diff --git a/.env b/.env
new file mode 120000
index 00000000..0ec1a3a4
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+src/.env
\ No newline at end of file
diff --git a/bin/doctum b/bin/doctum
index 569d076b..1aab12a7 100755
--- a/bin/doctum
+++ b/bin/doctum
@@ -1,15 +1,15 @@
 #!/bin/bash
 
 cwd=$(dirname $0)
 
 pushd ${cwd}/../src/
 
-rm -rf cache/store/
+rm -rf ../docs/build/main/ cache/store/
 
 php -dmemory_limit=-1 \
     vendor/bin/doctum.php \
     update \
     doctum.config.php \
     -v
 
 popd
diff --git a/bin/phpstan b/bin/phpstan
index 099b8871..3143812f 100755
--- a/bin/phpstan
+++ b/bin/phpstan
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 cwd=$(dirname $0)
 
 pushd ${cwd}/../src/
 
-php -dmemory_limit=320M \
+php -dmemory_limit=400M \
     vendor/bin/phpstan \
     analyse
 
 popd
diff --git a/bin/quickstart.sh b/bin/quickstart.sh
index a89c55ab..84ce7c0a 100755
--- a/bin/quickstart.sh
+++ b/bin/quickstart.sh
@@ -1,85 +1,96 @@
 #!/bin/bash
 
 set -e
 
 function die() {
     echo "$1"
     exit 1
 }
 
 rpm -qv composer >/dev/null 2>&1 || \
     test ! -z "$(which composer 2>/dev/null)" || \
     die "Is composer installed?"
 
 rpm -qv docker-compose >/dev/null 2>&1 || \
     test ! -z "$(which docker-compose 2>/dev/null)" || \
     die "Is docker-compose installed?"
 
 rpm -qv npm >/dev/null 2>&1 || \
     test ! -z "$(which npm 2>/dev/null)" || \
     die "Is npm installed?"
 
 rpm -qv php >/dev/null 2>&1 || \
     test ! -z "$(which php 2>/dev/null)" || \
     die "Is php installed?"
 
 rpm -qv php-ldap >/dev/null 2>&1 || \
     test ! -z "$(php --ini | grep ldap)" || \
     die "Is php-ldap installed?"
 
 rpm -qv php-mysqlnd >/dev/null 2>&1 || \
     test ! -z "$(php --ini | grep mysql)" || \
     die "Is php-mysqlnd installed?"
 
-base_dir=$(dirname $(dirname $0))
+test ! -z "$(php --modules | grep swoole)" || \
+    die "Is swoole installed?"
 
-bin/regen-certs
+base_dir=$(dirname $(dirname $0))
 
-docker pull kolab/centos7:latest
+docker pull docker.io/kolab/centos7:latest
 
-docker-compose down
+docker-compose down --remove-orphans
 docker-compose build
 
-docker-compose up -d kolab mariadb redis
-
 pushd ${base_dir}/src/
-cp .env.example .env
+
+if [ ! -f ".env" ]; then
+    cp .env.example .env
+fi
 
 if [ -f ".env.local" ]; then
     # Ensure there's a line ending
     echo "" >> .env
     cat .env.local >> .env
 fi
 
+popd
+
+bin/regen-certs
+
+docker-compose up -d coturn kolab mariadb openvidu kurento-media-server proxy redis
+
+pushd ${base_dir}/src/
+
 rm -rf vendor/ composer.lock
 php -dmemory_limit=-1 /bin/composer install
 npm install
 find bootstrap/cache/ -type f ! -name ".gitignore" -delete
 ./artisan key:generate
 ./artisan jwt:secret -f
 ./artisan clear-compiled
 ./artisan cache:clear
+./artisan horizon:install
 
 if [ ! -z "$(rpm -qv chromium 2>/dev/null)" ]; then
     chver=$(rpmquery --queryformat="%{VERSION}" chromium | awk -F'.' '{print $1}')
     ./artisan dusk:chrome-driver ${chver}
 fi
 
 if [ ! -f 'resources/countries.php' ]; then
     ./artisan data:countries
 fi
 
 npm run dev
 popd
 
 docker-compose up -d worker
 
 pushd ${base_dir}/src/
 rm -rf database/database.sqlite
 ./artisan db:ping --wait
 php -dmemory_limit=512M ./artisan migrate:refresh --seed
 ./artisan data:import
 ./artisan swoole:http stop >/dev/null 2>&1 || :
 ./artisan swoole:http start
 popd
 
diff --git a/bin/regen-certs b/bin/regen-certs
index 30e76274..ee277724 100755
--- a/bin/regen-certs
+++ b/bin/regen-certs
@@ -1,65 +1,72 @@
 #!/bin/bash
 
 base_dir=$(dirname $(dirname $0))
 
-base_dir="${base_dir}/docker/certs/"
+cert_dir="${base_dir}/docker/certs/"
 
-if [ ! -d "${base_dir}" ]; then
-    mkdir -p ${base_dir}
+if [ ! -d "${cert_dir}" ]; then
+    mkdir -p ${cert_dir}
 fi
 
-if [ ! -f "${base_dir}/ca.key" ]; then
-    openssl genrsa -out ${base_dir}/ca.key 4096
+if [ ! -f "${cert_dir}/ca.key" ]; then
+    openssl genrsa -out ${cert_dir}/ca.key 4096
 
     openssl req \
         -new \
         -x509 \
         -nodes \
         -days 3650 \
-        -key ${base_dir}/ca.key \
-        -out ${base_dir}/ca.cert \
+        -key ${cert_dir}/ca.key \
+        -out ${cert_dir}/ca.cert \
         -subj '/O=Example CA/'
 fi
 
 if [ -f /etc/pki/tls/openssl.cnf ]; then
     openssl_cnf="/etc/pki/tls/openssl.cnf"
 elif [ -f /etc/ssl/openssl.cnf ]; then
     openssl_cnf="/etc/ssl/openssl.cnf"
 else
     echo "No openssl.cnf"
     exit 1
 fi
 
-for name in kolab.mgmt.com kolab.hosted.com; do
-    openssl genrsa -out ${base_dir}/${name}.key 4096
+export $(cat ${base_dir}/src/.env | xargs) >/dev/null 2>&1
+
+for name in kolab.mgmt.com kolab.hosted.com {{admin,meet}.,}${APP_DOMAIN}; do
+    openssl genrsa -out ${cert_dir}/${name}.key 4096
 
     openssl req \
         -new \
-        -key ${base_dir}/${name}.key \
-        -out ${base_dir}/${name}.csr \
+        -key ${cert_dir}/${name}.key \
+        -out ${cert_dir}/${name}.csr \
         -subj "/O=Example CA/CN=${name}/" \
         -reqexts SAN \
         -config <(cat ${openssl_cnf} \
             <(printf "[SAN]\nsubjectAltName=DNS:${name}"))
 
     openssl x509 \
         -req \
-        -in ${base_dir}/${name}.csr \
-        -CA ${base_dir}/ca.cert \
-        -CAkey ${base_dir}/ca.key \
+        -in ${cert_dir}/${name}.csr \
+        -CA ${cert_dir}/ca.cert \
+        -CAkey ${cert_dir}/ca.key \
         -CAcreateserial \
-        -out ${base_dir}/${name}.cert \
+        -out ${cert_dir}/${name}.cert \
         -days 28 \
         -extfile <(cat ${openssl_cnf} \
             <(printf "[SAN]\nsubjectAltName=DNS:${name}")) \
         -extensions SAN
 
     # 'cause java ...
     openssl pkcs8 \
         -topk8 \
         -inform pem \
-        -in ${base_dir}/${name}.key \
+        -in ${cert_dir}/${name}.key \
         -outform pem \
         -nocrypt \
-        -out ${base_dir}/${name}_p8.key
+        -out ${cert_dir}/${name}_p8.key
+
+    cat ${cert_dir}/${name}.cert \
+        ${cert_dir}/ca.cert > ${cert_dir}/${name}.chain.pem
+
+    chmod 644 ${cert_dir}/*.{cert,key,pem}
 done
diff --git a/docker-compose.openvidu.yml b/docker-compose.openvidu.yml
new file mode 100644
index 00000000..0d15fbf6
--- /dev/null
+++ b/docker-compose.openvidu.yml
@@ -0,0 +1,22 @@
+version: '3'
+services:
+  kurento-media-server2:
+    build:
+      context: ./docker/kurento-media-server/
+    container_name: kolab-kurento-media-server2
+    environment:
+      - GST_DEBUG=3,Kurento*:4,kms*:4,sdp*:4,webrtc*:4,*rtpendpoint:4,rtp*handler:4,rtpsynchronizer:4,agnosticbin:4
+      - KMS_PORT=8889
+    hostname: kurento-media-server.hosted.com
+    image: apheleia/kurento-media-server:6.15.0
+    network_mode: host
+  openvidu:
+    build:
+      context: ./docker/openvidu-dev/
+    depends_on:
+      - kurento-media-server
+      - kurento-media-server2
+    volumes:
+      - /etc/letsencrypt/:/etc/letsencrypt/:ro
+      - ~/src/openvidu:/src/openvidu/
+      - ./docker/openvidu-dev/build/.m2:/root/.m2/
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e8032b6..d5c3a535 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,71 +1,145 @@
 version: '3'
 services:
+  coturn:
+    container_name: kolab-coturn
+    environment:
+      - DB_NAME=${OPENVIDU_COTURN_REDIS_DATABASE}
+      - DB_PASSWORD=${OPENVIDU_COTURN_REDIS_PASSWORD}
+      - REDIS_IP=${OPENVIDU_COTURN_REDIS_IP}
+      - TURN_PUBLIC_IP=${OPENVIDU_COTURN_IP}
+      - TURN_LISTEN_PORT=3478
+    hostname: sturn.mgmt.com
+    image: openvidu/openvidu-coturn:1.0.0
+    network_mode: host
+    restart: on-failure
+    tty: true
   kolab:
     build:
       context: ./docker/kolab/
     container_name: kolab
     depends_on:
       - mariadb
     extra_hosts:
       - "kolab.mgmt.com:127.0.0.1"
     healthcheck:
       interval: 10s
       test: test -f /tmp/kolab-init.done
       timeout: 5s
       retries: 30
     hostname: kolab.mgmt.com
     image: kolab
     network_mode: host
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     volumes:
+      - /etc/letsencrypt/:/etc/letsencrypt/:ro
       - ./docker/certs/ca.cert:/etc/pki/tls/certs/ca.cert:ro
       - ./docker/certs/ca.cert:/etc/pki/ca-trust/source/anchors/ca.cert:ro
       - ./docker/certs/kolab.hosted.com.cert:/etc/pki/tls/certs/kolab.hosted.com.cert
       - ./docker/certs/kolab.hosted.com.key:/etc/pki/tls/certs/kolab.hosted.com.key
       - ./docker/certs/kolab.mgmt.com.cert:/etc/pki/tls/certs/kolab.mgmt.com.cert
       - ./docker/certs/kolab.mgmt.com.key:/etc/pki/tls/certs/kolab.mgmt.com.key
       - ./docker/kolab/utils:/root/utils:ro
+      - ./src/.env:/.dockerenv:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  kurento-media-server:
+    build:
+      context: ./docker/kurento-media-server/
+    container_name: kolab-kurento-media-server
+    environment:
+      - GST_DEBUG=3,Kurento*:4,kms*:4,sdp*:4,webrtc*:4,*rtpendpoint:4,rtp*handler:4,rtpsynchronizer:4,agnosticbin:4
+    hostname: kurento-media-server.hosted.com
+    image: apheleia/kurento-media-server:6.15.0
+    network_mode: host
   mariadb:
     container_name: kolab-mariadb
     environment:
       MYSQL_ROOT_PASSWORD: Welcome2KolabSystems
     healthcheck:
       interval: 10s
       test: test -e /var/run/mysqld/mysqld.sock
       timeout: 5s
       retries: 30
     image: mariadb
     network_mode: host
+  openvidu:
+    build:
+      context: ./docker/openvidu/
+    container_name: kolab-openvidu
+    depends_on:
+      - kurento-media-server
+    environment:
+      - APP_DOMAIN=${APP_DOMAIN}
+      - CERTIFICATE_TYPE=letsencrypt
+      - COTURN_IP=${OPENVIDU_COTURN_IP}
+      - COTURN_REDIS_DBNAME=${OPENVIDU_COTURN_REDIS_DATABASE}
+      - COTURN_REDIS_PASSWORD=${OPENVIDU_COTURN_REDIS_PASSWORD}
+      - COTURN_REDIS_IP=${OPENVIDU_COTURN_REDIS_IP}
+      - DOMAIN_OR_PUBLIC_IP=${OPENVIDU_PUBLIC_IP}
+      - SERVER_PORT=${OPENVIDU_SERVER_PORT}
+      - KMS_STUN_IP=${OPENVIDU_COTURN_IP}
+      - KMS_STUN_PORT=3478
+      - KMS_URIS=["ws://localhost:8888/kurento", "ws://localhost:8889/kurento"]
+      - OPENVIDU_SECRET=${OPENVIDU_API_PASSWORD}
+      - OPENVIDU_WEBHOOK=${OPENVIDU_WEBHOOK}
+      - OPENVIDU_WEBHOOK_ENDPOINT=${OPENVIDU_WEBHOOK_ENDPOINT}
+      - SERVER_SSL_ENABLED=false
+    hostname: openvidu.hosted.com
+    image: apheleia/openvidu:2.16.0
+    network_mode: host
+    tmpfs:
+      - /run
+      - /tmp
+      - /var/run
+      - /var/tmp
+    tty: true
+    volumes:
+      - /etc/letsencrypt/:/etc/letsencrypt/:ro
+  proxy:
+    build:
+      context: ./docker/proxy/
+    container_name: kolab-proxy
+    hostname: kanarip.internet-box.ch
+    image: kolab-proxy
+    network_mode: host
+    tmpfs:
+      - /run
+      - /tmp
+      - /var/run
+      - /var/tmp
+    tty: true
+    volumes:
+      - ./docker/certs/:/etc/certs/:ro
+      - /etc/letsencrypt/:/etc/letsencrypt/:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
   redis:
     build:
       context: ./docker/redis/
     container_name: kolab-redis
     hostname: redis
     image: redis
     network_mode: host
     volumes:
       - ./docker/redis/redis.conf:/usr/local/etc/redis/redis.conf:ro
   worker:
     build:
       context: ./docker/worker/
     container_name: kolab-worker
     depends_on:
       - kolab
     hostname: worker
     image: kolab-worker
     network_mode: host
     tmpfs:
       - /run
       - /tmp
       - /var/run
       - /var/tmp
     tty: true
     volumes:
       - ./src:/home/worker/src.orig:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
diff --git a/docker/coturn/Dockerfile b/docker/coturn/Dockerfile
new file mode 100644
index 00000000..551b3fca
--- /dev/null
+++ b/docker/coturn/Dockerfile
@@ -0,0 +1,38 @@
+FROM fedora:31
+
+MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+
+RUN dnf -y install \
+        --setopt 'tsflags=nodocs' \
+        bash-completion \
+        bind-utils \
+        coturn \
+        curl \
+        dhcp-client \
+        iproute \
+        iptraf-ng \
+        iputils \
+        less \
+        lsof \
+        mtr \
+        net-tools \
+        NetworkManager \
+        NetworkManager-tui \
+        network-scripts \
+        nmap-ncat \
+        openssh-clients \
+        openssh-server \
+        procps-ng \
+        redis \
+        strace \
+        systemd-udev \
+        tcpdump \
+        telnet \
+        traceroute \
+        vim-enhanced \
+        wget && \
+    dnf clean all
+
+COPY rootfs/ /
+
+CMD ["/usr/local/bin/coturn.sh"]
diff --git a/docker/coturn/rootfs/usr/local/bin/coturn.sh b/docker/coturn/rootfs/usr/local/bin/coturn.sh
new file mode 100755
index 00000000..45a7c476
--- /dev/null
+++ b/docker/coturn/rootfs/usr/local/bin/coturn.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+cd /tmp/
+
+cat > ./turnserver.conf << EOF
+external-ip=${TURN_PUBLIC_IP:-127.0.0.1}
+listening-port=${TURN_LISTEN_PORT:-3478}
+fingerprint
+lt-cred-mech
+max-port=${MAX_PORT:-65535}
+min-port=${MIN_PORT:-40000}
+pidfile="$(pwd)/turnserver.pid"
+realm=openvidu
+simple-log
+redis-userdb="ip=${REDIS_IP:-127.0.0.1} dbname=${DB_NAME:-2} password=${DB_PASSWORD:-turn} connect_timeout=30"
+verbose
+EOF
+
+/usr/bin/turnserver -c ./turnserver.conf
diff --git a/docker/kolab/Dockerfile b/docker/kolab/Dockerfile
index ed1d6bc7..2d5278ca 100644
--- a/docker/kolab/Dockerfile
+++ b/docker/kolab/Dockerfile
@@ -1,77 +1,80 @@
 FROM centos:7
 
 LABEL maintainer="contact@kolabsystems.com"
 LABEL dist=centos7
 LABEL tier=${TIER}
 
 ENV container docker
 ENV SYSTEMD_PAGER=''
 ENV DISTRO=centos7
 ENV LANG=en_US.utf8
 ENV LC_ALL=en_US.utf8
 
 RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
     rm -f /lib/systemd/system/multi-user.target.wants/*; \
     rm -f /etc/systemd/system/*.wants/*; \
     rm -f /lib/systemd/system/local-fs.target.wants/*; \
     rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
     rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
     rm -f /lib/systemd/system/basic.target.wants/*; \
     rm -f /lib/systemd/system/anaconda.target.wants/*;
 
 # To speed things up, disable fastestmirror.
 RUN sed -r -i \
         -e 's/^enabled.*$/enabled = 0/g' \
         /etc/yum/pluginconf.d/fastestmirror.conf
 
 # Avoid using a mirrorlist (use a transparent proxy and cache everything instead).
 RUN sed -r -i \
         -e 's/^mirrorlist/#mirrorlist/g' \
         -e 's/^#baseurl/baseurl/g' \
         /etc/yum.repos.d/*.repo
 
 RUN sed -i -e '/tsflags=nodocs/d' /etc/yum.conf
 
 # Add EPEL.
 RUN yum -y install \
         epel-release && \
     yum clean all
 
 # Add the EPEL key.
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
 
 RUN rpm --import https://mirror.kolabenterprise.com/maipo.asc
 
 RUN yum -y install https://mirror.kolabenterprise.com/kolab-16-for-el7.rpm && \
     yum -y install kolab-16-release-development && \
         yum clean all
 
 RUN yum -y --setopt tsflags= install kolab
 
 COPY kolab-init.service /etc/systemd/system/kolab-init.service
 COPY kolab-setenv.service /etc/systemd/system/kolab-setenv.service
 COPY kolab-vlv.service /etc/systemd/system/kolab-vlv.service
 COPY utils /root/utils
 
 RUN rm -rf /etc/systemd/system/multi-user.target.wants/{avahi-daemon,sshd}.* && \
     ln -s /etc/systemd/system/kolab-init.service \
         /etc/systemd/system/multi-user.target.wants/kolab-init.service && \
     ln -s /etc/systemd/system/kolab-setenv.service \
         /etc/systemd/system/multi-user.target.wants/kolab-setenv.service && \
     ln -s /etc/systemd/system/kolab-vlv.service \
         /etc/systemd/system/multi-user.target.wants/kolab-vlv.service
 
 RUN sed -i -r -e 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config 2>/dev/null || :
 
+RUN sed -i -r -e 's/^Listen 80$/Listen 9080/g' /etc/httpd/conf/httpd.conf
+#RUN sed -i -r -e 's/^Listen 443$/Listen 9443/g' /etc/httpd/conf/httpd.conf
+
 COPY kolab-init.sh /usr/local/sbin/
 RUN chmod 750 /usr/local/sbin/kolab-init.sh
 COPY kolab-vlv.sh /usr/local/sbin/
 RUN chmod 750 /usr/local/sbin/kolab-vlv.sh
 
 VOLUME [ "/sys/fs/cgroup" ]
 
 WORKDIR /root/
 
 CMD ["/lib/systemd/systemd"]
 
 EXPOSE 21/tcp 22/tcp 25/tcp 53/tcp 53/udp 80/tcp 110/tcp 143/tcp 389/tcp 443/tcp 465/tcp 587/tcp 993/tcp 995/tcp 5353/udp 8880/tcp 8443/tcp 8447/tcp
diff --git a/docker/kolab/kolab-init.sh b/docker/kolab/kolab-init.sh
index 01915c1c..d3dac5c8 100755
--- a/docker/kolab/kolab-init.sh
+++ b/docker/kolab/kolab-init.sh
@@ -1,31 +1,33 @@
 #!/bin/bash
 
 if [ -d "/etc/dirsrv/slapd-kolab/" ]; then
     exit 0
 fi
 
+cp -av /bin/true /usr/sbin/ds_systemd_ask_password_acl
+
 pushd /root/utils/
 
 ./01-reverse-etc-hosts.sh && echo "01 done"
 ./02-write-my.cnf.sh && echo "02 done"
 ./03-setup-kolab.sh && echo "03 done"
 ./04-reset-mysql-kolab-password.sh && echo "04 done"
 ./05-replace-localhost.sh && echo "05 done"
 ./06-mysql-for-kolabdev.sh && echo "06 done"
 ./07-adjust-base-dns.sh && echo "07 done"
 ./08-disable-amavisd.sh && echo "08 done"
 ./09-enable-debugging.sh && echo "09 done"
 ./10-reset-kolab-service-password.sh && echo "10 done"
 ./11-reset-cyrus-admin-password.sh && echo "11 done"
 ./12-create-hosted-kolab-service.sh && echo "12 done"
 ./13-create-ou-domains.sh && echo "13 done"
 ./14-create-management-domain.sh && echo "14 done"
 ./15-create-hosted-domain.sh && echo "15 done"
 ./16-remove-cn-kolab-cn-config.sh && echo "16 done"
 ./17-remove-hosted-service-access-from-mgmt-domain.sh && echo "17 done"
 ./18-adjust-kolab-conf.sh && echo "18 done"
 ./19-turn-on-vlv-in-roundcube.sh && echo "19 done"
 ./20-add-alias-attribute-index.sh && echo "20 done"
 ./21-adjust-postfix-config.sh && echo "21 done"
 
 touch /tmp/kolab-init.done
diff --git a/docker/kolab/utils/04-reset-mysql-kolab-password.sh b/docker/kolab/utils/04-reset-mysql-kolab-password.sh
index e0014f4d..0692de4f 100755
--- a/docker/kolab/utils/04-reset-mysql-kolab-password.sh
+++ b/docker/kolab/utils/04-reset-mysql-kolab-password.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 sqlpw=$(grep ^sql_uri /etc/kolab/kolab.conf | awk -F':' '{print $3}' | awk -F'@' '{print $1}')
 
-mysql -h ${DB_HOST} -u root --password=${DB_ROOT_PASSWORD} \
+mysql -h ${DB_HOST:-127.0.0.1} -u root --password=${DB_ROOT_PASSWORD:-Welcome2KolabSystems} \
     -e "SET PASSWORD FOR '${DB_HKCCP_USERNAME:-kolabdev}'@'%' = PASSWORD('${DB_HKCCP_PASSWORD:-Welcome2KolabSystems}');"
 
-mysql -h ${DB_HOST} -u root --password=${DB_ROOT_PASSWORD} \
+mysql -h ${DB_HOST:-127.0.0.1} -u root --password=${DB_ROOT_PASSWORD:-Welcome2KolabSystems} \
     -e "SET PASSWORD FOR '${DB_KOLAB_USERNAME:-kolab}'@'%' = PASSWORD('${DB_KOLAB_PASSWORD:=$sqlpw}');"
 
-mysql -h ${DB_HOST} -u root --password=${DB_ROOT_PASSWORD} \
+mysql -h ${DB_HOST:-127.0.0.1} -u root --password=${DB_ROOT_PASSWORD:-Welcome2KolabSystems} \
     -e "SET PASSWORD FOR '${DB_RC_USERNAME:-roundcube}'@'%' = PASSWORD('${DB_RC_PASSWORD:-Welcome2KolabSystems}');"
diff --git a/docker/kurento-media-server/Dockerfile b/docker/kurento-media-server/Dockerfile
new file mode 100644
index 00000000..e3913706
--- /dev/null
+++ b/docker/kurento-media-server/Dockerfile
@@ -0,0 +1,427 @@
+FROM fedora:31
+
+MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+
+ENV CFLAGS="-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -fasynchronous-unwind-tables -fstack-clash-protection -flto"
+ENV CXXFLAGS="${CFLAGS}"
+ENV LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -flto -fuse-linker-plugin"
+ENV CC="gcc"
+ENV CXX="g++"
+ENV AR="/bin/gcc-ar"
+ENV RANLIB="/bin/gcc-ranlib"
+ENV NM="/bin/gcc-nm"
+ENV CMAKE_CXX_ARCHIVE_CREATE="<CMAKE_AR> qcs <TARGET> <LINK_FLAGS> <OBJECTS>"
+ENV OPENSSL_CONF=''
+ENV GST_DEBUG="*:3,Kurento*:5,kms*:5,sdp*:4,webrtc*:5,*rtpendpoint:5,rtp*handler:5,rtpsynchronizer:5,agnosticbin:4,GST_ELEMENT_FACTORY:7"
+
+ARG CLEAN=1
+
+ARG CMAKEOPTS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/ -DCMAKE_INSTALL_SYSCONFDIR=/etc/ -DCMAKE_MODULES_INSTALL_DIR=/usr/share/cmake/Modules/ -DBUILD_SHARED_LIBS=ON -DCMAKE_AR=${AR} -DCMAKE_CXX_ARCHIVE_FINISH=true -DCMAKE_MODULES_INSTALL_DIR=/usr/share/cmake/Modules/ -DGENERATE_TESTS=FALSE -DDISABLE_TESTS=TRUE"
+ARG GST_BASE_VERSION="1.8.1-1kurento2"
+ARG GST_VERSION="1.8.1"
+ARG KURENTO_MEDIA_SERVER_VERSION="6.15.0"
+ARG KURENTO_CMAKE_VERSION="6.15.0"
+ARG KURENTO_CORE_VERSION="6.15.0"
+ARG KURENTO_ELEMENTS_VERSION="6.15.0"
+ARG KURENTO_FILTERS_VERSION="6.15.0"
+ARG KURENTO_MODULE_CREATOR_VERSION="6.15.0"
+ARG KURENTO_JSONCPP_VERSION="1.6.4"
+ARG KURENTO_JSONRPC_VERSION="6.15.0"
+ARG OPENCV_VERSION="3.4.10"
+
+RUN rpm -Uvh https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-31.noarch.rpm && \
+    rpm -Uvh https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-31.noarch.rpm && \
+    dnf -y install \
+        autoconf \
+        automake \
+        bison \
+        boost-devel \
+        cmake \
+        coreutils \
+        dnf-plugins-core \
+        ffmpeg \
+        ffmpeg-devel \
+        flac-devel \
+        flex \
+        gcc-c++ \
+        gettext-devel \
+        git \
+        glibmm24-devel \
+        gsl-devel \
+        gtk-doc \
+        libevent-devel \
+        libjpeg-devel \
+        libmicrodns-devel \
+        libpng-devel \
+        libsigc++20-devel \
+        libsoup-devel \
+        libsrtp-devel \
+        libtool \
+        libunwind-devel \
+        libuuid-devel \
+        libvisual-devel \
+        libvpx-devel \
+        make \
+        maven \
+        meson \
+        net-tools \
+        opencl-headers \
+        opencv-devel \
+        # not available on ppc64le? \
+        #openni-devel \
+        openssl-devel \
+        opus-devel \
+        patch \
+        redhat-rpm-config \
+        spandsp-devel \
+        usrsctp-devel \
+        vim-enhanced \
+        webrtc-audio-processing-devel \
+        websocketpp-devel \
+        x264-devel \
+        x265-devel && \
+    # meson in module older than meson in updates \
+    dnf module -y disable meson && \
+    dnf -y update meson && \
+    rpm -e --nodeps gstreamer1 gstreamer1-plugins-base && \
+    dnf -y clean all && \
+    mkdir -p /src/ && \
+    if [ "${GST_BASE_VERSION}" == "1.8.1-1kurento2" ]; then \
+        git clone https://github.com/Kurento/gstreamer.git /src/gstreamer.git && \
+            cd /src/gstreamer.git/ && \
+            sed -i \
+                -e 's|git://anongit.freedesktop.org/gstreamer/common.*$|https://anongit.freedesktop.org/git/gstreamer/common.git/|g' \
+                .gitmodules && \
+            git submodule init && \
+            git submodule update && \
+            #sed -r -i \
+            #    -e 's/^GST_API_VERSION=.*$/GST_API_VERSION=1.0/g' \
+            #    configure.ac && \
+            autopoint --force && \
+            autoreconf -vi && \
+            ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-failing-tests --disable-static --disable-static-plugins --enable-shared && \
+            make -j $(nproc) VERBOSE=1 && \
+            make install VERBOSE=1 ; \
+    else \
+        git clone -b ${GST_BASE_VERSION} https://gitlab.freedesktop.org/gstreamer/gstreamer.git /src/gstreamer.git && \
+            cd /src/gstreamer.git/ && \
+            if [ -f 'meson.build' ]; then \
+                meson build --prefix=/usr && \
+                ninja -C build install ; \
+            else \
+                sed -i \
+                    -e 's|git://anongit.freedesktop.org/gstreamer/common.*$|https://anongit.freedesktop.org/git/gstreamer/common.git/|g' \
+                    .gitmodules && \
+                git submodule init && \
+                git submodule update && \
+                autopoint --force && \
+                autoreconf -vi && \
+                ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-failing-tests --disable-static --disable-static-plugins --enable-shared && \
+                make -j $(nproc) VERBOSE=1 && \
+                make install VERBOSE=1 ; \
+            fi ; \
+    fi && \
+    git clone https://gitlab.freedesktop.org/libnice/libnice.git /src/libnice.git && \
+        cd /src/libnice.git && \
+        sed -r -i \
+            -e 's/-(base|check)-1\.0/-\1-1.5/g' \
+            -e 's/gstreamer-1\.0/gstreamer-1.5/g' \
+            meson.build \
+            gst/meson.build \
+            tests/meson.build && \
+        meson build --prefix=/usr && \
+        ninja -C build install && \
+    git clone -b ${GST_VERSION} https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git /src/gst-plugins-base.git && \
+        cd /src/gst-plugins-base.git/ && \
+        if [ -f 'meson.build' ]; then \
+            meson build --prefix=/usr && \
+            ninja -C build install ; \
+        else \
+            sed -i \
+                -e 's|git://anongit.freedesktop.org/gstreamer/common.*$|https://anongit.freedesktop.org/git/gstreamer/common.git/|g' \
+                .gitmodules && \
+            git submodule init && \
+            git submodule update && \
+            sed -r -i \
+                -e 's/^GST_API_VERSION.*$/GST_API_VERSION=1.5/g' \
+                configure.ac && \
+            sed -r -i \
+                -e 's/^DOMAIN.*$/DOMAIN = gst-plugins-base-1.5/g' \
+                po/Makevars && \
+            autopoint --force && \
+            autoreconf -vi && \
+            sed -r -i \
+                -e 's/@GST_API_VERSION@\.1/@GST_API_VERSION@/g' \
+                tools/Makefile.in && \
+            ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-failing-tests --disable-static --disable-static-plugins --enable-shared && \
+            make -j $(nproc) VERBOSE=1 && \
+            make install VERBOSE=1 ; \
+        fi && \
+    git clone -b ${GST_VERSION} https://gitlab.freedesktop.org/gstreamer/gst-plugins-good.git /src/gst-plugins-good.git && \
+        cd /src/gst-plugins-good.git/ && \
+        if [ -f 'meson.build' ]; then \
+            meson build --prefix=/usr && \
+            ninja -C build install ; \
+        else \
+            sed -i \
+                -e 's|git://anongit.freedesktop.org/gstreamer/common.*$|https://anongit.freedesktop.org/git/gstreamer/common.git/|g' \
+                .gitmodules && \
+            git submodule init && \
+            git submodule update && \
+            sed -r -i \
+                -e 's/^GST_API_VERSION.*$/GST_API_VERSION=1.5/g' \
+                configure.ac && \
+            sed -r -i \
+                -e 's/^DOMAIN.*$/DOMAIN = gst-plugins-good-1.5/g' \
+                po/Makevars && \
+            autopoint --force && \
+            autoreconf -vi && \
+            sed -i \
+                -e '/^#define .* gint64/d' \
+                -e '/^#define .* guint64/d' \
+                sys/v4l2/ext/types-compat.h && \
+            sed -i \
+                -e 's/__s64/gint64/g' \
+                -e 's/__u64/guint64/g' \
+                sys/v4l2/ext/videodev2.h && \
+            ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-failing-tests --disable-static --disable-static-plugins --enable-shared && \
+            make -j $(nproc) VERBOSE=1 && \
+            make install VERBOSE=1 ; \
+        fi && \
+    git clone https://github.com/kanarip/gst-plugins-bad.git /src/gst-plugins-bad.git && \
+        cd /src/gst-plugins-bad.git/ && \
+        if [ -f 'meson.build' ]; then \
+            meson build --prefix=/usr && \
+            ninja -C build install ; \
+        else \
+            sed -i \
+                -e 's|git://anongit.freedesktop.org/gstreamer/common.*$|https://anongit.freedesktop.org/git/gstreamer/common.git/|g' \
+                .gitmodules && \
+            git submodule init && \
+            git submodule update && \
+            sed -r -i \
+                -e 's/^GST_API_VERSION.*$/GST_API_VERSION=1.5/g' \
+                -e 's/gstreamer-allocators-1.0/gstreamer-allocators-1.5/g' \
+                configure.ac && \
+            sed -r -i \
+                -e 's/gstaudio-1.0/gstaudio-1.5/g' \
+                -e 's/gstvideo-1.0/gstvideo-1.5/g' \
+                gst/festival/Makefile.am \
+                gst/ivtc/Makefile.am \
+                gst/yadif/Makefile.am && \
+            sed -r -i \
+                -e 's/^DOMAIN.*$/DOMAIN = gst-plugins-bad-1.5/g' \
+                po/Makevars && \
+            autopoint --force && \
+            autoreconf -vi && \
+            #./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-failing-tests --disable-dtls && \
+            ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-failing-tests --disable-static --disable-static-plugins --enable-shared && \
+            make -j $(nproc) VERBOSE=1 && \
+            make install VERBOSE=1 ; \
+        fi && \
+    git clone -b ${GST_VERSION} https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly.git /src/gst-plugins-ugly.git && \
+        cd /src/gst-plugins-ugly.git/ && \
+        if [ -f 'meson.build' ]; then \
+            meson build --prefix=/usr && \
+            ninja -C build install ; \
+        else \
+            sed -i \
+                -e 's|git://anongit.freedesktop.org/gstreamer/common.*$|https://anongit.freedesktop.org/git/gstreamer/common.git/|g' \
+                .gitmodules && \
+            git submodule init && \
+            git submodule update && \
+            sed -r -i \
+                -e 's/^GST_API_VERSION.*$/GST_API_VERSION=1.5/g' \
+                configure.ac && \
+            sed -r -i \
+                -e 's/^DOMAIN.*$/DOMAIN = gst-plugins-ugly-1.5/g' \
+                po/Makevars && \
+            autopoint --force && \
+            autoreconf -vi && \
+            ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-failing-tests --disable-x264 --disable-static --disable-static-plugins --enable-shared && \
+            make -j $(nproc) VERBOSE=1 && \
+            make install VERBOSE=1 ; \
+        fi && \
+    git clone https://github.com/Kurento/openwebrtc-gst-plugins.git /src/openwebrtc-gst-plugins.git && \
+        cd /src/openwebrtc-gst-plugins.git/ && \
+        autoreconf -vi && \
+        ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --disable-static --disable-static-plugins --enable-shared && \
+        make VERBOSE=1 && \
+        make install VERBOSE=1 && \
+    git clone -b ${KURENTO_CMAKE_VERSION} https://github.com/Kurento/kms-cmake-utils.git /src/kms-cmake-utils.git && \
+        cd /src/kms-cmake-utils.git/ && \
+        mkdir build && \
+        cd build && \
+        cmake \
+            ${CMAKEOPTS} \
+            .. && \
+        make -j $(nproc) VERBOSE=1 && \
+        make install -s && \
+    git clone -b ${KURENTO_MODULE_CREATOR_VERSION} https://github.com/Kurento/kurento-module-creator.git /src/kurento-module-creator.git && \
+        cd /src/kurento-module-creator.git/ && \
+        mvn clean install -DskipTests && \
+        cp target/kurento-module-creator-jar-with-dependencies.jar /usr/bin/. && \
+        cp scripts/kurento-module-creator /usr/bin/. && \
+        cp target/classes/*.cmake /usr/share/cmake/Modules/. && \
+    git clone -b ${KURENTO_JSONCPP_VERSION} https://github.com/Kurento/jsoncpp.git /src/jsoncpp.git && \
+        cd /src/jsoncpp.git/ && \
+        mkdir build && \
+        cd build && \
+        cmake \
+            ${CMAKEOPTS} \
+            -DJSONCPP_WITH_CMAKE_PACKAGE=ON \
+            -DLIBRARY_INSTALL_DIR=/usr/lib64/ \
+            -DPACKAGE_INSTALL_DIR=/usr/share/cmake/ \
+            .. && \
+        make -j $(nproc) VERBOSE=1 && \
+        make install -s && \
+        mv -v /usr/lib/pkgconfig/*.pc /usr/share/pkgconfig/. && \
+        mv -v /usr/share/cmake/jsoncpp/*.cmake /usr/share/cmake/Modules/. && \
+        rm -rvf /usr/share/cmake/jsoncpp/ && \
+        mv -v /usr/include/json/features.h /usr/include/json/json-features.h && \
+        sed -i -e 's/features\.h/json-features\.h/g' /usr/include/json/*.h && \
+        cp -av /usr/include/json /usr/include/kmsjsoncpp && \
+    git clone -b ${KURENTO_JSONRPC_VERSION} https://github.com/Kurento/kms-jsonrpc.git /src/kms-jsonrpc.git && \
+        cd /src/kms-jsonrpc.git/ && \
+        mkdir build && \
+        cd build && \
+        cmake \
+            ${CMAKEOPTS} \
+            .. && \
+        make -j $(nproc) VERBOSE=1 && \
+        make install -s && \
+    git clone -b ${KURENTO_CORE_VERSION} https://github.com/Kurento/kms-core.git /src/kms-core.git && \
+        cd /src/kms-core.git/ && \
+        mkdir build && \
+        cd build && \
+        if [ "${GST_BASE_VERSION}" != "1.8.1-1kurento2" ]; then \
+            sed -r -i \
+                -e 's/gstreamer-(.*)1.5/gstreamer-\11.0/g' \
+                $(find -type f -name CMakeLists.txt) && \
+            cmake \
+                ${CMAKEOPTS} \
+                -DCMAKE_INSTALL_GST_PLUGINS_DIR=/usr/lib64/gstreamer-1.0/ \
+                .. ; \
+        else \
+            cmake \
+                ${CMAKEOPTS} \
+                -DCMAKE_INSTALL_GST_PLUGINS_DIR=/usr/lib64/gstreamer-1.5/ \
+                .. ; \
+        fi && \
+        make -j $(nproc) VERBOSE=1 && \
+        make install -s && \
+    git clone -b ${KURENTO_ELEMENTS_VERSION} https://github.com/Kurento/kms-elements.git /src/kms-elements.git && \
+        cd /src/kms-elements.git/ && \
+        if [ "${GST_BASE_VERSION}" != "1.8.1-1kurento2" ]; then \
+            sed -r -i \
+                -e 's/gstreamer-(.*)1.5/gstreamer-\11.0/g' \
+                $(find -type f -name CMakeLists.txt) ; \
+        fi && \
+        mkdir build && \
+        cd build && \
+        cmake \
+            ${CMAKEOPTS} \
+            .. && \
+        sed -i \
+            -e 's/-lkmsgstcommons/-lkmsgstcommons -lkmscoreinterface/g' \
+            -e 's/-lkmscoreinterface/-lkmscoreinterface -lkmsutils/g' \
+            $(find . -type f -name link.txt) && \
+        make -j $(nproc) VERBOSE=1 && \
+        make -j $(nproc) check VERBOSE=1 && \
+        make install -s && \
+        cp -av src/server/implementation/HttpServer/libkmshttpep.so /usr/lib64/. && \
+        cp -av /usr/lib64/libkmswebrtcendpointlib.so* /usr/lib64/kurento/modules/. && \
+        cp -av /usr/lib64/libkmshttpep.so* /usr/lib64/kurento/modules/. && \
+    git clone -b ${KURENTO_FILTERS_VERSION} https://github.com/Kurento/kms-filters.git /src/kms-filters.git && \
+        cd /src/kms-filters.git/ && \
+        if [ "${GST_BASE_VERSION}" != "1.8.1-1kurento2" ]; then \
+            sed -r -i \
+                -e 's/gstreamer-(.*)1.5/gstreamer-\11.0/g' \
+                $(find -type f -name CMakeLists.txt) ; \
+        fi && \
+        mkdir build && \
+        cd build && \
+        cmake \
+            ${CMAKEOPTS} \
+            .. && \
+        make -j $(nproc) VERBOSE=1 && \
+        make install -s && \
+    git clone -b ${KURENTO_MEDIA_SERVER_VERSION} https://github.com/Kurento/kurento-media-server.git /src/kurento-media-server.git && \
+        cd /src/kurento-media-server.git/ && \
+        if [ "${GST_BASE_VERSION}" != "1.8.1-1kurento2" ]; then \
+            sed -r -i \
+                -e 's/gstreamer-(.*)1.5/gstreamer-\11.0/g' \
+                $(find -type f -name CMakeLists.txt) ; \
+        fi && \
+        # work around for kurento not building on pcc64le \
+        sed -i \
+            -e '603,618d' \
+            server/death_handler.cpp && \
+        mkdir build && \
+        cd build && \
+        cmake \
+            ${CMAKEOPTS} \
+            .. && \
+        # a linking error / oversight may occur \
+        sed -i \
+            -e 's/-lkmsgstcommons/-lkmsgstcommons -lkmscoreinterface/g' \
+            $(find . -type f -name link.txt) && \
+        make -j $(nproc) VERBOSE=1 && \
+        make install VERBOSE=1 -s && \
+        cp -av $(find . -type f -name 'libtransport.so*') /usr/lib64/ && \
+        cp -av $(find . -type f -name 'libwebsocketTransport.so*') /usr/lib64/ && \
+    if [ "${CLEAN}" -eq 1 ]; then \
+        strip -s \
+            /usr/lib64/gstreamer-*/*.so \
+            /usr/lib64/kurento/modules/*.so* \
+            /usr/lib64/libkms*.so* && \
+        dnf -y remove \
+            -x boost-filesystem \
+            -x boost-program-options \
+            -x boost-log \
+            -x boost-thread \
+            -x file \
+            -x gstreamer1-plugins-base \
+            -x gstreamer1-plugins-bad-free \
+            -x glibmm24 \
+            -x java-1.8.0-openjdk \
+            -x libsigc \
+            -x libsoup \
+            -x libvpx \
+            -x opencv \
+            boost-devel \
+            cmake \
+            gcc-c++ \
+            git \
+            glibmm24-devel \
+            gstreamer1-devel \
+            gstreamer1-plugins-base-devel \
+            gstreamer1-plugins-bad-free-devel \
+            libevent-devel \
+            libsigc++20-devel \
+            libsoup-devel \
+            libuuid-devel \
+            libvpx-devel \
+            make \
+            maven \
+            opencv-devel \
+            openssl-devel \
+            redhat-rpm-config \
+            vim-enhanced \
+            websocketpp-devel && \
+        dnf -y clean all && \
+        rm -rvf \
+            /src/ \
+            /root/.m2/ \
+            /usr/include/* \
+            /usr/lib64/*.la \
+            /usr/lib64/gstreamer-*/*.la && \
+        ldconfig ; \
+    fi
+
+COPY rootfs/ /
+
+RUN chmod 777 /etc/kurento/modules/kurento/
+RUN chmod 666 /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
+
+CMD ["/usr/local/bin/kurento-media-server.sh"]
diff --git a/docker/kurento-media-server/rootfs/etc/kurento/kurento.conf.json b/docker/kurento-media-server/rootfs/etc/kurento/kurento.conf.json
new file mode 100644
index 00000000..c9c510e0
--- /dev/null
+++ b/docker/kurento-media-server/rootfs/etc/kurento/kurento.conf.json
@@ -0,0 +1,47 @@
+{
+  "mediaServer": {
+    "resources": {
+      "//": "KMS will raise an error when reaching this usage% of Kernel resources",
+      "//": "Applies to allowed number of threads, and number of open file descriptors",
+      "//": "Default: 0.8 (80%)",
+      "//exceptionLimit": "0.8",
+      "//": "KMS process will be automatically killed when there are no sessions but this % of resources are in use",
+      "//killLimit": "0.7",
+      "//": "Garbage collector period, in seconds",
+      "//": "Default: 240 (4 minutes)",
+      "garbageCollectorPeriod": 240,
+      "//": "Whether to disable the RPC API request cache, for memory constrained environments",
+      "//": "Default: false",
+      "disableRequestCache": false
+    },
+    "net": {
+      "websocket": {
+        "//": "Try (or not) to use IPv6 for the WebSocket connection, with IPv4 fallback",
+        "//": "Default: true",
+        "ipv6": false,
+        "//": "WebSocket port where API clients connect to control KMS",
+        "//": "Set to 0 or comment out the line to disable WebSocket access",
+        "port": 8888,
+        "secure": {
+          "//": "Secure WebSocket port where API clients connect to control KMS",
+          "//": "Set to 0 or comment out the line to disable Secure WebSocket access",
+          "//port": 8433,
+          "//": "Path (absolute or relative to this config file) to the",
+          "//": "concatenated certificate (chain) file(s) + private key, in PEM format",
+          "//certificate": "cert+key.pem",
+          "//": "Password for the private key, if one was set when the key was created",
+          "//password": ""
+        },
+        "//registrar": {
+          "//address": "ws://localhost:9090",
+          "//localAddress": "localhost"
+        },
+        "//": "Maximum queue length of pending connections (see sysctl tcp_max_syn_backlog)",
+        "//": "Default: SOMAXCONN (128)",
+        "//connqueue": 128,
+        "path": "kurento",
+        "threads": 10
+      }
+    }
+  }
+}
diff --git a/docker/kurento-media-server/rootfs/etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini b/docker/kurento-media-server/rootfs/etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
new file mode 100644
index 00000000..e2f6112a
--- /dev/null
+++ b/docker/kurento-media-server/rootfs/etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
@@ -0,0 +1,130 @@
+;; Local network interfaces used for ICE gathering.
+;;
+;; If you know which network interfaces should be used to perform ICE (for
+;; WebRTC connectivity), you can define them here. Doing so has several
+;; advantages:
+;;
+;; * The WebRTC ICE gathering process will be much quicker. Normally, it needs
+;;   to gather local candidates for all of the network interfaces, but this step
+;;   can be made faster if you limit it to only the interface that you know will
+;;   work.
+;;
+;; * It will ensure that the media server always decides to use the correct
+;;   network interface. With WebRTC ICE gathering it's possible that, under some
+;;   circumstances (in systems with virtual network interfaces such as
+;;   "docker0") the ICE process ends up choosing the wrong local IP.
+;;
+;; <networkInterfaces> is a comma-separated list of network interface names.
+;;
+;; Examples:
+;; networkInterfaces=eth0
+;; networkInterfaces=eth0,enp0s25
+;;
+;networkInterfaces=eth0
+
+;; STUN server IP address.
+;;
+;; The ICE process uses STUN to punch holes through NAT firewalls.
+;;
+;; You don't need to configure both STUN and TURN, because TURN already includes
+;; STUN functionality.
+;;
+;; <stunServerAddress> MUST be an IP address; domain names are NOT supported.
+;;
+;; You need to use a well-working STUN server. Use this to check if it works:
+;; https://webrtc.github.io/samples/src/content/peerconnection/trickle-ice/
+;; From that check, you should get at least one Server-Reflexive Candidate
+;; (type "srflx").
+;;
+stunServerAddress=212.103.80.153
+stunServerPort=3478
+
+;; TURN server URL.
+;;
+;; When STUN is not enough to open connections through some NAT firewalls,
+;; using TURN is the remaining alternative.
+;;
+;; You don't need to configure both STUN and TURN, because TURN already includes
+;; STUN functionality.
+;;
+;; The provided URL should follow one of these formats:
+;;
+;;   * user:password@ipaddress:port
+;;   * user:password@ipaddress:port?transport=[udp|tcp|tls]
+;;
+;; <ipaddress> MUST be an IP address; domain names are NOT supported.
+;; <transport> is OPTIONAL. Possible values: udp, tcp, tls. Default: udp.
+;;
+;; You need to use a well-working TURN server. Use this to check if it works:
+;; https://webrtc.github.io/samples/src/content/peerconnection/trickle-ice/
+;;
+;; From that check, you should get at least one Server-Reflexive Candidate
+;; (type "srflx") AND one Relay Candidate (type "relay").
+;;
+;turnURL=user:password@198.51.100.1:3478?transport=udp
+
+;; Certificate used for DTLS authentication.
+;;
+;; If you want KMS to use a specific certificate for DTLS, then provide it here.
+;; You can provide both RSA or ECDSA files; the choice between them is done when
+;; calling the WebRtcEndpoint constructor.
+;;
+;; If this setting isn't specified, a different set of self-signed certificates
+;; is generated automatically for each WebRtcEndpoint instance.
+;;
+;; This setting can be helpful, for example, for situations where you have to
+;; manage multiple media servers and want to make sure that all of them use the
+;; same certificate. Some browsers, such as Firefox, require this in order to
+;; allow multiple WebRTC connections from the same tab to different KMS.
+;;
+;; Absolute path to the concatenated certificate (chain) file(s) + private key,
+;; in PEM format.
+;;
+;pemCertificateRSA=/path/to/cert+key.pem
+;pemCertificateECDSA=/path/to/cert+key.pem
+
+;; External IPv4 and IPv6 addresses of the media server.
+;;
+;; Forces all local IPv4 and/or IPv6 ICE candidates to have the given address.
+;; This is really nothing more than a hack, but it's very effective to force a
+;; public IP address when one is known in advance for the media server. In doing
+;; so, KMS will not need a STUN or TURN server, but remote peers will still be
+;; able to contact it.
+;;
+;; You can try using these settings if KMS is deployed on a publicly accessible
+;; server, without NAT, and with a static public IP address. But if it doesn't
+;; work for you, just go back to configuring a STUN or TURN server for ICE.
+;;
+;; Only set this parameter if you know what you're doing, and you understand
+;; 100% WHY you need it. For the majority of cases, you should just prefer to
+;; configure a STUN or TURN server.
+;;
+;; <externalIPv4> is a single IPv4 address.
+;; <externalIPv6> is a single IPv6 address.
+;;
+;externalIPv4=198.51.100.1
+;externalIPv6=2001:0db8:85a3:0000:0000:8a2e:0370:7334
+
+;; External IP address of the media server.
+;;
+;; DEPRECATED: Use "externalIPv4" and/or "externalIPv6" instead.
+;;
+;; Forces all local IPv4 and IPv6 ICE candidates to have the given address. This
+;; is really nothing more than a hack, but it's very effective to force a public
+;; IP address when one is known in advance for the media server. In doing so,
+;; KMS will not need a STUN or TURN server, but remote peers will still be able
+;; to contact it.
+;;
+;; You can try using this setting if KMS is deployed on a publicly accessible
+;; server, without NAT, and with a static public IP address. But if it doesn't
+;; work for you, just go back to configuring a STUN or TURN server for ICE.
+;;
+;; Only set this parameter if you know what you're doing, and you understand
+;; 100% WHY you need it. For the majority of cases, you should just prefer to
+;; configure a STUN or TURN server.
+;;
+;; <externalAddress> is a single IPv4 or IPv6 address.
+;;
+;externalAddress=198.51.100.1
+;externalAddress=2001:0db8:85a3:0000:0000:8a2e:0370:7334
+
diff --git a/docker/kurento-media-server/rootfs/usr/local/bin/kurento-media-server.sh b/docker/kurento-media-server/rootfs/usr/local/bin/kurento-media-server.sh
new file mode 100755
index 00000000..54f23a26
--- /dev/null
+++ b/docker/kurento-media-server/rootfs/usr/local/bin/kurento-media-server.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ ! -z "${OPENVIDU_COTURN_IP}" ]; then
+    sed -i \
+        -e "s/;externalIPv4.*$/externalIPv4=${OPENVIDU_COTURN_IP}/g" \
+        /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
+fi
+
+if [ ! -z "${KMS_PORT}" ]; then
+    sed -i \
+        -e "s/\"port\": 8888,/\"port\": ${KMS_PORT},/g" \
+        /etc/kurento/kurento.conf.json
+fi
+
+/usr/bin/kurento-media-server
diff --git a/docker/openvidu-dev/.gitignore b/docker/openvidu-dev/.gitignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/docker/openvidu-dev/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/docker/openvidu-dev/Dockerfile b/docker/openvidu-dev/Dockerfile
new file mode 100644
index 00000000..ecc0bfd5
--- /dev/null
+++ b/docker/openvidu-dev/Dockerfile
@@ -0,0 +1,44 @@
+FROM fedora:31
+
+MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+
+ENV CERTIFICATE_TYPE=selfsigned
+ENV DOMAIN_OR_PUBLIC_IP=localhost.localdomain
+ENV OPENVIDU_SECRET=MY_SECRET
+
+RUN dnf -y install \
+        --setopt 'tsflags=nodocs' \
+        bash-completion \
+        bind-utils \
+        coturn \
+        curl \
+        dhcp-client \
+        git \
+        iproute \
+        iptraf-ng \
+        iputils \
+        java-1.8.0-openjdk \
+        less \
+        lsof \
+        maven \
+        mtr \
+        net-tools \
+        NetworkManager \
+        NetworkManager-tui \
+        network-scripts \
+        nmap-ncat \
+        openssh-clients \
+        openssh-server \
+        procps-ng \
+        redis \
+        strace \
+        systemd-udev \
+        tcpdump \
+        telnet \
+        traceroute \
+        vim-enhanced \
+        wget && \
+    dnf clean all
+
+COPY init.sh /init.sh
+CMD [ "/init.sh" ]
diff --git a/docker/openvidu-dev/build/.m2/.gitkeep b/docker/openvidu-dev/build/.m2/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/docker/openvidu-dev/init.sh b/docker/openvidu-dev/init.sh
new file mode 100755
index 00000000..30f277ea
--- /dev/null
+++ b/docker/openvidu-dev/init.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+cd /src/openvidu/
+mvn -DskipTests=true clean install
+/usr/bin/java -jar /src/openvidu/openvidu-server/target/openvidu-server-2.16.0.jar
diff --git a/docker/openvidu/Dockerfile b/docker/openvidu/Dockerfile
new file mode 100644
index 00000000..97c7a982
--- /dev/null
+++ b/docker/openvidu/Dockerfile
@@ -0,0 +1,56 @@
+FROM fedora:31
+
+MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+
+ENV CERTIFICATE_TYPE=selfsigned
+ENV DOMAIN_OR_PUBLIC_IP=localhost.localdomain
+ENV OPENVIDU_SECRET=MY_SECRET
+
+RUN dnf -y install \
+        --setopt 'tsflags=nodocs' \
+        bash-completion \
+        bind-utils \
+        coturn \
+        curl \
+        dhcp-client \
+        git \
+        iproute \
+        iptraf-ng \
+        iputils \
+        java-1.8.0-openjdk \
+        less \
+        lsof \
+        maven \
+        mtr \
+        net-tools \
+        NetworkManager \
+        NetworkManager-tui \
+        network-scripts \
+        nmap-ncat \
+        openssh-clients \
+        openssh-server \
+        procps-ng \
+        redis \
+        strace \
+        systemd-udev \
+        tcpdump \
+        telnet \
+        traceroute \
+        vim-enhanced \
+        wget && \
+    dnf clean all && \
+    mkdir -p /src/ && \
+    git clone --branch stable/kolab-2.16.0 https://git.kolab.org/source/openvidu.git /src/openvidu.git && \
+        cd /src/openvidu.git/ && \
+        mvn clean install -DskipTests && \
+        mkdir -p /usr/share/openvidu/ && \
+        mv -v \
+            /src/openvidu.git/openvidu-server/target/openvidu-server-2.16.0.jar \
+            /usr/share/openvidu/openvidu-server.jar && \
+        rm -rvf /src/ /root/.m2/
+
+CMD [ \
+        "/usr/bin/java", \
+        "-jar", \
+        "/usr/share/openvidu/openvidu-server.jar" \
+    ]
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
new file mode 100644
index 00000000..592e1e2a
--- /dev/null
+++ b/docker/proxy/Dockerfile
@@ -0,0 +1,46 @@
+FROM fedora:31
+
+MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+
+ENV container docker
+ENV SYSTEMD_PAGER=''
+
+RUN dnf -y install \
+        --setopt 'tsflags=nodocs' \
+        bash-completion \
+        bind-utils \
+        certbot \
+        curl \
+        dhcp-client \
+        git \
+        iproute \
+        iptraf-ng \
+        iputils \
+        less \
+        lsof \
+        mtr \
+        net-tools \
+        NetworkManager \
+        NetworkManager-tui \
+        network-scripts \
+        nginx \
+        nmap-ncat \
+        openssh-clients \
+        openssh-server \
+        procps-ng \
+        python3-certbot-nginx \
+        strace \
+        systemd-udev \
+        tcpdump \
+        telnet \
+        traceroute \
+        vim-enhanced \
+        wget && \
+    dnf clean all
+
+COPY rootfs/ /
+
+RUN systemctl enable nginx
+
+CMD ["/lib/systemd/systemd", "--system"]
+ENTRYPOINT "/lib/systemd/systemd"
diff --git a/docker/proxy/rootfs/etc/nginx/conf.d/ssl.conf b/docker/proxy/rootfs/etc/nginx/conf.d/ssl.conf
new file mode 100644
index 00000000..7526b8e1
--- /dev/null
+++ b/docker/proxy/rootfs/etc/nginx/conf.d/ssl.conf
@@ -0,0 +1,9 @@
+ssl_session_cache shared:le_nginx_SSL:10m;
+ssl_session_timeout 1440m;
+ssl_session_tickets off;
+
+ssl_protocols TLSv1.2 TLSv1.3;
+ssl_prefer_server_ciphers off;
+
+ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
+
diff --git a/docker/proxy/rootfs/etc/nginx/nginx.conf b/docker/proxy/rootfs/etc/nginx/nginx.conf
new file mode 100644
index 00000000..311c500a
--- /dev/null
+++ b/docker/proxy/rootfs/etc/nginx/nginx.conf
@@ -0,0 +1,85 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+
+    server {
+        listen [::]:443 ssl ipv6only=on;
+        listen 443 ssl;
+
+        ssl_certificate /etc/letsencrypt/live/$server_name/fullchain.pem;
+        ssl_certificate_key /etc/letsencrypt/live/$server_name/privkey.pem;
+
+        server_name  kanarip.internet-box.ch;
+        root         /usr/share/nginx/html;
+
+        # Load configuration files for the default server block.
+        include /etc/nginx/default.d/*.conf;
+
+        location / {
+	        proxy_pass       http://127.0.0.1:8000;
+            proxy_redirect   off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_no_cache 1;
+            proxy_cache_bypass 1;
+        }
+
+        location /openvidu {
+            proxy_pass https://127.0.0.1:8443;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+            proxy_set_header Host $host;
+        }
+
+        error_page 404 /404.html;
+            location = /40x.html {
+        }
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+        }
+
+    }
+}
diff --git a/docker/swoole/Dockerfile b/docker/swoole/Dockerfile
new file mode 100644
index 00000000..30b0aba0
--- /dev/null
+++ b/docker/swoole/Dockerfile
@@ -0,0 +1,66 @@
+FROM fedora:31
+
+MAINTAINER Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>
+
+LABEL io.k8s.description="Platform for serving PHP applications under Swoole" \
+      io.k8s.display-name="Swoole 4.4.x" \
+      io.openshift.expose-services="8000:http" \
+      io.openshift.tags="builder,php,swoole"
+
+ENV SWOOLE_VERSION=4.4.x \
+    HOME=/opt/app-root/src
+
+RUN dnf -y install \
+        composer \
+        diffutils \
+        file \
+        git \
+        make \
+        npm \
+        openssl-devel \
+        patch \
+        php-cli \
+        php-common \
+        php-devel \
+        php-ldap \
+        php-opcache \
+        php-pecl-apcu \
+        php-mysqlnd \
+        re2c \
+        wget && \
+    git clone -b v4.4.x https://github.com/swoole/swoole-src.git/ /swoole-src.git/ && \
+        cd /swoole-src.git/ && \
+        git clean -d -f -x && \
+        phpize --clean && \
+        phpize && \
+        ./configure \
+            --enable-sockets \
+            --disable-mysqlnd \
+            --enable-http2 \
+            --enable-openssl && \
+        make -j4 && \
+        make install && \
+        cd / && \
+    rm -rf /swoole-src.git/ && \
+    dnf -y remove \
+        diffutils \
+        file \
+        make \
+        openssl-devel \
+        php-devel \
+        re2c && \
+    dnf clean all && \
+    echo "extension=swoole.so" >> /etc/php.d/swoole.ini && \
+    php -m 2>&1 | grep -q swoole
+
+RUN id default || (groupadd -g 1001 default && useradd -d /opt/app-root/ -u 1001 -g 1001 default)
+
+USER 1001
+
+WORKDIR ${HOME}
+
+COPY /rootfs /
+
+EXPOSE 8000
+
+CMD [ "/usr/local/bin/usage" ]
diff --git a/docker/swoole/do-it-again.sh b/docker/swoole/do-it-again.sh
new file mode 100755
index 00000000..46892d1b
--- /dev/null
+++ b/docker/swoole/do-it-again.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+export APP_DEBUG="true"
+export APP_KEY=
+export APP_PUBLIC_URL=http://127.0.0.1:8000/
+export APP_SRC=src/
+export APP_URL=http://127.0.0.1:8000/
+export CACHE_DRIVER="array"
+export COMPOSER_ARGS="--no-dev"
+export DB_CONNECTION="sqlite"
+export DB_DATABASE=":memory:"
+export GIT_URI=https://git.kolab.org/source/kolab.git
+export LARAVEL_ENV=production
+export LOG_CHANNEL="stderr"
+export MAIL_DRIVER="array"
+export QUEUE_CONNECTION="sync"
+export SESSION_DRIVER="array"
+export SWOOLE_HTTP_HOST=0.0.0.0
+export SWOOLE_HTTP_PORT=8000
+export SWOOLE_HTTP_REACTOR_NUM=6
+export SWOOLE_HTTP_WORKER_NUM=6
+
+docker build -t swoole .
+
+docker kill swoole
+
+docker rm swoole
+
+docker_opts="\
+    -e APP_DEBUG=${APP_DEBUG} \
+    -e APP_KEY=${APP_KEY} \
+    -e APP_PUBLIC_URL=${APP_PUBLIC_URL} \
+    -e APP_SRC=${APP_SRC} \
+    -e APP_URL=${APP_URL} \
+    -e CACHE_DRIVER=${CACHE_DRIVER} \
+    -e COMPOSER_ARGS=${COMPOSER_ARGS} \
+    -e DB_CONNECTION=${DB_CONNECTION} \
+    -e DB_DATABASE=${DB_DATABASE} \
+    -e GIT_URI=${GIT_URI} \
+    -e LARAVEL_ENV=${LARAVEL_ENV} \
+    -e LOG_CHANNEL=${LOG_CHANNEL} \
+    -e MAIL_DRIVER=${MAIL_DRIVER} \
+    -e QUEUE_CONNECTION=${QUEUE_CONNECTION} \
+    -e SESSION_DRIVER=${SESSION_DRIVER} \
+    -e SWOOLE_HTTP_HOST=${SWOOLE_HTTP_HOST} \
+    -e SWOOLE_HTTP_PORT=${SWOOLE_HTTP_PORT} \
+    -e SWOOLE_HTTP_REACTOR_NUM=${SWOOLE_HTTP_REACTOR_NUM} \
+    -e SWOOLE_HTTP_WORKER_NUM=${SWOOLE_HTTP_WORKER_NUM}"
+
+docker run -it \
+    ${docker_opts} \
+    --name swoole swoole /usr/local/bin/build-image
+
+docker commit swoole swoole-s2i
+
+docker kill swoole-s2i
+
+docker rm swoole-s2i
+
+docker run -it -p 8000:8000 \
+    ${docker_opts} \
+    --name swoole-s2i swoole-s2i /usr/local/bin/run-container
diff --git a/docker/swoole/rootfs/usr/local/bin/build-image b/docker/swoole/rootfs/usr/local/bin/build-image
new file mode 100755
index 00000000..78f0f37b
--- /dev/null
+++ b/docker/swoole/rootfs/usr/local/bin/build-image
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -x
+
+set -e
+
+pwd
+
+if [ -z "${GIT_URI}" ]; then
+    echo "No GIT_URI specified. Exiting."
+    exit 1
+fi
+
+git clone -b ${GIT_BRANCH:-master} ${GIT_URI}
+
+cd $(basename ${GIT_URI} .git)
+
+if [ ! -z "${APP_SRC}" ]; then
+    cd ${APP_SRC}
+fi
+
+if [ -f "composer.json" ]; then
+    echo "Detected composer.json, running install"
+    php -dmemory_limit=${COMPOSER_MEMORY_LIMIT:--1} /usr/bin/composer install ${COMPOSER_ARGS}
+    rm -rf ~/.cache/composer/
+fi
+
+if [ -z "${LARAVEL_ENV}" ]; then
+    LARAVEL_ENV=prod
+fi
+
+npm install
+
+npm run ${LARAVEL_ENV} && rm -rf ~/.npm/
diff --git a/docker/swoole/rootfs/usr/local/bin/run-container b/docker/swoole/rootfs/usr/local/bin/run-container
new file mode 100755
index 00000000..8e6df328
--- /dev/null
+++ b/docker/swoole/rootfs/usr/local/bin/run-container
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -x
+
+set -e
+
+if [ -z "$@" ]; then
+    cd $(basename ${GIT_URI} .git)
+
+    if [ ! -z "${APP_SRC}" ]; then
+        cd ${APP_SRC}
+    fi
+
+    if [ ! -f ".env" -a -f ".env.example" ]; then
+        mv .env.example .env
+    fi
+
+    if [ -z "${APP_KEY}" ]; then
+        ./artisan key:generate
+        unset APP_KEY
+    fi
+
+    if [ -z "${JWT_SECRET}" ]; then
+        ./artisan jwt:secret -f
+    fi
+
+    ./artisan clear-compiled
+
+    # This should not occur in production
+    #./artisan cache:clear
+
+    # A standalone environment doesn't have anything to ping
+    #timeout 10m ./artisan db:ping --wait
+
+    ./artisan migrate
+
+    env
+
+    exec ./artisan swoole:http start
+else
+    exec $@
+fi
diff --git a/docker/worker/kolab-worker.sh b/docker/worker/kolab-worker.sh
index 01ca18dc..8f8da2bd 100644
--- a/docker/worker/kolab-worker.sh
+++ b/docker/worker/kolab-worker.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 
 if [ -d /home/worker/src/ ]; then
     rm -rf /home/worker/src/
 fi
 
 cp -a /home/worker/src.orig/ /home/worker/src/
 mkdir -p /home/worker/src/storage/framework/{cache,sessions,views}
 chown -R worker:worker /home/worker/src/
 
 pushd /home/worker/src/
 
 rm -rf bootstrap/cache/
 mkdir -p bootstrap/cache/
 
 ./artisan db:ping --wait
 
-./artisan queue:work
+./artisan horizon
diff --git a/src/.env.example b/src/.env.example
index 746928dc..7ec4d2c8 100644
--- a/src/.env.example
+++ b/src/.env.example
@@ -1,117 +1,145 @@
 APP_NAME=Kolab
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://127.0.0.1:8000
 APP_PUBLIC_URL=
 APP_DOMAIN=kolabnow.com
+APP_THEME=default
 
 ASSET_URL=http://127.0.0.1:8000
 
-SUPPORT_URL=
+WEBMAIL_URL=/apps
+SUPPORT_URL=/support
+SUPPORT_EMAIL=
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
 DB_DATABASE=kolabdev
 DB_HOST=127.0.0.1
 DB_PASSWORD=kolab
 DB_PORT=3306
 DB_USERNAME=kolabdev
 
-BROADCAST_DRIVER=log
+BROADCAST_DRIVER=redis
 CACHE_DRIVER=redis
 
 QUEUE_CONNECTION=redis
 
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
 MFA_DSN=mysql://roundcube:Welcome2KolabSystems@127.0.0.1/roundcube
 MFA_TOTP_DIGITS=6
 MFA_TOTP_INTERVAL=30
 MFA_TOTP_DIGEST=sha1
 
 IMAP_URI=ssl://127.0.0.1:993
 IMAP_ADMIN_LOGIN=cyrus-admin
 IMAP_ADMIN_PASSWORD=Welcome2KolabSystems
 IMAP_VERIFY_HOST=false
 IMAP_VERIFY_PEER=false
 
 LDAP_BASE_DN="dc=mgmt,dc=com"
 LDAP_DOMAIN_BASE_DN="ou=Domains,dc=mgmt,dc=com"
 LDAP_HOSTS=127.0.0.1
 LDAP_PORT=389
 LDAP_SERVICE_BIND_DN="uid=kolab-service,ou=Special Users,dc=mgmt,dc=com"
 LDAP_SERVICE_BIND_PW="Welcome2KolabSystems"
 LDAP_USE_SSL=false
 LDAP_USE_TLS=false
 
 # Administrative
 LDAP_ADMIN_BIND_DN="cn=Directory Manager"
 LDAP_ADMIN_BIND_PW="Welcome2KolabSystems"
 LDAP_ADMIN_ROOT_DN="dc=mgmt,dc=com"
 
 # Hosted (public registration)
 LDAP_HOSTED_BIND_DN="uid=hosted-kolab-service,ou=Special Users,dc=mgmt,dc=com"
 LDAP_HOSTED_BIND_PW="Welcome2KolabSystems"
 LDAP_HOSTED_ROOT_DN="dc=hosted,dc=com"
 
+OPENVIDU_API_PASSWORD=MY_SECRET
+OPENVIDU_API_URL=http://localhost:8080/api/
+OPENVIDU_API_USERNAME=OPENVIDUAPP
+OPENVIDU_API_VERIFY_TLS=true
+OPENVIDU_COTURN_IP=127.0.0.1
+OPENVIDU_COTURN_REDIS_DATABASE=2
+OPENVIDU_COTURN_REDIS_IP=127.0.0.1
+OPENVIDU_COTURN_REDIS_PASSWORD=turn
+# Used as COTURN_IP, TURN_PUBLIC_IP, for KMS_TURN_URL
+OPENVIDU_PUBLIC_IP=127.0.0.1
+OPENVIDU_PUBLIC_PORT=3478
+OPENVIDU_SERVER_PORT=8080
+OPENVIDU_WEBHOOK=true
+OPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:8000/webhooks/meet/openvidu
+
+# "CDR" events, see https://docs.openvidu.io/en/2.13.0/reference-docs/openvidu-server-cdr/
+#OPENVIDU_WEBHOOK_EVENTS=[sessionCreated,sessionDestroyed,participantJoined,participantLeft,webrtcConnectionCreated,webrtcConnectionDestroyed,recordingStatusChanged,filterEventDispatched,mediaNodeStatusChanged]
+#OPENVIDU_WEBHOOK_HEADERS=[\"Authorization:\ Basic\ SOMETHING\"]
+
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
+SWOOLE_HOT_RELOAD_ENABLE=true
+SWOOLE_HTTP_ACCESS_LOG=true
 SWOOLE_HTTP_HOST=127.0.0.1
 SWOOLE_HTTP_PORT=8000
+SWOOLE_HTTP_REACTOR_NUM=1
+SWOOLE_HTTP_WEBSOCKET=true
+SWOOLE_HTTP_WORKER_NUM=1
+SWOOLE_OB_OUTPUT=true
 
 PAYMENT_PROVIDER=
 MOLLIE_KEY=
 STRIPE_KEY=
 STRIPE_PUBLIC_KEY=
 STRIPE_WEBHOOK_SECRET=
 
 MAIL_DRIVER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="noreply@example.com"
 MAIL_FROM_NAME="Example.com"
 MAIL_REPLYTO_ADDRESS=null
 MAIL_REPLYTO_NAME=null
 
 DNS_TTL=3600
 DNS_SPF="v=spf1 mx -all"
 DNS_STATIC="%s.    MX  10 ext-mx01.mykolab.com."
 DNS_COPY_FROM=null
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
-MIX_ASSET_PATH=
+MIX_ASSET_PATH='/'
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 JWT_SECRET=
 JWT_TTL=60
 
 COMPANY_NAME=
 COMPANY_ADDRESS=
 COMPANY_DETAILS=
 COMPANY_EMAIL=
 COMPANY_LOGO=
 COMPANY_FOOTER=
 
 VAT_COUNTRIES=CH,LI
 VAT_RATE=7.7
 
 KB_ACCOUNT_DELETE=
 KB_ACCOUNT_SUSPENDED=
diff --git a/src/.eslintrc.js b/src/.eslintrc.js
index fd082b1c..195d8ce8 100644
--- a/src/.eslintrc.js
+++ b/src/.eslintrc.js
@@ -1,15 +1,16 @@
 module.exports = {
   extends: [
     // add more generic rulesets here, such as:
     // 'eslint:recommended',
     'plugin:vue/recommended'
   ],
   rules: {
     "vue/attributes-order": "off",
     "vue/html-indent": ["error", 4],
     "vue/html-self-closing": "off",
     "vue/max-attributes-per-line": "off",
+    "vue/no-v-html": "off",
     "vue/singleline-html-element-content-newline": "off",
     "vue/multiline-html-element-content-newline": "off"
   }
 }
diff --git a/src/.s2i/bin/assemble b/src/.s2i/bin/assemble
index 88aad3a5..9cb1ebcb 100755
--- a/src/.s2i/bin/assemble
+++ b/src/.s2i/bin/assemble
@@ -1,33 +1,41 @@
 #!/bin/bash
 
+set -x
 set -e
 
+function composer_install () {
+    echo "--->> Detected composer.json, running install"
+    php -dmemory_limit=${COMPOSER_MEMORY_LIMIT:--1} /usr/bin/composer install ${COMPOSER_ARGS}
+    rm -rf ~/.cache/composer/
+}
+
 shopt -s dotglob
 echo "--->> $(rm -vrf vendor/ composer.lock)"
 
+echo "---> Installing application source..."
+rm -fR /tmp/src/.git
+mv /tmp/src/* ./
+
+pushd /opt/app-root/src
+
+fix-permissions ./
+
 if [ -f ".env.local" ]; then
     # Ensure there's a line ending
     echo "---->> Append .env.local"
     echo "" >> .env
     cat .env.local >> .env
 fi
 
-#env
-
-/usr/libexec/s2i/assemble
-
-#cat >> /opt/app-root/etc/conf.d/99-loglevel.conf << EOF
-#LogLevel warn mod_rewrite.c:trace4
-#EOF
-
-# Won't work due to:
-# Cannot install, php_dir for channel "pecl.php.net" is not writeable by the current user
-#pecl channel-update pecl.php.net
-#pecl install swoole
+if [ -f "composer.json" ]; then
+    echo "--->> Detected composer.json, running install"
+    composer_install
+fi
 
-pushd /opt/app-root/src
+./artisan horizon:install
 
 echo "---->> Run npm run prod"
-npm install cross-env
-npm run prod
+npm install
+npm run ${LARAVEL_ENV:=prod} && rm -rf ~/.npm/
 
+fix-permissions ./
diff --git a/src/.s2i/bin/run b/src/.s2i/bin/run
index 7c021ea9..4efd0cd9 100755
--- a/src/.s2i/bin/run
+++ b/src/.s2i/bin/run
@@ -1,60 +1,85 @@
 #!/bin/bash
 
 shopt -s dotglob
 
 pushd /opt/app-root/src
 
 echo "----> Remove bootstrap cache"
 find bootstrap/cache/ -type f ! -name ".gitignore" -delete
 
 if [ -z ${APP_KEY} ]; then
     echo "----> Run artisan key:generate"
     ./artisan key:generate
+    unset APP_KEY
 fi
 
 if [ -z ${JWT_SECRET} ]; then
     echo "----> Run artisan jwt:secret"
     ./artisan jwt:secret --always-no
 fi
 
 echo "----> Run artisan clear-compiled"
 ./artisan clear-compiled
 
-echo "----> Run artisan cache:clear"
-./artisan ${ARTISAN_VERBOSITY} cache:clear || true
+if [ "${LARAVEL_ENV}" != "production" -a "${LARAVEL_ENV}" != "prod" ]; then
+    echo "----> Run artisan cache:clear"
+    ./artisan ${ARTISAN_VERBOSITY} cache:clear || true
+fi
 
 # rpm -qv chromium
 # if [ ! -z "$(rpm -qv chromium 2>/dev/null)" ]; then
 #     echo "---- Run artisan dusk:chrome-driver"
 #     chver=$(rpmquery --queryformat="%{VERSION}" chromium | awk -F'.' '{print $1}')
 #     ./artisan dusk:chrome-driver ${chver}
 # fi
 
 if [ ! -f 'resources/countries.php' ]; then
     echo "----> Run artisan data:countries"
     ./artisan data:countries
 fi
 
 rm -rvf bootstrap/cache/
 mkdir -vp bootstrap/cache/
 chown default bootstrap/cache
 
 ./artisan db:ping --wait || exit 1
 
 ./artisan migrate --force || :
 #./artisan db:seed --force || :
 
-case ${HKCCP_APP} in
+if [ -z "${KOLAB_ROLE}" -a ! -z "${HKCCP_APP}" ]; then
+    echo "WARNING: Use env KOLAB_ROLE, not HKCCP_APP"
+    KOLAB_ROLE=$HKCCP_APP
+fi
+
+case ${KOLAB_ROLE} in
+    apache|APACHE|httpd|HTTPD)
+        echo "----> Starting httpd"
+        /usr/libexec/s2i/run 2>&1
+    ;;
+
+    horizon|HORIZON)
+        echo "----> Starting horizon"
+        ./artisan horizon
+    ;;
+
+    server|SERVER)
+        echo "----> Running server"
+        exec ./artisan serve
+    ;;
+
+    swoole|SWOOLE )
+        echo "----> Running swoole"
+        exec ./artisan swoole:http start
+    ;;
+
     worker|WORKER )
-        echo "----> Running worker "
-        ./artisan queue:work;;
-    server|SERVER )
-        echo "----> Running server "
-       ./artisan serve;;
-    apache|APACHE|httpd|HTTPD )
-        echo "----> Starting httpd "
-        /usr/libexec/s2i/run 2>&1;;
+        echo "----> Running worker"
+        exec ./artisan queue:work
+    ;;
+
     * )
         echo "----> Sleeping"
-        sleep 10000;;
+        exec sleep 10000
+    ;;
 esac
diff --git a/src/app/Backends/LDAP.php b/src/app/Backends/LDAP.php
index fc391888..87814279 100644
--- a/src/app/Backends/LDAP.php
+++ b/src/app/Backends/LDAP.php
@@ -1,734 +1,984 @@
 <?php
 
 namespace App\Backends;
 
 use App\Domain;
+use App\Group;
 use App\User;
 
 class LDAP
 {
     /** @const array UserSettings used by the backend */
     public const USER_SETTINGS = [
         'first_name',
         'last_name',
         'organization',
     ];
 
     /** @var ?\Net_LDAP3 LDAP connection object */
     protected static $ldap;
 
 
     /**
      * Starts a new LDAP connection that will be used by all methods
      * until you call self::disconnect() explicitely. Normally every
      * method uses a separate connection.
      *
      * @throws \Exception
      */
     public static function connect(): void
     {
         if (empty(self::$ldap)) {
             $config = self::getConfig('admin');
             self::$ldap = self::initLDAP($config);
         }
     }
 
     /**
      * Close the connection created by self::connect()
      */
     public static function disconnect(): void
     {
         if (!empty(self::$ldap)) {
             self::$ldap->close();
             self::$ldap = null;
         }
     }
 
     /**
      * Create a domain in LDAP.
      *
      * @param \App\Domain $domain The domain to create.
      *
      * @throws \Exception
      */
     public static function createDomain(Domain $domain): void
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         $hostedRootDN = \config('ldap.hosted.root_dn');
         $mgmtRootDN = \config('ldap.admin.root_dn');
 
         $domainBaseDN = "ou={$domain->namespace},{$hostedRootDN}";
 
         $aci = [
             '(targetattr = "*")'
             . '(version 3.0; acl "Deny Unauthorized"; deny (all)'
             . '(userdn != "ldap:///uid=kolab-service,ou=Special Users,' . $mgmtRootDN
             . ' || ldap:///ou=People,' . $domainBaseDN . '??sub?(objectclass=inetorgperson)") '
             . 'AND NOT roledn = "ldap:///cn=kolab-admin,' . $mgmtRootDN . '";)',
 
             '(targetattr != "userPassword")'
             . '(version 3.0;acl "Search Access";allow (read,compare,search)'
             . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmtRootDN
             . ' || ldap:///ou=People,' . $domainBaseDN . '??sub?(objectclass=inetorgperson)");)',
 
             '(targetattr = "*")'
             . '(version 3.0;acl "Kolab Administrators";allow (all)'
             . '(roledn = "ldap:///cn=kolab-admin,' . $domainBaseDN
             . ' || ldap:///cn=kolab-admin,' . $mgmtRootDN . '");)'
         ];
 
         $entry = [
             'aci' => $aci,
             'associateddomain' => $domain->namespace,
             'inetdomainbasedn' => $domainBaseDN,
             'objectclass' => [
                 'top',
                 'domainrelatedobject',
                 'inetdomain'
             ],
         ];
 
         $dn = "associateddomain={$domain->namespace},{$config['domain_base_dn']}";
 
         self::setDomainAttributes($domain, $entry);
 
         if (!$ldap->get_entry($dn)) {
             $result = $ldap->add_entry($dn, $entry);
 
             if (!$result) {
                 self::throwException(
                     $ldap,
                     "Failed to create domain {$domain->namespace} in LDAP (" . __LINE__ . ")"
                 );
             }
         }
 
         // create ou, roles, ous
         $entry = [
             'description' => $domain->namespace,
             'objectclass' => [
                 'top',
                 'organizationalunit'
             ],
             'ou' => $domain->namespace,
         ];
 
         $entry['aci'] = array(
             '(targetattr = "*")'
             . '(version 3.0;acl "Deny Unauthorized"; deny (all)'
             . '(userdn != "ldap:///uid=kolab-service,ou=Special Users,' . $mgmtRootDN
             . ' || ldap:///ou=People,' . $domainBaseDN . '??sub?(objectclass=inetorgperson)") '
             . 'AND NOT roledn = "ldap:///cn=kolab-admin,' . $mgmtRootDN . '";)',
 
             '(targetattr != "userPassword")'
             . '(version 3.0;acl "Search Access";allow (read,compare,search,write)'
             . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmtRootDN
             . ' || ldap:///ou=People,' . $domainBaseDN . '??sub?(objectclass=inetorgperson)");)',
 
             '(targetattr = "*")'
             . '(version 3.0;acl "Kolab Administrators";allow (all)'
             . '(roledn = "ldap:///cn=kolab-admin,' . $domainBaseDN
             . ' || ldap:///cn=kolab-admin,' . $mgmtRootDN . '");)',
 
             '(target = "ldap:///ou=*,' . $domainBaseDN . '")'
             . '(targetattr="objectclass || aci || ou")'
             . '(version 3.0;acl "Allow Domain sub-OU Registration"; allow (add)'
             . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmtRootDN . '");)',
 
             '(target = "ldap:///uid=*,ou=People,' . $domainBaseDN . '")(targetattr="*")'
             . '(version 3.0;acl "Allow Domain First User Registration"; allow (add)'
             . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmtRootDN . '");)',
 
             '(target = "ldap:///cn=*,' . $domainBaseDN . '")(targetattr="objectclass || cn")'
             . '(version 3.0;acl "Allow Domain Role Registration"; allow (add)'
             . '(userdn = "ldap:///uid=kolab-service,ou=Special Users,' . $mgmtRootDN . '");)',
         );
 
         if (!$ldap->get_entry($domainBaseDN)) {
             $result = $ldap->add_entry($domainBaseDN, $entry);
 
             if (!$result) {
                 self::throwException(
                     $ldap,
                     "Failed to create domain {$domain->namespace} in LDAP (" . __LINE__ . ")"
                 );
             }
         }
 
         foreach (['Groups', 'People', 'Resources', 'Shared Folders'] as $item) {
             if (!$ldap->get_entry("ou={$item},{$domainBaseDN}")) {
                 $result = $ldap->add_entry(
                     "ou={$item},{$domainBaseDN}",
                     [
                         'ou' => $item,
                         'description' => $item,
                         'objectclass' => [
                             'top',
                             'organizationalunit'
                         ]
                     ]
                 );
 
                 if (!$result) {
                     self::throwException(
                         $ldap,
                         "Failed to create domain {$domain->namespace} in LDAP (" . __LINE__ . ")"
                     );
                 }
             }
         }
 
         foreach (['kolab-admin'] as $item) {
             if (!$ldap->get_entry("cn={$item},{$domainBaseDN}")) {
                 $result = $ldap->add_entry(
                     "cn={$item},{$domainBaseDN}",
                     [
                         'cn' => $item,
                         'description' => "{$item} role",
                         'objectclass' => [
                             'top',
                             'ldapsubentry',
                             'nsmanagedroledefinition',
                             'nsroledefinition',
                             'nssimpleroledefinition'
                         ]
                     ]
                 );
 
                 if (!$result) {
                     self::throwException(
                         $ldap,
                         "Failed to create domain {$domain->namespace} in LDAP (" . __LINE__ . ")"
                     );
                 }
             }
         }
 
         // TODO: Assign kolab-admin role to the owner?
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
     }
 
+    /**
+     * Create a group in LDAP.
+     *
+     * @param \App\Group $group The group to create.
+     *
+     * @throws \Exception
+     */
+    public static function createGroup(Group $group): void
+    {
+        $config = self::getConfig('admin');
+        $ldap = self::initLDAP($config);
+
+        list($cn, $domainName) = explode('@', $group->email);
+
+        $domain = $group->domain();
+
+        if (empty($domain)) {
+            self::throwException(
+                $ldap,
+                "Failed to create group {$group->email} in LDAP (" . __LINE__ . ")"
+            );
+        }
+
+        $hostedRootDN = \config('ldap.hosted.root_dn');
+
+        $domainBaseDN = "ou={$domain->namespace},{$hostedRootDN}";
+
+        $groupBaseDN = "ou=Groups,{$domainBaseDN}";
+
+        $dn = "cn={$cn},{$groupBaseDN}";
+
+        $entry = [
+            'cn' => $cn,
+            'mail' => $group->email,
+            'objectclass' => [
+                'top',
+                'groupofuniquenames',
+                'kolabgroupofuniquenames'
+            ],
+            'uniquemember' => []
+        ];
+
+        self::setGroupAttributes($ldap, $group, $entry);
+
+        $result = $ldap->add_entry($dn, $entry);
+
+        if (!$result) {
+            self::throwException(
+                $ldap,
+                "Failed to create group {$group->email} in LDAP (" . __LINE__ . ")"
+            );
+        }
+
+        if (empty(self::$ldap)) {
+            $ldap->close();
+        }
+    }
+
     /**
      * Create a user in LDAP.
      *
      * Only need to add user if in any of the local domains? Figure that out here for now. Should
      * have Context-Based Access Controls before the job is queued though, probably.
      *
      * Use one of three modes;
      *
      * 1) The authenticated user account.
      *
      *    * Only valid if the authenticated user is a domain admin.
      *    * We don't know the originating user here.
      *    * We certainly don't have its password anymore.
      *
      * 2) The hosted kolab account.
      *
      * 3) The Directory Manager account.
      *
      * @param \App\User $user The user account to create.
      *
      * @throws \Exception
      */
     public static function createUser(User $user): void
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         $entry = [
             'objectclass' => [
                 'top',
                 'inetorgperson',
                 'inetuser',
                 'kolabinetorgperson',
                 'mailrecipient',
                 'person'
             ],
             'mail' => $user->email,
             'uid' => $user->email,
             'nsroledn' => []
         ];
 
         if (!self::getUserEntry($ldap, $user->email, $dn)) {
             if (empty($dn)) {
                 self::throwException($ldap, "Failed to create user {$user->email} in LDAP (" . __LINE__ . ")");
             }
 
             self::setUserAttributes($user, $entry);
 
             $result = $ldap->add_entry($dn, $entry);
 
             if (!$result) {
                 self::throwException(
                     $ldap,
                     "Failed to create user {$user->email} in LDAP (" . __LINE__ . ")"
                 );
             }
         }
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
     }
 
     /**
      * Delete a domain from LDAP.
      *
-     * @param \App\Domain $domain The domain to update.
+     * @param \App\Domain $domain The domain to delete
      *
      * @throws \Exception
      */
     public static function deleteDomain(Domain $domain): void
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         $hostedRootDN = \config('ldap.hosted.root_dn');
         $mgmtRootDN = \config('ldap.admin.root_dn');
 
         $domainBaseDN = "ou={$domain->namespace},{$hostedRootDN}";
 
         if ($ldap->get_entry($domainBaseDN)) {
             $result = $ldap->delete_entry_recursive($domainBaseDN);
 
             if (!$result) {
                 self::throwException(
                     $ldap,
                     "Failed to delete domain {$domain->namespace} from LDAP (" . __LINE__ . ")"
                 );
             }
         }
 
         if ($ldap_domain = $ldap->find_domain($domain->namespace)) {
             if ($ldap->get_entry($ldap_domain['dn'])) {
                 $result = $ldap->delete_entry($ldap_domain['dn']);
 
                 if (!$result) {
                     self::throwException(
                         $ldap,
                         "Failed to delete domain {$domain->namespace} from LDAP (" . __LINE__ . ")"
                     );
                 }
             }
         }
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
     }
 
+    /**
+     * Delete a group from LDAP.
+     *
+     * @param \App\Group $group The group to delete.
+     *
+     * @throws \Exception
+     */
+    public static function deleteGroup(Group $group): void
+    {
+        $config = self::getConfig('admin');
+        $ldap = self::initLDAP($config);
+
+        if (self::getGroupEntry($ldap, $group->email, $dn)) {
+            $result = $ldap->delete_entry($dn);
+
+            if (!$result) {
+                self::throwException(
+                    $ldap,
+                    "Failed to delete group {$group->email} from LDAP (" . __LINE__ . ")"
+                );
+            }
+        }
+
+        if (empty(self::$ldap)) {
+            $ldap->close();
+        }
+    }
+
     /**
      * Delete a user from LDAP.
      *
-     * @param \App\User $user The user account to update.
+     * @param \App\User $user The user account to delete.
      *
      * @throws \Exception
      */
     public static function deleteUser(User $user): void
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         if (self::getUserEntry($ldap, $user->email, $dn)) {
             $result = $ldap->delete_entry($dn);
 
             if (!$result) {
                 self::throwException(
                     $ldap,
                     "Failed to delete user {$user->email} from LDAP (" . __LINE__ . ")"
                 );
             }
         }
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
     }
 
     /**
      * Get a domain data from LDAP.
      *
      * @param string $namespace The domain name
      *
      * @return array|false|null
      * @throws \Exception
      */
     public static function getDomain(string $namespace)
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         $ldapDomain = $ldap->find_domain($namespace);
 
         if ($ldapDomain) {
             $domain = $ldap->get_entry($ldapDomain['dn']);
         }
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
 
         return $domain ?? null;
     }
 
+    /**
+     * Get a group data from LDAP.
+     *
+     * @param string $email The group email.
+     *
+     * @return array|false|null
+     * @throws \Exception
+     */
+    public static function getGroup(string $email)
+    {
+        $config = self::getConfig('admin');
+        $ldap = self::initLDAP($config);
+
+        $group = self::getGroupEntry($ldap, $email, $dn);
+
+        if (empty(self::$ldap)) {
+            $ldap->close();
+        }
+
+        return $group;
+    }
+
     /**
      * Get a user data from LDAP.
      *
      * @param string $email The user email.
      *
      * @return array|false|null
      * @throws \Exception
      */
     public static function getUser(string $email)
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         $user = self::getUserEntry($ldap, $email, $dn, true);
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
 
         return $user;
     }
 
     /**
      * Update a domain in LDAP.
      *
      * @param \App\Domain $domain The domain to update.
      *
      * @throws \Exception
      */
     public static function updateDomain(Domain $domain): void
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         $ldapDomain = $ldap->find_domain($domain->namespace);
 
         if (!$ldapDomain) {
             self::throwException(
                 $ldap,
                 "Failed to update domain {$domain->namespace} in LDAP (domain not found)"
             );
         }
 
         $oldEntry = $ldap->get_entry($ldapDomain['dn']);
         $newEntry = $oldEntry;
 
         self::setDomainAttributes($domain, $newEntry);
 
         if (array_key_exists('inetdomainstatus', $newEntry)) {
             $newEntry['inetdomainstatus'] = (string) $newEntry['inetdomainstatus'];
         }
 
         $result = $ldap->modify_entry($ldapDomain['dn'], $oldEntry, $newEntry);
 
         if (!is_array($result)) {
             self::throwException(
                 $ldap,
                 "Failed to update domain {$domain->namespace} in LDAP (" . __LINE__ . ")"
             );
         }
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
     }
 
+    /**
+     * Update a group in LDAP.
+     *
+     * @param \App\Group $group The group to update
+     *
+     * @throws \Exception
+     */
+    public static function updateGroup(Group $group): void
+    {
+        $config = self::getConfig('admin');
+        $ldap = self::initLDAP($config);
+
+        list($cn, $domainName) = explode('@', $group->email);
+
+        $domain = $group->domain();
+
+        if (empty($domain)) {
+            self::throwException(
+                $ldap,
+                "Failed to update group {$group->email} in LDAP (" . __LINE__ . ")"
+            );
+        }
+
+        $hostedRootDN = \config('ldap.hosted.root_dn');
+
+        $domainBaseDN = "ou={$domain->namespace},{$hostedRootDN}";
+
+        $groupBaseDN = "ou=Groups,{$domainBaseDN}";
+
+        $dn = "cn={$cn},{$groupBaseDN}";
+
+        $entry = [
+            'cn' => $cn,
+            'mail' => $group->email,
+            'objectclass' => [
+                'top',
+                'groupofuniquenames',
+                'kolabgroupofuniquenames'
+            ],
+            'uniquemember' => []
+        ];
+
+        $oldEntry = $ldap->get_entry($dn);
+
+        self::setGroupAttributes($ldap, $group, $entry);
+
+        $result = $ldap->modify_entry($dn, $oldEntry, $entry);
+
+        if (!is_array($result)) {
+            self::throwException(
+                $ldap,
+                "Failed to update group {$group->email} in LDAP (" . __LINE__ . ")"
+            );
+        }
+
+        if (empty(self::$ldap)) {
+            $ldap->close();
+        }
+    }
+
     /**
      * Update a user in LDAP.
      *
      * @param \App\User $user The user account to update.
      *
      * @throws \Exception
      */
     public static function updateUser(User $user): void
     {
         $config = self::getConfig('admin');
         $ldap = self::initLDAP($config);
 
         $newEntry = $oldEntry = self::getUserEntry($ldap, $user->email, $dn, true);
 
         if (!$oldEntry) {
             self::throwException(
                 $ldap,
                 "Failed to update user {$user->email} in LDAP (user not found)"
             );
         }
 
         self::setUserAttributes($user, $newEntry);
 
         if (array_key_exists('objectclass', $newEntry)) {
             if (!in_array('inetuser', $newEntry['objectclass'])) {
                 $newEntry['objectclass'][] = 'inetuser';
             }
         }
 
         if (array_key_exists('inetuserstatus', $newEntry)) {
             $newEntry['inetuserstatus'] = (string) $newEntry['inetuserstatus'];
         }
 
         if (array_key_exists('mailquota', $newEntry)) {
             $newEntry['mailquota'] = (string) $newEntry['mailquota'];
         }
 
         $result = $ldap->modify_entry($dn, $oldEntry, $newEntry);
 
         if (!is_array($result)) {
             self::throwException(
                 $ldap,
                 "Failed to update user {$user->email} in LDAP (" . __LINE__ . ")"
             );
         }
 
         if (empty(self::$ldap)) {
             $ldap->close();
         }
     }
 
     /**
      * Initialize connection to LDAP
      */
     private static function initLDAP(array $config, string $privilege = 'admin')
     {
         if (self::$ldap) {
             return self::$ldap;
         }
 
         $ldap = new \Net_LDAP3($config);
 
         $connected = $ldap->connect();
 
         if (!$connected) {
             throw new \Exception("Failed to connect to LDAP");
         }
 
         $bound = $ldap->bind(
             \config("ldap.{$privilege}.bind_dn"),
             \config("ldap.{$privilege}.bind_pw")
         );
 
         if (!$bound) {
             throw new \Exception("Failed to bind to LDAP");
         }
 
         return $ldap;
     }
 
     /**
      * Set domain attributes
      */
     private static function setDomainAttributes(Domain $domain, array &$entry)
     {
         $entry['inetdomainstatus'] = $domain->status;
     }
 
+    /**
+     * Convert group member addresses in to valid entries.
+     */
+    private static function setGroupAttributes($ldap, Group $group, &$entry)
+    {
+        $validMembers = [];
+
+        $domain = $group->domain();
+
+        $hostedRootDN = \config('ldap.hosted.root_dn');
+
+        $domainBaseDN = "ou={$domain->namespace},{$hostedRootDN}";
+
+        foreach ($group->members as $member) {
+            list($local, $domainName) = explode('@', $member);
+
+            $memberDN = "uid={$member},ou=People,{$domainBaseDN}";
+
+            // if the member is in the local domain but doesn't exist, drop it
+            if ($domainName == $domain->namespace) {
+                if (!$ldap->get_entry($memberDN)) {
+                    continue;
+                }
+            }
+
+            // add the member if not in the local domain
+            if (!$ldap->get_entry($memberDN)) {
+                $memberEntry = [
+                    'cn' => $member,
+                    'mail' => $member,
+                    'objectclass' => [
+                        'top',
+                        'inetorgperson',
+                        'organizationalperson',
+                        'person'
+                    ],
+                    'sn' => 'unknown'
+                ];
+
+                $ldap->add_entry($memberDN, $memberEntry);
+            }
+
+            $entry['uniquemember'][] = $memberDN;
+            $validMembers[] = $member;
+        }
+
+        // Update members in sql (some might have been removed),
+        // skip model events to not invoke another update job
+        $group->members = $validMembers;
+        Group::withoutEvents(function () use ($group) {
+            $group->save();
+        });
+    }
+
     /**
      * Set common user attributes
      */
     private static function setUserAttributes(User $user, array &$entry)
     {
         $firstName = $user->getSetting('first_name');
         $lastName = $user->getSetting('last_name');
 
         $cn = "unknown";
         $displayname = "";
 
         if ($firstName) {
             if ($lastName) {
                 $cn = "{$firstName} {$lastName}";
                 $displayname = "{$lastName}, {$firstName}";
             } else {
                 $lastName = "unknown";
                 $cn = "{$firstName}";
                 $displayname = "{$firstName}";
             }
         } else {
             $firstName = "";
             if ($lastName) {
                 $cn = "{$lastName}";
                 $displayname = "{$lastName}";
             } else {
                 $lastName = "unknown";
             }
         }
 
         $entry['cn'] = $cn;
         $entry['displayname'] = $displayname;
         $entry['givenname'] = $firstName;
         $entry['sn'] = $lastName;
         $entry['userpassword'] = $user->password_ldap;
         $entry['inetuserstatus'] = $user->status;
         $entry['o'] = $user->getSetting('organization');
         $entry['mailquota'] = 0;
         $entry['alias'] = $user->aliases->pluck('alias')->toArray();
 
         $roles = [];
 
         foreach ($user->entitlements as $entitlement) {
             \Log::debug("Examining {$entitlement->sku->title}");
 
             switch ($entitlement->sku->title) {
                 case "mailbox":
                     break;
 
                 case "storage":
                     $entry['mailquota'] += 1048576;
                     break;
 
                 default:
                     $roles[] = $entitlement->sku->title;
                     break;
             }
         }
 
         $hostedRootDN = \config('ldap.hosted.root_dn');
 
         $entry['nsroledn'] = [];
 
         if (in_array("2fa", $roles)) {
             $entry['nsroledn'][] = "cn=2fa-user,{$hostedRootDN}";
         }
 
         if (in_array("activesync", $roles)) {
             $entry['nsroledn'][] = "cn=activesync-user,{$hostedRootDN}";
         }
 
         if (!in_array("groupware", $roles)) {
             $entry['nsroledn'][] = "cn=imap-user,{$hostedRootDN}";
         }
     }
 
     /**
      * Get LDAP configuration for specified access level
      */
     private static function getConfig(string $privilege)
     {
         $config = [
             'domain_base_dn' => \config('ldap.domain_base_dn'),
             'domain_filter' => \config('ldap.domain_filter'),
             'domain_name_attribute' => \config('ldap.domain_name_attribute'),
             'hosts' => \config('ldap.hosts'),
             'sort' => false,
             'vlv' => false,
             'log_hook' => 'App\Backends\LDAP::logHook',
         ];
 
         return $config;
     }
 
+    /**
+     * Get group entry from LDAP.
+     *
+     * @param \Net_LDAP3 $ldap  Ldap connection
+     * @param string     $email Group email (mail)
+     * @param string     $dn    Reference to group DN
+     *
+     * @return false|null|array Group entry, False on error, NULL if not found
+     */
+    private static function getGroupEntry($ldap, $email, &$dn = null)
+    {
+        list($_local, $_domain) = explode('@', $email, 2);
+
+        $domain = $ldap->find_domain($_domain);
+
+        if (!$domain) {
+            return $domain;
+        }
+
+        $base_dn = $ldap->domain_root_dn($_domain);
+        $dn = "cn={$_local},ou=Groups,{$base_dn}";
+
+        $entry = $ldap->get_entry($dn);
+
+        return $entry ?: null;
+    }
+
     /**
      * Get user entry from LDAP.
      *
      * @param \Net_LDAP3 $ldap  Ldap connection
      * @param string     $email User email (uid)
      * @param string     $dn    Reference to user DN
      * @param bool       $full  Get extra attributes, e.g. nsroledn
      *
      * @return false|null|array User entry, False on error, NULL if not found
      */
     private static function getUserEntry($ldap, $email, &$dn = null, $full = false)
     {
         list($_local, $_domain) = explode('@', $email, 2);
 
         $domain = $ldap->find_domain($_domain);
 
         if (!$domain) {
             return $domain;
         }
 
         $base_dn = $ldap->domain_root_dn($_domain);
         $dn = "uid={$email},ou=People,{$base_dn}";
 
         $entry = $ldap->get_entry($dn);
 
         if ($entry && $full) {
             if (!array_key_exists('nsroledn', $entry)) {
                 $roles = $ldap->get_entry_attributes($dn, ['nsroledn']);
                 if (!empty($roles)) {
                     $entry['nsroledn'] = (array) $roles['nsroledn'];
                 }
             }
         }
 
         return $entry ?: null;
     }
 
     /**
      * Logging callback
      */
     public static function logHook($level, $msg): void
     {
         if (
             (
                 $level == LOG_INFO
                 || $level == LOG_DEBUG
                 || $level == LOG_NOTICE
             )
             && !\config('app.debug')
         ) {
             return;
         }
 
         switch ($level) {
             case LOG_CRIT:
                 $function = 'critical';
                 break;
             case LOG_EMERG:
                 $function = 'emergency';
                 break;
             case LOG_ERR:
                 $function = 'error';
                 break;
             case LOG_ALERT:
                 $function = 'alert';
                 break;
             case LOG_WARNING:
                 $function = 'warning';
                 break;
             case LOG_INFO:
                 $function = 'info';
                 break;
             case LOG_DEBUG:
                 $function = 'debug';
                 break;
             case LOG_NOTICE:
                 $function = 'notice';
                 break;
             default:
                 $function = 'info';
         }
 
         if (is_array($msg)) {
             $msg = implode("\n", $msg);
         }
 
         $msg = '[LDAP] ' . $msg;
 
         \Log::{$function}($msg);
     }
 
     /**
      * Throw exception and close the connection when needed
      *
      * @param \Net_LDAP3 $ldap    Ldap connection
      * @param string     $message Exception message
      *
      * @throws \Exception
      */
     private static function throwException($ldap, string $message): void
     {
         if (empty(self::$ldap) && !empty($ldap)) {
             $ldap->close();
         }
 
         throw new \Exception($message);
     }
 }
diff --git a/src/app/Console/Command.php b/src/app/Console/Command.php
index 2036fb70..63808a8e 100644
--- a/src/app/Console/Command.php
+++ b/src/app/Console/Command.php
@@ -1,104 +1,112 @@
 <?php
 
 namespace App\Console;
 
 class Command extends \Illuminate\Console\Command
 {
     /**
      * Find the domain.
      *
      * @param string $domain Domain ID or namespace
      *
      * @return \App\Domain|null
      */
     public function getDomain($domain)
     {
         return $this->getObject(\App\Domain::class, $domain, 'namespace');
     }
 
     /**
      * Find an object.
      *
      * @param string $objectClass      The name of the class
      * @param string $objectIdOrTitle  The name of a database field to match.
      * @param string|null $objectTitle An additional database field to match.
      *
      * @return mixed
      */
     public function getObject($objectClass, $objectIdOrTitle, $objectTitle)
     {
-        $object = $objectClass::find($objectIdOrTitle);
+        if ($this->hasOption('with-deleted') && $this->option('with-deleted')) {
+            $object = $objectClass::withTrashed()->find($objectIdOrTitle);
+        } else {
+            $object = $objectClass::find($objectIdOrTitle);
+        }
 
         if (!$object && !empty($objectTitle)) {
-            $object = $objectClass::where($objectTitle, $objectIdOrTitle)->first();
+            if ($this->hasOption('with-deleted') && $this->option('with-deleted')) {
+                $object = $objectClass::withTrashed()->where($objectTitle, $objectIdOrTitle)->first();
+            } else {
+                $object = $objectClass::where($objectTitle, $objectIdOrTitle)->first();
+            }
         }
 
         return $object;
     }
 
     /**
      * Find the user.
      *
      * @param string $user User ID or email
      *
      * @return \App\User|null
      */
     public function getUser($user)
     {
         return $this->getObject(\App\User::class, $user, 'email');
     }
 
     /**
      * Find the wallet.
      *
      * @param string $wallet Wallet ID
      *
      * @return \App\Wallet|null
      */
     public function getWallet($wallet)
     {
         return $this->getObject(\App\Wallet::class, $wallet, null);
     }
 
     /**
      * Return a string for output, with any additional attributes specified as well.
      *
      * @param mixed $entry An object
      *
      * @return string
      */
     protected function toString($entry)
     {
         /**
          * Haven't figured out yet, how to test if this command implements an option for additional
          * attributes.
         if (!in_array('attr', $this->options())) {
             return $entry->{$entry->getKeyName()};
         }
         */
 
         $str = [
             $entry->{$entry->getKeyName()}
         ];
 
         foreach ($this->option('attr') as $attr) {
             if ($attr == $entry->getKeyName()) {
                 $this->warn("Specifying {$attr} is not useful.");
                 continue;
             }
 
             if (!array_key_exists($attr, $entry->toArray())) {
                 $this->error("Attribute {$attr} isn't available");
                 continue;
             }
 
             if (is_numeric($entry->{$attr})) {
                 $str[] = $entry->{$attr};
             } else {
                 $str[] = !empty($entry->{$attr}) ? $entry->{$attr} : "null";
             }
         }
 
         return implode(" ", $str);
     }
 }
diff --git a/src/app/Console/Commands/DiscountsCommand.php b/src/app/Console/Commands/DiscountsCommand.php
new file mode 100644
index 00000000..ad469186
--- /dev/null
+++ b/src/app/Console/Commands/DiscountsCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class DiscountsCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\Discount::class;
+    protected $objectName = 'discount';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/DomainRestore.php b/src/app/Console/Commands/DomainRestore.php
new file mode 100644
index 00000000..c20a7ef4
--- /dev/null
+++ b/src/app/Console/Commands/DomainRestore.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class DomainRestore extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'domain:restore {domain}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Restore (undelete) a domain';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $domain = \App\Domain::withTrashed()->where('namespace', $this->argument('domain'))->first();
+
+        if (!$domain) {
+            $this->error("Domain not found.");
+            return 1;
+        }
+
+        if (!$domain->trashed()) {
+            $this->error("The domain is not yet deleted.");
+            return 1;
+        }
+
+        $wallet = $domain->wallet();
+
+        if ($wallet && !$wallet->owner) {
+            $this->error("The domain owner is deleted.");
+            return 1;
+        }
+
+        DB::beginTransaction();
+        $domain->restore();
+        DB::commit();
+    }
+}
diff --git a/src/app/Console/Commands/DomainsCommand.php b/src/app/Console/Commands/DomainsCommand.php
new file mode 100644
index 00000000..5f35eb55
--- /dev/null
+++ b/src/app/Console/Commands/DomainsCommand.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+/**
+ * List domains.
+ *
+ * Example usage:
+ *
+ * ```
+ * $ ./artisan domains
+ * 96217419
+ * 502526624
+ * 539082236
+ * (...)
+ * ```
+ *
+ * To include specific attributes, use `--attr` (allowed multiple times):
+ *
+ * ```
+ * $ ./artisan domains --attr=namespace --attr=status
+ * 96217419 attorneymail.ch 51
+ * 502526624 example.net 51
+ * 539082236 collaborative.li 51
+ * (...)
+ * ```
+ */
+class DomainsCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\Domain::class;
+    protected $objectName = 'domain';
+    protected $objectTitle = 'namespace';
+}
diff --git a/src/app/Console/Commands/EntitlementsCommand.php b/src/app/Console/Commands/EntitlementsCommand.php
new file mode 100644
index 00000000..dd788768
--- /dev/null
+++ b/src/app/Console/Commands/EntitlementsCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class EntitlementsCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\Entitlement::class;
+    protected $objectName = 'entitlement';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Group/AddMemberCommand.php b/src/app/Console/Commands/Group/AddMemberCommand.php
new file mode 100644
index 00000000..ebb61364
--- /dev/null
+++ b/src/app/Console/Commands/Group/AddMemberCommand.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Console\Commands\Group;
+
+use App\Console\Command;
+
+class AddMemberCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'group:add-member {group} {member}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = "Add a member to a group.";
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $input = $this->argument('group');
+        $member = \strtolower($this->argument('member'));
+        $group = $this->getObject(\App\Group::class, $input, 'email');
+
+        if (empty($group)) {
+            $this->error("Group {$input} does not exist.");
+            return 1;
+        }
+
+        if (in_array($member, $group->members)) {
+            $this->error("{$member}: Already exists in the group.");
+            return 1;
+        }
+
+        if ($error = CreateCommand::validateMemberEmail($member)) {
+            $this->error("{$member}: $error");
+            return 1;
+        }
+
+        // We can't modify the property indirectly, therefor array_merge()
+        $group->members = array_merge($group->members, [$member]);
+        $group->save();
+    }
+}
diff --git a/src/app/Console/Commands/Group/CreateCommand.php b/src/app/Console/Commands/Group/CreateCommand.php
new file mode 100644
index 00000000..f6d2d50d
--- /dev/null
+++ b/src/app/Console/Commands/Group/CreateCommand.php
@@ -0,0 +1,173 @@
+<?php
+
+namespace App\Console\Commands\Group;
+
+use App\Console\Command;
+use App\Domain;
+use App\Group;
+use App\User;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+
+class CreateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'group:create {email} {--member=*}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = "Create a group.";
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $email = $this->argument('email');
+        $members = $this->option('member');
+
+        list($local, $domainName) = explode('@', $email, 2);
+
+        $domain = $this->getDomain($domainName);
+
+        if (!$domain) {
+            $this->error("No such domain {$domainName}.");
+            return 1;
+        }
+
+        if ($domain->isPublic()) {
+            $this->error("Domain {$domainName} is public.");
+            return 1;
+        }
+
+        $owner = $domain->wallet()->owner;
+
+        // Validate group email address
+        foreach ($members as $i => $member) {
+            if ($error = $this->validateMemberEmail($member)) {
+                $this->error("{$member}: $error");
+                return 1;
+            }
+            if (\strtolower($member) === \strtolower($email)) {
+                $this->error("{$member}: Cannot be the same as the group address.");
+                return 1;
+            }
+        }
+
+        // Validate members addresses
+        if ($error = $this->validateGroupEmail($email, $owner)) {
+            $this->error("{$email}: {$error}");
+            return 1;
+        }
+
+        DB::beginTransaction();
+
+        // Create the group
+        $group = new Group();
+        $group->email = $email;
+        $group->members = $members;
+        $group->save();
+
+        $group->assignToWallet($owner->wallets->first());
+
+        DB::commit();
+
+        $this->info($group->id);
+    }
+
+    /**
+     * Validate an email address for use as a group member
+     *
+     * @param string $email Email address
+     *
+     * @return ?string Error message on validation error
+     */
+    public static function validateMemberEmail(string $email): ?string
+    {
+        $v = Validator::make(
+            ['email' => $email],
+            ['email' => [new \App\Rules\ExternalEmail()]]
+        );
+
+        if ($v->fails()) {
+            return $v->errors()->toArray()['email'][0];
+        }
+
+        return null;
+    }
+
+    /**
+     * Validate an email address for use as a group email
+     *
+     * @param string    $email Email address
+     * @param \App\User $user  The group owner
+     *
+     * @return ?string Error message on validation error
+     */
+    public static function validateGroupEmail(string $email, \App\User $user): ?string
+    {
+        if (strpos($email, '@') === false) {
+            return \trans('validation.entryinvalid', ['attribute' => 'email']);
+        }
+
+        list($login, $domain) = explode('@', \strtolower($email));
+
+        if (strlen($login) === 0 || strlen($domain) === 0) {
+            return \trans('validation.entryinvalid', ['attribute' => 'email']);
+        }
+
+        // Check if domain exists
+        $domain = Domain::where('namespace', $domain)->first();
+/*
+        if (empty($domain)) {
+            return \trans('validation.domainnotavailable');
+        }
+
+        if ($domain->isPublic()) {
+            return \trans('validation.domainnotavailable');
+        }
+*/
+        // Validate login part alone
+        $v = Validator::make(
+            ['email' => $login],
+            ['email' => [new \App\Rules\UserEmailLocal(!$domain->isPublic())]]
+        );
+
+        if ($v->fails()) {
+            return $v->errors()->toArray()['email'][0];
+        }
+/*
+        // Check if it is one of domains available to the user
+        $domains = \collect($user->domains())->pluck('namespace')->all();
+
+        if (!in_array($domain->namespace, $domains)) {
+            // return \trans('validation.entryexists', ['attribute' => 'domain']);
+            return \trans('validation.domainnotavailable');
+        }
+*/
+        // Check if a user with specified address already exists
+        if (User::emailExists($email)) {
+            return \trans('validation.entryexists', ['attribute' => 'email']);
+        }
+
+        // Check if an alias with specified address already exists.
+        if (User::aliasExists($email)) {
+            return \trans('validation.entryexists', ['attribute' => 'email']);
+        }
+
+        if (Group::emailExists($email)) {
+            return \trans('validation.entryexists', ['attribute' => 'email']);
+        }
+
+        return null;
+    }
+}
diff --git a/src/app/Console/Commands/Group/DeleteCommand.php b/src/app/Console/Commands/Group/DeleteCommand.php
new file mode 100644
index 00000000..9f524723
--- /dev/null
+++ b/src/app/Console/Commands/Group/DeleteCommand.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Console\Commands\Group;
+
+use App\Console\Command;
+
+class DeleteCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'group:delete {group}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = "Delete a group.";
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $input = $this->argument('group');
+        $group = $this->getObject(\App\Group::class, $input, 'email');
+
+        if (empty($group)) {
+            $this->error("Group {$input} does not exist.");
+            return 1;
+        }
+
+        $group->delete();
+    }
+}
diff --git a/src/app/Console/Commands/Group/InfoCommand.php b/src/app/Console/Commands/Group/InfoCommand.php
new file mode 100644
index 00000000..1b2def12
--- /dev/null
+++ b/src/app/Console/Commands/Group/InfoCommand.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands\Group;
+
+use App\Console\Command;
+
+class InfoCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'group:info {group}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = "Print a group information.";
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $input = $this->argument('group');
+        $group = $this->getObject(\App\Group::class, $input, 'email');
+
+        if (empty($group)) {
+            $this->error("Group {$input} does not exist.");
+            return 1;
+        }
+
+        $this->info('Id: ' . $group->id);
+        $this->info('Email: ' . $group->email);
+        $this->info('Status: ' . $group->status);
+
+        // TODO: Print owner/wallet
+
+        foreach ($group->members as $member) {
+            $this->info('Member: ' . $member);
+        }
+    }
+}
diff --git a/src/app/Console/Commands/Group/RemoveMemberCommand.php b/src/app/Console/Commands/Group/RemoveMemberCommand.php
new file mode 100644
index 00000000..341f9e9c
--- /dev/null
+++ b/src/app/Console/Commands/Group/RemoveMemberCommand.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands\Group;
+
+use App\Console\Command;
+
+class RemoveMemberCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'group:remove-member {group} {member}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = "Remove a member from a group.";
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $input = $this->argument('group');
+        $member = \strtolower($this->argument('member'));
+
+        $group = $this->getObject(\App\Group::class, $input, 'email');
+
+        if (empty($group)) {
+            $this->error("Group {$input} does not exist.");
+            return 1;
+        }
+
+        $members = [];
+
+        foreach ($group->members as $m) {
+            if ($m !== $member) {
+                $members[] = $m;
+            }
+        }
+
+        if (count($members) == count($group->members)) {
+            $this->error("Member {$member} not found in the group.");
+            return 1;
+        }
+
+        $group->members = $members;
+        $group->save();
+    }
+}
diff --git a/src/app/Console/Commands/MigratePrices.php b/src/app/Console/Commands/MigratePrices.php
new file mode 100644
index 00000000..46905afa
--- /dev/null
+++ b/src/app/Console/Commands/MigratePrices.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class MigratePrices extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'migrate:prices';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Apply a new price list';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->updateSKUs();
+        $this->updateEntitlements();
+    }
+
+    private function updateSKUs()
+    {
+        $bar = \App\Utils::createProgressBar($this->output, 8, "Updating SKUs");
+
+        // 1. Set the list price for the SKU 'mailbox' to 500.
+        $bar->advance();
+        $mailbox_sku = \App\Sku::where('title', 'mailbox')->first();
+        $mailbox_sku->cost = 500;
+        $mailbox_sku->save();
+
+        // 2. Set the list price for the SKU 'groupware' to 490.
+        $bar->advance();
+        $groupware_sku = \App\Sku::where('title', 'groupware')->first();
+        $groupware_sku->cost = 490;
+        $groupware_sku->save();
+
+        // 3. Set the list price for the SKU 'activesync' to 0.
+        $bar->advance();
+        $activesync_sku = \App\Sku::where('title', 'activesync')->first();
+        $activesync_sku->cost = 0;
+        $activesync_sku->save();
+
+        // 4. Set the units free for the SKU 'storage' to 5.
+        $bar->advance();
+        $storage_sku = \App\Sku::where('title', 'storage')->first();
+        $storage_sku->units_free = 5;
+        $storage_sku->save();
+
+        // 5. Set the number of units for storage to 5 for the 'lite' and 'kolab' packages.
+        $bar->advance();
+        $kolab_package = \App\Package::where('title', 'kolab')->first();
+        $kolab_package->skus()->updateExistingPivot($storage_sku, ['qty' => 5], false);
+        $lite_package = \App\Package::where('title', 'lite')->first();
+        $lite_package->skus()->updateExistingPivot($storage_sku, ['qty' => 5], false);
+
+        // 6. Set the cost for the 'mailbox' unit for the 'lite' and 'kolab' packages to 500.
+        $bar->advance();
+        $kolab_package->skus()->updateExistingPivot($mailbox_sku, ['cost' => 500], false);
+        $lite_package->skus()->updateExistingPivot($mailbox_sku, ['cost' => 500], false);
+
+        // 7. Set the cost for the 'groupware' unit for the 'kolab' package to 490.
+        $bar->advance();
+        $kolab_package->skus()->updateExistingPivot($groupware_sku, ['cost' => 490], false);
+
+        // 8. Set the cost for the 'activesync' unit for the 'kolab' package to 0.
+        $bar->advance();
+        $kolab_package->skus()->updateExistingPivot($activesync_sku, ['cost' => 0], false);
+
+        $bar->finish();
+
+        $this->info("DONE");
+    }
+
+    private function updateEntitlements()
+    {
+        $users = \App\User::all();
+
+        $bar = \App\Utils::createProgressBar($this->output, count($users), "Updating entitlements");
+
+        $groupware_sku = \App\Sku::where('title', 'groupware')->first();
+        $activesync_sku = \App\Sku::where('title', 'activesync')->first();
+        $storage_sku = \App\Sku::where('title', 'storage')->first();
+        $mailbox_sku = \App\Sku::where('title', 'mailbox')->first();
+
+        foreach ($users as $user) {
+            $bar->advance();
+
+            // 1. For every user with a mailbox, ensure that there's a minimum of 5 storage entitlements
+            //    that are free of charge.
+            //    A. For existing storage entitlements reduce the price to 0 until there's 5 of those.
+            //    B. Do not touch the entitlement's updated_at column.
+            $mailbox = $user->entitlements()->where('sku_id', $mailbox_sku->id)->first();
+            if ($mailbox) {
+                $storage = $user->entitlements()->where('sku_id', $storage_sku->id)
+                    ->orderBy('cost')->orderBy('updated_at')->get();
+
+                $num = 0;
+                foreach ($storage as $entitlement) {
+                    $num++;
+                    if ($num <= 5 && $entitlement->cost) {
+                        $entitlement->timestamps = false;
+                        $entitlement->cost = 0;
+                        $entitlement->save();
+                    }
+                }
+
+                if ($num < 5) {
+                    $user->assignSku($storage_sku, 5 - $num);
+                }
+            }
+
+            // 2. For every user with a 'groupware' entitlement, set the price of that entitlement to 490
+            //    -- without touching updated_at.
+            $entitlement = $user->entitlements()->where('sku_id', $groupware_sku->id)->first();
+            if ($entitlement) {
+                $entitlement->timestamps = false;
+                $entitlement->cost = 490;
+                $entitlement->save();
+
+                $entitlement = $user->entitlements()->where('sku_id', $mailbox_sku->id)->first();
+
+                if ($entitlement) {
+                    $entitlement->timestamps = false;
+                    $entitlement->cost = 500;
+                    $entitlement->save();
+                }
+            }
+
+            // 3. For every user with an 'activesync' entitlement, set the price for that entitlement to 0
+            //    -- without touching updated_at.
+            $entitlement = $user->entitlements()->where('sku_id', $activesync_sku->id)->first();
+            if ($entitlement) {
+                $entitlement->timestamps = false;
+                $entitlement->cost = 0;
+                $entitlement->save();
+            }
+        }
+
+        $bar->finish();
+
+        $this->info("DONE");
+    }
+}
diff --git a/src/app/Console/Commands/OpenVidu/RoomCreate.php b/src/app/Console/Commands/OpenVidu/RoomCreate.php
new file mode 100644
index 00000000..b9343780
--- /dev/null
+++ b/src/app/Console/Commands/OpenVidu/RoomCreate.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Console\Commands\OpenVidu;
+
+use Illuminate\Console\Command;
+
+class RoomCreate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'openvidu:room-create {user} {room}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a room for a user';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $user = \App\User::where('email', $this->argument('user'))->first();
+
+        if (!$user) {
+            return 1;
+        }
+
+        $roomName = $this->argument('room');
+
+        if (!preg_match('/^[a-zA-Z0-9_-]{1,16}$/', $roomName)) {
+            $this->error("Invalid room name. Should be up to 16 characters ([a-zA-Z0-9_-]).");
+            return 1;
+        }
+
+        $room = \App\OpenVidu\Room::where('name', $roomName)->first();
+
+        if ($room) {
+            $this->error("Room already exists.");
+            return 1;
+        }
+
+        \App\OpenVidu\Room::create(
+            [
+                'name' => $roomName,
+                'user_id' => $user->id
+            ]
+        );
+    }
+}
diff --git a/src/app/Console/Commands/OpenVidu/Rooms.php b/src/app/Console/Commands/OpenVidu/Rooms.php
new file mode 100644
index 00000000..77beabc0
--- /dev/null
+++ b/src/app/Console/Commands/OpenVidu/Rooms.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands\OpenVidu;
+
+use Illuminate\Console\Command;
+
+class Rooms extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'openvidu:rooms';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'List OpenVidu rooms';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $rooms = \App\OpenVidu\Room::all();
+
+        foreach ($rooms as $room) {
+            $this->info("{$room->name}");
+        }
+    }
+}
diff --git a/src/app/Console/Commands/OpenVidu/Sessions.php b/src/app/Console/Commands/OpenVidu/Sessions.php
new file mode 100644
index 00000000..6b6d8d8f
--- /dev/null
+++ b/src/app/Console/Commands/OpenVidu/Sessions.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Console\Commands\OpenVidu;
+
+use Illuminate\Console\Command;
+
+class Sessions extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'openvidu:sessions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'List OpenVidu sessions';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // curl -X GET -k -u OPENVIDUAPP:MY_SECRET https://localhost:4443/api/sessions, json
+
+        $client = new \GuzzleHttp\Client(
+            [
+                'base_uri' => \config('openvidu.api_url'),
+                'verify' => \config('openvidu.api_verify_tls')
+            ]
+        );
+
+        $response = $client->request(
+            'GET',
+            'sessions',
+            ['auth' => [\config('openvidu.api_username'), \config('openvidu.api_password')]]
+        );
+
+        if ($response->getStatusCode() !== 200) {
+            return 1;
+        }
+
+        $sessionResponse = json_decode($response->getBody(), true);
+
+        foreach ($sessionResponse['content'] as $session) {
+            $room = \App\OpenVidu\Room::where('session_id', $session['sessionId'])->first();
+            if ($room) {
+                $owner = $room->owner->email;
+                $roomName = $room->name;
+            } else {
+                $owner = '(none)';
+                $roomName = '(none)';
+            }
+
+            $this->info(
+                sprintf(
+                    "Session: %s for %s since %s (by %s)",
+                    $session['sessionId'],
+                    $roomName,
+                    \Carbon\Carbon::parse((int)substr($session['createdAt'], 0, 10), 'UTC'),
+                    $owner
+                )
+            );
+        }
+    }
+}
diff --git a/src/app/Console/Commands/PackagesCommand.php b/src/app/Console/Commands/PackagesCommand.php
new file mode 100644
index 00000000..4f047105
--- /dev/null
+++ b/src/app/Console/Commands/PackagesCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class PackagesCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\Package::class;
+    protected $objectName = 'package';
+    protected $objectTitle = 'title';
+}
diff --git a/src/app/Console/Commands/PlansCommand.php b/src/app/Console/Commands/PlansCommand.php
new file mode 100644
index 00000000..791dca6d
--- /dev/null
+++ b/src/app/Console/Commands/PlansCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class PlansCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\Plan::class;
+    protected $objectName = 'plan';
+    protected $objectTitle = 'title';
+}
diff --git a/src/app/Console/Commands/Scalpel/Discount/CreateCommand.php b/src/app/Console/Commands/Scalpel/Discount/CreateCommand.php
new file mode 100644
index 00000000..37c5fef9
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Discount/CreateCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Discount;
+
+use App\Console\ObjectCreateCommand;
+
+class CreateCommand extends ObjectCreateCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Discount::class;
+    protected $objectName = 'discount';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/Discount/ReadCommand.php b/src/app/Console/Commands/Scalpel/Discount/ReadCommand.php
new file mode 100644
index 00000000..9cda9f1d
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Discount/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Discount;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Discount::class;
+    protected $objectName = 'discount';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/Domain/CreateCommand.php b/src/app/Console/Commands/Scalpel/Domain/CreateCommand.php
new file mode 100644
index 00000000..e0455966
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Domain/CreateCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Domain;
+
+use App\Console\ObjectCreateCommand;
+
+class CreateCommand extends ObjectCreateCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Domain::class;
+    protected $objectName = 'domain';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/Domain/ReadCommand.php b/src/app/Console/Commands/Scalpel/Domain/ReadCommand.php
new file mode 100644
index 00000000..abcc4f53
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Domain/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Domain;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Domain::class;
+    protected $objectName = 'domain';
+    protected $objectTitle = 'namespace';
+}
diff --git a/src/app/Console/Commands/Scalpel/Domain/UpdateCommand.php b/src/app/Console/Commands/Scalpel/Domain/UpdateCommand.php
new file mode 100644
index 00000000..aa35c0c7
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Domain/UpdateCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Domain;
+
+use App\Console\ObjectUpdateCommand;
+
+class UpdateCommand extends ObjectUpdateCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Domain::class;
+    protected $objectName = 'domain';
+    protected $objectTitle = 'namespace';
+}
diff --git a/src/app/Console/Commands/Scalpel/Entitlement/CreateCommand.php b/src/app/Console/Commands/Scalpel/Entitlement/CreateCommand.php
new file mode 100644
index 00000000..79e5941f
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Entitlement/CreateCommand.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Entitlement;
+
+use App\Console\ObjectCreateCommand;
+
+class CreateCommand extends ObjectCreateCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Entitlement::class;
+    protected $objectName = 'entitlement';
+    protected $objectTitle = null;
+
+    public function handle()
+    {
+        $this->properties = $this->getProperties();
+
+        $entitleable = call_user_func_array(
+            [$this->properties['entitleable_type'], 'find'],
+            [$this->properties['entitleable_id']]
+        );
+
+        if (!$entitleable) {
+            $this->error("No such {$this->properties['entitleable_type']}");
+            return 1;
+        }
+
+        if (!array_key_exists('entitleable_id', $this->properties)) {
+            $this->error("Specify --entitleable_id");
+        }
+
+        if (array_key_exists('sku_id', $this->properties)) {
+            $sku = \App\Sku::find($this->properties['sku_id']);
+
+            if (!$sku) {
+                $this->error("No such SKU {$this->properties['sku_id']}");
+                return 1;
+            }
+
+            if ($this->properties['cost'] == null) {
+                $this->properties['cost'] = $sku->cost;
+            }
+        }
+
+        if (array_key_exists('wallet_id', $this->properties)) {
+            $wallet = \App\Wallet::find($this->properties['wallet_id']);
+
+            if (!$wallet) {
+                $this->error("No such wallet {$this->properties['wallet_id']}");
+                return 1;
+            }
+        }
+
+        parent::handle();
+    }
+}
diff --git a/src/app/Console/Commands/Scalpel/Entitlement/ReadCommand.php b/src/app/Console/Commands/Scalpel/Entitlement/ReadCommand.php
new file mode 100644
index 00000000..fd6437a7
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Entitlement/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Entitlement;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Entitlement::class;
+    protected $objectName = 'entitlement';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/Entitlement/UpdateCommand.php b/src/app/Console/Commands/Scalpel/Entitlement/UpdateCommand.php
new file mode 100644
index 00000000..f608ae5c
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Entitlement/UpdateCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Entitlement;
+
+use App\Console\ObjectUpdateCommand;
+
+class UpdateCommand extends ObjectUpdateCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Entitlement::class;
+    protected $objectName = 'entitlement';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/Package/ReadCommand.php b/src/app/Console/Commands/Scalpel/Package/ReadCommand.php
new file mode 100644
index 00000000..d412d63b
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Package/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Package;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Package::class;
+    protected $objectName = 'package';
+    protected $objectTitle = 'title';
+}
diff --git a/src/app/Console/Commands/Scalpel/Plan/ReadCommand.php b/src/app/Console/Commands/Scalpel/Plan/ReadCommand.php
new file mode 100644
index 00000000..1571244d
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Plan/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Plan;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Plan::class;
+    protected $objectName = 'plan';
+    protected $objectTitle = 'title';
+}
diff --git a/src/app/Console/Commands/Scalpel/Sku/ReadCommand.php b/src/app/Console/Commands/Scalpel/Sku/ReadCommand.php
new file mode 100644
index 00000000..920746dd
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Sku/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Sku;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Sku::class;
+    protected $objectName = 'sku';
+    protected $objectTitle = 'title';
+}
diff --git a/src/app/Console/Commands/Scalpel/Transaction/ReadCommand.php b/src/app/Console/Commands/Scalpel/Transaction/ReadCommand.php
new file mode 100644
index 00000000..ba6e17b0
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Transaction/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Transaction;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Transaction::class;
+    protected $objectName = 'transaction';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/User/CreateCommand.php b/src/app/Console/Commands/Scalpel/User/CreateCommand.php
new file mode 100644
index 00000000..7aeb0836
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/User/CreateCommand.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\User;
+
+use App\Console\ObjectCreateCommand;
+
+/**
+ * Create a user at the lowest level of control over the exact database entry.
+ *
+ * For example:
+ *
+ * ```
+ * $ ./artisan scalpel:user:create --id=3 --email=john.doe@kolab.local --password=somehash --status=3
+ * ```
+ *
+ * **NOTE**: Executes the model's create() function, and therefore the necessary observer routines (meaning, basically,
+ * actions such as the creation of wallet will be executed), **HOWEVER** no entitlements will be associated with the
+ * user.
+ */
+class CreateCommand extends ObjectCreateCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\User::class;
+    protected $objectName = 'user';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/User/ReadCommand.php b/src/app/Console/Commands/Scalpel/User/ReadCommand.php
new file mode 100644
index 00000000..47ab3988
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/User/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\User;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\User::class;
+    protected $objectName = 'user';
+    protected $objectTitle = 'email';
+}
diff --git a/src/app/Console/Commands/Scalpel/UserSetting/ReadCommand.php b/src/app/Console/Commands/Scalpel/UserSetting/ReadCommand.php
new file mode 100644
index 00000000..0de38e23
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/UserSetting/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\UserSetting;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\UserSetting::class;
+    protected $objectName = 'user-setting';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/Wallet/ReadCommand.php b/src/app/Console/Commands/Scalpel/Wallet/ReadCommand.php
new file mode 100644
index 00000000..41ab49b2
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Wallet/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Wallet;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Wallet::class;
+    protected $objectName = 'wallet';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/Wallet/SettingsCommand.php b/src/app/Console/Commands/Scalpel/Wallet/SettingsCommand.php
new file mode 100644
index 00000000..47ca881a
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/Wallet/SettingsCommand.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\Wallet;
+
+use App\Console\ObjectRelationListCommand;
+
+class SettingsCommand extends ObjectRelationListCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\Wallet::class;
+    protected $objectName = 'wallet';
+    protected $objectTitle = null;
+    protected $objectRelation = 'settings';
+}
diff --git a/src/app/Console/Commands/Scalpel/WalletSetting/CreateCommand.php b/src/app/Console/Commands/Scalpel/WalletSetting/CreateCommand.php
new file mode 100644
index 00000000..7c1f9ef3
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/WalletSetting/CreateCommand.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\WalletSetting;
+
+use App\Console\ObjectCreateCommand;
+
+class CreateCommand extends ObjectCreateCommand
+{
+    protected $cacheKeys = ['app\wallet_settings_%wallet_id%'];
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\WalletSetting::class;
+    protected $objectName = 'wallet-setting';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/WalletSetting/ReadCommand.php b/src/app/Console/Commands/Scalpel/WalletSetting/ReadCommand.php
new file mode 100644
index 00000000..e893a14c
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/WalletSetting/ReadCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\WalletSetting;
+
+use App\Console\ObjectReadCommand;
+
+class ReadCommand extends ObjectReadCommand
+{
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\WalletSetting::class;
+    protected $objectName = 'wallet-setting';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Scalpel/WalletSetting/UpdateCommand.php b/src/app/Console/Commands/Scalpel/WalletSetting/UpdateCommand.php
new file mode 100644
index 00000000..bd61ee27
--- /dev/null
+++ b/src/app/Console/Commands/Scalpel/WalletSetting/UpdateCommand.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Console\Commands\Scalpel\WalletSetting;
+
+use App\Console\ObjectUpdateCommand;
+
+class UpdateCommand extends ObjectUpdateCommand
+{
+    protected $cacheKeys = ['app\wallet_settings_%wallet_id%'];
+    protected $commandPrefix = 'scalpel';
+    protected $objectClass = \App\WalletSetting::class;
+    protected $objectName = 'wallet-setting';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/Sku/ListUsers.php b/src/app/Console/Commands/Sku/ListUsers.php
new file mode 100644
index 00000000..631bfed8
--- /dev/null
+++ b/src/app/Console/Commands/Sku/ListUsers.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Console\Commands\Sku;
+
+use Illuminate\Console\Command;
+
+class ListUsers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'sku:list-users {sku}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'List users with the SKU entitlement.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $sku = \App\Sku::find($this->argument('sku'));
+
+        if (!$sku) {
+            $sku = \App\Sku::where('title', $this->argument('sku'))->first();
+        }
+
+        if (!$sku) {
+            $this->error("Unable to find the SKU.");
+            return 1;
+        }
+
+        $fn = function ($entitlement) {
+            $user_id = $entitlement->user_id;
+            if ($entitlement->entitleable_type == \App\User::class) {
+                $user_id = $entitlement->entitleable_id;
+            }
+
+            return $user_id;
+        };
+
+        $users = \App\Entitlement::select('user_id', 'entitleable_id', 'entitleable_type')
+            ->join('wallets', 'wallets.id', '=', 'wallet_id')
+            ->where('sku_id', $sku->id)
+            ->get()
+            ->map($fn)
+            ->unique();
+
+        // TODO: This wereIn() might not scale
+        \App\User::whereIn('id', $users)->orderBy('email')->get()
+            ->pluck('email')
+            ->each(function ($email, $key) {
+                $this->info($email);
+            });
+    }
+}
diff --git a/src/app/Console/Commands/TransactionsCommand.php b/src/app/Console/Commands/TransactionsCommand.php
new file mode 100644
index 00000000..732d9829
--- /dev/null
+++ b/src/app/Console/Commands/TransactionsCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class TransactionsCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\Transaction::class;
+    protected $objectName = 'transaction';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/UserAddAlias.php b/src/app/Console/Commands/UserAddAlias.php
index d2a3bdb9..6b87aa7b 100644
--- a/src/app/Console/Commands/UserAddAlias.php
+++ b/src/app/Console/Commands/UserAddAlias.php
@@ -1,69 +1,69 @@
 <?php
 
 namespace App\Console\Commands;
 
 use App\Http\Controllers\API\V4\UsersController;
 use Illuminate\Console\Command;
 
 class UserAddAlias extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'user:add-alias {--force} {user} {alias}';
 
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = 'Add an email alias to a user (forcefully)';
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $user = \App\User::where('email', $this->argument('user'))->first();
 
         if (!$user) {
             return 1;
         }
 
         $alias = \strtolower($this->argument('alias'));
 
         // Check if the alias already exists
         if ($user->aliases()->where('alias', $alias)->first()) {
             $this->error("Address is already assigned to the user.");
             return 1;
         }
 
         $controller = $user->wallet()->owner;
 
         // Validate the alias
-        $error = UsersController::validateEmail($alias, $controller, true);
+        $error = UsersController::validateAlias($alias, $controller);
 
         if ($error) {
             if (!$this->option('force')) {
                 $this->error($error);
                 return 1;
             }
         }
 
         $user->aliases()->create(['alias' => $alias]);
     }
 }
diff --git a/src/app/Console/Commands/UserAssignSku.php b/src/app/Console/Commands/UserAssignSku.php
new file mode 100644
index 00000000..bdc1dd60
--- /dev/null
+++ b/src/app/Console/Commands/UserAssignSku.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UserAssignSku extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'user:assign-sku {user} {sku} {--qty=}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Assign a SKU to the user';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $user = \App\User::where('email', $this->argument('user'))->first();
+
+        if (!$user) {
+            $this->error("Unable to find the user {$this->argument('user')}.");
+            return 1;
+        }
+
+        $sku = \App\Sku::find($this->argument('sku'));
+
+        if (!$sku) {
+            $sku = \App\Sku::where('title', $this->argument('sku'))->first();
+        }
+
+        if (!$sku) {
+            $this->error("Unable to find the SKU {$this->argument('sku')}.");
+            return 1;
+        }
+
+        $quantity = (int) $this->option('qty');
+
+        // Check if the entitlement already exists
+        if (empty($quantity)) {
+            if ($user->entitlements()->where('sku_id', $sku->id)->first()) {
+                $this->error("The entitlement already exists. Maybe try with --qty=X?");
+                return 1;
+            }
+        }
+
+        $user->assignSku($sku, $quantity ?: 1);
+    }
+}
diff --git a/src/app/Console/Commands/UserRestore.php b/src/app/Console/Commands/UserRestore.php
new file mode 100644
index 00000000..0bd82cff
--- /dev/null
+++ b/src/app/Console/Commands/UserRestore.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class UserRestore extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'user:restore {user}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Restore (undelete) a user';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $user = \App\User::withTrashed()->where('email', $this->argument('user'))->first();
+
+        if (!$user) {
+            $this->error('User not found.');
+            return 1;
+        }
+
+        if (!$user->trashed()) {
+            $this->error('The user is not yet deleted.');
+            return 1;
+        }
+
+        DB::beginTransaction();
+        $user->restore();
+        DB::commit();
+    }
+}
diff --git a/src/app/Console/Commands/UserSettingsCommand.php b/src/app/Console/Commands/UserSettingsCommand.php
new file mode 100644
index 00000000..143c26a7
--- /dev/null
+++ b/src/app/Console/Commands/UserSettingsCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class UserSettingsCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\UserSetting::class;
+    protected $objectName = 'user-setting';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/UsersCommand.php b/src/app/Console/Commands/UsersCommand.php
new file mode 100644
index 00000000..805457e1
--- /dev/null
+++ b/src/app/Console/Commands/UsersCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class UsersCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\User::class;
+    protected $objectName = 'user';
+    protected $objectTitle = 'email';
+}
diff --git a/src/app/Console/Commands/WalletSettingsCommand.php b/src/app/Console/Commands/WalletSettingsCommand.php
new file mode 100644
index 00000000..a6a7afc2
--- /dev/null
+++ b/src/app/Console/Commands/WalletSettingsCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class WalletSettingsCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\WalletSetting::class;
+    protected $objectName = 'wallet-setting';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/Commands/WalletsCommand.php b/src/app/Console/Commands/WalletsCommand.php
new file mode 100644
index 00000000..32278ac8
--- /dev/null
+++ b/src/app/Console/Commands/WalletsCommand.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\ObjectListCommand;
+
+class WalletsCommand extends ObjectListCommand
+{
+    protected $objectClass = \App\Wallet::class;
+    protected $objectName = 'wallet';
+    protected $objectTitle = null;
+}
diff --git a/src/app/Console/ObjectCommand.php b/src/app/Console/ObjectCommand.php
new file mode 100644
index 00000000..a2ae4414
--- /dev/null
+++ b/src/app/Console/ObjectCommand.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Support\Facades\Cache;
+
+abstract class ObjectCommand extends Command
+{
+    /**
+     * Specify a command prefix, if any.
+     *
+     * For example, \App\Console\Commands\Scalpel\User\CreateCommand uses prefix 'scalpel'.
+     *
+     * @var string
+     */
+    protected $commandPrefix = null;
+
+    /**
+     * The object class that we are operating on, for example \App\User::class
+     *
+     * @var string
+     */
+    protected $objectClass;
+
+    /**
+     * The (simple) object name, such as 'domain' or 'user'. Corresponds with the mandatory command-line option
+     * to identify the object from its corresponding model.
+     *
+     * @var string
+     */
+    protected $objectName;
+
+    /**
+     * A column name other than the primary key can be used to identify an object, such as 'email' for users,
+     * 'namespace' for domains, and 'title' for SKUs.
+     *
+     * @var string
+     */
+    protected $objectTitle;
+
+    /**
+     * Placeholder for column name attributes for objects, from which command-line switches and attribute names can be
+     * generated.
+     *
+     * @var array
+     */
+    protected $properties;
+
+
+    /**
+     * List of cache keys to refresh after updating/creating an object
+     *
+     * @var array
+     */
+    protected $cacheKeys = [];
+
+    /**
+     * Reset the cache for specified object using defined cacheKeys.
+     *
+     * @param object $object The object that was updated/created
+     */
+    protected function cacheRefresh($object): void
+    {
+        foreach ($this->cacheKeys as $cacheKey) {
+            foreach ($object->toArray() as $propKey => $propValue) {
+                if (!is_object($propValue)) {
+                    $cacheKey = str_replace('%' . $propKey . '%', $propValue, $cacheKey);
+                }
+            }
+
+            Cache::forget($cacheKey);
+        }
+    }
+}
diff --git a/src/app/Console/ObjectCreateCommand.php b/src/app/Console/ObjectCreateCommand.php
new file mode 100644
index 00000000..81ef536d
--- /dev/null
+++ b/src/app/Console/ObjectCreateCommand.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Console;
+
+/**
+ * This abstract class provides a means to treat objects in our model using CRUD.
+ */
+abstract class ObjectCreateCommand extends ObjectCommand
+{
+    public function __construct()
+    {
+        $this->description = "Create a {$this->objectName}";
+        $this->signature = sprintf(
+            "%s%s:create",
+            $this->commandPrefix ? $this->commandPrefix . ":" : "",
+            $this->objectName
+        );
+
+        $class = new $this->objectClass();
+
+        foreach ($class->getFillable() as $fillable) {
+            $this->signature .= " {--{$fillable}=}";
+        }
+
+        parent::__construct();
+    }
+
+    public function getProperties()
+    {
+        if (!empty($this->properties)) {
+            return $this->properties;
+        }
+
+        $class = new $this->objectClass();
+
+        $this->properties = [];
+
+        foreach ($class->getFillable() as $fillable) {
+            $this->properties[$fillable] = $this->option($fillable);
+        }
+
+        return $this->properties;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->getProperties();
+
+        $class = new $this->objectClass();
+
+        $object = $this->objectClass::create($this->properties);
+
+        if ($object) {
+            $this->cacheRefresh($object);
+            $this->info($object->{$class->getKeyName()});
+        } else {
+            $this->error("Object could not be created.");
+        }
+
+        return $object;
+    }
+}
diff --git a/src/app/Console/ObjectListCommand.php b/src/app/Console/ObjectListCommand.php
new file mode 100644
index 00000000..21d13d8a
--- /dev/null
+++ b/src/app/Console/ObjectListCommand.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * This abstract class provides a means to treat objects in our model using CRUD, with the exception that
+ * this particular abstract class lists objects.
+ */
+abstract class ObjectListCommand extends ObjectCommand
+{
+    public function __construct()
+    {
+        $this->description = "List {$this->objectName}s";
+
+        $this->signature = $this->commandPrefix ? $this->commandPrefix . ":" : "";
+        $this->signature .= "{$this->objectName}s";
+
+        $classes = class_uses_recursive($this->objectClass);
+
+        if (in_array(SoftDeletes::class, $classes)) {
+            $this->signature .= " {--with-deleted : Include deleted {$this->objectName}s}";
+        }
+
+        $this->signature .= " {--attr=* : Attributes other than the primary unique key to include}";
+
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $classes = class_uses_recursive($this->objectClass);
+
+        if (in_array(SoftDeletes::class, $classes) && $this->option('with-deleted')) {
+            $objects = $this->objectClass::withTrashed();
+        } else {
+            $objects = new $this->objectClass();
+        }
+
+        $objects->each(
+            function ($object) {
+                if ($object->deleted_at) {
+                    $this->info("{$this->toString($object)} (deleted at {$object->deleted_at}");
+                } else {
+                    $this->info("{$this->toString($object)}");
+                }
+            }
+        );
+    }
+}
diff --git a/src/app/Console/ObjectReadCommand.php b/src/app/Console/ObjectReadCommand.php
new file mode 100644
index 00000000..bbccae63
--- /dev/null
+++ b/src/app/Console/ObjectReadCommand.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console;
+
+/**
+ * This abstract class provides a means to treat objects in our model using CRUD.
+ */
+abstract class ObjectReadCommand extends ObjectCommand
+{
+    public function __construct()
+    {
+        $this->description = "Read a {$this->objectName}";
+
+        $this->signature = sprintf(
+            "%s%s:read {%s}",
+            $this->commandPrefix ? $this->commandPrefix . ":" : "",
+            $this->objectName,
+            $this->objectName
+        );
+
+        $this->signature .= " {--attr=* : Attributes other than the primary unique key to include}";
+
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $argument = $this->argument($this->objectName);
+
+        $object = $this->getObject($this->objectClass, $argument, $this->objectTitle);
+
+        if (!$object) {
+            $this->error("No such {$this->objectName} {$argument}");
+            return 1;
+        }
+
+        $this->info($this->toString($object));
+    }
+}
diff --git a/src/app/Console/ObjectRelationListCommand.php b/src/app/Console/ObjectRelationListCommand.php
new file mode 100644
index 00000000..786dede6
--- /dev/null
+++ b/src/app/Console/ObjectRelationListCommand.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Console;
+
+/**
+ * This abstract class provides a means to treat objects in our model using CRUD, with the exception that
+ * this particular abstract class lists objects' relations.
+ */
+abstract class ObjectRelationListCommand extends ObjectCommand
+{
+    /**
+     * The "relation" -- a method or property.
+     *
+     * @var string
+     */
+    protected $objectRelation;
+
+    /**
+     * Supplement the base command constructor with a derived or generated signature and
+     * description.
+     *
+     * @return mixed
+     */
+    public function __construct()
+    {
+        $this->description = "List {$this->objectRelation} for a {$this->objectName}";
+
+        $this->signature = sprintf(
+            "%s%s:%s {%s}",
+            $this->commandPrefix ? $this->commandPrefix . ":" : "",
+            $this->objectName,
+            $this->objectRelation,
+            $this->objectName
+        );
+
+        $this->signature .= " {--attr=* : Attributes other than the primary unique key to include}";
+
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $argument = $this->argument($this->objectName);
+
+        $object = $this->getObject(
+            $this->objectClass,
+            $argument,
+            $this->objectTitle
+        );
+
+        if (!$object) {
+            $this->error("No such {$this->objectName} {$argument}");
+            return 1;
+        }
+
+        if (method_exists($object, $this->objectRelation)) {
+            $result = call_user_func([$object, $this->objectRelation]);
+        } elseif (property_exists($object, $this->objectRelation)) {
+            $result = $object->{"{$this->objectRelation}"};
+        } else {
+            $this->error("No such relation {$this->objectRelation}");
+            return 1;
+        }
+
+        if ($result instanceof \Illuminate\Database\Eloquent\Collection) {
+            $result->each(
+                function ($entry) {
+                    $this->info($this->toString($entry));
+                }
+            );
+        } elseif ($result instanceof \Illuminate\Database\Eloquent\Relations\Relation) {
+            $result->each(
+                function ($entry) {
+                    $this->info($this->toString($entry));
+                }
+            );
+        } elseif (is_array($result)) {
+            foreach ($result as $entry) {
+                $this->info($this->toString($entry));
+            }
+        } else {
+            $this->info($this->toString($result));
+        }
+    }
+}
diff --git a/src/app/Console/ObjectUpdateCommand.php b/src/app/Console/ObjectUpdateCommand.php
new file mode 100644
index 00000000..5633b753
--- /dev/null
+++ b/src/app/Console/ObjectUpdateCommand.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * This abstract class provides a means to treat objects in our model using CRUD.
+ */
+abstract class ObjectUpdateCommand extends ObjectCommand
+{
+    public function __construct()
+    {
+        $this->description = "Update a {$this->objectName}";
+        $this->signature = sprintf(
+            "%s%s:update {%s}",
+            $this->commandPrefix ? $this->commandPrefix . ":" : "",
+            $this->objectName,
+            $this->objectName
+        );
+
+        $class = new $this->objectClass();
+
+        try {
+            foreach (Schema::getColumnListing($class->getTable()) as $column) {
+                if ($column == "id") {
+                    continue;
+                }
+
+                $this->signature .= " {--{$column}=}";
+            }
+        } catch (\Exception $e) {
+            \Log::error("Could not extract options: {$e->getMessage()}");
+        }
+
+        $classes = class_uses_recursive($this->objectClass);
+
+        if (in_array(SoftDeletes::class, $classes)) {
+            $this->signature .= " {--with-deleted : Include deleted {$this->objectName}s}";
+        }
+
+        parent::__construct();
+    }
+
+    public function getProperties()
+    {
+        if (!empty($this->properties)) {
+            return $this->properties;
+        }
+
+        $class = new $this->objectClass();
+
+        $this->properties = [];
+
+        foreach (Schema::getColumnListing($class->getTable()) as $column) {
+            if ($column == "id") {
+                continue;
+            }
+
+            if (($value = $this->option($column)) !== null) {
+                $this->properties[$column] = $value;
+            }
+        }
+
+        return $this->properties;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $argument = $this->argument($this->objectName);
+
+        $object = $this->getObject($this->objectClass, $argument, $this->objectTitle);
+
+        if (!$object) {
+            $this->error("No such {$this->objectName} {$argument}");
+            return 1;
+        }
+
+        foreach ($this->getProperties() as $property => $value) {
+            if ($property == "deleted_at" && $value == "null") {
+                $value = null;
+            }
+
+            $object->{$property} = $value;
+        }
+
+        $object->timestamps = false;
+
+        $object->save(['timestamps' => false]);
+
+        $this->cacheRefresh($object);
+    }
+}
diff --git a/src/app/Documents/Receipt.php b/src/app/Documents/Receipt.php
index 22b65619..d9c48975 100644
--- a/src/app/Documents/Receipt.php
+++ b/src/app/Documents/Receipt.php
@@ -1,263 +1,278 @@
 <?php
 
 namespace App\Documents;
 
 use App\Payment;
 use App\Providers\PaymentProvider;
 use App\User;
 use App\Wallet;
 use Carbon\Carbon;
 
 class Receipt
 {
     /** @var \App\Wallet The wallet */
     protected $wallet;
 
     /** @var int Transactions date year */
     protected $year;
 
     /** @var int Transactions date month */
     protected $month;
 
     /** @var bool Enable fake data mode */
     protected static $fakeMode = false;
 
 
     /**
      * Document constructor.
      *
      * @param \App\Wallet $wallet A wallet containing transactions
      * @param int         $year   A year to list transactions from
      * @param int         $month  A month to list transactions from
      *
      * @return void
      */
     public function __construct(Wallet $wallet, int $year, int $month)
     {
         $this->wallet = $wallet;
         $this->year = $year;
         $this->month = $month;
     }
 
     /**
      * Render the mail template with fake data
      *
      * @param string $type Output format ('html' or 'pdf')
      *
      * @return string HTML or PDF output
      */
     public static function fakeRender(string $type = 'html'): string
     {
         $wallet = new Wallet();
         $wallet->id = \App\Utils::uuidStr();
         $wallet->owner = new User(['id' => 123456789]); // @phpstan-ignore-line
 
         $receipt = new self($wallet, date('Y'), date('n'));
 
         self::$fakeMode = true;
 
         if ($type == 'pdf') {
             return $receipt->pdfOutput();
         } elseif ($type !== 'html') {
             throw new \Exception("Unsupported output format");
         }
 
         return $receipt->htmlOutput();
     }
 
     /**
      * Render the receipt in HTML format.
      *
      * @return string HTML content
      */
     public function htmlOutput(): string
     {
         return $this->build()->render();
     }
 
     /**
      * Render the receipt in PDF format.
      *
      * @return string PDF content
      */
     public function pdfOutput(): string
     {
         // Parse ther HTML template
         $html = $this->build()->render();
 
         // Link fonts from public/fonts to storage/fonts so DomPdf can find them
         if (!is_link(storage_path('fonts/Roboto-Regular.ttf'))) {
             symlink(
                 public_path('fonts/Roboto-Regular.ttf'),
                 storage_path('fonts/Roboto-Regular.ttf')
             );
             symlink(
                 public_path('fonts/Roboto-Bold.ttf'),
                 storage_path('fonts/Roboto-Bold.ttf')
             );
         }
 
         // Fix font and image paths
         $html = str_replace('url(/fonts/', 'url(fonts/', $html);
-        $html = str_replace('src="/images/', 'src="images/', $html);
+        $html = str_replace('src="/', 'src="', $html);
 
         // TODO: The output file is about ~200KB, we could probably slim it down
         // by using separate font files with small subset of languages when
         // there are no Unicode characters used, e.g. only ASCII or Latin.
 
         // Load PDF generator
         $pdf = \PDF::loadHTML($html)->setPaper('a4', 'portrait');
 
         return $pdf->output();
     }
 
     /**
      * Build the document
      *
      * @return \Illuminate\View\View The template object
      */
     protected function build()
     {
         $appName = \config('app.name');
         $start = Carbon::create($this->year, $this->month, 1, 0, 0, 0);
         $end = $start->copy()->endOfMonth();
 
         $month = \trans('documents.month' . intval($this->month));
         $title = \trans('documents.receipt-title', ['year' => $this->year, 'month' => $month]);
         $company = $this->companyData();
 
         if (self::$fakeMode) {
             $country = 'CH';
             $customer = [
                 'id' => $this->wallet->owner->id,
                 'wallet_id' => $this->wallet->id,
                 'customer' => 'Freddie Krüger<br>7252 Westminster Lane<br>Forest Hills, NY 11375',
             ];
 
             $items = collect([
                 (object) [
                     'amount' => 1234,
                     'updated_at' => $start->copy()->next(Carbon::MONDAY),
                 ],
                 (object) [
                     'amount' => 10000,
                     'updated_at' => $start->copy()->next()->next(),
                 ],
                 (object) [
                     'amount' => 1234,
                     'updated_at' => $start->copy()->next()->next()->next(Carbon::MONDAY),
                 ],
                 (object) [
                     'amount' => 99,
                     'updated_at' => $start->copy()->next()->next()->next(),
                 ],
             ]);
         } else {
             $customer = $this->customerData();
             $country = $this->wallet->owner->getSetting('country');
 
             $items = $this->wallet->payments()
                 ->where('status', PaymentProvider::STATUS_PAID)
                 ->where('updated_at', '>=', $start)
                 ->where('updated_at', '<', $end)
-                ->where('amount', '>', 0)
+                ->where('amount', '<>', 0)
                 ->orderBy('updated_at')
                 ->get();
         }
 
         $vatRate = \config('app.vat.rate');
         $vatCountries = explode(',', \config('app.vat.countries'));
         $vatCountries = array_map('strtoupper', array_map('trim', $vatCountries));
 
         if (!$country || !in_array(strtoupper($country), $vatCountries)) {
             $vatRate = 0;
         }
 
         $totalVat = 0;
         $total = 0;
         $items = $items->map(function ($item) use (&$total, &$totalVat, $appName, $vatRate) {
             $amount = $item->amount;
 
             if ($vatRate > 0) {
                 $amount = round($amount * ((100 - $vatRate) / 100));
                 $totalVat += $item->amount - $amount;
             }
 
             $total += $amount;
 
+            $type = $item->type ?? null;
+
+            if ($type == PaymentProvider::TYPE_REFUND) {
+                $description = \trans('documents.receipt-refund');
+            } elseif ($type == PaymentProvider::TYPE_CHARGEBACK) {
+                $description = \trans('documents.receipt-chargeback');
+            } else {
+                $description = \trans('documents.receipt-item-desc', ['site' => $appName]);
+            }
+
             return [
                 'amount' => $this->wallet->money($amount),
-                'description' => \trans('documents.receipt-item-desc', ['site' => $appName]),
+                'description' => $description,
                 'date' => $item->updated_at->toDateString(),
             ];
         });
 
         // Load the template
         $view = view('documents.receipt')
             ->with([
                     'site' => $appName,
                     'title' => $title,
                     'company' => $company,
                     'customer' => $customer,
                     'items' => $items,
                     'subTotal' => $this->wallet->money($total),
                     'total' => $this->wallet->money($total + $totalVat),
                     'totalVat' => $this->wallet->money($totalVat),
                     'vatRate' => preg_replace('/([.,]00|0|[.,])$/', '', sprintf('%.2f', $vatRate)),
                     'vat' => $vatRate > 0,
             ]);
 
         return $view;
     }
 
     /**
      * Prepare customer data for the template
      *
      * @return array Customer data for the template
      */
     protected function customerData(): array
     {
         $user = $this->wallet->owner;
         $name = $user->name();
         $organization = $user->getSetting('organization');
         $address = $user->getSetting('billing_address');
 
         $customer = trim(($organization ?: $name) . "\n$address");
         $customer = str_replace("\n", '<br>', htmlentities($customer));
 
         return [
             'id' => $this->wallet->owner->id,
             'wallet_id' => $this->wallet->id,
             'customer' => $customer,
         ];
     }
 
     /**
      * Prepare company data for the template
      *
      * @return array Company data for the template
      */
     protected function companyData(): array
     {
         $header = \config('app.company.name') . "\n" . \config('app.company.address');
         $header = str_replace("\n", '<br>', htmlentities($header));
 
         $footerLineLength = 110;
         $footer = \config('app.company.details');
         $contact = \config('app.company.email');
         $logo = \config('app.company.logo');
+        $theme = \config('app.theme');
 
         if ($contact) {
             $length = strlen($footer) + strlen($contact) + 3;
             $contact = htmlentities($contact);
             $footer .= ($length > $footerLineLength ? "\n" : ' | ')
                 . sprintf('<a href="mailto:%s">%s</a>', $contact, $contact);
         }
 
+        if ($logo && strpos($logo, '/') === false) {
+            $logo = "/themes/$theme/images/$logo";
+        }
+
         return [
-            'logo' => $logo ? "<img src=\"/images/$logo\" width=300>" : '',
+            'logo' => $logo ? "<img src=\"$logo\" width=300>" : '',
             'header' => $header,
             'footer' => $footer,
         ];
     }
 }
diff --git a/src/app/Domain.php b/src/app/Domain.php
index 667eaa55..b8a0375d 100644
--- a/src/app/Domain.php
+++ b/src/app/Domain.php
@@ -1,445 +1,450 @@
 <?php
 
 namespace App;
 
 use App\Wallet;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * The eloquent definition of a Domain.
  *
  * @property string $namespace
  */
 class Domain extends Model
 {
     use SoftDeletes;
 
     // we've simply never heard of this domain
     public const STATUS_NEW        = 1 << 0;
     // it's been activated
     public const STATUS_ACTIVE     = 1 << 1;
     // domain has been suspended.
     public const STATUS_SUSPENDED  = 1 << 2;
     // domain has been deleted
     public const STATUS_DELETED    = 1 << 3;
     // ownership of the domain has been confirmed
     public const STATUS_CONFIRMED  = 1 << 4;
     // domain has been verified that it exists in DNS
     public const STATUS_VERIFIED   = 1 << 5;
     // domain has been created in LDAP
     public const STATUS_LDAP_READY = 1 << 6;
 
     // open for public registration
     public const TYPE_PUBLIC       = 1 << 0;
     // zone hosted with us
     public const TYPE_HOSTED       = 1 << 1;
     // zone registered externally
     public const TYPE_EXTERNAL     = 1 << 2;
 
     public const HASH_CODE = 1;
     public const HASH_TEXT = 2;
     public const HASH_CNAME = 3;
 
     public $incrementing = false;
 
     protected $keyType = 'bigint';
 
     protected $fillable = [
         'namespace',
         'status',
         'type'
     ];
 
     /**
      * Assign a package to a domain. The domain should not belong to any existing entitlements.
      *
      * @param \App\Package $package The package to assign.
      * @param \App\User    $user    The wallet owner.
      *
      * @return \App\Domain Self
      */
     public function assignPackage($package, $user)
     {
         // If this domain is public it can not be assigned to a user.
         if ($this->isPublic()) {
             return $this;
         }
 
         // See if this domain is already owned by another user.
         $wallet = $this->wallet();
 
         if ($wallet) {
             \Log::error(
                 "Domain {$this->namespace} is already assigned to {$wallet->owner->email}"
             );
 
             return $this;
         }
 
         $wallet_id = $user->wallets()->first()->id;
 
         foreach ($package->skus as $sku) {
             for ($i = $sku->pivot->qty; $i > 0; $i--) {
                 \App\Entitlement::create(
                     [
                         'wallet_id' => $wallet_id,
                         'sku_id' => $sku->id,
                         'cost' => $sku->pivot->cost(),
                         'entitleable_id' => $this->id,
                         'entitleable_type' => Domain::class
                     ]
                 );
             }
         }
 
         return $this;
     }
 
+    /**
+     * The domain entitlement.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphOne
+     */
     public function entitlement()
     {
         return $this->morphOne('App\Entitlement', 'entitleable');
     }
 
     /**
      * Return list of public+active domain names
      */
     public static function getPublicDomains(): array
     {
         $where = sprintf('(type & %s)', Domain::TYPE_PUBLIC);
 
         return self::whereRaw($where)->get(['namespace'])->pluck('namespace')->toArray();
     }
 
     /**
      * Returns whether this domain is active.
      *
      * @return bool
      */
     public function isActive(): bool
     {
         return ($this->status & self::STATUS_ACTIVE) > 0;
     }
 
     /**
      * Returns whether this domain is confirmed the ownership of.
      *
      * @return bool
      */
     public function isConfirmed(): bool
     {
         return ($this->status & self::STATUS_CONFIRMED) > 0;
     }
 
     /**
      * Returns whether this domain is deleted.
      *
      * @return bool
      */
     public function isDeleted(): bool
     {
         return ($this->status & self::STATUS_DELETED) > 0;
     }
 
     /**
      * Returns whether this domain is registered with us.
      *
      * @return bool
      */
     public function isExternal(): bool
     {
         return ($this->type & self::TYPE_EXTERNAL) > 0;
     }
 
     /**
      * Returns whether this domain is hosted with us.
      *
      * @return bool
      */
     public function isHosted(): bool
     {
         return ($this->type & self::TYPE_HOSTED) > 0;
     }
 
     /**
      * Returns whether this domain is new.
      *
      * @return bool
      */
     public function isNew(): bool
     {
         return ($this->status & self::STATUS_NEW) > 0;
     }
 
     /**
      * Returns whether this domain is public.
      *
      * @return bool
      */
     public function isPublic(): bool
     {
         return ($this->type & self::TYPE_PUBLIC) > 0;
     }
 
     /**
      * Returns whether this domain is registered in LDAP.
      *
      * @return bool
      */
     public function isLdapReady(): bool
     {
         return ($this->status & self::STATUS_LDAP_READY) > 0;
     }
 
     /**
      * Returns whether this domain is suspended.
      *
      * @return bool
      */
     public function isSuspended(): bool
     {
         return ($this->status & self::STATUS_SUSPENDED) > 0;
     }
 
     /**
      * Returns whether this (external) domain has been verified
      * to exist in DNS.
      *
      * @return bool
      */
     public function isVerified(): bool
     {
         return ($this->status & self::STATUS_VERIFIED) > 0;
     }
 
     /**
      * Ensure the namespace is appropriately cased.
      */
     public function setNamespaceAttribute($namespace)
     {
         $this->attributes['namespace'] = strtolower($namespace);
     }
 
     /**
      * Domain status mutator
      *
      * @throws \Exception
      */
     public function setStatusAttribute($status)
     {
         $new_status = 0;
 
         $allowed_values = [
             self::STATUS_NEW,
             self::STATUS_ACTIVE,
             self::STATUS_SUSPENDED,
             self::STATUS_DELETED,
             self::STATUS_CONFIRMED,
             self::STATUS_VERIFIED,
             self::STATUS_LDAP_READY,
         ];
 
         foreach ($allowed_values as $value) {
             if ($status & $value) {
                 $new_status |= $value;
                 $status ^= $value;
             }
         }
 
         if ($status > 0) {
             throw new \Exception("Invalid domain status: {$status}");
         }
 
         if ($this->isPublic()) {
             $this->attributes['status'] = $new_status;
             return;
         }
 
         if ($new_status & self::STATUS_CONFIRMED) {
             // if we have confirmed ownership of or management access to the domain, then we have
             // also confirmed the domain exists in DNS.
             $new_status |= self::STATUS_VERIFIED;
             $new_status |= self::STATUS_ACTIVE;
         }
 
         if ($new_status & self::STATUS_DELETED && $new_status & self::STATUS_ACTIVE) {
             $new_status ^= self::STATUS_ACTIVE;
         }
 
         if ($new_status & self::STATUS_SUSPENDED && $new_status & self::STATUS_ACTIVE) {
             $new_status ^= self::STATUS_ACTIVE;
         }
 
         // if the domain is now active, it is not new anymore.
         if ($new_status & self::STATUS_ACTIVE && $new_status & self::STATUS_NEW) {
             $new_status ^= self::STATUS_NEW;
         }
 
         $this->attributes['status'] = $new_status;
     }
 
     /**
      * Ownership verification by checking for a TXT (or CNAME) record
      * in the domain's DNS (that matches the verification hash).
      *
      * @return bool True if verification was successful, false otherwise
      * @throws \Exception Throws exception on DNS or DB errors
      */
     public function confirm(): bool
     {
         if ($this->isConfirmed()) {
             return true;
         }
 
         $hash = $this->hash(self::HASH_TEXT);
         $confirmed = false;
 
         // Get DNS records and find a matching TXT entry
         $records = \dns_get_record($this->namespace, DNS_TXT);
 
         if ($records === false) {
             throw new \Exception("Failed to get DNS record for {$this->namespace}");
         }
 
         foreach ($records as $record) {
             if ($record['txt'] === $hash) {
                 $confirmed = true;
                 break;
             }
         }
 
         // Get DNS records and find a matching CNAME entry
         // Note: some servers resolve every non-existing name
         // so we need to define left and right side of the CNAME record
         // i.e.: kolab-verify IN CNAME <hash>.domain.tld.
         if (!$confirmed) {
             $cname = $this->hash(self::HASH_CODE) . '.' . $this->namespace;
             $records = \dns_get_record('kolab-verify.' . $this->namespace, DNS_CNAME);
 
             if ($records === false) {
                 throw new \Exception("Failed to get DNS record for {$this->namespace}");
             }
 
             foreach ($records as $records) {
                 if ($records['target'] === $cname) {
                     $confirmed = true;
                     break;
                 }
             }
         }
 
         if ($confirmed) {
             $this->status |= Domain::STATUS_CONFIRMED;
             $this->save();
         }
 
         return $confirmed;
     }
 
     /**
      * Generate a verification hash for this domain
      *
      * @param int $mod One of: HASH_CNAME, HASH_CODE (Default), HASH_TEXT
      *
      * @return string Verification hash
      */
     public function hash($mod = null): string
     {
         $cname = 'kolab-verify';
 
         if ($mod === self::HASH_CNAME) {
             return $cname;
         }
 
         $hash = \md5('hkccp-verify-' . $this->namespace);
 
         return $mod === self::HASH_TEXT ? "$cname=$hash" : $hash;
     }
 
     /**
      * Suspend this domain.
      *
      * @return void
      */
     public function suspend(): void
     {
         if ($this->isSuspended()) {
             return;
         }
 
         $this->status |= Domain::STATUS_SUSPENDED;
         $this->save();
     }
 
     /**
      * Unsuspend this domain.
      *
      * The domain is unsuspended through either of the following courses of actions;
      *
      *   * The account balance has been topped up, or
      *   * a suspected spammer has resolved their issues, or
      *   * the command-line is triggered.
      *
      * Therefore, we can also confidently set the domain status to 'active' should the ownership of or management
      * access to have been confirmed before.
      *
      * @return void
      */
     public function unsuspend(): void
     {
         if (!$this->isSuspended()) {
             return;
         }
 
         $this->status ^= Domain::STATUS_SUSPENDED;
 
         if ($this->isConfirmed() && $this->isVerified()) {
             $this->status |= Domain::STATUS_ACTIVE;
         }
 
         $this->save();
     }
 
     /**
      * Verify if a domain exists in DNS
      *
      * @return bool True if registered, False otherwise
      * @throws \Exception Throws exception on DNS or DB errors
      */
     public function verify(): bool
     {
         if ($this->isVerified()) {
             return true;
         }
 
         $records = \dns_get_record($this->namespace, DNS_ANY);
 
         if ($records === false) {
             throw new \Exception("Failed to get DNS record for {$this->namespace}");
         }
 
         // It may happen that result contains other domains depending on the host DNS setup
         // that's why in_array() and not just !empty()
         if (in_array($this->namespace, array_column($records, 'host'))) {
             $this->status |= Domain::STATUS_VERIFIED;
             $this->save();
 
             return true;
         }
 
         return false;
     }
 
     /**
      * Returns the wallet by which the domain is controlled
      *
      * @return \App\Wallet A wallet object
      */
     public function wallet(): ?Wallet
     {
         // Note: Not all domains have a entitlement/wallet
         $entitlement = $this->entitlement()->withTrashed()->first();
 
         return $entitlement ? $entitlement->wallet : null;
     }
 }
diff --git a/src/app/Group.php b/src/app/Group.php
new file mode 100644
index 00000000..5661f232
--- /dev/null
+++ b/src/app/Group.php
@@ -0,0 +1,280 @@
+<?php
+
+namespace App;
+
+use App\Wallet;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * The eloquent definition of a Group.
+ *
+ * @property int    $id      The group identifier
+ * @property string $email   An email address
+ * @property string $members A comma-separated list of email addresses
+ * @property int    $status  The group status
+ */
+class Group extends Model
+{
+    use SoftDeletes;
+
+    // we've simply never heard of this domain
+    public const STATUS_NEW        = 1 << 0;
+    // it's been activated
+    public const STATUS_ACTIVE     = 1 << 1;
+    // domain has been suspended.
+    public const STATUS_SUSPENDED  = 1 << 2;
+    // domain has been deleted
+    public const STATUS_DELETED    = 1 << 3;
+    // domain has been created in LDAP
+    public const STATUS_LDAP_READY = 1 << 4;
+
+    public $incrementing = false;
+
+    protected $keyType = 'bigint';
+
+    protected $fillable = [
+        'email',
+        'status',
+        'members'
+    ];
+
+    /**
+     * Assign the group to a wallet.
+     *
+     * @param \App\Wallet $wallet The wallet
+     *
+     * @return \App\Group Self
+     * @throws \Exception
+     */
+    public function assignToWallet(Wallet $wallet): Group
+    {
+        if (empty($this->id)) {
+            throw new \Exception("Group not yet exists");
+        }
+
+        if ($this->entitlement()->count()) {
+            throw new \Exception("Group already assigned to a wallet");
+        }
+
+        $sku = \App\Sku::where('title', 'group')->first();
+        $exists = $wallet->entitlements()->where('sku_id', $sku->id)->count();
+
+        \App\Entitlement::create([
+            'wallet_id' => $wallet->id,
+            'sku_id' => $sku->id,
+            'cost' => $exists >= $sku->units_free ? $sku->cost : 0,
+            'entitleable_id' => $this->id,
+            'entitleable_type' => Group::class
+        ]);
+
+        return $this;
+    }
+
+    /**
+     * Returns group domain.
+     *
+     * @return ?\App\Domain The domain group belongs to, NULL if it does not exist
+     */
+    public function domain(): ?Domain
+    {
+        list($local, $domainName) = explode('@', $this->email);
+
+        return Domain::where('namespace', $domainName)->first();
+    }
+
+    /**
+     * Find whether an email address exists as a group (including deleted groups).
+     *
+     * @param string $email        Email address
+     * @param bool   $return_group Return Group instance instead of boolean
+     *
+     * @return \App\Group|bool True or Group model object if found, False otherwise
+     */
+    public static function emailExists(string $email, bool $return_group = false)
+    {
+        if (strpos($email, '@') === false) {
+            return false;
+        }
+
+        $email = \strtolower($email);
+
+        $group = self::withTrashed()->where('email', $email)->first();
+
+        if ($group) {
+            return $return_group ? $group : true;
+        }
+
+        return false;
+    }
+
+    /**
+     * The group entitlement.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphOne
+     */
+    public function entitlement()
+    {
+        return $this->morphOne('App\Entitlement', 'entitleable');
+    }
+
+    /**
+     * Group members propert accessor. Converts internal comma-separated list into an array
+     *
+     * @param string $members Comma-separated list of email addresses
+     *
+     * @return array Email addresses of the group members, as an array
+     */
+    public function getMembersAttribute($members): array
+    {
+        return $members ? explode(',', $members) : [];
+    }
+
+    /**
+     * Returns whether this domain is active.
+     *
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return ($this->status & self::STATUS_ACTIVE) > 0;
+    }
+
+    /**
+     * Returns whether this domain is deleted.
+     *
+     * @return bool
+     */
+    public function isDeleted(): bool
+    {
+        return ($this->status & self::STATUS_DELETED) > 0;
+    }
+
+    /**
+     * Returns whether this domain is new.
+     *
+     * @return bool
+     */
+    public function isNew(): bool
+    {
+        return ($this->status & self::STATUS_NEW) > 0;
+    }
+
+    /**
+     * Returns whether this domain is registered in LDAP.
+     *
+     * @return bool
+     */
+    public function isLdapReady(): bool
+    {
+        return ($this->status & self::STATUS_LDAP_READY) > 0;
+    }
+
+    /**
+     * Returns whether this domain is suspended.
+     *
+     * @return bool
+     */
+    public function isSuspended(): bool
+    {
+        return ($this->status & self::STATUS_SUSPENDED) > 0;
+    }
+
+    /**
+     * Ensure the email is appropriately cased.
+     *
+     * @param string $email Group email address
+     */
+    public function setEmailAttribute(string $email)
+    {
+        $this->attributes['email'] = strtolower($email);
+    }
+
+    /**
+     * Ensure the members are appropriately formatted.
+     *
+     * @param array $members Email addresses of the group members
+     */
+    public function setMembersAttribute(array $members): void
+    {
+        $members = array_unique(array_filter(array_map('strtolower', $members)));
+
+        sort($members);
+
+        $this->attributes['members'] = implode(',', $members);
+    }
+
+    /**
+     * Group status mutator
+     *
+     * @throws \Exception
+     */
+    public function setStatusAttribute($status)
+    {
+        $new_status = 0;
+
+        $allowed_values = [
+            self::STATUS_NEW,
+            self::STATUS_ACTIVE,
+            self::STATUS_SUSPENDED,
+            self::STATUS_DELETED,
+            self::STATUS_LDAP_READY,
+        ];
+
+        foreach ($allowed_values as $value) {
+            if ($status & $value) {
+                $new_status |= $value;
+                $status ^= $value;
+            }
+        }
+
+        if ($status > 0) {
+            throw new \Exception("Invalid group status: {$status}");
+        }
+
+        $this->attributes['status'] = $new_status;
+    }
+
+    /**
+     * Suspend this group.
+     *
+     * @return void
+     */
+    public function suspend(): void
+    {
+        if ($this->isSuspended()) {
+            return;
+        }
+
+        $this->status |= Group::STATUS_SUSPENDED;
+        $this->save();
+    }
+
+    /**
+     * Unsuspend this group.
+     *
+     * @return void
+     */
+    public function unsuspend(): void
+    {
+        if (!$this->isSuspended()) {
+            return;
+        }
+
+        $this->status ^= Group::STATUS_SUSPENDED;
+        $this->save();
+    }
+
+    /**
+     * Returns the wallet by which the group is controlled
+     *
+     * @return \App\Wallet A wallet object
+     */
+    public function wallet(): ?Wallet
+    {
+        // Note: Not all domains have a entitlement/wallet
+        $entitlement = $this->entitlement()->withTrashed()->first();
+
+        return $entitlement ? $entitlement->wallet : null;
+    }
+}
diff --git a/src/app/Handlers/Activesync.php b/src/app/Handlers/Activesync.php
index ad54abd1..98e3fc0a 100644
--- a/src/app/Handlers/Activesync.php
+++ b/src/app/Handlers/Activesync.php
@@ -1,26 +1,43 @@
 <?php
 
 namespace App\Handlers;
 
 class Activesync extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\User::class;
     }
 
-    public static function preReq($entitlement, $object): bool
+    /**
+     * SKU handler metadata.
+     *
+     * @param \App\Sku $sku The SKU object
+     *
+     * @return array
+     */
+    public static function metadata(\App\Sku $sku): array
     {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
+        $data = parent::metadata($sku);
 
-        return true;
+        $data['required'] = ['groupware'];
+
+        return $data;
     }
 
+    /**
+     * The priority that specifies the order of SKUs in UI.
+     * Higher number means higher on the list.
+     *
+     * @return int
+     */
     public static function priority(): int
     {
         return 70;
     }
 }
diff --git a/src/app/Handlers/Auth2F.php b/src/app/Handlers/Auth2F.php
index f408c9f4..a7651e83 100644
--- a/src/app/Handlers/Auth2F.php
+++ b/src/app/Handlers/Auth2F.php
@@ -1,26 +1,43 @@
 <?php
 
 namespace App\Handlers;
 
 class Auth2F extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\User::class;
     }
 
-    public static function preReq($entitlement, $object): bool
+    /**
+     * SKU handler metadata.
+     *
+     * @param \App\Sku $sku The SKU object
+     *
+     * @return array
+     */
+    public static function metadata(\App\Sku $sku): array
     {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
+        $data = parent::metadata($sku);
 
-        return true;
+        $data['forbidden'] = ['activesync'];
+
+        return $data;
     }
 
+    /**
+     * The priority that specifies the order of SKUs in UI.
+     * Higher number means higher on the list.
+     *
+     * @return int
+     */
     public static function priority(): int
     {
         return 60;
     }
 }
diff --git a/src/app/Handlers/Base.php b/src/app/Handlers/Base.php
index 4574b4de..349641e2 100644
--- a/src/app/Handlers/Base.php
+++ b/src/app/Handlers/Base.php
@@ -1,40 +1,107 @@
 <?php
 
 namespace App\Handlers;
 
 abstract class Base
 {
     /**
      * The entitleable class for this handler.
      *
      * @return string
      */
     public static function entitleableClass(): string
     {
         return '';
     }
 
+    /**
+     * Check if the SKU is available to the user. An SKU is available
+     * to the user when either it is active or there's already an
+     * active entitlement.
+     *
+     * @param \App\Sku  $sku  The SKU object
+     * @param \App\User $user The user object
+     *
+     * @return bool
+     */
+    public static function isAvailable(\App\Sku $sku, \App\User $user): bool
+    {
+        if (!$sku->active) {
+            if (!$user->entitlements()->where('sku_id', $sku->id)->first()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Metadata of this SKU handler.
+     *
+     * @param \App\Sku $sku The SKU object
+     *
+     * @return array
+     */
+    public static function metadata(\App\Sku $sku): array
+    {
+        $handler = explode('\\', static::class);
+        $handler = strtolower(end($handler));
+
+        $type = explode('\\', static::entitleableClass());
+        $type = strtolower(end($type));
+
+        return [
+            // entitleable type
+            'type' => $type,
+            // handler (as a keyword)
+            'handler' => $handler,
+            // readonly entitlement state cannot be changed
+            'readonly' => false,
+            // is entitlement enabled by default?
+            'enabled' => false,
+            // priority on the entitlements list
+            'prio' => static::priority(),
+        ];
+    }
+
     /**
      * Prerequisites for the Entitlement to be applied to the object.
      *
      * @param \App\Entitlement $entitlement
      * @param mixed $object
      *
      * @return bool
      */
     public static function preReq($entitlement, $object): bool
     {
+        $type = static::entitleableClass();
+
+        if (empty($type) || empty($entitlement->entitleable_type)) {
+            \Log::error("Entitleable class/type not specified");
+            return false;
+        }
+
+        if ($type !== $entitlement->entitleable_type) {
+            \Log::error("Entitleable class mismatch");
+            return false;
+        }
+
+        if (!$entitlement->sku->active) {
+            \Log::error("Sku not active");
+            return false;
+        }
+
         return true;
     }
 
     /**
      * The priority that specifies the order of SKUs in UI.
      * Higher number means higher on the list.
      *
      * @return int
      */
     public static function priority(): int
     {
         return 0;
     }
 }
diff --git a/src/app/Handlers/Base.php b/src/app/Handlers/Beta.php
similarity index 65%
copy from src/app/Handlers/Base.php
copy to src/app/Handlers/Beta.php
index 4574b4de..f54d3302 100644
--- a/src/app/Handlers/Base.php
+++ b/src/app/Handlers/Beta.php
@@ -1,40 +1,48 @@
 <?php
 
 namespace App\Handlers;
 
-abstract class Base
+class Beta extends \App\Handlers\Base
 {
     /**
      * The entitleable class for this handler.
      *
      * @return string
      */
     public static function entitleableClass(): string
     {
-        return '';
+        return \App\User::class;
     }
 
     /**
      * Prerequisites for the Entitlement to be applied to the object.
      *
      * @param \App\Entitlement $entitlement
      * @param mixed $object
      *
      * @return bool
      */
     public static function preReq($entitlement, $object): bool
     {
+        // We allow inactive "beta" Sku to be assigned
+
+        if (self::entitleableClass() !== $entitlement->entitleable_type) {
+            \Log::error("Entitleable class mismatch");
+            return false;
+        }
+
         return true;
     }
 
     /**
      * The priority that specifies the order of SKUs in UI.
      * Higher number means higher on the list.
      *
      * @return int
      */
     public static function priority(): int
     {
-        return 0;
+        // Just above all other beta SKUs, please
+        return 10;
     }
 }
diff --git a/src/app/Handlers/Beta/Base.php b/src/app/Handlers/Beta/Base.php
new file mode 100644
index 00000000..59130120
--- /dev/null
+++ b/src/app/Handlers/Beta/Base.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Handlers\Beta;
+
+class Base extends \App\Handlers\Base
+{
+    /**
+     * Check if the SKU is available to the user.
+     *
+     * @param \App\Sku  $sku  The SKU object
+     * @param \App\User $user The user object
+     *
+     * @return bool
+     */
+    public static function isAvailable(\App\Sku $sku, \App\User $user): bool
+    {
+        // These SKUs must be:
+        // 1) already assigned or
+        // 2) active and a 'beta' entitlement must exist.
+
+        if ($sku->active) {
+            $beta = \App\Sku::where('title', 'beta')->first();
+            if (!$beta) {
+                return false;
+            }
+
+            if ($user->entitlements()->where('sku_id', $beta->id)->first()) {
+                return true;
+            }
+        } else {
+            if ($user->entitlements()->where('sku_id', $sku->id)->first()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * SKU handler metadata.
+     *
+     * @param \App\Sku $sku The SKU object
+     *
+     * @return array
+     */
+    public static function metadata(\App\Sku $sku): array
+    {
+        $data = parent::metadata($sku);
+
+        $data['required'] = ['beta'];
+
+        return $data;
+    }
+
+    /**
+     * Prerequisites for the Entitlement to be applied to the object.
+     *
+     * @param \App\Entitlement $entitlement
+     * @param mixed            $object
+     *
+     * @return bool
+     */
+    public static function preReq($entitlement, $object): bool
+    {
+        if (!parent::preReq($entitlement, $object)) {
+            return false;
+        }
+
+        // TODO: User has to have the "beta" entitlement
+
+        return true;
+    }
+}
diff --git a/src/app/Handlers/Domain.php b/src/app/Handlers/Domain.php
index fd2b8282..7bb76797 100644
--- a/src/app/Handlers/Domain.php
+++ b/src/app/Handlers/Domain.php
@@ -1,21 +1,16 @@
 <?php
 
 namespace App\Handlers;
 
 class Domain extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\Domain::class;
     }
-
-    public static function preReq($entitlement, $domain): bool
-    {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/src/app/Handlers/DomainHosting.php b/src/app/Handlers/DomainHosting.php
index f599dec2..4350b077 100644
--- a/src/app/Handlers/DomainHosting.php
+++ b/src/app/Handlers/DomainHosting.php
@@ -1,21 +1,16 @@
 <?php
 
 namespace App\Handlers;
 
 class DomainHosting extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\Domain::class;
     }
-
-    public static function preReq($entitlement, $domain): bool
-    {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/src/app/Handlers/DomainRegistration.php b/src/app/Handlers/DomainRegistration.php
index 78116392..77ad1fe5 100644
--- a/src/app/Handlers/DomainRegistration.php
+++ b/src/app/Handlers/DomainRegistration.php
@@ -1,21 +1,16 @@
 <?php
 
 namespace App\Handlers;
 
 class DomainRegistration extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\Domain::class;
     }
-
-    public static function preReq($entitlement, $domain): bool
-    {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/src/app/Handlers/DomainRelay.php b/src/app/Handlers/DomainRelay.php
index 69e298aa..d96fe7c8 100644
--- a/src/app/Handlers/DomainRelay.php
+++ b/src/app/Handlers/DomainRelay.php
@@ -1,21 +1,16 @@
 <?php
 
 namespace App\Handlers;
 
 class DomainRelay extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\Domain::class;
     }
-
-    public static function preReq($entitlement, $domain): bool
-    {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/src/app/Handlers/Group.php b/src/app/Handlers/Group.php
new file mode 100644
index 00000000..6f09b9f1
--- /dev/null
+++ b/src/app/Handlers/Group.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Handlers;
+
+class Group extends \App\Handlers\Base
+{
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
+    public static function entitleableClass(): string
+    {
+        return \App\Group::class;
+    }
+}
diff --git a/src/app/Handlers/Groupware.php b/src/app/Handlers/Groupware.php
index 9bc574dc..26bf73c3 100644
--- a/src/app/Handlers/Groupware.php
+++ b/src/app/Handlers/Groupware.php
@@ -1,32 +1,27 @@
 <?php
 
 namespace App\Handlers;
 
 class Groupware extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\User::class;
     }
 
-    public static function preReq($entitlement, $user): bool
-    {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * The priority that specifies the order of SKUs in UI.
      * Higher number means higher on the list.
      *
      * @return int
      */
     public static function priority(): int
     {
         return 80;
     }
 }
diff --git a/src/app/Handlers/Mailbox.php b/src/app/Handlers/Mailbox.php
index f255c390..b28a1d88 100644
--- a/src/app/Handlers/Mailbox.php
+++ b/src/app/Handlers/Mailbox.php
@@ -1,50 +1,45 @@
 <?php
 
 namespace App\Handlers;
 
 class Mailbox extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\User::class;
     }
 
-    public static function preReq($entitlement, $user): bool
+    /**
+     * SKU handler metadata.
+     *
+     * @param \App\Sku $sku The SKU object
+     *
+     * @return array
+     */
+    public static function metadata(\App\Sku $sku): array
     {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-/*
-        FIXME: This code prevents from creating initial mailbox SKU
-               on signup of group account, because User::domains()
-               does not return the new domain.
-               Either we make sure to create domain entitlement before mailbox
-               entitlement or make the method here aware of that case or?
-
-        list($local, $domain) = explode('@', $user->email);
-
-        $domains = $user->domains();
+        $data = parent::metadata($sku);
 
-        foreach ($domains as $_domain) {
-            if ($domain == $_domain->namespace) {
-                return true;
-            }
-        }
+        // Mailbox is always enabled and cannot be unset
+        $data['readonly'] = true;
+        $data['enabled'] = true;
 
-        \Log::info("Domain not for user");
-*/
-        return true;
+        return $data;
     }
 
     /**
      * The priority that specifies the order of SKUs in UI.
      * Higher number means higher on the list.
      *
      * @return int
      */
     public static function priority(): int
     {
         return 100;
     }
 }
diff --git a/src/app/Handlers/Base.php b/src/app/Handlers/Meet.php
similarity index 56%
copy from src/app/Handlers/Base.php
copy to src/app/Handlers/Meet.php
index 4574b4de..277f1138 100644
--- a/src/app/Handlers/Base.php
+++ b/src/app/Handlers/Meet.php
@@ -1,40 +1,43 @@
 <?php
 
 namespace App\Handlers;
 
-abstract class Base
+class Meet extends Base
 {
     /**
      * The entitleable class for this handler.
      *
      * @return string
      */
     public static function entitleableClass(): string
     {
-        return '';
+        return \App\User::class;
     }
 
     /**
-     * Prerequisites for the Entitlement to be applied to the object.
+     * SKU handler metadata.
      *
-     * @param \App\Entitlement $entitlement
-     * @param mixed $object
+     * @param \App\Sku $sku The SKU object
      *
-     * @return bool
+     * @return array
      */
-    public static function preReq($entitlement, $object): bool
+    public static function metadata(\App\Sku $sku): array
     {
-        return true;
+        $data = parent::metadata($sku);
+
+        $data['required'] = ['groupware'];
+
+        return $data;
     }
 
     /**
      * The priority that specifies the order of SKUs in UI.
      * Higher number means higher on the list.
      *
      * @return int
      */
     public static function priority(): int
     {
-        return 0;
+        return 50;
     }
 }
diff --git a/src/app/Handlers/Resource.php b/src/app/Handlers/Resource.php
index 66cf6b03..4e6e3bd9 100644
--- a/src/app/Handlers/Resource.php
+++ b/src/app/Handlers/Resource.php
@@ -1,22 +1,17 @@
 <?php
 
 namespace App\Handlers;
 
 class Resource extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         // TODO
         return '';
     }
-
-    public static function preReq($entitlement, $owner): bool
-    {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/src/app/Handlers/SharedFolder.php b/src/app/Handlers/SharedFolder.php
index 96b13ccb..52a8963e 100644
--- a/src/app/Handlers/SharedFolder.php
+++ b/src/app/Handlers/SharedFolder.php
@@ -1,22 +1,17 @@
 <?php
 
 namespace App\Handlers;
 
 class SharedFolder extends \App\Handlers\Base
 {
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         // TODO
         return '';
     }
-
-    public static function preReq($entitlement, $owner): bool
-    {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
-
-        return true;
-    }
 }
diff --git a/src/app/Handlers/Storage.php b/src/app/Handlers/Storage.php
index 340a4b4e..85a17125 100644
--- a/src/app/Handlers/Storage.php
+++ b/src/app/Handlers/Storage.php
@@ -1,37 +1,52 @@
 <?php
 
 namespace App\Handlers;
 
 class Storage extends \App\Handlers\Base
 {
     public const MAX_ITEMS = 100;
     public const ITEM_UNIT = 'GB';
 
+    /**
+     * The entitleable class for this handler.
+     *
+     * @return string
+     */
     public static function entitleableClass(): string
     {
         return \App\User::class;
     }
 
-    public static function preReq($entitlement, $object): bool
+    /**
+     * SKU handler metadata.
+     *
+     * @param \App\Sku $sku The SKU object
+     *
+     * @return array
+     */
+    public static function metadata(\App\Sku $sku): array
     {
-        if (!$entitlement->sku->active) {
-            \Log::error("Sku not active");
-            return false;
-        }
+        $data = parent::metadata($sku);
 
-        // TODO: The storage can not be modified to below what is already consumed.
+        $data['readonly'] = true; // only the checkbox will be disabled, not range
+        $data['enabled'] = true;
+        $data['range'] = [
+           'min' => $sku->units_free,
+           'max' => self::MAX_ITEMS,
+           'unit' => self::ITEM_UNIT,
+        ];
 
-        return true;
+        return $data;
     }
 
     /**
      * The priority that specifies the order of SKUs in UI.
      * Higher number means higher on the list.
      *
      * @return int
      */
     public static function priority(): int
     {
         return 90;
     }
 }
diff --git a/src/app/Http/Controllers/API/SignupController.php b/src/app/Http/Controllers/API/SignupController.php
index 96ec5d2a..b1a69e2f 100644
--- a/src/app/Http/Controllers/API/SignupController.php
+++ b/src/app/Http/Controllers/API/SignupController.php
@@ -1,380 +1,380 @@
 <?php
 
 namespace App\Http\Controllers\API;
 
 use App\Http\Controllers\Controller;
 use App\Jobs\SignupVerificationEmail;
 use App\Jobs\SignupVerificationSMS;
 use App\Discount;
 use App\Domain;
 use App\Plan;
 use App\Rules\ExternalEmail;
 use App\Rules\UserEmailDomain;
 use App\Rules\UserEmailLocal;
 use App\SignupCode;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 
 /**
  * Signup process API
  */
 class SignupController extends Controller
 {
     /** @var ?\App\SignupCode A verification code object */
     protected $code;
 
     /** @var ?\App\Plan Signup plan object */
     protected $plan;
 
 
     /**
      * Returns plans definitions for signup.
      *
      * @param \Illuminate\Http\Request $request HTTP request
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
     public function plans(Request $request)
     {
         $plans = [];
 
         // Use reverse order just to have individual on left, group on right ;)
         Plan::select()->orderByDesc('title')->get()->map(function ($plan) use (&$plans) {
             $plans[] = [
                 'title' => $plan->title,
                 'name' => $plan->name,
                 'button' => __('app.planbutton', ['plan' => $plan->name]),
                 'description' => $plan->description,
             ];
         });
 
         return response()->json(['status' => 'success', 'plans' => $plans]);
     }
 
     /**
      * Starts signup process.
      *
      * Verifies user name and email/phone, sends verification email/sms message.
      * Returns the verification code.
      *
      * @param \Illuminate\Http\Request $request HTTP request
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
     public function init(Request $request)
     {
         // Check required fields
         $v = Validator::make(
             $request->all(),
             [
                 'email' => 'required',
                 'first_name' => 'max:128',
                 'last_name' => 'max:128',
                 'plan' => 'nullable|alpha_num|max:128',
                 'voucher' => 'max:32',
             ]
         );
 
         $is_phone = false;
         $errors = $v->fails() ? $v->errors()->toArray() : [];
 
         // Validate user email (or phone)
         if (empty($errors['email'])) {
             if ($error = $this->validatePhoneOrEmail($request->email, $is_phone)) {
                 $errors['email'] = $error;
             }
         }
 
         if (!empty($errors)) {
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         // Generate the verification code
         $code = SignupCode::create([
                 'data' => [
                     'email' => $request->email,
                     'first_name' => $request->first_name,
                     'last_name' => $request->last_name,
                     'plan' => $request->plan,
                     'voucher' => $request->voucher,
                 ]
         ]);
 
         // Send email/sms message
         if ($is_phone) {
             SignupVerificationSMS::dispatch($code);
         } else {
             SignupVerificationEmail::dispatch($code);
         }
 
         return response()->json(['status' => 'success', 'code' => $code->code]);
     }
 
     /**
      * Validation of the verification code.
      *
      * @param \Illuminate\Http\Request $request HTTP request
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
     public function verify(Request $request)
     {
         // Validate the request args
         $v = Validator::make(
             $request->all(),
             [
                 'code' => 'required',
                 'short_code' => 'required',
             ]
         );
 
         if ($v->fails()) {
             return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
         }
 
         // Validate the verification code
         $code = SignupCode::find($request->code);
 
         if (
             empty($code)
             || $code->isExpired()
             || Str::upper($request->short_code) !== Str::upper($code->short_code)
         ) {
             $errors = ['short_code' => "The code is invalid or expired."];
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         // For signup last-step mode remember the code object, so we can delete it
         // with single SQL query (->delete()) instead of two (::destroy())
         $this->code = $code;
 
         $has_domain = $this->getPlan()->hasDomain();
 
         // Return user name and email/phone/voucher from the codes database,
         // domains list for selection and "plan type" flag
         return response()->json([
                 'status' => 'success',
                 'email' => $code->data['email'],
                 'first_name' => $code->data['first_name'],
                 'last_name' => $code->data['last_name'],
                 'voucher' => $code->data['voucher'],
                 'is_domain' => $has_domain,
                 'domains' => $has_domain ? [] : Domain::getPublicDomains(),
         ]);
     }
 
     /**
      * Finishes the signup process by creating the user account.
      *
      * @param \Illuminate\Http\Request $request HTTP request
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
     public function signup(Request $request)
     {
         // Validate input
         $v = Validator::make(
             $request->all(),
             [
                 'login' => 'required|min:2',
                 'password' => 'required|min:4|confirmed',
                 'domain' => 'required',
                 'voucher' => 'max:32',
             ]
         );
 
         if ($v->fails()) {
             return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
         }
 
         // Validate verification codes (again)
         $v = $this->verify($request);
         if ($v->status() !== 200) {
             return $v;
         }
 
         // Find the voucher discount
         if ($request->voucher) {
             $discount = Discount::where('code', \strtoupper($request->voucher))
                 ->where('active', true)->first();
 
             if (!$discount) {
                 $errors = ['voucher' => \trans('validation.voucherinvalid')];
                 return response()->json(['status' => 'error', 'errors' => $errors], 422);
             }
         }
 
         // Get the plan
         $plan = $this->getPlan();
         $is_domain = $plan->hasDomain();
 
         $login = $request->login;
         $domain_name = $request->domain;
 
         // Validate login
         if ($errors = self::validateLogin($login, $domain_name, $is_domain)) {
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         // Get user name/email from the verification code database
         $code_data  = $v->getData();
         $user_email = $code_data->email;
 
         // We allow only ASCII, so we can safely lower-case the email address
         $login = Str::lower($login);
         $domain_name = Str::lower($domain_name);
         $domain = null;
 
         DB::beginTransaction();
 
         // Create domain record
         if ($is_domain) {
             $domain = Domain::create([
                     'namespace' => $domain_name,
                     'status' => Domain::STATUS_NEW,
                     'type' => Domain::TYPE_EXTERNAL,
             ]);
         }
 
         // Create user record
         $user = User::create([
                 'email' => $login . '@' . $domain_name,
                 'password' => $request->password,
         ]);
 
         if (!empty($discount)) {
             $wallet = $user->wallets()->first();
             $wallet->discount()->associate($discount);
             $wallet->save();
         }
 
         $user->assignPlan($plan, $domain);
 
         // Save the external email and plan in user settings
         $user->setSettings([
                 'external_email' => $user_email,
                 'first_name' => $code_data->first_name,
                 'last_name' => $code_data->last_name,
         ]);
 
         // Remove the verification code
         $this->code->delete();
 
         DB::commit();
 
         return AuthController::logonResponse($user);
     }
 
     /**
      * Returns plan for the signup process
      *
      * @returns \App\Plan Plan object selected for current signup process
      */
     protected function getPlan()
     {
         if (!$this->plan) {
             // Get the plan if specified and exists...
             if ($this->code && $this->code->data['plan']) {
                 $plan = Plan::where('title', $this->code->data['plan'])->first();
             }
 
             // ...otherwise use the default plan
             if (empty($plan)) {
                 // TODO: Get default plan title from config
                 $plan = Plan::where('title', 'individual')->first();
             }
 
             $this->plan = $plan;
         }
 
         return $this->plan;
     }
 
     /**
      * Checks if the input string is a valid email address or a phone number
      *
      * @param string $input    Email address or phone number
      * @param bool   $is_phone Will have been set to True if the string is valid phone number
      *
      * @return string Error message on validation error
      */
     protected static function validatePhoneOrEmail($input, &$is_phone = false): ?string
     {
         $is_phone = false;
 
         $v = Validator::make(
             ['email' => $input],
             ['email' => ['required', 'string', new ExternalEmail()]]
         );
 
         if ($v->fails()) {
             return $v->errors()->toArray()['email'][0];
         }
 
         // TODO: Phone number support
 /*
         $input = str_replace(array('-', ' '), '', $input);
 
         if (!preg_match('/^\+?[0-9]{9,12}$/', $input)) {
             return \trans('validation.noemailorphone');
         }
 
         $is_phone = true;
 */
         return null;
     }
 
     /**
      * Login (kolab identity) validation
      *
      * @param string $login    Login (local part of an email address)
      * @param string $domain   Domain name
      * @param bool   $external Enables additional checks for domain part
      *
      * @return array Error messages on validation error
      */
     protected static function validateLogin($login, $domain, $external = false): ?array
     {
         // Validate login part alone
         $v = Validator::make(
             ['login' => $login],
             ['login' => ['required', 'string', new UserEmailLocal($external)]]
         );
 
         if ($v->fails()) {
             return ['login' => $v->errors()->toArray()['login'][0]];
         }
 
         $domains = $external ? null : Domain::getPublicDomains();
 
         // Validate the domain
         $v = Validator::make(
             ['domain' => $domain],
             ['domain' => ['required', 'string', new UserEmailDomain($domains)]]
         );
 
         if ($v->fails()) {
             return ['domain' => $v->errors()->toArray()['domain'][0]];
         }
 
         $domain = Str::lower($domain);
 
         // Check if domain is already registered with us
         if ($external) {
             if (Domain::where('namespace', $domain)->first()) {
                 return ['domain' => \trans('validation.domainexists')];
             }
         }
 
         // Check if user with specified login already exists
         $email = $login . '@' . $domain;
-        if (User::emailExists($email)) {
+        if (User::emailExists($email) || User::aliasExists($email) || \App\Group::emailExists($email)) {
             return ['login' => \trans('validation.loginexists')];
         }
 
         return null;
     }
 }
diff --git a/src/app/Http/Controllers/API/V4/Admin/StatsController.php b/src/app/Http/Controllers/API/V4/Admin/StatsController.php
new file mode 100644
index 00000000..c7655f00
--- /dev/null
+++ b/src/app/Http/Controllers/API/V4/Admin/StatsController.php
@@ -0,0 +1,316 @@
+<?php
+
+namespace App\Http\Controllers\API\V4\Admin;
+
+use App\Providers\PaymentProvider;
+use App\User;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class StatsController extends \App\Http\Controllers\Controller
+{
+    public const COLOR_GREEN = '#48d368';       // '#28a745'
+    public const COLOR_GREEN_DARK = '#19692c';
+    public const COLOR_RED = '#e77681';         // '#dc3545'
+    public const COLOR_RED_DARK = '#a71d2a';
+    public const COLOR_BLUE = '#4da3ff';        // '#007bff'
+    public const COLOR_BLUE_DARK = '#0056b3';
+    public const COLOR_ORANGE = '#f1a539';
+
+    /**
+     * Fetch chart data
+     *
+     * @param string $chart Name of the chart
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function chart($chart)
+    {
+        if (!preg_match('/^[a-z-]+$/', $chart)) {
+            return $this->errorResponse(404);
+        }
+
+        $method = 'chart' . implode('', array_map('ucfirst', explode('-', $chart)));
+
+        if (!method_exists($this, $method)) {
+            return $this->errorResponse(404);
+        }
+
+        $result = $this->{$method}();
+
+        return response()->json($result);
+    }
+
+    /**
+     * Get discounts chart
+     */
+    protected function chartDiscounts(): array
+    {
+        $discounts = DB::table('wallets')
+            ->selectRaw("discount, count(discount_id) as cnt")
+            ->join('discounts', 'discounts.id', '=', 'wallets.discount_id')
+            ->join('users', 'users.id', '=', 'wallets.user_id')
+            ->where('discount', '>', 0)
+            ->whereNull('users.deleted_at')
+            ->groupBy('discounts.discount')
+            ->pluck('cnt', 'discount')
+            ->all();
+
+        $labels = array_keys($discounts);
+        $discounts = array_values($discounts);
+
+        // $labels = [10, 25, 30, 100];
+        // $discounts = [100, 120, 30, 50];
+
+        $labels = array_map(function ($item) {
+            return $item . '%';
+        }, $labels);
+
+        // See https://frappe.io/charts/docs for format/options description
+
+        return [
+            'title' => 'Discounts',
+            'type' => 'donut',
+            'colors' => [
+                self::COLOR_BLUE,
+                self::COLOR_BLUE_DARK,
+                self::COLOR_GREEN,
+                self::COLOR_GREEN_DARK,
+                self::COLOR_ORANGE,
+                self::COLOR_RED,
+                self::COLOR_RED_DARK
+            ],
+            'maxSlices' => 8,
+            'tooltipOptions' => [], // does not work without it (https://github.com/frappe/charts/issues/314)
+            'data' => [
+                'labels' => $labels,
+                'datasets' => [
+                    [
+                        'values' => $discounts
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Get income chart
+     */
+    protected function chartIncome(): array
+    {
+        $weeks = 8;
+        $start = Carbon::now();
+        $labels = [];
+
+        while ($weeks > 0) {
+            $labels[] = $start->format('Y-W');
+            $weeks--;
+            if ($weeks) {
+                $start->subWeeks(1);
+            }
+        }
+
+        $labels = array_reverse($labels);
+        $start->startOfWeek(Carbon::MONDAY);
+
+        $payments = DB::table('payments')
+            ->selectRaw("date_format(updated_at, '%Y-%v') as period, sum(amount) as amount")
+            ->where('updated_at', '>=', $start->toDateString())
+            ->where('status', PaymentProvider::STATUS_PAID)
+            ->whereIn('type', [PaymentProvider::TYPE_ONEOFF, PaymentProvider::TYPE_RECURRING])
+            ->groupByRaw('1')
+            ->pluck('amount', 'period')
+            ->map(function ($amount) {
+                return $amount / 100;
+            });
+
+        // TODO: exclude refunds/chargebacks
+
+        $empty = array_fill_keys($labels, 0);
+        $payments = array_values(array_merge($empty, $payments->all()));
+
+        // $payments = [1000, 1200.25, 3000, 1897.50, 2000, 1900, 2134, 3330];
+
+        $avg = collect($payments)->slice(0, count($labels) - 1)->avg();
+
+        // See https://frappe.io/charts/docs for format/options description
+
+        return [
+            'title' => 'Income in CHF - last 8 weeks',
+            'type' => 'bar',
+            'colors' => [self::COLOR_BLUE],
+            'axisOptions' => [
+                'xIsSeries' => true,
+            ],
+            'data' => [
+                'labels' => $labels,
+                'datasets' => [
+                    [
+                        // 'name' => 'Payments',
+                        'values' => $payments
+                    ]
+                ],
+                'yMarkers' => [
+                    [
+                        'label' => sprintf('average = %.2f', $avg),
+                        'value' => $avg,
+                        'options' => [ 'labelPos' => 'left' ] // default: 'right'
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Get created/deleted users chart
+     */
+    protected function chartUsers(): array
+    {
+        $weeks = 8;
+        $start = Carbon::now();
+        $labels = [];
+
+        while ($weeks > 0) {
+            $labels[] = $start->format('Y-W');
+            $weeks--;
+            if ($weeks) {
+                $start->subWeeks(1);
+            }
+        }
+
+        $labels = array_reverse($labels);
+        $start->startOfWeek(Carbon::MONDAY);
+
+        $created = DB::table('users')
+            ->selectRaw("date_format(created_at, '%Y-%v') as period, count(*) as cnt")
+            ->where('created_at', '>=', $start->toDateString())
+            ->groupByRaw('1')
+            ->get();
+
+        $deleted = DB::table('users')
+            ->selectRaw("date_format(deleted_at, '%Y-%v') as period, count(*) as cnt")
+            ->where('deleted_at', '>=', $start->toDateString())
+            ->groupByRaw('1')
+            ->get();
+
+        $empty = array_fill_keys($labels, 0);
+        $created = array_values(array_merge($empty, $created->pluck('cnt', 'period')->all()));
+        $deleted = array_values(array_merge($empty, $deleted->pluck('cnt', 'period')->all()));
+
+        // $created = [5, 2, 4, 2, 0, 5, 2, 4];
+        // $deleted = [1, 2, 3, 1, 2, 1, 2, 3];
+
+        $avg = collect($created)->slice(0, count($labels) - 1)->avg();
+
+        // See https://frappe.io/charts/docs for format/options description
+
+        return [
+            'title' => 'Users - last 8 weeks',
+            'type' => 'bar', // Required to fix https://github.com/frappe/charts/issues/294
+            'colors' => [self::COLOR_GREEN, self::COLOR_RED],
+            'axisOptions' => [
+                'xIsSeries' => true,
+            ],
+            'data' => [
+                'labels' => $labels,
+                'datasets' => [
+                    [
+                        'name' => 'Created',
+                        'chartType' => 'bar',
+                        'values' => $created
+                    ],
+                    [
+                        'name' => 'Deleted',
+                        'chartType' => 'line',
+                        'values' => $deleted
+                    ]
+                ],
+                'yMarkers' => [
+                    [
+                        'label' => sprintf('average = %.1f', $avg),
+                        'value' => collect($created)->avg(),
+                        'options' => [ 'labelPos' => 'left' ] // default: 'right'
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Get all users chart
+     */
+    protected function chartUsersAll(): array
+    {
+        $weeks = 54;
+        $start = Carbon::now();
+        $labels = [];
+
+        while ($weeks > 0) {
+            $labels[] = $start->format('Y-W');
+            $weeks--;
+            if ($weeks) {
+                $start->subWeeks(1);
+            }
+        }
+
+        $labels = array_reverse($labels);
+        $start->startOfWeek(Carbon::MONDAY);
+
+        $created = DB::table('users')
+            ->selectRaw("date_format(created_at, '%Y-%v') as period, count(*) as cnt")
+            ->where('created_at', '>=', $start->toDateString())
+            ->groupByRaw('1')
+            ->get();
+
+        $deleted = DB::table('users')
+            ->selectRaw("date_format(deleted_at, '%Y-%v') as period, count(*) as cnt")
+            ->where('deleted_at', '>=', $start->toDateString())
+            ->groupByRaw('1')
+            ->get();
+
+        $count = DB::table('users')->whereNull('deleted_at')->count();
+
+        $empty = array_fill_keys($labels, 0);
+        $created = array_merge($empty, $created->pluck('cnt', 'period')->all());
+        $deleted = array_merge($empty, $deleted->pluck('cnt', 'period')->all());
+        $all = [];
+
+        foreach (array_reverse($labels) as $label) {
+            $all[] = $count;
+            $count -= $created[$label] - $deleted[$label];
+        }
+
+        $all = array_reverse($all);
+
+        // $start = 3000;
+        // for ($i = 0; $i < count($labels); $i++) {
+        //     $all[$i] = $start + $i * 15;
+        // }
+
+        // See https://frappe.io/charts/docs for format/options description
+
+        return [
+            'title' => 'All Users - last year',
+            'type' => 'line',
+            'colors' => [self::COLOR_GREEN],
+            'axisOptions' => [
+                'xIsSeries' => true,
+                'xAxisMode' => 'tick',
+            ],
+            'lineOptions' => [
+                'hideDots' => true,
+                'regionFill' => true,
+            ],
+            'data' => [
+                'labels' => $labels,
+                'datasets' => [
+                    [
+                        // 'name' => 'Existing',
+                        'values' => $all
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/src/app/Http/Controllers/API/V4/Admin/WalletsController.php b/src/app/Http/Controllers/API/V4/Admin/WalletsController.php
index 1c8462be..f03e0563 100644
--- a/src/app/Http/Controllers/API/V4/Admin/WalletsController.php
+++ b/src/app/Http/Controllers/API/V4/Admin/WalletsController.php
@@ -1,148 +1,148 @@
 <?php
 
 namespace App\Http\Controllers\API\V4\Admin;
 
 use App\Discount;
 use App\Http\Controllers\API\V4\PaymentsController;
 use App\Providers\PaymentProvider;
 use App\Transaction;
 use App\Wallet;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
 class WalletsController extends \App\Http\Controllers\API\V4\WalletsController
 {
     /**
      * Return data of the specified wallet.
      *
      * @param string $id A wallet identifier
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function show($id)
     {
         $wallet = Wallet::find($id);
 
         if (empty($wallet)) {
             return $this->errorResponse(404);
         }
 
         $result = $wallet->toArray();
 
         $result['discount'] = 0;
         $result['discount_description'] = '';
 
         if ($wallet->discount) {
             $result['discount'] = $wallet->discount->discount;
             $result['discount_description'] = $wallet->discount->description;
         }
 
         $result['mandate'] = PaymentsController::walletMandate($wallet);
 
         $provider = PaymentProvider::factory($wallet);
 
         $result['provider'] = $provider->name();
         $result['providerLink'] = $provider->customerLink($wallet);
 
         return response()->json($result);
     }
 
     /**
      * Award/penalize a wallet.
      *
      * @param \Illuminate\Http\Request $request The API request.
      * @param string                   $id      Wallet identifier
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function oneOff(Request $request, $id)
     {
         $wallet = Wallet::find($id);
 
         if (empty($wallet)) {
             return $this->errorResponse(404);
         }
 
         // Check required fields
         $v = Validator::make(
             $request->all(),
             [
                 'amount' => 'required|numeric',
                 'description' => 'required|string|max:1024',
             ]
         );
 
         if ($v->fails()) {
             return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
         }
 
         $amount = (int) ($request->amount * 100);
         $type = $amount > 0 ? Transaction::WALLET_AWARD : Transaction::WALLET_PENALTY;
 
         DB::beginTransaction();
 
         $wallet->balance += $amount;
         $wallet->save();
 
         Transaction::create(
             [
                 'user_email' => \App\Utils::userEmailOrNull(),
                 'object_id' => $wallet->id,
                 'object_type' => Wallet::class,
                 'type' => $type,
-                'amount' => $amount < 0 ? $amount * -1 : $amount,
+                'amount' => $amount,
                 'description' => $request->description
             ]
         );
 
         DB::commit();
 
         $response = [
             'status' => 'success',
             'message' => \trans("app.wallet-{$type}-success"),
             'balance' => $wallet->balance
         ];
 
         return response()->json($response);
     }
 
     /**
      * Update wallet data.
      *
      * @param \Illuminate\Http\Request $request The API request.
      * @param string                   $id      Wallet identifier
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function update(Request $request, $id)
     {
         $wallet = Wallet::find($id);
 
         if (empty($wallet)) {
             return $this->errorResponse(404);
         }
 
         if (array_key_exists('discount', $request->input())) {
             if (empty($request->discount)) {
                 $wallet->discount()->dissociate();
                 $wallet->save();
             } elseif ($discount = Discount::find($request->discount)) {
                 $wallet->discount()->associate($discount);
                 $wallet->save();
             }
         }
 
         $response = $wallet->toArray();
 
         if ($wallet->discount) {
             $response['discount'] = $wallet->discount->discount;
             $response['discount_description'] = $wallet->discount->description;
         }
 
         $response['status'] = 'success';
         $response['message'] = \trans('app.wallet-update-success');
 
         return response()->json($response);
     }
 }
diff --git a/src/app/Http/Controllers/API/V4/OpenViduController.php b/src/app/Http/Controllers/API/V4/OpenViduController.php
new file mode 100644
index 00000000..99930635
--- /dev/null
+++ b/src/app/Http/Controllers/API/V4/OpenViduController.php
@@ -0,0 +1,590 @@
+<?php
+
+namespace App\Http\Controllers\API\V4;
+
+use App\Http\Controllers\Controller;
+use App\OpenVidu\Connection;
+use App\OpenVidu\Room;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
+
+class OpenViduController extends Controller
+{
+    public const AUTH_HEADER = 'X-Meet-Auth-Token';
+
+    /**
+     * Accept the room join request.
+     *
+     * @param string $id    Room identifier (name)
+     * @param string $reqid Request identifier
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function acceptJoinRequest($id, $reqid)
+    {
+        $room = Room::where('name', $id)->first();
+
+        // This isn't a room, bye bye
+        if (!$room) {
+            return $this->errorResponse(404, \trans('meet.room-not-found'));
+        }
+
+        // Only the moderator can do it
+        if (!$this->isModerator($room)) {
+            return $this->errorResponse(403);
+        }
+
+        if (!$room->requestAccept($reqid)) {
+            return $this->errorResponse(500, \trans('meet.session-request-accept-error'));
+        }
+
+        return response()->json(['status' => 'success']);
+    }
+
+    /**
+     * Deny the room join request.
+     *
+     * @param string $id    Room identifier (name)
+     * @param string $reqid Request identifier
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function denyJoinRequest($id, $reqid)
+    {
+        $room = Room::where('name', $id)->first();
+
+        // This isn't a room, bye bye
+        if (!$room) {
+            return $this->errorResponse(404, \trans('meet.room-not-found'));
+        }
+
+        // Only the moderator can do it
+        if (!$this->isModerator($room)) {
+            return $this->errorResponse(403);
+        }
+
+        if (!$room->requestDeny($reqid)) {
+            return $this->errorResponse(500, \trans('meet.session-request-deny-error'));
+        }
+
+        return response()->json(['status' => 'success']);
+    }
+
+    /**
+     * Close the room session.
+     *
+     * @param string $id Room identifier (name)
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function closeRoom($id)
+    {
+        $room = Room::where('name', $id)->first();
+
+        // This isn't a room, bye bye
+        if (!$room) {
+            return $this->errorResponse(404, \trans('meet.room-not-found'));
+        }
+
+        $user = Auth::guard()->user();
+
+        // Only the room owner can do it
+        if (!$user || $user->id != $room->user_id) {
+            return $this->errorResponse(403);
+        }
+
+        if (!$room->deleteSession()) {
+            return $this->errorResponse(500, \trans('meet.session-close-error'));
+        }
+
+        return response()->json([
+                'status' => 'success',
+                'message' => __('meet.session-close-success'),
+        ]);
+    }
+
+    /**
+     * Create a connection for screen sharing.
+     *
+     * @param string $id Room identifier (name)
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function createConnection($id)
+    {
+        $room = Room::where('name', $id)->first();
+
+        // This isn't a room, bye bye
+        if (!$room) {
+            return $this->errorResponse(404, \trans('meet.room-not-found'));
+        }
+
+        $connection = $this->getConnectionFromRequest();
+
+        if (
+            !$connection
+            || $connection->session_id != $room->session_id
+            || ($connection->role & Room::ROLE_PUBLISHER) == 0
+        ) {
+            return $this->errorResponse(403);
+        }
+
+        $response = $room->getSessionToken(Room::ROLE_SCREEN);
+
+        return response()->json(['status' => 'success', 'token' => $response['token']]);
+    }
+
+    /**
+     * Dismiss the participant/connection from the session.
+     *
+     * @param string $id   Room identifier (name)
+     * @param string $conn Connection identifier
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function dismissConnection($id, $conn)
+    {
+        $connection = Connection::where('id', $conn)->first();
+
+        // There's no such connection, bye bye
+        if (!$connection || $connection->room->name != $id) {
+            return $this->errorResponse(404, \trans('meet.connection-not-found'));
+        }
+
+        // Only the moderator can do it
+        if (!$this->isModerator($connection->room)) {
+            return $this->errorResponse(403);
+        }
+
+        if (!$connection->dismiss()) {
+            return $this->errorResponse(500, \trans('meet.connection-dismiss-error'));
+        }
+
+        return response()->json(['status' => 'success']);
+    }
+
+    /**
+     * Listing of rooms that belong to the authenticated user.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function index()
+    {
+        $user = Auth::guard()->user();
+
+        $rooms = Room::where('user_id', $user->id)->orderBy('name')->get();
+
+        if (count($rooms) == 0) {
+            // Create a room for the user (with a random and unique name)
+            while (true) {
+                $name = strtolower(\App\Utils::randStr(3, 3, '-'));
+                if (!Room::where('name', $name)->count()) {
+                    break;
+                }
+            }
+
+            $room = Room::create([
+                    'name' => $name,
+                    'user_id' => $user->id
+            ]);
+
+            $rooms = collect([$room]);
+        }
+
+        $result = [
+            'list' => $rooms,
+            'count' => count($rooms),
+        ];
+
+        return response()->json($result);
+    }
+
+    /**
+     * Join the room session. Each room has one owner, and the room isn't open until the owner
+     * joins (and effectively creates the session).
+     *
+     * @param string $id Room identifier (name)
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function joinRoom($id)
+    {
+        $room = Room::where('name', $id)->first();
+
+        // Room does not exist, or the owner is deleted
+        if (!$room || !$room->owner) {
+            return $this->errorResponse(404, \trans('meet.room-not-found'));
+        }
+
+        // Check if there's still a valid beta entitlement for the room owner
+        $sku = \App\Sku::where('title', 'meet')->first();
+        if ($sku && !$room->owner->entitlements()->where('sku_id', $sku->id)->first()) {
+            return $this->errorResponse(404, \trans('meet.room-not-found'));
+        }
+
+        $user = Auth::guard()->user();
+        $isOwner = $user && $user->id == $room->user_id;
+        $init = !empty(request()->input('init'));
+
+        // There's no existing session
+        if (!$room->hasSession()) {
+            // Participants can't join the room until the session is created by the owner
+            if (!$isOwner) {
+                return $this->errorResponse(422, \trans('meet.session-not-found'), ['code' => 323]);
+            }
+
+            // The room owner can create the session on request
+            if (!$init) {
+                return $this->errorResponse(422, \trans('meet.session-not-found'), ['code' => 324]);
+            }
+
+            $session = $room->createSession();
+
+            if (empty($session)) {
+                return $this->errorResponse(500, \trans('meet.session-create-error'));
+            }
+        }
+
+        $password = (string) $room->getSetting('password');
+
+        $config = [
+            'locked' => $room->getSetting('locked') === 'true',
+            'nomedia' => $room->getSetting('nomedia') === 'true',
+            'password' => $isOwner ? $password : '',
+            'requires_password' => !$isOwner && strlen($password),
+        ];
+
+        $response = ['config' => $config];
+
+        // Validate room password
+        if (!$isOwner && strlen($password)) {
+            $request_password = request()->input('password');
+            if ($request_password !== $password) {
+                return $this->errorResponse(422, \trans('meet.session-password-error'), $response + ['code' => 325]);
+            }
+        }
+
+        // Handle locked room
+        if (!$isOwner && $config['locked']) {
+            $nickname = request()->input('nickname');
+            $picture = request()->input('picture');
+            $requestId = request()->input('requestId');
+
+            $request = $requestId ? $room->requestGet($requestId) : null;
+
+            $error = \trans('meet.session-room-locked-error');
+
+            // Request already has been processed (not accepted yet, but it could be denied)
+            if (empty($request['status']) || $request['status'] != Room::REQUEST_ACCEPTED) {
+                if (!$request) {
+                    if (empty($nickname) || empty($requestId) || !preg_match('/^[a-z0-9]{8,32}$/i', $requestId)) {
+                        return $this->errorResponse(422, $error, $response + ['code' => 326]);
+                    }
+
+                    if (empty($picture)) {
+                        $svg = file_get_contents(resource_path('images/user.svg'));
+                        $picture = 'data:image/svg+xml;base64,' . base64_encode($svg);
+                    } elseif (!preg_match('|^data:image/png;base64,[a-zA-Z0-9=+/]+$|', $picture)) {
+                        return $this->errorResponse(422, $error, $response + ['code' => 326]);
+                    }
+
+                    // TODO: Resize when big/make safe the user picture?
+
+                    $request = ['nickname' => $nickname, 'requestId' => $requestId, 'picture' => $picture];
+
+                    if (!$room->requestSave($requestId, $request)) {
+                        // FIXME: should we use error code 500?
+                        return $this->errorResponse(422, $error, $response + ['code' => 326]);
+                    }
+
+                    // Send the request (signal) to the owner
+                    $result = $room->signal('joinRequest', $request, Room::ROLE_MODERATOR);
+                }
+
+                return $this->errorResponse(422, $error, $response + ['code' => 327]);
+            }
+        }
+
+        // Initialize connection tokens
+        if ($init) {
+            // Choose the connection role
+            $canPublish = !empty(request()->input('canPublish')) && (empty($config['nomedia']) || $isOwner);
+            $role = $canPublish ? Room::ROLE_PUBLISHER : Room::ROLE_SUBSCRIBER;
+            if ($isOwner) {
+                $role |= Room::ROLE_MODERATOR;
+                $role |= Room::ROLE_OWNER;
+            }
+
+            // Create session token for the current user/connection
+            $response = $room->getSessionToken($role);
+
+            if (empty($response)) {
+                return $this->errorResponse(500, \trans('meet.session-join-error'));
+            }
+
+            // Get up-to-date connections metadata
+            $response['connections'] = $room->getSessionConnections();
+
+            $response_code = 200;
+            $response['role'] = $role;
+            $response['config'] = $config;
+        } else {
+            $response_code = 422;
+            $response['code'] = 322;
+        }
+
+        return response()->json($response, $response_code);
+    }
+
+    /**
+     * Set the domain configuration.
+     *
+     * @param string $id Room identifier (name)
+     *
+     * @return \Illuminate\Http\JsonResponse|void
+     */
+    public function setRoomConfig($id)
+    {
+        $room = Room::where('name', $id)->first();
+
+        // Room does not exist, or the owner is deleted
+        if (!$room || !$room->owner) {
+            return $this->errorResponse(404);
+        }
+
+        $user = Auth::guard()->user();
+
+        // Only room owner can configure the room
+        if ($user->id != $room->user_id) {
+            return $this->errorResponse(403);
+        }
+
+        $input = request()->input();
+        $errors = [];
+
+        foreach ($input as $key => $value) {
+            switch ($key) {
+                case 'password':
+                    if ($value === null || $value === '') {
+                        $input[$key] = null;
+                    } else {
+                        // TODO: Do we have to validate the password in any way?
+                    }
+                    break;
+
+                case 'locked':
+                    $input[$key] = $value ? 'true' : null;
+                    break;
+
+                case 'nomedia':
+                    $input[$key] = $value ? 'true' : null;
+                    break;
+
+                default:
+                    $errors[$key] = \trans('meet.room-unsupported-option-error');
+            }
+        }
+
+        if (!empty($errors)) {
+            return response()->json(['status' => 'error', 'errors' => $errors], 422);
+        }
+
+        if (!empty($input)) {
+            $room->setSettings($input);
+        }
+
+        return response()->json([
+                'status' => 'success',
+                'message' => \trans('meet.room-setconfig-success'),
+        ]);
+    }
+
+    /**
+     * Update the participant/connection parameters (e.g. role).
+     *
+     * @param string $id   Room identifier (name)
+     * @param string $conn Connection identifier
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function updateConnection($id, $conn)
+    {
+        $connection = Connection::where('id', $conn)->first();
+
+        // There's no such connection, bye bye
+        if (!$connection || $connection->room->name != $id) {
+            return $this->errorResponse(404, \trans('meet.connection-not-found'));
+        }
+
+        foreach (request()->input() as $key => $value) {
+            switch ($key) {
+                case 'hand':
+                    // Only possible on user's own connection(s)
+                    if (!$this->isSelfConnection($connection)) {
+                        return $this->errorResponse(403);
+                    }
+
+                    if ($value) {
+                        // Store current time, so we know the order in the queue
+                        $connection->metadata = ['hand' => time()] + $connection->metadata;
+                    } else {
+                        $connection->metadata = array_diff_key($connection->metadata, ['hand' => 0]);
+                    }
+
+                    break;
+
+                case 'language':
+                    // Only the moderator can do it
+                    if (!$this->isModerator($connection->room)) {
+                        return $this->errorResponse(403);
+                    }
+
+                    if ($value) {
+                        if (preg_match('/^[a-z]{2}$/', $value)) {
+                            $connection->metadata = ['language' => $value] + $connection->metadata;
+                        }
+                    } else {
+                        $connection->metadata = array_diff_key($connection->metadata, ['language' => 0]);
+                    }
+
+                    break;
+
+                case 'role':
+                    // Only the moderator can do it
+                    if (!$this->isModerator($connection->room)) {
+                        return $this->errorResponse(403);
+                    }
+
+                    // The 'owner' role is not assignable
+                    if ($value & Room::ROLE_OWNER && !($connection->role & Room::ROLE_OWNER)) {
+                        return $this->errorResponse(403);
+                    } elseif (!($value & Room::ROLE_OWNER) && ($connection->role & Room::ROLE_OWNER)) {
+                        return $this->errorResponse(403);
+                    }
+
+                    // The room owner has always a 'moderator' role
+                    if (!($value & Room::ROLE_MODERATOR) && $connection->role & Room::ROLE_OWNER) {
+                        $value |= Room::ROLE_MODERATOR;
+                    }
+
+                    // Promotion to publisher? Put the user hand down
+                    if ($value & Room::ROLE_PUBLISHER && !($connection->role & Room::ROLE_PUBLISHER)) {
+                        $connection->metadata = array_diff_key($connection->metadata, ['hand' => 0]);
+                    }
+
+                    // Non-publisher cannot be a language interpreter
+                    if (!($value & Room::ROLE_PUBLISHER)) {
+                        $connection->metadata = array_diff_key($connection->metadata, ['language' => 0]);
+                    }
+
+                    $connection->{$key} = $value;
+                    break;
+            }
+        }
+
+        // The connection observer will send a signal to everyone when needed
+        $connection->save();
+
+        return response()->json(['status' => 'success']);
+    }
+
+    /**
+     * Webhook as triggered from OpenVidu server
+     *
+     * @param \Illuminate\Http\Request $request The API request.
+     *
+     * @return \Illuminate\Http\Response The response
+     */
+    public function webhook(Request $request)
+    {
+        \Log::debug($request->getContent());
+
+        switch ((string) $request->input('event')) {
+            case 'sessionDestroyed':
+                // When all participants left the room OpenVidu dispatches sessionDestroyed
+                // event. We'll remove the session reference from the database.
+                $sessionId = $request->input('sessionId');
+                $room = Room::where('session_id', $sessionId)->first();
+
+                if ($room) {
+                    $room->session_id = null;
+                    $room->save();
+                }
+
+                // Remove all connections
+                // Note: We could remove connections one-by-one via the 'participantLeft' event
+                // but that could create many INSERTs when the session (with many participants) ends
+                // So, it is better to remove them all in a single INSERT.
+                Connection::where('session_id', $sessionId)->delete();
+
+                break;
+        }
+
+        return response('Success', 200);
+    }
+
+    /**
+     * Check if current user is a moderator for the specified room.
+     *
+     * @param \App\OpenVidu\Room $room The room
+     *
+     * @return bool True if the current user is the room moderator
+     */
+    protected function isModerator(Room $room): bool
+    {
+        $user = Auth::guard()->user();
+
+        // The room owner is a moderator
+        if ($user && $user->id == $room->user_id) {
+            return true;
+        }
+
+        // Moderator's authentication via the extra request header
+        if (
+            ($connection = $this->getConnectionFromRequest())
+            && $connection->session_id === $room->session_id
+            && $connection->role & Room::ROLE_MODERATOR
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if current user "owns" the specified connection.
+     *
+     * @param \App\OpenVidu\Connection $connection The connection
+     *
+     * @return bool
+     */
+    protected function isSelfConnection(Connection $connection): bool
+    {
+        return ($conn = $this->getConnectionFromRequest())
+            && $conn->id === $connection->id;
+    }
+
+    /**
+     * Get the connection object for the token in current request headers.
+     * It will also validate the token.
+     *
+     * @return \App\OpenVidu\Connection|null Connection (if exists and the token is valid)
+     */
+    protected function getConnectionFromRequest()
+    {
+        // Authenticate the user via the extra request header
+        if ($token = request()->header(self::AUTH_HEADER)) {
+            list($connId, ) = explode(':', base64_decode($token), 2);
+
+            if (
+                ($connection = Connection::find($connId))
+                && $connection->metadata['authToken'] === $token
+            ) {
+                return $connection;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/app/Http/Controllers/API/V4/PaymentsController.php b/src/app/Http/Controllers/API/V4/PaymentsController.php
index 89b5eb38..e46b8f88 100644
--- a/src/app/Http/Controllers/API/V4/PaymentsController.php
+++ b/src/app/Http/Controllers/API/V4/PaymentsController.php
@@ -1,322 +1,475 @@
 <?php
 
 namespace App\Http\Controllers\API\V4;
 
 use App\Http\Controllers\Controller;
 use App\Providers\PaymentProvider;
 use App\Wallet;
+use App\Payment;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
 class PaymentsController extends Controller
 {
     /**
      * Get the auto-payment mandate info.
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function mandate()
     {
         $user = Auth::guard()->user();
 
         // TODO: Wallet selection
-        $wallet = $user->wallets->first();
+        $wallet = $user->wallets()->first();
 
         $mandate = self::walletMandate($wallet);
 
         return response()->json($mandate);
     }
 
     /**
      * Create a new auto-payment mandate.
      *
      * @param \Illuminate\Http\Request $request The API request.
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function mandateCreate(Request $request)
     {
         $current_user = Auth::guard()->user();
 
         // TODO: Wallet selection
-        $wallet = $current_user->wallets->first();
+        $wallet = $current_user->wallets()->first();
 
-        $rules = [
-            'amount' => 'required|numeric',
-            'balance' => 'required|numeric|min:0',
-        ];
-
-        // Check required fields
-        $v = Validator::make($request->all(), $rules);
-
-        // TODO: allow comma as a decimal point?
-
-        if ($v->fails()) {
-            return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
-        }
-
-        $amount = (int) ($request->amount * 100);
-
-        // Validate the minimum value
-        if ($amount < PaymentProvider::MIN_AMOUNT) {
-            $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
-            $errors = ['amount' => \trans('validation.minamount', ['amount' => $min])];
+        // Input validation
+        if ($errors = self::mandateValidate($request, $wallet)) {
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         $wallet->setSettings([
                 'mandate_amount' => $request->amount,
                 'mandate_balance' => $request->balance,
         ]);
 
-        $request = [
+        $mandate = [
             'currency' => 'CHF',
-            'amount' => $amount,
             'description' => \config('app.name') . ' Auto-Payment Setup',
+            'methodId' => $request->methodId
         ];
 
+        // Normally the auto-payment setup operation is 0, if the balance is below the threshold
+        // we'll top-up the wallet with the configured auto-payment amount
+        if ($wallet->balance < intval($request->balance * 100)) {
+            $mandate['amount'] = intval($request->amount * 100);
+        }
+
         $provider = PaymentProvider::factory($wallet);
 
-        $result = $provider->createMandate($wallet, $request);
+        $result = $provider->createMandate($wallet, $mandate);
 
         $result['status'] = 'success';
 
         return response()->json($result);
     }
 
     /**
      * Revoke the auto-payment mandate.
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function mandateDelete()
     {
         $user = Auth::guard()->user();
 
         // TODO: Wallet selection
-        $wallet = $user->wallets->first();
+        $wallet = $user->wallets()->first();
 
         $provider = PaymentProvider::factory($wallet);
 
         $provider->deleteMandate($wallet);
 
         $wallet->setSetting('mandate_disabled', null);
 
         return response()->json([
                 'status' => 'success',
                 'message' => \trans('app.mandate-delete-success'),
         ]);
     }
 
     /**
      * Update a new auto-payment mandate.
      *
      * @param \Illuminate\Http\Request $request The API request.
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function mandateUpdate(Request $request)
     {
         $current_user = Auth::guard()->user();
 
         // TODO: Wallet selection
-        $wallet = $current_user->wallets->first();
+        $wallet = $current_user->wallets()->first();
+
+        // Input validation
+        if ($errors = self::mandateValidate($request, $wallet)) {
+            return response()->json(['status' => 'error', 'errors' => $errors], 422);
+        }
+
+        $wallet->setSettings([
+                'mandate_amount' => $request->amount,
+                'mandate_balance' => $request->balance,
+                // Re-enable the mandate to give it a chance to charge again
+                // after it has been disabled (e.g. because the mandate amount was too small)
+                'mandate_disabled' => null,
+        ]);
+
+        // Trigger auto-payment if the balance is below the threshold
+        if ($wallet->balance < intval($request->balance * 100)) {
+            \App\Jobs\WalletCharge::dispatch($wallet);
+        }
+
+        $result = self::walletMandate($wallet);
+        $result['status'] = 'success';
+        $result['message'] = \trans('app.mandate-update-success');
 
+        return response()->json($result);
+    }
+
+    /**
+     * Validate an auto-payment mandate request.
+     *
+     * @param \Illuminate\Http\Request $request The API request.
+     * @param \App\Wallet              $wallet  The wallet
+     *
+     * @return array|null List of errors on error or Null on success
+     */
+    protected static function mandateValidate(Request $request, Wallet $wallet)
+    {
         $rules = [
             'amount' => 'required|numeric',
             'balance' => 'required|numeric|min:0',
         ];
 
         // Check required fields
         $v = Validator::make($request->all(), $rules);
 
         // TODO: allow comma as a decimal point?
 
         if ($v->fails()) {
-            return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
+            return $v->errors()->toArray();
         }
 
         $amount = (int) ($request->amount * 100);
 
         // Validate the minimum value
-        if ($amount < PaymentProvider::MIN_AMOUNT) {
-            $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
-            $errors = ['amount' => \trans('validation.minamount', ['amount' => $min])];
-            return response()->json(['status' => 'error', 'errors' => $errors], 422);
+        // It has to be at least minimum payment amount and must cover current debt
+        if (
+            $wallet->balance < 0
+            && $wallet->balance * -1 > PaymentProvider::MIN_AMOUNT
+            && $wallet->balance + $amount < 0
+        ) {
+            return ['amount' => \trans('validation.minamountdebt')];
         }
 
-        // If the mandate is disabled the update will trigger
-        // an auto-payment and the amount must cover the debt
-        if ($wallet->getSetting('mandate_disabled')) {
-            if ($wallet->balance < 0 && $wallet->balance + $amount < 0) {
-                $errors = ['amount' => \trans('validation.minamountdebt')];
-                return response()->json(['status' => 'error', 'errors' => $errors], 422);
-            }
-
-            $wallet->setSetting('mandate_disabled', null);
-
-            if ($wallet->balance < intval($request->balance * 100)) {
-                \App\Jobs\WalletCharge::dispatch($wallet);
-            }
+        if ($amount < PaymentProvider::MIN_AMOUNT) {
+            $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
+            return ['amount' => \trans('validation.minamount', ['amount' => $min])];
         }
 
-        $wallet->setSettings([
-                'mandate_amount' => $request->amount,
-                'mandate_balance' => $request->balance,
-        ]);
-
-        $result = self::walletMandate($wallet);
-        $result['status'] = 'success';
-        $result['message'] = \trans('app.mandate-update-success');
-
-        return response()->json($result);
+        return null;
     }
 
     /**
      * Create a new payment.
      *
      * @param \Illuminate\Http\Request $request The API request.
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function store(Request $request)
     {
         $current_user = Auth::guard()->user();
 
         // TODO: Wallet selection
-        $wallet = $current_user->wallets->first();
+        $wallet = $current_user->wallets()->first();
 
         $rules = [
             'amount' => 'required|numeric',
         ];
 
         // Check required fields
         $v = Validator::make($request->all(), $rules);
 
         // TODO: allow comma as a decimal point?
 
         if ($v->fails()) {
             return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
         }
 
         $amount = (int) ($request->amount * 100);
 
         // Validate the minimum value
         if ($amount < PaymentProvider::MIN_AMOUNT) {
             $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
             $errors = ['amount' => \trans('validation.minamount', ['amount' => $min])];
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         $request = [
             'type' => PaymentProvider::TYPE_ONEOFF,
-            'currency' => 'CHF',
+            'currency' => $request->currency,
             'amount' => $amount,
+            'methodId' => $request->methodId,
             'description' => \config('app.name') . ' Payment',
         ];
 
         $provider = PaymentProvider::factory($wallet);
 
         $result = $provider->payment($wallet, $request);
 
         $result['status'] = 'success';
 
         return response()->json($result);
     }
 
+    /**
+     * Delete a pending payment.
+     *
+     * @param \Illuminate\Http\Request $request The API request.
+     *
+     * @return \Illuminate\Http\JsonResponse The response
+     */
+    // TODO currently unused
+    // public function cancel(Request $request)
+    // {
+    //     $current_user = Auth::guard()->user();
+
+    //     // TODO: Wallet selection
+    //     $wallet = $current_user->wallets()->first();
+
+    //     $paymentId = $request->payment;
+
+    //     $user_owns_payment = Payment::where('id', $paymentId)
+    //         ->where('wallet_id', $wallet->id)
+    //         ->exists();
+
+    //     if (!$user_owns_payment) {
+    //         return $this->errorResponse(404);
+    //     }
+
+    //     $provider = PaymentProvider::factory($wallet);
+    //     if ($provider->cancel($wallet, $paymentId)) {
+    //         $result = ['status' => 'success'];
+    //         return response()->json($result);
+    //     }
+
+    //     return $this->errorResponse(404);
+    // }
+
     /**
      * Update payment status (and balance).
      *
      * @param string $provider Provider name
      *
      * @return \Illuminate\Http\Response The response
      */
     public function webhook($provider)
     {
         $code = 200;
 
         if ($provider = PaymentProvider::factory($provider)) {
             $code = $provider->webhook();
         }
 
         return response($code < 400 ? 'Success' : 'Server error', $code);
     }
 
     /**
      * Top up a wallet with a "recurring" payment.
      *
      * @param \App\Wallet $wallet The wallet to charge
      *
      * @return bool True if the payment has been initialized
      */
     public static function topUpWallet(Wallet $wallet): bool
     {
         if ((bool) $wallet->getSetting('mandate_disabled')) {
             return false;
         }
 
         $min_balance = (int) (floatval($wallet->getSetting('mandate_balance')) * 100);
         $amount = (int) (floatval($wallet->getSetting('mandate_amount')) * 100);
 
         // The wallet balance is greater than the auto-payment threshold
         if ($wallet->balance >= $min_balance) {
             // Do nothing
             return false;
         }
 
         $provider = PaymentProvider::factory($wallet);
         $mandate = (array) $provider->getMandate($wallet);
 
         if (empty($mandate['isValid'])) {
             return false;
         }
 
         // The defined top-up amount is not enough
         // Disable auto-payment and notify the user
         if ($wallet->balance + $amount < 0) {
             // Disable (not remove) the mandate
             $wallet->setSetting('mandate_disabled', 1);
             \App\Jobs\PaymentMandateDisabledEmail::dispatch($wallet);
             return false;
         }
 
         $request = [
             'type' => PaymentProvider::TYPE_RECURRING,
             'currency' => 'CHF',
             'amount' => $amount,
+            'methodId' => PaymentProvider::METHOD_CREDITCARD,
             'description' => \config('app.name') . ' Recurring Payment',
         ];
 
         $result = $provider->payment($wallet, $request);
 
         return !empty($result);
     }
 
     /**
      * Returns auto-payment mandate info for the specified wallet
      *
      * @param \App\Wallet $wallet A wallet object
      *
      * @return array A mandate metadata
      */
     public static function walletMandate(Wallet $wallet): array
     {
         $provider = PaymentProvider::factory($wallet);
 
         // Get the Mandate info
         $mandate = (array) $provider->getMandate($wallet);
 
         $mandate['amount'] = (int) (PaymentProvider::MIN_AMOUNT / 100);
         $mandate['balance'] = 0;
         $mandate['isDisabled'] = !empty($mandate['id']) && $wallet->getSetting('mandate_disabled');
 
         foreach (['amount', 'balance'] as $key) {
             if (($value = $wallet->getSetting("mandate_{$key}")) !== null) {
                 $mandate[$key] = $value;
             }
         }
 
         return $mandate;
     }
+
+
+    /**
+     * List supported payment methods.
+     *
+     * @param \Illuminate\Http\Request $request The API request.
+     *
+     * @return \Illuminate\Http\JsonResponse The response
+     */
+    public static function paymentMethods(Request $request)
+    {
+        $user = Auth::guard()->user();
+
+        // TODO: Wallet selection
+        $wallet = $user->wallets()->first();
+
+        $methods = PaymentProvider::paymentMethods($wallet, $request->type);
+
+        \Log::debug("Provider methods" . var_export(json_encode($methods), true));
+
+        return response()->json($methods);
+    }
+
+    /**
+     * Check for pending payments.
+     *
+     * @param \Illuminate\Http\Request $request The API request.
+     *
+     * @return \Illuminate\Http\JsonResponse The response
+     */
+    public static function hasPayments(Request $request)
+    {
+        $user = Auth::guard()->user();
+
+        // TODO: Wallet selection
+        $wallet = $user->wallets()->first();
+
+        $exists = Payment::where('wallet_id', $wallet->id)
+            ->where('type', PaymentProvider::TYPE_ONEOFF)
+            ->whereIn('status', [
+                PaymentProvider::STATUS_OPEN,
+                PaymentProvider::STATUS_PENDING,
+                PaymentProvider::STATUS_AUTHORIZED])
+            ->exists();
+
+        return response()->json([
+            'status' => 'success',
+            'hasPending' => $exists
+        ]);
+    }
+
+    /**
+     * List pending payments.
+     *
+     * @param \Illuminate\Http\Request $request The API request.
+     *
+     * @return \Illuminate\Http\JsonResponse The response
+     */
+    public static function payments(Request $request)
+    {
+        $user = Auth::guard()->user();
+
+        // TODO: Wallet selection
+        $wallet = $user->wallets()->first();
+
+        $pageSize = 10;
+        $page = intval(request()->input('page')) ?: 1;
+        $hasMore = false;
+        $result = Payment::where('wallet_id', $wallet->id)
+            ->where('type', PaymentProvider::TYPE_ONEOFF)
+            ->whereIn('status', [
+                PaymentProvider::STATUS_OPEN,
+                PaymentProvider::STATUS_PENDING,
+                PaymentProvider::STATUS_AUTHORIZED])
+            ->orderBy('created_at', 'desc')
+            ->limit($pageSize + 1)
+            ->offset($pageSize * ($page - 1))
+            ->get();
+
+        if (count($result) > $pageSize) {
+            $result->pop();
+            $hasMore = true;
+        }
+
+        $result = $result->map(function ($item) {
+            $provider = PaymentProvider::factory($item->provider);
+            $payment = $provider->getPayment($item->id);
+            $entry = [
+                'id' => $item->id,
+                'createdAt' => $item->created_at->format('Y-m-d H:i'),
+                'type' => $item->type,
+                'description' => $item->description,
+                'amount' => $item->amount,
+                'status' => $item->status,
+                'isCancelable' => $payment['isCancelable'],
+                'checkoutUrl' => $payment['checkoutUrl']
+            ];
+
+            return $entry;
+        });
+
+        return response()->json([
+            'status' => 'success',
+            'list' => $result,
+            'count' => count($result),
+            'hasMore' => $hasMore,
+            'page' => $page,
+        ]);
+    }
 }
diff --git a/src/app/Http/Controllers/API/V4/SkusController.php b/src/app/Http/Controllers/API/V4/SkusController.php
index 6de81c59..f18eb5bb 100644
--- a/src/app/Http/Controllers/API/V4/SkusController.php
+++ b/src/app/Http/Controllers/API/V4/SkusController.php
@@ -1,183 +1,193 @@
 <?php
 
 namespace App\Http\Controllers\API\V4;
 
 use App\Http\Controllers\Controller;
 use App\Sku;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class SkusController extends Controller
 {
     /**
      * Show the form for creating a new sku.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function create()
     {
         // TODO
         return $this->errorResponse(404);
     }
 
     /**
      * Remove the specified sku from storage.
      *
      * @param int $id SKU identifier
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($id)
     {
         // TODO
         return $this->errorResponse(404);
     }
 
     /**
      * Show the form for editing the specified sku.
      *
      * @param int $id SKU identifier
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function edit($id)
     {
         // TODO
         return $this->errorResponse(404);
     }
 
     /**
-     * Display a listing of the sku.
+     * Get a list of active SKUs.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function index()
     {
         // Note: Order by title for consistent ordering in tests
-        $skus = Sku::select()->orderBy('title')->get();
-
-        // Note: we do not limit the result to active SKUs only.
-        //       It's because we might need users assigned to old SKUs,
-        //       we need to display these old SKUs on the entitlements list
+        $skus = Sku::where('active', true)->orderBy('title')->get();
 
         $response = [];
 
         foreach ($skus as $sku) {
             if ($data = $this->skuElement($sku)) {
                 $response[] = $data;
             }
         }
 
         usort($response, function ($a, $b) {
             return ($b['prio'] <=> $a['prio']);
         });
 
         return response()->json($response);
     }
 
     /**
      * Store a newly created sku in storage.
      *
      * @param \Illuminate\Http\Request $request
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(Request $request)
     {
         // TODO
         return $this->errorResponse(404);
     }
 
     /**
      * Display the specified sku.
      *
      * @param int $id SKU identifier
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id)
     {
         // TODO
         return $this->errorResponse(404);
     }
 
     /**
      * Update the specified sku in storage.
      *
      * @param \Illuminate\Http\Request $request Request object
      * @param int                      $id      SKU identifier
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request, $id)
     {
         // TODO
         return $this->errorResponse(404);
     }
 
+    /**
+     * Get a list of SKUs available to the user.
+     *
+     * @param int $id User identifier
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function userSkus($id)
+    {
+        $user = \App\User::find($id);
+
+        if (empty($user)) {
+            return $this->errorResponse(404);
+        }
+
+        if (!Auth::guard()->user()->canRead($user)) {
+            return $this->errorResponse(403);
+        }
+
+        $type = request()->input('type');
+        $response = [];
+
+        // Note: Order by title for consistent ordering in tests
+        $skus = Sku::orderBy('title')->get();
+
+        foreach ($skus as $sku) {
+            if (!class_exists($sku->handler_class)) {
+                continue;
+            }
+
+            if (!$sku->handler_class::isAvailable($sku, $user)) {
+                continue;
+            }
+
+            if ($data = $this->skuElement($sku)) {
+                if ($type && $type != $data['type']) {
+                    continue;
+                }
+
+                $response[] = $data;
+            }
+        }
+
+        usort($response, function ($a, $b) {
+            return ($b['prio'] <=> $a['prio']);
+        });
+
+        return response()->json($response);
+    }
+
     /**
      * Convert SKU information to metadata used by UI to
      * display the form control
      *
      * @param \App\Sku $sku SKU object
      *
      * @return array|null Metadata
      */
     protected function skuElement($sku): ?array
     {
-        $type = $sku->handler_class::entitleableClass();
-
-        // ignore incomplete handlers
-        if (!$type) {
+        if (!class_exists($sku->handler_class)) {
             return null;
         }
 
-        $type = explode('\\', $type);
-        $type = strtolower(end($type));
-
-        $handler = explode('\\', $sku->handler_class);
-        $handler = strtolower(end($handler));
+        $data = array_merge($sku->toArray(), $sku->handler_class::metadata($sku));
 
-        $data = $sku->toArray();
-
-        $data['type'] = $type;
-        $data['handler'] = $handler;
-        $data['readonly'] = false;
-        $data['enabled'] = false;
-        $data['prio'] = $sku->handler_class::priority();
+        // ignore incomplete handlers
+        if (empty($data['type'])) {
+            return null;
+        }
 
         // Use localized value, toArray() does not get them right
         $data['name'] = $sku->name;
         $data['description'] = $sku->description;
 
-        unset($data['handler_class']);
-
-        switch ($handler) {
-            case 'activesync':
-                $data['required'] = ['groupware'];
-                break;
-
-            case 'auth2f':
-                $data['forbidden'] = ['activesync'];
-                break;
-
-            case 'storage':
-                // Quota range input
-                $data['readonly'] = true; // only the checkbox will be disabled, not range
-                $data['enabled'] = true;
-                $data['range'] = [
-                    'min' => $data['units_free'],
-                    'max' => $sku->handler_class::MAX_ITEMS,
-                    'unit' => $sku->handler_class::ITEM_UNIT,
-                ];
-                break;
-
-            case 'mailbox':
-                // Mailbox is always enabled and cannot be unset
-                $data['readonly'] = true;
-                $data['enabled'] = true;
-                break;
-        }
+        unset($data['handler_class'], $data['created_at'], $data['updated_at']);
 
         return $data;
     }
 }
diff --git a/src/app/Http/Controllers/API/V4/SupportController.php b/src/app/Http/Controllers/API/V4/SupportController.php
new file mode 100644
index 00000000..84e7ae9c
--- /dev/null
+++ b/src/app/Http/Controllers/API/V4/SupportController.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Http\Controllers\API\V4;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Validator;
+
+class SupportController extends Controller
+{
+    /**
+     * Submit contact request form.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function request(Request $request)
+    {
+        $rules = [
+            'user' => 'string|nullable|max:256',
+            'name' => 'string|nullable|max:256',
+            'email' => 'required|email',
+            'summary' => 'required|string|max:512',
+            'body' => 'required|string',
+        ];
+
+        $params = $request->only(array_keys($rules));
+
+        // Check required fields
+        $v = Validator::make($params, $rules);
+
+        if ($v->fails()) {
+            return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
+        }
+
+        $to = \config('app.support_email');
+
+        if (empty($to)) {
+            \Log::error("Failed to send a support request. SUPPORT_EMAIL not set");
+            return $this->errorResponse(500, \trans('app.support-request-error'));
+        }
+
+        $content = sprintf(
+            "ID: %s\nName: %s\nWorking email address: %s\nSubject: %s\n\n%s\n",
+            $params['user'] ?? '',
+            $params['name'] ?? '',
+            $params['email'],
+            $params['summary'],
+            $params['body'],
+        );
+
+        Mail::raw($content, function ($message) use ($params, $to) {
+            // Remove the global reply-to addressee
+            $message->getHeaders()->remove('Reply-To');
+
+            $message->to($to)
+                ->from($params['email'], $params['name'] ?? null)
+                ->replyTo($params['email'], $params['name'] ?? null)
+                ->subject($params['summary']);
+        });
+
+        return response()->json([
+                'status' => 'success',
+                'message' => \trans('app.support-request-success'),
+        ]);
+    }
+}
diff --git a/src/app/Http/Controllers/API/V4/UsersController.php b/src/app/Http/Controllers/API/V4/UsersController.php
index 9535eb4b..2d441230 100644
--- a/src/app/Http/Controllers/API/V4/UsersController.php
+++ b/src/app/Http/Controllers/API/V4/UsersController.php
@@ -1,685 +1,821 @@
 <?php
 
 namespace App\Http\Controllers\API\V4;
 
 use App\Http\Controllers\Controller;
 use App\Domain;
+use App\Group;
 use App\Rules\UserEmailDomain;
 use App\Rules\UserEmailLocal;
 use App\Sku;
 use App\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
 
 class UsersController extends Controller
 {
-    // List of user settings keys available for modification in UI
+    /** @const array List of user setting keys available for modification in UI */
     public const USER_SETTINGS = [
         'billing_address',
         'country',
         'currency',
         'external_email',
         'first_name',
         'last_name',
         'organization',
         'phone',
     ];
 
+    /**
+     * On user create it is filled with a user or group object to force-delete
+     * before the creation of a new user record is possible.
+     *
+     * @var \App\User|\App\Group|null
+     */
+    protected $deleteBeforeCreate;
+
+
     /**
      * Delete a user.
      *
      * @param int $id User identifier
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function destroy($id)
     {
         $user = User::find($id);
 
         if (empty($user)) {
             return $this->errorResponse(404);
         }
 
         // User can't remove himself until he's the controller
         if (!$this->guard()->user()->canDelete($user)) {
             return $this->errorResponse(403);
         }
 
         $user->delete();
 
         return response()->json([
                 'status' => 'success',
                 'message' => __('app.user-delete-success'),
         ]);
     }
 
     /**
      * Listing of users.
      *
      * The user-entitlements billed to the current user wallet(s)
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function index()
     {
         $user = $this->guard()->user();
 
         $result = $user->users()->orderBy('email')->get()->map(function ($user) {
             $data = $user->toArray();
             $data = array_merge($data, self::userStatuses($user));
             return $data;
         });
 
         return response()->json($result);
     }
 
     /**
      * Display information on the user account specified by $id.
      *
      * @param int $id The account to show information for.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id)
     {
         $user = User::find($id);
 
         if (empty($user)) {
             return $this->errorResponse(404);
         }
 
         if (!$this->guard()->user()->canRead($user)) {
             return $this->errorResponse(403);
         }
 
         $response = $this->userResponse($user);
 
         // Simplified Entitlement/SKU information,
         // TODO: I agree this format may need to be extended in future
         $response['skus'] = [];
         foreach ($user->entitlements as $ent) {
             $sku = $ent->sku;
             $response['skus'][$sku->id] = [
 //                'cost' => $ent->cost,
                 'count' => isset($response['skus'][$sku->id]) ? $response['skus'][$sku->id]['count'] + 1 : 1,
             ];
         }
 
         return response()->json($response);
     }
 
     /**
      * Fetch user status (and reload setup process)
      *
      * @param int $id User identifier
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function status($id)
     {
         $user = User::find($id);
 
         if (empty($user)) {
             return $this->errorResponse(404);
         }
 
         if (!$this->guard()->user()->canRead($user)) {
             return $this->errorResponse(403);
         }
 
         $response = self::statusInfo($user);
 
         if (!empty(request()->input('refresh'))) {
             $updated = false;
+            $async = false;
             $last_step = 'none';
 
             foreach ($response['process'] as $idx => $step) {
                 $last_step = $step['label'];
 
                 if (!$step['state']) {
-                    if (!$this->execProcessStep($user, $step['label'])) {
+                    $exec = $this->execProcessStep($user, $step['label']);
+
+                    if (!$exec) {
+                        if ($exec === null) {
+                            $async = true;
+                        }
+
                         break;
                     }
 
                     $updated = true;
                 }
             }
 
             if ($updated) {
                 $response = self::statusInfo($user);
             }
 
             $success = $response['isReady'];
             $suffix = $success ? 'success' : 'error-' . $last_step;
 
             $response['status'] = $success ? 'success' : 'error';
             $response['message'] = \trans('app.process-' . $suffix);
+
+            if ($async && !$success) {
+                $response['processState'] = 'waiting';
+                $response['status'] = 'success';
+                $response['message'] = \trans('app.process-async');
+            }
         }
 
         $response = array_merge($response, self::userStatuses($user));
 
         return response()->json($response);
     }
 
     /**
      * User status (extended) information
      *
      * @param \App\User $user User object
      *
      * @return array Status information
      */
     public static function statusInfo(User $user): array
     {
         $process = [];
         $steps = [
             'user-new' => true,
             'user-ldap-ready' => $user->isLdapReady(),
             'user-imap-ready' => $user->isImapReady(),
         ];
 
         // Create a process check list
         foreach ($steps as $step_name => $state) {
             $step = [
                 'label' => $step_name,
                 'title' => \trans("app.process-{$step_name}"),
                 'state' => $state,
             ];
 
             $process[] = $step;
         }
 
         list ($local, $domain) = explode('@', $user->email);
         $domain = Domain::where('namespace', $domain)->first();
 
         // If that is not a public domain, add domain specific steps
         if ($domain && !$domain->isPublic()) {
             $domain_status = DomainsController::statusInfo($domain);
             $process = array_merge($process, $domain_status['process']);
         }
 
         $all = count($process);
         $checked = count(array_filter($process, function ($v) {
                 return $v['state'];
         }));
 
         $state = $all === $checked ? 'done' : 'running';
 
         // After 180 seconds assume the process is in failed state,
         // this should unlock the Refresh button in the UI
         if ($all !== $checked && $user->created_at->diffInSeconds(Carbon::now()) > 180) {
             $state = 'failed';
         }
 
         // Check if the user is a controller of his wallet
         $isController = $user->canDelete($user);
         $hasCustomDomain = $user->wallet()->entitlements()
             ->where('entitleable_type', Domain::class)
             ->count() > 0;
 
+        // Get user's entitlements titles
+        $skus = $user->entitlements()->select('skus.title')
+            ->join('skus', 'skus.id', '=', 'entitlements.sku_id')
+            ->get()
+            ->pluck('title')
+            ->sort()
+            ->unique()
+            ->values()
+            ->all();
+
         return [
+            'skus' => $skus,
             // TODO: This will change when we enable all users to create domains
             'enableDomains' => $isController && $hasCustomDomain,
             'enableUsers' => $isController,
             'enableWallets' => $isController,
             'process' => $process,
             'processState' => $state,
             'isReady' => $all === $checked,
         ];
     }
 
     /**
      * Create a new user record.
      *
      * @param \Illuminate\Http\Request $request The API request.
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function store(Request $request)
     {
         $current_user = $this->guard()->user();
         $owner = $current_user->wallet()->owner;
 
         if ($owner->id != $current_user->id) {
             return $this->errorResponse(403);
         }
 
+        $this->deleteBeforeCreate = null;
+
         if ($error_response = $this->validateUserRequest($request, null, $settings)) {
             return $error_response;
         }
 
         if (empty($request->package) || !($package = \App\Package::find($request->package))) {
             $errors = ['package' => \trans('validation.packagerequired')];
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         if ($package->isDomain()) {
             $errors = ['package' => \trans('validation.packageinvalid')];
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         DB::beginTransaction();
 
+        // @phpstan-ignore-next-line
+        if ($this->deleteBeforeCreate) {
+            $this->deleteBeforeCreate->forceDelete();
+        }
+
         // Create user record
         $user = User::create([
                 'email' => $request->email,
                 'password' => $request->password,
         ]);
 
         $owner->assignPackage($package, $user);
 
         if (!empty($settings)) {
             $user->setSettings($settings);
         }
 
         if (!empty($request->aliases)) {
             $user->setAliases($request->aliases);
         }
 
         DB::commit();
 
         return response()->json([
                 'status' => 'success',
                 'message' => __('app.user-create-success'),
         ]);
     }
 
     /**
      * Update user data.
      *
      * @param \Illuminate\Http\Request $request The API request.
      * @param string                   $id      User identifier
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function update(Request $request, $id)
     {
         $user = User::find($id);
 
         if (empty($user)) {
             return $this->errorResponse(404);
         }
 
         $current_user = $this->guard()->user();
 
         // TODO: Decide what attributes a user can change on his own profile
         if (!$current_user->canUpdate($user)) {
             return $this->errorResponse(403);
         }
 
         if ($error_response = $this->validateUserRequest($request, $user, $settings)) {
             return $error_response;
         }
 
         // Entitlements, only controller can do that
         if ($request->skus !== null && !$current_user->canDelete($user)) {
             return $this->errorResponse(422, "You have no permission to change entitlements");
         }
 
         DB::beginTransaction();
 
         $this->updateEntitlements($user, $request->skus);
 
         if (!empty($settings)) {
             $user->setSettings($settings);
         }
 
         if (!empty($request->password)) {
             $user->password = $request->password;
             $user->save();
         }
 
         if (isset($request->aliases)) {
             $user->setAliases($request->aliases);
         }
 
         // TODO: Make sure that UserUpdate job is created in case of entitlements update
         //       and no password change. So, for example quota change is applied to LDAP
         // TODO: Review use of $user->save() in the above context
 
         DB::commit();
 
-        return response()->json([
-                'status' => 'success',
-                'message' => __('app.user-update-success'),
-        ]);
+        $response = [
+            'status' => 'success',
+            'message' => __('app.user-update-success'),
+        ];
+
+        // For self-update refresh the statusInfo in the UI
+        if ($user->id == $current_user->id) {
+            $response['statusInfo'] = self::statusInfo($user);
+        }
+
+        return response()->json($response);
     }
 
     /**
      * Get the guard to be used during authentication.
      *
      * @return \Illuminate\Contracts\Auth\Guard
      */
     public function guard()
     {
         return Auth::guard();
     }
 
     /**
      * Update user entitlements.
      *
      * @param \App\User $user  The user
      * @param array     $rSkus List of SKU IDs requested for the user in the form [id=>qty]
      */
     protected function updateEntitlements(User $user, $rSkus)
     {
         if (!is_array($rSkus)) {
             return;
         }
 
         // list of skus, [id=>obj]
         $skus = Sku::all()->mapWithKeys(
             function ($sku) {
                 return [$sku->id => $sku];
             }
         );
 
         // existing entitlement's SKUs
         $eSkus = [];
 
         $user->entitlements()->groupBy('sku_id')
             ->selectRaw('count(*) as total, sku_id')->each(
                 function ($e) use (&$eSkus) {
                     $eSkus[$e->sku_id] = $e->total;
                 }
             );
 
         foreach ($skus as $skuID => $sku) {
             $e = array_key_exists($skuID, $eSkus) ? $eSkus[$skuID] : 0;
             $r = array_key_exists($skuID, $rSkus) ? $rSkus[$skuID] : 0;
 
             if ($sku->handler_class == \App\Handlers\Mailbox::class) {
                 if ($r != 1) {
                     throw new \Exception("Invalid quantity of mailboxes");
                 }
             }
 
             if ($e > $r) {
                 // remove those entitled more than existing
                 $user->removeSku($sku, ($e - $r));
             } elseif ($e < $r) {
                 // add those requested more than entitled
                 $user->assignSku($sku, ($r - $e));
             }
         }
     }
 
     /**
      * Create a response data array for specified user.
      *
      * @param \App\User $user User object
      *
      * @return array Response data
      */
     public static function userResponse(User $user): array
     {
         $response = $user->toArray();
 
         // Settings
         $response['settings'] = [];
         foreach ($user->settings()->whereIn('key', self::USER_SETTINGS)->get() as $item) {
             $response['settings'][$item->key] = $item->value;
         }
 
         // Aliases
         $response['aliases'] = [];
         foreach ($user->aliases as $item) {
             $response['aliases'][] = $item->alias;
         }
 
         // Status info
         $response['statusInfo'] = self::statusInfo($user);
 
         $response = array_merge($response, self::userStatuses($user));
 
         // Add more info to the wallet object output
         $map_func = function ($wallet) use ($user) {
             $result = $wallet->toArray();
 
             if ($wallet->discount) {
                 $result['discount'] = $wallet->discount->discount;
                 $result['discount_description'] = $wallet->discount->description;
             }
 
             if ($wallet->user_id != $user->id) {
                 $result['user_email'] = $wallet->owner->email;
             }
 
             $provider = \App\Providers\PaymentProvider::factory($wallet);
             $result['provider'] = $provider->name();
 
             return $result;
         };
 
         // Information about wallets and accounts for access checks
         $response['wallets'] = $user->wallets->map($map_func)->toArray();
         $response['accounts'] = $user->accounts->map($map_func)->toArray();
         $response['wallet'] = $map_func($user->wallet());
 
         return $response;
     }
 
     /**
      * Prepare user statuses for the UI
      *
      * @param \App\User $user User object
      *
      * @return array Statuses array
      */
     protected static function userStatuses(User $user): array
     {
         return [
             'isImapReady' => $user->isImapReady(),
             'isLdapReady' => $user->isLdapReady(),
             'isSuspended' => $user->isSuspended(),
             'isActive' => $user->isActive(),
             'isDeleted' => $user->isDeleted() || $user->trashed(),
         ];
     }
 
     /**
      * Validate user input
      *
      * @param \Illuminate\Http\Request $request  The API request.
      * @param \App\User|null           $user     User identifier
      * @param array                    $settings User settings (from the request)
      *
      * @return \Illuminate\Http\JsonResponse|null The error response on error
      */
     protected function validateUserRequest(Request $request, $user, &$settings = [])
     {
         $rules = [
             'external_email' => 'nullable|email',
             'phone' => 'string|nullable|max:64|regex:/^[0-9+() -]+$/',
             'first_name' => 'string|nullable|max:128',
             'last_name' => 'string|nullable|max:128',
             'organization' => 'string|nullable|max:512',
             'billing_address' => 'string|nullable|max:1024',
             'country' => 'string|nullable|alpha|size:2',
             'currency' => 'string|nullable|alpha|size:3',
             'aliases' => 'array|nullable',
         ];
 
         if (empty($user) || !empty($request->password) || !empty($request->password_confirmation)) {
             $rules['password'] = 'required|min:4|max:2048|confirmed';
         }
 
         $errors = [];
 
         // Validate input
         $v = Validator::make($request->all(), $rules);
 
         if ($v->fails()) {
             $errors = $v->errors()->toArray();
         }
 
         $controller = $user ? $user->wallet()->owner : $this->guard()->user();
 
         // For new user validate email address
         if (empty($user)) {
             $email = $request->email;
 
             if (empty($email)) {
                 $errors['email'] = \trans('validation.required', ['attribute' => 'email']);
-            } elseif ($error = self::validateEmail($email, $controller, false)) {
+            } elseif ($error = self::validateEmail($email, $controller, $this->deleteBeforeCreate)) {
                 $errors['email'] = $error;
             }
         }
 
         // Validate aliases input
         if (isset($request->aliases)) {
             $aliases = [];
             $existing_aliases = $user ? $user->aliases()->get()->pluck('alias')->toArray() : [];
 
             foreach ($request->aliases as $idx => $alias) {
                 if (is_string($alias) && !empty($alias)) {
                     // Alias cannot be the same as the email address (new user)
                     if (!empty($email) && Str::lower($alias) == Str::lower($email)) {
                         continue;
                     }
 
                     // validate new aliases
                     if (
                         !in_array($alias, $existing_aliases)
-                        && ($error = self::validateEmail($alias, $controller, true))
+                        && ($error = self::validateAlias($alias, $controller))
                     ) {
                         if (!isset($errors['aliases'])) {
                             $errors['aliases'] = [];
                         }
                         $errors['aliases'][$idx] = $error;
                         continue;
                     }
 
                     $aliases[] = $alias;
                 }
             }
 
             $request->aliases = $aliases;
         }
 
         if (!empty($errors)) {
             return response()->json(['status' => 'error', 'errors' => $errors], 422);
         }
 
         // Update user settings
         $settings = $request->only(array_keys($rules));
         unset($settings['password'], $settings['aliases'], $settings['email']);
 
         return null;
     }
 
     /**
      * Execute (synchronously) specified step in a user setup process.
      *
      * @param \App\User $user User object
      * @param string    $step Step identifier (as in self::statusInfo())
      *
-     * @return bool True if the execution succeeded, False otherwise
+     * @return bool|null True if the execution succeeded, False if not, Null when
+     *                   the job has been sent to the worker (result unknown)
      */
-    public static function execProcessStep(User $user, string $step): bool
+    public static function execProcessStep(User $user, string $step): ?bool
     {
         try {
             if (strpos($step, 'domain-') === 0) {
                 list ($local, $domain) = explode('@', $user->email);
                 $domain = Domain::where('namespace', $domain)->first();
 
                 return DomainsController::execProcessStep($domain, $step);
             }
 
             switch ($step) {
                 case 'user-ldap-ready':
                     // User not in LDAP, create it
                     $job = new \App\Jobs\User\CreateJob($user->id);
                     $job->handle();
 
                     $user->refresh();
 
                     return $user->isLdapReady();
 
                 case 'user-imap-ready':
                     // User not in IMAP? Verify again
+                    // Do it synchronously if the imap admin credentials are available
+                    // otherwise let the worker do the job
+                    if (!\config('imap.admin_password')) {
+                        \App\Jobs\User\VerifyJob::dispatch($user->id);
+
+                        return null;
+                    }
+
                     $job = new \App\Jobs\User\VerifyJob($user->id);
                     $job->handle();
 
                     $user->refresh();
 
                     return $user->isImapReady();
             }
         } catch (\Exception $e) {
             \Log::error($e);
         }
 
         return false;
     }
 
     /**
-     * Email address (login or alias) validation
+     * Email address validation for use as a user mailbox (login).
      *
-     * @param string    $email    Email address
-     * @param \App\User $user     The account owner
-     * @param bool      $is_alias The email is an alias
+     * @param string                    $email   Email address
+     * @param \App\User                 $user    The account owner
+     * @param null|\App\User|\App\Group $deleted Filled with an instance of a deleted user or group
+     *                                           with the specified email address, if exists
      *
-     * @return string Error message on validation error
+     * @return ?string Error message on validation error
      */
-    public static function validateEmail(
-        string $email,
-        \App\User $user,
-        bool $is_alias = false
-    ): ?string {
-        $attribute = $is_alias ? 'alias' : 'email';
+    public static function validateEmail(string $email, \App\User $user, &$deleted = null): ?string
+    {
+        $deleted = null;
+
+        if (strpos($email, '@') === false) {
+            return \trans('validation.entryinvalid', ['attribute' => 'email']);
+        }
+
+        list($login, $domain) = explode('@', Str::lower($email));
+
+        if (strlen($login) === 0 || strlen($domain) === 0) {
+            return \trans('validation.entryinvalid', ['attribute' => 'email']);
+        }
+
+        // Check if domain exists
+        $domain = Domain::where('namespace', $domain)->first();
+
+        if (empty($domain)) {
+            return \trans('validation.domaininvalid');
+        }
+
+        // Validate login part alone
+        $v = Validator::make(
+            ['email' => $login],
+            ['email' => ['required', new UserEmailLocal(!$domain->isPublic())]]
+        );
+
+        if ($v->fails()) {
+            return $v->errors()->toArray()['email'][0];
+        }
+
+        // Check if it is one of domains available to the user
+        $domains = \collect($user->domains())->pluck('namespace')->all();
+
+        if (!in_array($domain->namespace, $domains)) {
+            return \trans('validation.entryexists', ['attribute' => 'domain']);
+        }
+
+        // Check if a user with specified address already exists
+        if ($existing_user = User::emailExists($email, true)) {
+            // If this is a deleted user in the same custom domain
+            // we'll force delete him before
+            if (!$domain->isPublic() && $existing_user->trashed()) {
+                $deleted = $existing_user;
+            } else {
+                return \trans('validation.entryexists', ['attribute' => 'email']);
+            }
+        }
+
+        // Check if an alias with specified address already exists.
+        if (User::aliasExists($email)) {
+            return \trans('validation.entryexists', ['attribute' => 'email']);
+        }
+
+        // Check if a group with specified address already exists
+        if ($existing_group = Group::emailExists($email, true)) {
+            // If this is a deleted group in the same custom domain
+            // we'll force delete it before
+            if (!$domain->isPublic() && $existing_group->trashed()) {
+                $deleted = $existing_group;
+            } else {
+                return \trans('validation.entryexists', ['attribute' => 'email']);
+            }
+        }
 
+        return null;
+    }
+
+    /**
+     * Email address validation for use as an alias.
+     *
+     * @param string    $email Email address
+     * @param \App\User $user  The account owner
+     *
+     * @return ?string Error message on validation error
+     */
+    public static function validateAlias(string $email, \App\User $user): ?string
+    {
         if (strpos($email, '@') === false) {
-            return \trans('validation.entryinvalid', ['attribute' => $attribute]);
+            return \trans('validation.entryinvalid', ['attribute' => 'alias']);
         }
 
         list($login, $domain) = explode('@', Str::lower($email));
 
         if (strlen($login) === 0 || strlen($domain) === 0) {
-            return \trans('validation.entryinvalid', ['attribute' => $attribute]);
+            return \trans('validation.entryinvalid', ['attribute' => 'alias']);
         }
 
         // Check if domain exists
         $domain = Domain::where('namespace', $domain)->first();
 
         if (empty($domain)) {
             return \trans('validation.domaininvalid');
         }
 
         // Validate login part alone
         $v = Validator::make(
-            [$attribute => $login],
-            [$attribute => ['required', new UserEmailLocal(!$domain->isPublic())]]
+            ['alias' => $login],
+            ['alias' => ['required', new UserEmailLocal(!$domain->isPublic())]]
         );
 
         if ($v->fails()) {
-            return $v->errors()->toArray()[$attribute][0];
+            return $v->errors()->toArray()['alias'][0];
         }
 
         // Check if it is one of domains available to the user
         $domains = \collect($user->domains())->pluck('namespace')->all();
 
         if (!in_array($domain->namespace, $domains)) {
             return \trans('validation.entryexists', ['attribute' => 'domain']);
         }
 
-        // Check if a user/alias with specified address already exists
-        // Allow assigning the same alias to a user in the same group account,
-        // but only for non-public domains
-        // Allow an alias in a custom domain to an address that was a user before
-        if ($exists = User::emailExists($email, true, $alias_exists, $is_alias && !$domain->isPublic())) {
-            if (
-                !$is_alias
-                || !$alias_exists
-                || $domain->isPublic()
-                || $exists->wallet()->user_id != $user->id
-            ) {
-                return \trans('validation.entryexists', ['attribute' => $attribute]);
+        // Check if a user with specified address already exists
+        if ($existing_user = User::emailExists($email, true)) {
+            // Allow an alias in a custom domain to an address that was a user before
+            if ($domain->isPublic() || !$existing_user->trashed()) {
+                return \trans('validation.entryexists', ['attribute' => 'alias']);
             }
         }
 
+        // Check if an alias with specified address already exists
+        if (User::aliasExists($email)) {
+            // Allow assigning the same alias to a user in the same group account,
+            // but only for non-public domains
+            if ($domain->isPublic()) {
+                return \trans('validation.entryexists', ['attribute' => 'alias']);
+            }
+        }
+
+        // Check if a group with specified address already exists
+        if (Group::emailExists($email)) {
+            return \trans('validation.entryexists', ['attribute' => 'alias']);
+        }
+
         return null;
     }
 }
diff --git a/src/app/Http/Controllers/API/V4/WalletsController.php b/src/app/Http/Controllers/API/V4/WalletsController.php
index a8ab8db6..481ebc1d 100644
--- a/src/app/Http/Controllers/API/V4/WalletsController.php
+++ b/src/app/Http/Controllers/API/V4/WalletsController.php
@@ -1,322 +1,321 @@
 <?php
 
 namespace App\Http\Controllers\API\V4;
 
 use App\Transaction;
 use App\Wallet;
 use App\Http\Controllers\Controller;
 use App\Providers\PaymentProvider;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 /**
  * API\WalletsController
  */
 class WalletsController extends Controller
 {
     /**
      * Display a listing of the resource.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function index()
     {
         return $this->errorResponse(404);
     }
 
     /**
      * Show the form for creating a new resource.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function create()
     {
         return $this->errorResponse(404);
     }
 
     /**
      * Store a newly created resource in storage.
      *
      * @param \Illuminate\Http\Request $request
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(Request $request)
     {
         return $this->errorResponse(404);
     }
 
     /**
      * Return data of the specified wallet.
      *
      * @param string $id A wallet identifier
      *
      * @return \Illuminate\Http\JsonResponse The response
      */
     public function show($id)
     {
         $wallet = Wallet::find($id);
 
         if (empty($wallet)) {
             return $this->errorResponse(404);
         }
 
         // Only owner (or admin) has access to the wallet
         if (!Auth::guard()->user()->canRead($wallet)) {
             return $this->errorResponse(403);
         }
 
         $result = $wallet->toArray();
 
         $provider = \App\Providers\PaymentProvider::factory($wallet);
 
         $result['provider'] = $provider->name();
         $result['notice'] = $this->getWalletNotice($wallet);
 
         return response()->json($result);
     }
 
     /**
      * Show the form for editing the specified resource.
      *
      * @param int $id
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function edit($id)
     {
         return $this->errorResponse(404);
     }
 
     /**
      * Update the specified resource in storage.
      *
      * @param \Illuminate\Http\Request $request
      * @param string                   $id
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request, $id)
     {
         return $this->errorResponse(404);
     }
 
     /**
      * Remove the specified resource from storage.
      *
      * @param int $id
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($id)
     {
         return $this->errorResponse(404);
     }
 
     /**
      * Download a receipt in pdf format.
      *
      * @param string $id      Wallet identifier
      * @param string $receipt Receipt identifier (YYYY-MM)
      *
      * @return \Illuminate\Http\Response
      */
     public function receiptDownload($id, $receipt)
     {
         $wallet = Wallet::find($id);
 
         // Only owner (or admin) has access to the wallet
         if (!Auth::guard()->user()->canRead($wallet)) {
             abort(403);
         }
 
         list ($year, $month) = explode('-', $receipt);
 
         if (empty($year) || empty($month) || $year < 2000 || $month < 1 || $month > 12) {
             abort(404);
         }
 
         if ($receipt >= date('Y-m')) {
             abort(404);
         }
 
         $params = [
             'id' => sprintf('%04d-%02d', $year, $month),
             'site' => \config('app.name')
         ];
 
         $filename = \trans('documents.receipt-filename', $params);
 
         $receipt = new \App\Documents\Receipt($wallet, (int) $year, (int) $month);
 
         $content = $receipt->pdfOutput();
 
         return response($content)
             ->withHeaders([
                 'Content-Type' => 'application/pdf',
                 'Content-Disposition' =>  'attachment; filename="' . $filename . '"',
                 'Content-Length' => strlen($content),
             ]);
     }
 
     /**
      * Fetch wallet receipts list.
      *
      * @param string $id Wallet identifier
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function receipts($id)
     {
         $wallet = Wallet::find($id);
 
         // Only owner (or admin) has access to the wallet
         if (!Auth::guard()->user()->canRead($wallet)) {
             return $this->errorResponse(403);
         }
 
         $result = $wallet->payments()
             ->selectRaw('distinct date_format(updated_at, "%Y-%m") as ident')
             ->where('status', PaymentProvider::STATUS_PAID)
-            ->where('amount', '>', 0)
+            ->where('amount', '<>', 0)
             ->orderBy('ident', 'desc')
             ->get()
             ->whereNotIn('ident', [date('Y-m')]) // exclude current month
             ->pluck('ident');
 
         return response()->json([
                 'status' => 'success',
                 'list' => $result,
                 'count' => count($result),
                 'hasMore' => false,
                 'page' => 1,
         ]);
     }
 
     /**
      * Fetch wallet transactions.
      *
      * @param string $id Wallet identifier
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function transactions($id)
     {
         $wallet = Wallet::find($id);
 
         // Only owner (or admin) has access to the wallet
         if (!Auth::guard()->user()->canRead($wallet)) {
             return $this->errorResponse(403);
         }
 
         $pageSize = 10;
         $page = intval(request()->input('page')) ?: 1;
         $hasMore = false;
         $isAdmin = $this instanceof Admin\WalletsController;
 
         if ($transaction = request()->input('transaction')) {
             // Get sub-transactions for the specified transaction ID, first
             // check access rights to the transaction's wallet
 
             $transaction = $wallet->transactions()->where('id', $transaction)->first();
 
             if (!$transaction) {
                 return $this->errorResponse(404);
             }
 
             $result = Transaction::where('transaction_id', $transaction->id)->get();
         } else {
             // Get main transactions (paged)
             $result = $wallet->transactions()
                 // FIXME: Do we know which (type of) transaction has sub-transactions
                 //        without the sub-query?
                 ->selectRaw("*, (SELECT count(*) FROM transactions sub "
                     . "WHERE sub.transaction_id = transactions.id) AS cnt")
                 ->whereNull('transaction_id')
                 ->latest()
                 ->limit($pageSize + 1)
                 ->offset($pageSize * ($page - 1))
                 ->get();
 
             if (count($result) > $pageSize) {
                 $result->pop();
                 $hasMore = true;
             }
         }
 
         $result = $result->map(function ($item) use ($isAdmin) {
-            $amount = $item->amount;
-
-            if (in_array($item->type, [Transaction::WALLET_PENALTY, Transaction::WALLET_DEBIT])) {
-                $amount *= -1;
-            }
-
             $entry = [
                 'id' => $item->id,
                 'createdAt' => $item->created_at->format('Y-m-d H:i'),
                 'type' => $item->type,
                 'description' => $item->shortDescription(),
-                'amount' => $amount,
+                'amount' => $item->amount,
                 'hasDetails' => !empty($item->cnt),
             ];
 
             if ($isAdmin && $item->user_email) {
                 $entry['user'] = $item->user_email;
             }
 
             return $entry;
         });
 
         return response()->json([
                 'status' => 'success',
                 'list' => $result,
                 'count' => count($result),
                 'hasMore' => $hasMore,
                 'page' => $page,
         ]);
     }
 
     /**
      * Returns human readable notice about the wallet state.
      *
      * @param \App\Wallet $wallet The wallet
      */
     protected function getWalletNotice(Wallet $wallet): ?string
     {
         // there is no credit
         if ($wallet->balance < 0) {
             return \trans('app.wallet-notice-nocredit');
         }
 
         // the discount is 100%, no credit is needed
         if ($wallet->discount && $wallet->discount->discount == 100) {
             return null;
         }
 
         // the owner was created less than a month ago
         if ($wallet->owner->created_at > Carbon::now()->subMonthsWithoutOverflow(1)) {
             // but more than two weeks ago, notice of trial ending
             if ($wallet->owner->created_at <= Carbon::now()->subWeeks(2)) {
                 return \trans('app.wallet-notice-trial-end');
             }
 
             return \trans('app.wallet-notice-trial');
         }
 
         if ($until = $wallet->balanceLastsUntil()) {
             if ($until->isToday()) {
                 return \trans('app.wallet-notice-today');
             }
 
+            // Once in a while we got e.g. "3 weeks" instead of expected "4 weeks".
+            // It's because $until uses full seconds, but $now is more precise.
+            // We make sure both have the same time set.
+            $now = Carbon::now()->setTimeFrom($until);
+
             $params = [
                 'date' => $until->toDateString(),
-                'days' => Carbon::now()->diffForHumans($until, Carbon::DIFF_ABSOLUTE),
+                'days' => $now->diffForHumans($until, Carbon::DIFF_ABSOLUTE),
             ];
 
             return \trans('app.wallet-notice-date', $params);
         }
 
         return null;
     }
 }
diff --git a/src/app/Http/Controllers/ContentController.php b/src/app/Http/Controllers/ContentController.php
new file mode 100644
index 00000000..7aa099dc
--- /dev/null
+++ b/src/app/Http/Controllers/ContentController.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Controllers;
+
+class ContentController extends Controller
+{
+    /**
+     * Get the HTML content for the specified page
+     *
+     * @param string $page Page template identifier
+     *
+     * @return \Illuminate\View\View
+     */
+    public function pageContent(string $page)
+    {
+        if (empty($page) || !preg_match('/^[a-z\/]+$/', $page)) {
+            abort(404);
+        }
+
+        $page = str_replace('/', '.', $page);
+        $file = sprintf('themes/%s/pages/%s.blade.php', \config('app.theme'), $page);
+        $view = sprintf('%s.pages.%s', \config('app.theme'), $page);
+
+        if (!file_exists(resource_path($file))) {
+            abort(404);
+        }
+
+        return view($view)->with('env', \App\Utils::uiEnv());
+    }
+
+    /**
+     * Get the list of FAQ entries for the specified page
+     *
+     * @param string $page Page path
+     *
+     * @return \Illuminate\Http\JsonResponse JSON response
+     */
+    public function faqContent(string $page)
+    {
+        if (empty($page)) {
+            return $this->errorResponse(404);
+        }
+
+        $faq = [];
+
+        $theme_name = \config('app.theme');
+        $theme_file = resource_path("themes/{$theme_name}/theme.json");
+
+        if (file_exists($theme_file)) {
+            $theme = json_decode(file_get_contents($theme_file), true);
+            if (json_last_error() != JSON_ERROR_NONE) {
+                \Log::error("Failed to parse $theme_file: " . json_last_error_msg());
+            } elseif (!empty($theme['faq']) && !empty($theme['faq'][$page])) {
+                $faq = $theme['faq'][$page];
+            }
+
+            // TODO: Support pages with variables, e.g. users/<user-id>
+        }
+
+        return response()->json(['status' => 'success', 'faq' => $faq]);
+    }
+}
diff --git a/src/app/Http/Controllers/Controller.php b/src/app/Http/Controllers/Controller.php
index 25ed87c3..9e957987 100644
--- a/src/app/Http/Controllers/Controller.php
+++ b/src/app/Http/Controllers/Controller.php
@@ -1,44 +1,49 @@
 <?php
 
 namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests;
     use DispatchesJobs;
     use ValidatesRequests;
 
 
     /**
      * Common error response builder for API (JSON) responses
      *
      * @param int    $code    Error code
      * @param string $message Error message
+     * @param array  $data    Additional response data
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    protected function errorResponse(int $code, string $message = null)
+    protected function errorResponse(int $code, string $message = null, array $data = [])
     {
         $errors = [
             400 => "Bad request",
             401 => "Unauthorized",
             403 => "Access denied",
             404 => "Not found",
             422 => "Input validation error",
             405 => "Method not allowed",
             500 => "Internal server error",
         ];
 
         $response = [
             'status' => 'error',
             'message' => $message ?: (isset($errors[$code]) ? $errors[$code] : "Server error"),
         ];
 
+        if (!empty($data)) {
+            $response = $response + $data;
+        }
+
         return response()->json($response, $code);
     }
 }
diff --git a/src/app/Http/Controllers/WebsocketController.php b/src/app/Http/Controllers/WebsocketController.php
new file mode 100644
index 00000000..cd75d811
--- /dev/null
+++ b/src/app/Http/Controllers/WebsocketController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class WebsocketController extends Controller
+{
+    public function message($websocket, $data)
+    {
+        $websocket->emit("message", $data);
+    }
+
+    public function ping($websocket, $data)
+    {
+        $websocket->emit("pong", $data);
+    }
+}
diff --git a/src/app/Http/Kernel.php b/src/app/Http/Kernel.php
index fc565e7a..af03713a 100644
--- a/src/app/Http/Kernel.php
+++ b/src/app/Http/Kernel.php
@@ -1,85 +1,88 @@
 <?php
 
 namespace App\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
 {
     /**
      * The application's global HTTP middleware stack.
      *
      * These middleware are run during every request to your application.
      *
      * @var array
      */
     protected $middleware = [
         \App\Http\Middleware\RequestLogger::class,
         \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\DevelConfig::class,
+        // FIXME: CORS handling added here, I didn't find a nice way
+        // to add this only to the API routes
+        // \App\Http\Middleware\Cors::class,
     ];
 
     /**
      * The application's route middleware groups.
      *
      * @var array
      */
     protected $middlewareGroups = [
         'web' => [
             // \App\Http\Middleware\EncryptCookies::class,
             // \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             // \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             // \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             // \App\Http\Middleware\VerifyCsrfToken::class,
             // \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
         'api' => [
             //'throttle:120,1',
             'bindings',
         ],
     ];
 
     /**
      * The application's route middleware.
      *
      * These middleware may be assigned to groups or used individually.
      *
      * @var array
      */
     protected $routeMiddleware = [
         'admin' => \App\Http\Middleware\AuthenticateAdmin::class,
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
 
     /**
      * The priority-sorted list of middleware.
      *
      * This forces non-global middleware to always be in the given order.
      *
      * @var array
      */
     protected $middlewarePriority = [
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \App\Http\Middleware\AuthenticateAdmin::class,
         \App\Http\Middleware\Authenticate::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,
         \App\Http\Middleware\AuthenticateAdmin::class,
     ];
 }
diff --git a/src/app/Http/Middleware/Cors.php b/src/app/Http/Middleware/Cors.php
new file mode 100644
index 00000000..69dd2dff
--- /dev/null
+++ b/src/app/Http/Middleware/Cors.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class Cors
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // TODO: Now we allow all, but we should be allowing only meet.domain.tld
+
+        return $next($request)
+            ->header('Access-Control-Allow-Origin', '*')
+            ->header(
+                'Access-Control-Allow-Methods',
+                'GET, POST, PUT, DELETE, OPTIONS'
+            )
+            ->header(
+                'Access-Control-Allow-Headers',
+                'X-Requested-With, Content-Type, X-Token-Auth, Authorization'
+            );
+    }
+}
diff --git a/src/app/Http/Middleware/RequestLogger.php b/src/app/Http/Middleware/RequestLogger.php
index a9a6a802..59d30556 100644
--- a/src/app/Http/Middleware/RequestLogger.php
+++ b/src/app/Http/Middleware/RequestLogger.php
@@ -1,25 +1,31 @@
 <?php
 
 namespace App\Http\Middleware;
 
 use Closure;
 
 class RequestLogger
 {
+    private static $start;
+
     public function handle($request, Closure $next)
     {
+        // FIXME: This is not really a request start, but we can't
+        //        use LARAVEL_START constant when working with swoole
+        self::$start = microtime(true);
+
         return $next($request);
     }
 
     public function terminate($request, $response)
     {
         if (\App::environment('local')) {
             $url = $request->fullUrl();
             $method = $request->getMethod();
-            $time = microtime(true) - LARAVEL_START;
             $mem = round(memory_get_peak_usage() / 1024 / 1024, 1);
+            $time = microtime(true) - self::$start;
 
             \Log::debug(sprintf("C: %s %s [%sM]: %.4f sec.", $method, $url, $mem, $time));
         }
     }
 }
diff --git a/src/app/Jobs/CommonJob.php b/src/app/Jobs/CommonJob.php
index 6d4602d8..d0c2b001 100644
--- a/src/app/Jobs/CommonJob.php
+++ b/src/app/Jobs/CommonJob.php
@@ -1,73 +1,107 @@
 <?php
 
 namespace App\Jobs;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
 /**
  * The abstract \App\Jobs\DomainJob implements the logic needed for all dispatchable Jobs related to
  * \App\Domain objects.
  *
  * ```php
  * $job = new \App\Jobs\Domain\CreateJob($domainId);
  * $job->handle();
  * ```
  */
 abstract class CommonJob implements ShouldQueue
 {
     use Dispatchable;
     use InteractsWithQueue;
     use Queueable;
 
     /**
      * The failure message.
      *
      * @var string
      */
     public $failureMessage;
 
+    /**
+     * The job released state.
+     *
+     * @var bool
+     */
+    protected $isReleased = false;
+
     /**
      * The number of tries for this Job.
      *
      * @var int
      */
     public $tries = 5;
 
     /**
      * Execute the job.
      *
      * @return void
      */
     abstract public function handle();
 
     /**
      * Delete the job, call the "failed" method, and raise the failed job event.
      *
      * @param \Throwable|null $e An Exception
      *
      * @return void
      */
     public function fail($e = null)
     {
         // Save the message, for testing purposes
         $this->failureMessage = $e->getMessage();
 
         // @phpstan-ignore-next-line
         if ($this->job) {
             $this->job->fail($e);
         }
     }
 
     /**
      * Check if the job has failed
      *
      * @return bool
      */
     public function hasFailed(): bool
     {
         return $this->failureMessage !== null;
     }
+
+    /**
+     * Release the job back into the queue.
+     *
+     * @param int $delay Time in seconds
+     * @return void
+     */
+    public function release($delay = 0)
+    {
+        // We need this for testing purposes
+        $this->isReleased = true;
+
+        // @phpstan-ignore-next-line
+        if ($this->job) {
+            $this->job->release($delay);
+        }
+    }
+
+    /**
+     * Check if the job was released
+     *
+     * @return bool
+     */
+    public function isReleased(): bool
+    {
+        return $this->isReleased;
+    }
 }
diff --git a/src/app/Jobs/Domain/CreateJob.php b/src/app/Jobs/Domain/CreateJob.php
index 490fee5b..cbe90e97 100644
--- a/src/app/Jobs/Domain/CreateJob.php
+++ b/src/app/Jobs/Domain/CreateJob.php
@@ -1,27 +1,31 @@
 <?php
 
 namespace App\Jobs\Domain;
 
 use App\Jobs\DomainJob;
 
 class CreateJob extends DomainJob
 {
     /**
      * Execute the job.
      *
      * @return void
      */
     public function handle()
     {
         $domain = $this->getDomain();
 
+        if (!$domain) {
+            return;
+        }
+
         if (!$domain->isLdapReady()) {
             \App\Backends\LDAP::createDomain($domain);
 
             $domain->status |= \App\Domain::STATUS_LDAP_READY;
             $domain->save();
 
             \App\Jobs\Domain\VerifyJob::dispatch($domain->id);
         }
     }
 }
diff --git a/src/app/Jobs/Domain/DeleteJob.php b/src/app/Jobs/Domain/DeleteJob.php
index 6f308f1c..5e070223 100644
--- a/src/app/Jobs/Domain/DeleteJob.php
+++ b/src/app/Jobs/Domain/DeleteJob.php
@@ -1,29 +1,38 @@
 <?php
 
 namespace App\Jobs\Domain;
 
 use App\Jobs\DomainJob;
 
 class DeleteJob extends DomainJob
 {
     /**
      * Execute the job.
      *
      * @return void
      */
     public function handle()
     {
         $domain = $this->getDomain();
 
+        if (!$domain) {
+            return;
+        }
+
         // sanity checks
         if ($domain->isDeleted()) {
             $this->fail(new \Exception("Domain {$this->domainId} is already marked as deleted."));
             return;
         }
 
         \App\Backends\LDAP::deleteDomain($domain);
 
         $domain->status |= \App\Domain::STATUS_DELETED;
+
+        if ($domain->isLdapReady()) {
+            $domain->status ^= \App\Domain::STATUS_LDAP_READY;
+        }
+
         $domain->save();
     }
 }
diff --git a/src/app/Jobs/Domain/UpdateJob.php b/src/app/Jobs/Domain/UpdateJob.php
index f939dfe4..de84fe08 100644
--- a/src/app/Jobs/Domain/UpdateJob.php
+++ b/src/app/Jobs/Domain/UpdateJob.php
@@ -1,25 +1,29 @@
 <?php
 
 namespace App\Jobs\Domain;
 
 use App\Jobs\DomainJob;
 
 class UpdateJob extends DomainJob
 {
     /**
      * Execute the job.
      *
      * @return void
      */
     public function handle()
     {
         $domain = $this->getDomain();
 
+        if (!$domain) {
+            return;
+        }
+
         if (!$domain->isLdapReady()) {
             $this->delete();
             return;
         }
 
         \App\Backends\LDAP::updateDomain($domain);
     }
 }
diff --git a/src/app/Jobs/Domain/VerifyJob.php b/src/app/Jobs/Domain/VerifyJob.php
index df33a1a9..00f1c1f9 100644
--- a/src/app/Jobs/Domain/VerifyJob.php
+++ b/src/app/Jobs/Domain/VerifyJob.php
@@ -1,24 +1,24 @@
 <?php
 
 namespace App\Jobs\Domain;
 
 use App\Jobs\DomainJob;
 
 class VerifyJob extends DomainJob
 {
     /**
      * Execute the job.
      *
      * @return void
      */
     public function handle()
     {
         $domain = $this->getDomain();
 
-        $domain->verify();
+        if (!$domain) {
+            return;
+        }
 
-        // TODO: What should happen if the domain is not registered yet?
-        //       Should we start a new job with some specified delay?
-        //       Or we just give the user a button to start verification again?
+        $domain->verify();
     }
 }
diff --git a/src/app/Jobs/DomainJob.php b/src/app/Jobs/DomainJob.php
index 98d54fcb..d8cf3d3a 100644
--- a/src/app/Jobs/DomainJob.php
+++ b/src/app/Jobs/DomainJob.php
@@ -1,66 +1,73 @@
 <?php
 
 namespace App\Jobs;
 
 /**
  * The abstract \App\Jobs\DomainJob implements the logic needed for all dispatchable Jobs related to
  * \App\Domain objects.
  *
  * ```php
  * $job = new \App\Jobs\Domain\CreateJob($domainId);
  * $job->handle();
  * ```
  */
 abstract class DomainJob extends CommonJob
 {
     /**
      * The ID for the \App\Domain. This is the shortest globally unique identifier and saves Redis space
      * compared to a serialized version of the complete \App\Domain object.
      *
      * @var int
      */
     protected $domainId;
 
     /**
      * The \App\Domain namespace property, for legibility in the queue management.
      *
      * @var string
      */
     protected $domainNamespace;
 
     /**
      * Create a new job instance.
      *
-     * @param int $domainId The ID for the user to create.
+     * @param int $domainId The ID for the domain to create.
      *
      * @return void
      */
     public function __construct(int $domainId)
     {
         $this->domainId = $domainId;
 
         $domain = $this->getDomain();
 
         if ($domain) {
             $this->domainNamespace = $domain->namespace;
         }
     }
 
     /**
      * Get the \App\Domain entry associated with this job.
      *
      * @return \App\Domain|null
      *
      * @throws \Exception
      */
     protected function getDomain()
     {
         $domain = \App\Domain::withTrashed()->find($this->domainId);
 
         if (!$domain) {
+            // The record might not exist yet in case of a db replication environment
+            // This will release the job and delay another attempt for 5 seconds
+            if ($this instanceof Domain\CreateJob) {
+                $this->release(5);
+                return null;
+            }
+
             $this->fail(new \Exception("Domain {$this->domainId} could not be found in the database."));
         }
 
         return $domain;
     }
 }
diff --git a/src/app/Jobs/Group/CreateJob.php b/src/app/Jobs/Group/CreateJob.php
new file mode 100644
index 00000000..4437a4a2
--- /dev/null
+++ b/src/app/Jobs/Group/CreateJob.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Jobs\Group;
+
+use App\Jobs\GroupJob;
+
+class CreateJob extends GroupJob
+{
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $group = $this->getGroup();
+
+        if (!$group) {
+            return;
+        }
+
+        if (!$group->isLdapReady()) {
+            \App\Backends\LDAP::createGroup($group);
+
+            $group->status |= \App\Group::STATUS_LDAP_READY;
+            $group->save();
+        }
+    }
+}
diff --git a/src/app/Jobs/Group/DeleteJob.php b/src/app/Jobs/Group/DeleteJob.php
new file mode 100644
index 00000000..2d550693
--- /dev/null
+++ b/src/app/Jobs/Group/DeleteJob.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Jobs\Group;
+
+use App\Jobs\GroupJob;
+
+class DeleteJob extends GroupJob
+{
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $group = $this->getGroup();
+
+        if (!$group) {
+            return;
+        }
+
+        // sanity checks
+        if ($group->isDeleted()) {
+            $this->fail(new \Exception("Group {$this->groupId} is already marked as deleted."));
+            return;
+        }
+
+        \App\Backends\LDAP::deleteGroup($group);
+
+        $group->status |= \App\Group::STATUS_DELETED;
+
+        if ($group->isLdapReady()) {
+            $group->status ^= \App\Group::STATUS_LDAP_READY;
+        }
+
+        $group->save();
+    }
+}
diff --git a/src/app/Jobs/Group/UpdateJob.php b/src/app/Jobs/Group/UpdateJob.php
new file mode 100644
index 00000000..c6529765
--- /dev/null
+++ b/src/app/Jobs/Group/UpdateJob.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Jobs\Group;
+
+use App\Jobs\GroupJob;
+
+class UpdateJob extends GroupJob
+{
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $group = $this->getGroup();
+
+        if (!$group) {
+            return;
+        }
+
+        if (!$group->isLdapReady()) {
+            $this->delete();
+            return;
+        }
+
+        \App\Backends\LDAP::updateGroup($group);
+    }
+}
diff --git a/src/app/Jobs/GroupJob.php b/src/app/Jobs/GroupJob.php
new file mode 100644
index 00000000..80a5db8e
--- /dev/null
+++ b/src/app/Jobs/GroupJob.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Jobs;
+
+/**
+ * The abstract \App\Jobs\GroupJob implements the logic needed for all dispatchable Jobs related to
+ * \App\Group objects.
+ *
+ * ```php
+ * $job = new \App\Jobs\Group\CreateJob($groupId);
+ * $job->handle();
+ * ```
+ */
+abstract class GroupJob extends CommonJob
+{
+    /**
+     * The ID for the \App\Group. This is the shortest globally unique identifier and saves Redis space
+     * compared to a serialized version of the complete \App\Group object.
+     *
+     * @var int
+     */
+    protected $groupId;
+
+    /**
+     * The \App\Group email property, for legibility in the queue management.
+     *
+     * @var string
+     */
+    protected $groupEmail;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param int $groupId The ID for the group to create.
+     *
+     * @return void
+     */
+    public function __construct(int $groupId)
+    {
+        $this->groupId = $groupId;
+
+        $group = $this->getGroup();
+
+        if ($group) {
+            $this->groupEmail = $group->email;
+        }
+    }
+
+    /**
+     * Get the \App\Group entry associated with this job.
+     *
+     * @return \App\Group|null
+     *
+     * @throws \Exception
+     */
+    protected function getGroup()
+    {
+        $group = \App\Group::withTrashed()->find($this->groupId);
+
+        if (!$group) {
+            // The record might not exist yet in case of a db replication environment
+            // This will release the job and delay another attempt for 5 seconds
+            if ($this instanceof Group\CreateJob) {
+                $this->release(5);
+                return null;
+            }
+
+            $this->fail(new \Exception("Group {$this->groupId} could not be found in the database."));
+        }
+
+        return $group;
+    }
+}
diff --git a/src/app/Jobs/User/DeleteJob.php b/src/app/Jobs/User/DeleteJob.php
index 4c5cf6a3..307fb4a2 100644
--- a/src/app/Jobs/User/DeleteJob.php
+++ b/src/app/Jobs/User/DeleteJob.php
@@ -1,33 +1,42 @@
 <?php
 
 namespace App\Jobs\User;
 
 use App\Jobs\UserJob;
 
 class DeleteJob extends UserJob
 {
     /**
      * Execute the job.
      *
      * @return void
      */
     public function handle()
     {
         $user = $this->getUser();
 
         if (!$user) {
             return;
         }
 
         // sanity checks
         if ($user->isDeleted()) {
             $this->fail(new \Exception("User {$this->userId} is already marked as deleted."));
             return;
         }
 
         \App\Backends\LDAP::deleteUser($user);
 
         $user->status |= \App\User::STATUS_DELETED;
+
+        if ($user->isLdapReady()) {
+            $user->status ^= \App\User::STATUS_LDAP_READY;
+        }
+
+        if ($user->isImapReady()) {
+            $user->status ^= \App\User::STATUS_IMAP_READY;
+        }
+
         $user->save();
     }
 }
diff --git a/src/app/Jobs/User/UpdateJob.php b/src/app/Jobs/User/UpdateJob.php
index 2ed454e2..29b0acec 100644
--- a/src/app/Jobs/User/UpdateJob.php
+++ b/src/app/Jobs/User/UpdateJob.php
@@ -1,25 +1,29 @@
 <?php
 
 namespace App\Jobs\User;
 
 use App\Jobs\UserJob;
 
 class UpdateJob extends UserJob
 {
     /**
      * Execute the job.
      *
      * @return void
      */
     public function handle()
     {
         $user = $this->getUser();
 
+        if (!$user) {
+            return;
+        }
+
         if (!$user->isLdapReady()) {
             $this->delete();
             return;
         }
 
         \App\Backends\LDAP::updateUser($user);
     }
 }
diff --git a/src/app/Jobs/UserJob.php b/src/app/Jobs/UserJob.php
index 2e1760d3..149540da 100644
--- a/src/app/Jobs/UserJob.php
+++ b/src/app/Jobs/UserJob.php
@@ -1,66 +1,73 @@
 <?php
 
 namespace App\Jobs;
 
 /**
  * The abstract \App\Jobs\UserJob implements the logic needed for all dispatchable Jobs related to
  * \App\User objects.
  *
  * ```php
  * $job = new \App\Jobs\User\CreateJob($userId);
  * $job->handle();
  * ```
  */
 abstract class UserJob extends CommonJob
 {
     /**
      * The ID for the \App\User. This is the shortest globally unique identifier and saves Redis space
      * compared to a serialized version of the complete \App\User object.
      *
      * @var int
      */
     protected $userId;
 
     /**
      * The \App\User email property, for legibility in the queue management.
      *
      * @var string
      */
     protected $userEmail;
 
     /**
      * Create a new job instance.
      *
      * @param int $userId The ID for the user to create.
      *
      * @return void
      */
     public function __construct(int $userId)
     {
         $this->userId = $userId;
 
         $user = $this->getUser();
 
         if ($user) {
             $this->userEmail = $user->email;
         }
     }
 
     /**
      * Get the \App\User entry associated with this job.
      *
      * @return \App\User|null
      *
      * @throws \Exception
      */
     protected function getUser()
     {
         $user = \App\User::withTrashed()->find($this->userId);
 
         if (!$user) {
+            // The record might not exist yet in case of a db replication environment
+            // This will release the job and delay another attempt for 5 seconds
+            if ($this instanceof User\CreateJob) {
+                $this->release(5);
+                return null;
+            }
+
             $this->fail(new \Exception("User {$this->userId} could not be found in the database."));
         }
 
         return $user;
     }
 }
diff --git a/src/app/Jobs/WalletCheck.php b/src/app/Jobs/WalletCheck.php
index 274240ca..f388848b 100644
--- a/src/app/Jobs/WalletCheck.php
+++ b/src/app/Jobs/WalletCheck.php
@@ -1,338 +1,338 @@
 <?php
 
 namespace App\Jobs;
 
 use App\Http\Controllers\API\V4\PaymentsController;
 use App\Wallet;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Mail;
 
 class WalletCheck implements ShouldQueue
 {
     use Dispatchable;
     use InteractsWithQueue;
     use Queueable;
     use SerializesModels;
 
     public const THRESHOLD_DELETE = 'delete';
     public const THRESHOLD_BEFORE_DELETE = 'before_delete';
     public const THRESHOLD_SUSPEND = 'suspend';
     public const THRESHOLD_BEFORE_SUSPEND = 'before_suspend';
     public const THRESHOLD_REMINDER = 'reminder';
     public const THRESHOLD_BEFORE_REMINDER = 'before_reminder';
     public const THRESHOLD_INITIAL = 'initial';
 
     /** @var int The number of seconds to wait before retrying the job. */
     public $retryAfter = 10;
 
     /** @var int How many times retry the job if it fails. */
     public $tries = 5;
 
     /** @var bool Delete the job if the wallet no longer exist. */
     public $deleteWhenMissingModels = true;
 
     /** @var \App\Wallet A wallet object */
     protected $wallet;
 
 
     /**
      * Create a new job instance.
      *
      * @param \App\Wallet $wallet The wallet that has been charged.
      *
      * @return void
      */
     public function __construct(Wallet $wallet)
     {
         $this->wallet = $wallet;
     }
 
     /**
      * Execute the job.
      *
      * @return ?string Executed action (THRESHOLD_*)
      */
     public function handle()
     {
         if ($this->wallet->balance >= 0) {
             return null;
         }
 
         $now = Carbon::now();
 
         // Delete the account
         if (self::threshold($this->wallet, self::THRESHOLD_DELETE) < $now) {
             $this->deleteAccount();
             return self::THRESHOLD_DELETE;
         }
 
         // Warn about the upcomming account deletion
         if (self::threshold($this->wallet, self::THRESHOLD_BEFORE_DELETE) < $now) {
             $this->warnBeforeDelete();
             return self::THRESHOLD_BEFORE_DELETE;
         }
 
         // Suspend the account
         if (self::threshold($this->wallet, self::THRESHOLD_SUSPEND) < $now) {
             $this->suspendAccount();
             return self::THRESHOLD_SUSPEND;
         }
 
         // Try to top-up the wallet before suspending the account
         if (self::threshold($this->wallet, self::THRESHOLD_BEFORE_SUSPEND) < $now) {
             PaymentsController::topUpWallet($this->wallet);
             return self::THRESHOLD_BEFORE_SUSPEND;
         }
 
         // Send the second reminder
         if (self::threshold($this->wallet, self::THRESHOLD_REMINDER) < $now) {
             $this->secondReminder();
             return self::THRESHOLD_REMINDER;
         }
 
         // Try to top-up the wallet before the second reminder
         if (self::threshold($this->wallet, self::THRESHOLD_BEFORE_REMINDER) < $now) {
             PaymentsController::topUpWallet($this->wallet);
             return self::THRESHOLD_BEFORE_REMINDER;
         }
 
         // Send the initial reminder
         if (self::threshold($this->wallet, self::THRESHOLD_INITIAL) < $now) {
             $this->initialReminder();
             return self::THRESHOLD_INITIAL;
         }
 
         return null;
     }
 
     /**
      * Send the initial reminder
      */
     protected function initialReminder()
     {
         if ($this->wallet->getSetting('balance_warning_initial')) {
             return;
         }
 
         // TODO: Should we check if the account is already suspended?
 
         $label = "Notification sent for";
 
         $this->sendMail(\App\Mail\NegativeBalance::class, false, $label);
 
         $now = \Carbon\Carbon::now()->toDateTimeString();
         $this->wallet->setSetting('balance_warning_initial', $now);
     }
 
     /**
      * Send the second reminder
      */
     protected function secondReminder()
     {
         if ($this->wallet->getSetting('balance_warning_reminder')) {
             return;
         }
 
         // TODO: Should we check if the account is already suspended?
 
         $label = "Reminder sent for";
 
         $this->sendMail(\App\Mail\NegativeBalanceReminder::class, false, $label);
 
         $now = \Carbon\Carbon::now()->toDateTimeString();
         $this->wallet->setSetting('balance_warning_reminder', $now);
     }
 
     /**
      * Suspend the account (and send the warning)
      */
     protected function suspendAccount()
     {
         if ($this->wallet->getSetting('balance_warning_suspended')) {
             return;
         }
 
         // Sanity check, already deleted
         if (!$this->wallet->owner) {
             return;
         }
 
         // Suspend the account
         $this->wallet->owner->suspend();
         foreach ($this->wallet->entitlements as $entitlement) {
             if (
                 $entitlement->entitleable_type == \App\Domain::class
                 || $entitlement->entitleable_type == \App\User::class
             ) {
                 $entitlement->entitleable->suspend();
             }
         }
 
         $label = "Account suspended";
 
-        $this->sendMail(\App\Mail\NegativeBalanceSuspended::class, false, $label);
+        $this->sendMail(\App\Mail\NegativeBalanceSuspended::class, true, $label);
 
         $now = \Carbon\Carbon::now()->toDateTimeString();
         $this->wallet->setSetting('balance_warning_suspended', $now);
     }
 
     /**
      * Send the last warning before delete
      */
     protected function warnBeforeDelete()
     {
         if ($this->wallet->getSetting('balance_warning_before_delete')) {
             return;
         }
 
         // Sanity check, already deleted
         if (!$this->wallet->owner) {
             return;
         }
 
         $label = "Last warning sent for";
 
         $this->sendMail(\App\Mail\NegativeBalanceBeforeDelete::class, true, $label);
 
         $now = \Carbon\Carbon::now()->toDateTimeString();
         $this->wallet->setSetting('balance_warning_before_delete', $now);
     }
 
     /**
      * Delete the account
      */
     protected function deleteAccount()
     {
         // TODO: This will not work when we actually allow multiple-wallets per account
         //       but in this case we anyway have to change the whole thing
         //       and calculate summarized balance from all wallets.
         // The dirty work will be done by UserObserver
         if ($this->wallet->owner) {
             $email = $this->wallet->owner->email;
 
             $this->wallet->owner->delete();
 
             \Log::info(
                 sprintf(
                     "[WalletCheck] Account deleted %s (%s)",
                     $this->wallet->id,
                     $email
                 )
             );
         }
     }
 
     /**
      * Send the email
      *
      * @param string  $class         Mailable class name
      * @param bool    $with_external Use users's external email
      * @param ?string $log_label     Log label
      */
     protected function sendMail($class, $with_external = false, $log_label = null): void
     {
         // TODO: Send the email to all wallet controllers?
 
         $mail = new $class($this->wallet, $this->wallet->owner);
 
         list($to, $cc) = \App\Mail\Helper::userEmails($this->wallet->owner, $with_external);
 
         if (!empty($to) || !empty($cc)) {
             try {
                 Mail::to($to)->cc($cc)->send($mail);
 
                 if ($log_label) {
                     $msg = sprintf(
                         "[WalletCheck] %s %s (%s)",
                         $log_label,
                         $this->wallet->id,
                         empty($cc) ? $to : implode(', ', array_merge([$to], $cc)),
                     );
 
                     \Log::info($msg);
                 }
             } catch (\Exception $e) {
                 $msg = sprintf(
                     "[WalletCheck] Failed to send mail for %s (%s): %s",
                     $this->wallet->id,
                     empty($cc) ? $to : implode(', ', array_merge([$to], $cc)),
                     $e->getMessage()
                 );
 
                 \Log::error($msg);
                 throw $e;
             }
         }
     }
 
     /**
      * Get the date-time for an action threshold. Calculated using
      * the date when a wallet balance turned negative.
      *
      * @param \App\Wallet $wallet A wallet
      * @param string      $type   Action type (one of self::THRESHOLD_*)
      *
      * @return \Carbon\Carbon The threshold date-time object
      */
     public static function threshold(Wallet $wallet, string $type): ?Carbon
     {
         $negative_since = $wallet->getSetting('balance_negative_since');
 
         // Migration scenario: balance<0, but no balance_negative_since set
         if (!$negative_since) {
             // 2h back from now, so first run can sent the initial notification
             $negative_since = Carbon::now()->subHours(2);
             $wallet->setSetting('balance_negative_since', $negative_since->toDateTimeString());
         } else {
             $negative_since = new Carbon($negative_since);
         }
 
         $remind = 7;   // remind after first X days
         $suspend = 14; // suspend after next X days
         $delete = 21;  // delete after next X days
         $warn = 3;     // warn about delete on X days before delete
 
         // Acount deletion
         if ($type == self::THRESHOLD_DELETE) {
             return $negative_since->addDays($delete + $suspend + $remind);
         }
 
         // Warning about the upcomming account deletion
         if ($type == self::THRESHOLD_BEFORE_DELETE) {
             return $negative_since->addDays($delete + $suspend + $remind - $warn);
         }
 
         // Account suspension
         if ($type == self::THRESHOLD_SUSPEND) {
             return $negative_since->addDays($suspend + $remind);
         }
 
         // A day before account suspension
         if ($type == self::THRESHOLD_BEFORE_SUSPEND) {
             return $negative_since->addDays($suspend + $remind - 1);
         }
 
         // Second notification
         if ($type == self::THRESHOLD_REMINDER) {
             return $negative_since->addDays($remind);
         }
 
         // A day before the second reminder
         if ($type == self::THRESHOLD_BEFORE_REMINDER) {
             return $negative_since->addDays($remind - 1);
         }
 
         // Initial notification
         // Give it an hour so the async recurring payment has a chance to be finished
         if ($type == self::THRESHOLD_INITIAL) {
             return $negative_since->addHours(1);
         }
 
         return null;
     }
 }
diff --git a/src/app/Observers/DomainObserver.php b/src/app/Observers/DomainObserver.php
index 72be1d66..57cfc858 100644
--- a/src/app/Observers/DomainObserver.php
+++ b/src/app/Observers/DomainObserver.php
@@ -1,109 +1,157 @@
 <?php
 
 namespace App\Observers;
 
 use App\Domain;
 use Illuminate\Support\Facades\DB;
 
 class DomainObserver
 {
     /**
      * Handle the domain "created" event.
      *
      * @param \App\Domain $domain The domain.
      *
      * @return void
      */
     public function creating(Domain $domain): void
     {
         while (true) {
             $allegedly_unique = \App\Utils::uuidInt();
-            if (!Domain::find($allegedly_unique)) {
+            if (!Domain::withTrashed()->find($allegedly_unique)) {
                 $domain->{$domain->getKeyName()} = $allegedly_unique;
                 break;
             }
         }
 
         $domain->namespace = \strtolower($domain->namespace);
 
         $domain->status |= Domain::STATUS_NEW;
     }
 
     /**
      * Handle the domain "created" event.
      *
      * @param \App\Domain $domain The domain.
      *
      * @return void
      */
     public function created(Domain $domain)
     {
         // Create domain record in LDAP
         // Note: DomainCreate job will dispatch DomainVerify job
         \App\Jobs\Domain\CreateJob::dispatch($domain->id);
     }
 
     /**
      * Handle the domain "deleting" event.
      *
      * @param \App\Domain $domain The domain.
      *
      * @return void
      */
     public function deleting(Domain $domain)
     {
         // Entitlements do not have referential integrity on the entitled object, so this is our
         // way of doing an onDelete('cascade') without the foreign key.
         \App\Entitlement::where('entitleable_id', $domain->id)
             ->where('entitleable_type', Domain::class)
             ->delete();
     }
 
     /**
      * Handle the domain "deleted" event.
      *
      * @param \App\Domain $domain The domain.
      *
      * @return void
      */
     public function deleted(Domain $domain)
     {
+        if ($domain->isForceDeleting()) {
+            return;
+        }
+
         \App\Jobs\Domain\DeleteJob::dispatch($domain->id);
     }
 
     /**
      * Handle the domain "updated" event.
      *
      * @param \App\Domain $domain The domain.
      *
      * @return void
      */
     public function updated(Domain $domain)
     {
         \App\Jobs\Domain\UpdateJob::dispatch($domain->id);
     }
 
+    /**
+     * Handle the domain "restoring" event.
+     *
+     * @param \App\Domain $domain The domain.
+     *
+     * @return void
+     */
+    public function restoring(Domain $domain)
+    {
+        // Make sure it's not DELETED/LDAP_READY/SUSPENDED
+        if ($domain->isDeleted()) {
+            $domain->status ^= Domain::STATUS_DELETED;
+        }
+        if ($domain->isLdapReady()) {
+            $domain->status ^= Domain::STATUS_LDAP_READY;
+        }
+        if ($domain->isSuspended()) {
+            $domain->status ^= Domain::STATUS_SUSPENDED;
+        }
+        if ($domain->isConfirmed() && $domain->isVerified()) {
+            $domain->status |= Domain::STATUS_ACTIVE;
+        }
+
+        // Note: $domain->save() is invoked between 'restoring' and 'restored' events
+    }
+
     /**
      * Handle the domain "restored" event.
      *
      * @param \App\Domain $domain The domain.
      *
      * @return void
      */
     public function restored(Domain $domain)
     {
-        //
+        // Restore domain entitlements
+        // We'll restore only these that were deleted last. So, first we get
+        // the maximum deleted_at timestamp and then use it to select
+        // domain entitlements for restore
+        $deleted_at = \App\Entitlement::withTrashed()
+            ->where('entitleable_id', $domain->id)
+            ->where('entitleable_type', Domain::class)
+            ->max('deleted_at');
+
+        if ($deleted_at) {
+            \App\Entitlement::withTrashed()
+                ->where('entitleable_id', $domain->id)
+                ->where('entitleable_type', Domain::class)
+                ->where('deleted_at', '>=', (new \Carbon\Carbon($deleted_at))->subMinute())
+                ->update(['updated_at' => now(), 'deleted_at' => null]);
+        }
+
+        // Create the domain in LDAP again
+        \App\Jobs\Domain\CreateJob::dispatch($domain->id);
     }
 
     /**
      * Handle the domain "force deleted" event.
      *
      * @param \App\Domain $domain The domain.
      *
      * @return void
      */
     public function forceDeleted(Domain $domain)
     {
         //
     }
 }
diff --git a/src/app/Observers/EntitlementObserver.php b/src/app/Observers/EntitlementObserver.php
index 61a9ac12..6b62498a 100644
--- a/src/app/Observers/EntitlementObserver.php
+++ b/src/app/Observers/EntitlementObserver.php
@@ -1,165 +1,165 @@
 <?php
 
 namespace App\Observers;
 
 use App\Entitlement;
 use Carbon\Carbon;
 
 /**
  * This is an observer for the Entitlement model definition.
  */
 class EntitlementObserver
 {
     /**
      * Handle the "creating" event on an Entitlement.
      *
      * Ensures that the entry uses a custom ID (uuid).
      *
      * Ensures that the {@link \App\Wallet} to which it is to be billed is owned or controlled by
      * the {@link \App\User} entitled.
      *
      * @param Entitlement $entitlement The entitlement being created.
      *
      * @return bool
      */
     public function creating(Entitlement $entitlement): bool
     {
-        while (true) {
-            $allegedly_unique = \App\Utils::uuidStr();
-            if (!Entitlement::find($allegedly_unique)) {
-                $entitlement->{$entitlement->getKeyName()} = $allegedly_unique;
-                break;
-            }
-        }
-
         // can't dispatch job here because it'll fail serialization
 
         // Make sure the owner is at least a controller on the wallet
         $wallet = \App\Wallet::find($entitlement->wallet_id);
 
         if (!$wallet || !$wallet->owner) {
             return false;
         }
 
         $sku = \App\Sku::find($entitlement->sku_id);
 
         if (!$sku) {
             return false;
         }
 
         $result = $sku->handler_class::preReq($entitlement, $wallet->owner);
 
         if (!$result) {
             return false;
         }
 
+        while (true) {
+            $allegedly_unique = \App\Utils::uuidStr();
+            if (!Entitlement::withTrashed()->find($allegedly_unique)) {
+                $entitlement->{$entitlement->getKeyName()} = $allegedly_unique;
+                break;
+            }
+        }
+
         return true;
     }
 
     /**
      * Handle the entitlement "created" event.
      *
      * @param \App\Entitlement $entitlement The entitlement.
      *
      * @return void
      */
     public function created(Entitlement $entitlement)
     {
         $entitlement->entitleable->updated_at = Carbon::now();
         $entitlement->entitleable->save();
 
         $entitlement->createTransaction(\App\Transaction::ENTITLEMENT_CREATED);
     }
 
     /**
      * Handle the entitlement "deleted" event.
      *
      * @param \App\Entitlement $entitlement The entitlement.
      *
      * @return void
      */
     public function deleted(Entitlement $entitlement)
     {
         // Remove all configured 2FA methods from Roundcube database
         if ($entitlement->sku->title == '2fa') {
             // FIXME: Should that be an async job?
             $sf = new \App\Auth\SecondFactor($entitlement->entitleable);
             $sf->removeFactors();
         }
 
         $entitlement->entitleable->updated_at = Carbon::now();
         $entitlement->entitleable->save();
 
         $entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED);
     }
 
     /**
      * Handle the entitlement "deleting" event.
      *
      * @param \App\Entitlement $entitlement The entitlement.
      *
      * @return void
      */
     public function deleting(Entitlement $entitlement)
     {
         if ($entitlement->trashed()) {
             return;
         }
 
         // Start calculating the costs for the consumption of this entitlement if the
         // existing consumption spans >= 14 days.
         //
         // Effect is that anything's free for the first 14 days
         if ($entitlement->created_at >= Carbon::now()->subDays(14)) {
             return;
         }
 
         $owner = $entitlement->wallet->owner;
 
         // Determine if we're still within the free first month
         $freeMonthEnds = $owner->created_at->copy()->addMonthsWithoutOverflow(1);
 
         if ($freeMonthEnds >= Carbon::now()) {
             return;
         }
 
         $cost = 0;
         $now = Carbon::now();
 
         // get the discount rate applied to the wallet.
         $discount = $entitlement->wallet->getDiscountRate();
 
         // just in case this had not been billed yet, ever
         $diffInMonths = $entitlement->updated_at->diffInMonths($now);
         $cost += (int) ($entitlement->cost * $discount * $diffInMonths);
 
         // this moves the hypothetical updated at forward to however many months past the original
         $updatedAt = $entitlement->updated_at->copy()->addMonthsWithoutOverflow($diffInMonths);
 
         // now we have the diff in days since the last "billed" period end.
         // This may be an entitlement paid up until February 28th, 2020, with today being March
         // 12th 2020. Calculating the costs for the entitlement is based on the daily price
 
         // the price per day is based on the number of days in the last month
         // or the current month if the period does not overlap with the previous month
         // FIXME: This really should be simplified to $daysInMonth=30
 
         $diffInDays = $updatedAt->diffInDays($now);
 
         if ($now->day >= $diffInDays) {
             $daysInMonth = $now->daysInMonth;
         } else {
             $daysInMonth = \App\Utils::daysInLastMonth();
         }
 
         $pricePerDay = $entitlement->cost / $daysInMonth;
 
         $cost += (int) (round($pricePerDay * $discount * $diffInDays, 0));
 
         if ($cost == 0) {
             return;
         }
 
         $entitlement->wallet->debit($cost);
     }
 }
diff --git a/src/app/Observers/GroupObserver.php b/src/app/Observers/GroupObserver.php
new file mode 100644
index 00000000..eaf0a543
--- /dev/null
+++ b/src/app/Observers/GroupObserver.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Observers;
+
+use App\Group;
+use Illuminate\Support\Facades\DB;
+
+class GroupObserver
+{
+    /**
+     * Handle the group "created" event.
+     *
+     * @param \App\Group $group The group
+     *
+     * @return void
+     */
+    public function creating(Group $group): void
+    {
+        while (true) {
+            $allegedly_unique = \App\Utils::uuidInt();
+            if (!Group::withTrashed()->find($allegedly_unique)) {
+                $group->{$group->getKeyName()} = $allegedly_unique;
+                break;
+            }
+        }
+
+        $group->status |= Group::STATUS_NEW | Group::STATUS_ACTIVE;
+    }
+
+    /**
+     * Handle the group "created" event.
+     *
+     * @param \App\Group $group The group
+     *
+     * @return void
+     */
+    public function created(Group $group)
+    {
+        \App\Jobs\Group\CreateJob::dispatch($group->id);
+    }
+
+    /**
+     * Handle the group "deleting" event.
+     *
+     * @param \App\Group $group The group
+     *
+     * @return void
+     */
+    public function deleting(Group $group)
+    {
+        // Entitlements do not have referential integrity on the entitled object, so this is our
+        // way of doing an onDelete('cascade') without the foreign key.
+        \App\Entitlement::where('entitleable_id', $group->id)
+            ->where('entitleable_type', Group::class)
+            ->delete();
+    }
+
+    /**
+     * Handle the group "deleted" event.
+     *
+     * @param \App\Group $group The group
+     *
+     * @return void
+     */
+    public function deleted(Group $group)
+    {
+        if ($group->isForceDeleting()) {
+            return;
+        }
+
+        \App\Jobs\Group\DeleteJob::dispatch($group->id);
+    }
+
+    /**
+     * Handle the group "updated" event.
+     *
+     * @param \App\Group $group The group
+     *
+     * @return void
+     */
+    public function updated(Group $group)
+    {
+        \App\Jobs\Group\UpdateJob::dispatch($group->id);
+    }
+
+    /**
+     * Handle the group "restored" event.
+     *
+     * @param \App\Group $group The group
+     *
+     * @return void
+     */
+    public function restored(Group $group)
+    {
+        //
+    }
+
+    /**
+     * Handle the group "force deleting" event.
+     *
+     * @param \App\Group $group The group
+     *
+     * @return void
+     */
+    public function forceDeleted(Group $group)
+    {
+        // A group can be force-deleted separately from the owner
+        // we have to force-delete entitlements
+        \App\Entitlement::where('entitleable_id', $group->id)
+            ->where('entitleable_type', Group::class)
+            ->forceDelete();
+    }
+}
diff --git a/src/app/Observers/OpenVidu/ConnectionObserver.php b/src/app/Observers/OpenVidu/ConnectionObserver.php
new file mode 100644
index 00000000..94c8091e
--- /dev/null
+++ b/src/app/Observers/OpenVidu/ConnectionObserver.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Observers\OpenVidu;
+
+use App\OpenVidu\Connection;
+
+class ConnectionObserver
+{
+    /**
+     * Handle the OpenVidu connection "updated" event.
+     *
+     * @param \App\OpenVidu\Connection $connection The connection.
+     *
+     * @return void
+     */
+    public function updated(Connection $connection)
+    {
+        $params = [];
+
+        // Role change
+        if ($connection->role != $connection->getOriginal('role')) {
+            $params['role'] = $connection->role;
+
+            // TODO: When demoting publisher to subscriber maybe we should
+            // destroy all streams using REST API. For now we trust the
+            // participant browser to do this.
+        }
+
+        // Detect metadata changes for specified properties
+        $keys = [
+            'hand' => 'bool',
+            'language' => '',
+        ];
+
+        foreach ($keys as $key => $type) {
+            $newState = $connection->metadata[$key] ?? null;
+            $oldState = $this->getOriginal($connection, 'metadata')[$key] ?? null;
+
+            if ($newState !== $oldState) {
+                $params[$key] = $type == 'bool' ? !empty($newState) : $newState;
+            }
+        }
+
+        // Send the signal to all participants
+        if (!empty($params)) {
+            $params['connectionId'] = $connection->id;
+            $connection->room->signal('connectionUpdate', $params);
+        }
+    }
+
+    /**
+     * A wrapper to getOriginal() on an object
+     *
+     * @param \App\OpenVidu\Connection $connection The connection.
+     * @param string                   $property   The property name
+     *
+     * @return mixed
+     */
+    private function getOriginal($connection, $property)
+    {
+        $original = $connection->getOriginal($property);
+
+        // The original value for a property is in a format stored in database
+        // I.e. for 'metadata' it is a JSON string instead of an array
+        if ($property == 'metadata') {
+            $original = json_decode($original, true);
+        }
+
+        return $original;
+    }
+}
diff --git a/src/app/Observers/UserAliasObserver.php b/src/app/Observers/UserAliasObserver.php
index c88270f0..544a7765 100644
--- a/src/app/Observers/UserAliasObserver.php
+++ b/src/app/Observers/UserAliasObserver.php
@@ -1,94 +1,77 @@
 <?php
 
 namespace App\Observers;
 
 use App\Domain;
 use App\User;
 use App\UserAlias;
 
 class UserAliasObserver
 {
     /**
      * Handle the "creating" event on an alias
      *
      * Ensures that there's no user with specified email.
      *
      * @param \App\UserAlias $alias The user email alias
      *
      * @return bool
      */
     public function creating(UserAlias $alias): bool
     {
         $alias->alias = \strtolower($alias->alias);
 
         list($login, $domain) = explode('@', $alias->alias);
 
         $domain = Domain::where('namespace', $domain)->first();
 
         if (!$domain) {
             \Log::error("Failed creating alias {$alias->alias}. Domain does not exist.");
             return false;
         }
-/*
-        if ($exists = User::emailExists($alias->alias, true, $alias_exists, !$domain->isPublic())) {
-            if (!$alias_exists) {
-                \Log::error("Failed creating alias {$alias->alias}. Email address exists.");
-                return false;
-            }
 
-            if ($domain->isPublic()) {
-                \Log::error("Failed creating alias {$alias->alias}. Alias exists in public domain.");
-                return false;
-            }
-
-            if ($exists->wallet()->user_id != $alias->user->wallet()->user_id) {
-                \Log::error("Failed creating alias {$alias->alias}. Alias exists in another account.");
-                return false;
-            }
-        }
-*/
         return true;
     }
 
     /**
      * Handle the user alias "created" event.
      *
      * @param \App\UserAlias $alias User email alias
      *
      * @return void
      */
     public function created(UserAlias $alias)
     {
         if ($alias->user) {
             \App\Jobs\User\UpdateJob::dispatch($alias->user_id);
         }
     }
 
     /**
      * Handle the user setting "updated" event.
      *
      * @param \App\UserAlias $alias User email alias
      *
      * @return void
      */
     public function updated(UserAlias $alias)
     {
         if ($alias->user) {
             \App\Jobs\User\UpdateJob::dispatch($alias->user_id);
         }
     }
 
     /**
      * Handle the user setting "deleted" event.
      *
      * @param \App\UserAlias $alias User email alias
      *
      * @return void
      */
     public function deleted(UserAlias $alias)
     {
         if ($alias->user) {
             \App\Jobs\User\UpdateJob::dispatch($alias->user_id);
         }
     }
 }
diff --git a/src/app/Observers/UserObserver.php b/src/app/Observers/UserObserver.php
index 62891f82..ac254a6a 100644
--- a/src/app/Observers/UserObserver.php
+++ b/src/app/Observers/UserObserver.php
@@ -1,261 +1,362 @@
 <?php
 
 namespace App\Observers;
 
 use App\Entitlement;
 use App\Domain;
+use App\Group;
 use App\Transaction;
 use App\User;
 use App\Wallet;
 use Illuminate\Support\Facades\DB;
 
 class UserObserver
 {
     /**
      * Handle the "creating" event.
      *
      * Ensure that the user is created with a random, large integer.
      *
      * @param \App\User $user The user being created.
      *
      * @return void
      */
     public function creating(User $user)
     {
         if (!$user->id) {
             while (true) {
                 $allegedly_unique = \App\Utils::uuidInt();
-                if (!User::find($allegedly_unique)) {
+                if (!User::withTrashed()->find($allegedly_unique)) {
                     $user->{$user->getKeyName()} = $allegedly_unique;
                     break;
                 }
             }
         }
 
         $user->email = \strtolower($user->email);
 
         // only users that are not imported get the benefit of the doubt.
         $user->status |= User::STATUS_NEW | User::STATUS_ACTIVE;
 
         // can't dispatch job here because it'll fail serialization
     }
 
     /**
      * Handle the "created" event.
      *
      * Ensures the user has at least one wallet.
      *
      * Should ensure some basic settings are available as well.
      *
      * @param \App\User $user The user created.
      *
      * @return void
      */
     public function created(User $user)
     {
         $settings = [
             'country' => \App\Utils::countryForRequest(),
             'currency' => 'CHF',
             /*
             'first_name' => '',
             'last_name' => '',
             'billing_address' => '',
             'organization' => '',
             'phone' => '',
             'external_email' => '',
             */
         ];
 
         foreach ($settings as $key => $value) {
             $settings[$key] = [
                 'key' => $key,
                 'value' => $value,
                 'user_id' => $user->id,
             ];
         }
 
         // Note: Don't use setSettings() here to bypass UserSetting observers
         // Note: This is a single multi-insert query
         $user->settings()->insert(array_values($settings));
 
         $user->wallets()->create();
 
         // Create user record in LDAP, then check if the account is created in IMAP
         $chain = [
             new \App\Jobs\User\VerifyJob($user->id),
         ];
 
         \App\Jobs\User\CreateJob::withChain($chain)->dispatch($user->id);
     }
 
     /**
      * Handle the "deleted" event.
      *
      * @param \App\User $user The user deleted.
      *
      * @return void
      */
     public function deleted(User $user)
     {
-        //
+        // Remove the user from existing groups
+        $wallet = $user->wallet();
+        if ($wallet && $wallet->owner) {
+            $wallet->owner->groups()->each(function ($group) use ($user) {
+                if (in_array($user->email, $group->members)) {
+                    $group->members = array_diff($group->members, [$user->email]);
+                    $group->save();
+                }
+            });
+        }
     }
 
     /**
      * Handle the "deleting" event.
      *
      * @param User $user The user that is being deleted.
      *
      * @return void
      */
     public function deleting(User $user)
     {
         if ($user->isForceDeleting()) {
             $this->forceDeleting($user);
             return;
         }
 
         // TODO: Especially in tests we're doing delete() on a already deleted user.
         //       Should we escape here - for performance reasons?
         // TODO: I think all of this should use database transactions
 
         // Entitlements do not have referential integrity on the entitled object, so this is our
         // way of doing an onDelete('cascade') without the foreign key.
         $entitlements = Entitlement::where('entitleable_id', $user->id)
             ->where('entitleable_type', User::class)->get();
 
         foreach ($entitlements as $entitlement) {
             $entitlement->delete();
         }
 
         // Remove owned users/domains
         $wallets = $user->wallets()->pluck('id')->all();
         $assignments = Entitlement::whereIn('wallet_id', $wallets)->get();
         $users = [];
         $domains = [];
+        $groups = [];
         $entitlements = [];
 
         foreach ($assignments as $entitlement) {
             if ($entitlement->entitleable_type == Domain::class) {
                 $domains[] = $entitlement->entitleable_id;
             } elseif ($entitlement->entitleable_type == User::class && $entitlement->entitleable_id != $user->id) {
                 $users[] = $entitlement->entitleable_id;
+            } elseif ($entitlement->entitleable_type == Group::class) {
+                $groups[] = $entitlement->entitleable_id;
             } else {
-                $entitlements[] = $entitlement->id;
+                $entitlements[] = $entitlement;
             }
         }
 
-        $users = array_unique($users);
-        $domains = array_unique($domains);
-
         // Domains/users/entitlements need to be deleted one by one to make sure
         // events are fired and observers can do the proper cleanup.
         if (!empty($users)) {
-            foreach (User::whereIn('id', $users)->get() as $_user) {
+            foreach (User::whereIn('id', array_unique($users))->get() as $_user) {
                 $_user->delete();
             }
         }
 
         if (!empty($domains)) {
-            foreach (Domain::whereIn('id', $domains)->get() as $_domain) {
+            foreach (Domain::whereIn('id', array_unique($domains))->get() as $_domain) {
                 $_domain->delete();
             }
         }
 
-        if (!empty($entitlements)) {
-            Entitlement::whereIn('id', $entitlements)->delete();
+        if (!empty($groups)) {
+            foreach (Group::whereIn('id', array_unique($groups))->get() as $_group) {
+                $_group->delete();
+            }
+        }
+
+        foreach ($entitlements as $entitlement) {
+            $entitlement->delete();
         }
 
         // FIXME: What do we do with user wallets?
 
         \App\Jobs\User\DeleteJob::dispatch($user->id);
     }
 
     /**
      * Handle the "deleting" event on forceDelete() call.
      *
      * @param User $user The user that is being deleted.
      *
      * @return void
      */
     public function forceDeleting(User $user)
     {
         // TODO: We assume that at this moment all belongings are already soft-deleted.
 
         // Remove owned users/domains
         $wallets = $user->wallets()->pluck('id')->all();
         $assignments = Entitlement::withTrashed()->whereIn('wallet_id', $wallets)->get();
         $entitlements = [];
         $domains = [];
+        $groups = [];
         $users = [];
 
         foreach ($assignments as $entitlement) {
             $entitlements[] = $entitlement->id;
 
             if ($entitlement->entitleable_type == Domain::class) {
                 $domains[] = $entitlement->entitleable_id;
             } elseif (
                 $entitlement->entitleable_type == User::class
                 && $entitlement->entitleable_id != $user->id
             ) {
                 $users[] = $entitlement->entitleable_id;
+            } elseif ($entitlement->entitleable_type == Group::class) {
+                $groups[] = $entitlement->entitleable_id;
             }
         }
 
-        $users = array_unique($users);
-        $domains = array_unique($domains);
-
         // Remove the user "direct" entitlements explicitely, if they belong to another
         // user's wallet they will not be removed by the wallets foreign key cascade
         Entitlement::withTrashed()
             ->where('entitleable_id', $user->id)
             ->where('entitleable_type', User::class)
             ->forceDelete();
 
         // Users need to be deleted one by one to make sure observers can do the proper cleanup.
         if (!empty($users)) {
-            foreach (User::withTrashed()->whereIn('id', $users)->get() as $_user) {
+            foreach (User::withTrashed()->whereIn('id', array_unique($users))->get() as $_user) {
                 $_user->forceDelete();
             }
         }
 
         // Domains can be just removed
         if (!empty($domains)) {
-            Domain::withTrashed()->whereIn('id', $domains)->forceDelete();
+            Domain::withTrashed()->whereIn('id', array_unique($domains))->forceDelete();
+        }
+
+        // Groups can be just removed
+        if (!empty($groups)) {
+            Group::withTrashed()->whereIn('id', array_unique($groups))->forceDelete();
         }
 
         // Remove transactions, they also have no foreign key constraint
         Transaction::where('object_type', Entitlement::class)
             ->whereIn('object_id', $entitlements)
             ->delete();
 
         Transaction::where('object_type', Wallet::class)
             ->whereIn('object_id', $wallets)
             ->delete();
     }
 
+    /**
+     * Handle the user "restoring" event.
+     *
+     * @param \App\User $user The user
+     *
+     * @return void
+     */
+    public function restoring(User $user)
+    {
+        // Make sure it's not DELETED/LDAP_READY/IMAP_READY/SUSPENDED anymore
+        if ($user->isDeleted()) {
+            $user->status ^= User::STATUS_DELETED;
+        }
+        if ($user->isLdapReady()) {
+            $user->status ^= User::STATUS_LDAP_READY;
+        }
+        if ($user->isImapReady()) {
+            $user->status ^= User::STATUS_IMAP_READY;
+        }
+        if ($user->isSuspended()) {
+            $user->status ^= User::STATUS_SUSPENDED;
+        }
+
+        $user->status |= User::STATUS_ACTIVE;
+
+        // Note: $user->save() is invoked between 'restoring' and 'restored' events
+    }
+
+    /**
+     * Handle the user "restored" event.
+     *
+     * @param \App\User $user The user
+     *
+     * @return void
+     */
+    public function restored(User $user)
+    {
+        $wallets = $user->wallets()->pluck('id')->all();
+
+        // Restore user entitlements
+        // We'll restore only these that were deleted last. So, first we get
+        // the maximum deleted_at timestamp and then use it to select
+        // entitlements for restore
+        $deleted_at = \App\Entitlement::withTrashed()
+            ->where('entitleable_id', $user->id)
+            ->where('entitleable_type', User::class)
+            ->max('deleted_at');
+
+        if ($deleted_at) {
+            $threshold = (new \Carbon\Carbon($deleted_at))->subMinute();
+
+            // We need at least the user domain so it can be created in ldap.
+            // FIXME: What if the domain is owned by someone else?
+            $domain = $user->domain();
+            if ($domain->trashed() && !$domain->isPublic()) {
+                // Note: Domain entitlements will be restored by the DomainObserver
+                $domain->restore();
+            }
+
+            // Restore user entitlements
+            \App\Entitlement::withTrashed()
+                ->where('entitleable_id', $user->id)
+                ->where('entitleable_type', User::class)
+                ->where('deleted_at', '>=', $threshold)
+                ->update(['updated_at' => now(), 'deleted_at' => null]);
+
+            // Note: We're assuming that cost of entitlements was correct
+            // on user deletion, so we don't have to re-calculate it again.
+        }
+
+        // FIXME: Should we reset user aliases? or re-validate them in any way?
+
+        // Create user record in LDAP, then run the verification process
+        $chain = [
+            new \App\Jobs\User\VerifyJob($user->id),
+        ];
+
+        \App\Jobs\User\CreateJob::withChain($chain)->dispatch($user->id);
+    }
+
     /**
      * Handle the "retrieving" event.
      *
      * @param User $user The user that is being retrieved.
      *
      * @todo This is useful for audit.
      *
      * @return void
      */
     public function retrieving(User $user)
     {
         // TODO   \App\Jobs\User\ReadJob::dispatch($user->id);
     }
 
     /**
      * Handle the "updating" event.
      *
      * @param User $user The user that is being updated.
      *
      * @return void
      */
     public function updating(User $user)
     {
         \App\Jobs\User\UpdateJob::dispatch($user->id);
     }
 }
diff --git a/src/app/OpenVidu/Connection.php b/src/app/OpenVidu/Connection.php
new file mode 100644
index 00000000..cccde474
--- /dev/null
+++ b/src/app/OpenVidu/Connection.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace App\OpenVidu;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * The eloquent definition of a Connection.
+ *
+ * @property string  $id         OpenVidu connection identifier
+ * @property array   $metadata   Connection metadata
+ * @property int     $role       Connection role
+ * @property int     $room_id    Room identifier
+ * @property string  $session_id OpenVidu session identifier
+ */
+class Connection extends Model
+{
+    protected $table = 'openvidu_connections';
+
+    public $incrementing = false;
+    protected $keyType = 'string';
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'metadata' => 'array',
+    ];
+
+    /**
+     * Dismiss (close) the connection.
+     *
+     * @return bool True on success, False on failure
+     */
+    public function dismiss()
+    {
+        if ($this->room->closeOVConnection($this->id)) {
+            $this->delete();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * The room to which this connection belongs.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function room()
+    {
+        return $this->belongsTo(Room::class, 'room_id', 'id');
+    }
+
+    /**
+     * Connection role mutator
+     *
+     * @throws \Exception
+     */
+    public function setRoleAttribute($role)
+    {
+        $new_role = 0;
+
+        $allowed_values = [
+            Room::ROLE_SUBSCRIBER,
+            Room::ROLE_PUBLISHER,
+            Room::ROLE_MODERATOR,
+            Room::ROLE_SCREEN,
+            Room::ROLE_OWNER,
+        ];
+
+        foreach ($allowed_values as $value) {
+            if ($role & $value) {
+                $new_role |= $value;
+                $role ^= $value;
+            }
+        }
+
+        if ($role > 0) {
+            throw new \Exception("Invalid connection role: {$role}");
+        }
+
+        // It is either screen sharing connection or publisher/subscriber connection
+        if ($new_role & Room::ROLE_SCREEN) {
+            if ($new_role & Room::ROLE_PUBLISHER) {
+                $new_role ^= Room::ROLE_PUBLISHER;
+            }
+            if ($new_role & Room::ROLE_SUBSCRIBER) {
+                $new_role ^= Room::ROLE_SUBSCRIBER;
+            }
+        }
+
+        $this->attributes['role'] = $new_role;
+    }
+}
diff --git a/src/app/OpenVidu/Room.php b/src/app/OpenVidu/Room.php
new file mode 100644
index 00000000..572061d0
--- /dev/null
+++ b/src/app/OpenVidu/Room.php
@@ -0,0 +1,419 @@
+<?php
+
+namespace App\OpenVidu;
+
+use App\Traits\SettingsTrait;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * The eloquent definition of a Room.
+ *
+ * @property int     $id         Room identifier
+ * @property string  $name       Room name
+ * @property int     $user_id    Room owner
+ * @property ?string $session_id OpenVidu session identifier
+ */
+class Room extends Model
+{
+    use SettingsTrait;
+
+    public const ROLE_SUBSCRIBER = 1 << 0;
+    public const ROLE_PUBLISHER = 1 << 1;
+    public const ROLE_MODERATOR = 1 << 2;
+    public const ROLE_SCREEN = 1 << 3;
+    public const ROLE_OWNER = 1 << 4;
+
+    public const REQUEST_ACCEPTED = 'accepted';
+    public const REQUEST_DENIED = 'denied';
+
+    private const OV_ROLE_MODERATOR = 'MODERATOR';
+    private const OV_ROLE_PUBLISHER = 'PUBLISHER';
+    private const OV_ROLE_SUBSCRIBER = 'SUBSCRIBER';
+
+    protected $fillable = [
+        'user_id',
+        'name'
+    ];
+
+    protected $table = 'openvidu_rooms';
+
+    /** @var \GuzzleHttp\Client|null HTTP client instance */
+    private static $client = null;
+
+
+    /**
+     * Creates HTTP client for connections to OpenVidu server
+     *
+     * @return \GuzzleHttp\Client HTTP client instance
+     */
+    private function client()
+    {
+        if (!self::$client) {
+            self::$client = new \GuzzleHttp\Client(
+                [
+                    'http_errors' => false, // No exceptions from Guzzle
+                    'base_uri' => \config('openvidu.api_url'),
+                    'verify' => \config('openvidu.api_verify_tls'),
+                    'auth' => [
+                        \config('openvidu.api_username'),
+                        \config('openvidu.api_password')
+                    ]
+                ]
+            );
+        }
+
+        return self::$client;
+    }
+
+    /**
+     * Destroy a OpenVidu connection
+     *
+     * @param string $conn Connection identifier
+     *
+     * @return bool True on success, False otherwise
+     * @throws \Exception if session does not exist
+     */
+    public function closeOVConnection($conn): bool
+    {
+        if (!$this->session_id) {
+            throw new \Exception("The room session does not exist");
+        }
+
+        $url = 'sessions/' . $this->session_id . '/connection/' . urlencode($conn);
+
+        $response = $this->client()->request('DELETE', $url);
+
+        return $response->getStatusCode() == 204;
+    }
+
+    /**
+     * Fetch a OpenVidu connection information.
+     *
+     * @param string $conn Connection identifier
+     *
+     * @return ?array Connection data on success, Null otherwise
+     * @throws \Exception if session does not exist
+     */
+    public function getOVConnection($conn): ?array
+    {
+        // Note: getOVConnection() not getConnection() because Eloquent\Model::getConnection() exists
+        // TODO: Maybe use some other name? getParticipant?
+        if (!$this->session_id) {
+            throw new \Exception("The room session does not exist");
+        }
+
+        $url = 'sessions/' . $this->session_id . '/connection/' . urlencode($conn);
+
+        $response = $this->client()->request('GET', $url);
+
+        if ($response->getStatusCode() == 200) {
+            return json_decode($response->getBody(), true);
+        }
+
+        return null;
+    }
+
+    /**
+     * Create a OpenVidu session
+     *
+     * @return array|null Session data on success, NULL otherwise
+     */
+    public function createSession(): ?array
+    {
+        $response = $this->client()->request(
+            'POST',
+            "sessions",
+            [
+                'json' => [
+                    'mediaMode' => 'ROUTED',
+                    'recordingMode' => 'MANUAL'
+                ]
+            ]
+        );
+
+        if ($response->getStatusCode() !== 200) {
+            $this->session_id = null;
+            $this->save();
+            return null;
+        }
+
+        $session = json_decode($response->getBody(), true);
+
+        $this->session_id = $session['id'];
+        $this->save();
+
+        return $session;
+    }
+
+    /**
+     * Delete a OpenVidu session
+     *
+     * @return bool
+     */
+    public function deleteSession(): bool
+    {
+        if (!$this->session_id) {
+            return true;
+        }
+
+        $response = $this->client()->request(
+            'DELETE',
+            "sessions/" . $this->session_id,
+        );
+
+        if ($response->getStatusCode() == 204) {
+            $this->session_id = null;
+            $this->save();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns metadata for every connection in a session.
+     *
+     * @return array Connections metadata, indexed by connection identifier
+     * @throws \Exception if session does not exist
+     */
+    public function getSessionConnections(): array
+    {
+        if (!$this->session_id) {
+            throw new \Exception("The room session does not exist");
+        }
+
+        return Connection::where('session_id', $this->session_id)
+            // Ignore screen sharing connection for now
+            ->whereRaw("(role & " . self::ROLE_SCREEN . ") = 0")
+            ->get()
+            ->keyBy('id')
+            ->map(function ($item) {
+                // Warning: Make sure to not return all metadata here as it might contain sensitive data.
+                return [
+                    'role' => $item->role,
+                    'hand' => $item->metadata['hand'] ?? 0,
+                    'language' => $item->metadata['language'] ?? null,
+                ];
+            })
+            // Sort by order in the queue, so UI can re-build the existing queue in order
+            ->sort(function ($a, $b) {
+                return $a['hand'] <=> $b['hand'];
+            })
+            ->all();
+    }
+
+    /**
+     * Create a OpenVidu session (connection) token
+     *
+     * @param int $role User role (see self::ROLE_* constants)
+     *
+     * @return array|null Token data on success, NULL otherwise
+     * @throws \Exception if session does not exist
+     */
+    public function getSessionToken($role = self::ROLE_SUBSCRIBER): ?array
+    {
+        if (!$this->session_id) {
+            throw new \Exception("The room session does not exist");
+        }
+
+        // FIXME: Looks like passing the role in 'data' param is the only way
+        // to make it visible for everyone in a room. So, for example we can
+        // handle/style subscribers/publishers/moderators differently on the
+        // client-side. Is this a security issue?
+        $data = ['role' => $role];
+
+        $url = 'sessions/' . $this->session_id . '/connection';
+        $post = [
+            'json' => [
+                'role' => self::OV_ROLE_PUBLISHER,
+                'data' => json_encode($data)
+            ]
+        ];
+
+        $response = $this->client()->request('POST', $url, $post);
+
+        if ($response->getStatusCode() == 200) {
+            $json = json_decode($response->getBody(), true);
+
+            $authToken = base64_encode($json['id'] . ':' . \random_bytes(16));
+
+            // Extract the 'token' part of the token, it will be used to authenticate the connection.
+            // It will be needed in next iterations e.g. to authenticate moderators that aren't
+            // Kolab4 users (or are just not logged in to Kolab4).
+            // FIXME: we could as well generate our own token for auth purposes
+            parse_str(parse_url($json['token'], PHP_URL_QUERY), $url);
+
+            // Create the connection reference in our database
+            $conn = new Connection();
+            $conn->id = $json['id'];
+            $conn->session_id = $this->session_id;
+            $conn->room_id = $this->id;
+            $conn->role = $role;
+            $conn->metadata = ['token' => $url['token'], 'authToken' => $authToken];
+            $conn->save();
+
+            return [
+                'session' => $this->session_id,
+                'token' => $json['token'],
+                'authToken' => $authToken,
+                'connectionId' => $json['id'],
+                'role' => $role,
+            ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if the room has an active session
+     *
+     * @return bool True when the session exists, False otherwise
+     */
+    public function hasSession(): bool
+    {
+        if (!$this->session_id) {
+            return false;
+        }
+
+        $response = $this->client()->request('GET', "sessions/{$this->session_id}");
+
+        return $response->getStatusCode() == 200;
+    }
+
+    /**
+     * The room owner.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function owner()
+    {
+        return $this->belongsTo('\App\User', 'user_id', 'id');
+    }
+
+    /**
+     * Accept the join request.
+     *
+     * @param string $id Request identifier
+     *
+     * @return bool True on success, False on failure
+     */
+    public function requestAccept(string $id): bool
+    {
+        $request = Cache::get($this->session_id . '-' . $id);
+
+        if ($request) {
+            $request['status'] = self::REQUEST_ACCEPTED;
+
+            return Cache::put($this->session_id . '-' . $id, $request, now()->addHours(1));
+        }
+
+        return false;
+    }
+
+    /**
+     * Deny the join request.
+     *
+     * @param string $id Request identifier
+     *
+     * @return bool True on success, False on failure
+     */
+    public function requestDeny(string $id): bool
+    {
+        $request = Cache::get($this->session_id . '-' . $id);
+
+        if ($request) {
+            $request['status'] = self::REQUEST_DENIED;
+
+            return Cache::put($this->session_id . '-' . $id, $request, now()->addHours(1));
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the join request data.
+     *
+     * @param string $id Request identifier
+     *
+     * @return array|null Request data (e.g. nickname, status, picture?)
+     */
+    public function requestGet(string $id): ?array
+    {
+        return Cache::get($this->session_id . '-' . $id);
+    }
+
+    /**
+     * Save the join request.
+     *
+     * @param string $id      Request identifier
+     * @param array  $request Request data
+     *
+     * @return bool True on success, False on failure
+     */
+    public function requestSave(string $id, array $request): bool
+    {
+        // We don't really need the picture in the cache
+        // As we use this cache for the request status only
+        unset($request['picture']);
+
+        return Cache::put($this->session_id . '-' . $id, $request, now()->addHours(1));
+    }
+
+    /**
+     * Any (additional) properties of this room.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function settings()
+    {
+        return $this->hasMany('App\OpenVidu\RoomSetting', 'room_id');
+    }
+
+    /**
+     * Send a OpenVidu signal to the session participants (connections)
+     *
+     * @param string            $name   Signal name (type)
+     * @param array             $data   Signal data array
+     * @param null|int|string[] $target List of target connections, Null for all connections.
+     *                                  It can be also a participant role.
+     *
+     * @return bool True on success, False on failure
+     * @throws \Exception if session does not exist
+     */
+    public function signal(string $name, array $data = [], $target = null): bool
+    {
+        if (!$this->session_id) {
+            throw new \Exception("The room session does not exist");
+        }
+
+        $post = [
+            'session' => $this->session_id,
+            'type' => $name,
+            'data' => $data ? json_encode($data) : '',
+        ];
+
+        // Get connection IDs by participant role
+        if (is_int($target)) {
+            $connections = Connection::where('session_id', $this->session_id)
+                ->whereRaw("(role & $target)")
+                ->pluck('id')
+                ->all();
+
+            if (empty($connections)) {
+                return false;
+            }
+
+            $target = $connections;
+        }
+
+        if (!empty($target)) {
+            $post['to'] = $target;
+        }
+
+        $response = $this->client()->request('POST', 'signal', ['json' => $post]);
+
+        return $response->getStatusCode() == 200;
+    }
+}
diff --git a/src/app/OpenVidu/RoomSetting.php b/src/app/OpenVidu/RoomSetting.php
new file mode 100644
index 00000000..4b4ac9ca
--- /dev/null
+++ b/src/app/OpenVidu/RoomSetting.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\OpenVidu;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * A collection of settings for a Room.
+ *
+ * @property int    $id
+ * @property int    $room_id
+ * @property string $key
+ * @property string $value
+ */
+class RoomSetting extends Model
+{
+    protected $fillable = [
+        'room_id', 'key', 'value'
+    ];
+
+    protected $table = 'openvidu_room_settings';
+
+    /**
+     * The user to which this setting belongs.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function room()
+    {
+        return $this->belongsTo(
+            '\App\OpenVidu\Room',
+            'room_id', /* local */
+            'id' /* remote */
+        );
+    }
+}
diff --git a/src/app/Package.php b/src/app/Package.php
index 52f99d1c..c7b5775b 100644
--- a/src/app/Package.php
+++ b/src/app/Package.php
@@ -1,92 +1,97 @@
 <?php
 
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Translatable\HasTranslations;
 
 /**
  * The eloquent definition of a Package.
  *
  * A package is a set of SKUs that a user can select, so that instead of;
  *
  * * Create a mailbox entitlement,
  * * Create a quota entitlement,
  * * Create a groupware entitlement,
  * * ...
  *
  * users can simply select a 'package';
  *
  * * Kolab package: mailbox + quota + groupware,
  * * Free package: mailbox + quota.
  *
  * Selecting a package will therefore create a set of entitlments from SKUs.
  */
 class Package extends Model
 {
     use HasTranslations;
 
     public $incrementing = false;
     protected $keyType = 'string';
 
     public $timestamps = false;
 
     protected $fillable = [
         'description',
         'discount_rate',
         'name',
         'title',
     ];
 
     /** @var array Translatable properties */
     public $translatable = [
         'name',
         'description',
     ];
 
     /**
      * The costs of this package at its pre-defined, existing configuration.
      *
      * @return int The costs in cents.
      */
     public function cost()
     {
         $costs = 0;
 
         foreach ($this->skus as $sku) {
             $units = $sku->pivot->qty - $sku->units_free;
 
             if ($units < 0) {
                 \Log::debug("Package {$this->id} is misconfigured for more free units than qty.");
                 $units = 0;
             }
 
             $ppu = $sku->cost * ((100 - $this->discount_rate) / 100);
 
             $costs += $units * $ppu;
         }
 
         return $costs;
     }
 
     public function isDomain()
     {
         foreach ($this->skus as $sku) {
             if ($sku->handler_class::entitleableClass() == \App\Domain::class) {
                 return true;
             }
         }
 
         return false;
     }
 
+    /**
+     * SKUs of this package.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
     public function skus()
     {
         return $this->belongsToMany(
             'App\Sku',
             'package_skus'
         )->using('App\PackageSku')->withPivot(
             ['qty']
         );
     }
 }
diff --git a/src/app/Payment.php b/src/app/Payment.php
index f501decc..ba088b68 100644
--- a/src/app/Payment.php
+++ b/src/app/Payment.php
@@ -1,48 +1,61 @@
 <?php
 
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * A payment operation on a wallet.
  *
- * @property int         $amount      Amount of money in cents
+ * @property int         $amount      Amount of money in cents of CHF
  * @property string      $description Payment description
  * @property string      $id          Mollie's Payment ID
  * @property \App\Wallet $wallet      The wallet
  * @property string      $wallet_id   The ID of the wallet
+ * @property string      $currency    Currency of this payment
+ * @property int         $currency_amount      Amount of money in cents of $currency
  */
 class Payment extends Model
 {
     public $incrementing = false;
     protected $keyType = 'string';
 
     protected $casts = [
         'amount' => 'integer'
     ];
 
     protected $fillable = [
         'id',
         'wallet_id',
         'amount',
         'description',
         'provider',
         'status',
         'type',
+        'currency',
+        'currency_amount',
     ];
 
+
+    /**
+     * Ensure the currency is appropriately cased.
+     */
+    public function setCurrencyAttribute($currency)
+    {
+        $this->attributes['currency'] = strtoupper($currency);
+    }
+
     /**
      * The wallet to which this payment belongs.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function wallet()
     {
         return $this->belongsTo(
             '\App\Wallet',
             'wallet_id', /* local */
             'id' /* remote */
         );
     }
 }
diff --git a/src/app/Providers/AppServiceProvider.php b/src/app/Providers/AppServiceProvider.php
index 2fdda4ad..40437600 100644
--- a/src/app/Providers/AppServiceProvider.php
+++ b/src/app/Providers/AppServiceProvider.php
@@ -1,52 +1,61 @@
 <?php
 
 namespace App\Providers;
 
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
     /**
      * Register any application services.
      *
      * @return void
      */
     public function register()
     {
         //
     }
 
     /**
      * Bootstrap any application services.
      *
      * @return void
      */
     public function boot()
     {
         \App\Discount::observe(\App\Observers\DiscountObserver::class);
         \App\Domain::observe(\App\Observers\DomainObserver::class);
         \App\Entitlement::observe(\App\Observers\EntitlementObserver::class);
+        \App\Group::observe(\App\Observers\GroupObserver::class);
+        \App\OpenVidu\Connection::observe(\App\Observers\OpenVidu\ConnectionObserver::class);
         \App\Package::observe(\App\Observers\PackageObserver::class);
         \App\PackageSku::observe(\App\Observers\PackageSkuObserver::class);
         \App\Plan::observe(\App\Observers\PlanObserver::class);
         \App\SignupCode::observe(\App\Observers\SignupCodeObserver::class);
         \App\Sku::observe(\App\Observers\SkuObserver::class);
         \App\Transaction::observe(\App\Observers\TransactionObserver::class);
         \App\User::observe(\App\Observers\UserObserver::class);
         \App\UserAlias::observe(\App\Observers\UserAliasObserver::class);
         \App\UserSetting::observe(\App\Observers\UserSettingObserver::class);
         \App\VerificationCode::observe(\App\Observers\VerificationCodeObserver::class);
         \App\Wallet::observe(\App\Observers\WalletObserver::class);
 
         Schema::defaultStringLength(191);
 
         // Log SQL queries in debug mode
         if (\config('app.debug')) {
             DB::listen(function ($query) {
                 \Log::debug(sprintf('[SQL] %s [%s]', $query->sql, implode(', ', $query->bindings)));
             });
         }
+
+        // Register some template helpers
+        Blade::directive('theme_asset', function ($path) {
+            $path = trim($path, '/\'"');
+            return "<?php echo secure_asset('themes/' . \$env['app.theme'] . '/' . '$path'); ?>";
+        });
     }
 }
diff --git a/src/app/Providers/HorizonServiceProvider.php b/src/app/Providers/HorizonServiceProvider.php
new file mode 100644
index 00000000..84081edc
--- /dev/null
+++ b/src/app/Providers/HorizonServiceProvider.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Gate;
+use Laravel\Horizon\Horizon;
+use Laravel\Horizon\HorizonApplicationServiceProvider;
+
+class HorizonServiceProvider extends HorizonApplicationServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        parent::boot();
+
+        // Horizon::routeSmsNotificationsTo('15556667777');
+        // Horizon::routeMailNotificationsTo('example@example.com');
+        // Horizon::routeSlackNotificationsTo('slack-webhook-url', '#channel');
+
+        Horizon::night();
+    }
+
+    protected function gate()
+    {
+        Gate::define(
+            'viewHorizon',
+            function ($user = null) {
+                return true;
+            }
+        );
+    }
+}
diff --git a/src/app/Providers/Payment/Mollie.php b/src/app/Providers/Payment/Mollie.php
index c6332eb9..bdbf867a 100644
--- a/src/app/Providers/Payment/Mollie.php
+++ b/src/app/Providers/Payment/Mollie.php
@@ -1,461 +1,622 @@
 <?php
 
 namespace App\Providers\Payment;
 
 use App\Payment;
 use App\Utils;
 use App\Wallet;
 use Illuminate\Support\Facades\DB;
+use Mollie\Api\Exceptions\ApiException;
+use Mollie\Api\Types;
 
 class Mollie extends \App\Providers\PaymentProvider
 {
     /**
      * Get a link to the customer in the provider's control panel
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return string|null The string representing <a> tag
      */
     public function customerLink(Wallet $wallet): ?string
     {
         $customer_id = self::mollieCustomerId($wallet, false);
 
         if (!$customer_id) {
             return null;
         }
 
         return sprintf(
             '<a href="https://www.mollie.com/dashboard/customers/%s" target="_blank">%s</a>',
             $customer_id,
             $customer_id
         );
     }
 
     /**
      * Create a new auto-payment mandate for a wallet.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data:
-     *                             - amount: Value in cents
+     *                             - amount: Value in cents (optional)
      *                             - currency: The operation currency
      *                             - description: Operation desc.
+     *                             - methodId: Payment method
      *
      * @return array Provider payment data:
      *               - id: Operation identifier
      *               - redirectUrl: the location to redirect to
      */
     public function createMandate(Wallet $wallet, array $payment): ?array
     {
         // Register the user in Mollie, if not yet done
         $customer_id = self::mollieCustomerId($wallet, true);
 
+        if (!isset($payment['amount'])) {
+            $payment['amount'] = 0;
+        }
+
+        $amount = $this->exchange($payment['amount'], $wallet->currency, $payment['currency']);
+        $payment['currency_amount'] = $amount;
+
         $request = [
             'amount' => [
                 'currency' => $payment['currency'],
-                'value' => '0.00',
+                'value' => sprintf('%.2f', $amount / 100),
             ],
             'customerId' => $customer_id,
             'sequenceType' => 'first',
             'description' => $payment['description'],
             'webhookUrl' => Utils::serviceUrl('/api/webhooks/payment/mollie'),
             'redirectUrl' => Utils::serviceUrl('/wallet'),
             'locale' => 'en_US',
-            // 'method' => 'creditcard',
+            'method' => $payment['methodId']
         ];
 
         // Create the payment in Mollie
         $response = mollie()->payments()->create($request);
 
         if ($response->mandateId) {
             $wallet->setSetting('mollie_mandate_id', $response->mandateId);
         }
 
+        // Store the payment reference in database
+        $payment['status'] = $response->status;
+        $payment['id'] = $response->id;
+        $payment['type'] = self::TYPE_MANDATE;
+
+        $this->storePayment($payment, $wallet->id);
+
         return [
             'id' => $response->id,
             'redirectUrl' => $response->getCheckoutUrl(),
         ];
     }
 
     /**
      * Revoke the auto-payment mandate for the wallet.
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return bool True on success, False on failure
      */
     public function deleteMandate(Wallet $wallet): bool
     {
         // Get the Mandate info
         $mandate = self::mollieMandate($wallet);
 
         // Revoke the mandate on Mollie
         if ($mandate) {
             $mandate->revoke();
 
             $wallet->setSetting('mollie_mandate_id', null);
         }
 
         return true;
     }
 
     /**
      * Get a auto-payment mandate for the wallet.
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return array|null Mandate information:
      *                    - id: Mandate identifier
      *                    - method: user-friendly payment method desc.
+     *                    - methodId: Payment method
      *                    - isPending: the process didn't complete yet
      *                    - isValid: the mandate is valid
      */
     public function getMandate(Wallet $wallet): ?array
     {
         // Get the Mandate info
         $mandate = self::mollieMandate($wallet);
 
         if (empty($mandate)) {
             return null;
         }
 
         $result = [
             'id' => $mandate->id,
             'isPending' => $mandate->isPending(),
             'isValid' => $mandate->isValid(),
-            'method' => self::paymentMethod($mandate, 'Unknown method')
+            'method' => self::paymentMethod($mandate, 'Unknown method'),
+            'methodId' => $mandate->method
         ];
 
         return $result;
     }
 
     /**
      * Get a provider name
      *
      * @return string Provider name
      */
     public function name(): string
     {
         return 'mollie';
     }
 
     /**
      * Create a new payment.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data:
      *                             - amount: Value in cents
      *                             - currency: The operation currency
      *                             - type: oneoff/recurring
      *                             - description: Operation desc.
+     *                             - methodId: Payment method
      *
      * @return array Provider payment data:
      *               - id: Operation identifier
      *               - redirectUrl: the location to redirect to
      */
     public function payment(Wallet $wallet, array $payment): ?array
     {
         if ($payment['type'] == self::TYPE_RECURRING) {
             return $this->paymentRecurring($wallet, $payment);
         }
 
         // Register the user in Mollie, if not yet done
         $customer_id = self::mollieCustomerId($wallet, true);
 
-        // Note: Required fields: description, amount/currency, amount/value
+        $amount = $this->exchange($payment['amount'], $wallet->currency, $payment['currency']);
+        $payment['currency_amount'] = $amount;
 
+        // Note: Required fields: description, amount/currency, amount/value
         $request = [
             'amount' => [
                 'currency' => $payment['currency'],
-                // a number with two decimals is required
-                'value' => sprintf('%.2f', $payment['amount'] / 100),
+                // a number with two decimals is required (note that JPK and ISK don't require decimals,
+                // but we're not using them currently)
+                'value' => sprintf('%.2f', $amount / 100),
             ],
             'customerId' => $customer_id,
             'sequenceType' => $payment['type'],
             'description' => $payment['description'],
             'webhookUrl' => Utils::serviceUrl('/api/webhooks/payment/mollie'),
             'locale' => 'en_US',
-            // 'method' => 'creditcard',
+            'method' => $payment['methodId'],
             'redirectUrl' => Utils::serviceUrl('/wallet') // required for non-recurring payments
         ];
 
         // TODO: Additional payment parameters for better fraud protection:
         //   billingEmail - for bank transfers, Przelewy24, but not creditcard
         //   billingAddress (it is a structured field not just text)
 
         // Create the payment in Mollie
         $response = mollie()->payments()->create($request);
 
         // Store the payment reference in database
         $payment['status'] = $response->status;
         $payment['id'] = $response->id;
 
         $this->storePayment($payment, $wallet->id);
 
         return [
             'id' => $payment['id'],
             'redirectUrl' => $response->getCheckoutUrl(),
         ];
     }
 
+
+    /**
+     * Cancel a pending payment.
+     *
+     * @param \App\Wallet $wallet  The wallet
+     * @param string      $paymentId Payment Id
+     *
+     * @return bool True on success, False on failure
+     */
+    public function cancel(Wallet $wallet, $paymentId): bool
+    {
+        $response = mollie()->payments()->delete($paymentId);
+
+        $db_payment = Payment::find($paymentId);
+        $db_payment->status = $response->status;
+        $db_payment->save();
+
+        return true;
+    }
+
+
     /**
      * Create a new automatic payment operation.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data (see self::payment())
      *
      * @return array Provider payment/session data:
      *               - id: Operation identifier
      */
     protected function paymentRecurring(Wallet $wallet, array $payment): ?array
     {
         // Check if there's a valid mandate
         $mandate = self::mollieMandate($wallet);
 
         if (empty($mandate) || !$mandate->isValid() || $mandate->isPending()) {
             return null;
         }
 
         $customer_id = self::mollieCustomerId($wallet, true);
 
         // Note: Required fields: description, amount/currency, amount/value
+        $amount = $this->exchange($payment['amount'], $wallet->currency, $payment['currency']);
+        $payment['currency_amount'] = $amount;
 
         $request = [
             'amount' => [
                 'currency' => $payment['currency'],
                 // a number with two decimals is required
-                'value' => sprintf('%.2f', $payment['amount'] / 100),
+                'value' => sprintf('%.2f', $amount / 100),
             ],
             'customerId' => $customer_id,
             'sequenceType' => $payment['type'],
             'description' => $payment['description'],
             'webhookUrl' => Utils::serviceUrl('/api/webhooks/payment/mollie'),
             'locale' => 'en_US',
-            // 'method' => 'creditcard',
+            'method' => $payment['methodId'],
             'mandateId' => $mandate->id
         ];
 
         // Create the payment in Mollie
         $response = mollie()->payments()->create($request);
 
         // Store the payment reference in database
         $payment['status'] = $response->status;
         $payment['id'] = $response->id;
 
         DB::beginTransaction();
 
         $payment = $this->storePayment($payment, $wallet->id);
 
         // Mollie can return 'paid' status immediately, so we don't
         // have to wait for the webhook. What's more, the webhook would ignore
         // the payment because it will be marked as paid before the webhook.
         // Let's handle paid status here too.
         if ($response->isPaid()) {
             self::creditPayment($payment, $response);
             $notify = true;
         } elseif ($response->isFailed()) {
             // Note: I didn't find a way to get any description of the problem with a payment
             \Log::info(sprintf('Mollie payment failed (%s)', $response->id));
 
             // Disable the mandate
             $wallet->setSetting('mandate_disabled', 1);
             $notify = true;
         }
 
         DB::commit();
 
         if (!empty($notify)) {
             \App\Jobs\PaymentEmail::dispatch($payment);
         }
 
         return [
             'id' => $payment['id'],
         ];
     }
 
     /**
      * Update payment status (and balance).
      *
      * @return int HTTP response code
      */
     public function webhook(): int
     {
         $payment_id = \request()->input('id');
 
         if (empty($payment_id)) {
             return 200;
         }
 
         $payment = Payment::find($payment_id);
 
         if (empty($payment)) {
             // Mollie recommends to return "200 OK" even if the payment does not exist
             return 200;
         }
 
         // Get the payment details from Mollie
+        // TODO: Consider https://github.com/mollie/mollie-api-php/issues/502 when it's fixed
         $mollie_payment = mollie()->payments()->get($payment_id);
 
         if (empty($mollie_payment)) {
             // Mollie recommends to return "200 OK" even if the payment does not exist
             return 200;
         }
 
+        $refunds = [];
+
         if ($mollie_payment->isPaid()) {
-            if (!$mollie_payment->hasRefunds() && !$mollie_payment->hasChargebacks()) {
-                // The payment is paid and isn't refunded or charged back.
-                // Update the balance, if it wasn't already
-                if ($payment->status != self::STATUS_PAID && $payment->amount > 0) {
-                    $credit = true;
-                    $notify = $payment->type == self::TYPE_RECURRING;
+            // The payment is paid. Update the balance, and notify the user
+            if ($payment->status != self::STATUS_PAID && $payment->amount > 0) {
+                $credit = true;
+                $notify = $payment->type == self::TYPE_RECURRING;
+            }
+
+            // The payment has been (partially) refunded.
+            // Let's process refunds with status "refunded".
+            if ($mollie_payment->hasRefunds()) {
+                foreach ($mollie_payment->refunds() as $refund) {
+                    if ($refund->isTransferred() && $refund->amount->value) {
+                        $refunds[] = [
+                            'id' => $refund->id,
+                            'description' => $refund->description,
+                            'amount' => round(floatval($refund->amount->value) * 100),
+                            'type' => self::TYPE_REFUND,
+                            'currency' => $refund->amount->currency
+                        ];
+                    }
+                }
+            }
+
+            // The payment has been (partially) charged back.
+            // Let's process chargebacks (they have no states as refunds)
+            if ($mollie_payment->hasChargebacks()) {
+                foreach ($mollie_payment->chargebacks() as $chargeback) {
+                    if ($chargeback->amount->value) {
+                        $refunds[] = [
+                            'id' => $chargeback->id,
+                            'amount' => round(floatval($chargeback->amount->value) * 100),
+                            'type' => self::TYPE_CHARGEBACK,
+                            'currency' => $chargeback->amount->currency
+                        ];
+                    }
                 }
-            } elseif ($mollie_payment->hasRefunds()) {
-                // The payment has been (partially) refunded.
-                // The status of the payment is still "paid"
-                // TODO: Update balance
-            } elseif ($mollie_payment->hasChargebacks()) {
-                // The payment has been (partially) charged back.
-                // The status of the payment is still "paid"
-                // TODO: Update balance
+            }
+
+            // In case there were multiple auto-payment setup requests (e.g. caused by a double
+            // form submission) we end up with multiple payment records and mollie_mandate_id
+            // pointing to the one from the last payment not the successful one.
+            // We make sure to use mandate id from the successful "first" payment.
+            if (
+                $payment->type == self::TYPE_MANDATE
+                && $mollie_payment->mandateId
+                && $mollie_payment->sequenceType == Types\SequenceType::SEQUENCETYPE_FIRST
+            ) {
+                $payment->wallet->setSetting('mollie_mandate_id', $mollie_payment->mandateId);
             }
         } elseif ($mollie_payment->isFailed()) {
             // Note: I didn't find a way to get any description of the problem with a payment
             \Log::info(sprintf('Mollie payment failed (%s)', $payment->id));
 
             // Disable the mandate
             if ($payment->type == self::TYPE_RECURRING) {
                 $notify = true;
                 $payment->wallet->setSetting('mandate_disabled', 1);
             }
         }
 
         DB::beginTransaction();
 
         // This is a sanity check, just in case the payment provider api
         // sent us open -> paid -> open -> paid. So, we lock the payment after
         // recivied a "final" state.
         $pending_states = [self::STATUS_OPEN, self::STATUS_PENDING, self::STATUS_AUTHORIZED];
         if (in_array($payment->status, $pending_states)) {
             $payment->status = $mollie_payment->status;
             $payment->save();
         }
 
         if (!empty($credit)) {
             self::creditPayment($payment, $mollie_payment);
         }
 
+        foreach ($refunds as $refund) {
+            $this->storeRefund($payment->wallet, $refund);
+        }
+
         DB::commit();
 
         if (!empty($notify)) {
             \App\Jobs\PaymentEmail::dispatch($payment);
         }
 
         return 200;
     }
 
     /**
      * Get Mollie customer identifier for specified wallet.
      * Create one if does not exist yet.
      *
      * @param \App\Wallet $wallet The wallet
      * @param bool        $create Create the customer if does not exist yet
      *
      * @return ?string Mollie customer identifier
      */
     protected static function mollieCustomerId(Wallet $wallet, bool $create = false): ?string
     {
         $customer_id = $wallet->getSetting('mollie_id');
 
         // Register the user in Mollie
         if (empty($customer_id) && $create) {
             $customer = mollie()->customers()->create([
                     'name'  => $wallet->owner->name(),
                     'email' => $wallet->id . '@private.' . \config('app.domain'),
             ]);
 
             $customer_id = $customer->id;
 
             $wallet->setSetting('mollie_id', $customer->id);
         }
 
         return $customer_id;
     }
 
     /**
      * Get the active Mollie auto-payment mandate
      */
     protected static function mollieMandate(Wallet $wallet)
     {
         $customer_id = $wallet->getSetting('mollie_id');
         $mandate_id = $wallet->getSetting('mollie_mandate_id');
 
         // Get the manadate reference we already have
         if ($customer_id && $mandate_id) {
-            $mandate = mollie()->mandates()->getForId($customer_id, $mandate_id);
-            if ($mandate) {// && ($mandate->isValid() || $mandate->isPending())) {
-                return $mandate;
-            }
-        }
+            try {
+                return mollie()->mandates()->getForId($customer_id, $mandate_id);
+            } catch (ApiException $e) {
+                // FIXME: What about 404?
+                if ($e->getCode() == 410) {
+                    // The mandate is gone, remove the reference
+                    $wallet->setSetting('mollie_mandate_id', null);
+                    return null;
+                }
 
-        // Get all mandates from Mollie and find the active one
-        /*
-        foreach ($customer->mandates() as $mandate) {
-            if ($mandate->isValid() || $mandate->isPending()) {
-                $wallet->setSetting('mollie_mandate_id', $mandate->id);
-                return $mandate;
+                // TODO: Maybe we shouldn't always throw? It make sense in the job
+                //       but for example when we're just fetching wallet info...
+                throw $e;
             }
         }
-        */
     }
 
     /**
      * Apply the successful payment's pecunia to the wallet
      */
     protected static function creditPayment($payment, $mollie_payment)
     {
         // Extract the payment method for transaction description
         $method = self::paymentMethod($mollie_payment, 'Mollie');
 
         // TODO: Localization?
         $description = $payment->type == self::TYPE_RECURRING ? 'Auto-payment' : 'Payment';
         $description .= " transaction {$payment->id} using {$method}";
 
         $payment->wallet->credit($payment->amount, $description);
 
         // Unlock the disabled auto-payment mandate
         if ($payment->wallet->balance >= 0) {
             $payment->wallet->setSetting('mandate_disabled', null);
         }
     }
 
     /**
      * Extract payment method description from Mollie payment/mandate details
      */
     protected static function paymentMethod($object, $default = ''): string
     {
         $details = $object->details;
 
         // Mollie supports 3 methods here
         switch ($object->method) {
-            case 'creditcard':
+            case self::METHOD_CREDITCARD:
                 // If the customer started, but never finished the 'first' payment
                 // card details will be empty, and mandate will be 'pending'.
                 if (empty($details->cardNumber)) {
                     return 'Credit Card';
                 }
 
                 return sprintf(
                     '%s (**** **** **** %s)',
                     $details->cardLabel ?: 'Card', // @phpstan-ignore-line
                     $details->cardNumber
                 );
 
-            case 'directdebit':
+            case self::METHOD_DIRECTDEBIT:
                 return sprintf('Direct Debit (%s)', $details->customerAccount);
 
-            case 'paypal':
+            case self::METHOD_PAYPAL:
                 return sprintf('PayPal (%s)', $details->consumerAccount);
         }
 
         return $default;
     }
+
+    /**
+     * List supported payment methods.
+     *
+     * @param string $type The payment type for which we require a method (oneoff/recurring).
+     *
+     * @return array Array of array with available payment methods:
+     *               - id: id of the method
+     *               - name: User readable name of the payment method
+     *               - minimumAmount: Minimum amount to be charged in cents
+     *               - currency: Currency used for the method
+     *               - exchangeRate: The projected exchange rate (actual rate is determined during payment)
+     *               - icon: An icon (icon name) representing the method
+     */
+    public function providerPaymentMethods($type): array
+    {
+
+        $providerMethods = array_merge(
+            // Fallback to EUR methods (later provider methods will override earlier ones)
+            //mollie()->methods()->allActive(
+            //    [
+            //        'sequenceType' => $type,
+            //        'amount' => [
+            //            'value' => '1.00',
+            //            'currency' => 'EUR'
+            //        ]
+            //    ]
+            //),
+            // Prefer CHF methods
+            (array)mollie()->methods()->allActive(
+                [
+                    'sequenceType' => $type,
+                    'amount' => [
+                        'value' => '1.00',
+                        'currency' => 'CHF'
+                    ]
+                ]
+            )
+        );
+
+        $availableMethods = [];
+        foreach ($providerMethods as $method) {
+            $availableMethods[$method->id] = [
+                'id' => $method->id,
+                'name' => $method->description,
+                'minimumAmount' => round(floatval($method->minimumAmount->value) * 100), // Converted to cents
+                'currency' => $method->minimumAmount->currency,
+                'exchangeRate' => $this->exchangeRate('CHF', $method->minimumAmount->currency)
+            ];
+        }
+
+        return $availableMethods;
+    }
+
+    /**
+     * Get a payment.
+     *
+     * @param string $paymentId Payment identifier
+     *
+     * @return array Payment information:
+     *                    - id: Payment identifier
+     *                    - status: Payment status
+     *                    - isCancelable: The payment can be canceled
+     *                    - checkoutUrl: The checkout url to complete the payment or null if none
+     */
+    public function getPayment($paymentId): array
+    {
+        $payment = mollie()->payments()->get($paymentId);
+
+        return [
+            'id' => $payment->id,
+            'status' => $payment->status,
+            'isCancelable' => $payment->isCancelable,
+            'checkoutUrl' => $payment->getCheckoutUrl()
+        ];
+    }
 }
diff --git a/src/app/Providers/Payment/Stripe.php b/src/app/Providers/Payment/Stripe.php
index 00b0fa75..6c20642d 100644
--- a/src/app/Providers/Payment/Stripe.php
+++ b/src/app/Providers/Payment/Stripe.php
@@ -1,465 +1,558 @@
 <?php
 
 namespace App\Providers\Payment;
 
 use App\Payment;
 use App\Utils;
 use App\Wallet;
 use App\WalletSetting;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Request;
 use Stripe as StripeAPI;
 
 class Stripe extends \App\Providers\PaymentProvider
 {
     /**
      * Class constructor.
      */
     public function __construct()
     {
         StripeAPI\Stripe::setApiKey(\config('services.stripe.key'));
     }
 
     /**
      * Get a link to the customer in the provider's control panel
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return string|null The string representing <a> tag
      */
     public function customerLink(Wallet $wallet): ?string
     {
         $customer_id = self::stripeCustomerId($wallet, false);
 
         if (!$customer_id) {
             return null;
         }
 
         $location = 'https://dashboard.stripe.com';
 
         $key = \config('services.stripe.key');
 
         if (strpos($key, 'sk_test_') === 0) {
             $location .= '/test';
         }
 
         return sprintf(
             '<a href="%s/customers/%s" target="_blank">%s</a>',
             $location,
             $customer_id,
             $customer_id
         );
     }
 
     /**
      * Create a new auto-payment mandate for a wallet.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data:
-     *                             - amount: Value in cents
+     *                             - amount: Value in cents (not used)
      *                             - currency: The operation currency
      *                             - description: Operation desc.
      *
      * @return array Provider payment/session data:
      *               - id: Session identifier
      */
     public function createMandate(Wallet $wallet, array $payment): ?array
     {
         // Register the user in Stripe, if not yet done
         $customer_id = self::stripeCustomerId($wallet, true);
 
         $request = [
             'customer' => $customer_id,
             'cancel_url' => Utils::serviceUrl('/wallet'), // required
             'success_url' => Utils::serviceUrl('/wallet'), // required
             'payment_method_types' => ['card'], // required
             'locale' => 'en',
             'mode' => 'setup',
         ];
 
+        // Note: Stripe does not allow to set amount for 'setup' operation
+        // We'll dispatch WalletCharge job when we receive a webhook request
+
         $session = StripeAPI\Checkout\Session::create($request);
 
-        $payment = [
-            'id' => $session->setup_intent,
-            'type' => self::TYPE_MANDATE,
-        ];
+        $payment['amount'] = 0;
+        $payment['currency_amount'] = 0;
+        $payment['id'] = $session->setup_intent;
+        $payment['type'] = self::TYPE_MANDATE;
 
         $this->storePayment($payment, $wallet->id);
 
         return [
             'id' => $session->id,
         ];
     }
 
     /**
      * Revoke the auto-payment mandate.
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return bool True on success, False on failure
      */
     public function deleteMandate(Wallet $wallet): bool
     {
         // Get the Mandate info
         $mandate = self::stripeMandate($wallet);
 
         if ($mandate) {
             // Remove the reference
             $wallet->setSetting('stripe_mandate_id', null);
 
             // Detach the payment method on Stripe
             $pm = StripeAPI\PaymentMethod::retrieve($mandate->payment_method);
             $pm->detach();
         }
 
         return true;
     }
 
     /**
      * Get a auto-payment mandate for a wallet.
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return array|null Mandate information:
      *                    - id: Mandate identifier
      *                    - method: user-friendly payment method desc.
      *                    - isPending: the process didn't complete yet
      *                    - isValid: the mandate is valid
      */
     public function getMandate(Wallet $wallet): ?array
     {
         // Get the Mandate info
         $mandate = self::stripeMandate($wallet);
 
         if (empty($mandate)) {
             return null;
         }
 
         $pm = StripeAPI\PaymentMethod::retrieve($mandate->payment_method);
 
         $result = [
             'id' => $mandate->id,
             'isPending' => $mandate->status != 'succeeded' && $mandate->status != 'canceled',
             'isValid' => $mandate->status == 'succeeded',
             'method' => self::paymentMethod($pm, 'Unknown method')
         ];
 
         return $result;
     }
 
     /**
      * Get a provider name
      *
      * @return string Provider name
      */
     public function name(): string
     {
         return 'stripe';
     }
 
     /**
      * Create a new payment.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data:
      *                             - amount: Value in cents
      *                             - currency: The operation currency
      *                             - type: first/oneoff/recurring
      *                             - description: Operation desc.
      *
      * @return array Provider payment/session data:
      *               - id: Session identifier
      */
     public function payment(Wallet $wallet, array $payment): ?array
     {
         if ($payment['type'] == self::TYPE_RECURRING) {
             return $this->paymentRecurring($wallet, $payment);
         }
 
         // Register the user in Stripe, if not yet done
         $customer_id = self::stripeCustomerId($wallet, true);
 
+
+        $amount = $this->exchange($payment['amount'], $wallet->currency, $payment['currency']);
+        $payment['currency_amount'] = $amount;
+
         $request = [
             'customer' => $customer_id,
             'cancel_url' => Utils::serviceUrl('/wallet'), // required
             'success_url' => Utils::serviceUrl('/wallet'), // required
             'payment_method_types' => ['card'], // required
             'locale' => 'en',
             'line_items' => [
                 [
                     'name' => $payment['description'],
-                    'amount' => $payment['amount'],
+                    'amount' => $amount,
                     'currency' => \strtolower($payment['currency']),
                     'quantity' => 1,
                 ]
             ]
         ];
 
         $session = StripeAPI\Checkout\Session::create($request);
 
         // Store the payment reference in database
         $payment['id'] = $session->payment_intent;
 
         $this->storePayment($payment, $wallet->id);
 
         return [
             'id' => $session->id,
         ];
     }
 
     /**
      * Create a new automatic payment operation.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data (see self::payment())
      *
      * @return array Provider payment/session data:
      *               - id: Session identifier
      */
     protected function paymentRecurring(Wallet $wallet, array $payment): ?array
     {
         // Check if there's a valid mandate
         $mandate = self::stripeMandate($wallet);
 
         if (empty($mandate)) {
             return null;
         }
 
+        $amount = $this->exchange($payment['amount'], $wallet->currency, $payment['currency']);
+        $payment['currency_amount'] = $amount;
+
         $request = [
-            'amount' => $payment['amount'],
+            'amount' => $amount,
             'currency' => \strtolower($payment['currency']),
             'description' => $payment['description'],
             'receipt_email' => $wallet->owner->email,
             'customer' => $mandate->customer,
             'payment_method' => $mandate->payment_method,
             'off_session' => true,
             'confirm' => true,
         ];
 
         $intent = StripeAPI\PaymentIntent::create($request);
 
         // Store the payment reference in database
         $payment['id'] = $intent->id;
 
         $this->storePayment($payment, $wallet->id);
 
         return [
             'id' => $payment['id'],
         ];
     }
 
     /**
      * Update payment status (and balance).
      *
      * @return int HTTP response code
      */
     public function webhook(): int
     {
         // We cannot just use php://input as it's already "emptied" by the framework
         // $payload = file_get_contents('php://input');
         $request = Request::instance();
         $payload = $request->getContent();
         $sig_header = $request->header('Stripe-Signature');
 
         // Parse and validate the input
         try {
             $event = StripeAPI\Webhook::constructEvent(
                 $payload,
                 $sig_header,
                 \config('services.stripe.webhook_secret')
             );
         } catch (\Exception $e) {
+            \Log::error("Invalid payload: " . $e->getMessage());
             // Invalid payload
             return 400;
         }
 
         switch ($event->type) {
             case StripeAPI\Event::PAYMENT_INTENT_CANCELED:
             case StripeAPI\Event::PAYMENT_INTENT_PAYMENT_FAILED:
             case StripeAPI\Event::PAYMENT_INTENT_SUCCEEDED:
                 $intent = $event->data->object; // @phpstan-ignore-line
                 $payment = Payment::find($intent->id);
 
                 if (empty($payment) || $payment->type == self::TYPE_MANDATE) {
                     return 404;
                 }
 
                 switch ($intent->status) {
                     case StripeAPI\PaymentIntent::STATUS_CANCELED:
                         $status = self::STATUS_CANCELED;
                         break;
                     case StripeAPI\PaymentIntent::STATUS_SUCCEEDED:
                         $status = self::STATUS_PAID;
                         break;
                     default:
                         $status = self::STATUS_FAILED;
                 }
 
                 DB::beginTransaction();
 
                 if ($status == self::STATUS_PAID) {
                     // Update the balance, if it wasn't already
                     if ($payment->status != self::STATUS_PAID) {
                         $this->creditPayment($payment, $intent);
                     }
                 } else {
                     if (!empty($intent->last_payment_error)) {
                         // See https://stripe.com/docs/error-codes for more info
                         \Log::info(sprintf(
                             'Stripe payment failed (%s): %s',
                             $payment->id,
                             json_encode($intent->last_payment_error)
                         ));
                     }
                 }
 
                 if ($payment->status != self::STATUS_PAID) {
                     $payment->status = $status;
                     $payment->save();
 
                     if ($status != self::STATUS_CANCELED && $payment->type == self::TYPE_RECURRING) {
                         // Disable the mandate
                         if ($status == self::STATUS_FAILED) {
                             $payment->wallet->setSetting('mandate_disabled', 1);
                         }
 
                         // Notify the user
                         \App\Jobs\PaymentEmail::dispatch($payment);
                     }
                 }
 
                 DB::commit();
 
                 break;
 
             case StripeAPI\Event::SETUP_INTENT_SUCCEEDED:
             case StripeAPI\Event::SETUP_INTENT_SETUP_FAILED:
             case StripeAPI\Event::SETUP_INTENT_CANCELED:
                 $intent = $event->data->object; // @phpstan-ignore-line
                 $payment = Payment::find($intent->id);
 
                 if (empty($payment) || $payment->type != self::TYPE_MANDATE) {
                     return 404;
                 }
 
                 switch ($intent->status) {
                     case StripeAPI\SetupIntent::STATUS_CANCELED:
                         $status = self::STATUS_CANCELED;
                         break;
                     case StripeAPI\SetupIntent::STATUS_SUCCEEDED:
                         $status = self::STATUS_PAID;
                         break;
                     default:
                         $status = self::STATUS_FAILED;
                 }
 
                 if ($status == self::STATUS_PAID) {
                     $payment->wallet->setSetting('stripe_mandate_id', $intent->id);
+                    $threshold = intval((float) $payment->wallet->getSetting('mandate_balance') * 100);
+
+                    // Top-up the wallet if balance is below the threshold
+                    if ($payment->wallet->balance < $threshold && $payment->status != self::STATUS_PAID) {
+                        \App\Jobs\WalletCharge::dispatch($payment->wallet);
+                    }
                 }
 
                 $payment->status = $status;
                 $payment->save();
 
                 break;
 
             default:
                 \Log::debug("Unhandled Stripe event: " . var_export($payload, true));
                 break;
         }
 
         return 200;
     }
 
     /**
      * Get Stripe customer identifier for specified wallet.
      * Create one if does not exist yet.
      *
      * @param \App\Wallet $wallet The wallet
      * @param bool        $create Create the customer if does not exist yet
      *
      * @return string|null Stripe customer identifier
      */
     protected static function stripeCustomerId(Wallet $wallet, bool $create = false): ?string
     {
         $customer_id = $wallet->getSetting('stripe_id');
 
         // Register the user in Stripe
         if (empty($customer_id) && $create) {
             $customer = StripeAPI\Customer::create([
                     'name'  => $wallet->owner->name(),
                     // Stripe will display the email on Checkout page, editable,
                     // and use it to send the receipt (?), use the user email here
                     // 'email' => $wallet->id . '@private.' . \config('app.domain'),
                     'email' => $wallet->owner->email,
             ]);
 
             $customer_id = $customer->id;
 
             $wallet->setSetting('stripe_id', $customer->id);
         }
 
         return $customer_id;
     }
 
     /**
      * Get the active Stripe auto-payment mandate (Setup Intent)
      */
     protected static function stripeMandate(Wallet $wallet)
     {
         // Note: Stripe also has 'Mandate' objects, but we do not use these
 
         if ($mandate_id = $wallet->getSetting('stripe_mandate_id')) {
             $mandate = StripeAPI\SetupIntent::retrieve($mandate_id);
             // @phpstan-ignore-next-line
             if ($mandate && $mandate->status != 'canceled') {
                 return $mandate;
             }
         }
     }
 
     /**
      * Apply the successful payment's pecunia to the wallet
      */
     protected static function creditPayment(Payment $payment, $intent)
     {
         $method = 'Stripe';
 
         // Extract the payment method for transaction description
         if (
             !empty($intent->charges)
             && ($charge = $intent->charges->data[0])
             && ($pm = $charge->payment_method_details)
         ) {
             $method = self::paymentMethod($pm);
         }
 
         // TODO: Localization?
         $description = $payment->type == self::TYPE_RECURRING ? 'Auto-payment' : 'Payment';
         $description .= " transaction {$payment->id} using {$method}";
 
         $payment->wallet->credit($payment->amount, $description);
 
         // Unlock the disabled auto-payment mandate
         if ($payment->wallet->balance >= 0) {
             $payment->wallet->setSetting('mandate_disabled', null);
         }
     }
 
     /**
      * Extract payment method description from Stripe payment details
      */
     protected static function paymentMethod($details, $default = ''): string
     {
         switch ($details->type) {
             case 'card':
                 // TODO: card number
                 return \sprintf(
                     '%s (**** **** **** %s)',
                     \ucfirst($details->card->brand) ?: 'Card',
                     $details->card->last4
                 );
         }
 
         return $default;
     }
+
+    /**
+     * List supported payment methods.
+     *
+     * @param string $type The payment type for which we require a method (oneoff/recurring).
+     *
+     * @return array Array of array with available payment methods:
+     *               - id: id of the method
+     *               - name: User readable name of the payment method
+     *               - minimumAmount: Minimum amount to be charged in cents
+     *               - currency: Currency used for the method
+     *               - exchangeRate: The projected exchange rate (actual rate is determined during payment)
+     *               - icon: An icon (icon name) representing the method
+     */
+    public function providerPaymentMethods($type): array
+    {
+        //TODO get this from the stripe API?
+        $availableMethods = [];
+        switch ($type) {
+            case self::TYPE_ONEOFF:
+                $availableMethods = [
+                    self::METHOD_CREDITCARD => [
+                        'id' => self::METHOD_CREDITCARD,
+                        'name' => "Credit Card",
+                        'minimumAmount' => self::MIN_AMOUNT,
+                        'currency' => 'CHF',
+                        'exchangeRate' => 1.0
+                    ],
+                    self::METHOD_PAYPAL => [
+                        'id' => self::METHOD_PAYPAL,
+                        'name' => "PayPal",
+                        'minimumAmount' => self::MIN_AMOUNT,
+                        'currency' => 'CHF',
+                        'exchangeRate' => 1.0
+                    ]
+                ];
+                break;
+            case self::TYPE_RECURRING:
+                $availableMethods = [
+                    self::METHOD_CREDITCARD => [
+                        'id' => self::METHOD_CREDITCARD,
+                        'name' => "Credit Card",
+                        'minimumAmount' => self::MIN_AMOUNT, // Converted to cents,
+                        'currency' => 'CHF',
+                        'exchangeRate' => 1.0
+                    ]
+                ];
+                break;
+        }
+
+        return $availableMethods;
+    }
+
+    /**
+     * Get a payment.
+     *
+     * @param string $paymentId Payment identifier
+     *
+     * @return array Payment information:
+     *                    - id: Payment identifier
+     *                    - status: Payment status
+     *                    - isCancelable: The payment can be canceled
+     *                    - checkoutUrl: The checkout url to complete the payment or null if none
+     */
+    public function getPayment($paymentId): array
+    {
+        \Log::info("Stripe::getPayment does not yet retrieve a checkoutUrl.");
+
+        $payment = StripeAPI\PaymentIntent::retrieve($paymentId);
+        return [
+            'id' => $payment->id,
+            'status' => $payment->status,
+            'isCancelable' => false,
+            'checkoutUrl' => null
+        ];
+    }
 }
diff --git a/src/app/Providers/PaymentProvider.php b/src/app/Providers/PaymentProvider.php
index 991169bd..30d41a8e 100644
--- a/src/app/Providers/PaymentProvider.php
+++ b/src/app/Providers/PaymentProvider.php
@@ -1,156 +1,388 @@
 <?php
 
 namespace App\Providers;
 
+use App\Transaction;
 use App\Payment;
 use App\Wallet;
+use Illuminate\Support\Facades\Cache;
 
 abstract class PaymentProvider
 {
     public const STATUS_OPEN = 'open';
     public const STATUS_CANCELED = 'canceled';
     public const STATUS_PENDING = 'pending';
     public const STATUS_AUTHORIZED = 'authorized';
     public const STATUS_EXPIRED = 'expired';
     public const STATUS_FAILED = 'failed';
     public const STATUS_PAID = 'paid';
 
     public const TYPE_ONEOFF = 'oneoff';
     public const TYPE_RECURRING = 'recurring';
     public const TYPE_MANDATE = 'mandate';
+    public const TYPE_REFUND = 'refund';
+    public const TYPE_CHARGEBACK = 'chargeback';
+
+    public const METHOD_CREDITCARD = 'creditcard';
+    public const METHOD_PAYPAL = 'paypal';
+    public const METHOD_BANKTRANSFER = 'banktransfer';
+    public const METHOD_DIRECTDEBIT = 'directdebit';
+
+    public const PROVIDER_MOLLIE = 'mollie';
+    public const PROVIDER_STRIPE = 'stripe';
 
     /** const int Minimum amount of money in a single payment (in cents) */
     public const MIN_AMOUNT = 1000;
 
+    private static $paymentMethodIcons = [
+        self::METHOD_CREDITCARD => ['prefix' => 'far', 'name' => 'credit-card'],
+        self::METHOD_PAYPAL => ['prefix' => 'fab', 'name' => 'paypal'],
+        self::METHOD_BANKTRANSFER => ['prefix' => 'fas', 'name' => 'university']
+    ];
+
     /**
-     * Factory method
+     * Detect the name of the provider
      *
      * @param \App\Wallet|string|null $provider_or_wallet
+     * @return string The name of the provider
      */
-    public static function factory($provider_or_wallet = null)
+    private static function providerName($provider_or_wallet = null): string
     {
         if ($provider_or_wallet instanceof Wallet) {
             if ($provider_or_wallet->getSetting('stripe_id')) {
-                $provider = 'stripe';
+                $provider = self::PROVIDER_STRIPE;
             } elseif ($provider_or_wallet->getSetting('mollie_id')) {
-                $provider = 'mollie';
+                $provider = self::PROVIDER_MOLLIE;
             }
         } else {
             $provider = $provider_or_wallet;
         }
 
         if (empty($provider)) {
-            $provider = \config('services.payment_provider') ?: 'mollie';
+            $provider = \config('services.payment_provider') ?: self::PROVIDER_MOLLIE;
         }
 
-        switch (\strtolower($provider)) {
-            case 'stripe':
+        return \strtolower($provider);
+    }
+
+    /**
+     * Factory method
+     *
+     * @param \App\Wallet|string|null $provider_or_wallet
+     */
+    public static function factory($provider_or_wallet = null)
+    {
+        switch (self::providerName($provider_or_wallet)) {
+            case self::PROVIDER_STRIPE:
                 return new \App\Providers\Payment\Stripe();
 
-            case 'mollie':
+            case self::PROVIDER_MOLLIE:
                 return new \App\Providers\Payment\Mollie();
 
             default:
-                throw new \Exception("Invalid payment provider: {$provider}");
+                throw new \Exception("Invalid payment provider: {$provider_or_wallet}");
         }
     }
 
     /**
      * Create a new auto-payment mandate for a wallet.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data:
      *                             - amount: Value in cents
      *                             - currency: The operation currency
      *                             - description: Operation desc.
+     *                             - methodId: Payment method
      *
      * @return array Provider payment data:
      *               - id: Operation identifier
      *               - redirectUrl: the location to redirect to
      */
     abstract public function createMandate(Wallet $wallet, array $payment): ?array;
 
     /**
      * Revoke the auto-payment mandate for a wallet.
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return bool True on success, False on failure
      */
     abstract public function deleteMandate(Wallet $wallet): bool;
 
     /**
      * Get a auto-payment mandate for a wallet.
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return array|null Mandate information:
      *                    - id: Mandate identifier
      *                    - method: user-friendly payment method desc.
+     *                    - methodId: Payment method
      *                    - isPending: the process didn't complete yet
      *                    - isValid: the mandate is valid
      */
     abstract public function getMandate(Wallet $wallet): ?array;
 
     /**
      * Get a link to the customer in the provider's control panel
      *
      * @param \App\Wallet $wallet The wallet
      *
      * @return string|null The string representing <a> tag
      */
     abstract public function customerLink(Wallet $wallet): ?string;
 
     /**
      * Get a provider name
      *
      * @return string Provider name
      */
     abstract public function name(): string;
 
     /**
      * Create a new payment.
      *
      * @param \App\Wallet $wallet  The wallet
      * @param array       $payment Payment data:
      *                             - amount: Value in cents
      *                             - currency: The operation currency
      *                             - type: first/oneoff/recurring
      *                             - description: Operation description
+     *                             - methodId: Payment method
      *
      * @return array Provider payment/session data:
      *               - id: Operation identifier
      *               - redirectUrl
      */
     abstract public function payment(Wallet $wallet, array $payment): ?array;
 
     /**
      * Update payment status (and balance).
      *
      * @return int HTTP response code
      */
     abstract public function webhook(): int;
 
     /**
      * Create a payment record in DB
      *
      * @param array  $payment   Payment information
      * @param string $wallet_id Wallet ID
      *
      * @return \App\Payment Payment object
      */
     protected function storePayment(array $payment, $wallet_id): Payment
     {
         $db_payment = new Payment();
         $db_payment->id = $payment['id'];
         $db_payment->description = $payment['description'] ?? '';
         $db_payment->status = $payment['status'] ?? self::STATUS_OPEN;
         $db_payment->amount = $payment['amount'] ?? 0;
         $db_payment->type = $payment['type'];
         $db_payment->wallet_id = $wallet_id;
         $db_payment->provider = $this->name();
+        $db_payment->currency = $payment['currency'];
+        $db_payment->currency_amount = $payment['currency_amount'];
         $db_payment->save();
 
         return $db_payment;
     }
+
+    /**
+     * Retrieve an exchange rate.
+     *
+     * @param string $sourceCurrency Currency from which to convert
+     * @param string $targetCurrency Currency to convert to
+     *
+     * @return float Exchange rate
+     */
+    protected function exchangeRate(string $sourceCurrency, string $targetCurrency): float
+    {
+        if (strcasecmp($sourceCurrency, $targetCurrency)) {
+            throw new \Exception("Currency conversion is not yet implemented.");
+            //FIXME Not yet implemented
+        }
+        return 1.0;
+    }
+
+    /**
+     * Convert a value from $sourceCurrency to $targetCurrency
+     *
+     * @param int    $amount         Amount in cents of $sourceCurrency
+     * @param string $sourceCurrency Currency from which to convert
+     * @param string $targetCurrency Currency to convert to
+     *
+     * @return int Exchanged amount in cents of $targetCurrency
+     */
+    protected function exchange(int $amount, string $sourceCurrency, string $targetCurrency): int
+    {
+        return intval(round($amount * $this->exchangeRate($sourceCurrency, $targetCurrency)));
+    }
+
+    /**
+     * Deduct an amount of pecunia from the wallet.
+     * Creates a payment and transaction records for the refund/chargeback operation.
+     *
+     * @param \App\Wallet $wallet A wallet object
+     * @param array       $refund A refund or chargeback data (id, type, amount, description)
+     *
+     * @return void
+     */
+    protected function storeRefund(Wallet $wallet, array $refund): void
+    {
+        if (empty($refund) || empty($refund['amount'])) {
+            return;
+        }
+
+        // Preserve originally refunded amount
+        $refund['currency_amount'] = $refund['amount'];
+
+        // Convert amount to wallet currency
+        // TODO We should possibly be using the same exchange rate as for the original payment?
+        $amount = $this->exchange($refund['amount'], $refund['currency'], $wallet->currency);
+
+        $wallet->balance -= $amount;
+        $wallet->save();
+
+        if ($refund['type'] == self::TYPE_CHARGEBACK) {
+            $transaction_type = Transaction::WALLET_CHARGEBACK;
+        } else {
+            $transaction_type = Transaction::WALLET_REFUND;
+        }
+
+        Transaction::create([
+                'object_id' => $wallet->id,
+                'object_type' => Wallet::class,
+                'type' => $transaction_type,
+                'amount' => $amount * -1,
+                'description' => $refund['description'] ?? '',
+        ]);
+
+        $refund['status'] = self::STATUS_PAID;
+        $refund['amount'] = -1 * $amount;
+
+        $this->storePayment($refund, $wallet->id);
+    }
+
+    /**
+     * List supported payment methods from this provider
+     *
+     * @param string $type The payment type for which we require a method (oneoff/recurring).
+     *
+     * @return array Array of array with available payment methods:
+     *               - id: id of the method
+     *               - name: User readable name of the payment method
+     *               - minimumAmount: Minimum amount to be charged in cents
+     *               - currency: Currency used for the method
+     *               - exchangeRate: The projected exchange rate (actual rate is determined during payment)
+     *               - icon: An icon (icon name) representing the method
+     */
+    abstract public function providerPaymentMethods($type): array;
+
+    /**
+     * Get a payment.
+     *
+     * @param string $paymentId Payment identifier
+     *
+     * @return array Payment information:
+     *                    - id: Payment identifier
+     *                    - status: Payment status
+     *                    - isCancelable: The payment can be canceled
+     *                    - checkoutUrl: The checkout url to complete the payment or null if none
+     */
+    abstract public function getPayment($paymentId): array;
+
+    /**
+     * Return an array of whitelisted payment methods with override values.
+     *
+     * @param string $type The payment type for which we require a method.
+     *
+     * @return array Array of methods
+     */
+    protected static function paymentMethodsWhitelist($type): array
+    {
+        switch ($type) {
+            case self::TYPE_ONEOFF:
+                return [
+                    self::METHOD_CREDITCARD => [
+                        'id' => self::METHOD_CREDITCARD,
+                        'icon' => self::$paymentMethodIcons[self::METHOD_CREDITCARD]
+                    ],
+                    self::METHOD_PAYPAL => [
+                        'id' => self::METHOD_PAYPAL,
+                        'icon' => self::$paymentMethodIcons[self::METHOD_PAYPAL]
+                    ],
+                    // TODO Enable once we're ready to offer them
+                    // self::METHOD_BANKTRANSFER => [
+                    //     'id' => self::METHOD_BANKTRANSFER,
+                    //     'icon' => self::$paymentMethodIcons[self::METHOD_BANKTRANSFER]
+                    // ]
+                ];
+            case PaymentProvider::TYPE_RECURRING:
+                return [
+                    self::METHOD_CREDITCARD => [
+                        'id' => self::METHOD_CREDITCARD,
+                        'icon' => self::$paymentMethodIcons[self::METHOD_CREDITCARD]
+                    ]
+                ];
+        }
+
+        \Log::error("Unknown payment type: " . $type);
+        return [];
+    }
+
+    /**
+     * Return an array of whitelisted payment methods with override values.
+     *
+     * @param string $type The payment type for which we require a method.
+     *
+     * @return array Array of methods
+     */
+    private static function applyMethodWhitelist($type, $availableMethods): array
+    {
+        $methods = [];
+
+        // Use only whitelisted methods, and apply values from whitelist (overriding the backend)
+        $whitelistMethods = self::paymentMethodsWhitelist($type);
+        foreach ($whitelistMethods as $id => $whitelistMethod) {
+            if (array_key_exists($id, $availableMethods)) {
+                $methods[] = array_merge($availableMethods[$id], $whitelistMethod);
+            }
+        }
+
+        return $methods;
+    }
+
+    /**
+     * List supported payment methods for $wallet
+     *
+     * @param \App\Wallet $wallet The wallet
+     * @param string      $type   The payment type for which we require a method (oneoff/recurring).
+     *
+     * @return array Array of array with available payment methods:
+     *               - id: id of the method
+     *               - name: User readable name of the payment method
+     *               - minimumAmount: Minimum amount to be charged in cents
+     *               - currency: Currency used for the method
+     *               - exchangeRate: The projected exchange rate (actual rate is determined during payment)
+     *               - icon: An icon (icon name) representing the method
+     */
+    public static function paymentMethods(Wallet $wallet, $type): array
+    {
+        $providerName = self::providerName($wallet);
+
+        $cacheKey = "methods-" . $providerName . '-' . $type;
+
+        if ($methods = Cache::get($cacheKey)) {
+            \Log::debug("Using payment method cache" . var_export($methods, true));
+            return $methods;
+        }
+
+        $provider = PaymentProvider::factory($providerName);
+        $methods = self::applyMethodWhitelist($type, $provider->providerPaymentMethods($type));
+
+        Cache::put($cacheKey, $methods, now()->addHours(1));
+
+        return $methods;
+    }
 }
diff --git a/src/app/SignupCode.php b/src/app/SignupCode.php
index 1a11f690..9f44dae0 100644
--- a/src/app/SignupCode.php
+++ b/src/app/SignupCode.php
@@ -1,106 +1,96 @@
 <?php
 
 namespace App;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * The eloquent definition of a SignupCode.
  *
  * @property string         $code
  * @property array          $data
  * @property \Carbon\Carbon $expires_at
  * @property string         $short_code
  */
 class SignupCode extends Model
 {
-    // Note: Removed '0', 'O', '1', 'I' as problematic with some fonts
-    public const SHORTCODE_CHARS   = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
     public const SHORTCODE_LENGTH  = 5;
     public const CODE_LENGTH       = 32;
 
     // Code expires after so many hours
     public const CODE_EXP_HOURS    = 24;
 
 
     /**
      * The primary key associated with the table.
      *
      * @var string
      */
     protected $primaryKey = 'code';
 
     /**
      * Indicates if the IDs are auto-incrementing.
      *
      * @var bool
      */
     public $incrementing = false;
 
     /**
      * The "type" of the auto-incrementing ID.
      *
      * @var string
      */
     protected $keyType = 'string';
 
     /**
      * Indicates if the model should be timestamped.
      *
      * @var bool
      */
     public $timestamps = false;
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = ['code', 'short_code', 'data', 'expires_at'];
 
     /**
      * The attributes that should be cast to native types.
      *
      * @var array
      */
     protected $casts = ['data' => 'array'];
 
     /**
      * The attributes that should be mutated to dates.
      *
      * @var array
      */
     protected $dates = ['expires_at'];
 
     /**
      * Check if code is expired.
      *
      * @return bool True if code is expired, False otherwise
      */
     public function isExpired()
     {
         // @phpstan-ignore-next-line
         return $this->expires_at ? Carbon::now()->gte($this->expires_at) : false;
     }
 
     /**
      * Generate a short code (for human).
      *
      * @return string
      */
     public static function generateShortCode(): string
     {
         $code_length = env('SIGNUP_CODE_LENGTH', self::SHORTCODE_LENGTH);
-        $code_chars  = env('SIGNUP_CODE_CHARS', self::SHORTCODE_CHARS);
-        $random      = [];
 
-        for ($i = 1; $i <= $code_length; $i++) {
-            $random[] = $code_chars[rand(0, strlen($code_chars) - 1)];
-        }
-
-        shuffle($random);
-
-        return implode('', $random);
+        return \App\Utils::randStr($code_length);
     }
 }
diff --git a/src/app/Sku.php b/src/app/Sku.php
index 083587a0..ee451e86 100644
--- a/src/app/Sku.php
+++ b/src/app/Sku.php
@@ -1,57 +1,62 @@
 <?php
 
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Translatable\HasTranslations;
 
 /**
  * The eloquent definition of a Stock Keeping Unit (SKU).
  */
 class Sku extends Model
 {
     use HasTranslations;
 
     public $incrementing = false;
     protected $keyType = 'string';
 
     protected $casts = [
         'units_free' => 'integer'
     ];
 
     protected $fillable = [
         'active',
         'cost',
         'description',
         'handler_class',
         'name',
         // persist for annual domain registration
         'period',
         'title',
         'units_free',
     ];
 
     /** @var array Translatable properties */
     public $translatable = [
         'name',
         'description',
     ];
 
     /**
      * List the entitlements that consume this SKU.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function entitlements()
     {
         return $this->hasMany('App\Entitlement');
     }
 
+    /**
+     * List of packages that use this SKU.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
     public function packages()
     {
         return $this->belongsToMany(
             'App\Package',
             'package_skus'
         )->using('App\PackageSku')->withPivot(['cost', 'qty']);
     }
 }
diff --git a/src/app/Traits/UserAliasesTrait.php b/src/app/Traits/UserAliasesTrait.php
index a2591edd..d2be2c6e 100644
--- a/src/app/Traits/UserAliasesTrait.php
+++ b/src/app/Traits/UserAliasesTrait.php
@@ -1,40 +1,61 @@
 <?php
 
 namespace App\Traits;
 
 trait UserAliasesTrait
 {
+    /**
+     * Find whether an email address exists as an alias
+     * (including aliases of deleted users).
+     *
+     * @param string $email Email address
+     *
+     * @return bool True if found, False otherwise
+     */
+    public static function aliasExists(string $email): bool
+    {
+        if (strpos($email, '@') === false) {
+            return false;
+        }
+
+        $email = \strtolower($email);
+
+        $count = \App\UserAlias::where('alias', $email)->count();
+
+        return $count > 0;
+    }
+
     /**
      * A helper to update user aliases list.
      *
      * Example Usage:
      *
      * ```php
      * $user = User::firstOrCreate(['email' => 'some@other.org']);
      * $user->setAliases(['alias1@other.org', 'alias2@other.org']);
      * ```
      *
      * @param array $aliases An array of email addresses
      *
      * @return void
      */
     public function setAliases(array $aliases): void
     {
         $aliases = array_map('strtolower', $aliases);
         $aliases = array_unique($aliases);
 
         $existing_aliases = [];
 
         foreach ($this->aliases()->get() as $alias) {
             if (!in_array($alias->alias, $aliases)) {
                 $alias->delete();
             } else {
                 $existing_aliases[] = $alias->alias;
             }
         }
 
         foreach (array_diff($aliases, $existing_aliases) as $alias) {
             $this->aliases()->create(['alias' => $alias]);
         }
     }
 }
diff --git a/src/app/Transaction.php b/src/app/Transaction.php
index d504e468..684d8f3a 100644
--- a/src/app/Transaction.php
+++ b/src/app/Transaction.php
@@ -1,191 +1,199 @@
 <?php
 
 namespace App;
 
 use App\Entitlement;
 use App\Wallet;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * The eloquent definition of a Transaction.
  *
  * @property int    $amount
  * @property string $description
  * @property string $id
  * @property string $object_id
  * @property string $object_type
  * @property string $type
  * @property string $transaction_id
  * @property string $user_email
  */
 class Transaction extends Model
 {
     public const ENTITLEMENT_BILLED = 'billed';
     public const ENTITLEMENT_CREATED = 'created';
     public const ENTITLEMENT_DELETED = 'deleted';
 
     public const WALLET_AWARD = 'award';
     public const WALLET_CREDIT = 'credit';
     public const WALLET_DEBIT = 'debit';
     public const WALLET_PENALTY = 'penalty';
+    public const WALLET_REFUND = 'refund';
+    public const WALLET_CHARGEBACK = 'chback';
 
     protected $fillable = [
         // actor, if any
         'user_email',
 
         // entitlement, wallet
         'object_id',
         'object_type',
 
         // entitlement: created, deleted, billed
         // wallet: debit, credit, award, penalty
         'type',
 
         'amount',
 
         'description',
 
         // parent, for example wallet debit is parent for entitlements charged.
         'transaction_id'
     ];
 
     /** @var array Casts properties as type */
     protected $casts = [
         'amount' => 'integer',
     ];
 
     /** @var boolean This model uses an automatically incrementing integer primary key? */
     public $incrementing = false;
 
     /** @var string The type of the primary key */
     protected $keyType = 'string';
 
 
     /**
      * Returns the entitlement to which the transaction is assigned (if any)
      *
      * @return \App\Entitlement|null The entitlement
      */
     public function entitlement(): ?Entitlement
     {
         if ($this->object_type !== Entitlement::class) {
             return null;
         }
 
         return Entitlement::withTrashed()->find($this->object_id);
     }
 
     /**
      * Transaction type mutator
      *
      * @throws \Exception
      */
     public function setTypeAttribute($value): void
     {
         switch ($value) {
             case self::ENTITLEMENT_BILLED:
             case self::ENTITLEMENT_CREATED:
             case self::ENTITLEMENT_DELETED:
                 // TODO: Must be an entitlement.
                 $this->attributes['type'] = $value;
                 break;
 
             case self::WALLET_AWARD:
             case self::WALLET_CREDIT:
             case self::WALLET_DEBIT:
             case self::WALLET_PENALTY:
+            case self::WALLET_REFUND:
+            case self::WALLET_CHARGEBACK:
                 // TODO: This must be a wallet.
                 $this->attributes['type'] = $value;
                 break;
 
             default:
                 throw new \Exception("Invalid type value");
         }
     }
 
     /**
      * Returns a short text describing the transaction.
      *
      * @return string The description
      */
     public function shortDescription(): string
     {
         $label = $this->objectTypeToLabelString() . '-' . $this->{'type'} . '-short';
 
-        return \trans("transactions.{$label}", $this->descriptionParams());
+        $result = \trans("transactions.{$label}", $this->descriptionParams());
+
+        return trim($result, ': ');
     }
 
     /**
      * Returns a text describing the transaction.
      *
      * @return string The description
      */
     public function toString(): string
     {
         $label = $this->objectTypeToLabelString() . '-' . $this->{'type'};
 
         return \trans("transactions.{$label}", $this->descriptionParams());
     }
 
     /**
      * Returns a wallet to which the transaction is assigned (if any)
      *
      * @return \App\Wallet|null The wallet
      */
     public function wallet(): ?Wallet
     {
         if ($this->object_type !== Wallet::class) {
             return null;
         }
 
         return Wallet::find($this->object_id);
     }
 
     /**
      * Collect transaction parameters used in (localized) descriptions
      *
      * @return array Parameters
      */
     private function descriptionParams(): array
     {
         $result = [
             'user_email' => $this->user_email,
             'description' => $this->{'description'},
         ];
 
+        $amount = $this->amount * ($this->amount < 0 ? -1 : 1);
+
         if ($entitlement = $this->entitlement()) {
             $wallet = $entitlement->wallet;
             $cost = $entitlement->cost;
             $discount = $entitlement->wallet->getDiscountRate();
 
             $result['entitlement_cost'] = $cost * $discount;
             $result['object'] = $entitlement->entitleableTitle();
             $result['sku_title'] = $entitlement->sku->{'title'};
         } else {
             $wallet = $this->wallet();
         }
 
         $result['wallet'] = $wallet->{'description'} ?: 'Default wallet';
-        $result['amount'] = $wallet->money($this->amount);
+        $result['amount'] = $wallet->money($amount);
 
         return $result;
     }
 
     /**
      * Get a string for use in translation tables derived from the object type.
      *
      * @return string|null
      */
     private function objectTypeToLabelString(): ?string
     {
         if ($this->object_type == Entitlement::class) {
             return 'entitlement';
         }
 
         if ($this->object_type == Wallet::class) {
             return 'wallet';
         }
 
         return null;
     }
 }
diff --git a/src/app/User.php b/src/app/User.php
index 0b61a957..ac1ed60b 100644
--- a/src/app/User.php
+++ b/src/app/User.php
@@ -1,774 +1,763 @@
 <?php
 
 namespace App;
 
 use App\Entitlement;
 use App\UserAlias;
 use App\Sku;
 use App\Traits\UserAliasesTrait;
 use App\Traits\SettingsTrait;
 use App\Wallet;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Iatstuti\Database\Support\NullableFields;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 
 /**
  * The eloquent definition of a User.
  *
  * @property string $email
  * @property int    $id
  * @property string $password
  * @property int    $status
  */
 class User extends Authenticatable implements JWTSubject
 {
     use Notifiable;
     use NullableFields;
     use UserAliasesTrait;
     use SettingsTrait;
     use SoftDeletes;
 
     // a new user, default on creation
     public const STATUS_NEW        = 1 << 0;
     // it's been activated
     public const STATUS_ACTIVE     = 1 << 1;
     // user has been suspended
     public const STATUS_SUSPENDED  = 1 << 2;
     // user has been deleted
     public const STATUS_DELETED    = 1 << 3;
     // user has been created in LDAP
     public const STATUS_LDAP_READY = 1 << 4;
     // user mailbox has been created in IMAP
     public const STATUS_IMAP_READY = 1 << 5;
 
 
     // change the default primary key type
     public $incrementing = false;
     protected $keyType = 'bigint';
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
         'id',
         'email',
         'password',
         'password_ldap',
         'status'
     ];
 
     /**
      * The attributes that should be hidden for arrays.
      *
      * @var array
      */
     protected $hidden = [
         'password',
         'password_ldap',
         'role'
     ];
 
     protected $nullable = [
         'password',
         'password_ldap'
     ];
 
     /**
      * Any wallets on which this user is a controller.
      *
      * This does not include wallets owned by the user.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function accounts()
     {
         return $this->belongsToMany(
             'App\Wallet',       // The foreign object definition
             'user_accounts',    // The table name
             'user_id',          // The local foreign key
             'wallet_id'         // The remote foreign key
         );
     }
 
     /**
      * Email aliases of this user.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function aliases()
     {
         return $this->hasMany('App\UserAlias', 'user_id');
     }
 
     /**
      * Assign a package to a user. The user should not have any existing entitlements.
      *
      * @param \App\Package   $package The package to assign.
      * @param \App\User|null $user    Assign the package to another user.
      *
      * @return \App\User
      */
     public function assignPackage($package, $user = null)
     {
         if (!$user) {
             $user = $this;
         }
 
         $wallet_id = $this->wallets()->first()->id;
 
         foreach ($package->skus as $sku) {
             for ($i = $sku->pivot->qty; $i > 0; $i--) {
                 \App\Entitlement::create(
                     [
                         'wallet_id' => $wallet_id,
                         'sku_id' => $sku->id,
                         'cost' => $sku->pivot->cost(),
                         'entitleable_id' => $user->id,
                         'entitleable_type' => User::class
                     ]
                 );
             }
         }
 
         return $user;
     }
 
     /**
      * Assign a package plan to a user.
      *
      * @param \App\Plan   $plan   The plan to assign
      * @param \App\Domain $domain Optional domain object
      *
      * @return \App\User Self
      */
     public function assignPlan($plan, $domain = null): User
     {
         $this->setSetting('plan_id', $plan->id);
 
         foreach ($plan->packages as $package) {
             if ($package->isDomain()) {
                 $domain->assignPackage($package, $this);
             } else {
                 $this->assignPackage($package);
             }
         }
 
         return $this;
     }
 
     /**
      * Assign a Sku to a user.
      *
      * @param \App\Sku $sku   The sku to assign.
      * @param int      $count Count of entitlements to add
      *
      * @return \App\User Self
      * @throws \Exception
      */
     public function assignSku(Sku $sku, int $count = 1): User
     {
         // TODO: I guess wallet could be parametrized in future
         $wallet = $this->wallet();
         $exists = $this->entitlements()->where('sku_id', $sku->id)->count();
 
-        // TODO: Sanity check, this probably should be in preReq() on handlers
-        //       or in EntitlementObserver
-        if ($sku->handler_class::entitleableClass() != User::class) {
-            throw new \Exception("Cannot assign non-user SKU ({$sku->title}) to a user");
-        }
-
         while ($count > 0) {
             \App\Entitlement::create([
                 'wallet_id' => $wallet->id,
                 'sku_id' => $sku->id,
                 'cost' => $exists >= $sku->units_free ? $sku->cost : 0,
                 'entitleable_id' => $this->id,
                 'entitleable_type' => User::class
             ]);
 
             $exists++;
             $count--;
         }
 
         return $this;
     }
 
     /**
      * Check if current user can delete another object.
      *
      * @param \App\User|\App\Domain $object A user|domain object
      *
      * @return bool True if he can, False otherwise
      */
     public function canDelete($object): bool
     {
         if (!method_exists($object, 'wallet')) {
             return false;
         }
 
         $wallet = $object->wallet();
 
         // TODO: For now controller can delete/update the account owner,
         //       this may change in future, controllers are not 0-regression feature
 
         return $this->wallets->contains($wallet) || $this->accounts->contains($wallet);
     }
 
     /**
      * Check if current user can read data of another object.
      *
      * @param \App\User|\App\Domain|\App\Wallet $object A user|domain|wallet object
      *
      * @return bool True if he can, False otherwise
      */
     public function canRead($object): bool
     {
         if ($this->role == "admin") {
             return true;
         }
 
         if ($object instanceof User && $this->id == $object->id) {
             return true;
         }
 
         if ($object instanceof Wallet) {
             return $object->user_id == $this->id || $object->controllers->contains($this);
         }
 
         if (!method_exists($object, 'wallet')) {
             return false;
         }
 
         $wallet = $object->wallet();
 
         return $this->wallets->contains($wallet) || $this->accounts->contains($wallet);
     }
 
     /**
      * Check if current user can update data of another object.
      *
      * @param \App\User|\App\Domain $object A user|domain object
      *
      * @return bool True if he can, False otherwise
      */
     public function canUpdate($object): bool
     {
         if (!method_exists($object, 'wallet')) {
             return false;
         }
 
         if ($object instanceof User && $this->id == $object->id) {
             return true;
         }
 
         return $this->canDelete($object);
     }
 
     /**
      * Return the \App\Domain for this user.
      *
      * @return \App\Domain|null
      */
     public function domain()
     {
         list($local, $domainName) = explode('@', $this->email);
 
         $domain = \App\Domain::withTrashed()->where('namespace', $domainName)->first();
 
         return $domain;
     }
 
     /**
      * List the domains to which this user is entitled.
      *
      * @return Domain[]
      */
     public function domains()
     {
         $dbdomains = Domain::whereRaw(
             sprintf(
                 '(type & %s) AND (status & %s)',
                 Domain::TYPE_PUBLIC,
                 Domain::STATUS_ACTIVE
             )
         )->get();
 
         $domains = [];
 
         foreach ($dbdomains as $dbdomain) {
             $domains[] = $dbdomain;
         }
 
         foreach ($this->wallets as $wallet) {
             $entitlements = $wallet->entitlements()->where('entitleable_type', Domain::class)->get();
             foreach ($entitlements as $entitlement) {
                 $domain = $entitlement->entitleable;
                 \Log::info("Found domain for {$this->email}: {$domain->namespace} (owned)");
                 $domains[] = $domain;
             }
         }
 
         foreach ($this->accounts as $wallet) {
             $entitlements = $wallet->entitlements()->where('entitleable_type', Domain::class)->get();
             foreach ($entitlements as $entitlement) {
                 $domain = $entitlement->entitleable;
                 \Log::info("Found domain {$this->email}: {$domain->namespace} (charged)");
                 $domains[] = $domain;
             }
         }
 
         return $domains;
     }
 
+    /**
+     * The user entitlement.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphOne
+     */
     public function entitlement()
     {
         return $this->morphOne('App\Entitlement', 'entitleable');
     }
 
     /**
      * Entitlements for this user.
      *
      * Note that these are entitlements that apply to the user account, and not entitlements that
      * this user owns.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function entitlements()
     {
-        return $this->hasMany('App\Entitlement', 'entitleable_id', 'id');
-    }
-
-    public function addEntitlement($entitlement)
-    {
-        if (!$this->entitlements->contains($entitlement)) {
-            return $this->entitlements()->save($entitlement);
-        }
+        return $this->hasMany('App\Entitlement', 'entitleable_id', 'id')
+            ->where('entitleable_type', User::class);
     }
 
     /**
-     * Find whether an email address exists (user or alias).
-     * Note: This will also find deleted users.
+     * Find whether an email address exists as a user (including deleted users).
      *
      * @param string $email       Email address
      * @param bool   $return_user Return User instance instead of boolean
-     * @param bool   $is_alias    Set to True if the existing email is an alias
-     * @param bool   $existing    Ignore deleted users
      *
      * @return \App\User|bool True or User model object if found, False otherwise
      */
-    public static function emailExists(string $email, bool $return_user = false, &$is_alias = false, $existing = false)
+    public static function emailExists(string $email, bool $return_user = false)
     {
         if (strpos($email, '@') === false) {
             return false;
         }
 
         $email = \strtolower($email);
 
-        if ($existing) {
-            $user = self::where('email', $email)->first();
-        } else {
-            $user = self::withTrashed()->where('email', $email)->first();
-        }
+        $user = self::withTrashed()->where('email', $email)->first();
 
         if ($user) {
             return $return_user ? $user : true;
         }
 
-        $aliases = UserAlias::where('alias', $email);
-
-        if ($existing) {
-            $aliases = $aliases->join('users', 'user_id', '=', 'users.id')
-                ->whereNull('users.deleted_at');
-        }
-
-        $alias = $aliases->first();
-
-        if ($alias) {
-            $is_alias = true;
-            return $return_user ? self::withTrashed()->find($alias->user_id) : true;
-        }
-
         return false;
     }
 
     /**
      * Helper to find user by email address, whether it is
      * main email address, alias or an external email.
      *
      * If there's more than one alias NULL will be returned.
      *
      * @param string $email    Email address
      * @param bool   $external Search also for an external email
      *
      * @return \App\User User model object if found
      */
     public static function findByEmail(string $email, bool $external = false): ?User
     {
         if (strpos($email, '@') === false) {
             return null;
         }
 
         $email = \strtolower($email);
 
         $user = self::where('email', $email)->first();
 
         if ($user) {
             return $user;
         }
 
         $aliases = UserAlias::where('alias', $email)->get();
 
         if (count($aliases) == 1) {
             return $aliases->first()->user;
         }
 
         // TODO: External email
 
         return null;
     }
 
     public function getJWTIdentifier()
     {
         return $this->getKey();
     }
 
     public function getJWTCustomClaims()
     {
         return [];
     }
 
+    /**
+     * Return groups controlled by the current user.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder Query builder
+     */
+    public function groups()
+    {
+        $wallets = $this->wallets()->pluck('id')->all();
+
+        $groupIds = \App\Entitlement::whereIn('entitlements.wallet_id', $wallets)
+            ->where('entitlements.entitleable_type', Group::class)
+            ->pluck('entitleable_id')
+            ->all();
+
+        return Group::whereIn('id', $groupIds);
+    }
+
     /**
      * Check if user has an entitlement for the specified SKU.
      *
      * @param string $title The SKU title
      *
      * @return bool True if specified SKU entitlement exists
      */
     public function hasSku($title): bool
     {
         $sku = Sku::where('title', $title)->first();
 
         if (!$sku) {
             return false;
         }
 
         return $this->entitlements()->where('sku_id', $sku->id)->count() > 0;
     }
 
     /**
      * Returns whether this domain is active.
      *
      * @return bool
      */
     public function isActive(): bool
     {
         return ($this->status & self::STATUS_ACTIVE) > 0;
     }
 
     /**
      * Returns whether this domain is deleted.
      *
      * @return bool
      */
     public function isDeleted(): bool
     {
         return ($this->status & self::STATUS_DELETED) > 0;
     }
 
     /**
      * Returns whether this (external) domain has been verified
      * to exist in DNS.
      *
      * @return bool
      */
     public function isImapReady(): bool
     {
         return ($this->status & self::STATUS_IMAP_READY) > 0;
     }
 
     /**
      * Returns whether this user is registered in LDAP.
      *
      * @return bool
      */
     public function isLdapReady(): bool
     {
         return ($this->status & self::STATUS_LDAP_READY) > 0;
     }
 
     /**
      * Returns whether this user is new.
      *
      * @return bool
      */
     public function isNew(): bool
     {
         return ($this->status & self::STATUS_NEW) > 0;
     }
 
     /**
      * Returns whether this domain is suspended.
      *
      * @return bool
      */
     public function isSuspended(): bool
     {
         return ($this->status & self::STATUS_SUSPENDED) > 0;
     }
 
     /**
      * A shortcut to get the user name.
      *
      * @param bool $fallback Return "<aa.name> User" if there's no name
      *
      * @return string Full user name
      */
     public function name(bool $fallback = false): string
     {
         $firstname = $this->getSetting('first_name');
         $lastname = $this->getSetting('last_name');
 
         $name = trim($firstname . ' ' . $lastname);
 
         if (empty($name) && $fallback) {
             return \config('app.name') . ' User';
         }
 
         return $name;
     }
 
     /**
      * Remove a number of entitlements for the SKU.
      *
      * @param \App\Sku $sku   The SKU
      * @param int      $count The number of entitlements to remove
      *
      * @return User Self
      */
     public function removeSku(Sku $sku, int $count = 1): User
     {
         $entitlements = $this->entitlements()
             ->where('sku_id', $sku->id)
             ->orderBy('cost', 'desc')
             ->orderBy('created_at')
             ->get();
 
         $entitlements_count = count($entitlements);
 
         foreach ($entitlements as $entitlement) {
             if ($entitlements_count <= $sku->units_free) {
                 continue;
             }
 
             if ($count > 0) {
                 $entitlement->delete();
                 $entitlements_count--;
                 $count--;
             }
         }
 
         return $this;
     }
 
     public function senderPolicyFrameworkWhitelist($clientName)
     {
         $setting = $this->getSetting('spf_whitelist');
 
         if (!$setting) {
             return false;
         }
 
         $whitelist = json_decode($setting);
 
         $matchFound = false;
 
         foreach ($whitelist as $entry) {
             if (substr($entry, 0, 1) == '/') {
                 $match = preg_match($entry, $clientName);
 
                 if ($match) {
                     $matchFound = true;
                 }
 
                 continue;
             }
 
             if (substr($entry, 0, 1) == '.') {
                 if (substr($clientName, (-1 * strlen($entry))) == $entry) {
                     $matchFound = true;
                 }
 
                 continue;
             }
 
             if ($entry == $clientName) {
                 $matchFound = true;
                 continue;
             }
         }
 
         return $matchFound;
     }
 
     /**
      * Any (additional) properties of this user.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function settings()
     {
         return $this->hasMany('App\UserSetting', 'user_id');
     }
 
     /**
      * Suspend this domain.
      *
      * @return void
      */
     public function suspend(): void
     {
         if ($this->isSuspended()) {
             return;
         }
 
         $this->status |= User::STATUS_SUSPENDED;
         $this->save();
     }
 
     /**
      * Unsuspend this domain.
      *
      * @return void
      */
     public function unsuspend(): void
     {
         if (!$this->isSuspended()) {
             return;
         }
 
         $this->status ^= User::STATUS_SUSPENDED;
         $this->save();
     }
 
     /**
      * Return users controlled by the current user.
      *
      * @param bool $with_accounts Include users assigned to wallets
      *                            the current user controls but not owns.
      *
      * @return \Illuminate\Database\Eloquent\Builder Query builder
      */
     public function users($with_accounts = true)
     {
         $wallets = $this->wallets()->pluck('id')->all();
 
         if ($with_accounts) {
             $wallets = array_merge($wallets, $this->accounts()->pluck('wallet_id')->all());
         }
 
         return $this->select(['users.*', 'entitlements.wallet_id'])
             ->distinct()
             ->leftJoin('entitlements', 'entitlements.entitleable_id', '=', 'users.id')
             ->whereIn('entitlements.wallet_id', $wallets)
-            ->where('entitlements.entitleable_type', 'App\User');
+            ->where('entitlements.entitleable_type', User::class);
     }
 
     /**
      * Verification codes for this user.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function verificationcodes()
     {
         return $this->hasMany('App\VerificationCode', 'user_id', 'id');
     }
 
     /**
      * Returns the wallet by which the user is controlled
      *
-     * @return \App\Wallet A wallet object
+     * @return ?\App\Wallet A wallet object
      */
-    public function wallet(): Wallet
+    public function wallet(): ?Wallet
     {
-        $entitlement = $this->entitlement()->first();
+        $entitlement = $this->entitlement()->withTrashed()->first();
 
         // TODO: No entitlement should not happen, but in tests we have
         //       such cases, so we fallback to the user's wallet in this case
         return $entitlement ? $entitlement->wallet : $this->wallets()->first();
     }
 
     /**
      * Wallets this user owns.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function wallets()
     {
         return $this->hasMany('App\Wallet');
     }
 
     /**
      * User password mutator
      *
      * @param string $password The password in plain text.
      *
      * @return void
      */
     public function setPasswordAttribute($password)
     {
         if (!empty($password)) {
             $this->attributes['password'] = bcrypt($password, [ "rounds" => 12 ]);
             $this->attributes['password_ldap'] = '{SSHA512}' . base64_encode(
                 pack('H*', hash('sha512', $password))
             );
         }
     }
 
     /**
      * User LDAP password mutator
      *
      * @param string $password The password in plain text.
      *
      * @return void
      */
     public function setPasswordLdapAttribute($password)
     {
         $this->setPasswordAttribute($password);
     }
 
     /**
      * User status mutator
      *
      * @throws \Exception
      */
     public function setStatusAttribute($status)
     {
         $new_status = 0;
 
         $allowed_values = [
             self::STATUS_NEW,
             self::STATUS_ACTIVE,
             self::STATUS_SUSPENDED,
             self::STATUS_DELETED,
             self::STATUS_LDAP_READY,
             self::STATUS_IMAP_READY,
         ];
 
         foreach ($allowed_values as $value) {
             if ($status & $value) {
                 $new_status |= $value;
                 $status ^= $value;
             }
         }
 
         if ($status > 0) {
             throw new \Exception("Invalid user status: {$status}");
         }
 
         $this->attributes['status'] = $new_status;
     }
 }
diff --git a/src/app/Utils.php b/src/app/Utils.php
index 43ae6605..f07e238a 100644
--- a/src/app/Utils.php
+++ b/src/app/Utils.php
@@ -1,465 +1,536 @@
 <?php
 
 namespace App;
 
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
 use Ramsey\Uuid\Uuid;
 
 /**
  * Small utility functions for App.
  */
 class Utils
 {
+    // Note: Removed '0', 'O', '1', 'I' as problematic with some fonts
+    public const CHARS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
+
     /**
      * Count the number of lines in a file.
      *
      * Useful for progress bars.
      *
      * @param string $file The filepath to count the lines of.
      *
      * @return int
      */
     public static function countLines($file)
     {
         $fh = fopen($file, 'rb');
         $numLines = 0;
 
         while (!feof($fh)) {
             $numLines += substr_count(fread($fh, 8192), "\n");
         }
 
         fclose($fh);
 
         return $numLines;
     }
 
     /**
      * Return the country ISO code for an IP address.
      *
      * @return string
      */
     public static function countryForIP($ip)
     {
         if (strpos($ip, ':') === false) {
             $query = "
                 SELECT country FROM ip4nets
                 WHERE INET_ATON(net_number) <= INET_ATON(?)
                 AND INET_ATON(net_broadcast) >= INET_ATON(?)
                 ORDER BY INET_ATON(net_number), net_mask DESC LIMIT 1
             ";
         } else {
             $query =  "
                 SELECT id FROM ip6nets
                 WHERE INET6_ATON(net_number) <= INET6_ATON(?)
                 AND INET6_ATON(net_broadcast) >= INET6_ATON(?)
                 ORDER BY INET6_ATON(net_number), net_mask DESC LIMIT 1
             ";
         }
 
         $nets = \Illuminate\Support\Facades\DB::select($query, [$ip, $ip]);
 
         if (sizeof($nets) > 0) {
             return $nets[0]->country;
         }
 
         return 'CH';
     }
 
     /**
      * Return the country ISO code for the current request.
      */
     public static function countryForRequest()
     {
         $request = \request();
         $ip = $request->ip();
 
         return self::countryForIP($ip);
     }
 
     /**
      * Shortcut to creating a progress bar of a particular format with a particular message.
      *
      * @param \Illuminate\Console\OutputStyle $output  Console output object
      * @param int                             $count   Number of progress steps
      * @param string                          $message The description
      *
      * @return \Symfony\Component\Console\Helper\ProgressBar
      */
     public static function createProgressBar($output, $count, $message = null)
     {
         $bar = $output->createProgressBar($count);
 
         $bar->setFormat(
             '%current:7s%/%max:7s% [%bar%] %percent:3s%% %elapsed:7s%/%estimated:-7s% %message% '
         );
 
         if ($message) {
             $bar->setMessage($message . " ...");
         }
 
         $bar->start();
 
         return $bar;
     }
 
     /**
      * Return the number of days in the month prior to this one.
      *
      * @return int
      */
     public static function daysInLastMonth()
     {
         $start = new Carbon('first day of last month');
         $end = new Carbon('last day of last month');
 
         return $start->diffInDays($end) + 1;
     }
 
     /**
      * Download a file from the interwebz and store it locally.
      *
      * @param string $source The source location
      * @param string $target The target location
      * @param bool $force    Force the download (and overwrite target)
      *
      * @return void
      */
     public static function downloadFile($source, $target, $force = false)
     {
         if (is_file($target) && !$force) {
             return;
         }
 
         \Log::info("Retrieving {$source}");
 
         $fp = fopen($target, 'w');
 
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $source);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FILE, $fp);
         curl_exec($curl);
 
         if (curl_errno($curl)) {
             \Log::error("Request error on {$source}: " . curl_error($curl));
 
             curl_close($curl);
             fclose($fp);
 
             unlink($target);
             return;
         }
 
         curl_close($curl);
         fclose($fp);
     }
 
     /**
      * Find an object that is the recipient for the specified address.
      *
      * @param string $address
      *
      * @return array
      */
     public static function findObjectsByRecipientAddress($address)
     {
         $address = \App\Utils::normalizeAddress($address);
 
         list($local, $domainName) = explode('@', $address);
 
         $domain = \App\Domain::where('namespace', $domainName)->first();
 
         if (!$domain) {
             return [];
         }
 
         $user = \App\User::where('email', $address)->first();
 
         if ($user) {
             return [$user];
         }
 
         $userAliases = \App\UserAlias::where('alias', $address)->get();
 
         if (count($userAliases) > 0) {
             $users = [];
 
             foreach ($userAliases as $userAlias) {
                 $users[] = $userAlias->user;
             }
 
             return $users;
         }
 
         $userAliases = \App\UserAlias::where('alias', "catchall@{$domain->namespace}")->get();
 
         if (count($userAliases) > 0) {
             $users = [];
 
             foreach ($userAliases as $userAlias) {
                 $users[] = $userAlias->user;
             }
 
             return $users;
         }
 
         return [];
     }
 
     /**
      * Generate a passphrase. Not intended for use in production, so limited to environments that are not production.
      *
      * @return string
      */
     public static function generatePassphrase()
     {
         $alphaLow = 'abcdefghijklmnopqrstuvwxyz';
         $alphaUp = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $num = '0123456789';
         $stdSpecial = '~`!@#$%^&*()-_+=[{]}\\|\'";:/?.>,<';
 
         $source = $alphaLow . $alphaUp . $num . $stdSpecial;
 
         $result = '';
 
         for ($x = 0; $x < 16; $x++) {
             $result .= substr($source, rand(0, (strlen($source) - 1)), 1);
         }
 
         return $result;
     }
 
     /**
      * Retrieve the network ID and Type from a client address
      *
      * @param string $clientAddress The IPv4 or IPv6 address.
      *
      * @return array An array of ID and class or null and null.
      */
     public static function getNetFromAddress($clientAddress)
     {
         if (strpos($clientAddress, ':') === false) {
             $net = \App\IP4Net::getNet($clientAddress);
 
             if ($net) {
                 return [$net->id, \App\IP4Net::class];
             }
         } else {
             $net = \App\IP6Net::getNet($clientAddress);
 
             if ($net) {
                 return [$net->id, \App\IP6Net::class];
             }
         }
 
         return [null, null];
     }
 
     /**
      * Calculate the broadcast address provided a net number and a prefix.
      *
      * @param string $net A valid IPv6 network number.
      * @param int $prefix The network prefix.
      *
      * @return string
      */
     public static function ip6Broadcast($net, $prefix)
     {
         $netHex = bin2hex(inet_pton($net));
 
         // Overwriting first address string to make sure notation is optimal
         $net = inet_ntop(hex2bin($netHex));
 
         // Calculate the number of 'flexible' bits
         $flexbits = 128 - $prefix;
 
         // Build the hexadecimal string of the last address
         $lastAddrHex = $netHex;
 
         // We start at the end of the string (which is always 32 characters long)
         $pos = 31;
         while ($flexbits > 0) {
             // Get the character at this position
             $orig = substr($lastAddrHex, $pos, 1);
 
             // Convert it to an integer
             $origval = hexdec($orig);
 
             // OR it with (2^flexbits)-1, with flexbits limited to 4 at a time
             $newval = $origval | (pow(2, min(4, $flexbits)) - 1);
 
             // Convert it back to a hexadecimal character
             $new = dechex($newval);
 
             // And put that character back in the string
             $lastAddrHex = substr_replace($lastAddrHex, $new, $pos, 1);
 
             // We processed one nibble, move to previous position
             $flexbits -= 4;
             $pos -= 1;
         }
 
         // Convert the hexadecimal string to a binary string
         # Using pack() here
         # Newer PHP version can use hex2bin()
         $lastaddrbin = pack('H*', $lastAddrHex);
 
         // And create an IPv6 address from the binary string
         $lastaddrstr = inet_ntop($lastaddrbin);
 
         return $lastaddrstr;
     }
 
     /**
      * Normalize an email address.
      *
      * This means to lowercase and strip components separated with recipient delimiters.
      *
      * @param string $address The address to normalize.
      *
      * @return string
      */
     public static function normalizeAddress($address)
     {
         $address = strtolower($address);
 
         list($local, $domain) = explode('@', $address);
 
         if (strpos($local, '+') === false) {
             return "{$local}@{$domain}";
         }
 
         $localComponents = explode('+', $local);
 
         $local = array_pop($localComponents);
 
         return "{$local}@{$domain}";
     }
 
     /**
      * Provide all unique combinations of elements in $input, with order and duplicates irrelevant.
      *
      * @param array $input The input array of elements.
      *
      * @return array[]
      */
     public static function powerSet(array $input): array
     {
         $output = [];
 
         for ($x = 0; $x < count($input); $x++) {
             self::combine($input, $x + 1, 0, [], 0, $output);
         }
 
         return $output;
     }
 
     /**
      * Returns the current user's email address or null.
      *
      * @return string
      */
     public static function userEmailOrNull(): ?string
     {
         $user = Auth::user();
 
         if (!$user) {
             return null;
         }
 
         return $user->email;
     }
 
+    /**
+     * Returns a random string consisting of a quantity of segments of a certain length joined.
+     *
+     * Example:
+     *
+     * ```php
+     * $roomName = strtolower(\App\Utils::randStr(3, 3, '-');
+     * // $roomName == '3qb-7cs-cjj'
+     * ```
+     *
+     * @param int $length  The length of each segment
+     * @param int $qty     The quantity of segments
+     * @param string $join The string to use to join the segments
+     *
+     * @return string
+     */
+    public static function randStr($length, $qty = 1, $join = '')
+    {
+        $chars = env('SHORTCODE_CHARS', self::CHARS);
+
+        $randStrs = [];
+
+        for ($x = 0; $x < $qty; $x++) {
+            $randStrs[$x] = [];
+
+            for ($y = 0; $y < $length; $y++) {
+                $randStrs[$x][] = $chars[rand(0, strlen($chars) - 1)];
+            }
+
+            shuffle($randStrs[$x]);
+
+            $randStrs[$x] = implode('', $randStrs[$x]);
+        }
+
+        return implode($join, $randStrs);
+    }
+
     /**
      * Returns a UUID in the form of an integer.
      *
      * @return integer
      */
     public static function uuidInt(): int
     {
         $hex = Uuid::uuid4();
         $bin = pack('h*', str_replace('-', '', $hex));
         $ids = unpack('L', $bin);
         $id = array_shift($ids);
 
         return $id;
     }
 
     /**
      * Returns a UUID in the form of a string.
      *
      * @return string
      */
     public static function uuidStr(): string
     {
         return Uuid::uuid4()->toString();
     }
 
     private static function combine($input, $r, $index, $data, $i, &$output): void
     {
         $n = count($input);
 
         // Current cobination is ready
         if ($index == $r) {
             $output[] = array_slice($data, 0, $r);
             return;
         }
 
         // When no more elements are there to put in data[]
         if ($i >= $n) {
             return;
         }
 
         // current is included, put next at next location
         $data[$index] = $input[$i];
         self::combine($input, $r, $index + 1, $data, $i + 1, $output);
 
         // current is excluded, replace it with next (Note that i+1
         // is passed, but index is not changed)
         self::combine($input, $r, $index, $data, $i + 1, $output);
     }
 
     /**
      * Create self URL
      *
      * @param string $route Route/Path
+     * @todo Move this to App\Http\Controllers\Controller
      *
      * @return string Full URL
      */
     public static function serviceUrl(string $route): string
     {
         $url = \config('app.public_url');
 
         if (!$url) {
             $url = \config('app.url');
         }
 
         return rtrim(trim($url, '/') . '/' . ltrim($route, '/'), '/');
     }
 
     /**
      * Create a configuration/environment data to be passed to
      * the UI
      *
-     * @todo For a lack of better place this is put here for now
+     * @todo Move this to App\Http\Controllers\Controller
      *
      * @return array Configuration data
      */
     public static function uiEnv(): array
     {
-        $opts = ['app.name', 'app.url', 'app.domain'];
+        $countries = include resource_path('countries.php');
+        $req_domain = preg_replace('/:[0-9]+$/', '', request()->getHttpHost());
+        $sys_domain = \config('app.domain');
+        $path = request()->path();
+        $opts = [
+            'app.name',
+            'app.url',
+            'app.domain',
+            'app.theme',
+            'app.webmail_url',
+            'app.support_email',
+            'mail.from.address'
+        ];
+
         $env = \app('config')->getMany($opts);
 
-        $countries = include resource_path('countries.php');
         $env['countries'] = $countries ?: [];
+        $env['view'] = 'root';
+        $env['jsapp'] = 'user.js';
 
-        $isAdmin = strpos(request()->getHttpHost(), 'admin.') === 0;
-        $env['jsapp'] = $isAdmin ? 'admin.js' : 'user.js';
+        if ($req_domain == "admin.$sys_domain") {
+            $env['jsapp'] = 'admin.js';
+        }
 
         $env['paymentProvider'] = \config('services.payment_provider');
         $env['stripePK'] = \config('services.stripe.public_key');
 
+        $theme_file = resource_path("themes/{$env['app.theme']}/theme.json");
+        $menu = [];
+
+        if (file_exists($theme_file)) {
+            $theme = json_decode(file_get_contents($theme_file), true);
+
+            if (json_last_error() != JSON_ERROR_NONE) {
+                \Log::error("Failed to parse $theme_file: " . json_last_error_msg());
+            } elseif (!empty($theme['menu'])) {
+                $menu = $theme['menu'];
+            }
+        }
+
+        $env['menu'] = $menu;
+
         return $env;
     }
 }
diff --git a/src/app/VerificationCode.php b/src/app/VerificationCode.php
index 0aa0284c..89c90d5f 100644
--- a/src/app/VerificationCode.php
+++ b/src/app/VerificationCode.php
@@ -1,65 +1,56 @@
 <?php
 
 namespace App;
 
 use App\SignupCode;
-use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * The eloquent definition of a VerificationCode
  *
  * @property string    $mode
  * @property \App\User $user
  */
 class VerificationCode extends SignupCode
 {
     // Code expires after so many hours
     public const CODE_EXP_HOURS = 8;
     public const SHORTCODE_LENGTH = 8;
 
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = ['user_id', 'code', 'short_code', 'mode', 'expires_at'];
 
     /**
      * The attributes that should be cast to native types.
      *
      * @var array
      */
     protected $casts = [];
 
     /**
      * The user to which this setting belongs.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
     {
         return $this->belongsTo('\App\User', 'user_id', 'id');
     }
 
     /**
      * Generate a short code (for human).
      *
      * @return string
      */
     public static function generateShortCode(): string
     {
         $code_length = env('VERIFICATION_CODE_LENGTH', self::SHORTCODE_LENGTH);
-        $code_chars  = env('VERIFICATION_CODE_CHARS', self::SHORTCODE_CHARS);
-        $random      = [];
 
-        for ($i = 1; $i <= $code_length; $i++) {
-            $random[] = $code_chars[rand(0, strlen($code_chars) - 1)];
-        }
-
-        shuffle($random);
-
-        return implode('', $random);
+        return \App\Utils::randStr($code_length);
     }
 }
diff --git a/src/app/Wallet.php b/src/app/Wallet.php
index e5ee16de..8c0a77ec 100644
--- a/src/app/Wallet.php
+++ b/src/app/Wallet.php
@@ -1,400 +1,400 @@
 <?php
 
 namespace App;
 
 use App\User;
 use App\Traits\SettingsTrait;
 use Carbon\Carbon;
 use Iatstuti\Database\Support\NullableFields;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 /**
  * The eloquent definition of a wallet -- a container with a chunk of change.
  *
  * A wallet is owned by an {@link \App\User}.
  *
  * @property integer $balance
  */
 class Wallet extends Model
 {
     use NullableFields;
     use SettingsTrait;
 
     public $incrementing = false;
     protected $keyType = 'string';
 
     public $timestamps = false;
 
     protected $attributes = [
         'balance' => 0,
         'currency' => 'CHF'
     ];
 
     protected $fillable = [
         'currency'
     ];
 
     protected $nullable = [
         'description',
     ];
 
     protected $casts = [
         'balance' => 'integer',
     ];
 
 
     /**
      * Add a controller to this wallet.
      *
      * @param \App\User $user The user to add as a controller to this wallet.
      *
      * @return void
      */
     public function addController(User $user)
     {
         if (!$this->controllers->contains($user)) {
             $this->controllers()->save($user);
         }
     }
 
     public function chargeEntitlements($apply = true)
     {
         // This wallet has been created less than a month ago, this is the trial period
         if ($this->owner->created_at >= Carbon::now()->subMonthsWithoutOverflow(1)) {
             // Move all the current entitlement's updated_at timestamps forward to one month after
             // this wallet was created.
             $freeMonthEnds = $this->owner->created_at->copy()->addMonthsWithoutOverflow(1);
 
             foreach ($this->entitlements()->get()->fresh() as $entitlement) {
                 if ($entitlement->updated_at < $freeMonthEnds) {
                     $entitlement->updated_at = $freeMonthEnds;
                     $entitlement->save();
                 }
             }
 
             return 0;
         }
 
         $charges = 0;
         $discount = $this->getDiscountRate();
 
         DB::beginTransaction();
 
         // used to parent individual entitlement billings to the wallet debit.
         $entitlementTransactions = [];
 
         foreach ($this->entitlements()->get()->fresh() as $entitlement) {
             // This entitlement has been created less than or equal to 14 days ago (this is at
             // maximum the fourteenth 24-hour period).
             if ($entitlement->created_at > Carbon::now()->subDays(14)) {
                 continue;
             }
 
             // This entitlement was created, or billed last, less than a month ago.
             if ($entitlement->updated_at > Carbon::now()->subMonthsWithoutOverflow(1)) {
                 continue;
             }
 
             // updated last more than a month ago -- was it billed?
             if ($entitlement->updated_at <= Carbon::now()->subMonthsWithoutOverflow(1)) {
                 $diff = $entitlement->updated_at->diffInMonths(Carbon::now());
 
                 $cost = (int) ($entitlement->cost * $discount * $diff);
 
                 $charges += $cost;
 
                 // if we're in dry-run, you know...
                 if (!$apply) {
                     continue;
                 }
 
                 $entitlement->updated_at = $entitlement->updated_at->copy()
                     ->addMonthsWithoutOverflow($diff);
 
                 $entitlement->save();
 
                 if ($cost == 0) {
                     continue;
                 }
 
                 $entitlementTransactions[] = $entitlement->createTransaction(
                     \App\Transaction::ENTITLEMENT_BILLED,
                     $cost
                 );
             }
         }
 
         if ($apply) {
             $this->debit($charges, $entitlementTransactions);
         }
 
         DB::commit();
 
         return $charges;
     }
 
     /**
      * Calculate for how long the current balance will last.
      *
      * Returns NULL for balance < 0 or discount = 100% or on a fresh account
      *
      * @return \Carbon\Carbon|null Date
      */
     public function balanceLastsUntil()
     {
         if ($this->balance < 0 || $this->getDiscount() == 100) {
             return null;
         }
 
         // retrieve any expected charges
         $expectedCharge = $this->expectedCharges();
 
         // get the costs per day for all entitlements billed against this wallet
         $costsPerDay = $this->costsPerDay();
 
         if (!$costsPerDay) {
             return null;
         }
 
         // the number of days this balance, minus the expected charges, would last
         $daysDelta = ($this->balance - $expectedCharge) / $costsPerDay;
 
         // calculate from the last entitlement billed
         $entitlement = $this->entitlements()->orderBy('updated_at', 'desc')->first();
 
         $until = $entitlement->updated_at->copy()->addDays($daysDelta);
 
         // Don't return dates from the past
         if ($until < Carbon::now() && !$until->isToday()) {
             return null;
         }
 
         return $until;
     }
 
     /**
      * Controllers of this wallet.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function controllers()
     {
         return $this->belongsToMany(
             'App\User',         // The foreign object definition
             'user_accounts',    // The table name
             'wallet_id',      // The local foreign key
             'user_id'         // The remote foreign key
         );
     }
 
     /**
      * Retrieve the costs per day of everything charged to this wallet.
      *
      * @return float
      */
     public function costsPerDay()
     {
         $costs = (float) 0;
 
         foreach ($this->entitlements as $entitlement) {
             $costs += $entitlement->costsPerDay();
         }
 
         return $costs;
     }
 
     /**
      * Add an amount of pecunia to this wallet's balance.
      *
      * @param int    $amount      The amount of pecunia to add (in cents).
      * @param string $description The transaction description
      *
      * @return Wallet Self
      */
     public function credit(int $amount, string $description = ''): Wallet
     {
         $this->balance += $amount;
 
         $this->save();
 
         \App\Transaction::create(
             [
                 'object_id' => $this->id,
                 'object_type' => \App\Wallet::class,
                 'type' => \App\Transaction::WALLET_CREDIT,
                 'amount' => $amount,
                 'description' => $description
             ]
         );
 
         return $this;
     }
 
     /**
      * Deduct an amount of pecunia from this wallet's balance.
      *
      * @param int   $amount The amount of pecunia to deduct (in cents).
      * @param array $eTIDs  List of transaction IDs for the individual entitlements that make up
      *                      this debit record, if any.
      * @return Wallet Self
      */
     public function debit(int $amount, array $eTIDs = []): Wallet
     {
         if ($amount == 0) {
             return $this;
         }
 
         $this->balance -= $amount;
 
         $this->save();
 
         $transaction = \App\Transaction::create(
             [
                 'object_id' => $this->id,
                 'object_type' => \App\Wallet::class,
                 'type' => \App\Transaction::WALLET_DEBIT,
-                'amount' => $amount
+                'amount' => $amount * -1
             ]
         );
 
         \App\Transaction::whereIn('id', $eTIDs)->update(['transaction_id' => $transaction->id]);
 
         return $this;
     }
 
     /**
      * The discount assigned to the wallet.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function discount()
     {
         return $this->belongsTo('App\Discount', 'discount_id', 'id');
     }
 
     /**
      * Entitlements billed to this wallet.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function entitlements()
     {
         return $this->hasMany('App\Entitlement');
     }
 
     /**
      * Calculate the expected charges to this wallet.
      *
      * @return int
      */
     public function expectedCharges()
     {
         return $this->chargeEntitlements(false);
     }
 
     /**
      * Return the exact, numeric version of the discount to be applied.
      *
      * Ranges from 0 - 100.
      *
      * @return int
      */
     public function getDiscount()
     {
         return $this->discount ? $this->discount->discount : 0;
     }
 
     /**
      * The actual discount rate for use in multiplication
      *
      * Ranges from 0.00 to 1.00.
      */
     public function getDiscountRate()
     {
         return (100 - $this->getDiscount()) / 100;
     }
 
     /**
      * A helper to display human-readable amount of money using
      * the wallet currency and specified locale.
      *
      * @param int    $amount A amount of money (in cents)
      * @param string $locale A locale for the output
      *
      * @return string String representation, e.g. "9.99 CHF"
      */
     public function money(int $amount, $locale = 'de_DE')
     {
         $amount = round($amount / 100, 2);
 
         // Prefer intl extension's number formatter
         if (class_exists('NumberFormatter')) {
             $nf = new \NumberFormatter($locale, \NumberFormatter::CURRENCY);
             $result = $nf->formatCurrency($amount, $this->currency);
             // Replace non-breaking space
             return str_replace("\xC2\xA0", " ", $result);
         }
 
         return sprintf('%.2f %s', $amount, $this->currency);
     }
 
     /**
      * The owner of the wallet -- the wallet is in his/her back pocket.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function owner()
     {
         return $this->belongsTo('App\User', 'user_id', 'id');
     }
 
     /**
      * Payments on this wallet.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function payments()
     {
         return $this->hasMany('App\Payment');
     }
 
     /**
      * Remove a controller from this wallet.
      *
      * @param \App\User $user The user to remove as a controller from this wallet.
      *
      * @return void
      */
     public function removeController(User $user)
     {
         if ($this->controllers->contains($user)) {
             $this->controllers()->detach($user);
         }
     }
 
     /**
      * Any (additional) properties of this wallet.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function settings()
     {
         return $this->hasMany('App\WalletSetting');
     }
 
     /**
      * Retrieve the transactions against this wallet.
      *
      * @return \Illuminate\Database\Eloquent\Builder Query builder
      */
     public function transactions()
     {
         return \App\Transaction::where(
             [
                 'object_id' => $this->id,
                 'object_type' => \App\Wallet::class
             ]
         );
     }
 }
diff --git a/src/composer.json b/src/composer.json
index ab853b3e..ee4f2f88 100644
--- a/src/composer.json
+++ b/src/composer.json
@@ -1,86 +1,87 @@
 {
     "name": "laravel/laravel",
     "type": "project",
     "description": "The Laravel Framework.",
     "keywords": [
         "framework",
         "laravel"
     ],
     "license": "MIT",
     "repositories": [
         {
             "type": "vcs",
             "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap3.git"
         }
     ],
     "require": {
         "php": "^7.1.3",
         "barryvdh/laravel-dompdf": "^0.8.6",
         "dyrynda/laravel-nullable-fields": "*",
         "fideloper/proxy": "^4.0",
         "kolab/net_ldap3": "dev-master",
         "laravel/framework": "6.*",
+        "laravel/horizon": "^3",
         "laravel/tinker": "^2.4",
         "mlocati/spf-lib": "^3.0",
         "mollie/laravel-mollie": "^2.9",
         "morrislaptop/laravel-queue-clear": "^1.2",
         "silviolleite/laravelpwa": "^2.0",
         "spatie/laravel-translatable": "^4.2",
         "spomky-labs/otphp": "~4.0.0",
         "stripe/stripe-php": "^7.29",
         "swooletw/laravel-swoole": "^2.6",
         "tymon/jwt-auth": "^1.0"
     },
     "require-dev": {
         "beyondcode/laravel-dump-server": "^1.0",
         "beyondcode/laravel-er-diagram-generator": "^1.3",
         "code-lts/doctum": "^5.1",
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "kirschbaum-development/mail-intercept": "^0.2.4",
         "laravel/dusk": "~5.11.0",
         "mockery/mockery": "^1.0",
         "nunomaduro/larastan": "^0.6",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit": "^8"
     },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true
     },
     "extra": {
         "laravel": {
             "dont-discover": []
         }
     },
     "autoload": {
         "psr-4": {
             "App\\": "app/"
         },
         "classmap": [
             "database/seeds",
             "database/factories",
             "include"
         ]
     },
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/"
         }
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ]
     }
 }
diff --git a/src/config/app.php b/src/config/app.php
index e8c1be22..887197a7 100644
--- a/src/config/app.php
+++ b/src/config/app.php
@@ -1,262 +1,269 @@
 <?php
 
 return [
 
     /*
     |--------------------------------------------------------------------------
     | Application Name
     |--------------------------------------------------------------------------
     |
     | This value is the name of your application. This value is used when the
     | framework needs to place the application's name in a notification or
     | any other location as required by the application or its packages.
     |
     */
 
     'name' => env('APP_NAME', 'Laravel'),
 
     /*
     |--------------------------------------------------------------------------
     | Application Environment
     |--------------------------------------------------------------------------
     |
     | This value determines the "environment" your application is currently
     | running in. This may determine how you prefer to configure various
     | services the application utilizes. Set this in your ".env" file.
     |
     */
 
     'env' => env('APP_ENV', 'production'),
 
     /*
     |--------------------------------------------------------------------------
     | Application Debug Mode
     |--------------------------------------------------------------------------
     |
     | When your application is in debug mode, detailed error messages with
     | stack traces will be shown on every error that occurs within your
     | application. If disabled, a simple generic error page is shown.
     |
     */
 
     'debug' => env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------
     | Application URL
     |--------------------------------------------------------------------------
     |
     | This URL is used by the console to properly generate URLs when using
     | the Artisan command line tool. You should set this to the root of
     | your application so that it is used when running Artisan tasks.
     */
 
     'url' => env('APP_URL', 'http://localhost'),
 
     'public_url' => env('APP_PUBLIC_URL', env('APP_URL', 'http://localhost')),
 
     'asset_url' => env('ASSET_URL', null),
 
     'support_url' => env('SUPPORT_URL', null),
 
+    'support_email' => env('SUPPORT_EMAIL', null),
+
+    'webmail_url' => env('WEBMAIL_URL', null),
+
+    'theme' => env('APP_THEME', 'default'),
+
     /*
     |--------------------------------------------------------------------------
     | Application Domain
     |--------------------------------------------------------------------------
     |
     | System domain used for user signup (kolab identity)
     */
     'domain' => env('APP_DOMAIN', 'domain.tld'),
 
     /*
     |--------------------------------------------------------------------------
     | Application Timezone
     |--------------------------------------------------------------------------
     |
     | Here you may specify the default timezone for your application, which
     | will be used by the PHP date and date-time functions. We have gone
     | ahead and set this to a sensible default for you out of the box.
     |
     */
 
     'timezone' => 'UTC',
 
     /*
     |--------------------------------------------------------------------------
     | Application Locale Configuration
     |--------------------------------------------------------------------------
     |
     | The application locale determines the default locale that will be used
     | by the translation service provider. You are free to set this value
     | to any of the locales which will be supported by the application.
     |
     */
 
     'locale' => 'en',
 
     /*
     |--------------------------------------------------------------------------
     | Application Fallback Locale
     |--------------------------------------------------------------------------
     |
     | The fallback locale determines the locale to use when the current one
     | is not available. You may change the value to correspond to any of
     | the language folders that are provided through your application.
     |
     */
 
     'fallback_locale' => 'en',
 
     /*
     |--------------------------------------------------------------------------
     | Faker Locale
     |--------------------------------------------------------------------------
     |
     | This locale will be used by the Faker PHP library when generating fake
     | data for your database seeds. For example, this will be used to get
     | localized telephone numbers, street address information and more.
     |
     */
 
     'faker_locale' => 'en_US',
 
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
     |--------------------------------------------------------------------------
     |
     | This key is used by the Illuminate encrypter service and should be set
     | to a random, 32 character string, otherwise these encrypted strings
     | will not be safe. Please do this before deploying an application!
     |
     */
 
     'key' => env('APP_KEY'),
 
     'cipher' => 'AES-256-CBC',
 
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
     |--------------------------------------------------------------------------
     |
     | The service providers listed here will be automatically loaded on the
     | request to your application. Feel free to add your own services to
     | this array to grant expanded functionality to your applications.
     |
     */
 
     'providers' => [
         /*
          * Laravel Framework Service Providers...
          */
         Illuminate\Auth\AuthServiceProvider::class,
         Illuminate\Broadcasting\BroadcastServiceProvider::class,
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Cache\CacheServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
         Illuminate\Cookie\CookieServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Encryption\EncryptionServiceProvider::class,
         Illuminate\Filesystem\FilesystemServiceProvider::class,
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
         Illuminate\Mail\MailServiceProvider::class,
         Illuminate\Notifications\NotificationServiceProvider::class,
         Illuminate\Pagination\PaginationServiceProvider::class,
         Illuminate\Pipeline\PipelineServiceProvider::class,
         Illuminate\Queue\QueueServiceProvider::class,
         Illuminate\Redis\RedisServiceProvider::class,
         Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
         Illuminate\Session\SessionServiceProvider::class,
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
 
         /*
          * Package Service Providers...
          */
         Barryvdh\DomPDF\ServiceProvider::class,
 
         /*
          * Application Service Providers...
          */
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
+        App\Providers\HorizonServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Class Aliases
     |--------------------------------------------------------------------------
     |
     | This array of class aliases will be registered when this application
     | is started. However, feel free to register as many as you wish as
     | the aliases are "lazy" loaded so they don't hinder performance.
     |
     */
 
     'aliases' => [
         'App' => Illuminate\Support\Facades\App::class,
         'Arr' => Illuminate\Support\Arr::class,
         'Artisan' => Illuminate\Support\Facades\Artisan::class,
         'Auth' => Illuminate\Support\Facades\Auth::class,
         'Blade' => Illuminate\Support\Facades\Blade::class,
         'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
         'Bus' => Illuminate\Support\Facades\Bus::class,
         'Cache' => Illuminate\Support\Facades\Cache::class,
         'Config' => Illuminate\Support\Facades\Config::class,
         'Cookie' => Illuminate\Support\Facades\Cookie::class,
         'Crypt' => Illuminate\Support\Facades\Crypt::class,
         'DB' => Illuminate\Support\Facades\DB::class,
         'Eloquent' => Illuminate\Database\Eloquent\Model::class,
         'Event' => Illuminate\Support\Facades\Event::class,
         'File' => Illuminate\Support\Facades\File::class,
         'Gate' => Illuminate\Support\Facades\Gate::class,
         'Hash' => Illuminate\Support\Facades\Hash::class,
         'Lang' => Illuminate\Support\Facades\Lang::class,
         'Log' => Illuminate\Support\Facades\Log::class,
         'Mail' => Illuminate\Support\Facades\Mail::class,
         'Notification' => Illuminate\Support\Facades\Notification::class,
         'Password' => Illuminate\Support\Facades\Password::class,
         'PDF' => Barryvdh\DomPDF\Facade::class,
         'Queue' => Illuminate\Support\Facades\Queue::class,
         'Redirect' => Illuminate\Support\Facades\Redirect::class,
         'Redis' => Illuminate\Support\Facades\Redis::class,
         'Request' => Illuminate\Support\Facades\Request::class,
         'Response' => Illuminate\Support\Facades\Response::class,
         'Route' => Illuminate\Support\Facades\Route::class,
         'Schema' => Illuminate\Support\Facades\Schema::class,
         'Session' => Illuminate\Support\Facades\Session::class,
         'Storage' => Illuminate\Support\Facades\Storage::class,
         'Str' => Illuminate\Support\Str::class,
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
     ],
 
     // Locations of knowledge base articles
     'kb' => [
         // An article about suspended accounts
         'account_suspended' => env('KB_ACCOUNT_SUSPENDED'),
         // An article about a way to delete an owned account
         'account_delete' => env('KB_ACCOUNT_DELETE'),
     ],
 
     'company' => [
         'name' => env('COMPANY_NAME'),
         'address' => env('COMPANY_ADDRESS'),
         'details' => env('COMPANY_DETAILS'),
         'email' => env('COMPANY_EMAIL'),
         'logo' => env('COMPANY_LOGO'),
         'footer' => env('COMPANY_FOOTER', env('COMPANY_DETAILS')),
     ],
 
     'vat' => [
         'countries' => env('VAT_COUNTRIES'),
         'rate' => (float) env('VAT_RATE'),
     ],
 ];
diff --git a/src/config/database.php b/src/config/database.php
index 55bece84..bbbda10c 100644
--- a/src/config/database.php
+++ b/src/config/database.php
@@ -1,146 +1,151 @@
 <?php
 
 use Illuminate\Support\Str;
 
 return [
 
     /*
     |--------------------------------------------------------------------------
     | Default Database Connection Name
     |--------------------------------------------------------------------------
     |
     | Here you may specify which of the database connections below you wish
     | to use as your default connection for all database work. Of course
     | you may use many connections at once using the Database library.
     |
     */
 
     'default' => env('DB_CONNECTION', 'mysql'),
 
     /*
     |--------------------------------------------------------------------------
     | Database Connections
     |--------------------------------------------------------------------------
     |
     | Here are each of the database connections setup for your application.
     | Of course, examples of configuring each database platform that is
     | supported by Laravel is shown below to make development simple.
     |
     |
     | All database work in Laravel is done through the PHP PDO facilities
     | so make sure you have the driver for your particular database of
     | choice installed on your machine before you begin development.
     |
     */
 
     'connections' => [
 
         'sqlite' => [
             'driver' => 'sqlite',
             'url' => env('DATABASE_URL'),
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
+        '2fa' => [
+            'driver' => 'mysql',
+            'url' => env('MFA_DSN')
+        ],
+
         'mysql' => [
             'driver' => 'mysql',
             'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8',
             'collation' => 'utf8_unicode_ci',
             'prefix' => '',
             'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
             'options' => extension_loaded('pdo_mysql') ? array_filter([
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
 
         'pgsql' => [
             'driver' => 'pgsql',
             'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
             'schema' => 'public',
             'sslmode' => 'prefer',
         ],
 
         'sqlsrv' => [
             'driver' => 'sqlsrv',
             'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
         ],
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Migration Repository Table
     |--------------------------------------------------------------------------
     |
     | This table keeps track of all the migrations that have already run for
     | your application. Using this information, we can determine which of
     | the migrations on disk haven't actually been run in the database.
     |
     */
 
     'migrations' => 'migrations',
 
     /*
     |--------------------------------------------------------------------------
     | Redis Databases
     |--------------------------------------------------------------------------
     |
     | Redis is an open source, fast, and advanced key-value store that also
     | provides a richer body of commands than a typical key-value system
     | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
 
     'redis' => [
 
         'client' => env('REDIS_CLIENT', 'predis'),
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'predis'),
             'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
         ],
 
         'default' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
             'database' => env('REDIS_DB', 0),
         ],
 
         'cache' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
             'database' => env('REDIS_CACHE_DB', 1),
         ],
 
     ],
 
 ];
diff --git a/src/config/horizon.php b/src/config/horizon.php
new file mode 100644
index 00000000..54400c3e
--- /dev/null
+++ b/src/config/horizon.php
@@ -0,0 +1,166 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Domain
+    |--------------------------------------------------------------------------
+    |
+    | This is the subdomain where Horizon will be accessible from. If this
+    | setting is null, Horizon will reside under the same domain as the
+    | application. Otherwise, this value will serve as the subdomain.
+    |
+    */
+
+    'domain' => 'admin.' . env('APP_DOMAIN'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Path
+    |--------------------------------------------------------------------------
+    |
+    | This is the URI path where Horizon will be accessible from. Feel free
+    | to change this path to anything you like. Note that the URI will not
+    | affect the paths of its internal API that aren't exposed to users.
+    |
+    */
+
+    'path' => 'horizon',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Redis Connection
+    |--------------------------------------------------------------------------
+    |
+    | This is the name of the Redis connection where Horizon will store the
+    | meta information required for it to function. It includes the list
+    | of supervisors, failed jobs, job metrics, and other information.
+    |
+    */
+
+    'use' => 'default',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Redis Prefix
+    |--------------------------------------------------------------------------
+    |
+    | This prefix will be used when storing all Horizon data in Redis. You
+    | may modify the prefix when you are running multiple installations
+    | of Horizon on the same server so that they don't have problems.
+    |
+    */
+
+    'prefix' => env('HORIZON_PREFIX', 'horizon:'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Route Middleware
+    |--------------------------------------------------------------------------
+    |
+    | These middleware will get attached onto each Horizon route, giving you
+    | the chance to add your own middleware to this list or change any of
+    | the existing middleware. Or, you can simply stick with this list.
+    |
+    */
+
+    'middleware' => ['web'],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Queue Wait Time Thresholds
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to configure when the LongWaitDetected event
+    | will be fired. Every connection / queue combination may have its
+    | own, unique threshold (in seconds) before this event is fired.
+    |
+    */
+
+    'waits' => [
+        'redis:default' => 60,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Job Trimming Times
+    |--------------------------------------------------------------------------
+    |
+    | Here you can configure for how long (in minutes) you desire Horizon to
+    | persist the recent and failed jobs. Typically, recent jobs are kept
+    | for one hour while all failed jobs are stored for an entire week.
+    |
+    */
+
+    'trim' => [
+        'recent' => 10080,
+        'completed' => 10080,
+        'recent_failed' => 10080,
+        'failed' => 10080,
+        'monitored' => 10080,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Fast Termination
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, Horizon's "terminate" command will not
+    | wait on all of the workers to terminate unless the --wait option
+    | is provided. Fast termination can shorten deployment delay by
+    | allowing a new instance of Horizon to start while the last
+    | instance will continue to terminate each of its workers.
+    |
+    */
+
+    'fast_termination' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Memory Limit (MB)
+    |--------------------------------------------------------------------------
+    |
+    | This value describes the maximum amount of memory the Horizon worker
+    | may consume before it is terminated and restarted. You should set
+    | this value according to the resources available to your server.
+    |
+    */
+
+    'memory_limit' => 64,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Queue Worker Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the queue worker settings used by your application
+    | in all environments. These supervisors and settings handle all your
+    | queued jobs and will be provisioned by Horizon during deployment.
+    |
+    */
+
+    'environments' => [
+        'production' => [
+            'supervisor-1' => [
+                'connection' => 'redis',
+                'queue' => ['default'],
+                'balance' => 'auto',
+                'maxProcesses' => 1,
+                'minProcesses' => 0,
+                'tries' => 1,
+            ],
+        ],
+
+        'local' => [
+            'supervisor-1' => [
+                'connection' => 'redis',
+                'queue' => ['default'],
+                'balance' => 'auto',
+                'maxProcesses' => 1,
+                'minProcesses' => 0,
+                'tries' => 1,
+            ],
+        ],
+    ],
+];
diff --git a/src/config/openvidu.php b/src/config/openvidu.php
new file mode 100644
index 00000000..55011090
--- /dev/null
+++ b/src/config/openvidu.php
@@ -0,0 +1,7 @@
+<?php
+    return [
+        'api_password' => env('OPENVIDU_API_PASSWORD', 'MY_SECRET'),
+        'api_url' => env('OPENVIDU_API_URL', 'https://localhost:8443/api/'),
+        'api_username' => env('OPENVIDU_API_USERNAME', 'OPENVIDUAPP'),
+        'api_verify_tls' => (bool) env('OPENVIDU_API_VERIFY_TLS', true)
+    ];
diff --git a/src/config/session.php b/src/config/session.php
index fbb9b4d7..406d50ec 100644
--- a/src/config/session.php
+++ b/src/config/session.php
@@ -1,199 +1,199 @@
 <?php
 
 use Illuminate\Support\Str;
 
 return [
 
     /*
     |--------------------------------------------------------------------------
     | Default Session Driver
     |--------------------------------------------------------------------------
     |
     | This option controls the default session "driver" that will be used on
     | requests. By default, we will use the lightweight native driver but
     | you may specify any of the other wonderful drivers provided here.
     |
     | Supported: "file", "cookie", "database", "apc",
     |            "memcached", "redis", "dynamodb", "array"
     |
     */
 
     'driver' => env('SESSION_DRIVER', 'file'),
 
     /*
     |--------------------------------------------------------------------------
     | Session Lifetime
     |--------------------------------------------------------------------------
     |
     | Here you may specify the number of minutes that you wish the session
     | to be allowed to remain idle before it expires. If you want them
     | to immediately expire on the browser closing, set that option.
     |
     */
 
     'lifetime' => env('SESSION_LIFETIME', 120),
 
     'expire_on_close' => false,
 
     /*
     |--------------------------------------------------------------------------
     | Session Encryption
     |--------------------------------------------------------------------------
     |
     | This option allows you to easily specify that all of your session data
     | should be encrypted before it is stored. All encryption will be run
     | automatically by Laravel and you can use the Session like normal.
     |
     */
 
     'encrypt' => false,
 
     /*
     |--------------------------------------------------------------------------
     | Session File Location
     |--------------------------------------------------------------------------
     |
     | When using the native session driver, we need a location where session
     | files may be stored. A default has been set for you but a different
     | location may be specified. This is only needed for file sessions.
     |
     */
 
     'files' => storage_path('framework/sessions'),
 
     /*
     |--------------------------------------------------------------------------
     | Session Database Connection
     |--------------------------------------------------------------------------
     |
     | When using the "database" or "redis" session drivers, you may specify a
     | connection that should be used to manage these sessions. This should
     | correspond to a connection in your database configuration options.
     |
     */
 
     'connection' => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
     | Session Database Table
     |--------------------------------------------------------------------------
     |
     | When using the "database" session driver, you may specify the table we
     | should use to manage the sessions. Of course, a sensible default is
     | provided for you; however, you are free to change this as needed.
     |
     */
 
     'table' => 'sessions',
 
     /*
     |--------------------------------------------------------------------------
     | Session Cache Store
     |--------------------------------------------------------------------------
     |
     | When using the "apc", "memcached", or "dynamodb" session drivers you may
     | list a cache store that should be used for these sessions. This value
     | must match with one of the application's configured cache "stores".
     |
     */
 
     'store' => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------
     | Session Sweeping Lottery
     |--------------------------------------------------------------------------
     |
     | Some session drivers must manually sweep their storage location to get
     | rid of old sessions from storage. Here are the chances that it will
     | happen on a given request. By default, the odds are 2 out of 100.
     |
     */
 
     'lottery' => [2, 100],
 
     /*
     |--------------------------------------------------------------------------
     | Session Cookie Name
     |--------------------------------------------------------------------------
     |
     | Here you may change the name of the cookie used to identify a session
     | instance by ID. The name specified here will get used every time a
     | new session cookie is created by the framework for every driver.
     |
     */
 
     'cookie' => env(
         'SESSION_COOKIE',
-        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_') . '_session'
     ),
 
     /*
     |--------------------------------------------------------------------------
     | Session Cookie Path
     |--------------------------------------------------------------------------
     |
     | The session cookie path determines the path for which the cookie will
     | be regarded as available. Typically, this will be the root path of
     | your application but you are free to change this when necessary.
     |
     */
 
     'path' => '/',
 
     /*
     |--------------------------------------------------------------------------
     | Session Cookie Domain
     |--------------------------------------------------------------------------
     |
     | Here you may change the domain of the cookie used to identify a session
     | in your application. This will determine which domains the cookie is
     | available to in your application. A sensible default has been set.
     |
     */
 
     'domain' => env('SESSION_DOMAIN', null),
 
     /*
     |--------------------------------------------------------------------------
     | HTTPS Only Cookies
     |--------------------------------------------------------------------------
     |
     | By setting this option to true, session cookies will only be sent back
     | to the server if the browser has a HTTPS connection. This will keep
     | the cookie from being sent to you if it can not be done securely.
     |
     */
 
     'secure' => env('SESSION_SECURE_COOKIE', false),
 
     /*
     |--------------------------------------------------------------------------
     | HTTP Access Only
     |--------------------------------------------------------------------------
     |
     | Setting this value to true will prevent JavaScript from accessing the
     | value of the cookie and the cookie will only be accessible through
     | the HTTP protocol. You are free to modify this option if needed.
     |
     */
 
     'http_only' => true,
 
     /*
     |--------------------------------------------------------------------------
     | Same-Site Cookies
     |--------------------------------------------------------------------------
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
     | do not enable this as other CSRF protection services are in place.
     |
     | Supported: "lax", "strict"
     |
     */
 
     'same_site' => null,
 
 ];
diff --git a/src/config/swoole_http.php b/src/config/swoole_http.php
index f73a2c59..27a27ace 100644
--- a/src/config/swoole_http.php
+++ b/src/config/swoole_http.php
@@ -1,137 +1,139 @@
 <?php
 
 return [
     /*
     |--------------------------------------------------------------------------
     | HTTP server configurations.
     |--------------------------------------------------------------------------
     |
     | @see https://www.swoole.co.uk/docs/modules/swoole-server/configuration
     |
     */
     'server' => [
         'host' => env('SWOOLE_HTTP_HOST', '127.0.0.1'),
         'port' => env('SWOOLE_HTTP_PORT', '1215'),
         'public_path' => base_path('public'),
         // Determine if to use swoole to respond request for static files
         'handle_static_files' => env('SWOOLE_HANDLE_STATIC', true),
         'access_log' => env('SWOOLE_HTTP_ACCESS_LOG', false),
         // You must add --enable-openssl while compiling Swoole
         // Put `SWOOLE_SOCK_TCP | SWOOLE_SSL` if you want to enable SSL
         'socket_type' => SWOOLE_SOCK_TCP,
         'process_type' => SWOOLE_PROCESS,
         'options' => [
             'pid_file' => env('SWOOLE_HTTP_PID_FILE', base_path('storage/logs/swoole_http.pid')),
             'log_file' => env('SWOOLE_HTTP_LOG_FILE', base_path('storage/logs/swoole_http.log')),
             'daemonize' => env('SWOOLE_HTTP_DAEMONIZE', false),
             // Normally this value should be 1~4 times larger according to your cpu cores.
             'reactor_num' => env('SWOOLE_HTTP_REACTOR_NUM', swoole_cpu_num()),
             'worker_num' => env('SWOOLE_HTTP_WORKER_NUM', swoole_cpu_num()),
             'task_worker_num' => env('SWOOLE_HTTP_TASK_WORKER_NUM', swoole_cpu_num()),
             // The data to receive can't be larger than buffer_output_size.
             'package_max_length' => 20 * 1024 * 1024,
             // The data to send can't be larger than buffer_output_size.
             'buffer_output_size' => 10 * 1024 * 1024,
             // Max buffer size for socket connections
             'socket_buffer_size' => 128 * 1024 * 1024,
             // Worker will restart after processing this number of requests
             'max_request' => 3000,
             // Enable coroutine send
             'send_yield' => true,
             // You must add --enable-openssl while compiling Swoole
             'ssl_cert_file' => null,
             'ssl_key_file' => null,
         ],
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Enable to turn on websocket server.
     |--------------------------------------------------------------------------
     */
     'websocket' => [
         'enabled' => env('SWOOLE_HTTP_WEBSOCKET', false),
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Hot reload configuration
     |--------------------------------------------------------------------------
     */
     'hot_reload' => [
         'enabled' => env('SWOOLE_HOT_RELOAD_ENABLE', false),
         'recursively' => env('SWOOLE_HOT_RELOAD_RECURSIVELY', true),
         'directory' => env('SWOOLE_HOT_RELOAD_DIRECTORY', base_path()),
         'log' => env('SWOOLE_HOT_RELOAD_LOG', true),
         'filter' => env('SWOOLE_HOT_RELOAD_FILTER', '.php'),
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Console output will be transferred to response content if enabled.
     |--------------------------------------------------------------------------
     */
     'ob_output' => env('SWOOLE_OB_OUTPUT', true),
 
     /*
     |--------------------------------------------------------------------------
     | Pre-resolved instances here will be resolved when sandbox created.
     |--------------------------------------------------------------------------
     */
     'pre_resolved' => [
         'view', 'files', 'session', 'session.store', 'routes',
         'db', 'db.factory', 'cache', 'cache.store', 'config', 'cookie',
         'encrypter', 'hash', 'router', 'translator', 'url', 'log',
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Instances here will be cleared on every request.
     |--------------------------------------------------------------------------
     */
     'instances' => [
-        //
+        'auth',
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Providers here will be registered on every request.
     |--------------------------------------------------------------------------
     */
     'providers' => [
         Illuminate\Pagination\PaginationServiceProvider::class,
+        App\Providers\AuthServiceProvider::class,
+        Tymon\JWTAuth\Providers\LaravelServiceProvider::class,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Resetters for sandbox app.
     |--------------------------------------------------------------------------
     */
     'resetters' => [
         SwooleTW\Http\Server\Resetters\ResetConfig::class,
         SwooleTW\Http\Server\Resetters\ResetSession::class,
         SwooleTW\Http\Server\Resetters\ResetCookie::class,
         SwooleTW\Http\Server\Resetters\ClearInstances::class,
         SwooleTW\Http\Server\Resetters\BindRequest::class,
         SwooleTW\Http\Server\Resetters\RebindKernelContainer::class,
         SwooleTW\Http\Server\Resetters\RebindRouterContainer::class,
         SwooleTW\Http\Server\Resetters\RebindViewContainer::class,
         SwooleTW\Http\Server\Resetters\ResetProviders::class,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Define your swoole tables here.
     |
     | @see https://www.swoole.co.uk/docs/modules/swoole-table
     |--------------------------------------------------------------------------
     */
     'tables' => [
         // 'table_name' => [
         //     'size' => 1024,
         //     'columns' => [
         //         ['name' => 'column_name', 'type' => Table::TYPE_STRING, 'size' => 1024],
         //     ]
         // ],
     ],
 ];
diff --git a/src/config/swoole_websocket.php b/src/config/swoole_websocket.php
index 867b9df8..4208912f 100644
--- a/src/config/swoole_websocket.php
+++ b/src/config/swoole_websocket.php
@@ -1,107 +1,107 @@
 <?php
 
 return [
     /*
     |--------------------------------------------------------------------------
     | Websocket handler for onOpen and onClose callback
     | Replace this handler if you want to customize your websocket handler
     |--------------------------------------------------------------------------
     */
     'handler' => SwooleTW\Http\Websocket\SocketIO\WebsocketHandler::class,
 
     /*
     |--------------------------------------------------------------------------
     | Default frame parser
     | Replace it if you want to customize your websocket payload
     |--------------------------------------------------------------------------
     */
     'parser' => SwooleTW\Http\Websocket\SocketIO\SocketIOParser::class,
 
     /*
     |--------------------------------------------------------------------------
     | Websocket route file path
     |--------------------------------------------------------------------------
     */
     'route_file' => base_path('routes/websocket.php'),
 
     /*
     |--------------------------------------------------------------------------
     | Default middleware for on connect request
     |--------------------------------------------------------------------------
     */
     'middleware' => [
-        // SwooleTW\Http\Websocket\Middleware\DecryptCookies::class,
-        // SwooleTW\Http\Websocket\Middleware\StartSession::class,
-        // SwooleTW\Http\Websocket\Middleware\Authenticate::class,
+        SwooleTW\Http\Websocket\Middleware\DecryptCookies::class,
+        SwooleTW\Http\Websocket\Middleware\StartSession::class,
+        SwooleTW\Http\Websocket\Middleware\Authenticate::class,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Websocket handler for customized onHandShake callback
     |--------------------------------------------------------------------------
     */
     'handshake' => [
         'enabled' => false,
         'handler' => SwooleTW\Http\Websocket\HandShakeHandler::class,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Default websocket driver
     |--------------------------------------------------------------------------
     */
     'default' => 'table',
 
     /*
     |--------------------------------------------------------------------------
     | Websocket client's heartbeat interval (ms)
     |--------------------------------------------------------------------------
     */
     'ping_interval' => 25000,
 
     /*
     |--------------------------------------------------------------------------
     | Websocket client's heartbeat interval timeout (ms)
     |--------------------------------------------------------------------------
     */
     'ping_timeout' => 60000,
 
     /*
     |--------------------------------------------------------------------------
     | Room drivers mapping
     |--------------------------------------------------------------------------
     */
     'drivers' => [
         'table' => SwooleTW\Http\Websocket\Rooms\TableRoom::class,
         'redis' => SwooleTW\Http\Websocket\Rooms\RedisRoom::class,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Room drivers settings
     |--------------------------------------------------------------------------
     */
     'settings' => [
 
         'table' => [
             'room_rows' => 4096,
             'room_size' => 2048,
             'client_rows' => 8192,
             'client_size' => 2048,
         ],
 
         'redis' => [
             'server' => [
                 'host' => env('REDIS_HOST', '127.0.0.1'),
                 'password' => env('REDIS_PASSWORD', null),
                 'port' => env('REDIS_PORT', 6379),
                 'database' => 0,
                 'persistent' => true,
             ],
             'options' => [
                 //
             ],
             'prefix' => 'swoole:',
         ],
     ],
 ];
diff --git a/src/config/view.php b/src/config/view.php
index 22b8a18d..de84cc3c 100644
--- a/src/config/view.php
+++ b/src/config/view.php
@@ -1,36 +1,37 @@
 <?php
 
 return [
 
     /*
     |--------------------------------------------------------------------------
     | View Storage Paths
     |--------------------------------------------------------------------------
     |
     | Most templating systems load templates from disk. Here you may specify
     | an array of paths that should be checked for your views. Of course
     | the usual Laravel view path has already been registered for you.
     |
     */
 
     'paths' => [
         resource_path('views'),
+        resource_path('themes'),
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Compiled View Path
     |--------------------------------------------------------------------------
     |
     | This option determines where all the compiled Blade templates will be
     | stored for your application. Typically, this is within the storage
     | directory. However, as usual, you are free to change this value.
     |
     */
 
     'compiled' => env(
         'VIEW_COMPILED_PATH',
         realpath(storage_path('framework/views'))
     ),
 
 ];
diff --git a/src/database/migrations/2020_04_30_115440_create_openvidu_tables.php b/src/database/migrations/2020_04_30_115440_create_openvidu_tables.php
new file mode 100644
index 00000000..97b8afe7
--- /dev/null
+++ b/src/database/migrations/2020_04_30_115440_create_openvidu_tables.php
@@ -0,0 +1,55 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+// phpcs:ignore
+class CreateOpenviduTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create(
+            'openvidu_rooms',
+            function (Blueprint $table) {
+                $table->bigIncrements('id');
+                $table->bigInteger('user_id');
+                $table->string('name', 16)->unique();
+                $table->string('session_id', 16)->nullable()->unique();
+                $table->timestamps();
+
+                $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            }
+        );
+
+        Schema::create(
+            'openvidu_room_settings',
+            function (Blueprint $table) {
+                $table->bigIncrements('id');
+                $table->bigInteger('room_id')->unsigned();
+                $table->string('key', 16);
+                $table->string('value');
+                $table->timestamps();
+
+                $table->foreign('room_id')->references('id')
+                    ->on('openvidu_rooms')->onDelete('cascade');
+            }
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('openvidu_room_settings');
+        Schema::dropIfExists('openvidu_rooms');
+    }
+}
diff --git a/src/database/migrations/2020_10_29_100000_add_beta_skus.php b/src/database/migrations/2020_10_29_100000_add_beta_skus.php
new file mode 100644
index 00000000..3cf3ed12
--- /dev/null
+++ b/src/database/migrations/2020_10_29_100000_add_beta_skus.php
@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+// phpcs:ignore
+class AddBetaSkus extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!\App\Sku::where('title', 'beta')->first()) {
+            \App\Sku::create([
+                'title' => 'beta',
+                'name' => 'Beta program',
+                'description' => 'Access to beta program subscriptions',
+                'cost' => 0,
+                'units_free' => 0,
+                'period' => 'monthly',
+                'handler_class' => 'App\Handlers\Beta',
+                'active' => false,
+            ]);
+        }
+
+        if (!\App\Sku::where('title', 'meet')->first()) {
+            \App\Sku::create([
+                'title' => 'meet',
+                'name' => 'Video chat',
+                'description' => 'Video conferencing tool',
+                'cost' => 0,
+                'units_free' => 0,
+                'period' => 'monthly',
+                'handler_class' => 'App\Handlers\Beta\Meet',
+                'active' => true,
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // there's no need to remove these SKUs
+    }
+}
diff --git a/src/database/migrations/2020_12_28_140000_create_groups_table.php b/src/database/migrations/2020_12_28_140000_create_groups_table.php
new file mode 100644
index 00000000..886b01e2
--- /dev/null
+++ b/src/database/migrations/2020_12_28_140000_create_groups_table.php
@@ -0,0 +1,55 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+// phpcs:ignore
+class CreateGroupsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create(
+            'groups',
+            function (Blueprint $table) {
+                $table->bigInteger('id');
+                $table->string('email')->unique();
+                $table->text('members')->nullable();
+                $table->smallInteger('status');
+
+                $table->timestamps();
+                $table->softDeletes();
+
+                $table->primary('id');
+            }
+        );
+
+        if (!\App\Sku::where('title', 'group')->first()) {
+            \App\Sku::create([
+                'title' => 'group',
+                'name' => 'Group',
+                'description' => 'Distribution list',
+                'cost' => 0,
+                'units_free' => 0,
+                'period' => 'monthly',
+                'handler_class' => 'App\Handlers\Group',
+                'active' => true,
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('groups');
+    }
+}
diff --git a/src/database/migrations/2021_01_13_120000_create_openvidu_connections_table.php b/src/database/migrations/2021_01_13_120000_create_openvidu_connections_table.php
new file mode 100644
index 00000000..94a2feb6
--- /dev/null
+++ b/src/database/migrations/2021_01_13_120000_create_openvidu_connections_table.php
@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+// phpcs:ignore
+class CreateOpenviduConnectionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create(
+            'openvidu_connections',
+            function (Blueprint $table) {
+                // I'm not sure about the max. length of the OpenVidu identifiers
+                // In examples they have 14 characters, so 16 should be enough, but
+                // let's be on the safe side with 24.
+                $table->string('id', 24);
+                $table->string('session_id', 24);
+                $table->bigInteger('room_id')->unsigned();
+                $table->smallInteger('role')->default(0);
+                $table->text('metadata')->nullable(); // should be json, but mariadb
+                $table->timestamps();
+
+                $table->primary('id');
+                $table->index('session_id');
+                $table->foreign('room_id')->references('id')->on('openvidu_rooms')->onDelete('cascade');
+            }
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('openvidu_connections');
+    }
+}
diff --git a/src/database/migrations/2021_01_26_150000_change_sku_descriptions.php b/src/database/migrations/2021_01_26_150000_change_sku_descriptions.php
new file mode 100644
index 00000000..7af011e5
--- /dev/null
+++ b/src/database/migrations/2021_01_26_150000_change_sku_descriptions.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+// phpcs:ignore
+class ChangeSkuDescriptions extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $beta_sku = \App\Sku::where('title', 'beta')->first();
+        $beta_sku->name = 'Private Beta (invitation only)';
+        $beta_sku->description = 'Access to the private beta program subscriptions';
+        $beta_sku->save();
+
+        $meet_sku = \App\Sku::where('title', 'meet')->first();
+        $meet_sku->name = 'Voice & Video Conferencing (public beta)';
+        $meet_sku->handler_class = 'App\Handlers\Meet';
+        $meet_sku->save();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}
diff --git a/src/database/migrations/2021_02_19_100000_transaction_amount_fix.php b/src/database/migrations/2021_02_19_100000_transaction_amount_fix.php
new file mode 100644
index 00000000..19277aa2
--- /dev/null
+++ b/src/database/migrations/2021_02_19_100000_transaction_amount_fix.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+// phpcs:ignore
+class TransactionAmountFix extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $negatives = [
+            \App\Transaction::WALLET_CHARGEBACK,
+            \App\Transaction::WALLET_DEBIT,
+            \App\Transaction::WALLET_PENALTY,
+            \App\Transaction::WALLET_REFUND,
+        ];
+
+        $query = "UPDATE transactions SET amount = amount * -1"
+            . " WHERE type IN (" . implode(',', array_fill(0, count($negatives), '?')) . ")";
+
+        DB::select($query, $negatives);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::select("UPDATE transactions SET amount = amount * -1 WHERE amount < 0");
+    }
+}
diff --git a/src/database/migrations/2021_02_23_084157_payment_table_add_currency_columns.php b/src/database/migrations/2021_02_23_084157_payment_table_add_currency_columns.php
new file mode 100644
index 00000000..7e42e1f6
--- /dev/null
+++ b/src/database/migrations/2021_02_23_084157_payment_table_add_currency_columns.php
@@ -0,0 +1,55 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+// phpcs:ignore
+class PaymentTableAddCurrencyColumns extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(
+            'payments',
+            function (Blueprint $table) {
+                $table->string('currency')->nullable();
+                $table->integer('currency_amount')->nullable();
+            }
+        );
+
+        DB::table('payments')->update([
+            'currency' => 'CHF',
+            'currency_amount' => DB::raw("`amount`")
+        ]);
+
+        Schema::table(
+            'payments',
+            function (Blueprint $table) {
+                $table->string('currency')->nullable(false)->change();
+                $table->integer('currency_amount')->nullable(false)->change();
+            }
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(
+            'payments',
+            function (Blueprint $table) {
+                $table->dropColumn('currency');
+                $table->dropColumn('currency_amount');
+            }
+        );
+    }
+}
diff --git a/src/database/seeds/DatabaseSeeder.php b/src/database/seeds/DatabaseSeeder.php
index 1e5e3db7..306a95ab 100644
--- a/src/database/seeds/DatabaseSeeder.php
+++ b/src/database/seeds/DatabaseSeeder.php
@@ -1,37 +1,38 @@
 <?php
 
 use Illuminate\Database\Seeder;
 
 // phpcs:ignore
 class DatabaseSeeder extends Seeder
 {
     /**
      * Seed the application's database.
      *
      * @return void
      */
     public function run()
     {
         // Define seeders order
         $seeders = [
             'DiscountSeeder',
             'DomainSeeder',
             'SkuSeeder',
             'PackageSeeder',
             'PlanSeeder',
-            'UserSeeder'
+            'UserSeeder',
+            'OpenViduRoomSeeder',
         ];
 
         $env = ucfirst(App::environment());
 
         // Check if the seeders exists
         foreach ($seeders as $idx => $name) {
             $class = "Database\\Seeds\\$env\\$name";
             $seeders[$idx] = class_exists($class) ? $class : null;
         }
 
         $seeders = array_filter($seeders);
 
         $this->call($seeders);
     }
 }
diff --git a/src/database/seeds/local/OpenViduRoomSeeder.php b/src/database/seeds/local/OpenViduRoomSeeder.php
new file mode 100644
index 00000000..e58a723c
--- /dev/null
+++ b/src/database/seeds/local/OpenViduRoomSeeder.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Database\Seeds\Local;
+
+use App\OpenVidu\Room;
+use Illuminate\Database\Seeder;
+
+class OpenViduRoomSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $john = \App\User::where('email', 'john@kolab.org')->first();
+        $jack = \App\User::where('email', 'jack@kolab.org')->first();
+
+        \App\OpenVidu\Room::create(
+            [
+                'user_id' => $john->id,
+                'name' => 'john'
+            ]
+        );
+
+        \App\OpenVidu\Room::create(
+            [
+                'user_id' => $jack->id,
+                'name' => strtolower(\App\Utils::randStr(3, 3, '-'))
+            ]
+        );
+    }
+}
diff --git a/src/database/seeds/local/SkuSeeder.php b/src/database/seeds/local/SkuSeeder.php
index e3b49179..0b68202c 100644
--- a/src/database/seeds/local/SkuSeeder.php
+++ b/src/database/seeds/local/SkuSeeder.php
@@ -1,155 +1,203 @@
 <?php
 
 namespace Database\Seeds\Local;
 
 use App\Sku;
 use Illuminate\Database\Seeder;
 
 class SkuSeeder extends Seeder
 {
     /**
      * Run the database seeds.
      *
      * @return void
      */
     public function run()
     {
         Sku::create(
             [
                 'title' => 'mailbox',
                 'name' => 'User Mailbox',
                 'description' => 'Just a mailbox',
                 'cost' => 444,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Mailbox',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain',
                 'name' => 'Hosted Domain',
                 'description' => 'Somewhere to place a mailbox',
                 'cost' => 100,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Domain',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain-registration',
                 'name' => 'Domain Registration',
                 'description' => 'Register a domain with us',
                 'cost' => 101,
                 'period' => 'yearly',
                 'handler_class' => 'App\Handlers\DomainRegistration',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain-hosting',
                 'name' => 'External Domain',
                 'description' => 'Host a domain that is externally registered',
                 'cost' => 100,
                 'units_free' => 1,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\DomainHosting',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain-relay',
                 'name' => 'Domain Relay',
                 'description' => 'A domain you host at home, for which we relay email',
                 'cost' => 103,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\DomainRelay',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'storage',
                 'name' => 'Storage Quota',
                 'description' => 'Some wiggle room',
                 'cost' => 25,
                 'units_free' => 2,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Storage',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'groupware',
                 'name' => 'Groupware Features',
                 'description' => 'Groupware functions like Calendar, Tasks, Notes, etc.',
                 'cost' => 555,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Groupware',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'resource',
                 'name' => 'Resource',
                 'description' => 'Reservation taker',
                 'cost' => 101,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Resource',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'shared_folder',
                 'name' => 'Shared Folder',
                 'description' => 'A shared folder',
                 'cost' => 89,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\SharedFolder',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => '2fa',
                 'name' => '2-Factor Authentication',
                 'description' => 'Two factor authentication for webmail and administration panel',
                 'cost' => 0,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Auth2F',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'activesync',
                 'name' => 'Activesync',
                 'description' => 'Mobile synchronization',
                 'cost' => 100,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Activesync',
                 'active' => true,
             ]
         );
+
+        // Check existence because migration might have added this already
+        if (!\App\Sku::where('title', 'beta')->first()) {
+            Sku::create(
+                [
+                    'title' => 'beta',
+                    'name' => 'Private Beta (invitation only)',
+                    'description' => 'Access to the private beta program subscriptions',
+                    'cost' => 0,
+                    'units_free' => 0,
+                    'period' => 'monthly',
+                    'handler_class' => 'App\Handlers\Beta',
+                    'active' => false,
+                ]
+            );
+        }
+
+        // Check existence because migration might have added this already
+        if (!\App\Sku::where('title', 'meet')->first()) {
+            Sku::create(
+                [
+                    'title' => 'meet',
+                    'name' => 'Voice & Video Conferencing (public beta)',
+                    'description' => 'Video conferencing tool',
+                    'cost' => 0,
+                    'units_free' => 0,
+                    'period' => 'monthly',
+                    'handler_class' => 'App\Handlers\Meet',
+                    'active' => true,
+                ]
+            );
+        }
+
+        // Check existence because migration might have added this already
+        if (!\App\Sku::where('title', 'group')->first()) {
+            Sku::create(
+                [
+                    'title' => 'group',
+                    'name' => 'Group',
+                    'description' => 'Distribution list',
+                    'cost' => 0,
+                    'units_free' => 0,
+                    'period' => 'monthly',
+                    'handler_class' => 'App\Handlers\Group',
+                    'active' => true,
+                ]
+            );
+        }
     }
 }
diff --git a/src/database/seeds/local/UserSeeder.php b/src/database/seeds/local/UserSeeder.php
index 938cae7a..1733d4e1 100644
--- a/src/database/seeds/local/UserSeeder.php
+++ b/src/database/seeds/local/UserSeeder.php
@@ -1,142 +1,149 @@
 <?php
 
 namespace Database\Seeds\Local;
 
 use App\Auth\SecondFactor;
 use App\Domain;
 use App\Entitlement;
 use App\User;
 use App\Sku;
 use Carbon\Carbon;
 use Illuminate\Database\Seeder;
 use App\Wallet;
 
 class UserSeeder extends Seeder
 {
     /**
      * Run the database seeds.
      *
      * @return void
      */
     public function run()
     {
         $domain = Domain::create(
             [
                 'namespace' => 'kolab.org',
                 'status' => Domain::STATUS_NEW
                     + Domain::STATUS_ACTIVE
                     + Domain::STATUS_CONFIRMED
                     + Domain::STATUS_VERIFIED,
                 'type' => Domain::TYPE_EXTERNAL
             ]
         );
 
         $john = User::create(
             [
                 'email' => 'john@kolab.org',
                 'password' => 'simple123',
             ]
         );
 
         $john->setSettings(
             [
                 'first_name' => 'John',
                 'last_name' => 'Doe',
                 'currency' => 'USD',
                 'country' => 'US',
                 'billing_address' => "601 13th Street NW\nSuite 900 South\nWashington, DC 20005",
                 'external_email' => 'john.doe.external@gmail.com',
                 'organization' => 'Kolab Developers',
                 'phone' => '+1 509-248-1111',
             ]
         );
 
         $john->setAliases(['john.doe@kolab.org']);
 
         $wallet = $john->wallets->first();
 
         $package_domain = \App\Package::where('title', 'domain-hosting')->first();
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $package_lite = \App\Package::where('title', 'lite')->first();
 
         $domain->assignPackage($package_domain, $john);
         $john->assignPackage($package_kolab);
 
         $jack = User::create(
             [
                 'email' => 'jack@kolab.org',
                 'password' => 'simple123',
             ]
         );
 
         $jack->setSettings(
             [
                 'first_name' => 'Jack',
                 'last_name' => 'Daniels',
                 'currency' => 'USD',
                 'country' => 'US'
             ]
         );
 
         $jack->setAliases(['jack.daniels@kolab.org']);
 
         $john->assignPackage($package_kolab, $jack);
 
         foreach ($john->entitlements as $entitlement) {
             $entitlement->created_at = Carbon::now()->subMonthsWithoutOverflow(1);
             $entitlement->updated_at = Carbon::now()->subMonthsWithoutOverflow(1);
             $entitlement->save();
         }
 
         $ned = User::create(
             [
                 'email' => 'ned@kolab.org',
                 'password' => 'simple123',
             ]
         );
 
         $ned->setSettings(
             [
                 'first_name' => 'Edward',
                 'last_name' => 'Flanders',
                 'currency' => 'USD',
                 'country' => 'US'
             ]
         );
 
         $john->assignPackage($package_kolab, $ned);
 
         $ned->assignSku(\App\Sku::where('title', 'activesync')->first(), 1);
 
         // Ned is a controller on Jack's wallet
         $john->wallets()->first()->addController($ned);
 
         // Ned is also our 2FA test user
         $sku2fa = Sku::firstOrCreate(['title' => '2fa']);
         $ned->assignSku($sku2fa);
-        SecondFactor::seed('ned@kolab.org');
+        try {
+            SecondFactor::seed('ned@kolab.org');
+        } catch (\Exception $e) {
+            // meh
+        }
 
         $joe = User::create(
             [
                 'email' => 'joe@kolab.org',
                 'password' => 'simple123',
             ]
         );
 
         $john->assignPackage($package_lite, $joe);
 
+        //$john->assignSku(Sku::firstOrCreate(['title' => 'beta']));
+        //$john->assignSku(Sku::firstOrCreate(['title' => 'meet']));
+
         $joe->setAliases(['joe.monster@kolab.org']);
 
         // factory(User::class, 10)->create();
 
         $jeroen = User::create(
             [
                 'email' => 'jeroen@jeroen.jeroen',
                 'password' => 'jeroen',
             ]
         );
 
         $jeroen->role = 'admin';
         $jeroen->save();
     }
 }
diff --git a/src/database/seeds/production/SkuSeeder.php b/src/database/seeds/production/SkuSeeder.php
index c5142773..fe466fe0 100644
--- a/src/database/seeds/production/SkuSeeder.php
+++ b/src/database/seeds/production/SkuSeeder.php
@@ -1,155 +1,203 @@
 <?php
 
 namespace Database\Seeds\Production;
 
 use App\Sku;
 use Illuminate\Database\Seeder;
 
 class SkuSeeder extends Seeder
 {
     /**
      * Run the database seeds.
      *
      * @return void
      */
     public function run()
     {
         Sku::create(
             [
                 'title' => 'mailbox',
                 'name' => 'User Mailbox',
                 'description' => 'Just a mailbox',
                 'cost' => 444,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Mailbox',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain',
                 'name' => 'Hosted Domain',
                 'description' => 'Somewhere to place a mailbox',
                 'cost' => 100,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Domain',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain-registration',
                 'name' => 'Domain Registration',
                 'description' => 'Register a domain with us',
                 'cost' => 101,
                 'period' => 'yearly',
                 'handler_class' => 'App\Handlers\DomainRegistration',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain-hosting',
                 'name' => 'External Domain',
                 'description' => 'Host a domain that is externally registered',
                 'cost' => 100,
                 'units_free' => 1,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\DomainHosting',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'domain-relay',
                 'name' => 'Domain Relay',
                 'description' => 'A domain you host at home, for which we relay email',
                 'cost' => 103,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\DomainRelay',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'storage',
                 'name' => 'Storage Quota',
                 'description' => 'Some wiggle room',
                 'cost' => 50,
                 'units_free' => 2,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Storage',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'groupware',
                 'name' => 'Groupware Features',
                 'description' => 'Groupware functions like Calendar, Tasks, Notes, etc.',
                 'cost' => 555,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Groupware',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'resource',
                 'name' => 'Resource',
                 'description' => 'Reservation taker',
                 'cost' => 101,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Resource',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'shared_folder',
                 'name' => 'Shared Folder',
                 'description' => 'A shared folder',
                 'cost' => 89,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\SharedFolder',
                 'active' => false,
             ]
         );
 
         Sku::create(
             [
                 'title' => '2fa',
                 'name' => '2-Factor Authentication',
                 'description' => 'Two factor authentication for webmail and administration panel',
                 'cost' => 0,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Auth2F',
                 'active' => true,
             ]
         );
 
         Sku::create(
             [
                 'title' => 'activesync',
                 'name' => 'Activesync',
                 'description' => 'Mobile synchronization',
                 'cost' => 100,
                 'units_free' => 0,
                 'period' => 'monthly',
                 'handler_class' => 'App\Handlers\Activesync',
                 'active' => true,
             ]
         );
+
+        // Check existence because migration might have added this already
+        if (!\App\Sku::where('title', 'beta')->first()) {
+            Sku::create(
+                [
+                    'title' => 'beta',
+                    'name' => 'Private Beta (invitation only)',
+                    'description' => 'Access to the private beta program subscriptions',
+                    'cost' => 0,
+                    'units_free' => 0,
+                    'period' => 'monthly',
+                    'handler_class' => 'App\Handlers\Beta',
+                    'active' => false,
+                ]
+            );
+        }
+
+        // Check existence because migration might have added this already
+        if (!\App\Sku::where('title', 'meet')->first()) {
+            Sku::create(
+                [
+                    'title' => 'meet',
+                    'name' => 'Voice & Video Conferencing (public beta)',
+                    'description' => 'Video conferencing tool',
+                    'cost' => 0,
+                    'units_free' => 0,
+                    'period' => 'monthly',
+                    'handler_class' => 'App\Handlers\Meet',
+                    'active' => true,
+                ]
+            );
+        }
+
+        // Check existence because migration might have added this already
+        if (!\App\Sku::where('title', 'group')->first()) {
+            Sku::create(
+                [
+                    'title' => 'group',
+                    'name' => 'Group',
+                    'description' => 'Distribution list',
+                    'cost' => 0,
+                    'units_free' => 0,
+                    'period' => 'monthly',
+                    'handler_class' => 'App\Handlers\Group',
+                    'active' => true,
+                ]
+            );
+        }
     }
 }
diff --git a/src/package-lock.json b/src/package-lock.json
index 3db95985..1035b130 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,14689 +1,14548 @@
 {
     "requires": true,
     "lockfileVersion": 1,
     "dependencies": {
         "@babel/code-frame": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
             "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
             "dev": true,
             "requires": {
                 "@babel/highlight": "^7.10.3"
             }
         },
         "@babel/compat-data": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-            "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-            "dev": true,
-            "requires": {
-                "browserslist": "^4.12.0",
-                "invariant": "^2.2.4",
-                "semver": "^5.5.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                }
-            }
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz",
+            "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==",
+            "dev": true
         },
         "@babel/core": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.3.tgz",
             "integrity": "sha512-5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.10.3",
                 "@babel/generator": "^7.10.3",
                 "@babel/helper-module-transforms": "^7.10.1",
                 "@babel/helpers": "^7.10.1",
                 "@babel/parser": "^7.10.3",
                 "@babel/template": "^7.10.3",
                 "@babel/traverse": "^7.10.3",
                 "@babel/types": "^7.10.3",
                 "convert-source-map": "^1.7.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.1",
                 "json5": "^2.1.2",
                 "lodash": "^4.17.13",
                 "resolve": "^1.3.2",
                 "semver": "^5.4.1",
                 "source-map": "^0.5.0"
             },
             "dependencies": {
                 "convert-source-map": {
                     "version": "1.7.0",
                     "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
                     "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
                     "dev": true,
                     "requires": {
                         "safe-buffer": "~5.1.1"
                     }
                 },
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
                     "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
                     "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 },
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 }
             }
         },
         "@babel/generator": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz",
             "integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.3",
                 "jsesc": "^2.5.1",
                 "lodash": "^4.17.13",
                 "source-map": "^0.5.0"
             }
         },
         "@babel/helper-annotate-as-pure": {
             "version": "7.10.4",
             "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
             "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.4"
             },
             "dependencies": {
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 }
             }
         },
         "@babel/helper-builder-binary-assignment-operator-visitor": {
             "version": "7.10.4",
             "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
             "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
             "dev": true,
             "requires": {
                 "@babel/helper-explode-assignable-expression": "^7.10.4",
                 "@babel/types": "^7.10.4"
             },
             "dependencies": {
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 }
             }
         },
         "@babel/helper-compilation-targets": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-            "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz",
+            "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==",
             "dev": true,
             "requires": {
-                "@babel/compat-data": "^7.10.4",
-                "browserslist": "^4.12.0",
-                "invariant": "^2.2.4",
-                "levenary": "^1.1.1",
+                "@babel/compat-data": "^7.12.5",
+                "@babel/helper-validator-option": "^7.12.1",
+                "browserslist": "^4.14.5",
                 "semver": "^5.5.0"
             },
             "dependencies": {
+                "browserslist": {
+                    "version": "4.14.7",
+                    "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz",
+                    "integrity": "sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==",
+                    "dev": true,
+                    "requires": {
+                        "caniuse-lite": "^1.0.30001157",
+                        "colorette": "^1.2.1",
+                        "electron-to-chromium": "^1.3.591",
+                        "escalade": "^3.1.1",
+                        "node-releases": "^1.1.66"
+                    }
+                },
+                "caniuse-lite": {
+                    "version": "1.0.30001157",
+                    "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz",
+                    "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==",
+                    "dev": true
+                },
+                "electron-to-chromium": {
+                    "version": "1.3.595",
+                    "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.595.tgz",
+                    "integrity": "sha512-JpaBIhdBkF9FLG7x06ONfe0f5bxPrxRcq0X+Sc8vsCt+OPWIzxOD+qM71NEHLGbDfN9Q6hbtHRv4/dnvcOxo6g==",
+                    "dev": true
+                },
+                "escalade": {
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+                    "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+                    "dev": true
+                },
+                "node-releases": {
+                    "version": "1.1.66",
+                    "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz",
+                    "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==",
+                    "dev": true
+                },
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 }
             }
         },
         "@babel/helper-create-class-features-plugin": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-            "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
+            "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
             "dev": true,
             "requires": {
                 "@babel/helper-function-name": "^7.10.4",
-                "@babel/helper-member-expression-to-functions": "^7.10.5",
+                "@babel/helper-member-expression-to-functions": "^7.12.1",
                 "@babel/helper-optimise-call-expression": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.12.1",
                 "@babel/helper-split-export-declaration": "^7.10.4"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-member-expression-to-functions": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-                    "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+                    "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.0"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-optimise-call-expression": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
                     "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-replace-supers": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-                    "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+                    "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-member-expression-to-functions": "^7.10.4",
+                        "@babel/helper-member-expression-to-functions": "^7.12.1",
                         "@babel/helper-optimise-call-expression": "^7.10.4",
-                        "@babel/traverse": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/traverse": "^7.12.5",
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/helper-create-regexp-features-plugin": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-            "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz",
+            "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==",
             "dev": true,
             "requires": {
                 "@babel/helper-annotate-as-pure": "^7.10.4",
                 "@babel/helper-regex": "^7.10.4",
-                "regexpu-core": "^4.7.0"
+                "regexpu-core": "^4.7.1"
             }
         },
         "@babel/helper-define-map": {
             "version": "7.10.5",
             "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
             "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-function-name": "^7.10.4",
                 "@babel/types": "^7.10.5",
                 "lodash": "^4.17.19"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 }
             }
         },
         "@babel/helper-explode-assignable-expression": {
-            "version": "7.11.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
-            "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz",
+            "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.1"
             },
             "dependencies": {
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 }
             }
         },
         "@babel/helper-function-name": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz",
             "integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==",
             "dev": true,
             "requires": {
                 "@babel/helper-get-function-arity": "^7.10.3",
                 "@babel/template": "^7.10.3",
                 "@babel/types": "^7.10.3"
             }
         },
         "@babel/helper-get-function-arity": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz",
             "integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.3"
             }
         },
         "@babel/helper-hoist-variables": {
             "version": "7.10.4",
             "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
             "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.4"
             },
             "dependencies": {
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 }
             }
         },
         "@babel/helper-member-expression-to-functions": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz",
             "integrity": "sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.3"
             }
         },
         "@babel/helper-module-imports": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz",
             "integrity": "sha512-Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.3"
             }
         },
         "@babel/helper-module-transforms": {
             "version": "7.10.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
             "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
             "dev": true,
             "requires": {
                 "@babel/helper-module-imports": "^7.10.1",
                 "@babel/helper-replace-supers": "^7.10.1",
                 "@babel/helper-simple-access": "^7.10.1",
                 "@babel/helper-split-export-declaration": "^7.10.1",
                 "@babel/template": "^7.10.1",
                 "@babel/types": "^7.10.1",
                 "lodash": "^4.17.13"
             }
         },
         "@babel/helper-optimise-call-expression": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz",
             "integrity": "sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.3"
             }
         },
         "@babel/helper-plugin-utils": {
             "version": "7.10.4",
             "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
             "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
             "dev": true
         },
         "@babel/helper-regex": {
             "version": "7.10.5",
             "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
             "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
             "dev": true,
             "requires": {
                 "lodash": "^4.17.19"
             }
         },
         "@babel/helper-remap-async-to-generator": {
-            "version": "7.11.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
-            "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz",
+            "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==",
             "dev": true,
             "requires": {
                 "@babel/helper-annotate-as-pure": "^7.10.4",
                 "@babel/helper-wrap-function": "^7.10.4",
-                "@babel/template": "^7.10.4",
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.1"
             },
             "dependencies": {
-                "@babel/code-frame": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-                    "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/highlight": "^7.10.4"
-                    }
-                },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
-                "@babel/highlight": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-                    "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                    }
-                },
-                "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
-                    "dev": true
-                },
-                "@babel/template": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-                    "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/code-frame": "^7.10.4",
-                        "@babel/parser": "^7.10.4",
-                        "@babel/types": "^7.10.4"
-                    }
-                },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
                 }
             }
         },
         "@babel/helper-replace-supers": {
             "version": "7.10.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
             "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
             "dev": true,
             "requires": {
                 "@babel/helper-member-expression-to-functions": "^7.10.1",
                 "@babel/helper-optimise-call-expression": "^7.10.1",
                 "@babel/traverse": "^7.10.1",
                 "@babel/types": "^7.10.1"
             }
         },
         "@babel/helper-simple-access": {
             "version": "7.10.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
             "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
             "dev": true,
             "requires": {
                 "@babel/template": "^7.10.1",
                 "@babel/types": "^7.10.1"
             }
         },
         "@babel/helper-skip-transparent-expression-wrappers": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-            "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+            "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.11.0"
+                "@babel/types": "^7.12.1"
             },
             "dependencies": {
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 }
             }
         },
         "@babel/helper-split-export-declaration": {
             "version": "7.10.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
             "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.10.1"
             }
         },
         "@babel/helper-validator-identifier": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
             "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==",
             "dev": true
         },
+        "@babel/helper-validator-option": {
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz",
+            "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==",
+            "dev": true
+        },
         "@babel/helper-wrap-function": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-            "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+            "version": "7.12.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz",
+            "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==",
             "dev": true,
             "requires": {
                 "@babel/helper-function-name": "^7.10.4",
                 "@babel/template": "^7.10.4",
                 "@babel/traverse": "^7.10.4",
                 "@babel/types": "^7.10.4"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/helpers": {
             "version": "7.10.1",
             "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
             "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
             "dev": true,
             "requires": {
                 "@babel/template": "^7.10.1",
                 "@babel/traverse": "^7.10.1",
                 "@babel/types": "^7.10.1"
             }
         },
         "@babel/highlight": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
             "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
             "dev": true,
             "requires": {
                 "@babel/helper-validator-identifier": "^7.10.3",
                 "chalk": "^2.0.0",
                 "js-tokens": "^4.0.0"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 }
             }
         },
         "@babel/parser": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz",
             "integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==",
             "dev": true
         },
         "@babel/plugin-proposal-async-generator-functions": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-            "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz",
+            "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-remap-async-to-generator": "^7.10.4",
+                "@babel/helper-remap-async-to-generator": "^7.12.1",
                 "@babel/plugin-syntax-async-generators": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-class-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-            "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz",
+            "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.10.4",
+                "@babel/helper-create-class-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-proposal-dynamic-import": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-            "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz",
+            "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-dynamic-import": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-export-namespace-from": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
-            "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz",
+            "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
             }
         },
         "@babel/plugin-proposal-json-strings": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-            "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz",
+            "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-json-strings": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-logical-assignment-operators": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
-            "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz",
+            "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
             }
         },
         "@babel/plugin-proposal-nullish-coalescing-operator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-            "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz",
+            "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-numeric-separator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-            "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz",
+            "integrity": "sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-numeric-separator": "^7.10.4"
             }
         },
         "@babel/plugin-proposal-object-rest-spread": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-            "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
+            "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-                "@babel/plugin-transform-parameters": "^7.10.4"
+                "@babel/plugin-transform-parameters": "^7.12.1"
             }
         },
         "@babel/plugin-proposal-optional-catch-binding": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-            "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz",
+            "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-optional-chaining": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-            "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz",
+            "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
                 "@babel/plugin-syntax-optional-chaining": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-private-methods": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
-            "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz",
+            "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.10.4",
+                "@babel/helper-create-class-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-proposal-unicode-property-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-            "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz",
+            "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-syntax-async-generators": {
             "version": "7.8.4",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
             "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             }
         },
         "@babel/plugin-syntax-class-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-            "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz",
+            "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-syntax-dynamic-import": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
             "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             }
         },
         "@babel/plugin-syntax-export-namespace-from": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
             "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.3"
             }
         },
         "@babel/plugin-syntax-json-strings": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
             "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             }
         },
         "@babel/plugin-syntax-logical-assignment-operators": {
             "version": "7.10.4",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
             "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-syntax-nullish-coalescing-operator": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
             "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             }
         },
         "@babel/plugin-syntax-numeric-separator": {
             "version": "7.10.4",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
             "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-syntax-object-rest-spread": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
             "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             }
         },
         "@babel/plugin-syntax-optional-catch-binding": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
             "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             }
         },
         "@babel/plugin-syntax-optional-chaining": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
             "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.8.0"
             }
         },
         "@babel/plugin-syntax-top-level-await": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-            "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz",
+            "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-arrow-functions": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-            "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz",
+            "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-async-to-generator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-            "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
+            "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/helper-module-imports": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-remap-async-to-generator": "^7.10.4"
+                "@babel/helper-remap-async-to-generator": "^7.12.1"
             },
             "dependencies": {
                 "@babel/helper-module-imports": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-                    "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+                    "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 }
             }
         },
         "@babel/plugin-transform-block-scoped-functions": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-            "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz",
+            "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-block-scoping": {
-            "version": "7.11.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-            "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz",
+            "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-classes": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-            "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz",
+            "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==",
             "dev": true,
             "requires": {
                 "@babel/helper-annotate-as-pure": "^7.10.4",
                 "@babel/helper-define-map": "^7.10.4",
                 "@babel/helper-function-name": "^7.10.4",
                 "@babel/helper-optimise-call-expression": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.12.1",
                 "@babel/helper-split-export-declaration": "^7.10.4",
                 "globals": "^11.1.0"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-member-expression-to-functions": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-                    "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+                    "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.0"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-optimise-call-expression": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
                     "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-replace-supers": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-                    "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+                    "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-member-expression-to-functions": "^7.10.4",
+                        "@babel/helper-member-expression-to-functions": "^7.12.1",
                         "@babel/helper-optimise-call-expression": "^7.10.4",
-                        "@babel/traverse": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/traverse": "^7.12.5",
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/plugin-transform-computed-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-            "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz",
+            "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-destructuring": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-            "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz",
+            "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-dotall-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-            "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz",
+            "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-duplicate-keys": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-            "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz",
+            "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-exponentiation-operator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-            "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz",
+            "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==",
             "dev": true,
             "requires": {
                 "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-for-of": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-            "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz",
+            "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-function-name": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-            "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz",
+            "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==",
             "dev": true,
             "requires": {
                 "@babel/helper-function-name": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 }
             }
         },
         "@babel/plugin-transform-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-            "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz",
+            "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-member-expression-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-            "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz",
+            "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-modules-amd": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-            "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz",
+            "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-transforms": "^7.10.5",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-member-expression-to-functions": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-                    "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+                    "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.0"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-module-imports": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-                    "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+                    "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-module-transforms": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-                    "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+                    "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-module-imports": "^7.10.4",
-                        "@babel/helper-replace-supers": "^7.10.4",
-                        "@babel/helper-simple-access": "^7.10.4",
+                        "@babel/helper-module-imports": "^7.12.1",
+                        "@babel/helper-replace-supers": "^7.12.1",
+                        "@babel/helper-simple-access": "^7.12.1",
                         "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/helper-validator-identifier": "^7.10.4",
                         "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.11.0",
+                        "@babel/traverse": "^7.12.1",
+                        "@babel/types": "^7.12.1",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/helper-optimise-call-expression": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
                     "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-replace-supers": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-                    "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+                    "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-member-expression-to-functions": "^7.10.4",
+                        "@babel/helper-member-expression-to-functions": "^7.12.1",
                         "@babel/helper-optimise-call-expression": "^7.10.4",
-                        "@babel/traverse": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/traverse": "^7.12.5",
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-simple-access": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-                    "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+                    "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
                     "dev": true,
                     "requires": {
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/plugin-transform-modules-commonjs": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-            "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz",
+            "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-transforms": "^7.10.4",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-simple-access": "^7.10.4",
+                "@babel/helper-simple-access": "^7.12.1",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-member-expression-to-functions": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-                    "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+                    "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.0"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-module-imports": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-                    "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+                    "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-module-transforms": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-                    "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+                    "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-module-imports": "^7.10.4",
-                        "@babel/helper-replace-supers": "^7.10.4",
-                        "@babel/helper-simple-access": "^7.10.4",
+                        "@babel/helper-module-imports": "^7.12.1",
+                        "@babel/helper-replace-supers": "^7.12.1",
+                        "@babel/helper-simple-access": "^7.12.1",
                         "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/helper-validator-identifier": "^7.10.4",
                         "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.11.0",
+                        "@babel/traverse": "^7.12.1",
+                        "@babel/types": "^7.12.1",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/helper-optimise-call-expression": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
                     "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-replace-supers": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-                    "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+                    "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-member-expression-to-functions": "^7.10.4",
+                        "@babel/helper-member-expression-to-functions": "^7.12.1",
                         "@babel/helper-optimise-call-expression": "^7.10.4",
-                        "@babel/traverse": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/traverse": "^7.12.5",
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-simple-access": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-                    "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+                    "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
                     "dev": true,
                     "requires": {
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/plugin-transform-modules-systemjs": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-            "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz",
+            "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==",
             "dev": true,
             "requires": {
                 "@babel/helper-hoist-variables": "^7.10.4",
-                "@babel/helper-module-transforms": "^7.10.5",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-validator-identifier": "^7.10.4",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-member-expression-to-functions": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-                    "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+                    "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.0"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-module-imports": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-                    "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+                    "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-module-transforms": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-                    "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+                    "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-module-imports": "^7.10.4",
-                        "@babel/helper-replace-supers": "^7.10.4",
-                        "@babel/helper-simple-access": "^7.10.4",
+                        "@babel/helper-module-imports": "^7.12.1",
+                        "@babel/helper-replace-supers": "^7.12.1",
+                        "@babel/helper-simple-access": "^7.12.1",
                         "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/helper-validator-identifier": "^7.10.4",
                         "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.11.0",
+                        "@babel/traverse": "^7.12.1",
+                        "@babel/types": "^7.12.1",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/helper-optimise-call-expression": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
                     "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-replace-supers": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-                    "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+                    "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-member-expression-to-functions": "^7.10.4",
+                        "@babel/helper-member-expression-to-functions": "^7.12.1",
                         "@babel/helper-optimise-call-expression": "^7.10.4",
-                        "@babel/traverse": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/traverse": "^7.12.5",
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-simple-access": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-                    "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+                    "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
                     "dev": true,
                     "requires": {
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/plugin-transform-modules-umd": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-            "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz",
+            "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-transforms": "^7.10.4",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-member-expression-to-functions": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-                    "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+                    "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.0"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-module-imports": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-                    "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+                    "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-module-transforms": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-                    "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+                    "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-module-imports": "^7.10.4",
-                        "@babel/helper-replace-supers": "^7.10.4",
-                        "@babel/helper-simple-access": "^7.10.4",
+                        "@babel/helper-module-imports": "^7.12.1",
+                        "@babel/helper-replace-supers": "^7.12.1",
+                        "@babel/helper-simple-access": "^7.12.1",
                         "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/helper-validator-identifier": "^7.10.4",
                         "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.11.0",
+                        "@babel/traverse": "^7.12.1",
+                        "@babel/types": "^7.12.1",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/helper-optimise-call-expression": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
                     "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-replace-supers": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-                    "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+                    "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-member-expression-to-functions": "^7.10.4",
+                        "@babel/helper-member-expression-to-functions": "^7.12.1",
                         "@babel/helper-optimise-call-expression": "^7.10.4",
-                        "@babel/traverse": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/traverse": "^7.12.5",
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-simple-access": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-                    "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+                    "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
                     "dev": true,
                     "requires": {
-                        "@babel/template": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/plugin-transform-named-capturing-groups-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-            "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz",
+            "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1"
             }
         },
         "@babel/plugin-transform-new-target": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-            "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz",
+            "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-object-super": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-            "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz",
+            "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4"
+                "@babel/helper-replace-supers": "^7.12.1"
             },
             "dependencies": {
                 "@babel/code-frame": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
                     "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
                     "dev": true,
                     "requires": {
                         "@babel/highlight": "^7.10.4"
                     }
                 },
                 "@babel/generator": {
-                    "version": "7.11.6",
-                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-                    "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+                    "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.5",
+                        "@babel/types": "^7.12.5",
                         "jsesc": "^2.5.1",
                         "source-map": "^0.5.0"
                     }
                 },
                 "@babel/helper-function-name": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
                     "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-get-function-arity": "^7.10.4",
                         "@babel/template": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-get-function-arity": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
                     "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-member-expression-to-functions": {
-                    "version": "7.11.0",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-                    "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+                    "version": "7.12.1",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+                    "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.11.0"
+                        "@babel/types": "^7.12.1"
                     }
                 },
                 "@babel/helper-optimise-call-expression": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
                     "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/helper-replace-supers": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-                    "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+                    "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/helper-member-expression-to-functions": "^7.10.4",
+                        "@babel/helper-member-expression-to-functions": "^7.12.1",
                         "@babel/helper-optimise-call-expression": "^7.10.4",
-                        "@babel/traverse": "^7.10.4",
-                        "@babel/types": "^7.10.4"
+                        "@babel/traverse": "^7.12.5",
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-split-export-declaration": {
                     "version": "7.11.0",
                     "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
                     "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
                     "dev": true,
                     "requires": {
                         "@babel/types": "^7.11.0"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/highlight": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
                     "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "chalk": "^2.0.0",
                         "js-tokens": "^4.0.0"
                     }
                 },
                 "@babel/parser": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-                    "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+                    "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
                     "dev": true
                 },
                 "@babel/template": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
                     "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
                         "@babel/parser": "^7.10.4",
                         "@babel/types": "^7.10.4"
                     }
                 },
                 "@babel/traverse": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-                    "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+                    "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.10.4",
-                        "@babel/generator": "^7.11.5",
+                        "@babel/generator": "^7.12.5",
                         "@babel/helper-function-name": "^7.10.4",
                         "@babel/helper-split-export-declaration": "^7.11.0",
-                        "@babel/parser": "^7.11.5",
-                        "@babel/types": "^7.11.5",
+                        "@babel/parser": "^7.12.5",
+                        "@babel/types": "^7.12.5",
                         "debug": "^4.1.0",
                         "globals": "^11.1.0",
                         "lodash": "^4.17.19"
                     }
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/plugin-transform-parameters": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-            "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz",
+            "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==",
             "dev": true,
             "requires": {
-                "@babel/helper-get-function-arity": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "dependencies": {
-                "@babel/helper-get-function-arity": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-                    "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/types": "^7.10.4"
-                    }
-                },
-                "@babel/helper-validator-identifier": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-                    "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-                    "dev": true
-                },
-                "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.4",
-                        "lodash": "^4.17.19",
-                        "to-fast-properties": "^2.0.0"
-                    }
-                }
             }
         },
         "@babel/plugin-transform-property-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-            "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz",
+            "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-regenerator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-            "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz",
+            "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==",
             "dev": true,
             "requires": {
                 "regenerator-transform": "^0.14.2"
             }
         },
         "@babel/plugin-transform-reserved-words": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-            "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz",
+            "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-runtime": {
-            "version": "7.11.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz",
-            "integrity": "sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz",
+            "integrity": "sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/helper-module-imports": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "resolve": "^1.8.1",
                 "semver": "^5.5.1"
             },
             "dependencies": {
                 "@babel/helper-module-imports": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-                    "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+                    "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 }
             }
         },
         "@babel/plugin-transform-shorthand-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-            "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz",
+            "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-spread": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-            "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz",
+            "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
             }
         },
         "@babel/plugin-transform-sticky-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-            "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz",
+            "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/helper-regex": "^7.10.4"
             }
         },
         "@babel/plugin-transform-template-literals": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-            "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz",
+            "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==",
             "dev": true,
             "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-typeof-symbol": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-            "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz",
+            "integrity": "sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-unicode-escapes": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
-            "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz",
+            "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-unicode-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-            "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz",
+            "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/preset-env": {
-            "version": "7.11.5",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
-            "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz",
+            "integrity": "sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==",
             "dev": true,
             "requires": {
-                "@babel/compat-data": "^7.11.0",
-                "@babel/helper-compilation-targets": "^7.10.4",
-                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/compat-data": "^7.12.1",
+                "@babel/helper-compilation-targets": "^7.12.1",
+                "@babel/helper-module-imports": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
-                "@babel/plugin-proposal-class-properties": "^7.10.4",
-                "@babel/plugin-proposal-dynamic-import": "^7.10.4",
-                "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-                "@babel/plugin-proposal-json-strings": "^7.10.4",
-                "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-                "@babel/plugin-proposal-numeric-separator": "^7.10.4",
-                "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-                "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-                "@babel/plugin-proposal-optional-chaining": "^7.11.0",
-                "@babel/plugin-proposal-private-methods": "^7.10.4",
-                "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
+                "@babel/helper-validator-option": "^7.12.1",
+                "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
+                "@babel/plugin-proposal-class-properties": "^7.12.1",
+                "@babel/plugin-proposal-dynamic-import": "^7.12.1",
+                "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
+                "@babel/plugin-proposal-json-strings": "^7.12.1",
+                "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
+                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+                "@babel/plugin-proposal-numeric-separator": "^7.12.1",
+                "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+                "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
+                "@babel/plugin-proposal-optional-chaining": "^7.12.1",
+                "@babel/plugin-proposal-private-methods": "^7.12.1",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
                 "@babel/plugin-syntax-async-generators": "^7.8.0",
-                "@babel/plugin-syntax-class-properties": "^7.10.4",
+                "@babel/plugin-syntax-class-properties": "^7.12.1",
                 "@babel/plugin-syntax-dynamic-import": "^7.8.0",
                 "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
                 "@babel/plugin-syntax-json-strings": "^7.8.0",
                 "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
                 "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
                 "@babel/plugin-syntax-numeric-separator": "^7.10.4",
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
                 "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
                 "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-                "@babel/plugin-syntax-top-level-await": "^7.10.4",
-                "@babel/plugin-transform-arrow-functions": "^7.10.4",
-                "@babel/plugin-transform-async-to-generator": "^7.10.4",
-                "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
-                "@babel/plugin-transform-block-scoping": "^7.10.4",
-                "@babel/plugin-transform-classes": "^7.10.4",
-                "@babel/plugin-transform-computed-properties": "^7.10.4",
-                "@babel/plugin-transform-destructuring": "^7.10.4",
-                "@babel/plugin-transform-dotall-regex": "^7.10.4",
-                "@babel/plugin-transform-duplicate-keys": "^7.10.4",
-                "@babel/plugin-transform-exponentiation-operator": "^7.10.4",
-                "@babel/plugin-transform-for-of": "^7.10.4",
-                "@babel/plugin-transform-function-name": "^7.10.4",
-                "@babel/plugin-transform-literals": "^7.10.4",
-                "@babel/plugin-transform-member-expression-literals": "^7.10.4",
-                "@babel/plugin-transform-modules-amd": "^7.10.4",
-                "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-                "@babel/plugin-transform-modules-systemjs": "^7.10.4",
-                "@babel/plugin-transform-modules-umd": "^7.10.4",
-                "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
-                "@babel/plugin-transform-new-target": "^7.10.4",
-                "@babel/plugin-transform-object-super": "^7.10.4",
-                "@babel/plugin-transform-parameters": "^7.10.4",
-                "@babel/plugin-transform-property-literals": "^7.10.4",
-                "@babel/plugin-transform-regenerator": "^7.10.4",
-                "@babel/plugin-transform-reserved-words": "^7.10.4",
-                "@babel/plugin-transform-shorthand-properties": "^7.10.4",
-                "@babel/plugin-transform-spread": "^7.11.0",
-                "@babel/plugin-transform-sticky-regex": "^7.10.4",
-                "@babel/plugin-transform-template-literals": "^7.10.4",
-                "@babel/plugin-transform-typeof-symbol": "^7.10.4",
-                "@babel/plugin-transform-unicode-escapes": "^7.10.4",
-                "@babel/plugin-transform-unicode-regex": "^7.10.4",
+                "@babel/plugin-syntax-top-level-await": "^7.12.1",
+                "@babel/plugin-transform-arrow-functions": "^7.12.1",
+                "@babel/plugin-transform-async-to-generator": "^7.12.1",
+                "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
+                "@babel/plugin-transform-block-scoping": "^7.12.1",
+                "@babel/plugin-transform-classes": "^7.12.1",
+                "@babel/plugin-transform-computed-properties": "^7.12.1",
+                "@babel/plugin-transform-destructuring": "^7.12.1",
+                "@babel/plugin-transform-dotall-regex": "^7.12.1",
+                "@babel/plugin-transform-duplicate-keys": "^7.12.1",
+                "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
+                "@babel/plugin-transform-for-of": "^7.12.1",
+                "@babel/plugin-transform-function-name": "^7.12.1",
+                "@babel/plugin-transform-literals": "^7.12.1",
+                "@babel/plugin-transform-member-expression-literals": "^7.12.1",
+                "@babel/plugin-transform-modules-amd": "^7.12.1",
+                "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+                "@babel/plugin-transform-modules-systemjs": "^7.12.1",
+                "@babel/plugin-transform-modules-umd": "^7.12.1",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
+                "@babel/plugin-transform-new-target": "^7.12.1",
+                "@babel/plugin-transform-object-super": "^7.12.1",
+                "@babel/plugin-transform-parameters": "^7.12.1",
+                "@babel/plugin-transform-property-literals": "^7.12.1",
+                "@babel/plugin-transform-regenerator": "^7.12.1",
+                "@babel/plugin-transform-reserved-words": "^7.12.1",
+                "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+                "@babel/plugin-transform-spread": "^7.12.1",
+                "@babel/plugin-transform-sticky-regex": "^7.12.1",
+                "@babel/plugin-transform-template-literals": "^7.12.1",
+                "@babel/plugin-transform-typeof-symbol": "^7.12.1",
+                "@babel/plugin-transform-unicode-escapes": "^7.12.1",
+                "@babel/plugin-transform-unicode-regex": "^7.12.1",
                 "@babel/preset-modules": "^0.1.3",
-                "@babel/types": "^7.11.5",
-                "browserslist": "^4.12.0",
+                "@babel/types": "^7.12.1",
                 "core-js-compat": "^3.6.2",
-                "invariant": "^2.2.2",
-                "levenary": "^1.1.1",
                 "semver": "^5.5.0"
             },
             "dependencies": {
                 "@babel/helper-module-imports": {
-                    "version": "7.10.4",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-                    "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+                    "version": "7.12.5",
+                    "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+                    "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
                     "dev": true,
                     "requires": {
-                        "@babel/types": "^7.10.4"
+                        "@babel/types": "^7.12.5"
                     }
                 },
                 "@babel/helper-validator-identifier": {
                     "version": "7.10.4",
                     "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
                     "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
                     "dev": true
                 },
                 "@babel/types": {
-                    "version": "7.11.5",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-                    "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+                    "version": "7.12.6",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+                    "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
                     "dev": true,
                     "requires": {
                         "@babel/helper-validator-identifier": "^7.10.4",
                         "lodash": "^4.17.19",
                         "to-fast-properties": "^2.0.0"
                     }
                 },
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 }
             }
         },
         "@babel/preset-modules": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
             "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.0.0",
                 "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
                 "@babel/plugin-transform-dotall-regex": "^7.4.4",
                 "@babel/types": "^7.4.4",
                 "esutils": "^2.0.2"
             }
         },
         "@babel/runtime": {
-            "version": "7.11.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-            "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+            "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
             "dev": true,
             "requires": {
                 "regenerator-runtime": "^0.13.4"
             }
         },
         "@babel/template": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz",
             "integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.10.3",
                 "@babel/parser": "^7.10.3",
                 "@babel/types": "^7.10.3"
             }
         },
         "@babel/traverse": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz",
             "integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.10.3",
                 "@babel/generator": "^7.10.3",
                 "@babel/helper-function-name": "^7.10.3",
                 "@babel/helper-split-export-declaration": "^7.10.1",
                 "@babel/parser": "^7.10.3",
                 "@babel/types": "^7.10.3",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0",
                 "lodash": "^4.17.13"
             },
             "dependencies": {
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
                     "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
                     "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
                 },
                 "globals": {
                     "version": "11.12.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
                     "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "@babel/types": {
             "version": "7.10.3",
             "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz",
             "integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==",
             "dev": true,
             "requires": {
                 "@babel/helper-validator-identifier": "^7.10.3",
                 "lodash": "^4.17.13",
                 "to-fast-properties": "^2.0.0"
             }
         },
         "@fortawesome/fontawesome-common-types": {
-            "version": "0.2.32",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz",
-            "integrity": "sha512-ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w==",
+            "version": "0.2.34",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz",
+            "integrity": "sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA==",
             "dev": true
         },
         "@fortawesome/fontawesome-svg-core": {
-            "version": "1.2.32",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz",
-            "integrity": "sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==",
+            "version": "1.2.34",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.34.tgz",
+            "integrity": "sha512-0KNN0nc5eIzaJxlv43QcDmTkDY1CqeN6J7OCGSs+fwGPdtv0yOQqRjieopBCmw+yd7uD3N2HeNL3Zm5isDleLg==",
             "dev": true,
             "requires": {
-                "@fortawesome/fontawesome-common-types": "^0.2.32"
+                "@fortawesome/fontawesome-common-types": "^0.2.34"
             }
         },
         "@fortawesome/free-brands-svg-icons": {
-            "version": "5.15.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.1.tgz",
-            "integrity": "sha512-pkTZIWn7iuliCCgV+huDfZmZb2UjslalXGDA2PcqOVUYJmYL11y6ooFiMJkJvUZu+xgAc1gZgQe+Px12mZF0CA==",
+            "version": "5.15.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.2.tgz",
+            "integrity": "sha512-YPlVjE1cEO+OJ9I9ay3TQ3I88+XkxMTYwnnddqAboxLhPNGncsHV0DjWOVLCyuAY66yPfyndWwVn4v7vuqsO1g==",
             "dev": true,
             "requires": {
-                "@fortawesome/fontawesome-common-types": "^0.2.32"
+                "@fortawesome/fontawesome-common-types": "^0.2.34"
             }
         },
         "@fortawesome/free-regular-svg-icons": {
-            "version": "5.15.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.1.tgz",
-            "integrity": "sha512-eD9NWFy89e7SVVtrLedJUxIpCBGhd4x7s7dhesokjyo1Tw62daqN5UcuAGu1NrepLLq1IeAYUVfWwnOjZ/j3HA==",
+            "version": "5.15.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.2.tgz",
+            "integrity": "sha512-Uv5NQCYjyisNVTu/1Xjs+z8vwQjbfT6hiqYvQNfF0n8qdgfWLM581bAfVMQ3BCs1SPy+eEUKNcGkK4n0FihFHg==",
             "dev": true,
             "requires": {
-                "@fortawesome/fontawesome-common-types": "^0.2.32"
+                "@fortawesome/fontawesome-common-types": "^0.2.34"
             }
         },
         "@fortawesome/free-solid-svg-icons": {
-            "version": "5.15.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz",
-            "integrity": "sha512-EFMuKtzRMNbvjab/SvJBaOOpaqJfdSap/Nl6hst7CgrJxwfORR1drdTV6q1Ib/JVzq4xObdTDcT6sqTaXMqfdg==",
+            "version": "5.15.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.2.tgz",
+            "integrity": "sha512-ZfCU+QjaFsdNZmOGmfqEWhzI3JOe37x5dF4kz9GeXvKn/sTxhqMtZ7mh3lBf76SvcYY5/GKFuyG7p1r4iWMQqw==",
             "dev": true,
             "requires": {
-                "@fortawesome/fontawesome-common-types": "^0.2.32"
+                "@fortawesome/fontawesome-common-types": "^0.2.34"
             }
         },
         "@fortawesome/vue-fontawesome": {
             "version": "0.1.10",
             "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz",
             "integrity": "sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==",
             "dev": true
         },
         "@mrmlnc/readdir-enhanced": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
             "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
             "dev": true,
             "requires": {
                 "call-me-maybe": "^1.0.1",
                 "glob-to-regexp": "^0.3.0"
             }
         },
         "@nodelib/fs.scandir": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
             "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
             "dev": true,
             "requires": {
                 "@nodelib/fs.stat": "2.0.3",
                 "run-parallel": "^1.1.9"
             },
             "dependencies": {
                 "@nodelib/fs.stat": {
                     "version": "2.0.3",
                     "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
                     "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
                     "dev": true
                 }
             }
         },
         "@nodelib/fs.stat": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
             "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
             "dev": true
         },
         "@nodelib/fs.walk": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
             "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
             "dev": true,
             "requires": {
                 "@nodelib/fs.scandir": "2.1.3",
                 "fastq": "^1.6.0"
             }
         },
         "@stylelint/postcss-css-in-js": {
             "version": "0.37.2",
             "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
             "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
             "dev": true,
             "requires": {
                 "@babel/core": ">=7.9.0"
             }
         },
         "@stylelint/postcss-markdown": {
-            "version": "0.36.1",
-            "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz",
-            "integrity": "sha512-iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw==",
+            "version": "0.36.2",
+            "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
+            "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
             "dev": true,
             "requires": {
-                "remark": "^12.0.0",
-                "unist-util-find-all-after": "^3.0.1"
+                "remark": "^13.0.0",
+                "unist-util-find-all-after": "^3.0.2"
             }
         },
         "@types/color-name": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
             "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
             "dev": true
         },
         "@types/glob": {
             "version": "7.1.3",
             "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
             "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
             "dev": true,
             "requires": {
                 "@types/minimatch": "*",
                 "@types/node": "*"
             }
         },
         "@types/json-schema": {
             "version": "7.0.5",
             "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
             "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==",
             "dev": true
         },
+        "@types/mdast": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
+            "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+            "dev": true,
+            "requires": {
+                "@types/unist": "*"
+            }
+        },
         "@types/minimatch": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
             "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
             "dev": true
         },
         "@types/minimist": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-            "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+            "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
             "dev": true
         },
         "@types/node": {
-            "version": "14.11.8",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.8.tgz",
-            "integrity": "sha512-KPcKqKm5UKDkaYPTuXSx8wEP7vE9GnuaXIZKijwRYcePpZFDVuy2a57LarFKiORbHOuTOOwYzxVxcUzsh2P2Pw==",
+            "version": "14.14.7",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz",
+            "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==",
             "dev": true
         },
         "@types/normalize-package-data": {
             "version": "2.4.0",
             "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
             "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
             "dev": true
         },
         "@types/parse-json": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
             "dev": true
         },
         "@types/q": {
             "version": "1.5.4",
             "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
             "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
             "dev": true
         },
         "@types/unist": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
             "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
             "dev": true
         },
         "@vue/component-compiler-utils": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz",
             "integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==",
             "dev": true,
             "requires": {
                 "consolidate": "^0.15.1",
                 "hash-sum": "^1.0.2",
                 "lru-cache": "^4.1.2",
                 "merge-source-map": "^1.1.0",
                 "postcss": "^7.0.14",
                 "postcss-selector-parser": "^6.0.2",
                 "prettier": "^1.18.2",
                 "source-map": "~0.6.1",
                 "vue-template-es2015-compiler": "^1.9.0"
             },
             "dependencies": {
                 "lru-cache": {
                     "version": "4.1.5",
                     "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
                     "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
                     "dev": true,
                     "requires": {
                         "pseudomap": "^1.0.2",
                         "yallist": "^2.1.2"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 },
                 "yallist": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
                     "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
                     "dev": true
                 }
             }
         },
         "@webassemblyjs/ast": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
             "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/helper-module-context": "1.9.0",
                 "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
                 "@webassemblyjs/wast-parser": "1.9.0"
             }
         },
         "@webassemblyjs/floating-point-hex-parser": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
             "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
             "dev": true
         },
         "@webassemblyjs/helper-api-error": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
             "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
             "dev": true
         },
         "@webassemblyjs/helper-buffer": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
             "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
             "dev": true
         },
         "@webassemblyjs/helper-code-frame": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
             "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/wast-printer": "1.9.0"
             }
         },
         "@webassemblyjs/helper-fsm": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
             "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
             "dev": true
         },
         "@webassemblyjs/helper-module-context": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
             "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0"
             }
         },
         "@webassemblyjs/helper-wasm-bytecode": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
             "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
             "dev": true
         },
         "@webassemblyjs/helper-wasm-section": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
             "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/helper-buffer": "1.9.0",
                 "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
                 "@webassemblyjs/wasm-gen": "1.9.0"
             }
         },
         "@webassemblyjs/ieee754": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
             "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
             "dev": true,
             "requires": {
                 "@xtuc/ieee754": "^1.2.0"
             }
         },
         "@webassemblyjs/leb128": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
             "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
             "dev": true,
             "requires": {
                 "@xtuc/long": "4.2.2"
             }
         },
         "@webassemblyjs/utf8": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
             "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
             "dev": true
         },
         "@webassemblyjs/wasm-edit": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
             "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/helper-buffer": "1.9.0",
                 "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
                 "@webassemblyjs/helper-wasm-section": "1.9.0",
                 "@webassemblyjs/wasm-gen": "1.9.0",
                 "@webassemblyjs/wasm-opt": "1.9.0",
                 "@webassemblyjs/wasm-parser": "1.9.0",
                 "@webassemblyjs/wast-printer": "1.9.0"
             }
         },
         "@webassemblyjs/wasm-gen": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
             "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
                 "@webassemblyjs/ieee754": "1.9.0",
                 "@webassemblyjs/leb128": "1.9.0",
                 "@webassemblyjs/utf8": "1.9.0"
             }
         },
         "@webassemblyjs/wasm-opt": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
             "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/helper-buffer": "1.9.0",
                 "@webassemblyjs/wasm-gen": "1.9.0",
                 "@webassemblyjs/wasm-parser": "1.9.0"
             }
         },
         "@webassemblyjs/wasm-parser": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
             "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/helper-api-error": "1.9.0",
                 "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
                 "@webassemblyjs/ieee754": "1.9.0",
                 "@webassemblyjs/leb128": "1.9.0",
                 "@webassemblyjs/utf8": "1.9.0"
             }
         },
         "@webassemblyjs/wast-parser": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
             "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/floating-point-hex-parser": "1.9.0",
                 "@webassemblyjs/helper-api-error": "1.9.0",
                 "@webassemblyjs/helper-code-frame": "1.9.0",
                 "@webassemblyjs/helper-fsm": "1.9.0",
                 "@xtuc/long": "4.2.2"
             }
         },
         "@webassemblyjs/wast-printer": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
             "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/wast-parser": "1.9.0",
                 "@xtuc/long": "4.2.2"
             }
         },
         "@xtuc/ieee754": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
             "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
             "dev": true
         },
         "@xtuc/long": {
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
             "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
             "dev": true
         },
         "accepts": {
             "version": "1.3.7",
             "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
             "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
             "dev": true,
             "requires": {
                 "mime-types": "~2.1.24",
                 "negotiator": "0.6.2"
             }
         },
         "acorn": {
             "version": "7.3.1",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
             "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
             "dev": true
         },
         "acorn-jsx": {
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
             "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
             "dev": true
         },
         "adjust-sourcemap-loader": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz",
-            "integrity": "sha1-4z/eleUNufKoAuNkfjEdL8UADGk=",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz",
+            "integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==",
             "dev": true,
             "requires": {
-                "assert": "^1.3.0",
-                "camelcase": "^1.2.1",
-                "loader-utils": "^1.1.0",
-                "lodash.assign": "^4.0.1",
-                "lodash.defaults": "^3.1.2",
-                "object-path": "^0.9.2",
-                "regex-parser": "^2.2.9"
+                "loader-utils": "^2.0.0",
+                "regex-parser": "^2.2.11"
             },
             "dependencies": {
-                "camelcase": {
-                    "version": "1.2.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-                    "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+                "emojis-list": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+                    "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
                     "dev": true
                 },
-                "lodash.defaults": {
-                    "version": "3.1.2",
-                    "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
-                    "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
+                "loader-utils": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+                    "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
                     "dev": true,
                     "requires": {
-                        "lodash.assign": "^3.0.0",
-                        "lodash.restparam": "^3.0.0"
-                    },
-                    "dependencies": {
-                        "lodash.assign": {
-                            "version": "3.2.0",
-                            "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-                            "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-                            "dev": true,
-                            "requires": {
-                                "lodash._baseassign": "^3.0.0",
-                                "lodash._createassigner": "^3.0.0",
-                                "lodash.keys": "^3.0.0"
-                            }
-                        }
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^2.1.2"
                     }
                 }
             }
         },
         "aggregate-error": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
             "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
             "dev": true,
             "requires": {
                 "clean-stack": "^2.0.0",
                 "indent-string": "^4.0.0"
             }
         },
         "ajv": {
             "version": "6.12.2",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
             "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
             "dev": true,
             "requires": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
                 "json-schema-traverse": "^0.4.1",
                 "uri-js": "^4.2.2"
             }
         },
         "ajv-errors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
             "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
             "dev": true
         },
         "ajv-keywords": {
             "version": "3.5.0",
             "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.0.tgz",
             "integrity": "sha512-eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw==",
             "dev": true
         },
         "alphanum-sort": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
             "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
             "dev": true
         },
+        "anchorme": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/anchorme/-/anchorme-2.1.2.tgz",
+            "integrity": "sha512-2iPY3kxDDZvtRzauqKDb4v7a5sTF4GZ+esQTY8nGYvmhAtGTeFPMn4cRnvyWS1qmtPTP0Mv8hyLOp9l3ZzWMKg==",
+            "dev": true
+        },
         "ansi-colors": {
             "version": "3.2.4",
             "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
             "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
             "dev": true
         },
         "ansi-escapes": {
             "version": "4.3.1",
             "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
             "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
             "dev": true,
             "requires": {
                 "type-fest": "^0.11.0"
             },
             "dependencies": {
                 "type-fest": {
                     "version": "0.11.0",
                     "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
                     "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
                     "dev": true
                 }
             }
         },
         "ansi-html": {
             "version": "0.0.7",
             "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
             "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
             "dev": true
         },
         "ansi-regex": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
             "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
             "dev": true
         },
         "ansi-styles": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
             "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
             "dev": true,
             "requires": {
                 "color-convert": "^1.9.0"
             }
         },
         "anymatch": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
             "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
             "dev": true,
             "requires": {
                 "micromatch": "^3.1.4",
                 "normalize-path": "^2.1.1"
             },
             "dependencies": {
                 "normalize-path": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
                     "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
                     "dev": true,
                     "requires": {
                         "remove-trailing-separator": "^1.0.1"
                     }
                 }
             }
         },
         "aproba": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
             "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
             "dev": true
         },
         "argparse": {
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
             "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
             "dev": true,
             "requires": {
                 "sprintf-js": "~1.0.2"
             }
         },
+        "arity-n": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+            "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
+            "dev": true
+        },
         "arr-diff": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
             "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
             "dev": true
         },
         "arr-flatten": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
             "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
             "dev": true
         },
         "arr-union": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
             "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
             "dev": true
         },
         "array-flatten": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
             "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
         "array-union": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
             "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
             "dev": true,
             "requires": {
                 "array-uniq": "^1.0.1"
             }
         },
         "array-uniq": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
             "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
             "dev": true
         },
         "array-unique": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
             "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
             "dev": true
         },
         "arrify": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
             "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
             "dev": true
         },
         "asn1.js": {
             "version": "5.4.1",
             "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
             "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.0.0",
                 "inherits": "^2.0.1",
                 "minimalistic-assert": "^1.0.0",
                 "safer-buffer": "^2.1.0"
             },
             "dependencies": {
                 "bn.js": {
                     "version": "4.11.9",
                     "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
                     "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                     "dev": true
                 }
             }
         },
         "assert": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
             "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=",
             "dev": true,
             "requires": {
                 "object-assign": "^4.1.1",
                 "util": "0.10.3"
             },
             "dependencies": {
                 "inherits": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
                     "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
                     "dev": true
                 },
                 "util": {
                     "version": "0.10.3",
                     "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
                     "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
                     "dev": true,
                     "requires": {
                         "inherits": "2.0.1"
                     }
                 }
             }
         },
         "assign-symbols": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
             "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
             "dev": true
         },
         "ast-types": {
             "version": "0.9.6",
             "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
             "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
             "dev": true
         },
         "astral-regex": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
             "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
             "dev": true
         },
         "async": {
             "version": "2.6.3",
             "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
             "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
             "dev": true,
             "requires": {
                 "lodash": "^4.17.14"
             }
         },
         "async-each": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
             "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
             "dev": true
         },
         "async-limiter": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
             "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
             "dev": true
         },
         "atob": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
             "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
             "dev": true
         },
         "autoprefixer": {
-            "version": "9.8.4",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.4.tgz",
-            "integrity": "sha512-84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A==",
+            "version": "9.8.6",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
+            "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.12.0",
-                "caniuse-lite": "^1.0.30001087",
-                "colorette": "^1.2.0",
+                "caniuse-lite": "^1.0.30001109",
+                "colorette": "^1.2.1",
                 "normalize-range": "^0.1.2",
                 "num2fraction": "^1.2.2",
                 "postcss": "^7.0.32",
                 "postcss-value-parser": "^4.1.0"
+            },
+            "dependencies": {
+                "caniuse-lite": {
+                    "version": "1.0.30001157",
+                    "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz",
+                    "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==",
+                    "dev": true
+                }
             }
         },
         "axios": {
-            "version": "0.19.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
-            "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+            "version": "0.21.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+            "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
             "dev": true,
             "requires": {
-                "follow-redirects": "1.5.10",
-                "is-buffer": "^2.0.2"
-            }
-        },
-        "babel-code-frame": {
+                "follow-redirects": "^1.10.0"
+            },
+            "dependencies": {
+                "follow-redirects": {
+                    "version": "1.13.1",
+                    "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+                    "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==",
+                    "dev": true
+                }
+            }
+        },
+        "babel-code-frame": {
             "version": "6.26.0",
             "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
             "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
             "dev": true,
             "requires": {
                 "chalk": "^1.1.3",
                 "esutils": "^2.0.2",
                 "js-tokens": "^3.0.2"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
                     "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
                     "dev": true
                 },
                 "ansi-styles": {
                     "version": "2.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
                     "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
                     "dev": true
                 },
                 "chalk": {
                     "version": "1.1.3",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
                     "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^2.2.1",
                         "escape-string-regexp": "^1.0.2",
                         "has-ansi": "^2.0.0",
                         "strip-ansi": "^3.0.0",
                         "supports-color": "^2.0.0"
                     }
                 },
                 "js-tokens": {
                     "version": "3.0.2",
                     "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
                     "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
                     "dev": true
                 },
                 "strip-ansi": {
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
                     "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
                 },
                 "supports-color": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
                     "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
                     "dev": true
                 }
             }
         },
         "babel-loader": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-            "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+            "version": "8.2.1",
+            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz",
+            "integrity": "sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==",
             "dev": true,
             "requires": {
                 "find-cache-dir": "^2.1.0",
                 "loader-utils": "^1.4.0",
-                "mkdirp": "^0.5.3",
+                "make-dir": "^2.1.0",
                 "pify": "^4.0.1",
                 "schema-utils": "^2.6.5"
             },
             "dependencies": {
                 "emojis-list": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
                     "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
                     "dev": true
                 },
                 "json5": {
                     "version": "1.0.1",
                     "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
                     "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
                     "dev": true,
                     "requires": {
                         "minimist": "^1.2.0"
                     }
                 },
                 "loader-utils": {
                     "version": "1.4.0",
                     "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
                     "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
                     "dev": true,
                     "requires": {
                         "big.js": "^5.2.2",
                         "emojis-list": "^3.0.0",
                         "json5": "^1.0.1"
                     }
                 }
             }
         },
         "babel-merge": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/babel-merge/-/babel-merge-2.0.1.tgz",
             "integrity": "sha512-puTQQxuzS+0JlMyVdfsTVaCgzqjBXKPMv7oUANpYcHFY+7IptWZ4PZDYX+qBxrRMtrriuBA44LkKpS99EJzqVA==",
             "dev": true,
             "requires": {
                 "@babel/core": "^7.0.0-beta.49",
                 "deepmerge": "^2.1.0",
                 "object.omit": "^3.0.0"
             }
         },
         "babel-plugin-dynamic-import-node": {
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
             "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
             "dev": true,
             "requires": {
                 "object.assign": "^4.1.0"
             }
         },
         "bail": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
             "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
             "dev": true
         },
         "balanced-match": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
             "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
             "dev": true
         },
         "base": {
             "version": "0.11.2",
             "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
             "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
             "dev": true,
             "requires": {
                 "cache-base": "^1.0.1",
                 "class-utils": "^0.3.5",
                 "component-emitter": "^1.2.1",
                 "define-property": "^1.0.0",
                 "isobject": "^3.0.1",
                 "mixin-deep": "^1.2.0",
                 "pascalcase": "^0.1.1"
             },
             "dependencies": {
                 "define-property": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
                     "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^1.0.0"
                     }
                 },
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
                     "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
                     "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
                     "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
                         "is-data-descriptor": "^1.0.0",
                         "kind-of": "^6.0.2"
                     }
                 }
             }
         },
         "base64-js": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-            "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
             "dev": true
         },
         "batch": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
             "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
             "dev": true
         },
         "big.js": {
             "version": "5.2.2",
             "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
             "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
             "dev": true
         },
         "binary-extensions": {
             "version": "1.13.1",
             "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
             "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
             "dev": true
         },
         "bindings": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
             "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
             "dev": true,
             "optional": true,
             "requires": {
                 "file-uri-to-path": "1.0.0"
             }
         },
         "bluebird": {
             "version": "3.7.2",
             "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
             "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
             "dev": true
         },
         "bn.js": {
             "version": "5.1.3",
             "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
             "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
             "dev": true
         },
         "body-parser": {
             "version": "1.19.0",
             "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
             "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
             "dev": true,
             "requires": {
                 "bytes": "3.1.0",
                 "content-type": "~1.0.4",
                 "debug": "2.6.9",
                 "depd": "~1.1.2",
                 "http-errors": "1.7.2",
                 "iconv-lite": "0.4.24",
                 "on-finished": "~2.3.0",
                 "qs": "6.7.0",
                 "raw-body": "2.4.0",
                 "type-is": "~1.6.17"
             },
             "dependencies": {
                 "bytes": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
                     "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
                     "dev": true
                 },
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
                 }
             }
         },
         "bonjour": {
             "version": "3.5.0",
             "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
             "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
             "dev": true,
             "requires": {
                 "array-flatten": "^2.1.0",
                 "deep-equal": "^1.0.1",
                 "dns-equal": "^1.0.0",
                 "dns-txt": "^2.0.2",
                 "multicast-dns": "^6.0.1",
                 "multicast-dns-service-types": "^1.1.0"
             }
         },
         "boolbase": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
             "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
             "dev": true
         },
         "bootstrap": {
             "version": "4.5.3",
             "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz",
             "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==",
             "dev": true
         },
         "brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
             "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
             "dev": true,
             "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
             }
         },
         "braces": {
             "version": "2.3.2",
             "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
             "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
             "dev": true,
             "requires": {
                 "arr-flatten": "^1.1.0",
                 "array-unique": "^0.3.2",
                 "extend-shallow": "^2.0.1",
                 "fill-range": "^4.0.0",
                 "isobject": "^3.0.1",
                 "repeat-element": "^1.1.2",
                 "snapdragon": "^0.8.1",
                 "snapdragon-node": "^2.0.1",
                 "split-string": "^3.0.2",
                 "to-regex": "^3.0.1"
             },
             "dependencies": {
                 "extend-shallow": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
                     "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
                         "is-extendable": "^0.1.0"
                     }
                 },
                 "is-extendable": {
                     "version": "0.1.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
                     "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
                     "dev": true
                 }
             }
         },
         "brorand": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
             "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
             "dev": true
         },
         "browserify-aes": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
             "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
             "dev": true,
             "requires": {
                 "buffer-xor": "^1.0.3",
                 "cipher-base": "^1.0.0",
                 "create-hash": "^1.1.0",
                 "evp_bytestokey": "^1.0.3",
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.0.1"
             }
         },
         "browserify-cipher": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
             "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
             "dev": true,
             "requires": {
                 "browserify-aes": "^1.0.4",
                 "browserify-des": "^1.0.0",
                 "evp_bytestokey": "^1.0.0"
             }
         },
         "browserify-des": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
             "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
             "dev": true,
             "requires": {
                 "cipher-base": "^1.0.1",
                 "des.js": "^1.0.0",
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.1.2"
             }
         },
         "browserify-rsa": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-            "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+            "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
             "dev": true,
             "requires": {
-                "bn.js": "^4.1.0",
+                "bn.js": "^5.0.0",
                 "randombytes": "^2.0.1"
-            },
-            "dependencies": {
-                "bn.js": {
-                    "version": "4.11.9",
-                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                    "dev": true
-                }
             }
         },
         "browserify-sign": {
             "version": "4.2.1",
             "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
             "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
             "dev": true,
             "requires": {
                 "bn.js": "^5.1.1",
                 "browserify-rsa": "^4.0.1",
                 "create-hash": "^1.2.0",
                 "create-hmac": "^1.1.7",
                 "elliptic": "^6.5.3",
                 "inherits": "^2.0.4",
                 "parse-asn1": "^5.1.5",
                 "readable-stream": "^3.6.0",
                 "safe-buffer": "^5.2.0"
             },
             "dependencies": {
                 "readable-stream": {
                     "version": "3.6.0",
                     "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
                     "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
                     "dev": true,
                     "requires": {
                         "inherits": "^2.0.3",
                         "string_decoder": "^1.1.1",
                         "util-deprecate": "^1.0.1"
                     }
                 },
                 "safe-buffer": {
                     "version": "5.2.1",
                     "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
                     "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
                     "dev": true
                 }
             }
         },
         "browserify-zlib": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
             "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
             "dev": true,
             "requires": {
                 "pako": "~1.0.5"
             }
         },
         "browserslist": {
             "version": "4.12.2",
             "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.2.tgz",
             "integrity": "sha512-MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw==",
             "dev": true,
             "requires": {
                 "caniuse-lite": "^1.0.30001088",
                 "electron-to-chromium": "^1.3.483",
                 "escalade": "^3.0.1",
                 "node-releases": "^1.1.58"
             }
         },
         "buffer": {
             "version": "4.9.2",
             "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
             "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
             "dev": true,
             "requires": {
                 "base64-js": "^1.0.2",
                 "ieee754": "^1.1.4",
                 "isarray": "^1.0.0"
             }
         },
         "buffer-from": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
             "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
             "dev": true
         },
         "buffer-indexof": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
             "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
             "dev": true
         },
         "buffer-xor": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
             "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
             "dev": true
         },
         "builtin-status-codes": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
             "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
             "dev": true
         },
         "bytes": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
             "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
             "dev": true
         },
         "cacache": {
             "version": "13.0.1",
             "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
             "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
             "dev": true,
             "requires": {
                 "chownr": "^1.1.2",
                 "figgy-pudding": "^3.5.1",
                 "fs-minipass": "^2.0.0",
                 "glob": "^7.1.4",
                 "graceful-fs": "^4.2.2",
                 "infer-owner": "^1.0.4",
                 "lru-cache": "^5.1.1",
                 "minipass": "^3.0.0",
                 "minipass-collect": "^1.0.2",
                 "minipass-flush": "^1.0.5",
                 "minipass-pipeline": "^1.2.2",
                 "mkdirp": "^0.5.1",
                 "move-concurrently": "^1.0.1",
                 "p-map": "^3.0.0",
                 "promise-inflight": "^1.0.1",
                 "rimraf": "^2.7.1",
                 "ssri": "^7.0.0",
                 "unique-filename": "^1.1.1"
             },
             "dependencies": {
                 "rimraf": {
                     "version": "2.7.1",
                     "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
                     "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
                     "dev": true,
                     "requires": {
                         "glob": "^7.1.3"
                     }
                 }
             }
         },
         "cache-base": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
             "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
             "dev": true,
             "requires": {
                 "collection-visit": "^1.0.0",
                 "component-emitter": "^1.2.1",
                 "get-value": "^2.0.6",
                 "has-value": "^1.0.0",
                 "isobject": "^3.0.1",
                 "set-value": "^2.0.0",
                 "to-object-path": "^0.3.0",
                 "union-value": "^1.0.0",
                 "unset-value": "^1.0.0"
             }
         },
+        "call-bind": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
+            "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.0.0"
+            }
+        },
         "call-me-maybe": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
             "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
             "dev": true
         },
         "caller-callsite": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
             "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
             "dev": true,
             "requires": {
                 "callsites": "^2.0.0"
             },
             "dependencies": {
                 "callsites": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
                     "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
                     "dev": true
                 }
             }
         },
         "caller-path": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
             "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
             "dev": true,
             "requires": {
                 "caller-callsite": "^2.0.0"
             }
         },
         "callsites": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
             "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
             "dev": true
         },
         "camel-case": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
             "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
             "dev": true,
             "requires": {
                 "no-case": "^2.2.0",
                 "upper-case": "^1.1.1"
             }
         },
         "camelcase": {
             "version": "5.3.1",
             "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
             "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
             "dev": true
         },
         "camelcase-keys": {
             "version": "6.2.2",
             "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
             "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
             "dev": true,
             "requires": {
                 "camelcase": "^5.3.1",
                 "map-obj": "^4.0.0",
                 "quick-lru": "^4.0.1"
             }
         },
         "caniuse-api": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
             "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
                 "caniuse-lite": "^1.0.0",
                 "lodash.memoize": "^4.1.2",
                 "lodash.uniq": "^4.5.0"
             }
         },
         "caniuse-lite": {
             "version": "1.0.30001090",
             "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001090.tgz",
             "integrity": "sha512-QzPRKDCyp7RhjczTPZaqK3CjPA5Ht2UnXhZhCI4f7QiB5JK6KEuZBxIzyWnB3wO4hgAj4GMRxAhuiacfw0Psjg==",
             "dev": true
         },
-        "ccount": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz",
-            "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==",
-            "dev": true
-        },
         "chalk": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
             "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
             "dev": true,
             "requires": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
             },
             "dependencies": {
                 "ansi-styles": {
                     "version": "4.3.0",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
                     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
                     "dev": true,
                     "requires": {
                         "color-convert": "^2.0.1"
                     }
                 },
                 "color-convert": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
                     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
                     "dev": true,
                     "requires": {
                         "color-name": "~1.1.4"
                     }
                 },
                 "color-name": {
                     "version": "1.1.4",
                     "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
                     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
                     "dev": true
                 },
                 "has-flag": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
                     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
                     "dev": true
                 },
                 "supports-color": {
                     "version": "7.2.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
                     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
                     "dev": true,
                     "requires": {
                         "has-flag": "^4.0.0"
                     }
                 }
             }
         },
         "character-entities": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
             "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
             "dev": true
         },
-        "character-entities-html4": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-            "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-            "dev": true
-        },
         "character-entities-legacy": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
             "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
             "dev": true
         },
         "character-reference-invalid": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
             "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
             "dev": true
         },
         "chardet": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
             "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
             "dev": true
         },
         "charenc": {
             "version": "0.0.2",
             "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
             "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
             "dev": true
         },
         "chokidar": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
-            "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+            "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
             "dev": true,
             "requires": {
-                "anymatch": "~3.1.1",
-                "braces": "~3.0.2",
-                "fsevents": "~2.1.2",
-                "glob-parent": "~5.1.0",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.5.0"
+                "anymatch": "^2.0.0",
+                "async-each": "^1.0.1",
+                "braces": "^2.3.2",
+                "fsevents": "^1.2.7",
+                "glob-parent": "^3.1.0",
+                "inherits": "^2.0.3",
+                "is-binary-path": "^1.0.0",
+                "is-glob": "^4.0.0",
+                "normalize-path": "^3.0.0",
+                "path-is-absolute": "^1.0.0",
+                "readdirp": "^2.2.1",
+                "upath": "^1.1.1"
             },
             "dependencies": {
-                "anymatch": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                    "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                    "dev": true,
-                    "requires": {
-                        "normalize-path": "^3.0.0",
-                        "picomatch": "^2.0.4"
-                    }
-                },
-                "binary-extensions": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-                    "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-                    "dev": true
-                },
-                "braces": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "dev": true,
-                    "requires": {
-                        "fill-range": "^7.0.1"
-                    }
-                },
-                "fill-range": {
-                    "version": "7.0.1",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "dev": true,
-                    "requires": {
-                        "to-regex-range": "^5.0.1"
-                    }
-                },
-                "fsevents": {
-                    "version": "2.1.3",
-                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-                    "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "is-binary-path": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-                    "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-                    "dev": true,
-                    "requires": {
-                        "binary-extensions": "^2.0.0"
-                    }
-                },
-                "is-number": {
-                    "version": "7.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "dev": true
-                },
-                "readdirp": {
-                    "version": "3.5.0",
-                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-                    "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-                    "dev": true,
-                    "requires": {
-                        "picomatch": "^2.2.1"
-                    }
-                },
-                "to-regex-range": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+                "glob-parent": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+                    "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
                     "dev": true,
                     "requires": {
-                        "is-number": "^7.0.0"
+                        "is-glob": "^3.1.0",
+                        "path-dirname": "^1.0.0"
+                    },
+                    "dependencies": {
+                        "is-glob": {
+                            "version": "3.1.0",
+                            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+                            "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+                            "dev": true,
+                            "requires": {
+                                "is-extglob": "^2.1.0"
+                            }
+                        }
                     }
                 }
             }
         },
         "chownr": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
             "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
             "dev": true
         },
         "chrome-trace-event": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
             "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
             "dev": true,
             "requires": {
                 "tslib": "^1.9.0"
             }
         },
         "cipher-base": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
             "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.0.1"
             }
         },
         "class-utils": {
             "version": "0.3.6",
             "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
             "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
             "dev": true,
             "requires": {
                 "arr-union": "^3.1.0",
                 "define-property": "^0.2.5",
                 "isobject": "^3.0.0",
                 "static-extend": "^0.1.1"
             },
             "dependencies": {
                 "define-property": {
                     "version": "0.2.5",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
                     "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^0.1.0"
                     }
                 }
             }
         },
         "clean-css": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
             "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
             "dev": true,
             "requires": {
                 "source-map": "~0.6.0"
             },
             "dependencies": {
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "clean-stack": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
             "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
             "dev": true
         },
         "cli-cursor": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
             "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
             "dev": true,
             "requires": {
                 "restore-cursor": "^3.1.0"
             }
         },
         "cli-width": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
             "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
             "dev": true
         },
         "cliui": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
             "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
             "dev": true,
             "requires": {
                 "string-width": "^3.1.0",
                 "strip-ansi": "^5.2.0",
                 "wrap-ansi": "^5.1.0"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
                     "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
                     "dev": true
                 },
                 "strip-ansi": {
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
                     "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^4.1.0"
                     }
                 }
             }
         },
         "clone-deep": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
             "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
             "dev": true,
             "requires": {
                 "is-plain-object": "^2.0.4",
                 "kind-of": "^6.0.2",
                 "shallow-clone": "^3.0.0"
             }
         },
         "clone-regexp": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
             "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
             "dev": true,
             "requires": {
                 "is-regexp": "^2.0.0"
             }
         },
         "coa": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
             "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
             "dev": true,
             "requires": {
                 "@types/q": "^1.5.1",
                 "chalk": "^2.4.1",
                 "q": "^1.1.2"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 }
             }
         },
-        "collapse-white-space": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-            "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-            "dev": true
-        },
         "collect.js": {
-            "version": "4.28.2",
-            "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.28.2.tgz",
-            "integrity": "sha512-Ok2z0kuyywWJ4AtkeUI61pbSxCmaN5XYr/fkUYJP4bYk6Dz3NKH2FA8RhF7i3Do9Iq80MLRFWasSOpyE9X7hDA==",
+            "version": "4.28.4",
+            "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.28.4.tgz",
+            "integrity": "sha512-NJXATt6r+gtGOgDJOKLeooTY6QpGn8YQN/PkKnCmajJOguz/xGPgPrTyrBkmBBTHXnniPRIkUqjqt3AkjwCKlg==",
             "dev": true
         },
         "collection-visit": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
             "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
             "dev": true,
             "requires": {
                 "map-visit": "^1.0.0",
                 "object-visit": "^1.0.0"
             }
         },
         "color": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
             "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
             "dev": true,
             "requires": {
                 "color-convert": "^1.9.1",
                 "color-string": "^1.5.4"
             }
         },
         "color-convert": {
             "version": "1.9.3",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
             "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
             "dev": true,
             "requires": {
                 "color-name": "1.1.3"
             }
         },
         "color-name": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
             "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
             "dev": true
         },
         "color-string": {
             "version": "1.5.4",
             "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz",
             "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==",
             "dev": true,
             "requires": {
                 "color-name": "^1.0.0",
                 "simple-swizzle": "^0.2.2"
             }
         },
         "colorette": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.0.tgz",
-            "integrity": "sha512-soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw==",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
+            "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==",
             "dev": true
         },
         "commander": {
             "version": "2.20.3",
             "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
             "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
             "dev": true
         },
         "commondir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
             "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
             "dev": true
         },
         "component-emitter": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
             "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
             "dev": true
         },
+        "compose-function": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+            "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
+            "dev": true,
+            "requires": {
+                "arity-n": "^1.0.4"
+            }
+        },
         "compressible": {
             "version": "2.0.18",
             "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
             "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
             "dev": true,
             "requires": {
                 "mime-db": ">= 1.43.0 < 2"
             }
         },
         "compression": {
             "version": "1.7.4",
             "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
             "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
             "dev": true,
             "requires": {
                 "accepts": "~1.3.5",
                 "bytes": "3.0.0",
                 "compressible": "~2.0.16",
                 "debug": "2.6.9",
                 "on-headers": "~1.0.2",
                 "safe-buffer": "5.1.2",
                 "vary": "~1.1.2"
             },
             "dependencies": {
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
                 }
             }
         },
         "concat": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/concat/-/concat-1.0.3.tgz",
             "integrity": "sha1-QPM1MInWVGdpXLGIa0Xt1jfYzKg=",
             "dev": true,
             "requires": {
                 "commander": "^2.9.0"
             }
         },
         "concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
             "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
             "dev": true
         },
         "concat-stream": {
             "version": "1.6.2",
             "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
             "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
             "dev": true,
             "requires": {
                 "buffer-from": "^1.0.0",
                 "inherits": "^2.0.3",
                 "readable-stream": "^2.2.2",
                 "typedarray": "^0.0.6"
             }
         },
         "connect-history-api-fallback": {
             "version": "1.6.0",
             "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
             "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
             "dev": true
         },
         "console-browserify": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
             "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
             "dev": true
         },
         "consolidate": {
             "version": "0.15.1",
             "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
             "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
             "dev": true,
             "requires": {
                 "bluebird": "^3.1.1"
             }
         },
         "constants-browserify": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
             "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
             "dev": true
         },
         "content-disposition": {
             "version": "0.5.3",
             "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
             "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
             "dev": true,
             "requires": {
                 "safe-buffer": "5.1.2"
             }
         },
         "content-type": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
             "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
             "dev": true
         },
         "convert-source-map": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-            "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+            "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
             "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.1"
             }
         },
         "cookie": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
             "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
             "dev": true
         },
         "cookie-signature": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
             "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
             "dev": true
         },
         "copy-concurrently": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
             "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
             "dev": true,
             "requires": {
                 "aproba": "^1.1.1",
                 "fs-write-stream-atomic": "^1.0.8",
                 "iferr": "^0.1.5",
                 "mkdirp": "^0.5.1",
                 "rimraf": "^2.5.4",
                 "run-queue": "^1.0.0"
             }
         },
         "copy-descriptor": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
             "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
             "dev": true
         },
         "core-js-compat": {
-            "version": "3.6.5",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-            "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+            "version": "3.7.0",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz",
+            "integrity": "sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==",
             "dev": true,
             "requires": {
-                "browserslist": "^4.8.5",
+                "browserslist": "^4.14.6",
                 "semver": "7.0.0"
             },
             "dependencies": {
+                "browserslist": {
+                    "version": "4.14.7",
+                    "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz",
+                    "integrity": "sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==",
+                    "dev": true,
+                    "requires": {
+                        "caniuse-lite": "^1.0.30001157",
+                        "colorette": "^1.2.1",
+                        "electron-to-chromium": "^1.3.591",
+                        "escalade": "^3.1.1",
+                        "node-releases": "^1.1.66"
+                    }
+                },
+                "caniuse-lite": {
+                    "version": "1.0.30001157",
+                    "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz",
+                    "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==",
+                    "dev": true
+                },
+                "electron-to-chromium": {
+                    "version": "1.3.595",
+                    "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.595.tgz",
+                    "integrity": "sha512-JpaBIhdBkF9FLG7x06ONfe0f5bxPrxRcq0X+Sc8vsCt+OPWIzxOD+qM71NEHLGbDfN9Q6hbtHRv4/dnvcOxo6g==",
+                    "dev": true
+                },
+                "escalade": {
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+                    "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+                    "dev": true
+                },
+                "node-releases": {
+                    "version": "1.1.66",
+                    "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz",
+                    "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==",
+                    "dev": true
+                },
                 "semver": {
                     "version": "7.0.0",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
                     "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
                     "dev": true
                 }
             }
         },
         "core-util-is": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
             "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
             "dev": true
         },
         "cosmiconfig": {
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
             "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
             "dev": true,
             "requires": {
                 "import-fresh": "^2.0.0",
                 "is-directory": "^0.3.1",
                 "js-yaml": "^3.13.1",
                 "parse-json": "^4.0.0"
             },
             "dependencies": {
                 "import-fresh": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
                     "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
                     "dev": true,
                     "requires": {
                         "caller-path": "^2.0.0",
                         "resolve-from": "^3.0.0"
                     }
                 },
                 "resolve-from": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
                     "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
                     "dev": true
                 }
             }
         },
         "create-ecdh": {
             "version": "4.0.4",
             "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
             "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.1.0",
                 "elliptic": "^6.5.3"
             },
             "dependencies": {
                 "bn.js": {
                     "version": "4.11.9",
                     "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
                     "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                     "dev": true
                 }
             }
         },
         "create-hash": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
             "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
             "dev": true,
             "requires": {
                 "cipher-base": "^1.0.1",
                 "inherits": "^2.0.1",
                 "md5.js": "^1.3.4",
                 "ripemd160": "^2.0.1",
                 "sha.js": "^2.4.0"
             }
         },
         "create-hmac": {
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
             "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
             "dev": true,
             "requires": {
                 "cipher-base": "^1.0.3",
                 "create-hash": "^1.1.0",
                 "inherits": "^2.0.1",
                 "ripemd160": "^2.0.0",
                 "safe-buffer": "^5.0.1",
                 "sha.js": "^2.4.8"
             }
         },
         "cross-env": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz",
-            "integrity": "sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==",
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+            "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
             "dev": true,
             "requires": {
                 "cross-spawn": "^7.0.1"
             }
         },
         "cross-spawn": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
             "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
             "dev": true,
             "requires": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
                 "which": "^2.0.1"
             }
         },
         "crypt": {
             "version": "0.0.2",
             "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
             "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
             "dev": true
         },
         "crypto-browserify": {
             "version": "3.12.0",
             "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
             "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
             "dev": true,
             "requires": {
                 "browserify-cipher": "^1.0.0",
                 "browserify-sign": "^4.0.0",
                 "create-ecdh": "^4.0.0",
                 "create-hash": "^1.1.0",
                 "create-hmac": "^1.1.0",
                 "diffie-hellman": "^5.0.0",
                 "inherits": "^2.0.1",
                 "pbkdf2": "^3.0.3",
                 "public-encrypt": "^4.0.0",
                 "randombytes": "^2.0.0",
                 "randomfill": "^1.0.3"
             }
         },
         "css": {
             "version": "2.2.4",
             "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-            "integrity": "sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=",
+            "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.3",
                 "source-map": "^0.6.1",
                 "source-map-resolve": "^0.5.2",
                 "urix": "^0.1.0"
             },
             "dependencies": {
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "css-color-names": {
             "version": "0.0.4",
             "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
             "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
             "dev": true
         },
         "css-declaration-sorter": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
             "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.1",
                 "timsort": "^0.3.0"
             }
         },
         "css-loader": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.1.tgz",
             "integrity": "sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==",
             "dev": true,
             "requires": {
                 "babel-code-frame": "^6.26.0",
                 "css-selector-tokenizer": "^0.7.0",
                 "icss-utils": "^2.1.0",
                 "loader-utils": "^1.0.2",
                 "lodash": "^4.17.11",
                 "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",
                 "postcss-value-parser": "^3.3.0",
                 "source-list-map": "^2.0.0"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "postcss": {
                     "version": "6.0.23",
                     "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
                     "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
                     "dev": true,
                     "requires": {
                         "chalk": "^2.4.1",
                         "source-map": "^0.6.1",
                         "supports-color": "^5.4.0"
                     }
                 },
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "css-select": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
             "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
             "dev": true,
             "requires": {
                 "boolbase": "^1.0.0",
                 "css-what": "^3.2.1",
                 "domutils": "^1.7.0",
                 "nth-check": "^1.0.2"
             }
         },
         "css-select-base-adapter": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
             "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
             "dev": true
         },
         "css-selector-tokenizer": {
             "version": "0.7.3",
             "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
             "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
             "dev": true,
             "requires": {
                 "cssesc": "^3.0.0",
                 "fastparse": "^1.1.2"
             }
         },
         "css-tree": {
             "version": "1.0.0-alpha.37",
             "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
             "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
             "dev": true,
             "requires": {
                 "mdn-data": "2.0.4",
                 "source-map": "^0.6.1"
             },
             "dependencies": {
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "css-what": {
-            "version": "3.4.1",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz",
-            "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+            "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
             "dev": true
         },
         "cssesc": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
             "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
             "dev": true
         },
         "cssnano": {
             "version": "4.1.10",
             "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
             "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
             "dev": true,
             "requires": {
                 "cosmiconfig": "^5.0.0",
                 "cssnano-preset-default": "^4.0.7",
                 "is-resolvable": "^1.0.0",
                 "postcss": "^7.0.0"
             }
         },
         "cssnano-preset-default": {
             "version": "4.0.7",
             "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
             "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
             "dev": true,
             "requires": {
                 "css-declaration-sorter": "^4.0.1",
                 "cssnano-util-raw-cache": "^4.0.1",
                 "postcss": "^7.0.0",
                 "postcss-calc": "^7.0.1",
                 "postcss-colormin": "^4.0.3",
                 "postcss-convert-values": "^4.0.1",
                 "postcss-discard-comments": "^4.0.2",
                 "postcss-discard-duplicates": "^4.0.2",
                 "postcss-discard-empty": "^4.0.1",
                 "postcss-discard-overridden": "^4.0.1",
                 "postcss-merge-longhand": "^4.0.11",
                 "postcss-merge-rules": "^4.0.3",
                 "postcss-minify-font-values": "^4.0.2",
                 "postcss-minify-gradients": "^4.0.2",
                 "postcss-minify-params": "^4.0.2",
                 "postcss-minify-selectors": "^4.0.2",
                 "postcss-normalize-charset": "^4.0.1",
                 "postcss-normalize-display-values": "^4.0.2",
                 "postcss-normalize-positions": "^4.0.2",
                 "postcss-normalize-repeat-style": "^4.0.2",
                 "postcss-normalize-string": "^4.0.2",
                 "postcss-normalize-timing-functions": "^4.0.2",
                 "postcss-normalize-unicode": "^4.0.1",
                 "postcss-normalize-url": "^4.0.1",
                 "postcss-normalize-whitespace": "^4.0.2",
                 "postcss-ordered-values": "^4.1.2",
                 "postcss-reduce-initial": "^4.0.3",
                 "postcss-reduce-transforms": "^4.0.2",
                 "postcss-svgo": "^4.0.2",
                 "postcss-unique-selectors": "^4.0.1"
             }
         },
         "cssnano-util-get-arguments": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
             "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
             "dev": true
         },
         "cssnano-util-get-match": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
             "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
             "dev": true
         },
         "cssnano-util-raw-cache": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
             "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
             }
         },
         "cssnano-util-same-parent": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
             "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
             "dev": true
         },
         "csso": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-            "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/csso/-/csso-4.1.0.tgz",
+            "integrity": "sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==",
             "dev": true,
             "requires": {
-                "css-tree": "1.0.0-alpha.39"
+                "css-tree": "^1.0.0"
             },
             "dependencies": {
                 "css-tree": {
-                    "version": "1.0.0-alpha.39",
-                    "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-                    "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz",
+                    "integrity": "sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA==",
                     "dev": true,
                     "requires": {
-                        "mdn-data": "2.0.6",
+                        "mdn-data": "2.0.12",
                         "source-map": "^0.6.1"
                     }
                 },
                 "mdn-data": {
-                    "version": "2.0.6",
-                    "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-                    "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+                    "version": "2.0.12",
+                    "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz",
+                    "integrity": "sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==",
                     "dev": true
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "cyclist": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
             "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
             "dev": true
         },
+        "d": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+            "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+            "dev": true,
+            "requires": {
+                "es5-ext": "^0.10.50",
+                "type": "^1.0.1"
+            }
+        },
         "de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
             "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
             "dev": true
         },
         "debug": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
             "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
             "dev": true,
             "requires": {
                 "ms": "2.0.0"
             }
         },
         "decamelize": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
             "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
             "dev": true
         },
         "decamelize-keys": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
             "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
             "dev": true,
             "requires": {
                 "decamelize": "^1.1.0",
                 "map-obj": "^1.0.0"
             },
             "dependencies": {
                 "map-obj": {
                     "version": "1.0.1",
                     "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
                     "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
                     "dev": true
                 }
             }
         },
         "decode-uri-component": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
             "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
             "dev": true
         },
         "deep-equal": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
             "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
             "dev": true,
             "requires": {
                 "is-arguments": "^1.0.4",
                 "is-date-object": "^1.0.1",
                 "is-regex": "^1.0.4",
                 "object-is": "^1.0.1",
                 "object-keys": "^1.1.1",
                 "regexp.prototype.flags": "^1.2.0"
             }
         },
         "deep-is": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
             "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
             "dev": true
         },
         "deepmerge": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
             "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==",
             "dev": true
         },
         "default-gateway": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
             "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
             "dev": true,
             "requires": {
                 "execa": "^1.0.0",
                 "ip-regex": "^2.1.0"
             }
         },
         "define-properties": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
             "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
             "dev": true,
             "requires": {
                 "object-keys": "^1.0.12"
             }
         },
         "define-property": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
             "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
             "dev": true,
             "requires": {
                 "is-descriptor": "^1.0.2",
                 "isobject": "^3.0.1"
             },
             "dependencies": {
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
                     "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
                     "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
                     "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
                         "is-data-descriptor": "^1.0.0",
                         "kind-of": "^6.0.2"
                     }
                 }
             }
         },
         "del": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
             "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
             "dev": true,
             "requires": {
                 "@types/glob": "^7.1.1",
                 "globby": "^6.1.0",
                 "is-path-cwd": "^2.0.0",
                 "is-path-in-cwd": "^2.0.0",
                 "p-map": "^2.0.0",
                 "pify": "^4.0.1",
                 "rimraf": "^2.6.3"
             },
             "dependencies": {
                 "globby": {
                     "version": "6.1.0",
                     "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
                     "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
                     "dev": true,
                     "requires": {
                         "array-union": "^1.0.1",
                         "glob": "^7.0.3",
                         "object-assign": "^4.0.1",
                         "pify": "^2.0.0",
                         "pinkie-promise": "^2.0.0"
                     },
                     "dependencies": {
                         "pify": {
                             "version": "2.3.0",
                             "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
                             "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
                             "dev": true
                         }
                     }
                 },
                 "p-map": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
                     "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
                     "dev": true
                 }
             }
         },
         "depd": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
             "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
             "dev": true
         },
         "des.js": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
             "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
                 "minimalistic-assert": "^1.0.0"
             }
         },
         "destroy": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
             "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
             "dev": true
         },
         "detect-file": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
             "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
             "dev": true
         },
         "detect-node": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
             "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
             "dev": true
         },
         "diffie-hellman": {
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
             "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.1.0",
                 "miller-rabin": "^4.0.0",
                 "randombytes": "^2.0.0"
             },
             "dependencies": {
                 "bn.js": {
                     "version": "4.11.9",
                     "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
                     "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                     "dev": true
                 }
             }
         },
         "dir-glob": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
             "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
             "dev": true,
             "requires": {
                 "arrify": "^1.0.1",
                 "path-type": "^3.0.0"
             }
         },
         "dns-equal": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
             "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
             "dev": true
         },
         "dns-packet": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
             "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
             "dev": true,
             "requires": {
                 "ip": "^1.1.0",
                 "safe-buffer": "^5.0.1"
             }
         },
         "dns-txt": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
             "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
             "dev": true,
             "requires": {
                 "buffer-indexof": "^1.0.0"
             }
         },
         "doctrine": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
             "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
             "dev": true,
             "requires": {
                 "esutils": "^2.0.2"
             }
         },
         "dom-serializer": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
             "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
             "dev": true,
             "requires": {
                 "domelementtype": "^2.0.1",
                 "entities": "^2.0.0"
             },
             "dependencies": {
                 "domelementtype": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
                     "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
                     "dev": true
                 }
             }
         },
         "domain-browser": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
             "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
             "dev": true
         },
         "domelementtype": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
             "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
             "dev": true
         },
         "domhandler": {
             "version": "2.4.2",
             "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
             "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
             "dev": true,
             "requires": {
                 "domelementtype": "1"
             }
         },
         "domutils": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
             "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
             "dev": true,
             "requires": {
                 "dom-serializer": "0",
                 "domelementtype": "1"
             }
         },
         "dot-prop": {
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
             "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
             "dev": true,
             "requires": {
                 "is-obj": "^2.0.0"
             }
         },
         "dotenv": {
             "version": "6.2.0",
             "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
             "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
             "dev": true
         },
         "dotenv-expand": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz",
             "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=",
             "dev": true
         },
         "duplexify": {
             "version": "3.7.1",
             "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
             "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.0.0",
                 "inherits": "^2.0.1",
                 "readable-stream": "^2.0.0",
                 "stream-shift": "^1.0.0"
             }
         },
         "ee-first": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
             "dev": true
         },
         "electron-to-chromium": {
             "version": "1.3.483",
             "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz",
             "integrity": "sha512-+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg==",
             "dev": true
         },
         "elliptic": {
             "version": "6.5.3",
             "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
             "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.4.0",
                 "brorand": "^1.0.1",
                 "hash.js": "^1.0.0",
                 "hmac-drbg": "^1.0.0",
                 "inherits": "^2.0.1",
                 "minimalistic-assert": "^1.0.0",
                 "minimalistic-crypto-utils": "^1.0.0"
             },
             "dependencies": {
                 "bn.js": {
                     "version": "4.11.9",
                     "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
                     "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                     "dev": true
                 }
             }
         },
         "emoji-regex": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
             "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
             "dev": true
         },
         "emojis-list": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
             "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
             "dev": true
         },
         "encodeurl": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
             "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
             "dev": true
         },
         "end-of-stream": {
             "version": "1.4.4",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
             "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
             "dev": true,
             "requires": {
                 "once": "^1.4.0"
             }
         },
         "enhanced-resolve": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz",
             "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.2",
                 "memory-fs": "^0.5.0",
                 "tapable": "^1.0.0"
             },
             "dependencies": {
                 "memory-fs": {
                     "version": "0.5.0",
                     "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
                     "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
                     "dev": true,
                     "requires": {
                         "errno": "^0.1.3",
                         "readable-stream": "^2.0.1"
                     }
                 }
             }
         },
         "entities": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
             "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
             "dev": true
         },
         "errno": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
             "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
             "dev": true,
             "requires": {
                 "prr": "~1.0.1"
             }
         },
         "error-ex": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
             "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
             "dev": true,
             "requires": {
                 "is-arrayish": "^0.2.1"
             }
         },
         "error-stack-parser": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
             "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
             "dev": true,
             "requires": {
                 "stackframe": "^1.1.1"
             }
         },
         "es-abstract": {
-            "version": "1.18.0-next.1",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-            "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+            "version": "1.17.7",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+            "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
             "dev": true,
             "requires": {
                 "es-to-primitive": "^1.2.1",
                 "function-bind": "^1.1.1",
                 "has": "^1.0.3",
                 "has-symbols": "^1.0.1",
                 "is-callable": "^1.2.2",
-                "is-negative-zero": "^2.0.0",
                 "is-regex": "^1.1.1",
                 "object-inspect": "^1.8.0",
                 "object-keys": "^1.1.1",
                 "object.assign": "^4.1.1",
                 "string.prototype.trimend": "^1.0.1",
                 "string.prototype.trimstart": "^1.0.1"
             }
         },
         "es-to-primitive": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
             "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
             "dev": true,
             "requires": {
                 "is-callable": "^1.1.4",
                 "is-date-object": "^1.0.1",
                 "is-symbol": "^1.0.2"
             }
         },
+        "es5-ext": {
+            "version": "0.10.53",
+            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+            "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+            "dev": true,
+            "requires": {
+                "es6-iterator": "~2.0.3",
+                "es6-symbol": "~3.1.3",
+                "next-tick": "~1.0.0"
+            }
+        },
+        "es6-iterator": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+            "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+            "dev": true,
+            "requires": {
+                "d": "1",
+                "es5-ext": "^0.10.35",
+                "es6-symbol": "^3.1.1"
+            }
+        },
+        "es6-symbol": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+            "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+            "dev": true,
+            "requires": {
+                "d": "^1.0.1",
+                "ext": "^1.1.2"
+            }
+        },
         "es6-templates": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz",
             "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=",
             "dev": true,
             "requires": {
                 "recast": "~0.11.12",
                 "through": "~2.3.6"
             }
         },
         "escalade": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz",
             "integrity": "sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA==",
             "dev": true
         },
         "escape-html": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
             "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
             "dev": true
         },
         "escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
             "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
             "dev": true
         },
         "eslint": {
             "version": "6.8.0",
             "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
             "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.0.0",
                 "ajv": "^6.10.0",
                 "chalk": "^2.1.0",
                 "cross-spawn": "^6.0.5",
                 "debug": "^4.0.1",
                 "doctrine": "^3.0.0",
                 "eslint-scope": "^5.0.0",
                 "eslint-utils": "^1.4.3",
                 "eslint-visitor-keys": "^1.1.0",
                 "espree": "^6.1.2",
                 "esquery": "^1.0.1",
                 "esutils": "^2.0.2",
                 "file-entry-cache": "^5.0.1",
                 "functional-red-black-tree": "^1.0.1",
                 "glob-parent": "^5.0.0",
                 "globals": "^12.1.0",
                 "ignore": "^4.0.6",
                 "import-fresh": "^3.0.0",
                 "imurmurhash": "^0.1.4",
                 "inquirer": "^7.0.0",
                 "is-glob": "^4.0.0",
                 "js-yaml": "^3.13.1",
                 "json-stable-stringify-without-jsonify": "^1.0.1",
                 "levn": "^0.3.0",
                 "lodash": "^4.17.14",
                 "minimatch": "^3.0.4",
                 "mkdirp": "^0.5.1",
                 "natural-compare": "^1.4.0",
                 "optionator": "^0.8.3",
                 "progress": "^2.0.0",
                 "regexpp": "^2.0.1",
                 "semver": "^6.1.2",
                 "strip-ansi": "^5.2.0",
                 "strip-json-comments": "^3.0.1",
                 "table": "^5.2.3",
                 "text-table": "^0.2.0",
                 "v8-compile-cache": "^2.0.3"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
                     "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
                     "dev": true
                 },
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "cross-spawn": {
                     "version": "6.0.5",
                     "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
                     "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
                     "dev": true,
                     "requires": {
                         "nice-try": "^1.0.4",
                         "path-key": "^2.0.1",
                         "semver": "^5.5.0",
                         "shebang-command": "^1.2.0",
                         "which": "^1.2.9"
                     },
                     "dependencies": {
                         "semver": {
                             "version": "5.7.1",
                             "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                             "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                             "dev": true
                         }
                     }
                 },
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
                     "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
                     "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 },
                 "path-key": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
                     "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
                     "dev": true
                 },
                 "shebang-command": {
                     "version": "1.2.0",
                     "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
                     "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
                     "dev": true,
                     "requires": {
                         "shebang-regex": "^1.0.0"
                     }
                 },
                 "shebang-regex": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
                     "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
                     "dev": true
                 },
                 "strip-ansi": {
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
                     "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^4.1.0"
                     }
                 },
                 "which": {
                     "version": "1.3.1",
                     "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
                     "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
                     "dev": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
                 }
             }
         },
         "eslint-plugin-vue": {
             "version": "6.2.2",
             "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz",
             "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==",
             "dev": true,
             "requires": {
                 "natural-compare": "^1.4.0",
                 "semver": "^5.6.0",
                 "vue-eslint-parser": "^7.0.0"
             },
             "dependencies": {
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 }
             }
         },
         "eslint-scope": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
             "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
             "dev": true,
             "requires": {
                 "esrecurse": "^4.1.0",
                 "estraverse": "^4.1.1"
             }
         },
         "eslint-utils": {
             "version": "1.4.3",
             "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
             "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
             "dev": true,
             "requires": {
                 "eslint-visitor-keys": "^1.1.0"
             }
         },
         "eslint-visitor-keys": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
             "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
             "dev": true
         },
         "espree": {
             "version": "6.2.1",
             "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
             "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
             "dev": true,
             "requires": {
                 "acorn": "^7.1.1",
                 "acorn-jsx": "^5.2.0",
                 "eslint-visitor-keys": "^1.1.0"
             }
         },
         "esprima": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
             "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
             "dev": true
         },
         "esquery": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
             "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
             "dev": true,
             "requires": {
                 "estraverse": "^5.1.0"
             },
             "dependencies": {
                 "estraverse": {
                     "version": "5.1.0",
                     "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
                     "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
                     "dev": true
                 }
             }
         },
         "esrecurse": {
             "version": "4.2.1",
             "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
             "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
             "dev": true,
             "requires": {
                 "estraverse": "^4.1.0"
             }
         },
         "estraverse": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
             "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
             "dev": true
         },
         "esutils": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
             "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
             "dev": true
         },
         "etag": {
             "version": "1.8.1",
             "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
             "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
             "dev": true
         },
         "eventemitter3": {
             "version": "4.0.7",
             "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
             "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
             "dev": true
         },
         "events": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
             "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
             "dev": true
         },
         "eventsource": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
             "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
             "dev": true,
             "requires": {
                 "original": "^1.0.0"
             }
         },
         "evp_bytestokey": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
             "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
             "dev": true,
             "requires": {
                 "md5.js": "^1.3.4",
                 "safe-buffer": "^5.1.1"
             }
         },
         "execa": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
             "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
             "dev": true,
             "requires": {
                 "cross-spawn": "^6.0.0",
                 "get-stream": "^4.0.0",
                 "is-stream": "^1.1.0",
                 "npm-run-path": "^2.0.0",
                 "p-finally": "^1.0.0",
                 "signal-exit": "^3.0.0",
                 "strip-eof": "^1.0.0"
             },
             "dependencies": {
                 "cross-spawn": {
                     "version": "6.0.5",
                     "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
                     "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
                     "dev": true,
                     "requires": {
                         "nice-try": "^1.0.4",
                         "path-key": "^2.0.1",
                         "semver": "^5.5.0",
                         "shebang-command": "^1.2.0",
                         "which": "^1.2.9"
                     }
                 },
                 "path-key": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
                     "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
                     "dev": true
                 },
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 },
                 "shebang-command": {
                     "version": "1.2.0",
                     "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
                     "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
                     "dev": true,
                     "requires": {
                         "shebang-regex": "^1.0.0"
                     }
                 },
                 "shebang-regex": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
                     "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
                     "dev": true
                 },
                 "which": {
                     "version": "1.3.1",
                     "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
                     "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
                     "dev": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
                 }
             }
         },
         "execall": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
             "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
             "dev": true,
             "requires": {
                 "clone-regexp": "^2.1.0"
             }
         },
         "expand-brackets": {
             "version": "2.1.4",
             "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
             "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
             "dev": true,
             "requires": {
                 "debug": "^2.3.3",
                 "define-property": "^0.2.5",
                 "extend-shallow": "^2.0.1",
                 "posix-character-classes": "^0.1.0",
                 "regex-not": "^1.0.0",
                 "snapdragon": "^0.8.1",
                 "to-regex": "^3.0.1"
             },
             "dependencies": {
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
                 },
                 "define-property": {
                     "version": "0.2.5",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
                     "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^0.1.0"
                     }
                 },
                 "extend-shallow": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
                     "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
                         "is-extendable": "^0.1.0"
                     }
                 },
                 "is-extendable": {
                     "version": "0.1.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
                     "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
                     "dev": true
                 }
             }
         },
         "expand-tilde": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
             "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
             "dev": true,
             "requires": {
                 "homedir-polyfill": "^1.0.1"
             }
         },
         "express": {
             "version": "4.17.1",
             "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
             "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
             "dev": true,
             "requires": {
                 "accepts": "~1.3.7",
                 "array-flatten": "1.1.1",
                 "body-parser": "1.19.0",
                 "content-disposition": "0.5.3",
                 "content-type": "~1.0.4",
                 "cookie": "0.4.0",
                 "cookie-signature": "1.0.6",
                 "debug": "2.6.9",
                 "depd": "~1.1.2",
                 "encodeurl": "~1.0.2",
                 "escape-html": "~1.0.3",
                 "etag": "~1.8.1",
                 "finalhandler": "~1.1.2",
                 "fresh": "0.5.2",
                 "merge-descriptors": "1.0.1",
                 "methods": "~1.1.2",
                 "on-finished": "~2.3.0",
                 "parseurl": "~1.3.3",
                 "path-to-regexp": "0.1.7",
                 "proxy-addr": "~2.0.5",
                 "qs": "6.7.0",
                 "range-parser": "~1.2.1",
                 "safe-buffer": "5.1.2",
                 "send": "0.17.1",
                 "serve-static": "1.14.1",
                 "setprototypeof": "1.1.1",
                 "statuses": "~1.5.0",
                 "type-is": "~1.6.18",
                 "utils-merge": "1.0.1",
                 "vary": "~1.1.2"
             },
             "dependencies": {
                 "array-flatten": {
                     "version": "1.1.1",
                     "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
                     "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
                     "dev": true
                 },
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
                 }
             }
         },
+        "ext": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+            "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+            "dev": true,
+            "requires": {
+                "type": "^2.0.0"
+            },
+            "dependencies": {
+                "type": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+                    "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
+                    "dev": true
+                }
+            }
+        },
         "extend": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
             "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
             "dev": true
         },
         "extend-shallow": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
             "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
             "dev": true,
             "requires": {
                 "assign-symbols": "^1.0.0",
                 "is-extendable": "^1.0.1"
             }
         },
         "external-editor": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
             "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
             "dev": true,
             "requires": {
                 "chardet": "^0.7.0",
                 "iconv-lite": "^0.4.24",
                 "tmp": "^0.0.33"
             }
         },
         "extglob": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
             "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
             "dev": true,
             "requires": {
                 "array-unique": "^0.3.2",
                 "define-property": "^1.0.0",
                 "expand-brackets": "^2.1.4",
                 "extend-shallow": "^2.0.1",
                 "fragment-cache": "^0.2.1",
                 "regex-not": "^1.0.0",
                 "snapdragon": "^0.8.1",
                 "to-regex": "^3.0.1"
             },
             "dependencies": {
                 "define-property": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
                     "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^1.0.0"
                     }
                 },
                 "extend-shallow": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
                     "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
                         "is-extendable": "^0.1.0"
                     }
                 },
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
                     "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
                     "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
                     "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
                         "is-data-descriptor": "^1.0.0",
                         "kind-of": "^6.0.2"
                     }
                 },
                 "is-extendable": {
                     "version": "0.1.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
                     "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
                     "dev": true
                 }
             }
         },
         "extract-text-webpack-plugin": {
             "version": "4.0.0-beta.0",
             "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
             "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
             "dev": true,
             "requires": {
                 "async": "^2.4.1",
                 "loader-utils": "^1.1.0",
                 "schema-utils": "^0.4.5",
                 "webpack-sources": "^1.1.0"
             },
             "dependencies": {
                 "schema-utils": {
                     "version": "0.4.7",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
                     "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
                     "dev": true,
                     "requires": {
                         "ajv": "^6.1.0",
                         "ajv-keywords": "^3.1.0"
                     }
                 }
             }
         },
         "fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
             "dev": true
         },
         "fast-glob": {
             "version": "2.2.7",
             "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
             "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
             "dev": true,
             "requires": {
                 "@mrmlnc/readdir-enhanced": "^2.2.1",
                 "@nodelib/fs.stat": "^1.1.2",
                 "glob-parent": "^3.1.0",
                 "is-glob": "^4.0.0",
                 "merge2": "^1.2.3",
                 "micromatch": "^3.1.10"
             },
             "dependencies": {
                 "glob-parent": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
                     "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
                     "dev": true,
                     "requires": {
                         "is-glob": "^3.1.0",
                         "path-dirname": "^1.0.0"
                     },
                     "dependencies": {
                         "is-glob": {
                             "version": "3.1.0",
                             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
                             "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
                             "dev": true,
                             "requires": {
                                 "is-extglob": "^2.1.0"
                             }
                         }
                     }
                 }
             }
         },
         "fast-json-stable-stringify": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
             "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
             "dev": true
         },
         "fast-levenshtein": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
             "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
             "dev": true
         },
         "fastest-levenshtein": {
             "version": "1.0.12",
             "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
             "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
             "dev": true
         },
         "fastparse": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
             "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
             "dev": true
         },
         "fastq": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-            "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
+            "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
             "dev": true,
             "requires": {
                 "reusify": "^1.0.4"
             }
         },
         "faye-websocket": {
             "version": "0.10.0",
             "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
             "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
             "dev": true,
             "requires": {
                 "websocket-driver": ">=0.5.1"
             }
         },
         "figgy-pudding": {
             "version": "3.5.2",
             "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
             "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
             "dev": true
         },
         "figures": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
             "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
             "dev": true,
             "requires": {
                 "escape-string-regexp": "^1.0.5"
             }
         },
         "file-entry-cache": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
             "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
             "dev": true,
             "requires": {
                 "flat-cache": "^2.0.1"
             }
         },
         "file-loader": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz",
             "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.0.2",
                 "schema-utils": "^1.0.0"
             },
             "dependencies": {
                 "schema-utils": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
                     "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
                     "dev": true,
                     "requires": {
                         "ajv": "^6.1.0",
                         "ajv-errors": "^1.0.0",
                         "ajv-keywords": "^3.1.0"
                     }
                 }
             }
         },
         "file-type": {
             "version": "10.11.0",
             "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
             "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
             "dev": true
         },
         "file-uri-to-path": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
             "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
             "dev": true,
             "optional": true
         },
         "fill-range": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
             "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
             "dev": true,
             "requires": {
                 "extend-shallow": "^2.0.1",
                 "is-number": "^3.0.0",
                 "repeat-string": "^1.6.1",
                 "to-regex-range": "^2.1.0"
             },
             "dependencies": {
                 "extend-shallow": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
                     "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
                         "is-extendable": "^0.1.0"
                     }
                 },
                 "is-extendable": {
                     "version": "0.1.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
                     "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
                     "dev": true
                 }
             }
         },
         "finalhandler": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
             "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
             "dev": true,
             "requires": {
                 "debug": "2.6.9",
                 "encodeurl": "~1.0.2",
                 "escape-html": "~1.0.3",
                 "on-finished": "~2.3.0",
                 "parseurl": "~1.3.3",
                 "statuses": "~1.5.0",
                 "unpipe": "~1.0.0"
             },
             "dependencies": {
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
                 }
             }
         },
         "find-cache-dir": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
             "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
             "dev": true,
             "requires": {
                 "commondir": "^1.0.1",
                 "make-dir": "^2.0.0",
                 "pkg-dir": "^3.0.0"
             }
         },
         "find-up": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
             "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
             "dev": true,
             "requires": {
                 "locate-path": "^3.0.0"
             }
         },
         "findup-sync": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
             "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
             "dev": true,
             "requires": {
                 "detect-file": "^1.0.0",
                 "is-glob": "^4.0.0",
                 "micromatch": "^3.0.4",
                 "resolve-dir": "^1.0.1"
             }
         },
         "flat-cache": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
             "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
             "dev": true,
             "requires": {
                 "flatted": "^2.0.0",
                 "rimraf": "2.6.3",
                 "write": "1.0.3"
             }
         },
         "flatted": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
             "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
             "dev": true
         },
         "flush-write-stream": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
             "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.3",
                 "readable-stream": "^2.3.6"
             }
         },
         "follow-redirects": {
             "version": "1.5.10",
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
             "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=",
             "dev": true,
             "requires": {
                 "debug": "=3.1.0"
             }
         },
         "for-in": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
             "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
             "dev": true
         },
         "forwarded": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
             "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
             "dev": true
         },
         "fragment-cache": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
             "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
             "dev": true,
             "requires": {
                 "map-cache": "^0.2.2"
             }
         },
+        "frappe-charts": {
+            "version": "1.5.6",
+            "resolved": "https://registry.npmjs.org/frappe-charts/-/frappe-charts-1.5.6.tgz",
+            "integrity": "sha512-1OWqF7ijDba+Nlei/CjXSORYlUm+/M0oeVOP3Yu7R2bLBDc5GYkFSHGVx13XavuCxDoOPEJZMRgRK6GUAuB8FQ==",
+            "dev": true
+        },
+        "freeice": {
+            "version": "2.2.2",
+            "resolved": "https://registry.npmjs.org/freeice/-/freeice-2.2.2.tgz",
+            "integrity": "sha512-XNoIxDHufqPIBSLpp4IrFPnoc+hv/0RwdOGhIoggIDC2ZKf5r6OoixbeoFJSmZOAq2aYiEUArhuQ8zVVrM5C4w==",
+            "dev": true,
+            "requires": {
+                "normalice": "^1.0.0"
+            }
+        },
         "fresh": {
             "version": "0.5.2",
             "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
             "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
             "dev": true
         },
         "friendly-errors-webpack-plugin": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz",
             "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==",
             "dev": true,
             "requires": {
                 "chalk": "^1.1.3",
                 "error-stack-parser": "^2.0.0",
                 "string-width": "^2.0.0"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
                     "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
                     "dev": true
                 },
                 "ansi-styles": {
                     "version": "2.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
                     "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
                     "dev": true
                 },
                 "chalk": {
                     "version": "1.1.3",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
                     "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^2.2.1",
                         "escape-string-regexp": "^1.0.2",
                         "has-ansi": "^2.0.0",
                         "strip-ansi": "^3.0.0",
                         "supports-color": "^2.0.0"
                     }
                 },
                 "string-width": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
                     "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
                     "dev": true,
                     "requires": {
                         "is-fullwidth-code-point": "^2.0.0",
                         "strip-ansi": "^4.0.0"
                     },
                     "dependencies": {
                         "ansi-regex": {
                             "version": "3.0.0",
                             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
                             "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
                             "dev": true
                         },
                         "strip-ansi": {
                             "version": "4.0.0",
                             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
                             "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
                             "dev": true,
                             "requires": {
                                 "ansi-regex": "^3.0.0"
                             }
                         }
                     }
                 },
                 "strip-ansi": {
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
                     "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
                 },
                 "supports-color": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
                     "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
                     "dev": true
                 }
             }
         },
         "from2": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
             "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
                 "readable-stream": "^2.0.0"
             }
         },
         "fs-extra": {
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
             "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.2",
                 "jsonfile": "^4.0.0",
                 "universalify": "^0.1.0"
             }
         },
         "fs-minipass": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
             "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
             "dev": true,
             "requires": {
                 "minipass": "^3.0.0"
             }
         },
         "fs-write-stream-atomic": {
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
             "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.2",
                 "iferr": "^0.1.5",
                 "imurmurhash": "^0.1.4",
                 "readable-stream": "1 || 2"
             }
         },
         "fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
             "dev": true
         },
         "fsevents": {
             "version": "1.2.13",
             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
             "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
             "dev": true,
             "optional": true,
             "requires": {
                 "bindings": "^1.5.0",
                 "nan": "^2.12.1"
             }
         },
         "function-bind": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
             "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
             "dev": true
         },
         "functional-red-black-tree": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
             "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
             "dev": true
         },
         "gensync": {
             "version": "1.0.0-beta.1",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
             "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
             "dev": true
         },
         "get-caller-file": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
             "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
             "dev": true
         },
+        "get-intrinsic": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
+            "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1"
+            }
+        },
         "get-stdin": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
             "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
             "dev": true
         },
         "get-stream": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
             "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
             "dev": true,
             "requires": {
                 "pump": "^3.0.0"
             }
         },
         "get-value": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
             "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
             "dev": true
         },
         "glob": {
             "version": "7.1.6",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
             "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
             "dev": true,
             "requires": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
                 "inherits": "2",
                 "minimatch": "^3.0.4",
                 "once": "^1.3.0",
                 "path-is-absolute": "^1.0.0"
             }
         },
         "glob-parent": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
             "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
             "dev": true,
             "requires": {
                 "is-glob": "^4.0.1"
             }
         },
         "glob-to-regexp": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
             "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
             "dev": true
         },
         "global-modules": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
             "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
             "dev": true,
             "requires": {
                 "global-prefix": "^3.0.0"
             },
             "dependencies": {
                 "global-prefix": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
                     "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
                     "dev": true,
                     "requires": {
                         "ini": "^1.3.5",
                         "kind-of": "^6.0.2",
                         "which": "^1.3.1"
                     }
                 },
                 "which": {
                     "version": "1.3.1",
                     "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
                     "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
                     "dev": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
                 }
             }
         },
         "global-prefix": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
             "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
             "dev": true,
             "requires": {
                 "expand-tilde": "^2.0.2",
                 "homedir-polyfill": "^1.0.1",
                 "ini": "^1.3.4",
                 "is-windows": "^1.0.1",
                 "which": "^1.2.14"
             },
             "dependencies": {
                 "which": {
                     "version": "1.3.1",
                     "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
                     "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
                     "dev": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
                 }
             }
         },
         "globals": {
             "version": "12.4.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
             "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
             "dev": true,
             "requires": {
                 "type-fest": "^0.8.1"
             }
         },
         "globby": {
             "version": "8.0.2",
             "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
             "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
             "dev": true,
             "requires": {
                 "array-union": "^1.0.1",
                 "dir-glob": "2.0.0",
                 "fast-glob": "^2.0.2",
                 "glob": "^7.1.2",
                 "ignore": "^3.3.5",
                 "pify": "^3.0.0",
                 "slash": "^1.0.0"
             },
             "dependencies": {
                 "ignore": {
                     "version": "3.3.10",
                     "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
                     "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
                     "dev": true
                 },
                 "pify": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
                     "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
                     "dev": true
                 }
             }
         },
         "globjoin": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
             "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
             "dev": true
         },
         "gonzales-pe": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
             "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
             "dev": true,
             "requires": {
                 "minimist": "^1.2.5"
             }
         },
         "graceful-fs": {
             "version": "4.2.4",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
             "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
             "dev": true
         },
         "growly": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
             "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
             "dev": true
         },
         "handle-thing": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
             "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
             "dev": true
         },
         "hard-rejection": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
             "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
             "dev": true
         },
+        "hark": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/hark/-/hark-1.2.3.tgz",
+            "integrity": "sha512-u68vz9SCa38ESiFJSDjqK8XbXqWzyot7Cj6Y2b6jk2NJ+II3MY2dIrLMg/kjtIAun4Y1DHF/20hfx4rq1G5GMg==",
+            "dev": true,
+            "requires": {
+                "wildemitter": "^1.2.0"
+            }
+        },
         "has": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
             "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
             "dev": true,
             "requires": {
                 "function-bind": "^1.1.1"
             }
         },
         "has-ansi": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
             "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
             "dev": true,
             "requires": {
                 "ansi-regex": "^2.0.0"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
                     "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
                     "dev": true
                 }
             }
         },
         "has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
             "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
             "dev": true
         },
         "has-symbols": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
             "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
             "dev": true
         },
         "has-value": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
             "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
             "dev": true,
             "requires": {
                 "get-value": "^2.0.6",
                 "has-values": "^1.0.0",
                 "isobject": "^3.0.0"
             }
         },
         "has-values": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
             "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
             "dev": true,
             "requires": {
                 "is-number": "^3.0.0",
                 "kind-of": "^4.0.0"
             },
             "dependencies": {
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 },
                 "kind-of": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
                     "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
                     "dev": true,
                     "requires": {
                         "is-buffer": "^1.1.5"
                     }
                 }
             }
         },
         "hash-base": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
             "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.4",
                 "readable-stream": "^3.6.0",
                 "safe-buffer": "^5.2.0"
             },
             "dependencies": {
                 "readable-stream": {
                     "version": "3.6.0",
                     "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
                     "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
                     "dev": true,
                     "requires": {
                         "inherits": "^2.0.3",
                         "string_decoder": "^1.1.1",
                         "util-deprecate": "^1.0.1"
                     }
                 },
                 "safe-buffer": {
                     "version": "5.2.1",
                     "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
                     "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
                     "dev": true
                 }
             }
         },
         "hash-sum": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
             "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
             "dev": true
         },
         "hash.js": {
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
             "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.3",
                 "minimalistic-assert": "^1.0.1"
             }
         },
         "he": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
             "integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8=",
             "dev": true
         },
         "hex-color-regex": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
             "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
             "dev": true
         },
         "hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
             "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
             "dev": true,
             "requires": {
                 "hash.js": "^1.0.3",
                 "minimalistic-assert": "^1.0.0",
                 "minimalistic-crypto-utils": "^1.0.1"
             }
         },
         "homedir-polyfill": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
             "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
             "dev": true,
             "requires": {
                 "parse-passwd": "^1.0.0"
             }
         },
         "hosted-git-info": {
-            "version": "2.8.8",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-            "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-            "dev": true
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz",
+            "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==",
+            "dev": true,
+            "requires": {
+                "lru-cache": "^6.0.0"
+            },
+            "dependencies": {
+                "lru-cache": {
+                    "version": "6.0.0",
+                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+                    "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+                    "dev": true,
+                    "requires": {
+                        "yallist": "^4.0.0"
+                    }
+                }
+            }
         },
         "hpack.js": {
             "version": "2.1.6",
             "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
             "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
                 "obuf": "^1.0.0",
                 "readable-stream": "^2.0.1",
                 "wbuf": "^1.1.0"
             }
         },
         "hsl-regex": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
             "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
             "dev": true
         },
         "hsla-regex": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
             "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
             "dev": true
         },
         "html-comment-regex": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
             "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
             "dev": true
         },
         "html-entities": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
             "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
             "dev": true
         },
         "html-loader": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.5.5.tgz",
             "integrity": "sha512-7hIW7YinOYUpo//kSYcPB6dCKoceKLmOwjEMmhIobHuWGDVl0Nwe4l68mdG/Ru0wcUxQjVMEoZpkalZ/SE7zog==",
             "dev": true,
             "requires": {
                 "es6-templates": "^0.2.3",
                 "fastparse": "^1.1.1",
                 "html-minifier": "^3.5.8",
                 "loader-utils": "^1.1.0",
                 "object-assign": "^4.1.1"
             }
         },
         "html-minifier": {
             "version": "3.5.21",
             "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
             "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
             "dev": true,
             "requires": {
                 "camel-case": "3.0.x",
                 "clean-css": "4.2.x",
                 "commander": "2.17.x",
                 "he": "1.2.x",
                 "param-case": "2.1.x",
                 "relateurl": "0.2.x",
                 "uglify-js": "3.4.x"
             },
             "dependencies": {
                 "commander": {
                     "version": "2.17.1",
                     "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
                     "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
                     "dev": true
                 }
             }
         },
         "html-tags": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
             "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
             "dev": true
         },
         "htmlparser2": {
             "version": "3.10.1",
             "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
             "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
             "dev": true,
             "requires": {
                 "domelementtype": "^1.3.1",
                 "domhandler": "^2.3.0",
                 "domutils": "^1.5.1",
                 "entities": "^1.1.1",
                 "inherits": "^2.0.1",
                 "readable-stream": "^3.1.1"
             },
             "dependencies": {
                 "entities": {
                     "version": "1.1.2",
                     "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
                     "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
                     "dev": true
                 },
                 "readable-stream": {
                     "version": "3.6.0",
                     "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
                     "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
                     "dev": true,
                     "requires": {
                         "inherits": "^2.0.3",
                         "string_decoder": "^1.1.1",
                         "util-deprecate": "^1.0.1"
                     }
                 }
             }
         },
         "http-deceiver": {
             "version": "1.2.7",
             "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
             "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
             "dev": true
         },
         "http-errors": {
             "version": "1.7.2",
             "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
             "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
             "dev": true,
             "requires": {
                 "depd": "~1.1.2",
                 "inherits": "2.0.3",
                 "setprototypeof": "1.1.1",
                 "statuses": ">= 1.5.0 < 2",
                 "toidentifier": "1.0.0"
             },
             "dependencies": {
                 "inherits": {
                     "version": "2.0.3",
                     "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                     "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
                     "dev": true
                 }
             }
         },
         "http-proxy": {
             "version": "1.18.1",
             "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
             "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
             "dev": true,
             "requires": {
                 "eventemitter3": "^4.0.0",
                 "follow-redirects": "^1.0.0",
                 "requires-port": "^1.0.0"
             }
         },
         "http-proxy-middleware": {
             "version": "0.19.1",
             "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
             "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
             "dev": true,
             "requires": {
                 "http-proxy": "^1.17.0",
                 "is-glob": "^4.0.0",
                 "lodash": "^4.17.11",
                 "micromatch": "^3.1.10"
             }
         },
         "https-browserify": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
             "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
             "dev": true
         },
         "iconv-lite": {
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
             "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
             "dev": true,
             "requires": {
                 "safer-buffer": ">= 2.1.2 < 3"
             }
         },
         "icss-replace-symbols": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
             "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
             "dev": true
         },
         "icss-utils": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
             "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
             "dev": true,
             "requires": {
                 "postcss": "^6.0.1"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "postcss": {
                     "version": "6.0.23",
                     "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
                     "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
                     "dev": true,
                     "requires": {
                         "chalk": "^2.4.1",
                         "source-map": "^0.6.1",
                         "supports-color": "^5.4.0"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "ieee754": {
-            "version": "1.1.13",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-            "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
             "dev": true
         },
         "iferr": {
             "version": "0.1.5",
             "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
             "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
             "dev": true
         },
         "ignore": {
             "version": "4.0.6",
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
             "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
             "dev": true
         },
         "imagemin": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-6.1.0.tgz",
             "integrity": "sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==",
             "dev": true,
             "requires": {
                 "file-type": "^10.7.0",
                 "globby": "^8.0.1",
                 "make-dir": "^1.0.0",
                 "p-pipe": "^1.1.0",
                 "pify": "^4.0.1",
                 "replace-ext": "^1.0.0"
             },
             "dependencies": {
                 "make-dir": {
                     "version": "1.3.0",
                     "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
                     "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
                     "dev": true,
                     "requires": {
                         "pify": "^3.0.0"
                     },
                     "dependencies": {
                         "pify": {
                             "version": "3.0.0",
                             "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
                             "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
                             "dev": true
                         }
                     }
                 }
             }
         },
         "img-loader": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/img-loader/-/img-loader-3.0.2.tgz",
             "integrity": "sha512-rSriLKgvi85Km7ppSF+AEAM3nU4fxpvCkaXtC/IoCEU7jfks55bEANFs0bB9YXYkxY9JurZQIZFtXh5Gue3upw==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.1.0"
             }
         },
         "import-cwd": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
             "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
             "dev": true,
             "requires": {
                 "import-from": "^2.1.0"
             }
         },
         "import-fresh": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
             "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
             "dev": true,
             "requires": {
                 "parent-module": "^1.0.0",
                 "resolve-from": "^4.0.0"
             }
         },
         "import-from": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
             "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
             "dev": true,
             "requires": {
                 "resolve-from": "^3.0.0"
             },
             "dependencies": {
                 "resolve-from": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
                     "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
                     "dev": true
                 }
             }
         },
         "import-lazy": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
             "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
             "dev": true
         },
         "import-local": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
             "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
             "dev": true,
             "requires": {
                 "pkg-dir": "^3.0.0",
                 "resolve-cwd": "^2.0.0"
             }
         },
         "imurmurhash": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
             "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
             "dev": true
         },
         "indent-string": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
             "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
             "dev": true
         },
         "indexes-of": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
             "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
             "dev": true
         },
         "infer-owner": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
             "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
             "dev": true
         },
         "inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
             "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
             "dev": true,
             "requires": {
                 "once": "^1.3.0",
                 "wrappy": "1"
             }
         },
         "inherits": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
             "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
             "dev": true
         },
         "ini": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
             "dev": true
         },
         "inquirer": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz",
             "integrity": "sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ==",
             "dev": true,
             "requires": {
                 "ansi-escapes": "^4.2.1",
                 "chalk": "^3.0.0",
                 "cli-cursor": "^3.1.0",
                 "cli-width": "^2.0.0",
                 "external-editor": "^3.0.3",
                 "figures": "^3.0.0",
                 "lodash": "^4.17.15",
                 "mute-stream": "0.0.8",
                 "run-async": "^2.4.0",
                 "rxjs": "^6.5.3",
                 "string-width": "^4.1.0",
                 "strip-ansi": "^6.0.0",
                 "through": "^2.3.6"
             },
             "dependencies": {
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
                     "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
                     "dev": true,
                     "requires": {
                         "@types/color-name": "^1.1.1",
                         "color-convert": "^2.0.1"
                     }
                 },
                 "chalk": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
                     "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^4.1.0",
                         "supports-color": "^7.1.0"
                     }
                 },
                 "color-convert": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
                     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
                     "dev": true,
                     "requires": {
                         "color-name": "~1.1.4"
                     }
                 },
                 "color-name": {
                     "version": "1.1.4",
                     "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
                     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
                     "dev": true
                 },
                 "emoji-regex": {
                     "version": "8.0.0",
                     "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
                     "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
                     "dev": true
                 },
                 "has-flag": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
                     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
                     "dev": true
                 },
                 "is-fullwidth-code-point": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
                     "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
                     "dev": true
                 },
                 "string-width": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
                     "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
                     "dev": true,
                     "requires": {
                         "emoji-regex": "^8.0.0",
                         "is-fullwidth-code-point": "^3.0.0",
                         "strip-ansi": "^6.0.0"
                     }
                 },
                 "supports-color": {
                     "version": "7.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
                     "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
                     "dev": true,
                     "requires": {
                         "has-flag": "^4.0.0"
                     }
                 }
             }
         },
         "internal-ip": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
             "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
             "dev": true,
             "requires": {
                 "default-gateway": "^4.2.0",
                 "ipaddr.js": "^1.9.0"
             }
         },
         "interpret": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
             "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
             "dev": true
         },
-        "invariant": {
-            "version": "2.2.4",
-            "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-            "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-            "dev": true,
-            "requires": {
-                "loose-envify": "^1.0.0"
-            }
-        },
         "ip": {
             "version": "1.1.5",
             "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
             "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
             "dev": true
         },
         "ip-regex": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
             "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
             "dev": true
         },
         "ipaddr.js": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
             "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
             "dev": true
         },
         "is-absolute-url": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
             "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
             "dev": true
         },
         "is-accessor-descriptor": {
             "version": "0.1.6",
             "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
             "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
             "dev": true,
             "requires": {
                 "kind-of": "^3.0.2"
             },
             "dependencies": {
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 },
                 "kind-of": {
                     "version": "3.2.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                     "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                     "dev": true,
                     "requires": {
                         "is-buffer": "^1.1.5"
                     }
                 }
             }
         },
         "is-alphabetical": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
             "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
             "dev": true
         },
-        "is-alphanumeric": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-            "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
-            "dev": true
-        },
         "is-alphanumerical": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
             "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
             "dev": true,
             "requires": {
                 "is-alphabetical": "^1.0.0",
                 "is-decimal": "^1.0.0"
             }
         },
         "is-arguments": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
             "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
             "dev": true
         },
         "is-arrayish": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
             "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
             "dev": true
         },
         "is-binary-path": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
             "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
             "dev": true,
             "requires": {
                 "binary-extensions": "^1.0.0"
             }
         },
         "is-buffer": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-            "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+            "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
             "dev": true
         },
         "is-callable": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
             "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
             "dev": true
         },
         "is-color-stop": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
             "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
             "dev": true,
             "requires": {
                 "css-color-names": "^0.0.4",
                 "hex-color-regex": "^1.1.0",
                 "hsl-regex": "^1.0.0",
                 "hsla-regex": "^1.0.0",
                 "rgb-regex": "^1.0.1",
                 "rgba-regex": "^1.0.0"
             }
         },
         "is-data-descriptor": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
             "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
             "dev": true,
             "requires": {
                 "kind-of": "^3.0.2"
             },
             "dependencies": {
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 },
                 "kind-of": {
                     "version": "3.2.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                     "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                     "dev": true,
                     "requires": {
                         "is-buffer": "^1.1.5"
                     }
                 }
             }
         },
         "is-date-object": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
             "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
             "dev": true
         },
         "is-decimal": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
             "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
             "dev": true
         },
         "is-descriptor": {
             "version": "0.1.6",
             "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
             "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
             "dev": true,
             "requires": {
                 "is-accessor-descriptor": "^0.1.6",
                 "is-data-descriptor": "^0.1.4",
                 "kind-of": "^5.0.0"
             },
             "dependencies": {
                 "kind-of": {
                     "version": "5.1.0",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
                     "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
                     "dev": true
                 }
             }
         },
         "is-directory": {
             "version": "0.3.1",
             "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
             "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
             "dev": true
         },
         "is-extendable": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
             "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
             "dev": true,
             "requires": {
                 "is-plain-object": "^2.0.4"
             }
         },
         "is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
             "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
             "dev": true
         },
         "is-fullwidth-code-point": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
             "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
             "dev": true
         },
         "is-glob": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
             "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=",
             "dev": true,
             "requires": {
                 "is-extglob": "^2.1.1"
             }
         },
         "is-hexadecimal": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
             "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
             "dev": true
         },
         "is-negative-zero": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
             "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
             "dev": true
         },
         "is-number": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
             "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
             "dev": true,
             "requires": {
                 "kind-of": "^3.0.2"
             },
             "dependencies": {
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 },
                 "kind-of": {
                     "version": "3.2.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                     "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                     "dev": true,
                     "requires": {
                         "is-buffer": "^1.1.5"
                     }
                 }
             }
         },
         "is-obj": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
             "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
             "dev": true
         },
         "is-path-cwd": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
             "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
             "dev": true
         },
         "is-path-in-cwd": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
             "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
             "dev": true,
             "requires": {
                 "is-path-inside": "^2.1.0"
             }
         },
         "is-path-inside": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
             "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
             "dev": true,
             "requires": {
                 "path-is-inside": "^1.0.2"
             }
         },
         "is-plain-obj": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
             "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
             "dev": true
         },
         "is-plain-object": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
             "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
             "dev": true,
             "requires": {
                 "isobject": "^3.0.1"
             }
         },
         "is-regex": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
             "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
             "dev": true,
             "requires": {
                 "has-symbols": "^1.0.1"
             }
         },
         "is-regexp": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
             "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
             "dev": true
         },
         "is-resolvable": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
             "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
             "dev": true
         },
         "is-stream": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
             "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
             "dev": true
         },
         "is-svg": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
             "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
             "dev": true,
             "requires": {
                 "html-comment-regex": "^1.1.0"
             }
         },
         "is-symbol": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
             "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
             "dev": true,
             "requires": {
                 "has-symbols": "^1.0.1"
             }
         },
         "is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
             "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
             "dev": true
         },
-        "is-whitespace-character": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-            "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-            "dev": true
-        },
         "is-windows": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
             "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
             "dev": true
         },
-        "is-word-character": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-            "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-            "dev": true
-        },
         "is-wsl": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
             "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
             "dev": true
         },
         "isarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
             "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
             "dev": true
         },
         "isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
             "dev": true
         },
         "isobject": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
             "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
             "dev": true
         },
         "jest-worker": {
             "version": "25.5.0",
             "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
             "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
             "dev": true,
             "requires": {
                 "merge-stream": "^2.0.0",
                 "supports-color": "^7.0.0"
             },
             "dependencies": {
                 "has-flag": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
                     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
                     "dev": true
                 },
                 "supports-color": {
                     "version": "7.2.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
                     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
                     "dev": true,
                     "requires": {
                         "has-flag": "^4.0.0"
                     }
                 }
             }
         },
         "jquery": {
             "version": "3.5.1",
             "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
             "integrity": "sha1-17TQjhv9uGrS8aPQOeoXMEcXq7U=",
             "dev": true
         },
         "js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
             "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
             "dev": true
         },
         "js-yaml": {
             "version": "3.14.0",
             "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
             "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
             "dev": true,
             "requires": {
                 "argparse": "^1.0.7",
                 "esprima": "^4.0.0"
             }
         },
         "jsesc": {
             "version": "2.5.2",
             "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
             "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
             "dev": true
         },
         "json-parse-better-errors": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
             "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
             "dev": true
         },
         "json-parse-even-better-errors": {
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
             "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
             "dev": true
         },
         "json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
             "dev": true
         },
         "json-stable-stringify-without-jsonify": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
             "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
             "dev": true
         },
         "json3": {
             "version": "3.3.3",
             "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
             "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
             "dev": true
         },
         "json5": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
             "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
             "dev": true,
             "requires": {
                 "minimist": "^1.2.5"
             }
         },
         "jsonfile": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
             "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.6"
             }
         },
         "killable": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
             "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
             "dev": true
         },
         "kind-of": {
             "version": "6.0.3",
             "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
             "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
             "dev": true
         },
         "known-css-properties": {
-            "version": "0.19.0",
-            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz",
-            "integrity": "sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==",
+            "version": "0.20.0",
+            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.20.0.tgz",
+            "integrity": "sha512-URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw==",
             "dev": true
         },
         "laravel-mix": {
-            "version": "5.0.6",
-            "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-5.0.6.tgz",
-            "integrity": "sha512-yeX23rnpUUs7LXZlDMQMh2yg5nOkizlvUjwir8d54yhIqDec7Btnkg935Pxeo81kq/JONssHEaVPrwp1/TsPsQ==",
+            "version": "5.0.9",
+            "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-5.0.9.tgz",
+            "integrity": "sha512-1WCJiHimTRW3KlxcabRTco0q+bo4uKPaFTkc6cJ/bLEq4JT1aPkojoauUK7+PyiIlDJncw0Nt2MtDrv5C6j5IQ==",
             "dev": true,
             "requires": {
                 "@babel/core": "^7.2.0",
                 "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
                 "@babel/plugin-syntax-dynamic-import": "^7.2.0",
                 "@babel/plugin-transform-runtime": "^7.2.0",
                 "@babel/preset-env": "^7.2.0",
                 "@babel/runtime": "^7.2.0",
                 "autoprefixer": "^9.4.2",
                 "babel-loader": "^8.0.4",
                 "babel-merge": "^2.0.1",
                 "chokidar": "^2.0.3",
                 "clean-css": "^4.1.3",
                 "collect.js": "^4.12.8",
                 "concat": "^1.0.3",
                 "css-loader": "^1.0.1",
                 "dotenv": "^6.2.0",
                 "dotenv-expand": "^4.2.0",
                 "extract-text-webpack-plugin": "v4.0.0-beta.0",
                 "file-loader": "^2.0.0",
                 "friendly-errors-webpack-plugin": "^1.6.1",
                 "fs-extra": "^7.0.1",
                 "glob": "^7.1.2",
                 "html-loader": "^0.5.5",
                 "imagemin": "^6.0.0",
                 "img-loader": "^3.0.0",
                 "lodash": "^4.17.15",
                 "md5": "^2.2.1",
                 "optimize-css-assets-webpack-plugin": "^5.0.1",
                 "postcss-loader": "^3.0.0",
                 "style-loader": "^0.23.1",
                 "terser": "^3.11.0",
                 "terser-webpack-plugin": "^2.2.3",
                 "vue-loader": "^15.4.2",
                 "webpack": "^4.36.1",
                 "webpack-cli": "^3.1.2",
                 "webpack-dev-server": "^3.1.14",
                 "webpack-merge": "^4.1.0",
                 "webpack-notifier": "^1.5.1",
                 "yargs": "^15.4.1"
-            },
-            "dependencies": {
-                "chokidar": {
-                    "version": "2.1.8",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-                    "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-                    "dev": true,
-                    "requires": {
-                        "anymatch": "^2.0.0",
-                        "async-each": "^1.0.1",
-                        "braces": "^2.3.2",
-                        "fsevents": "^1.2.7",
-                        "glob-parent": "^3.1.0",
-                        "inherits": "^2.0.3",
-                        "is-binary-path": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "normalize-path": "^3.0.0",
-                        "path-is-absolute": "^1.0.0",
-                        "readdirp": "^2.2.1",
-                        "upath": "^1.1.1"
-                    }
-                },
-                "glob-parent": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-                    "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^3.1.0",
-                        "path-dirname": "^1.0.0"
-                    },
-                    "dependencies": {
-                        "is-glob": {
-                            "version": "3.1.0",
-                            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                            "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                            "dev": true,
-                            "requires": {
-                                "is-extglob": "^2.1.0"
-                            }
-                        }
-                    }
-                }
             }
         },
         "last-call-webpack-plugin": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
             "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
             "dev": true,
             "requires": {
                 "lodash": "^4.17.5",
                 "webpack-sources": "^1.1.0"
             }
         },
-        "leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true
-        },
-        "levenary": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-            "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-            "dev": true,
-            "requires": {
-                "leven": "^3.1.0"
-            }
-        },
         "levn": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
             "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
             "dev": true,
             "requires": {
                 "prelude-ls": "~1.1.2",
                 "type-check": "~0.3.2"
             }
         },
         "lines-and-columns": {
             "version": "1.1.6",
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
             "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
             "dev": true
         },
         "loader-runner": {
             "version": "2.4.0",
             "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
             "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
             "dev": true
         },
         "loader-utils": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
             "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=",
             "dev": true,
             "requires": {
                 "big.js": "^5.2.2",
                 "emojis-list": "^2.0.0",
                 "json5": "^1.0.1"
             },
             "dependencies": {
                 "json5": {
                     "version": "1.0.1",
                     "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
                     "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
                     "dev": true,
                     "requires": {
                         "minimist": "^1.2.0"
                     }
                 }
             }
         },
         "locate-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
             "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
             "dev": true,
             "requires": {
                 "p-locate": "^3.0.0",
                 "path-exists": "^3.0.0"
             }
         },
         "lodash": {
             "version": "4.17.20",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
             "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
             "dev": true
         },
-        "lodash._baseassign": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-            "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-            "dev": true,
-            "requires": {
-                "lodash._basecopy": "^3.0.0",
-                "lodash.keys": "^3.0.0"
-            }
-        },
-        "lodash._basecopy": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-            "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-            "dev": true
-        },
-        "lodash._bindcallback": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-            "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-            "dev": true
-        },
-        "lodash._createassigner": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-            "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-            "dev": true,
-            "requires": {
-                "lodash._bindcallback": "^3.0.0",
-                "lodash._isiterateecall": "^3.0.0",
-                "lodash.restparam": "^3.0.0"
-            }
-        },
-        "lodash._getnative": {
-            "version": "3.9.1",
-            "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-            "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-            "dev": true
-        },
-        "lodash._isiterateecall": {
-            "version": "3.0.9",
-            "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-            "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-            "dev": true
-        },
-        "lodash.assign": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-            "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-            "dev": true
-        },
-        "lodash.defaults": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-            "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-            "dev": true
-        },
-        "lodash.isarguments": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-            "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-            "dev": true
-        },
-        "lodash.isarray": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-            "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-            "dev": true
-        },
-        "lodash.keys": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-            "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-            "dev": true,
-            "requires": {
-                "lodash._getnative": "^3.0.0",
-                "lodash.isarguments": "^3.0.0",
-                "lodash.isarray": "^3.0.0"
-            }
-        },
         "lodash.memoize": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
             "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
             "dev": true
         },
-        "lodash.restparam": {
-            "version": "3.6.1",
-            "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-            "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-            "dev": true
-        },
         "lodash.uniq": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
             "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
             "dev": true
         },
         "log-symbols": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
             "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
             "dev": true,
             "requires": {
                 "chalk": "^4.0.0"
             }
         },
         "loglevel": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
             "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
             "dev": true
         },
         "longest-streak": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
             "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
             "dev": true
         },
-        "loose-envify": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-            "dev": true,
-            "requires": {
-                "js-tokens": "^3.0.0 || ^4.0.0"
-            }
-        },
         "lower-case": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
             "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
             "dev": true
         },
         "lru-cache": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
             "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
             "dev": true,
             "requires": {
                 "yallist": "^3.0.2"
             },
             "dependencies": {
                 "yallist": {
                     "version": "3.1.1",
                     "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
                     "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
                     "dev": true
                 }
             }
         },
         "make-dir": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
             "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
             "dev": true,
             "requires": {
                 "pify": "^4.0.1",
                 "semver": "^5.6.0"
             },
             "dependencies": {
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 }
             }
         },
         "map-cache": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
             "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
             "dev": true
         },
         "map-obj": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz",
             "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==",
             "dev": true
         },
         "map-visit": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
             "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
             "dev": true,
             "requires": {
                 "object-visit": "^1.0.0"
             }
         },
-        "markdown-escapes": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-            "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
-            "dev": true
-        },
-        "markdown-table": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-            "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-            "dev": true,
-            "requires": {
-                "repeat-string": "^1.0.0"
-            }
-        },
         "mathml-tag-names": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
             "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
             "dev": true
         },
         "md5": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
             "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
             "dev": true,
             "requires": {
                 "charenc": "0.0.2",
                 "crypt": "0.0.2",
                 "is-buffer": "~1.1.6"
             },
             "dependencies": {
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 }
             }
         },
         "md5.js": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
             "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
             "dev": true,
             "requires": {
                 "hash-base": "^3.0.0",
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.1.2"
             }
         },
-        "mdast-util-compact": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-            "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
+        "mdast-util-from-markdown": {
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.1.tgz",
+            "integrity": "sha512-qJXNcFcuCSPqUF0Tb0uYcFDIq67qwB3sxo9RPdf9vG8T90ViKnksFqdB/Coq2a7sTnxL/Ify2y7aIQXDkQFH0w==",
             "dev": true,
             "requires": {
-                "unist-util-visit": "^2.0.0"
+                "@types/mdast": "^3.0.0",
+                "mdast-util-to-string": "^1.0.0",
+                "micromark": "~2.10.0",
+                "parse-entities": "^2.0.0"
             }
         },
+        "mdast-util-to-markdown": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz",
+            "integrity": "sha512-sr8q7fQJ1xoCqZSXW6dO/MYu2Md+a4Hfk9uO+XHCfiBhVM0EgWtfAV7BuN+ff6otUeu2xDyt1o7vhZGwOG3+BA==",
+            "dev": true,
+            "requires": {
+                "@types/unist": "^2.0.0",
+                "longest-streak": "^2.0.0",
+                "mdast-util-to-string": "^1.0.0",
+                "parse-entities": "^2.0.0",
+                "repeat-string": "^1.0.0",
+                "zwitch": "^1.0.0"
+            }
+        },
+        "mdast-util-to-string": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz",
+            "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==",
+            "dev": true
+        },
         "mdn-data": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
             "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
             "dev": true
         },
         "media-typer": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
             "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
             "dev": true
         },
         "memory-fs": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
             "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
             "dev": true,
             "requires": {
                 "errno": "^0.1.3",
                 "readable-stream": "^2.0.1"
             }
         },
         "meow": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz",
-            "integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==",
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz",
+            "integrity": "sha512-nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg==",
             "dev": true,
             "requires": {
                 "@types/minimist": "^1.2.0",
                 "camelcase-keys": "^6.2.2",
                 "decamelize-keys": "^1.1.0",
                 "hard-rejection": "^2.1.0",
                 "minimist-options": "4.1.0",
-                "normalize-package-data": "^2.5.0",
+                "normalize-package-data": "^3.0.0",
                 "read-pkg-up": "^7.0.1",
                 "redent": "^3.0.0",
                 "trim-newlines": "^3.0.0",
-                "type-fest": "^0.13.1",
-                "yargs-parser": "^18.1.3"
+                "type-fest": "^0.18.0",
+                "yargs-parser": "^20.2.3"
             },
             "dependencies": {
                 "type-fest": {
-                    "version": "0.13.1",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-                    "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+                    "version": "0.18.1",
+                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+                    "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
                     "dev": true
                 },
                 "yargs-parser": {
-                    "version": "18.1.3",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-                    "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    }
+                    "version": "20.2.4",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+                    "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+                    "dev": true
                 }
             }
         },
         "merge-descriptors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
             "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
             "dev": true
         },
         "merge-source-map": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
             "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
             "dev": true,
             "requires": {
                 "source-map": "^0.6.1"
             },
             "dependencies": {
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "merge-stream": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
             "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
             "dev": true
         },
         "merge2": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
             "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
             "dev": true
         },
         "methods": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
             "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
             "dev": true
         },
+        "micromark": {
+            "version": "2.10.1",
+            "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.10.1.tgz",
+            "integrity": "sha512-fUuVF8sC1X7wsCS29SYQ2ZfIZYbTymp0EYr6sab3idFjigFFjGa5UwoniPlV9tAgntjuapW1t9U+S0yDYeGKHQ==",
+            "dev": true,
+            "requires": {
+                "debug": "^4.0.0",
+                "parse-entities": "^2.0.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "ms": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                    "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+                    "dev": true
+                }
+            }
+        },
         "micromatch": {
             "version": "3.1.10",
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
             "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
             "dev": true,
             "requires": {
                 "arr-diff": "^4.0.0",
                 "array-unique": "^0.3.2",
                 "braces": "^2.3.1",
                 "define-property": "^2.0.2",
                 "extend-shallow": "^3.0.2",
                 "extglob": "^2.0.4",
                 "fragment-cache": "^0.2.1",
                 "kind-of": "^6.0.2",
                 "nanomatch": "^1.2.9",
                 "object.pick": "^1.3.0",
                 "regex-not": "^1.0.0",
                 "snapdragon": "^0.8.1",
                 "to-regex": "^3.0.2"
             }
         },
         "miller-rabin": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
             "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
             "dev": true,
             "requires": {
                 "bn.js": "^4.0.0",
                 "brorand": "^1.0.1"
             },
             "dependencies": {
                 "bn.js": {
                     "version": "4.11.9",
                     "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
                     "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                     "dev": true
                 }
             }
         },
         "mime": {
             "version": "1.6.0",
             "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
             "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
             "dev": true
         },
         "mime-db": {
             "version": "1.44.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
             "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
             "dev": true
         },
         "mime-types": {
             "version": "2.1.27",
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
             "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
             "dev": true,
             "requires": {
                 "mime-db": "1.44.0"
             }
         },
         "mimic-fn": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
             "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
             "dev": true
         },
         "min-indent": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
             "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
             "dev": true
         },
         "minimalistic-assert": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
             "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
             "dev": true
         },
         "minimalistic-crypto-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
             "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
             "dev": true
         },
         "minimatch": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
             "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
             "dev": true,
             "requires": {
                 "brace-expansion": "^1.1.7"
             }
         },
         "minimist": {
             "version": "1.2.5",
             "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
             "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
             "dev": true
         },
         "minimist-options": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
             "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
             "dev": true,
             "requires": {
                 "arrify": "^1.0.1",
                 "is-plain-obj": "^1.1.0",
                 "kind-of": "^6.0.3"
             },
             "dependencies": {
                 "is-plain-obj": {
                     "version": "1.1.0",
                     "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
                     "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
                     "dev": true
                 }
             }
         },
         "minipass": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
             "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
             "dev": true,
             "requires": {
                 "yallist": "^4.0.0"
             }
         },
         "minipass-collect": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
             "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
             "dev": true,
             "requires": {
                 "minipass": "^3.0.0"
             }
         },
         "minipass-flush": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
             "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
             "dev": true,
             "requires": {
                 "minipass": "^3.0.0"
             }
         },
         "minipass-pipeline": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
             "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
             "dev": true,
             "requires": {
                 "minipass": "^3.0.0"
             }
         },
         "mississippi": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
             "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
             "dev": true,
             "requires": {
                 "concat-stream": "^1.5.0",
                 "duplexify": "^3.4.2",
                 "end-of-stream": "^1.1.0",
                 "flush-write-stream": "^1.0.0",
                 "from2": "^2.1.0",
                 "parallel-transform": "^1.1.0",
                 "pump": "^3.0.0",
                 "pumpify": "^1.3.3",
                 "stream-each": "^1.1.0",
                 "through2": "^2.0.0"
             }
         },
         "mixin-deep": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
             "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
             "dev": true,
             "requires": {
                 "for-in": "^1.0.2",
                 "is-extendable": "^1.0.1"
             }
         },
         "mkdirp": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
             "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
             "dev": true,
             "requires": {
                 "minimist": "^1.2.5"
             }
         },
         "move-concurrently": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
             "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
             "dev": true,
             "requires": {
                 "aproba": "^1.1.1",
                 "copy-concurrently": "^1.0.0",
                 "fs-write-stream-atomic": "^1.0.8",
                 "mkdirp": "^0.5.1",
                 "rimraf": "^2.5.4",
                 "run-queue": "^1.0.3"
             }
         },
         "ms": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
             "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
             "dev": true
         },
         "multicast-dns": {
             "version": "6.2.3",
             "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
             "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
             "dev": true,
             "requires": {
                 "dns-packet": "^1.3.1",
                 "thunky": "^1.0.2"
             }
         },
         "multicast-dns-service-types": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
             "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
             "dev": true
         },
         "mute-stream": {
             "version": "0.0.8",
             "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
             "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
             "dev": true
         },
         "nan": {
-            "version": "2.14.1",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-            "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+            "version": "2.14.2",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+            "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
             "dev": true,
             "optional": true
         },
         "nanomatch": {
             "version": "1.2.13",
             "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
             "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
             "dev": true,
             "requires": {
                 "arr-diff": "^4.0.0",
                 "array-unique": "^0.3.2",
                 "define-property": "^2.0.2",
                 "extend-shallow": "^3.0.2",
                 "fragment-cache": "^0.2.1",
                 "is-windows": "^1.0.2",
                 "kind-of": "^6.0.2",
                 "object.pick": "^1.3.0",
                 "regex-not": "^1.0.0",
                 "snapdragon": "^0.8.1",
                 "to-regex": "^3.0.1"
             }
         },
         "natural-compare": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
             "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
             "dev": true
         },
         "negotiator": {
             "version": "0.6.2",
             "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
             "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
             "dev": true
         },
         "neo-async": {
             "version": "2.6.1",
             "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
             "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
             "dev": true
         },
+        "next-tick": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+            "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+            "dev": true
+        },
         "nice-try": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
             "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
             "dev": true
         },
         "no-case": {
             "version": "2.3.2",
             "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
             "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
             "dev": true,
             "requires": {
                 "lower-case": "^1.1.1"
             }
         },
         "node-forge": {
             "version": "0.10.0",
             "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
             "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
             "dev": true
         },
         "node-libs-browser": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
             "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
             "dev": true,
             "requires": {
                 "assert": "^1.1.1",
                 "browserify-zlib": "^0.2.0",
                 "buffer": "^4.3.0",
                 "console-browserify": "^1.1.0",
                 "constants-browserify": "^1.0.0",
                 "crypto-browserify": "^3.11.0",
                 "domain-browser": "^1.1.1",
                 "events": "^3.0.0",
                 "https-browserify": "^1.0.0",
                 "os-browserify": "^0.3.0",
                 "path-browserify": "0.0.1",
                 "process": "^0.11.10",
                 "punycode": "^1.2.4",
                 "querystring-es3": "^0.2.0",
                 "readable-stream": "^2.3.3",
                 "stream-browserify": "^2.0.1",
                 "stream-http": "^2.7.2",
                 "string_decoder": "^1.0.0",
                 "timers-browserify": "^2.0.4",
                 "tty-browserify": "0.0.0",
                 "url": "^0.11.0",
                 "util": "^0.11.0",
                 "vm-browserify": "^1.0.1"
             },
             "dependencies": {
                 "punycode": {
                     "version": "1.4.1",
                     "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
                     "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
                     "dev": true
                 }
             }
         },
         "node-notifier": {
             "version": "5.4.3",
             "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
             "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
             "dev": true,
             "requires": {
                 "growly": "^1.3.0",
                 "is-wsl": "^1.1.0",
                 "semver": "^5.5.0",
                 "shellwords": "^0.1.1",
                 "which": "^1.3.0"
             },
             "dependencies": {
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 },
                 "which": {
                     "version": "1.3.1",
                     "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
                     "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
                     "dev": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
                 }
             }
         },
         "node-releases": {
             "version": "1.1.58",
             "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
             "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
             "dev": true
         },
+        "normalice": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/normalice/-/normalice-1.0.1.tgz",
+            "integrity": "sha1-A0NcLuzVYxprygLaOTDsPjRagPc=",
+            "dev": true
+        },
         "normalize-package-data": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz",
+            "integrity": "sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==",
             "dev": true,
             "requires": {
-                "hosted-git-info": "^2.1.4",
-                "resolve": "^1.10.0",
-                "semver": "2 || 3 || 4 || 5",
+                "hosted-git-info": "^3.0.6",
+                "resolve": "^1.17.0",
+                "semver": "^7.3.2",
                 "validate-npm-package-license": "^3.0.1"
             },
             "dependencies": {
                 "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "version": "7.3.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+                    "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
                     "dev": true
                 }
             }
         },
         "normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
             "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=",
             "dev": true
         },
         "normalize-range": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
             "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
             "dev": true
         },
         "normalize-selector": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
             "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
             "dev": true
         },
         "normalize-url": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
             "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
             "dev": true
         },
         "npm-run-path": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
             "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
             "dev": true,
             "requires": {
                 "path-key": "^2.0.0"
             },
             "dependencies": {
                 "path-key": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
                     "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
                     "dev": true
                 }
             }
         },
         "nth-check": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
             "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
             "dev": true,
             "requires": {
                 "boolbase": "~1.0.0"
             }
         },
         "num2fraction": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
             "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
             "dev": true
         },
         "object-assign": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
             "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
             "dev": true
         },
         "object-copy": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
             "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
             "dev": true,
             "requires": {
                 "copy-descriptor": "^0.1.0",
                 "define-property": "^0.2.5",
                 "kind-of": "^3.0.3"
             },
             "dependencies": {
                 "define-property": {
                     "version": "0.2.5",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
                     "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^0.1.0"
                     }
                 },
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 },
                 "kind-of": {
                     "version": "3.2.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                     "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                     "dev": true,
                     "requires": {
                         "is-buffer": "^1.1.5"
                     }
                 }
             }
         },
         "object-inspect": {
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
             "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
             "dev": true
         },
         "object-is": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
             "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
                 "es-abstract": "^1.18.0-next.1"
+            },
+            "dependencies": {
+                "es-abstract": {
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+                    "dev": true,
+                    "requires": {
+                        "es-to-primitive": "^1.2.1",
+                        "function-bind": "^1.1.1",
+                        "has": "^1.0.3",
+                        "has-symbols": "^1.0.1",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
+                        "object-keys": "^1.1.1",
+                        "object.assign": "^4.1.1",
+                        "string.prototype.trimend": "^1.0.1",
+                        "string.prototype.trimstart": "^1.0.1"
+                    }
+                }
             }
         },
         "object-keys": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
             "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
             "dev": true
         },
-        "object-path": {
-            "version": "0.9.2",
-            "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
-            "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=",
-            "dev": true
-        },
         "object-visit": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
             "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
             "dev": true,
             "requires": {
                 "isobject": "^3.0.0"
             }
         },
         "object.assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
-            "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+            "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
             "dev": true,
             "requires": {
+                "call-bind": "^1.0.0",
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.18.0-next.0",
                 "has-symbols": "^1.0.1",
                 "object-keys": "^1.1.1"
             }
         },
         "object.getownpropertydescriptors": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
             "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
                 "es-abstract": "^1.17.0-next.1"
-            },
-            "dependencies": {
-                "es-abstract": {
-                    "version": "1.17.7",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-                    "dev": true,
-                    "requires": {
-                        "es-to-primitive": "^1.2.1",
-                        "function-bind": "^1.1.1",
-                        "has": "^1.0.3",
-                        "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.2",
-                        "is-regex": "^1.1.1",
-                        "object-inspect": "^1.8.0",
-                        "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.1",
-                        "string.prototype.trimend": "^1.0.1",
-                        "string.prototype.trimstart": "^1.0.1"
-                    }
-                }
             }
         },
         "object.omit": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-3.0.0.tgz",
             "integrity": "sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==",
             "dev": true,
             "requires": {
                 "is-extendable": "^1.0.0"
             }
         },
         "object.pick": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
             "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
             "dev": true,
             "requires": {
                 "isobject": "^3.0.1"
             }
         },
         "object.values": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
             "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
                 "es-abstract": "^1.17.0-next.1",
                 "function-bind": "^1.1.1",
                 "has": "^1.0.3"
-            },
-            "dependencies": {
-                "es-abstract": {
-                    "version": "1.17.7",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-                    "dev": true,
-                    "requires": {
-                        "es-to-primitive": "^1.2.1",
-                        "function-bind": "^1.1.1",
-                        "has": "^1.0.3",
-                        "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.2",
-                        "is-regex": "^1.1.1",
-                        "object-inspect": "^1.8.0",
-                        "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.1",
-                        "string.prototype.trimend": "^1.0.1",
-                        "string.prototype.trimstart": "^1.0.1"
-                    }
-                }
             }
         },
         "obuf": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
             "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
             "dev": true
         },
         "on-finished": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
             "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
             "dev": true,
             "requires": {
                 "ee-first": "1.1.1"
             }
         },
         "on-headers": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
             "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
             "dev": true
         },
         "once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
             "dev": true,
             "requires": {
                 "wrappy": "1"
             }
         },
         "onetime": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
             "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
             "dev": true,
             "requires": {
                 "mimic-fn": "^2.1.0"
             }
         },
+        "openvidu-browser": {
+            "version": "2.16.2",
+            "resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.16.2.tgz",
+            "integrity": "sha512-rdiF6X42FJCbIj3DDICJPfqiTP1KtXAG8kkXQqp/M98qLMnxdjFlTlRkXl+HolwD6KRHBxiSWPhbKDh0zRiEcw==",
+            "dev": true,
+            "requires": {
+                "freeice": "2.2.2",
+                "hark": "1.2.3",
+                "platform": "1.3.6",
+                "uuid": "8.3.1",
+                "wolfy87-eventemitter": "5.2.9"
+            },
+            "dependencies": {
+                "uuid": {
+                    "version": "8.3.1",
+                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+                    "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+                    "dev": true
+                }
+            }
+        },
         "opn": {
             "version": "5.5.0",
             "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
             "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
             "dev": true,
             "requires": {
                 "is-wsl": "^1.1.0"
             }
         },
         "optimize-css-assets-webpack-plugin": {
             "version": "5.0.4",
             "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz",
             "integrity": "sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A==",
             "dev": true,
             "requires": {
                 "cssnano": "^4.1.10",
                 "last-call-webpack-plugin": "^3.0.0"
             }
         },
         "optionator": {
             "version": "0.8.3",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
             "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
             "dev": true,
             "requires": {
                 "deep-is": "~0.1.3",
                 "fast-levenshtein": "~2.0.6",
                 "levn": "~0.3.0",
                 "prelude-ls": "~1.1.2",
                 "type-check": "~0.3.2",
                 "word-wrap": "~1.2.3"
             }
         },
         "original": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
             "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
             "dev": true,
             "requires": {
                 "url-parse": "^1.4.3"
             }
         },
         "os-browserify": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
             "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
             "dev": true
         },
         "os-tmpdir": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
             "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
             "dev": true
         },
         "p-finally": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
             "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
             "dev": true
         },
         "p-limit": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
             "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
             "dev": true,
             "requires": {
                 "p-try": "^2.0.0"
             }
         },
         "p-locate": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
             "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
             "dev": true,
             "requires": {
                 "p-limit": "^2.0.0"
             }
         },
         "p-map": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
             "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
             "dev": true,
             "requires": {
                 "aggregate-error": "^3.0.0"
             }
         },
         "p-pipe": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz",
             "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=",
             "dev": true
         },
         "p-retry": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
             "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
             "dev": true,
             "requires": {
                 "retry": "^0.12.0"
             }
         },
         "p-try": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
             "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
             "dev": true
         },
         "pako": {
             "version": "1.0.11",
             "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
             "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
             "dev": true
         },
         "parallel-transform": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
             "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
             "dev": true,
             "requires": {
                 "cyclist": "^1.0.1",
                 "inherits": "^2.0.3",
                 "readable-stream": "^2.1.5"
             }
         },
         "param-case": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
             "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
             "dev": true,
             "requires": {
                 "no-case": "^2.2.0"
             }
         },
         "parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
             "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
             "dev": true,
             "requires": {
                 "callsites": "^3.0.0"
             }
         },
         "parse-asn1": {
             "version": "5.1.6",
             "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
             "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
             "dev": true,
             "requires": {
                 "asn1.js": "^5.2.0",
                 "browserify-aes": "^1.0.0",
                 "evp_bytestokey": "^1.0.0",
                 "pbkdf2": "^3.0.3",
                 "safe-buffer": "^5.1.1"
             }
         },
         "parse-entities": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
             "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
             "dev": true,
             "requires": {
                 "character-entities": "^1.0.0",
                 "character-entities-legacy": "^1.0.0",
                 "character-reference-invalid": "^1.0.0",
                 "is-alphanumerical": "^1.0.0",
                 "is-decimal": "^1.0.0",
                 "is-hexadecimal": "^1.0.0"
             }
         },
         "parse-json": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
             "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
             "dev": true,
             "requires": {
                 "error-ex": "^1.3.1",
                 "json-parse-better-errors": "^1.0.1"
             }
         },
         "parse-passwd": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
             "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
             "dev": true
         },
         "parseurl": {
             "version": "1.3.3",
             "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
             "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
             "dev": true
         },
         "pascalcase": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
             "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
             "dev": true
         },
         "path-browserify": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
             "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
             "dev": true
         },
         "path-dirname": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
             "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
             "dev": true
         },
         "path-exists": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
             "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
             "dev": true
         },
         "path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
             "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
             "dev": true
         },
         "path-is-inside": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
             "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
             "dev": true
         },
         "path-key": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
             "dev": true
         },
         "path-parse": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
             "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
             "dev": true
         },
         "path-to-regexp": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
             "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
             "dev": true
         },
         "path-type": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
             "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
             "dev": true,
             "requires": {
                 "pify": "^3.0.0"
             },
             "dependencies": {
                 "pify": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
                     "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
                     "dev": true
                 }
             }
         },
         "pbkdf2": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
             "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
             "dev": true,
             "requires": {
                 "create-hash": "^1.1.2",
                 "create-hmac": "^1.1.4",
                 "ripemd160": "^2.0.1",
                 "safe-buffer": "^5.0.1",
                 "sha.js": "^2.4.8"
             }
         },
         "picomatch": {
             "version": "2.2.2",
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
             "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
             "dev": true
         },
         "pify": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
             "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
             "dev": true
         },
         "pinkie": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
             "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
             "dev": true
         },
         "pinkie-promise": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
             "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
             "dev": true,
             "requires": {
                 "pinkie": "^2.0.0"
             }
         },
         "pkg-dir": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
             "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
             "dev": true,
             "requires": {
                 "find-up": "^3.0.0"
             }
         },
+        "platform": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
+            "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
+            "dev": true
+        },
         "popper.js": {
             "version": "1.16.1",
             "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
             "integrity": "sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=",
             "dev": true
         },
         "portfinder": {
             "version": "1.0.28",
             "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
             "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
             "dev": true,
             "requires": {
                 "async": "^2.6.2",
                 "debug": "^3.1.1",
                 "mkdirp": "^0.5.5"
             },
             "dependencies": {
                 "debug": {
                     "version": "3.2.6",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
                     "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
                     "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "posix-character-classes": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
             "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
             "dev": true
         },
         "postcss": {
             "version": "7.0.32",
             "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
             "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
             "dev": true,
             "requires": {
                 "chalk": "^2.4.2",
                 "source-map": "^0.6.1",
                 "supports-color": "^6.1.0"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     },
                     "dependencies": {
                         "supports-color": {
                             "version": "5.5.0",
                             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
                             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
                             "dev": true,
                             "requires": {
                                 "has-flag": "^3.0.0"
                             }
                         }
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 },
                 "supports-color": {
                     "version": "6.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
                     "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
                     "dev": true,
                     "requires": {
                         "has-flag": "^3.0.0"
                     }
                 }
             }
         },
         "postcss-calc": {
             "version": "7.0.5",
             "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
             "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.27",
                 "postcss-selector-parser": "^6.0.2",
                 "postcss-value-parser": "^4.0.2"
             }
         },
         "postcss-colormin": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
             "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
                 "color": "^3.0.0",
                 "has": "^1.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-convert-values": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
             "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-discard-comments": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
             "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
             }
         },
         "postcss-discard-duplicates": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
             "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
             }
         },
         "postcss-discard-empty": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
             "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
             }
         },
         "postcss-discard-overridden": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
             "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
             }
         },
         "postcss-html": {
             "version": "0.36.0",
             "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
             "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
             "dev": true,
             "requires": {
                 "htmlparser2": "^3.10.0"
             }
         },
         "postcss-less": {
             "version": "3.1.4",
             "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
             "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.14"
             }
         },
         "postcss-load-config": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
             "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
             "dev": true,
             "requires": {
                 "cosmiconfig": "^5.0.0",
                 "import-cwd": "^2.0.0"
             }
         },
         "postcss-loader": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
             "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.1.0",
                 "postcss": "^7.0.0",
                 "postcss-load-config": "^2.0.0",
                 "schema-utils": "^1.0.0"
             },
             "dependencies": {
                 "schema-utils": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
                     "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
                     "dev": true,
                     "requires": {
                         "ajv": "^6.1.0",
                         "ajv-errors": "^1.0.0",
                         "ajv-keywords": "^3.1.0"
                     }
                 }
             }
         },
         "postcss-media-query-parser": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
             "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
             "dev": true
         },
         "postcss-merge-longhand": {
             "version": "4.0.11",
             "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
             "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
             "dev": true,
             "requires": {
                 "css-color-names": "0.0.4",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0",
                 "stylehacks": "^4.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-merge-rules": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
             "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
                 "caniuse-api": "^3.0.0",
                 "cssnano-util-same-parent": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-selector-parser": "^3.0.0",
                 "vendors": "^1.0.0"
             },
             "dependencies": {
                 "postcss-selector-parser": {
                     "version": "3.1.2",
                     "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
                     "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
                     "dev": true,
                     "requires": {
                         "dot-prop": "^5.2.0",
                         "indexes-of": "^1.0.1",
                         "uniq": "^1.0.1"
                     }
                 }
             }
         },
         "postcss-minify-font-values": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
             "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-minify-gradients": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
             "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
                 "is-color-stop": "^1.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-minify-params": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
             "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
             "dev": true,
             "requires": {
                 "alphanum-sort": "^1.0.0",
                 "browserslist": "^4.0.0",
                 "cssnano-util-get-arguments": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0",
                 "uniqs": "^2.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-minify-selectors": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
             "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
             "dev": true,
             "requires": {
                 "alphanum-sort": "^1.0.0",
                 "has": "^1.0.0",
                 "postcss": "^7.0.0",
                 "postcss-selector-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-selector-parser": {
                     "version": "3.1.2",
                     "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
                     "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
                     "dev": true,
                     "requires": {
                         "dot-prop": "^5.2.0",
                         "indexes-of": "^1.0.1",
                         "uniq": "^1.0.1"
                     }
                 }
             }
         },
         "postcss-modules-extract-imports": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz",
             "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==",
             "dev": true,
             "requires": {
                 "postcss": "^6.0.1"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "postcss": {
                     "version": "6.0.23",
                     "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
                     "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
                     "dev": true,
                     "requires": {
                         "chalk": "^2.4.1",
                         "source-map": "^0.6.1",
                         "supports-color": "^5.4.0"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "postcss-modules-local-by-default": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
             "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
             "dev": true,
             "requires": {
                 "css-selector-tokenizer": "^0.7.0",
                 "postcss": "^6.0.1"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "postcss": {
                     "version": "6.0.23",
                     "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
                     "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
                     "dev": true,
                     "requires": {
                         "chalk": "^2.4.1",
                         "source-map": "^0.6.1",
                         "supports-color": "^5.4.0"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "postcss-modules-scope": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
             "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
             "dev": true,
             "requires": {
                 "css-selector-tokenizer": "^0.7.0",
                 "postcss": "^6.0.1"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "postcss": {
                     "version": "6.0.23",
                     "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
                     "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
                     "dev": true,
                     "requires": {
                         "chalk": "^2.4.1",
                         "source-map": "^0.6.1",
                         "supports-color": "^5.4.0"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "postcss-modules-values": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
             "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
             "dev": true,
             "requires": {
                 "icss-replace-symbols": "^1.1.0",
                 "postcss": "^6.0.1"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 },
                 "postcss": {
                     "version": "6.0.23",
                     "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
                     "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
                     "dev": true,
                     "requires": {
                         "chalk": "^2.4.1",
                         "source-map": "^0.6.1",
                         "supports-color": "^5.4.0"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-charset": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
             "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0"
             }
         },
         "postcss-normalize-display-values": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
             "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-match": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-positions": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
             "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
                 "has": "^1.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-repeat-style": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
             "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
                 "cssnano-util-get-match": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-string": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
             "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
             "dev": true,
             "requires": {
                 "has": "^1.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-timing-functions": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
             "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-match": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-unicode": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
             "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-url": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
             "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
             "dev": true,
             "requires": {
                 "is-absolute-url": "^2.0.0",
                 "normalize-url": "^3.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-normalize-whitespace": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
             "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-ordered-values": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
             "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-arguments": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-reduce-initial": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
             "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
                 "caniuse-api": "^3.0.0",
                 "has": "^1.0.0",
                 "postcss": "^7.0.0"
             }
         },
         "postcss-reduce-transforms": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
             "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
             "dev": true,
             "requires": {
                 "cssnano-util-get-match": "^4.0.0",
                 "has": "^1.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-resolve-nested-selector": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
             "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
             "dev": true
         },
         "postcss-safe-parser": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
             "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.26"
             }
         },
         "postcss-sass": {
             "version": "0.4.4",
             "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
             "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
             "dev": true,
             "requires": {
                 "gonzales-pe": "^4.3.0",
                 "postcss": "^7.0.21"
             }
         },
         "postcss-scss": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
             "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.6"
             }
         },
         "postcss-selector-parser": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
             "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
             "dev": true,
             "requires": {
                 "cssesc": "^3.0.0",
                 "indexes-of": "^1.0.1",
                 "uniq": "^1.0.1"
             }
         },
         "postcss-svgo": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
             "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
             "dev": true,
             "requires": {
                 "is-svg": "^3.0.0",
                 "postcss": "^7.0.0",
                 "postcss-value-parser": "^3.0.0",
                 "svgo": "^1.0.0"
             },
             "dependencies": {
                 "postcss-value-parser": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
                     "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
                     "dev": true
                 }
             }
         },
         "postcss-syntax": {
             "version": "0.36.2",
             "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
             "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
             "dev": true
         },
         "postcss-unique-selectors": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
             "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
             "dev": true,
             "requires": {
                 "alphanum-sort": "^1.0.0",
                 "postcss": "^7.0.0",
                 "uniqs": "^2.0.0"
             }
         },
         "postcss-value-parser": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
             "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
             "dev": true
         },
         "prelude-ls": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
             "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
             "dev": true
         },
         "prettier": {
             "version": "1.19.1",
             "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
             "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
             "dev": true,
             "optional": true
         },
         "private": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
             "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
             "dev": true
         },
         "process": {
             "version": "0.11.10",
             "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
             "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
             "dev": true
         },
         "process-nextick-args": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
             "dev": true
         },
         "progress": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
             "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
             "dev": true
         },
         "promise-inflight": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
             "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
             "dev": true
         },
         "proxy-addr": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
             "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
             "dev": true,
             "requires": {
                 "forwarded": "~0.1.2",
                 "ipaddr.js": "1.9.1"
             }
         },
         "prr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
             "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
             "dev": true
         },
         "pseudomap": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
             "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
             "dev": true
         },
         "public-encrypt": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
             "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
             "dev": true,
             "requires": {
                 "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"
             },
             "dependencies": {
                 "bn.js": {
                     "version": "4.11.9",
                     "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
                     "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
                     "dev": true
                 }
             }
         },
         "pump": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
             "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
             }
         },
         "pumpify": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
             "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
             "dev": true,
             "requires": {
                 "duplexify": "^3.6.0",
                 "inherits": "^2.0.3",
                 "pump": "^2.0.0"
             },
             "dependencies": {
                 "pump": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
                     "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
                     "dev": true,
                     "requires": {
                         "end-of-stream": "^1.1.0",
                         "once": "^1.3.1"
                     }
                 }
             }
         },
         "punycode": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
             "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
             "dev": true
         },
         "q": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
             "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
             "dev": true
         },
         "qs": {
             "version": "6.7.0",
             "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
             "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
             "dev": true
         },
         "querystring": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
             "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
             "dev": true
         },
         "querystring-es3": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
             "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
             "dev": true
         },
         "querystringify": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
             "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
             "dev": true
         },
         "quick-lru": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
             "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
             "dev": true
         },
         "randombytes": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
             "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
             "dev": true,
             "requires": {
                 "safe-buffer": "^5.1.0"
             }
         },
         "randomfill": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
             "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
             "dev": true,
             "requires": {
                 "randombytes": "^2.0.5",
                 "safe-buffer": "^5.1.0"
             }
         },
         "range-parser": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
             "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
             "dev": true
         },
         "raw-body": {
             "version": "2.4.0",
             "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
             "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
             "dev": true,
             "requires": {
                 "bytes": "3.1.0",
                 "http-errors": "1.7.2",
                 "iconv-lite": "0.4.24",
                 "unpipe": "1.0.0"
             },
             "dependencies": {
                 "bytes": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
                     "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
                     "dev": true
                 }
             }
         },
         "read-pkg": {
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
             "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
             "dev": true,
             "requires": {
                 "@types/normalize-package-data": "^2.4.0",
                 "normalize-package-data": "^2.5.0",
                 "parse-json": "^5.0.0",
                 "type-fest": "^0.6.0"
             },
             "dependencies": {
+                "hosted-git-info": {
+                    "version": "2.8.8",
+                    "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+                    "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+                    "dev": true
+                },
+                "normalize-package-data": {
+                    "version": "2.5.0",
+                    "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+                    "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+                    "dev": true,
+                    "requires": {
+                        "hosted-git-info": "^2.1.4",
+                        "resolve": "^1.10.0",
+                        "semver": "2 || 3 || 4 || 5",
+                        "validate-npm-package-license": "^3.0.1"
+                    }
+                },
                 "parse-json": {
                     "version": "5.1.0",
                     "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
                     "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.0.0",
                         "error-ex": "^1.3.1",
                         "json-parse-even-better-errors": "^2.3.0",
                         "lines-and-columns": "^1.1.6"
                     }
                 },
+                "semver": {
+                    "version": "5.7.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "dev": true
+                },
                 "type-fest": {
                     "version": "0.6.0",
                     "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
                     "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
                     "dev": true
                 }
             }
         },
         "read-pkg-up": {
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
             "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
             "dev": true,
             "requires": {
                 "find-up": "^4.1.0",
                 "read-pkg": "^5.2.0",
                 "type-fest": "^0.8.1"
             },
             "dependencies": {
                 "find-up": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
                     "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
                     "dev": true,
                     "requires": {
                         "locate-path": "^5.0.0",
                         "path-exists": "^4.0.0"
                     }
                 },
                 "locate-path": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
                     "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
                     "dev": true,
                     "requires": {
                         "p-locate": "^4.1.0"
                     }
                 },
                 "p-locate": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
                     "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
                     "dev": true,
                     "requires": {
                         "p-limit": "^2.2.0"
                     }
                 },
                 "path-exists": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
                     "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
                     "dev": true
                 }
             }
         },
         "readable-stream": {
             "version": "2.3.7",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
             "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
             "dev": true,
             "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.3",
                 "isarray": "~1.0.0",
                 "process-nextick-args": "~2.0.0",
                 "safe-buffer": "~5.1.1",
                 "string_decoder": "~1.1.1",
                 "util-deprecate": "~1.0.1"
             }
         },
         "readdirp": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
             "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.11",
                 "micromatch": "^3.1.10",
                 "readable-stream": "^2.0.2"
             }
         },
         "recast": {
             "version": "0.11.23",
             "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
             "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
             "dev": true,
             "requires": {
                 "ast-types": "0.9.6",
                 "esprima": "~3.1.0",
                 "private": "~0.1.5",
                 "source-map": "~0.5.0"
             },
             "dependencies": {
                 "esprima": {
                     "version": "3.1.3",
                     "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
                     "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
                     "dev": true
                 }
             }
         },
         "redent": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
             "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
             "dev": true,
             "requires": {
                 "indent-string": "^4.0.0",
                 "strip-indent": "^3.0.0"
             }
         },
         "regenerate": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-            "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+            "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
             "dev": true
         },
         "regenerate-unicode-properties": {
             "version": "8.2.0",
             "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
             "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
             "dev": true,
             "requires": {
                 "regenerate": "^1.4.0"
             }
         },
         "regenerator-runtime": {
             "version": "0.13.7",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
             "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
             "dev": true
         },
         "regenerator-transform": {
             "version": "0.14.5",
             "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
             "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
             "dev": true,
             "requires": {
                 "@babel/runtime": "^7.8.4"
             }
         },
         "regex-not": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
             "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
             "dev": true,
             "requires": {
                 "extend-shallow": "^3.0.2",
                 "safe-regex": "^1.1.0"
             }
         },
         "regex-parser": {
-            "version": "2.2.10",
-            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
-            "integrity": "sha1-nmao9z2JoQdhbmOznU3t3+6RKzc=",
+            "version": "2.2.11",
+            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
+            "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
             "dev": true
         },
         "regexp.prototype.flags": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
             "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
                 "es-abstract": "^1.17.0-next.1"
-            },
-            "dependencies": {
-                "es-abstract": {
-                    "version": "1.17.7",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-                    "dev": true,
-                    "requires": {
-                        "es-to-primitive": "^1.2.1",
-                        "function-bind": "^1.1.1",
-                        "has": "^1.0.3",
-                        "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.2",
-                        "is-regex": "^1.1.1",
-                        "object-inspect": "^1.8.0",
-                        "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.1",
-                        "string.prototype.trimend": "^1.0.1",
-                        "string.prototype.trimstart": "^1.0.1"
-                    }
-                }
             }
         },
         "regexpp": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
             "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
             "dev": true
         },
         "regexpu-core": {
             "version": "4.7.1",
             "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
             "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
             "dev": true,
             "requires": {
                 "regenerate": "^1.4.0",
                 "regenerate-unicode-properties": "^8.2.0",
                 "regjsgen": "^0.5.1",
                 "regjsparser": "^0.6.4",
                 "unicode-match-property-ecmascript": "^1.0.4",
                 "unicode-match-property-value-ecmascript": "^1.2.0"
             }
         },
         "regjsgen": {
             "version": "0.5.2",
             "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
             "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
             "dev": true
         },
         "regjsparser": {
             "version": "0.6.4",
             "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
             "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
             "dev": true,
             "requires": {
                 "jsesc": "~0.5.0"
             },
             "dependencies": {
                 "jsesc": {
                     "version": "0.5.0",
                     "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
                     "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
                     "dev": true
                 }
             }
         },
         "relateurl": {
             "version": "0.2.7",
             "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
             "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
             "dev": true
         },
         "remark": {
-            "version": "12.0.1",
-            "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
-            "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
+            "version": "13.0.0",
+            "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
+            "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
             "dev": true,
             "requires": {
-                "remark-parse": "^8.0.0",
-                "remark-stringify": "^8.0.0",
-                "unified": "^9.0.0"
+                "remark-parse": "^9.0.0",
+                "remark-stringify": "^9.0.0",
+                "unified": "^9.1.0"
             }
         },
         "remark-parse": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-            "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
+            "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
             "dev": true,
             "requires": {
-                "ccount": "^1.0.0",
-                "collapse-white-space": "^1.0.2",
-                "is-alphabetical": "^1.0.0",
-                "is-decimal": "^1.0.0",
-                "is-whitespace-character": "^1.0.0",
-                "is-word-character": "^1.0.0",
-                "markdown-escapes": "^1.0.0",
-                "parse-entities": "^2.0.0",
-                "repeat-string": "^1.5.4",
-                "state-toggle": "^1.0.0",
-                "trim": "0.0.1",
-                "trim-trailing-lines": "^1.0.0",
-                "unherit": "^1.0.4",
-                "unist-util-remove-position": "^2.0.0",
-                "vfile-location": "^3.0.0",
-                "xtend": "^4.0.1"
+                "mdast-util-from-markdown": "^0.8.0"
             }
         },
         "remark-stringify": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
-            "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.0.tgz",
+            "integrity": "sha512-8x29DpTbVzEc6Dwb90qhxCtbZ6hmj3BxWWDpMhA+1WM4dOEGH5U5/GFe3Be5Hns5MvPSFAr1e2KSVtKZkK5nUw==",
             "dev": true,
             "requires": {
-                "ccount": "^1.0.0",
-                "is-alphanumeric": "^1.0.0",
-                "is-decimal": "^1.0.0",
-                "is-whitespace-character": "^1.0.0",
-                "longest-streak": "^2.0.1",
-                "markdown-escapes": "^1.0.0",
-                "markdown-table": "^2.0.0",
-                "mdast-util-compact": "^2.0.0",
-                "parse-entities": "^2.0.0",
-                "repeat-string": "^1.5.4",
-                "state-toggle": "^1.0.0",
-                "stringify-entities": "^3.0.0",
-                "unherit": "^1.0.4",
-                "xtend": "^4.0.1"
+                "mdast-util-to-markdown": "^0.5.0"
             }
         },
         "remove-trailing-separator": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
             "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
             "dev": true
         },
         "repeat-element": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
             "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
             "dev": true
         },
         "repeat-string": {
             "version": "1.6.1",
             "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
             "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
             "dev": true
         },
         "replace-ext": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
             "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
             "dev": true
         },
         "require-directory": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
             "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
             "dev": true
         },
         "require-main-filename": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
             "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
             "dev": true
         },
         "requires-port": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
             "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
             "dev": true
         },
         "resolve": {
             "version": "1.17.0",
             "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
             "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
             "dev": true,
             "requires": {
                 "path-parse": "^1.0.6"
             }
         },
         "resolve-cwd": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
             "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
             "dev": true,
             "requires": {
                 "resolve-from": "^3.0.0"
             },
             "dependencies": {
                 "resolve-from": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
                     "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
                     "dev": true
                 }
             }
         },
         "resolve-dir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
             "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
             "dev": true,
             "requires": {
                 "expand-tilde": "^2.0.0",
                 "global-modules": "^1.0.0"
             },
             "dependencies": {
                 "global-modules": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
                     "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
                     "dev": true,
                     "requires": {
                         "global-prefix": "^1.0.1",
                         "is-windows": "^1.0.1",
                         "resolve-dir": "^1.0.0"
                     }
                 }
             }
         },
         "resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
             "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
             "dev": true
         },
         "resolve-url": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
             "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
             "dev": true
         },
         "resolve-url-loader": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-2.3.2.tgz",
-            "integrity": "sha1-g7uevDkrZsVjeV7vIvB4lwNXom4=",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
+            "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
             "dev": true,
             "requires": {
-                "adjust-sourcemap-loader": "^1.1.0",
-                "camelcase": "^4.1.0",
-                "convert-source-map": "^1.5.1",
-                "loader-utils": "^1.1.0",
-                "lodash.defaults": "^4.0.0",
-                "rework": "^1.0.1",
-                "rework-visit": "^1.0.0",
-                "source-map": "^0.5.7",
-                "urix": "^0.1.0"
+                "adjust-sourcemap-loader": "3.0.0",
+                "camelcase": "5.3.1",
+                "compose-function": "3.0.3",
+                "convert-source-map": "1.7.0",
+                "es6-iterator": "2.0.3",
+                "loader-utils": "1.2.3",
+                "postcss": "7.0.21",
+                "rework": "1.0.1",
+                "rework-visit": "1.0.0",
+                "source-map": "0.6.1"
             },
             "dependencies": {
-                "camelcase": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-                    "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+                "chalk": {
+                    "version": "2.4.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^3.2.1",
+                        "escape-string-regexp": "^1.0.5",
+                        "supports-color": "^5.3.0"
+                    },
+                    "dependencies": {
+                        "supports-color": {
+                            "version": "5.5.0",
+                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                            "dev": true,
+                            "requires": {
+                                "has-flag": "^3.0.0"
+                            }
+                        }
+                    }
+                },
+                "postcss": {
+                    "version": "7.0.21",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
+                    "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.2",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^6.1.0"
+                    }
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
+                },
+                "supports-color": {
+                    "version": "6.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
                 }
             }
         },
         "restore-cursor": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
             "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
             "dev": true,
             "requires": {
                 "onetime": "^5.1.0",
                 "signal-exit": "^3.0.2"
             }
         },
         "ret": {
             "version": "0.1.15",
             "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
             "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
             "dev": true
         },
         "retry": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
             "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
             "dev": true
         },
         "reusify": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
             "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
             "dev": true
         },
         "rework": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
             "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
             "dev": true,
             "requires": {
                 "convert-source-map": "^0.3.3",
                 "css": "^2.0.0"
             },
             "dependencies": {
                 "convert-source-map": {
                     "version": "0.3.5",
                     "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
                     "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
                     "dev": true
                 }
             }
         },
         "rework-visit": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
             "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
             "dev": true
         },
         "rgb-regex": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
             "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
             "dev": true
         },
         "rgba-regex": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
             "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
             "dev": true
         },
         "rimraf": {
             "version": "2.6.3",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
             "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
             "dev": true,
             "requires": {
                 "glob": "^7.1.3"
             }
         },
         "ripemd160": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
             "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
             "dev": true,
             "requires": {
                 "hash-base": "^3.0.0",
                 "inherits": "^2.0.1"
             }
         },
         "run-async": {
             "version": "2.4.1",
             "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
             "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
             "dev": true
         },
         "run-parallel": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-            "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
+            "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==",
             "dev": true
         },
         "run-queue": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
             "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
             "dev": true,
             "requires": {
                 "aproba": "^1.1.1"
             }
         },
         "rxjs": {
             "version": "6.5.5",
             "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
             "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
             "dev": true,
             "requires": {
                 "tslib": "^1.9.0"
             }
         },
         "safe-buffer": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
             "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
             "dev": true
         },
         "safe-regex": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
             "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
             "dev": true,
             "requires": {
                 "ret": "~0.1.10"
             }
         },
         "safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
             "dev": true
         },
         "sass": {
-            "version": "1.27.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz",
-            "integrity": "sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig==",
+            "version": "1.32.4",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.4.tgz",
+            "integrity": "sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w==",
             "dev": true,
             "requires": {
                 "chokidar": ">=2.0.0 <4.0.0"
             }
         },
         "sass-loader": {
             "version": "8.0.2",
             "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
             "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
             "dev": true,
             "requires": {
                 "clone-deep": "^4.0.1",
                 "loader-utils": "^1.2.3",
                 "neo-async": "^2.6.1",
                 "schema-utils": "^2.6.1",
                 "semver": "^6.3.0"
             },
             "dependencies": {
                 "semver": {
                     "version": "6.3.0",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
                     "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
                     "dev": true
                 }
             }
         },
         "sax": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
             "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
             "dev": true
         },
         "schema-utils": {
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
             "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
             "dev": true,
             "requires": {
                 "@types/json-schema": "^7.0.4",
                 "ajv": "^6.12.2",
                 "ajv-keywords": "^3.4.1"
             }
         },
         "select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
             "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
             "dev": true
         },
         "selfsigned": {
             "version": "1.10.8",
             "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
             "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
             "dev": true,
             "requires": {
                 "node-forge": "^0.10.0"
             }
         },
         "semver": {
             "version": "6.3.0",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
             "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
             "dev": true
         },
         "send": {
             "version": "0.17.1",
             "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
             "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
             "dev": true,
             "requires": {
                 "debug": "2.6.9",
                 "depd": "~1.1.2",
                 "destroy": "~1.0.4",
                 "encodeurl": "~1.0.2",
                 "escape-html": "~1.0.3",
                 "etag": "~1.8.1",
                 "fresh": "0.5.2",
                 "http-errors": "~1.7.2",
                 "mime": "1.6.0",
                 "ms": "2.1.1",
                 "on-finished": "~2.3.0",
                 "range-parser": "~1.2.1",
                 "statuses": "~1.5.0"
             },
             "dependencies": {
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     },
                     "dependencies": {
                         "ms": {
                             "version": "2.0.0",
                             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
                             "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
                             "dev": true
                         }
                     }
                 },
                 "ms": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
                     "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
                     "dev": true
                 }
             }
         },
         "serialize-javascript": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
             "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
             "dev": true,
             "requires": {
                 "randombytes": "^2.1.0"
             }
         },
         "serve-index": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
             "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
             "dev": true,
             "requires": {
                 "accepts": "~1.3.4",
                 "batch": "0.6.1",
                 "debug": "2.6.9",
                 "escape-html": "~1.0.3",
                 "http-errors": "~1.6.2",
                 "mime-types": "~2.1.17",
                 "parseurl": "~1.3.2"
             },
             "dependencies": {
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
                 },
                 "http-errors": {
                     "version": "1.6.3",
                     "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
                     "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
                     "dev": true,
                     "requires": {
                         "depd": "~1.1.2",
                         "inherits": "2.0.3",
                         "setprototypeof": "1.1.0",
                         "statuses": ">= 1.4.0 < 2"
                     }
                 },
                 "inherits": {
                     "version": "2.0.3",
                     "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                     "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
                     "dev": true
                 },
                 "setprototypeof": {
                     "version": "1.1.0",
                     "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
                     "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
                     "dev": true
                 }
             }
         },
         "serve-static": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
             "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
             "dev": true,
             "requires": {
                 "encodeurl": "~1.0.2",
                 "escape-html": "~1.0.3",
                 "parseurl": "~1.3.3",
                 "send": "0.17.1"
             }
         },
         "set-blocking": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
             "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
             "dev": true
         },
         "set-value": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
             "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
             "dev": true,
             "requires": {
                 "extend-shallow": "^2.0.1",
                 "is-extendable": "^0.1.1",
                 "is-plain-object": "^2.0.3",
                 "split-string": "^3.0.1"
             },
             "dependencies": {
                 "extend-shallow": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
                     "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
                         "is-extendable": "^0.1.0"
                     }
                 },
                 "is-extendable": {
                     "version": "0.1.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
                     "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
                     "dev": true
                 }
             }
         },
         "setimmediate": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
             "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
             "dev": true
         },
         "setprototypeof": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
             "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
             "dev": true
         },
         "sha.js": {
             "version": "2.4.11",
             "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
             "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
             "dev": true,
             "requires": {
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.0.1"
             }
         },
         "shallow-clone": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
             "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
             "dev": true,
             "requires": {
                 "kind-of": "^6.0.2"
             }
         },
         "shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "dev": true,
             "requires": {
                 "shebang-regex": "^3.0.0"
             }
         },
         "shebang-regex": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
             "dev": true
         },
         "shellwords": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
             "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
             "dev": true
         },
         "signal-exit": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
             "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
             "dev": true
         },
         "simple-swizzle": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
             "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
             "dev": true,
             "requires": {
                 "is-arrayish": "^0.3.1"
             },
             "dependencies": {
                 "is-arrayish": {
                     "version": "0.3.2",
                     "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
                     "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
                     "dev": true
                 }
             }
         },
         "slash": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
             "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
             "dev": true
         },
         "slice-ansi": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
             "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
             "dev": true,
             "requires": {
                 "ansi-styles": "^3.2.0",
                 "astral-regex": "^1.0.0",
                 "is-fullwidth-code-point": "^2.0.0"
             }
         },
         "snapdragon": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
             "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
             "dev": true,
             "requires": {
                 "base": "^0.11.1",
                 "debug": "^2.2.0",
                 "define-property": "^0.2.5",
                 "extend-shallow": "^2.0.1",
                 "map-cache": "^0.2.2",
                 "source-map": "^0.5.6",
                 "source-map-resolve": "^0.5.0",
                 "use": "^3.1.0"
             },
             "dependencies": {
                 "debug": {
                     "version": "2.6.9",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
                     "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
                     "dev": true,
                     "requires": {
                         "ms": "2.0.0"
                     }
                 },
                 "define-property": {
                     "version": "0.2.5",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
                     "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^0.1.0"
                     }
                 },
                 "extend-shallow": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
                     "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
                     "dev": true,
                     "requires": {
                         "is-extendable": "^0.1.0"
                     }
                 },
                 "is-extendable": {
                     "version": "0.1.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
                     "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
                     "dev": true
                 }
             }
         },
         "snapdragon-node": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
             "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
             "dev": true,
             "requires": {
                 "define-property": "^1.0.0",
                 "isobject": "^3.0.0",
                 "snapdragon-util": "^3.0.1"
             },
             "dependencies": {
                 "define-property": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
                     "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^1.0.0"
                     }
                 },
                 "is-accessor-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
                     "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-data-descriptor": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
                     "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
                     "dev": true,
                     "requires": {
                         "kind-of": "^6.0.0"
                     }
                 },
                 "is-descriptor": {
                     "version": "1.0.2",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
                     "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
                     "dev": true,
                     "requires": {
                         "is-accessor-descriptor": "^1.0.0",
                         "is-data-descriptor": "^1.0.0",
                         "kind-of": "^6.0.2"
                     }
                 }
             }
         },
         "snapdragon-util": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
             "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
             "dev": true,
             "requires": {
                 "kind-of": "^3.2.0"
             },
             "dependencies": {
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 },
                 "kind-of": {
                     "version": "3.2.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                     "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                     "dev": true,
                     "requires": {
                         "is-buffer": "^1.1.5"
                     }
                 }
             }
         },
         "sockjs": {
             "version": "0.3.20",
             "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
             "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
             "dev": true,
             "requires": {
                 "faye-websocket": "^0.10.0",
                 "uuid": "^3.4.0",
                 "websocket-driver": "0.6.5"
             }
         },
         "sockjs-client": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
             "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
             "dev": true,
             "requires": {
                 "debug": "^3.2.5",
                 "eventsource": "^1.0.7",
                 "faye-websocket": "~0.11.1",
                 "inherits": "^2.0.3",
                 "json3": "^3.3.2",
                 "url-parse": "^1.4.3"
             },
             "dependencies": {
                 "debug": {
                     "version": "3.2.6",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
                     "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
                     "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
                 },
                 "faye-websocket": {
                     "version": "0.11.3",
                     "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
                     "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
                     "dev": true,
                     "requires": {
                         "websocket-driver": ">=0.5.1"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "source-list-map": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
             "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
             "dev": true
         },
         "source-map": {
             "version": "0.5.7",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
             "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
             "dev": true
         },
         "source-map-resolve": {
             "version": "0.5.2",
             "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
             "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
             "dev": true,
             "requires": {
                 "atob": "^2.1.1",
                 "decode-uri-component": "^0.2.0",
                 "resolve-url": "^0.2.1",
                 "source-map-url": "^0.4.0",
                 "urix": "^0.1.0"
             }
         },
         "source-map-support": {
             "version": "0.5.19",
             "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
             "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
             "dev": true,
             "requires": {
                 "buffer-from": "^1.0.0",
                 "source-map": "^0.6.0"
             },
             "dependencies": {
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "source-map-url": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
             "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
             "dev": true
         },
         "spdx-correct": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
             "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
             "dev": true,
             "requires": {
                 "spdx-expression-parse": "^3.0.0",
                 "spdx-license-ids": "^3.0.0"
             }
         },
         "spdx-exceptions": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
             "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
             "dev": true
         },
         "spdx-expression-parse": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
             "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
             "dev": true,
             "requires": {
                 "spdx-exceptions": "^2.1.0",
                 "spdx-license-ids": "^3.0.0"
             }
         },
         "spdx-license-ids": {
             "version": "3.0.6",
             "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
             "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==",
             "dev": true
         },
         "spdy": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
             "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
             "dev": true,
             "requires": {
                 "debug": "^4.1.0",
                 "handle-thing": "^2.0.0",
                 "http-deceiver": "^1.2.7",
                 "select-hose": "^2.0.0",
                 "spdy-transport": "^3.0.0"
             },
             "dependencies": {
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "spdy-transport": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
             "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
             "dev": true,
             "requires": {
                 "debug": "^4.1.0",
                 "detect-node": "^2.0.4",
                 "hpack.js": "^2.1.6",
                 "obuf": "^1.1.2",
                 "readable-stream": "^3.0.6",
                 "wbuf": "^1.7.3"
             },
             "dependencies": {
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 },
                 "readable-stream": {
                     "version": "3.6.0",
                     "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
                     "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
                     "dev": true,
                     "requires": {
                         "inherits": "^2.0.3",
                         "string_decoder": "^1.1.1",
                         "util-deprecate": "^1.0.1"
                     }
                 }
             }
         },
         "specificity": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
             "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
             "dev": true
         },
         "split-string": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
             "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
             "dev": true,
             "requires": {
                 "extend-shallow": "^3.0.0"
             }
         },
         "sprintf-js": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
             "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
             "dev": true
         },
         "ssri": {
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
             "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
             "dev": true,
             "requires": {
                 "figgy-pudding": "^3.5.1",
                 "minipass": "^3.1.1"
             }
         },
         "stable": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
             "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
             "dev": true
         },
         "stackframe": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz",
             "integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==",
             "dev": true
         },
-        "state-toggle": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-            "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-            "dev": true
-        },
         "static-extend": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
             "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
             "dev": true,
             "requires": {
                 "define-property": "^0.2.5",
                 "object-copy": "^0.1.0"
             },
             "dependencies": {
                 "define-property": {
                     "version": "0.2.5",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
                     "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
                     "dev": true,
                     "requires": {
                         "is-descriptor": "^0.1.0"
                     }
                 }
             }
         },
         "statuses": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
             "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
             "dev": true
         },
         "stream-browserify": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
             "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
             "dev": true,
             "requires": {
                 "inherits": "~2.0.1",
                 "readable-stream": "^2.0.2"
             }
         },
         "stream-each": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
             "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.1.0",
                 "stream-shift": "^1.0.0"
             }
         },
         "stream-http": {
             "version": "2.8.3",
             "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
             "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
             "dev": true,
             "requires": {
                 "builtin-status-codes": "^3.0.0",
                 "inherits": "^2.0.1",
                 "readable-stream": "^2.3.6",
                 "to-arraybuffer": "^1.0.0",
                 "xtend": "^4.0.0"
             }
         },
         "stream-shift": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
             "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
             "dev": true
         },
         "string-width": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
             "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
             "dev": true,
             "requires": {
                 "emoji-regex": "^7.0.1",
                 "is-fullwidth-code-point": "^2.0.0",
                 "strip-ansi": "^5.1.0"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
                     "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
                     "dev": true
                 },
                 "strip-ansi": {
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
                     "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^4.1.0"
                     }
                 }
             }
         },
         "string.prototype.trimend": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-            "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
+            "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.5"
+                "es-abstract": "^1.18.0-next.1"
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.7",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
                         "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
                         "is-regex": "^1.1.1",
                         "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
                         "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
                 }
             }
         },
         "string.prototype.trimstart": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-            "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
+            "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.5"
+                "es-abstract": "^1.18.0-next.1"
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.7",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
                         "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
                         "is-regex": "^1.1.1",
                         "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
                         "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
                 }
             }
         },
         "string_decoder": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
             "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
             "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.0"
             }
         },
-        "stringify-entities": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz",
-            "integrity": "sha512-Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ==",
-            "dev": true,
-            "requires": {
-                "character-entities-html4": "^1.0.0",
-                "character-entities-legacy": "^1.0.0",
-                "is-alphanumerical": "^1.0.0",
-                "is-decimal": "^1.0.2",
-                "is-hexadecimal": "^1.0.0"
-            }
-        },
         "strip-ansi": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
             "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
             "dev": true,
             "requires": {
                 "ansi-regex": "^5.0.0"
             }
         },
         "strip-eof": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
             "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
             "dev": true
         },
         "strip-indent": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
             "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
             "dev": true,
             "requires": {
                 "min-indent": "^1.0.0"
             }
         },
         "strip-json-comments": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
             "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
             "dev": true
         },
         "style-loader": {
             "version": "0.23.1",
             "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
             "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
             "dev": true,
             "requires": {
                 "loader-utils": "^1.1.0",
                 "schema-utils": "^1.0.0"
             },
             "dependencies": {
                 "schema-utils": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
                     "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
                     "dev": true,
                     "requires": {
                         "ajv": "^6.1.0",
                         "ajv-errors": "^1.0.0",
                         "ajv-keywords": "^3.1.0"
                     }
                 }
             }
         },
         "style-search": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
             "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
             "dev": true
         },
         "stylehacks": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
             "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
             "dev": true,
             "requires": {
                 "browserslist": "^4.0.0",
                 "postcss": "^7.0.0",
                 "postcss-selector-parser": "^3.0.0"
             },
             "dependencies": {
                 "postcss-selector-parser": {
                     "version": "3.1.2",
                     "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
                     "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
                     "dev": true,
                     "requires": {
                         "dot-prop": "^5.2.0",
                         "indexes-of": "^1.0.1",
                         "uniq": "^1.0.1"
                     }
                 }
             }
         },
         "stylelint": {
-            "version": "13.7.2",
-            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.7.2.tgz",
-            "integrity": "sha512-mmieorkfmO+ZA6CNDu1ic9qpt4tFvH2QUB7vqXgrMVHe5ENU69q7YDq0YUg/UHLuCsZOWhUAvcMcLzLDIERzSg==",
+            "version": "13.8.0",
+            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz",
+            "integrity": "sha512-iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==",
             "dev": true,
             "requires": {
                 "@stylelint/postcss-css-in-js": "^0.37.2",
-                "@stylelint/postcss-markdown": "^0.36.1",
+                "@stylelint/postcss-markdown": "^0.36.2",
                 "autoprefixer": "^9.8.6",
                 "balanced-match": "^1.0.0",
                 "chalk": "^4.1.0",
                 "cosmiconfig": "^7.0.0",
-                "debug": "^4.1.1",
+                "debug": "^4.2.0",
                 "execall": "^2.0.0",
                 "fast-glob": "^3.2.4",
                 "fastest-levenshtein": "^1.0.12",
-                "file-entry-cache": "^5.0.1",
+                "file-entry-cache": "^6.0.0",
                 "get-stdin": "^8.0.0",
                 "global-modules": "^2.0.0",
                 "globby": "^11.0.1",
                 "globjoin": "^0.1.4",
                 "html-tags": "^3.1.0",
                 "ignore": "^5.1.8",
                 "import-lazy": "^4.0.0",
                 "imurmurhash": "^0.1.4",
-                "known-css-properties": "^0.19.0",
+                "known-css-properties": "^0.20.0",
                 "lodash": "^4.17.20",
                 "log-symbols": "^4.0.0",
                 "mathml-tag-names": "^2.1.3",
-                "meow": "^7.1.1",
+                "meow": "^8.0.0",
                 "micromatch": "^4.0.2",
                 "normalize-selector": "^0.2.0",
-                "postcss": "^7.0.32",
+                "postcss": "^7.0.35",
                 "postcss-html": "^0.36.0",
                 "postcss-less": "^3.1.4",
                 "postcss-media-query-parser": "^0.2.3",
                 "postcss-resolve-nested-selector": "^0.1.1",
                 "postcss-safe-parser": "^4.0.2",
                 "postcss-sass": "^0.4.4",
                 "postcss-scss": "^2.1.1",
-                "postcss-selector-parser": "^6.0.2",
+                "postcss-selector-parser": "^6.0.4",
                 "postcss-syntax": "^0.36.2",
                 "postcss-value-parser": "^4.1.0",
                 "resolve-from": "^5.0.0",
                 "slash": "^3.0.0",
                 "specificity": "^0.4.1",
                 "string-width": "^4.2.0",
                 "strip-ansi": "^6.0.0",
                 "style-search": "^0.1.0",
                 "sugarss": "^2.0.0",
                 "svg-tags": "^1.0.0",
-                "table": "^6.0.1",
-                "v8-compile-cache": "^2.1.1",
+                "table": "^6.0.3",
+                "v8-compile-cache": "^2.2.0",
                 "write-file-atomic": "^3.0.3"
             },
             "dependencies": {
                 "@nodelib/fs.stat": {
                     "version": "2.0.3",
                     "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
                     "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
                     "dev": true
                 },
                 "ajv": {
                     "version": "6.12.6",
                     "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
                     "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
                     "dev": true,
                     "requires": {
                         "fast-deep-equal": "^3.1.1",
                         "fast-json-stable-stringify": "^2.0.0",
                         "json-schema-traverse": "^0.4.1",
                         "uri-js": "^4.2.2"
                     }
                 },
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
                 "array-union": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
                     "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
                     "dev": true
                 },
                 "astral-regex": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
                     "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
                     "dev": true
                 },
-                "autoprefixer": {
-                    "version": "9.8.6",
-                    "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-                    "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
-                    "dev": true,
-                    "requires": {
-                        "browserslist": "^4.12.0",
-                        "caniuse-lite": "^1.0.30001109",
-                        "colorette": "^1.2.1",
-                        "normalize-range": "^0.1.2",
-                        "num2fraction": "^1.2.2",
-                        "postcss": "^7.0.32",
-                        "postcss-value-parser": "^4.1.0"
-                    }
-                },
                 "braces": {
                     "version": "3.0.2",
                     "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
                     "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
                     "dev": true,
                     "requires": {
                         "fill-range": "^7.0.1"
                     }
                 },
-                "caniuse-lite": {
-                    "version": "1.0.30001148",
-                    "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz",
-                    "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==",
-                    "dev": true
-                },
                 "color-convert": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
                     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
                     "dev": true,
                     "requires": {
                         "color-name": "~1.1.4"
                     }
                 },
                 "color-name": {
                     "version": "1.1.4",
                     "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
                     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
                     "dev": true
                 },
-                "colorette": {
-                    "version": "1.2.1",
-                    "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
-                    "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==",
-                    "dev": true
-                },
                 "cosmiconfig": {
                     "version": "7.0.0",
                     "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
                     "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
                     "dev": true,
                     "requires": {
                         "@types/parse-json": "^4.0.0",
                         "import-fresh": "^3.2.1",
                         "parse-json": "^5.0.0",
                         "path-type": "^4.0.0",
                         "yaml": "^1.10.0"
                     }
                 },
                 "debug": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-                    "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
                 "dir-glob": {
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
                     "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
                     "dev": true,
                     "requires": {
                         "path-type": "^4.0.0"
                     }
                 },
                 "emoji-regex": {
                     "version": "8.0.0",
                     "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
                     "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
                     "dev": true
                 },
                 "fast-glob": {
                     "version": "3.2.4",
                     "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
                     "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
                     "dev": true,
                     "requires": {
                         "@nodelib/fs.stat": "^2.0.2",
                         "@nodelib/fs.walk": "^1.2.3",
                         "glob-parent": "^5.1.0",
                         "merge2": "^1.3.0",
                         "micromatch": "^4.0.2",
                         "picomatch": "^2.2.1"
                     }
                 },
+                "file-entry-cache": {
+                    "version": "6.0.0",
+                    "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz",
+                    "integrity": "sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==",
+                    "dev": true,
+                    "requires": {
+                        "flat-cache": "^3.0.4"
+                    }
+                },
                 "fill-range": {
                     "version": "7.0.1",
                     "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
                     "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
                     "dev": true,
                     "requires": {
                         "to-regex-range": "^5.0.1"
                     }
                 },
+                "flat-cache": {
+                    "version": "3.0.4",
+                    "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+                    "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+                    "dev": true,
+                    "requires": {
+                        "flatted": "^3.1.0",
+                        "rimraf": "^3.0.2"
+                    }
+                },
+                "flatted": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz",
+                    "integrity": "sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==",
+                    "dev": true
+                },
                 "globby": {
                     "version": "11.0.1",
                     "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
                     "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
                     "dev": true,
                     "requires": {
                         "array-union": "^2.1.0",
                         "dir-glob": "^3.0.1",
                         "fast-glob": "^3.1.1",
                         "ignore": "^5.1.4",
                         "merge2": "^1.3.0",
                         "slash": "^3.0.0"
                     }
                 },
                 "ignore": {
                     "version": "5.1.8",
                     "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
                     "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
                     "dev": true
                 },
                 "is-fullwidth-code-point": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
                     "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
                     "dev": true
                 },
                 "is-number": {
                     "version": "7.0.0",
                     "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
                     "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
                     "dev": true
                 },
                 "micromatch": {
                     "version": "4.0.2",
                     "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
                     "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
                     "dev": true,
                     "requires": {
                         "braces": "^3.0.1",
                         "picomatch": "^2.0.5"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 },
                 "parse-json": {
                     "version": "5.1.0",
                     "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
                     "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
                     "dev": true,
                     "requires": {
                         "@babel/code-frame": "^7.0.0",
                         "error-ex": "^1.3.1",
                         "json-parse-even-better-errors": "^2.3.0",
                         "lines-and-columns": "^1.1.6"
                     }
                 },
                 "path-type": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
                     "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
                     "dev": true
                 },
+                "postcss": {
+                    "version": "7.0.35",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+                    "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.2",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^6.1.0"
+                    },
+                    "dependencies": {
+                        "chalk": {
+                            "version": "2.4.2",
+                            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+                            "dev": true,
+                            "requires": {
+                                "ansi-styles": "^3.2.1",
+                                "escape-string-regexp": "^1.0.5",
+                                "supports-color": "^5.3.0"
+                            },
+                            "dependencies": {
+                                "supports-color": {
+                                    "version": "5.5.0",
+                                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                                    "dev": true,
+                                    "requires": {
+                                        "has-flag": "^3.0.0"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "postcss-selector-parser": {
+                    "version": "6.0.4",
+                    "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+                    "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+                    "dev": true,
+                    "requires": {
+                        "cssesc": "^3.0.0",
+                        "indexes-of": "^1.0.1",
+                        "uniq": "^1.0.1",
+                        "util-deprecate": "^1.0.2"
+                    }
+                },
                 "resolve-from": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
                     "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
                     "dev": true
                 },
+                "rimraf": {
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+                    "dev": true,
+                    "requires": {
+                        "glob": "^7.1.3"
+                    }
+                },
                 "slash": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
                     "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
                     "dev": true
                 },
                 "slice-ansi": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
                     "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^4.0.0",
                         "astral-regex": "^2.0.0",
                         "is-fullwidth-code-point": "^3.0.0"
+                    },
+                    "dependencies": {
+                        "ansi-styles": {
+                            "version": "4.3.0",
+                            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                            "dev": true,
+                            "requires": {
+                                "color-convert": "^2.0.1"
+                            }
+                        }
                     }
                 },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
+                },
                 "string-width": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
                     "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
                     "dev": true,
                     "requires": {
                         "emoji-regex": "^8.0.0",
                         "is-fullwidth-code-point": "^3.0.0",
                         "strip-ansi": "^6.0.0"
                     }
                 },
+                "supports-color": {
+                    "version": "6.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                },
                 "table": {
-                    "version": "6.0.3",
-                    "resolved": "https://registry.npmjs.org/table/-/table-6.0.3.tgz",
-                    "integrity": "sha512-8321ZMcf1B9HvVX/btKv8mMZahCjn2aYrDlpqHaBFCfnox64edeH9kEid0vTLTRR8gWR2A20aDgeuTTea4sVtw==",
+                    "version": "6.0.4",
+                    "resolved": "https://registry.npmjs.org/table/-/table-6.0.4.tgz",
+                    "integrity": "sha512-sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw==",
                     "dev": true,
                     "requires": {
                         "ajv": "^6.12.4",
                         "lodash": "^4.17.20",
                         "slice-ansi": "^4.0.0",
                         "string-width": "^4.2.0"
                     }
                 },
                 "to-regex-range": {
                     "version": "5.0.1",
                     "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
                     "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
                     "dev": true,
                     "requires": {
                         "is-number": "^7.0.0"
                     }
+                },
+                "v8-compile-cache": {
+                    "version": "2.2.0",
+                    "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
+                    "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
+                    "dev": true
                 }
             }
         },
         "stylelint-config-recommended": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz",
             "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==",
             "dev": true
         },
         "stylelint-config-standard": {
             "version": "20.0.0",
             "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz",
             "integrity": "sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==",
             "dev": true,
             "requires": {
                 "stylelint-config-recommended": "^3.0.0"
             }
         },
         "sugarss": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
             "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
             "dev": true,
             "requires": {
                 "postcss": "^7.0.2"
             }
         },
         "supports-color": {
             "version": "5.5.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
             "dev": true,
             "requires": {
                 "has-flag": "^3.0.0"
             }
         },
         "svg-tags": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
             "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
             "dev": true
         },
         "svgo": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
             "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
             "dev": true,
             "requires": {
                 "chalk": "^2.4.1",
                 "coa": "^2.0.2",
                 "css-select": "^2.0.0",
                 "css-select-base-adapter": "^0.1.1",
                 "css-tree": "1.0.0-alpha.37",
                 "csso": "^4.0.2",
                 "js-yaml": "^3.13.1",
                 "mkdirp": "~0.5.1",
                 "object.values": "^1.1.0",
                 "sax": "~1.2.4",
                 "stable": "^0.1.8",
                 "unquote": "~1.1.1",
                 "util.promisify": "~1.0.0"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     }
                 }
             }
         },
         "table": {
             "version": "5.4.6",
             "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
             "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
             "dev": true,
             "requires": {
                 "ajv": "^6.10.2",
                 "lodash": "^4.17.14",
                 "slice-ansi": "^2.1.0",
                 "string-width": "^3.0.0"
             }
         },
         "tapable": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
             "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
             "dev": true
         },
         "terser": {
             "version": "3.17.0",
             "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
             "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
             "dev": true,
             "requires": {
                 "commander": "^2.19.0",
                 "source-map": "~0.6.1",
                 "source-map-support": "~0.5.10"
             },
             "dependencies": {
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "terser-webpack-plugin": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
             "integrity": "sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==",
             "dev": true,
             "requires": {
                 "cacache": "^13.0.1",
                 "find-cache-dir": "^3.3.1",
                 "jest-worker": "^25.4.0",
                 "p-limit": "^2.3.0",
                 "schema-utils": "^2.6.6",
                 "serialize-javascript": "^4.0.0",
                 "source-map": "^0.6.1",
                 "terser": "^4.6.12",
                 "webpack-sources": "^1.4.3"
             },
             "dependencies": {
                 "find-cache-dir": {
                     "version": "3.3.1",
                     "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
                     "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
                     "dev": true,
                     "requires": {
                         "commondir": "^1.0.1",
                         "make-dir": "^3.0.2",
                         "pkg-dir": "^4.1.0"
                     }
                 },
                 "find-up": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
                     "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
                     "dev": true,
                     "requires": {
                         "locate-path": "^5.0.0",
                         "path-exists": "^4.0.0"
                     }
                 },
                 "locate-path": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
                     "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
                     "dev": true,
                     "requires": {
                         "p-locate": "^4.1.0"
                     }
                 },
                 "make-dir": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
                     "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
                     "dev": true,
                     "requires": {
                         "semver": "^6.0.0"
                     }
                 },
                 "p-locate": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
                     "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
                     "dev": true,
                     "requires": {
                         "p-limit": "^2.2.0"
                     }
                 },
                 "path-exists": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
                     "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
                     "dev": true
                 },
                 "pkg-dir": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
                     "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
                     "dev": true,
                     "requires": {
                         "find-up": "^4.0.0"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 },
                 "terser": {
                     "version": "4.8.0",
                     "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
                     "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
                     "dev": true,
                     "requires": {
                         "commander": "^2.20.0",
                         "source-map": "~0.6.1",
                         "source-map-support": "~0.5.12"
                     }
                 }
             }
         },
         "text-table": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
             "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
             "dev": true
         },
         "through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
             "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
             "dev": true
         },
         "through2": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
             "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
             "dev": true,
             "requires": {
                 "readable-stream": "~2.3.6",
                 "xtend": "~4.0.1"
             }
         },
         "thunky": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
             "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
             "dev": true
         },
         "timers-browserify": {
-            "version": "2.0.11",
-            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-            "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+            "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
             "dev": true,
             "requires": {
                 "setimmediate": "^1.0.4"
             }
         },
         "timsort": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
             "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
             "dev": true
         },
         "tmp": {
             "version": "0.0.33",
             "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
             "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
             "dev": true,
             "requires": {
                 "os-tmpdir": "~1.0.2"
             }
         },
         "to-arraybuffer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
             "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
             "dev": true
         },
         "to-fast-properties": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
             "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
             "dev": true
         },
         "to-object-path": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
             "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
             "dev": true,
             "requires": {
                 "kind-of": "^3.0.2"
             },
             "dependencies": {
                 "is-buffer": {
                     "version": "1.1.6",
                     "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
                     "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
                     "dev": true
                 },
                 "kind-of": {
                     "version": "3.2.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                     "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
                     "dev": true,
                     "requires": {
                         "is-buffer": "^1.1.5"
                     }
                 }
             }
         },
         "to-regex": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
             "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
             "dev": true,
             "requires": {
                 "define-property": "^2.0.2",
                 "extend-shallow": "^3.0.2",
                 "regex-not": "^1.0.2",
                 "safe-regex": "^1.1.0"
             }
         },
         "to-regex-range": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
             "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
             "dev": true,
             "requires": {
                 "is-number": "^3.0.0",
                 "repeat-string": "^1.6.1"
             }
         },
         "toidentifier": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
             "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
             "dev": true
         },
-        "trim": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-            "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-            "dev": true
-        },
         "trim-newlines": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz",
             "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
             "dev": true
         },
-        "trim-trailing-lines": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz",
-            "integrity": "sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==",
-            "dev": true
-        },
         "trough": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
             "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
             "dev": true
         },
         "tslib": {
             "version": "1.13.0",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
             "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
             "dev": true
         },
         "tty-browserify": {
             "version": "0.0.0",
             "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
             "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
             "dev": true
         },
+        "type": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+            "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+            "dev": true
+        },
         "type-check": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
             "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
             "dev": true,
             "requires": {
                 "prelude-ls": "~1.1.2"
             }
         },
         "type-fest": {
             "version": "0.8.1",
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
             "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
             "dev": true
         },
         "type-is": {
             "version": "1.6.18",
             "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
             "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
             "dev": true,
             "requires": {
                 "media-typer": "0.3.0",
                 "mime-types": "~2.1.24"
             }
         },
         "typedarray": {
             "version": "0.0.6",
             "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
             "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
             "dev": true
         },
         "typedarray-to-buffer": {
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
             "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
             "dev": true,
             "requires": {
                 "is-typedarray": "^1.0.0"
             }
         },
         "uglify-js": {
             "version": "3.4.10",
             "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
             "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
             "dev": true,
             "requires": {
                 "commander": "~2.19.0",
                 "source-map": "~0.6.1"
             },
             "dependencies": {
                 "commander": {
                     "version": "2.19.0",
                     "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
                     "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
                     "dev": true
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
-        "unherit": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-            "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.0",
-                "xtend": "^4.0.0"
-            }
-        },
         "unicode-canonical-property-names-ecmascript": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
             "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
             "dev": true
         },
         "unicode-match-property-ecmascript": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
             "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
             "dev": true,
             "requires": {
                 "unicode-canonical-property-names-ecmascript": "^1.0.4",
                 "unicode-property-aliases-ecmascript": "^1.0.4"
             }
         },
         "unicode-match-property-value-ecmascript": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
             "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
             "dev": true
         },
         "unicode-property-aliases-ecmascript": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
             "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
             "dev": true
         },
         "unified": {
             "version": "9.2.0",
             "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
             "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
             "dev": true,
             "requires": {
                 "bail": "^1.0.0",
                 "extend": "^3.0.0",
                 "is-buffer": "^2.0.0",
                 "is-plain-obj": "^2.0.0",
                 "trough": "^1.0.0",
                 "vfile": "^4.0.0"
             }
         },
         "union-value": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
             "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
             "dev": true,
             "requires": {
                 "arr-union": "^3.1.0",
                 "get-value": "^2.0.6",
                 "is-extendable": "^0.1.1",
                 "set-value": "^2.0.1"
             },
             "dependencies": {
                 "is-extendable": {
                     "version": "0.1.1",
                     "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
                     "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
                     "dev": true
                 }
             }
         },
         "uniq": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
             "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
             "dev": true
         },
         "uniqs": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
             "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
             "dev": true
         },
         "unique-filename": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
             "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
             "dev": true,
             "requires": {
                 "unique-slug": "^2.0.0"
             }
         },
         "unique-slug": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
             "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
             "dev": true,
             "requires": {
                 "imurmurhash": "^0.1.4"
             }
         },
         "unist-util-find-all-after": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz",
-            "integrity": "sha512-0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
+            "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
             "dev": true,
             "requires": {
                 "unist-util-is": "^4.0.0"
             }
         },
         "unist-util-is": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
-            "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz",
+            "integrity": "sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==",
             "dev": true
         },
-        "unist-util-remove-position": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-            "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-            "dev": true,
-            "requires": {
-                "unist-util-visit": "^2.0.0"
-            }
-        },
         "unist-util-stringify-position": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
             "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
             "dev": true,
             "requires": {
                 "@types/unist": "^2.0.2"
             }
         },
-        "unist-util-visit": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-            "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-            "dev": true,
-            "requires": {
-                "@types/unist": "^2.0.0",
-                "unist-util-is": "^4.0.0",
-                "unist-util-visit-parents": "^3.0.0"
-            }
-        },
-        "unist-util-visit-parents": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz",
-            "integrity": "sha512-0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw==",
-            "dev": true,
-            "requires": {
-                "@types/unist": "^2.0.0",
-                "unist-util-is": "^4.0.0"
-            }
-        },
         "universalify": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
             "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
             "dev": true
         },
         "unpipe": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
             "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
             "dev": true
         },
         "unquote": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
             "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
             "dev": true
         },
         "unset-value": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
             "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
             "dev": true,
             "requires": {
                 "has-value": "^0.3.1",
                 "isobject": "^3.0.0"
             },
             "dependencies": {
                 "has-value": {
                     "version": "0.3.1",
                     "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
                     "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
                     "dev": true,
                     "requires": {
                         "get-value": "^2.0.3",
                         "has-values": "^0.1.4",
                         "isobject": "^2.0.0"
                     },
                     "dependencies": {
                         "isobject": {
                             "version": "2.1.0",
                             "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
                             "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
                             "dev": true,
                             "requires": {
                                 "isarray": "1.0.0"
                             }
                         }
                     }
                 },
                 "has-values": {
                     "version": "0.1.4",
                     "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
                     "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
                     "dev": true
                 }
             }
         },
         "upath": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
             "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
             "dev": true
         },
         "upper-case": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
             "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
             "dev": true
         },
         "uri-js": {
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
             "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
             "dev": true,
             "requires": {
                 "punycode": "^2.1.0"
             }
         },
         "urix": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
             "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
             "dev": true
         },
         "url": {
             "version": "0.11.0",
             "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
             "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
             "dev": true,
             "requires": {
                 "punycode": "1.3.2",
                 "querystring": "0.2.0"
             },
             "dependencies": {
                 "punycode": {
                     "version": "1.3.2",
                     "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
                     "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
                     "dev": true
                 }
             }
         },
         "url-parse": {
             "version": "1.4.7",
             "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
             "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
             "dev": true,
             "requires": {
                 "querystringify": "^2.1.1",
                 "requires-port": "^1.0.0"
             }
         },
         "use": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
             "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
             "dev": true
         },
         "util": {
             "version": "0.11.1",
             "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
             "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
             "dev": true,
             "requires": {
                 "inherits": "2.0.3"
             },
             "dependencies": {
                 "inherits": {
                     "version": "2.0.3",
                     "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                     "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
                     "dev": true
                 }
             }
         },
         "util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
             "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
             "dev": true
         },
         "util.promisify": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
             "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
             "dev": true,
             "requires": {
                 "define-properties": "^1.1.3",
                 "es-abstract": "^1.17.2",
                 "has-symbols": "^1.0.1",
                 "object.getownpropertydescriptors": "^2.1.0"
-            },
-            "dependencies": {
-                "es-abstract": {
-                    "version": "1.17.7",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-                    "dev": true,
-                    "requires": {
-                        "es-to-primitive": "^1.2.1",
-                        "function-bind": "^1.1.1",
-                        "has": "^1.0.3",
-                        "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.2",
-                        "is-regex": "^1.1.1",
-                        "object-inspect": "^1.8.0",
-                        "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.1",
-                        "string.prototype.trimend": "^1.0.1",
-                        "string.prototype.trimstart": "^1.0.1"
-                    }
-                }
             }
         },
         "utils-merge": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
             "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
             "dev": true
         },
         "uuid": {
             "version": "3.4.0",
             "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
             "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
             "dev": true
         },
         "v8-compile-cache": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
             "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
             "dev": true
         },
         "validate-npm-package-license": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
             "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
             "dev": true,
             "requires": {
                 "spdx-correct": "^3.0.0",
                 "spdx-expression-parse": "^3.0.0"
             }
         },
         "vary": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
             "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
             "dev": true
         },
         "vendors": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
             "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
             "dev": true
         },
         "vfile": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.0.tgz",
             "integrity": "sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==",
             "dev": true,
             "requires": {
                 "@types/unist": "^2.0.0",
                 "is-buffer": "^2.0.0",
                 "replace-ext": "1.0.0",
                 "unist-util-stringify-position": "^2.0.0",
                 "vfile-message": "^2.0.0"
             },
             "dependencies": {
                 "replace-ext": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
                     "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
                     "dev": true
                 }
             }
         },
-        "vfile-location": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz",
-            "integrity": "sha512-FCZ4AN9xMcjFIG1oGmZKo61PjwJHRVA+0/tPUP2ul4uIwjGGndIxavEMRpWn5p4xwm/ZsdXp9YNygf1ZyE4x8g==",
-            "dev": true
-        },
         "vfile-message": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
             "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
             "dev": true,
             "requires": {
                 "@types/unist": "^2.0.0",
                 "unist-util-stringify-position": "^2.0.0"
             }
         },
         "vm-browserify": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
             "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
             "dev": true
         },
         "vue": {
             "version": "2.6.12",
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
             "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
             "dev": true
         },
         "vue-eslint-parser": {
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz",
             "integrity": "sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q==",
             "dev": true,
             "requires": {
                 "debug": "^4.1.1",
                 "eslint-scope": "^5.0.0",
                 "eslint-visitor-keys": "^1.1.0",
                 "espree": "^6.2.1",
                 "esquery": "^1.0.1",
                 "lodash": "^4.17.15"
             },
             "dependencies": {
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
                     "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
                     "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
                 },
                 "espree": {
                     "version": "6.2.1",
                     "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
                     "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
                     "dev": true,
                     "requires": {
                         "acorn": "^7.1.1",
                         "acorn-jsx": "^5.2.0",
                         "eslint-visitor-keys": "^1.1.0"
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 }
             }
         },
         "vue-hot-reload-api": {
             "version": "2.3.4",
             "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
             "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
             "dev": true
         },
         "vue-loader": {
-            "version": "15.9.3",
-            "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz",
-            "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==",
+            "version": "15.9.5",
+            "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.5.tgz",
+            "integrity": "sha512-oeMOs2b5o5gRqkxfds10bCx6JeXYTwivRgbb8hzOrcThD2z1+GqEKE3EX9A2SGbsYDf4rXwRg6D5n1w0jO5SwA==",
             "dev": true,
             "requires": {
                 "@vue/component-compiler-utils": "^3.1.0",
                 "hash-sum": "^1.0.2",
                 "loader-utils": "^1.1.0",
                 "vue-hot-reload-api": "^2.3.0",
                 "vue-style-loader": "^4.1.0"
             }
         },
         "vue-router": {
-            "version": "3.4.6",
-            "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.6.tgz",
-            "integrity": "sha512-kaXnB3pfFxhAJl/Mp+XG1HJMyFqrL/xPqV7oXlpXn4AwMmm6VNgf0nllW8ksflmZANfI4kdo0bVn/FYSsAolPQ==",
+            "version": "3.4.9",
+            "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.9.tgz",
+            "integrity": "sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==",
             "dev": true
         },
         "vue-style-loader": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
             "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
             "dev": true,
             "requires": {
                 "hash-sum": "^1.0.2",
                 "loader-utils": "^1.0.2"
             }
         },
         "vue-template-compiler": {
             "version": "2.6.12",
             "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
             "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
             "dev": true,
             "requires": {
                 "de-indent": "^1.0.2",
                 "he": "^1.1.0"
             }
         },
         "vue-template-es2015-compiler": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
         "vuex": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.4.0.tgz",
-            "integrity": "sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg==",
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.0.tgz",
+            "integrity": "sha512-W74OO2vCJPs9/YjNjW8lLbj+jzT24waTo2KShI8jLvJW8OaIkgb3wuAMA7D+ZiUxDOx3ubwSZTaJBip9G8a3aQ==",
             "dev": true
         },
         "watchpack": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
-            "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+            "version": "1.7.5",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+            "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
             "dev": true,
             "requires": {
                 "chokidar": "^3.4.1",
                 "graceful-fs": "^4.1.2",
                 "neo-async": "^2.5.0",
-                "watchpack-chokidar2": "^2.0.0"
+                "watchpack-chokidar2": "^2.0.1"
             },
             "dependencies": {
                 "anymatch": {
                     "version": "3.1.1",
                     "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
                     "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "normalize-path": "^3.0.0",
                         "picomatch": "^2.0.4"
                     }
                 },
                 "binary-extensions": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
                     "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
                     "dev": true,
                     "optional": true
                 },
                 "braces": {
                     "version": "3.0.2",
                     "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
                     "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "fill-range": "^7.0.1"
                     }
                 },
                 "chokidar": {
-                    "version": "3.4.2",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-                    "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+                    "version": "3.4.3",
+                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+                    "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "anymatch": "~3.1.1",
                         "braces": "~3.0.2",
                         "fsevents": "~2.1.2",
                         "glob-parent": "~5.1.0",
                         "is-binary-path": "~2.1.0",
                         "is-glob": "~4.0.1",
                         "normalize-path": "~3.0.0",
-                        "readdirp": "~3.4.0"
+                        "readdirp": "~3.5.0"
                     }
                 },
                 "fill-range": {
                     "version": "7.0.1",
                     "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
                     "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "to-regex-range": "^5.0.1"
                     }
                 },
                 "fsevents": {
                     "version": "2.1.3",
                     "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
                     "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
                     "dev": true,
                     "optional": true
                 },
                 "is-binary-path": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
                     "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "binary-extensions": "^2.0.0"
                     }
                 },
                 "is-number": {
                     "version": "7.0.0",
                     "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
                     "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
                     "dev": true,
                     "optional": true
                 },
                 "readdirp": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-                    "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+                    "version": "3.5.0",
+                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+                    "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "picomatch": "^2.2.1"
                     }
                 },
                 "to-regex-range": {
                     "version": "5.0.1",
                     "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
                     "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
                     "dev": true,
                     "optional": true,
                     "requires": {
                         "is-number": "^7.0.0"
                     }
                 }
             }
         },
         "watchpack-chokidar2": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-            "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+            "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
             "dev": true,
             "optional": true,
             "requires": {
                 "chokidar": "^2.1.8"
-            },
-            "dependencies": {
-                "chokidar": {
-                    "version": "2.1.8",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-                    "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "anymatch": "^2.0.0",
-                        "async-each": "^1.0.1",
-                        "braces": "^2.3.2",
-                        "fsevents": "^1.2.7",
-                        "glob-parent": "^3.1.0",
-                        "inherits": "^2.0.3",
-                        "is-binary-path": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "normalize-path": "^3.0.0",
-                        "path-is-absolute": "^1.0.0",
-                        "readdirp": "^2.2.1",
-                        "upath": "^1.1.1"
-                    }
-                },
-                "glob-parent": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-                    "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "is-glob": "^3.1.0",
-                        "path-dirname": "^1.0.0"
-                    },
-                    "dependencies": {
-                        "is-glob": {
-                            "version": "3.1.0",
-                            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                            "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                            "dev": true,
-                            "optional": true,
-                            "requires": {
-                                "is-extglob": "^2.1.0"
-                            }
-                        }
-                    }
-                }
             }
         },
         "wbuf": {
             "version": "1.7.3",
             "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
             "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
             "dev": true,
             "requires": {
                 "minimalistic-assert": "^1.0.0"
             }
         },
         "webpack": {
             "version": "4.44.2",
             "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
             "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.9.0",
                 "@webassemblyjs/helper-module-context": "1.9.0",
                 "@webassemblyjs/wasm-edit": "1.9.0",
                 "@webassemblyjs/wasm-parser": "1.9.0",
                 "acorn": "^6.4.1",
                 "ajv": "^6.10.2",
                 "ajv-keywords": "^3.4.1",
                 "chrome-trace-event": "^1.0.2",
                 "enhanced-resolve": "^4.3.0",
                 "eslint-scope": "^4.0.3",
                 "json-parse-better-errors": "^1.0.2",
                 "loader-runner": "^2.4.0",
                 "loader-utils": "^1.2.3",
                 "memory-fs": "^0.4.1",
                 "micromatch": "^3.1.10",
                 "mkdirp": "^0.5.3",
                 "neo-async": "^2.6.1",
                 "node-libs-browser": "^2.2.1",
                 "schema-utils": "^1.0.0",
                 "tapable": "^1.1.3",
                 "terser-webpack-plugin": "^1.4.3",
                 "watchpack": "^1.7.4",
                 "webpack-sources": "^1.4.1"
             },
             "dependencies": {
                 "acorn": {
                     "version": "6.4.2",
                     "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
                     "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
                     "dev": true
                 },
                 "cacache": {
                     "version": "12.0.4",
                     "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
                     "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
                     "dev": true,
                     "requires": {
                         "bluebird": "^3.5.5",
                         "chownr": "^1.1.1",
                         "figgy-pudding": "^3.5.1",
                         "glob": "^7.1.4",
                         "graceful-fs": "^4.1.15",
                         "infer-owner": "^1.0.3",
                         "lru-cache": "^5.1.1",
                         "mississippi": "^3.0.0",
                         "mkdirp": "^0.5.1",
                         "move-concurrently": "^1.0.1",
                         "promise-inflight": "^1.0.1",
                         "rimraf": "^2.6.3",
                         "ssri": "^6.0.1",
                         "unique-filename": "^1.1.1",
                         "y18n": "^4.0.0"
                     }
                 },
                 "eslint-scope": {
                     "version": "4.0.3",
                     "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
                     "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
                     "dev": true,
                     "requires": {
                         "esrecurse": "^4.1.0",
                         "estraverse": "^4.1.1"
                     }
                 },
                 "schema-utils": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
                     "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
                     "dev": true,
                     "requires": {
                         "ajv": "^6.1.0",
                         "ajv-errors": "^1.0.0",
                         "ajv-keywords": "^3.1.0"
                     }
                 },
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 },
                 "ssri": {
                     "version": "6.0.1",
                     "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
                     "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
                     "dev": true,
                     "requires": {
                         "figgy-pudding": "^3.5.1"
                     }
                 },
                 "terser": {
                     "version": "4.8.0",
                     "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
                     "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
                     "dev": true,
                     "requires": {
                         "commander": "^2.20.0",
                         "source-map": "~0.6.1",
                         "source-map-support": "~0.5.12"
                     }
                 },
                 "terser-webpack-plugin": {
                     "version": "1.4.5",
                     "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
                     "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
                     "dev": true,
                     "requires": {
                         "cacache": "^12.0.2",
                         "find-cache-dir": "^2.1.0",
                         "is-wsl": "^1.1.0",
                         "schema-utils": "^1.0.0",
                         "serialize-javascript": "^4.0.0",
                         "source-map": "^0.6.1",
                         "terser": "^4.1.2",
                         "webpack-sources": "^1.4.0",
                         "worker-farm": "^1.7.0"
                     }
                 }
             }
         },
         "webpack-cli": {
             "version": "3.3.12",
             "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
             "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
             "dev": true,
             "requires": {
                 "chalk": "^2.4.2",
                 "cross-spawn": "^6.0.5",
                 "enhanced-resolve": "^4.1.1",
                 "findup-sync": "^3.0.0",
                 "global-modules": "^2.0.0",
                 "import-local": "^2.0.0",
                 "interpret": "^1.4.0",
                 "loader-utils": "^1.4.0",
                 "supports-color": "^6.1.0",
                 "v8-compile-cache": "^2.1.1",
                 "yargs": "^13.3.2"
             },
             "dependencies": {
                 "chalk": {
                     "version": "2.4.2",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^3.2.1",
                         "escape-string-regexp": "^1.0.5",
                         "supports-color": "^5.3.0"
                     },
                     "dependencies": {
                         "supports-color": {
                             "version": "5.5.0",
                             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
                             "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
                             "dev": true,
                             "requires": {
                                 "has-flag": "^3.0.0"
                             }
                         }
                     }
                 },
                 "cross-spawn": {
                     "version": "6.0.5",
                     "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
                     "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
                     "dev": true,
                     "requires": {
                         "nice-try": "^1.0.4",
                         "path-key": "^2.0.1",
                         "semver": "^5.5.0",
                         "shebang-command": "^1.2.0",
                         "which": "^1.2.9"
                     }
                 },
                 "emojis-list": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
                     "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
                     "dev": true
                 },
                 "json5": {
                     "version": "1.0.1",
                     "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
                     "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
                     "dev": true,
                     "requires": {
                         "minimist": "^1.2.0"
                     }
                 },
                 "loader-utils": {
                     "version": "1.4.0",
                     "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
                     "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
                     "dev": true,
                     "requires": {
                         "big.js": "^5.2.2",
                         "emojis-list": "^3.0.0",
                         "json5": "^1.0.1"
                     }
                 },
                 "path-key": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
                     "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
                     "dev": true
                 },
                 "semver": {
                     "version": "5.7.1",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "dev": true
                 },
                 "shebang-command": {
                     "version": "1.2.0",
                     "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
                     "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
                     "dev": true,
                     "requires": {
                         "shebang-regex": "^1.0.0"
                     }
                 },
                 "shebang-regex": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
                     "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
                     "dev": true
                 },
                 "supports-color": {
                     "version": "6.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
                     "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
                     "dev": true,
                     "requires": {
                         "has-flag": "^3.0.0"
                     }
                 },
                 "which": {
                     "version": "1.3.1",
                     "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
                     "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
                     "dev": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
                 },
                 "yargs": {
                     "version": "13.3.2",
                     "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
                     "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
                     "dev": true,
                     "requires": {
                         "cliui": "^5.0.0",
                         "find-up": "^3.0.0",
                         "get-caller-file": "^2.0.1",
                         "require-directory": "^2.1.1",
                         "require-main-filename": "^2.0.0",
                         "set-blocking": "^2.0.0",
                         "string-width": "^3.0.0",
                         "which-module": "^2.0.0",
                         "y18n": "^4.0.0",
                         "yargs-parser": "^13.1.2"
                     }
                 }
             }
         },
         "webpack-dev-middleware": {
             "version": "3.7.2",
             "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
             "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
             "dev": true,
             "requires": {
                 "memory-fs": "^0.4.1",
                 "mime": "^2.4.4",
                 "mkdirp": "^0.5.1",
                 "range-parser": "^1.2.1",
                 "webpack-log": "^2.0.0"
             },
             "dependencies": {
                 "mime": {
                     "version": "2.4.6",
                     "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
                     "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
                     "dev": true
                 }
             }
         },
         "webpack-dev-server": {
             "version": "3.11.0",
             "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
             "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
             "dev": true,
             "requires": {
                 "ansi-html": "0.0.7",
                 "bonjour": "^3.5.0",
                 "chokidar": "^2.1.8",
                 "compression": "^1.7.4",
                 "connect-history-api-fallback": "^1.6.0",
                 "debug": "^4.1.1",
                 "del": "^4.1.1",
                 "express": "^4.17.1",
                 "html-entities": "^1.3.1",
                 "http-proxy-middleware": "0.19.1",
                 "import-local": "^2.0.0",
                 "internal-ip": "^4.3.0",
                 "ip": "^1.1.5",
                 "is-absolute-url": "^3.0.3",
                 "killable": "^1.0.1",
                 "loglevel": "^1.6.8",
                 "opn": "^5.5.0",
                 "p-retry": "^3.0.1",
                 "portfinder": "^1.0.26",
                 "schema-utils": "^1.0.0",
                 "selfsigned": "^1.10.7",
                 "semver": "^6.3.0",
                 "serve-index": "^1.9.1",
                 "sockjs": "0.3.20",
                 "sockjs-client": "1.4.0",
                 "spdy": "^4.0.2",
                 "strip-ansi": "^3.0.1",
                 "supports-color": "^6.1.0",
                 "url": "^0.11.0",
                 "webpack-dev-middleware": "^3.7.2",
                 "webpack-log": "^2.0.0",
                 "ws": "^6.2.1",
                 "yargs": "^13.3.2"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
                     "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
                     "dev": true
                 },
-                "chokidar": {
-                    "version": "2.1.8",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-                    "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-                    "dev": true,
-                    "requires": {
-                        "anymatch": "^2.0.0",
-                        "async-each": "^1.0.1",
-                        "braces": "^2.3.2",
-                        "fsevents": "^1.2.7",
-                        "glob-parent": "^3.1.0",
-                        "inherits": "^2.0.3",
-                        "is-binary-path": "^1.0.0",
-                        "is-glob": "^4.0.0",
-                        "normalize-path": "^3.0.0",
-                        "path-is-absolute": "^1.0.0",
-                        "readdirp": "^2.2.1",
-                        "upath": "^1.1.1"
-                    }
-                },
                 "debug": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
                     "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
                     "dev": true,
                     "requires": {
                         "ms": "2.1.2"
                     }
                 },
-                "glob-parent": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-                    "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^3.1.0",
-                        "path-dirname": "^1.0.0"
-                    },
-                    "dependencies": {
-                        "is-glob": {
-                            "version": "3.1.0",
-                            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                            "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                            "dev": true,
-                            "requires": {
-                                "is-extglob": "^2.1.0"
-                            }
-                        }
-                    }
-                },
                 "is-absolute-url": {
                     "version": "3.0.3",
                     "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
                     "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
                     "dev": true
                 },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
                     "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
                     "dev": true
                 },
                 "schema-utils": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
                     "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
                     "dev": true,
                     "requires": {
                         "ajv": "^6.1.0",
                         "ajv-errors": "^1.0.0",
                         "ajv-keywords": "^3.1.0"
                     }
                 },
                 "strip-ansi": {
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
                     "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
                 },
                 "supports-color": {
                     "version": "6.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
                     "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
                     "dev": true,
                     "requires": {
                         "has-flag": "^3.0.0"
                     }
                 },
                 "yargs": {
                     "version": "13.3.2",
                     "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
                     "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
                     "dev": true,
                     "requires": {
                         "cliui": "^5.0.0",
                         "find-up": "^3.0.0",
                         "get-caller-file": "^2.0.1",
                         "require-directory": "^2.1.1",
                         "require-main-filename": "^2.0.0",
                         "set-blocking": "^2.0.0",
                         "string-width": "^3.0.0",
                         "which-module": "^2.0.0",
                         "y18n": "^4.0.0",
                         "yargs-parser": "^13.1.2"
                     }
                 }
             }
         },
         "webpack-log": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
             "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
             "dev": true,
             "requires": {
                 "ansi-colors": "^3.0.0",
                 "uuid": "^3.3.2"
             }
         },
         "webpack-merge": {
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
             "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
             "dev": true,
             "requires": {
                 "lodash": "^4.17.15"
             }
         },
         "webpack-notifier": {
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/webpack-notifier/-/webpack-notifier-1.8.0.tgz",
             "integrity": "sha512-I6t76NoPe5DZCCm5geELmDV2wlJ89LbU425uN6T2FG8Ywrrt1ZcUMz6g8yWGNg4pttqTPFQJYUPjWAlzUEQ+cQ==",
             "dev": true,
             "requires": {
                 "node-notifier": "^5.1.2",
                 "object-assign": "^4.1.0",
                 "strip-ansi": "^3.0.1"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "2.1.1",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
                     "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
                     "dev": true
                 },
                 "strip-ansi": {
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
                     "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
                 }
             }
         },
         "webpack-sources": {
             "version": "1.4.3",
             "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
             "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
             "dev": true,
             "requires": {
                 "source-list-map": "^2.0.0",
                 "source-map": "~0.6.1"
             },
             "dependencies": {
                 "source-map": {
                     "version": "0.6.1",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
                     "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
                     "dev": true
                 }
             }
         },
         "websocket-driver": {
             "version": "0.6.5",
             "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
             "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
             "dev": true,
             "requires": {
                 "websocket-extensions": ">=0.1.1"
             }
         },
         "websocket-extensions": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
             "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
             "dev": true
         },
         "which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "dev": true,
             "requires": {
                 "isexe": "^2.0.0"
             }
         },
         "which-module": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
             "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
             "dev": true
         },
+        "wildemitter": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/wildemitter/-/wildemitter-1.2.1.tgz",
+            "integrity": "sha512-UMmSUoIQSir+XbBpTxOTS53uJ8s/lVhADCkEbhfRjUGFDPme/XGOb0sBWLx5sTz7Wx/2+TlAw1eK9O5lw5PiEw==",
+            "dev": true
+        },
+        "wolfy87-eventemitter": {
+            "version": "5.2.9",
+            "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz",
+            "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw==",
+            "dev": true
+        },
         "word-wrap": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
             "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
             "dev": true
         },
         "worker-farm": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
             "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
             "dev": true,
             "requires": {
                 "errno": "~0.1.7"
             }
         },
         "wrap-ansi": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
             "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
             "dev": true,
             "requires": {
                 "ansi-styles": "^3.2.0",
                 "string-width": "^3.0.0",
                 "strip-ansi": "^5.0.0"
             },
             "dependencies": {
                 "ansi-regex": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
                     "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
                     "dev": true
                 },
                 "strip-ansi": {
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
                     "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
                     "dev": true,
                     "requires": {
                         "ansi-regex": "^4.1.0"
                     }
                 }
             }
         },
         "wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
             "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
             "dev": true
         },
         "write": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
             "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
             "dev": true,
             "requires": {
                 "mkdirp": "^0.5.1"
             }
         },
         "write-file-atomic": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
             "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
             "dev": true,
             "requires": {
                 "imurmurhash": "^0.1.4",
                 "is-typedarray": "^1.0.0",
                 "signal-exit": "^3.0.2",
                 "typedarray-to-buffer": "^3.1.5"
             }
         },
         "ws": {
             "version": "6.2.1",
             "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
             "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
             "dev": true,
             "requires": {
                 "async-limiter": "~1.0.0"
             }
         },
         "xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
             "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
             "dev": true
         },
         "y18n": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
             "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
             "dev": true
         },
         "yallist": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
             "dev": true
         },
         "yaml": {
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
             "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
             "dev": true
         },
         "yargs": {
             "version": "15.4.1",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
             "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
             "dev": true,
             "requires": {
                 "cliui": "^6.0.0",
                 "decamelize": "^1.2.0",
                 "find-up": "^4.1.0",
                 "get-caller-file": "^2.0.1",
                 "require-directory": "^2.1.1",
                 "require-main-filename": "^2.0.0",
                 "set-blocking": "^2.0.0",
                 "string-width": "^4.2.0",
                 "which-module": "^2.0.0",
                 "y18n": "^4.0.0",
                 "yargs-parser": "^18.1.2"
             },
             "dependencies": {
                 "ansi-styles": {
                     "version": "4.3.0",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
                     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
                     "dev": true,
                     "requires": {
                         "color-convert": "^2.0.1"
                     }
                 },
                 "cliui": {
                     "version": "6.0.0",
                     "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
                     "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
                     "dev": true,
                     "requires": {
                         "string-width": "^4.2.0",
                         "strip-ansi": "^6.0.0",
                         "wrap-ansi": "^6.2.0"
                     }
                 },
                 "color-convert": {
                     "version": "2.0.1",
                     "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
                     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
                     "dev": true,
                     "requires": {
                         "color-name": "~1.1.4"
                     }
                 },
                 "color-name": {
                     "version": "1.1.4",
                     "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
                     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
                     "dev": true
                 },
                 "emoji-regex": {
                     "version": "8.0.0",
                     "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
                     "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
                     "dev": true
                 },
                 "find-up": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
                     "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
                     "dev": true,
                     "requires": {
                         "locate-path": "^5.0.0",
                         "path-exists": "^4.0.0"
                     }
                 },
                 "is-fullwidth-code-point": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
                     "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
                     "dev": true
                 },
                 "locate-path": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
                     "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
                     "dev": true,
                     "requires": {
                         "p-locate": "^4.1.0"
                     }
                 },
                 "p-locate": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
                     "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
                     "dev": true,
                     "requires": {
                         "p-limit": "^2.2.0"
                     }
                 },
                 "path-exists": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
                     "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
                     "dev": true
                 },
                 "string-width": {
                     "version": "4.2.0",
                     "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
                     "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
                     "dev": true,
                     "requires": {
                         "emoji-regex": "^8.0.0",
                         "is-fullwidth-code-point": "^3.0.0",
                         "strip-ansi": "^6.0.0"
                     }
                 },
                 "wrap-ansi": {
                     "version": "6.2.0",
                     "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
                     "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
                     "dev": true,
                     "requires": {
                         "ansi-styles": "^4.0.0",
                         "string-width": "^4.1.0",
                         "strip-ansi": "^6.0.0"
                     }
                 },
                 "yargs-parser": {
                     "version": "18.1.3",
                     "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
                     "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
                     "dev": true,
                     "requires": {
                         "camelcase": "^5.0.0",
                         "decamelize": "^1.2.0"
                     }
                 }
             }
         },
         "yargs-parser": {
             "version": "13.1.2",
             "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
             "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
             "dev": true,
             "requires": {
                 "camelcase": "^5.0.0",
                 "decamelize": "^1.2.0"
             }
+        },
+        "zwitch": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
+            "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
+            "dev": true
         }
     }
 }
diff --git a/src/package.json b/src/package.json
index dc44acf4..cac2c463 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,37 +1,40 @@
 {
   "private": true,
   "scripts": {
     "dev": "npm run development",
     "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
     "watch": "npm run development -- --watch",
     "watch-poll": "npm run watch -- --watch-poll",
     "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
     "prod": "npm run production",
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
     "lint": "eslint --ext .js,.vue resources && stylelint \"resources/sass/*.scss\" \"resources/vue/*.vue\""
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.32",
-    "@fortawesome/free-brands-svg-icons": "^5.15.1",
-    "@fortawesome/free-regular-svg-icons": "^5.15.1",
-    "@fortawesome/free-solid-svg-icons": "^5.15.1",
+    "@fortawesome/fontawesome-svg-core": "^1.2.34",
+    "@fortawesome/free-brands-svg-icons": "^5.15.2",
+    "@fortawesome/free-regular-svg-icons": "^5.15.2",
+    "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fortawesome/vue-fontawesome": "^0.1.10",
-    "axios": "^0.19",
+    "anchorme": "^2.1.2",
+    "axios": "^0.21.1",
     "bootstrap": "^4.5.3",
-    "cross-env": "^7.0",
+    "cross-env": "^7.0.3",
     "eslint": "^6.8.0",
     "eslint-plugin-vue": "^6.2.2",
+    "frappe-charts": "^1.5.6",
     "jquery": "^3.5.1",
-    "laravel-mix": "^5.0.6",
+    "laravel-mix": "^5.0.9",
+    "openvidu-browser": "^2.16.2",
     "popper.js": "^1.16.0",
-    "resolve-url-loader": "^2.3.1",
-    "sass": "^1.27.0",
+    "resolve-url-loader": "^3.1.2",
+    "sass": "^1.32.4",
     "sass-loader": "^8.0.0",
-    "stylelint": "^13.7.2",
+    "stylelint": "^13.8.0",
     "stylelint-config-standard": "^20.0.0",
     "vue": "^2.6.12",
-    "vue-router": "^3.4.6",
+    "vue-router": "^3.4.9",
     "vue-template-compiler": "^2.6.12",
-    "vuex": "^3.4.0"
+    "vuex": "^3.6.0"
   }
 }
diff --git a/src/phpstan.neon b/src/phpstan.neon
index bed643e9..de3d7e1c 100644
--- a/src/phpstan.neon
+++ b/src/phpstan.neon
@@ -1,14 +1,14 @@
 includes:
     - ./vendor/nunomaduro/larastan/extension.neon
 parameters:
     ignoreErrors:
         - '#Access to an undefined property Illuminate\\Contracts\\Auth\\Authenticatable#'
-        - '#Access to an undefined property App\\Package::\$pivot#'
+        - '#Access to an undefined property [a-zA-Z\\]+::\$pivot#'
         - '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$id#'
         - '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$created_at#'
         - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Model::toString\(\)#'
         - '#Call to an undefined method Tests\\Browser::#'
     level: 4
     paths:
         - app/
         - tests/
diff --git a/src/public/images/icons/icon-128x128.png b/src/public/images/icons/icon-128x128.png
deleted file mode 100644
index cf4f4aaa..00000000
Binary files a/src/public/images/icons/icon-128x128.png and /dev/null differ
diff --git a/src/public/images/icons/icon-144x144.png b/src/public/images/icons/icon-144x144.png
deleted file mode 100644
index ce871ea1..00000000
Binary files a/src/public/images/icons/icon-144x144.png and /dev/null differ
diff --git a/src/public/images/icons/icon-152x152.png b/src/public/images/icons/icon-152x152.png
deleted file mode 100644
index fcae506a..00000000
Binary files a/src/public/images/icons/icon-152x152.png and /dev/null differ
diff --git a/src/public/images/icons/icon-192x192.png b/src/public/images/icons/icon-192x192.png
deleted file mode 100644
index 536a8d20..00000000
Binary files a/src/public/images/icons/icon-192x192.png and /dev/null differ
diff --git a/src/public/images/icons/icon-384x384.png b/src/public/images/icons/icon-384x384.png
deleted file mode 100644
index 4573d9dd..00000000
Binary files a/src/public/images/icons/icon-384x384.png and /dev/null differ
diff --git a/src/public/images/icons/icon-512x512.png b/src/public/images/icons/icon-512x512.png
deleted file mode 100644
index 5e6748ed..00000000
Binary files a/src/public/images/icons/icon-512x512.png and /dev/null differ
diff --git a/src/public/images/icons/icon-72x72.png b/src/public/images/icons/icon-72x72.png
deleted file mode 100644
index 8d40cd59..00000000
Binary files a/src/public/images/icons/icon-72x72.png and /dev/null differ
diff --git a/src/public/images/icons/icon-96x96.png b/src/public/images/icons/icon-96x96.png
deleted file mode 100644
index 0db2f3f1..00000000
Binary files a/src/public/images/icons/icon-96x96.png and /dev/null differ
diff --git a/src/public/images/icons/splash-1125x2436.png b/src/public/images/icons/splash-1125x2436.png
deleted file mode 100644
index 05b019ad..00000000
Binary files a/src/public/images/icons/splash-1125x2436.png and /dev/null differ
diff --git a/src/public/images/icons/splash-1242x2208.png b/src/public/images/icons/splash-1242x2208.png
deleted file mode 100644
index 127202e2..00000000
Binary files a/src/public/images/icons/splash-1242x2208.png and /dev/null differ
diff --git a/src/public/images/icons/splash-1242x2688.png b/src/public/images/icons/splash-1242x2688.png
deleted file mode 100644
index dec52b6a..00000000
Binary files a/src/public/images/icons/splash-1242x2688.png and /dev/null differ
diff --git a/src/public/images/icons/splash-1536x2048.png b/src/public/images/icons/splash-1536x2048.png
deleted file mode 100644
index 2008c757..00000000
Binary files a/src/public/images/icons/splash-1536x2048.png and /dev/null differ
diff --git a/src/public/images/icons/splash-1668x2224.png b/src/public/images/icons/splash-1668x2224.png
deleted file mode 100644
index 7fac0728..00000000
Binary files a/src/public/images/icons/splash-1668x2224.png and /dev/null differ
diff --git a/src/public/images/icons/splash-1668x2388.png b/src/public/images/icons/splash-1668x2388.png
deleted file mode 100644
index f39d2ceb..00000000
Binary files a/src/public/images/icons/splash-1668x2388.png and /dev/null differ
diff --git a/src/public/images/icons/splash-2048x2732.png b/src/public/images/icons/splash-2048x2732.png
deleted file mode 100644
index 3df934df..00000000
Binary files a/src/public/images/icons/splash-2048x2732.png and /dev/null differ
diff --git a/src/public/images/icons/splash-640x1136.png b/src/public/images/icons/splash-640x1136.png
deleted file mode 100644
index 73a34ad0..00000000
Binary files a/src/public/images/icons/splash-640x1136.png and /dev/null differ
diff --git a/src/public/images/icons/splash-750x1334.png b/src/public/images/icons/splash-750x1334.png
deleted file mode 100644
index a38e09d6..00000000
Binary files a/src/public/images/icons/splash-750x1334.png and /dev/null differ
diff --git a/src/public/images/icons/splash-828x1792.png b/src/public/images/icons/splash-828x1792.png
deleted file mode 100644
index f6de06c2..00000000
Binary files a/src/public/images/icons/splash-828x1792.png and /dev/null differ
diff --git a/src/public/mix-manifest.json b/src/public/mix-manifest.json
deleted file mode 100644
index f452e347..00000000
--- a/src/public/mix-manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "/js/admin.js": "/js/admin.js",
-    "/js/user.js": "/js/user.js",
-    "/css/app.css": "/css/app.css",
-    "/css/document.css": "/css/document.css"
-}
diff --git a/src/readme.md b/src/readme.md
deleted file mode 100644
index f95b2ec9..00000000
--- a/src/readme.md
+++ /dev/null
@@ -1,72 +0,0 @@
-<p align="center"><img src="https://res.cloudinary.com/dtfbvvkyp/image/upload/v1566331377/laravel-logolockup-cmyk-red.svg" width="400"></p>
-
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/license.svg" alt="License"></a>
-</p>
-
-## About Laravel
-
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
-
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
-
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
-
-## Learning Laravel
-
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
-
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
-
-## Laravel Sponsors
-
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
-
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[British Software Development](https://www.britishsoftware.co)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- [UserInsights](https://userinsights.com)
-- [Fragrantica](https://www.fragrantica.com)
-- [SOFTonSOFA](https://softonsofa.com/)
-- [User10](https://user10.com)
-- [Soumettre.fr](https://soumettre.fr/)
-- [CodeBrisk](https://codebrisk.com)
-- [1Forge](https://1forge.com)
-- [TECPRESSO](https://tecpresso.co.jp/)
-- [Runtime Converter](http://runtimeconverter.com/)
-- [WebL'Agence](https://weblagence.com/)
-- [Invoice Ninja](https://www.invoiceninja.com)
-- [iMi digital](https://www.imi-digital.de/)
-- [Earthlink](https://www.earthlink.ro/)
-- [Steadfast Collective](https://steadfastcollective.com/)
-- [We Are The Robots Inc.](https://watr.mx/)
-- [Understand.io](https://www.understand.io/)
-- [Abdel Elrafa](https://abdelelrafa.com)
-- [Hyper Host](https://hyper.host)
-
-## Contributing
-
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
-
-## Security Vulnerabilities
-
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
-
-## License
-
-The Laravel framework is open-source software licensed under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/src/resources/images/user.svg b/src/resources/images/user.svg
new file mode 100644
index 00000000..c976281c
--- /dev/null
+++ b/src/resources/images/user.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 96c48.6 0 88 39.4 88 88s-39.4 88-88 88-88-39.4-88-88 39.4-88 88-88zm0 344c-58.7 0-111.3-26.6-146.5-68.2 18.8-35.4 55.6-59.8 98.5-59.8 2.4 0 4.8.4 7.1 1.1 13 4.2 26.6 6.9 40.9 6.9 14.3 0 28-2.7 40.9-6.9 2.3-.7 4.7-1.1 7.1-1.1 42.9 0 79.7 24.4 98.5 59.8C359.3 421.4 306.7 448 248 448z"/></svg>
\ No newline at end of file
diff --git a/src/resources/js/app.js b/src/resources/js/app.js
index 4eb7f011..f744f992 100644
--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
@@ -1,353 +1,477 @@
 /**
  * First we will load all of this project's JavaScript dependencies which
  * includes Vue and other libraries. It is a great starting point when
  * building robust, powerful web applications using Vue and Laravel.
  */
 
 require('./bootstrap')
 
 import AppComponent from '../vue/App'
 import MenuComponent from '../vue/Widgets/Menu'
+import SupportForm from '../vue/Widgets/SupportForm'
 import store from './store'
 
 const loader = '<div class="app-loader"><div class="spinner-border" role="status"><span class="sr-only">Loading</span></div></div>'
 
+let isLoading = 0
+
+// Lock the UI with the 'loading...' element
+const startLoading = () => {
+    isLoading++
+    let loading = $('#app > .app-loader').removeClass('fadeOut')
+    if (!loading.length) {
+        $('#app').append($(loader))
+    }
+}
+
+// Hide "loading" overlay
+const stopLoading = () => {
+    if (isLoading > 0) {
+        $('#app > .app-loader').addClass('fadeOut')
+        isLoading--;
+    }
+}
+
+let loadingRoute
+
+// Note: This has to be before the app is created
+// Note: You cannot use app inside of the function
+window.router.beforeEach((to, from, next) => {
+    // check if the route requires authentication and user is not logged in
+    if (to.matched.some(route => route.meta.requiresAuth) && !store.state.isLoggedIn) {
+        // remember the original request, to use after login
+        store.state.afterLogin = to;
+
+        // redirect to login page
+        next({ name: 'login' })
+
+        return
+    }
+
+    if (to.meta.loading) {
+        startLoading()
+        loadingRoute = to.name
+    }
+
+    next()
+})
+
+window.router.afterEach((to, from) => {
+    if (to.name && loadingRoute === to.name) {
+        stopLoading()
+        loadingRoute = null
+    }
+
+    // When changing a page remove old:
+    // - error page
+    // - modal backdrop
+    $('#error-page,.modal-backdrop.show').remove()
+})
+
 const app = new Vue({
     el: '#app',
     components: {
         AppComponent,
         MenuComponent,
     },
     store,
     router: window.router,
     data() {
         return {
-            isLoading: true,
-            isAdmin: window.isAdmin
+            isAdmin: window.isAdmin,
+            appName: window.config['app.name'],
+            appUrl: window.config['app.url'],
+            themeDir: '/themes/' + window.config['app.theme']
         }
     },
     methods: {
         // Clear (bootstrap) form validation state
         clearFormValidation(form) {
             $(form).find('.is-invalid').removeClass('is-invalid')
             $(form).find('.invalid-feedback').remove()
         },
+        hasRoute(name) {
+            return this.$router.resolve({ name: name }).resolved.matched.length > 0
+        },
+        hasSKU(name) {
+            const authInfo = store.state.authInfo
+            return authInfo.statusInfo.skus && authInfo.statusInfo.skus.indexOf(name) != -1
+        },
         isController(wallet_id) {
             if (wallet_id && store.state.authInfo) {
                 let i
                 for (i = 0; i < store.state.authInfo.wallets.length; i++) {
                     if (wallet_id == store.state.authInfo.wallets[i].id) {
                         return true
                     }
                 }
                 for (i = 0; i < store.state.authInfo.accounts.length; i++) {
                     if (wallet_id == store.state.authInfo.accounts[i].id) {
                         return true
                     }
                 }
             }
 
             return false
         },
         // Set user state to "logged in"
         loginUser(response, dashboard, update) {
             if (!update) {
                 store.commit('logoutUser') // destroy old state data
                 store.commit('loginUser')
             }
 
             localStorage.setItem('token', response.access_token)
             axios.defaults.headers.common.Authorization = 'Bearer ' + response.access_token
 
             if (response.email) {
                 store.state.authInfo = response
             }
 
             if (dashboard !== false) {
                 this.$router.push(store.state.afterLogin || { name: 'dashboard' })
             }
 
             store.state.afterLogin = null
 
             // Refresh the token before it expires
             let timeout = response.expires_in || 0
 
             // We'll refresh 60 seconds before the token expires
             if (timeout > 60) {
                 timeout -= 60
             }
 
             // TODO: We probably should try a few times in case of an error
             // TODO: We probably should prevent axios from doing any requests
             //       while the token is being refreshed
 
             this.refreshTimeout = setTimeout(() => {
                 axios.post('/api/auth/refresh').then(response => {
                     this.loginUser(response.data, false, true)
                 })
             }, timeout * 1000)
         },
         // Set user state to "not logged in"
-        logoutUser() {
+        logoutUser(redirect) {
             store.commit('logoutUser')
             localStorage.setItem('token', '')
             delete axios.defaults.headers.common.Authorization
-            this.$router.push({ name: 'login' })
+
+            if (redirect !== false) {
+                this.$router.push({ name: 'login' })
+            }
+
             clearTimeout(this.refreshTimeout)
         },
+        logo(mode) {
+            let src = this.appUrl + this.themeDir + '/images/logo_' + (mode || 'header') + '.png'
+
+            return `<img src="${src}" alt="${this.appName}">`
+        },
         // Display "loading" overlay inside of the specified element
-        addLoader(elem) {
-            $(elem).css({position: 'relative'}).append($(loader).addClass('small'))
+        addLoader(elem, small = true) {
+            $(elem).css({position: 'relative'}).append(small ? $(loader).addClass('small') : $(loader))
         },
         // Remove loader element added in addLoader()
         removeLoader(elem) {
             $(elem).find('.app-loader').remove()
         },
-        startLoading() {
-            this.isLoading = true
-            // Lock the UI with the 'loading...' element
-            let loading = $('#app > .app-loader').removeClass('fadeOut')
-            if (!loading.length) {
-                $('#app').append($(loader))
-            }
-        },
-        // Hide "loading" overlay
-        stopLoading() {
-            $('#app > .app-loader').addClass('fadeOut')
-            this.isLoading = false
+        startLoading,
+        stopLoading,
+        isLoading() {
+            return isLoading > 0
         },
         errorPage(code, msg) {
             // Until https://github.com/vuejs/vue-router/issues/977 is implemented
             // we can't really use router to display error page as it has two side
             // effects: it changes the URL and adds the error page to browser history.
             // For now we'll be replacing current view with error page "manually".
             const map = {
                 400: "Bad request",
                 401: "Unauthorized",
                 403: "Access denied",
                 404: "Not found",
                 405: "Method not allowed",
                 500: "Internal server error"
             }
 
             if (!msg) msg = map[code] || "Unknown Error"
 
-            const error_page = `<div id="error-page"><div class="code">${code}</div><div class="message">${msg}</div></div>`
+            const error_page = `<div id="error-page" class="error-page"><div class="code">${code}</div><div class="message">${msg}</div></div>`
 
             $('#error-page').remove()
             $('#app').append(error_page)
+
+            app.updateBodyClass('error')
         },
         errorHandler(error) {
             this.stopLoading()
 
             if (!error.response) {
                 // TODO: probably network connection error
             } else if (error.response.status === 401) {
-                this.logoutUser()
+                // Remember requested route to come back to it after log in
+                if (this.$route.meta.requiresAuth) {
+                    store.state.afterLogin = this.$route
+                    this.logoutUser()
+                } else {
+                    this.logoutUser(false)
+                }
             } else {
                 this.errorPage(error.response.status, error.response.statusText)
             }
         },
         downloadFile(url) {
             // TODO: This might not be a best way for big files as the content
             //       will be stored (temporarily) in browser memory
             // TODO: This method does not show the download progress in the browser
             //       but it could be implemented in the UI, axios has 'progress' property
             axios.get(url, { responseType: 'blob' })
-                .then (response => {
+                .then(response => {
                     const link = document.createElement('a')
                     const contentDisposition = response.headers['content-disposition']
                     let filename = 'unknown'
 
                     if (contentDisposition) {
                         const match = contentDisposition.match(/filename="(.+)"/);
                         if (match.length === 2) {
                             filename = match[1];
                         }
                     }
 
                     link.href = window.URL.createObjectURL(response.data)
                     link.download = filename
                     link.click()
                 })
         },
         price(price, currency) {
             return ((price || 0) / 100).toLocaleString('de-DE', { style: 'currency', currency: currency || 'CHF' })
         },
         priceLabel(cost, units = 1, discount) {
             let index = ''
 
             if (units < 0) {
                 units = 1
             }
 
             if (discount) {
                 cost = Math.floor(cost * ((100 - discount) / 100))
                 index = '\u00B9'
             }
 
             return this.price(cost * units) + '/month' + index
         },
         clickRecord(event) {
             if (!/^(a|button|svg|path)$/i.test(event.target.nodeName)) {
                 let link = $(event.target).closest('tr').find('a')[0]
                 if (link) {
                     link.click()
                 }
             }
         },
         domainStatusClass(domain) {
             if (domain.isDeleted) {
                 return 'text-muted'
             }
 
             if (domain.isSuspended) {
                 return 'text-warning'
             }
 
             if (!domain.isVerified || !domain.isLdapReady || !domain.isConfirmed) {
                 return 'text-danger'
             }
 
             return 'text-success'
         },
         domainStatusText(domain) {
             if (domain.isDeleted) {
                 return 'Deleted'
             }
 
             if (domain.isSuspended) {
                 return 'Suspended'
             }
 
             if (!domain.isVerified || !domain.isLdapReady || !domain.isConfirmed) {
                 return 'Not Ready'
             }
 
             return 'Active'
         },
+        pageName(path) {
+            let page = this.$route.path
+
+            // check if it is a "menu page", find the page name
+            // otherwise we'll use the real path as page name
+            window.config.menu.every(item => {
+                if (item.location == page && item.page) {
+                    page = item.page
+                    return false
+                }
+            })
+
+            page = page.replace(/^\//, '')
+
+            return page ? page : '404'
+        },
+        supportDialog(container) {
+            let dialog = $('#support-dialog')
+
+            // FIXME: Find a nicer way of doing this
+            if (!dialog.length) {
+                let form = new Vue(SupportForm)
+                form.$mount($('<div>').appendTo(container)[0])
+                form.$root = this
+                form.$toast = this.$toast
+                dialog = $(form.$el)
+            }
+
+            dialog.on('shown.bs.modal', () => {
+                    dialog.find('input').first().focus()
+                }).modal()
+        },
         userStatusClass(user) {
             if (user.isDeleted) {
                 return 'text-muted'
             }
 
             if (user.isSuspended) {
                 return 'text-warning'
             }
 
             if (!user.isImapReady || !user.isLdapReady) {
                 return 'text-danger'
             }
 
             return 'text-success'
         },
         userStatusText(user) {
             if (user.isDeleted) {
                 return 'Deleted'
             }
 
             if (user.isSuspended) {
                 return 'Suspended'
             }
 
             if (!user.isImapReady || !user.isLdapReady) {
                 return 'Not Ready'
             }
 
             return 'Active'
+        },
+        updateBodyClass(name) {
+            // Add 'class' attribute to the body, different for each page
+            // so, we can apply page-specific styles
+            let className = 'page-' + (name || this.pageName()).replace(/\/.*$/, '')
+            $(document.body).removeClass().addClass(className)
         }
     }
 })
 
 // Add a axios request interceptor
 window.axios.interceptors.request.use(
     config => {
         // This is the only way I found to change configuration options
         // on a running application. We need this for browser testing.
         config.headers['X-Test-Payment-Provider'] = window.config.paymentProvider
 
         return config
     },
     error => {
         // Do something with request error
         return Promise.reject(error)
     }
 )
 
 // Add a axios response interceptor for general/validation error handler
 window.axios.interceptors.response.use(
     response => {
-        // Do nothing
+        if (response.config.onFinish) {
+            response.config.onFinish()
+        }
+
         return response
     },
     error => {
         let error_msg
         let status = error.response ? error.response.status : 200
 
+        // Do not display the error in a toast message, pass the error as-is
+        if (error.config.ignoreErrors) {
+            return Promise.reject(error)
+        }
+
+        if (error.config.onFinish) {
+            error.config.onFinish()
+        }
+
         if (error.response && status == 422) {
             error_msg = "Form validation error"
 
             const modal = $('div.modal.show')
 
             $(modal.length ? modal : 'form').each((i, form) => {
                 form = $(form)
 
                 $.each(error.response.data.errors || {}, (idx, msg) => {
                     const input_name = (form.data('validation-prefix') || form.find('form').first().data('validation-prefix') || '') + idx
                     let input = form.find('#' + input_name)
 
                     if (!input.length) {
                         input = form.find('[name="' + input_name + '"]');
                     }
 
                     if (input.length) {
                         // Create an error message\
                         // API responses can use a string, array or object
                         let msg_text = ''
                         if ($.type(msg) !== 'string') {
                             $.each(msg, (index, str) => {
                                 msg_text += str + ' '
                             })
                         }
                         else {
                             msg_text = msg
                         }
 
                         let feedback = $('<div class="invalid-feedback">').text(msg_text)
 
                         if (input.is('.list-input')) {
                             // List input widget
                             input.children(':not(:first-child)').each((index, element) => {
                                 if (msg[index]) {
                                     $(element).find('input').addClass('is-invalid')
                                 }
                             })
 
                             input.addClass('is-invalid').next('.invalid-feedback').remove()
                             input.after(feedback)
                         }
                         else {
                             // Standard form element
                             input.addClass('is-invalid')
                             input.parent().find('.invalid-feedback').remove()
                             input.parent().append(feedback)
                         }
                     }
                 })
 
                 form.find('.is-invalid:not(.listinput-widget)').first().focus()
             })
         }
         else if (error.response && error.response.data) {
             error_msg = error.response.data.message
         }
         else {
             error_msg = error.request ? error.request.statusText : error.message
         }
 
         app.$toast.error(error_msg || "Server Error")
 
         // Pass the error as-is
         return Promise.reject(error)
     }
 )
diff --git a/src/resources/js/bootstrap.js b/src/resources/js/bootstrap.js
index 88b4aecd..3a942131 100644
--- a/src/resources/js/bootstrap.js
+++ b/src/resources/js/bootstrap.js
@@ -1,101 +1,79 @@
 /**
  * We'll load jQuery and the Bootstrap jQuery plugin which provides support
  * for JavaScript based Bootstrap features such as modals and tabs. This
  * code may be modified to fit the specific needs of your application.
  */
 
 window.Popper = require('popper.js').default
 window.$ = window.jQuery = require('jquery')
 
 require('bootstrap')
 
 /**
  * We'll load Vue, VueRouter and global components
  */
 
 import FontAwesomeIcon from './fontawesome'
 import VueRouter from 'vue-router'
 import Toast from '../vue/Widgets/Toast'
 import store from './store'
 
 window.Vue = require('vue')
 
 Vue.component('svg-icon', FontAwesomeIcon)
 
 const vTooltip = (el, binding) => {
     const t = []
 
     if (binding.modifiers.focus) t.push('focus')
     if (binding.modifiers.hover) t.push('hover')
     if (binding.modifiers.click) t.push('click')
     if (!t.length) t.push('hover')
 
     $(el).tooltip({
         title: binding.value,
         placement: binding.arg || 'top',
         trigger: t.join(' '),
         html: !!binding.modifiers.html,
     });
 }
 
 Vue.directive('tooltip', {
     bind: vTooltip,
     update: vTooltip,
     unbind (el) {
         $(el).tooltip('dispose')
     }
 })
 
 Vue.use(Toast)
 
 Vue.use(VueRouter)
 
 let vueRouterBase = '/'
 try {
   let url = new URL(window.config['app.url'])
   vueRouterBase = url.pathname
 } catch(e) {
     // ignore
 }
 
 window.router = new VueRouter({
     base: vueRouterBase,
     mode: 'history',
     routes: window.routes,
     scrollBehavior (to, from, savedPosition) {
         // Scroll the page to top, but not on Back action
         return savedPosition || { x: 0, y: 0 }
     }
 })
 
-router.beforeEach((to, from, next) => {
-    // check if the route requires authentication and user is not logged in
-    if (to.matched.some(route => route.meta.requiresAuth) && !store.state.isLoggedIn) {
-        // remember the original request, to use after login
-        store.state.afterLogin = to;
-
-        // redirect to login page
-        next({ name: 'login' })
-
-        return
-    }
-
-    next()
-})
-
-router.afterEach((to, from) => {
-    // When changing a page remove old:
-    // - error page
-    // - modal backdrop
-    $('#error-page,.modal-backdrop.show').remove()
-})
-
 /**
  * We'll load the axios HTTP library which allows us to easily issue requests
  * to our Laravel back-end. This library automatically handles sending the
  * CSRF token as a header based on the value of the "XSRF" token cookie.
  */
 
 window.axios = require('axios')
 axios.defaults.baseURL = vueRouterBase
 axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'
diff --git a/src/resources/js/fontawesome.js b/src/resources/js/fontawesome.js
index 318a8da5..93297fa2 100644
--- a/src/resources/js/fontawesome.js
+++ b/src/resources/js/fontawesome.js
@@ -1,55 +1,66 @@
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 //import { } from '@fortawesome/free-brands-svg-icons'
 import {
     faCheckSquare,
     faCreditCard,
     faSquare,
 } from '@fortawesome/free-regular-svg-icons'
 
 import {
     faCheck,
     faCheckCircle,
+    faComments,
     faDownload,
+    faEnvelope,
     faGlobe,
+    faUniversity,
     faExclamationCircle,
     faInfoCircle,
     faLock,
     faKey,
     faPlus,
     faSearch,
     faSignInAlt,
     faSyncAlt,
     faTrashAlt,
     faUser,
     faUserCog,
     faUsers,
     faWallet
 } from '@fortawesome/free-solid-svg-icons'
 
+import {
+    faPaypal
+} from '@fortawesome/free-brands-svg-icons'
+
 // Register only these icons we need
 library.add(
     faCheck,
     faCheckCircle,
     faCheckSquare,
+    faComments,
     faCreditCard,
+    faPaypal,
+    faUniversity,
     faDownload,
+    faEnvelope,
     faExclamationCircle,
     faGlobe,
     faInfoCircle,
     faLock,
     faKey,
     faPlus,
     faSearch,
     faSignInAlt,
     faSquare,
     faSyncAlt,
     faTrashAlt,
     faUser,
     faUserCog,
     faUsers,
     faWallet
 )
 
 export default FontAwesomeIcon
diff --git a/src/resources/js/meet/app.js b/src/resources/js/meet/app.js
new file mode 100644
index 00000000..98d52152
--- /dev/null
+++ b/src/resources/js/meet/app.js
@@ -0,0 +1,1670 @@
+import anchorme from 'anchorme'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { OpenVidu } from 'openvidu-browser'
+
+class Roles {
+    static get SUBSCRIBER() { return 1 << 0; }
+    static get PUBLISHER() { return 1 << 1; }
+    static get MODERATOR() { return 1 << 2; }
+    static get SCREEN() { return 1 << 3; }
+    static get OWNER() { return 1 << 4; }
+}
+
+function Meet(container)
+{
+    let OV                      // OpenVidu object to initialize a session
+    let session                 // Session object where the user will connect
+    let publisher               // Publisher object which the user will publish
+    let audioActive = false     // True if the audio track of the publisher is active
+    let videoActive = false     // True if the video track of the publisher is active
+    let audioSource = ''        // Currently selected microphone
+    let videoSource = ''        // Currently selected camera
+    let sessionData             // Room session metadata
+
+    let screenOV                // OpenVidu object to initialize a screen sharing session
+    let screenSession           // Session object where the user will connect for screen sharing
+    let screenPublisher         // Publisher object which the user will publish the screen sharing
+
+    let publisherDefaults = {
+        publishAudio: true,     // Whether to start publishing with your audio unmuted or not
+        publishVideo: true,     // Whether to start publishing with your video enabled or not
+        resolution: '640x480',  // The resolution of your video
+        frameRate: 30,          // The frame rate of your video
+        mirror: true            // Whether to mirror your local video or not
+    }
+
+    let cameras = []            // List of user video devices
+    let microphones = []        // List of user audio devices
+    let connections = {}        // Connected users in the session
+
+    let chatCount = 0
+    let volumeElement
+    let publishersContainer
+    let subscribersContainer
+    let scrollStop
+
+    OV = ovInit()
+
+    // Disconnect participant when browser's window close
+    window.addEventListener('beforeunload', () => {
+        leaveRoom()
+    })
+
+    window.addEventListener('resize', resize)
+
+    // Public methods
+    this.isScreenSharingSupported = isScreenSharingSupported
+    this.joinRoom = joinRoom
+    this.leaveRoom = leaveRoom
+    this.setupStart = setupStart
+    this.setupStop = setupStop
+    this.setupSetAudioDevice = setupSetAudioDevice
+    this.setupSetVideoDevice = setupSetVideoDevice
+    this.switchAudio = switchAudio
+    this.switchChannel = switchChannel
+    this.switchScreen = switchScreen
+    this.switchVideo = switchVideo
+    this.updateSession = updateSession
+
+    /**
+     * Initialize OpenVidu instance
+     */
+    function ovInit()
+    {
+        let ov = new OpenVidu()
+
+        // If there's anything to do, do it here.
+        //ov.setAdvancedConfiguration(config)
+
+        // Disable all logging except errors
+        // ov.enableProdMode()
+
+        return ov
+    }
+
+    /**
+     * Join the room session
+     *
+     * @param data Session metadata and event handlers:
+     *      token       - OpenVidu token for the main connection,
+     *      shareToken  - OpenVidu token for screen-sharing connection,
+     *      nickname    - Participant name,
+     *      role        - connection (participant) role(s),
+     *      connections - Optional metadata for other users connections (current state),
+     *      channel     - Selected interpreted language channel (two-letter language code)
+     *      languages   - Supported languages (code-to-label map)
+     *      chatElement - DOM element for the chat widget,
+     *      counterElement - DOM element for the participants counter,
+     *      menuElement - DOM element of the room toolbar,
+     *      queueElement - DOM element for the Q&A queue (users with a raised hand)
+     *      onSuccess           - Callback for session connection (join) success
+     *      onError             - Callback for session connection (join) error
+     *      onDestroy           - Callback for session disconnection event,
+     *      onDismiss           - Callback for Dismiss action,
+     *      onJoinRequest       - Callback for join request,
+     *      onConnectionChange  - Callback for participant changes, e.g. role update,
+     *      onSessionDataUpdate - Callback for current user connection update,
+     *      onMediaSetup        - Called when user clicks the Media setup button
+     */
+    function joinRoom(data) {
+        // Create a container for subscribers and publishers
+        publishersContainer = $('<div id="meet-publishers">').appendTo(container).get(0)
+        subscribersContainer = $('<div id="meet-subscribers">').appendTo(container).get(0)
+
+        resize();
+        volumeMeterStop()
+
+        data.params = {
+            nickname: data.nickname, // user nickname
+            // avatar: undefined        // avatar image
+        }
+
+        // Make sure all supported callbacks exist, so we don't have to check
+        // their existence everywhere anymore
+        let events = ['Success', 'Error', 'Destroy', 'Dismiss', 'JoinRequest', 'ConnectionChange',
+            'SessionDataUpdate', 'MediaSetup']
+
+        events.map(event => 'on' + event).forEach(event => {
+            if (!data[event]) {
+                data[event] = () => {}
+            }
+        })
+
+        sessionData = data
+
+        // Init a session
+        session = OV.initSession()
+
+        // Handle connection creation events
+        session.on('connectionCreated', event => {
+            // Ignore the current user connection
+            if (event.connection.role) {
+                return
+            }
+
+            // This is the first event executed when a user joins in.
+            // We'll create the video wrapper here, which can be re-used
+            // in 'streamCreated' event handler.
+
+            let metadata = connectionData(event.connection)
+            const connId = metadata.connectionId
+
+            // The connection metadata here is the initial metadata set on
+            // connection initialization. There's no way to update it via OpenVidu API.
+            // So, we merge the initial connection metadata with up-to-dated one that
+            // we got from our database.
+            if (sessionData.connections && connId in sessionData.connections) {
+                Object.assign(metadata, sessionData.connections[connId])
+            }
+
+            metadata.element = participantCreate(metadata)
+
+            connections[connId] = metadata
+
+            // Send the current user status to the connecting user
+            // otherwise e.g. nickname might be not up to date
+            signalUserUpdate(event.connection)
+        })
+
+        session.on('connectionDestroyed', event => {
+            let connectionId = event.connection.connectionId
+            let conn = connections[connectionId]
+
+            if (conn) {
+                // Remove elements related to the participant
+                connectionHandDown(connectionId)
+                $(conn.element).remove()
+                delete connections[connectionId]
+            }
+
+            resize()
+        })
+
+        // On every new Stream received...
+        session.on('streamCreated', event => {
+            let connectionId = event.stream.connection.connectionId
+            let metadata = connections[connectionId]
+            let props = {
+                // Prepend the video element so it is always before the watermark element
+                insertMode: 'PREPEND'
+            }
+
+            // Subscribe to the Stream to receive it
+            let subscriber = session.subscribe(event.stream, metadata.element, props);
+
+            Object.assign(metadata, {
+                audioActive: event.stream.audioActive,
+                videoActive: event.stream.videoActive,
+                videoDimensions: event.stream.videoDimensions
+            })
+
+            subscriber.on('videoElementCreated', event => {
+                $(event.element).prop({
+                    tabindex: -1
+                })
+
+                resize()
+            })
+
+            // Update the wrapper controls/status
+            participantUpdate(metadata.element, metadata)
+        })
+
+        // Stream properties changes e.g. audio/video muted/unmuted
+        session.on('streamPropertyChanged', event => {
+            let connectionId = event.stream.connection.connectionId
+            let metadata = connections[connectionId]
+
+            if (session.connection.connectionId == connectionId) {
+                metadata = sessionData
+                metadata.audioActive = audioActive
+                metadata.videoActive = videoActive
+            }
+
+            if (metadata) {
+                metadata[event.changedProperty] = event.newValue
+
+                if (event.changedProperty == 'videoDimensions') {
+                    resize()
+                } else {
+                    participantUpdate(metadata.element, metadata)
+                }
+            }
+        })
+
+        // Handle session disconnection events
+        session.on('sessionDisconnected', event => {
+            data.onDestroy(event)
+            session = null
+            resize()
+        })
+
+        // Handle signals from all participants
+        session.on('signal', signalEventHandler)
+
+        // Connect with the token
+        session.connect(data.token, data.params)
+            .then(() => {
+                data.onSuccess()
+
+                let params = {
+                    connectionId: session.connection.connectionId,
+                    role: data.role,
+                    audioActive,
+                    videoActive
+                }
+
+                params = Object.assign({}, data.params, params)
+
+                publisher.on('videoElementCreated', event => {
+                    $(event.element).prop({
+                            muted: true, // Mute local video to avoid feedback
+                            disablePictureInPicture: true, // this does not work in Firefox
+                            tabindex: -1
+                    })
+                    resize()
+                })
+
+                let wrapper = participantCreate(params)
+
+                if (data.role & Roles.PUBLISHER) {
+                    publisher.createVideoElement(wrapper, 'PREPEND')
+                    session.publish(publisher)
+                }
+
+                sessionData.element = wrapper
+
+                // Create Q&A queue from the existing connections with rised hand.
+                // Here we expect connections in a proper queue order
+                Object.keys(data.connections || {}).forEach(key => {
+                    let conn = data.connections[key]
+
+                    if (conn.hand) {
+                        conn.connectionId = key
+                        connectionHandUp(conn)
+                    }
+                })
+
+                sessionData.channels = getChannels(data.connections)
+
+                // Inform the vue component, so it can update some UI controls
+                if (sessionData.channels.length) {
+                    sessionData.onSessionDataUpdate(sessionData)
+                }
+            })
+            .catch(error => {
+                console.error('There was an error connecting to the session: ', error.message);
+                data.onError(error)
+            })
+
+        // Prepare the chat
+        setupChat()
+    }
+
+    /**
+     * Leave the room (disconnect)
+     */
+    function leaveRoom() {
+        if (publisher) {
+            volumeMeterStop()
+
+            // Release any media
+            let mediaStream = publisher.stream.getMediaStream()
+            if (mediaStream) {
+                mediaStream.getTracks().forEach(track => track.stop())
+            }
+
+            publisher = null
+        }
+
+        if (session) {
+            session.disconnect();
+            session = null
+        }
+
+        if (screenSession) {
+            screenSession.disconnect();
+            screenSession = null
+        }
+    }
+
+    /**
+     * Sets the audio and video devices for the session.
+     * This will ask user for permission to access media devices.
+     *
+     * @param props Setup properties (videoElement, volumeElement, onSuccess, onError)
+     */
+    function setupStart(props) {
+        // Note: After changing media permissions in Chrome/Firefox a page refresh is required.
+        // That means that in a scenario where you first blocked access to media devices
+        // and then allowed it we can't ask for devices list again and expect a different
+        // result than before.
+        // That's why we do not bother, and return ealy when we open the media setup dialog.
+        if (publisher) {
+            volumeMeterStart()
+            return
+        }
+
+        publisher = OV.initPublisher(undefined, publisherDefaults)
+
+        publisher.once('accessDenied', error => {
+            props.onError(error)
+        })
+
+        publisher.once('accessAllowed', async () => {
+            let mediaStream = publisher.stream.getMediaStream()
+            let videoStream = mediaStream.getVideoTracks()[0]
+            let audioStream = mediaStream.getAudioTracks()[0]
+
+            audioActive = !!audioStream
+            videoActive = !!videoStream
+            volumeElement = props.volumeElement
+
+            publisher.addVideoElement(props.videoElement)
+
+            volumeMeterStart()
+
+            const devices = await OV.getDevices()
+
+            devices.forEach(device => {
+                // device's props: deviceId, kind, label
+                if (device.kind == 'videoinput') {
+                    cameras.push(device)
+                    if (videoStream && videoStream.label == device.label) {
+                        videoSource = device.deviceId
+                    }
+                } else if (device.kind == 'audioinput') {
+                    microphones.push(device)
+                    if (audioStream && audioStream.label == device.label) {
+                        audioSource = device.deviceId
+                    }
+                }
+            })
+
+            props.onSuccess({
+                microphones,
+                cameras,
+                audioSource,
+                videoSource,
+                audioActive,
+                videoActive
+            })
+        })
+    }
+
+    /**
+     * Stop the setup "process", cleanup after it.
+     */
+    function setupStop() {
+        volumeMeterStop()
+    }
+
+    /**
+     * Change the publisher audio device
+     *
+     * @param deviceId Device identifier string
+     */
+    async function setupSetAudioDevice(deviceId) {
+        if (!deviceId) {
+            publisher.publishAudio(false)
+            volumeMeterStop()
+            audioActive = false
+        } else if (deviceId == audioSource) {
+            publisher.publishAudio(true)
+            volumeMeterStart()
+            audioActive = true
+        } else {
+            const mediaStream = publisher.stream.mediaStream
+            const properties = Object.assign({}, publisherDefaults, {
+                publishAudio: true,
+                publishVideo: videoActive,
+                audioSource: deviceId,
+                videoSource: videoSource
+            })
+
+            volumeMeterStop()
+
+            // Stop and remove the old track, otherwise you get "Concurrent mic process limit." error
+            mediaStream.getAudioTracks().forEach(track => {
+                track.stop()
+                mediaStream.removeTrack(track)
+            })
+
+            // TODO: Handle errors
+
+            await OV.getUserMedia(properties)
+                .then(async (newMediaStream) => {
+                    await replaceTrack(newMediaStream.getAudioTracks()[0])
+                    volumeMeterStart()
+                    audioActive = true
+                    audioSource = deviceId
+                })
+        }
+
+        return audioActive
+    }
+
+    /**
+     * Change the publisher video device
+     *
+     * @param deviceId Device identifier string
+     */
+    async function setupSetVideoDevice(deviceId) {
+        if (!deviceId) {
+            publisher.publishVideo(false)
+            videoActive = false
+        } else if (deviceId == videoSource) {
+            publisher.publishVideo(true)
+            videoActive = true
+        } else {
+            const mediaStream = publisher.stream.mediaStream
+            const properties = Object.assign({}, publisherDefaults, {
+                publishAudio: audioActive,
+                publishVideo: true,
+                audioSource: audioSource,
+                videoSource: deviceId
+            })
+
+            volumeMeterStop()
+
+            // Stop and remove the old track, otherwise you get "Concurrent mic process limit." error
+            mediaStream.getVideoTracks().forEach(track => {
+                track.stop()
+                mediaStream.removeTrack(track)
+            })
+
+            // TODO: Handle errors
+
+            await OV.getUserMedia(properties)
+                .then(async (newMediaStream) => {
+                    await replaceTrack(newMediaStream.getVideoTracks()[0])
+                    volumeMeterStart()
+                    videoActive = true
+                    videoSource = deviceId
+                })
+        }
+
+        return videoActive
+    }
+
+    /**
+     * A way to switch tracks in a stream.
+     * Note: This is close to what publisher.replaceTrack() does but it does not
+     * require the session.
+     * Note: The old track needs to be removed before OV.getUserMedia() call,
+     * otherwise we get "Concurrent mic process limit" error.
+     */
+    function replaceTrack(track) {
+        const stream = publisher.stream
+
+        const replaceMediaStreamTrack = () => {
+            stream.mediaStream.addTrack(track);
+
+            if (session) {
+                session.sendVideoData(publisher.stream.streamManager, 5, true, 5);
+            }
+        }
+
+        // Fix a bug in Chrome where you would start hearing yourself after audio device change
+        // https://github.com/OpenVidu/openvidu/issues/449
+        publisher.videoReference.muted = true
+
+        return new Promise((resolve, reject) => {
+            if (stream.isLocalStreamPublished) {
+                // Only if the Publisher has been published it is necessary to call the native
+                // Web API RTCRtpSender.replaceTrack()
+                const senders = stream.getRTCPeerConnection().getSenders()
+                let sender
+
+                if (track.kind === 'video') {
+                    sender = senders.find(s => !!s.track && s.track.kind === 'video')
+                } else {
+                    sender = senders.find(s => !!s.track && s.track.kind === 'audio')
+                }
+
+                if (!sender) return
+
+                sender.replaceTrack(track).then(() => {
+                    replaceMediaStreamTrack()
+                    resolve()
+                }).catch(error => {
+                    reject(error)
+                })
+            } else {
+                // Publisher not published. Simply modify local MediaStream tracks
+                replaceMediaStreamTrack()
+                resolve()
+            }
+        })
+    }
+
+    /**
+     * Setup the chat UI
+     */
+    function setupChat() {
+        // The UI elements are created in the vue template
+        // Here we add a logic for how they work
+
+        const chat = $(sessionData.chatElement).find('.chat').get(0)
+        const textarea = $(sessionData.chatElement).find('textarea')
+        const button = $(sessionData.menuElement).find('.link-chat')
+
+        textarea.on('keydown', e => {
+            if (e.keyCode == 13 && !e.shiftKey) {
+                if (textarea.val().length) {
+                    signalChat(textarea.val())
+                    textarea.val('')
+                }
+
+                return false
+            }
+        })
+
+        // Add an element for the count of unread messages on the chat button
+        button.append('<span class="badge badge-dark blinker">')
+            .on('click', () => {
+                button.find('.badge').text('')
+                chatCount = 0
+                // When opening the chat scroll it to the bottom, or we shouldn't?
+                scrollStop = false
+                chat.scrollTop = chat.scrollHeight
+            })
+
+        $(chat).on('scroll', event => {
+            // Detect manual scrollbar moves, disable auto-scrolling until
+            // the scrollbar is positioned on the element bottom again
+            scrollStop = chat.scrollTop + chat.offsetHeight < chat.scrollHeight
+        })
+    }
+
+    /**
+     * Signal events handler
+     */
+    function signalEventHandler(signal) {
+        let conn, data
+        let connId = signal.from ? signal.from.connectionId : null
+
+        switch (signal.type) {
+            case 'signal:userChanged':
+                // TODO: Use 'signal:connectionUpdate' for nickname updates?
+                if (conn = connections[connId]) {
+                    data = JSON.parse(signal.data)
+
+                    conn.nickname = data.nickname
+                    participantUpdate(conn.element, conn)
+                    nicknameUpdate(data.nickname, connId)
+                }
+                break
+
+            case 'signal:chat':
+                data = JSON.parse(signal.data)
+                data.id = connId
+                pushChatMessage(data)
+                break
+
+            case 'signal:joinRequest':
+                // accept requests from the server only
+                if (!connId) {
+                    sessionData.onJoinRequest(JSON.parse(signal.data))
+                }
+                break
+
+            case 'signal:connectionUpdate':
+                // accept requests from the server only
+                if (!connId) {
+                    data = JSON.parse(signal.data)
+
+                    connectionUpdate(data)
+                }
+                break
+        }
+    }
+
+    /**
+     * Send the chat message to other participants
+     *
+     * @param message Message string
+     */
+    function signalChat(message) {
+        let data = {
+            nickname: sessionData.params.nickname,
+            message
+        }
+
+        session.signal({
+            data: JSON.stringify(data),
+            type: 'chat'
+        })
+    }
+
+    /**
+     * Add a message to the chat
+     *
+     * @param data Object with a message, nickname, id (of the connection, empty for self)
+     */
+    function pushChatMessage(data) {
+        let message = $('<span>').text(data.message).text() // make the message secure
+
+        // Format the message, convert emails and urls to links
+        message = anchorme({
+            input: message,
+            options: {
+                attributes: {
+                    target: "_blank"
+                },
+                // any link above 20 characters will be truncated
+                // to 20 characters and ellipses at the end
+                truncate: 20,
+                // characters will be taken out of the middle
+                middleTruncation: true
+            }
+            // TODO: anchorme is extensible, we could support
+            //       github/phabricator's markup e.g. backticks for code samples
+        })
+
+        message = message.replace(/\r?\n/, '<br>')
+
+        // Display the message
+        let isSelf = data.id == session.connectionId
+        let chat = $(sessionData.chatElement).find('.chat')
+        let box = chat.find('.message').last()
+
+        message = $('<div>').html(message)
+
+        message.find('a').attr('rel', 'noreferrer')
+
+        if (box.length && box.data('id') == data.id) {
+            // A message from the same user as the last message, no new box needed
+            message.appendTo(box)
+        } else {
+            box = $('<div class="message">').data('id', data.id)
+                .append($('<div class="nickname">').text(data.nickname || ''))
+                .append(message)
+                .appendTo(chat)
+
+            if (isSelf) {
+                box.addClass('self')
+            }
+        }
+
+        // Count unread messages
+        if (!$(sessionData.chatElement).is('.open')) {
+            if (!isSelf) {
+                chatCount++
+            }
+        } else {
+            chatCount = 0
+        }
+
+        $(sessionData.menuElement).find('.link-chat .badge').text(chatCount ? chatCount : '')
+
+        // Scroll the chat element to the end
+        if (!scrollStop) {
+            chat.get(0).scrollTop = chat.get(0).scrollHeight
+        }
+    }
+
+    /**
+     * Send the user properties update signal to other participants
+     *
+     * @param connection Optional connection to which the signal will be sent
+     *                   If not specified the signal is sent to all participants
+     */
+    function signalUserUpdate(connection) {
+        let data = {
+            nickname: sessionData.params.nickname
+        }
+
+        session.signal({
+            data: JSON.stringify(data),
+            type: 'userChanged',
+            to: connection ? [connection] : undefined
+        })
+
+        // The same nickname for screen sharing session
+        if (screenSession) {
+            screenSession.signal({
+                data: JSON.stringify(data),
+                type: 'userChanged',
+                to: connection ? [connection] : undefined
+            })
+        }
+    }
+
+    /**
+     * Switch interpreted language channel
+     *
+     * @param channel Two-letter language code
+     */
+    function switchChannel(channel) {
+        sessionData.channel = channel
+
+        // Mute/unmute all connections depending on the selected channel
+        participantUpdateAll()
+    }
+
+    /**
+     * Mute/Unmute audio for current session publisher
+     */
+    function switchAudio() {
+        // TODO: If user has no devices or denied access to them in the setup,
+        //       the button will just not work. Find a way to make it working
+        //       after user unlocks his devices. For now he has to refresh
+        //       the page and join the room again.
+        if (microphones.length) {
+            try {
+                publisher.publishAudio(!audioActive)
+                audioActive = !audioActive
+            } catch (e) {
+                console.error(e)
+            }
+        }
+
+        return audioActive
+    }
+
+    /**
+     * Mute/Unmute video for current session publisher
+     */
+    function switchVideo() {
+        // TODO: If user has no devices or denied access to them in the setup,
+        //       the button will just not work. Find a way to make it working
+        //       after user unlocks his devices. For now he has to refresh
+        //       the page and join the room again.
+        if (cameras.length) {
+            try {
+                publisher.publishVideo(!videoActive)
+                videoActive = !videoActive
+            } catch (e) {
+                console.error(e)
+            }
+        }
+
+        return videoActive
+    }
+
+    /**
+     * Switch on/off screen sharing
+     */
+    function switchScreen(callback) {
+        if (screenPublisher) {
+            // Note: This is what the original openvidu-call app does.
+            // It is probably better for performance reasons to close the connection,
+            // than to use unpublish() and keep the connection open.
+            screenSession.disconnect()
+            screenSession = null
+            screenPublisher = null
+
+            if (callback) {
+                // Note: Disconnecting invalidates the token, we have to inform the vue component
+                // to update UI state (and be prepared to request a new token).
+                callback(false)
+            }
+
+            return
+        }
+
+        screenConnect(callback)
+    }
+
+    /**
+     * Detect if screen sharing is supported by the browser
+     */
+    function isScreenSharingSupported() {
+        return !!OV.checkScreenSharingCapabilities();
+    }
+
+    /**
+     * Update participant connection state
+     */
+    function connectionUpdate(data) {
+        let conn = connections[data.connectionId]
+        let refresh = false
+        let handUpdate = conn => {
+            if ('hand' in data && data.hand != conn.hand) {
+                if (data.hand) {
+                    connectionHandUp(conn)
+                } else {
+                    connectionHandDown(data.connectionId)
+                }
+            }
+        }
+
+        // It's me
+        if (session.connection.connectionId == data.connectionId) {
+            const rolePublisher = data.role && data.role & Roles.PUBLISHER
+            const roleModerator = data.role && data.role & Roles.MODERATOR
+            const isPublisher = sessionData.role & Roles.PUBLISHER
+            const isModerator = sessionData.role & Roles.MODERATOR
+
+            // demoted to a subscriber
+            if ('role' in data && isPublisher && !rolePublisher) {
+                session.unpublish(publisher)
+                // FIXME: There's a reference in OpenVidu to a video element that should not
+                // exist anymore. It causes issues when we try to do publish/unpublish
+                // sequence multiple times in a row. So, we're clearing the reference here.
+                let videos = publisher.stream.streamManager.videos
+                publisher.stream.streamManager.videos = videos.filter(video => video.video.parentNode != null)
+            }
+
+            handUpdate(sessionData)
+
+            // merge the changed data into internal session metadata object
+            sessionData = Object.assign({}, sessionData, data, { audioActive, videoActive })
+
+            // update the participant element
+            sessionData.element = participantUpdate(sessionData.element, sessionData)
+
+            // promoted/demoted to/from a moderator
+            if ('role' in data) {
+                // Update all participants, to enable/disable the popup menu
+                refresh = (!isModerator && roleModerator) || (isModerator && !roleModerator)
+            }
+
+            // promoted to a publisher
+            if ('role' in data && !isPublisher && rolePublisher) {
+                publisher.createVideoElement(sessionData.element, 'PREPEND')
+                session.publish(publisher).then(() => {
+                    sessionData.audioActive = publisher.stream.audioActive
+                    sessionData.videoActive = publisher.stream.videoActive
+
+                    sessionData.onSessionDataUpdate(sessionData)
+                })
+
+                // Open the media setup dialog
+                // Note: If user didn't give permission to media before joining the room
+                // he will not be able to use them now. Changing permissions requires
+                // a page refresh.
+                // Note: In Firefox I'm always being asked again for media permissions.
+                // It does not happen in Chrome. In Chrome the cam/mic will be just re-used.
+                // I.e. streaming starts automatically.
+                // It might make sense to not start streaming automatically in any cirmustances,
+                // display the dialog and wait until user closes it, but this would be
+                // a bigger refactoring.
+                sessionData.onMediaSetup()
+            }
+        } else if (conn) {
+            handUpdate(conn)
+
+            // merge the changed data into internal session metadata object
+            Object.keys(data).forEach(key => { conn[key] = data[key] })
+
+            conn.element = participantUpdate(conn.element, conn)
+        }
+
+        // Update channels list
+        sessionData.channels = getChannels(connections)
+
+        // The channel user was using has been removed (or rather the participant stopped being an interpreter)
+        if (sessionData.channel && !sessionData.channels.includes(sessionData.channel)) {
+            sessionData.channel = null
+            refresh = true
+        }
+
+        if (refresh) {
+            participantUpdateAll()
+        }
+
+        // Inform the vue component, so it can update some UI controls
+        sessionData.onSessionDataUpdate(sessionData)
+    }
+
+    /**
+     * Handler for Hand-Up "signal"
+     */
+    function connectionHandUp(connection) {
+        connection.isSelf = session.connection.connectionId == connection.connectionId
+
+        let element = $(nicknameWidget(connection))
+
+        participantUpdate(element, connection)
+
+        element.attr('id', 'qa' + connection.connectionId)
+            .appendTo($(sessionData.queueElement).show())
+
+        setTimeout(() => element.addClass('widdle'), 50)
+    }
+
+    /**
+     * Handler for Hand-Down "signal"
+     */
+    function connectionHandDown(connectionId) {
+        let list = $(sessionData.queueElement)
+
+        list.find('#qa' + connectionId).remove();
+
+        if (!list.find('.meet-nickname').length) {
+            list.hide();
+        }
+    }
+
+    /**
+     * Update participant nickname in the UI
+     *
+     * @param nickname     Nickname
+     * @param connectionId Connection identifier of the user
+     */
+    function nicknameUpdate(nickname, connectionId) {
+        if (connectionId) {
+            $(sessionData.chatElement).find('.chat').find('.message').each(function() {
+                let elem = $(this)
+                if (elem.data('id') == connectionId) {
+                    elem.find('.nickname').text(nickname || '')
+                }
+            })
+
+            $(sessionData.queueElement).find('#qa' + connectionId + ' .content').text(nickname || '')
+        }
+    }
+
+    /**
+     * Create a participant element in the matrix. Depending on the connection role
+     * parameter it will be a video element wrapper inside the matrix or a simple
+     * tag-like element on the subscribers list.
+     *
+     * @param params  Connection metadata/params
+     * @param content Optional content to prepend to the element
+     *
+     * @return The element
+     */
+    function participantCreate(params, content) {
+        let element
+
+        params.isSelf = params.isSelf || session.connection.connectionId == params.connectionId
+
+        if ((!params.language && params.role & Roles.PUBLISHER) || params.role & Roles.SCREEN) {
+            // publishers and shared screens
+            element = publisherCreate(params, content)
+        } else {
+            // subscribers and language interpreters
+            element = subscriberCreate(params, content)
+        }
+
+        setTimeout(resize, 50);
+
+        return element
+    }
+
+    /**
+     * Create a <video> element wrapper with controls
+     *
+     * @param params  Connection metadata/params
+     * @param content Optional content to prepend to the element
+     */
+    function publisherCreate(params, content) {
+        let isScreen = params.role & Roles.SCREEN
+
+        // Create the element
+        let wrapper = $(
+            '<div class="meet-video">'
+            + svgIcon('user', 'fas', 'watermark')
+            + '<div class="controls">'
+                + '<button type="button" class="btn btn-link link-setup hidden" title="Media setup">' + svgIcon('cog') + '</button>'
+                + '<button type="button" class="btn btn-link link-audio hidden" title="Mute audio">' + svgIcon('volume-mute') + '</button>'
+                + '<button type="button" class="btn btn-link link-fullscreen closed hidden" title="Full screen">' + svgIcon('expand') + '</button>'
+                + '<button type="button" class="btn btn-link link-fullscreen open hidden" title="Full screen">' + svgIcon('compress') + '</button>'
+            + '</div>'
+            + '<div class="status">'
+                + '<span class="bg-warning status-audio hidden">' + svgIcon('microphone-slash') + '</span>'
+                + '<span class="bg-warning status-video hidden">' + svgIcon('video-slash') + '</span>'
+            + '</div>'
+            + '</div>'
+        )
+
+        // Append the nickname widget
+        wrapper.find('.controls').before(nicknameWidget(params))
+
+        if (content) {
+            wrapper.prepend(content)
+        }
+
+        if (isScreen) {
+            wrapper.addClass('screen')
+        }
+
+        if (params.isSelf) {
+            wrapper.find('.link-setup').removeClass('hidden').click(() => sessionData.onMediaSetup())
+        } else {
+            // Enable audio mute button
+            wrapper.find('.link-audio').removeClass('hidden')
+                .on('click', e => {
+                    let video = wrapper.find('video')[0]
+                    video.muted = !video.muted
+                    wrapper.find('.link-audio')[video.muted ? 'addClass' : 'removeClass']('text-danger')
+                })
+        }
+
+        participantUpdate(wrapper, params, true)
+
+        // Fullscreen control
+        if (document.fullscreenEnabled) {
+            wrapper.find('.link-fullscreen.closed').removeClass('hidden')
+                .on('click', () => {
+                    wrapper.get(0).requestFullscreen()
+                })
+
+            wrapper.find('.link-fullscreen.open')
+                .on('click', () => {
+                    document.exitFullscreen()
+                })
+
+            wrapper.on('fullscreenchange', () => {
+                // const enabled = document.fullscreenElement
+                wrapper.find('.link-fullscreen').toggleClass('hidden')
+            })
+        }
+
+        // Remove the subscriber element, if exists
+        $('#subscriber-' + params.connectionId).remove()
+
+        let prio = params.isSelf || (isScreen && !$(publishersContainer).children('.screen').length)
+
+        return wrapper[prio ? 'prependTo' : 'appendTo'](publishersContainer)
+            .attr('id', 'publisher-' + params.connectionId)
+            .get(0)
+    }
+
+    /**
+     * Update the publisher/subscriber element controls
+     *
+     * @param wrapper The wrapper element
+     * @param params  Connection metadata/params
+     */
+    function participantUpdate(wrapper, params, noupdate) {
+        const element = $(wrapper)
+        const isModerator = sessionData.role & Roles.MODERATOR
+        const isSelf = session.connection.connectionId == params.connectionId
+        const rolePublisher = params.role & Roles.PUBLISHER
+        const roleModerator = params.role & Roles.MODERATOR
+        const roleScreen = params.role & Roles.SCREEN
+        const roleOwner = params.role & Roles.OWNER
+        const roleInterpreter = rolePublisher && !!params.language
+
+        if (!noupdate && !roleScreen) {
+            const isPublisher = element.is('.meet-video')
+
+            // Publisher-to-interpreter or vice-versa, move element to the subscribers list or vice-versa,
+            // but keep the existing video element
+            if (
+                !isSelf
+                && element.find('video').length
+                && ((roleInterpreter && isPublisher) || (!roleInterpreter && !isPublisher && rolePublisher))
+            ) {
+                wrapper = participantCreate(params, element.find('video'))
+                element.remove()
+                return wrapper
+            }
+
+            // Handle publisher-to-subscriber and subscriber-to-publisher change
+            if (
+                !roleInterpreter
+                && (rolePublisher && !isPublisher) || (!rolePublisher && isPublisher)
+            ) {
+                element.remove()
+                return participantCreate(params)
+            }
+        }
+
+        let muted = false
+        let video = element.find('video')[0]
+
+        // When a channel is selected - mute everyone except the interpreter of the language.
+        // When a channel is not selected - mute language interpreters only
+        if (sessionData.channel) {
+            muted = !(roleInterpreter && params.language == sessionData.channel)
+        } else {
+            muted = roleInterpreter
+        }
+
+        if (muted && !isSelf) {
+            element.find('.status-audio').removeClass('hidden')
+            element.find('.link-audio').addClass('hidden')
+        } else {
+            element.find('.status-audio')[params.audioActive ? 'addClass' : 'removeClass']('hidden')
+
+            if (!isSelf) {
+                element.find('.link-audio').removeClass('hidden')
+            }
+
+            muted = !params.audioActive || isSelf
+        }
+
+        element.find('.status-video')[params.videoActive ? 'addClass' : 'removeClass']('hidden')
+
+        if (video) {
+            video.muted = muted
+        }
+
+        if ('nickname' in params) {
+            element.find('.meet-nickname > .content').text(params.nickname)
+        }
+
+        if (isSelf) {
+            element.addClass('self')
+        }
+
+        if (isModerator) {
+            element.addClass('moderated')
+        }
+
+        const withPerm = isModerator && !roleScreen && !(roleOwner && !isSelf);
+        const withMenu = isSelf || (isModerator && !roleOwner)
+
+        // TODO: This probably could be better done with css
+        let elements = {
+            '.dropdown-menu': withMenu,
+            '.permissions': withPerm,
+            '.interpreting': withPerm && rolePublisher,
+            'svg.moderator': roleModerator,
+            'svg.user': !roleModerator && !roleInterpreter,
+            'svg.interpreter': !roleModerator && roleInterpreter
+        }
+
+        Object.keys(elements).forEach(key => {
+            element.find(key)[elements[key] ? 'removeClass' : 'addClass']('hidden')
+        })
+
+        element.find('.action-role-publisher input').prop('checked', rolePublisher)
+        element.find('.action-role-moderator input').prop('checked', roleModerator)
+            .prop('disabled', roleOwner)
+
+        element.find('.interpreting select').val(roleInterpreter ? params.language : '')
+
+        return wrapper
+    }
+
+    /**
+     * Update/refresh state of all participants' elements
+     */
+    function participantUpdateAll() {
+        Object.keys(connections).forEach(key => {
+            const conn = connections[key]
+            participantUpdate(conn.element, conn)
+        })
+    }
+
+    /**
+     * Create a tag-like element for a subscriber participant
+     *
+     * @param params  Connection metadata/params
+     * @param content Optional content to prepend to the element
+     */
+    function subscriberCreate(params, content) {
+        // Create the element
+        let wrapper = $('<div class="meet-subscriber">').append(nicknameWidget(params))
+
+        if (content) {
+            wrapper.prepend(content)
+        }
+
+        participantUpdate(wrapper, params, true)
+
+        return wrapper[params.isSelf ? 'prependTo' : 'appendTo'](subscribersContainer)
+            .attr('id', 'subscriber-' + params.connectionId)
+            .get(0)
+    }
+
+    /**
+     * Create a tag-like nickname widget
+     *
+     * @param object params Connection metadata/params
+     */
+    function nicknameWidget(params) {
+        let languages = []
+
+        // Append languages selection options
+        Object.keys(sessionData.languages).forEach(code => {
+            languages.push(`<option value="${code}">${sessionData.languages[code]}</option>`)
+        })
+
+        // Create the element
+        let element = $(
+            '<div class="dropdown">'
+                + '<a href="#" class="meet-nickname btn" aria-haspopup="true" aria-expanded="false" role="button">'
+                    + '<span class="content"></span>'
+                    + '<span class="icon">'
+                        + svgIcon('user', null, 'user')
+                        + svgIcon('crown', null, 'moderator hidden')
+                        + svgIcon('headphones', null, 'interpreter hidden')
+                    + '</span>'
+                + '</a>'
+                + '<div class="dropdown-menu">'
+                    + '<a class="dropdown-item action-nickname" href="#">Nickname</a>'
+                    + '<a class="dropdown-item action-dismiss" href="#">Dismiss</a>'
+                    + '<div class="dropdown-divider permissions"></div>'
+                    + '<div class="permissions">'
+                        + '<h6 class="dropdown-header">Permissions</h6>'
+                        + '<label class="dropdown-item action-role-publisher custom-control custom-switch">'
+                            + '<input type="checkbox" class="custom-control-input">'
+                            + ' <span class="custom-control-label">Audio &amp; Video publishing</span>'
+                        + '</label>'
+                        + '<label class="dropdown-item action-role-moderator custom-control custom-switch">'
+                            + '<input type="checkbox" class="custom-control-input">'
+                            + ' <span class="custom-control-label">Moderation</span>'
+                        + '</label>'
+                    + '</div>'
+                    + '<div class="dropdown-divider interpreting"></div>'
+                    + '<div class="interpreting">'
+                        + '<h6 class="dropdown-header">Language interpreter</h6>'
+                        + '<div class="ml-4 mr-4"><select class="custom-select">'
+                            + '<option value="">- none -</option>'
+                            + languages.join('')
+                        + '</select></div>'
+                    + '</div>'
+                + '</div>'
+            + '</div>'
+        )
+
+        let nickname = element.find('.meet-nickname')
+            .addClass('btn btn-outline-' + (params.isSelf ? 'primary' : 'secondary'))
+            .attr({title: 'Options', 'data-toggle': 'dropdown'})
+            .dropdown({boundary: container.parentNode})
+
+        if (params.isSelf) {
+            // Add events for nickname change
+            let editable = element.find('.content')[0]
+            let editableEnable = () => {
+                editable.contentEditable = true
+                editable.focus()
+            }
+            let editableUpdate = () => {
+                editable.contentEditable = false
+                sessionData.params.nickname = editable.innerText
+                signalUserUpdate()
+                nicknameUpdate(editable.innerText, session.connection.connectionId)
+            }
+
+            element.find('.action-nickname').on('click', editableEnable)
+            element.find('.action-dismiss').remove()
+
+            $(editable).on('blur', editableUpdate)
+                .on('keydown', e => {
+                    // Enter or Esc
+                    if (e.keyCode == 13 || e.keyCode == 27) {
+                        editableUpdate()
+                        return false
+                    }
+
+                    // Do not propagate the event, so it does not interfere with our
+                    // keyboard shortcuts
+                    e.stopPropagation()
+                })
+        } else {
+            element.find('.action-nickname').remove()
+
+            element.find('.action-dismiss').on('click', e => {
+                sessionData.onDismiss(params.connectionId)
+            })
+        }
+
+        let connectionRole = () => {
+            if (params.isSelf) {
+                return sessionData.role
+            }
+            if (params.connectionId in connections) {
+                return connections[params.connectionId].role
+            }
+            return 0
+        }
+
+        // Don't close the menu on permission change
+        element.find('.dropdown-menu > label').on('click', e => { e.stopPropagation() })
+
+        element.find('.action-role-publisher input').on('change', e => {
+            const enabled = e.target.checked
+            let role = connectionRole()
+
+            if (enabled) {
+                role |= Roles.PUBLISHER
+            } else {
+                role |= Roles.SUBSCRIBER
+                if (role & Roles.PUBLISHER) {
+                    role ^= Roles.PUBLISHER
+                }
+            }
+
+            sessionData.onConnectionChange(params.connectionId, { role })
+        })
+
+        element.find('.action-role-moderator input').on('change', e => {
+            const enabled = e.target.checked
+            let role = connectionRole()
+
+            if (enabled) {
+                role |= Roles.MODERATOR
+            } else if (role & Roles.MODERATOR) {
+                role ^= Roles.MODERATOR
+            }
+
+            sessionData.onConnectionChange(params.connectionId, { role })
+        })
+
+        element.find('.interpreting select')
+            .on('change', e => {
+                const language = $(e.target).val()
+                sessionData.onConnectionChange(params.connectionId, { language })
+                element.find('.meet-nickname').dropdown('hide')
+            })
+            .on('click', e => {
+                // Prevents from closing the dropdown menu on click
+                e.stopPropagation()
+            })
+
+        return element.get(0)
+    }
+
+    /**
+     * Window onresize event handler (updates room layout)
+     */
+    function resize() {
+        if (publishersContainer) {
+            updateLayout()
+        }
+
+        $(container).parent()[window.screen.width <= 768 ? 'addClass' : 'removeClass']('mobile')
+    }
+
+    /**
+     * Update the room "matrix" layout
+     */
+    function updateLayout() {
+        let publishers = $(publishersContainer).find('.meet-video')
+        let numOfVideos = publishers.length
+
+        if (sessionData && sessionData.counterElement) {
+            sessionData.counterElement.innerHTML = Object.keys(connections).length + 1
+        }
+
+        if (!numOfVideos) {
+            subscribersContainer.style.minHeight = 'auto'
+            return
+        }
+
+        let allHeight = container.offsetHeight
+        let scrollHeight = subscribersContainer.scrollHeight
+        let containerWidth = publishersContainer.offsetWidth
+        let containerHeight = publishersContainer.offsetHeight
+        let limit = Math.ceil(allHeight * 0.25) // max subscribers list height
+
+        // Fix subscribers list height
+        if (subscribersContainer.offsetHeight <= scrollHeight) {
+            limit = Math.min(scrollHeight, limit)
+            subscribersContainer.style.minHeight = limit + 'px'
+            containerHeight = allHeight - limit
+        } else {
+            subscribersContainer.style.minHeight = 'auto'
+        }
+
+        let css, rows, cols, height, padding = 0
+
+        // Make the first screen sharing tile big
+        let screenVideo = publishers.filter('.screen').find('video').get(0)
+
+        if (screenVideo) {
+            let element = screenVideo.parentNode
+            let connId = element.id.replace(/^publisher-/, '')
+            let connection = connections[connId]
+
+            // We know the shared screen video dimensions, we can calculate
+            // width/height of the tile in the matrix
+            if (connection && connection.videoDimensions) {
+                let screenWidth = connection.videoDimensions.width
+                let screenHeight = containerHeight
+
+                // TODO: When the shared window is minimized the width/height is set to 1 (or 2)
+                //       - at least on my system. We might need to handle this case nicer. Right now
+                //       it create a 1-2px line on the left of the matrix - not a big issue.
+                // TODO: Make the 0.666 factor bigger for wide screen and small number of participants?
+                let maxWidth = Math.ceil(containerWidth * 0.666)
+
+                if (screenWidth > maxWidth) {
+                    screenWidth = maxWidth
+                }
+
+                // Set the tile position and size
+                $(element).css({
+                    width: screenWidth + 'px',
+                    height: screenHeight + 'px',
+                    position: 'absolute',
+                    top: 0,
+                    left: 0
+                })
+
+                padding = screenWidth + 'px'
+
+                // Now the estate for the rest of participants is what's left on the right side
+                containerWidth -= screenWidth
+                publishers = publishers.not(element)
+                numOfVideos -= 1
+            }
+        }
+
+        // Compensate the shared screen estate with a padding
+        $(publishersContainer).css('padding-left', padding)
+
+        const factor = containerWidth / containerHeight
+
+        if (factor >= 16/9) {
+            if (numOfVideos <= 3) {
+                rows = 1
+            } else if (numOfVideos <= 8) {
+                rows = 2
+            } else if (numOfVideos <= 15) {
+                rows = 3
+            } else if (numOfVideos <= 20) {
+                rows = 4
+            } else {
+                rows = 5
+            }
+
+            cols = Math.ceil(numOfVideos / rows)
+        } else {
+            if (numOfVideos == 1) {
+                cols = 1
+            } else if (numOfVideos <= 4) {
+                cols = 2
+            } else if (numOfVideos <= 9) {
+                cols = 3
+            } else if (numOfVideos <= 16) {
+                cols = 4
+            } else if (numOfVideos <= 25) {
+                cols = 5
+            } else {
+                cols = 6
+            }
+
+            rows = Math.ceil(numOfVideos / cols)
+
+            if (rows < cols && containerWidth < containerHeight) {
+                cols = rows
+                rows = Math.ceil(numOfVideos / cols)
+            }
+        }
+
+        // console.log('factor=' + factor, 'num=' + numOfVideos, 'cols = '+cols, 'rows=' + rows);
+
+        // Update all tiles (except the main shared screen) in the matrix
+        publishers.css({
+            width: (containerWidth / cols) + 'px',
+            // Height must be in pixels to make object-fit:cover working
+            height:  (containerHeight / rows) + 'px'
+        })
+    }
+
+    /**
+     * Initialize screen sharing session/publisher
+     */
+    function screenConnect(callback) {
+        if (!sessionData.shareToken) {
+            return false
+        }
+
+        let gotSession = !!screenSession
+
+        if (!screenOV) {
+            screenOV = ovInit()
+        }
+
+        // Init screen sharing session
+        if (!gotSession) {
+            screenSession = screenOV.initSession();
+        }
+
+        let successFunc = function() {
+            screenSession.publish(screenPublisher)
+
+            screenSession.on('sessionDisconnected', event => {
+                callback(false)
+                screenSession = null
+                screenPublisher = null
+            })
+
+            if (callback) {
+                callback(true)
+            }
+        }
+
+        let errorFunc = function() {
+            screenPublisher = null
+            if (callback) {
+                callback(false, true)
+            }
+        }
+
+        // Init the publisher
+        let params = {
+            videoSource: 'screen',
+            publishAudio: false
+        }
+
+        screenPublisher = screenOV.initPublisher(null, params)
+
+        screenPublisher.once('accessAllowed', (event) => {
+            if (gotSession) {
+                successFunc()
+            } else {
+                screenSession.connect(sessionData.shareToken, sessionData.params)
+                    .then(() => {
+                        successFunc()
+                    })
+                    .catch(error => {
+                        console.error('There was an error connecting to the session:', error.code, error.message);
+                        errorFunc()
+                    })
+            }
+        })
+
+        screenPublisher.once('accessDenied', () => {
+            console.info('ScreenShare: Access Denied')
+            errorFunc()
+        })
+    }
+
+    /**
+     * Create an svg element (string) for a FontAwesome icon
+     *
+     * @todo Find if there's a "official" way to do this
+     */
+    function svgIcon(name, type, className) {
+        // Note: the library will contain definitions for all icons registered elswhere
+        const icon = library.definitions[type || 'fas'][name]
+
+        let attrs = {
+            'class': 'svg-inline--fa',
+            'aria-hidden': true,
+            focusable: false,
+            role: 'img',
+            xmlns: 'http://www.w3.org/2000/svg',
+            viewBox: `0 0 ${icon[0]} ${icon[1]}`
+        }
+
+        if (className) {
+            attrs['class'] += ' ' + className
+        }
+
+        return $(`<svg><path fill="currentColor" d="${icon[4]}"></path></svg>`)
+            .attr(attrs)
+            .get(0).outerHTML
+    }
+
+    /**
+     * A way to update some session data, after you joined the room
+     *
+     * @param data Same input as for joinRoom()
+     */
+    function updateSession(data) {
+        sessionData.shareToken = data.shareToken
+    }
+
+    /**
+     * A handler for volume level change events
+     */
+    function volumeChangeHandler(event) {
+        let value = 100 + Math.min(0, Math.max(-100, event.value.newValue))
+        let color = 'lime'
+        const bar = volumeElement.firstChild
+
+        if (value >= 70) {
+            color = '#ff3300'
+        } else if (value >= 50) {
+            color = '#ff9933'
+        }
+
+        bar.style.height = value + '%'
+        bar.style.background = color
+    }
+
+    /**
+     * Start the volume meter
+     */
+    function volumeMeterStart() {
+        if (publisher && volumeElement) {
+            publisher.on('streamAudioVolumeChange', volumeChangeHandler)
+        }
+    }
+
+    /**
+     * Stop the volume meter
+     */
+    function volumeMeterStop() {
+        if (publisher && volumeElement) {
+            publisher.off('streamAudioVolumeChange')
+            volumeElement.firstChild.style.height = 0
+        }
+    }
+
+    function connectionData(connection) {
+        // Note: we're sending a json from two sources (server-side when
+        // creating a token/connection, and client-side when joining the session)
+        // OpenVidu is unable to merge these two objects into one, for it it is only
+        // two strings, so it puts a "%/%" separator in between, we'll replace it with comma
+        // to get one parseable json object
+        let data = JSON.parse(connection.data.replace('}%/%{', ','))
+
+        data.connectionId = connection.connectionId
+
+        return data
+    }
+
+    /**
+     * Get all existing language interpretation channels
+     */
+    function getChannels(connections) {
+        let channels = []
+
+        Object.keys(connections || {}).forEach(key => {
+            let conn = connections[key]
+
+            if (
+                conn.language
+                && !channels.includes(conn.language)
+            ) {
+                channels.push(conn.language)
+            }
+        })
+
+        return channels
+    }
+}
+
+export { Meet, Roles }
diff --git a/src/resources/js/routes-admin.js b/src/resources/js/routes-admin.js
index 27665db2..6a2cdda1 100644
--- a/src/resources/js/routes-admin.js
+++ b/src/resources/js/routes-admin.js
@@ -1,48 +1,55 @@
 import DashboardComponent from '../vue/Admin/Dashboard'
 import DomainComponent from '../vue/Admin/Domain'
-import Error404Component from '../vue/404'
 import LoginComponent from '../vue/Login'
 import LogoutComponent from '../vue/Logout'
+import PageComponent from '../vue/Page'
+import StatsComponent from '../vue/Admin/Stats'
 import UserComponent from '../vue/Admin/User'
 
 const routes = [
     {
         path: '/',
         redirect: { name: 'dashboard' }
     },
     {
         path: '/dashboard',
         name: 'dashboard',
         component: DashboardComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/domain/:domain',
         name: 'domain',
         component: DomainComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/login',
         name: 'login',
         component: LoginComponent
     },
     {
         path: '/logout',
         name: 'logout',
         component: LogoutComponent
     },
+    {
+        path: '/stats',
+        name: 'stats',
+        component: StatsComponent,
+        meta: { requiresAuth: true }
+    },
     {
         path: '/user/:user',
         name: 'user',
         component: UserComponent,
         meta: { requiresAuth: true }
     },
     {
         name: '404',
         path: '*',
-        component: Error404Component
+        component: PageComponent
     }
 ]
 
 export default routes
diff --git a/src/resources/js/routes-user.js b/src/resources/js/routes-user.js
index 1612aaac..944812a4 100644
--- a/src/resources/js/routes-user.js
+++ b/src/resources/js/routes-user.js
@@ -1,96 +1,110 @@
 import DashboardComponent from '../vue/Dashboard'
 import DomainInfoComponent from '../vue/Domain/Info'
 import DomainListComponent from '../vue/Domain/List'
-import Error404Component from '../vue/404'
 import LoginComponent from '../vue/Login'
 import LogoutComponent from '../vue/Logout'
+import MeetComponent from '../vue/Rooms'
+import PageComponent from '../vue/Page'
 import PasswordResetComponent from '../vue/PasswordReset'
 import SignupComponent from '../vue/Signup'
 import UserInfoComponent from '../vue/User/Info'
 import UserListComponent from '../vue/User/List'
 import UserProfileComponent from '../vue/User/Profile'
 import UserProfileDeleteComponent from '../vue/User/ProfileDelete'
 import WalletComponent from '../vue/Wallet'
 
+// Here's a list of lazy-loaded components
+// Note: you can pack multiple components into the same chunk, webpackChunkName
+// is also used to get a sensible file name instead of numbers
+const RoomComponent = () => import(/* webpackChunkName: "room" */ '../vue/Meet/Room.vue')
+
 const routes = [
-    {
-        path: '/',
-        redirect: { name: 'dashboard' }
-    },
     {
         path: '/dashboard',
         name: 'dashboard',
         component: DashboardComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/domain/:domain',
         name: 'domain',
         component: DomainInfoComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/domains',
         name: 'domains',
         component: DomainListComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/login',
         name: 'login',
         component: LoginComponent
     },
     {
         path: '/logout',
         name: 'logout',
         component: LogoutComponent
     },
     {
         path: '/password-reset/:code?',
         name: 'password-reset',
         component: PasswordResetComponent
     },
     {
         path: '/profile',
         name: 'profile',
         component: UserProfileComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/profile/delete',
         name: 'profile-delete',
         component: UserProfileDeleteComponent,
         meta: { requiresAuth: true }
     },
+    {
+        component: RoomComponent,
+        name: 'room',
+        path: '/meet/:room',
+        meta: { loading: true }
+    },
+    {
+        path: '/rooms',
+        name: 'rooms',
+        component: MeetComponent,
+        meta: { requiresAuth: true }
+    },
     {
         path: '/signup/:param?',
         alias: '/signup/voucher/:param',
         name: 'signup',
         component: SignupComponent
     },
     {
         path: '/user/:user',
         name: 'user',
         component: UserInfoComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/users',
         name: 'users',
         component: UserListComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/wallet',
         name: 'wallet',
         component: WalletComponent,
         meta: { requiresAuth: true }
     },
     {
         name: '404',
         path: '*',
-        component: Error404Component
+        component: PageComponent
     }
 ]
 
 export default routes
diff --git a/src/resources/lang/en/app.php b/src/resources/lang/en/app.php
index 76974430..70e3ccd2 100644
--- a/src/resources/lang/en/app.php
+++ b/src/resources/lang/en/app.php
@@ -1,56 +1,60 @@
 <?php
 
 return [
 
     /*
     |--------------------------------------------------------------------------
     | Application Language Lines
     |--------------------------------------------------------------------------
     |
     | The following language lines are used in the application.
     */
 
     'mandate-delete-success' => 'The auto-payment has been removed.',
     'mandate-update-success' => 'The auto-payment has been updated.',
 
     'planbutton' => 'Choose :plan',
 
+    'process-async' => 'Setup process has been pushed. Please wait.',
     'process-user-new' => 'Registering a user...',
     'process-user-ldap-ready' => 'Creating a user...',
     'process-user-imap-ready' => 'Creating a mailbox...',
     'process-domain-new' => 'Registering a custom domain...',
     'process-domain-ldap-ready' => 'Creating a custom domain...',
     'process-domain-verified' => 'Verifying a custom domain...',
     'process-domain-confirmed' => 'Verifying an ownership of a custom domain...',
     'process-success' => 'Setup process finished successfully.',
     'process-error-user-ldap-ready' => 'Failed to create a user.',
     'process-error-user-imap-ready' => 'Failed to verify that a mailbox exists.',
     'process-error-domain-ldap-ready' => 'Failed to create a domain.',
     'process-error-domain-verified' => 'Failed to verify a domain.',
     'process-error-domain-confirmed' => 'Failed to verify an ownership of a domain.',
 
     'domain-verify-success' => 'Domain verified successfully.',
     'domain-verify-error' => 'Domain ownership verification failed.',
     'domain-suspend-success' => 'Domain suspended successfully.',
     'domain-unsuspend-success' => 'Domain unsuspended successfully.',
 
     'user-update-success' => 'User data updated successfully.',
     'user-create-success' => 'User created successfully.',
     'user-delete-success' => 'User deleted successfully.',
     'user-suspend-success' => 'User suspended successfully.',
     'user-unsuspend-success' => 'User unsuspended successfully.',
     'user-reset-2fa-success' => '2-Factor authentication reset successfully.',
 
     'search-foundxdomains' => ':x domains have been found.',
     'search-foundxusers' => ':x user accounts have been found.',
 
+    'support-request-success' => 'Support request submitted successfully.',
+    'support-request-error' => 'Failed to submit the support request.',
+
     'wallet-award-success' => 'The bonus has been added to the wallet successfully.',
     'wallet-penalty-success' => 'The penalty has been added to the wallet successfully.',
     'wallet-update-success' => 'User wallet updated successfully.',
 
     'wallet-notice-date' => 'With your current subscriptions your account balance will last until about :date (:days).',
     'wallet-notice-nocredit' => 'You are out of credit, top up your balance now.',
     'wallet-notice-today' => 'You will run out of credit today, top up your balance now.',
     'wallet-notice-trial' => 'You are in your free trial period.',
     'wallet-notice-trial-end' => 'Your free trial is about to end, top up to continue.',
 ];
diff --git a/src/resources/lang/en/documents.php b/src/resources/lang/en/documents.php
index ca8e3db4..e6d5986a 100644
--- a/src/resources/lang/en/documents.php
+++ b/src/resources/lang/en/documents.php
@@ -1,38 +1,40 @@
 <?php
 
 return [
 
     /*
     |--------------------------------------------------------------------------
     | Language files for document templates
     |--------------------------------------------------------------------------
     */
 
     'account-id' => "Account ID",
     'amount' => "Amount",
     'customer-no' => "Customer No.",
     'date' => "Date",
     'description' => "Description",
     'period' => "Period",
     'total' => "Total",
 
     'month1' => "January",
     'month2' => "February",
     'month3' => "March",
     'month4' => "April",
     'month5' => "May",
     'month6' => "June",
     'month7' => "July",
     'month8' => "August",
     'month9' => "September",
     'month10' => "October",
     'month11' => "November",
     'month12' => "December",
 
     'receipt-filename' => ":site Receipt for :id",
     'receipt-title' => "Receipt for :month :year",
     'receipt-item-desc' => ":site Services",
+    'receipt-refund' => "Refund",
+    'receipt-chargeback' => "Chargeback",
 
     'subtotal' => "Subtotal",
     'vat' => "VAT (:rate%)",
 ];
diff --git a/src/resources/lang/en/meet.php b/src/resources/lang/en/meet.php
new file mode 100644
index 00000000..5a5fe1af
--- /dev/null
+++ b/src/resources/lang/en/meet.php
@@ -0,0 +1,30 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'connection-not-found' => 'The connection does not exist.',
+    'connection-dismiss-error' => 'Failed to dismiss the connection.',
+    'room-not-found' => 'The room does not exist.',
+    'room-setconfig-success' => 'Room configuration updated successfully.',
+    'room-unsupported-option-error' => 'Invalid room configuration option.',
+    'session-not-found' => 'The session does not exist.',
+    'session-create-error' => 'Failed to create the session.',
+    'session-join-error' => 'Failed to join the session.',
+    'session-close-error' => 'Failed to close the session.',
+    'session-close-success' => 'The session has been closed successfully.',
+    'session-password-error' => 'Failed to join the session. Invalid password.',
+    'session-request-accept-error' => 'Failed to accept the join request.',
+    'session-request-deny-error' => 'Failed to deny the join request.',
+    'session-room-locked-error' => 'Failed to join the session. Room locked.',
+];
diff --git a/src/resources/lang/en/transactions.php b/src/resources/lang/en/transactions.php
index d0248a51..21b193dd 100644
--- a/src/resources/lang/en/transactions.php
+++ b/src/resources/lang/en/transactions.php
@@ -1,21 +1,26 @@
 <?php
 
 return [
     'entitlement-created' => ':user_email created :sku_title for :object',
     'entitlement-billed' => ':sku_title for :object is billed at :amount',
     'entitlement-deleted' => ':user_email deleted :sku_title for :object',
 
+    'entitlement-created-short' => 'Added :sku_title for :object',
+    'entitlement-billed-short' => 'Billed :sku_title for :object',
+    'entitlement-deleted-short' => 'Deleted :sku_title for :object',
+
     'wallet-award' => 'Bonus of :amount awarded to :wallet; :description',
+    'wallet-chargeback' => ':amount was charged back from :wallet',
     'wallet-credit' => ':amount was added to the balance of :wallet',
     'wallet-debit' => ':amount was deducted from the balance of :wallet',
     'wallet-penalty' => 'The balance of :wallet was reduced by :amount; :description',
-
-    'entitlement-created-short' => 'Added :sku_title for :object',
-    'entitlement-billed-short' => 'Billed :sku_title for :object',
-    'entitlement-deleted-short' => 'Deleted :sku_title for :object',
+    'wallet-refund' => ':amount was refunded from the balance of :wallet',
+    'wallet-refund' => ':amount was refunded from :wallet',
 
     'wallet-award-short' => 'Bonus: :description',
+    'wallet-chargeback-short' => 'Chargeback',
     'wallet-credit-short' => 'Payment',
     'wallet-debit-short' => 'Deduction',
     'wallet-penalty-short' => 'Charge: :description',
+    'wallet-refund-short' => 'Refund: :description',
 ];
diff --git a/src/resources/lang/en/validation.php b/src/resources/lang/en/validation.php
index e8917b33..d4c37c38 100644
--- a/src/resources/lang/en/validation.php
+++ b/src/resources/lang/en/validation.php
@@ -1,167 +1,168 @@
 <?php
 
 return [
 
     /*
     |--------------------------------------------------------------------------
     | Validation Language Lines
     |--------------------------------------------------------------------------
     |
     | The following language lines contain the default error messages used by
     | the validator class. Some of these rules have multiple versions such
     | as the size rules. Feel free to tweak each of these messages here.
     |
     */
 
     'accepted' => 'The :attribute must be accepted.',
     'active_url' => 'The :attribute is not a valid URL.',
     'after' => 'The :attribute must be a date after :date.',
     'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
     'alpha' => 'The :attribute may only contain letters.',
     'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
     'alpha_num' => 'The :attribute may only contain letters and numbers.',
     'array' => 'The :attribute must be an array.',
     'before' => 'The :attribute must be a date before :date.',
     'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
     'between' => [
         'numeric' => 'The :attribute must be between :min and :max.',
         'file' => 'The :attribute must be between :min and :max kilobytes.',
         'string' => 'The :attribute must be between :min and :max characters.',
         'array' => 'The :attribute must have between :min and :max items.',
     ],
     'boolean' => 'The :attribute field must be true or false.',
     'confirmed' => 'The :attribute confirmation does not match.',
     'date' => 'The :attribute is not a valid date.',
     'date_equals' => 'The :attribute must be a date equal to :date.',
     'date_format' => 'The :attribute does not match the format :format.',
     'different' => 'The :attribute and :other must be different.',
     'digits' => 'The :attribute must be :digits digits.',
     'digits_between' => 'The :attribute must be between :min and :max digits.',
     'dimensions' => 'The :attribute has invalid image dimensions.',
     'distinct' => 'The :attribute field has a duplicate value.',
     'email' => 'The :attribute must be a valid email address.',
     'ends_with' => 'The :attribute must end with one of the following: :values',
     'exists' => 'The selected :attribute is invalid.',
     'file' => 'The :attribute must be a file.',
     'filled' => 'The :attribute field must have a value.',
     'gt' => [
         'numeric' => 'The :attribute must be greater than :value.',
         'file' => 'The :attribute must be greater than :value kilobytes.',
         'string' => 'The :attribute must be greater than :value characters.',
         'array' => 'The :attribute must have more than :value items.',
     ],
     'gte' => [
         'numeric' => 'The :attribute must be greater than or equal :value.',
         'file' => 'The :attribute must be greater than or equal :value kilobytes.',
         'string' => 'The :attribute must be greater than or equal :value characters.',
         'array' => 'The :attribute must have :value items or more.',
     ],
     'image' => 'The :attribute must be an image.',
     'in' => 'The selected :attribute is invalid.',
     'in_array' => 'The :attribute field does not exist in :other.',
     'integer' => 'The :attribute must be an integer.',
     'ip' => 'The :attribute must be a valid IP address.',
     'ipv4' => 'The :attribute must be a valid IPv4 address.',
     'ipv6' => 'The :attribute must be a valid IPv6 address.',
     'json' => 'The :attribute must be a valid JSON string.',
     'lt' => [
         'numeric' => 'The :attribute must be less than :value.',
         'file' => 'The :attribute must be less than :value kilobytes.',
         'string' => 'The :attribute must be less than :value characters.',
         'array' => 'The :attribute must have less than :value items.',
     ],
     'lte' => [
         'numeric' => 'The :attribute must be less than or equal :value.',
         'file' => 'The :attribute must be less than or equal :value kilobytes.',
         'string' => 'The :attribute must be less than or equal :value characters.',
         'array' => 'The :attribute must not have more than :value items.',
     ],
     'max' => [
         'numeric' => 'The :attribute may not be greater than :max.',
         'file' => 'The :attribute may not be greater than :max kilobytes.',
         'string' => 'The :attribute may not be greater than :max characters.',
         'array' => 'The :attribute may not have more than :max items.',
     ],
     'mimes' => 'The :attribute must be a file of type: :values.',
     'mimetypes' => 'The :attribute must be a file of type: :values.',
     'min' => [
         'numeric' => 'The :attribute must be at least :min.',
         'file' => 'The :attribute must be at least :min kilobytes.',
         'string' => 'The :attribute must be at least :min characters.',
         'array' => 'The :attribute must have at least :min items.',
     ],
     'not_in' => 'The selected :attribute is invalid.',
     'not_regex' => 'The :attribute format is invalid.',
     'numeric' => 'The :attribute must be a number.',
     'present' => 'The :attribute field must be present.',
     'regex' => 'The :attribute format is invalid.',
     'required' => 'The :attribute field is required.',
     'required_if' => 'The :attribute field is required when :other is :value.',
     'required_unless' => 'The :attribute field is required unless :other is in :values.',
     'required_with' => 'The :attribute field is required when :values is present.',
     'required_with_all' => 'The :attribute field is required when :values are present.',
     'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
     'same' => 'The :attribute and :other must match.',
     'size' => [
         'numeric' => 'The :attribute must be :size.',
         'file' => 'The :attribute must be :size kilobytes.',
         'string' => 'The :attribute must be :size characters.',
         'array' => 'The :attribute must contain :size items.',
     ],
     'starts_with' => 'The :attribute must start with one of the following: :values',
     'string' => 'The :attribute must be a string.',
     'timezone' => 'The :attribute must be a valid zone.',
     'unique' => 'The :attribute has already been taken.',
     'uploaded' => 'The :attribute failed to upload.',
     'url' => 'The :attribute format is invalid.',
     'uuid' => 'The :attribute must be a valid UUID.',
 
     '2fareq' => 'Second factor code is required.',
     '2fainvalid' => 'Second factor code is invalid.',
     'emailinvalid' => 'The specified email address is invalid.',
     'domaininvalid' => 'The specified domain is invalid.',
+    'domainnotavailable' => 'The specified domain is not available.',
     'logininvalid' => 'The specified login is invalid.',
     'loginexists' => 'The specified login is not available.',
     'domainexists' => 'The specified domain is not available.',
     'noemailorphone' => 'The specified text is neither a valid email address nor a phone number.',
     'packageinvalid' => 'Invalid package selected.',
     'packagerequired' => 'Package is required.',
     'usernotexists' => 'Unable to find user.',
     'voucherinvalid' => 'The voucher code is invalid or expired.',
     'noextemail' => 'This user has no external email address.',
     'entryinvalid' => 'The specified :attribute is invalid.',
     'entryexists' => 'The specified :attribute is not available.',
     'minamount' => 'Minimum amount for a single payment is :amount.',
     'minamountdebt' => 'The specified amount does not cover the balance on the account.',
 
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Language Lines
     |--------------------------------------------------------------------------
     |
     | Here you may specify custom validation messages for attributes using the
     | convention "attribute.rule" to name the lines. This makes it quick to
     | specify a specific custom language line for a given attribute rule.
     |
     */
 
     'custom' => [
         'attribute-name' => [
             'rule-name' => 'custom-message',
         ],
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
     |--------------------------------------------------------------------------
     |
     | The following language lines are used to swap our attribute placeholder
     | with something more reader friendly such as "E-Mail Address" instead
     | of "email". This simply helps us make our message more expressive.
     |
     */
 
     'attributes' => [],
 ];
diff --git a/src/resources/themes/README.md b/src/resources/themes/README.md
new file mode 100644
index 00000000..3a07c189
--- /dev/null
+++ b/src/resources/themes/README.md
@@ -0,0 +1,65 @@
+## THEMES
+
+### Creating a theme
+
+1. First create the theme directory and content by copying the default theme:
+
+```
+cp resources/themes/default resources/themes/mytheme
+```
+
+2. Compile resources. This will also make sure to copy static files (e.g. images)
+   to `public/themes/`:
+
+```
+npm run prod
+```
+
+3. Configure the app to use your new theme (in .env file):
+
+```
+APP_THEME=mytheme
+```
+
+### Styles
+
+The main theme directory should include following files:
+
+- "theme.json": Theme metadata, e.g. menu definition.
+- "app.scss": The app styles.
+- "document.scss": Documents styles.
+- "images/logo_header.png": An image that is not controlled by the theme (yet).
+- "images/logo_footer.png": An image that is not controlled by the theme (yet).
+- "images/favicon.ico": An image that is not controlled by the theme (yet).
+
+Note: Applying some styles to `<body>` or other elements outside of the template
+content can be done using `.page-<page>` class that is always added to the `<body>`.
+
+### Menu definition
+
+The menu items are defined using "menu" property in `theme.json` file.
+It should be an array of object. Here are all available properties for such an object.
+
+- "title" (string): The displayed label for the menu item. Required.
+- "location" (string): The page location. Can be a full URL (for external pages)
+  or relative path starting with a slash for internal locations. Required.
+- "page" (string): The name of the page. Required for internal pages.
+  This is the first element of the page template file which should exist
+  in `resources/themes/<theme>/pages/` directory. The template file name should be
+  `<page>.blade.php`.
+- "footer" (bool): Whether the menu should appear only in the footer menu.
+
+Note that menu definition should not include special pages like "Signup", "Contact" or "Login".
+
+### Page templates
+
+Page content templates placed in `resources/themes/<theme>/pages/` directory are
+Blade templates. Some notes about that:
+
+- the content will be placed inside the page layout so you should not use <html> nor <body>
+  nor even a wrapper <div>.
+- for internal links use `href="/<page_name>"`. Such links will be handled by
+  Vue router (without page reload).
+- for images or other resource files use `@theme_asset(images/file.jpg)`.
+
+See also: https://laravel.com/docs/6.x/blade
diff --git a/src/resources/sass/app.scss b/src/resources/themes/app.scss
similarity index 85%
rename from src/resources/sass/app.scss
rename to src/resources/themes/app.scss
index 87f10d47..c5b8c840 100644
--- a/src/resources/sass/app.scss
+++ b/src/resources/themes/app.scss
@@ -1,398 +1,452 @@
-@import 'variables';
-@import 'bootstrap';
-@import 'menu';
-@import 'toast';
-@import 'forms';
-
 html,
 body,
 body > .outer-container {
     height: 100%;
 }
 
 #app {
     display: flex;
     flex-direction: column;
     min-height: 100%;
+    overflow: hidden;
 
     & > nav {
         flex-shrink: 0;
         z-index: 12;
     }
 
     & > div.container {
         flex-grow: 1;
         margin-top: 2rem;
         margin-bottom: 2rem;
     }
 
     & > .filler {
         flex-grow: 1;
     }
 
     & > div.container + .filler {
         display: none;
     }
 }
 
-#error-page {
+.error-page {
     position: absolute;
     top: 0;
     height: 100%;
     width: 100%;
     align-items: center;
     display: flex;
     justify-content: center;
     color: #636b6f;
     z-index: 10;
     background: white;
 
     .code {
         text-align: right;
         border-right: 2px solid;
         font-size: 26px;
         padding: 0 15px;
     }
 
     .message {
         font-size: 18px;
         padding: 0 15px;
     }
 }
 
 .app-loader {
     background-color: $body-bg;
     height: 100%;
     width: 100%;
     position: absolute;
     top: 0;
     left: 0;
     display: flex;
     align-items: center;
     justify-content: center;
     z-index: 8;
 
     .spinner-border {
         width: 120px;
         height: 120px;
         border-width: 15px;
         color: #b2aa99;
     }
 
     &.small .spinner-border {
         width: 25px;
         height: 25px;
         border-width: 3px;
     }
 
     &.fadeOut {
         visibility: hidden;
         opacity: 0;
         transition: visibility 300ms linear, opacity 300ms linear;
     }
 }
 
 pre {
     margin: 1rem 0;
     padding: 1rem;
     background-color: $menu-bg-color;
 }
 
 .card-title {
     font-size: 1.2rem;
     font-weight: bold;
 }
 
 tfoot.table-fake-body {
     background-color: #f8f8f8;
     color: grey;
     text-align: center;
 
     td {
         vertical-align: middle;
         height: 8em;
         border: 0;
     }
 
     tbody:not(:empty) + & {
         display: none;
     }
 }
 
 table {
     td.buttons,
     td.email,
     td.price,
     td.datetime,
     td.selection {
         width: 1%;
         white-space: nowrap;
     }
 
     th.price,
     td.price {
         width: 1%;
         text-align: right;
         white-space: nowrap;
     }
 
     &.form-list {
         margin: 0;
 
         td {
             border: 0;
 
             &:first-child {
                 padding-left: 0;
             }
 
             &:last-child {
                 padding-right: 0;
             }
         }
 
         button {
             line-height: 1;
         }
     }
 
     .btn-action {
         line-height: 1;
         padding: 0;
     }
 }
 
 .list-details {
     min-height: 1em;
 
     & > ul {
         margin: 0;
         padding-left: 1.2em;
     }
 }
 
 .plan-selector {
+    .plan-header {
+        display: flex;
+    }
+
     .plan-ico {
+        margin:auto;
         font-size: 3.8rem;
         color: #f1a539;
         border: 3px solid #f1a539;
         width: 6rem;
         height: 6rem;
-        margin-bottom: 1rem;
         border-radius: 50%;
     }
 }
 
-.plan-description {
-    & > ul {
-        padding-left: 1.2em;
+.status-message {
+    display: flex;
+    align-items: center;
+    justify-content: center;
 
-        &:last-child {
-            margin-bottom: 0;
+    .app-loader {
+        width: auto;
+        position: initial;
+
+        .spinner-border {
+            color: $body-color;
         }
     }
+
+    svg {
+        font-size: 1.5em;
+    }
+
+    :first-child {
+        margin-right: 0.4em;
+    }
+}
+
+.form-separator {
+    position: relative;
+    margin: 1em 0;
+    display: flex;
+    justify-content: center;
+
+    hr {
+        border-color: #999;
+        margin: 0;
+        position: absolute;
+        top: 0.75em;
+        width: 100%;
+    }
+
+    span {
+        background: #fff;
+        padding: 0 1em;
+        z-index: 1;
+    }
 }
 
 #status-box {
     background-color: lighten($green, 35);
 
     .progress {
         background-color: #fff;
         height: 10px;
     }
 
     .progress-label {
         font-size: 0.9em;
     }
 
     .progress-bar {
         background-color: $green;
     }
 
     &.process-failed {
         background-color: lighten($orange, 30);
 
         .progress-bar {
             background-color: $red;
         }
     }
 }
 
+@keyframes blinker {
+    50% {
+        opacity: 0;
+    }
+}
+
+.blinker {
+    animation: blinker 750ms step-start infinite;
+}
+
 #dashboard-nav {
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
 
     & > a {
         padding: 1rem;
         text-align: center;
         white-space: nowrap;
         margin: 0.25rem;
         text-decoration: none;
         width: 150px;
 
         &.disabled {
             pointer-events: none;
             opacity: 0.6;
         }
 
         .badge {
             position: absolute;
             top: 0.5rem;
             right: 0.5rem;
         }
     }
 
     svg {
         width: 6rem;
         height: 6rem;
         margin: auto;
     }
 }
 
-.form-separator {
-    position: relative;
-    margin: 1em 0;
+#payment-method-selection {
     display: flex;
+    flex-wrap: wrap;
     justify-content: center;
 
-    hr {
-        border-color: #999;
-        margin: 0;
-        position: absolute;
-        top: 0.75em;
-        width: 100%;
+    & > a {
+        padding: 1rem;
+        text-align: center;
+        white-space: nowrap;
+        margin: 0.25rem;
+        text-decoration: none;
+        width: 150px;
     }
 
-    span {
-        background: #fff;
-        padding: 0 1em;
-        z-index: 1;
+    svg {
+        width: 6rem;
+        height: 6rem;
+        margin: auto;
+    }
+}
+
+#logon-form {
+    flex-basis: auto; // Bootstrap issue? See logon page with width < 992
+}
+
+#logon-form-footer {
+    a:not(:first-child) {
+        margin-left: 2em;
     }
 }
 
 // Various improvements for mobile
 @include media-breakpoint-down(sm) {
-    .card {
+    .card,
+    .card-footer {
         border: 0;
     }
 
     .card-body {
         padding: 0.5rem 0;
     }
 
     .form-group {
         margin-bottom: 0.5rem;
     }
 
     .nav-tabs {
         flex-wrap: nowrap;
         overflow-x: auto;
 
         .nav-link {
             white-space: nowrap;
             padding: 0.5rem 0.75rem;
         }
     }
 
     .tab-content {
         margin-top: 0.5rem;
     }
 
     .col-form-label {
         color: #666;
         font-size: 95%;
     }
 
     .form-group.plaintext .col-form-label {
         padding-bottom: 0;
     }
 
     form.read-only.short label {
         width: 35%;
 
         & + * {
             width: 65%;
         }
     }
 
     #app > div.container {
         margin-bottom: 1rem;
         margin-top: 1rem;
         max-width: 100%;
     }
 
     #header-menu-navbar {
         padding: 0;
     }
 
     #dashboard-nav > a {
         width: 135px;
     }
 
     .table-sm:not(.form-list) {
         tbody td {
             padding: 0.75rem 0.5rem;
 
             svg {
                 vertical-align: -0.175em;
             }
 
             & > svg {
                 font-size: 125%;
                 margin-right: 0.25rem;
             }
         }
     }
 
     .table.transactions {
         thead {
             display: none;
         }
 
         tbody {
             tr {
                 position: relative;
                 display: flex;
                 flex-wrap: wrap;
             }
 
             td {
                 width: auto;
                 border: 0;
                 padding: 0.5rem;
 
                 &.datetime {
                     width: 50%;
                     padding-left: 0;
                 }
 
                 &.description {
                     order: 3;
                     width: 100%;
                     border-bottom: 1px solid $border-color;
                     color: $secondary;
                     padding: 0 1.5em 0.5rem 0;
                     margin-top: -0.25em;
                 }
 
                 &.selection {
                     position: absolute;
                     right: 0;
                     border: 0;
                     top: 1.7em;
                     padding-right: 0;
                 }
 
                 &.price {
                     width: 50%;
                     padding-right: 0;
                 }
 
                 &.email {
                     display: none;
                 }
             }
         }
     }
 }
diff --git a/src/resources/sass/bootstrap.scss b/src/resources/themes/bootstrap.scss
similarity index 74%
rename from src/resources/sass/bootstrap.scss
rename to src/resources/themes/bootstrap.scss
index 444260d9..a80f3032 100644
--- a/src/resources/sass/bootstrap.scss
+++ b/src/resources/themes/bootstrap.scss
@@ -1,15 +1,17 @@
 // Bootstrap
 @import '~bootstrap/scss/bootstrap';
 
 // Bootstrap style fixes
-.btn-link {
-    border: 0;
-}
 
+.btn-link,
 .table thead th {
     border: 0;
 }
 
 small {
     font-size: 0.875em;
 }
+
+.hidden {
+    display: none !important;
+}
diff --git a/src/resources/themes/charts.scss b/src/resources/themes/charts.scss
new file mode 100644
index 00000000..56adcd94
--- /dev/null
+++ b/src/resources/themes/charts.scss
@@ -0,0 +1,41 @@
+@import '~frappe-charts/dist/frappe-charts.min.css';
+
+.chart-container {
+    font-family: unset;
+
+    .title {
+        font-size: 12pt;
+        font-weight: bold;
+    }
+}
+
+#stats-container {
+    & > div {
+        border: 1px solid lightgrey;
+        border-radius: 0.5em;
+        padding-top: 0.5em;
+        margin: 0.5em;
+        min-height: 250px;
+        text-align: center;
+
+        & > span {
+            line-height: 240px;
+        }
+    }
+}
+
+@include media-breakpoint-up(lg) {
+    #stats-container {
+        display: flex;
+        flex-wrap: wrap;
+        align-content: baseline;
+
+        & > div {
+            width: calc(50% - 1em);
+
+            svg {
+                width: 100%;
+            }
+        }
+    }
+}
diff --git a/src/resources/sass/_variables.scss b/src/resources/themes/default/_variables.scss
similarity index 63%
rename from src/resources/sass/_variables.scss
rename to src/resources/themes/default/_variables.scss
index 6995c999..74d0ae15 100644
--- a/src/resources/sass/_variables.scss
+++ b/src/resources/themes/default/_variables.scss
@@ -1,26 +1,17 @@
 // Body
 $body-bg: #fff;
 
 // Typography
 $font-family-sans-serif: 'Nunito', sans-serif;
 $font-size-base: 0.9rem;
 $line-height-base: 1.5;
 
 // Colors
-$blue: #3490dc;
-$indigo: #6574cd;
-$purple: #9561e2;
-$pink: #f66d9b;
-$red: #e3342f;
 $orange: #f1a539;
-$yellow: #ffed4a;
-$green: #38c172;
-$teal: #4dc0b5;
-$cyan: #6cb2eb;
-
 $light: #f6f5f3;
 
 // App colors
 $menu-bg-color: $light;
+$menu-gray: #575656;
 $main-color: $orange;
 $warning: $orange;
diff --git a/src/resources/themes/default/app.scss b/src/resources/themes/default/app.scss
new file mode 100644
index 00000000..ed37caff
--- /dev/null
+++ b/src/resources/themes/default/app.scss
@@ -0,0 +1,9 @@
+@import 'variables';
+
+@import '../bootstrap';
+@import '../menu';
+@import '../meet';
+@import '../toast';
+@import '../forms';
+@import '../charts';
+@import '../app';
diff --git a/src/resources/themes/default/document.scss b/src/resources/themes/default/document.scss
new file mode 100644
index 00000000..2c9155ba
--- /dev/null
+++ b/src/resources/themes/default/document.scss
@@ -0,0 +1,3 @@
+// Variables
+@import 'variables';
+@import '../document';
diff --git a/src/public/images/favicon.ico b/src/resources/themes/default/images/favicon.ico
similarity index 100%
rename from src/public/images/favicon.ico
rename to src/resources/themes/default/images/favicon.ico
diff --git a/src/public/images/logo.svg b/src/resources/themes/default/images/logo.svg
similarity index 100%
rename from src/public/images/logo.svg
rename to src/resources/themes/default/images/logo.svg
diff --git a/src/public/images/logo_footer.png b/src/resources/themes/default/images/logo_footer.png
similarity index 100%
rename from src/public/images/logo_footer.png
rename to src/resources/themes/default/images/logo_footer.png
diff --git a/src/public/images/logo_header.png b/src/resources/themes/default/images/logo_header.png
similarity index 100%
rename from src/public/images/logo_header.png
rename to src/resources/themes/default/images/logo_header.png
diff --git a/src/public/images/logo_print.svg b/src/resources/themes/default/images/logo_print.svg
similarity index 100%
rename from src/public/images/logo_print.svg
rename to src/resources/themes/default/images/logo_print.svg
diff --git a/src/resources/themes/default/pages/support.blade.php b/src/resources/themes/default/pages/support.blade.php
new file mode 100644
index 00000000..85e6ae3d
--- /dev/null
+++ b/src/resources/themes/default/pages/support.blade.php
@@ -0,0 +1,21 @@
+<div id="support" class="card">
+    <div class="card-body">
+        <h3 class="card-title text-center">Contact Support</h3>
+            <p class="card-text text-justify">
+                Our technical support team is here to provide help, should you run
+                into issues. You won’t have to talk to computers or navigate voice
+                menus, but have actual human beings answering you personally.
+                <br />
+                <br />
+                This support is already included in your subscription fee, so
+                there are no further costs for you. If you have issues with your
+                Kolab Now account, or questions about our product before you sign
+                up, please contact us.
+            </p>
+            </div>
+            <div class="card-footer text-center">
+                <a href="/support/contact" class="btn btn-info">Contact Support</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/resources/themes/default/theme.json b/src/resources/themes/default/theme.json
new file mode 100644
index 00000000..83a03023
--- /dev/null
+++ b/src/resources/themes/default/theme.json
@@ -0,0 +1,41 @@
+{
+    "menu": [
+        {
+            "title": "Explore",
+            "location": "https://kolabnow.com/",
+            "admin": true
+        },
+        {
+            "title": "Blog",
+            "location": "https://blogs.kolabnow.com/",
+            "admin": true
+        },
+        {
+            "title": "Support",
+            "location": "/support",
+            "page": "support",
+            "admin": true
+        },
+        {
+            "title": "ToS",
+            "location": "https://kolabnow.com/tos",
+            "footer": true
+        }
+    ],
+    "faq": {
+        "signup": [
+            {
+                "href": "https://kolabnow.com/tos",
+                "title": "What are your terms of service?"
+            },
+            {
+                "href": "https://kb.kolabnow.com/faq/can-i-upgrade-an-individual-account-to-a-group-account",
+                "title": "Can I upgrade an individual account to a group account?"
+            },
+            {
+                "href": "https://kb.kolabnow.com/faq/how-much-storage-comes-with-my-account",
+                "title": "How much storage comes with my account?"
+            }
+        ]
+    }
+}
diff --git a/src/resources/sass/document.scss b/src/resources/themes/document.scss
similarity index 90%
rename from src/resources/sass/document.scss
rename to src/resources/themes/document.scss
index e873ff91..04587c96 100644
--- a/src/resources/sass/document.scss
+++ b/src/resources/themes/document.scss
@@ -1,118 +1,115 @@
-// Variables
-@import 'variables';
-
 @font-face {
     font-family: 'Roboto';
     font-style: normal;
     font-weight: normal;
-    src: url('../fonts/Roboto-Regular.ttf') format('truetype');
+    src: url('/fonts/Roboto-Regular.ttf') format('truetype');
 }
 
 @font-face {
     font-family: 'Roboto';
     font-style: normal;
     font-weight: 700;
-    src: url('../fonts/Roboto-Bold.ttf') format('truetype');
+    src: url('/fonts/Roboto-Bold.ttf') format('truetype');
 }
 
 body {
     font-family: Roboto, sans-serif;
     margin: 20pt;
 }
 
 a {
     text-decoration: none;
     color: $main-color;
 }
 
 h1 {
     text-align: center;
     margin: 30pt;
     font-size: 20pt;
 }
 
 table {
     width: 100%;
 
     &.content {
         border-spacing: initial;
 
         th {
             padding: 5px;
             background-color: #f4f4f4;
             border-top: 1px solid #eee;
         }
 
         td {
             padding: 5px;
             border-bottom: 1px solid #eee;
         }
     }
 
     &.head {
         margin-bottom: 1em;
     }
 
     td.idents {
         white-space: nowrap;
         width: 1%;
         text-align: right;
         vertical-align: top;
         font-size: 10pt;
     }
 
     .price {
         width: 150px;
         text-align: right;
         white-space: nowrap;
     }
 
     td.logo {
         width: 1%;
     }
 
     td.description {
         width: 98%;
     }
 
     tr.total {
         background-color: #f4f4f4;
     }
 
     tr.vat td,
     tr.subtotal td {
         border-bottom: 0;
     }
 }
 
 #footer {
     font-size: 10pt;
     color: gray;
     text-align: center;
     padding-top: 5pt;
     position: absolute;
     margin: 20pt;
     bottom: 0;
     left: 0;
     right: 0;
 
     @media print {
         margin-bottom: 0;
     }
 }
 
 .bold {
     font-weight: bold;
 }
 
 .gray {
     color: gray;
 }
 
 .align-right {
     text-align: right;
 }
 
 .align-left {
     text-align: left;
 }
diff --git a/src/resources/sass/forms.scss b/src/resources/themes/forms.scss
similarity index 59%
rename from src/resources/sass/forms.scss
rename to src/resources/themes/forms.scss
index 5690b8ed..f8bd1d75 100644
--- a/src/resources/sass/forms.scss
+++ b/src/resources/themes/forms.scss
@@ -1,47 +1,77 @@
 .list-input {
     & > div {
         &:not(:last-child) {
             margin-bottom: -1px;
 
             input,
             a.btn {
                 border-bottom-right-radius: 0;
                 border-bottom-left-radius: 0;
             }
         }
 
         &:not(:first-child) {
             input,
             a.btn {
                 border-top-right-radius: 0;
                 border-top-left-radius: 0;
             }
         }
     }
 
     input.is-invalid {
         z-index: 2;
     }
 
     .btn svg {
         vertical-align: middle;
     }
 }
 
 .range-input {
     display: flex;
 
     label {
         margin-right: 0.5em;
     }
 }
 
+.input-group-activable {
+    &.active {
+        :not(.input-group-append):not(.activable) {
+            display: none;
+        }
+    }
+
+    &:not(.active) {
+        .activable {
+            display: none;
+        }
+    }
+
+    // Label is always visible
+    .label {
+        color: $body-color;
+        display: initial !important;
+    }
+
+    .input-group-text {
+        border-color: transparent;
+        background: transparent;
+        padding-left: 0;
+
+        &:not(.label) {
+            flex: 1;
+        }
+    }
+}
+
 .form-control-plaintext .btn-sm {
     margin-top: -0.25rem;
 }
 
 form.read-only {
     .row {
         margin-bottom: 0;
     }
 }
diff --git a/src/resources/themes/meet.scss b/src/resources/themes/meet.scss
new file mode 100644
index 00000000..7e0a0801
--- /dev/null
+++ b/src/resources/themes/meet.scss
@@ -0,0 +1,531 @@
+.meet-nickname {
+    padding: 0;
+    line-height: 2em;
+    border-radius: 1em;
+    max-width: 100%;
+    white-space: nowrap;
+    display: inline-flex;
+
+    .icon {
+        display: inline-block;
+        min-width: 2em;
+    }
+
+    .content {
+        order: 1;
+        height: 2em;
+        outline: none;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+        &:not(:empty) {
+            margin-left: 0.5em;
+            padding-right: 0.5em;
+
+            & + .icon {
+                margin-right: -0.75em;
+            }
+        }
+    }
+
+    .self & {
+        .content {
+            &:focus {
+                min-width: 0.5em;
+            }
+        }
+    }
+
+    & + .dropdown-menu {
+        .permissions > label {
+            margin: 0;
+            padding-left: 3.75rem;
+        }
+    }
+}
+
+.meet-video {
+    position: relative;
+    background: $menu-bg-color;
+    // Use flexbox for centering .watermark
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    video {
+        // To make object-fit:cover working we have to set the height in pixels
+        // on the wrapper element. This is what javascript method will do.
+        object-fit: cover;
+        width: 100%;
+        height: 100%;
+        background: #000;
+
+        & + .watermark {
+            display: none;
+        }
+    }
+
+    &.screen video {
+        // For shared screen videos we use the original aspect ratio
+        object-fit: scale-down;
+        background: none;
+    }
+
+    &:fullscreen {
+        video {
+            // We don't want the video to be cut in fullscreen
+            // This will preserve the aspect ratio of the video stream
+            object-fit: contain;
+        }
+    }
+
+    .watermark {
+        color: darken($menu-bg-color, 20%);
+        width: 50%;
+        height: 50%;
+    }
+
+    .controls {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        margin: 0.5em;
+        padding: 0 0.05em;
+        line-height: 2em;
+        border-radius: 1em;
+        background: rgba(#000, 0.7);
+
+        button {
+            line-height: 2;
+            border-radius: 50%;
+            padding: 0;
+            width: 2em;
+        }
+    }
+
+    .status {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        margin: 0.5em;
+        line-height: 2em;
+
+        span {
+            display: inline-block;
+            color: #fff;
+            border-radius: 50%;
+            width: 2em;
+            text-align: center;
+            margin-right: 0.25em;
+        }
+    }
+
+    .dropdown {
+        position: absolute !important;
+        top: 0;
+        left: 0;
+        right: 0;
+    }
+
+    .meet-nickname {
+        margin: 0.5em;
+        max-width: calc(100% - 1em);
+        border: 0;
+
+        &:not(:hover) {
+            background-color: rgba(#fff, 0.8);
+        }
+    }
+
+    &:not(.moderated):not(.self) .meet-nickname {
+        .icon {
+            display: none;
+        }
+    }
+}
+
+#meet-component {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+
+    & + .filler {
+        display: none;
+    }
+}
+
+#app.meet {
+    height: 100%;
+
+    #meet-component {
+        overflow: hidden;
+    }
+
+    nav.navbar {
+        display: none;
+    }
+}
+
+#meet-setup {
+    max-width: 720px;
+}
+
+#meet-auth {
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+    flex: 1;
+}
+
+#meet-counter {
+    position: absolute;
+    left: 0;
+    padding: 1.1em 0.6em;
+    color: #808c99;
+
+    svg {
+        font-size: 1.4em;
+        vertical-align: text-bottom;
+    }
+}
+
+#meet-session-toolbar {
+    display: flex;
+    justify-content: center;
+}
+
+#meet-session-menu {
+    background: $menu-bg-color;
+    border-radius: 0 2em 2em 0;
+    margin: 0.25em 0;
+    padding-right: 0.5em;
+
+    button {
+        font-size: 1.3em;
+        margin: 0.4em;
+        position: relative;
+        color: #4f5963;
+        width: 1.75em;
+        height: 1.75em;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+
+        &.on:not(:disabled) {
+            background: #4f5963;
+            color: white;
+        }
+
+        .badge {
+            font-size: 0.5em;
+            position: absolute;
+            right: -0.5em;
+            top: -0.5em;
+
+            &:empty {
+                display: none;
+            }
+        }
+
+        svg {
+            width: 1em;
+        }
+    }
+
+    #meet-component:fullscreen & {
+        background: transparent;
+
+        button {
+            color: $main-color;
+
+            &.on:not(:disabled) {
+                background: $main-color;
+                color: #000;
+            }
+        }
+    }
+}
+
+#meet-session-logo {
+    background: #e9e7e2;
+    border-radius: 2em 0 0 2em;
+    margin: 0.25em 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
+    img {
+        height: 1.25em;
+        padding: 0 1em 0 1.5em;
+    }
+
+    #meet-component:fullscreen & {
+        background: transparent;
+    }
+}
+
+#meet-session-layout {
+    flex: 1;
+    overflow: hidden;
+}
+
+#meet-publishers {
+    height: 100%;
+    position: relative;
+}
+
+#meet-subscribers {
+    padding: 0.15em;
+    overflow-y: auto;
+
+    .meet-subscriber {
+        margin: 0.15em;
+        max-width: calc(25% - 0.4em);
+    }
+
+    // Language interpreters will be displayed as subscribers, but will have still
+    // the video element that we will hide
+    video {
+        display: none;
+    }
+}
+
+#meet-session {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: hidden;
+
+    & > div {
+        display: flex;
+        flex-wrap: wrap;
+        width: 100%;
+
+        &:empty {
+            display: none;
+        }
+    }
+
+    #meet-publishers:empty {
+        & + #meet-subscribers {
+            justify-content: center;
+            align-content: center;
+            flex: 1;
+        }
+    }
+}
+
+#meet-chat {
+    width: 0;
+    display: none;
+    flex-direction: column;
+    background: $menu-bg-color;
+    padding-top: 0.25em;
+
+    &.open {
+        width: 30%;
+        display: flex !important;
+
+        .mobile & {
+            width: 100%;
+            z-index: 1;
+        }
+    }
+
+    #meet-component:fullscreen & {
+        background: transparent;
+    }
+
+    .chat {
+        flex: 1;
+        overflow-y: auto;
+        scrollbar-width: thin;
+    }
+
+    .message {
+        margin: 0 0.5em 0.5em 0.5em;
+        padding: 0.25em 0.5em;
+        border-radius: 1em;
+        background: #fff;
+        border: 1px solid #e9e7e2;
+        overflow-wrap: break-word;
+
+        &.self {
+            background: lighten($main-color, 30%);
+        }
+
+        &:last-child {
+            margin-bottom: 0;
+        }
+    }
+
+    .nickname {
+        font-size: 80%;
+        color: $secondary;
+        text-align: right;
+    }
+}
+
+#meet-queue {
+    display: none;
+    width: 150px;
+
+    .head {
+        text-align: center;
+        font-size: 1.75em;
+        background: $menu-bg-color;
+    }
+
+    .dropdown {
+        margin: 0.2em;
+        display: flex;
+        position: relative;
+        transition: top 10s ease;
+        top: 15em;
+
+        .meet-nickname {
+            width: 100%;
+        }
+
+        &.widdle {
+            top: 0;
+            animation-name: wiggle;
+            animation-duration: 1s;
+            animation-timing-function: ease-in-out;
+            animation-iteration-count: 8;
+        }
+    }
+}
+
+@keyframes wiggle {
+    0% { transform: rotate(0deg); }
+    25% { transform: rotate(10deg); }
+    50% { transform: rotate(0deg); }
+    75% { transform: rotate(-10deg); }
+    100% { transform: rotate(0deg); }
+}
+
+.media-setup-form {
+    .input-group svg {
+        width: 1em;
+    }
+}
+
+.media-setup-preview {
+    display: flex;
+    position: relative;
+
+    video {
+        width: 100%;
+        background: #000;
+    }
+
+    .volume {
+        height: 50%;
+        position: absolute;
+        bottom: 1em;
+        right: 2em;
+        width: 0.5em;
+        background: rgba(0, 0, 0, 0.5);
+
+        .bar {
+            width: 100%;
+            position: absolute;
+            bottom: 0;
+        }
+
+        #media-setup-dialog & {
+            right: 1em;
+        }
+    }
+}
+
+.toast.join-request {
+    .toast-header {
+        color: #eee;
+    }
+
+    .toast-body {
+        display: flex;
+    }
+
+    .picture {
+        margin-right: 1em;
+
+        img {
+            width: 64px;
+            height: 64px;
+            border: 1px solid #555;
+            border-radius: 50%;
+            object-fit: cover;
+        }
+    }
+
+    .content {
+        flex: 1;
+    }
+}
+
+@include media-breakpoint-down(xs) {
+    #meet-session-menu {
+        white-space: nowrap;
+        margin: 0;
+        margin-top: 1.25em;
+        border-radius: 0;
+        padding: 0;
+        background: none;
+
+        button {
+            margin: 0.25em;
+        }
+
+        // .link-screen,
+        .link-fullscreen {
+            display: none;
+        }
+    }
+
+    #meet-session-logo {
+        background: none;
+        position: absolute;
+        left: 0;
+
+        img {
+            height: 0.8em;
+            padding: 0 0.25em;
+        }
+    }
+
+    #meet-counter {
+        text-align: right;
+        right: 0;
+        padding: 0 0.25em;
+        font-size: 0.9em;
+        background: $menu-bg-color;
+
+        svg {
+            font-size: 1.1em;
+            vertical-align: -0.125em;
+        }
+    }
+
+    #meet-setup {
+        .card-title {
+            text-align: center;
+        }
+    }
+
+    #meet-queue {
+        width: 100px;
+
+        .dropdown {
+            animation: none !important;
+            transition: none;
+            top: 0;
+        }
+    }
+
+    .media-setup-preview {
+        // Fix video element size in Safari/iOS
+        display: block;
+    }
+}
diff --git a/src/resources/sass/menu.scss b/src/resources/themes/menu.scss
similarity index 100%
rename from src/resources/sass/menu.scss
rename to src/resources/themes/menu.scss
index e02f713b..58f683b5 100644
--- a/src/resources/sass/menu.scss
+++ b/src/resources/themes/menu.scss
@@ -1,151 +1,151 @@
 #header-menu {
     background-color: $menu-bg-color;
     padding: 0;
     line-height: 85px;
 
     .navbar-brand {
         padding: 0;
         outline: 0;
 
         > img {
             display: inline;
             vertical-align: middle;
         }
     }
 
     .nav-link {
         color: #202020;
         line-height: 85px;
         padding: 0 0 0 25px;
         background: transparent;
 
         &:focus {
             text-decoration: underline;
             outline: 0;
         }
 
         &:hover {
             color: $main-color;
             text-decoration: underline;
         }
 
         &.active:not(.menulogin) {
             font-weight: bold;
         }
     }
 }
 
 #footer-menu {
     background-color: $main-color;
     height: 100px;
     overflow: hidden;
 
     .navbar-brand {
         margin: 0;
 
         img {
             width: 170px;
         }
     }
 
     .footer {
         text-align: right;
         color: #fff;
         font-size: 0.75rem;
         padding: 0 0.5rem;
     }
 }
 
 @include media-breakpoint-up(lg) {
     #header-menu {
         a.menulogin {
             text-transform: uppercase;
             border: 2px solid $main-color;
             border-radius: 21px;
             line-height: 21px;
             letter-spacing: 1px;
             padding: 6px 34px;
             margin: 25px 0 25px 25px;
 
             &:focus,
             &:hover {
                 text-decoration: none;
                 background-color: $main-color;
                 color: #fff;
                 font-weight: normal;
             }
         }
     }
 
     .navbar {
         .navbar {
             justify-content: flex-end;
         }
     }
 
     #footer-menu {
         .navbar {
             flex-direction: column;
             align-items: flex-end;
         }
     }
 }
 
 @include media-breakpoint-down(md) {
     #header-menu {
         .navbar-nav {
             padding-bottom: 1em;
         }
 
         .nav-link {
             line-height: 45px;
             padding: 0;
         }
     }
 
     #footer-menu {
+        height: 80px;
+
         .navbar-nav {
             display: none;
         }
 
         .container {
             flex-wrap: nowrap;
         }
     }
 }
 
 @include media-breakpoint-down(sm) {
     #header-menu {
         padding: 0 1em;
 
         .navbar-nav {
             display: block;
             width: 100%;
             padding: 0;
 
             li {
                 border-top: 1px solid #eee;
             }
         }
     }
 
     #footer-menu {
-        height: 80px;
-
         .container {
             flex-direction: column;
         }
 
         #footer-company {
             display: none;
         }
     }
 }
 
 @media (max-width: 340px) {
     #header-menu {
         .navbar-brand img {
             width: 160px;
         }
     }
 }
diff --git a/src/resources/sass/toast.scss b/src/resources/themes/toast.scss
similarity index 85%
rename from src/resources/sass/toast.scss
rename to src/resources/themes/toast.scss
index dd832111..3aa738ff 100644
--- a/src/resources/sass/toast.scss
+++ b/src/resources/themes/toast.scss
@@ -1,55 +1,59 @@
 .toast-container {
     position: fixed;
     bottom: 0;
     right: 0;
     margin: 0.5rem;
     width: 320px;
+    max-height: calc(100% - 1rem);
+    overflow-y: auto;
+    scrollbar-width: thin;
+    scrollbar-color: rgba(52, 58, 64, 0.95) transparent;
     z-index: 1055; // above Bootstrap's modal backdrop and dialogs
 
     @media (max-width: 375px) {
         left: 0;
         width: auto;
     }
 }
 
 .toast {
     background-color: rgba(52, 58, 64, 0.95);
 
     &:not(:last-child) {
         margin-bottom: 0.3rem;
     }
 
     @media (max-width: 375px) {
         max-width: 100%;
     }
 }
 
 .toast-header {
     background-color: #343a40;
     border-color: #555;
     color: #fff;
 
     strong {
         flex: 1;
     }
 
     svg {
         font-size: 1.2em;
         margin-right: 0.5rem;
     }
 
     button.close {
         color: #eee;
         opacity: 1 !important;
         text-shadow: none;
         font-size: 1.2rem;
 
         &:hover {
             color: #fff;
         }
     }
 }
 
 .toast-body {
     color: #fff;
 }
diff --git a/src/resources/views/documents/receipt.blade.php b/src/resources/views/documents/receipt.blade.php
index ce9e9e2c..b4829d7a 100644
--- a/src/resources/views/documents/receipt.blade.php
+++ b/src/resources/views/documents/receipt.blade.php
@@ -1,66 +1,66 @@
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
     <head>
         <meta charset="utf-8">
         <style>
-<?php include public_path('css/document.css') ?>
+<?php include public_path('/themes/' . config('app.theme') . '/document.css') ?>
         </style>
     </head>
     <body>
         <table id="header">
             <tr>
                 <td>
                     {!! $company['header'] !!}
                 </td>
                 <td class="logo">
                     {!! $company['logo'] !!}
                 </td>
             </tr>
         </table>
 
         <h1 id="title">{{ $title }}</h1>
 
         <table id="customer" class="head">
             <tr>
                 <td>
                     {!! $customer['customer'] !!}
                 </td>
                 <td class="idents">
                     {{--<span class="gray">{{ __('documents.account-id') }}</span> {{ $customer['wallet_id'] }}<br>--}}
                     <span class="gray">{{ __('documents.customer-no') }}</span> {{ $customer['id'] }}
                 </td>
             </tr>
         </table>
 
         <table id="content" class="content">
             <tr>
                 <th class="align-left">{{ __('documents.date') }}</th>
                 <th class="align-left description">{{ __('documents.description') }}</th>
                 <th class="price">{{ __('documents.amount') }}</th>
             </tr>
 @foreach ($items as $item)
             <tr>
                 <td class="align-left">{{ $item['date'] }}</td>
                 <td class="align-left">{{ $item['description'] }}</td>
                 <td class="price">{{ $item['amount'] }}</td>
             </tr>
 @endforeach
 @if ($vat)
             <tr class="total subtotal">
                 <td colspan="2" class="align-right bold">{{ __('documents.subtotal') }}</td>
                 <td class="price bold">{{ $subTotal }}</td>
             </tr>
             <tr class="total vat">
                 <td colspan="2" class="align-right bold">{{ __('documents.vat', ['rate' => $vatRate]) }}</td>
                 <td class="price bold">{{ $totalVat }}</td>
             </tr>
 @endif
             <tr class="total">
                 <td colspan="2" class="align-right bold">{{ __('documents.total') }}</td>
                 <td class="price bold">{{ $total }}</td>
             </tr>
         </table>
 
         <div id="footer">{!! $company['footer'] !!}</div>
     </body>
 </html>
diff --git a/src/resources/views/layouts/app.blade.php b/src/resources/views/layouts/app.blade.php
index ab6e2cc7..f8415a1e 100644
--- a/src/resources/views/layouts/app.blade.php
+++ b/src/resources/views/layouts/app.blade.php
@@ -1,23 +1,23 @@
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, maximum-scale=1.0">
         <meta name="csrf-token" content="{{ csrf_token() }}">
 
         <title>{{ config('app.name') }} -- @yield('title')</title>
 
         {{-- TODO: PWA disabled for now: @laravelPWA --}}
-        <link rel="icon" type="image/x-icon" href="{{ asset('images/favicon.ico') }}">
-        <link href="{{ secure_asset('css/app.css') }}" rel="stylesheet">
+        <link rel="icon" type="image/x-icon" href="@theme_asset(images/favicon.ico)">
+        <link href="@theme_asset(app.css)" rel="stylesheet">
     </head>
     <body>
         <div class="outer-container">
             @yield('content')
         </div>
 
         <script>window.config = {!! json_encode($env) !!}</script>
-        <script src="{{ secure_asset('js/' . $env['jsapp']) }}" defer></script>
+        <script src="{{ asset('js/' . $env['jsapp']) }}" defer></script>
     </body>
 </html>
diff --git a/src/resources/vue/404.vue b/src/resources/vue/404.vue
deleted file mode 100644
index 04e64cc3..00000000
--- a/src/resources/vue/404.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<template>
-    <div id="error-page">
-        <div class="code">404</div>
-        <div class="message">Not Found</div>
-    </div>
-</template>
diff --git a/src/resources/vue/Admin/Dashboard.vue b/src/resources/vue/Admin/Dashboard.vue
index 9d267bf8..6a239de7 100644
--- a/src/resources/vue/Admin/Dashboard.vue
+++ b/src/resources/vue/Admin/Dashboard.vue
@@ -1,94 +1,89 @@
 <template>
-    <div v-if="!$root.isLoading" class="container" dusk="dashboard-component">
+    <div class="container" dusk="dashboard-component">
         <div id="search-box" class="card">
             <div class="card-body">
                 <form @submit.prevent="searchUser" class="row justify-content-center">
                     <div class="input-group col-sm-8">
                         <input class="form-control" type="text" placeholder="User ID, email or domain" v-model="search">
                         <div class="input-group-append">
                             <button type="submit" class="btn btn-primary"><svg-icon icon="search"></svg-icon> Search</button>
                         </div>
                     </div>
                 </form>
                 <table v-if="users.length" class="table table-sm table-hover mt-4">
                     <thead class="thead-light">
                         <tr>
                             <th scope="col">Primary Email</th>
                             <th scope="col">ID</th>
                             <th scope="col" class="d-none d-md-table-cell">Created</th>
                             <th scope="col" class="d-none d-md-table-cell">Deleted</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr v-for="user in users" :id="'user' + user.id" :key="user.id" :class="user.isDeleted ? 'text-secondary' : ''">
                             <td class="text-nowrap">
                                 <svg-icon icon="user" :class="$root.userStatusClass(user)" :title="$root.userStatusText(user)"></svg-icon>
                                 <router-link v-if="!user.isDeleted" :to="{ path: 'user/' + user.id }">{{ user.email }}</router-link>
                                 <span v-if="user.isDeleted">{{ user.email }}</span>
                             </td>
                             <td>
                                 <router-link v-if="!user.isDeleted" :to="{ path: 'user/' + user.id }">{{ user.id }}</router-link>
                                 <span v-if="user.isDeleted">{{ user.id }}</span>
                             </td>
                             <td class="d-none d-md-table-cell">{{ toDate(user.created_at) }}</td>
                             <td class="d-none d-md-table-cell">{{ toDate(user.deleted_at) }}</td>
                         </tr>
                     </tbody>
                 </table>
             </div>
         </div>
-        <div id="dashboard-nav"></div>
+        <div id="dashboard-nav" class="mt-3">
+            <router-link class="card link-stats" :to="{ name: 'stats' }">
+                <svg-icon icon="chart-line"></svg-icon><span class="name">Stats</span>
+            </router-link>
+        </div>
     </div>
 </template>
 
 <script>
+    import { library } from '@fortawesome/fontawesome-svg-core'
+    import { faChartLine } from '@fortawesome/free-solid-svg-icons'
+    library.add(faChartLine)
+
     export default {
         data() {
             return {
                 search: '',
                 users: []
             }
         },
         mounted() {
-            const authInfo = this.$store.state.isLoggedIn ? this.$store.state.authInfo : null
-
-            if (authInfo) {
-                $('#search-box input').focus()
-            } else {
-                this.$root.startLoading()
-                axios.get('/api/auth/info')
-                    .then(response => {
-                        this.$store.state.authInfo = response.data
-                        this.$root.stopLoading()
-                        setTimeout(() => { $('#search-box input').focus() }, 10)
-                    })
-                    .catch(this.$root.errorHandler)
-            }
+            $('#search-box input').focus()
         },
         methods: {
             searchUser() {
                 this.users = []
 
                 axios.get('/api/v4/users', { params: { search: this.search } })
                     .then(response => {
                         if (response.data.count == 1 && !response.data.list[0].isDeleted) {
                             this.$router.push({ name: 'user', params: { user: response.data.list[0].id } })
                             return
                         }
 
                         if (response.data.message) {
                             this.$toast.info(response.data.message)
                         }
 
                         this.users = response.data.list
                     })
                     .catch(this.$root.errorHandler)
             },
             toDate(datetime) {
                 if (datetime) {
                     return datetime.split(' ')[0]
                 }
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Admin/Stats.vue b/src/resources/vue/Admin/Stats.vue
new file mode 100644
index 00000000..0c60c7f3
--- /dev/null
+++ b/src/resources/vue/Admin/Stats.vue
@@ -0,0 +1,46 @@
+<template>
+    <div id="stats-container" class="container">
+    </div>
+</template>
+
+<script>
+    import { Chart } from 'frappe-charts/dist/frappe-charts.esm.js'
+
+    export default {
+        data() {
+            return {
+                charts: {}
+            }
+        },
+        mounted() {
+            ['users', 'users-all', 'income', 'discounts'].forEach(chart => this.loadChart(chart))
+        },
+        methods: {
+            drawChart(name, data) {
+                if (!data.title) {
+                    return
+                }
+
+                const ch = new Chart('#chart-' + name, data)
+
+                this.charts[name] = ch
+            },
+            loadChart(name) {
+                const chart = $('<div>').attr({ id: 'chart-' + name }).appendTo(this.$el)
+
+                this.$root.addLoader(chart)
+
+                axios.get('/api/v4/stats/chart/' + name)
+                    .then(response => {
+                        this.$root.removeLoader(chart)
+                        this.drawChart(name, response.data)
+                    })
+                    .catch(error => {
+                        console.error(error)
+                        this.$root.removeLoader(chart)
+                        chart.append($('<span>').text('Failed to load data.'))
+                    })
+            }
+        }
+    }
+</script>
diff --git a/src/resources/vue/Admin/User.vue b/src/resources/vue/Admin/User.vue
index 1cff1957..aead8af1 100644
--- a/src/resources/vue/Admin/User.vue
+++ b/src/resources/vue/Admin/User.vue
@@ -1,644 +1,656 @@
 <template>
     <div class="container">
         <div class="card" id="user-info">
             <div class="card-body">
                 <h1 class="card-title">{{ user.email }}</h1>
                 <div class="card-text">
                     <form class="read-only short">
                         <div v-if="user.wallet.user_id != user.id" class="form-group row plaintext">
                             <label for="manager" class="col-sm-4 col-form-label">Managed by</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="manager">
                                     <router-link :to="{ path: '/user/' + user.wallet.user_id }">{{ user.wallet.user_email }}</router-link>
                                 </span>
                             </div>
                         </div>
                         <div class="form-group row plaintext">
                             <label for="userid" class="col-sm-4 col-form-label">ID <span class="text-muted">(Created at)</span></label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="userid">
                                     {{ user.id }} <span class="text-muted">({{ user.created_at }})</span>
                                 </span>
                             </div>
                         </div>
                         <div class="form-group row plaintext">
                             <label for="status" class="col-sm-4 col-form-label">Status</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="status">
                                     <span :class="$root.userStatusClass(user)">{{ $root.userStatusText(user) }}</span>
                                 </span>
                             </div>
                         </div>
                         <div class="form-group row plaintext" v-if="user.first_name">
                             <label for="first_name" class="col-sm-4 col-form-label">First name</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="first_name">{{ user.first_name }}</span>
                             </div>
                         </div>
                         <div class="form-group row plaintext" v-if="user.last_name">
                             <label for="last_name" class="col-sm-4 col-form-label">Last name</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="last_name">{{ user.last_name }}</span>
                             </div>
                         </div>
                         <div class="form-group row plaintext" v-if="user.organization">
                             <label for="organization" class="col-sm-4 col-form-label">Organization</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="organization">{{ user.organization }}</span>
                             </div>
                         </div>
                         <div class="form-group row plaintext" v-if="user.phone">
                             <label for="phone" class="col-sm-4 col-form-label">Phone</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="phone">{{ user.phone }}</span>
                             </div>
                         </div>
                         <div class="form-group row plaintext">
                             <label for="external_email" class="col-sm-4 col-form-label">External email</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="external_email">
                                     <a v-if="user.external_email" :href="'mailto:' + user.external_email">{{ user.external_email }}</a>
                                     <button type="button" class="btn btn-secondary btn-sm" @click="emailEdit">Edit</button>
                                 </span>
                             </div>
                         </div>
                         <div class="form-group row plaintext" v-if="user.billing_address">
                             <label for="billing_address" class="col-sm-4 col-form-label">Address</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" style="white-space:pre" id="billing_address">{{ user.billing_address }}</span>
                             </div>
                         </div>
                         <div class="form-group row plaintext">
                             <label for="country" class="col-sm-4 col-form-label">Country</label>
                             <div class="col-sm-8">
                                 <span class="form-control-plaintext" id="country">{{ user.country }}</span>
                             </div>
                         </div>
                     </form>
                     <div class="mt-2">
                         <button v-if="!user.isSuspended" id="button-suspend" class="btn btn-warning" type="button" @click="suspendUser">Suspend</button>
                         <button v-if="user.isSuspended" id="button-unsuspend" class="btn btn-warning" type="button" @click="unsuspendUser">Unsuspend</button>
                     </div>
                 </div>
             </div>
         </div>
         <ul class="nav nav-tabs mt-3" role="tablist">
             <li class="nav-item">
                 <a class="nav-link active" id="tab-finances" href="#user-finances" role="tab" aria-controls="user-finances" aria-selected="true">
                     Finances
                 </a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" id="tab-aliases" href="#user-aliases" role="tab" aria-controls="user-aliases" aria-selected="false">
                     Aliases ({{ user.aliases.length }})
                 </a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" id="tab-subscriptions" href="#user-subscriptions" role="tab" aria-controls="user-subscriptions" aria-selected="false">
                     Subscriptions ({{ skus.length }})
                 </a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" id="tab-domains" href="#user-domains" role="tab" aria-controls="user-domains" aria-selected="false">
                     Domains ({{ domains.length }})
                 </a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" id="tab-users" href="#user-users" role="tab" aria-controls="user-users" aria-selected="false">
                     Users ({{ users.length }})
                 </a>
             </li>
         </ul>
         <div class="tab-content">
             <div class="tab-pane show active" id="user-finances" role="tabpanel" aria-labelledby="tab-finances">
                 <div class="card-body">
                     <h2 class="card-title">Account balance <span :class="wallet.balance < 0 ? 'text-danger' : 'text-success'"><strong>{{ $root.price(wallet.balance) }}</strong></span></h2>
                     <div class="card-text">
                         <form class="read-only short">
                             <div class="form-group row">
                                 <label class="col-sm-4 col-form-label">Discount</label>
                                 <div class="col-sm-8">
                                     <span class="form-control-plaintext" id="discount">
                                         <span>{{ wallet.discount ? (wallet.discount + '% - ' + wallet.discount_description) : 'none' }}</span>
                                         <button type="button" class="btn btn-secondary btn-sm" @click="discountEdit">Edit</button>
                                     </span>
                                 </div>
                             </div>
                             <div class="form-group row" v-if="wallet.mandate && wallet.mandate.id">
                                 <label class="col-sm-4 col-form-label">Auto-payment</label>
                                 <div class="col-sm-8">
-                                    <span class="form-control-plaintext" id="autopayment">
+                                    <span id="autopayment" :class="'form-control-plaintext' + (wallet.mandateState ? ' text-danger' : '')">
                                         Fill up by <b>{{ wallet.mandate.amount }} CHF</b>
                                         when under <b>{{ wallet.mandate.balance }} CHF</b>
-                                        using {{ wallet.mandate.method }}<span v-if="wallet.mandate.isDisabled"> (disabled)</span>.
+                                        using {{ wallet.mandate.method }}
+                                        <span v-if="wallet.mandateState">({{ wallet.mandateState }})</span>.
                                     </span>
                                 </div>
                             </div>
                             <div class="form-group row" v-if="wallet.providerLink">
                                 <label class="col-sm-4 col-form-label">{{ capitalize(wallet.provider) }} ID</label>
                                 <div class="col-sm-8">
                                     <span class="form-control-plaintext" v-html="wallet.providerLink"></span>
                                 </div>
                             </div>
                         </form>
                         <div class="mt-2">
                             <button id="button-award" class="btn btn-success" type="button" @click="awardDialog">Add bonus</button>
                             <button id="button-penalty" class="btn btn-danger" type="button" @click="penalizeDialog">Add penalty</button>
                         </div>
                     </div>
                     <h2 class="card-title mt-4">Transactions</h2>
                     <transaction-log v-if="wallet.id && !walletReload" class="card-text" :wallet-id="wallet.id" :is-admin="true"></transaction-log>
                 </div>
             </div>
             <div class="tab-pane" id="user-aliases" role="tabpanel" aria-labelledby="tab-aliases">
                 <div class="card-body">
                     <div class="card-text">
                         <table class="table table-sm table-hover">
                             <thead class="thead-light">
                                 <tr>
                                     <th scope="col">Email address</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr v-for="(alias, index) in user.aliases" :id="'alias' + index" :key="index">
                                     <td>{{ alias }}</td>
                                 </tr>
                             </tbody>
                             <tfoot class="table-fake-body">
                                 <tr>
                                     <td>This user has no email aliases.</td>
                                 </tr>
                             </tfoot>
                         </table>
                     </div>
                 </div>
             </div>
             <div class="tab-pane" id="user-subscriptions" role="tabpanel" aria-labelledby="tab-subscriptions">
                 <div class="card-body">
                     <div class="card-text">
                         <table class="table table-sm table-hover mb-0">
                             <thead class="thead-light">
                                 <tr>
                                     <th scope="col">Subscription</th>
                                     <th scope="col">Price</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr v-for="(sku, sku_id) in skus" :id="'sku' + sku.id" :key="sku_id">
                                     <td>{{ sku.name }}</td>
                                     <td>{{ sku.price }}</td>
                                 </tr>
                             </tbody>
                             <tfoot class="table-fake-body">
                                 <tr>
                                     <td colspan="2">This user has no subscriptions.</td>
                                 </tr>
                             </tfoot>
                         </table>
                         <small v-if="discount > 0" class="hint">
                             <hr class="m-0">
                             &sup1; applied discount: {{ discount }}% - {{ discount_description }}
                         </small>
                         <div class="mt-2">
                             <button type="button" class="btn btn-danger" id="reset2fa" v-if="has2FA" @click="reset2FADialog">Reset 2-Factor Auth</button>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="tab-pane" id="user-domains" role="tabpanel" aria-labelledby="tab-domains">
                 <div class="card-body">
                     <div class="card-text">
                         <table class="table table-sm table-hover">
                             <thead class="thead-light">
                                 <tr>
                                     <th scope="col">Name</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr v-for="domain in domains" :id="'domain' + domain.id" :key="domain.id" @click="$root.clickRecord">
                                     <td>
                                         <svg-icon icon="globe" :class="$root.domainStatusClass(domain)" :title="$root.domainStatusText(domain)"></svg-icon>
                                         <router-link :to="{ path: '/domain/' + domain.id }">{{ domain.namespace }}</router-link>
                                     </td>
                                 </tr>
                             </tbody>
                             <tfoot class="table-fake-body">
                                 <tr>
                                     <td>There are no domains in this account.</td>
                                 </tr>
                             </tfoot>
                         </table>
                     </div>
                 </div>
             </div>
             <div class="tab-pane" id="user-users" role="tabpanel" aria-labelledby="tab-users">
                 <div class="card-body">
                     <div class="card-text">
                         <table class="table table-sm table-hover">
                             <thead class="thead-light">
                                 <tr>
                                     <th scope="col">Primary Email</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr v-for="item in users" :id="'user' + item.id" :key="item.id" @click="$root.clickRecord">
                                     <td>
                                         <svg-icon icon="user" :class="$root.userStatusClass(item)" :title="$root.userStatusText(item)"></svg-icon>
                                         <router-link v-if="item.id != user.id" :to="{ path: '/user/' + item.id }">{{ item.email }}</router-link>
                                         <span v-else>{{ item.email }}</span>
                                     </td>
                                 </tr>
                             </tbody>
                             <tfoot class="table-fake-body">
                                 <tr>
                                     <td>There are no users in this account.</td>
                                 </tr>
                             </tfoot>
                         </table>
                     </div>
                 </div>
             </div>
         </div>
 
         <div id="discount-dialog" class="modal" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">Account discount</h5>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
                     </div>
                     <div class="modal-body">
                         <p class="form-group">
                             <select v-model="wallet.discount_id" class="custom-select">
                                 <option value="">- none -</option>
                                 <option v-for="item in discounts" :value="item.id" :key="item.id">{{ item.label }}</option>
                             </select>
                         </p>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary modal-cancel" data-dismiss="modal">Cancel</button>
                         <button type="button" class="btn btn-primary modal-action" @click="submitDiscount()">
                             <svg-icon icon="check"></svg-icon> Submit
                         </button>
                     </div>
                 </div>
             </div>
         </div>
 
         <div id="email-dialog" class="modal" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">External email</h5>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
                     </div>
                     <div class="modal-body">
                         <p class="form-group">
                             <input v-model="external_email" name="external_email" class="form-control">
                         </p>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary modal-cancel" data-dismiss="modal">Cancel</button>
                         <button type="button" class="btn btn-primary modal-action" @click="submitEmail()">
                             <svg-icon icon="check"></svg-icon> Submit
                         </button>
                     </div>
                 </div>
             </div>
         </div>
 
         <div id="oneoff-dialog" class="modal" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">{{ oneoff_negative ? 'Add a penalty to the wallet' : 'Add a bonus to the wallet' }}</h5>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
                     </div>
                     <div class="modal-body">
                         <form data-validation-prefix="oneoff_">
                             <div class="form-group">
                                 <label for="oneoff_amount" class="col-form-label">Amount</label>
                                 <div class="input-group">
                                     <input type="text" class="form-control" id="oneoff_amount" v-model="oneoff_amount" required>
                                     <span class="input-group-append">
                                         <span class="input-group-text">{{ oneoff_currency }}</span>
                                     </span>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label for="oneoff_description" class="col-form-label">Description</label>
                                 <input class="form-control" id="oneoff_description" v-model="oneoff_description" required>
                             </div>
                         </form>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary modal-cancel" data-dismiss="modal">Cancel</button>
                         <button type="button" class="btn btn-primary modal-action" @click="submitOneOff()">
                             <svg-icon icon="check"></svg-icon> Submit
                         </button>
                     </div>
                 </div>
             </div>
         </div>
 
         <div id="reset-2fa-dialog" class="modal" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">2-Factor Authentication Reset</h5>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
                     </div>
                     <div class="modal-body">
                         <p>This will remove 2-Factor Authentication entitlement as well
                             as the user-configured factors.</p>
                         <p>Please, make sure to confirm the user identity properly.</p>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary modal-cancel" data-dismiss="modal">Cancel</button>
                         <button type="button" class="btn btn-danger modal-action" @click="reset2FA()">Reset</button>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     import TransactionLog from '../Widgets/TransactionLog'
 
     export default {
         beforeRouteUpdate (to, from, next) {
             // An event called when the route that renders this component has changed,
             // but this component is reused in the new route.
             // Required to handle links from /user/XXX to /user/YYY
             next()
             this.$parent.routerReload()
         },
         components: {
             TransactionLog
         },
         data() {
             return {
                 oneoff_amount: '',
                 oneoff_currency: 'CHF',
                 oneoff_description: '',
                 oneoff_negative: false,
                 discount: 0,
                 discount_description: '',
                 discounts: [],
                 external_email: '',
                 has2FA: false,
                 wallet: {},
                 walletReload: false,
                 domains: [],
                 skus: [],
                 sku2FA: null,
                 users: [],
                 user: {
                     aliases: [],
                     wallet: {},
                     skus: {},
                 }
             }
         },
         created() {
             const user_id = this.$route.params.user
 
             this.$root.startLoading()
 
             axios.get('/api/v4/users/' + user_id)
                 .then(response => {
                     this.$root.stopLoading()
 
                     this.user = response.data
 
                     const financesTab = '#user-finances'
                     const keys = ['first_name', 'last_name', 'external_email', 'billing_address', 'phone', 'organization']
 
                     let country = this.user.settings.country
                     if (country && country in window.config.countries) {
                         country = window.config.countries[country][1]
                     }
 
                     this.user.country = country
 
                     keys.forEach(key => { this.user[key] = this.user.settings[key] })
 
                     this.discount = this.user.wallet.discount
                     this.discount_description = this.user.wallet.discount_description
 
                     // TODO: currencies, multi-wallets, accounts
                     // Get more info about the wallet (e.g. payment provider related)
                     this.$root.addLoader(financesTab)
                     axios.get('/api/v4/wallets/' + this.user.wallets[0].id)
                         .then(response => {
                             this.$root.removeLoader(financesTab)
                             this.wallet = response.data
+                            this.setMandateState()
                         })
                         .catch(error => {
                             this.$root.removeLoader(financesTab)
                         })
 
                     // Create subscriptions list
-                    axios.get('/api/v4/skus')
+                    axios.get('/api/v4/users/' + user_id + '/skus')
                         .then(response => {
                             // "merge" SKUs with user entitlement-SKUs
                             response.data.forEach(sku => {
                                 if (sku.id in this.user.skus) {
                                     let count = this.user.skus[sku.id].count
                                     let item = {
                                         id: sku.id,
                                         name: sku.name,
                                         cost: sku.cost,
                                         units: count - sku.units_free,
                                         price: this.$root.priceLabel(sku.cost, count - sku.units_free, this.discount)
                                     }
 
                                     if (sku.range) {
                                         item.name += ' ' + count + ' ' + sku.range.unit
                                     }
 
                                     this.skus.push(item)
 
-                                    if (sku.title == '2fa') {
+                                    if (sku.handler == 'auth2f') {
                                         this.has2FA = true
                                         this.sku2FA = sku.id
                                     }
                                 }
                             })
                         })
 
                     // Fetch users
                     // TODO: Multiple wallets
                     axios.get('/api/v4/users?owner=' + user_id)
                         .then(response => {
                             this.users = response.data.list;
                         })
 
                     // Fetch domains
                     axios.get('/api/v4/domains?owner=' + user_id)
                         .then(response => {
                             this.domains = response.data.list
                         })
                 })
                 .catch(this.$root.errorHandler)
         },
         mounted() {
             $(this.$el).find('ul.nav-tabs a').on('click', e => {
                 e.preventDefault()
                 $(e.target).tab('show')
             })
         },
         methods: {
             capitalize(str) {
                 return str.charAt(0).toUpperCase() + str.slice(1)
             },
             awardDialog() {
                 this.oneOffDialog(false)
             },
             discountEdit() {
                 $('#discount-dialog')
                     .on('shown.bs.modal', e => {
                         $(e.target).find('select').focus()
                         // Note: Vue v-model is strict, convert null to a string
                         this.wallet.discount_id = this.wallet_discount_id || ''
                     })
                     .modal()
 
                 if (!this.discounts.length) {
                     // Fetch discounts
                     axios.get('/api/v4/discounts')
                         .then(response => {
                             this.discounts = response.data.list
                         })
                 }
             },
             emailEdit() {
                 this.external_email = this.user.external_email
                 this.$root.clearFormValidation($('#email-dialog'))
 
                 $('#email-dialog')
                     .on('shown.bs.modal', e => {
                         $(e.target).find('input').focus()
                     })
                     .modal()
             },
+            setMandateState() {
+                let mandate = this.wallet.mandate
+                if (mandate && mandate.id) {
+                    if (!mandate.isValid) {
+                        this.wallet.mandateState = mandate.isPending ? 'pending' : 'invalid'
+                    } else if (mandate.isDisabled) {
+                        this.wallet.mandateState = 'disabled'
+                    }
+                }
+            },
             oneOffDialog(negative) {
                 this.oneoff_negative = negative
                 this.dialog = $('#oneoff-dialog').on('shown.bs.modal', event => {
                     this.$root.clearFormValidation(event.target)
                     $(event.target).find('#oneoff_amount').focus()
                 }).modal()
             },
             penalizeDialog() {
                 this.oneOffDialog(true)
             },
             reload() {
                 // this is to reload transaction log
                 this.walletReload = true
                 this.$nextTick(() => { this.walletReload = false })
             },
             reset2FA() {
                 $('#reset-2fa-dialog').modal('hide')
                 axios.post('/api/v4/users/' + this.user.id + '/reset2FA')
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.$toast.success(response.data.message)
                             this.skus = this.skus.filter(sku => sku.id != this.sku2FA)
                             this.has2FA = false
                         }
                     })
             },
             reset2FADialog() {
                 $('#reset-2fa-dialog').modal()
             },
             submitDiscount() {
                 $('#discount-dialog').modal('hide')
 
                 axios.put('/api/v4/wallets/' + this.user.wallets[0].id, { discount: this.wallet.discount_id })
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.$toast.success(response.data.message)
                             this.wallet = Object.assign({}, this.wallet, response.data)
 
                             // Update prices in Subscriptions tab
                             if (this.user.wallet.id == response.data.id) {
                                 this.discount = this.wallet.discount
                                 this.discount_description = this.wallet.discount_description
 
                                 this.skus.forEach(sku => {
                                     sku.price = this.$root.priceLabel(sku.cost, sku.units, this.discount)
                                 })
                             }
                         }
                     })
             },
             submitEmail() {
                 axios.put('/api/v4/users/' + this.user.id, { external_email: this.external_email })
                     .then(response => {
                         if (response.data.status == 'success') {
                             $('#email-dialog').modal('hide')
                             this.$toast.success(response.data.message)
                             this.user.external_email = this.external_email
                             this.external_email = null // required because of Vue
                         }
                     })
             },
             submitOneOff() {
                 let wallet_id = this.user.wallets[0].id
                 let post = {
                     amount: this.oneoff_amount,
                     description: this.oneoff_description
                 }
 
                 if (this.oneoff_negative && /^\d+(\.?\d+)?$/.test(post.amount)) {
                     post.amount *= -1
                 }
 
                 // TODO: We maybe should use system currency not wallet currency,
                 //       or have a selector so the operator does not have to calculate
                 //       exchange rates
 
                 this.$root.clearFormValidation(this.dialog)
 
                 axios.post('/api/v4/wallets/' + wallet_id + '/one-off', post)
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.dialog.modal('hide')
                             this.$toast.success(response.data.message)
                             this.wallet = Object.assign({}, this.wallet, {balance: response.data.balance})
                             this.oneoff_amount = ''
                             this.oneoff_description = ''
                             this.reload()
                         }
                     })
             },
             suspendUser() {
                 axios.post('/api/v4/users/' + this.user.id + '/suspend', {})
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.$toast.success(response.data.message)
                             this.user = Object.assign({}, this.user, { isSuspended: true })
                         }
                     })
             },
             unsuspendUser() {
                 axios.post('/api/v4/users/' + this.user.id + '/unsuspend', {})
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.$toast.success(response.data.message)
                             this.user = Object.assign({}, this.user, { isSuspended: false })
                         }
                     })
             }
         }
     }
 </script>
diff --git a/src/resources/vue/App.vue b/src/resources/vue/App.vue
index 3670b843..b30fd825 100644
--- a/src/resources/vue/App.vue
+++ b/src/resources/vue/App.vue
@@ -1,49 +1,91 @@
 <template>
-    <router-view v-if="!isLoading && !routerReloading"></router-view>
+    <router-view v-if="!isLoading && !routerReloading" :key="key" @hook:mounted="childMounted"></router-view>
 </template>
 
 <script>
     export default {
         data() {
             return {
                 isLoading: true,
                 routerReloading: false
             }
         },
+        computed: {
+            key() {
+                // The 'key' property is used to reload the Page component
+                // whenever a route changes. Normally vue does not do that.
+                return this.$route.name == '404' ? this.$route.path : 'static'
+            }
+        },
         mounted() {
             const token = localStorage.getItem('token')
 
             if (token) {
                 this.$root.startLoading()
                 axios.defaults.headers.common.Authorization = 'Bearer ' + token
 
                 axios.get('/api/auth/info?refresh_token=1')
                     .then(response => {
                         this.$root.loginUser(response.data, false)
                         this.$root.stopLoading()
                         this.isLoading = false
                     })
                     .catch(error => {
                         // Release lock on the router-view, otherwise links (e.g. Logout) will not work
-                        // FIXME: This causes dashboard to call /api/auth/info again
                         this.isLoading = false
+                        this.$root.logoutUser(false)
                         this.$root.errorHandler(error)
                     })
             } else {
-                this.$root.stopLoading()
                 this.isLoading = false
             }
         },
         methods: {
+            childMounted() {
+                this.$root.updateBodyClass()
+                this.getFAQ()
+            },
+            getFAQ() {
+                let page = this.$route.path
+
+                if (page == '/' || page == '/login') {
+                    return
+                }
+
+                axios.get('/content/faq' + page, { ignoreErrors: true })
+                    .then(response => {
+                        const result = response.data.faq
+                        $('#faq').remove()
+                        if (result && result.length) {
+                            let faq = $('<div id="faq" class="faq mt-3"><h5>FAQ</h5><ul class="pl-4"></ul></div>')
+                            let list = []
+
+                            result.forEach(item => {
+                                list.push($('<li>').append($('<a>').attr('href', item.href).text(item.title)))
+
+                                // Handle internal links with the vue-router
+                                if (item.href.charAt(0) == '/') {
+                                    list[list.length-1].find('a').on('click', event => {
+                                        event.preventDefault()
+                                        this.$router.push(item.href)
+                                    })
+                                }
+                            })
+
+                            faq.find('ul').append(list)
+                            $(this.$el).append(faq)
+                        }
+                    })
+            },
             routerReload() {
                 // Together with beforeRouteUpdate even on a route component
                 // allows us to force reload the component. So it is possible
                 // to jump from/to page that uses currently loaded component.
                 this.routerReloading = true
                 this.$nextTick().then(() => {
                     this.routerReloading = false
                 })
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Dashboard.vue b/src/resources/vue/Dashboard.vue
index 93f2030a..1ec8db1f 100644
--- a/src/resources/vue/Dashboard.vue
+++ b/src/resources/vue/Dashboard.vue
@@ -1,55 +1,63 @@
 <template>
     <div class="container" dusk="dashboard-component">
         <status-component :status="status" @status-update="statusUpdate"></status-component>
 
         <div id="dashboard-nav">
             <router-link class="card link-profile" :to="{ name: 'profile' }">
                 <svg-icon icon="user-cog"></svg-icon><span class="name">Your profile</span>
             </router-link>
             <router-link v-if="status.enableDomains" class="card link-domains" :to="{ name: 'domains' }">
                 <svg-icon icon="globe"></svg-icon><span class="name">Domains</span>
             </router-link>
             <router-link v-if="status.enableUsers" class="card link-users" :to="{ name: 'users' }">
                 <svg-icon icon="users"></svg-icon><span class="name">User accounts</span>
             </router-link>
             <router-link v-if="status.enableWallets" class="card link-wallet" :to="{ name: 'wallet' }">
                 <svg-icon icon="wallet"></svg-icon><span class="name">Wallet</span>
                 <span v-if="balance < 0" class="badge badge-danger">{{ $root.price(balance) }}</span>
             </router-link>
+            <router-link v-if="$root.hasSKU('meet')" class="card link-chat" :to="{ name: 'rooms' }">
+                <svg-icon icon="comments"></svg-icon><span class="name">Video chat</span>
+                <span class="badge badge-primary">beta</span>
+            </router-link>
+            <a v-if="webmailURL" class="card link-webmail" :href="webmailURL">
+                <svg-icon icon="envelope"></svg-icon><span class="name">Webmail</span>
+            </a>
         </div>
     </div>
 </template>
 
 <script>
     import StatusComponent from './Widgets/Status'
 
     export default {
         components: {
             StatusComponent
         },
         data() {
             return {
                 status: {},
-                balance: 0
+                balance: 0,
+                webmailURL: window.config['app.webmail_url']
             }
         },
         mounted() {
             const authInfo = this.$store.state.authInfo
             this.status = authInfo.statusInfo
             this.getBalance(authInfo)
         },
         methods: {
             getBalance(authInfo) {
                 this.balance = 0;
                 // TODO: currencies, multi-wallets, accounts
                 authInfo.wallets.forEach(wallet => {
                     this.balance += wallet.balance
                 })
             },
             statusUpdate(user) {
                 this.status = Object.assign({}, this.status, user)
                 this.$store.state.authInfo.statusInfo = this.status
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Domain/Info.vue b/src/resources/vue/Domain/Info.vue
index f5c9249b..377d731f 100644
--- a/src/resources/vue/Domain/Info.vue
+++ b/src/resources/vue/Domain/Info.vue
@@ -1,93 +1,92 @@
 <template>
     <div class="container">
         <status-component :status="status" @status-update="statusUpdate"></status-component>
 
         <div v-if="domain && !domain.isConfirmed" class="card" id="domain-verify">
             <div class="card-body">
                 <div class="card-title">Domain verification</div>
                 <div class="card-text">
                     <p>In order to confirm that you're the actual holder of the domain,
                         we need to run a verification process before finally activating it for email delivery.</p>
                     <p>The domain <b>must have one of the following entries</b> in DNS:
                         <ul>
                             <li>TXT entry with value: <code>{{ domain.hash_text }}</code></li>
                             <li>or CNAME entry: <code>{{ domain.hash_cname }}.{{ domain.namespace }}. IN CNAME {{ domain.hash_code }}.{{ domain.namespace }}.</code></li>
                         </ul>
                         When this is done press the button below to start the verification.</p>
                     <p>Here's a sample zone file for your domain: <pre>{{ domain.dns.join("\n") }}</pre></p>
                     <button class="btn btn-primary" type="button" @click="confirm"><svg-icon icon="sync-alt"></svg-icon> Verify</button>
                 </div>
             </div>
         </div>
         <div v-if="domain && domain.isConfirmed" class="card" id="domain-config">
             <div class="card-body">
                 <div class="card-title">Domain configuration</div>
                 <div class="card-text">
-                    <p>In order to let {{ app_name }} receive email traffic for your domain you need to adjust
+                    <p>In order to let {{ $root.appName }} receive email traffic for your domain you need to adjust
                         the DNS settings, more precisely the MX entries, accordingly.</p>
                     <p>Edit your domain's zone file and replace existing MX
                         entries with the following values: <pre>{{ domain.config.join("\n") }}</pre></p>
                     <p>If you don't know how to set DNS entries for your domain,
                         please contact the registration service where you registered
                         the domain or your web hosting provider.</p>
                 </div>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     import StatusComponent from '../Widgets/Status'
 
     export default {
         components: {
             StatusComponent
         },
         data() {
             return {
                 domain_id: null,
                 domain: null,
-                app_name: window.config['app.name'],
                 status: {}
             }
         },
         created() {
             if (this.domain_id = this.$route.params.domain) {
                 this.$root.startLoading()
 
                 axios.get('/api/v4/domains/' + this.domain_id)
                     .then(response => {
                         this.$root.stopLoading()
                         this.domain = response.data
 
                         if (!this.domain.isConfirmed) {
                             $('#domain-verify button').focus()
                         }
 
                         this.status = response.data.statusInfo
                     })
                     .catch(this.$root.errorHandler)
             } else {
                 this.$root.errorPage(404)
             }
         },
         methods: {
             confirm() {
                 axios.get('/api/v4/domains/' + this.domain_id + '/confirm')
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.domain.isConfirmed = true
                             this.status = response.data.statusInfo
                         }
 
                         if (response.data.message) {
                             this.$toast[response.data.status](response.data.message)
                         }
                     })
             },
             statusUpdate(domain) {
                 this.domain = Object.assign({}, this.domain, domain)
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Login.vue b/src/resources/vue/Login.vue
index f3f96b16..5903d93e 100644
--- a/src/resources/vue/Login.vue
+++ b/src/resources/vue/Login.vue
@@ -1,76 +1,81 @@
 <template>
     <div class="container d-flex flex-column align-items-center justify-content-center">
-        <div class="card col-sm-8 col-lg-6">
+        <div id="logon-form" class="card col-sm-8 col-lg-6">
             <div class="card-body">
                 <h1 class="card-title text-center mb-3">Please sign in</h1>
                 <div class="card-text">
                     <form class="form-signin" @submit.prevent="submitLogin">
                         <div class="form-group">
                             <label for="inputEmail" class="sr-only">Email address</label>
                             <div class="input-group">
                                 <span class="input-group-prepend">
                                     <span class="input-group-text"><svg-icon icon="user"></svg-icon></span>
                                 </span>
                                 <input type="email" id="inputEmail" class="form-control" placeholder="Email address" required autofocus v-model="email">
                             </div>
                         </div>
                         <div class="form-group">
                             <label for="inputPassword" class="sr-only">Password</label>
                             <div class="input-group">
                                 <span class="input-group-prepend">
                                     <span class="input-group-text"><svg-icon icon="lock"></svg-icon></span>
                                 </span>
                                 <input type="password" id="inputPassword" class="form-control" placeholder="Password" required v-model="password">
                             </div>
                         </div>
                         <div class="form-group pt-3" v-if="!$root.isAdmin">
                             <label for="secondfactor" class="sr-only">2FA</label>
                             <div class="input-group">
                                 <span class="input-group-prepend">
                                     <span class="input-group-text"><svg-icon icon="key"></svg-icon></span>
                                 </span>
                                 <input type="text" id="secondfactor" class="form-control rounded-right" placeholder="Second factor code" v-model="secondFactor">
                             </div>
                             <small class="form-text text-muted">Second factor code is optional for users with no 2-Factor Authentication setup.</small>
                         </div>
                         <div class="text-center">
                             <button class="btn btn-primary" type="submit">
                                 <svg-icon icon="sign-in-alt"></svg-icon> Sign in
                             </button>
                         </div>
                     </form>
                 </div>
             </div>
         </div>
-        <div class="mt-1">
-            <router-link v-if="!$root.isAdmin" :to="{ name: 'password-reset' }" id="forgot-password">Forgot password?</router-link>
+        <div id="logon-form-footer" class="mt-1">
+            <router-link v-if="!$root.isAdmin && $root.hasRoute('password-reset')" :to="{ name: 'password-reset' }" id="forgot-password">Forgot password?</router-link>
+            <a v-if="webmailURL && !$root.isAdmin" :href="webmailURL" id="webmail">Webmail</a>
         </div>
     </div>
 </template>
 
-
 <script>
     export default {
+        props: {
+            dashboard: { type: Boolean, default: true }
+        },
         data() {
             return {
                 email: '',
                 password: '',
-                secondFactor: ''
+                secondFactor: '',
+                webmailURL: window.config['app.webmail_url']
             }
         },
         methods: {
             submitLogin() {
                 this.$root.clearFormValidation($('form.form-signin'))
 
                 axios.post('/api/auth/login', {
                     email: this.email,
                     password: this.password,
                     secondfactor: this.secondFactor
                 }).then(response => {
                     // login user and redirect to dashboard
-                    this.$root.loginUser(response.data)
+                    this.$root.loginUser(response.data, this.dashboard)
+                    this.$emit('success')
                 })
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Meet/Room.vue b/src/resources/vue/Meet/Room.vue
new file mode 100644
index 00000000..4c173c0d
--- /dev/null
+++ b/src/resources/vue/Meet/Room.vue
@@ -0,0 +1,758 @@
+<template>
+    <div id="meet-component">
+        <div id="meet-session-toolbar" class="hidden">
+            <span id="meet-counter" title="Number of participants"><svg-icon icon="users"></svg-icon> <span></span></span>
+            <span id="meet-session-logo" v-html="$root.logo()"></span>
+            <div id="meet-session-menu">
+                <button :class="'btn link-audio' + (audioActive ? '' : ' on')" @click="switchSound" :disabled="!isPublisher()" :title="audioActive ? 'Mute audio' : 'Unmute audio'">
+                    <svg-icon :icon="audioActive ? 'microphone' : 'microphone-slash'"></svg-icon>
+                </button>
+                <button :class="'btn link-video' + (videoActive ? '' : ' on')" @click="switchVideo" :disabled="!isPublisher()" :title="videoActive ? 'Mute video' : 'Unmute video'">
+                    <svg-icon :icon="videoActive ? 'video' : 'video-slash'"></svg-icon>
+                </button>
+                <button :class="'btn link-screen' + (screenShareActive ? ' on' : '')" @click="switchScreen" :disabled="!canShareScreen || !isPublisher()" title="Share screen">
+                    <svg-icon icon="desktop"></svg-icon>
+                </button>
+                <button :class="'btn link-hand' + (handRaised ? ' on' : '')" v-if="!isPublisher()" @click="switchHand" :title="handRaised ? 'Lower hand' : 'Raise hand'">
+                    <svg-icon icon="hand-paper"></svg-icon>
+                </button>
+                <span id="channel-select" :style="'display:' + (channels.length ? '' : 'none')" class="dropdown">
+                    <button :class="'btn link-channel' + (session.channel ? ' on' : '')" data-toggle="dropdown"
+                            title="Interpreted language channel" aria-haspopup="true" aria-expanded="false"
+                    >
+                        <svg-icon icon="headphones"></svg-icon>
+                        <span class="badge badge-danger" v-if="session.channel">{{ session.channel.toUpperCase() }}</span>
+                    </button>
+                    <div class="dropdown-menu">
+                        <a :class="'dropdown-item' + (!session.channel ? ' active' : '')" href="#" data-code="" @click="switchChannel">- none -</a>
+                        <a v-for="code in channels" :key="code" href="#" @click="switchChannel" :data-code="code"
+                           :class="'dropdown-item' + (session.channel == code ? ' active' : '')"
+                        >{{ languages[code] }}</a>
+                    </div>
+                </span>
+                <button :class="'btn link-chat' + (chatActive ? ' on' : '')" @click="switchChat" title="Chat">
+                    <svg-icon icon="comment"></svg-icon>
+                </button>
+                <button class="btn link-fullscreen closed hidden" @click="switchFullscreen" title="Full screen">
+                    <svg-icon icon="expand"></svg-icon>
+                </button>
+                <button class="btn link-fullscreen open hidden" @click="switchFullscreen" title="Exit full screen">
+                    <svg-icon icon="compress"></svg-icon>
+                </button>
+                <button class="btn link-options" v-if="isRoomOwner()" @click="roomOptions" title="Room options">
+                    <svg-icon icon="cog"></svg-icon>
+                </button>
+                <button class="btn link-logout" @click="logout" title="Leave session">
+                    <svg-icon icon="power-off"></svg-icon>
+                </button>
+            </div>
+        </div>
+
+        <div id="meet-setup" class="card container mt-2 mt-md-5 mb-5">
+            <div class="card-body">
+                <div class="card-title">Set up your session</div>
+                <div class="card-text">
+                    <form class="media-setup-form row" @submit.prevent="joinSession">
+                        <div class="media-setup-preview col-sm-6 mb-3 mb-sm-0">
+                            <video class="rounded"></video>
+                            <div class="volume"><div class="bar"></div></div>
+                        </div>
+                        <div class="col-sm-6 align-self-center">
+                            <div class="input-group">
+                                <label for="setup-microphone" class="input-group-prepend mb-0">
+                                    <span class="input-group-text" title="Microphone"><svg-icon icon="microphone"></svg-icon></span>
+                                </label>
+                                <select class="custom-select" id="setup-microphone" v-model="microphone" @change="setupMicrophoneChange">
+                                    <option value="">None</option>
+                                    <option v-for="mic in setup.microphones" :value="mic.deviceId" :key="mic.deviceId">{{ mic.label }}</option>
+                                </select>
+                            </div>
+                            <div class="input-group mt-2">
+                                <label for="setup-camera" class="input-group-prepend mb-0">
+                                    <span class="input-group-text" title="Camera"><svg-icon icon="video"></svg-icon></span>
+                                </label>
+                                <select class="custom-select" id="setup-camera" v-model="camera" @change="setupCameraChange">
+                                    <option value="">None</option>
+                                    <option v-for="cam in setup.cameras" :value="cam.deviceId" :key="cam.deviceId">{{ cam.label }}</option>
+                                </select>
+                            </div>
+                            <div class="input-group mt-2">
+                                <label for="setup-nickname" class="input-group-prepend mb-0">
+                                    <span class="input-group-text" title="Nickname"><svg-icon icon="user"></svg-icon></span>
+                                </label>
+                                <input class="form-control" type="text" id="setup-nickname" v-model="nickname" placeholder="Your name">
+                            </div>
+                            <div class="input-group mt-2" v-if="session.config && session.config.requires_password">
+                                <label for="setup-password" class="input-group-prepend mb-0">
+                                    <span class="input-group-text" title="Password"><svg-icon icon="key"></svg-icon></span>
+                                </label>
+                                <input type="password" class="form-control" id="setup-password" v-model="password" placeholder="Password">
+                            </div>
+                            <div class="mt-3">
+                                <button type="submit" id="join-button"
+                                        :class="'btn w-100 btn-' + (isRoomReady() ? 'success' : 'primary')"
+                                >
+                                    <span v-if="isRoomReady()">JOIN NOW</span>
+                                    <span v-else-if="roomState == 323">I'm the owner</span>
+                                    <span v-else>JOIN</span>
+                                </button>
+                            </div>
+                        </div>
+                        <div class="mt-4 col-sm-12">
+                            <status-message :status="roomState" :status-labels="roomStateLabels"></status-message>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+
+        <div id="meet-session-layout" class="d-flex hidden">
+            <div id="meet-queue">
+                <div class="head" title="Q &amp; A"><svg-icon icon="microphone-alt"></svg-icon></div>
+            </div>
+            <div id="meet-session"></div>
+            <div id="meet-chat">
+                <div class="chat"></div>
+                <div class="chat-input m-2">
+                    <textarea class="form-control" rows="1"></textarea>
+                </div>
+            </div>
+        </div>
+
+        <logon-form id="meet-auth" class="hidden" :dashboard="false" @success="authSuccess"></logon-form>
+
+        <div id="leave-dialog" class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Room closed</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>The session has been closed by the room owner.</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-danger modal-action" data-dismiss="modal">Close</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div id="media-setup-dialog" class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Media setup</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <form class="media-setup-form">
+                            <div class="media-setup-preview"></div>
+                            <div class="input-group mt-2">
+                                <label for="setup-mic" class="input-group-prepend mb-0">
+                                    <span class="input-group-text" title="Microphone"><svg-icon icon="microphone"></svg-icon></span>
+                                </label>
+                                <select class="custom-select" id="setup-mic" v-model="microphone" @change="setupMicrophoneChange">
+                                    <option value="">None</option>
+                                    <option v-for="mic in setup.microphones" :value="mic.deviceId" :key="mic.deviceId">{{ mic.label }}</option>
+                                </select>
+                            </div>
+                            <div class="input-group mt-2">
+                                <label for="setup-cam" class="input-group-prepend mb-0">
+                                    <span class="input-group-text" title="Camera"><svg-icon icon="video"></svg-icon></span>
+                                </label>
+                                <select class="custom-select" id="setup-cam" v-model="camera" @change="setupCameraChange">
+                                    <option value="">None</option>
+                                    <option v-for="cam in setup.cameras" :value="cam.deviceId" :key="cam.deviceId">{{ cam.label }}</option>
+                                </select>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary modal-action" data-dismiss="modal">Close</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <room-options v-if="session.config" :config="session.config" :room="room" @config-update="configUpdate"></room-options>
+    </div>
+</template>
+
+<script>
+    import { Meet, Roles } from '../../js/meet/app.js'
+    import StatusMessage from '../Widgets/StatusMessage'
+    import LogonForm from '../Login'
+    import RoomOptions from './RoomOptions'
+
+    // Register additional icons
+    import { library } from '@fortawesome/fontawesome-svg-core'
+
+    import {
+        faComment,
+        faCog,
+        faCompress,
+        faCrown,
+        faDesktop,
+        faExpand,
+        faHandPaper,
+        faHeadphones,
+        faMicrophone,
+        faMicrophoneSlash,
+        faMicrophoneAlt,
+        faPowerOff,
+        faUser,
+        faUsers,
+        faVideo,
+        faVideoSlash,
+        faVolumeMute
+    } from '@fortawesome/free-solid-svg-icons'
+
+    // Register only these icons we need
+    library.add(
+        faComment,
+        faCog,
+        faCompress,
+        faCrown,
+        faDesktop,
+        faExpand,
+        faHandPaper,
+        faHeadphones,
+        faMicrophone,
+        faMicrophoneSlash,
+        faMicrophoneAlt,
+        faPowerOff,
+        faUser,
+        faUsers,
+        faVideo,
+        faVideoSlash,
+        faVolumeMute
+    )
+
+    let roomRequest
+    const authHeader = 'X-Meet-Auth-Token'
+
+    export default {
+        components: {
+            LogonForm,
+            RoomOptions,
+            StatusMessage
+        },
+        data() {
+            return {
+                setup: {
+                    cameras: [],
+                    microphones: [],
+                },
+                canShareScreen: false,
+                camera: '',
+                channels: [],
+                languages: {
+                    en: 'English',
+                    de: 'German',
+                    fr: 'French',
+                    it: 'Italian'
+                },
+                meet: null,
+                microphone: '',
+                nickname: '',
+                password: '',
+                room: null,
+                roomState: 'init',
+                roomStateLabels: {
+                    init: 'Checking the room...',
+                    323: 'The room is closed. Please, wait for the owner to start the session.',
+                    324: 'The room is closed. It will be open for others after you join.',
+                    325: 'The room is ready. Please, provide a valid password.',
+                    326: 'The room is locked. Please, enter your name and try again.',
+                    327: 'Waiting for permission to join the room.',
+                    404: 'The room does not exist.',
+                    429: 'Too many requests. Please, wait.',
+                    500: 'Failed to connect to the room. Server error.'
+                },
+                session: {},
+                audioActive: false,
+                videoActive: false,
+                chatActive: false,
+                handRaised: false,
+                screenShareActive: false
+            }
+        },
+        mounted() {
+            this.room = this.$route.params.room
+
+            // Initialize OpenVidu and do some basic checks
+            this.meet = new Meet($('#meet-session')[0]);
+            this.canShareScreen = this.meet.isScreenSharingSupported()
+
+            // Check the room and init the session
+            this.initSession()
+
+            // Setup the room UI
+            this.setupSession()
+        },
+        beforeDestroy() {
+            clearTimeout(roomRequest)
+
+            $('#app').removeClass('meet')
+
+            if (this.meet) {
+                this.meet.leaveRoom()
+            }
+
+            delete axios.defaults.headers.common[authHeader]
+
+            $(document.body).off('keydown.meet')
+        },
+        methods: {
+            authSuccess() {
+                // The user authentication succeeded, we still don't know it's really the room owner
+                this.initSession()
+
+                $('#meet-setup').removeClass('hidden')
+                $('#meet-auth').addClass('hidden')
+            },
+            configUpdate(config) {
+                this.session.config = Object.assign({}, this.session.config, config)
+            },
+            dismissParticipant(id) {
+                axios.post('/api/v4/openvidu/rooms/' + this.room + '/connections/' + id + '/dismiss')
+            },
+            initSession(init) {
+                const button = $('#join-button').prop('disabled', true)
+
+                this.post = {
+                    password: this.password,
+                    nickname: this.nickname,
+                    screenShare: this.canShareScreen ? 1 : 0,
+                    init: init ? 1 : 0,
+                    picture: init ? this.makePicture() : '',
+                    requestId: this.requestId(),
+                    canPublish: !!this.camera || !!this.microphone
+                }
+
+                $('#setup-password,#setup-nickname').removeClass('is-invalid')
+
+                axios.post('/api/v4/openvidu/rooms/' + this.room, this.post, { ignoreErrors: true })
+                    .then(response => {
+                        button.prop('disabled', false)
+
+                        // We already have token, the response is redundant
+                        if (this.roomState == 'ready' && this.session.token) {
+                            return
+                        }
+
+                        this.roomState = 'ready'
+                        this.session = response.data
+
+                        if (init) {
+                            this.joinSession()
+                        }
+
+                        if (this.session.authToken) {
+                            axios.defaults.headers.common[authHeader] = this.session.authToken
+                        }
+                    })
+                    .catch(error => {
+                        if (!error.response) {
+                            console.error(error)
+                            return
+                        }
+
+                        const data = error.response.data || {}
+
+                        if (data.code) {
+                            this.roomState = data.code
+                        } else {
+                            this.roomState = error.response.status
+                        }
+
+                        button.prop('disabled', this.roomState == 'init' || this.roomState == 327 || this.roomState >= 400)
+
+                        if (data.config) {
+                            this.session.config = data.config
+                        }
+
+                        switch (this.roomState) {
+                            case 323:
+                                // Waiting for the owner to open the room...
+                                // Update room state every 10 seconds
+                                roomRequest = setTimeout(() => { this.initSession() }, 10000)
+                                break;
+
+                            case 324:
+                                // Room is ready for the owner, but the 'init' was not requested yet
+                                clearTimeout(roomRequest)
+                                break;
+
+                            case 325:
+                                // Missing/invalid password
+                                if (init) {
+                                    $('#setup-password').addClass('is-invalid').focus()
+                                }
+                                break;
+
+                            case 326:
+                                // Locked room prerequisites error
+                                if (init && !$('#setup-nickname').val()) {
+                                    $('#setup-nickname').addClass('is-invalid').focus()
+                                }
+                                break;
+
+                            case 327:
+                                // Waiting for the owner's approval to join
+                                // Update room state every 10 seconds
+                                roomRequest = setTimeout(() => { this.initSession(true) }, 10000)
+                                break;
+
+                            case 429:
+                                // Rate limited, wait and try again
+                                const waitTime = error.response.headers['retry-after'] || 10
+                                roomRequest = setTimeout(() => { this.initSession(init) }, waitTime * 1000)
+                                break;
+
+                            default:
+                                if (this.roomState >= 400 && this.roomState != 404) {
+                                    this.roomState = 500
+                                }
+                        }
+                    })
+
+                if (document.fullscreenEnabled) {
+                    $('#meet-session-menu').find('.link-fullscreen.closed').removeClass('hidden')
+                }
+            },
+            isModerator() {
+                return this.isRoomOwner() || (!!this.session.role && (this.session.role & Roles.MODERATOR) > 0)
+            },
+            isPublisher() {
+                return !!this.session.role && (this.session.role & Roles.PUBLISHER) > 0
+            },
+            isRoomOwner() {
+                return !!this.session.role && (this.session.role & Roles.OWNER) > 0
+            },
+            isRoomReady() {
+                return ['ready', 322, 324, 325, 326, 327].includes(this.roomState)
+            },
+            // An event received by the room owner when a participant is asking for a permission to join the room
+            joinRequest(data) {
+                // The toast for this user request already exists, ignore
+                // It's not really needed as we do this on server-side already
+                if ($('#i' + data.requestId).length) {
+                    return
+                }
+
+                // FIXME: Should the message close button act as the Deny button? Do we need the Deny button?
+
+                let body = $(
+                    `<div>`
+                    + `<div class="picture"><img src="${data.picture}"></div>`
+                    + `<div class="content">`
+                        + `<p class="mb-2"></p>`
+                        + `<div class="text-right">`
+                            + `<button type="button" class="btn btn-sm btn-success accept">Accept</button>`
+                            + `<button type="button" class="btn btn-sm btn-danger deny ml-2">Deny</button>`
+                )
+
+                this.$toast.message({
+                    className: 'join-request',
+                    icon: 'user',
+                    timeout: 0,
+                    title: 'Join request',
+                    // titleClassName: '',
+                    body: body.html(),
+                    onShow: element => {
+                        const id = data.requestId
+
+                        $(element).find('p').text((data.nickname || '') + ' requested to join.')
+
+                        // add id attribute, so we can identify it
+                        $(element).attr('id', 'i' + id)
+                            // add action to the buttons
+                            .find('button.accept,button.deny').on('click', e => {
+                                const action = $(e.target).is('.accept') ? 'accept' : 'deny'
+                                axios.post('/api/v4/openvidu/rooms/' + this.room + '/request/' + id + '/' + action)
+                                    .then(response => {
+                                        $('#i' + id).remove()
+                                    })
+                            })
+                    }
+                })
+            },
+            // Entering the room
+            joinSession() {
+                // The form can be submitted not only via the submit button,
+                // make sure the submit is allowed
+                if ($('#meet-setup [type=submit]').prop('disabled')) {
+                    return;
+                }
+
+                if (this.roomState == 323) {
+                    $('#meet-setup').addClass('hidden')
+                    $('#meet-auth').removeClass('hidden')
+                    return
+                }
+
+                if (this.roomState != 'ready' && !this.session.token) {
+                    this.initSession(true)
+                    return
+                }
+
+                clearTimeout(roomRequest)
+
+                this.session.nickname = this.nickname
+                this.session.languages = this.languages
+                this.session.menuElement = $('#meet-session-menu')[0]
+                this.session.chatElement = $('#meet-chat')[0]
+                this.session.queueElement = $('#meet-queue')[0]
+                this.session.counterElement = $('#meet-counter span')[0]
+                this.session.onSuccess = () => {
+                    $('#app').addClass('meet')
+                    $('#meet-setup').addClass('hidden')
+                    $('#meet-session-toolbar,#meet-session-layout').removeClass('hidden')
+                }
+                this.session.onError = () => {
+                    this.roomState = 500
+                }
+                this.session.onDestroy = event => {
+                    // TODO: Display different message for each reason: forceDisconnectByUser,
+                    //       forceDisconnectByServer, sessionClosedByServer?
+                    if (event.reason != 'disconnect' && event.reason != 'networkDisconnect' && !this.isRoomOwner()) {
+                        $('#leave-dialog').on('hide.bs.modal', () => {
+                            // FIXME: Where exactly the user should land? Currently he'll land
+                            //        on dashboard (if he's logged in) or login form (if he's not).
+
+                            this.$router.push({ name: 'dashboard' })
+                        }).modal()
+                    }
+                }
+                this.session.onDismiss = connId => { this.dismissParticipant(connId) }
+                this.session.onSessionDataUpdate = data => { this.updateSession(data) }
+                this.session.onConnectionChange = (connId, data) => { this.updateParticipant(connId, data) }
+                this.session.onJoinRequest = data => { this.joinRequest(data) }
+                this.session.onMediaSetup = () => { this.setupMedia() }
+
+                this.meet.joinRoom(this.session)
+
+                this.keyboardShortcuts()
+            },
+            keyboardShortcuts() {
+                $(document.body).on('keydown.meet', e => {
+                    if ($(e.target).is('select,input,textarea')) {
+                        return
+                    }
+
+                    // Self-Mute with 'm' key
+                    if (e.key == 'm' || e.key == 'M') {
+                        if ($('#meet-session-menu').find('.link-audio:not(:disabled)').length) {
+                            this.switchSound()
+                        }
+                    }
+                })
+            },
+            logout() {
+                const logout = () => {
+                    this.meet.leaveRoom()
+                    this.meet = null
+                    this.$router.push({ name: 'dashboard' })
+                }
+
+                if (this.isRoomOwner()) {
+                    axios.post('/api/v4/openvidu/rooms/' + this.room + '/close').then(logout)
+                } else {
+                    logout()
+                }
+            },
+            makePicture() {
+                const video = $("#meet-setup video")[0];
+
+                // Skip if video is not "playing"
+                if (!video.videoWidth || !this.camera) {
+                    return ''
+                }
+
+                // we're going to crop a square from the video and resize it
+                const maxSize = 64
+
+                // Calculate sizing
+                let sh = Math.floor(video.videoHeight / 1.5)
+                let sw = sh
+                let sx = (video.videoWidth - sw) / 2
+                let sy = (video.videoHeight - sh) / 2
+
+                let dh = Math.min(sh, maxSize)
+                let dw = sh < maxSize ? sw : Math.floor(sw * dh/sh)
+
+                const canvas = $("<canvas>")[0];
+                canvas.width = dw;
+                canvas.height = dh;
+
+                // draw the image on the canvas (square cropped and resized)
+                canvas.getContext('2d').drawImage(video, sx, sy, sw, sh, 0, 0, dw, dh);
+
+                // convert it to a usable data URL (png format)
+                return canvas.toDataURL();
+            },
+            requestId() {
+                const key = 'kolab-meet-uid'
+
+                if (!this.reqId) {
+                    this.reqId = localStorage.getItem(key)
+                }
+
+                if (!this.reqId) {
+                    // We store the identifier in the browser to make sure that it is the same after
+                    // page refresh for the avg user. This will not prevent hackers from sending
+                    // the new identifier on every request.
+                    // If we're afraid of a room owner being spammed with join requests we might invent
+                    // a way to silently ignore all join requests after the owner pressed some button
+                    // stating "all attendees already joined, lock the room for good!".
+
+                    // This will create max. 24-char numeric string
+                    this.reqId = (String(Date.now()) + String(Math.random()).substring(2)).substring(0, 24)
+                    localStorage.setItem(key, this.reqId)
+                }
+
+                return this.reqId
+            },
+            roomOptions() {
+                $('#room-options-dialog').modal()
+            },
+            setupMedia() {
+                let dialog = $('#media-setup-dialog')
+
+                if (!dialog.find('video').length) {
+                    $('#meet-setup').find('video,div.volume').appendTo(dialog.find('.media-setup-preview'))
+                }
+
+                dialog.on('show.bs.modal', () => { this.meet.setupStart() })
+                    .on('hide.bs.modal', () => { this.meet.setupStop() })
+                    .modal()
+            },
+            setupSession() {
+                this.meet.setupStart({
+                    videoElement: $('#meet-setup video')[0],
+                    volumeElement: $('#meet-setup .volume')[0],
+                    onSuccess: setup => {
+                        this.setup = setup
+                        this.microphone = setup.audioSource
+                        this.camera = setup.videoSource
+
+                        this.audioActive = setup.audioActive
+                        this.videoActive = setup.videoActive
+                    },
+                    onError: error => {
+                        this.audioActive = false
+                        this.videoActive = false
+                    }
+                })
+            },
+            setupCameraChange() {
+                this.meet.setupSetVideoDevice(this.camera).then(enabled => {
+                    this.videoActive = enabled
+                })
+            },
+            setupMicrophoneChange() {
+                this.meet.setupSetAudioDevice(this.microphone).then(enabled => {
+                    this.audioActive = enabled
+                })
+            },
+            switchChannel(e) {
+                let channel = $(e.target).data('code')
+
+                this.$set(this.session, 'channel', channel)
+                this.meet.switchChannel(channel)
+            },
+            switchChat() {
+                let chat = $('#meet-chat')
+                let enabled = chat.is('.open')
+
+                chat.toggleClass('open')
+
+                if (!enabled) {
+                    chat.find('textarea').focus()
+                }
+
+                this.chatActive = !enabled
+
+                // Trigger resize, so participant matrix can update its layout
+                window.dispatchEvent(new Event('resize'));
+            },
+            switchFullscreen() {
+                const element = this.$el
+
+                $(element).off('fullscreenchange').on('fullscreenchange', (e) => {
+                    let enabled = document.fullscreenElement == element
+                    let buttons = $('#meet-session-menu').find('.link-fullscreen')
+
+                    buttons.first()[enabled ? 'addClass' : 'removeClass']('hidden')
+                    buttons.last()[!enabled ? 'addClass' : 'removeClass']('hidden')
+                })
+
+                if (document.fullscreenElement) {
+                    document.exitFullscreen()
+                } else {
+                    element.requestFullscreen()
+                }
+            },
+            switchHand() {
+                this.updateSelf({ hand: !this.handRaised })
+            },
+            switchSound() {
+                this.audioActive = this.meet.switchAudio()
+            },
+            switchVideo() {
+                this.videoActive = this.meet.switchVideo()
+            },
+            switchScreen() {
+                const switchScreenAction = () => {
+                    this.meet.switchScreen((enabled, error) => {
+                        this.screenShareActive = enabled
+                        if (!enabled && !error) {
+                            // Closing a screen sharing connection invalidates the token
+                            delete this.session.shareToken
+                        }
+                    })
+                }
+
+                if (this.session.shareToken || this.screenShareActive) {
+                    switchScreenAction()
+                } else {
+                    axios.post('/api/v4/openvidu/rooms/' + this.room + '/connections')
+                        .then(response => {
+                            this.session.shareToken = response.data.token
+                            this.meet.updateSession(this.session)
+                            switchScreenAction()
+                        })
+                }
+            },
+            updateParticipant(connId, params) {
+                if (this.isModerator()) {
+                    axios.put('/api/v4/openvidu/rooms/' + this.room + '/connections/' + connId, params)
+                }
+            },
+            updateSelf(params, onSuccess) {
+                axios.put('/api/v4/openvidu/rooms/' + this.room + '/connections/' + this.session.connectionId, params)
+                    .then(response => {
+                        if (onSuccess) {
+                            onSuccess(response)
+                        }
+                    })
+            },
+            updateSession(data) {
+                this.session = data
+                this.channels = data.channels || []
+
+                const isPublisher = this.isPublisher()
+
+                this.videoActive = isPublisher ? data.videoActive : false
+                this.audioActive = isPublisher ? data.audioActive : false
+                this.handRaised = data.hand
+            }
+        }
+    }
+</script>
diff --git a/src/resources/vue/Meet/RoomOptions.vue b/src/resources/vue/Meet/RoomOptions.vue
new file mode 100644
index 00000000..9d435f82
--- /dev/null
+++ b/src/resources/vue/Meet/RoomOptions.vue
@@ -0,0 +1,124 @@
+<template>
+    <div v-if="config">
+        <div id="room-options-dialog" class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Room options</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <form id="room-options-password">
+                            <div id="password-input" class="input-group input-group-activable">
+                                <span class="input-group-text label">Password:</span>
+                                <span v-if="config.password" id="password-input-text" class="input-group-text">{{ config.password }}</span>
+                                <span v-else id="password-input-text" class="input-group-text text-muted">none</span>
+                                <input type="text" :value="config.password" name="password" class="form-control rounded-left activable">
+                                <div class="input-group-append">
+                                    <button type="button" @click="passwordSave" id="password-save-btn" class="btn btn-outline-primary activable rounded-right">Save</button>
+                                    <button type="button" v-if="config.password" id="password-clear-btn" @click="passwordClear" class="btn btn-outline-danger rounded">Clear password</button>
+                                    <button type="button" v-else @click="passwordSet" id="password-set-btn" class="btn btn-outline-primary rounded">Set password</button>
+                                </div>
+                            </div>
+                            <small class="form-text text-muted">
+                                You can add a password to your meeting. Participants will have to provide
+                                the password before they are allowed to join the meeting.
+                            </small>
+                        </form>
+                        <hr>
+                        <form id="room-options-lock">
+                            <div id="room-lock">
+                                <label for="room-lock-input">Locked room:</label>
+                                <input type="checkbox" id="room-lock-input" name="lock" value="1" :checked="config.locked" @click="lockSave">
+                            </div>
+                            <small class="form-text text-muted">
+                                When the room is locked participants have to be approved by a moderator
+                                before they could join the meeting.
+                            </small>
+                        </form>
+                        <hr>
+                        <form id="room-options-nomedia">
+                            <div id="room-nomedia">
+                                <label for="room-nomedia-input">Subscribers only:</label>
+                                <input type="checkbox" id="room-nomedia-input" name="lock" value="1" :checked="config.nomedia" @click="nomediaSave">
+                            </div>
+                            <small class="form-text text-muted">
+                                Forces all participants to join as subscribers (with camera and microphone turned off).
+                                Moderators will be able to promote them to publishers throughout the session.
+                            </small>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary modal-action" data-dismiss="modal">Close</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            config: { type: Object, default: () => null },
+            room: { type: String, default: () => null }
+        },
+        data() {
+            return {
+            }
+        },
+        mounted() {
+            $('#room-options-dialog').on('show.bs.modal', e => {
+                $(e.target).find('.input-group-activable.active').removeClass('active')
+            })
+        },
+        methods: {
+            configSave(name, value, callback) {
+                const post = {}
+                post[name] = value
+
+                axios.post('/api/v4/openvidu/rooms/' + this.room + '/config', post)
+                    .then(response => {
+                        this.config[name] = value
+                        if (callback) {
+                            callback(response.data)
+                        }
+                        this.$emit('config-update', this.config)
+                        this.$toast.success(response.data.message)
+                    })
+            },
+            lockSave(e) {
+                this.configSave('locked', $(e.target).prop('checked') ? 1 : 0)
+            },
+            nomediaSave(e) {
+                this.configSave('nomedia', $(e.target).prop('checked') ? 1 : 0)
+            },
+            passwordClear() {
+                this.configSave('password', '')
+            },
+            passwordSave() {
+                this.configSave('password', $('#password-input input').val(), () => {
+                        $('#password-input').removeClass('active')
+                })
+            },
+            passwordSet() {
+                $('#password-input').addClass('active').find('input')
+                    .off('keydown.pass')
+                    .on('keydown.pass', e => {
+                        if (e.which == 13) {
+                            // On ENTER save the password
+                            this.passwordSave()
+                            e.preventDefault()
+                        } else if (e.which == 27) {
+                            // On ESC escape from the input, but not the dialog
+                            $('#password-input').removeClass('active')
+                            e.stopPropagation()
+                        }
+                    })
+                    .focus()
+            }
+        }
+    }
+</script>
diff --git a/src/resources/vue/Page.vue b/src/resources/vue/Page.vue
new file mode 100644
index 00000000..077f361a
--- /dev/null
+++ b/src/resources/vue/Page.vue
@@ -0,0 +1,74 @@
+<template>
+    <div class="page-content container" @click="clickHandler" v-html="content"></div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                content: ''
+            }
+        },
+        mounted() {
+            let page = this.$root.pageName()
+
+            // Redirect / to /dashboard, if root page is not defined
+            if (page == '404' && this.$route.path == '/') {
+                this.$router.push({ name: 'dashboard' })
+                return
+            }
+
+            this.$root.startLoading()
+
+            axios.get('/content/page/' + page, { ignoreErrors: true })
+                .then(response => {
+                    this.$root.stopLoading()
+                    this.content = response.data
+                })
+                .catch(this.$root.errorHandler)
+        },
+        methods: {
+            clickHandler(event) {
+                // ensure we use the link, in case the click has been received by a subelement
+                let target = event.target
+
+                while (target && target.tagName !== 'A') {
+                    target = target.parentNode
+                }
+
+                // handle only links that do not reference external resources
+                if (target && target.href && !target.getAttribute('href').match(/:\/\//)) {
+                    const { altKey, ctrlKey, metaKey, shiftKey, button, defaultPrevented } = event
+
+                    if (
+                        // don't handle with control keys
+                        metaKey || altKey || ctrlKey || shiftKey
+                        // don't handle when preventDefault called
+                        || defaultPrevented
+                        // don't handle right clicks
+                        || (button !== undefined && button !== 0)
+                        // don't handle if `target="_blank"`
+                        || /_blank/i.test(target.getAttribute('target'))
+                    ) {
+                        return
+                    }
+
+                    // don't handle same page links/anchors
+                    const url = new URL(target.href)
+                    const to = url.pathname
+
+                    if (to == '/support/contact') {
+                        event.preventDefault()
+                        this.$root.supportDialog(this.$el)
+                        return
+                    }
+
+                    if (window.location.pathname !== to) {
+                        event.preventDefault()
+                        this.$router.push(to)
+                    }
+                }
+            }
+        }
+    }
+</script>
diff --git a/src/resources/vue/PasswordReset.vue b/src/resources/vue/PasswordReset.vue
index d612d84a..5c43211d 100644
--- a/src/resources/vue/PasswordReset.vue
+++ b/src/resources/vue/PasswordReset.vue
@@ -1,155 +1,157 @@
 <template>
     <div class="container">
         <div class="card" id="step1">
             <div class="card-body">
                 <h4 class="card-title">Password Reset - Step 1/3</h4>
                 <p class="card-text">
-                    Enter your email address to reset your password. You may need to check your spam folder or unblock noreply@kolabnow.com.
+                    Enter your email address to reset your password.
+                    <span v-if="fromEmail">You may need to check your spam folder or unblock {{ fromEmail }}.</span>
                 </p>
                 <form @submit.prevent="submitStep1" data-validation-prefix="reset_">
                     <div class="form-group">
                         <label for="reset_email" class="sr-only">Email Address</label>
                         <input type="text" class="form-control" id="reset_email" placeholder="Email Address" required v-model="email">
                     </div>
                     <button class="btn btn-primary" type="submit"><svg-icon icon="check"></svg-icon> Continue</button>
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step2">
             <div class="card-body">
                 <h4 class="card-title">Password Reset - Step 2/3</h4>
                 <p class="card-text">
                     We sent out a confirmation code to your external email address.
                     Enter the code we sent you, or click the link in the message.
                 </p>
                 <form @submit.prevent="submitStep2" data-validation-prefix="reset_">
                     <div class="form-group">
                         <label for="reset_short_code" class="sr-only">Confirmation Code</label>
                         <input type="text" class="form-control" id="reset_short_code" placeholder="Confirmation Code" required v-model="short_code">
                     </div>
                     <button class="btn btn-secondary" type="button" @click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit"><svg-icon icon="check"></svg-icon> Continue</button>
                     <input type="hidden" id="reset_code" v-model="code" />
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step3">
             <div class="card-body">
                 <h4 class="card-title">Password Reset - Step 3/3</h4>
                 <p class="card-text">
                 </p>
                 <form @submit.prevent="submitStep3" data-validation-prefix="reset_">
                     <div class="form-group">
                         <label for="reset_password" class="sr-only">Password</label>
                         <input type="password" class="form-control" id="reset_password" placeholder="Password" required v-model="password">
                     </div>
                     <div class="form-group">
                         <label for="reset_confirm" class="sr-only">Confirm Password</label>
                         <input type="password" class="form-control" id="reset_confirm" placeholder="Confirm Password" required v-model="password_confirmation">
                     </div>
                     <button class="btn btn-secondary" type="button" @click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit"><svg-icon icon="check"></svg-icon> Submit</button>
                 </form>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     export default {
         data() {
             return {
                 email: '',
                 code: '',
                 short_code: '',
                 password: '',
-                password_confirmation: ''
+                password_confirmation: '',
+                fromEmail: window.config['mail.from.address']
             }
         },
         created() {
             // Verification code provided, auto-submit Step 2
             if (this.$route.params.code) {
                 if (/^([A-Z0-9]+)-([a-zA-Z0-9]+)$/.test(this.$route.params.code)) {
                     this.short_code = RegExp.$1
                     this.code = RegExp.$2
                     this.submitStep2(true)
                 }
                 else {
                     this.$root.errorPage(404)
                 }
             }
         },
         mounted() {
             // Focus the first input (autofocus does not work when using the menu/router)
             this.displayForm(1, true)
         },
         methods: {
             // Submits data to the API, validates and gets verification code
             submitStep1() {
                 this.$root.clearFormValidation($('#step1 form'))
 
                 axios.post('/api/auth/password-reset/init', {
                     email: this.email
                 }).then(response => {
                     this.displayForm(2, true)
                     this.code = response.data.code
                 })
             },
             // Submits the code to the API for verification
             submitStep2(bylink) {
                 if (bylink === true) {
                     this.displayForm(2, false)
                 }
 
                 this.$root.clearFormValidation($('#step2 form'))
 
                 axios.post('/api/auth/password-reset/verify', {
                     code: this.code,
                     short_code: this.short_code
                 }).then(response => {
                     this.displayForm(3, true)
                 }).catch(error => {
                     if (bylink === true) {
                         // FIXME: display step 1, user can do nothing about it anyway
                         //        Maybe we should display 404 error page?
                         this.displayForm(1, true)
                     }
                 })
             },
             // Submits the data to the API to reset the password
             submitStep3() {
                 this.$root.clearFormValidation($('#step3 form'))
 
                 axios.post('/api/auth/password-reset', {
                     code: this.code,
                     short_code: this.short_code,
                     password: this.password,
                     password_confirmation: this.password_confirmation
                 }).then(response => {
                     // auto-login and goto dashboard
                     this.$root.loginUser(response.data)
                 })
             },
             // Moves the user a step back in registration form
             stepBack(e) {
                 var card = $(e.target).closest('.card')
 
                 card.prev().removeClass('d-none').find('input').first().focus()
                 card.addClass('d-none').find('form')[0].reset()
             },
             displayForm(step, focus) {
                 [1, 2, 3].filter(value => value != step).forEach(value => {
                     $('#step' + value).addClass('d-none')
                 })
 
                 $('#step' + step).removeClass('d-none')
 
                 if (focus) {
                     $('#step' + step).find('input').first().focus()
                 }
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Rooms.vue b/src/resources/vue/Rooms.vue
new file mode 100644
index 00000000..c4f3ab6a
--- /dev/null
+++ b/src/resources/vue/Rooms.vue
@@ -0,0 +1,104 @@
+<template>
+    <div class="container" dusk="rooms-component">
+        <div id="meet-rooms" class="card">
+            <div class="card-body">
+                <div class="card-title">Voice &amp; Video Conferencing <small><sup class="badge badge-primary">beta</sup></small></div>
+                <div class="card-text">
+                    <p>
+                        Welcome to our beta program for Voice &amp; Video Conferencing.
+                    </p>
+                    <p>
+                        You have a room of your own at the URL below. This room is only open when you yourself are in
+                        attendance. Use this URL to invite people to join you.
+                    </p>
+                    <p>
+                        <router-link v-if="href" :to="roomRoute">{{ href }}</router-link>
+                    </p>
+                    <p>
+                        This is a work in progress and more features will be added over time. Current features include:
+                    </p>
+                    <dl>
+                        <dt>Screen Sharing</dt>
+                        <dd>
+                            Share your screen for presentations or show-and-tell.
+                        </dd>
+
+                        <dt>Room Security</dt>
+                        <dd>
+                            Increase the room security by setting a password that attendees will need to know
+                            before they can enter, or lock the door so attendees will have to knock, and a moderator
+                            can accept or deny those requests.
+                        </dd>
+
+                        <dt>Raise Hand (Q&amp;A)</dt>
+                        <dd>
+                            Silent audience members can raise their hand to facilitate a Question &amp; Answer session
+                            with the panel members.
+                        </dd>
+
+                        <dt>Moderator Delegation</dt>
+                        <dd>
+                            Delegate moderator authority for the session, so that a speaker is not needlessly
+                            interrupted with attendees knocking and other moderator duties.
+                        </dd>
+
+                        <dt>Eject Attendees</dt>
+                        <dd>
+                            Eject attendees from the session in order to force them to reconnect, or address policy
+                            violations. Click the user icon for effective dismissal.
+                        </dd>
+
+                        <dt>Silent Audience Members</dt>
+                        <dd>
+                            For a webinar-style session, configure the room to force all new attendees to be silent
+                            audience members.
+                        </dd>
+
+                        <dt>Language Specific Audio Channels</dt>
+                        <dd>
+                            Designate a participant to interpret the original audio to a target language, for sessions
+                            with multi-lingual attendees. The interpreter is expected to be able to relay the original
+                            audio, and override it.
+                        </dd>
+                    </dl>
+                    <p>
+                        Keep in mind that this is still in beta and might come with some issues.
+                        Should you encounter any on your way, let us know by contacting support.
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                rooms: [],
+                href: '',
+                roomRoute: ''
+            }
+        },
+        mounted() {
+            if (!this.$root.hasSKU('meet')) {
+                this.$root.errorPage(403)
+                return
+            }
+
+            this.$root.startLoading()
+
+            axios.get('/api/v4/openvidu/rooms')
+                .then(response => {
+                    this.$root.stopLoading()
+
+                    this.rooms = response.data.list
+                    if (response.data.count) {
+                        this.roomRoute = '/meet/' + encodeURI(this.rooms[0].name)
+                        this.href = window.config['app.url'] + this.roomRoute
+                    }
+                })
+                .catch(this.$root.errorHandler)
+        }
+    }
+</script>
diff --git a/src/resources/vue/Signup.vue b/src/resources/vue/Signup.vue
index 88a0b600..fa02dc76 100644
--- a/src/resources/vue/Signup.vue
+++ b/src/resources/vue/Signup.vue
@@ -1,268 +1,264 @@
 <template>
     <div class="container">
         <div id="step0">
-            <div class="plan-selector d-flex justify-content-around align-items-stretch mb-3">
-                <div v-for="item in plans" :key="item.id" :class="'p-3 m-1 text-center bg-light flex-fill plan-box d-flex flex-column align-items-center plan-' + item.title">
-                    <div class="plan-ico">
-                        <svg-icon :icon="plan_icons[item.title]"></svg-icon>
+            <div class="plan-selector card-deck">
+                <div v-for="item in plans" :key="item.id" :class="'card bg-light plan-' + item.title">
+                    <div class="card-header plan-header">
+                        <div class="plan-ico text-center">
+                            <svg-icon :icon="plan_icons[item.title]"></svg-icon>
+                        </div>
+                    </div>
+                    <div class="card-body text-center ">
+                        <button class="btn btn-primary" :data-title="item.title" @click="selectPlan(item.title)" v-html="item.button"></button>
+                        <div class="plan-description text-left mt-3" v-html="item.description"></div>
                     </div>
-                    <button class="btn btn-primary" :data-title="item.title" @click="selectPlan(item.title)" v-html="item.button"></button>
-                    <div class="plan-description text-left mt-3" v-html="item.description"></div>
                 </div>
             </div>
-            <div class="faq">
-                <h5>FAQ</h5>
-                <ul class="pl-4">
-                    <li><a href="https://kolabnow.com/tos">What are your terms of service?</a></li>
-                    <li><a href="https://kb.kolabnow.com/faq/can-i-upgrade-an-individual-account-to-a-group-account">Can I upgrade an individual account to a group account?</a></li>
-                    <li><a href="https://kb.kolabnow.com/faq/how-much-storage-comes-with-my-account">How much storage comes with my account?</a></li>
-                </ul>
-            </div>
         </div>
 
         <div class="card d-none" id="step1">
             <div class="card-body">
                 <h4 class="card-title">Sign Up - Step 1/3</h4>
                 <p class="card-text">
                     Sign up to start your free month.
                 </p>
                 <form @submit.prevent="submitStep1" data-validation-prefix="signup_">
                     <div class="form-group">
                         <div class="input-group">
                             <input type="text" class="form-control" id="signup_first_name" placeholder="First Name" autofocus v-model="first_name">
                             <input type="text" class="form-control rounded-right" id="signup_last_name" placeholder="Surname" v-model="last_name">
                         </div>
                     </div>
                     <div class="form-group">
                         <label for="signup_email" class="sr-only">Existing Email Address</label>
                         <input type="text" class="form-control" id="signup_email" placeholder="Existing Email Address" required v-model="email">
                     </div>
                     <button class="btn btn-secondary" type="button" @click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit"><svg-icon icon="check"></svg-icon> Continue</button>
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step2">
             <div class="card-body">
                 <h4 class="card-title">Sign Up - Step 2/3</h4>
                 <p class="card-text">
                     We sent out a confirmation code to your email address.
                     Enter the code we sent you, or click the link in the message.
                 </p>
                 <form @submit.prevent="submitStep2" data-validation-prefix="signup_">
                     <div class="form-group">
                         <label for="signup_short_code" class="sr-only">Confirmation Code</label>
                         <input type="text" class="form-control" id="signup_short_code" placeholder="Confirmation Code" required v-model="short_code">
                     </div>
                     <button class="btn btn-secondary" type="button" @click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit"><svg-icon icon="check"></svg-icon> Continue</button>
                     <input type="hidden" id="signup_code" v-model="code" />
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step3">
             <div class="card-body">
                 <h4 class="card-title">Sign Up - Step 3/3</h4>
                 <p class="card-text">
                     Create your Kolab identity (you can choose additional addresses later).
                 </p>
                 <form @submit.prevent="submitStep3" data-validation-prefix="signup_">
                     <div class="form-group">
                         <label for="signup_login" class="sr-only"></label>
                         <div class="input-group">
                             <input type="text" class="form-control" id="signup_login" required v-model="login" placeholder="Login">
                             <span class="input-group-append">
                                 <span class="input-group-text">@</span>
                             </span>
                             <input v-if="is_domain" type="text" class="form-control rounded-right" id="signup_domain" required v-model="domain" placeholder="Domain">
                             <select v-else class="custom-select rounded-right" id="signup_domain" required v-model="domain"></select>
                         </div>
                     </div>
                     <div class="form-group">
                         <label for="signup_password" class="sr-only">Password</label>
                         <input type="password" class="form-control" id="signup_password" placeholder="Password" required v-model="password">
                     </div>
                     <div class="form-group">
                         <label for="signup_confirm" class="sr-only">Confirm Password</label>
                         <input type="password" class="form-control" id="signup_confirm" placeholder="Confirm Password" required v-model="password_confirmation">
                     </div>
                     <div class="form-group pt-2 pb-2">
                         <label for="signup_voucher" class="sr-only">Voucher code</label>
                         <input type="text" class="form-control" id="signup_voucher" placeholder="Voucher code" v-model="voucher">
                     </div>
                     <button class="btn btn-secondary" type="button" @click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit"><svg-icon icon="check"></svg-icon> Submit</button>
                 </form>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     export default {
         data() {
             return {
                 email: '',
                 first_name: '',
                 last_name: '',
                 code: '',
                 short_code: '',
                 login: '',
                 password: '',
                 password_confirmation: '',
                 domain: '',
                 plan: null,
                 is_domain: false,
                 plan_icons: {
                     individual: 'user',
                     group: 'users'
                 },
                 plans: [],
                 voucher: ''
             }
         },
         mounted() {
             let param = this.$route.params.param;
 
             if (param) {
                 if (this.$route.path.indexOf('/signup/voucher/') === 0) {
                     // Voucher (discount) code
                     this.voucher = param
                     this.displayForm(0)
                 } else if (/^([A-Z0-9]+)-([a-zA-Z0-9]+)$/.test(param)) {
                     // Verification code provided, auto-submit Step 2
                     this.short_code = RegExp.$1
                     this.code = RegExp.$2
                     this.submitStep2(true)
                 } else if (/^([a-zA-Z_]+)$/.test(param)) {
                     // Plan title provided, save it and display Step 1
                     this.plan = param
                     this.displayForm(1, true)
                 } else {
                     this.$root.errorPage(404)
                 }
             } else {
                 this.displayForm(0)
             }
         },
         methods: {
             selectPlan(plan) {
                 this.$router.push({path: '/signup/' + plan})
                 this.plan = plan
                 this.displayForm(1, true)
             },
             // Composes plan selection page
             step0() {
                 if (!this.plans.length) {
                     this.$root.startLoading()
-                    axios.get('/api/auth/signup/plans', {}).then(response => {
+                    axios.get('/api/auth/signup/plans').then(response => {
                         this.$root.stopLoading()
                         this.plans = response.data.plans
                     })
                     .catch(error => {
                         this.$root.errorHandler(error)
                     })
                 }
             },
             // Submits data to the API, validates and gets verification code
             submitStep1() {
                 this.$root.clearFormValidation($('#step1 form'))
 
                 axios.post('/api/auth/signup/init', {
                     email: this.email,
                     last_name: this.last_name,
                     first_name: this.first_name,
                     plan: this.plan,
                     voucher: this.voucher
                 }).then(response => {
                     this.displayForm(2, true)
                     this.code = response.data.code
                 })
             },
             // Submits the code to the API for verification
             submitStep2(bylink) {
                 if (bylink === true) {
                     this.displayForm(2, false)
                 }
 
                 this.$root.clearFormValidation($('#step2 form'))
 
                 axios.post('/api/auth/signup/verify', {
                     code: this.code,
                     short_code: this.short_code
                 }).then(response => {
                     this.displayForm(3, true)
                     // Reset user name/email/plan, we don't have them if user used a verification link
                     this.first_name = response.data.first_name
                     this.last_name = response.data.last_name
                     this.email = response.data.email
                     this.is_domain = response.data.is_domain
                     this.voucher = response.data.voucher
 
                     // Fill the domain selector with available domains
                     if (!this.is_domain) {
                         let options = []
                         $('select#signup_domain').html('')
                         $.each(response.data.domains, (i, v) => {
                             options.push($('<option>').text(v).attr('value', v))
                         })
                         $('select#signup_domain').append(options)
                         this.domain = window.config['app.domain']
                     }
                 }).catch(error => {
                     if (bylink === true) {
                         // FIXME: display step 1, user can do nothing about it anyway
                         //        Maybe we should display 404 error page?
                         this.displayForm(1, true)
                     }
                 })
             },
             // Submits the data to the API to create the user account
             submitStep3() {
                 this.$root.clearFormValidation($('#step3 form'))
 
                 axios.post('/api/auth/signup', {
                     code: this.code,
                     short_code: this.short_code,
                     login: this.login,
                     domain: this.domain,
                     password: this.password,
                     password_confirmation: this.password_confirmation,
                     voucher: this.voucher
                 }).then(response => {
                     // auto-login and goto dashboard
                     this.$root.loginUser(response.data)
                 })
             },
             // Moves the user a step back in registration form
             stepBack(e) {
                 var card = $(e.target).closest('.card')
 
                 card.prev().removeClass('d-none').find('input').first().focus()
                 card.addClass('d-none').find('form')[0].reset()
 
                 if (card.attr('id') == 'step1') {
                     this.step0()
                     this.$router.replace({path: '/signup'})
                 }
             },
             displayForm(step, focus) {
                 [0, 1, 2, 3].filter(value => value != step).forEach(value => {
                     $('#step' + value).addClass('d-none')
                 })
 
                 if (!step) {
                     return this.step0()
                 }
 
                 $('#step' + step).removeClass('d-none')
 
                 if (focus) {
                     $('#step' + step).find('input').first().focus()
                 }
             }
         }
     }
 </script>
diff --git a/src/resources/vue/User/Info.vue b/src/resources/vue/User/Info.vue
index d4d6ee53..ab880d27 100644
--- a/src/resources/vue/User/Info.vue
+++ b/src/resources/vue/User/Info.vue
@@ -1,370 +1,373 @@
 <template>
     <div class="container">
         <status-component v-if="user_id !== 'new'" :status="status" @status-update="statusUpdate"></status-component>
 
         <div class="card" id="user-info">
             <div class="card-body">
                 <div class="card-title" v-if="user_id !== 'new'">User account</div>
                 <div class="card-title" v-if="user_id === 'new'">New user account</div>
                 <div class="card-text">
                     <form @submit.prevent="submit">
                         <div v-if="user_id !== 'new'" class="form-group row plaintext">
                             <label for="first_name" class="col-sm-4 col-form-label">Status</label>
                             <div class="col-sm-8">
                                 <span :class="$root.userStatusClass(user) + ' form-control-plaintext'" id="status">{{ $root.userStatusText(user) }}</span>
                             </div>
                         </div>
                         <div class="form-group row">
                             <label for="first_name" class="col-sm-4 col-form-label">First name</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control" id="first_name" v-model="user.first_name">
                             </div>
                         </div>
                         <div class="form-group row">
                             <label for="last_name" class="col-sm-4 col-form-label">Last name</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control" id="last_name" v-model="user.last_name">
                             </div>
                         </div>
                         <div class="form-group row">
                             <label for="organization" class="col-sm-4 col-form-label">Organization</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control" id="organization" v-model="user.organization">
                             </div>
                         </div>
                         <div class="form-group row">
                             <label for="email" class="col-sm-4 col-form-label">Email</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control" id="email" :disabled="user_id !== 'new'" required v-model="user.email">
                             </div>
                         </div>
                         <div class="form-group row">
                             <label for="aliases-input" class="col-sm-4 col-form-label">Email aliases</label>
                             <div class="col-sm-8">
                                 <list-input id="aliases" :list="user.aliases"></list-input>
                             </div>
                         </div>
                         <div class="form-group row">
                             <label for="password" class="col-sm-4 col-form-label">Password</label>
                             <div class="col-sm-8">
                                 <input type="password" class="form-control" id="password" v-model="user.password" :required="user_id === 'new'">
                             </div>
                         </div>
                         <div class="form-group row">
                             <label for="password_confirmaton" class="col-sm-4 col-form-label">Confirm password</label>
                             <div class="col-sm-8">
                                 <input type="password" class="form-control" id="password_confirmation" v-model="user.password_confirmation" :required="user_id === 'new'">
                             </div>
                         </div>
                         <div v-if="user_id === 'new'" id="user-packages" class="form-group row">
                             <label class="col-sm-4 col-form-label">Package</label>
                             <div class="col-sm-8">
                                 <table class="table table-sm form-list">
                                     <thead class="thead-light sr-only">
                                         <tr>
                                             <th scope="col"></th>
                                             <th scope="col">Package</th>
                                             <th scope="col">Price</th>
                                             <th scope="col"></th>
                                         </tr>
                                     </thead>
                                     <tbody>
                                         <tr v-for="pkg in packages" :id="'p' + pkg.id" :key="pkg.id">
                                             <td class="selection">
                                                 <input type="checkbox" @click="selectPackage"
                                                        :value="pkg.id"
                                                        :checked="pkg.id == package_id"
                                                        :id="'pkg-input-' + pkg.id"
                                                 >
                                             </td>
                                             <td class="name">
                                                 <label :for="'pkg-input-' + pkg.id">{{ pkg.name }}</label>
                                             </td>
                                             <td class="price text-nowrap">
                                                 {{ $root.priceLabel(pkg.cost, 1, discount) }}
                                             </td>
                                             <td class="buttons">
                                                 <button v-if="pkg.description" type="button" class="btn btn-link btn-lg p-0" v-tooltip.click="pkg.description">
                                                     <svg-icon icon="info-circle"></svg-icon>
                                                     <span class="sr-only">More information</span>
                                                 </button>
                                             </td>
                                         </tr>
                                     </tbody>
                                 </table>
                                 <small v-if="discount > 0" class="hint">
                                     <hr class="m-0">
                                     &sup1; applied discount: {{ discount }}% - {{ discount_description }}
                                 </small>
                             </div>
                         </div>
                         <div v-if="user_id !== 'new'" id="user-skus" class="form-group row">
                             <label class="col-sm-4 col-form-label">Subscriptions</label>
                             <div class="col-sm-8">
                                 <table class="table table-sm form-list">
                                     <thead class="thead-light sr-only">
                                         <tr>
                                             <th scope="col"></th>
                                             <th scope="col">Subscription</th>
                                             <th scope="col">Price</th>
                                             <th scope="col"></th>
                                         </tr>
                                     </thead>
                                     <tbody>
                                         <tr v-for="sku in skus" :id="'s' + sku.id" :key="sku.id">
                                             <td class="selection">
                                                 <input type="checkbox" @input="onInputSku"
                                                        :value="sku.id"
                                                        :disabled="sku.readonly"
                                                        :checked="sku.enabled"
                                                        :id="'sku-input-' + sku.title"
                                                 >
                                             </td>
                                             <td class="name">
                                                 <label :for="'sku-input-' + sku.title">{{ sku.name }}</label>
                                                 <div v-if="sku.range" class="range-input">
                                                     <label class="text-nowrap">{{ sku.range.min }} {{ sku.range.unit }}</label>
                                                     <input
                                                         type="range" class="custom-range" @input="rangeUpdate"
                                                         :value="sku.value || sku.range.min"
                                                         :min="sku.range.min"
                                                         :max="sku.range.max"
                                                     >
                                                 </div>
                                             </td>
                                             <td class="price text-nowrap">
                                                 {{ $root.priceLabel(sku.cost, 1, discount) }}
                                             </td>
                                             <td class="buttons">
                                                 <button v-if="sku.description" type="button" class="btn btn-link btn-lg p-0" v-tooltip.click="sku.description">
                                                     <svg-icon icon="info-circle"></svg-icon>
                                                     <span class="sr-only">More information</span>
                                                 </button>
                                             </td>
                                         </tr>
                                     </tbody>
                                 </table>
                                 <small v-if="discount > 0" class="hint">
                                     <hr class="m-0">
                                     &sup1; applied discount: {{ discount }}% - {{ discount_description }}
                                 </small>
                             </div>
                         </div>
                         <button class="btn btn-primary" type="submit"><svg-icon icon="check"></svg-icon> Submit</button>
                     </form>
                 </div>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     import ListInput from '../Widgets/ListInput'
     import StatusComponent from '../Widgets/Status'
 
     export default {
         components: {
             ListInput,
             StatusComponent
         },
         data() {
             return {
                 discount: 0,
                 discount_description: '',
                 user_id: null,
                 user: { aliases: [] },
                 packages: [],
                 package_id: null,
                 skus: [],
                 status: {}
             }
         },
         created() {
             this.user_id = this.$route.params.user
 
             let wallet = this.$store.state.authInfo.accounts[0]
 
             if (!wallet) {
                 wallet = this.$store.state.authInfo.wallets[0]
             }
 
             if (wallet && wallet.discount) {
                 this.discount = wallet.discount
                 this.discount_description = wallet.discount_description
             }
 
             this.$root.startLoading()
 
             if (this.user_id === 'new') {
                 // do nothing (for now)
                 axios.get('/api/v4/packages')
                     .then(response => {
                         this.$root.stopLoading()
 
                         this.packages = response.data.filter(pkg => !pkg.isDomain)
                         this.package_id = this.packages[0].id
                     })
                     .catch(this.$root.errorHandler)
             }
             else {
                 axios.get('/api/v4/users/' + this.user_id)
                     .then(response => {
                         this.$root.stopLoading()
 
                         this.user = response.data
                         this.user.first_name = response.data.settings.first_name
                         this.user.last_name = response.data.settings.last_name
                         this.user.organization = response.data.settings.organization
                         this.discount = this.user.wallet.discount
                         this.discount_description = this.user.wallet.discount_description
                         this.status = response.data.statusInfo
 
-                        axios.get('/api/v4/skus')
+                        axios.get('/api/v4/users/' + this.user_id + '/skus?type=user')
                             .then(response => {
                                 // "merge" SKUs with user entitlement-SKUs
                                 this.skus = response.data
-                                    .filter(sku => sku.type == 'user')
                                     .map(sku => {
                                         if (sku.id in this.user.skus) {
                                             sku.enabled = true
                                             sku.value = this.user.skus[sku.id].count
                                         } else if (!sku.readonly) {
                                             sku.enabled = false
                                         }
 
                                         return sku
                                     })
 
                                 // Update all range inputs (and price)
                                 this.$nextTick(() => {
                                     $('#user-skus input[type=range]').each((idx, elem) => { this.rangeUpdate(elem) })
                                 })
                             })
                             .catch(this.$root.errorHandler)
                     })
                     .catch(this.$root.errorHandler)
             }
         },
         mounted() {
             $('#first_name').focus()
         },
         methods: {
             submit() {
                 this.$root.clearFormValidation($('#user-info form'))
 
                 let method = 'post'
                 let location = '/api/v4/users'
 
                 if (this.user_id !== 'new') {
                     method = 'put'
                     location += '/' + this.user_id
 
                     let skus = {}
                     $('#user-skus input[type=checkbox]:checked').each((idx, input) => {
                         let id = $(input).val()
                         let range = $(input).parents('tr').first().find('input[type=range]').val()
 
                         skus[id] = range || 1
                     })
                     this.user.skus = skus
                 } else {
                     this.user.package = this.package_id
                 }
 
                 axios[method](location, this.user)
                     .then(response => {
+                        if (response.data.statusInfo) {
+                            this.$store.state.authInfo.statusInfo = response.data.statusInfo
+                        }
+
                         this.$toast.success(response.data.message)
                         this.$router.push({ name: 'users' })
                     })
             },
             onInputSku(e) {
                 let input = e.target
                 let sku = this.findSku(input.value)
                 let required = []
 
                 // We use 'readonly', not 'disabled', because we might want to handle
                 // input events. For example to display an error when someone clicks
                 // the locked input
                 if (input.readOnly) {
                     input.checked = !input.checked
                     // TODO: Display an alert explaining why it's locked
                     return
                 }
 
                 // TODO: Following code might not work if we change definition of forbidden/required
                 //       or we just need more sophisticated SKU dependency rules
 
                 if (input.checked) {
                     // Check if a required SKU is selected, alert the user if not
                     (sku.required || []).forEach(title => {
                         this.skus.forEach(item => {
                             let checkbox
                             if (item.handler == title && (checkbox = $('#s' + item.id).find('input[type=checkbox]')[0])) {
                                 if (!checkbox.checked) {
                                     required.push(item.name)
                                 }
                             }
                         })
                     })
 
                     if (required.length) {
                         input.checked = false
                         return alert(sku.name + ' requires ' + required.join(', ') + '.')
                     }
                 } else {
                     // Uncheck all dependent SKUs, e.g. when unchecking Groupware we also uncheck Activesync
                     // TODO: Should we display an alert instead?
                     this.skus.forEach(item => {
                         if (item.required && item.required.indexOf(sku.handler) > -1) {
                             $('#s' + item.id).find('input[type=checkbox]').prop('checked', false)
                         }
                     })
                 }
 
                 // Uncheck+lock/unlock conflicting SKUs
                 (sku.forbidden || []).forEach(title => {
                     this.skus.forEach(item => {
                         let checkbox
                         if (item.handler == title && (checkbox = $('#s' + item.id).find('input[type=checkbox]')[0])) {
                             if (input.checked) {
                                 checkbox.checked = false
                                 checkbox.readOnly = true
                             } else {
                                 checkbox.readOnly = false
                             }
                         }
                     })
                 })
             },
             selectPackage(e) {
                 // Make sure there always is only one package selected
                 $('#user-packages input').prop('checked', false)
                 this.package_id = $(e.target).prop('checked', false).val()
             },
             rangeUpdate(e) {
                 let input = $(e.target || e)
                 let value = input.val()
                 let record = input.parents('tr').first()
                 let sku_id = record.find('input[type=checkbox]').val()
                 let sku = this.findSku(sku_id)
                 let cost = sku.cost
 
                 // Update the label
                 input.prev().text(value + ' ' + sku.range.unit)
 
                 // Update the price
                 record.find('.price').text(this.$root.priceLabel(cost, value - sku.units_free, this.discount))
             },
             findSku(id) {
                 for (let i = 0; i < this.skus.length; i++) {
                     if (this.skus[i].id == id) {
                         return this.skus[i];
                     }
                 }
             },
             statusUpdate(user) {
                 this.user = Object.assign({}, this.user, user)
             }
         }
     }
 </script>
diff --git a/src/resources/vue/User/ProfileDelete.vue b/src/resources/vue/User/ProfileDelete.vue
index 6c1174dc..a589ec1e 100644
--- a/src/resources/vue/User/ProfileDelete.vue
+++ b/src/resources/vue/User/ProfileDelete.vue
@@ -1,49 +1,56 @@
 <template>
     <div class="container">
         <div class="card" id="user-delete">
             <div class="card-body">
                 <div class="card-title">Delete this account?</div>
                 <div class="card-text">
                     <p>This will delete the account as well as all domains, users and aliases associated with this account.
                         <strong>This operation is irreversible</strong>.</p>
                     <p>As you will not be able to recover anything after this point, please make sure
                         that you have migrated all data before proceeding.</p>
-                    <p>As we always strive to improve, we would like to ask for 2 minutes of your time.
+                    <p v-if="supportEmail">
+                        As we always strive to improve, we would like to ask for 2 minutes of your time.
                         The best tool for improvement is feedback from users, and we would like to ask
                         for a few words about your reasons for leaving our service. Please send your feedback
-                        to support@kolabnow.com.</p>
-                    <p>Also feel free to contact Kolab Now Support at support@kolabnow.com with any questions
+                        to <a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>.
+                    </p>
+                    <p>Also feel free to contact {{ $root.appName }} Support with any questions
                         or concerns that you may have in this context.</p>
                     <button class="btn btn-secondary button-cancel" @click="$router.go(-1)">Cancel</button>
                     <button class="btn btn-danger button-delete" @click="deleteProfile">
                         <svg-icon icon="trash-alt"></svg-icon> Delete account
                     </button>
                 </div>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     export default {
+        data() {
+            return {
+                supportEmail: window.config['app.support_email']
+            }
+        },
         created() {
             if (!this.$root.isController(this.$store.state.authInfo.wallet.id)) {
                 this.$root.errorPage(403)
             }
         },
         mounted() {
             $('button.btn-secondary').focus()
         },
         methods: {
             deleteProfile() {
                 axios.delete('/api/v4/users/' + this.$store.state.authInfo.id)
                     .then(response => {
                         if (response.data.status == 'success') {
                             this.$root.logoutUser()
                             this.$toast.success(response.data.message)
                         }
                     })
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Wallet.vue b/src/resources/vue/Wallet.vue
index 6cad58c7..fc71405c 100644
--- a/src/resources/vue/Wallet.vue
+++ b/src/resources/vue/Wallet.vue
@@ -1,339 +1,473 @@
 <template>
     <div class="container" dusk="wallet-component">
         <div v-if="wallet.id" id="wallet" class="card">
             <div class="card-body">
                 <div class="card-title">Account balance <span :class="wallet.balance < 0 ? 'text-danger' : 'text-success'">{{ $root.price(wallet.balance, wallet.currency) }}</span></div>
                 <div class="card-text">
                     <p v-if="wallet.notice" id="wallet-notice">{{ wallet.notice }}</p>
-                    <p>Add credit to your account or setup an automatic payment by using the button below.</p>
-                    <button type="button" class="btn btn-primary" @click="paymentDialog()">Add credit</button>
+
+                    <div v-if="showPendingPayments" class="alert alert-warning">
+                        You have payments that are still in progress. See the "Pending Payments" tab below.
+                    </div>
+                    <p>
+                        <button type="button" class="btn btn-primary" @click="paymentMethodForm('manual')">Add credit</button>
+                    </p>
+                    <div id="mandate-form" v-if="!mandate.isValid && !mandate.isPending">
+                        <template v-if="mandate.id && !mandate.isValid">
+                            <div class="alert alert-danger">
+                                The setup of automatic payments failed. Restart the process to enable automatic top-ups.
+                            </div>
+                            <button type="button" class="btn btn-danger" @click="autoPaymentDelete">Cancel auto-payment</button>
+                        </template>
+                        <button type="button" class="btn btn-primary" @click="paymentMethodForm('auto')">Set up auto-payment</button>
+                    </div>
+                    <div id="mandate-info" v-else>
+                        <div v-if="mandate.isDisabled" class="disabled-mandate alert alert-danger">
+                            The configured auto-payment has been disabled. Top up your wallet or
+                            raise the auto-payment amount.
+                        </div>
+                        <template v-else>
+                            <p>
+                                Auto-payment is <b>set</b> to fill up your account by <b>{{ mandate.amount }} CHF</b>
+                                every time your account balance gets under <b>{{ mandate.balance }} CHF</b>.
+                            </p>
+                            <p>
+                                Method of payment: {{ mandate.method }}
+                            </p>
+                        </template>
+                        <div v-if="mandate.isPending" class="alert alert-warning">
+                            The setup of the automatic payment is still in progress.
+                        </div>
+                        <p>
+                            <button type="button" class="btn btn-danger" @click="autoPaymentDelete">Cancel auto-payment</button>
+                            <button type="button" class="btn btn-primary" @click="autoPaymentChange">Change auto-payment</button>
+                        </p>
+                    </div>
                 </div>
             </div>
         </div>
 
         <ul class="nav nav-tabs mt-3" role="tablist">
             <li class="nav-item">
                 <a class="nav-link active" id="tab-receipts" href="#wallet-receipts" role="tab" aria-controls="wallet-receipts" aria-selected="true">
                     Receipts
                 </a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" id="tab-history" href="#wallet-history" role="tab" aria-controls="wallet-history" aria-selected="false">
                     History
                 </a>
             </li>
+            <li v-if="showPendingPayments" class="nav-item">
+                <a class="nav-link" id="tab-payments" href="#wallet-payments" role="tab" aria-controls="wallet-payments" aria-selected="false">
+                    Pending Payments
+                </a>
+            </li>
         </ul>
         <div class="tab-content">
-            <div class="tab-pane show active" id="wallet-receipts" role="tabpanel" aria-labelledby="tab-receipts">
+            <div class="tab-pane active" id="wallet-receipts" role="tabpanel" aria-labelledby="tab-receipts">
                 <div class="card-body">
                     <div class="card-text">
                         <p v-if="receipts.length">
                             Here you can download receipts (in PDF format) for payments in specified period.
                             Select the period and press the Download button.
                         </p>
                         <div v-if="receipts.length" class="input-group">
                             <select id="receipt-id" class="form-control">
                                 <option v-for="(receipt, index) in receipts" :key="index" :value="receipt">{{ receipt }}</option>
                             </select>
                             <div class="input-group-append">
                                 <button type="button" class="btn btn-secondary" @click="receiptDownload">
                                     <svg-icon icon="download"></svg-icon> Download
                                 </button>
                             </div>
                         </div>
                         <p v-if="!receipts.length">
                             There are no receipts for payments in this account. Please, note that you can download
                             receipts after the month ends.
                         </p>
                     </div>
                 </div>
             </div>
-            <div class="tab-pane show" id="wallet-history" role="tabpanel" aria-labelledby="tab-history">
+            <div class="tab-pane" id="wallet-history" role="tabpanel" aria-labelledby="tab-history">
                 <div class="card-body">
                     <transaction-log v-if="walletId && loadTransactions" class="card-text" :wallet-id="walletId"></transaction-log>
                 </div>
             </div>
+            <div class="tab-pane" id="wallet-payments" role="tabpanel" aria-labelledby="tab-payments">
+                <div class="card-body">
+                    <payment-log v-if="walletId && loadPayments" class="card-text" :wallet-id="walletId"></payment-log>
+                </div>
+            </div>
         </div>
 
         <div id="payment-dialog" class="modal" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">{{ paymentDialogTitle }}</h5>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
                     </div>
                     <div class="modal-body">
-                        <div id="payment" v-if="paymentForm == 'init'">
+                        <div id="payment-method" v-if="paymentForm == 'method'">
+                            <form data-validation-prefix="mandate_">
+                                <div id="payment-method-selection">
+                                    <a :id="method.id" v-for="method in paymentMethods" :key="method.id" @click="selectPaymentMethod(method)" href="#" class="card link-profile">
+                                        <svg-icon v-if="method.icon" :icon="[method.icon.prefix, method.icon.name]" />
+                                        <img v-if="method.image" v-bind:src="method.image" />
+                                        <span class="name">{{ method.name }}</span>
+                                    </a>
+                                </div>
+                            </form>
+                        </div>
+                        <div id="manual-payment" v-if="paymentForm == 'manual'">
+                            <p v-if="wallet.currency != selectedPaymentMethod.currency">
+                                Here is how it works: You specify the amount by which you want to to up your wallet in {{ wallet.currency }}.
+                                We will then convert this to {{ selectedPaymentMethod.currency }}, and on the next page you will be provided with the bank-details
+                                to transfer the amount in {{ selectedPaymentMethod.currency }}.
+                            </p>
+                            <p v-if="selectedPaymentMethod.id == 'banktransfer'">
+                                Please note that a bank transfer can take several days to complete.
+                            </p>
                             <p>Choose the amount by which you want to top up your wallet.</p>
                             <form id="payment-form" @submit.prevent="payment">
                                 <div class="form-group">
                                     <div class="input-group">
                                         <input type="text" class="form-control" id="amount" v-model="amount" required>
                                         <span class="input-group-append">
                                             <span class="input-group-text">{{ wallet.currency }}</span>
                                         </span>
                                     </div>
                                 </div>
-                                <div class="w-100 text-center">
-                                    <button type="submit" class="btn btn-primary">
-                                        <svg-icon :icon="['far', 'credit-card']"></svg-icon> Continue
-                                    </button>
+                                <div v-if="wallet.currency != selectedPaymentMethod.currency && !isNaN(amount)" class="alert alert-warning">
+                                    You will be charged for {{ $root.price(amount * selectedPaymentMethod.exchangeRate * 100, selectedPaymentMethod.currency) }}
                                 </div>
                             </form>
-                            <div class="form-separator"><hr><span>or</span></div>
-                            <div id="mandate-form" v-if="!mandate.id">
-                                <p>Add auto-payment, so you never run out.</p>
-                                <div class="w-100 text-center">
-                                    <button type="button" class="btn btn-primary" @click="autoPaymentForm">Set up auto-payment</button>
-                                </div>
-                            </div>
-                            <div id="mandate-info" v-if="mandate.id">
-                                <p>Auto-payment is set to fill up your account by <b>{{ mandate.amount }} CHF</b>
-                                    every time your account balance gets under <b>{{ mandate.balance }} CHF</b>.
-                                    You will be charged via {{ mandate.method }}.
-                                </p>
-                                <p v-if="mandate.isDisabled" class="disabled-mandate text-danger">
-                                    The configured auto-payment has been disabled. Top up your wallet or
-                                    raise the auto-payment amount.
-                                </p>
-                                <p>You can cancel or change the auto-payment at any time.</p>
-                                <div class="form-group d-flex justify-content-around">
-                                    <button type="button" class="btn btn-danger" @click="autoPaymentDelete">Cancel auto-payment</button>
-                                    <button type="button" class="btn btn-primary" @click="autoPaymentChange">Change auto-payment</button>
-                                </div>
-                            </div>
                         </div>
                         <div id="auto-payment" v-if="paymentForm == 'auto'">
                             <form data-validation-prefix="mandate_">
-                                <p>Here is how it works: Every time your account runs low,
+                                <p>
+                                    Here is how it works: Every time your account runs low,
                                     we will charge your preferred payment method for an amount you choose.
                                     You can cancel or change the auto-payment option at any time.
                                 </p>
                                 <div class="form-group row">
                                     <label for="mandate_amount" class="col-sm-6 col-form-label">Fill up by</label>
                                     <div class="input-group col-sm-6">
                                         <input type="text" class="form-control" id="mandate_amount" v-model="mandate.amount" required>
                                         <span class="input-group-append">
                                             <span class="input-group-text">{{ wallet.currency }}</span>
                                         </span>
                                     </div>
                                 </div>
                                 <div class="form-group row">
                                     <label for="mandate_balance" class="col-sm-6 col-form-label">when account balance is below</label>
                                     <div class="col-sm-6">
                                         <div class="input-group">
                                             <input type="text" class="form-control" id="mandate_balance" v-model="mandate.balance" required>
                                             <span class="input-group-append">
                                                 <span class="input-group-text">{{ wallet.currency }}</span>
                                             </span>
                                         </div>
                                     </div>
                                 </div>
-                                <p v-if="!mandate.id">
+                                <p v-if="!mandate.isValid">
                                     Next, you will be redirected to the checkout page, where you can provide
                                     your credit card details.
                                 </p>
-                                <p v-if="mandate.isDisabled" class="disabled-mandate text-danger">
+                                <div v-if="mandate.isValid && mandate.isDisabled" class="disabled-mandate alert alert-danger">
                                     The auto-payment is disabled. Immediately after you submit new settings we'll
-                                    attempt to top up your wallet.
-                                </p>
+                                    enable it and attempt to top up your wallet.
+                                </div>
                             </form>
                         </div>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary modal-cancel" data-dismiss="modal">Cancel</button>
-                        <button type="button" class="btn btn-primary modal-action" v-if="paymentForm == 'auto' && mandate.id" @click="autoPayment">
+                        <button type="button" class="btn btn-primary modal-action"
+                                v-if="paymentForm == 'auto' && (mandate.isValid || mandate.isPending)"
+                                @click="autoPayment"
+                        >
                             <svg-icon icon="check"></svg-icon> Submit
                         </button>
-                        <button type="button" class="btn btn-primary modal-action" v-if="paymentForm == 'auto' && !mandate.id" @click="autoPayment">
-                            <svg-icon :icon="['far', 'credit-card']"></svg-icon> Continue
+                        <button type="button" class="btn btn-primary modal-action"
+                                v-if="paymentForm == 'auto' && !mandate.isValid && !mandate.isPending"
+                                @click="autoPayment"
+                        >
+                            <svg-icon icon="check"></svg-icon> Continue
+                        </button>
+                        <button type="button" class="btn btn-primary modal-action"
+                                v-if="paymentForm == 'manual'"
+                                @click="payment"
+                        >
+                            <svg-icon icon="check"></svg-icon> Continue
                         </button>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </template>
 
 <script>
     import TransactionLog from './Widgets/TransactionLog'
+    import PaymentLog from './Widgets/PaymentLog'
 
     export default {
         components: {
-            TransactionLog
+            TransactionLog,
+            PaymentLog
         },
         data() {
             return {
                 amount: '',
-                mandate: { amount: 10, balance: 0 },
+                mandate: { amount: 10, balance: 0, method: null },
                 paymentDialogTitle: null,
-                paymentForm: 'init',
+                paymentForm: null,
+                nextForm: null,
                 receipts: [],
                 stripe: null,
                 loadTransactions: false,
+                loadPayments: false,
+                showPendingPayments: false,
                 wallet: {},
-                walletId: null
+                walletId: null,
+                paymentMethods: [],
+                selectedPaymentMethod: null
             }
         },
         mounted() {
             $('#wallet button').focus()
 
             this.walletId = this.$store.state.authInfo.wallets[0].id
 
             this.$root.startLoading()
             axios.get('/api/v4/wallets/' + this.walletId)
                 .then(response => {
                     this.$root.stopLoading()
                     this.wallet = response.data
 
                     const receiptsTab = $('#wallet-receipts')
 
                     this.$root.addLoader(receiptsTab)
                     axios.get('/api/v4/wallets/' + this.walletId + '/receipts')
                         .then(response => {
                             this.$root.removeLoader(receiptsTab)
                             this.receipts = response.data.list
                         })
                         .catch(error => {
                             this.$root.removeLoader(receiptsTab)
                         })
 
                     if (this.wallet.provider == 'stripe') {
                         this.stripeInit()
                     }
                 })
                 .catch(this.$root.errorHandler)
 
+            this.loadMandate()
+
+            axios.get('/api/v4/payments/has-pending')
+                .then(response => {
+                    this.showPendingPayments = response.data.hasPending
+                })
+
+        },
+        updated() {
             $(this.$el).find('ul.nav-tabs a').on('click', e => {
                 e.preventDefault()
                 $(e.target).tab('show')
                 if ($(e.target).is('#tab-history')) {
                     this.loadTransactions = true
                 }
+                if ($(e.target).is('#tab-payments')) {
+                    this.loadPayments = true
+                }
             })
         },
         methods: {
-            paymentDialog() {
-                const dialog = $('#payment-dialog')
+            loadMandate() {
                 const mandate_form = $('#mandate-form')
 
                 this.$root.removeLoader(mandate_form)
 
-                if (!this.mandate.id) {
+                if (!this.mandate.id || this.mandate.isPending) {
                     this.$root.addLoader(mandate_form)
                     axios.get('/api/v4/payments/mandate')
                         .then(response => {
                             this.$root.removeLoader(mandate_form)
                             this.mandate = response.data
                         })
                         .catch(error => {
                             this.$root.removeLoader(mandate_form)
                         })
                 }
+            },
+            selectPaymentMethod(method) {
+                this.formLock = false
 
-                this.paymentForm = 'init'
-                this.paymentDialogTitle = 'Top up your wallet'
+                this.selectedPaymentMethod = method
 
-                this.dialog = dialog.on('shown.bs.modal', () => {
-                        dialog.find('#amount').focus()
-                    }).modal()
+                this.paymentForm = this.nextForm
+                this.formLock = false
+
+                setTimeout(() => {
+                    this.dialog.find('#mandate_amount').focus()
+                    this.dialog.find('#amount').focus()
+                }, 10)
             },
             payment() {
+                if (this.formLock) {
+                    return
+                }
+
+                // Lock the form to prevent from double submission
+                this.formLock = true
+                let onFinish = () => { this.formLock = false }
+
                 this.$root.clearFormValidation($('#payment-form'))
 
-                axios.post('/api/v4/payments', {amount: this.amount})
+                axios.post('/api/v4/payments', {amount: this.amount, methodId: this.selectedPaymentMethod.id, currency: this.selectedPaymentMethod.currency}, { onFinish })
                     .then(response => {
                         if (response.data.redirectUrl) {
                             location.href = response.data.redirectUrl
                         } else {
                             this.stripeCheckout(response.data)
                         }
                     })
             },
             autoPayment() {
-                const method = this.mandate.id ? 'put' : 'post'
-                const post = {
+                if (this.formLock) {
+                    return
+                }
+
+                // Lock the form to prevent from double submission
+                this.formLock = true
+                let onFinish = () => { this.formLock = false }
+
+                const method = this.mandate.id && (this.mandate.isValid || this.mandate.isPending) ? 'put' : 'post'
+                let post = {
                     amount: this.mandate.amount,
-                    balance: this.mandate.balance
+                    balance: this.mandate.balance,
+                }
+
+                // Modifications can't change the method of payment
+                if (this.selectedPaymentMethod) {
+                    post['methodId'] = this.selectedPaymentMethod.id;
+                    post['currency'] = this.selectedPaymentMethod.currency;
                 }
 
                 this.$root.clearFormValidation($('#auto-payment form'))
 
-                axios[method]('/api/v4/payments/mandate', post)
+                axios[method]('/api/v4/payments/mandate', post, { onFinish })
                     .then(response => {
                         if (method == 'post') {
+                            this.mandate.id = null
                             // a new mandate, redirect to the chackout page
                             if (response.data.redirectUrl) {
                                 location.href = response.data.redirectUrl
                             } else if (response.data.id) {
                                 this.stripeCheckout(response.data)
                             }
                         } else {
                             // an update
                             if (response.data.status == 'success') {
                                 this.dialog.modal('hide');
                                 this.mandate = response.data
                                 this.$toast.success(response.data.message)
                             }
                         }
                     })
             },
             autoPaymentChange(event) {
                 this.autoPaymentForm(event, 'Update auto-payment')
             },
             autoPaymentDelete() {
                 axios.delete('/api/v4/payments/mandate')
                     .then(response => {
                         this.mandate = { amount: 10, balance: 0 }
                         if (response.data.status == 'success') {
                             this.$toast.success(response.data.message)
                         }
                     })
             },
+
+            paymentMethodForm(nextForm) {
+                const dialog = $('#payment-dialog')
+                this.formLock = false
+                this.paymentMethods = []
+
+                this.paymentForm = 'method'
+                this.nextForm = nextForm
+                if (nextForm == 'auto') {
+                    this.paymentDialogTitle = 'Add auto-payment'
+                } else {
+                    this.paymentDialogTitle = 'Top up your wallet'
+                }
+
+                const methods = $('#payment-method')
+                this.$root.addLoader(methods, false)
+                axios.get('/api/v4/payments/methods', {params: {type: nextForm == 'manual' ? 'oneoff' : 'recurring'}})
+                    .then(response => {
+                        this.$root.removeLoader(methods)
+                        this.paymentMethods = response.data
+                    })
+                    .catch(this.$root.errorHandler)
+
+                this.dialog = dialog.on('shown.bs.modal', () => {}).modal()
+            },
             autoPaymentForm(event, title) {
+                const dialog = $('#payment-dialog')
+
                 this.paymentForm = 'auto'
-                this.paymentDialogTitle = title || 'Add auto-payment'
+                this.paymentDialogTitle = title
+                this.formLock = false
+
+                this.dialog = dialog.on('shown.bs.modal', () => {
+                    dialog.find('#mandate_amount').focus()
+                }).modal()
+
                 setTimeout(() => { this.dialog.find('#mandate_amount').focus()}, 10)
             },
             receiptDownload() {
                 const receipt = $('#receipt-id').val()
                 this.$root.downloadFile('/api/v4/wallets/' + this.walletId + '/receipts/' + receipt)
             },
             stripeInit() {
                 let script = $('#stripe-script')
 
                 if (!script.length) {
                     script = document.createElement('script')
 
                     script.onload = () => {
                         this.stripe = Stripe(window.config.stripePK)
                     }
 
                     script.id = 'stripe-script'
                     script.src = 'https://js.stripe.com/v3/'
 
                     document.getElementsByTagName('head')[0].appendChild(script)
                 } else {
                     this.stripe = Stripe(window.config.stripePK)
                 }
             },
             stripeCheckout(data) {
                 if (!this.stripe) {
                     return
                 }
 
                 this.stripe.redirectToCheckout({
                     sessionId: data.id
                 }).then(result => {
                     // If it fails due to a browser or network error,
                     // display the localized error message to the user
                     if (result.error) {
                         this.$toast.error(result.error.message)
                     }
                 })
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Widgets/Menu.vue b/src/resources/vue/Widgets/Menu.vue
index b4ca9e74..8ebd6285 100644
--- a/src/resources/vue/Widgets/Menu.vue
+++ b/src/resources/vue/Widgets/Menu.vue
@@ -1,79 +1,99 @@
 <template>
     <nav :id="mode + '-menu'" class="navbar navbar-expand-lg navbar-light">
         <div class="container">
-            <router-link class="navbar-brand" :to="{ name: 'dashboard' }">
-                <img :src="app_url + '/images/logo_' + mode + '.png'" :alt="app_name">
-            </router-link>
+            <router-link class="navbar-brand" to="/" v-html="$root.logo(mode)"></router-link>
             <button v-if="mode == 'header'" class="navbar-toggler" type="button"
                     data-toggle="collapse" :data-target="'#' + mode + '-menu-navbar'"
                     aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"
             >
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div :id="mode + '-menu-navbar'" :class="'navbar' + (mode == 'header' ? ' collapse navbar-collapse' : '')">
                 <ul class="navbar-nav">
-                    <li class="nav-item" v-if="!logged_in">
-                        <router-link v-if="!$root.isAdmin" class="nav-link link-signup" active-class="active" :to="{name: 'signup'}">Signup</router-link>
-                        <a v-else class="nav-link link-signup" :href="app_url + '/signup'">Signup</a>
+                    <li class="nav-item" v-for="item in menu()" :key="item.index">
+                        <a v-if="item.href" :class="'nav-link link-' + item.index" :href="item.href">{{ item.title }}</a>
+                        <router-link v-if="item.to"
+                                     :class="'nav-link link-' + item.index"
+                                     active-class="active"
+                                     :to="item.to"
+                                     :exact="item.exact"
+                        >
+                            {{ item.title }}
+                        </router-link>
                     </li>
-                    <li class="nav-item" v-if="!logged_in">
-                        <a class="nav-link link-explore" href="https://kolabnow.com">Explore</a>
+                    <li class="nav-item" v-if="!loggedIn && !$root.isAdmin">
+                        <router-link class="nav-link link-signup" active-class="active" :to="{name: 'signup'}">Signup</router-link>
                     </li>
-                    <li class="nav-item" v-if="!logged_in">
-                        <a class="nav-link link-blog" href="https://blogs.kolabnow.com">Blog</a>
+                    <li class="nav-item" v-if="loggedIn">
+                        <router-link class="nav-link link-dashboard" active-class="active" :to="{name: 'dashboard'}">Cockpit</router-link>
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link link-support" href="https://kolabnow.com/support">Support</a>
-                    </li>
-                    <li class="nav-item" v-if="logged_in">
-                        <a class="nav-link link-contact" href="https://kolabnow.com/contact">Contact</a>
-                    </li>
-                    <li class="nav-item" v-if="!logged_in && mode == 'footer'">
-                        <a class="nav-link link-tos" href="https://kolabnow.com/tos">ToS</a>
-                    </li>
-                    <li class="nav-item" v-if="logged_in">
-                        <a class="nav-link menulogin link-webmail" href="https://kolabnow.com/apps" target="_blank">Webmail</a>
-                    </li>
-                    <li class="nav-item" v-if="logged_in">
+                    <li class="nav-item" v-if="loggedIn">
                         <router-link class="nav-link menulogin link-logout" active-class="active" :to="{name: 'logout'}">Logout</router-link>
                     </li>
-                    <li class="nav-item" v-if="!logged_in && route == 'login'">
-                        <a class="nav-link menulogin link-webmail" href="https://kolabnow.com/apps" target="_blank">Webmail</a>
-                    </li>
-                    <li class="nav-item" v-if="!logged_in && (!route || route == 'signup')">
-                        <router-link class="nav-link menulogin link-login" active-class="active" :to="{name: 'login'}">Login</router-link>
+                    <li class="nav-item" v-if="!loggedIn">
+                        <router-link class="nav-link menulogin link-login" :to="{name: 'login'}">Login</router-link>
                     </li>
                 </ul>
                 <div v-if="mode == 'footer'" class="footer">
                     <div id="footer-copyright">@ Apheleia IT AG, 2020</div>
                     <div v-if="footer" id="footer-company">{{ footer }}</div>
                 </div>
             </div>
         </div>
     </nav>
 </template>
 
 <script>
     export default {
         props: {
             mode: { type: String, default: 'header' },
             footer: { type: String, default: '' }
         },
-        data() {
-            return {
-                app_name: window.config['app.name'],
-                app_url: window.config['app.url'],
-            }
-        },
         computed: {
-            logged_in() { return this.$store.state.isLoggedIn },
+            loggedIn() { return this.$store.state.isLoggedIn },
             route() { return this.$route.name }
         },
         mounted() {
             // On mobile close the menu when the menu item is clicked
             if (this.mode == 'header') {
                 $('#header-menu .navbar').on('click', function() { $(this).removeClass('show') })
             }
+        },
+        methods: {
+            menu() {
+                let menu = []
+                const loggedIn = this.loggedIn
+
+                window.config.menu.forEach(item => {
+                    if (!item.location || !item.title) {
+                        console.error("Invalid menu entry", item)
+                        return
+                    }
+
+                    // TODO: Different menu for different loggedIn state
+
+                    if (window.isAdmin && !item.admin) {
+                        return
+                    } else if (!window.isAdmin && item.admin === 'only') {
+                        return
+                    }
+
+                    if (!item.footer || this.mode == 'footer') {
+                        if (item.location.match(/^https?:/)) {
+                            item.href = item.location
+                        } else {
+                            item.to = { path: item.location }
+                        }
+
+                        item.exact = item.location == '/'
+                        item.index = item.page || item.title.toLowerCase().replace(/\s+/g, '')
+
+                        menu.push(item)
+                    }
+                })
+
+                return menu
+            }
         }
     }
 </script>
diff --git a/src/resources/vue/Widgets/PaymentLog.vue b/src/resources/vue/Widgets/PaymentLog.vue
new file mode 100644
index 00000000..4402db39
--- /dev/null
+++ b/src/resources/vue/Widgets/PaymentLog.vue
@@ -0,0 +1,76 @@
+<template>
+    <div>
+        <table class="table table-sm m-0 payments">
+            <thead class="thead-light">
+                <tr>
+                    <th scope="col">Date</th>
+                    <th scope="col">Description</th>
+                    <th scope="col"></th>
+                    <th scope="col" class="price">Amount</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr v-for="payment in payments" :id="'log' + payment.id" :key="payment.id">
+                    <td class="datetime">{{ payment.createdAt }}</td>
+                    <td class="description">{{ payment.description }}</td>
+                    <td><a v-if="payment.checkoutUrl" v-bind:href="payment.checkoutUrl">Details</a></td>
+                    <td class="price text-success">{{ amount(payment) }}</td>
+                </tr>
+            </tbody>
+            <tfoot class="table-fake-body">
+                <tr>
+                    <td colspan="4">There are no pending payments for this account.</td>
+                </tr>
+            </tfoot>
+        </table>
+        <div class="text-center p-3" id="payments-loader" v-if="hasMore">
+            <button class="btn btn-secondary" @click="loadLog(true)">Load more</button>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+        },
+        data() {
+            return {
+                payments: [],
+                hasMore: false,
+                page: 1
+            }
+        },
+        mounted() {
+            this.loadLog()
+        },
+        methods: {
+            loadLog(more) {
+                let loader = $(this.$el)
+                let param = ''
+
+                if (more) {
+                    param = '?page=' + (this.page + 1)
+                    loader = $('#payments-loader')
+                }
+
+                this.$root.addLoader(loader)
+                axios.get('/api/v4/payments/pending' + param)
+                    .then(response => {
+                        this.$root.removeLoader(loader)
+                        // Note: In Vue we can't just use .concat()
+                        for (let i in response.data.list) {
+                            this.$set(this.payments, this.payments.length, response.data.list[i])
+                        }
+                        this.hasMore = response.data.hasMore
+                        this.page = response.data.page || 1
+                    })
+                    .catch(error => {
+                        this.$root.removeLoader(loader)
+                    })
+            },
+            amount(payment) {
+                return this.$root.price(payment.amount)
+            }
+        }
+    }
+</script>
diff --git a/src/resources/vue/Widgets/Status.vue b/src/resources/vue/Widgets/Status.vue
index 241f1794..dbf6a476 100644
--- a/src/resources/vue/Widgets/Status.vue
+++ b/src/resources/vue/Widgets/Status.vue
@@ -1,185 +1,198 @@
 <template>
     <div v-if="!state.isReady" id="status-box" :class="'p-4 mb-3 rounded process-' + className">
         <div v-if="state.step != 'domain-confirmed'" class="d-flex align-items-start">
             <p id="status-body" class="flex-grow-1">
                 <span v-if="scope == 'dashboard'">We are preparing your account.</span>
                 <span v-else-if="scope == 'domain'">We are preparing the domain.</span>
                 <span v-else>We are preparing the user account.</span>
                 <br>
                 Some features may be missing or readonly at the moment.<br>
                 <span id="refresh-text" v-if="refresh">The process never ends? Press the "Refresh" button, please.</span>
             </p>
             <button v-if="refresh" id="status-refresh" href="#" class="btn btn-secondary" @click="statusRefresh">
                 <svg-icon icon="sync-alt"></svg-icon> Refresh
             </button>
         </div>
         <div v-else class="d-flex align-items-start">
             <p id="status-body" class="flex-grow-1">
                 <span v-if="scope == 'dashboard'">Your account is almost ready.</span>
                 <span v-else-if="scope == 'domain'">The domain is almost ready.</span>
                 <span v-else>The user account is almost ready.</span>
                 <br>
                 Verify your domain to finish the setup process.
             </p>
             <div v-if="scope == 'domain'">
                 <button id="status-verify" class="btn btn-secondary text-nowrap" @click="confirmDomain">
                     <svg-icon icon="sync-alt"></svg-icon> Verify
                 </button>
             </div>
             <div v-else-if="state.link && scope != 'domain'">
                 <router-link id="status-link" class="btn btn-secondary" :to="{ path: state.link }">Verify domain</router-link>
             </div>
         </div>
 
         <div class="status-progress text-center">
             <div class="progress">
                 <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
             </div>
             <span class="progress-label">{{ state.title || 'Initializing...' }}</span>
         </div>
     </div>
 </template>
 
 <script>
     export default {
         props: {
             status: { type: Object, default: () => {} }
         },
         data() {
             return {
                 className: 'pending',
                 refresh: false,
                 delay: 5000,
                 scope: 'user',
-                state: { isReady: true }
+                state: { isReady: true },
+                waiting: 0,
             }
         },
         watch: {
             // We use property watcher because parent component
             // might set the property with a delay and we need to parse it
+            // FIXME: Problem with this and update-status event is that whenever
+            //        we emit the event a watcher function is executed, causing
+            //        duplicate parseStatusInfo() calls. Fortunaltely this does not
+            //        cause duplicate http requests.
             status: function (val, oldVal) {
                 this.parseStatusInfo(val)
             }
         },
         destroyed() {
             clearTimeout(window.infoRequest)
         },
         mounted() {
             this.scope = this.$route.name
         },
         methods: {
             // Displays account status information
             parseStatusInfo(info) {
                 if (info) {
                     if (!info.isReady) {
                         let failedCount = 0
                         let allCount = info.process.length
 
                         info.process.forEach((step, idx) => {
                             if (!step.state) {
                                 failedCount++
 
                                 if (!info.title) {
                                     info.title = step.title
                                     info.step = step.label
                                     info.link = step.link
                                 }
                             }
                         })
 
                         info.percent = Math.floor((allCount - failedCount) / allCount * 100);
                     }
 
                     this.state = info || {}
 
                     this.$nextTick(function() {
                         $(this.$el).find('.progress-bar')
                             .css('width', info.percent + '%')
                             .attr('aria-valuenow', info.percent)
                     })
 
                     // Unhide the Refresh button, the process is in failure state
-                    this.refresh = info.processState == 'failed'
+                    this.refresh = info.processState == 'failed' && this.waiting == 0
 
                     if (this.refresh || info.step == 'domain-confirmed') {
                         this.className = 'failed'
                     }
+
+                    // A async job has been dispatched, switch to a waiting mode where
+                    // we hide the Refresh button and pull status for about a minute,
+                    // after that we switch to normal mode, i.e. user can Refresh again (if still not ready)
+                    if (info.processState == 'waiting') {
+                        this.waiting = 10
+                        this.delay = 5000
+                    } else if (this.waiting > 0) {
+                        this.waiting -= 1
+                    }
                 }
 
-                // Update status process info every 10 seconds
-                // FIXME: This probably should have some limit, or the interval
-                //        should grow (well, until it could be done with websocket notifications)
+                // Update status process info every 5,6,7,8,9,... seconds
                 clearTimeout(window.infoRequest)
-                if (!this.refresh && (!info || !info.isReady)) {
+                if ((!this.refresh || this.waiting > 0) && (!info || !info.isReady)) {
                     window.infoRequest = setTimeout(() => {
                         delete window.infoRequest
                         // Stop updates after user logged out
                         if (!this.$store.state.isLoggedIn) {
                             return;
                         }
 
                         axios.get(this.getUrl())
                             .then(response => {
                                 this.parseStatusInfo(response.data)
                                 this.emitEvent(response.data)
                             })
                             .catch(error => {
                                 this.parseStatusInfo(info)
                             })
                     }, this.delay);
 
                     this.delay += 1000;
                 }
             },
             statusRefresh() {
                 clearTimeout(window.infoRequest)
 
                 axios.get(this.getUrl() + '?refresh=1')
                     .then(response => {
                         this.$toast[response.data.status](response.data.message)
                         this.parseStatusInfo(response.data)
                         this.emitEvent(response.data)
                     })
                     .catch(error => {
                         this.parseStatusInfo(this.state)
                     })
             },
             confirmDomain() {
                 axios.get('/api/v4/domains/' + this.$route.params.domain + '/confirm')
                     .then(response => {
                         if (response.data.message) {
                             this.$toast[response.data.status](response.data.message)
                         }
 
                         if (response.data.status == 'success') {
                             this.parseStatusInfo(response.data.statusInfo)
                             response.data.isConfirmed = true
                             this.emitEvent(response.data)
                         }
                     })
             },
             emitEvent(data) {
                 // Remove useless data and emit the event (to parent components)
                 delete data.status
                 delete data.message
                 this.$emit('status-update', data)
             },
             getUrl() {
                 let url
 
                 switch (this.scope) {
                     case 'dashboard':
                         url = '/api/v4/users/' + this.$store.state.authInfo.id + '/status'
                         break
                     case 'domain':
                         url = '/api/v4/domains/' + this.$route.params.domain + '/status'
                         break
                     default:
                         url = '/api/v4/users/' + this.$route.params.user + '/status'
                 }
 
                 return url
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Widgets/StatusMessage.vue b/src/resources/vue/Widgets/StatusMessage.vue
new file mode 100644
index 00000000..d706ba5e
--- /dev/null
+++ b/src/resources/vue/Widgets/StatusMessage.vue
@@ -0,0 +1,49 @@
+<template>
+    <div v-if="statusLabel()" :class="statusClass()">
+        <div v-if="status == 'init'" class="app-loader small">
+            <div class="spinner-border" role="status"></div>
+        </div>
+        <span v-if="status == 'init'">{{ statusLabel() }}</span>
+
+        <svg-icon v-if="status != 'init' && statusLabel()" :icon="Number(status) >= 400 ? 'exclamation-circle' : 'info-circle'"></svg-icon>
+        <span v-if="status != 'init' && statusLabel()">{{ statusLabel() }}</span>
+    </div>
+</template>
+
+<script>
+    const defaultLabels = {
+        init: 'Loading...',
+        404: 'Resource not found.'
+    }
+
+    export default {
+        props: {
+            status: { type: [String, Number], default: 'init' },
+            statusLabels: { type: Object, default: defaultLabels }
+        },
+        methods: {
+            statusClass() {
+                let className = 'status-message'
+
+                if (this.status === 'init') {
+                    className += ' loading'
+                } else if (Number(this.status) >= 400) {
+                    className += ' text-danger'
+                }
+
+                return className
+            },
+            statusLabel() {
+                if (this.status in this.statusLabels) {
+                    return this.statusLabels[this.status]
+                }
+
+                if (this.status in defaultLabels) {
+                    return defaultLabels[this.status]
+                }
+
+                return ''
+            }
+        }
+    }
+</script>
diff --git a/src/resources/vue/Widgets/SupportForm.vue b/src/resources/vue/Widgets/SupportForm.vue
new file mode 100644
index 00000000..2c7e822b
--- /dev/null
+++ b/src/resources/vue/Widgets/SupportForm.vue
@@ -0,0 +1,106 @@
+<template>
+    <div class="modal" id="support-dialog" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <form class="modal-content" @submit.prevent="submit">
+                <div class="modal-header">
+                    <h5 class="modal-title">Contact Support</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="form">
+                        <div class="form-group">
+                            <label>Customer number or email address you have with us</label>
+                            <input id="support-user" type="text" class="form-control" placeholder="e.g. 12345678 or john@kolab.org" v-model="user" />
+                            <small class="form-text text-muted">Leave blank if you are not a customer yet</small>
+                        </div>
+                        <div class="form-group">
+                            <label>Name</label>
+                            <input id="support-name" type="text" class="form-control" placeholder="how we should call you in our reply" v-model="name" />
+                        </div>
+                        <div class="form-group">
+                            <label>Working email address</label>
+                            <input id="support-email" type="email" class="form-control" placeholder="make sure we can reach you at this address" v-model="email" required />
+                        </div>
+                        <div class="form-group">
+                            <label>Issue Summary</label>
+                            <input id="support-summary" type="text" class="form-control" placeholder="one sentence that summarizes your issue" v-model="summary" required />
+                        </div>
+                        <div class="form-group">
+                            <label>Issue Explanation</label>
+                            <textarea id="support-body" class="form-control" rows="5" v-model="body" required></textarea>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary modal-cancel" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary modal-action"><svg-icon icon="check"></svg-icon> Submit</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                body: '',
+                email: '',
+                name: '',
+                summary: '',
+                user: ''
+            }
+        },
+        mounted() {
+            this.dialog = $('#support-dialog')
+                .on('hide.bs.modal', () => {
+                    this.lockForm(false)
+                    if (this.cancelToken) {
+                        this.cancelToken()
+                        this.cancelToken = null
+                    }
+                })
+                .on('show.bs.modal', () => {
+                    this.cancelToken = null
+                })
+        },
+        methods: {
+            lockForm(lock) {
+                this.dialog.find('input,textarea,.modal-action').prop('disabled', lock)
+            },
+            submit() {
+                this.lockForm(true)
+
+                let params = {
+                    user: this.user,
+                    name: this.name,
+                    email: this.email,
+                    summary: this.summary,
+                    body: this.body
+                }
+
+                const CancelToken = axios.CancelToken
+
+                let args = {
+                    cancelToken: new CancelToken((c) => {
+                        this.cancelToken = c;
+                    })
+                }
+
+                axios.post('/api/v4/support/request', params, args)
+                    .then(response => {
+                        this.summary = ''
+                        this.body = ''
+                        this.lockForm(false)
+                        this.dialog.modal('hide')
+                        this.$toast.success(response.data.message)
+                    })
+                    .catch(error => {
+                        this.lockForm(false)
+                    })
+            }
+        }
+    }
+</script>
diff --git a/src/resources/vue/Widgets/Toast.vue b/src/resources/vue/Widgets/Toast.vue
index 35351cf4..a4693eed 100644
--- a/src/resources/vue/Widgets/Toast.vue
+++ b/src/resources/vue/Widgets/Toast.vue
@@ -1,104 +1,114 @@
 <template>
     <div class="toast-container" aria-live="polite" aria-atomic="true"></div>
 </template>
 
 <script>
     import ToastMessage from './ToastMessage.vue'
 
     export default {
         methods: {
             addToast(data) {
                 const msg = Vue.extend(ToastMessage)
                 const instance = new msg({ propsData: { data: data } })
                 instance.$mount()
                 $(instance.$el).prependTo(this.$el)
             },
             processObjectData(data) {
                 if (typeof data === 'object' && data.msg !== undefined) {
                     if (data.type === undefined) {
                         data.type = this.defaultType
                     }
                     if (data.timeout === undefined) {
                         data.timeout = this.defaultTimeout
                     }
 
                     return data
                 }
 
                 return {
                     msg: data.toString(),
                     type: this.defaultType,
                     timeout: this.defaultTimeout
                 }
             },
             error(msg, title) {
                 let data = this.processObjectData(msg)
 
                 data.type = 'error'
 
                 if (title !== undefined) {
                     data.title = title
                 }
 
                 if (!msg.timeout) {
                     data.timeout *= 2
                 }
 
                 return this.addToast(data)
             },
             success(msg, title) {
                 let data = this.processObjectData(msg)
 
                 data.type = 'success'
 
                 if (title !== undefined) {
                     data.title = title
                 }
 
                 return this.addToast(data)
             },
             warning(msg, title) {
                 let data = this.processObjectData(msg)
 
                 data.type = 'warning'
 
                 if (title !== undefined) {
                     data.title = title
                 }
 
                 if (!msg.timeout) {
                     data.timeout *= 2
                 }
 
                 return this.addToast(data)
             },
             info(msg, title) {
                 let data = this.processObjectData(msg)
 
                 data.type = 'info'
 
                 if (title !== undefined) {
                     data.title = title
                 }
 
+                return this.addToast(data)
+            },
+            message(data) {
+                if (data.type === undefined) {
+                    data.type = 'custom'
+                }
+                if (data.timeout === undefined) {
+                    data.timeout = this.defaultTimeout
+                }
+
                 return this.addToast(data)
             }
         },
         // Plugin installer method
         install(Vue, options) {
             const defaultOptions = {
                 defaultType: 'info',
                 defaultTimeout: 5000
             }
 
             options = $.extend(defaultOptions, [options || {}])
 
             const Comp = Vue.extend(this)
             const vm = new Comp({ data: options }).$mount()
 
             document.body.appendChild(vm.$el)
 
             Vue.prototype.$toast = vm
         }
     }
 </script>
diff --git a/src/resources/vue/Widgets/ToastMessage.vue b/src/resources/vue/Widgets/ToastMessage.vue
index c87de155..8030d2b8 100644
--- a/src/resources/vue/Widgets/ToastMessage.vue
+++ b/src/resources/vue/Widgets/ToastMessage.vue
@@ -1,60 +1,74 @@
 <template>
-    <div :class="'toast hide toast-' + data.type" role="alert" aria-live="assertive" aria-atomic="true">
-        <div class="toast-header">
-            <svg-icon icon="info-circle" :class="className()" v-if="data.type == 'info'"></svg-icon>
-            <svg-icon icon="check-circle" :class="className()" v-else-if="data.type == 'success'"></svg-icon>
-            <svg-icon icon="exclamation-circle" :class="className()" v-else-if="data.type == 'error'"></svg-icon>
-            <svg-icon icon="exclamation-circle" :class="className()" v-else-if="data.type == 'warning'"></svg-icon>
-            <strong :class="className()">{{ data.title || title() }}</strong>
+    <div :class="toastClassName()" role="alert" aria-live="assertive" aria-atomic="true">
+        <div class="toast-header" :class="className()">
+            <svg-icon icon="info-circle" v-if="data.type == 'info'"></svg-icon>
+            <svg-icon icon="check-circle" v-else-if="data.type == 'success'"></svg-icon>
+            <svg-icon icon="exclamation-circle" v-else-if="data.type == 'error'"></svg-icon>
+            <svg-icon icon="exclamation-circle" v-else-if="data.type == 'warning'"></svg-icon>
+            <svg-icon :icon="data.icon" v-else-if="data.type == 'custom' && data.icon"></svg-icon>
+            <strong>{{ data.title || title() }}</strong>
             <button type="button" class="close" data-dismiss="toast" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
             </button>
         </div>
-        <div class="toast-body">
-            {{ data.msg }}
-        </div>
+        <div v-if="data.body" v-html="data.body" class="toast-body"></div>
+        <div v-else class="toast-body">{{ data.msg }}</div>
     </div>
 </template>
 
 <script>
     export default {
         props: {
             data: { type: Object, default: () => {} }
         },
         mounted() {
-            $(this.$el).on('hidden.bs.toast', () => {
+            $(this.$el)
+                .on('hidden.bs.toast', () => {
                     (this.$el).remove()
                     this.$destroy()
                 })
+                .on('shown.bs.toast', () => {
+                    if (this.data.onShow) {
+                        this.data.onShow(this.$el)
+                    }
+                })
                 .toast({
                     animation: true,
-                    autohide: true,
+                    autohide: this.data.timeout > 0,
                     delay: this.data.timeout
                 })
                 .toast('show')
         },
         methods: {
             className() {
                 switch (this.data.type) {
                     case 'error':
                         return 'text-danger'
                     case 'warning':
                     case 'info':
                     case 'success':
                         return 'text-' + this.data.type
+                    case 'custom':
+                        return this.data.titleClassName || ''
                 }
             },
             title() {
                 const type = this.data.type
                 switch (type) {
                     case 'info':
                         return 'Information';
                     case 'error':
                     case 'warning':
                     case 'success':
                         return type.charAt(0).toUpperCase() + type.slice(1)
                 }
+
+                return ''
+            },
+            toastClassName() {
+                return 'toast hide toast-' + this.data.type
+                    + (this.data.className ? ' ' + this.data.className : '')
             }
         }
     }
 </script>
diff --git a/src/routes/api.php b/src/routes/api.php
index 2c42f6f3..65c2dcbd 100644
--- a/src/routes/api.php
+++ b/src/routes/api.php
@@ -1,121 +1,177 @@
 <?php
 
 use Illuminate\Http\Request;
 
 /*
 |--------------------------------------------------------------------------
 | API Routes
 |--------------------------------------------------------------------------
 |
 | Here is where you can register API routes for your application. These
 | routes are loaded by the RouteServiceProvider within a group which
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
 
 $prefix = \trim(\parse_url(\config('app.url'), PHP_URL_PATH), '/') . '/';
 
 Route::group(
     [
         'middleware' => 'api',
         'prefix' => $prefix . 'api/auth'
     ],
     function ($router) {
         Route::post('login', 'API\AuthController@login');
 
         Route::group(
             ['middleware' => 'auth:api'],
             function ($router) {
                 Route::get('info', 'API\AuthController@info');
                 Route::post('logout', 'API\AuthController@logout');
                 Route::post('refresh', 'API\AuthController@refresh');
             }
         );
     }
 );
 
 Route::group(
     [
         'domain' => \config('app.domain'),
         'middleware' => 'api',
         'prefix' => $prefix . 'api/auth'
     ],
     function ($router) {
         Route::post('password-reset/init', 'API\PasswordResetController@init');
         Route::post('password-reset/verify', 'API\PasswordResetController@verify');
         Route::post('password-reset', 'API\PasswordResetController@reset');
 
         Route::get('signup/plans', 'API\SignupController@plans');
         Route::post('signup/init', 'API\SignupController@init');
         Route::post('signup/verify', 'API\SignupController@verify');
         Route::post('signup', 'API\SignupController@signup');
     }
 );
 
 Route::group(
     [
         'domain' => \config('app.domain'),
         'middleware' => 'auth:api',
         'prefix' => $prefix . 'api/v4'
     ],
     function () {
         Route::apiResource('domains', API\V4\DomainsController::class);
         Route::get('domains/{id}/confirm', 'API\V4\DomainsController@confirm');
         Route::get('domains/{id}/status', 'API\V4\DomainsController@status');
 
         Route::apiResource('entitlements', API\V4\EntitlementsController::class);
         Route::apiResource('packages', API\V4\PackagesController::class);
         Route::apiResource('skus', API\V4\SkusController::class);
         Route::apiResource('users', API\V4\UsersController::class);
+        Route::get('users/{id}/skus', 'API\V4\SkusController@userSkus');
         Route::get('users/{id}/status', 'API\V4\UsersController@status');
 
         Route::apiResource('wallets', API\V4\WalletsController::class);
         Route::get('wallets/{id}/transactions', 'API\V4\WalletsController@transactions');
         Route::get('wallets/{id}/receipts', 'API\V4\WalletsController@receipts');
         Route::get('wallets/{id}/receipts/{receipt}', 'API\V4\WalletsController@receiptDownload');
 
         Route::post('payments', 'API\V4\PaymentsController@store');
+        //Route::delete('payments', 'API\V4\PaymentsController@cancel');
         Route::get('payments/mandate', 'API\V4\PaymentsController@mandate');
         Route::post('payments/mandate', 'API\V4\PaymentsController@mandateCreate');
         Route::put('payments/mandate', 'API\V4\PaymentsController@mandateUpdate');
         Route::delete('payments/mandate', 'API\V4\PaymentsController@mandateDelete');
+        Route::get('payments/methods', 'API\V4\PaymentsController@paymentMethods');
+        Route::get('payments/pending', 'API\V4\PaymentsController@payments');
+        Route::get('payments/has-pending', 'API\V4\PaymentsController@hasPayments');
+
+        Route::get('openvidu/rooms', 'API\V4\OpenViduController@index');
+        Route::post('openvidu/rooms/{id}/close', 'API\V4\OpenViduController@closeRoom');
+        Route::post('openvidu/rooms/{id}/config', 'API\V4\OpenViduController@setRoomConfig');
+
+        // FIXME: I'm not sure about this one, should we use DELETE request maybe?
+        Route::post('openvidu/rooms/{id}/connections/{conn}/dismiss', 'API\V4\OpenViduController@dismissConnection');
+        Route::put('openvidu/rooms/{id}/connections/{conn}', 'API\V4\OpenViduController@updateConnection');
+        Route::post('openvidu/rooms/{id}/request/{reqid}/accept', 'API\V4\OpenViduController@acceptJoinRequest');
+        Route::post('openvidu/rooms/{id}/request/{reqid}/deny', 'API\V4\OpenViduController@denyJoinRequest');
+    }
+);
+
+// Note: In Laravel 7.x we could just use withoutMiddleware() instead of a separate group
+Route::group(
+    [
+        'domain' => \config('app.domain'),
+        'prefix' => $prefix . 'api/v4'
+    ],
+    function () {
+        Route::post('openvidu/rooms/{id}', 'API\V4\OpenViduController@joinRoom');
+        Route::post('openvidu/rooms/{id}/connections', 'API\V4\OpenViduController@createConnection');
+        // FIXME: I'm not sure about this one, should we use DELETE request maybe?
+        Route::post('openvidu/rooms/{id}/connections/{conn}/dismiss', 'API\V4\OpenViduController@dismissConnection');
+        Route::put('openvidu/rooms/{id}/connections/{conn}', 'API\V4\OpenViduController@updateConnection');
+        Route::post('openvidu/rooms/{id}/request/{reqid}/accept', 'API\V4\OpenViduController@acceptJoinRequest');
+        Route::post('openvidu/rooms/{id}/request/{reqid}/deny', 'API\V4\OpenViduController@denyJoinRequest');
+    }
+);
+
+Route::group(
+    [
+        'domain' => \config('app.domain'),
+        'middleware' => 'api',
+        'prefix' => $prefix . 'api/v4'
+    ],
+    function ($router) {
+        Route::post('support/request', 'API\V4\SupportController@request');
     }
 );
 
 Route::group(
     [
         'domain' => \config('app.domain'),
         'prefix' => $prefix . 'api/webhooks'
     ],
     function () {
-        Route::post('greylist', 'API\V4\PolicyController@greylist');
         Route::post('payment/{provider}', 'API\V4\PaymentsController@webhook');
+        Route::post('meet/openvidu', 'API\V4\OpenViduController@webhook');
+    }
+);
+
+Route::group(
+    [
+        'domain' => 'services.' . \config('app.domain'),
+        'prefix' => $prefix . 'api/webhooks'
+    ],
+    function () {
+        Route::post('greylist', 'API\V4\PolicyController@greylist');
         Route::post('spf', 'API\V4\PolicyController@senderPolicyFramework');
     }
 );
 
 Route::group(
     [
         'domain' => 'admin.' . \config('app.domain'),
         'middleware' => ['auth:api', 'admin'],
         'prefix' => $prefix . 'api/v4',
     ],
     function () {
         Route::apiResource('domains', API\V4\Admin\DomainsController::class);
         Route::get('domains/{id}/confirm', 'API\V4\Admin\DomainsController@confirm');
         Route::post('domains/{id}/suspend', 'API\V4\Admin\DomainsController@suspend');
         Route::post('domains/{id}/unsuspend', 'API\V4\Admin\DomainsController@unsuspend');
 
         Route::apiResource('entitlements', API\V4\Admin\EntitlementsController::class);
         Route::apiResource('packages', API\V4\Admin\PackagesController::class);
         Route::apiResource('skus', API\V4\Admin\SkusController::class);
         Route::apiResource('users', API\V4\Admin\UsersController::class);
         Route::post('users/{id}/reset2FA', 'API\V4\Admin\UsersController@reset2FA');
+        Route::get('users/{id}/skus', 'API\V4\Admin\SkusController@userSkus');
         Route::post('users/{id}/suspend', 'API\V4\Admin\UsersController@suspend');
         Route::post('users/{id}/unsuspend', 'API\V4\Admin\UsersController@unsuspend');
         Route::apiResource('wallets', API\V4\Admin\WalletsController::class);
         Route::post('wallets/{id}/one-off', 'API\V4\Admin\WalletsController@oneOff');
         Route::get('wallets/{id}/transactions', 'API\V4\Admin\WalletsController@transactions');
         Route::apiResource('discounts', API\V4\Admin\DiscountsController::class);
+
+        Route::get('stats/chart/{chart}', 'API\V4\Admin\StatsController@chart');
     }
 );
diff --git a/src/routes/web.php b/src/routes/web.php
index 42c0803f..560a4160 100644
--- a/src/routes/web.php
+++ b/src/routes/web.php
@@ -1,28 +1,23 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Web Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register web routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| contains the "web" middleware group. Now create something great!
-|
-*/
-
 // We can handle every URL with the default action because
 // we have client-side router (including 404 error handler).
 // This way we don't have to define any "deep link" routes here.
 Route::group(
     [
         //'domain' => \config('app.domain'),
     ],
     function () {
+        Route::get('content/page/{page}', 'ContentController@pageContent')
+            ->where('page', '(.*)');
+        Route::get('content/faq/{page}', 'ContentController@faqContent')
+            ->where('page', '(.*)');
+
         Route::fallback(
             function () {
-                return view('root')->with('env', \App\Utils::uiEnv());
+                $env = \App\Utils::uiEnv();
+                return view($env['view'])->with('env', $env);
             }
         );
     }
 );
diff --git a/src/routes/websocket.php b/src/routes/websocket.php
index ddebfe14..3fd6d85b 100644
--- a/src/routes/websocket.php
+++ b/src/routes/websocket.php
@@ -1,26 +1,37 @@
 <?php
 
-
 use Illuminate\Http\Request;
 use SwooleTW\Http\Websocket\Facades\Websocket;
 
 /*
 |--------------------------------------------------------------------------
 | Websocket Routes
 |--------------------------------------------------------------------------
 |
 | Here is where you can register websocket events for your application.
 |
 */
 
-Websocket::on('connect', function ($websocket, Request $request) {
-    // called while socket on connect
-});
+Websocket::on(
+    'connect',
+    function ($websocket, Request $request) {
+        return;
+    }
+);
+
+Websocket::on(
+    'open',
+    function ($websocket, Request $request) {
+        return;
+    }
+);
 
-Websocket::on('disconnect', function ($websocket) {
-    // called while socket on disconnect
-});
+Websocket::on(
+    'disconnect',
+    function ($websocket) {
+        return;
+    }
+);
 
-Websocket::on('example', function ($websocket, $data) {
-    $websocket->emit('message', $data);
-});
+//Websocket::on('message', 'App\Http\Controllers\WebsocketController@message');
+//Websocket::on('ping', 'App\Http\Controllers\WebsocketController@ping');
diff --git a/src/tests/Browser.php b/src/tests/Browser.php
index e319856f..33d6cbf3 100644
--- a/src/tests/Browser.php
+++ b/src/tests/Browser.php
@@ -1,245 +1,266 @@
 <?php
 
 namespace Tests;
 
 use Facebook\WebDriver\WebDriverKeys;
 use PHPUnit\Framework\Assert;
 use Tests\Browser\Components\Error;
 use Tests\Browser\Components\Toast;
 
 /**
  * Laravel Dusk Browser extensions
  */
 class Browser extends \Laravel\Dusk\Browser
 {
+    /**
+     * Assert that the given element attribute contains specified text.
+     */
+    public function assertAttributeRegExp($selector, $attribute, $regexp)
+    {
+        $element = $this->resolver->findOrFail($selector);
+        $value   = (string) $element->getAttribute($attribute);
+
+        Assert::assertRegExp($regexp, $value, "No expected text in [$selector][$attribute]. Found: $value");
+
+        return $this;
+    }
+
     /**
      * Assert number of (visible) elements
      */
     public function assertElementsCount($selector, $expected_count, $visible = true)
     {
         $elements = $this->elements($selector);
         $count = count($elements);
 
         if ($visible) {
             foreach ($elements as $element) {
                 if (!$element->isDisplayed()) {
                     $count--;
                 }
             }
         }
 
         Assert::assertEquals($expected_count, $count, "Count of [$selector] elements is not $expected_count");
 
         return $this;
     }
 
     /**
      * Assert Tip element content
      */
     public function assertTip($selector, $content)
     {
         return $this->click($selector)
             ->withinBody(function ($browser) use ($content) {
                 $browser->waitFor('div.tooltip .tooltip-inner')
                     ->assertSeeIn('div.tooltip .tooltip-inner', $content);
             })
             ->click($selector);
     }
 
     /**
      * Assert Toast element content (and close it)
      */
     public function assertToast(string $type, string $message, $title = null)
     {
         return $this->withinBody(function ($browser) use ($type, $title, $message) {
             $browser->with(new Toast($type), function (Browser $browser) use ($title, $message) {
                 $browser->assertToastTitle($title)
                     ->assertToastMessage($message)
                         ->closeToast();
             });
         });
     }
 
     /**
      * Assert specified error page is displayed.
      */
     public function assertErrorPage(int $error_code)
     {
         $this->with(new Error($error_code), function ($browser) {
             // empty, assertions will be made by the Error component itself
         });
 
         return $this;
     }
 
     /**
      * Assert that the given element has specified class assigned.
      */
     public function assertHasClass($selector, $class_name)
     {
         $element = $this->resolver->findOrFail($selector);
         $classes = explode(' ', (string) $element->getAttribute('class'));
 
         Assert::assertContains($class_name, $classes, "[$selector] has no class '{$class_name}'");
 
         return $this;
     }
 
     /**
      * Assert that the given element is readonly
      */
     public function assertReadonly($selector)
     {
         $element = $this->resolver->findOrFail($selector);
         $value = $element->getAttribute('readonly');
 
         Assert::assertTrue($value == 'true', "Element [$selector] is not readonly");
 
         return $this;
     }
 
     /**
      * Assert that the given element is not readonly
      */
     public function assertNotReadonly($selector)
     {
         $element = $this->resolver->findOrFail($selector);
         $value = $element->getAttribute('readonly');
 
         Assert::assertTrue($value != 'true', "Element [$selector] is not readonly");
 
         return $this;
     }
 
     /**
      * Assert that the given element contains specified text,
      * no matter it's displayed or not.
      */
     public function assertText($selector, $text)
     {
         $element = $this->resolver->findOrFail($selector);
 
         if ($text === '') {
             Assert::assertTrue((string) $element->getText() === $text, "Element's text is not empty [$selector]");
         } else {
             Assert::assertTrue(strpos($element->getText(), $text) !== false, "No expected text in [$selector]");
         }
 
         return $this;
     }
 
     /**
      * Assert that the given element contains specified text,
      * no matter it's displayed or not - using a regular expression.
      */
     public function assertTextRegExp($selector, $regexp)
     {
         $element = $this->resolver->findOrFail($selector);
 
         Assert::assertRegExp($regexp, $element->getText(), "No expected text in [$selector]");
 
         return $this;
     }
 
     /**
      * Remove all toast messages
      */
     public function clearToasts()
     {
         $this->script("jQuery('.toast-container > *').remove()");
 
         return $this;
     }
 
+    /**
+     * Wait until a button becomes enabled and click it
+     */
+    public function clickWhenEnabled($selector)
+    {
+        return $this->waitFor($selector . ':not([disabled])')->click($selector);
+    }
+
     /**
      * Check if in Phone mode
      */
     public static function isPhone()
     {
         return getenv('TESTS_MODE') == 'phone';
     }
 
     /**
      * Check if in Tablet mode
      */
     public static function isTablet()
     {
         return getenv('TESTS_MODE') == 'tablet';
     }
 
     /**
      * Check if in Desktop mode
      */
     public static function isDesktop()
     {
         return !self::isPhone() && !self::isTablet();
     }
 
     /**
      * Returns content of a downloaded file
      */
     public function readDownloadedFile($filename, $sleep = 5)
     {
         $filename = __DIR__ . "/Browser/downloads/$filename";
 
         // Give the browser a chance to finish download
         if (!file_exists($filename) && $sleep) {
             sleep($sleep);
         }
 
         Assert::assertFileExists($filename);
 
         return file_get_contents($filename);
     }
 
     /**
      * Removes downloaded file
      */
     public function removeDownloadedFile($filename)
     {
         @unlink(__DIR__ . "/Browser/downloads/$filename");
 
         return $this;
     }
 
     /**
      * Clears the input field and related vue v-model data.
      */
     public function vueClear($selector)
     {
         if ($this->resolver->prefix != 'body') {
             $selector = $this->resolver->prefix . ' ' . $selector;
         }
 
         // The existing clear(), and type() with empty string do not work.
         // We have to clear the field and dispatch 'input' event programatically.
 
         $this->script(
             "var element = document.querySelector('$selector');"
             . "element.value = '';"
             . "element.dispatchEvent(new Event('input'))"
         );
 
         return $this;
     }
 
     /**
      * Execute code within body context.
      * Useful to execute code that selects elements outside of a component context
      */
     public function withinBody($callback)
     {
         if ($this->resolver->prefix != 'body') {
             $orig_prefix = $this->resolver->prefix;
             $this->resolver->prefix = 'body';
         }
 
         call_user_func($callback, $this);
 
         if (isset($orig_prefix)) {
             $this->resolver->prefix = $orig_prefix;
         }
 
         return $this;
     }
 }
diff --git a/src/tests/Browser/Admin/LogonTest.php b/src/tests/Browser/Admin/LogonTest.php
index b258c23b..59fcd99c 100644
--- a/src/tests/Browser/Admin/LogonTest.php
+++ b/src/tests/Browser/Admin/LogonTest.php
@@ -1,145 +1,145 @@
 <?php
 
 namespace Tests\Browser\Admin;
 
 use Tests\Browser;
 use Tests\Browser\Components\Menu;
 use Tests\Browser\Components\Toast;
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Home;
 use Tests\TestCaseDusk;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class LogonTest extends TestCaseDusk
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
         self::useAdminUrl();
     }
 
     /**
      * Test menu on logon page
      */
     public function testLogonMenu(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->with(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                    $browser->assertMenuItems(['explore', 'blog', 'support', 'login']);
                 })
                 ->assertMissing('@second-factor-input')
                 ->assertMissing('@forgot-password');
         });
     }
 
     /**
      * Test redirect to /login if user is unauthenticated
      */
     public function testLogonRedirect(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/dashboard');
 
             // Checks if we're really on the login page
             $browser->waitForLocation('/login')
                 ->on(new Home());
         });
     }
 
     /**
      * Logon with wrong password/user test
      */
     public function testLogonWrongCredentials(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->submitLogon('jeroen@jeroen.jeroen', 'wrong')
                 // Error message
                 ->assertToast(Toast::TYPE_ERROR, 'Invalid username or password.')
                 // Checks if we're still on the logon page
                 ->on(new Home());
         });
     }
 
     /**
      * Successful logon test
      */
     public function testLogonSuccessful(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->submitLogon('jeroen@jeroen.jeroen', 'jeroen', true);
 
             // Checks if we're really on Dashboard page
             $browser->on(new Dashboard())
                 ->within(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['support', 'contact', 'webmail', 'logout']);
+                    $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout']);
                 })
                 ->assertUser('jeroen@jeroen.jeroen');
 
             // Test that visiting '/' with logged in user does not open logon form
             // but "redirects" to the dashboard
             $browser->visit('/')->on(new Dashboard());
         });
     }
 
     /**
      * Logout test
      *
      * @depends testLogonSuccessful
      */
     public function testLogout(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->on(new Dashboard());
 
             // Click the Logout button
             $browser->within(new Menu(), function ($browser) {
                 $browser->clickMenuItem('logout');
             });
 
             // We expect the logon page
             $browser->waitForLocation('/login')
                 ->on(new Home());
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['explore', 'blog', 'support', 'login']);
             });
 
             // Success toast message
             $browser->assertToast(Toast::TYPE_SUCCESS, 'Successfully logged out');
         });
     }
 
     /**
      * Logout by URL test
      */
     public function testLogoutByURL(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->submitLogon('jeroen@jeroen.jeroen', 'jeroen', true);
 
             // Checks if we're really on Dashboard page
             $browser->on(new Dashboard());
 
             // Use /logout url, and expect the logon page
             $browser->visit('/logout')
                 ->waitForLocation('/login')
                 ->on(new Home());
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['explore', 'blog', 'support', 'login']);
             });
 
             // Success toast message
             $browser->assertToast(Toast::TYPE_SUCCESS, 'Successfully logged out');
         });
     }
 }
diff --git a/src/tests/Browser/Admin/StatsTest.php b/src/tests/Browser/Admin/StatsTest.php
new file mode 100644
index 00000000..4f524aff
--- /dev/null
+++ b/src/tests/Browser/Admin/StatsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Browser\Admin;
+
+use Tests\Browser;
+use Tests\Browser\Pages\Admin\Stats;
+use Tests\Browser\Pages\Dashboard;
+use Tests\Browser\Pages\Home;
+use Tests\TestCaseDusk;
+
+class StatsTest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        self::useAdminUrl();
+    }
+
+    /**
+     * Test Stats page
+     */
+    public function testStats(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit(new Home())
+                ->submitLogon('jeroen@jeroen.jeroen', 'jeroen', true)
+                ->on(new Dashboard())
+                ->assertSeeIn('@links .link-stats', 'Stats')
+                ->click('@links .link-stats')
+                ->on(new Stats())
+                ->assertElementsCount('@container > div', 4)
+                ->waitFor('@container #chart-users svg')
+                ->assertSeeIn('@container #chart-users svg .title', 'Users - last 8 weeks')
+                ->waitFor('@container #chart-users-all svg')
+                ->assertSeeIn('@container #chart-users-all svg .title', 'All Users - last year')
+                ->waitFor('@container #chart-income svg')
+                ->assertSeeIn('@container #chart-income svg .title', 'Income in CHF - last 8 weeks')
+                ->waitFor('@container #chart-discounts svg')
+                ->assertSeeIn('@container #chart-discounts svg .title', 'Discounts');
+        });
+    }
+}
diff --git a/src/tests/Browser/Admin/UserTest.php b/src/tests/Browser/Admin/UserTest.php
index 0755a234..43e498df 100644
--- a/src/tests/Browser/Admin/UserTest.php
+++ b/src/tests/Browser/Admin/UserTest.php
@@ -1,439 +1,443 @@
 <?php
 
 namespace Tests\Browser\Admin;
 
 use App\Auth\SecondFactor;
 use App\Discount;
 use App\Sku;
 use App\User;
 use Tests\Browser;
 use Tests\Browser\Components\Dialog;
 use Tests\Browser\Components\Toast;
 use Tests\Browser\Pages\Admin\User as UserPage;
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Home;
 use Tests\TestCaseDusk;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class UserTest extends TestCaseDusk
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
         self::useAdminUrl();
 
         $john = $this->getTestUser('john@kolab.org');
         $john->setSettings([
                 'phone' => '+48123123123',
                 'external_email' => 'john.doe.external@gmail.com',
         ]);
         if ($john->isSuspended()) {
             User::where('email', $john->email)->update(['status' => $john->status - User::STATUS_SUSPENDED]);
         }
         $wallet = $john->wallets()->first();
         $wallet->discount()->dissociate();
         $wallet->save();
+
+        $this->clearMeetEntitlements();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $john = $this->getTestUser('john@kolab.org');
         $john->setSettings([
                 'phone' => null,
                 'external_email' => 'john.doe.external@gmail.com',
         ]);
         if ($john->isSuspended()) {
             User::where('email', $john->email)->update(['status' => $john->status - User::STATUS_SUSPENDED]);
         }
         $wallet = $john->wallets()->first();
         $wallet->discount()->dissociate();
         $wallet->save();
 
+        $this->clearMeetEntitlements();
+
         parent::tearDown();
     }
 
     /**
      * Test user info page (unauthenticated)
      */
     public function testUserUnauth(): void
     {
         // Test that the page requires authentication
         $this->browse(function (Browser $browser) {
             $jack = $this->getTestUser('jack@kolab.org');
             $browser->visit('/user/' . $jack->id)->on(new Home());
         });
     }
 
     /**
      * Test user info page
      */
     public function testUserInfo(): void
     {
         $this->browse(function (Browser $browser) {
             $jack = $this->getTestUser('jack@kolab.org');
             $page = new UserPage($jack->id);
 
             $browser->visit(new Home())
                 ->submitLogon('jeroen@jeroen.jeroen', 'jeroen', true)
                 ->on(new Dashboard())
                 ->visit($page)
                 ->on($page);
 
             // Assert main info box content
             $browser->assertSeeIn('@user-info .card-title', $jack->email)
                 ->with('@user-info form', function (Browser $browser) use ($jack) {
                     $browser->assertElementsCount('.row', 7)
                         ->assertSeeIn('.row:nth-child(1) label', 'Managed by')
                         ->assertSeeIn('.row:nth-child(1) #manager a', 'john@kolab.org')
                         ->assertSeeIn('.row:nth-child(2) label', 'ID (Created at)')
                         ->assertSeeIn('.row:nth-child(2) #userid', "{$jack->id} ({$jack->created_at})")
                         ->assertSeeIn('.row:nth-child(3) label', 'Status')
                         ->assertSeeIn('.row:nth-child(3) #status span.text-success', 'Active')
                         ->assertSeeIn('.row:nth-child(4) label', 'First name')
                         ->assertSeeIn('.row:nth-child(4) #first_name', 'Jack')
                         ->assertSeeIn('.row:nth-child(5) label', 'Last name')
                         ->assertSeeIn('.row:nth-child(5) #last_name', 'Daniels')
                         ->assertSeeIn('.row:nth-child(6) label', 'External email')
                         ->assertMissing('.row:nth-child(6) #external_email a')
                         ->assertSeeIn('.row:nth-child(7) label', 'Country')
                         ->assertSeeIn('.row:nth-child(7) #country', 'United States');
                 });
 
             // Some tabs are loaded in background, wait a second
             $browser->pause(500)
                 ->assertElementsCount('@nav a', 5);
 
             // Note: Finances tab is tested in UserFinancesTest.php
             $browser->assertSeeIn('@nav #tab-finances', 'Finances');
 
             // Assert Aliases tab
             $browser->assertSeeIn('@nav #tab-aliases', 'Aliases (1)')
                 ->click('@nav #tab-aliases')
                 ->whenAvailable('@user-aliases', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 1)
                         ->assertSeeIn('table tbody tr:first-child td:first-child', 'jack.daniels@kolab.org')
                         ->assertMissing('table tfoot');
                 });
 
             // Assert Subscriptions tab
             $browser->assertSeeIn('@nav #tab-subscriptions', 'Subscriptions (3)')
                 ->click('@nav #tab-subscriptions')
                 ->with('@user-subscriptions', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 3)
                         ->assertSeeIn('table tbody tr:nth-child(1) td:first-child', 'User Mailbox')
                         ->assertSeeIn('table tbody tr:nth-child(1) td:last-child', '4,44 CHF')
                         ->assertSeeIn('table tbody tr:nth-child(2) td:first-child', 'Storage Quota 2 GB')
                         ->assertSeeIn('table tbody tr:nth-child(2) td:last-child', '0,00 CHF')
                         ->assertSeeIn('table tbody tr:nth-child(3) td:first-child', 'Groupware Features')
                         ->assertSeeIn('table tbody tr:nth-child(3) td:last-child', '5,55 CHF')
                         ->assertMissing('table tfoot')
                         ->assertMissing('#reset2fa');
                 });
 
             // Assert Domains tab
             $browser->assertSeeIn('@nav #tab-domains', 'Domains (0)')
                 ->click('@nav #tab-domains')
                 ->with('@user-domains', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 0)
                         ->assertSeeIn('table tfoot tr td', 'There are no domains in this account.');
                 });
 
             // Assert Users tab
             $browser->assertSeeIn('@nav #tab-users', 'Users (0)')
                 ->click('@nav #tab-users')
                 ->with('@user-users', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 0)
                         ->assertSeeIn('table tfoot tr td', 'There are no users in this account.');
                 });
         });
     }
 
     /**
      * Test user info page (continue)
      *
      * @depends testUserInfo
      */
     public function testUserInfo2(): void
     {
         $this->browse(function (Browser $browser) {
             $john = $this->getTestUser('john@kolab.org');
             $page = new UserPage($john->id);
             $discount = Discount::where('code', 'TEST')->first();
             $wallet = $john->wallet();
             $wallet->discount()->associate($discount);
             $wallet->debit(2010);
             $wallet->save();
 
             // Click the managed-by link on Jack's page
             $browser->click('@user-info #manager a')
                 ->on($page);
 
             // Assert main info box content
             $browser->assertSeeIn('@user-info .card-title', $john->email)
                 ->with('@user-info form', function (Browser $browser) use ($john) {
                     $ext_email = $john->getSetting('external_email');
 
                     $browser->assertElementsCount('.row', 9)
                         ->assertSeeIn('.row:nth-child(1) label', 'ID (Created at)')
                         ->assertSeeIn('.row:nth-child(1) #userid', "{$john->id} ({$john->created_at})")
                         ->assertSeeIn('.row:nth-child(2) label', 'Status')
                         ->assertSeeIn('.row:nth-child(2) #status span.text-success', 'Active')
                         ->assertSeeIn('.row:nth-child(3) label', 'First name')
                         ->assertSeeIn('.row:nth-child(3) #first_name', 'John')
                         ->assertSeeIn('.row:nth-child(4) label', 'Last name')
                         ->assertSeeIn('.row:nth-child(4) #last_name', 'Doe')
                         ->assertSeeIn('.row:nth-child(5) label', 'Organization')
                         ->assertSeeIn('.row:nth-child(5) #organization', 'Kolab Developers')
                         ->assertSeeIn('.row:nth-child(6) label', 'Phone')
                         ->assertSeeIn('.row:nth-child(6) #phone', $john->getSetting('phone'))
                         ->assertSeeIn('.row:nth-child(7) label', 'External email')
                         ->assertSeeIn('.row:nth-child(7) #external_email a', $ext_email)
                         ->assertAttribute('.row:nth-child(7) #external_email a', 'href', "mailto:$ext_email")
                         ->assertSeeIn('.row:nth-child(8) label', 'Address')
                         ->assertSeeIn('.row:nth-child(8) #billing_address', $john->getSetting('billing_address'))
                         ->assertSeeIn('.row:nth-child(9) label', 'Country')
                         ->assertSeeIn('.row:nth-child(9) #country', 'United States');
                 });
 
             // Some tabs are loaded in background, wait a second
             $browser->pause(500)
                 ->assertElementsCount('@nav a', 5);
 
             // Note: Finances tab is tested in UserFinancesTest.php
             $browser->assertSeeIn('@nav #tab-finances', 'Finances');
 
             // Assert Aliases tab
             $browser->assertSeeIn('@nav #tab-aliases', 'Aliases (1)')
                 ->click('@nav #tab-aliases')
                 ->whenAvailable('@user-aliases', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 1)
                         ->assertSeeIn('table tbody tr:first-child td:first-child', 'john.doe@kolab.org')
                         ->assertMissing('table tfoot');
                 });
 
             // Assert Subscriptions tab
             $browser->assertSeeIn('@nav #tab-subscriptions', 'Subscriptions (3)')
                 ->click('@nav #tab-subscriptions')
                 ->with('@user-subscriptions', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 3)
                         ->assertSeeIn('table tbody tr:nth-child(1) td:first-child', 'User Mailbox')
                         ->assertSeeIn('table tbody tr:nth-child(1) td:last-child', '3,99 CHF/month¹')
                         ->assertSeeIn('table tbody tr:nth-child(2) td:first-child', 'Storage Quota 2 GB')
                         ->assertSeeIn('table tbody tr:nth-child(2) td:last-child', '0,00 CHF/month¹')
                         ->assertSeeIn('table tbody tr:nth-child(3) td:first-child', 'Groupware Features')
                         ->assertSeeIn('table tbody tr:nth-child(3) td:last-child', '4,99 CHF/month¹')
                         ->assertMissing('table tfoot')
                         ->assertSeeIn('table + .hint', '¹ applied discount: 10% - Test voucher');
                 });
 
             // Assert Domains tab
             $browser->assertSeeIn('@nav #tab-domains', 'Domains (1)')
                 ->click('@nav #tab-domains')
                 ->with('@user-domains table', function (Browser $browser) {
                     $browser->assertElementsCount('tbody tr', 1)
                         ->assertSeeIn('tbody tr:nth-child(1) td:first-child a', 'kolab.org')
                         ->assertVisible('tbody tr:nth-child(1) td:first-child svg.text-success')
                         ->assertMissing('tfoot');
                 });
 
             // Assert Users tab
             $browser->assertSeeIn('@nav #tab-users', 'Users (4)')
                 ->click('@nav #tab-users')
                 ->with('@user-users table', function (Browser $browser) {
                     $browser->assertElementsCount('tbody tr', 4)
                         ->assertSeeIn('tbody tr:nth-child(1) td:first-child a', 'jack@kolab.org')
                         ->assertVisible('tbody tr:nth-child(1) td:first-child svg.text-success')
                         ->assertSeeIn('tbody tr:nth-child(2) td:first-child a', 'joe@kolab.org')
                         ->assertVisible('tbody tr:nth-child(2) td:first-child svg.text-success')
                         ->assertSeeIn('tbody tr:nth-child(3) td:first-child span', 'john@kolab.org')
                         ->assertVisible('tbody tr:nth-child(3) td:first-child svg.text-success')
                         ->assertSeeIn('tbody tr:nth-child(4) td:first-child a', 'ned@kolab.org')
                         ->assertVisible('tbody tr:nth-child(4) td:first-child svg.text-success')
                         ->assertMissing('tfoot');
                 });
         });
 
         // Now we go to Ned's info page, he's a controller on John's wallet
         $this->browse(function (Browser $browser) {
             $ned = $this->getTestUser('ned@kolab.org');
             $page = new UserPage($ned->id);
 
             $browser->click('@user-users tbody tr:nth-child(4) td:first-child a')
                 ->on($page);
 
             // Assert main info box content
             $browser->assertSeeIn('@user-info .card-title', $ned->email)
                 ->with('@user-info form', function (Browser $browser) use ($ned) {
                     $browser->assertSeeIn('.row:nth-child(2) label', 'ID (Created at)')
                         ->assertSeeIn('.row:nth-child(2) #userid', "{$ned->id} ({$ned->created_at})");
                 });
 
             // Some tabs are loaded in background, wait a second
             $browser->pause(500)
                 ->assertElementsCount('@nav a', 5);
 
             // Note: Finances tab is tested in UserFinancesTest.php
             $browser->assertSeeIn('@nav #tab-finances', 'Finances');
 
             // Assert Aliases tab
             $browser->assertSeeIn('@nav #tab-aliases', 'Aliases (0)')
                 ->click('@nav #tab-aliases')
                 ->whenAvailable('@user-aliases', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 0)
                         ->assertSeeIn('table tfoot tr td', 'This user has no email aliases.');
                 });
 
             // Assert Subscriptions tab, we expect John's discount here
             $browser->assertSeeIn('@nav #tab-subscriptions', 'Subscriptions (5)')
                 ->click('@nav #tab-subscriptions')
                 ->with('@user-subscriptions', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 5)
                         ->assertSeeIn('table tbody tr:nth-child(1) td:first-child', 'User Mailbox')
                         ->assertSeeIn('table tbody tr:nth-child(1) td:last-child', '3,99 CHF/month¹')
                         ->assertSeeIn('table tbody tr:nth-child(2) td:first-child', 'Storage Quota 2 GB')
                         ->assertSeeIn('table tbody tr:nth-child(2) td:last-child', '0,00 CHF/month¹')
                         ->assertSeeIn('table tbody tr:nth-child(3) td:first-child', 'Groupware Features')
                         ->assertSeeIn('table tbody tr:nth-child(3) td:last-child', '4,99 CHF/month¹')
                         ->assertSeeIn('table tbody tr:nth-child(4) td:first-child', 'Activesync')
                         ->assertSeeIn('table tbody tr:nth-child(4) td:last-child', '0,90 CHF/month¹')
                         ->assertSeeIn('table tbody tr:nth-child(5) td:first-child', '2-Factor Authentication')
                         ->assertSeeIn('table tbody tr:nth-child(5) td:last-child', '0,00 CHF/month¹')
                         ->assertMissing('table tfoot')
                         ->assertSeeIn('table + .hint', '¹ applied discount: 10% - Test voucher')
                         ->assertSeeIn('#reset2fa', 'Reset 2-Factor Auth');
                 });
 
             // We don't expect John's domains here
             $browser->assertSeeIn('@nav #tab-domains', 'Domains (0)')
                 ->click('@nav #tab-domains')
                 ->with('@user-domains', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 0)
                         ->assertSeeIn('table tfoot tr td', 'There are no domains in this account.');
                 });
 
             // We don't expect John's users here
             $browser->assertSeeIn('@nav #tab-users', 'Users (0)')
                 ->click('@nav #tab-users')
                 ->with('@user-users', function (Browser $browser) {
                     $browser->assertElementsCount('table tbody tr', 0)
                         ->assertSeeIn('table tfoot tr td', 'There are no users in this account.');
                 });
         });
     }
 
     /**
      * Test editing an external email
      *
      * @depends testUserInfo2
      */
     public function testExternalEmail(): void
     {
         $this->browse(function (Browser $browser) {
             $john = $this->getTestUser('john@kolab.org');
 
             $browser->visit(new UserPage($john->id))
                 ->waitFor('@user-info #external_email button')
                 ->click('@user-info #external_email button')
                 // Test dialog content, and closing it with Cancel button
                 ->with(new Dialog('#email-dialog'), function (Browser $browser) {
                     $browser->assertSeeIn('@title', 'External email')
                         ->assertFocused('@body input')
                         ->assertValue('@body input', 'john.doe.external@gmail.com')
                         ->assertSeeIn('@button-cancel', 'Cancel')
                         ->assertSeeIn('@button-action', 'Submit')
                         ->click('@button-cancel');
                 })
                 ->assertMissing('#email-dialog')
                 ->click('@user-info #external_email button')
                 // Test email validation error handling, and email update
                 ->with(new Dialog('#email-dialog'), function (Browser $browser) {
                     $browser->type('@body input', 'test')
                         ->click('@button-action')
                         ->waitFor('@body input.is-invalid')
                         ->assertSeeIn(
                             '@body input + .invalid-feedback',
                             'The external email must be a valid email address.'
                         )
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->type('@body input', 'test@test.com')
                         ->click('@button-action');
                 })
                 ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.')
                 ->assertSeeIn('@user-info #external_email a', 'test@test.com')
                 ->click('@user-info #external_email button')
                 ->with(new Dialog('#email-dialog'), function (Browser $browser) {
                     $browser->assertValue('@body input', 'test@test.com')
                         ->assertMissing('@body input.is-invalid')
                         ->assertMissing('@body input + .invalid-feedback')
                         ->click('@button-cancel');
                 })
                 ->assertSeeIn('@user-info #external_email a', 'test@test.com');
 
             // $john->getSetting() may not work here as it uses internal cache
             // read the value form database
             $current_ext_email = $john->settings()->where('key', 'external_email')->first()->value;
             $this->assertSame('test@test.com', $current_ext_email);
         });
     }
 
     /**
      * Test suspending/unsuspending the user
      */
     public function testSuspendAndUnsuspend(): void
     {
         $this->browse(function (Browser $browser) {
             $john = $this->getTestUser('john@kolab.org');
 
             $browser->visit(new UserPage($john->id))
                 ->assertVisible('@user-info #button-suspend')
                 ->assertMissing('@user-info #button-unsuspend')
                 ->click('@user-info #button-suspend')
                 ->assertToast(Toast::TYPE_SUCCESS, 'User suspended successfully.')
                 ->assertSeeIn('@user-info #status span.text-warning', 'Suspended')
                 ->assertMissing('@user-info #button-suspend')
                 ->click('@user-info #button-unsuspend')
                 ->assertToast(Toast::TYPE_SUCCESS, 'User unsuspended successfully.')
                 ->assertSeeIn('@user-info #status span.text-success', 'Active')
                 ->assertVisible('@user-info #button-suspend')
                 ->assertMissing('@user-info #button-unsuspend');
         });
     }
 
     /**
      * Test resetting 2FA for the user
      */
     public function testReset2FA(): void
     {
         $this->browse(function (Browser $browser) {
             $this->deleteTestUser('userstest1@kolabnow.com');
             $user = $this->getTestUser('userstest1@kolabnow.com');
             $sku2fa = Sku::firstOrCreate(['title' => '2fa']);
             $user->assignSku($sku2fa);
             SecondFactor::seed('userstest1@kolabnow.com');
 
             $browser->visit(new UserPage($user->id))
                 ->click('@nav #tab-subscriptions')
                 ->with('@user-subscriptions', function (Browser $browser) use ($sku2fa) {
                     $browser->waitFor('#reset2fa')
                         ->assertVisible('#sku' . $sku2fa->id);
                 })
                 ->assertSeeIn('@nav #tab-subscriptions', 'Subscriptions (1)')
                 ->click('#reset2fa')
                 ->with(new Dialog('#reset-2fa-dialog'), function (Browser $browser) {
                     $browser->assertSeeIn('@title', '2-Factor Authentication Reset')
                         ->assertSeeIn('@button-cancel', 'Cancel')
                         ->assertSeeIn('@button-action', 'Reset')
                         ->click('@button-action');
                 })
                 ->assertToast(Toast::TYPE_SUCCESS, '2-Factor authentication reset successfully.')
                 ->assertMissing('#sku' . $sku2fa->id)
                 ->assertSeeIn('@nav #tab-subscriptions', 'Subscriptions (0)');
         });
     }
 }
diff --git a/src/tests/Browser/Components/Menu.php b/src/tests/Browser/Components/Menu.php
index 82833b50..2ac83067 100644
--- a/src/tests/Browser/Components/Menu.php
+++ b/src/tests/Browser/Components/Menu.php
@@ -1,113 +1,113 @@
 <?php
 
 namespace Tests\Browser\Components;
 
 use Laravel\Dusk\Component as BaseComponent;
 use PHPUnit\Framework\Assert as PHPUnit;
 
 class Menu extends BaseComponent
 {
     protected $mode;
 
     /**
      * Object constructor
      *
      * @param string $mode Menu mode ('header' or 'footer')
      */
     public function __construct($mode = 'header')
     {
         $this->mode = $mode;
     }
 
     /**
      * Get the root selector for the component.
      *
      * @return string
      */
     public function selector()
     {
         return '#' . $this->mode . '-menu';
     }
 
     /**
      * Assert that the browser page contains the component.
      *
      * @param \Tests\Browser $browser
      *
      * @return void
      */
     public function assert($browser)
     {
         $browser->assertVisible($this->selector());
     }
 
     /**
      * Assert that menu contains only specified menu items.
      *
      * @param \Tests\Browser $browser
      * @param array          $items   List of menu items
      * @param string         $active  Expected active item
      *
      * @return void
      */
     public function assertMenuItems($browser, array $items, string $active = null)
     {
         // On mobile the links are not visible, show them first (wait for transition)
-        if ($browser->isPhone()) {
+        if (!$browser->isDesktop()) {
             $browser->click('@toggler')->waitFor('.navbar-collapse.show');
         }
 
         foreach ($items as $item) {
             $browser->assertVisible('.link-' . $item);
         }
 
         // Check number of items, to make sure there's no extra items
         PHPUnit::assertCount(count($items), $browser->elements('li'));
 
         if ($active) {
             $browser->assertPresent(".link-{$active}.active");
         }
 
-        if ($browser->isPhone()) {
+        if (!$browser->isDesktop()) {
             $browser->click('@toggler')->waitUntilMissing('.navbar-collapse.show');
         }
     }
 
     /**
      * Click menu link.
      *
      * @param \Tests\Browser $browser The browser object
      * @param string         $name    Menu item name
      *
      * @return void
      */
     public function clickMenuItem($browser, string $name)
     {
         // On mobile the links are not visible, show them first (wait for transition)
         if ($browser->isPhone()) {
             $browser->click('@toggler')->waitFor('.navbar-collapse.show');
         }
 
         $browser->click('.link-' . $name);
 
         if ($browser->isPhone()) {
             $browser->waitUntilMissing('.navbar-collapse.show');
         }
     }
 
     /**
      * Get the element shortcuts for the component.
      *
      * @return array
      */
     public function elements()
     {
         $selector = $this->selector();
 
         return [
             '@list' => ".navbar-nav",
             '@brand' =>  ".navbar-brand",
             '@toggler' => ".navbar-toggler",
         ];
     }
 }
diff --git a/src/tests/Browser/Components/Toast.php b/src/tests/Browser/Components/Toast.php
index 1e4409d1..ee7ebba9 100644
--- a/src/tests/Browser/Components/Toast.php
+++ b/src/tests/Browser/Components/Toast.php
@@ -1,101 +1,102 @@
 <?php
 
 namespace Tests\Browser\Components;
 
 use Facebook\WebDriver\WebDriverBy;
 use Laravel\Dusk\Component as BaseComponent;
 use PHPUnit\Framework\Assert as PHPUnit;
 
 class Toast extends BaseComponent
 {
     public const TYPE_ERROR = 'error';
     public const TYPE_SUCCESS = 'success';
     public const TYPE_WARNING = 'warning';
     public const TYPE_INFO = 'info';
+    public const TYPE_CUSTOM = 'custom';
 
     protected $type;
     protected $element;
 
 
     public function __construct($type)
     {
         $this->type = $type;
     }
 
     /**
      * Get the root selector for the component.
      *
      * @return string
      */
     public function selector()
     {
         return '.toast-container > .toast.toast-' . $this->type;
     }
 
     /**
      * Assert that the browser page contains the component.
      *
      * @param \Laravel\Dusk\Browser $browser The browser object
      *
      * @return void
      */
     public function assert($browser)
     {
         $browser->waitFor($this->selector());
         $this->element = $browser->element($this->selector());
     }
 
     /**
      * Get the element shortcuts for the component.
      *
      * @return array
      */
     public function elements()
     {
         return [
             '@title' => ".toast-header > strong",
             '@message' =>  ".toast-body",
         ];
     }
 
     /**
      * Assert title of the toast element
      */
     public function assertToastTitle($browser, string $title = null)
     {
         if (empty($title)) {
             switch ($this->type) {
                 case self::TYPE_ERROR:
                     $title = 'Error';
                     break;
                 case self::TYPE_SUCCESS:
                     $title = 'Success';
                     break;
                 case self::TYPE_WARNING:
                     $title = 'Warning';
                     break;
                 case self::TYPE_INFO:
                     $title = 'Information';
                     break;
             }
         }
 
         $browser->assertSeeIn('@title', $title);
     }
 
     /**
      * Assert message of the toast element
      */
     public function assertToastMessage($browser, string $message)
     {
         $browser->assertSeeIn('@message', $message);
     }
 
     /**
      * Close the toast with a click
      */
     public function closeToast($browser)
     {
         $this->element->findElements(WebDriverBy::cssSelector('button.close'))[0]->click();
     }
 }
diff --git a/src/tests/Browser/ErrorTest.php b/src/tests/Browser/ErrorTest.php
index aaeec604..5a49ab9a 100644
--- a/src/tests/Browser/ErrorTest.php
+++ b/src/tests/Browser/ErrorTest.php
@@ -1,38 +1,38 @@
 <?php
 
 namespace Tests\Browser;
 
 use Tests\Browser;
 use Tests\TestCaseDusk;
 
 class ErrorTest extends TestCaseDusk
 {
 
     /**
      * Test error 404 page on unknown route
      *
      * @return void
      */
     public function testError404Page()
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/unknown')
                 ->waitFor('#app > #error-page')
                 ->assertVisible('#app > #header-menu')
                 ->assertVisible('#app > #footer-menu');
 
             $this->assertSame('404', $browser->text('#error-page .code'));
-            $this->assertSame('Not Found', $browser->text('#error-page .message'));
+            $this->assertSame('Not found', $browser->text('#error-page .message'));
         });
 
         $this->browse(function (Browser $browser) {
             $browser->visit('/login/unknown')
                 ->waitFor('#app > #error-page')
                 ->assertVisible('#app > #header-menu')
                 ->assertVisible('#app > #footer-menu');
 
             $this->assertSame('404', $browser->text('#error-page .code'));
-            $this->assertSame('Not Found', $browser->text('#error-page .message'));
+            $this->assertSame('Not found', $browser->text('#error-page .message'));
         });
     }
 }
diff --git a/src/tests/Browser/LogonTest.php b/src/tests/Browser/LogonTest.php
index 6ca98b9c..b1cae78a 100644
--- a/src/tests/Browser/LogonTest.php
+++ b/src/tests/Browser/LogonTest.php
@@ -1,211 +1,238 @@
 <?php
 
 namespace Tests\Browser;
 
 use Tests\Browser;
 use Tests\Browser\Components\Menu;
 use Tests\Browser\Components\Toast;
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Home;
+use Tests\Browser\Pages\UserProfile;
 use Tests\TestCaseDusk;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class LogonTest extends TestCaseDusk
 {
 
     /**
      * Test menu on logon page
      */
     public function testLogonMenu(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->within(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login']);
                 });
 
             if ($browser->isDesktop()) {
                 $browser->within(new Menu('footer'), function ($browser) {
-                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos', 'webmail']);
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos', 'login']);
                 });
             } else {
                 $browser->assertMissing('#footer-menu .navbar-nav');
             }
+
+            $browser->assertSeeLink('Forgot password?')
+                ->assertSeeLink('Webmail');
         });
     }
 
     /**
      * Test redirect to /login if user is unauthenticated
      */
-    public function testLogonRedirect(): void
+    public function testRequiredAuth(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/dashboard');
 
             // Checks if we're really on the login page
             $browser->waitForLocation('/login')
                 ->on(new Home());
         });
     }
 
     /**
      * Logon with wrong password/user test
      */
     public function testLogonWrongCredentials(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->submitLogon('john@kolab.org', 'wrong');
 
             // Error message
             $browser->assertToast(Toast::TYPE_ERROR, 'Invalid username or password.');
 
             // Checks if we're still on the logon page
             $browser->on(new Home());
         });
     }
 
     /**
      * Successful logon test
      */
     public function testLogonSuccessful(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->submitLogon('john@kolab.org', 'simple123', true)
                 // Checks if we're really on Dashboard page
                 ->on(new Dashboard())
                 ->assertVisible('@links a.link-profile')
                 ->assertVisible('@links a.link-domains')
                 ->assertVisible('@links a.link-users')
                 ->assertVisible('@links a.link-wallet')
+                ->assertVisible('@links a.link-webmail')
                 ->within(new Menu(), function ($browser) {
-                    $browser->assertMenuItems(['support', 'contact', 'webmail', 'logout']);
+                    $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout']);
                 });
 
             if ($browser->isDesktop()) {
                 $browser->within(new Menu('footer'), function ($browser) {
-                    $browser->assertMenuItems(['support', 'contact', 'webmail', 'logout']);
+                    $browser->assertMenuItems(['explore', 'blog', 'support', 'tos', 'dashboard', 'logout']);
                 });
             } else {
                 $browser->assertMissing('#footer-menu .navbar-nav');
             }
 
             $browser->assertUser('john@kolab.org');
 
             // Assert no "Account status" for this account
             $browser->assertMissing('@status');
 
             // Goto /domains and assert that the link on logo element
             // leads to the dashboard
             $browser->visit('/domains')
                 ->waitForText('Domains')
                 ->click('a.navbar-brand')
                 ->on(new Dashboard());
 
             // Test that visiting '/' with logged in user does not open logon form
             // but "redirects" to the dashboard
-            $browser->visit('/')->on(new Dashboard());
+            $browser->visit('/')
+                ->waitForLocation('/dashboard')
+                ->on(new Dashboard());
         });
     }
 
     /**
      * Logout test
      *
      * @depends testLogonSuccessful
      */
     public function testLogout(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->on(new Dashboard());
 
             // Click the Logout button
             $browser->within(new Menu(), function ($browser) {
                 $browser->clickMenuItem('logout');
             });
 
             // We expect the logon page
             $browser->waitForLocation('/login')
                 ->on(new Home());
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login']);
             });
 
             // Success toast message
             $browser->assertToast(Toast::TYPE_SUCCESS, 'Successfully logged out');
         });
     }
 
     /**
      * Logout by URL test
      */
     public function testLogoutByURL(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->submitLogon('john@kolab.org', 'simple123', true);
 
             // Checks if we're really on Dashboard page
             $browser->on(new Dashboard());
 
             // Use /logout url, and expect the logon page
             $browser->visit('/logout')
                 ->waitForLocation('/login')
                 ->on(new Home());
 
             // with default menu
             $browser->within(new Menu(), function ($browser) {
-                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'webmail']);
+                $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login']);
             });
 
             // Success toast message
             $browser->assertToast(Toast::TYPE_SUCCESS, 'Successfully logged out');
         });
     }
 
     /**
      * Test 2-Factor Authentication
      *
      * @depends testLogoutByURL
      */
     public function test2FA(): void
     {
         $this->browse(function (Browser $browser) {
             // Test missing 2fa code
             $browser->on(new Home())
                 ->type('@email-input', 'ned@kolab.org')
                 ->type('@password-input', 'simple123')
                 ->press('form button')
                 ->waitFor('@second-factor-input.is-invalid + .invalid-feedback')
                 ->assertSeeIn(
                     '@second-factor-input.is-invalid + .invalid-feedback',
                     'Second factor code is required.'
                 )
                 ->assertFocused('@second-factor-input')
                 ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
 
             // Test invalid code
             $browser->type('@second-factor-input', '123456')
                 ->press('form button')
                 ->waitUntilMissing('@second-factor-input.is-invalid')
                 ->waitFor('@second-factor-input.is-invalid + .invalid-feedback')
                 ->assertSeeIn(
                     '@second-factor-input.is-invalid + .invalid-feedback',
                     'Second factor code is invalid.'
                 )
                 ->assertFocused('@second-factor-input')
                 ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
 
             $code = \App\Auth\SecondFactor::code('ned@kolab.org');
 
             // Test valid (TOTP) code
             $browser->type('@second-factor-input', $code)
                 ->press('form button')
                 ->waitUntilMissing('@second-factor-input.is-invalid')
                 ->waitForLocation('/dashboard')
                 ->on(new Dashboard());
         });
     }
+
+    /**
+     * Test redirect to the requested page after logon
+     *
+     * @depends test2FA
+     */
+    public function testAfterLogonRedirect(): void
+    {
+        $this->browse(function (Browser $browser) {
+            // User is logged in
+            $browser->visit(new UserProfile());
+
+            // Test redirect if the token is invalid
+            $browser->script("localStorage.setItem('token', '123')");
+            $browser->refresh()
+                ->on(new Home())
+                ->submitLogon('john@kolab.org', 'simple123', false)
+                ->waitForLocation('/profile');
+        });
+    }
 }
diff --git a/src/tests/Browser/Meet/RoomControlsTest.php b/src/tests/Browser/Meet/RoomControlsTest.php
new file mode 100644
index 00000000..b3b31416
--- /dev/null
+++ b/src/tests/Browser/Meet/RoomControlsTest.php
@@ -0,0 +1,377 @@
+<?php
+
+namespace Tests\Browser\Meet;
+
+use App\OpenVidu\Room;
+use Tests\Browser;
+use Tests\Browser\Pages\Meet\Room as RoomPage;
+use Tests\TestCaseDusk;
+
+class RoomControlsTest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->setupTestRoom();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetTestRoom();
+        parent::tearDown();
+    }
+
+    /**
+     * Test fullscreen buttons
+     *
+     * @group openvidu
+     */
+    public function testFullscreen(): void
+    {
+        // TODO: This test does not work in headless mode
+        $this->markTestIncomplete();
+/*
+        $this->browse(function (Browser $browser) {
+            // Join the room as an owner (authenticate)
+            $browser->visit(new RoomPage('john'))
+                ->click('@setup-button')
+                ->assertMissing('@toolbar')
+                ->assertMissing('@menu')
+                ->assertMissing('@session')
+                ->assertMissing('@chat')
+                ->assertMissing('@setup-form')
+                ->assertVisible('@login-form')
+                ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->assertMissing('@login-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->click('@setup-button')
+                ->waitFor('@session')
+
+                // Test fullscreen for the whole room
+                ->click('@menu button.link-fullscreen.closed')
+                ->assertVisible('@toolbar')
+                ->assertVisible('@session')
+                ->assertMissing('nav')
+                ->assertMissing('@menu button.link-fullscreen.closed')
+                ->click('@menu button.link-fullscreen.open')
+                ->assertVisible('nav')
+
+                // Test fullscreen for the participant video
+                ->click('@session button.link-fullscreen.closed')
+                ->assertVisible('@session')
+                ->assertMissing('@toolbar')
+                ->assertMissing('nav')
+                ->assertMissing('@session button.link-fullscreen.closed')
+                ->click('@session button.link-fullscreen.open')
+                ->assertVisible('nav')
+                ->assertVisible('@toolbar');
+        });
+*/
+    }
+
+    /**
+     * Test nickname and muting audio/video
+     *
+     * @group openvidu
+     */
+    public function testNicknameAndMuting(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest) {
+            // Join the room as an owner (authenticate)
+            $owner->visit(new RoomPage('john'))
+                ->click('@setup-button')
+                ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'john')
+                ->keys('@setup-nickname-input', '{enter}') // Test form submit with Enter key
+                ->waitFor('@session');
+
+            // In another browser act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                //->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Assert current UI state
+            $owner->assertToolbar([
+                    'audio' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'video' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'screen' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'chat' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'fullscreen' => RoomPage::BUTTON_ENABLED,
+                    'options' => RoomPage::BUTTON_ENABLED,
+                    'logout' => RoomPage::BUTTON_ENABLED,
+                ])
+                ->whenAvailable('div.meet-video.self', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertAudioMuted('video', true)
+                        ->assertSeeIn('.meet-nickname', 'john')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertMissing('.controls button.link-audio')
+                        ->assertMissing('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->whenAvailable('div.meet-video:not(.self)', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertVisible('.meet-nickname')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertVisible('.controls button.link-audio')
+                        ->assertVisible('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->assertElementsCount('@session div.meet-video', 2);
+
+            // Assert current UI state
+            $guest->assertToolbar([
+                    'audio' => RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED,
+                    'video' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'screen' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'chat' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'fullscreen' => RoomPage::BUTTON_ENABLED,
+                    'logout' => RoomPage::BUTTON_ENABLED,
+                ])
+                ->whenAvailable('div.meet-video:not(.self)', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertSeeIn('.meet-nickname', 'john')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertVisible('.controls button.link-audio')
+                        ->assertMissing('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->whenAvailable('div.meet-video.self', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertMissing('.controls button.link-audio')
+                        ->assertVisible('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->assertElementsCount('@session div.meet-video', 2);
+
+            // Test nickname change propagation
+
+            $guest->setNickname('div.meet-video.self', 'guest');
+            $owner->waitFor('div.meet-video:not(.self) .meet-nickname')
+                ->assertSeeIn('div.meet-video:not(.self) .meet-nickname', 'guest');
+
+            // Test muting audio
+            $owner->click('@menu button.link-audio')
+                ->assertToolbarButtonState('audio', RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertVisible('div.meet-video.self .status .status-audio');
+
+            // FIXME: It looks that we can't just check the <video> element state
+            //        We might consider using OpenVidu API to make sure
+            $guest->waitFor('div.meet-video:not(.self) .status .status-audio');
+
+            // Test unmuting audio
+            $owner->click('@menu button.link-audio')
+                ->assertToolbarButtonState('audio', RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertMissing('div.meet-video.self .status .status-audio');
+
+            $guest->waitUntilMissing('div.meet-video:not(.self) .status .status-audio');
+
+            // Test muting audio with a keyboard shortcut (key 'm')
+            $owner->driver->getKeyboard()->sendKeys('m');
+            $owner->assertToolbarButtonState('audio', RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertVisible('div.meet-video.self .status .status-audio');
+
+            $guest->waitFor('div.meet-video:not(.self) .status .status-audio')
+                ->assertAudioMuted('div.meet-video:not(.self) video', true);
+
+            // Test unmuting audio with a keyboard shortcut (key 'm')
+            $owner->driver->getKeyboard()->sendKeys('m');
+            $owner->assertToolbarButtonState('audio', RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertMissing('div.meet-video.self .status .status-audio');
+
+            $guest->waitUntilMissing('div.meet-video:not(.self) .status .status-audio')
+                ->assertAudioMuted('div.meet-video:not(.self) video', false);
+
+            // Test muting video
+            $owner->click('@menu button.link-video')
+                ->assertToolbarButtonState('video', RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertVisible('div.meet-video.self .status .status-video');
+
+            // FIXME: It looks that we can't just check the <video> element state
+            //        We might consider using OpenVidu API to make sure
+            $guest->waitFor('div.meet-video:not(.self) .status .status-video');
+
+            // Test unmuting video
+            $owner->click('@menu button.link-video')
+                ->assertToolbarButtonState('video', RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertMissing('div.meet-video.self .status .status-video');
+
+            $guest->waitUntilMissing('div.meet-video:not(.self) .status .status-video');
+
+            // Test muting other user
+            $guest->with('div.meet-video:not(.self)', function (Browser $browser) {
+                $browser->click('.controls button.link-audio')
+                    ->assertAudioMuted('video', true)
+                    ->assertVisible('.controls button.link-audio.text-danger')
+                    ->click('.controls button.link-audio')
+                    ->assertAudioMuted('video', false)
+                    ->assertVisible('.controls button.link-audio:not(.text-danger)');
+            });
+        });
+    }
+
+    /**
+     * Test text chat
+     *
+     * @group openvidu
+     */
+    public function testChat(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest) {
+            // Join the room as an owner
+            $owner->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'john')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // In another browser act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                // ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Test chat elements
+
+            $owner->click('@menu button.link-chat')
+                ->assertToolbarButtonState('chat', RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertVisible('@chat')
+                ->assertVisible('@session')
+                ->assertFocused('@chat-input')
+                ->assertElementsCount('@chat-list .message', 0)
+                ->keys('@chat-input', 'test1', '{enter}')
+                ->assertValue('@chat-input', '')
+                ->waitFor('@chat-list .message')
+                ->assertElementsCount('@chat-list .message', 1)
+                ->assertSeeIn('@chat-list .message .nickname', 'john')
+                ->assertSeeIn('@chat-list .message div:last-child', 'test1');
+
+            $guest->waitFor('@menu button.link-chat .badge')
+                ->assertTextRegExp('@menu button.link-chat .badge', '/^1$/')
+                ->click('@menu button.link-chat')
+                ->assertToolbarButtonState('chat', RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertMissing('@menu button.link-chat .badge')
+                ->assertVisible('@chat')
+                ->assertVisible('@session')
+                ->assertElementsCount('@chat-list .message', 1)
+                ->assertSeeIn('@chat-list .message .nickname', 'john')
+                ->assertSeeIn('@chat-list .message div:last-child', 'test1');
+
+            // Test the number of (hidden) incoming messages
+            $guest->click('@menu button.link-chat')
+                ->assertMissing('@chat');
+
+            $owner->keys('@chat-input', 'test2', '{enter}', 'test3', '{enter}')
+                ->assertElementsCount('@chat-list .message', 1)
+                ->assertSeeIn('@chat-list .message .nickname', 'john')
+                ->assertElementsCount('@chat-list .message div', 4)
+                ->assertSeeIn('@chat-list .message div:last-child', 'test3');
+
+            $guest->waitFor('@menu button.link-chat .badge')
+                ->assertSeeIn('@menu button.link-chat .badge', '2')
+                ->click('@menu button.link-chat')
+                ->assertElementsCount('@chat-list .message', 1)
+                ->assertSeeIn('@chat-list .message .nickname', 'john')
+                ->assertSeeIn('@chat-list .message div:last-child', 'test3')
+                ->keys('@chat-input', 'guest1', '{enter}')
+                ->assertElementsCount('@chat-list .message', 2)
+                ->assertMissing('@chat-list .message:last-child .nickname')
+                ->assertSeeIn('@chat-list .message:last-child div:last-child', 'guest1');
+
+            $owner->assertElementsCount('@chat-list .message', 2)
+                ->assertMissing('@chat-list .message:last-child .nickname')
+                ->assertSeeIn('@chat-list .message:last-child div:last-child', 'guest1');
+
+            // Test nickname change is propagated to chat messages
+
+            $guest->setNickname('div.meet-video.self', 'guest')
+                ->keys('@chat-input', 'guest2', '{enter}')
+                ->assertElementsCount('@chat-list .message', 2)
+                ->assertSeeIn('@chat-list .message:last-child .nickname', 'guest')
+                ->assertSeeIn('@chat-list .message:last-child div:last-child', 'guest2');
+
+            $owner->assertElementsCount('@chat-list .message', 2)
+                ->assertSeeIn('@chat-list .message:last-child .nickname', 'guest')
+                ->assertSeeIn('@chat-list .message:last-child div:last-child', 'guest2');
+
+            // TODO: Test text chat features, e.g. link handling
+        });
+    }
+
+    /**
+     * Test screen sharing
+     *
+     * @group openvidu
+     */
+    public function testShareScreen(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest) {
+            // Join the room as an owner
+            $owner->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'john')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // In another browser act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Test screen sharing
+            $owner->assertToolbarButtonState('screen', RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED)
+                ->assertElementsCount('@session div.meet-video', 1)
+                ->click('@menu button.link-screen')
+                ->whenAvailable('div.meet-video:not(.self)', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertSeeIn('.meet-nickname', 'john')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertVisible('.controls button.link-audio')
+                        ->assertVisible('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertElementsCount('@subscribers .meet-subscriber', 1)
+                ->assertToolbarButtonState('screen', RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED);
+
+            $guest
+                ->whenAvailable('div.meet-video.screen', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertSeeIn('.meet-nickname', 'john')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertVisible('.controls button.link-audio')
+                        ->assertVisible('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertElementsCount('@subscribers .meet-subscriber', 1);
+        });
+    }
+}
diff --git a/src/tests/Browser/Meet/RoomInterpretersTest.php b/src/tests/Browser/Meet/RoomInterpretersTest.php
new file mode 100644
index 00000000..0ccbb6db
--- /dev/null
+++ b/src/tests/Browser/Meet/RoomInterpretersTest.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace Tests\Browser\Meet;
+
+use App\OpenVidu\Room;
+use Tests\Browser;
+use Tests\Browser\Pages\Meet\Room as RoomPage;
+use Tests\TestCaseDusk;
+
+class RoomInterpretersTest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->setupTestRoom();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetTestRoom();
+        parent::tearDown();
+    }
+
+    /**
+     * Test language interpreted channels functionality
+     *
+     * @group openvidu
+     */
+    public function testInterpreters(): void
+    {
+        $this->browse(function (Browser $owner, Browser $interpreter, Browser $guest) {
+            $page = new RoomPage('john');
+            // Join the room as an owner (authenticate)
+            $owner->visit($page)
+                ->click('@setup-button')
+                ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'John')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // In another browser act as a guest-to-be-interpreter
+            $interpreter->visit($page)
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->type('@setup-nickname-input', 'Interpreter')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Assert current UI state, make the guest an interpreter
+            $owner->waitFor('@session .meet-video.self')
+                ->waitFor('@session .meet-video:not(.self)')
+                ->assertSeeIn('@session .meet-video:not(.self)', 'Interpreter')
+                ->click('@session .meet-video:not(.self) .meet-nickname')
+                ->whenAvailable('@session .meet-video:not(.self) .dropdown-menu', function ($browser) {
+                    $browser->assertVisible('.interpreting')
+                        ->assertSeeIn('.interpreting h6', 'Language interpreter')
+                        ->select('.interpreting select', 'en');
+                })
+                ->assertMissing('@session .meet-video:not(.self) .dropdown-menu')
+                ->waitFor('@session div.meet-subscriber')
+                ->assertUserIcon('@session div.meet-subscriber', RoomPage::ICO_INTERPRETER)
+                ->assertToolbarButtonState('channel', RoomPage::BUTTON_ENABLED)
+                ->assertMissing('@menu button.link-channel .badge');
+
+            // Assert current UI state
+            $interpreter->waitFor('@session .meet-video.self svg.interpreter')
+                ->assertUserIcon('@session .meet-video.self', RoomPage::ICO_INTERPRETER)
+                ->assertMissing('@menu button.link-channel')
+                ->assertAudioMuted('@session .meet-video.self video', true) // always muted video of self
+                ->assertAudioMuted('@session .meet-video:not(.self) video', false); // unmuted other publisher (owner)
+
+            // In another browser act as a guest-subscriber
+            // Test using a channel by subscriber
+            $guest->visit($page)
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->type('@setup-nickname-input', 'Guest')
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session .meet-subscriber.self') // self
+                ->waitFor('@session .meet-subscriber:not(.self)') // interpreter
+                ->waitFor('@session .meet-video') // owner
+                ->waitFor('@menu button.link-channel')
+                ->assertToolbarButtonState('channel', RoomPage::BUTTON_ENABLED)
+                ->assertMissing('@menu button.link-channel .badge')
+                ->assertUserIcon('@session .meet-subscriber.self', RoomPage::ICO_USER) // self
+                ->assertUserIcon('@session .meet-subscriber:not(.self)', RoomPage::ICO_INTERPRETER) // interpreter
+                ->assertMissing('@session .meet-subscriber:not(.self) video') // hidden interpreter video
+                ->assertAudioMuted('@session .meet-video video', false) // unmuted owner
+                ->assertAudioMuted('@session .meet-subscriber:not(.self) video', true) // muted interpreter
+                // select a channel
+                ->click('@menu button.link-channel')
+                ->whenAvailable('#channel-select .dropdown-menu', function ($browser) {
+                    $browser->assertSeeIn('a:first-child.active', '- none -')
+                        ->assertSeeIn('a:nth-child(2):not(.active)', 'English')
+                        ->assertMissing('a:nth-child(3)')
+                        ->click('a:nth-child(2)');
+                })
+                ->waitFor('@menu button.link-channel .badge')
+                ->assertSeeIn('@menu button.link-channel .badge', 'EN')
+                ->assertAudioMuted('@session .meet-video video', true) // muted owner
+                ->assertAudioMuted('@session .meet-subscriber:not(.self) video', false) // unmuted interpreter
+                // Unselect a channel
+                ->click('@menu button.link-channel')
+                ->whenAvailable('#channel-select .dropdown-menu', function ($browser) {
+                    $browser->assertVisible('a:first-child:not(.active)')
+                        ->assertVisible('a:nth-child(2).active')
+                        ->click('a:first-child');
+                })
+                ->waitUntilMissing('@menu button.link-channel .badge')
+                ->assertAudioMuted('@session .meet-video video', false) // unmuted owner
+                ->assertAudioMuted('@session .meet-subscriber:not(.self) video', true); // muted interpreter
+
+            // Test setting a channel by publisher
+            $owner->assertUserIcon('@session .meet-video.self', RoomPage::ICO_MODERATOR) // self
+                ->assertUserIcon('@session .meet-subscriber:nth-child(1)', RoomPage::ICO_INTERPRETER) // interpreter
+                ->assertUserIcon('@session .meet-subscriber:nth-child(2)', RoomPage::ICO_USER) // guest-subscriber
+                ->assertMissing('@session .meet-subscriber:nth-child(1) video') // hidden interpreter video
+                ->assertAudioMuted('@session .meet-video video', true) // always muted owner's self video
+                ->assertAudioMuted('@session .meet-subscriber:nth-child(1) video', true) // muted interpreter
+                // select a channel
+                ->click('@menu button.link-channel')
+                ->whenAvailable('#channel-select .dropdown-menu', function ($browser) {
+                    $browser->assertSeeIn('a:first-child.active', '- none -')
+                        ->assertSeeIn('a:nth-child(2):not(.active)', 'English')
+                        ->assertMissing('a:nth-child(3)')
+                        ->click('a:nth-child(2)');
+                })
+                ->waitFor('@menu button.link-channel .badge')
+                ->assertSeeIn('@menu button.link-channel .badge', 'EN')
+                ->assertAudioMuted('@session .meet-video video', true) // always muted self video
+                ->assertAudioMuted('@session .meet-subscriber:nth-child(1) video', false) // unmuted interpreter
+                // Unselect a channel
+                ->click('@menu button.link-channel')
+                ->whenAvailable('#channel-select .dropdown-menu', function ($browser) {
+                    $browser->assertVisible('a:first-child:not(.active)')
+                        ->assertVisible('a:nth-child(2).active')
+                        ->click('a:first-child');
+                })
+                ->waitUntilMissing('@menu button.link-channel .badge')
+                ->assertAudioMuted('@session .meet-video video', true) // always muted video of self
+                ->assertAudioMuted('@session .meet-subscriber:nth-child(1) video', true); // muted interpreter
+
+            // Remove interpreting role
+            $owner->click('@session .meet-subscriber:nth-child(1) .meet-nickname')
+                ->whenAvailable('@session .meet-subscriber:nth-child(1) .dropdown-menu', function ($browser) {
+                    $browser->assertSelected('.interpreting select', 'en')
+                        ->select('.interpreting select', '');
+                })
+                ->waitFor('div.meet-video:not(.self)')
+                ->assertUserIcon('div.meet-video:not(.self)', RoomPage::ICO_USER)
+                ->assertMissing('@menu button.link-channel');
+
+            $guest->waitUntilMissing('@menu button.link-channel');
+
+            // TODO: Test what happens for users with a selectd channel when the interpreter is removed
+            // TODO: Test two interpreters
+        });
+    }
+}
diff --git a/src/tests/Browser/Meet/RoomModeratorTest.php b/src/tests/Browser/Meet/RoomModeratorTest.php
new file mode 100644
index 00000000..d322098f
--- /dev/null
+++ b/src/tests/Browser/Meet/RoomModeratorTest.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace Tests\Browser\Meet;
+
+use App\OpenVidu\Room;
+use Tests\Browser;
+use Tests\Browser\Components\Dialog;
+use Tests\Browser\Components\Menu;
+use Tests\Browser\Pages\Meet\Room as RoomPage;
+use Tests\TestCaseDusk;
+
+class RoomModeratorTest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->setupTestRoom();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetTestRoom();
+        parent::tearDown();
+    }
+
+    /**
+     * Test three users in a room, one will be promoted/demoted to/from a moderator
+     *
+     * @group openvidu
+     */
+    public function testModeratorPromotion(): void
+    {
+        $this->browse(function (Browser $browser, Browser $guest1, Browser $guest2) {
+            // In one browser window join as a room owner
+            $browser->visit(new RoomPage('john'))
+                ->click('@setup-button')
+                ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'John')
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // In one browser window join as a guest (to be promoted)
+            $guest1->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->type('@setup-nickname-input', 'Guest1')
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // In one browser window join as a guest
+            $guest2->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Join the room, disable mic
+                ->select('@setup-mic-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Assert that only the owner is a moderator right now
+            $guest1->waitFor('@session video')
+                ->assertMissing('@session div.meet-video .meet-nickname') // guest2
+                ->assertVisible('@session div.meet-subscriber.self svg.user') // self
+                ->assertMissing('@session div.meet-subscriber.self svg.moderator') // self
+                ->assertMissing('@session div.meet-subscriber:not(.self) svg.user') // owner
+                ->assertVisible('@session div.meet-subscriber:not(.self) svg.moderator') // owner
+                ->click('@session div.meet-subscriber.self .meet-nickname')
+                ->whenAvailable('@session div.meet-subscriber.self .dropdown-menu', function (Browser $browser) {
+                    $browser->assertMissing('.permissions');
+                })
+                ->click('@session div.meet-subscriber:not(.self) .meet-nickname')
+                ->assertMissing('.dropdown-menu');
+
+            $guest2->waitFor('@session video')
+                ->assertVisible('@session div.meet-video svg.user') // self
+                ->assertMissing('@session div.meet-video svg.moderator'); // self
+                /*
+                    it does not work because the order is different all the time
+
+                ->assertMissing('@session div.meet-subscriber:nth-child(1) svg.user') // owner
+                ->assertVisible('@session div.meet-subscriber:nth-child(1) svg.moderator') // owner
+                ->assertVisible('@session div.meet-subscriber:nth-child(2) svg.user') // guest1
+                ->assertMissing('@session div.meet-subscriber:nth-child(2) svg.moderator'); // guest1
+                */
+
+            // Promote guest1 to a moderator
+            $browser->waitFor('@session video')
+                ->assertMissing('@session div.meet-subscriber.self svg.user') // self
+                ->assertVisible('@session div.meet-subscriber.self svg.moderator') // self
+                ->click('@session div.meet-subscriber.self .meet-nickname')
+                ->whenAvailable('@session div.meet-subscriber.self .dropdown-menu', function (Browser $browser) {
+                    $browser->assertChecked('.action-role-moderator input')
+                        ->assertDisabled('.action-role-moderator input');
+                })
+                ->click('@session div.meet-subscriber:not(.self) .meet-nickname')
+                ->whenAvailable('@session div.meet-subscriber:not(.self) .dropdown-menu', function (Browser $browser) {
+                    $browser->assertNotChecked('.action-role-moderator input')
+                        ->click('.action-role-moderator input');
+                });
+
+            // Assert that we have two moderators now
+            $guest2->waitFor('@session div.meet-subscriber:nth-child(2) svg.moderator')
+                ->assertMissing('@session div.meet-subscriber:nth-child(2) svg.user'); // guest1
+
+            $guest1->waitFor('@session div.meet-subscriber.self svg.moderator')
+                ->assertMissing('@session div.meet-subscriber.self svg.user') // self
+                ->assertVisible('@session div.meet-video svg.user') // guest2
+                ->assertMissing('@session div.meet-video svg.moderator') // guest2
+                ->assertMissing('@session div.meet-subscriber:not(.self) svg.user') // owner
+                ->assertVisible('@session div.meet-subscriber:not(.self) svg.moderator') // owner
+                ->click('@session div.meet-subscriber:not(.self) .meet-nickname') // owner
+                ->assertMissing('@session div.meet-subscriber:not(.self) .dropdown-menu')
+                ->click('@session div.meet-subscriber.self .meet-nickname')
+                ->whenAvailable('@session div.meet-subscriber.self .dropdown-menu', function (Browser $browser) {
+                    $browser->assertChecked('.action-role-moderator input')
+                        ->assertEnabled('.action-role-moderator input')
+                        ->assertNotChecked('.action-role-publisher input')
+                        ->assertEnabled('.action-role-publisher input');
+                });
+
+            $browser->waitFor('@session div.meet-subscriber:not(.self) svg.moderator')
+                ->assertMissing('@session div.meet-subscriber:not(.self) svg.user');
+
+            // Check if a moderator can unpublish another user
+            $guest1->click('@session div.meet-video .meet-nickname')
+                ->whenAvailable('@session div.meet-video .dropdown-menu', function (Browser $browser) {
+                    $browser->assertNotChecked('.action-role-moderator input')
+                        ->assertEnabled('.action-role-moderator input')
+                        ->assertChecked('.action-role-publisher input')
+                        ->assertEnabled('.action-role-publisher input')
+                        ->click('.action-role-publisher input');
+                })
+                ->waitUntilMissing('@session div.meet-video');
+
+            $guest2->waitUntilMissing('@session div.meet-video');
+
+            // Demote guest1 back to a normal user
+            $browser->waitFor('@session div.meet-subscriber:nth-child(3)')
+                ->click('@session') // somehow needed to make the next line invoke the menu
+                ->click('@session div.meet-subscriber:nth-child(2) .meet-nickname')
+                ->whenAvailable('@session div.meet-subscriber:nth-child(2) .dropdown-menu', function ($browser) {
+                    $browser->assertChecked('.action-role-moderator input')
+                        ->click('.action-role-moderator input');
+                })
+                ->waitFor('@session div.meet-subscriber:nth-child(2) svg.user')
+                ->assertMissing('@session div.meet-subscriber:nth-child(2) svg.moderator');
+
+            $guest1->waitFor('@session div.meet-subscriber.self svg.user')
+                ->assertMissing('@session div.meet-subscriber.self svg.moderator')
+                ->click('@session div.meet-subscriber.self .meet-nickname')
+                ->whenAvailable('@session .dropdown-menu', function (Browser $browser) {
+                    $browser->assertMissing('.permissions');
+                });
+        });
+    }
+}
diff --git a/src/tests/Browser/Meet/RoomOptionsTest.php b/src/tests/Browser/Meet/RoomOptionsTest.php
new file mode 100644
index 00000000..d569d6bd
--- /dev/null
+++ b/src/tests/Browser/Meet/RoomOptionsTest.php
@@ -0,0 +1,326 @@
+<?php
+
+namespace Tests\Browser\Meet;
+
+use App\OpenVidu\Room;
+use Tests\Browser;
+use Tests\Browser\Components\Dialog;
+use Tests\Browser\Components\Toast;
+use Tests\Browser\Pages\Meet\Room as RoomPage;
+use Tests\TestCaseDusk;
+
+class RoomOptionsTest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->setupTestRoom();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetTestRoom();
+        parent::tearDown();
+    }
+
+    /**
+     * Test password protected room
+     *
+     * @group openvidu
+     */
+    public function testRoomPassword(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest) {
+            $room = Room::where('name', 'john')->first();
+
+            // Join the room as an owner (authenticate)
+            $owner->visit(new RoomPage('john'))
+                ->click('@setup-button')
+                ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-password-input')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                // Enter room option dialog
+                ->click('@menu button.link-options')
+                ->with(new Dialog('#room-options-dialog'), function (Browser $browser) use ($room) {
+                    $browser->assertSeeIn('@title', 'Room options')
+                        ->assertSeeIn('@button-action', 'Close')
+                        ->assertElementsCount('.modal-footer button', 1)
+                        ->assertSeeIn('#password-input .label', 'Password:')
+                        ->assertSeeIn('#password-input-text.text-muted', 'none')
+                        ->assertVisible('#password-input + small')
+                        ->assertSeeIn('#password-set-btn', 'Set password')
+                        ->assertElementsCount('#password-input button', 1)
+                        ->assertMissing('#password-input input')
+                        // Test setting a password
+                        ->click('#password-set-btn')
+                        ->assertMissing('#password-input-text')
+                        ->assertVisible('#password-input input')
+                        ->assertValue('#password-input input', '')
+                        ->assertSeeIn('#password-input #password-save-btn', 'Save')
+                        ->assertElementsCount('#password-input button', 1)
+                        ->type('#password-input input', 'pass')
+                        ->click('#password-input #password-save-btn')
+                        ->assertToast(Toast::TYPE_SUCCESS, 'Room configuration updated successfully.')
+                        ->assertMissing('#password-input input')
+                        ->assertSeeIn('#password-input-text:not(.text-muted)', 'pass')
+                        ->assertSeeIn('#password-clear-btn.btn-outline-danger', 'Clear password')
+                        ->assertElementsCount('#password-input button', 1)
+                        ->click('@button-action');
+
+                    $this->assertSame('pass', $room->fresh()->getSetting('password'));
+                });
+
+            // In another browser act as a guest, expect password required
+            $guest->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertSeeIn('@setup-status-message', "Please, provide a valid password.")
+                ->assertVisible('@setup-form .input-group:nth-child(4) svg')
+                ->assertAttribute('@setup-form .input-group:nth-child(4) .input-group-text', 'title', 'Password')
+                ->assertAttribute('@setup-password-input', 'placeholder', 'Password')
+                ->assertValue('@setup-password-input', '')
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Try to join w/o password
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('#setup-password.is-invalid')
+                // Try to join with a valid password
+                ->type('#setup-password', 'pass')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Test removing the password
+            $owner->click('@menu button.link-options')
+                ->with(new Dialog('#room-options-dialog'), function (Browser $browser) use ($room) {
+                    $browser->assertSeeIn('@title', 'Room options')
+                        ->assertSeeIn('#password-input-text:not(.text-muted)', 'pass')
+                        ->assertSeeIn('#password-clear-btn.btn-outline-danger', 'Clear password')
+                        ->assertElementsCount('#password-input button', 1)
+                        ->click('#password-clear-btn')
+                        ->assertToast(Toast::TYPE_SUCCESS, "Room configuration updated successfully.")
+                        ->assertMissing('#password-input input')
+                        ->assertSeeIn('#password-input-text.text-muted', 'none')
+                        ->assertSeeIn('#password-set-btn', 'Set password')
+                        ->assertElementsCount('#password-input button', 1)
+                        ->click('@button-action');
+
+                    $this->assertSame(null, $room->fresh()->getSetting('password'));
+                });
+        });
+    }
+
+    /**
+     * Test locked room (denying the join request)
+     *
+     * @group openvidu
+     */
+    public function testLockedRoomDeny(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest) {
+            $room = Room::where('name', 'john')->first();
+
+            // Join the room as an owner (authenticate)
+            $owner->visit(new RoomPage('john'))
+                // ->click('@setup-button')
+                // ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'John')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                // Enter room option dialog
+                ->click('@menu button.link-options')
+                ->with(new Dialog('#room-options-dialog'), function (Browser $browser) use ($room) {
+                    $browser->assertSeeIn('@title', 'Room options')
+                        ->assertSeeIn('#room-lock label', 'Locked room:')
+                        ->assertVisible('#room-lock input[type=checkbox]:not(:checked)')
+                        ->assertVisible('#room-lock + small')
+                        // Test setting the lock
+                        ->click('#room-lock input')
+                        ->assertToast(Toast::TYPE_SUCCESS, "Room configuration updated successfully.")
+                        ->click('@button-action');
+
+                    $this->assertSame('true', $room->fresh()->getSetting('locked'));
+                });
+
+            // In another browser act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertButtonEnabled('@setup-button')
+                ->assertSeeIn('@setup-button.btn-success', 'JOIN NOW')
+                // try without the nickname
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@setup-nickname-input.is-invalid')
+                ->assertSeeIn(
+                    '@setup-status-message',
+                    "The room is locked. Please, enter your name and try again."
+                )
+                ->assertMissing('@setup-password-input')
+                ->assertButtonEnabled('@setup-button')
+                ->assertSeeIn('@setup-button.btn-success', 'JOIN NOW')
+                ->type('@setup-nickname-input', 'Guest<p>')
+                ->clickWhenEnabled('@setup-button')
+                ->assertMissing('@setup-nickname-input.is-invalid')
+                ->waitForText("Waiting for permission to join the room.")
+                ->assertButtonDisabled('@setup-button');
+
+            // Test denying the request (this will also test custom toasts)
+            $owner
+                ->whenAvailable(new Toast(Toast::TYPE_CUSTOM), function ($browser) {
+                    $browser->assertToastTitle('Join request')
+                        ->assertVisible('.toast-header svg.fa-user')
+                        ->assertSeeIn('@message', 'Guest<p> requested to join.')
+                        ->assertAttributeRegExp('@message img', 'src', '|^data:image|')
+                        ->assertSeeIn('@message button.accept.btn-success', 'Accept')
+                        ->assertSeeIn('@message button.deny.btn-danger', 'Deny')
+                        ->click('@message button.deny');
+                })
+                ->waitUntilMissing('.toast')
+                // wait 10 seconds to make sure the request message does not show up again
+                ->pause(10 * 1000)
+                ->assertMissing('.toast');
+        });
+    }
+
+    /**
+     * Test locked room (accepting the join request, and dismissing a user)
+     *
+     * @group openvidu
+     */
+    public function testLockedRoomAcceptAndDismiss(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest) {
+            $room = Room::where('name', 'john')->first();
+
+            // Join the room as an owner (authenticate)
+            $owner->visit(new RoomPage('john'))
+                // ->click('@setup-button')
+                // ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'John')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                // Enter room option dialog
+                ->click('@menu button.link-options')
+                ->with(new Dialog('#room-options-dialog'), function (Browser $browser) use ($room) {
+                    $browser->assertSeeIn('@title', 'Room options')
+                        ->assertSeeIn('#room-lock label', 'Locked room:')
+                        ->assertVisible('#room-lock input[type=checkbox]:not(:checked)')
+                        ->assertVisible('#room-lock + small')
+                        // Test setting the lock
+                        ->click('#room-lock input')
+                        ->assertToast(Toast::TYPE_SUCCESS, "Room configuration updated successfully.")
+                        ->click('@button-action');
+
+                    $this->assertSame('true', $room->fresh()->getSetting('locked'));
+                });
+
+            // In another browser act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'guest')
+                ->clickWhenEnabled('@setup-button')
+                ->waitForText("Waiting for permission to join the room.")
+                ->assertButtonDisabled('@setup-button');
+
+            $owner
+                ->whenAvailable(new Toast(Toast::TYPE_CUSTOM), function ($browser) {
+                    $browser->assertToastTitle('Join request')
+                        ->assertSeeIn('@message', 'guest requested to join.')
+                        ->click('@message button.accept');
+                });
+
+            // Guest automatically anters the room
+            $guest->waitFor('@session', 12)
+                // make sure he has no access to the Options menu
+                ->waitFor('@session .meet-video:not(.self)')
+                ->assertSeeIn('@session .meet-video:not(.self) .meet-nickname', 'John')
+                // TODO: Assert title and icon
+                ->click('@session .meet-video:not(.self) .meet-nickname')
+                ->pause(100)
+                ->assertMissing('.dropdown-menu');
+
+            // Test dismissing the participant
+            $owner->click('@session .meet-video:not(.self) .meet-nickname')
+                ->waitFor('@session .meet-video:not(.self) .dropdown-menu')
+                ->assertSeeIn('@session .meet-video:not(.self) .dropdown-menu > .action-dismiss', 'Dismiss')
+                ->click('@session .meet-video:not(.self) .dropdown-menu > .action-dismiss')
+                ->waitUntilMissing('.dropdown-menu')
+                ->waitUntilMissing('@session .meet-video:not(.self)');
+
+            // Expect a "end of session" dialog on the participant side
+            $guest->with(new Dialog('#leave-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Room closed')
+                        ->assertSeeIn('@body', "The session has been closed by the room owner.")
+                        ->assertMissing('@button-cancel')
+                        ->assertSeeIn('@button-action', 'Close');
+            });
+        });
+    }
+
+    /**
+     * Test nomedia (subscribers only) feature
+     *
+     * @group openvidu
+     */
+    public function testSubscribersOnly(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest) {
+            $room = Room::where('name', 'john')->first();
+
+            // Join the room as an owner (authenticate)
+            $owner->visit(new RoomPage('john'))
+                // ->click('@setup-button')
+                // ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'John')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                // Enter room option dialog
+                ->click('@menu button.link-options')
+                ->with(new Dialog('#room-options-dialog'), function (Browser $browser) use ($room) {
+                    $browser->assertSeeIn('@title', 'Room options')
+                        ->assertSeeIn('#room-nomedia label', 'Subscribers only:')
+                        ->assertVisible('#room-nomedia input[type=checkbox]:not(:checked)')
+                        ->assertVisible('#room-nomedia + small')
+                        // Test enabling the option
+                        ->click('#room-nomedia input')
+                        ->assertToast(Toast::TYPE_SUCCESS, "Room configuration updated successfully.")
+                        ->click('@button-action');
+
+                    $this->assertSame('true', $room->fresh()->getSetting('nomedia'));
+                });
+
+            // In another browser act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->type('@setup-nickname-input', 'John')
+                ->clickWhenEnabled('@setup-button')
+                // expect the owner to have a video, but the guest to have none
+                ->waitFor('@session .meet-video')
+                ->waitFor('@session .meet-subscriber.self');
+
+            // Unset the option back
+            $owner->click('@menu button.link-options')
+                ->with(new Dialog('#room-options-dialog'), function (Browser $browser) use ($room) {
+                    $browser->assertVisible('#room-nomedia input[type=checkbox]:checked')
+                        // Test enabling the option
+                        ->click('#room-nomedia input')
+                        ->assertToast(Toast::TYPE_SUCCESS, "Room configuration updated successfully.")
+                        ->click('@button-action');
+
+                    $this->assertSame(null, $room->fresh()->getSetting('nomedia'));
+                });
+        });
+    }
+}
diff --git a/src/tests/Browser/Meet/RoomQATest.php b/src/tests/Browser/Meet/RoomQATest.php
new file mode 100644
index 00000000..66a5ce2e
--- /dev/null
+++ b/src/tests/Browser/Meet/RoomQATest.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Tests\Browser\Meet;
+
+use App\OpenVidu\Room;
+use Tests\Browser;
+use Tests\Browser\Pages\Meet\Room as RoomPage;
+use Tests\TestCaseDusk;
+
+class RoomQATest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->setupTestRoom();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetTestRoom();
+        parent::tearDown();
+    }
+
+    /**
+     * Test Q&A queue
+     *
+     * @group openvidu
+     */
+    public function testQA(): void
+    {
+        $this->browse(function (Browser $owner, Browser $guest1, Browser $guest2) {
+            // Join the room as an owner (authenticate)
+            $owner->visit(new RoomPage('john'))
+                ->click('@setup-button')
+                ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->type('@setup-nickname-input', 'John')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // In another browser act as a guest (1)
+            $guest1->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->type('@setup-nickname-input', 'Guest1')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Assert current UI state
+            $owner->assertToolbarButtonState('hand', RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED)
+                ->waitFor('div.meet-subscriber.self')
+                ->assertMissing('@queue')
+                ->click('@menu button.link-hand')
+                ->waitFor('@queue .dropdown.self.moderated')
+                ->assertSeeIn('@queue .dropdown.self.moderated', 'John')
+                ->assertToolbarButtonState('hand', RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_ENABLED);
+
+            // Assert current UI state
+            $guest1->waitFor('@queue .dropdown')
+                ->assertSeeIn('@queue .dropdown', 'John')
+                ->assertElementsCount('@queue .dropdown', 1)
+                ->waitFor('div.meet-subscriber.self')
+                ->click('@menu button.link-hand')
+                ->waitFor('@queue .dropdown.self')
+                ->assertSeeIn('@queue .dropdown.self', 'Guest1')
+                ->assertElementsCount('@queue .dropdown', 2)
+                ->click('@menu button.link-hand')
+                ->waitUntilMissing('@queue .dropdown.self')
+                ->assertElementsCount('@queue .dropdown', 1)
+                ->assertToolbarButtonState('hand', RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED);
+
+            // In another browser act as a guest (2)
+            $guest2->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->type('@setup-nickname-input', 'Guest2')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@queue .dropdown')
+                ->assertSeeIn('@queue .dropdown', 'John')
+                ->assertElementsCount('@queue .dropdown', 1)
+                ->assertMissing('@menu button.link-hand');
+
+            // Demote the guest (2) to subscriber, assert Hand button in toolbar
+            $owner->click('@session div.meet-video .meet-nickname')
+                ->whenAvailable('@session div.meet-video .dropdown-menu', function ($browser) {
+                    $browser->click('.action-role-publisher input');
+                });
+
+            // Guest (2) rises his hand
+            $guest2->waitUntilMissing('@session .meet-video')
+                ->waitFor('@menu button.link-hand')
+                ->assertToolbarButtonState('hand', RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED)
+                ->click('@menu button.link-hand')
+                ->waitFor('@queue .dropdown.self')
+                ->assertElementsCount('@queue .dropdown', 2);
+
+            // Promote guest (2) to publisher
+            $owner->waitFor('@queue .dropdown:not(.self)')
+                ->pause(8000) // wait until it's not moving, otherwise click() will be possible
+                ->click('@queue .dropdown:not(.self)')
+                ->whenAvailable('@queue .dropdown:not(.self) .dropdown-menu', function ($browser) {
+                    $browser->click('.action-role-publisher input');
+                })
+                ->waitUntilMissing('@queue .dropdown:not(.self)')
+                ->waitFor('@session .meet-video');
+
+            $guest1->waitFor('@session .meet-video')
+                ->assertElementsCount('@queue .dropdown', 1);
+
+            $guest2->waitFor('@session .meet-video')
+                ->waitUntilMissing('@queue .dropdown.self')
+                ->assertElementsCount('@queue .dropdown', 1);
+
+            // Finally, do the same with the owner (last in the queue)
+            $owner->click('@queue .dropdown.self')
+                ->whenAvailable('@queue .dropdown.self .dropdown-menu', function ($browser) {
+                    $browser->click('.action-role-publisher input');
+                })
+                ->waitUntilMissing('@queue')
+                ->waitFor('@session .meet-video.self');
+
+            $guest1->waitUntilMissing('@queue');
+            $guest2->waitUntilMissing('@queue');
+        });
+    }
+}
diff --git a/src/tests/Browser/Meet/RoomSetupTest.php b/src/tests/Browser/Meet/RoomSetupTest.php
new file mode 100644
index 00000000..b83f50fb
--- /dev/null
+++ b/src/tests/Browser/Meet/RoomSetupTest.php
@@ -0,0 +1,574 @@
+<?php
+
+namespace Tests\Browser\Meet;
+
+use App\OpenVidu\Room;
+use Tests\Browser;
+use Tests\Browser\Components\Dialog;
+use Tests\Browser\Components\Menu;
+use Tests\Browser\Pages\Meet\Room as RoomPage;
+use Tests\TestCaseDusk;
+
+class RoomSetupTest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->setupTestRoom();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetTestRoom();
+        parent::tearDown();
+    }
+
+    /**
+     * Test non-existing room
+     *
+     * @group openvidu
+     */
+    public function testRoomNonExistingRoom(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit(new RoomPage('unknown'))
+                ->within(new Menu(), function ($browser) {
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login']);
+                });
+
+            if ($browser->isDesktop()) {
+                $browser->within(new Menu('footer'), function ($browser) {
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos', 'login']);
+                });
+            } else {
+                $browser->assertMissing('#footer-menu .navbar-nav');
+            }
+
+            // FIXME: Maybe it would be better to just display the usual 404 Not Found error page?
+
+            $browser->assertMissing('@toolbar')
+                ->assertMissing('@menu')
+                ->assertMissing('@session')
+                ->assertMissing('@chat')
+                ->assertMissing('@login-form')
+                ->assertVisible('@setup-form')
+                ->assertSeeIn('@setup-status-message', "The room does not exist.")
+                ->assertButtonDisabled('@setup-button');
+        });
+    }
+
+    /**
+     * Test the room setup page
+     *
+     * @group openvidu
+     */
+    public function testRoomSetup(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit(new RoomPage('john'))
+                ->within(new Menu(), function ($browser) {
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login']);
+                });
+
+            if ($browser->isDesktop()) {
+                $browser->within(new Menu('footer'), function ($browser) {
+                    $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos', 'login']);
+                });
+            } else {
+                $browser->assertMissing('#footer-menu .navbar-nav');
+            }
+
+            // Note: I've found out that if I have another Chrome instance running
+            //       that uses media, here the media devices will not be available
+
+            // TODO: Test enabling/disabling cam/mic in the setup widget
+
+            $browser->assertMissing('@toolbar')
+                ->assertMissing('@menu')
+                ->assertMissing('@session')
+                ->assertMissing('@chat')
+                ->assertMissing('@login-form')
+                ->assertVisible('@setup-form')
+                ->assertSeeIn('@setup-title', 'Set up your session')
+                ->assertVisible('@setup-video')
+                ->assertVisible('@setup-form .input-group:nth-child(1) svg')
+                ->assertAttribute('@setup-form .input-group:nth-child(1) .input-group-text', 'title', 'Microphone')
+                ->assertVisible('@setup-mic-select')
+                ->assertVisible('@setup-form .input-group:nth-child(2) svg')
+                ->assertAttribute('@setup-form .input-group:nth-child(2) .input-group-text', 'title', 'Camera')
+                ->assertVisible('@setup-cam-select')
+                ->assertVisible('@setup-form .input-group:nth-child(3) svg')
+                ->assertAttribute('@setup-form .input-group:nth-child(3) .input-group-text', 'title', 'Nickname')
+                ->assertValue('@setup-nickname-input', '')
+                ->assertAttribute('@setup-nickname-input', 'placeholder', 'Your name')
+                ->assertMissing('@setup-password-input')
+                ->assertSeeIn(
+                    '@setup-status-message',
+                    "The room is closed. Please, wait for the owner to start the session."
+                )
+                ->assertSeeIn('@setup-button', "I'm the owner");
+        });
+    }
+
+    /**
+     * Test two users in a room (joining/leaving and some basic functionality)
+     *
+     * @group openvidu
+     * @depends testRoomSetup
+     */
+    public function testTwoUsersInARoom(): void
+    {
+        $this->browse(function (Browser $browser, Browser $guest) {
+            // In one browser window act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->assertMissing('@toolbar')
+                ->assertMissing('@menu')
+                ->assertMissing('@session')
+                ->assertMissing('@chat')
+                ->assertMissing('@login-form')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertSeeIn(
+                    '@setup-status-message',
+                    "The room is closed. Please, wait for the owner to start the session."
+                )
+                ->assertSeeIn('@setup-button', "I'm the owner");
+
+            // In another window join the room as the owner (authenticate)
+            $browser->on(new RoomPage('john'))
+                ->assertSeeIn('@setup-button', "I'm the owner")
+                ->clickWhenEnabled('@setup-button')
+                ->assertMissing('@toolbar')
+                ->assertMissing('@menu')
+                ->assertMissing('@session')
+                ->assertMissing('@chat')
+                ->assertMissing('@setup-form')
+                ->assertVisible('@login-form')
+                ->submitLogon('john@kolab.org', 'simple123')
+                ->waitFor('@setup-form')
+                ->within(new Menu(), function ($browser) {
+                    $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout']);
+                });
+
+            if ($browser->isDesktop()) {
+                $browser->within(new Menu('footer'), function ($browser) {
+                    $browser->assertMenuItems(['explore', 'blog', 'support', 'tos', 'dashboard', 'logout']);
+                });
+            }
+
+            $browser->assertMissing('@login-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->waitFor('@setup-status-message')
+                ->assertSeeIn('@setup-status-message', "The room is closed. It will be open for others after you join.")
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->type('@setup-nickname-input', 'john')
+                // Join the room (click the button twice, to make sure it does not
+                // produce redundant participants/subscribers in the room)
+                ->clickWhenEnabled('@setup-button')
+                ->pause(10)
+                ->click('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form')
+                ->whenAvailable('div.meet-video.self', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertSeeIn('.meet-nickname', 'john')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertMissing('.controls button.link-audio')
+                        ->assertMissing('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->assertMissing('#header-menu')
+                ->assertSeeIn('@counter', 1);
+
+            if (!$browser->isPhone()) {
+                $browser->assertMissing('#footer-menu');
+            } else {
+                $browser->assertVisible('#footer-menu');
+            }
+
+            // After the owner "opened the room" guest should be able to join
+            $guest->waitUntilMissing('@setup-status-message', 10)
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                //->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form')
+                ->whenAvailable('div.meet-video.self', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertVisible('.meet-nickname')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertMissing('.controls button.link-audio')
+                        ->assertVisible('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->whenAvailable('div.meet-video:not(.self)', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertSeeIn('.meet-nickname', 'john')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertVisible('.controls button.link-audio')
+                        ->assertMissing('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertSeeIn('@counter', 2);
+
+            // Check guest's elements in the owner's window
+            $browser
+                ->whenAvailable('div.meet-video:not(.self)', function (Browser $browser) {
+                    $browser->waitFor('video')
+                        ->assertVisible('.meet-nickname')
+                        ->assertVisible('.controls button.link-fullscreen')
+                        ->assertVisible('.controls button.link-audio')
+                        ->assertMissing('.controls button.link-setup')
+                        ->assertVisible('.status .status-audio')
+                        ->assertMissing('.status .status-video');
+                })
+                ->assertElementsCount('@session div.meet-video', 2);
+
+            // Test leaving the room
+
+            // Guest is leaving
+            $guest->click('@menu button.link-logout')
+                ->waitForLocation('/login')
+                ->assertVisible('#header-menu');
+
+            // Expect the participant removed from other users windows
+            $browser->waitUntilMissing('@session div.meet-video:not(.self)')
+                ->assertSeeIn('@counter', 1);
+
+            // Join the room as guest again
+            $guest->visit(new RoomPage('john'))
+                ->assertMissing('@toolbar')
+                ->assertMissing('@menu')
+                ->assertMissing('@session')
+                ->assertMissing('@chat')
+                ->assertMissing('@login-form')
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->assertMissing('@setup-status-message')
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                //->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session');
+
+            // Leave the room as the room owner
+            // TODO: Test leaving the room by closing the browser window,
+            //       it should not destroy the session
+            $browser->click('@menu button.link-logout')
+                ->waitForLocation('/dashboard');
+
+            // Expect other participants be informed about the end of the session
+            $guest->with(new Dialog('#leave-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Room closed')
+                        ->assertSeeIn('@body', "The session has been closed by the room owner.")
+                        ->assertMissing('@button-cancel')
+                        ->assertSeeIn('@button-action', 'Close')
+                        ->click('@button-action');
+            })
+                ->assertMissing('#leave-dialog')
+                ->waitForLocation('/login');
+        });
+    }
+
+    /**
+     * Test two subscribers-only users in a room
+     *
+     * @group openvidu
+     * @depends testTwoUsersInARoom
+     */
+    public function testSubscribers(): void
+    {
+        $this->browse(function (Browser $browser, Browser $guest) {
+            // Join the room as the owner
+            $browser->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->waitFor('@setup-status-message')
+                ->type('@setup-nickname-input', 'john')
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form')
+                ->whenAvailable('@subscribers .meet-subscriber.self', function (Browser $browser) {
+                    $browser->assertSeeIn('.meet-nickname', 'john');
+                })
+                ->assertElementsCount('@session div.meet-video', 0)
+                ->assertElementsCount('@session video', 0)
+                ->assertElementsCount('@session .meet-subscriber', 1)
+                ->assertToolbar([
+                    'audio' => RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_DISABLED,
+                    'video' => RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_DISABLED,
+                    'screen' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_DISABLED,
+                    'hand' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'chat' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'fullscreen' => RoomPage::BUTTON_ENABLED,
+                    'options' => RoomPage::BUTTON_ENABLED,
+                    'logout' => RoomPage::BUTTON_ENABLED,
+                ]);
+
+            // After the owner "opened the room" guest should be able to join
+            // In one browser window act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitUntilMissing('@setup-status-message', 10)
+                ->assertSeeIn('@setup-button', "JOIN")
+                // Join the room, disable cam/mic
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form')
+                ->whenAvailable('@subscribers .meet-subscriber.self', function (Browser $browser) {
+                    $browser->assertVisible('.meet-nickname');
+                })
+                ->whenAvailable('@subscribers .meet-subscriber:not(.self)', function (Browser $browser) {
+                    $browser->assertSeeIn('.meet-nickname', 'john');
+                })
+                ->assertElementsCount('@session div.meet-video', 0)
+                ->assertElementsCount('@session video', 0)
+                ->assertElementsCount('@session div.meet-subscriber', 2)
+                ->assertSeeIn('@counter', 2)
+                ->assertToolbar([
+                    'audio' => RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_DISABLED,
+                    'video' => RoomPage::BUTTON_ACTIVE | RoomPage::BUTTON_DISABLED,
+                    'screen' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_DISABLED,
+                    'hand' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'chat' => RoomPage::BUTTON_INACTIVE | RoomPage::BUTTON_ENABLED,
+                    'fullscreen' => RoomPage::BUTTON_ENABLED,
+                    'logout' => RoomPage::BUTTON_ENABLED,
+                ]);
+
+            // Check guest's elements in the owner's window
+            $browser
+                ->whenAvailable('@subscribers .meet-subscriber:not(.self)', function (Browser $browser) {
+                    $browser->assertVisible('.meet-nickname');
+                })
+                ->assertElementsCount('@session div.meet-video', 0)
+                ->assertElementsCount('@session video', 0)
+                ->assertElementsCount('@session .meet-subscriber', 2)
+                ->assertSeeIn('@counter', 2);
+
+            // Test leaving the room
+
+            // Guest is leaving
+            $guest->click('@menu button.link-logout')
+                ->waitForLocation('/login');
+
+            // Expect the participant removed from other users windows
+            $browser->waitUntilMissing('@session .meet-subscriber:not(.self)');
+        });
+    }
+
+    /**
+     * Test demoting publisher to a subscriber
+     *
+     * @group openvidu
+     * @depends testSubscribers
+     */
+    public function testDemoteToSubscriber(): void
+    {
+        $this->browse(function (Browser $browser, Browser $guest1, Browser $guest2) {
+            // Join the room as the owner
+            $browser->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->waitFor('@setup-status-message')
+                ->type('@setup-nickname-input', 'john')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form')
+                ->waitFor('@session video');
+
+            // In one browser window act as a guest
+            $guest1->visit(new RoomPage('john'))
+                ->waitUntilMissing('@setup-status-message', 10)
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form')
+                ->waitFor('div.meet-video.self')
+                ->waitFor('div.meet-video:not(.self)')
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertElementsCount('@session video', 2)
+                ->assertElementsCount('@session div.meet-subscriber', 0)
+                // assert there's no moderator-related features for this guess available
+                ->click('@session .meet-video.self .meet-nickname')
+                ->whenAvailable('@session .meet-video.self .dropdown-menu', function (Browser $browser) {
+                    $browser->assertMissing('.permissions');
+                })
+                ->click('@session .meet-video:not(.self) .meet-nickname')
+                ->pause(50)
+                ->assertMissing('.dropdown-menu');
+
+            // Demote the guest to a subscriber
+            $browser
+                ->waitFor('div.meet-video.self')
+                ->waitFor('div.meet-video:not(.self)')
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertElementsCount('@session video', 2)
+                ->assertElementsCount('@session .meet-subscriber', 0)
+                ->click('@session .meet-video:not(.self) .meet-nickname')
+                ->whenAvailable('@session .meet-video:not(.self) .dropdown-menu', function (Browser $browser) {
+                    $browser->assertSeeIn('.action-role-publisher', 'Audio & Video publishing')
+                        ->click('.action-role-publisher')
+                        ->waitUntilMissing('.dropdown-menu');
+                })
+                ->waitUntilMissing('@session .meet-video:not(.self)')
+                ->waitFor('@session div.meet-subscriber')
+                ->assertElementsCount('@session div.meet-video', 1)
+                ->assertElementsCount('@session video', 1)
+                ->assertElementsCount('@session div.meet-subscriber', 1);
+
+            $guest1
+                ->waitUntilMissing('@session .meet-video.self')
+                ->waitFor('@session div.meet-subscriber')
+                ->assertElementsCount('@session div.meet-video', 1)
+                ->assertElementsCount('@session video', 1)
+                ->assertElementsCount('@session div.meet-subscriber', 1);
+
+            // Join as another user to make sure the role change is propagated to new connections
+            $guest2->visit(new RoomPage('john'))
+                ->waitUntilMissing('@setup-status-message', 10)
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form')
+                ->waitFor('div.meet-subscriber:not(.self)')
+                ->assertElementsCount('@session div.meet-video', 1)
+                ->assertElementsCount('@session video', 1)
+                ->assertElementsCount('@session div.meet-subscriber', 2)
+                ->click('@toolbar .link-logout');
+
+            // Promote the guest back to a publisher
+            $browser
+                ->click('@session .meet-subscriber .meet-nickname')
+                ->whenAvailable('@session .meet-subscriber .dropdown-menu', function (Browser $browser) {
+                    $browser->assertSeeIn('.action-role-publisher', 'Audio & Video publishing')
+                        ->assertNotChecked('.action-role-publisher input')
+                        ->click('.action-role-publisher')
+                        ->waitUntilMissing('.dropdown-menu');
+                })
+                ->waitFor('@session .meet-video:not(.self) video')
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertElementsCount('@session video', 2)
+                ->assertElementsCount('@session div.meet-subscriber', 0);
+
+            $guest1
+                ->with(new Dialog('#media-setup-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Media setup')
+                        ->click('@button-action');
+                })
+                ->waitFor('@session .meet-video.self')
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertElementsCount('@session video', 2)
+                ->assertElementsCount('@session div.meet-subscriber', 0);
+
+            // Demote the owner to a subscriber
+            $browser
+                ->click('@session .meet-video.self .meet-nickname')
+                ->whenAvailable('@session .meet-video.self .dropdown-menu', function (Browser $browser) {
+                    $browser->assertSeeIn('.action-role-publisher', 'Audio & Video publishing')
+                        ->assertChecked('.action-role-publisher input')
+                        ->click('.action-role-publisher')
+                        ->waitUntilMissing('.dropdown-menu');
+                })
+                ->waitUntilMissing('@session .meet-video.self')
+                ->waitFor('@session div.meet-subscriber.self')
+                ->assertElementsCount('@session div.meet-video', 1)
+                ->assertElementsCount('@session video', 1)
+                ->assertElementsCount('@session div.meet-subscriber', 1);
+
+            // Promote the owner to a publisher
+            $browser
+                ->click('@session .meet-subscriber.self .meet-nickname')
+                ->whenAvailable('@session .meet-subscriber.self .dropdown-menu', function (Browser $browser) {
+                    $browser->assertSeeIn('.action-role-publisher', 'Audio & Video publishing')
+                        ->assertNotChecked('.action-role-publisher input')
+                        ->click('.action-role-publisher')
+                        ->waitUntilMissing('.dropdown-menu');
+                })
+                ->waitUntilMissing('@session .meet-subscriber.self')
+                ->with(new Dialog('#media-setup-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Media setup')
+                        ->click('@button-action');
+                })
+                ->waitFor('@session div.meet-video.self')
+                ->assertElementsCount('@session div.meet-video', 2)
+                ->assertElementsCount('@session video', 2)
+                ->assertElementsCount('@session div.meet-subscriber', 0);
+        });
+    }
+
+    /**
+     * Test the media setup dialog
+     *
+     * @group openvidu
+     * @depends testDemoteToSubscriber
+     */
+    public function testMediaSetupDialog(): void
+    {
+        $this->browse(function (Browser $browser, $guest) {
+            // Join the room as the owner
+            $browser->visit(new RoomPage('john'))
+                ->waitFor('@setup-form')
+                ->waitUntilMissing('@setup-status-message.loading')
+                ->waitFor('@setup-status-message')
+                ->type('@setup-nickname-input', 'john')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form');
+
+            // In one browser window act as a guest
+            $guest->visit(new RoomPage('john'))
+                ->waitUntilMissing('@setup-status-message', 10)
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->select('@setup-mic-select', '')
+                ->select('@setup-cam-select', '')
+                ->clickWhenEnabled('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form');
+
+            $browser->waitFor('@session video')
+                ->click('.controls button.link-setup')
+                ->with(new Dialog('#media-setup-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Media setup')
+                        ->assertVisible('form video')
+                        ->assertVisible('form > div:nth-child(1) video')
+                        ->assertVisible('form > div:nth-child(1) .volume')
+                        ->assertVisible('form > div:nth-child(2) svg')
+                        ->assertAttribute('form > div:nth-child(2) .input-group-text', 'title', 'Microphone')
+                        ->assertVisible('form > div:nth-child(2) select')
+                        ->assertVisible('form > div:nth-child(3) svg')
+                        ->assertAttribute('form > div:nth-child(3) .input-group-text', 'title', 'Camera')
+                        ->assertVisible('form > div:nth-child(3) select')
+                        ->assertMissing('@button-cancel')
+                        ->assertSeeIn('@button-action', 'Close')
+                        ->click('@button-action');
+                })
+                ->assertMissing('#media-setup-dialog')
+                // Test mute audio and video
+                ->click('.controls button.link-setup')
+                ->with(new Dialog('#media-setup-dialog'), function (Browser $browser) {
+                    $browser->select('form > div:nth-child(2) select', '')
+                        ->select('form > div:nth-child(3) select', '')
+                        ->click('@button-action');
+                })
+                ->assertMissing('#media-setup-dialog')
+                ->assertVisible('@session .meet-video .status .status-audio')
+                ->assertVisible('@session .meet-video .status .status-video');
+
+            $guest->waitFor('@session video')
+                ->assertVisible('@session .meet-video .status .status-audio')
+                ->assertVisible('@session .meet-video .status .status-video');
+        });
+    }
+}
diff --git a/src/tests/Browser/Meet/RoomsTest.php b/src/tests/Browser/Meet/RoomsTest.php
new file mode 100644
index 00000000..0e554c4b
--- /dev/null
+++ b/src/tests/Browser/Meet/RoomsTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Tests\Browser\Meet;
+
+use App\Sku;
+use Tests\Browser;
+use Tests\Browser\Components\Toast;
+use Tests\Browser\Pages\Dashboard;
+use Tests\Browser\Pages\Home;
+use Tests\Browser\Pages\Meet\Room as RoomPage;
+use Tests\Browser\Pages\UserInfo;
+use Tests\TestCaseDusk;
+
+class RoomsTest extends TestCaseDusk
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->clearMeetEntitlements();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->clearMeetEntitlements();
+        parent::tearDown();
+    }
+
+    /**
+     * Test rooms page (unauthenticated and unauthorized)
+     *
+     * @group openvidu
+     */
+    public function testRoomsUnauth(): void
+    {
+        // Test that the page requires authentication
+        $this->browse(function (Browser $browser) {
+            $browser->visit('/rooms')
+                ->on(new Home())
+                // User has no 'meet' entitlement yet, expect redirect to error page
+                ->submitLogon('john@kolab.org', 'simple123', false)
+                ->waitFor('#app > #error-page')
+                ->assertSeeIn('#error-page .code', '403')
+                ->assertSeeIn('#error-page .message', 'Access denied');
+        });
+    }
+
+    /**
+     * Test rooms page
+     *
+     * @group openvidu
+     */
+    public function testRooms(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $href = \config('app.url') . '/meet/john';
+            $john = $this->getTestUser('john@kolab.org');
+
+            // User has no 'meet' entitlement yet
+            $browser->visit('/login')
+                ->on(new Home())
+                ->submitLogon('john@kolab.org', 'simple123', true)
+                ->on(new Dashboard())
+                ->assertMissing('@links a.link-chat');
+
+            // Goto user subscriptions, and enable 'meet' subscription
+            $browser->visit('/user/' . $john->id)
+                ->on(new UserInfo())
+                ->whenAvailable('@skus', function ($browser) {
+                    $browser->click('#sku-input-meet');
+                })
+                ->click('button[type=submit]')
+                ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.')
+                ->click('.navbar-brand')
+                ->on(new Dashboard())
+                ->assertSeeIn('@links a.link-chat', 'Video chat')
+                // Make sure the element also exists on Dashboard page load
+                ->refresh()
+                ->on(new Dashboard())
+                ->assertSeeIn('@links a.link-chat', 'Video chat');
+
+            // Test Video chat page
+            $browser->click('@links a.link-chat')
+                ->waitFor('#meet-rooms')
+                ->waitFor('.card-text a')
+                ->assertSeeIn('.card-title', 'Voice & Video Conferencing')
+                ->assertSeeIn('.card-text a', $href)
+                ->assertAttribute('.card-text a', 'href', $href)
+                ->click('.card-text a')
+                ->on(new RoomPage('john'))
+                // check that entering the room skips the logon form
+                ->assertMissing('@toolbar')
+                ->assertMissing('@menu')
+                ->assertMissing('@session')
+                ->assertMissing('@chat')
+                ->assertMissing('@login-form')
+                ->assertVisible('@setup-form')
+                ->assertSeeIn('@setup-status-message', "The room is closed. It will be open for others after you join.")
+                ->assertSeeIn('@setup-button', "JOIN")
+                ->click('@setup-button')
+                ->waitFor('@session')
+                ->assertMissing('@setup-form');
+        });
+    }
+}
diff --git a/src/tests/Browser/Pages/Signup.php b/src/tests/Browser/Pages/Admin/Stats.php
similarity index 54%
copy from src/tests/Browser/Pages/Signup.php
copy to src/tests/Browser/Pages/Admin/Stats.php
index efeaddbb..52b90d4c 100644
--- a/src/tests/Browser/Pages/Signup.php
+++ b/src/tests/Browser/Pages/Admin/Stats.php
@@ -1,50 +1,44 @@
 <?php
 
-namespace Tests\Browser\Pages;
+namespace Tests\Browser\Pages\Admin;
 
 use Laravel\Dusk\Page;
 
-class Signup extends Page
+class Stats extends Page
 {
     /**
      * Get the URL for the page.
      *
      * @return string
      */
     public function url(): string
     {
-        return '/signup';
+        return '/stats';
     }
 
     /**
      * Assert that the browser is on the page.
      *
      * @param \Laravel\Dusk\Browser $browser The browser object
      *
      * @return void
      */
-    public function assert($browser)
+    public function assert($browser): void
     {
-        $browser->assertPathIs('/signup')
-            ->assertPresent('@step0')
-            ->assertPresent('@step1')
-            ->assertPresent('@step2')
-            ->assertPresent('@step3');
+        $browser->waitForLocation($this->url())
+            ->waitFor('@container');
     }
 
     /**
      * Get the element shortcuts for the page.
      *
      * @return array
      */
     public function elements(): array
     {
         return [
             '@app' => '#app',
-            '@step0' => '#step0',
-            '@step1' => '#step1',
-            '@step2' => '#step2',
-            '@step3' => '#step3',
+            '@container' => '#stats-container',
         ];
     }
 }
diff --git a/src/tests/Browser/Pages/Meet/Room.php b/src/tests/Browser/Pages/Meet/Room.php
new file mode 100644
index 00000000..e2662977
--- /dev/null
+++ b/src/tests/Browser/Pages/Meet/Room.php
@@ -0,0 +1,225 @@
+<?php
+
+namespace Tests\Browser\Pages\Meet;
+
+use Laravel\Dusk\Page;
+use PHPUnit\Framework\Assert;
+
+class Room extends Page
+{
+    public const BUTTON_ACTIVE = 1;
+    public const BUTTON_ENABLED = 2;
+    public const BUTTON_INACTIVE = 4;
+    public const BUTTON_DISABLED = 8;
+
+    public const ICO_MODERATOR = 'moderator';
+    public const ICO_USER = 'user';
+    public const ICO_INTERPRETER = 'interpreter';
+
+    protected $roomName;
+
+    /**
+     * Object constructor.
+     *
+     * @param string $name Room name
+     */
+    public function __construct($name)
+    {
+        $this->roomName = $name;
+    }
+
+    /**
+     * Get the URL for the page.
+     *
+     * @return string
+     */
+    public function url()
+    {
+        return '/meet/' . $this->roomName;
+    }
+
+    /**
+     * Assert that the browser is on the page.
+     *
+     * @param \Laravel\Dusk\Browser $browser The browser object
+     *
+     * @return void
+     */
+    public function assert($browser)
+    {
+        $browser->waitForLocation($this->url())
+            ->waitUntilMissing('.app-loader')
+            ->waitUntilMissing('#meet-setup div.status-message.loading');
+    }
+
+    /**
+     * Get the element shortcuts for the page.
+     *
+     * @return array
+     */
+    public function elements()
+    {
+        return [
+            '@app' => '#app',
+
+            '@setup-form' => '#meet-setup form',
+            '@setup-title' => '#meet-setup .card-title',
+            '@setup-mic-select' => '#setup-microphone',
+            '@setup-cam-select' => '#setup-camera',
+            '@setup-nickname-input' => '#setup-nickname',
+            '@setup-password-input' => '#setup-password',
+            '@setup-preview' => '#meet-setup .media-setup-preview',
+            '@setup-volume' => '#meet-setup .media-setup-preview .volume',
+            '@setup-video' => '#meet-setup .media-setup-preview video',
+            '@setup-status-message' => '#meet-setup div.status-message',
+            '@setup-button' => '#join-button',
+
+            '@toolbar' => '#meet-session-toolbar',
+
+            '@menu' => '#meet-session-menu',
+
+            '@counter' => '#meet-counter',
+
+            '@session' => '#meet-session',
+            '@subscribers' => '#meet-subscribers',
+            '@queue' => '#meet-queue',
+
+            '@chat' => '#meet-chat',
+            '@chat-input' => '#meet-chat textarea',
+            '@chat-list' => '#meet-chat .chat',
+
+            '@login-form' => '#meet-auth',
+            '@login-email-input' => '#inputEmail',
+            '@login-password-input' => '#inputPassword',
+            '@login-second-factor-input' => '#secondfactor',
+            '@login-button' => '#meet-auth button',
+        ];
+    }
+
+    /**
+     * Assert menu state.
+     *
+     * @param \Tests\Browser $browser The browser object
+     * @param array          $menu    Menu items/state
+     */
+    public function assertToolbar($browser, array $menu): void
+    {
+        $browser->assertElementsCount('@menu button', count($menu));
+
+        foreach ($menu as $item => $state) {
+            $this->assertToolbarButtonState($browser, $item, $state);
+        }
+    }
+
+    /**
+     * Assert menu button state.
+     *
+     * @param \Tests\Browser $browser The browser object
+     * @param string         $button  Button name
+     * @param int            $state   Expected button state (sum of BUTTON_* consts)
+     */
+    public function assertToolbarButtonState($browser, $button, $state): void
+    {
+        $class = '';
+
+        if ($state & self::BUTTON_ACTIVE) {
+            $class .= '.on';
+        }
+
+        if ($state & self::BUTTON_INACTIVE) {
+            $class .= ':not(.on)';
+        }
+
+        if ($state & self::BUTTON_DISABLED) {
+            $class .= '[disabled]';
+        }
+
+        if ($state & self::BUTTON_ENABLED) {
+            $class .= ':not([disabled])';
+        }
+
+        $browser->assertVisible('@menu button.link-' . $button . $class);
+    }
+
+    /**
+     * Assert the <video> element's 'muted' property state
+     *
+     * @param \Tests\Browser $browser  The browser object
+     * @param string         $selector Video element selector
+     * @param bool           $state    Expected state
+     */
+    public function assertAudioMuted($browser, $selector, $state): void
+    {
+        $selector = addslashes($browser->resolver->format($selector));
+
+        $result = $browser->script(
+            "var video = document.querySelector('$selector'); return video.muted"
+        );
+
+        Assert::assertSame((bool) $result[0], $state);
+    }
+
+    /**
+     * Assert the participant icon type
+     *
+     * @param \Tests\Browser $browser  The browser object
+     * @param string         $selector Element selector
+     * @param string         $type     Participant icon type
+     */
+    public function assertUserIcon($browser, $selector, $type): void
+    {
+        $browser->assertVisible("{$selector} svg.{$type}")
+            ->assertMissing("{$selector} svg:not(.{$type})");
+    }
+
+    /**
+     * Set the nickname for the participant
+     *
+     * @param \Tests\Browser $browser  The browser object
+     * @param string         $selector Participant element selector
+     * @param string         $nickname Nickname
+     */
+    public function setNickname($browser, $selector, $nickname): void
+    {
+        $element = "$selector .meet-nickname .content";
+
+        $browser->click("$selector .meet-nickname")
+            ->waitFor("$selector .dropdown-menu")
+            ->assertSeeIn("$selector .dropdown-menu > .action-nickname", 'Nickname')
+            ->click("$selector .dropdown-menu > .action-nickname")
+            ->waitUntilMissing('.dropdown-menu')
+            // Use script() because type() does not work with this contenteditable widget
+            ->script(
+                "var element = document.querySelector('$element');"
+                . "element.innerText = '$nickname';"
+                . "element.dispatchEvent(new KeyboardEvent('keydown', { keyCode: 27 }))"
+            );
+    }
+
+    /**
+     * Submit logon form.
+     *
+     * @param \Tests\Browser $browser  The browser object
+     * @param string         $username User name
+     * @param string         $password User password
+     * @param array          $config   Client-site config
+     */
+    public function submitLogon($browser, $username, $password, $config = []): void
+    {
+        $browser->type('@login-email-input', $username)
+            ->type('@login-password-input', $password);
+
+        if ($username == 'ned@kolab.org') {
+            $code = \App\Auth\SecondFactor::code('ned@kolab.org');
+            $browser->type('@login-second-factor-input', $code);
+        }
+
+        if (!empty($config)) {
+            $browser->script(
+                sprintf('Object.assign(window.config, %s)', \json_encode($config))
+            );
+        }
+
+        $browser->click('@login-button');
+    }
+}
diff --git a/src/tests/Browser/Pages/PaymentMollie.php b/src/tests/Browser/Pages/PaymentMollie.php
index 498493a8..1532f97e 100644
--- a/src/tests/Browser/Pages/PaymentMollie.php
+++ b/src/tests/Browser/Pages/PaymentMollie.php
@@ -1,64 +1,65 @@
 <?php
 
 namespace Tests\Browser\Pages;
 
 use Laravel\Dusk\Page;
 
 class PaymentMollie extends Page
 {
     /**
      * Get the URL for the page.
      *
      * @return string
      */
     public function url(): string
     {
         return '';
     }
 
     /**
      * Assert that the browser is on the page.
      *
      * @param \Laravel\Dusk\Browser $browser The browser object
      *
      * @return void
      */
     public function assert($browser)
     {
         $browser->waitFor('#container');
     }
 
     /**
      * Get the element shortcuts for the page.
      *
      * @return array
      */
     public function elements(): array
     {
         return [
             '@form' => '#container',
             '@title' => '#container .header__info',
             '@amount' => '#container .header__amount',
             '@methods' => '#payment-method-list',
             '@status-table' => 'table.table--select-status',
         ];
     }
 
     /**
      * Submit payment form.
      *
-     * @param \Laravel\Dusk\Browser $browser  The browser object
+     * @param \Laravel\Dusk\Browser $browser The browser object
+     * @param string                $status  Test payment status (paid, open, failed, canceled, expired)
      *
      * @return void
      */
-    public function submitValidCreditCard($browser)
+    public function submitValidCreditCard($browser, $status = 'paid')
     {
         if ($browser->element('@methods')) {
             $browser->click('@methods button.grid-button-creditcard')
                 ->waitFor('button.form__button');
         }
 
-        $browser->click('input[value="paid"]')
+        $browser->click('input[value="' . $status . '"]')
             ->click('button.form__button');
     }
 }
diff --git a/src/tests/Browser/Pages/Signup.php b/src/tests/Browser/Pages/Signup.php
index efeaddbb..474388f4 100644
--- a/src/tests/Browser/Pages/Signup.php
+++ b/src/tests/Browser/Pages/Signup.php
@@ -1,50 +1,51 @@
 <?php
 
 namespace Tests\Browser\Pages;
 
 use Laravel\Dusk\Page;
 
 class Signup extends Page
 {
     /**
      * Get the URL for the page.
      *
      * @return string
      */
     public function url(): string
     {
         return '/signup';
     }
 
     /**
      * Assert that the browser is on the page.
      *
      * @param \Laravel\Dusk\Browser $browser The browser object
      *
      * @return void
      */
     public function assert($browser)
     {
         $browser->assertPathIs('/signup')
+            ->waitUntilMissing('.app-loader')
             ->assertPresent('@step0')
             ->assertPresent('@step1')
             ->assertPresent('@step2')
             ->assertPresent('@step3');
     }
 
     /**
      * Get the element shortcuts for the page.
      *
      * @return array
      */
     public function elements(): array
     {
         return [
             '@app' => '#app',
             '@step0' => '#step0',
             '@step1' => '#step1',
             '@step2' => '#step2',
             '@step3' => '#step3',
         ];
     }
 }
diff --git a/src/tests/Browser/PaymentMollieTest.php b/src/tests/Browser/PaymentMollieTest.php
index 5b66eefe..27018d3f 100644
--- a/src/tests/Browser/PaymentMollieTest.php
+++ b/src/tests/Browser/PaymentMollieTest.php
@@ -1,233 +1,313 @@
 <?php
 
 namespace Tests\Browser;
 
 use App\Providers\PaymentProvider;
 use App\Wallet;
 use Tests\Browser;
 use Tests\Browser\Components\Dialog;
 use Tests\Browser\Components\Toast;
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Home;
 use Tests\Browser\Pages\PaymentMollie;
 use Tests\Browser\Pages\Wallet as WalletPage;
 use Tests\TestCaseDusk;
 
 class PaymentMollieTest extends TestCaseDusk
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('payment-test@kolabnow.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('payment-test@kolabnow.com');
 
         parent::tearDown();
     }
 
     /**
      * Test the payment process
      *
      * @group mollie
      */
     public function testPayment(): void
     {
         $user = $this->getTestUser('payment-test@kolabnow.com', [
                 'password' => 'simple123',
         ]);
 
-        $this->browse(function (Browser $browser) {
+        $this->browse(function (Browser $browser) use ($user) {
             $browser->visit(new Home())
                 ->submitLogon('payment-test@kolabnow.com', 'simple123', true, ['paymentProvider' => 'mollie'])
                 ->on(new Dashboard())
                 ->click('@links .link-wallet')
                 ->on(new WalletPage())
                 ->assertSeeIn('@main button', 'Add credit')
                 ->click('@main button')
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Top up your wallet')
+                        ->waitFor('#payment-method-selection #creditcard')
+                        ->waitFor('#payment-method-selection #paypal')
+                        ->assertMissing('#payment-method-selection #banktransfer')
+                        ->click('#creditcard');
+                })
                 ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
                     $browser->assertSeeIn('@title', 'Top up your wallet')
                         ->assertFocused('#amount')
                         ->assertSeeIn('@button-cancel', 'Cancel')
-                        ->assertSeeIn('@body #payment-form button', 'Continue')
+                        ->assertSeeIn('@button-action', 'Continue')
                         // Test error handling
                         ->type('@body #amount', 'aaa')
-                        ->click('@body #payment-form button')
+                        ->click('@button-action')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->assertSeeIn('#amount + span + .invalid-feedback', 'The amount must be a number.')
                         // Submit valid data
                         ->type('@body #amount', '12.34')
-                        ->click('@body #payment-form button');
+                        // Note we use double click to assert it does not create redundant requests
+                        ->click('@button-action')
+                        ->click('@button-action');
                 })
                 ->on(new PaymentMollie())
                 ->assertSeeIn('@title', \config('app.name') . ' Payment')
                 ->assertSeeIn('@amount', 'CHF 12.34');
 
+            $this->assertSame(1, $user->wallets()->first()->payments()->count());
+
             // Looks like the Mollie testing mode is limited.
             // We'll select credit card method and mark the payment as paid
             // We can't do much more, we have to trust Mollie their page works ;)
 
             // For some reason I don't get the method selection form, it
             // immediately jumps to the next step. Let's detect that
             if ($browser->element('@methods')) {
                 $browser->click('@methods button.grid-button-creditcard')
                     ->waitFor('button.form__button');
             }
 
             $browser->click('@status-table input[value="paid"]')
                 ->click('button.form__button');
 
             // Now it should redirect back to wallet page and in background
             // use the webhook to update payment status (and balance).
 
             // Looks like in test-mode the webhook is executed before redirect
             // so we can expect balance updated on the wallet page
 
             $browser->waitForLocation('/wallet')
                 ->on(new WalletPage())
                 ->assertSeeIn('@main .card-title', 'Account balance 12,34 CHF');
         });
     }
 
     /**
      * Test the auto-payment setup process
      *
      * @group mollie
      */
     public function testAutoPaymentSetup(): void
     {
         $user = $this->getTestUser('payment-test@kolabnow.com', [
                 'password' => 'simple123',
         ]);
 
-        $this->browse(function (Browser $browser) {
+        $this->browse(function (Browser $browser) use ($user) {
             $browser->visit(new Home())
                 ->submitLogon('payment-test@kolabnow.com', 'simple123', true, ['paymentProvider' => 'mollie'])
                 ->on(new Dashboard())
                 ->click('@links .link-wallet')
                 ->on(new WalletPage())
-                ->click('@main button')
+                ->assertMissing('@body #mandate-form .alert')
+                ->click('@main #mandate-form button')
                 ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $browser->assertSeeIn('@title', 'Top up your wallet')
-                        ->assertSeeIn('@button-cancel', 'Cancel')
-                        ->assertSeeIn('@body #mandate-form button', 'Set up auto-payment')
-                        ->click('@body #mandate-form button')
-                        ->assertSeeIn('@title', 'Add auto-payment')
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
+                        ->waitFor('#payment-method-selection #creditcard')
+                        ->assertMissing('#payment-method-selection #paypal')
+                        ->assertMissing('#payment-method-selection #banktransfer')
+                        ->click('#creditcard');
+                })
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
                         ->assertSeeIn('@body label[for="mandate_amount"]', 'Fill up by')
                         ->assertValue('@body #mandate_amount', PaymentProvider::MIN_AMOUNT / 100)
                         ->assertSeeIn('@body label[for="mandate_balance"]', 'when account balance is below') // phpcs:ignore
                         ->assertValue('@body #mandate_balance', '0')
                         ->assertSeeIn('@button-cancel', 'Cancel')
                         ->assertSeeIn('@button-action', 'Continue')
                         // Test error handling
                         ->type('@body #mandate_amount', 'aaa')
                         ->type('@body #mandate_balance', '-1')
                         ->click('@button-action')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->assertVisible('@body #mandate_amount.is-invalid')
                         ->assertVisible('@body #mandate_balance.is-invalid')
                         ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
                         ->assertSeeIn('#mandate_balance + span + .invalid-feedback', 'The balance must be at least 0.')
                         ->type('@body #mandate_amount', 'aaa')
                         ->type('@body #mandate_balance', '0')
                         ->click('@button-action')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->assertVisible('@body #mandate_amount.is-invalid')
                         ->assertMissing('@body #mandate_balance.is-invalid')
                         ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
                         ->assertMissing('#mandate_balance + span + .invalid-feedback')
                         // Submit valid data
                         ->type('@body #mandate_amount', '100')
                         ->type('@body #mandate_balance', '0')
+                        // Note we use double click to assert it does not create redundant requests
+                        ->click('@button-action')
                         ->click('@button-action');
                 })
                 ->on(new PaymentMollie())
                 ->assertSeeIn('@title', \config('app.name') . ' Auto-Payment Setup')
                 ->assertMissing('@amount')
                 ->submitValidCreditCard()
                 ->waitForLocation('/wallet')
                 ->visit('/wallet?paymentProvider=mollie')
-                ->on(new WalletPage())
-                ->click('@main button')
-                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $expected = 'Auto-payment is set to fill up your account by 100 CHF every'
-                        . ' time your account balance gets under 0 CHF. You will be charged'
-                        . ' via Mastercard (**** **** **** 6787).';
+                ->waitFor('#mandate-info')
+                ->assertPresent('#mandate-info p:first-child')
+                ->assertSeeIn(
+                    '#mandate-info p:first-child',
+                    'Auto-payment is set to fill up your account by 100 CHF ' .
+                    'every time your account balance gets under 0 CHF.'
+                )
+                ->assertSeeIn(
+                    '#mandate-info p:nth-child(2)',
+                    'Mastercard (**** **** **** 6787)'
+                )
+                ->assertMissing('@body .alert');
 
-                    $browser->assertSeeIn('@title', 'Top up your wallet')
-                        ->waitFor('#mandate-info')
-                        ->assertSeeIn('#mandate-info p:first-child', $expected)
-                        ->click('@button-cancel');
-                });
+            $this->assertSame(1, $user->wallets()->first()->payments()->count());
         });
 
-        // Test updating auto-payment
+        // Test updating (disabled) auto-payment
         $this->browse(function (Browser $browser) use ($user) {
             $wallet = $user->wallets()->first();
             $wallet->setSetting('mandate_disabled', 1);
 
             $browser->refresh()
                 ->on(new WalletPage())
-                ->click('@main button')
+                ->waitFor('#mandate-info')
+                ->assertSeeIn(
+                    '#mandate-info .disabled-mandate',
+                    'The configured auto-payment has been disabled'
+                )
+                ->assertSeeIn('#mandate-info button.btn-primary', 'Change auto-payment')
+                ->click('#mandate-info button.btn-primary')
                 ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $browser->waitFor('@body #mandate-info')
-                        ->assertSeeIn(
-                            '@body #mandate-info p.disabled-mandate',
-                            'The configured auto-payment has been disabled'
-                        )
-                        ->assertSeeIn('@body #mandate-info button.btn-primary', 'Change auto-payment')
-                        ->click('@body #mandate-info button.btn-primary')
-                        ->assertSeeIn('@title', 'Update auto-payment')
-                        ->assertSeeIn(
-                            '@body form p.disabled-mandate',
-                            'The auto-payment is disabled.'
-                        )
-                        ->assertValue('@body #mandate_amount', '100')
-                        ->assertValue('@body #mandate_balance', '0')
-                        ->assertSeeIn('@button-cancel', 'Cancel')
-                        ->assertSeeIn('@button-action', 'Submit')
-                        // Test error handling
-                        ->type('@body #mandate_amount', 'aaa')
-                        ->click('@button-action')
-                        ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
-                        ->assertVisible('@body #mandate_amount.is-invalid')
-                        ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
-                        // Submit valid data
-                        ->type('@body #mandate_amount', '50')
-                        ->click('@button-action');
+                    $browser->assertSeeIn('@title', 'Update auto-payment')
+                    ->assertSeeIn(
+                        '@body form .disabled-mandate',
+                        'The auto-payment is disabled.'
+                    )
+                    ->assertValue('@body #mandate_amount', '100')
+                    ->assertValue('@body #mandate_balance', '0')
+                    ->assertSeeIn('@button-cancel', 'Cancel')
+                    ->assertSeeIn('@button-action', 'Submit')
+                    // Test error handling
+                    ->type('@body #mandate_amount', 'aaa')
+                    ->click('@button-action')
+                    ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
+                    ->assertVisible('@body #mandate_amount.is-invalid')
+                    ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
+                    // Submit valid data
+                    ->type('@body #mandate_amount', '50')
+                    ->click('@button-action');
                 })
                 ->waitUntilMissing('#payment-dialog')
                 ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been updated.')
-                // Open the dialog again and make sure the "disabled" text isn't there
-                ->click('@main button')
-                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $browser->assertMissing('@body #mandate-info p.disabled-mandate')
-                        ->click('@body #mandate-info button.btn-primary')
-                        ->assertMissing('@body form p.disabled-mandate')
-                        ->click('@button-cancel');
-                });
+                // make sure the "disabled" text isn't there
+                ->assertMissing('#mandate-info .disabled-mandate')
+                ->click('#mandate-info button.btn-primary')
+                ->assertMissing('form .disabled-mandate')
+                ->click('button.modal-cancel');
         });
 
         // Test deleting auto-payment
         $this->browse(function (Browser $browser) {
             $browser->on(new WalletPage())
+            ->waitFor('#mandate-info')
+            ->assertSeeIn('#mandate-info * button.btn-danger', 'Cancel auto-payment')
+            ->assertVisible('#mandate-info * button.btn-danger')
+            ->click('#mandate-info * button.btn-danger')
+            ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been removed.')
+            ->assertVisible('#mandate-form')
+            ->assertMissing('#mandate-info');
+        });
+
+        // Test pending and failed mandate
+        $this->browse(function (Browser $browser) {
+            $browser->on(new WalletPage())
+                ->assertMissing('@body #mandate-form .alert')
+                ->click('@main #mandate-form button')
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
+                        ->waitFor('#payment-method-selection #creditcard')
+                        ->click('#creditcard');
+                })
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
+                        ->assertSeeIn('@button-cancel', 'Cancel')
+                        ->assertSeeIn('@button-action', 'Continue')
+                        // Submit valid data
+                        ->type('@body #mandate_amount', '100')
+                        ->type('@body #mandate_balance', '0')
+                        ->click('@button-action');
+                })
+                ->on(new PaymentMollie())
+                ->submitValidCreditCard('open')
+                ->waitForLocation('/wallet')
+                ->visit('/wallet?paymentProvider=mollie')
+                ->on(new WalletPage())
+                ->assertSeeIn(
+                    '#mandate-info .alert-warning',
+                    'The setup of the automatic payment is still in progress.'
+                )
+                // Delete the mandate
+                ->click('#mandate-info * button.btn-danger')
+                ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been removed.')
+                ->assertMissing('@body #mandate-form .alert')
+
+                // Create a new mandate
+                ->click('@main #mandate-form button')
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
+                        ->waitFor('#payment-method-selection #creditcard')
+                        ->click('#creditcard');
+                })
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
+                        ->assertSeeIn('@button-cancel', 'Cancel')
+                        ->assertSeeIn('@button-action', 'Continue')
+                        // Submit valid data
+                        ->type('@body #mandate_amount', '100')
+                        ->type('@body #mandate_balance', '0')
+                        ->click('@button-action');
+                })
+                ->on(new PaymentMollie())
+                ->submitValidCreditCard('failed')
+                ->waitForLocation('/wallet')
+                ->visit('/wallet?paymentProvider=mollie')
+                ->on(new WalletPage())
+                ->waitFor('#mandate-form .alert-danger')
+                ->assertSeeIn(
+                    '#mandate-form .alert-danger',
+                    'The setup of automatic payments failed. Restart the process to enable'
+                )
                 ->click('@main button')
                 ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $browser->assertSeeIn('@body #mandate-info button.btn-danger', 'Cancel auto-payment')
-                        ->click('@body #mandate-info button.btn-danger')
-                        ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been removed.')
-                        ->assertVisible('@body #mandate-form')
-                        ->assertMissing('@body #mandate-info');
+                    $browser->waitFor('#mandate-form')
+                        ->assertMissing('#mandate-info');
                 });
         });
     }
 }
diff --git a/src/tests/Browser/PaymentStripeTest.php b/src/tests/Browser/PaymentStripeTest.php
index c37e47aa..5bb34510 100644
--- a/src/tests/Browser/PaymentStripeTest.php
+++ b/src/tests/Browser/PaymentStripeTest.php
@@ -1,202 +1,234 @@
 <?php
 
 namespace Tests\Browser;
 
 use App\Providers\PaymentProvider;
 use App\Wallet;
 use Tests\Browser;
 use Tests\Browser\Components\Dialog;
 use Tests\Browser\Components\Toast;
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Home;
 use Tests\Browser\Pages\PaymentStripe;
 use Tests\Browser\Pages\Wallet as WalletPage;
 use Tests\TestCaseDusk;
 
 class PaymentStripeTest extends TestCaseDusk
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('payment-test@kolabnow.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('payment-test@kolabnow.com');
 
         parent::tearDown();
     }
 
     /**
      * Test the payment process
      *
      * @group stripe
      */
     public function testPayment(): void
     {
         $user = $this->getTestUser('payment-test@kolabnow.com', [
                 'password' => 'simple123',
         ]);
 
         $this->browse(function (Browser $browser) use ($user) {
             $browser->visit(new Home())
                 ->submitLogon('payment-test@kolabnow.com', 'simple123', true, ['paymentProvider' => 'stripe'])
                 ->on(new Dashboard())
                 ->click('@links .link-wallet')
                 ->on(new WalletPage())
                 ->assertSeeIn('@main button', 'Add credit')
                 ->click('@main button')
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Top up your wallet')
+                        ->waitFor('#payment-method-selection #creditcard')
+                        ->waitFor('#payment-method-selection #paypal')
+                        ->assertMissing('#payment-method-selection #banktransfer')
+                        ->click('#creditcard');
+                })
                 ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
                     $browser->assertSeeIn('@title', 'Top up your wallet')
                         ->assertFocused('#amount')
                         ->assertSeeIn('@button-cancel', 'Cancel')
-                        ->assertSeeIn('@body #payment-form button', 'Continue')
+                        ->assertSeeIn('@button-action', 'Continue')
                         // Test error handling
                         ->type('@body #amount', 'aaa')
-                        ->click('@body #payment-form button')
+                        ->click('@button-action')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->assertSeeIn('#amount + span + .invalid-feedback', 'The amount must be a number.')
                         // Submit valid data
                         ->type('@body #amount', '12.34')
-                        ->click('@body #payment-form button');
+                        // Note we use double click to assert it does not create redundant requests
+                        ->click('@button-action')
+                        ->click('@button-action');
                 })
                 ->on(new PaymentStripe())
                 ->assertSeeIn('@title', \config('app.name') . ' Payment')
                 ->assertSeeIn('@amount', 'CHF 12.34')
                 ->assertValue('@email-input', $user->email)
                 ->submitValidCreditCard();
 
             // Now it should redirect back to wallet page and in background
             // use the webhook to update payment status (and balance).
 
             // Looks like in test-mode the webhook is executed before redirect
             // so we can expect balance updated on the wallet page
 
             $browser->waitForLocation('/wallet', 30) // need more time than default 5 sec.
                 ->on(new WalletPage())
                 ->assertSeeIn('@main .card-title', 'Account balance 12,34 CHF');
         });
     }
 
     /**
      * Test the auto-payment setup process
      *
      * @group stripe
      */
     public function testAutoPaymentSetup(): void
     {
         $user = $this->getTestUser('payment-test@kolabnow.com', [
                 'password' => 'simple123',
         ]);
 
         // Test creating auto-payment
         $this->browse(function (Browser $browser) use ($user) {
             $browser->visit(new Home())
                 ->submitLogon('payment-test@kolabnow.com', 'simple123', true, ['paymentProvider' => 'stripe'])
                 ->on(new Dashboard())
                 ->click('@links .link-wallet')
                 ->on(new WalletPage())
-                ->click('@main button')
+                ->assertMissing('@body #mandate-form .alert')
+                ->click('@main #mandate-form button')
                 ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $browser->assertSeeIn('@title', 'Top up your wallet')
-                        ->assertSeeIn('@button-cancel', 'Cancel')
-                        ->assertSeeIn('@body #mandate-form button', 'Set up auto-payment')
-                        ->click('@body #mandate-form button')
-                        ->assertSeeIn('@title', 'Add auto-payment')
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
+                        ->waitFor('#payment-method-selection #creditcard')
+                        ->assertMissing('#payment-method-selection #paypal')
+                        ->assertMissing('#payment-method-selection #banktransfer')
+                        ->click('#creditcard');
+                })
+                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Add auto-payment')
                         ->assertSeeIn('@body label[for="mandate_amount"]', 'Fill up by')
                         ->assertValue('@body #mandate_amount', PaymentProvider::MIN_AMOUNT / 100)
                         ->assertSeeIn('@body label[for="mandate_balance"]', 'when account balance is below') // phpcs:ignore
                         ->assertValue('@body #mandate_balance', '0')
                         ->assertSeeIn('@button-cancel', 'Cancel')
                         ->assertSeeIn('@button-action', 'Continue')
                         // Test error handling
                         ->type('@body #mandate_amount', 'aaa')
                         ->type('@body #mandate_balance', '-1')
                         ->click('@button-action')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->assertVisible('@body #mandate_amount.is-invalid')
                         ->assertVisible('@body #mandate_balance.is-invalid')
                         ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
                         ->assertSeeIn('#mandate_balance + span + .invalid-feedback', 'The balance must be at least 0.')
                         ->type('@body #mandate_amount', 'aaa')
                         ->type('@body #mandate_balance', '0')
                         ->click('@button-action')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->assertVisible('@body #mandate_amount.is-invalid')
                         ->assertMissing('@body #mandate_balance.is-invalid')
                         ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
                         ->assertMissing('#mandate_balance + span + .invalid-feedback')
                         // Submit valid data
                         ->type('@body #mandate_amount', '100')
                         ->type('@body #mandate_balance', '0')
+                        // Note we use double click to assert it does not create redundant requests
+                        ->click('@button-action')
                         ->click('@button-action');
                 })
                 ->on(new PaymentStripe())
                 ->assertMissing('@title')
                 ->assertMissing('@amount')
                 ->assertValue('@email-input', $user->email)
                 ->submitValidCreditCard()
                 ->waitForLocation('/wallet', 30) // need more time than default 5 sec.
                 ->visit('/wallet?paymentProvider=stripe')
-                ->on(new WalletPage())
-                ->click('@main button')
-                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $expected = 'Auto-payment is set to fill up your account by 100 CHF every'
-                        . ' time your account balance gets under 0 CHF. You will be charged'
-                        . ' via Visa (**** **** **** 4242).';
-
-                    $browser->assertSeeIn('@title', 'Top up your wallet')
-                        ->waitFor('#mandate-info')
-                        ->assertSeeIn('#mandate-info p:first-child', $expected)
-                        ->click('@button-cancel');
-                });
+                ->waitFor('#mandate-info')
+                ->assertPresent('#mandate-info p:first-child')
+                ->assertSeeIn(
+                    '#mandate-info p:first-child',
+                    'Auto-payment is set to fill up your account by 100 CHF ' .
+                    'every time your account balance gets under 0 CHF.'
+                )
+                ->assertSeeIn(
+                    '#mandate-info p:nth-child(2)',
+                    'Visa (**** **** **** 4242)'
+                )
+                ->assertMissing('@body .alert');
         });
 
-        // Test updating auto-payment
-        $this->browse(function (Browser $browser) {
-            $browser->on(new WalletPage())
-                ->click('@main button')
+
+        // Test updating (disabled) auto-payment
+        $this->browse(function (Browser $browser) use ($user) {
+            $wallet = $user->wallets()->first();
+            $wallet->setSetting('mandate_disabled', 1);
+
+            $browser->refresh()
+                ->on(new WalletPage())
+                ->waitFor('#mandate-info')
+                ->assertSeeIn(
+                    '#mandate-info .disabled-mandate',
+                    'The configured auto-payment has been disabled'
+                )
+                ->assertSeeIn('#mandate-info button.btn-primary', 'Change auto-payment')
+                ->click('#mandate-info button.btn-primary')
                 ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $browser->assertSeeIn('@body #mandate-info button.btn-primary', 'Change auto-payment')
-                        ->click('@body #mandate-info button.btn-primary')
-                        ->assertSeeIn('@title', 'Update auto-payment')
-                        ->assertValue('@body #mandate_amount', '100')
-                        ->assertValue('@body #mandate_balance', '0')
-                        ->assertSeeIn('@button-cancel', 'Cancel')
-                        ->assertSeeIn('@button-action', 'Submit')
-                        // Test error handling
-                        ->type('@body #mandate_amount', 'aaa')
-                        ->click('@button-action')
-                        ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
-                        ->assertVisible('@body #mandate_amount.is-invalid')
-                        ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
-                        // Submit valid data
-                        ->type('@body #mandate_amount', '50')
-                        ->click('@button-action');
+                    $browser->assertSeeIn('@title', 'Update auto-payment')
+                    ->assertSeeIn(
+                        '@body form .disabled-mandate',
+                        'The auto-payment is disabled.'
+                    )
+                    ->assertValue('@body #mandate_amount', '100')
+                    ->assertValue('@body #mandate_balance', '0')
+                    ->assertSeeIn('@button-cancel', 'Cancel')
+                    ->assertSeeIn('@button-action', 'Submit')
+                    // Test error handling
+                    ->type('@body #mandate_amount', 'aaa')
+                    ->click('@button-action')
+                    ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
+                    ->assertVisible('@body #mandate_amount.is-invalid')
+                    ->assertSeeIn('#mandate_amount + span + .invalid-feedback', 'The amount must be a number.')
+                    // Submit valid data
+                    ->type('@body #mandate_amount', '50')
+                    ->click('@button-action');
                 })
                 ->waitUntilMissing('#payment-dialog')
-                ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been updated.');
+                ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been updated.')
+                // make sure the "disabled" text isn't there
+                ->assertMissing('#mandate-info .disabled-mandate')
+                ->click('#mandate-info button.btn-primary')
+                ->assertMissing('form .disabled-mandate')
+                ->click('button.modal-cancel');
         });
 
         // Test deleting auto-payment
         $this->browse(function (Browser $browser) {
             $browser->on(new WalletPage())
-                ->click('@main button')
-                ->with(new Dialog('@payment-dialog'), function (Browser $browser) {
-                    $browser->assertSeeIn('@body #mandate-info button.btn-danger', 'Cancel auto-payment')
-                        ->click('@body #mandate-info button.btn-danger')
-                        ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been removed.')
-                        ->assertVisible('@body #mandate-form')
-                        ->assertMissing('@body #mandate-info');
-                });
+            ->waitFor('#mandate-info')
+            ->assertSeeIn('#mandate-info * button.btn-danger', 'Cancel auto-payment')
+            ->assertVisible('#mandate-info * button.btn-danger')
+            ->click('#mandate-info * button.btn-danger')
+            ->assertToast(Toast::TYPE_SUCCESS, 'The auto-payment has been removed.')
+            ->assertVisible('#mandate-form')
+            ->assertMissing('#mandate-info');
         });
     }
 }
diff --git a/src/tests/Browser/SignupTest.php b/src/tests/Browser/SignupTest.php
index d8ba4bb2..eed0948d 100644
--- a/src/tests/Browser/SignupTest.php
+++ b/src/tests/Browser/SignupTest.php
@@ -1,545 +1,545 @@
 <?php
 
 namespace Tests\Browser;
 
 use App\Discount;
 use App\Domain;
 use App\SignupCode;
 use App\User;
 use Tests\Browser;
 use Tests\Browser\Components\Menu;
 use Tests\Browser\Components\Toast;
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Signup;
 use Tests\TestCaseDusk;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class SignupTest extends TestCaseDusk
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('signuptestdusk@' . \config('app.domain'));
         $this->deleteTestUser('admin@user-domain-signup.com');
         $this->deleteTestDomain('user-domain-signup.com');
     }
 
     public function tearDown(): void
     {
         $this->deleteTestUser('signuptestdusk@' . \config('app.domain'));
         $this->deleteTestUser('admin@user-domain-signup.com');
         $this->deleteTestDomain('user-domain-signup.com');
 
         parent::tearDown();
     }
 
     /**
      * Test signup code verification with a link
      */
     public function testSignupCodeByLink(): void
     {
         // Test invalid code (invalid format)
         $this->browse(function (Browser $browser) {
             // Register Signup page element selectors we'll be using
             $browser->onWithoutAssert(new Signup());
 
             // TODO: Test what happens if user is logged in
 
             $browser->visit('/signup/invalid-code');
 
             // TODO: According to https://github.com/vuejs/vue-router/issues/977
             // it is not yet easily possible to display error page component (route)
             // without changing the URL
             // TODO: Instead of css selector we should probably define page/component
             // and use it instead
             $browser->waitFor('#error-page');
         });
 
         // Test invalid code (valid format)
         $this->browse(function (Browser $browser) {
             $browser->visit('/signup/XXXXX-code');
 
             // FIXME: User will not be able to continue anyway, so we should
             //        either display 1st step or 404 error page
             $browser->waitFor('@step1')
                 ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
         });
 
         // Test valid code
         $this->browse(function (Browser $browser) {
             $code = SignupCode::create([
                     'data' => [
                         'email' => 'User@example.org',
                         'first_name' => 'User',
                         'last_name' => 'Name',
                         'plan' => 'individual',
                         'voucher' => '',
                     ]
             ]);
 
             $browser->visit('/signup/' . $code->short_code . '-' . $code->code)
                 ->waitFor('@step3')
                 ->assertMissing('@step1')
                 ->assertMissing('@step2');
 
             // FIXME: Find a nice way to read javascript data without using hidden inputs
             $this->assertSame($code->code, $browser->value('@step2 #signup_code'));
 
             // TODO: Test if the signup process can be completed
         });
     }
 
     /**
      * Test signup "welcome" page
      */
     public function testSignupStep0(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Signup());
 
             $browser->assertVisible('@step0')
                 ->assertMissing('@step1')
                 ->assertMissing('@step2')
                 ->assertMissing('@step3');
 
             $browser->within(new Menu(), function ($browser) {
                 $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login'], 'signup');
             });
 
-            $browser->waitFor('@step0 .plan-selector > .plan-box');
+            $browser->waitFor('@step0 .plan-selector > .card');
 
             // Assert first plan box and press the button
             $browser->with('@step0 .plan-selector > .plan-individual', function ($step) {
                 $step->assertVisible('button')
                     ->assertSeeIn('button', 'Individual Account')
                     ->assertVisible('.plan-description')
                     ->click('button');
             });
 
             $browser->waitForLocation('/signup/individual')
                 ->assertVisible('@step1')
                 ->assertMissing('@step0')
                 ->assertMissing('@step2')
                 ->assertMissing('@step3')
                 ->assertFocused('@step1 #signup_first_name');
 
             // Click Back button
             $browser->click('@step1 [type=button]')
                 ->waitForLocation('/signup')
                     ->assertVisible('@step0')
                     ->assertMissing('@step1')
                     ->assertMissing('@step2')
                     ->assertMissing('@step3');
 
             // Choose the group account plan
             $browser->click('@step0 .plan-selector > .plan-group button')
                 ->waitForLocation('/signup/group')
                 ->assertVisible('@step1')
                 ->assertMissing('@step0')
                 ->assertMissing('@step2')
                 ->assertMissing('@step3')
                 ->assertFocused('@step1 #signup_first_name');
 
             // TODO: Test if 'plan' variable is set properly in vue component
         });
     }
 
     /**
      * Test 1st step of the signup process
      */
     public function testSignupStep1(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/signup/individual')
                 ->onWithoutAssert(new Signup());
 
             // Here we expect two text inputs and Back and Continue buttons
             $browser->with('@step1', function ($step) {
                 $step->assertVisible('#signup_last_name')
                     ->assertVisible('#signup_first_name')
                     ->assertFocused('#signup_first_name')
                     ->assertVisible('#signup_email')
                     ->assertVisible('[type=button]')
                     ->assertVisible('[type=submit]');
             });
 
             // Submit empty form
             // Email is required, so after pressing Submit
             // we expect focus to be moved to the email input
             $browser->with('@step1', function ($step) {
                 $step->click('[type=submit]');
                 $step->assertFocused('#signup_email');
             });
 
             $browser->within(new Menu(), function ($browser) {
                 $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login'], 'signup');
             });
 
             // Submit invalid email, and first_name
             // We expect both inputs to have is-invalid class added, with .invalid-feedback element
             $browser->with('@step1', function ($step) {
                 $step->type('#signup_first_name', str_repeat('a', 250))
                     ->type('#signup_email', '@test')
                     ->click('[type=submit]')
                     ->waitFor('#signup_email.is-invalid')
                     ->assertVisible('#signup_first_name.is-invalid')
                     ->assertVisible('#signup_email + .invalid-feedback')
                     ->assertVisible('#signup_last_name + .invalid-feedback')
                     ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
             });
 
             // Submit valid data
             // We expect error state on email input to be removed, and Step 2 form visible
             $browser->with('@step1', function ($step) {
                 $step->type('#signup_first_name', 'Test')
                     ->type('#signup_last_name', 'User')
                     ->type('#signup_email', 'BrowserSignupTestUser1@kolab.org')
                     ->click('[type=submit]')
                     ->assertMissing('#signup_email.is-invalid')
                     ->assertMissing('#signup_email + .invalid-feedback');
             });
 
             $browser->waitUntilMissing('@step2 #signup_code[value=""]');
             $browser->waitFor('@step2');
             $browser->assertMissing('@step1');
         });
     }
 
     /**
      * Test 2nd Step of the signup process
      *
      * @depends testSignupStep1
      */
     public function testSignupStep2(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->assertVisible('@step2')
                 ->assertMissing('@step0')
                 ->assertMissing('@step1')
                 ->assertMissing('@step3');
 
             // Here we expect one text input, Back and Continue buttons
             $browser->with('@step2', function ($step) {
                 $step->assertVisible('#signup_short_code')
                     ->assertFocused('#signup_short_code')
                     ->assertVisible('[type=button]')
                     ->assertVisible('[type=submit]');
             });
 
             // Test Back button functionality
             $browser->click('@step2 [type=button]')
                 ->waitFor('@step1')
                 ->assertFocused('@step1 #signup_first_name')
                 ->assertMissing('@step2');
 
             // Submit valid Step 1 data (again)
             $browser->with('@step1', function ($step) {
                 $step->type('#signup_first_name', 'User')
                     ->type('#signup_last_name', 'User')
                     ->type('#signup_email', 'BrowserSignupTestUser1@kolab.org')
                     ->click('[type=submit]');
             });
 
             $browser->waitFor('@step2');
             $browser->assertMissing('@step1');
 
             // Submit invalid code
             // We expect code input to have is-invalid class added, with .invalid-feedback element
             $browser->with('@step2', function ($step) {
                 $step->type('#signup_short_code', 'XXXXX');
                 $step->click('[type=submit]');
 
                 $step->waitFor('#signup_short_code.is-invalid')
                     ->assertVisible('#signup_short_code + .invalid-feedback')
                     ->assertFocused('#signup_short_code')
                     ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
             });
 
             // Submit valid code
             // We expect error state on code input to be removed, and Step 3 form visible
             $browser->with('@step2', function ($step) {
                 // Get the code and short_code from database
                 // FIXME: Find a nice way to read javascript data without using hidden inputs
                 $code = $step->value('#signup_code');
 
                 $this->assertNotEmpty($code);
 
                 $code = SignupCode::find($code);
 
                 $step->type('#signup_short_code', $code->short_code);
                 $step->click('[type=submit]');
 
                 $step->assertMissing('#signup_short_code.is-invalid');
                 $step->assertMissing('#signup_short_code + .invalid-feedback');
             });
 
             $browser->waitFor('@step3');
             $browser->assertMissing('@step2');
         });
     }
 
     /**
      * Test 3rd Step of the signup process
      *
      * @depends testSignupStep2
      */
     public function testSignupStep3(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->assertVisible('@step3');
 
             // Here we expect 3 text inputs, Back and Continue buttons
             $browser->with('@step3', function ($step) {
                 $step->assertVisible('#signup_login');
                 $step->assertVisible('#signup_password');
                 $step->assertVisible('#signup_confirm');
                 $step->assertVisible('select#signup_domain');
                 $step->assertVisible('[type=button]');
                 $step->assertVisible('[type=submit]');
                 $step->assertFocused('#signup_login');
                 $step->assertValue('select#signup_domain', \config('app.domain'));
                 $step->assertValue('#signup_login', '');
                 $step->assertValue('#signup_password', '');
                 $step->assertValue('#signup_confirm', '');
 
                 // TODO: Test domain selector
             });
 
             // Test Back button
             $browser->click('@step3 [type=button]');
             $browser->waitFor('@step2');
             $browser->assertFocused('@step2 #signup_short_code');
             $browser->assertMissing('@step3');
 
             // TODO: Test form reset when going back
 
             // Submit valid code again
             $browser->with('@step2', function ($step) {
                 $code = $step->value('#signup_code');
 
                 $this->assertNotEmpty($code);
 
                 $code = SignupCode::find($code);
 
                 $step->type('#signup_short_code', $code->short_code);
                 $step->click('[type=submit]');
             });
 
             $browser->waitFor('@step3');
 
             // Submit invalid data
             $browser->with('@step3', function ($step) {
                 $step->assertFocused('#signup_login')
                     ->type('#signup_login', '*')
                     ->type('#signup_password', '12345678')
                     ->type('#signup_confirm', '123456789')
                     ->click('[type=submit]')
                     ->waitFor('#signup_login.is-invalid')
                     ->assertVisible('#signup_domain + .invalid-feedback')
                     ->assertVisible('#signup_password.is-invalid')
                     ->assertVisible('#signup_password + .invalid-feedback')
                     ->assertFocused('#signup_login')
                     ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
             });
 
             // Submit invalid data (valid login, invalid password)
             $browser->with('@step3', function ($step) {
                 $step->type('#signup_login', 'SignupTestDusk')
                     ->click('[type=submit]')
                     ->waitFor('#signup_password.is-invalid')
                     ->assertVisible('#signup_password + .invalid-feedback')
                     ->assertMissing('#signup_login.is-invalid')
                     ->assertMissing('#signup_domain + .invalid-feedback')
                     ->assertFocused('#signup_password')
                     ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
             });
 
             // Submit valid data
             $browser->with('@step3', function ($step) {
                 $step->type('#signup_confirm', '12345678');
 
                 $step->click('[type=submit]');
             });
 
             // At this point we should be auto-logged-in to dashboard
             $browser->waitUntilMissing('@step3')
                 ->waitUntilMissing('.app-loader')
                 ->on(new Dashboard())
                 ->assertUser('signuptestdusk@' . \config('app.domain'))
                 ->assertVisible('@links a.link-profile')
                 ->assertMissing('@links a.link-domains')
                 ->assertVisible('@links a.link-users')
                 ->assertVisible('@links a.link-wallet');
 
             // Logout the user
             $browser->within(new Menu(), function ($browser) {
                 $browser->clickMenuItem('logout');
             });
         });
     }
 
     /**
      * Test signup for a group account
      */
     public function testSignupGroup(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new Signup());
 
             // Choose the group account plan
             $browser->waitFor('@step0 .plan-group button')
                 ->click('@step0 .plan-group button');
 
             // Submit valid data
             // We expect error state on email input to be removed, and Step 2 form visible
             $browser->whenAvailable('@step1', function ($step) {
                 $step->type('#signup_first_name', 'Test')
                     ->type('#signup_last_name', 'User')
                     ->type('#signup_email', 'BrowserSignupTestUser1@kolab.org')
                     ->click('[type=submit]');
             });
 
             // Submit valid code
             $browser->whenAvailable('@step2', function ($step) {
                 // Get the code and short_code from database
                 // FIXME: Find a nice way to read javascript data without using hidden inputs
                 $code = $step->value('#signup_code');
                 $code = SignupCode::find($code);
 
                 $step->type('#signup_short_code', $code->short_code)
                     ->click('[type=submit]');
             });
 
             // Here we expect 4 text inputs, Back and Continue buttons
             $browser->whenAvailable('@step3', function ($step) {
                 $step->assertVisible('#signup_login')
                     ->assertVisible('#signup_password')
                     ->assertVisible('#signup_confirm')
                     ->assertVisible('input#signup_domain')
                     ->assertVisible('[type=button]')
                     ->assertVisible('[type=submit]')
                     ->assertFocused('#signup_login')
                     ->assertValue('input#signup_domain', '')
                     ->assertValue('#signup_login', '')
                     ->assertValue('#signup_password', '')
                     ->assertValue('#signup_confirm', '');
             });
 
             // Submit invalid login and password data
             $browser->with('@step3', function ($step) {
                 $step->assertFocused('#signup_login')
                     ->type('#signup_login', '*')
                     ->type('#signup_domain', 'test.com')
                     ->type('#signup_password', '12345678')
                     ->type('#signup_confirm', '123456789')
                     ->click('[type=submit]')
                     ->waitFor('#signup_login.is-invalid')
                     ->assertVisible('#signup_domain + .invalid-feedback')
                     ->assertVisible('#signup_password.is-invalid')
                     ->assertVisible('#signup_password + .invalid-feedback')
                     ->assertFocused('#signup_login')
                     ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
             });
 
             // Submit invalid domain
             $browser->with('@step3', function ($step) {
                 $step->type('#signup_login', 'admin')
                     ->type('#signup_domain', 'aaa')
                     ->type('#signup_password', '12345678')
                     ->type('#signup_confirm', '12345678')
                     ->click('[type=submit]')
                     ->waitUntilMissing('#signup_login.is-invalid')
                     ->waitFor('#signup_domain.is-invalid + .invalid-feedback')
                     ->assertMissing('#signup_password.is-invalid')
                     ->assertMissing('#signup_password + .invalid-feedback')
                     ->assertFocused('#signup_domain')
                     ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
             });
 
             // Submit invalid domain
             $browser->with('@step3', function ($step) {
                 $step->type('#signup_domain', 'user-domain-signup.com')
                     ->click('[type=submit]');
             });
 
             // At this point we should be auto-logged-in to dashboard
             $browser->waitUntilMissing('@step3')
                 ->waitUntilMissing('.app-loader')
                 ->on(new Dashboard())
                 ->assertUser('admin@user-domain-signup.com')
                 ->assertVisible('@links a.link-profile')
                 ->assertVisible('@links a.link-domains')
                 ->assertVisible('@links a.link-users')
                 ->assertVisible('@links a.link-wallet');
 
             $browser->within(new Menu(), function ($browser) {
                 $browser->clickMenuItem('logout');
             });
         });
     }
 
     /**
      * Test signup with voucher
      */
     public function testSignupVoucherLink(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/signup/voucher/TEST')
                 ->onWithoutAssert(new Signup())
                 ->waitUntilMissing('.app-loader')
                 ->waitFor('@step0')
                 ->click('.plan-individual button')
                 ->whenAvailable('@step1', function (Browser $browser) {
                     $browser->type('#signup_first_name', 'Test')
                         ->type('#signup_last_name', 'User')
                         ->type('#signup_email', 'BrowserSignupTestUser1@kolab.org')
                         ->click('[type=submit]');
                 })
                 ->whenAvailable('@step2', function (Browser $browser) {
                     // Get the code and short_code from database
                     // FIXME: Find a nice way to read javascript data without using hidden inputs
                     $code = $browser->value('#signup_code');
 
                     $this->assertNotEmpty($code);
 
                     $code = SignupCode::find($code);
 
                     $browser->type('#signup_short_code', $code->short_code)
                         ->click('[type=submit]');
                 })
                 ->whenAvailable('@step3', function (Browser $browser) {
                     // Assert that the code is filled in the input
                     // Change it and test error handling
                     $browser->assertValue('#signup_voucher', 'TEST')
                         ->type('#signup_voucher', 'TESTXX')
                         ->type('#signup_login', 'signuptestdusk')
                         ->type('#signup_password', '123456789')
                         ->type('#signup_confirm', '123456789')
                         ->click('[type=submit]')
                         ->waitFor('#signup_voucher.is-invalid')
                         ->assertVisible('#signup_voucher + .invalid-feedback')
                         ->assertFocused('#signup_voucher')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         // Submit the correct code
                         ->type('#signup_voucher', 'TEST')
                         ->click('[type=submit]');
                 })
                 ->waitUntilMissing('@step3')
                 ->waitUntilMissing('.app-loader')
                 ->on(new Dashboard())
                 ->assertUser('signuptestdusk@' . \config('app.domain'))
                 // Logout the user
                 ->within(new Menu(), function ($browser) {
                     $browser->clickMenuItem('logout');
                 });
         });
 
         $user = $this->getTestUser('signuptestdusk@' . \config('app.domain'));
         $discount = Discount::where('code', 'TEST')->first();
         $this->assertSame($discount->id, $user->wallets()->first()->discount_id);
     }
 }
diff --git a/src/tests/Browser/SupportTest.php b/src/tests/Browser/SupportTest.php
new file mode 100644
index 00000000..e9e7651b
--- /dev/null
+++ b/src/tests/Browser/SupportTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Browser;
+
+use Tests\Browser;
+use Tests\Browser\Components\Dialog;
+use Tests\Browser\Components\Menu;
+use Tests\Browser\Components\Toast;
+use Tests\TestCaseDusk;
+
+class SupportTest extends TestCaseDusk
+{
+    /**
+     * Test support contact form
+     */
+    public function testSupportForm(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser->visit('/')
+                ->within(new Menu(), function ($browser) {
+                    $browser->clickMenuItem('support');
+                })
+                ->waitFor('#support')
+                ->assertSeeIn('.card-title', 'Contact Support')
+                ->assertSeeIn('a.btn-info', 'Contact Support')
+                ->click('a.btn-info')
+                ->with(new Dialog('#support-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Contact Support')
+                        ->assertFocused('#support-user')
+                        ->assertSeeIn('@button-cancel', 'Cancel')
+                        ->assertSeeIn('@button-action', 'Submit')
+                        ->assertVisible('#support-name')
+                        ->assertVisible('#support-email')
+                        ->assertVisible('#support-summary')
+                        ->assertVisible('#support-body')
+                        ->type('#support-email', 'email@address.com')
+                        ->type('#support-summary', 'Summary')
+                        ->type('#support-body', 'Body')
+                        ->click('@button-cancel');
+                })
+                ->assertMissing('#support-dialog')
+                ->click('a.btn-info')
+                ->with(new Dialog('#support-dialog'), function (Browser $browser) {
+                    $browser->assertSeeIn('@title', 'Contact Support')
+                        ->assertFocused('#support-user')
+                        ->assertValue('#support-email', 'email@address.com')
+                        ->assertValue('#support-summary', 'Summary')
+                        ->assertValue('#support-body', 'Body')
+                        ->click('@button-action');
+                })
+                // Note: This line assumes SUPPORT_EMAIL is not set in config
+                ->assertToast(Toast::TYPE_ERROR, 'Failed to submit the support request')
+                ->assertVisible('#support-dialog');
+        });
+    }
+}
diff --git a/src/tests/Browser/UsersTest.php b/src/tests/Browser/UsersTest.php
index 419b777f..1d732422 100644
--- a/src/tests/Browser/UsersTest.php
+++ b/src/tests/Browser/UsersTest.php
@@ -1,586 +1,672 @@
 <?php
 
 namespace Tests\Browser;
 
 use App\Discount;
 use App\Entitlement;
 use App\Sku;
 use App\User;
 use App\UserAlias;
 use Tests\Browser;
 use Tests\Browser\Components\Dialog;
 use Tests\Browser\Components\ListInput;
 use Tests\Browser\Components\QuotaInput;
 use Tests\Browser\Components\Toast;
 use Tests\Browser\Pages\Dashboard;
 use Tests\Browser\Pages\Home;
 use Tests\Browser\Pages\UserInfo;
 use Tests\Browser\Pages\UserList;
 use Tests\TestCaseDusk;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class UsersTest extends TestCaseDusk
 {
     private $profile = [
         'first_name' => 'John',
         'last_name' => 'Doe',
         'organization' => 'Kolab Developers',
     ];
 
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('julia.roberts@kolab.org');
 
         $john = User::where('email', 'john@kolab.org')->first();
         $john->setSettings($this->profile);
         UserAlias::where('user_id', $john->id)
             ->where('alias', 'john.test@kolab.org')->delete();
 
         Entitlement::where('entitleable_id', $john->id)->whereIn('cost', [25, 100])->delete();
 
         $wallet = $john->wallets()->first();
         $wallet->discount()->dissociate();
         $wallet->save();
+
+        $this->clearBetaEntitlements();
+        $this->clearMeetEntitlements();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('julia.roberts@kolab.org');
 
         $john = User::where('email', 'john@kolab.org')->first();
         $john->setSettings($this->profile);
         UserAlias::where('user_id', $john->id)
             ->where('alias', 'john.test@kolab.org')->delete();
 
         Entitlement::where('entitleable_id', $john->id)->whereIn('cost', [25, 100])->delete();
 
         $wallet = $john->wallets()->first();
         $wallet->discount()->dissociate();
         $wallet->save();
 
+        $this->clearBetaEntitlements();
+        $this->clearMeetEntitlements();
+
         parent::tearDown();
     }
 
     /**
      * Test user info page (unauthenticated)
      */
     public function testInfoUnauth(): void
     {
         // Test that the page requires authentication
         $this->browse(function (Browser $browser) {
             $user = User::where('email', 'john@kolab.org')->first();
 
             $browser->visit('/user/' . $user->id)->on(new Home());
         });
     }
 
     /**
      * Test users list page (unauthenticated)
      */
     public function testListUnauth(): void
     {
         // Test that the page requires authentication
         $this->browse(function (Browser $browser) {
             $browser->visit('/users')->on(new Home());
         });
     }
 
     /**
      * Test users list page
      */
     public function testList(): void
     {
         // Test that the page requires authentication
         $this->browse(function (Browser $browser) {
             $browser->visit(new Home())
                 ->submitLogon('john@kolab.org', 'simple123', true)
                 ->on(new Dashboard())
                 ->assertSeeIn('@links .link-users', 'User accounts')
                 ->click('@links .link-users')
                 ->on(new UserList())
                 ->whenAvailable('@table', function (Browser $browser) {
                     $browser->waitFor('tbody tr')
                         ->assertElementsCount('tbody tr', 4)
                         ->assertSeeIn('tbody tr:nth-child(1) a', 'jack@kolab.org')
                         ->assertSeeIn('tbody tr:nth-child(2) a', 'joe@kolab.org')
                         ->assertSeeIn('tbody tr:nth-child(3) a', 'john@kolab.org')
                         ->assertSeeIn('tbody tr:nth-child(4) a', 'ned@kolab.org')
                         ->assertVisible('tbody tr:nth-child(1) button.button-delete')
                         ->assertVisible('tbody tr:nth-child(2) button.button-delete')
                         ->assertVisible('tbody tr:nth-child(3) button.button-delete')
                         ->assertVisible('tbody tr:nth-child(4) button.button-delete')
                         ->assertMissing('tfoot');
                 });
         });
     }
 
     /**
      * Test user account editing page (not profile page)
      *
      * @depends testList
      */
     public function testInfo(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->on(new UserList())
                 ->click('@table tr:nth-child(3) a')
                 ->on(new UserInfo())
                 ->assertSeeIn('#user-info .card-title', 'User account')
                 ->with('@form', function (Browser $browser) {
                     // Assert form content
                     $browser->assertSeeIn('div.row:nth-child(1) label', 'Status')
                         ->assertSeeIn('div.row:nth-child(1) #status', 'Active')
                         ->assertFocused('div.row:nth-child(2) input')
                         ->assertSeeIn('div.row:nth-child(2) label', 'First name')
                         ->assertValue('div.row:nth-child(2) input[type=text]', $this->profile['first_name'])
                         ->assertSeeIn('div.row:nth-child(3) label', 'Last name')
                         ->assertValue('div.row:nth-child(3) input[type=text]', $this->profile['last_name'])
                         ->assertSeeIn('div.row:nth-child(4) label', 'Organization')
                         ->assertValue('div.row:nth-child(4) input[type=text]', $this->profile['organization'])
                         ->assertSeeIn('div.row:nth-child(5) label', 'Email')
                         ->assertValue('div.row:nth-child(5) input[type=text]', 'john@kolab.org')
                         ->assertDisabled('div.row:nth-child(5) input[type=text]')
                         ->assertSeeIn('div.row:nth-child(6) label', 'Email aliases')
                         ->assertVisible('div.row:nth-child(6) .list-input')
                         ->with(new ListInput('#aliases'), function (Browser $browser) {
                             $browser->assertListInputValue(['john.doe@kolab.org'])
                                 ->assertValue('@input', '');
                         })
                         ->assertSeeIn('div.row:nth-child(7) label', 'Password')
                         ->assertValue('div.row:nth-child(7) input[type=password]', '')
                         ->assertSeeIn('div.row:nth-child(8) label', 'Confirm password')
                         ->assertValue('div.row:nth-child(8) input[type=password]', '')
                         ->assertSeeIn('button[type=submit]', 'Submit')
                         // Clear some fields and submit
                         ->vueClear('#first_name')
                         ->vueClear('#last_name')
                         ->click('button[type=submit]');
                 })
                 ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.')
                 ->on(new UserList())
                 ->click('@table tr:nth-child(3) a')
                 ->on(new UserInfo())
                 ->assertSeeIn('#user-info .card-title', 'User account')
                 ->with('@form', function (Browser $browser) {
                     // Test error handling (password)
                     $browser->type('#password', 'aaaaaa')
                         ->vueClear('#password_confirmation')
                         ->click('button[type=submit]')
                         ->waitFor('#password + .invalid-feedback')
                         ->assertSeeIn('#password + .invalid-feedback', 'The password confirmation does not match.')
                         ->assertFocused('#password')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
 
                     // TODO: Test password change
 
                     // Test form error handling (aliases)
                     $browser->vueClear('#password')
                         ->vueClear('#password_confirmation')
                         ->with(new ListInput('#aliases'), function (Browser $browser) {
                             $browser->addListEntry('invalid address');
                         })
                         ->click('button[type=submit]')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error');
 
                     $browser->with(new ListInput('#aliases'), function (Browser $browser) {
                         $browser->assertFormError(2, 'The specified alias is invalid.', false);
                     });
 
                     // Test adding aliases
                     $browser->with(new ListInput('#aliases'), function (Browser $browser) {
                         $browser->removeListEntry(2)
                             ->addListEntry('john.test@kolab.org');
                     })
                         ->click('button[type=submit]')
                         ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.');
                 })
                 ->on(new UserList())
                 ->click('@table tr:nth-child(3) a')
                 ->on(new UserInfo());
 
             $john = User::where('email', 'john@kolab.org')->first();
             $alias = UserAlias::where('user_id', $john->id)->where('alias', 'john.test@kolab.org')->first();
             $this->assertTrue(!empty($alias));
 
             // Test subscriptions
             $browser->with('@form', function (Browser $browser) {
                 $browser->assertSeeIn('div.row:nth-child(9) label', 'Subscriptions')
                     ->assertVisible('@skus.row:nth-child(9)')
                     ->with('@skus', function ($browser) {
-                        $browser->assertElementsCount('tbody tr', 5)
+                        $browser->assertElementsCount('tbody tr', 6)
                             // Mailbox SKU
                             ->assertSeeIn('tbody tr:nth-child(1) td.name', 'User Mailbox')
                             ->assertSeeIn('tbody tr:nth-child(1) td.price', '4,44 CHF/month')
                             ->assertChecked('tbody tr:nth-child(1) td.selection input')
                             ->assertDisabled('tbody tr:nth-child(1) td.selection input')
                             ->assertTip(
                                 'tbody tr:nth-child(1) td.buttons button',
                                 'Just a mailbox'
                             )
                             // Storage SKU
                             ->assertSeeIn('tbody tr:nth-child(2) td.name', 'Storage Quota')
                             ->assertSeeIn('tr:nth-child(2) td.price', '0,00 CHF/month')
                             ->assertChecked('tbody tr:nth-child(2) td.selection input')
                             ->assertDisabled('tbody tr:nth-child(2) td.selection input')
                             ->assertTip(
                                 'tbody tr:nth-child(2) td.buttons button',
                                 'Some wiggle room'
                             )
                             ->with(new QuotaInput('tbody tr:nth-child(2) .range-input'), function ($browser) {
                                 $browser->assertQuotaValue(2)->setQuotaValue(3);
                             })
                             ->assertSeeIn('tr:nth-child(2) td.price', '0,25 CHF/month')
                             // groupware SKU
                             ->assertSeeIn('tbody tr:nth-child(3) td.name', 'Groupware Features')
                             ->assertSeeIn('tbody tr:nth-child(3) td.price', '5,55 CHF/month')
                             ->assertChecked('tbody tr:nth-child(3) td.selection input')
                             ->assertEnabled('tbody tr:nth-child(3) td.selection input')
                             ->assertTip(
                                 'tbody tr:nth-child(3) td.buttons button',
                                 'Groupware functions like Calendar, Tasks, Notes, etc.'
                             )
                             // ActiveSync SKU
                             ->assertSeeIn('tbody tr:nth-child(4) td.name', 'Activesync')
                             ->assertSeeIn('tbody tr:nth-child(4) td.price', '1,00 CHF/month')
                             ->assertNotChecked('tbody tr:nth-child(4) td.selection input')
                             ->assertEnabled('tbody tr:nth-child(4) td.selection input')
                             ->assertTip(
                                 'tbody tr:nth-child(4) td.buttons button',
                                 'Mobile synchronization'
                             )
                             // 2FA SKU
                             ->assertSeeIn('tbody tr:nth-child(5) td.name', '2-Factor Authentication')
                             ->assertSeeIn('tbody tr:nth-child(5) td.price', '0,00 CHF/month')
                             ->assertNotChecked('tbody tr:nth-child(5) td.selection input')
                             ->assertEnabled('tbody tr:nth-child(5) td.selection input')
                             ->assertTip(
                                 'tbody tr:nth-child(5) td.buttons button',
                                 'Two factor authentication for webmail and administration panel'
                             )
+                            // Meet SKU
+                            ->assertSeeIn('tbody tr:nth-child(6) td.name', 'Voice & Video Conferencing (public beta)')
+                            ->assertSeeIn('tbody tr:nth-child(6) td.price', '0,00 CHF/month')
+                            ->assertNotChecked('tbody tr:nth-child(6) td.selection input')
+                            ->assertEnabled('tbody tr:nth-child(6) td.selection input')
+                            ->assertTip(
+                                'tbody tr:nth-child(6) td.buttons button',
+                                'Video conferencing tool'
+                            )
                             ->click('tbody tr:nth-child(4) td.selection input');
                     })
                     ->assertMissing('@skus table + .hint')
                     ->click('button[type=submit]')
                     ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.');
             })
                 ->on(new UserList())
                 ->click('@table tr:nth-child(3) a')
                 ->on(new UserInfo());
 
             $expected = ['activesync', 'groupware', 'mailbox', 'storage', 'storage', 'storage'];
             $this->assertUserEntitlements($john, $expected);
 
             // Test subscriptions interaction
             $browser->with('@form', function (Browser $browser) {
                 $browser->with('@skus', function ($browser) {
                     // Uncheck 'groupware', expect activesync unchecked
                     $browser->click('#sku-input-groupware')
                         ->assertNotChecked('#sku-input-groupware')
                         ->assertNotChecked('#sku-input-activesync')
                         ->assertEnabled('#sku-input-activesync')
                         ->assertNotReadonly('#sku-input-activesync')
                         // Check 'activesync', expect an alert
                         ->click('#sku-input-activesync')
                         ->assertDialogOpened('Activesync requires Groupware Features.')
                         ->acceptDialog()
                         ->assertNotChecked('#sku-input-activesync')
+                        // Check 'meet', expect an alert
+                        ->click('#sku-input-meet')
+                        ->assertDialogOpened('Voice & Video Conferencing (public beta) requires Groupware Features.')
+                        ->acceptDialog()
+                        ->assertNotChecked('#sku-input-meet')
                         // Check '2FA', expect 'activesync' unchecked and readonly
                         ->click('#sku-input-2fa')
                         ->assertChecked('#sku-input-2fa')
                         ->assertNotChecked('#sku-input-activesync')
                         ->assertReadonly('#sku-input-activesync')
                         // Uncheck '2FA'
                         ->click('#sku-input-2fa')
                         ->assertNotChecked('#sku-input-2fa')
                         ->assertNotReadonly('#sku-input-activesync');
                 });
             });
         });
     }
 
     /**
      * Test user adding page
      *
      * @depends testList
      */
     public function testNewUser(): void
     {
         $this->browse(function (Browser $browser) {
             $browser->visit(new UserList())
                 ->assertSeeIn('button.create-user', 'Create user')
                 ->click('button.create-user')
                 ->on(new UserInfo())
                 ->assertSeeIn('#user-info .card-title', 'New user account')
                 ->with('@form', function (Browser $browser) {
                     // Assert form content
                     $browser->assertFocused('div.row:nth-child(1) input')
                         ->assertSeeIn('div.row:nth-child(1) label', 'First name')
                         ->assertValue('div.row:nth-child(1) input[type=text]', '')
                         ->assertSeeIn('div.row:nth-child(2) label', 'Last name')
                         ->assertValue('div.row:nth-child(2) input[type=text]', '')
                         ->assertSeeIn('div.row:nth-child(3) label', 'Organization')
                         ->assertValue('div.row:nth-child(3) input[type=text]', '')
                         ->assertSeeIn('div.row:nth-child(4) label', 'Email')
                         ->assertValue('div.row:nth-child(4) input[type=text]', '')
                         ->assertEnabled('div.row:nth-child(4) input[type=text]')
                         ->assertSeeIn('div.row:nth-child(5) label', 'Email aliases')
                         ->assertVisible('div.row:nth-child(5) .list-input')
                         ->with(new ListInput('#aliases'), function (Browser $browser) {
                             $browser->assertListInputValue([])
                                 ->assertValue('@input', '');
                         })
                         ->assertSeeIn('div.row:nth-child(6) label', 'Password')
                         ->assertValue('div.row:nth-child(6) input[type=password]', '')
                         ->assertSeeIn('div.row:nth-child(7) label', 'Confirm password')
                         ->assertValue('div.row:nth-child(7) input[type=password]', '')
                         ->assertSeeIn('div.row:nth-child(8) label', 'Package')
                         // assert packages list widget, select "Lite Account"
                         ->with('@packages', function ($browser) {
                             $browser->assertElementsCount('tbody tr', 2)
                                 ->assertSeeIn('tbody tr:nth-child(1)', 'Groupware Account')
                                 ->assertSeeIn('tbody tr:nth-child(2)', 'Lite Account')
                                 ->assertSeeIn('tbody tr:nth-child(1) .price', '9,99 CHF/month')
                                 ->assertSeeIn('tbody tr:nth-child(2) .price', '4,44 CHF/month')
                                 ->assertChecked('tbody tr:nth-child(1) input')
                                 ->click('tbody tr:nth-child(2) input')
                                 ->assertNotChecked('tbody tr:nth-child(1) input')
                                 ->assertChecked('tbody tr:nth-child(2) input');
                         })
                         ->assertMissing('@packages table + .hint')
                         ->assertSeeIn('button[type=submit]', 'Submit');
 
                     // Test browser-side required fields and error handling
                     $browser->click('button[type=submit]')
                         ->assertFocused('#email')
                         ->type('#email', 'invalid email')
                         ->click('button[type=submit]')
                         ->assertFocused('#password')
                         ->type('#password', 'simple123')
                         ->click('button[type=submit]')
                         ->assertFocused('#password_confirmation')
                         ->type('#password_confirmation', 'simple')
                         ->click('button[type=submit]')
                         ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                         ->assertSeeIn('#email + .invalid-feedback', 'The specified email is invalid.')
                         ->assertSeeIn('#password + .invalid-feedback', 'The password confirmation does not match.');
                 });
 
             // Test form error handling (aliases)
             $browser->with('@form', function (Browser $browser) {
                 $browser->type('#email', 'julia.roberts@kolab.org')
                     ->type('#password_confirmation', 'simple123')
                     ->with(new ListInput('#aliases'), function (Browser $browser) {
                         $browser->addListEntry('invalid address');
                     })
                     ->click('button[type=submit]')
                     ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                     ->with(new ListInput('#aliases'), function (Browser $browser) {
                         $browser->assertFormError(1, 'The specified alias is invalid.', false);
                     });
             });
 
             // Successful account creation
             $browser->with('@form', function (Browser $browser) {
                 $browser->type('#first_name', 'Julia')
                     ->type('#last_name', 'Roberts')
                     ->type('#organization', 'Test Org')
                     ->with(new ListInput('#aliases'), function (Browser $browser) {
                         $browser->removeListEntry(1)
                             ->addListEntry('julia.roberts2@kolab.org');
                     })
                     ->click('button[type=submit]');
             })
             ->assertToast(Toast::TYPE_SUCCESS, 'User created successfully.')
             // check redirection to users list
             ->on(new UserList())
                 ->whenAvailable('@table', function (Browser $browser) {
                     $browser->assertElementsCount('tbody tr', 5)
                         ->assertSeeIn('tbody tr:nth-child(4) a', 'julia.roberts@kolab.org');
                 });
 
             $julia = User::where('email', 'julia.roberts@kolab.org')->first();
             $alias = UserAlias::where('user_id', $julia->id)->where('alias', 'julia.roberts2@kolab.org')->first();
             $this->assertTrue(!empty($alias));
             $this->assertUserEntitlements($julia, ['mailbox', 'storage', 'storage']);
             $this->assertSame('Julia', $julia->getSetting('first_name'));
             $this->assertSame('Roberts', $julia->getSetting('last_name'));
             $this->assertSame('Test Org', $julia->getSetting('organization'));
 
             // Some additional tests for the list input widget
             $browser->click('tbody tr:nth-child(4) a')
                 ->on(new UserInfo())
                 ->with(new ListInput('#aliases'), function (Browser $browser) {
                     $browser->assertListInputValue(['julia.roberts2@kolab.org'])
                         ->addListEntry('invalid address')
                         ->type('.input-group:nth-child(2) input', '@kolab.org');
                 })
                 ->click('button[type=submit]')
                 ->assertToast(Toast::TYPE_ERROR, 'Form validation error')
                 ->with(new ListInput('#aliases'), function (Browser $browser) {
                     $browser->assertVisible('.input-group:nth-child(2) input.is-invalid')
                         ->assertVisible('.input-group:nth-child(3) input.is-invalid')
                         ->type('.input-group:nth-child(2) input', 'julia.roberts3@kolab.org')
                         ->type('.input-group:nth-child(3) input', 'julia.roberts4@kolab.org');
                 })
                 ->click('button[type=submit]')
                 ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.');
 
             $julia = User::where('email', 'julia.roberts@kolab.org')->first();
             $aliases = $julia->aliases()->orderBy('alias')->get()->pluck('alias')->all();
             $this->assertSame(['julia.roberts3@kolab.org', 'julia.roberts4@kolab.org'], $aliases);
         });
     }
 
     /**
      * Test user delete
      *
      * @depends testNewUser
      */
     public function testDeleteUser(): void
     {
         // First create a new user
         $john = $this->getTestUser('john@kolab.org');
         $julia = $this->getTestUser('julia.roberts@kolab.org');
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $john->assignPackage($package_kolab, $julia);
 
         // Test deleting non-controller user
         $this->browse(function (Browser $browser) {
             $browser->visit(new UserList())
                 ->whenAvailable('@table', function (Browser $browser) {
                     $browser->assertElementsCount('tbody tr', 5)
                         ->assertSeeIn('tbody tr:nth-child(4) a', 'julia.roberts@kolab.org')
                         ->click('tbody tr:nth-child(4) button.button-delete');
                 })
                 ->with(new Dialog('#delete-warning'), function (Browser $browser) {
                     $browser->assertSeeIn('@title', 'Delete julia.roberts@kolab.org')
                         ->assertFocused('@button-cancel')
                         ->assertSeeIn('@button-cancel', 'Cancel')
                         ->assertSeeIn('@button-action', 'Delete')
                         ->click('@button-cancel');
                 })
                 ->whenAvailable('@table', function (Browser $browser) {
                     $browser->click('tbody tr:nth-child(4) button.button-delete');
                 })
                 ->with(new Dialog('#delete-warning'), function (Browser $browser) {
                     $browser->click('@button-action');
                 })
                 ->assertToast(Toast::TYPE_SUCCESS, 'User deleted successfully.')
                 ->with('@table', function (Browser $browser) {
                     $browser->assertElementsCount('tbody tr', 4)
                         ->assertSeeIn('tbody tr:nth-child(1) a', 'jack@kolab.org')
                         ->assertSeeIn('tbody tr:nth-child(2) a', 'joe@kolab.org')
                         ->assertSeeIn('tbody tr:nth-child(3) a', 'john@kolab.org')
                         ->assertSeeIn('tbody tr:nth-child(4) a', 'ned@kolab.org');
                 });
 
             $julia = User::where('email', 'julia.roberts@kolab.org')->first();
             $this->assertTrue(empty($julia));
 
             // Test clicking Delete on the controller record redirects to /profile/delete
             $browser
                 ->with('@table', function (Browser $browser) {
                     $browser->click('tbody tr:nth-child(3) button.button-delete');
                 })
                 ->waitForLocation('/profile/delete');
         });
 
         // Test that non-controller user cannot see/delete himself on the users list
         // Note: Access to /profile/delete page is tested in UserProfileTest.php
         $this->browse(function (Browser $browser) {
             $browser->visit('/logout')
                 ->on(new Home())
                 ->submitLogon('jack@kolab.org', 'simple123', true)
                 ->visit(new UserList())
                 ->whenAvailable('@table', function (Browser $browser) {
                     $browser->assertElementsCount('tbody tr', 0)
                         ->assertSeeIn('tfoot td', 'There are no users in this account.');
                 });
         });
 
         // Test that controller user (Ned) can see/delete all the users ???
         $this->browse(function (Browser $browser) {
             $browser->visit('/logout')
                 ->on(new Home())
                 ->submitLogon('ned@kolab.org', 'simple123', true)
                 ->visit(new UserList())
                 ->whenAvailable('@table', function (Browser $browser) {
                     $browser->assertElementsCount('tbody tr', 4)
                         ->assertElementsCount('tbody button.button-delete', 4);
                 });
 
                 // TODO: Test the delete action in details
         });
 
         // TODO: Test what happens with the logged in user session after he's been deleted by another user
     }
 
     /**
      * Test discounted sku/package prices in the UI
      */
     public function testDiscountedPrices(): void
     {
         // Add 10% discount
         $discount = Discount::where('code', 'TEST')->first();
         $john = User::where('email', 'john@kolab.org')->first();
         $wallet = $john->wallet();
         $wallet->discount()->associate($discount);
         $wallet->save();
 
         // SKUs on user edit page
         $this->browse(function (Browser $browser) {
             $browser->visit('/logout')
                 ->on(new Home())
                 ->submitLogon('john@kolab.org', 'simple123', true)
                 ->visit(new UserList())
                 ->waitFor('@table tr:nth-child(2)')
                 ->click('@table tr:nth-child(2) a')
                 ->on(new UserInfo())
                 ->with('@form', function (Browser $browser) {
                     $browser->whenAvailable('@skus', function (Browser $browser) {
                         $quota_input = new QuotaInput('tbody tr:nth-child(2) .range-input');
                         $browser->waitFor('tbody tr')
-                            ->assertElementsCount('tbody tr', 5)
+                            ->assertElementsCount('tbody tr', 6)
                             // Mailbox SKU
                             ->assertSeeIn('tbody tr:nth-child(1) td.price', '3,99 CHF/month¹')
                             // Storage SKU
                             ->assertSeeIn('tr:nth-child(2) td.price', '0,00 CHF/month¹')
                             ->with($quota_input, function (Browser $browser) {
                                 $browser->setQuotaValue(100);
                             })
                             ->assertSeeIn('tr:nth-child(2) td.price', '21,56 CHF/month¹')
                             // groupware SKU
                             ->assertSeeIn('tbody tr:nth-child(3) td.price', '4,99 CHF/month¹')
                             // ActiveSync SKU
                             ->assertSeeIn('tbody tr:nth-child(4) td.price', '0,90 CHF/month¹')
                             // 2FA SKU
                             ->assertSeeIn('tbody tr:nth-child(5) td.price', '0,00 CHF/month¹');
                     })
                     ->assertSeeIn('@skus table + .hint', '¹ applied discount: 10% - Test voucher');
                 });
         });
 
         // Packages on new user page
         $this->browse(function (Browser $browser) {
             $browser->visit(new UserList())
                 ->click('button.create-user')
                 ->on(new UserInfo())
                 ->with('@form', function (Browser $browser) {
                     $browser->whenAvailable('@packages', function (Browser $browser) {
                         $browser->assertElementsCount('tbody tr', 2)
                             ->assertSeeIn('tbody tr:nth-child(1) .price', '8,99 CHF/month¹') // Groupware
                             ->assertSeeIn('tbody tr:nth-child(2) .price', '3,99 CHF/month¹'); // Lite
                     })
                     ->assertSeeIn('@packages table + .hint', '¹ applied discount: 10% - Test voucher');
                 });
         });
     }
+
+    /**
+     * Test beta entitlements
+     *
+     * @depends testList
+     */
+    public function testBetaEntitlements(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $john = User::where('email', 'john@kolab.org')->first();
+            $sku = Sku::where('title', 'beta')->first();
+            $john->assignSku($sku);
+
+            $browser->visit('/user/' . $john->id)
+                ->on(new UserInfo())
+                ->with('@skus', function ($browser) {
+                    $browser->assertElementsCount('tbody tr', 7)
+                        // Beta/Meet SKU
+                        ->assertSeeIn('tbody tr:nth-child(6) td.name', 'Voice & Video Conferencing (public beta)')
+                        ->assertSeeIn('tr:nth-child(6) td.price', '0,00 CHF/month')
+                        ->assertNotChecked('tbody tr:nth-child(6) td.selection input')
+                        ->assertEnabled('tbody tr:nth-child(6) td.selection input')
+                        ->assertTip(
+                            'tbody tr:nth-child(6) td.buttons button',
+                            'Video conferencing tool'
+                        )
+                        // Beta SKU
+                        ->assertSeeIn('tbody tr:nth-child(7) td.name', 'Private Beta (invitation only)')
+                        ->assertSeeIn('tbody tr:nth-child(7) td.price', '0,00 CHF/month')
+                        ->assertChecked('tbody tr:nth-child(7) td.selection input')
+                        ->assertEnabled('tbody tr:nth-child(7) td.selection input')
+                        ->assertTip(
+                            'tbody tr:nth-child(7) td.buttons button',
+                            'Access to the private beta program subscriptions'
+                        )
+/*
+                        // Check Meet, Uncheck Beta, expect Meet unchecked
+                        ->click('#sku-input-meet')
+                        ->click('#sku-input-beta')
+                        ->assertNotChecked('#sku-input-beta')
+                        ->assertNotChecked('#sku-input-meet')
+                        // Click Meet expect an alert
+                        ->click('#sku-input-meet')
+                        ->assertDialogOpened('Video chat requires Beta program.')
+                        ->acceptDialog()
+*/
+                        // Enable Meet and submit
+                        ->click('#sku-input-meet');
+                })
+                ->click('button[type=submit]')
+                ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.');
+
+            $expected = ['beta', 'groupware', 'mailbox', 'meet', 'storage', 'storage'];
+            $this->assertUserEntitlements($john, $expected);
+
+            $browser->visit('/user/' . $john->id)
+                ->on(new UserInfo())
+                ->click('#sku-input-beta')
+                ->click('#sku-input-meet')
+                ->click('button[type=submit]')
+                ->assertToast(Toast::TYPE_SUCCESS, 'User data updated successfully.');
+
+            $expected = ['groupware', 'mailbox', 'storage', 'storage'];
+            $this->assertUserEntitlements($john, $expected);
+        });
+    }
 }
diff --git a/src/tests/Feature/Backends/LDAPTest.php b/src/tests/Feature/Backends/LDAPTest.php
index dc2dba99..b5646656 100644
--- a/src/tests/Feature/Backends/LDAPTest.php
+++ b/src/tests/Feature/Backends/LDAPTest.php
@@ -1,278 +1,365 @@
 <?php
 
 namespace Tests\Feature\Backends;
 
 use App\Backends\LDAP;
 use App\Domain;
+use App\Group;
 use App\Entitlement;
 use App\User;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
 
 class LDAPTest extends TestCase
 {
     private $ldap_config = [];
 
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->ldap_config = [
             'ldap.hosts' => \config('ldap.hosts'),
         ];
 
         $this->deleteTestUser('user-ldap-test@' . \config('app.domain'));
         $this->deleteTestDomain('testldap.com');
+        $this->deleteTestGroup('group@kolab.org');
+        // TODO: Remove group members
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         \config($this->ldap_config);
 
         $this->deleteTestUser('user-ldap-test@' . \config('app.domain'));
         $this->deleteTestDomain('testldap.com');
+        $this->deleteTestGroup('group@kolab.org');
+        // TODO: Remove group members
 
         parent::tearDown();
     }
 
     /**
      * Test handling connection errors
      *
      * @group ldap
      */
     public function testConnectException(): void
     {
         \config(['ldap.hosts' => 'non-existing.host']);
 
         $this->expectException(\Exception::class);
 
         LDAP::connect();
     }
 
     /**
      * Test creating/updating/deleting a domain record
      *
      * @group ldap
      */
     public function testDomain(): void
     {
         Queue::fake();
 
         $domain = $this->getTestDomain('testldap.com', [
                 'type' => Domain::TYPE_EXTERNAL,
                 'status' => Domain::STATUS_NEW | Domain::STATUS_ACTIVE,
         ]);
 
         // Create the domain
         LDAP::createDomain($domain);
 
         $ldap_domain = LDAP::getDomain($domain->namespace);
 
         $expected = [
             'associateddomain' => $domain->namespace,
             'inetdomainstatus' => $domain->status,
             'objectclass' => [
                 'top',
                 'domainrelatedobject',
                 'inetdomain'
             ],
         ];
 
         foreach ($expected as $attr => $value) {
             $this->assertEquals($value, isset($ldap_domain[$attr]) ? $ldap_domain[$attr] : null);
         }
 
         // TODO: Test other attributes, aci, roles/ous
 
         // Update the domain
         $domain->status |= User::STATUS_LDAP_READY;
 
         LDAP::updateDomain($domain);
 
         $expected['inetdomainstatus'] = $domain->status;
 
         $ldap_domain = LDAP::getDomain($domain->namespace);
 
         foreach ($expected as $attr => $value) {
             $this->assertEquals($value, isset($ldap_domain[$attr]) ? $ldap_domain[$attr] : null);
         }
 
         // Delete the domain
         LDAP::deleteDomain($domain);
 
         $this->assertSame(null, LDAP::getDomain($domain->namespace));
     }
 
+    /**
+     * Test creating/updating/deleting a group record
+     *
+     * @group ldap
+     */
+    public function testGroup(): void
+    {
+        Queue::fake();
+
+        $root_dn = \config('ldap.hosted.root_dn');
+        $group = $this->getTestGroup('group@kolab.org', [
+                'members' => ['member1@testldap.com', 'member2@testldap.com']
+        ]);
+
+        // Create the group
+        LDAP::createGroup($group);
+
+        $ldap_group = LDAP::getGroup($group->email);
+
+        $expected = [
+            'cn' => 'group',
+            'dn' => 'cn=group,ou=Groups,ou=kolab.org,' . $root_dn,
+            'mail' => $group->email,
+            'objectclass' => [
+                'top',
+                'groupofuniquenames',
+                'kolabgroupofuniquenames'
+            ],
+            'uniquemember' => [
+                'uid=member1@testldap.com,ou=People,ou=kolab.org,' . $root_dn,
+                'uid=member2@testldap.com,ou=People,ou=kolab.org,' . $root_dn,
+            ],
+        ];
+
+        foreach ($expected as $attr => $value) {
+            $this->assertEquals($value, isset($ldap_group[$attr]) ? $ldap_group[$attr] : null, "Group $attr attribute");
+        }
+
+        // Update members
+        $group->members = ['member3@testldap.com'];
+        $group->save();
+
+        LDAP::updateGroup($group);
+
+        // TODO: Should we force this to be always an array?
+        $expected['uniquemember'] = 'uid=member3@testldap.com,ou=People,ou=kolab.org,' . $root_dn;
+
+        $ldap_group = LDAP::getGroup($group->email);
+
+        foreach ($expected as $attr => $value) {
+            $this->assertEquals($value, isset($ldap_group[$attr]) ? $ldap_group[$attr] : null, "Group $attr attribute");
+        }
+
+        $this->assertSame(['member3@testldap.com'], $group->fresh()->members);
+
+        // Update members (add non-existing local member, expect it to be aot-removed from the group)
+        $group->members = ['member3@testldap.com', 'member-local@kolab.org'];
+        $group->save();
+
+        LDAP::updateGroup($group);
+
+        // TODO: Should we force this to be always an array?
+        $expected['uniquemember'] = 'uid=member3@testldap.com,ou=People,ou=kolab.org,' . $root_dn;
+
+        $ldap_group = LDAP::getGroup($group->email);
+
+        foreach ($expected as $attr => $value) {
+            $this->assertEquals($value, isset($ldap_group[$attr]) ? $ldap_group[$attr] : null, "Group $attr attribute");
+        }
+
+        $this->assertSame(['member3@testldap.com'], $group->fresh()->members);
+
+        // We called save() twice, so we expect two update obs, this is making sure
+        // that there's no job executed by the LDAP backend
+        Queue::assertPushed(\App\Jobs\Group\UpdateJob::class, 2);
+
+        // Delete the domain
+        LDAP::deleteGroup($group);
+
+        $this->assertSame(null, LDAP::getGroup($group->email));
+    }
+
     /**
      * Test creating/editing/deleting a user record
      *
      * @group ldap
      */
     public function testUser(): void
     {
         Queue::fake();
 
         $user = $this->getTestUser('user-ldap-test@' . \config('app.domain'));
 
         LDAP::createUser($user);
 
         $ldap_user = LDAP::getUser($user->email);
 
         $expected = [
             'objectclass' => [
                 'top',
                 'inetorgperson',
                 'inetuser',
                 'kolabinetorgperson',
                 'mailrecipient',
                 'person',
                 'organizationalPerson',
             ],
             'mail' => $user->email,
             'uid' => $user->email,
             'nsroledn' => [
                 'cn=imap-user,' . \config('ldap.hosted.root_dn')
             ],
             'cn' => 'unknown',
             'displayname' => '',
             'givenname' => '',
             'sn' => 'unknown',
             'inetuserstatus' => $user->status,
             'mailquota' => null,
             'o' => '',
             'alias' => null,
         ];
 
         foreach ($expected as $attr => $value) {
             $this->assertEquals($value, isset($ldap_user[$attr]) ? $ldap_user[$attr] : null);
         }
 
         // Add aliases, and change some user settings, and entitlements
         $user->setSettings([
             'first_name' => 'Firstname',
             'last_name' => 'Lastname',
             'organization' => 'Org',
             'country' => 'PL',
         ]);
         $user->status |= User::STATUS_IMAP_READY;
         $user->save();
         $aliases = ['t1-' . $user->email, 't2-' . $user->email];
         $user->setAliases($aliases);
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $user->assignPackage($package_kolab);
 
         LDAP::updateUser($user->fresh());
 
         $expected['alias'] = $aliases;
         $expected['o'] = 'Org';
         $expected['displayname'] = 'Lastname, Firstname';
         $expected['givenname'] = 'Firstname';
         $expected['cn'] = 'Firstname Lastname';
         $expected['sn'] = 'Lastname';
         $expected['inetuserstatus'] = $user->status;
         $expected['mailquota'] = 2097152;
         $expected['nsroledn'] = null;
 
         $ldap_user = LDAP::getUser($user->email);
 
         foreach ($expected as $attr => $value) {
             $this->assertEquals($value, isset($ldap_user[$attr]) ? $ldap_user[$attr] : null);
         }
 
         // Update entitlements
         $sku_activesync = \App\Sku::where('title', 'activesync')->first();
         $sku_groupware = \App\Sku::where('title', 'groupware')->first();
         $user->assignSku($sku_activesync, 1);
         Entitlement::where(['sku_id' => $sku_groupware->id, 'entitleable_id' => $user->id])->delete();
 
         LDAP::updateUser($user->fresh());
 
         $expected_roles = [
             'activesync-user',
             'imap-user'
         ];
 
         $ldap_user = LDAP::getUser($user->email);
 
         $this->assertCount(2, $ldap_user['nsroledn']);
 
         $ldap_roles = array_map(
             function ($role) {
                 if (preg_match('/^cn=([a-z0-9-]+)/', $role, $m)) {
                     return $m[1];
                 } else {
                     return $role;
                 }
             },
             $ldap_user['nsroledn']
         );
 
         $this->assertSame($expected_roles, $ldap_roles);
 
         // Delete the user
         LDAP::deleteUser($user);
 
         $this->assertSame(null, LDAP::getUser($user->email));
     }
 
     /**
      * Test handling errors on user creation
      *
      * @group ldap
      */
     public function testCreateUserException(): void
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessageMatches('/Failed to create user/');
 
         $user = new User([
                 'email' => 'test-non-existing-ldap@non-existing.org',
                 'status' => User::STATUS_ACTIVE,
         ]);
 
         LDAP::createUser($user);
     }
 
     /**
      * Test handling update of a non-existing domain
      *
      * @group ldap
      */
     public function testUpdateDomainException(): void
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessageMatches('/domain not found/');
 
         $domain = new Domain([
                 'namespace' => 'testldap.com',
                 'type' => Domain::TYPE_EXTERNAL,
                 'status' => Domain::STATUS_NEW | Domain::STATUS_ACTIVE,
         ]);
 
         LDAP::updateDomain($domain);
     }
 
     /**
      * Test handling update of a non-existing user
      *
      * @group ldap
      */
     public function testUpdateUserException(): void
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessageMatches('/user not found/');
 
         $user = new User([
                 'email' => 'test-non-existing-ldap@kolab.org',
                 'status' => User::STATUS_ACTIVE,
         ]);
 
         LDAP::updateUser($user);
     }
 }
diff --git a/src/tests/Feature/Console/DomainRestoreTest.php b/src/tests/Feature/Console/DomainRestoreTest.php
new file mode 100644
index 00000000..64d46a49
--- /dev/null
+++ b/src/tests/Feature/Console/DomainRestoreTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class DomainRestoreTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestUser('user@force-delete.com');
+        $this->deleteTestDomain('force-delete.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestUser('user@force-delete.com');
+        $this->deleteTestDomain('force-delete.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test the command
+     */
+    public function testHandle(): void
+    {
+        Queue::fake();
+
+        // Non-existing domain
+        $code = \Artisan::call("domain:restore unknown.org");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("Domain not found.", $output);
+
+        // Create a user account for delete
+        $user = $this->getTestUser('user@force-delete.com');
+        $domain = $this->getTestDomain('force-delete.com', [
+                'status' => \App\Domain::STATUS_NEW,
+                'type' => \App\Domain::TYPE_HOSTED,
+        ]);
+        $package_kolab = \App\Package::where('title', 'kolab')->first();
+        $package_domain = \App\Package::where('title', 'domain-hosting')->first();
+        $user->assignPackage($package_kolab);
+        $domain->assignPackage($package_domain, $user);
+        $wallet = $user->wallets()->first();
+        $entitlements = $wallet->entitlements->pluck('id')->all();
+
+        $this->assertCount(5, $entitlements);
+
+        // Non-deleted domain
+        $code = \Artisan::call("domain:restore force-delete.com");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("The domain is not yet deleted.", $output);
+
+        $domain->delete();
+
+        $this->assertTrue($domain->fresh()->trashed());
+
+        // Deleted domain
+        $code = \Artisan::call("domain:restore force-delete.com");
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame("", $output);
+
+        $this->assertFalse($domain->fresh()->trashed());
+
+        $user->delete();
+
+        $this->assertTrue($domain->fresh()->trashed());
+        $this->assertTrue($user->fresh()->trashed());
+
+        // Deleted domain, deleted owner
+        $code = \Artisan::call("domain:restore force-delete.com");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("The domain owner is deleted.", $output);
+
+        $this->assertTrue($domain->fresh()->trashed());
+    }
+}
diff --git a/src/tests/Feature/Console/Group/AddMemberTest.php b/src/tests/Feature/Console/Group/AddMemberTest.php
new file mode 100644
index 00000000..6ffa0140
--- /dev/null
+++ b/src/tests/Feature/Console/Group/AddMemberTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Feature\Console\Group;
+
+use App\Group;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class AddMemberTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group-test@kolabnow.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group-test@kolabnow.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test command runs
+     */
+    public function testHandle(): void
+    {
+        Queue::fake();
+
+        // Warning: We're not using artisan() here, as this will not
+        // allow us to test "empty output" cases
+
+        // Non-existing group
+        $code = \Artisan::call("group:add-member test@group.com member@group.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(1, $code);
+        $this->assertSame("Group test@group.com does not exist.", $output);
+
+        $group = Group::create(['email' => 'group-test@kolabnow.com']);
+
+        // Existing group, invalid member
+        $code = \Artisan::call("group:add-member {$group->email} member");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(1, $code);
+        $this->assertSame("member: The specified email address is invalid.", $output);
+
+        // Existing group
+        $code = \Artisan::call("group:add-member {$group->email} member@gmail.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(0, $code);
+        $this->assertSame('', $output);
+        $this->assertSame(['member@gmail.com'], $group->refresh()->members);
+
+        // Existing group
+        $code = \Artisan::call("group:add-member {$group->email} member2@gmail.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(0, $code);
+        $this->assertSame('', $output);
+        $this->assertSame(['member2@gmail.com', 'member@gmail.com'], $group->refresh()->members);
+
+        // Add a member that already exists
+        $code = \Artisan::call("group:add-member {$group->email} member@gmail.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(1, $code);
+        $this->assertSame("member@gmail.com: Already exists in the group.", $output);
+        $this->assertSame(['member2@gmail.com', 'member@gmail.com'], $group->refresh()->members);
+    }
+}
diff --git a/src/tests/Feature/Console/Group/CreateTest.php b/src/tests/Feature/Console/Group/CreateTest.php
new file mode 100644
index 00000000..ab404e51
--- /dev/null
+++ b/src/tests/Feature/Console/Group/CreateTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Tests\Feature\Console\Group;
+
+use App\Group;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class CreateTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group-test@kolab.org');
+        $this->deleteTestGroup('group-testm@kolab.org');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group-test@kolab.org');
+        $this->deleteTestGroup('group-testm@kolab.org');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test command runs
+     */
+    public function testHandle(): void
+    {
+        Queue::fake();
+
+        // Warning: We're not using artisan() here, as this will not
+        // allow us to test "empty output" cases
+
+        $user = $this->getTestUser('john@kolab.org');
+
+        // Domain not existing
+        $code = \Artisan::call("group:create testgroup@unknown.org");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("No such domain unknown.org.", $output);
+
+        // Existing email
+        $code = \Artisan::call("group:create jack@kolab.org");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("jack@kolab.org: The specified email is not available.", $output);
+
+        // Existing email (of a user alias)
+        $code = \Artisan::call("group:create jack.daniels@kolab.org");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("jack.daniels@kolab.org: The specified email is not available.", $output);
+
+        // Public domain not allowed in the group email address
+        $code = \Artisan::call("group:create group-test@kolabnow.com");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("Domain kolabnow.com is public.", $output);
+
+        // Create a group without members
+        $code = \Artisan::call("group:create group-test@kolab.org");
+        $output = trim(\Artisan::output());
+        $group = Group::where('email', 'group-test@kolab.org')->first();
+
+        $this->assertSame(0, $code);
+        $this->assertEquals($group->id, $output);
+        $this->assertSame([], $group->members);
+        $this->assertSame($user->wallets->first()->id, $group->wallet()->id);
+
+        // Existing email (of a group)
+        $code = \Artisan::call("group:create group-test@kolab.org");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("group-test@kolab.org: The specified email is not available.", $output);
+
+        // Invalid member
+        $code = \Artisan::call("group:create group-testm@kolab.org --member=invalid");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("invalid: The specified email address is invalid.", $output);
+
+        // Valid members
+        $code = \Artisan::call(
+            "group:create group-testm@kolab.org --member=member1@kolabnow.com --member=member2@gmail.com"
+        );
+        $output = trim(\Artisan::output());
+        $group = Group::where('email', 'group-testm@kolab.org')->first();
+        $this->assertSame(0, $code);
+        $this->assertEquals($group->id, $output);
+        $this->assertSame(['member1@kolabnow.com', 'member2@gmail.com'], $group->members);
+        $this->assertSame($user->wallets->first()->id, $group->wallet()->id);
+    }
+}
diff --git a/src/tests/Feature/Console/Group/DeleteTest.php b/src/tests/Feature/Console/Group/DeleteTest.php
new file mode 100644
index 00000000..10d6526f
--- /dev/null
+++ b/src/tests/Feature/Console/Group/DeleteTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Console\Group;
+
+use App\Group;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class DeleteTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group-test@kolabnow.com');
+        $this->deleteTestUser('group-owner@kolabnow.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group-test@kolabnow.com');
+        $this->deleteTestUser('group-owner@kolabnow.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test command runs
+     */
+    public function testHandle(): void
+    {
+        Queue::fake();
+
+        // Warning: We're not using artisan() here, as this will not
+        // allow us to test "empty output" cases
+
+        // Non-existing group
+        $code = \Artisan::call("group:delete test@group.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(1, $code);
+        $this->assertSame("Group test@group.com does not exist.", $output);
+
+        $user = $this->getTestUser('group-owner@kolabnow.com');
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+
+        // Existing group
+        $code = \Artisan::call("group:delete {$group->email}");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(0, $code);
+        $this->assertSame('', $output);
+        $this->assertTrue($group->refresh()->trashed());
+    }
+}
diff --git a/src/tests/Feature/Console/Group/InfoTest.php b/src/tests/Feature/Console/Group/InfoTest.php
new file mode 100644
index 00000000..50963c8e
--- /dev/null
+++ b/src/tests/Feature/Console/Group/InfoTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\Feature\Console\Group;
+
+use App\Group;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class InfoTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group-test@kolabnow.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group-test@kolabnow.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test command runs
+     */
+    public function testHandle(): void
+    {
+        Queue::fake();
+
+        $code = \Artisan::call("group:info unknown@unknown.org");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("Group unknown@unknown.org does not exist.", $output);
+
+        // A group without members
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+
+        $expected = "Id: {$group->id}\nEmail: {$group->email}\nStatus: {$group->status}";
+
+        $code = \Artisan::call("group:info {$group->email}");
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame($expected, $output);
+
+        // Group with members
+        $group->members = ['test@member.com'];
+        $group->save();
+
+        $expected .= "\nMember: test@member.com";
+
+        $code = \Artisan::call("group:info {$group->email}");
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame($expected, $output);
+    }
+}
diff --git a/src/tests/Feature/Console/Group/RemoveMemberTest.php b/src/tests/Feature/Console/Group/RemoveMemberTest.php
new file mode 100644
index 00000000..377ea336
--- /dev/null
+++ b/src/tests/Feature/Console/Group/RemoveMemberTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Feature\Console\Group;
+
+use App\Group;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class RemoveMemberTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group-test@kolabnow.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group-test@kolabnow.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test command runs
+     */
+    public function testHandle(): void
+    {
+        Queue::fake();
+
+        // Warning: We're not using artisan() here, as this will not
+        // allow us to test "empty output" cases
+
+        // Non-existing group
+        $code = \Artisan::call("group:remove-member test@group.com member@group.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(1, $code);
+        $this->assertSame("Group test@group.com does not exist.", $output);
+
+        $group = Group::create([
+                'email' => 'group-test@kolabnow.com',
+                'members' => ['member1@gmail.com', 'member2@gmail.com'],
+        ]);
+
+        // Existing group, non-existing member
+        $code = \Artisan::call("group:remove-member {$group->email} nonexisting@gmail.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(1, $code);
+        $this->assertSame("Member nonexisting@gmail.com not found in the group.", $output);
+
+        // Existing group, existing member
+        $code = \Artisan::call("group:remove-member {$group->email} member1@gmail.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(0, $code);
+        $this->assertSame('', $output);
+        $this->assertSame(['member2@gmail.com'], $group->refresh()->members);
+
+        // Existing group, the last existing member
+        $code = \Artisan::call("group:remove-member {$group->email} member2@gmail.com");
+        $output = trim(\Artisan::output());
+
+        $this->assertSame(0, $code);
+        $this->assertSame('', $output);
+        $this->assertSame([], $group->refresh()->members);
+    }
+}
diff --git a/src/tests/Feature/Console/Scalpel/WalletSetting/CreateCommandTest.php b/src/tests/Feature/Console/Scalpel/WalletSetting/CreateCommandTest.php
new file mode 100644
index 00000000..2fdd3854
--- /dev/null
+++ b/src/tests/Feature/Console/Scalpel/WalletSetting/CreateCommandTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Console\Scalpel\WalletSetting;
+
+use Tests\TestCase;
+
+class CreateCommandTest extends TestCase
+{
+    public function testHandle(): void
+    {
+        $user = $this->getTestUser('john@kolab.org');
+        $wallet = $user->wallets->first();
+        $wallet->setSetting('test', null);
+
+        $this->artisan("scalpel:wallet-setting:create --key=test --value=init --wallet_id={$wallet->id}")
+             ->assertExitCode(0);
+
+        $setting = $wallet->settings()->where('key', 'test')->first();
+
+        $this->assertSame('init', $setting->fresh()->value);
+        $this->assertSame('init', $wallet->fresh()->getSetting('test'));
+    }
+}
diff --git a/src/tests/Feature/Console/Scalpel/WalletSetting/UpdateCommandTest.php b/src/tests/Feature/Console/Scalpel/WalletSetting/UpdateCommandTest.php
new file mode 100644
index 00000000..9fdd3558
--- /dev/null
+++ b/src/tests/Feature/Console/Scalpel/WalletSetting/UpdateCommandTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Feature\Console\Scalpel\WalletSetting;
+
+use Tests\TestCase;
+
+class UpdateCommandTest extends TestCase
+{
+    public function testHandle(): void
+    {
+        $user = $this->getTestUser('john@kolab.org');
+        $wallet = $user->wallets->first();
+        $wallet->setSetting('test', 'init');
+
+        $this->artisan("scalpel:wallet-setting:update unknown --value=test")
+             ->assertExitCode(1)
+             ->expectsOutput("No such wallet-setting unknown");
+
+        $setting = $wallet->settings()->where('key', 'test')->first();
+
+        $this->artisan("scalpel:wallet-setting:update {$setting->id} --value=test")
+             ->assertExitCode(0);
+
+        $this->assertSame('test', $setting->fresh()->value);
+        $this->assertSame('test', $wallet->fresh()->getSetting('test'));
+    }
+}
diff --git a/src/tests/Feature/Console/Sku/ListUsersTest.php b/src/tests/Feature/Console/Sku/ListUsersTest.php
new file mode 100644
index 00000000..abf54505
--- /dev/null
+++ b/src/tests/Feature/Console/Sku/ListUsersTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Feature\Console\Sku;
+
+use Illuminate\Contracts\Console\Kernel;
+use Tests\TestCase;
+
+class ListUsersTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestUser('sku-list-users@kolabnow.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestUser('sku-list-users@kolabnow.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test command runs
+     */
+    public function testHandle(): void
+    {
+        // Warning: We're not using artisan() here, as this will not
+        // allow us to test "empty output" cases
+        $code = \Artisan::call('sku:list-users meet');
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame('', $output);
+
+        $code = \Artisan::call('sku:list-users unknown');
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("Unable to find the SKU.", $output);
+
+        $code = \Artisan::call('sku:list-users 2fa');
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame("ned@kolab.org", $output);
+
+        $code = \Artisan::call('sku:list-users mailbox');
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame("jack@kolab.org\njoe@kolab.org\njohn@kolab.org\nned@kolab.org", $output);
+
+        $code = \Artisan::call('sku:list-users domain-hosting');
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame("john@kolab.org", $output);
+
+        $sku = \App\Sku::where('title', 'meet')->first();
+        $user = $this->getTestUser('sku-list-users@kolabnow.com');
+        $user->assignSku($sku);
+
+        $code = \Artisan::call('sku:list-users meet');
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame($user->email, $output);
+
+        $user->assignSku($sku);
+
+        $code = \Artisan::call('sku:list-users meet');
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame($user->email, $output);
+    }
+}
diff --git a/src/tests/Feature/Console/UserAssignSkuTest.php b/src/tests/Feature/Console/UserAssignSkuTest.php
new file mode 100644
index 00000000..9905fe72
--- /dev/null
+++ b/src/tests/Feature/Console/UserAssignSkuTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use Tests\TestCase;
+
+class UserAssignSkuTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestUser('add-entitlement@kolabnow.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestUser('add-entitlement@kolabnow.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test command runs
+     */
+    public function testHandle(): void
+    {
+        $sku = \App\Sku::where('title', 'meet')->first();
+        $user = $this->getTestUser('add-entitlement@kolabnow.com');
+
+        $this->artisan('user:assign-sku unknown@unknown.org ' . $sku->id)
+             ->assertExitCode(1)
+             ->expectsOutput("Unable to find the user unknown@unknown.org.");
+
+        $this->artisan('user:assign-sku ' . $user->email . ' unknownsku')
+             ->assertExitCode(1)
+             ->expectsOutput("Unable to find the SKU unknownsku.");
+
+        $this->artisan('user:assign-sku ' . $user->email . ' ' . $sku->id)
+             ->assertExitCode(0);
+
+        $this->assertCount(1, $user->entitlements()->where('sku_id', $sku->id)->get());
+
+        // Try again (also test sku by title)
+        $this->artisan('user:assign-sku ' . $user->email . ' ' . $sku->title)
+             ->assertExitCode(1)
+             ->expectsOutput("The entitlement already exists. Maybe try with --qty=X?");
+
+        $this->assertCount(1, $user->entitlements()->where('sku_id', $sku->id)->get());
+
+        // Try again with --qty option, to force the assignment
+        $this->artisan('user:assign-sku ' . $user->email . ' ' . $sku->title . ' --qty=1')
+             ->assertExitCode(0);
+
+        $this->assertCount(2, $user->entitlements()->where('sku_id', $sku->id)->get());
+    }
+}
diff --git a/src/tests/Feature/Console/UserRestoreTest.php b/src/tests/Feature/Console/UserRestoreTest.php
new file mode 100644
index 00000000..a57db9cf
--- /dev/null
+++ b/src/tests/Feature/Console/UserRestoreTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class UserRestoreTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestUser('user@force-delete.com');
+        $this->deleteTestDomain('force-delete.com');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->deleteTestUser('user@force-delete.com');
+        $this->deleteTestDomain('force-delete.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test the command
+     */
+    public function testHandle(): void
+    {
+        Queue::fake();
+
+        // Non-existing user
+        $code = \Artisan::call("user:restore unknown@unknown.org");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("User not found.", $output);
+
+        // Create a user account for delete
+        $user = $this->getTestUser('user@force-delete.com');
+        $domain = $this->getTestDomain('force-delete.com', [
+                'status' => \App\Domain::STATUS_NEW,
+                'type' => \App\Domain::TYPE_HOSTED,
+        ]);
+        $package_kolab = \App\Package::where('title', 'kolab')->first();
+        $package_domain = \App\Package::where('title', 'domain-hosting')->first();
+        $user->assignPackage($package_kolab);
+        $domain->assignPackage($package_domain, $user);
+        $wallet = $user->wallets()->first();
+        $entitlements = $wallet->entitlements->pluck('id')->all();
+
+        $this->assertCount(5, $entitlements);
+
+        // Non-deleted user
+        $code = \Artisan::call("user:restore {$user->email}");
+        $output = trim(\Artisan::output());
+        $this->assertSame(1, $code);
+        $this->assertSame("The user is not yet deleted.", $output);
+
+        $user->delete();
+
+        $this->assertTrue($user->trashed());
+        $this->assertTrue($domain->fresh()->trashed());
+
+        // Deleted user
+        $code = \Artisan::call("user:restore {$user->email}");
+        $output = trim(\Artisan::output());
+        $this->assertSame(0, $code);
+        $this->assertSame("", $output);
+
+        $this->assertFalse($user->fresh()->trashed());
+        $this->assertFalse($domain->fresh()->trashed());
+    }
+}
diff --git a/src/tests/Feature/Controller/Admin/StatsTest.php b/src/tests/Feature/Controller/Admin/StatsTest.php
new file mode 100644
index 00000000..2bfb240e
--- /dev/null
+++ b/src/tests/Feature/Controller/Admin/StatsTest.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Tests\Feature\Controller\Admin;
+
+use Tests\TestCase;
+
+class StatsTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        self::useAdminUrl();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * Test charts (GET /api/v4/stats/chart/<chart>)
+     */
+    public function testChart(): void
+    {
+        $user = $this->getTestUser('john@kolab.org');
+        $admin = $this->getTestUser('jeroen@jeroen.jeroen');
+
+        // Non-admin user
+        $response = $this->actingAs($user)->get("api/v4/stats/chart/discounts");
+        $response->assertStatus(403);
+
+        // Unknown chart name
+        $response = $this->actingAs($admin)->get("api/v4/stats/chart/unknown");
+        $response->assertStatus(404);
+
+        // 'discounts' chart
+        $response = $this->actingAs($admin)->get("api/v4/stats/chart/discounts");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame('Discounts', $json['title']);
+        $this->assertSame('donut', $json['type']);
+        $this->assertSame([], $json['data']['labels']);
+        $this->assertSame([['values' => []]], $json['data']['datasets']);
+
+        // 'income' chart
+        $response = $this->actingAs($admin)->get("api/v4/stats/chart/income");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame('Income in CHF - last 8 weeks', $json['title']);
+        $this->assertSame('bar', $json['type']);
+        $this->assertCount(8, $json['data']['labels']);
+        $this->assertSame(date('Y-W'), $json['data']['labels'][7]);
+        $this->assertSame([['values' => [0,0,0,0,0,0,0,0]]], $json['data']['datasets']);
+
+        // 'users' chart
+        $response = $this->actingAs($admin)->get("api/v4/stats/chart/users");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame('Users - last 8 weeks', $json['title']);
+        $this->assertCount(8, $json['data']['labels']);
+        $this->assertSame(date('Y-W'), $json['data']['labels'][7]);
+        $this->assertCount(2, $json['data']['datasets']);
+        $this->assertSame('Created', $json['data']['datasets'][0]['name']);
+        $this->assertSame('Deleted', $json['data']['datasets'][1]['name']);
+
+        // 'users-all' chart
+        $response = $this->actingAs($admin)->get("api/v4/stats/chart/users-all");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame('All Users - last year', $json['title']);
+        $this->assertCount(54, $json['data']['labels']);
+        $this->assertCount(1, $json['data']['datasets']);
+    }
+}
diff --git a/src/tests/Feature/Controller/Admin/WalletsTest.php b/src/tests/Feature/Controller/Admin/WalletsTest.php
index c949dbc9..5b8c4fb6 100644
--- a/src/tests/Feature/Controller/Admin/WalletsTest.php
+++ b/src/tests/Feature/Controller/Admin/WalletsTest.php
@@ -1,228 +1,228 @@
 <?php
 
 namespace Tests\Feature\Controller\Admin;
 
 use App\Discount;
 use App\Transaction;
 use Tests\TestCase;
 
 class WalletsTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
         self::useAdminUrl();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         parent::tearDown();
     }
 
     /**
      * Test fetching a wallet (GET /api/v4/wallets/:id)
      *
      * @group stripe
      */
     public function testShow(): void
     {
         \config(['services.payment_provider' => 'stripe']);
 
         $user = $this->getTestUser('john@kolab.org');
         $admin = $this->getTestUser('jeroen@jeroen.jeroen');
         $wallet = $user->wallets()->first();
         $wallet->discount_id = null;
         $wallet->save();
 
         // Make sure there's no stripe/mollie identifiers
         $wallet->setSetting('stripe_id', null);
         $wallet->setSetting('stripe_mandate_id', null);
         $wallet->setSetting('mollie_id', null);
         $wallet->setSetting('mollie_mandate_id', null);
 
         // Non-admin user
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}");
         $response->assertStatus(403);
 
         // Admin user
         $response = $this->actingAs($admin)->get("api/v4/wallets/{$wallet->id}");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame($wallet->id, $json['id']);
         $this->assertSame('CHF', $json['currency']);
         $this->assertSame($wallet->balance, $json['balance']);
         $this->assertSame(0, $json['discount']);
         $this->assertTrue(empty($json['description']));
         $this->assertTrue(empty($json['discount_description']));
         $this->assertTrue(!empty($json['provider']));
         $this->assertTrue(empty($json['providerLink']));
         $this->assertTrue(!empty($json['mandate']));
     }
 
     /**
      * Test awarding/penalizing a wallet (POST /api/v4/wallets/:id/one-off)
      */
     public function testOneOff(): void
     {
         $user = $this->getTestUser('john@kolab.org');
         $admin = $this->getTestUser('jeroen@jeroen.jeroen');
         $wallet = $user->wallets()->first();
         $balance = $wallet->balance;
 
         Transaction::where('object_id', $wallet->id)
             ->whereIn('type', [Transaction::WALLET_AWARD, Transaction::WALLET_PENALTY])
             ->delete();
 
         // Non-admin user
         $response = $this->actingAs($user)->post("api/v4/wallets/{$wallet->id}/one-off", []);
         $response->assertStatus(403);
 
         // Admin user - invalid input
         $post = ['amount' => 'aaaa'];
         $response = $this->actingAs($admin)->post("api/v4/wallets/{$wallet->id}/one-off", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertSame('The amount must be a number.', $json['errors']['amount'][0]);
         $this->assertSame('The description field is required.', $json['errors']['description'][0]);
         $this->assertCount(2, $json);
         $this->assertCount(2, $json['errors']);
 
         // Admin user - a valid bonus
         $post = ['amount' => '50', 'description' => 'A bonus'];
         $response = $this->actingAs($admin)->post("api/v4/wallets/{$wallet->id}/one-off", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('The bonus has been added to the wallet successfully.', $json['message']);
         $this->assertSame($balance += 5000, $json['balance']);
         $this->assertSame($balance, $wallet->fresh()->balance);
 
         $transaction = Transaction::where('object_id', $wallet->id)
             ->where('type', Transaction::WALLET_AWARD)->first();
 
         $this->assertSame($post['description'], $transaction->description);
         $this->assertSame(5000, $transaction->amount);
         $this->assertSame($admin->email, $transaction->user_email);
 
         // Admin user - a valid penalty
         $post = ['amount' => '-40', 'description' => 'A penalty'];
         $response = $this->actingAs($admin)->post("api/v4/wallets/{$wallet->id}/one-off", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('The penalty has been added to the wallet successfully.', $json['message']);
         $this->assertSame($balance -= 4000, $json['balance']);
         $this->assertSame($balance, $wallet->fresh()->balance);
 
         $transaction = Transaction::where('object_id', $wallet->id)
             ->where('type', Transaction::WALLET_PENALTY)->first();
 
         $this->assertSame($post['description'], $transaction->description);
-        $this->assertSame(4000, $transaction->amount);
+        $this->assertSame(-4000, $transaction->amount);
         $this->assertSame($admin->email, $transaction->user_email);
     }
 
     /**
      * Test fetching wallet transactions (GET /api/v4/wallets/:id/transactions)
      */
     public function testTransactions(): void
     {
         // Note: Here we're testing only that the end-point works,
         // and admin can get the transaction log, response details
         // are tested in Feature/Controller/WalletsTest.php
         $this->deleteTestUser('wallets-controller@kolabnow.com');
         $user = $this->getTestUser('wallets-controller@kolabnow.com');
         $wallet = $user->wallets()->first();
         $admin = $this->getTestUser('jeroen@jeroen.jeroen');
 
         // Non-admin
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/transactions");
         $response->assertStatus(403);
 
         // Create some sample transactions
         $transactions = $this->createTestTransactions($wallet);
         $transactions = array_reverse($transactions);
         $pages = array_chunk($transactions, 10 /* page size*/);
 
         // Get the 2nd page
         $response = $this->actingAs($admin)->get("api/v4/wallets/{$wallet->id}/transactions?page=2");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame(2, $json['page']);
         $this->assertSame(2, $json['count']);
         $this->assertSame(false, $json['hasMore']);
         $this->assertCount(2, $json['list']);
         foreach ($pages[1] as $idx => $transaction) {
             $this->assertSame($transaction->id, $json['list'][$idx]['id']);
             $this->assertSame($transaction->type, $json['list'][$idx]['type']);
             $this->assertSame($transaction->shortDescription(), $json['list'][$idx]['description']);
             $this->assertFalse($json['list'][$idx]['hasDetails']);
         }
 
         // The 'user' key is set only on the admin end-point
         $this->assertSame('jeroen@jeroen.jeroen', $json['list'][1]['user']);
     }
 
     /**
      * Test updating a wallet (PUT /api/v4/wallets/:id)
      */
     public function testUpdate(): void
     {
         $user = $this->getTestUser('john@kolab.org');
         $admin = $this->getTestUser('jeroen@jeroen.jeroen');
         $wallet = $user->wallets()->first();
         $discount = Discount::where('code', 'TEST')->first();
 
         // Non-admin user
         $response = $this->actingAs($user)->put("api/v4/wallets/{$wallet->id}", []);
         $response->assertStatus(403);
 
         // Admin user - setting a discount
         $post = ['discount' => $discount->id];
         $response = $this->actingAs($admin)->put("api/v4/wallets/{$wallet->id}", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('User wallet updated successfully.', $json['message']);
         $this->assertSame($wallet->id, $json['id']);
         $this->assertSame($discount->discount, $json['discount']);
         $this->assertSame($discount->id, $json['discount_id']);
         $this->assertSame($discount->description, $json['discount_description']);
         $this->assertSame($discount->id, $wallet->fresh()->discount->id);
 
         // Admin user - removing a discount
         $post = ['discount' => null];
         $response = $this->actingAs($admin)->put("api/v4/wallets/{$wallet->id}", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('User wallet updated successfully.', $json['message']);
         $this->assertSame($wallet->id, $json['id']);
         $this->assertSame(null, $json['discount_id']);
         $this->assertTrue(empty($json['discount_description']));
         $this->assertSame(null, $wallet->fresh()->discount);
     }
 }
diff --git a/src/tests/Feature/Controller/DomainsTest.php b/src/tests/Feature/Controller/DomainsTest.php
index 69fd44ba..05e3e8d0 100644
--- a/src/tests/Feature/Controller/DomainsTest.php
+++ b/src/tests/Feature/Controller/DomainsTest.php
@@ -1,243 +1,242 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
-use App\Http\Controllers\API\DomainsController;
 use App\Domain;
 use App\Entitlement;
 use App\Sku;
 use App\User;
 use App\Wallet;
 use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class DomainsTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('test1@domainscontroller.com');
         $this->deleteTestDomain('domainscontroller.com');
     }
 
     public function tearDown(): void
     {
         $this->deleteTestUser('test1@domainscontroller.com');
         $this->deleteTestDomain('domainscontroller.com');
 
         parent::tearDown();
     }
 
     /**
      * Test domain confirm request
      */
     public function testConfirm(): void
     {
         $sku_domain = Sku::where('title', 'domain-hosting')->first();
         $john = $this->getTestUser('john@kolab.org');
         $ned = $this->getTestUser('ned@kolab.org');
         $user = $this->getTestUser('test1@domainscontroller.com');
         $domain = $this->getTestDomain('domainscontroller.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
         ]);
 
         Entitlement::create([
                 'wallet_id' => $user->wallets()->first()->id,
                 'sku_id' => $sku_domain->id,
                 'entitleable_id' => $domain->id,
                 'entitleable_type' => Domain::class
         ]);
 
         $response = $this->actingAs($user)->get("api/v4/domains/{$domain->id}/confirm");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(2, $json);
         $this->assertEquals('error', $json['status']);
         $this->assertEquals('Domain ownership verification failed.', $json['message']);
 
         $domain->status |= Domain::STATUS_CONFIRMED;
         $domain->save();
 
         $response = $this->actingAs($user)->get("api/v4/domains/{$domain->id}/confirm");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals('success', $json['status']);
         $this->assertEquals('Domain verified successfully.', $json['message']);
         $this->assertTrue(is_array($json['statusInfo']));
 
         // Not authorized access
         $response = $this->actingAs($john)->get("api/v4/domains/{$domain->id}/confirm");
         $response->assertStatus(403);
 
         // Authorized access by additional account controller
         $domain = $this->getTestDomain('kolab.org');
         $response = $this->actingAs($ned)->get("api/v4/domains/{$domain->id}/confirm");
         $response->assertStatus(200);
     }
 
     /**
      * Test fetching domains list
      */
     public function testIndex(): void
     {
         // User with no domains
         $user = $this->getTestUser('test1@domainscontroller.com');
         $response = $this->actingAs($user)->get("api/v4/domains");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame([], $json);
 
         // User with custom domain(s)
         $john = $this->getTestUser('john@kolab.org');
         $ned = $this->getTestUser('ned@kolab.org');
 
         $response = $this->actingAs($john)->get("api/v4/domains");
         $response->assertStatus(200);
 
         $json = $response->json();
         $this->assertCount(1, $json);
         $this->assertSame('kolab.org', $json[0]['namespace']);
         // Values below are tested by Unit tests
         $this->assertArrayHasKey('isConfirmed', $json[0]);
         $this->assertArrayHasKey('isDeleted', $json[0]);
         $this->assertArrayHasKey('isVerified', $json[0]);
         $this->assertArrayHasKey('isSuspended', $json[0]);
         $this->assertArrayHasKey('isActive', $json[0]);
         $this->assertArrayHasKey('isLdapReady', $json[0]);
 
         $response = $this->actingAs($ned)->get("api/v4/domains");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(1, $json);
         $this->assertSame('kolab.org', $json[0]['namespace']);
     }
 
     /**
      * Test fetching domain info
      */
     public function testShow(): void
     {
         $sku_domain = Sku::where('title', 'domain-hosting')->first();
         $user = $this->getTestUser('test1@domainscontroller.com');
         $domain = $this->getTestDomain('domainscontroller.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
         ]);
 
         Entitlement::create([
                 'wallet_id' => $user->wallets()->first()->id,
                 'sku_id' => $sku_domain->id,
                 'entitleable_id' => $domain->id,
                 'entitleable_type' => Domain::class
         ]);
 
         $response = $this->actingAs($user)->get("api/v4/domains/{$domain->id}");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals($domain->id, $json['id']);
         $this->assertEquals($domain->namespace, $json['namespace']);
         $this->assertEquals($domain->status, $json['status']);
         $this->assertEquals($domain->type, $json['type']);
         $this->assertSame($domain->hash(Domain::HASH_TEXT), $json['hash_text']);
         $this->assertSame($domain->hash(Domain::HASH_CNAME), $json['hash_cname']);
         $this->assertSame($domain->hash(Domain::HASH_CODE), $json['hash_code']);
         $this->assertCount(4, $json['config']);
         $this->assertTrue(strpos(implode("\n", $json['config']), $domain->namespace) !== false);
         $this->assertCount(8, $json['dns']);
         $this->assertTrue(strpos(implode("\n", $json['dns']), $domain->namespace) !== false);
         $this->assertTrue(strpos(implode("\n", $json['dns']), $domain->hash()) !== false);
         $this->assertTrue(is_array($json['statusInfo']));
         // Values below are tested by Unit tests
         $this->assertArrayHasKey('isConfirmed', $json);
         $this->assertArrayHasKey('isDeleted', $json);
         $this->assertArrayHasKey('isVerified', $json);
         $this->assertArrayHasKey('isSuspended', $json);
         $this->assertArrayHasKey('isActive', $json);
         $this->assertArrayHasKey('isLdapReady', $json);
 
         $john = $this->getTestUser('john@kolab.org');
         $ned = $this->getTestUser('ned@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
 
         // Not authorized - Other account domain
         $response = $this->actingAs($john)->get("api/v4/domains/{$domain->id}");
         $response->assertStatus(403);
 
         $domain = $this->getTestDomain('kolab.org');
 
         // Ned is an additional controller on kolab.org's wallet
         $response = $this->actingAs($ned)->get("api/v4/domains/{$domain->id}");
         $response->assertStatus(200);
 
         // Jack has no entitlement/control over kolab.org
         $response = $this->actingAs($jack)->get("api/v4/domains/{$domain->id}");
         $response->assertStatus(403);
     }
 
     /**
      * Test fetching domain status (GET /api/v4/domains/<domain-id>/status)
      * and forcing setup process update (?refresh=1)
      *
      * @group dns
      */
     public function testStatus(): void
     {
         $john = $this->getTestUser('john@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
         $domain = $this->getTestDomain('kolab.org');
 
         // Test unauthorized access
         $response = $this->actingAs($jack)->get("/api/v4/domains/{$domain->id}/status");
         $response->assertStatus(403);
 
         $domain->status = Domain::STATUS_NEW | Domain::STATUS_ACTIVE | Domain::STATUS_LDAP_READY;
         $domain->save();
 
         // Get domain status
         $response = $this->actingAs($john)->get("/api/v4/domains/{$domain->id}/status");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertFalse($json['isVerified']);
         $this->assertFalse($json['isReady']);
         $this->assertCount(4, $json['process']);
         $this->assertSame('domain-verified', $json['process'][2]['label']);
         $this->assertSame(false, $json['process'][2]['state']);
         $this->assertTrue(empty($json['status']));
         $this->assertTrue(empty($json['message']));
 
         // Now "reboot" the process and verify the domain
         $response = $this->actingAs($john)->get("/api/v4/domains/{$domain->id}/status?refresh=1");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertTrue($json['isVerified']);
         $this->assertTrue($json['isReady']);
         $this->assertCount(4, $json['process']);
         $this->assertSame('domain-verified', $json['process'][2]['label']);
         $this->assertSame(true, $json['process'][2]['state']);
         $this->assertSame('domain-confirmed', $json['process'][3]['label']);
         $this->assertSame(true, $json['process'][3]['state']);
         $this->assertSame('success', $json['status']);
         $this->assertSame('Setup process finished successfully.', $json['message']);
 
         // TODO: Test completing all process steps
     }
 }
diff --git a/src/tests/Feature/Controller/OpenViduTest.php b/src/tests/Feature/Controller/OpenViduTest.php
new file mode 100644
index 00000000..70a173ae
--- /dev/null
+++ b/src/tests/Feature/Controller/OpenViduTest.php
@@ -0,0 +1,780 @@
+<?php
+
+namespace Tests\Feature\Controller;
+
+use App\Http\Controllers\API\V4\OpenViduController;
+use App\OpenVidu\Connection;
+use App\OpenVidu\Room;
+use Tests\TestCase;
+
+class OpenViduTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->clearMeetEntitlements();
+        $room = Room::where('name', 'john')->first();
+        $room->setSettings(['password' => null, 'locked' => null, 'nomedia' => null]);
+    }
+
+    public function tearDown(): void
+    {
+        $this->clearMeetEntitlements();
+        $room = Room::where('name', 'john')->first();
+        $room->setSettings(['password' => null, 'locked' => null, 'nomedia' => null]);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test listing user rooms
+     *
+     * @group openvidu
+     */
+    public function testIndex(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        Room::where('user_id', $jack->id)->delete();
+
+        // Unauth access not allowed
+        $response = $this->get("api/v4/openvidu/rooms");
+        $response->assertStatus(401);
+
+        // John has one room
+        $response = $this->actingAs($john)->get("api/v4/openvidu/rooms");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame(1, $json['count']);
+        $this->assertCount(1, $json['list']);
+        $this->assertSame('john', $json['list'][0]['name']);
+
+        // Jack has no room, but it will be auto-created
+        $response = $this->actingAs($jack)->get("api/v4/openvidu/rooms");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame(1, $json['count']);
+        $this->assertCount(1, $json['list']);
+        $this->assertRegExp('/^[0-9a-z-]{11}$/', $json['list'][0]['name']);
+    }
+
+    /**
+     * Test joining the room
+     *
+     * @group openvidu
+     */
+    public function testJoinRoom(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $room = Room::where('name', 'john')->first();
+        $room->session_id = null;
+        $room->save();
+
+        $this->assignMeetEntitlement($john);
+
+        // Unauth access, no session yet
+        $response = $this->post("api/v4/openvidu/rooms/{$room->name}");
+        $response->assertStatus(422);
+
+        $json = $response->json();
+        $this->assertSame(323, $json['code']);
+
+        // Non-existing room name
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/non-existing");
+        $response->assertStatus(404);
+
+        // TODO: Test accessing an existing room of deleted owner
+
+        // Non-owner, no session yet
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}");
+        $response->assertStatus(422);
+
+        $json = $response->json();
+        $this->assertSame(323, $json['code']);
+
+        // Room owner, no session yet
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}");
+        $response->assertStatus(422);
+
+        $json = $response->json();
+        $this->assertSame(324, $json['code']);
+
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $session_id = $room->fresh()->session_id;
+
+        $this->assertSame(Room::ROLE_SUBSCRIBER | Room::ROLE_MODERATOR | Room::ROLE_OWNER, $json['role']);
+        $this->assertSame($session_id, $json['session']);
+        $this->assertTrue(is_string($session_id) && !empty($session_id));
+        $this->assertTrue(strpos($json['token'], 'wss://') === 0);
+
+        $john_token = $json['token'];
+
+        // Non-owner, now the session exists, no 'init' argument
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}");
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertSame(322, $json['code']);
+        $this->assertTrue(empty($json['token']));
+
+        // Non-owner, now the session exists, with 'init', but no 'canPublish' argument
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame(Room::ROLE_SUBSCRIBER, $json['role']);
+        $this->assertSame($session_id, $json['session']);
+        $this->assertTrue(strpos($json['token'], 'wss://') === 0);
+        $this->assertTrue($json['token'] != $john_token);
+
+        // Non-owner, now the session exists, with 'init', and with 'role=PUBLISHER'
+        $post = ['canPublish' => true, 'init' => 1];
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame(Room::ROLE_PUBLISHER, $json['role']);
+        $this->assertSame($session_id, $json['session']);
+        $this->assertTrue(strpos($json['token'], 'wss://') === 0);
+        $this->assertTrue($json['token'] != $john_token);
+        $this->assertEmpty($json['config']['password']);
+        $this->assertEmpty($json['config']['requires_password']);
+
+        // Non-owner, password protected room, password not provided
+        $room->setSettings(['password' => 'pass']);
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}");
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertCount(4, $json);
+        $this->assertSame(325, $json['code']);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame('Failed to join the session. Invalid password.', $json['message']);
+        $this->assertEmpty($json['config']['password']);
+        $this->assertTrue($json['config']['requires_password']);
+
+        // Non-owner, password protected room, invalid provided
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", ['password' => 'aa']);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+        $this->assertSame(325, $json['code']);
+
+        // Non-owner, password protected room, valid password provided
+        // TODO: Test without init=1
+        $post = ['password' => 'pass', 'init' => 'init'];
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame($session_id, $json['session']);
+
+        // Make sure the room owner can access the password protected room w/o password
+        // TODO: Test without init=1
+        $post = ['init' => 'init'];
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+
+        // Test 'nomedia' room option
+        $room->setSettings(['nomedia' => 'true', 'password' => null]);
+
+        $post = ['init' => 'init', 'canPublish' => true];
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+        $this->assertSame(Room::ROLE_PUBLISHER & $json['role'], Room::ROLE_PUBLISHER);
+
+        $post = ['init' => 'init', 'canPublish' => true];
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+        $this->assertSame(Room::ROLE_PUBLISHER & $json['role'], 0);
+    }
+
+    /**
+     * Test locked room and join requests
+     *
+     * @group openvidu
+     */
+    public function testJoinRequests(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $room = Room::where('name', 'john')->first();
+        $room->session_id = null;
+        $room->save();
+        $room->setSettings(['password' => null, 'locked' => 'true']);
+
+        $this->assignMeetEntitlement($john);
+
+        // Create the session (also makes sure the owner can access a locked room)
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        // Non-owner, locked room, invalid/missing input
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}");
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertCount(4, $json);
+        $this->assertSame(326, $json['code']);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame('Failed to join the session. Room locked.', $json['message']);
+        $this->assertTrue($json['config']['locked']);
+
+        // Non-owner, locked room, invalid requestId
+        $post = ['nickname' => 'name', 'requestId' => '-----', 'init' => 1];
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+        $this->assertSame(326, $json['code']);
+
+        // Non-owner, locked room, invalid requestId
+        $post = ['nickname' => 'name', 'init' => 1];
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+        $this->assertSame(326, $json['code']);
+
+        // Non-owner, locked room, valid input
+        $reqId = '12345678';
+        $post = ['nickname' => 'name', 'requestId' => $reqId, 'picture' => 'data:image/png;base64,01234'];
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertCount(4, $json);
+        $this->assertSame(327, $json['code']);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame('Failed to join the session. Room locked.', $json['message']);
+        $this->assertTrue($json['config']['locked']);
+
+        // TODO: How do we assert that a signal has been sent to the owner?
+
+        // Test denying a request
+
+        // Unknown room
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/unknown/request/unknown/deny");
+        $response->assertStatus(404);
+
+        // Unknown request Id
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/request/unknown/deny");
+        $response->assertStatus(500);
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame('Failed to deny the join request.', $json['message']);
+
+        // Non-owner access forbidden
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}/request/{$reqId}/deny");
+        $response->assertStatus(403);
+
+        // Valid request
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/request/{$reqId}/deny");
+        $response->assertStatus(200);
+        $json = $response->json();
+
+        $this->assertSame('success', $json['status']);
+
+        // Non-owner, locked room, join request denied
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+        $this->assertSame(327, $json['code']);
+
+        // Test accepting a request
+
+        // Unknown room
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/unknown/request/unknown/accept");
+        $response->assertStatus(404);
+
+        // Unknown request Id
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/request/unknown/accept");
+        $response->assertStatus(500);
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame('Failed to accept the join request.', $json['message']);
+
+        // Non-owner access forbidden
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}/request/{$reqId}/accept");
+        $response->assertStatus(403);
+
+        // Valid request
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/request/{$reqId}/accept");
+        $response->assertStatus(200);
+        $json = $response->json();
+
+        $this->assertSame('success', $json['status']);
+
+        // Non-owner, locked room, join request accepted
+        $post['init'] = 1;
+        $post['canPublish'] = true;
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+        $json = $response->json();
+
+        $this->assertSame(Room::ROLE_PUBLISHER, $json['role']);
+        $this->assertTrue(strpos($json['token'], 'wss://') === 0);
+
+        // TODO: Test a scenario where both password and lock are enabled
+        // TODO: Test accepting/denying as a non-owner moderator
+    }
+
+    /**
+     * Test joining the room
+     *
+     * @group openvidu
+     * @depends testJoinRoom
+     */
+    public function testJoinRoomGuest(): void
+    {
+        $this->assignMeetEntitlement('john@kolab.org');
+
+        // There's no asy way to logout the user in the same test after
+        // using actingAs(). That's why this is moved to a separate test
+        $room = Room::where('name', 'john')->first();
+
+        // Guest, request with screenShare token
+        $post = ['canPublish' => true, 'screenShare' => 1, 'init' => 1];
+        $response = $this->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame(Room::ROLE_PUBLISHER, $json['role']);
+        $this->assertSame($room->session_id, $json['session']);
+        $this->assertTrue(strpos($json['token'], 'wss://') === 0);
+    }
+
+    /**
+     * Test closing the room (session)
+     *
+     * @group openvidu
+     * @depends testJoinRoom
+     */
+    public function testCloseRoom(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $room = Room::where('name', 'john')->first();
+
+        // Unauth access not allowed
+        $response = $this->post("api/v4/openvidu/rooms/{$room->name}/close", []);
+        $response->assertStatus(401);
+
+        // Non-existing room name
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/non-existing/close", []);
+        $response->assertStatus(404);
+
+        // Non-owner
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}/close", []);
+        $response->assertStatus(403);
+
+        // Room owner
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/close", []);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertNull($room->fresh()->session_id);
+        $this->assertSame('success', $json['status']);
+        $this->assertSame("The session has been closed successfully.", $json['message']);
+        $this->assertCount(2, $json);
+
+        // TODO: Test if the session is removed from the OpenVidu server too
+
+        // Test error handling when it's not possible to delete the session on
+        // the OpenVidu server (use fake session_id)
+        $room->session_id = 'aaa';
+        $room->save();
+
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/close", []);
+        $response->assertStatus(500);
+
+        $json = $response->json();
+
+        $this->assertSame('aaa', $room->fresh()->session_id);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame("Failed to close the session.", $json['message']);
+        $this->assertCount(2, $json);
+    }
+
+    /**
+     * Test creating an extra connection for screen sharing
+     *
+     * @group openvidu
+     */
+    public function testCreateConnection(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $room = Room::where('name', 'john')->first();
+        $room->session_id = null;
+        $room->save();
+
+        $this->assignMeetEntitlement($john);
+
+        // First we create the session
+        $post = ['init' => 1, 'canPublish' => 1];
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+        $owner_auth_token = $json['authToken'];
+
+        // And the other user connection
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $conn_id = $json['connectionId'];
+        $auth_token = $json['authToken'];
+
+        // Non-existing room name
+        $response = $this->post("api/v4/openvidu/rooms/non-existing/connections", []);
+        $response->assertStatus(404);
+
+        // No connection token provided
+        $response = $this->post("api/v4/openvidu/rooms/{$room->name}/connections", []);
+        $response->assertStatus(403);
+
+        // Invalid token
+        $response = $this->actingAs($jack)
+            ->withHeaders([OpenViduController::AUTH_HEADER => '123'])
+            ->post("api/v4/openvidu/rooms/{$room->name}/connections", []);
+
+        $response->assertStatus(403);
+
+        // Subscriber can't get the screen-sharing connection
+        // Note: We're acting as Jack because there's no easy way to unset the 'actingAs' user
+        // throughout the test
+        $response = $this->actingAs($jack)
+            ->withHeaders([OpenViduController::AUTH_HEADER => $auth_token])
+            ->post("api/v4/openvidu/rooms/{$room->name}/connections", []);
+
+        $response->assertStatus(403);
+
+        // Publisher can get the connection
+        $response = $this->actingAs($jack)
+            ->withHeaders([OpenViduController::AUTH_HEADER => $owner_auth_token])
+            ->post("api/v4/openvidu/rooms/{$room->name}/connections", []);
+
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame('success', $json['status']);
+        $this->assertTrue(strpos($json['token'], 'wss://') === 0);
+        $this->assertTrue(strpos($json['token'], 'role=PUBLISHER') !== false);
+    }
+
+    /**
+     * Test dismissing a participant (closing a connection)
+     *
+     * @group openvidu
+     */
+    public function testDismissConnection(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $room = Room::where('name', 'john')->first();
+        $room->session_id = null;
+        $room->save();
+
+        $this->assignMeetEntitlement($john);
+
+        // First we create the session
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        // And the other user connection
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $conn_id = $json['connectionId'];
+        $room->refresh();
+        $conn_data = $room->getOVConnection($conn_id);
+
+        $this->assertSame($conn_id, $conn_data['connectionId']);
+
+        // Non-existing room name
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/non-existing/connections/{$conn_id}/dismiss");
+        $response->assertStatus(404);
+
+        // TODO: Test accessing an existing room of deleted owner
+
+        // Non-existing connection
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/connections/123/dismiss");
+        $response->assertStatus(404);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame('The connection does not exist.', $json['message']);
+
+        // Non-owner access
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}/dismiss");
+        $response->assertStatus(403);
+
+        // Expected success
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}/dismiss");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame('success', $json['status']);
+        $this->assertNull($room->getOVConnection($conn_id));
+
+        // Test acting as a moderator
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+        $json = $response->json();
+        $conn_id = $json['connectionId'];
+
+        // Note: We're acting as Jack because there's no easy way to unset a 'actingAs' user
+        // throughout the test
+        $response = $this->actingAs($jack)
+            ->withHeaders([OpenViduController::AUTH_HEADER => $this->getModeratorToken($room)])
+            ->post("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}/dismiss");
+
+        $response->assertStatus(200);
+    }
+
+    /**
+     * Test configuring the room (session)
+     *
+     * @group openvidu
+     */
+    public function testSetRoomConfig(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $room = Room::where('name', 'john')->first();
+
+        // Unauth access not allowed
+        $response = $this->post("api/v4/openvidu/rooms/{$room->name}/config", []);
+        $response->assertStatus(401);
+
+        // Non-existing room name
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/non-existing/config", []);
+        $response->assertStatus(404);
+
+        // TODO: Test a room with a deleted owner
+
+        // Non-owner
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}/config", []);
+        $response->assertStatus(403);
+
+        // Room owner
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/config", []);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('success', $json['status']);
+        $this->assertSame("Room configuration updated successfully.", $json['message']);
+
+        // Set password and room lock
+        $post = ['password' => 'aaa', 'locked' => 1];
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/config", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('success', $json['status']);
+        $this->assertSame("Room configuration updated successfully.", $json['message']);
+        $room->refresh();
+        $this->assertSame('aaa', $room->getSetting('password'));
+        $this->assertSame('true', $room->getSetting('locked'));
+
+        // Unset password and room lock
+        $post = ['password' => '', 'locked' => 0];
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/config", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('success', $json['status']);
+        $this->assertSame("Room configuration updated successfully.", $json['message']);
+        $room->refresh();
+        $this->assertSame(null, $room->getSetting('password'));
+        $this->assertSame(null, $room->getSetting('locked'));
+
+        // Test invalid option error
+        $post = ['password' => 'eee', 'unknown' => 0];
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}/config", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame("Invalid room configuration option.", $json['errors']['unknown']);
+
+        $room->refresh();
+        $this->assertSame(null, $room->getSetting('password'));
+    }
+
+    /**
+     * Test updating a participant (connection)
+     *
+     * @group openvidu
+     */
+    public function testUpdateConnection(): void
+    {
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $room = Room::where('name', 'john')->first();
+        $room->session_id = null;
+        $room->save();
+
+        $this->assignMeetEntitlement($john);
+
+        // First we create the session
+        $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+        $owner_conn_id = $json['connectionId'];
+
+        // And the other user connection
+        $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", ['init' => 1]);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $conn_id = $json['connectionId'];
+        $auth_token = $json['authToken'];
+        $room->refresh();
+        $conn_data = $room->getOVConnection($conn_id);
+
+        $this->assertSame($conn_id, $conn_data['connectionId']);
+
+        // Non-existing room name
+        $response = $this->actingAs($john)->put("api/v4/openvidu/rooms/non-existing/connections/{$conn_id}", []);
+        $response->assertStatus(404);
+
+        // Non-existing connection
+        $response = $this->actingAs($john)->put("api/v4/openvidu/rooms/{$room->name}/connections/123", []);
+        $response->assertStatus(404);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('error', $json['status']);
+        $this->assertSame('The connection does not exist.', $json['message']);
+
+        // Non-owner access (empty post)
+        $response = $this->actingAs($jack)->put("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}", []);
+        $response->assertStatus(200);
+
+        // Non-owner access (role update)
+        $post = ['role' => Room::ROLE_PUBLISHER | Room::ROLE_MODERATOR];
+        $response = $this->actingAs($jack)->put("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}", $post);
+        $response->assertStatus(403);
+
+        // Expected success
+        $post = ['role' => Room::ROLE_PUBLISHER | Room::ROLE_MODERATOR];
+        $response = $this->actingAs($john)->put("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertSame('success', $json['status']);
+        $this->assertSame($post['role'], Connection::find($conn_id)->role);
+
+        // Access as moderator
+        // Note: We're acting as Jack because there's no easy way to unset a 'actingAs' user
+        // throughout the test
+        $token = $this->getModeratorToken($room);
+        $post = ['role' => Room::ROLE_PUBLISHER];
+        $response = $this->actingAs($jack)->withHeaders([OpenViduController::AUTH_HEADER => $token])
+            ->put("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}", $post);
+        $response->assertStatus(200);
+
+        $this->assertSame('success', $json['status']);
+        $this->assertSame($post['role'], Connection::find($conn_id)->role);
+
+        // Assert that it's not possible to add/remove the 'owner' role
+        $post = ['role' => Room::ROLE_PUBLISHER | Room::ROLE_OWNER];
+        $response = $this->actingAs($jack)->withHeaders([OpenViduController::AUTH_HEADER => $token])
+            ->put("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}", $post);
+
+        $response->assertStatus(403);
+
+        $post = ['role' => Room::ROLE_PUBLISHER];
+        $response = $this->actingAs($jack)->withHeaders([OpenViduController::AUTH_HEADER => $token])
+            ->put("api/v4/openvidu/rooms/{$room->name}/connections/{$owner_conn_id}", $post);
+
+        $response->assertStatus(403);
+
+        // Assert that removing a 'moderator' role from the owner is not possible
+        $post = ['role' => Room::ROLE_PUBLISHER | Room::ROLE_OWNER];
+        $response = $this->actingAs($jack)->withHeaders([OpenViduController::AUTH_HEADER => $token])
+            ->put("api/v4/openvidu/rooms/{$room->name}/connections/{$owner_conn_id}", $post);
+
+        $response->assertStatus(200);
+
+        $this->assertSame($post['role'] | Room::ROLE_MODERATOR, Connection::find($owner_conn_id)->role);
+
+        // Assert that non-moderator token does not allow access
+        $post = ['role' => Room::ROLE_SUBSCRIBER];
+        $response = $this->actingAs($jack)->withHeaders([OpenViduController::AUTH_HEADER => $auth_token])
+            ->put("api/v4/openvidu/rooms/{$room->name}/connections/{$conn_id}", $post);
+
+        $response->assertStatus(403);
+
+        // TODO: Test updating 'language' and 'hand' properties
+    }
+
+    /**
+     * Create a moderator connection to the room session.
+     *
+     * @param \App\OpenVidu\Room $room The room
+     *
+     * @return string The connection authentication token
+     */
+    private function getModeratorToken(Room $room): string
+    {
+        $result = $room->getSessionToken(Room::ROLE_MODERATOR);
+
+        return $result['authToken'];
+    }
+}
diff --git a/src/tests/Feature/Controller/PackagesTest.php b/src/tests/Feature/Controller/PackagesTest.php
index 1b12b6d4..4435021e 100644
--- a/src/tests/Feature/Controller/PackagesTest.php
+++ b/src/tests/Feature/Controller/PackagesTest.php
@@ -1,53 +1,52 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
-use App\Http\Controllers\API\PackagesController;
 use App\Package;
 use Tests\TestCase;
 
 class PackagesTest extends TestCase
 {
     /**
      * Test fetching packages list
      */
     public function testIndex(): void
     {
         // Unauth access not allowed
         $response = $this->get("api/v4/packages");
         $response->assertStatus(401);
 
         $user = $this->getTestUser('john@kolab.org');
         $package_domain = Package::where('title', 'domain-hosting')->first();
         $package_kolab = Package::where('title', 'kolab')->first();
         $package_lite = Package::where('title', 'lite')->first();
 
         $response = $this->actingAs($user)->get("api/v4/packages");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(3, $json);
 
         $this->assertSame($package_domain->id, $json[0]['id']);
         $this->assertSame($package_domain->title, $json[0]['title']);
         $this->assertSame($package_domain->name, $json[0]['name']);
         $this->assertSame($package_domain->description, $json[0]['description']);
         $this->assertSame($package_domain->isDomain(), $json[0]['isDomain']);
         $this->assertSame($package_domain->cost(), $json[0]['cost']);
 
         $this->assertSame($package_kolab->id, $json[1]['id']);
         $this->assertSame($package_kolab->title, $json[1]['title']);
         $this->assertSame($package_kolab->name, $json[1]['name']);
         $this->assertSame($package_kolab->description, $json[1]['description']);
         $this->assertSame($package_kolab->isDomain(), $json[1]['isDomain']);
         $this->assertSame($package_kolab->cost(), $json[1]['cost']);
 
         $this->assertSame($package_lite->id, $json[2]['id']);
         $this->assertSame($package_lite->title, $json[2]['title']);
         $this->assertSame($package_lite->name, $json[2]['name']);
         $this->assertSame($package_lite->description, $json[2]['description']);
         $this->assertSame($package_lite->isDomain(), $json[2]['isDomain']);
         $this->assertSame($package_lite->cost(), $json[2]['cost']);
     }
 }
diff --git a/src/tests/Feature/Controller/PaymentsMollieTest.php b/src/tests/Feature/Controller/PaymentsMollieTest.php
index f532fc03..bf053f35 100644
--- a/src/tests/Feature/Controller/PaymentsMollieTest.php
+++ b/src/tests/Feature/Controller/PaymentsMollieTest.php
@@ -1,595 +1,920 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
 use App\Http\Controllers\API\V4\PaymentsController;
 use App\Payment;
 use App\Providers\PaymentProvider;
 use App\Transaction;
 use App\Wallet;
 use App\WalletSetting;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Support\Facades\Bus;
 use Tests\TestCase;
 use Tests\BrowserAddonTrait;
 use Tests\MollieMocksTrait;
 
 class PaymentsMollieTest extends TestCase
 {
     use MollieMocksTrait;
     use BrowserAddonTrait;
 
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         // All tests in this file use Mollie
         \config(['services.payment_provider' => 'mollie']);
 
         $john = $this->getTestUser('john@kolab.org');
         $wallet = $john->wallets()->first();
         Payment::where('wallet_id', $wallet->id)->delete();
         Wallet::where('id', $wallet->id)->update(['balance' => 0]);
         WalletSetting::where('wallet_id', $wallet->id)->delete();
-        Transaction::where('object_id', $wallet->id)
-            ->where('type', Transaction::WALLET_CREDIT)->delete();
+        $types = [
+            Transaction::WALLET_CREDIT,
+            Transaction::WALLET_REFUND,
+            Transaction::WALLET_CHARGEBACK,
+        ];
+        Transaction::where('object_id', $wallet->id)->whereIn('type', $types)->delete();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $john = $this->getTestUser('john@kolab.org');
         $wallet = $john->wallets()->first();
         Payment::where('wallet_id', $wallet->id)->delete();
         Wallet::where('id', $wallet->id)->update(['balance' => 0]);
         WalletSetting::where('wallet_id', $wallet->id)->delete();
-        Transaction::where('object_id', $wallet->id)
-            ->where('type', Transaction::WALLET_CREDIT)->delete();
+        $types = [
+            Transaction::WALLET_CREDIT,
+            Transaction::WALLET_REFUND,
+            Transaction::WALLET_CHARGEBACK,
+        ];
+        Transaction::where('object_id', $wallet->id)->whereIn('type', $types)->delete();
 
         parent::tearDown();
     }
 
     /**
      * Test creating/updating/deleting an outo-payment mandate
      *
      * @group mollie
      */
     public function testMandates(): void
     {
         // Unauth access not allowed
         $response = $this->get("api/v4/payments/mandate");
         $response->assertStatus(401);
         $response = $this->post("api/v4/payments/mandate", []);
         $response->assertStatus(401);
         $response = $this->put("api/v4/payments/mandate", []);
         $response->assertStatus(401);
         $response = $this->delete("api/v4/payments/mandate");
         $response->assertStatus(401);
 
         $user = $this->getTestUser('john@kolab.org');
+        $wallet = $user->wallets()->first();
 
         // Test creating a mandate (invalid input)
         $post = [];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertSame('The amount field is required.', $json['errors']['amount'][0]);
         $this->assertSame('The balance field is required.', $json['errors']['balance'][0]);
 
         // Test creating a mandate (invalid input)
         $post = ['amount' => 100, 'balance' => 'a'];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertSame('The balance must be a number.', $json['errors']['balance'][0]);
 
-        // Test creating a mandate (invalid input)
+        // Test creating a mandate (amount smaller than the minimum value)
         $post = ['amount' => -100, 'balance' => 0];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
         $this->assertSame("Minimum amount for a single payment is {$min}.", $json['errors']['amount']);
 
+        // Test creating a mandate (negative balance, amount too small)
+        Wallet::where('id', $wallet->id)->update(['balance' => -2000]);
+        $post = ['amount' => PaymentProvider::MIN_AMOUNT / 100, 'balance' => 0];
+        $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertSame('error', $json['status']);
+        $this->assertCount(1, $json['errors']);
+        $this->assertSame("The specified amount does not cover the balance on the account.", $json['errors']['amount']);
+
         // Test creating a mandate (valid input)
         $post = ['amount' => 20.10, 'balance' => 0];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertRegExp('|^https://www.mollie.com|', $json['redirectUrl']);
 
+        // Assert the proper payment amount has been used
+        $payment = Payment::where('id', $json['id'])->first();
+        $this->assertSame(2010, $payment->amount);
+        $this->assertSame($wallet->id, $payment->wallet_id);
+        $this->assertSame(\config('app.name') . " Auto-Payment Setup", $payment->description);
+        $this->assertSame(PaymentProvider::TYPE_MANDATE, $payment->type);
+
         // Test fetching the mandate information
         $response = $this->actingAs($user)->get("api/v4/payments/mandate");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals(20.10, $json['amount']);
         $this->assertEquals(0, $json['balance']);
         $this->assertEquals('Credit Card', $json['method']);
         $this->assertSame(true, $json['isPending']);
         $this->assertSame(false, $json['isValid']);
         $this->assertSame(false, $json['isDisabled']);
 
         $mandate_id = $json['id'];
 
         // We would have to invoke a browser to accept the "first payment" to make
         // the mandate validated/completed. Instead, we'll mock the mandate object.
         $mollie_response = [
             'resource' => 'mandate',
             'id' => $mandate_id,
             'status' => 'valid',
             'method' => 'creditcard',
             'details' => [
                 'cardNumber' => '4242',
                 'cardLabel' => 'Visa',
             ],
             'customerId' => 'cst_GMfxGPt7Gj',
             'createdAt' => '2020-04-28T11:09:47+00:00',
         ];
 
         $responseStack = $this->mockMollie();
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $wallet = $user->wallets()->first();
         $wallet->setSetting('mandate_disabled', 1);
 
         $response = $this->actingAs($user)->get("api/v4/payments/mandate");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals(20.10, $json['amount']);
         $this->assertEquals(0, $json['balance']);
         $this->assertEquals('Visa (**** **** **** 4242)', $json['method']);
         $this->assertSame(false, $json['isPending']);
         $this->assertSame(true, $json['isValid']);
         $this->assertSame(true, $json['isDisabled']);
 
         Bus::fake();
         $wallet->setSetting('mandate_disabled', null);
+        $wallet->balance = 1000;
+        $wallet->save();
 
         // Test updating mandate details (invalid input)
         $post = [];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertSame('The amount field is required.', $json['errors']['amount'][0]);
         $this->assertSame('The balance field is required.', $json['errors']['balance'][0]);
 
         $post = ['amount' => -100, 'balance' => 0];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertSame("Minimum amount for a single payment is {$min}.", $json['errors']['amount']);
 
         // Test updating a mandate (valid input)
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
-        $post = ['amount' => 30.10, 'balance' => 1];
+        $post = ['amount' => 30.10, 'balance' => 10];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('The auto-payment has been updated.', $json['message']);
         $this->assertSame($mandate_id, $json['id']);
         $this->assertFalse($json['isDisabled']);
 
-        $wallet = $user->wallets()->first();
+        $wallet->refresh();
 
         $this->assertEquals(30.10, $wallet->getSetting('mandate_amount'));
-        $this->assertEquals(1, $wallet->getSetting('mandate_balance'));
+        $this->assertEquals(10, $wallet->getSetting('mandate_balance'));
+
+        Bus::assertDispatchedTimes(\App\Jobs\WalletCharge::class, 0);
 
         // Test updating a disabled mandate (invalid input)
         $wallet->setSetting('mandate_disabled', 1);
         $wallet->balance = -2000;
         $wallet->save();
         $user->refresh(); // required so the controller sees the wallet update from above
 
         $post = ['amount' => 15.10, 'balance' => 1];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertSame('The specified amount does not cover the balance on the account.', $json['errors']['amount']);
 
         // Test updating a disabled mandate (valid input)
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $post = ['amount' => 30, 'balance' => 1];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('The auto-payment has been updated.', $json['message']);
         $this->assertSame($mandate_id, $json['id']);
         $this->assertFalse($json['isDisabled']);
 
         Bus::assertDispatchedTimes(\App\Jobs\WalletCharge::class, 1);
         Bus::assertDispatched(\App\Jobs\WalletCharge::class, function ($job) use ($wallet) {
             $job_wallet = $this->getObjectProperty($job, 'wallet');
             return $job_wallet->id === $wallet->id;
         });
 
         $this->unmockMollie();
 
         // Delete mandate
         $response = $this->actingAs($user)->delete("api/v4/payments/mandate");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('The auto-payment has been removed.', $json['message']);
 
         // Confirm with Mollie the mandate does not exist
         $customer_id = $wallet->getSetting('mollie_id');
         $this->expectException(\Mollie\Api\Exceptions\ApiException::class);
         $this->expectExceptionMessageMatches('/410: Gone/');
         $mandate = mollie()->mandates()->getForId($customer_id, $mandate_id);
 
         $this->assertNull($wallet->fresh()->getSetting('mollie_mandate_id'));
+
+        // Test Mollie's "410 Gone" response handling when fetching the mandate info
+        // It is expected to remove the mandate reference
+        $mollie_response = [
+            'status' => 410,
+            'title' => "Gone",
+            'detail' => "You are trying to access an object, which has previously been deleted",
+            '_links' => [
+                'documentation' => [
+                    'href' => "https://docs.mollie.com/errors",
+                    'type' => "text/html"
+                ]
+            ]
+        ];
+
+        $responseStack = $this->mockMollie();
+        $responseStack->append(new Response(410, [], json_encode($mollie_response)));
+
+        $wallet->fresh()->setSetting('mollie_mandate_id', '123');
+
+        $response = $this->actingAs($user)->get("api/v4/payments/mandate");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertFalse(array_key_exists('id', $json));
+        $this->assertFalse(array_key_exists('method', $json));
+        $this->assertNull($wallet->fresh()->getSetting('mollie_mandate_id'));
     }
 
     /**
      * Test creating a payment and receiving a status via webhook
      *
      * @group mollie
      */
     public function testStoreAndWebhook(): void
     {
         Bus::fake();
 
         // Unauth access not allowed
         $response = $this->post("api/v4/payments", []);
         $response->assertStatus(401);
 
+        // Invalid amount
         $user = $this->getTestUser('john@kolab.org');
 
         $post = ['amount' => -1];
         $response = $this->actingAs($user)->post("api/v4/payments", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
         $this->assertSame("Minimum amount for a single payment is {$min}.", $json['errors']['amount']);
 
-        $post = ['amount' => '12.34'];
+        // Invalid currency
+        $post = ['amount' => '12.34', 'currency' => 'FOO', 'methodId' => 'creditcard'];
+        $response = $this->actingAs($user)->post("api/v4/payments", $post);
+        $response->assertStatus(500);
+
+        // Successful payment
+        $post = ['amount' => '12.34', 'currency' => 'CHF', 'methodId' => 'creditcard'];
         $response = $this->actingAs($user)->post("api/v4/payments", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertRegExp('|^https://www.mollie.com|', $json['redirectUrl']);
 
         $wallet = $user->wallets()->first();
         $payments = Payment::where('wallet_id', $wallet->id)->get();
 
         $this->assertCount(1, $payments);
         $payment = $payments[0];
         $this->assertSame(1234, $payment->amount);
         $this->assertSame(\config('app.name') . ' Payment', $payment->description);
         $this->assertSame('open', $payment->status);
         $this->assertEquals(0, $wallet->balance);
 
         // Test the webhook
         // Note: Webhook end-point does not require authentication
 
         $mollie_response = [
             "resource" => "payment",
             "id" => $payment->id,
             "status" => "paid",
             // Status is not enough, paidAt is used to distinguish the state
             "paidAt" => date('c'),
             "mode" => "test",
         ];
 
         // We'll trigger the webhook with payment id and use mocking for
         // a request to the Mollie payments API. We cannot force Mollie
         // to make the payment status change.
         $responseStack = $this->mockMollie();
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $post = ['id' => $payment->id];
         $response = $this->post("api/webhooks/payment/mollie", $post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         $transaction = $wallet->transactions()
             ->where('type', Transaction::WALLET_CREDIT)->get()->last();
 
         $this->assertSame(1234, $transaction->amount);
         $this->assertSame(
             "Payment transaction {$payment->id} using Mollie",
             $transaction->description
         );
 
         // Assert that email notification job wasn't dispatched,
         // it is expected only for recurring payments
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 0);
 
         // Verify "paid -> open -> paid" scenario, assert that balance didn't change
         $mollie_response['status'] = 'open';
         unset($mollie_response['paidAt']);
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $response = $this->post("api/webhooks/payment/mollie", $post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         $mollie_response['status'] = 'paid';
         $mollie_response['paidAt'] = date('c');
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $response = $this->post("api/webhooks/payment/mollie", $post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         // Test for payment failure
         Bus::fake();
 
         $payment->refresh();
         $payment->status = PaymentProvider::STATUS_OPEN;
         $payment->save();
 
         $mollie_response = [
             "resource" => "payment",
             "id" => $payment->id,
             "status" => "failed",
             "mode" => "test",
         ];
 
         // We'll trigger the webhook with payment id and use mocking for
         // a request to the Mollie payments API. We cannot force Mollie
         // to make the payment status change.
         $responseStack = $this->mockMollie();
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $response = $this->post("api/webhooks/payment/mollie", $post);
         $response->assertStatus(200);
 
         $this->assertSame('failed', $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         // Assert that email notification job wasn't dispatched,
         // it is expected only for recurring payments
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 0);
     }
 
     /**
      * Test automatic payment charges
      *
      * @group mollie
      */
     public function testTopUp(): void
     {
         Bus::fake();
 
         $user = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
 
-        // Create a valid mandate first
-        $this->createMandate($wallet, ['amount' => 20.10, 'balance' => 10]);
+        // Create a valid mandate first (balance=0, so there's no extra payment yet)
+        $this->createMandate($wallet, ['amount' => 20.10, 'balance' => 0]);
+
+        $wallet->setSetting('mandate_balance', 10);
 
         // Expect a recurring payment as we have a valid mandate at this point
+        // and the balance is below the threshold
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertTrue($result);
 
-        // Check that the payments table contains a new record with proper amount
-        // There should be two records, one for the first payment and another for
-        // the recurring payment
-        $this->assertCount(1, $wallet->payments()->get());
-        $payment = $wallet->payments()->first();
-        $this->assertSame(2010, $payment->amount);
+        // Check that the payments table contains a new record with proper amount.
+        // There should be two records, one for the mandate payment and another for
+        // the top-up payment
+        $payments = $wallet->payments()->orderBy('amount')->get();
+        $this->assertCount(2, $payments);
+        $this->assertSame(0, $payments[0]->amount);
+        $this->assertSame(2010, $payments[1]->amount);
+        $payment = $payments[1];
 
         // In mollie we don't have to wait for a webhook, the response to
         // PaymentIntent already sets the status to 'paid', so we can test
         // immediately the balance update
         // Assert that email notification job has been dispatched
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->status);
         $this->assertEquals(2010, $wallet->fresh()->balance);
         $transaction = $wallet->transactions()
             ->where('type', Transaction::WALLET_CREDIT)->get()->last();
 
         $this->assertSame(2010, $transaction->amount);
         $this->assertSame(
             "Auto-payment transaction {$payment->id} using Mastercard (**** **** **** 6787)",
             $transaction->description
         );
 
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 1);
         Bus::assertDispatched(\App\Jobs\PaymentEmail::class, function ($job) use ($payment) {
             $job_payment = $this->getObjectProperty($job, 'payment');
             return $job_payment->id === $payment->id;
         });
 
         // Expect no payment if the mandate is disabled
         $wallet->setSetting('mandate_disabled', 1);
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
-        $this->assertCount(1, $wallet->payments()->get());
+        $this->assertCount(2, $wallet->payments()->get());
 
         // Expect no payment if balance is ok
         $wallet->setSetting('mandate_disabled', null);
         $wallet->balance = 1000;
         $wallet->save();
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
-        $this->assertCount(1, $wallet->payments()->get());
+        $this->assertCount(2, $wallet->payments()->get());
 
         // Expect no payment if the top-up amount is not enough
         $wallet->setSetting('mandate_disabled', null);
         $wallet->balance = -2050;
         $wallet->save();
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
-        $this->assertCount(1, $wallet->payments()->get());
+        $this->assertCount(2, $wallet->payments()->get());
 
         Bus::assertDispatchedTimes(\App\Jobs\PaymentMandateDisabledEmail::class, 1);
         Bus::assertDispatched(\App\Jobs\PaymentMandateDisabledEmail::class, function ($job) use ($wallet) {
             $job_wallet = $this->getObjectProperty($job, 'wallet');
             return $job_wallet->id === $wallet->id;
         });
 
         // Expect no payment if there's no mandate
         $wallet->setSetting('mollie_mandate_id', null);
         $wallet->balance = 0;
         $wallet->save();
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
-        $this->assertCount(1, $wallet->payments()->get());
+        $this->assertCount(2, $wallet->payments()->get());
 
         Bus::assertDispatchedTimes(\App\Jobs\PaymentMandateDisabledEmail::class, 1);
 
         // Test webhook for recurring payments
 
         $wallet->transactions()->delete();
 
         $responseStack = $this->mockMollie();
         Bus::fake();
 
         $payment->refresh();
         $payment->status = PaymentProvider::STATUS_OPEN;
         $payment->save();
 
         $mollie_response = [
             "resource" => "payment",
             "id" => $payment->id,
             "status" => "paid",
             // Status is not enough, paidAt is used to distinguish the state
             "paidAt" => date('c'),
             "mode" => "test",
         ];
 
         // We'll trigger the webhook with payment id and use mocking for
         // a request to the Mollie payments API. We cannot force Mollie
         // to make the payment status change.
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $post = ['id' => $payment->id];
         $response = $this->post("api/webhooks/payment/mollie", $post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->fresh()->status);
         $this->assertEquals(2010, $wallet->fresh()->balance);
 
         $transaction = $wallet->transactions()
             ->where('type', Transaction::WALLET_CREDIT)->get()->last();
 
         $this->assertSame(2010, $transaction->amount);
         $this->assertSame(
             "Auto-payment transaction {$payment->id} using Mollie",
             $transaction->description
         );
 
         // Assert that email notification job has been dispatched
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 1);
         Bus::assertDispatched(\App\Jobs\PaymentEmail::class, function ($job) use ($payment) {
             $job_payment = $this->getObjectProperty($job, 'payment');
             return $job_payment->id === $payment->id;
         });
 
         Bus::fake();
 
         // Test for payment failure
         $payment->refresh();
         $payment->status = PaymentProvider::STATUS_OPEN;
         $payment->save();
 
         $wallet->setSetting('mollie_mandate_id', 'xxx');
         $wallet->setSetting('mandate_disabled', null);
 
         $mollie_response = [
             "resource" => "payment",
             "id" => $payment->id,
             "status" => "failed",
             "mode" => "test",
         ];
 
         $responseStack->append(new Response(200, [], json_encode($mollie_response)));
 
         $response = $this->post("api/webhooks/payment/mollie", $post);
         $response->assertStatus(200);
 
         $wallet->refresh();
 
         $this->assertSame(PaymentProvider::STATUS_FAILED, $payment->fresh()->status);
         $this->assertEquals(2010, $wallet->balance);
         $this->assertTrue(!empty($wallet->getSetting('mandate_disabled')));
 
         // Assert that email notification job has been dispatched
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 1);
         Bus::assertDispatched(\App\Jobs\PaymentEmail::class, function ($job) use ($payment) {
             $job_payment = $this->getObjectProperty($job, 'payment');
             return $job_payment->id === $payment->id;
         });
 
-        $responseStack = $this->unmockMollie();
+        $this->unmockMollie();
+    }
+
+    /**
+     * Test refund/chargeback handling by the webhook
+     *
+     * @group mollie
+     */
+    public function testRefundAndChargeback(): void
+    {
+        Bus::fake();
+
+        $user = $this->getTestUser('john@kolab.org');
+        $wallet = $user->wallets()->first();
+        $wallet->transactions()->delete();
+
+        $mollie = PaymentProvider::factory('mollie');
+
+        // Create a paid payment
+        $payment = Payment::create([
+                'id' => 'tr_123456',
+                'status' => PaymentProvider::STATUS_PAID,
+                'amount' => 123,
+                'currency_amount' => 123,
+                'currency' => 'CHF',
+                'type' => PaymentProvider::TYPE_ONEOFF,
+                'wallet_id' => $wallet->id,
+                'provider' => 'mollie',
+                'description' => 'test',
+        ]);
+
+        // Test handling a refund by the webhook
+
+        $mollie_response1 = [
+            "resource" => "payment",
+            "id" => $payment->id,
+            "status" => "paid",
+            // Status is not enough, paidAt is used to distinguish the state
+            "paidAt" => date('c'),
+            "mode" => "test",
+            "_links" => [
+                "refunds" => [
+                   "href" => "https://api.mollie.com/v2/payments/{$payment->id}/refunds",
+                   "type" => "application/hal+json"
+                ]
+            ]
+        ];
+
+        $mollie_response2 = [
+            "count" => 1,
+            "_links" => [],
+            "_embedded" => [
+                "refunds" => [
+                    [
+                        "resource" => "refund",
+                        "id" => "re_123456",
+                        "status" => \Mollie\Api\Types\RefundStatus::STATUS_REFUNDED,
+                        "paymentId" => $payment->id,
+                        "description" => "refund desc",
+                        "amount" => [
+                            "currency" => "CHF",
+                            "value" => "1.01",
+                        ],
+                    ]
+                ]
+            ]
+        ];
+
+        // We'll trigger the webhook with payment id and use mocking for
+        // requests to the Mollie payments API.
+        $responseStack = $this->mockMollie();
+        $responseStack->append(new Response(200, [], json_encode($mollie_response1)));
+        $responseStack->append(new Response(200, [], json_encode($mollie_response2)));
+
+        $post = ['id' => $payment->id];
+        $response = $this->post("api/webhooks/payment/mollie", $post);
+        $response->assertStatus(200);
+
+        $wallet->refresh();
+
+        $this->assertEquals(-101, $wallet->balance);
+
+        $transactions = $wallet->transactions()->where('type', Transaction::WALLET_REFUND)->get();
+
+        $this->assertCount(1, $transactions);
+        $this->assertSame(-101, $transactions[0]->amount);
+        $this->assertSame(Transaction::WALLET_REFUND, $transactions[0]->type);
+        $this->assertSame("refund desc", $transactions[0]->description);
+
+        $payments = $wallet->payments()->where('id', 're_123456')->get();
+
+        $this->assertCount(1, $payments);
+        $this->assertSame(-101, $payments[0]->amount);
+        $this->assertSame(PaymentProvider::STATUS_PAID, $payments[0]->status);
+        $this->assertSame(PaymentProvider::TYPE_REFUND, $payments[0]->type);
+        $this->assertSame("mollie", $payments[0]->provider);
+        $this->assertSame("refund desc", $payments[0]->description);
+
+        // Test handling a chargeback by the webhook
+
+        $mollie_response1["_links"] = [
+            "chargebacks" => [
+               "href" => "https://api.mollie.com/v2/payments/{$payment->id}/chargebacks",
+               "type" => "application/hal+json"
+            ]
+        ];
+
+        $mollie_response2 = [
+            "count" => 1,
+            "_links" => [],
+            "_embedded" => [
+                "chargebacks" => [
+                    [
+                        "resource" => "chargeback",
+                        "id" => "chb_123456",
+                        "paymentId" => $payment->id,
+                        "amount" => [
+                            "currency" => "CHF",
+                            "value" => "0.15",
+                        ],
+                    ]
+                ]
+            ]
+        ];
+
+        // We'll trigger the webhook with payment id and use mocking for
+        // requests to the Mollie payments API.
+        $responseStack = $this->mockMollie();
+        $responseStack->append(new Response(200, [], json_encode($mollie_response1)));
+        $responseStack->append(new Response(200, [], json_encode($mollie_response2)));
+
+        $post = ['id' => $payment->id];
+        $response = $this->post("api/webhooks/payment/mollie", $post);
+        $response->assertStatus(200);
+
+        $wallet->refresh();
+
+        $this->assertEquals(-116, $wallet->balance);
+
+        $transactions = $wallet->transactions()->where('type', Transaction::WALLET_CHARGEBACK)->get();
+
+        $this->assertCount(1, $transactions);
+        $this->assertSame(-15, $transactions[0]->amount);
+        $this->assertSame(Transaction::WALLET_CHARGEBACK, $transactions[0]->type);
+        $this->assertSame('', $transactions[0]->description);
+
+        $payments = $wallet->payments()->where('id', 'chb_123456')->get();
+
+        $this->assertCount(1, $payments);
+        $this->assertSame(-15, $payments[0]->amount);
+        $this->assertSame(PaymentProvider::STATUS_PAID, $payments[0]->status);
+        $this->assertSame(PaymentProvider::TYPE_CHARGEBACK, $payments[0]->type);
+        $this->assertSame("mollie", $payments[0]->provider);
+        $this->assertSame('', $payments[0]->description);
+
+        Bus::assertNotDispatched(\App\Jobs\PaymentEmail::class);
+
+        $this->unmockMollie();
     }
 
     /**
      * Create Mollie's auto-payment mandate using our API and Chrome browser
      */
     protected function createMandate(Wallet $wallet, array $params)
     {
         // Use the API to create a first payment with a mandate
         $response = $this->actingAs($wallet->owner)->post("api/v4/payments/mandate", $params);
         $response->assertStatus(200);
         $json = $response->json();
 
         // There's no easy way to confirm a created mandate.
         // The only way seems to be to fire up Chrome on checkout page
         // and do actions with use of Dusk browser.
         $this->startBrowser()
             ->visit($json['redirectUrl'])
             ->click('input[value="paid"]')
             ->click('button.form__button');
 
         $this->stopBrowser();
     }
+
+
+    /**
+     * Test listing a pending payment
+     *
+     * @group mollie
+     */
+    public function testListingPayments(): void
+    {
+        Bus::fake();
+
+        $user = $this->getTestUser('john@kolab.org');
+
+        //Empty response
+        $response = $this->actingAs($user)->get("api/v4/payments/pending");
+        $json = $response->json();
+
+        $this->assertSame('success', $json['status']);
+        $this->assertSame(0, $json['count']);
+        $this->assertSame(1, $json['page']);
+        $this->assertSame(false, $json['hasMore']);
+        $this->assertCount(0, $json['list']);
+
+        $response = $this->actingAs($user)->get("api/v4/payments/has-pending");
+        $json = $response->json();
+        $this->assertSame(false, $json['hasPending']);
+
+        $wallet = $user->wallets()->first();
+
+        // Successful payment
+        $post = ['amount' => '12.34', 'currency' => 'CHF', 'methodId' => 'creditcard'];
+        $response = $this->actingAs($user)->post("api/v4/payments", $post);
+        $response->assertStatus(200);
+
+        //A response
+        $response = $this->actingAs($user)->get("api/v4/payments/pending");
+        $json = $response->json();
+
+        $this->assertSame('success', $json['status']);
+        $this->assertSame(1, $json['count']);
+        $this->assertSame(1, $json['page']);
+        $this->assertSame(false, $json['hasMore']);
+        $this->assertCount(1, $json['list']);
+        $this->assertSame(PaymentProvider::STATUS_OPEN, $json['list'][0]['status']);
+
+        $response = $this->actingAs($user)->get("api/v4/payments/has-pending");
+        $json = $response->json();
+        $this->assertSame(true, $json['hasPending']);
+
+        // Set the payment to paid
+        $payments = Payment::where('wallet_id', $wallet->id)->get();
+
+        $this->assertCount(1, $payments);
+        $payment = $payments[0];
+
+        $payment->status = PaymentProvider::STATUS_PAID;
+        $payment->save();
+
+        // They payment should be gone from the pending list now
+        $response = $this->actingAs($user)->get("api/v4/payments/pending");
+        $json = $response->json();
+        $this->assertSame('success', $json['status']);
+        $this->assertSame(0, $json['count']);
+        $this->assertCount(0, $json['list']);
+
+        $response = $this->actingAs($user)->get("api/v4/payments/has-pending");
+        $json = $response->json();
+        $this->assertSame(false, $json['hasPending']);
+    }
+
+    /**
+     * Test listing payment methods
+     *
+     * @group mollie
+     */
+    public function testListingPaymentMethods(): void
+    {
+        Bus::fake();
+
+        $user = $this->getTestUser('john@kolab.org');
+
+        $response = $this->actingAs($user)->get('api/v4/payments/methods?type=' . PaymentProvider::TYPE_ONEOFF);
+        $response->assertStatus(200);
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('creditcard', $json[0]['id']);
+        $this->assertSame('paypal', $json[1]['id']);
+
+        $response = $this->actingAs($user)->get('api/v4/payments/methods?type=' . PaymentProvider::TYPE_RECURRING);
+        $response->assertStatus(200);
+        $json = $response->json();
+
+        $this->assertCount(1, $json);
+        $this->assertSame('creditcard', $json[0]['id']);
+    }
 }
diff --git a/src/tests/Feature/Controller/PaymentsStripeTest.php b/src/tests/Feature/Controller/PaymentsStripeTest.php
index ea772d6b..e9f70c5d 100644
--- a/src/tests/Feature/Controller/PaymentsStripeTest.php
+++ b/src/tests/Feature/Controller/PaymentsStripeTest.php
@@ -1,677 +1,743 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
 use App\Http\Controllers\API\V4\PaymentsController;
 use App\Payment;
 use App\Providers\PaymentProvider;
 use App\Transaction;
 use App\Wallet;
 use App\WalletSetting;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Support\Facades\Bus;
 use Tests\TestCase;
 use Tests\StripeMocksTrait;
 
 class PaymentsStripeTest extends TestCase
 {
     use StripeMocksTrait;
 
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         // All tests in this file use Stripe
         \config(['services.payment_provider' => 'stripe']);
 
         $john = $this->getTestUser('john@kolab.org');
         $wallet = $john->wallets()->first();
         Payment::where('wallet_id', $wallet->id)->delete();
         Wallet::where('id', $wallet->id)->update(['balance' => 0]);
         WalletSetting::where('wallet_id', $wallet->id)->delete();
         Transaction::where('object_id', $wallet->id)
             ->where('type', Transaction::WALLET_CREDIT)->delete();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $john = $this->getTestUser('john@kolab.org');
         $wallet = $john->wallets()->first();
         Payment::where('wallet_id', $wallet->id)->delete();
         Wallet::where('id', $wallet->id)->update(['balance' => 0]);
         WalletSetting::where('wallet_id', $wallet->id)->delete();
         Transaction::where('object_id', $wallet->id)
             ->where('type', Transaction::WALLET_CREDIT)->delete();
 
         parent::tearDown();
     }
 
     /**
      * Test creating/updating/deleting an outo-payment mandate
      *
      * @group stripe
      */
     public function testMandates(): void
     {
         Bus::fake();
 
         // Unauth access not allowed
         $response = $this->get("api/v4/payments/mandate");
         $response->assertStatus(401);
         $response = $this->post("api/v4/payments/mandate", []);
         $response->assertStatus(401);
         $response = $this->put("api/v4/payments/mandate", []);
         $response->assertStatus(401);
         $response = $this->delete("api/v4/payments/mandate");
         $response->assertStatus(401);
 
         $user = $this->getTestUser('john@kolab.org');
+        $wallet = $user->wallets()->first();
 
         // Test creating a mandate (invalid input)
         $post = [];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertSame('The amount field is required.', $json['errors']['amount'][0]);
         $this->assertSame('The balance field is required.', $json['errors']['balance'][0]);
 
         // Test creating a mandate (invalid input)
         $post = ['amount' => 100, 'balance' => 'a'];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertSame('The balance must be a number.', $json['errors']['balance'][0]);
 
         // Test creating a mandate (invalid input)
         $post = ['amount' => -100, 'balance' => 0];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
         $this->assertSame("Minimum amount for a single payment is {$min}.", $json['errors']['amount']);
 
+        // Test creating a mandate (negative balance, amount too small)
+        Wallet::where('id', $wallet->id)->update(['balance' => -2000]);
+        $post = ['amount' => PaymentProvider::MIN_AMOUNT / 100, 'balance' => 0];
+        $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertSame('error', $json['status']);
+        $this->assertCount(1, $json['errors']);
+        $this->assertSame("The specified amount does not cover the balance on the account.", $json['errors']['amount']);
+
         // Test creating a mandate (valid input)
         $post = ['amount' => 20.10, 'balance' => 0];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertRegExp('|^cs_test_|', $json['id']);
 
+        // Assert the proper payment amount has been used
+        // Stripe in 'setup' mode does not allow to set the amount
+        $payment = Payment::where('wallet_id', $wallet->id)->first();
+        $this->assertSame(0, $payment->amount);
+        $this->assertSame(\config('app.name') . " Auto-Payment Setup", $payment->description);
+        $this->assertSame(PaymentProvider::TYPE_MANDATE, $payment->type);
+
         // Test fetching the mandate information
         $response = $this->actingAs($user)->get("api/v4/payments/mandate");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals(20.10, $json['amount']);
         $this->assertEquals(0, $json['balance']);
         $this->assertSame(false, $json['isDisabled']);
 
         // We would have to invoke a browser to accept the "first payment" to make
         // the mandate validated/completed. Instead, we'll mock the mandate object.
         $setupIntent = '{
             "id": "AAA",
             "object": "setup_intent",
             "created": 123456789,
             "payment_method": "pm_YYY",
             "status": "succeeded",
             "usage": "off_session",
             "customer": null
         }';
 
         $paymentMethod = '{
             "id": "pm_YYY",
             "object": "payment_method",
             "card": {
                 "brand": "visa",
                 "country": "US",
                 "last4": "4242"
             },
             "created": 123456789,
             "type": "card"
         }';
 
         $client = $this->mockStripe();
         $client->addResponse($setupIntent);
         $client->addResponse($paymentMethod);
 
         // As we do not use checkout page, we do not receive a webworker request
         // I.e. we have to fake the mandate id
         $wallet = $user->wallets()->first();
         $wallet->setSetting('stripe_mandate_id', 'AAA');
         $wallet->setSetting('mandate_disabled', 1);
 
         $response = $this->actingAs($user)->get("api/v4/payments/mandate");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals(20.10, $json['amount']);
         $this->assertEquals(0, $json['balance']);
         $this->assertEquals('Visa (**** **** **** 4242)', $json['method']);
         $this->assertSame(false, $json['isPending']);
         $this->assertSame(true, $json['isValid']);
         $this->assertSame(true, $json['isDisabled']);
 
         // Test updating mandate details (invalid input)
         $wallet->setSetting('mandate_disabled', null);
+        $wallet->balance = 1000;
+        $wallet->save();
         $user->refresh();
         $post = [];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertSame('The amount field is required.', $json['errors']['amount'][0]);
         $this->assertSame('The balance field is required.', $json['errors']['balance'][0]);
 
         $post = ['amount' => -100, 'balance' => 0];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertSame("Minimum amount for a single payment is {$min}.", $json['errors']['amount']);
 
         // Test updating a mandate (valid input)
         $client->addResponse($setupIntent);
         $client->addResponse($paymentMethod);
 
-        $post = ['amount' => 30.10, 'balance' => 1];
+        $post = ['amount' => 30.10, 'balance' => 10];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('The auto-payment has been updated.', $json['message']);
         $this->assertEquals(30.10, $wallet->getSetting('mandate_amount'));
-        $this->assertEquals(1, $wallet->getSetting('mandate_balance'));
+        $this->assertEquals(10, $wallet->getSetting('mandate_balance'));
         $this->assertSame('AAA', $json['id']);
         $this->assertFalse($json['isDisabled']);
 
         // Test updating a disabled mandate (invalid input)
         $wallet->setSetting('mandate_disabled', 1);
         $wallet->balance = -2000;
         $wallet->save();
         $user->refresh(); // required so the controller sees the wallet update from above
 
         $post = ['amount' => 15.10, 'balance' => 1];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertSame('The specified amount does not cover the balance on the account.', $json['errors']['amount']);
 
         // Test updating a disabled mandate (valid input)
         $client->addResponse($setupIntent);
         $client->addResponse($paymentMethod);
 
         $post = ['amount' => 30, 'balance' => 1];
         $response = $this->actingAs($user)->put("api/v4/payments/mandate", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame('The auto-payment has been updated.', $json['message']);
         $this->assertSame('AAA', $json['id']);
         $this->assertFalse($json['isDisabled']);
 
         Bus::assertDispatchedTimes(\App\Jobs\WalletCharge::class, 1);
         Bus::assertDispatched(\App\Jobs\WalletCharge::class, function ($job) use ($wallet) {
             $job_wallet = $this->getObjectProperty($job, 'wallet');
             return $job_wallet->id === $wallet->id;
         });
 
 
         $this->unmockStripe();
 
         // TODO: Delete mandate
     }
 
     /**
      * Test creating a payment and receiving a status via webhook
      *
      * @group stripe
      */
     public function testStoreAndWebhook(): void
     {
         Bus::fake();
 
         // Unauth access not allowed
         $response = $this->post("api/v4/payments", []);
         $response->assertStatus(401);
 
         $user = $this->getTestUser('john@kolab.org');
 
         $post = ['amount' => -1];
         $response = $this->actingAs($user)->post("api/v4/payments", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $min = intval(PaymentProvider::MIN_AMOUNT / 100) . ' CHF';
         $this->assertSame("Minimum amount for a single payment is {$min}.", $json['errors']['amount']);
 
-        $post = ['amount' => '12.34'];
+
+        // Invalid currency
+        $post = ['amount' => '12.34', 'currency' => 'FOO', 'methodId' => 'creditcard'];
+        $response = $this->actingAs($user)->post("api/v4/payments", $post);
+        $response->assertStatus(500);
+
+        // Successful payment
+        $post = ['amount' => '12.34', 'currency' => 'CHF', 'methodId' => 'creditcard'];
         $response = $this->actingAs($user)->post("api/v4/payments", $post);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertRegExp('|^cs_test_|', $json['id']);
 
         $wallet = $user->wallets()->first();
         $payments = Payment::where('wallet_id', $wallet->id)->get();
 
         $this->assertCount(1, $payments);
         $payment = $payments[0];
         $this->assertSame(1234, $payment->amount);
         $this->assertSame(\config('app.name') . ' Payment', $payment->description);
         $this->assertSame('open', $payment->status);
         $this->assertEquals(0, $wallet->balance);
 
         // Test the webhook
 
         $post = [
             'id' => "evt_1GlZ814fj3SIEU8wtxMZ4Nsa",
             'object' => "event",
             'api_version' => "2020-03-02",
             'created' => 1590147209,
             'data' => [
                 'object' => [
                     'id' => $payment->id,
                     'object' => "payment_intent",
                     'amount' => 1234,
                     'amount_capturable' => 0,
                     'amount_received' => 1234,
                     'capture_method' => "automatic",
                     'client_secret' => "pi_1GlZ7w4fj3SIEU8w1RlBpN4l_secret_UYRNDTUUU7nkYHpOLZMb3uf48",
                     'confirmation_method' => "automatic",
                     'created' => 1590147204,
                     'currency' => "chf",
                     'customer' => "cus_HKDZ53OsKdlM83",
                     'last_payment_error' => null,
                     'livemode' => false,
                     'metadata' => [],
                     'receipt_email' => "payment-test@kolabnow.com",
                     'status' => "succeeded"
                 ]
             ],
             'type' => "payment_intent.succeeded"
         ];
 
         // Test payment succeeded event
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         $transaction = $wallet->transactions()
             ->where('type', Transaction::WALLET_CREDIT)->get()->last();
 
         $this->assertSame(1234, $transaction->amount);
         $this->assertSame(
             "Payment transaction {$payment->id} using Stripe",
             $transaction->description
         );
 
         // Assert that email notification job wasn't dispatched,
         // it is expected only for recurring payments
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 0);
 
         // Test that balance didn't change if the same event is posted
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         // Test for payment failure ('failed' status)
         $payment->refresh();
         $payment->status = PaymentProvider::STATUS_OPEN;
         $payment->save();
 
         $post['type'] = "payment_intent.payment_failed";
         $post['data']['object']['status'] = 'failed';
 
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_FAILED, $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         // Assert that email notification job wasn't dispatched,
         // it is expected only for recurring payments
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 0);
 
         // Test for payment failure ('canceled' status)
         $payment->refresh();
         $payment->status = PaymentProvider::STATUS_OPEN;
         $payment->save();
 
         $post['type'] = "payment_intent.canceled";
         $post['data']['object']['status'] = 'canceled';
 
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_CANCELED, $payment->fresh()->status);
         $this->assertEquals(1234, $wallet->fresh()->balance);
 
         // Assert that email notification job wasn't dispatched,
         // it is expected only for recurring payments
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 0);
     }
 
     /**
      * Test receiving webhook request for setup intent
      *
      * @group stripe
      */
     public function testCreateMandateAndWebhook(): void
     {
         $user = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
+        Wallet::where('id', $wallet->id)->update(['balance' => -1000]);
 
         // Test creating a mandate (valid input)
         $post = ['amount' => 20.10, 'balance' => 0];
         $response = $this->actingAs($user)->post("api/v4/payments/mandate", $post);
         $response->assertStatus(200);
 
         $payment = $wallet->payments()->first();
 
         $this->assertSame(PaymentProvider::STATUS_OPEN, $payment->status);
         $this->assertSame(PaymentProvider::TYPE_MANDATE, $payment->type);
         $this->assertSame(0, $payment->amount);
 
         $post = [
             'id' => "evt_1GlZ814fj3SIEU8wtxMZ4Nsa",
             'object' => "event",
             'api_version' => "2020-03-02",
             'created' => 1590147209,
             'data' => [
                 'object' => [
                     'id' => $payment->id,
                     'object' => "setup_intent",
                     'client_secret' => "pi_1GlZ7w4fj3SIEU8w1RlBpN4l_secret_UYRNDTUUU7nkYHpOLZMb3uf48",
                     'created' => 1590147204,
                     'customer' => "cus_HKDZ53OsKdlM83",
                     'last_setup_error' => null,
                     'metadata' => [],
                     'status' => "succeeded"
                 ]
             ],
             'type' => "setup_intent.succeeded"
         ];
 
+        Bus::fake();
+
         // Test payment succeeded event
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $payment->refresh();
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->status);
         $this->assertSame($payment->id, $wallet->fresh()->getSetting('stripe_mandate_id'));
 
+        // Expect a WalletCharge job if the balance is negative
+        Bus::assertDispatchedTimes(\App\Jobs\WalletCharge::class, 1);
+        Bus::assertDispatched(\App\Jobs\WalletCharge::class, function ($job) use ($wallet) {
+            $job_wallet = TestCase::getObjectProperty($job, 'wallet');
+            return $job_wallet->id === $wallet->id;
+        });
+
         // TODO: test other setup_intent.* events
     }
 
     /**
      * Test automatic payment charges
      *
      * @group stripe
      */
     public function testTopUpAndWebhook(): void
     {
-        $this->markTestIncomplete();
-
         Bus::fake();
 
         $user = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
 
         // Stripe API does not allow us to create a mandate easily
         // That's why we we'll mock API responses
         // Create a fake mandate
         $wallet->setSettings([
             'mandate_amount' => 20.10,
             'mandate_balance' => 10,
             'stripe_mandate_id' => 'AAA',
         ]);
 
         $setupIntent = json_encode([
                 "id" => "AAA",
                 "object" => "setup_intent",
                 "created" => 123456789,
                 "payment_method" => "pm_YYY",
                 "status" => "succeeded",
                 "usage" => "off_session",
                 "customer" => null
         ]);
 
         $paymentMethod = json_encode([
                 "id" => "pm_YYY",
                 "object" => "payment_method",
                 "card" => [
                     "brand" => "visa",
                     "country" => "US",
                     "last4" => "4242"
                 ],
                 "created" => 123456789,
                 "type" => "card"
         ]);
 
         $paymentIntent = json_encode([
                 "id" => "pi_XX",
                 "object" => "payment_intent",
                 "created" => 123456789,
                 "amount" => 2010,
                 "currency" => "chf",
                 "description" => "Kolab Recurring Payment"
         ]);
 
         $client = $this->mockStripe();
         $client->addResponse($setupIntent);
         $client->addResponse($paymentMethod);
         $client->addResponse($setupIntent);
         $client->addResponse($paymentIntent);
+        $client->addResponse($setupIntent);
+        $client->addResponse($paymentMethod);
 
         // Expect a recurring payment as we have a valid mandate at this point
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertTrue($result);
 
         // Check that the payments table contains a new record with proper amount
         // There should be two records, one for the first payment and another for
         // the recurring payment
         $this->assertCount(1, $wallet->payments()->get());
         $payment = $wallet->payments()->first();
         $this->assertSame(2010, $payment->amount);
         $this->assertSame(\config('app.name') . " Recurring Payment", $payment->description);
         $this->assertSame("pi_XX", $payment->id);
 
         // Expect no payment if the mandate is disabled
         $wallet->setSetting('mandate_disabled', 1);
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
         $this->assertCount(1, $wallet->payments()->get());
 
         // Expect no payment if balance is ok
         $wallet->setSetting('mandate_disabled', null);
         $wallet->balance = 1000;
         $wallet->save();
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
         $this->assertCount(1, $wallet->payments()->get());
 
         // Expect no payment if the top-up amount is not enough
         $wallet->setSetting('mandate_disabled', null);
         $wallet->balance = -2050;
         $wallet->save();
 
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
         $this->assertCount(1, $wallet->payments()->get());
 
         Bus::assertDispatchedTimes(\App\Jobs\PaymentMandateDisabledEmail::class, 1);
         Bus::assertDispatched(\App\Jobs\PaymentMandateDisabledEmail::class, function ($job) use ($wallet) {
             $job_wallet = $this->getObjectProperty($job, 'wallet');
             return $job_wallet->id === $wallet->id;
         });
 
         // Expect no payment if there's no mandate
         $wallet->setSetting('mollie_mandate_id', null);
         $wallet->balance = 0;
         $wallet->save();
         $result = PaymentsController::topUpWallet($wallet);
         $this->assertFalse($result);
         $this->assertCount(1, $wallet->payments()->get());
 
         Bus::assertDispatchedTimes(\App\Jobs\PaymentMandateDisabledEmail::class, 1);
 
         $this->unmockStripe();
 
         // Test webhook
 
         $post = [
             'id' => "evt_1GlZ814fj3SIEU8wtxMZ4Nsa",
             'object' => "event",
             'api_version' => "2020-03-02",
             'created' => 1590147209,
             'data' => [
                 'object' => [
                     'id' => $payment->id,
                     'object' => "payment_intent",
                     'amount' => 2010,
                     'capture_method' => "automatic",
                     'created' => 1590147204,
                     'currency' => "chf",
                     'customer' => "cus_HKDZ53OsKdlM83",
                     'last_payment_error' => null,
                     'metadata' => [],
                     'receipt_email' => "payment-test@kolabnow.com",
                     'status' => "succeeded"
                 ]
             ],
             'type' => "payment_intent.succeeded"
         ];
 
         // Test payment succeeded event
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_PAID, $payment->fresh()->status);
         $this->assertEquals(2010, $wallet->fresh()->balance);
         $transaction = $wallet->transactions()
             ->where('type', Transaction::WALLET_CREDIT)->get()->last();
 
         $this->assertSame(2010, $transaction->amount);
         $this->assertSame(
             "Auto-payment transaction {$payment->id} using Stripe",
             $transaction->description
         );
 
         // Assert that email notification job has been dispatched
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 1);
         Bus::assertDispatched(\App\Jobs\PaymentEmail::class, function ($job) use ($payment) {
             $job_payment = $this->getObjectProperty($job, 'payment');
             return $job_payment->id === $payment->id;
         });
 
         Bus::fake();
 
         // Test for payment failure ('failed' status)
         $payment->refresh();
         $payment->status = PaymentProvider::STATUS_OPEN;
         $payment->save();
 
         $wallet->setSetting('mandate_disabled', null);
 
         $post['type'] = "payment_intent.payment_failed";
         $post['data']['object']['status'] = 'failed';
 
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $wallet->refresh();
 
         $this->assertSame(PaymentProvider::STATUS_FAILED, $payment->fresh()->status);
         $this->assertEquals(2010, $wallet->balance);
         $this->assertTrue(!empty($wallet->getSetting('mandate_disabled')));
 
         // Assert that email notification job has been dispatched
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 1);
         Bus::assertDispatched(\App\Jobs\PaymentEmail::class, function ($job) use ($payment) {
             $job_payment = $this->getObjectProperty($job, 'payment');
             return $job_payment->id === $payment->id;
         });
 
         Bus::fake();
 
         // Test for payment failure ('canceled' status)
         $payment->refresh();
         $payment->status = PaymentProvider::STATUS_OPEN;
         $payment->save();
 
         $post['type'] = "payment_intent.canceled";
         $post['data']['object']['status'] = 'canceled';
 
         $response = $this->webhookRequest($post);
         $response->assertStatus(200);
 
         $this->assertSame(PaymentProvider::STATUS_CANCELED, $payment->fresh()->status);
         $this->assertEquals(2010, $wallet->fresh()->balance);
 
         // Assert that email notification job wasn't dispatched,
         // it is expected only for recurring payments
         Bus::assertDispatchedTimes(\App\Jobs\PaymentEmail::class, 0);
     }
 
     /**
      * Generate Stripe-Signature header for a webhook payload
      */
     protected function webhookRequest($post)
     {
         $secret = \config('services.stripe.webhook_secret');
         $ts = time();
 
         $payload = "$ts." . json_encode($post);
         $sig = sprintf('t=%d,v1=%s', $ts, \hash_hmac('sha256', $payload, $secret));
 
         return $this->withHeaders(['Stripe-Signature' => $sig])
             ->json('POST', "api/webhooks/payment/stripe", $post);
     }
+
+    /**
+     * Test listing payment methods
+     *
+     * @group stripe
+     */
+    public function testListingPaymentMethods(): void
+    {
+        Bus::fake();
+
+        $user = $this->getTestUser('john@kolab.org');
+
+        $response = $this->actingAs($user)->get('api/v4/payments/methods?type=' . PaymentProvider::TYPE_ONEOFF);
+        $response->assertStatus(200);
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('creditcard', $json[0]['id']);
+        $this->assertSame('paypal', $json[1]['id']);
+
+        $response = $this->actingAs($user)->get('api/v4/payments/methods?type=' . PaymentProvider::TYPE_RECURRING);
+        $response->assertStatus(200);
+        $json = $response->json();
+
+        $this->assertCount(1, $json);
+        $this->assertSame('creditcard', $json[0]['id']);
+    }
 }
diff --git a/src/tests/Feature/Controller/SignupTest.php b/src/tests/Feature/Controller/SignupTest.php
index 60225e05..704f2697 100644
--- a/src/tests/Feature/Controller/SignupTest.php
+++ b/src/tests/Feature/Controller/SignupTest.php
@@ -1,689 +1,710 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
 use App\Http\Controllers\API\SignupController;
 use App\Discount;
 use App\Domain;
 use App\SignupCode;
 use App\User;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
 
 class SignupTest extends TestCase
 {
     private $domain;
 
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         // TODO: Some tests depend on existence of individual and group plans,
         //       we should probably create plans here to not depend on that
         $this->domain = $this->getPublicDomain();
 
         $this->deleteTestUser("SignupControllerTest1@$this->domain");
         $this->deleteTestUser("signuplogin@$this->domain");
         $this->deleteTestUser("admin@external.com");
 
         $this->deleteTestDomain('external.com');
         $this->deleteTestDomain('signup-domain.com');
+
+        $this->deleteTestGroup('group-test@kolabnow.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser("SignupControllerTest1@$this->domain");
         $this->deleteTestUser("signuplogin@$this->domain");
         $this->deleteTestUser("admin@external.com");
 
         $this->deleteTestDomain('external.com');
         $this->deleteTestDomain('signup-domain.com');
 
+        $this->deleteTestGroup('group-test@kolabnow.com');
+
         parent::tearDown();
     }
 
     /**
      * Return a public domain for signup tests
      */
     private function getPublicDomain(): string
     {
         if (!$this->domain) {
             $this->refreshApplication();
             $public_domains = Domain::getPublicDomains();
             $this->domain = reset($public_domains);
 
             if (empty($this->domain)) {
                 $this->domain = 'signup-domain.com';
                 Domain::create([
                         'namespace' => $this->domain,
                         'status' => Domain::STATUS_ACTIVE,
                         'type' => Domain::TYPE_PUBLIC,
                 ]);
             }
         }
 
         return $this->domain;
     }
 
     /**
      * Test fetching plans for signup
      *
      * @return void
      */
     public function testSignupPlans()
     {
         $response = $this->get('/api/auth/signup/plans');
         $json = $response->json();
 
         $response->assertStatus(200);
 
         $this->assertSame('success', $json['status']);
         $this->assertCount(2, $json['plans']);
         $this->assertArrayHasKey('title', $json['plans'][0]);
         $this->assertArrayHasKey('name', $json['plans'][0]);
         $this->assertArrayHasKey('description', $json['plans'][0]);
         $this->assertArrayHasKey('button', $json['plans'][0]);
     }
 
     /**
      * Test signup initialization with invalid input
      *
      * @return void
      */
     public function testSignupInitInvalidInput()
     {
         // Empty input data
         $data = [];
 
         $response = $this->post('/api/auth/signup/init', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('email', $json['errors']);
 
         // Data with missing name
         $data = [
             'email' => 'UsersApiControllerTest1@UsersApiControllerTest.com',
             'first_name' => str_repeat('a', 250),
             'last_name' => str_repeat('a', 250),
         ];
 
         $response = $this->post('/api/auth/signup/init', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertArrayHasKey('first_name', $json['errors']);
         $this->assertArrayHasKey('last_name', $json['errors']);
 
         // Data with invalid email (but not phone number)
         $data = [
             'email' => '@example.org',
             'first_name' => 'Signup',
             'last_name' => 'User',
         ];
 
         $response = $this->post('/api/auth/signup/init', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('email', $json['errors']);
 
         // Sanity check on voucher code, last/first name is optional
         $data = [
             'voucher' => '123456789012345678901234567890123',
             'email' => 'valid@email.com',
         ];
 
         $response = $this->post('/api/auth/signup/init', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('voucher', $json['errors']);
 
         // TODO: Test phone validation
     }
 
     /**
      * Test signup initialization with valid input
      *
      * @return array
      */
     public function testSignupInitValidInput()
     {
         Queue::fake();
 
         // Assert that no jobs were pushed...
         Queue::assertNothingPushed();
 
         $data = [
             'email' => 'testuser@external.com',
             'first_name' => 'Signup',
             'last_name' => 'User',
             'plan' => 'individual',
         ];
 
         $response = $this->post('/api/auth/signup/init', $data);
         $json = $response->json();
 
         $response->assertStatus(200);
         $this->assertCount(2, $json);
         $this->assertSame('success', $json['status']);
         $this->assertNotEmpty($json['code']);
 
         // Assert the email sending job was pushed once
         Queue::assertPushed(\App\Jobs\SignupVerificationEmail::class, 1);
 
         // Assert the job has proper data assigned
         Queue::assertPushed(\App\Jobs\SignupVerificationEmail::class, function ($job) use ($data, $json) {
             $code = TestCase::getObjectProperty($job, 'code');
 
             return $code->code === $json['code']
                 && $code->data['plan'] === $data['plan']
                 && $code->data['email'] === $data['email']
                 && $code->data['first_name'] === $data['first_name']
                 && $code->data['last_name'] === $data['last_name'];
         });
 
         // Try the same with voucher
         $data['voucher'] = 'TEST';
 
         $response = $this->post('/api/auth/signup/init', $data);
         $json = $response->json();
 
         $response->assertStatus(200);
         $this->assertCount(2, $json);
         $this->assertSame('success', $json['status']);
         $this->assertNotEmpty($json['code']);
 
         // Assert the job has proper data assigned
         Queue::assertPushed(\App\Jobs\SignupVerificationEmail::class, function ($job) use ($data, $json) {
             $code = TestCase::getObjectProperty($job, 'code');
 
             return $code->code === $json['code']
                 && $code->data['plan'] === $data['plan']
                 && $code->data['email'] === $data['email']
                 && $code->data['voucher'] === $data['voucher']
                 && $code->data['first_name'] === $data['first_name']
                 && $code->data['last_name'] === $data['last_name'];
         });
 
         return [
             'code' => $json['code'],
             'email' => $data['email'],
             'first_name' => $data['first_name'],
             'last_name' => $data['last_name'],
             'plan' => $data['plan'],
             'voucher' => $data['voucher']
         ];
     }
 
     /**
      * Test signup code verification with invalid input
      *
      * @depends testSignupInitValidInput
      * @return void
      */
     public function testSignupVerifyInvalidInput(array $result)
     {
         // Empty data
         $data = [];
 
         $response = $this->post('/api/auth/signup/verify', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertArrayHasKey('code', $json['errors']);
         $this->assertArrayHasKey('short_code', $json['errors']);
 
         // Data with existing code but missing short_code
         $data = [
             'code' => $result['code'],
         ];
 
         $response = $this->post('/api/auth/signup/verify', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('short_code', $json['errors']);
 
         // Data with invalid short_code
         $data = [
             'code' => $result['code'],
             'short_code' => 'XXXX',
         ];
 
         $response = $this->post('/api/auth/signup/verify', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('short_code', $json['errors']);
 
         // TODO: Test expired code
     }
 
     /**
      * Test signup code verification with valid input
      *
      * @depends testSignupInitValidInput
      *
      * @return array
      */
     public function testSignupVerifyValidInput(array $result)
     {
         $code = SignupCode::find($result['code']);
         $data = [
             'code' => $code->code,
             'short_code' => $code->short_code,
         ];
 
         $response = $this->post('/api/auth/signup/verify', $data);
         $json = $response->json();
 
         $response->assertStatus(200);
         $this->assertCount(7, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame($result['email'], $json['email']);
         $this->assertSame($result['first_name'], $json['first_name']);
         $this->assertSame($result['last_name'], $json['last_name']);
         $this->assertSame($result['voucher'], $json['voucher']);
         $this->assertSame(false, $json['is_domain']);
         $this->assertTrue(is_array($json['domains']) && !empty($json['domains']));
 
         return $result;
     }
 
     /**
      * Test last signup step with invalid input
      *
      * @depends testSignupVerifyValidInput
      * @return void
      */
     public function testSignupInvalidInput(array $result)
     {
         // Empty data
         $data = [];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(3, $json['errors']);
         $this->assertArrayHasKey('login', $json['errors']);
         $this->assertArrayHasKey('password', $json['errors']);
         $this->assertArrayHasKey('domain', $json['errors']);
 
         $domain = $this->getPublicDomain();
 
         // Passwords do not match and missing domain
         $data = [
             'login' => 'test',
             'password' => 'test',
             'password_confirmation' => 'test2',
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertArrayHasKey('password', $json['errors']);
         $this->assertArrayHasKey('domain', $json['errors']);
 
         $domain = $this->getPublicDomain();
 
         // Login too short
         $data = [
             'login' => '1',
             'domain' => $domain,
             'password' => 'test',
             'password_confirmation' => 'test',
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('login', $json['errors']);
 
         // Missing codes
         $data = [
             'login' => 'login-valid',
             'domain' => $domain,
             'password' => 'test',
             'password_confirmation' => 'test',
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertArrayHasKey('code', $json['errors']);
         $this->assertArrayHasKey('short_code', $json['errors']);
 
         // Data with invalid short_code
         $data = [
             'login' => 'TestLogin',
             'domain' => $domain,
             'password' => 'test',
             'password_confirmation' => 'test',
             'code' => $result['code'],
             'short_code' => 'XXXX',
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('short_code', $json['errors']);
 
         $code = SignupCode::find($result['code']);
 
         // Data with invalid voucher
         $data = [
             'login' => 'TestLogin',
             'domain' => $domain,
             'password' => 'test',
             'password_confirmation' => 'test',
             'code' => $result['code'],
             'short_code' => $code->short_code,
             'voucher' => 'XXX',
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('voucher', $json['errors']);
 
         // Valid code, invalid login
         $data = [
             'login' => 'żżżżżż',
             'domain' => $domain,
             'password' => 'test',
             'password_confirmation' => 'test',
             'code' => $result['code'],
             'short_code' => $code->short_code,
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(422);
         $this->assertSame('error', $json['status']);
         $this->assertCount(1, $json['errors']);
         $this->assertArrayHasKey('login', $json['errors']);
     }
 
     /**
      * Test last signup step with valid input (user creation)
      *
      * @depends testSignupVerifyValidInput
      * @return void
      */
     public function testSignupValidInput(array $result)
     {
         $queue = Queue::fake();
 
         $domain = $this->getPublicDomain();
         $identity = \strtolower('SignupLogin@') . $domain;
         $code = SignupCode::find($result['code']);
         $data = [
             'login' => 'SignupLogin',
             'domain' => $domain,
             'password' => 'test',
             'password_confirmation' => 'test',
             'code' => $code->code,
             'short_code' => $code->short_code,
             'voucher' => 'TEST',
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $json = $response->json();
 
         $response->assertStatus(200);
         $this->assertSame('success', $json['status']);
         $this->assertSame('bearer', $json['token_type']);
         $this->assertTrue(!empty($json['expires_in']) && is_int($json['expires_in']) && $json['expires_in'] > 0);
         $this->assertNotEmpty($json['access_token']);
         $this->assertSame($identity, $json['email']);
 
         Queue::assertPushed(\App\Jobs\User\CreateJob::class, 1);
 
         Queue::assertPushed(
             \App\Jobs\User\CreateJob::class,
             function ($job) use ($data) {
                 $userEmail = TestCase::getObjectProperty($job, 'userEmail');
                 return $userEmail === \strtolower($data['login'] . '@' . $data['domain']);
             }
         );
 
         // Check if the code has been removed
         $this->assertNull(SignupCode::where('code', $result['code'])->first());
 
         // Check if the user has been created
         $user = User::where('email', $identity)->first();
 
         $this->assertNotEmpty($user);
         $this->assertSame($identity, $user->email);
 
         // Check user settings
         $this->assertSame($result['first_name'], $user->getSetting('first_name'));
         $this->assertSame($result['last_name'], $user->getSetting('last_name'));
         $this->assertSame($result['email'], $user->getSetting('external_email'));
 
         // Discount
         $discount = Discount::where('code', 'TEST')->first();
         $this->assertSame($discount->id, $user->wallets()->first()->discount_id);
 
         // TODO: Check SKUs/Plan
 
         // TODO: Check if the access token works
     }
 
     /**
      * Test signup for a group (custom domain) account
      *
      * @return void
      */
     public function testSignupGroupAccount()
     {
         Queue::fake();
 
         // Initial signup request
         $user_data = $data = [
             'email' => 'testuser@external.com',
             'first_name' => 'Signup',
             'last_name' => 'User',
             'plan' => 'group',
         ];
 
         $response = $this->withoutMiddleware()->post('/api/auth/signup/init', $data);
         $json = $response->json();
 
         $response->assertStatus(200);
         $this->assertCount(2, $json);
         $this->assertSame('success', $json['status']);
         $this->assertNotEmpty($json['code']);
 
         // Assert the email sending job was pushed once
         Queue::assertPushed(\App\Jobs\SignupVerificationEmail::class, 1);
 
         // Assert the job has proper data assigned
         Queue::assertPushed(\App\Jobs\SignupVerificationEmail::class, function ($job) use ($data, $json) {
             $code = TestCase::getObjectProperty($job, 'code');
 
             return $code->code === $json['code']
                 && $code->data['plan'] === $data['plan']
                 && $code->data['email'] === $data['email']
                 && $code->data['first_name'] === $data['first_name']
                 && $code->data['last_name'] === $data['last_name'];
         });
 
         // Verify the code
         $code = SignupCode::find($json['code']);
         $data = [
             'code' => $code->code,
             'short_code' => $code->short_code,
         ];
 
         $response = $this->post('/api/auth/signup/verify', $data);
         $result = $response->json();
 
         $response->assertStatus(200);
         $this->assertCount(7, $result);
         $this->assertSame('success', $result['status']);
         $this->assertSame($user_data['email'], $result['email']);
         $this->assertSame($user_data['first_name'], $result['first_name']);
         $this->assertSame($user_data['last_name'], $result['last_name']);
         $this->assertSame(null, $result['voucher']);
         $this->assertSame(true, $result['is_domain']);
         $this->assertSame([], $result['domains']);
 
         // Final signup request
         $login = 'admin';
         $domain = 'external.com';
         $data = [
             'login' => $login,
             'domain' => $domain,
             'password' => 'test',
             'password_confirmation' => 'test',
             'code' => $code->code,
             'short_code' => $code->short_code,
         ];
 
         $response = $this->post('/api/auth/signup', $data);
         $result = $response->json();
 
         $response->assertStatus(200);
         $this->assertSame('success', $result['status']);
         $this->assertSame('bearer', $result['token_type']);
         $this->assertTrue(!empty($result['expires_in']) && is_int($result['expires_in']) && $result['expires_in'] > 0);
         $this->assertNotEmpty($result['access_token']);
         $this->assertSame("$login@$domain", $result['email']);
 
         Queue::assertPushed(\App\Jobs\Domain\CreateJob::class, 1);
 
         Queue::assertPushed(
             \App\Jobs\Domain\CreateJob::class,
             function ($job) use ($domain) {
                 $domainNamespace = TestCase::getObjectProperty($job, 'domainNamespace');
 
                 return $domainNamespace === $domain;
             }
         );
 
         Queue::assertPushed(\App\Jobs\User\CreateJob::class, 1);
 
         Queue::assertPushed(
             \App\Jobs\User\CreateJob::class,
             function ($job) use ($data) {
                 $userEmail = TestCase::getObjectProperty($job, 'userEmail');
 
                 return $userEmail === $data['login'] . '@' . $data['domain'];
             }
         );
 
         // Check if the code has been removed
         $this->assertNull(SignupCode::find($code->id));
 
         // Check if the user has been created
         $user = User::where('email', $login . '@' . $domain)->first();
 
         $this->assertNotEmpty($user);
 
         // Check user settings
         $this->assertSame($user_data['email'], $user->getSetting('external_email'));
         $this->assertSame($user_data['first_name'], $user->getSetting('first_name'));
         $this->assertSame($user_data['last_name'], $user->getSetting('last_name'));
 
         // TODO: Check domain record
 
         // TODO: Check SKUs/Plan
 
         // TODO: Check if the access token works
     }
 
     /**
      * List of login/domain validation cases for testValidateLogin()
      *
      * @return array Arguments for testValidateLogin()
      */
     public function dataValidateLogin(): array
     {
         $domain = $this->getPublicDomain();
 
         return [
             // Individual account
             ['', $domain, false, ['login' => 'The login field is required.']],
             ['test123456', 'localhost', false, ['domain' => 'The specified domain is invalid.']],
             ['test123456', 'unknown-domain.org', false, ['domain' => 'The specified domain is invalid.']],
             ['test.test', $domain, false, null],
             ['test_test', $domain, false, null],
             ['test-test', $domain, false, null],
             ['admin', $domain, false, ['login' => 'The specified login is not available.']],
             ['administrator', $domain, false, ['login' => 'The specified login is not available.']],
             ['sales', $domain, false, ['login' => 'The specified login is not available.']],
             ['root', $domain, false, ['login' => 'The specified login is not available.']],
 
             // TODO existing (public domain) user
             // ['signuplogin', $domain, false, ['login' => 'The specified login is not available.']],
 
             // Domain account
             ['admin', 'kolabsys.com', true, null],
             ['testnonsystemdomain', 'invalid', true, ['domain' => 'The specified domain is invalid.']],
             ['testnonsystemdomain', '.com', true, ['domain' => 'The specified domain is invalid.']],
 
             // existing custom domain
             ['jack', 'kolab.org', true, ['domain' => 'The specified domain is not available.']],
         ];
     }
 
     /**
      * Signup login/domain validation.
      *
      * Note: Technically these include unit tests, but let's keep it here for now.
      * FIXME: Shall we do a http request for each case?
      *
      * @dataProvider dataValidateLogin
      */
     public function testValidateLogin($login, $domain, $external, $expected_result): void
     {
         $result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain, $external]);
 
         $this->assertSame($expected_result, $result);
     }
+
+    /**
+     * Signup login/domain validation, more cases
+     *
+     * Note: Technically these include unit tests, but let's keep it here for now.
+     */
+    public function testValidateLoginMore(): void
+    {
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+        $login = 'group-test';
+        $domain = 'kolabnow.com';
+        $external = false;
+
+        $result = $this->invokeMethod(new SignupController(), 'validateLogin', [$login, $domain, $external]);
+
+        $this->assertSame(['login' => 'The specified login is not available.'], $result);
+    }
 }
diff --git a/src/tests/Feature/Controller/SkusTest.php b/src/tests/Feature/Controller/SkusTest.php
index b1245308..38e3434d 100644
--- a/src/tests/Feature/Controller/SkusTest.php
+++ b/src/tests/Feature/Controller/SkusTest.php
@@ -1,70 +1,220 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
+use App\Entitlement;
 use App\Http\Controllers\API\V4\SkusController;
 use App\Sku;
 use Tests\TestCase;
 
 class SkusTest extends TestCase
 {
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->clearBetaEntitlements();
+        $this->clearMeetEntitlements();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function tearDown(): void
+    {
+        $this->clearBetaEntitlements();
+        $this->clearMeetEntitlements();
+
+        parent::tearDown();
+    }
+
+
     /**
      * Test fetching SKUs list
      */
     public function testIndex(): void
     {
         // Unauth access not allowed
         $response = $this->get("api/v4/skus");
         $response->assertStatus(401);
 
         $user = $this->getTestUser('john@kolab.org');
         $sku = Sku::where('title', 'mailbox')->first();
 
         $response = $this->actingAs($user)->get("api/v4/skus");
         $response->assertStatus(200);
 
         $json = $response->json();
 
-        $this->assertCount(9, $json);
+        $this->assertCount(8, $json);
 
         $this->assertSame(100, $json[0]['prio']);
         $this->assertSame($sku->id, $json[0]['id']);
         $this->assertSame($sku->title, $json[0]['title']);
         $this->assertSame($sku->name, $json[0]['name']);
         $this->assertSame($sku->description, $json[0]['description']);
         $this->assertSame($sku->cost, $json[0]['cost']);
         $this->assertSame($sku->units_free, $json[0]['units_free']);
         $this->assertSame($sku->period, $json[0]['period']);
         $this->assertSame($sku->active, $json[0]['active']);
         $this->assertSame('user', $json[0]['type']);
         $this->assertSame('mailbox', $json[0]['handler']);
     }
 
     /**
-     * Test for SkusController::skuElement()
+     * Test fetching SKUs list for a user (GET /users/<id>/skus)
      */
-    public function testSkuElement(): void
+    public function testUserSkus(): void
     {
-        $sku = Sku::where('title', 'storage')->first();
-        $result = $this->invokeMethod(new SkusController(), 'skuElement', [$sku]);
+        $user = $this->getTestUser('john@kolab.org');
+
+        // Unauth access not allowed
+        $response = $this->get("api/v4/users/{$user->id}/skus");
+        $response->assertStatus(401);
+
+        $response = $this->actingAs($user)->get("api/v4/users/{$user->id}/skus");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertCount(8, $json);
+
+        $this->assertSkuElement('mailbox', $json[0], [
+                'prio' => 100,
+                'type' => 'user',
+                'handler' => 'mailbox',
+                'enabled' => true,
+                'readonly' => true,
+        ]);
+
+        $this->assertSkuElement('storage', $json[1], [
+                'prio' => 90,
+                'type' => 'user',
+                'handler' => 'storage',
+                'enabled' => true,
+                'readonly' => true,
+                'range' => [
+                    'min' => 2,
+                    'max' => 100,
+                    'unit' => 'GB',
+                ]
+        ]);
+
+        $this->assertSkuElement('groupware', $json[2], [
+                'prio' => 80,
+                'type' => 'user',
+                'handler' => 'groupware',
+                'enabled' => false,
+                'readonly' => false,
+        ]);
+
+        $this->assertSkuElement('activesync', $json[3], [
+                'prio' => 70,
+                'type' => 'user',
+                'handler' => 'activesync',
+                'enabled' => false,
+                'readonly' => false,
+                'required' => ['groupware'],
+        ]);
+
+        $this->assertSkuElement('2fa', $json[4], [
+                'prio' => 60,
+                'type' => 'user',
+                'handler' => 'auth2f',
+                'enabled' => false,
+                'readonly' => false,
+                'forbidden' => ['activesync'],
+        ]);
+
+        $this->assertSkuElement('meet', $json[5], [
+                'prio' => 50,
+                'type' => 'user',
+                'handler' => 'meet',
+                'enabled' => false,
+                'readonly' => false,
+                'required' => ['groupware'],
+        ]);
+
+        $this->assertSkuElement('domain-hosting', $json[6], [
+                'prio' => 0,
+                'type' => 'domain',
+                'handler' => 'domainhosting',
+                'enabled' => false,
+                'readonly' => false,
+        ]);
+
+        $this->assertSkuElement('group', $json[7], [
+                'prio' => 0,
+                'type' => 'group',
+                'handler' => 'group',
+                'enabled' => false,
+                'readonly' => false,
+        ]);
+
+        // Test filter by type
+        $response = $this->actingAs($user)->get("api/v4/users/{$user->id}/skus?type=domain");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertCount(1, $json);
+        $this->assertSame('domain', $json[0]['type']);
+
+        // Test inclusion of beta SKUs
+        $sku = Sku::where('title', 'beta')->first();
+        $user->assignSku($sku);
+        $response = $this->actingAs($user)->get("api/v4/users/{$user->id}/skus?type=user");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertCount(7, $json);
+
+        $this->assertSkuElement('meet', $json[5], [
+                'prio' => 50,
+                'type' => 'user',
+                'handler' => 'meet',
+                'enabled' => false,
+                'readonly' => false,
+                'required' => ['groupware'],
+        ]);
+
+        $this->assertSkuElement('beta', $json[6], [
+                'prio' => 10,
+                'type' => 'user',
+                'handler' => 'beta',
+                'enabled' => false,
+                'readonly' => false,
+        ]);
+    }
+
+    /**
+     * Assert content of the SKU element in an API response
+     *
+     * @param string $sku_title The SKU title
+     * @param array  $result    The result to assert
+     * @param array  $other     Other items the SKU itself does not include
+     */
+    protected function assertSkuElement($sku_title, $result, $other = []): void
+    {
+        $sku = Sku::where('title', $sku_title)->first();
 
         $this->assertSame($sku->id, $result['id']);
         $this->assertSame($sku->title, $result['title']);
         $this->assertSame($sku->name, $result['name']);
         $this->assertSame($sku->description, $result['description']);
         $this->assertSame($sku->cost, $result['cost']);
         $this->assertSame($sku->units_free, $result['units_free']);
         $this->assertSame($sku->period, $result['period']);
         $this->assertSame($sku->active, $result['active']);
-        $this->assertSame('user', $result['type']);
-        $this->assertSame('storage', $result['handler']);
-        $this->assertSame($sku->units_free, $result['range']['min']);
-        $this->assertSame($sku->handler_class::MAX_ITEMS, $result['range']['max']);
-        $this->assertSame($sku->handler_class::ITEM_UNIT, $result['range']['unit']);
-        $this->assertTrue($result['readonly']);
-        $this->assertTrue($result['enabled']);
-
-        // Test all SKU types
-        $this->markTestIncomplete();
+
+        foreach ($other as $key => $value) {
+            $this->assertSame($value, $result[$key]);
+        }
+
+        $this->assertCount(8 + count($other), $result);
     }
 }
diff --git a/src/tests/Feature/Controller/SupportTest.php b/src/tests/Feature/Controller/SupportTest.php
new file mode 100644
index 00000000..c0924257
--- /dev/null
+++ b/src/tests/Feature/Controller/SupportTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Feature\Controller;
+
+use App\Http\Controllers\API\SupportController;
+use Tests\TestCase;
+
+class SupportTest extends TestCase
+{
+    /**
+     * Test submitting a support request (POST /support/request)
+     */
+    public function testRequest(): void
+    {
+        $support_email = \config('app.support_email');
+        if (empty($support_email)) {
+            $support_email = 'support@email.tld';
+            \config(['app.support_email' => $support_email]);
+        }
+
+        // Empty request
+        $response = $this->post("api/v4/support/request", []);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('error', $json['status']);
+        $this->assertCount(3, $json['errors']);
+        $this->assertSame(['The email field is required.'], $json['errors']['email']);
+        $this->assertSame(['The summary field is required.'], $json['errors']['summary']);
+        $this->assertSame(['The body field is required.'], $json['errors']['body']);
+
+        // Invalid email
+        $post = [
+            'email' => '@test.com',
+            'summary' => 'Test summary',
+            'body' => 'Test body',
+        ];
+        $response = $this->post("api/v4/support/request", $post);
+        $response->assertStatus(422);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('error', $json['status']);
+        $this->assertCount(1, $json['errors']);
+        $this->assertSame(['The email must be a valid email address.'], $json['errors']['email']);
+
+        $this->assertCount(0, $this->app->make('swift.transport')->driver()->messages());
+
+        // Valid input
+        $post = [
+            'email' => 'test@test.com',
+            'summary' => 'Test summary',
+            'body' => 'Test body',
+            'user' => '1234567',
+            'name' => 'Username',
+        ];
+        $response = $this->post("api/v4/support/request", $post);
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertCount(2, $json);
+        $this->assertSame('success', $json['status']);
+        $this->assertSame('Support request submitted successfully.', $json['message']);
+
+        $emails = $this->app->make('swift.transport')->driver()->messages();
+
+        $expected_body = "ID: 1234567\nName: Username\nWorking email address: test@test.com\n"
+            . "Subject: Test summary\n\nTest body";
+
+        $this->assertCount(1, $emails);
+        $this->assertSame('Test summary', $emails[0]->getSubject());
+        $this->assertSame(['test@test.com' => 'Username'], $emails[0]->getFrom());
+        $this->assertSame(['test@test.com' => 'Username'], $emails[0]->getReplyTo());
+        $this->assertNull($emails[0]->getCc());
+        $this->assertSame([$support_email => null], $emails[0]->getTo());
+        $this->assertSame($expected_body, trim($emails[0]->getBody()));
+    }
+}
diff --git a/src/tests/Feature/Controller/UsersTest.php b/src/tests/Feature/Controller/UsersTest.php
index 4033397d..485eb472 100644
--- a/src/tests/Feature/Controller/UsersTest.php
+++ b/src/tests/Feature/Controller/UsersTest.php
@@ -1,1068 +1,1266 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
 use App\Discount;
 use App\Domain;
 use App\Http\Controllers\API\V4\UsersController;
 use App\Package;
 use App\Sku;
 use App\User;
 use App\Wallet;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class UsersTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('jane@kolabnow.com');
         $this->deleteTestUser('UsersControllerTest1@userscontroller.com');
         $this->deleteTestUser('UsersControllerTest2@userscontroller.com');
         $this->deleteTestUser('UsersControllerTest3@userscontroller.com');
         $this->deleteTestUser('UserEntitlement2A@UserEntitlement.com');
         $this->deleteTestUser('john2.doe2@kolab.org');
         $this->deleteTestUser('deleted@kolab.org');
         $this->deleteTestUser('deleted@kolabnow.com');
         $this->deleteTestDomain('userscontroller.com');
+        $this->deleteTestGroup('group-test@kolabnow.com');
+        $this->deleteTestGroup('group-test@kolab.org');
 
         $user = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
         $wallet->discount()->dissociate();
         $wallet->settings()->whereIn('key', ['mollie_id', 'stripe_id'])->delete();
         $wallet->save();
         $user->status |= User::STATUS_IMAP_READY;
         $user->save();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('jane@kolabnow.com');
         $this->deleteTestUser('UsersControllerTest1@userscontroller.com');
         $this->deleteTestUser('UsersControllerTest2@userscontroller.com');
         $this->deleteTestUser('UsersControllerTest3@userscontroller.com');
         $this->deleteTestUser('UserEntitlement2A@UserEntitlement.com');
         $this->deleteTestUser('john2.doe2@kolab.org');
         $this->deleteTestUser('deleted@kolab.org');
         $this->deleteTestUser('deleted@kolabnow.com');
         $this->deleteTestDomain('userscontroller.com');
+        $this->deleteTestGroup('group-test@kolabnow.com');
+        $this->deleteTestGroup('group-test@kolab.org');
 
         $user = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
         $wallet->discount()->dissociate();
         $wallet->settings()->whereIn('key', ['mollie_id', 'stripe_id'])->delete();
         $wallet->save();
         $user->status |= User::STATUS_IMAP_READY;
         $user->save();
 
         parent::tearDown();
     }
 
     /**
      * Test user deleting (DELETE /api/v4/users/<id>)
      */
     public function testDestroy(): void
     {
         // First create some users/accounts to delete
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $package_domain = \App\Package::where('title', 'domain-hosting')->first();
 
         $john = $this->getTestUser('john@kolab.org');
         $user1 = $this->getTestUser('UsersControllerTest1@userscontroller.com');
         $user2 = $this->getTestUser('UsersControllerTest2@userscontroller.com');
         $user3 = $this->getTestUser('UsersControllerTest3@userscontroller.com');
         $domain = $this->getTestDomain('userscontroller.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_PUBLIC,
         ]);
         $user1->assignPackage($package_kolab);
         $domain->assignPackage($package_domain, $user1);
         $user1->assignPackage($package_kolab, $user2);
         $user1->assignPackage($package_kolab, $user3);
 
         // Test unauth access
         $response = $this->delete("api/v4/users/{$user2->id}");
         $response->assertStatus(401);
 
         // Test access to other user/account
         $response = $this->actingAs($john)->delete("api/v4/users/{$user2->id}");
         $response->assertStatus(403);
         $response = $this->actingAs($john)->delete("api/v4/users/{$user1->id}");
         $response->assertStatus(403);
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertSame("Access denied", $json['message']);
         $this->assertCount(2, $json);
 
         // Test that non-controller cannot remove himself
         $response = $this->actingAs($user3)->delete("api/v4/users/{$user3->id}");
         $response->assertStatus(403);
 
         // Test removing a non-controller user
         $response = $this->actingAs($user1)->delete("api/v4/users/{$user3->id}");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals('success', $json['status']);
         $this->assertEquals('User deleted successfully.', $json['message']);
 
         // Test removing self (an account with users)
         $response = $this->actingAs($user1)->delete("api/v4/users/{$user1->id}");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertEquals('success', $json['status']);
         $this->assertEquals('User deleted successfully.', $json['message']);
     }
 
     /**
      * Test user deleting (DELETE /api/v4/users/<id>)
      */
     public function testDestroyByController(): void
     {
         // Create an account with additional controller - $user2
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $package_domain = \App\Package::where('title', 'domain-hosting')->first();
         $user1 = $this->getTestUser('UsersControllerTest1@userscontroller.com');
         $user2 = $this->getTestUser('UsersControllerTest2@userscontroller.com');
         $user3 = $this->getTestUser('UsersControllerTest3@userscontroller.com');
         $domain = $this->getTestDomain('userscontroller.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_PUBLIC,
         ]);
         $user1->assignPackage($package_kolab);
         $domain->assignPackage($package_domain, $user1);
         $user1->assignPackage($package_kolab, $user2);
         $user1->assignPackage($package_kolab, $user3);
         $user1->wallets()->first()->addController($user2);
 
         // TODO/FIXME:
         //   For now controller can delete himself, as well as
         //   the whole account he has control to, including the owner
         //   Probably he should not be able to do none of those
         //   However, this is not 0-regression scenario as we
         //   do not fully support additional controllers.
 
         //$response = $this->actingAs($user2)->delete("api/v4/users/{$user2->id}");
         //$response->assertStatus(403);
 
         $response = $this->actingAs($user2)->delete("api/v4/users/{$user3->id}");
         $response->assertStatus(200);
 
         $response = $this->actingAs($user2)->delete("api/v4/users/{$user1->id}");
         $response->assertStatus(200);
 
         // Note: More detailed assertions in testDestroy() above
 
         $this->assertTrue($user1->fresh()->trashed());
         $this->assertTrue($user2->fresh()->trashed());
         $this->assertTrue($user3->fresh()->trashed());
     }
 
     /**
      * Test user listing (GET /api/v4/users)
      */
     public function testIndex(): void
     {
         // Test unauth access
         $response = $this->get("api/v4/users");
         $response->assertStatus(401);
 
         $jack = $this->getTestUser('jack@kolab.org');
         $joe = $this->getTestUser('joe@kolab.org');
         $john = $this->getTestUser('john@kolab.org');
         $ned = $this->getTestUser('ned@kolab.org');
 
         $response = $this->actingAs($jack)->get("/api/v4/users");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(0, $json);
 
         $response = $this->actingAs($john)->get("/api/v4/users");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(4, $json);
         $this->assertSame($jack->email, $json[0]['email']);
         $this->assertSame($joe->email, $json[1]['email']);
         $this->assertSame($john->email, $json[2]['email']);
         $this->assertSame($ned->email, $json[3]['email']);
         // Values below are tested by Unit tests
         $this->assertArrayHasKey('isDeleted', $json[0]);
         $this->assertArrayHasKey('isSuspended', $json[0]);
         $this->assertArrayHasKey('isActive', $json[0]);
         $this->assertArrayHasKey('isLdapReady', $json[0]);
         $this->assertArrayHasKey('isImapReady', $json[0]);
 
         $response = $this->actingAs($ned)->get("/api/v4/users");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(4, $json);
         $this->assertSame($jack->email, $json[0]['email']);
         $this->assertSame($joe->email, $json[1]['email']);
         $this->assertSame($john->email, $json[2]['email']);
         $this->assertSame($ned->email, $json[3]['email']);
     }
 
     /**
      * Test fetching user data/profile (GET /api/v4/users/<user-id>)
      */
     public function testShow(): void
     {
         $userA = $this->getTestUser('UserEntitlement2A@UserEntitlement.com');
 
         // Test getting profile of self
         $response = $this->actingAs($userA)->get("/api/v4/users/{$userA->id}");
 
         $json = $response->json();
 
         $response->assertStatus(200);
         $this->assertEquals($userA->id, $json['id']);
         $this->assertEquals($userA->email, $json['email']);
         $this->assertTrue(is_array($json['statusInfo']));
         $this->assertTrue(is_array($json['settings']));
         $this->assertTrue(is_array($json['aliases']));
         $this->assertSame([], $json['skus']);
         // Values below are tested by Unit tests
         $this->assertArrayHasKey('isDeleted', $json);
         $this->assertArrayHasKey('isSuspended', $json);
         $this->assertArrayHasKey('isActive', $json);
         $this->assertArrayHasKey('isLdapReady', $json);
         $this->assertArrayHasKey('isImapReady', $json);
 
         $john = $this->getTestUser('john@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
         $ned = $this->getTestUser('ned@kolab.org');
 
         // Test unauthorized access to a profile of other user
         $response = $this->actingAs($jack)->get("/api/v4/users/{$userA->id}");
         $response->assertStatus(403);
 
         // Test authorized access to a profile of other user
         // Ned: Additional account controller
         $response = $this->actingAs($ned)->get("/api/v4/users/{$john->id}");
         $response->assertStatus(200);
         $response = $this->actingAs($ned)->get("/api/v4/users/{$jack->id}");
         $response->assertStatus(200);
 
         // John: Account owner
         $response = $this->actingAs($john)->get("/api/v4/users/{$jack->id}");
         $response->assertStatus(200);
         $response = $this->actingAs($john)->get("/api/v4/users/{$ned->id}");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $storage_sku = Sku::where('title', 'storage')->first();
         $groupware_sku = Sku::where('title', 'groupware')->first();
         $mailbox_sku = Sku::where('title', 'mailbox')->first();
         $secondfactor_sku = Sku::where('title', '2fa')->first();
 
         $this->assertCount(5, $json['skus']);
 
         $this->assertSame(2, $json['skus'][$storage_sku->id]['count']);
         $this->assertSame(1, $json['skus'][$groupware_sku->id]['count']);
         $this->assertSame(1, $json['skus'][$mailbox_sku->id]['count']);
         $this->assertSame(1, $json['skus'][$secondfactor_sku->id]['count']);
     }
 
     /**
      * Test fetching user status (GET /api/v4/users/<user-id>/status)
      * and forcing setup process update (?refresh=1)
      *
      * @group imap
      * @group dns
      */
     public function testStatus(): void
     {
+        Queue::fake();
+
         $john = $this->getTestUser('john@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
 
         // Test unauthorized access
         $response = $this->actingAs($jack)->get("/api/v4/users/{$john->id}/status");
         $response->assertStatus(403);
 
         if ($john->isImapReady()) {
             $john->status ^= User::STATUS_IMAP_READY;
             $john->save();
         }
 
         // Get user status
         $response = $this->actingAs($john)->get("/api/v4/users/{$john->id}/status");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertFalse($json['isImapReady']);
         $this->assertFalse($json['isReady']);
         $this->assertCount(7, $json['process']);
         $this->assertSame('user-imap-ready', $json['process'][2]['label']);
         $this->assertSame(false, $json['process'][2]['state']);
         $this->assertTrue(empty($json['status']));
         $this->assertTrue(empty($json['message']));
 
         // Make sure the domain is confirmed (other test might unset that status)
         $domain = $this->getTestDomain('kolab.org');
         $domain->status |= Domain::STATUS_CONFIRMED;
         $domain->save();
 
         // Now "reboot" the process and verify the user in imap synchronously
         $response = $this->actingAs($john)->get("/api/v4/users/{$john->id}/status?refresh=1");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertTrue($json['isImapReady']);
         $this->assertTrue($json['isReady']);
         $this->assertCount(7, $json['process']);
         $this->assertSame('user-imap-ready', $json['process'][2]['label']);
         $this->assertSame(true, $json['process'][2]['state']);
         $this->assertSame('success', $json['status']);
         $this->assertSame('Setup process finished successfully.', $json['message']);
+
+        Queue::size(1);
+
+        // Test case for when the verify job is dispatched to the worker
+        $john->refresh();
+        $john->status ^= User::STATUS_IMAP_READY;
+        $john->save();
+
+        \config(['imap.admin_password' => null]);
+
+        $response = $this->actingAs($john)->get("/api/v4/users/{$john->id}/status?refresh=1");
+        $response->assertStatus(200);
+
+        $json = $response->json();
+
+        $this->assertFalse($json['isImapReady']);
+        $this->assertFalse($json['isReady']);
+        $this->assertSame('success', $json['status']);
+        $this->assertSame('waiting', $json['processState']);
+        $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
+
+        Queue::assertPushed(\App\Jobs\User\VerifyJob::class, 1);
     }
 
     /**
      * Test UsersController::statusInfo()
      */
     public function testStatusInfo(): void
     {
         $user = $this->getTestUser('UsersControllerTest1@userscontroller.com');
         $domain = $this->getTestDomain('userscontroller.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_PUBLIC,
         ]);
 
         $user->created_at = Carbon::now();
         $user->status = User::STATUS_NEW;
         $user->save();
 
         $result = UsersController::statusInfo($user);
 
         $this->assertFalse($result['isReady']);
+        $this->assertSame([], $result['skus']);
         $this->assertCount(3, $result['process']);
         $this->assertSame('user-new', $result['process'][0]['label']);
         $this->assertSame(true, $result['process'][0]['state']);
         $this->assertSame('user-ldap-ready', $result['process'][1]['label']);
         $this->assertSame(false, $result['process'][1]['state']);
         $this->assertSame('user-imap-ready', $result['process'][2]['label']);
         $this->assertSame(false, $result['process'][2]['state']);
         $this->assertSame('running', $result['processState']);
 
         $user->created_at = Carbon::now()->subSeconds(181);
         $user->save();
 
         $result = UsersController::statusInfo($user);
 
         $this->assertSame('failed', $result['processState']);
 
         $user->status |= User::STATUS_LDAP_READY | User::STATUS_IMAP_READY;
         $user->save();
 
         $result = UsersController::statusInfo($user);
 
         $this->assertTrue($result['isReady']);
         $this->assertCount(3, $result['process']);
         $this->assertSame('user-new', $result['process'][0]['label']);
         $this->assertSame(true, $result['process'][0]['state']);
         $this->assertSame('user-ldap-ready', $result['process'][1]['label']);
         $this->assertSame(true, $result['process'][1]['state']);
         $this->assertSame('user-imap-ready', $result['process'][2]['label']);
         $this->assertSame(true, $result['process'][2]['state']);
         $this->assertSame('done', $result['processState']);
 
         $domain->status |= Domain::STATUS_VERIFIED;
         $domain->type = Domain::TYPE_EXTERNAL;
         $domain->save();
 
         $result = UsersController::statusInfo($user);
 
         $this->assertFalse($result['isReady']);
+        $this->assertSame([], $result['skus']);
         $this->assertCount(7, $result['process']);
         $this->assertSame('user-new', $result['process'][0]['label']);
         $this->assertSame(true, $result['process'][0]['state']);
         $this->assertSame('user-ldap-ready', $result['process'][1]['label']);
         $this->assertSame(true, $result['process'][1]['state']);
         $this->assertSame('user-imap-ready', $result['process'][2]['label']);
         $this->assertSame(true, $result['process'][2]['state']);
         $this->assertSame('domain-new', $result['process'][3]['label']);
         $this->assertSame(true, $result['process'][3]['state']);
         $this->assertSame('domain-ldap-ready', $result['process'][4]['label']);
         $this->assertSame(false, $result['process'][4]['state']);
         $this->assertSame('domain-verified', $result['process'][5]['label']);
         $this->assertSame(true, $result['process'][5]['state']);
         $this->assertSame('domain-confirmed', $result['process'][6]['label']);
         $this->assertSame(false, $result['process'][6]['state']);
+
+        // Test 'skus' property
+        $user->assignSku(Sku::where('title', 'beta')->first());
+
+        $result = UsersController::statusInfo($user);
+
+        $this->assertSame(['beta'], $result['skus']);
+
+        $user->assignSku(Sku::where('title', 'meet')->first());
+
+        $result = UsersController::statusInfo($user);
+
+        $this->assertSame(['beta', 'meet'], $result['skus']);
+
+        $user->assignSku(Sku::where('title', 'meet')->first());
+
+        $result = UsersController::statusInfo($user);
+
+        $this->assertSame(['beta', 'meet'], $result['skus']);
     }
+
     /**
      * Test user creation (POST /api/v4/users)
      */
     public function testStore(): void
     {
+        Queue::fake();
+
         $jack = $this->getTestUser('jack@kolab.org');
         $john = $this->getTestUser('john@kolab.org');
         $deleted_priv = $this->getTestUser('deleted@kolab.org');
         $deleted_priv->delete();
 
         // Test empty request
         $response = $this->actingAs($john)->post("/api/v4/users", []);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertSame("The email field is required.", $json['errors']['email']);
         $this->assertSame("The password field is required.", $json['errors']['password'][0]);
         $this->assertCount(2, $json);
 
         // Test access by user not being a wallet controller
         $post = ['first_name' => 'Test'];
         $response = $this->actingAs($jack)->post("/api/v4/users", $post);
         $json = $response->json();
 
         $response->assertStatus(403);
 
         $this->assertSame('error', $json['status']);
         $this->assertSame("Access denied", $json['message']);
         $this->assertCount(2, $json);
 
         // Test some invalid data
         $post = ['password' => '12345678', 'email' => 'invalid'];
         $response = $this->actingAs($john)->post("/api/v4/users", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json);
         $this->assertSame('The password confirmation does not match.', $json['errors']['password'][0]);
         $this->assertSame('The specified email is invalid.', $json['errors']['email']);
 
         // Test existing user email
         $post = [
             'password' => 'simple',
             'password_confirmation' => 'simple',
             'first_name' => 'John2',
             'last_name' => 'Doe2',
             'email' => 'jack.daniels@kolab.org',
         ];
 
         $response = $this->actingAs($john)->post("/api/v4/users", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json);
         $this->assertSame('The specified email is not available.', $json['errors']['email']);
 
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $package_domain = \App\Package::where('title', 'domain-hosting')->first();
 
         $post = [
             'password' => 'simple',
             'password_confirmation' => 'simple',
             'first_name' => 'John2',
             'last_name' => 'Doe2',
             'email' => 'john2.doe2@kolab.org',
             'organization' => 'TestOrg',
             'aliases' => ['useralias1@kolab.org', 'deleted@kolab.org'],
         ];
 
         // Missing package
         $response = $this->actingAs($john)->post("/api/v4/users", $post);
         $json = $response->json();
 
         $response->assertStatus(422);
 
         $this->assertSame('error', $json['status']);
         $this->assertSame("Package is required.", $json['errors']['package']);
         $this->assertCount(2, $json);
 
         // Invalid package
         $post['package'] = $package_domain->id;
         $response = $this->actingAs($john)->post("/api/v4/users", $post);
         $json = $response->json();
 
         $response->assertStatus(422);
 
         $this->assertSame('error', $json['status']);
         $this->assertSame("Invalid package selected.", $json['errors']['package']);
         $this->assertCount(2, $json);
 
         // Test full and valid data
         $post['package'] = $package_kolab->id;
         $response = $this->actingAs($john)->post("/api/v4/users", $post);
         $json = $response->json();
 
         $response->assertStatus(200);
 
         $this->assertSame('success', $json['status']);
         $this->assertSame("User created successfully.", $json['message']);
         $this->assertCount(2, $json);
 
         $user = User::where('email', 'john2.doe2@kolab.org')->first();
         $this->assertInstanceOf(User::class, $user);
         $this->assertSame('John2', $user->getSetting('first_name'));
         $this->assertSame('Doe2', $user->getSetting('last_name'));
         $this->assertSame('TestOrg', $user->getSetting('organization'));
         $aliases = $user->aliases()->orderBy('alias')->get();
         $this->assertCount(2, $aliases);
         $this->assertSame('deleted@kolab.org', $aliases[0]->alias);
         $this->assertSame('useralias1@kolab.org', $aliases[1]->alias);
         // Assert the new user entitlements
         $this->assertUserEntitlements($user, ['groupware', 'mailbox', 'storage', 'storage']);
         // Assert the wallet to which the new user should be assigned to
         $wallet = $user->wallet();
         $this->assertSame($john->wallets()->first()->id, $wallet->id);
 
-        // Test acting as account controller (not owner)
-        /*
-        // FIXME: How do we know to which wallet the new user should be assigned to?
+        // Attempt to create a user previously deleted
+        $user->delete();
 
-        $this->deleteTestUser('john2.doe2@kolab.org');
-        $response = $this->actingAs($ned)->post("/api/v4/users", $post);
+        $post['package'] = $package_kolab->id;
+        $post['aliases'] = [];
+        $response = $this->actingAs($john)->post("/api/v4/users", $post);
         $json = $response->json();
 
         $response->assertStatus(200);
 
         $this->assertSame('success', $json['status']);
-        */
+        $this->assertSame("User created successfully.", $json['message']);
+        $this->assertCount(2, $json);
+
+        $user = User::where('email', 'john2.doe2@kolab.org')->first();
+        $this->assertInstanceOf(User::class, $user);
+        $this->assertSame('John2', $user->getSetting('first_name'));
+        $this->assertSame('Doe2', $user->getSetting('last_name'));
+        $this->assertSame('TestOrg', $user->getSetting('organization'));
+        $this->assertCount(0, $user->aliases()->get());
+        $this->assertUserEntitlements($user, ['groupware', 'mailbox', 'storage', 'storage']);
+
+        // Test acting as account controller (not owner)
 
         $this->markTestIncomplete();
     }
 
     /**
      * Test user update (PUT /api/v4/users/<user-id>)
      */
     public function testUpdate(): void
     {
         $userA = $this->getTestUser('UsersControllerTest1@userscontroller.com');
         $jack = $this->getTestUser('jack@kolab.org');
         $john = $this->getTestUser('john@kolab.org');
         $ned = $this->getTestUser('ned@kolab.org');
         $domain = $this->getTestDomain(
             'userscontroller.com',
             ['status' => Domain::STATUS_NEW, 'type' => Domain::TYPE_EXTERNAL]
         );
 
         // Test unauthorized update of other user profile
         $response = $this->actingAs($jack)->get("/api/v4/users/{$userA->id}", []);
         $response->assertStatus(403);
 
         // Test authorized update of account owner by account controller
         $response = $this->actingAs($ned)->get("/api/v4/users/{$john->id}", []);
         $response->assertStatus(200);
 
         // Test updating of self (empty request)
         $response = $this->actingAs($userA)->put("/api/v4/users/{$userA->id}", []);
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame('success', $json['status']);
         $this->assertSame("User data updated successfully.", $json['message']);
-        $this->assertCount(2, $json);
+        $this->assertTrue(!empty($json['statusInfo']));
+        $this->assertCount(3, $json);
 
         // Test some invalid data
         $post = ['password' => '12345678', 'currency' => 'invalid'];
         $response = $this->actingAs($userA)->put("/api/v4/users/{$userA->id}", $post);
         $response->assertStatus(422);
 
         $json = $response->json();
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json);
         $this->assertSame('The password confirmation does not match.', $json['errors']['password'][0]);
         $this->assertSame('The currency must be 3 characters.', $json['errors']['currency'][0]);
 
         // Test full profile update including password
         $post = [
             'password' => 'simple',
             'password_confirmation' => 'simple',
             'first_name' => 'John2',
             'last_name' => 'Doe2',
             'organization' => 'TestOrg',
             'phone' => '+123 123 123',
             'external_email' => 'external@gmail.com',
             'billing_address' => 'billing',
             'country' => 'CH',
             'currency' => 'CHF',
             'aliases' => ['useralias1@' . \config('app.domain'), 'useralias2@' . \config('app.domain')]
         ];
 
         $response = $this->actingAs($userA)->put("/api/v4/users/{$userA->id}", $post);
         $json = $response->json();
 
         $response->assertStatus(200);
 
         $this->assertSame('success', $json['status']);
         $this->assertSame("User data updated successfully.", $json['message']);
-        $this->assertCount(2, $json);
+        $this->assertTrue(!empty($json['statusInfo']));
+        $this->assertCount(3, $json);
         $this->assertTrue($userA->password != $userA->fresh()->password);
         unset($post['password'], $post['password_confirmation'], $post['aliases']);
         foreach ($post as $key => $value) {
             $this->assertSame($value, $userA->getSetting($key));
         }
         $aliases = $userA->aliases()->orderBy('alias')->get();
         $this->assertCount(2, $aliases);
         $this->assertSame('useralias1@' . \config('app.domain'), $aliases[0]->alias);
         $this->assertSame('useralias2@' . \config('app.domain'), $aliases[1]->alias);
 
         // Test unsetting values
         $post = [
             'first_name' => '',
             'last_name' => '',
             'organization' => '',
             'phone' => '',
             'external_email' => '',
             'billing_address' => '',
             'country' => '',
             'currency' => '',
             'aliases' => ['useralias2@' . \config('app.domain')]
         ];
 
         $response = $this->actingAs($userA)->put("/api/v4/users/{$userA->id}", $post);
         $json = $response->json();
 
         $response->assertStatus(200);
 
         $this->assertSame('success', $json['status']);
         $this->assertSame("User data updated successfully.", $json['message']);
-        $this->assertCount(2, $json);
+        $this->assertTrue(!empty($json['statusInfo']));
+        $this->assertCount(3, $json);
         unset($post['aliases']);
         foreach ($post as $key => $value) {
             $this->assertNull($userA->getSetting($key));
         }
         $aliases = $userA->aliases()->get();
         $this->assertCount(1, $aliases);
         $this->assertSame('useralias2@' . \config('app.domain'), $aliases[0]->alias);
 
         // Test error on some invalid aliases missing password confirmation
         $post = [
             'password' => 'simple123',
             'aliases' => [
                 'useralias2@' . \config('app.domain'),
                 'useralias1@kolab.org',
                 '@kolab.org',
             ]
         ];
 
         $response = $this->actingAs($userA)->put("/api/v4/users/{$userA->id}", $post);
         $json = $response->json();
 
         $response->assertStatus(422);
 
         $this->assertSame('error', $json['status']);
         $this->assertCount(2, $json['errors']);
         $this->assertCount(2, $json['errors']['aliases']);
         $this->assertSame("The specified domain is not available.", $json['errors']['aliases'][1]);
         $this->assertSame("The specified alias is invalid.", $json['errors']['aliases'][2]);
         $this->assertSame("The password confirmation does not match.", $json['errors']['password'][0]);
 
         // Test authorized update of other user
-        $response = $this->actingAs($ned)->get("/api/v4/users/{$jack->id}", []);
+        $response = $this->actingAs($ned)->put("/api/v4/users/{$jack->id}", []);
         $response->assertStatus(200);
 
+        $json = $response->json();
+
+        $this->assertTrue(empty($json['statusInfo']));
+
         // TODO: Test error on aliases with invalid/non-existing/other-user's domain
 
         // Create entitlements and additional user for following tests
         $owner = $this->getTestUser('UsersControllerTest1@userscontroller.com');
         $user = $this->getTestUser('UsersControllerTest2@userscontroller.com');
         $package_domain = Package::where('title', 'domain-hosting')->first();
         $package_kolab = Package::where('title', 'kolab')->first();
         $package_lite = Package::where('title', 'lite')->first();
         $sku_mailbox = Sku::where('title', 'mailbox')->first();
         $sku_storage = Sku::where('title', 'storage')->first();
         $sku_groupware = Sku::where('title', 'groupware')->first();
 
         $domain = $this->getTestDomain(
             'userscontroller.com',
             [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
             ]
         );
 
         $domain->assignPackage($package_domain, $owner);
         $owner->assignPackage($package_kolab);
         $owner->assignPackage($package_lite, $user);
 
         // Non-controller cannot update his own entitlements
         $post = ['skus' => []];
         $response = $this->actingAs($user)->put("/api/v4/users/{$user->id}", $post);
         $response->assertStatus(422);
 
         // Test updating entitlements
         $post = [
             'skus' => [
                 $sku_mailbox->id => 1,
                 $sku_storage->id => 3,
                 $sku_groupware->id => 1,
             ],
         ];
 
         $response = $this->actingAs($owner)->put("/api/v4/users/{$user->id}", $post);
         $response->assertStatus(200);
 
+        $json = $response->json();
+
         $storage_cost = $user->entitlements()
             ->where('sku_id', $sku_storage->id)
             ->orderBy('cost')
             ->pluck('cost')->all();
 
         $this->assertUserEntitlements(
             $user,
             ['groupware', 'mailbox', 'storage', 'storage', 'storage']
         );
 
         $this->assertSame([0, 0, 25], $storage_cost);
+        $this->assertTrue(empty($json['statusInfo']));
     }
 
     /**
      * Test UsersController::updateEntitlements()
      */
     public function testUpdateEntitlements(): void
     {
         $jane = $this->getTestUser('jane@kolabnow.com');
 
         $kolab = \App\Package::where('title', 'kolab')->first();
         $storage = \App\Sku::where('title', 'storage')->first();
         $activesync = \App\Sku::where('title', 'activesync')->first();
         $groupware = \App\Sku::where('title', 'groupware')->first();
         $mailbox = \App\Sku::where('title', 'mailbox')->first();
 
         // standard package, 1 mailbox, 1 groupware, 2 storage
         $jane->assignPackage($kolab);
 
         // add 2 storage, 1 activesync
         $post = [
             'skus' => [
                 $mailbox->id => 1,
                 $groupware->id => 1,
                 $storage->id => 4,
                 $activesync->id => 1
             ]
         ];
 
         $response = $this->actingAs($jane)->put("/api/v4/users/{$jane->id}", $post);
         $response->assertStatus(200);
 
         $this->assertUserEntitlements(
             $jane,
             [
                 'activesync',
                 'groupware',
                 'mailbox',
                 'storage',
                 'storage',
                 'storage',
                 'storage'
             ]
         );
 
         // add 2 storage, remove 1 activesync
         $post = [
             'skus' => [
                 $mailbox->id => 1,
                 $groupware->id => 1,
                 $storage->id => 6,
                 $activesync->id => 0
             ]
         ];
 
         $response = $this->actingAs($jane)->put("/api/v4/users/{$jane->id}", $post);
         $response->assertStatus(200);
 
         $this->assertUserEntitlements(
             $jane,
             [
                 'groupware',
                 'mailbox',
                 'storage',
                 'storage',
                 'storage',
                 'storage',
                 'storage',
                 'storage'
             ]
         );
 
         // add mailbox
         $post = [
             'skus' => [
                 $mailbox->id => 2,
                 $groupware->id => 1,
                 $storage->id => 6,
                 $activesync->id => 0
             ]
         ];
 
         $response = $this->actingAs($jane)->put("/api/v4/users/{$jane->id}", $post);
         $response->assertStatus(500);
 
         $this->assertUserEntitlements(
             $jane,
             [
                 'groupware',
                 'mailbox',
                 'storage',
                 'storage',
                 'storage',
                 'storage',
                 'storage',
                 'storage'
             ]
         );
 
         // remove mailbox
         $post = [
             'skus' => [
                 $mailbox->id => 0,
                 $groupware->id => 1,
                 $storage->id => 6,
                 $activesync->id => 0
             ]
         ];
 
         $response = $this->actingAs($jane)->put("/api/v4/users/{$jane->id}", $post);
         $response->assertStatus(500);
 
         $this->assertUserEntitlements(
             $jane,
             [
                 'groupware',
                 'mailbox',
                 'storage',
                 'storage',
                 'storage',
                 'storage',
                 'storage',
                 'storage'
             ]
         );
 
         // less than free storage
         $post = [
             'skus' => [
                 $mailbox->id => 1,
                 $groupware->id => 1,
                 $storage->id => 1,
                 $activesync->id => 0
             ]
         ];
 
         $response = $this->actingAs($jane)->put("/api/v4/users/{$jane->id}", $post);
         $response->assertStatus(200);
 
         $this->assertUserEntitlements(
             $jane,
             [
                 'groupware',
                 'mailbox',
                 'storage',
                 'storage'
             ]
         );
     }
 
     /**
      * Test user data response used in show and info actions
      */
     public function testUserResponse(): void
     {
         $provider = \config('services.payment_provider') ?: 'mollie';
         $user = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
         $wallet->setSettings(['mollie_id' => null, 'stripe_id' => null]);
         $result = $this->invokeMethod(new UsersController(), 'userResponse', [$user]);
 
         $this->assertEquals($user->id, $result['id']);
         $this->assertEquals($user->email, $result['email']);
         $this->assertEquals($user->status, $result['status']);
         $this->assertTrue(is_array($result['statusInfo']));
 
         $this->assertTrue(is_array($result['aliases']));
         $this->assertCount(1, $result['aliases']);
         $this->assertSame('john.doe@kolab.org', $result['aliases'][0]);
 
         $this->assertTrue(is_array($result['settings']));
         $this->assertSame('US', $result['settings']['country']);
         $this->assertSame('USD', $result['settings']['currency']);
 
         $this->assertTrue(is_array($result['accounts']));
         $this->assertTrue(is_array($result['wallets']));
         $this->assertCount(0, $result['accounts']);
         $this->assertCount(1, $result['wallets']);
         $this->assertSame($wallet->id, $result['wallet']['id']);
         $this->assertArrayNotHasKey('discount', $result['wallet']);
 
         $this->assertTrue($result['statusInfo']['enableDomains']);
         $this->assertTrue($result['statusInfo']['enableWallets']);
         $this->assertTrue($result['statusInfo']['enableUsers']);
 
         // Ned is John's wallet controller
         $ned = $this->getTestUser('ned@kolab.org');
         $ned_wallet = $ned->wallets()->first();
         $result = $this->invokeMethod(new UsersController(), 'userResponse', [$ned]);
 
         $this->assertEquals($ned->id, $result['id']);
         $this->assertEquals($ned->email, $result['email']);
         $this->assertTrue(is_array($result['accounts']));
         $this->assertTrue(is_array($result['wallets']));
         $this->assertCount(1, $result['accounts']);
         $this->assertCount(1, $result['wallets']);
         $this->assertSame($wallet->id, $result['wallet']['id']);
         $this->assertSame($wallet->id, $result['accounts'][0]['id']);
         $this->assertSame($ned_wallet->id, $result['wallets'][0]['id']);
         $this->assertSame($provider, $result['wallet']['provider']);
         $this->assertSame($provider, $result['wallets'][0]['provider']);
 
         $this->assertTrue($result['statusInfo']['enableDomains']);
         $this->assertTrue($result['statusInfo']['enableWallets']);
         $this->assertTrue($result['statusInfo']['enableUsers']);
 
         // Test discount in a response
         $discount = Discount::where('code', 'TEST')->first();
         $wallet->discount()->associate($discount);
         $wallet->save();
         $mod_provider = $provider == 'mollie' ? 'stripe' : 'mollie';
         $wallet->setSetting($mod_provider . '_id', 123);
         $user->refresh();
 
         $result = $this->invokeMethod(new UsersController(), 'userResponse', [$user]);
 
         $this->assertEquals($user->id, $result['id']);
         $this->assertSame($discount->id, $result['wallet']['discount_id']);
         $this->assertSame($discount->discount, $result['wallet']['discount']);
         $this->assertSame($discount->description, $result['wallet']['discount_description']);
         $this->assertSame($mod_provider, $result['wallet']['provider']);
         $this->assertSame($discount->id, $result['wallets'][0]['discount_id']);
         $this->assertSame($discount->discount, $result['wallets'][0]['discount']);
         $this->assertSame($discount->description, $result['wallets'][0]['discount_description']);
         $this->assertSame($mod_provider, $result['wallets'][0]['provider']);
 
         // Jack is not a John's wallet controller
         $jack = $this->getTestUser('jack@kolab.org');
         $result = $this->invokeMethod(new UsersController(), 'userResponse', [$jack]);
 
         $this->assertFalse($result['statusInfo']['enableDomains']);
         $this->assertFalse($result['statusInfo']['enableWallets']);
         $this->assertFalse($result['statusInfo']['enableUsers']);
     }
 
     /**
-     * List of alias validation cases for testValidateEmail()
+     * List of email address validation cases for testValidateEmail()
      *
      * @return array Arguments for testValidateEmail()
      */
     public function dataValidateEmail(): array
     {
         $this->refreshApplication();
         $public_domains = Domain::getPublicDomains();
         $domain = reset($public_domains);
 
         $john = $this->getTestUser('john@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
         $user = $this->getTestUser('UsersControllerTest1@userscontroller.com');
 
         return [
             // Invalid format
-            ["$domain", $john, true, 'The specified alias is invalid.'],
-            [".@$domain", $john, true, 'The specified alias is invalid.'],
-            ["test123456@localhost", $john, true, 'The specified domain is invalid.'],
-            ["test123456@unknown-domain.org", $john, true, 'The specified domain is invalid.'],
+            ["$domain", $john, 'The specified email is invalid.'],
+            [".@$domain", $john, 'The specified email is invalid.'],
+            ["test123456@localhost", $john, 'The specified domain is invalid.'],
+            ["test123456@unknown-domain.org", $john, 'The specified domain is invalid.'],
 
-            ["$domain", $john, false, 'The specified email is invalid.'],
-            [".@$domain", $john, false, 'The specified email is invalid.'],
+            ["$domain", $john, 'The specified email is invalid.'],
+            [".@$domain", $john, 'The specified email is invalid.'],
 
             // forbidden local part on public domains
-            ["admin@$domain", $john, true, 'The specified alias is not available.'],
-            ["administrator@$domain", $john, true, 'The specified alias is not available.'],
+            ["admin@$domain", $john, 'The specified email is not available.'],
+            ["administrator@$domain", $john, 'The specified email is not available.'],
 
             // forbidden (other user's domain)
-            ["testtest@kolab.org", $user, true, 'The specified domain is not available.'],
+            ["testtest@kolab.org", $user, 'The specified domain is not available.'],
 
             // existing alias of other user, to be a user email
-            ["jack.daniels@kolab.org", $john, false, 'The specified email is not available.'],
+            ["jack.daniels@kolab.org", $john, 'The specified email is not available.'],
+
+            // valid (user domain)
+            ["admin@kolab.org", $john, null],
+
+            // valid (public domain)
+            ["test.test@$domain", $john, null],
+        ];
+    }
+
+    /**
+     * User email address validation.
+     *
+     * Note: Technically these include unit tests, but let's keep it here for now.
+     * FIXME: Shall we do a http request for each case?
+     *
+     * @dataProvider dataValidateEmail
+     */
+    public function testValidateEmail($email, $user, $expected_result): void
+    {
+        $result = UsersController::validateEmail($email, $user);
+        $this->assertSame($expected_result, $result);
+    }
+
+    /**
+     * User email validation - tests for $deleted argument
+     *
+     * Note: Technically these include unit tests, but let's keep it here for now.
+     * FIXME: Shall we do a http request for each case?
+     */
+    public function testValidateEmailDeleted(): void
+    {
+        Queue::fake();
+
+        $john = $this->getTestUser('john@kolab.org');
+        $deleted_priv = $this->getTestUser('deleted@kolab.org');
+        $deleted_priv->delete();
+        $deleted_pub = $this->getTestUser('deleted@kolabnow.com');
+        $deleted_pub->delete();
+
+        $result = UsersController::validateEmail('deleted@kolab.org', $john, $deleted);
+        $this->assertSame(null, $result);
+        $this->assertSame($deleted_priv->id, $deleted->id);
+
+        $result = UsersController::validateEmail('deleted@kolabnow.com', $john, $deleted);
+        $this->assertSame('The specified email is not available.', $result);
+        $this->assertSame(null, $deleted);
+
+        $result = UsersController::validateEmail('jack@kolab.org', $john, $deleted);
+        $this->assertSame('The specified email is not available.', $result);
+        $this->assertSame(null, $deleted);
+    }
+
+    /**
+     * User email validation - tests for an address being a group email address
+     *
+     * Note: Technically these include unit tests, but let's keep it here for now.
+     * FIXME: Shall we do a http request for each case?
+     */
+    public function testValidateEmailGroup(): void
+    {
+        Queue::fake();
+
+        $john = $this->getTestUser('john@kolab.org');
+        $pub_group = $this->getTestGroup('group-test@kolabnow.com');
+        $priv_group = $this->getTestGroup('group-test@kolab.org');
+
+        // A group in a public domain, existing
+        $result = UsersController::validateEmail($pub_group->email, $john, $deleted);
+        $this->assertSame('The specified email is not available.', $result);
+        $this->assertNull($deleted);
+
+        $pub_group->delete();
+
+        // A group in a public domain, deleted
+        $result = UsersController::validateEmail($pub_group->email, $john, $deleted);
+        $this->assertSame('The specified email is not available.', $result);
+        $this->assertNull($deleted);
+
+        // A group in a private domain, existing
+        $result = UsersController::validateEmail($priv_group->email, $john, $deleted);
+        $this->assertSame('The specified email is not available.', $result);
+        $this->assertNull($deleted);
+
+        $priv_group->delete();
+
+        // A group in a private domain, deleted
+        $result = UsersController::validateEmail($priv_group->email, $john, $deleted);
+        $this->assertSame(null, $result);
+        $this->assertSame($priv_group->id, $deleted->id);
+    }
+
+    /**
+     * List of alias validation cases for testValidateAlias()
+     *
+     * @return array Arguments for testValidateAlias()
+     */
+    public function dataValidateAlias(): array
+    {
+        $this->refreshApplication();
+        $public_domains = Domain::getPublicDomains();
+        $domain = reset($public_domains);
+
+        $john = $this->getTestUser('john@kolab.org');
+        $jack = $this->getTestUser('jack@kolab.org');
+        $user = $this->getTestUser('UsersControllerTest1@userscontroller.com');
+
+        return [
+            // Invalid format
+            ["$domain", $john, 'The specified alias is invalid.'],
+            [".@$domain", $john, 'The specified alias is invalid.'],
+            ["test123456@localhost", $john, 'The specified domain is invalid.'],
+            ["test123456@unknown-domain.org", $john, 'The specified domain is invalid.'],
+
+            ["$domain", $john, 'The specified alias is invalid.'],
+            [".@$domain", $john, 'The specified alias is invalid.'],
+
+            // forbidden local part on public domains
+            ["admin@$domain", $john, 'The specified alias is not available.'],
+            ["administrator@$domain", $john, 'The specified alias is not available.'],
+
+            // forbidden (other user's domain)
+            ["testtest@kolab.org", $user, 'The specified domain is not available.'],
 
             // existing alias of other user, to be an alias, user in the same group account
-            ["jack.daniels@kolab.org", $john, true, null],
+            ["jack.daniels@kolab.org", $john, null],
 
             // existing user
-            ["jack@kolab.org", $john, true, 'The specified alias is not available.'],
+            ["jack@kolab.org", $john, 'The specified alias is not available.'],
 
             // valid (user domain)
-            ["admin@kolab.org", $john, true, null],
+            ["admin@kolab.org", $john, null],
 
             // valid (public domain)
-            ["test.test@$domain", $john, true, null],
+            ["test.test@$domain", $john, null],
         ];
     }
 
     /**
-     * User email/alias validation.
+     * User email alias validation.
      *
      * Note: Technically these include unit tests, but let's keep it here for now.
      * FIXME: Shall we do a http request for each case?
      *
-     * @dataProvider dataValidateEmail
+     * @dataProvider dataValidateAlias
      */
-    public function testValidateEmail($alias, $user, $is_alias, $expected_result): void
+    public function testValidateAlias($alias, $user, $expected_result): void
     {
-        $args = [$alias, $user, $is_alias];
-        $result = $this->invokeMethod(new UsersController(), 'validateEmail', $args);
-
+        $result = UsersController::validateAlias($alias, $user);
         $this->assertSame($expected_result, $result);
     }
 
     /**
-     * User email/alias validation - more cases.
+     * User alias validation - more cases.
      *
      * Note: Technically these include unit tests, but let's keep it here for now.
      * FIXME: Shall we do a http request for each case?
      */
-    public function testValidateEmail2(): void
+    public function testValidateAlias2(): void
     {
         Queue::fake();
 
         $john = $this->getTestUser('john@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
         $user = $this->getTestUser('UsersControllerTest1@userscontroller.com');
         $deleted_priv = $this->getTestUser('deleted@kolab.org');
         $deleted_priv->setAliases(['deleted-alias@kolab.org']);
         $deleted_priv->delete();
         $deleted_pub = $this->getTestUser('deleted@kolabnow.com');
         $deleted_pub->setAliases(['deleted-alias@kolabnow.com']);
         $deleted_pub->delete();
+        $group = $this->getTestGroup('group-test@kolabnow.com');
 
         // An alias that was a user email before is allowed, but only for custom domains
-        $result = UsersController::validateEmail('deleted@kolab.org', $john, true);
+        $result = UsersController::validateAlias('deleted@kolab.org', $john);
         $this->assertSame(null, $result);
 
-        $result = UsersController::validateEmail('deleted-alias@kolab.org', $john, true);
+        $result = UsersController::validateAlias('deleted-alias@kolab.org', $john);
         $this->assertSame(null, $result);
 
-        $result = UsersController::validateEmail('deleted@kolabnow.com', $john, true);
+        $result = UsersController::validateAlias('deleted@kolabnow.com', $john);
+        $this->assertSame('The specified alias is not available.', $result);
+
+        $result = UsersController::validateAlias('deleted-alias@kolabnow.com', $john);
         $this->assertSame('The specified alias is not available.', $result);
 
-        $result = UsersController::validateEmail('deleted-alias@kolabnow.com', $john, true);
+        // A grpoup with the same email address exists
+        $result = UsersController::validateAlias($group->email, $john);
         $this->assertSame('The specified alias is not available.', $result);
     }
 }
diff --git a/src/tests/Feature/Controller/WalletsTest.php b/src/tests/Feature/Controller/WalletsTest.php
index 25291f9f..5cb158ca 100644
--- a/src/tests/Feature/Controller/WalletsTest.php
+++ b/src/tests/Feature/Controller/WalletsTest.php
@@ -1,336 +1,338 @@
 <?php
 
 namespace Tests\Feature\Controller;
 
 use App\Http\Controllers\API\V4\WalletsController;
 use App\Payment;
 use App\Providers\PaymentProvider;
 use App\Transaction;
 use Carbon\Carbon;
 use Tests\TestCase;
 
 class WalletsTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('wallets-controller@kolabnow.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('wallets-controller@kolabnow.com');
 
         parent::tearDown();
     }
 
 
     /**
      * Test for getWalletNotice() method
      */
     public function testGetWalletNotice(): void
     {
         $user = $this->getTestUser('wallets-controller@kolabnow.com');
         $package = \App\Package::where('title', 'kolab')->first();
         $user->assignPackage($package);
         $wallet = $user->wallets()->first();
 
         $controller = new WalletsController();
         $method = new \ReflectionMethod($controller, 'getWalletNotice');
         $method->setAccessible(true);
 
         // User/entitlements created today, balance=0
         $notice = $method->invoke($controller, $wallet);
 
         $this->assertSame('You are in your free trial period.', $notice);
 
         $wallet->owner->created_at = Carbon::now()->subDays(15);
         $wallet->owner->save();
 
         $notice = $method->invoke($controller, $wallet);
 
         $this->assertSame('Your free trial is about to end, top up to continue.', $notice);
 
         // User/entitlements created today, balance=-10 CHF
         $wallet->balance = -1000;
         $notice = $method->invoke($controller, $wallet);
 
         $this->assertSame('You are out of credit, top up your balance now.', $notice);
 
         // User/entitlements created slightly more than a month ago, balance=9,99 CHF (monthly)
         $wallet->owner->created_at = Carbon::now()->subMonthsWithoutOverflow(1)->subDays(1);
         $wallet->owner->save();
 
         $wallet->balance = 999;
         $notice = $method->invoke($controller, $wallet);
 
         $this->assertRegExp('/\((1 month|4 weeks)\)/', $notice);
 
         // Old entitlements, 100% discount
         $this->backdateEntitlements($wallet->entitlements, Carbon::now()->subDays(40));
         $discount = \App\Discount::where('discount', 100)->first();
         $wallet->discount()->associate($discount);
 
         $notice = $method->invoke($controller, $wallet->refresh());
 
         $this->assertSame(null, $notice);
     }
 
     /**
      * Test fetching pdf receipt
      */
     public function testReceiptDownload(): void
     {
         $user = $this->getTestUser('wallets-controller@kolabnow.com');
         $john = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
 
         // Unauth access not allowed
         $response = $this->get("api/v4/wallets/{$wallet->id}/receipts/2020-05");
         $response->assertStatus(401);
         $response = $this->actingAs($john)->get("api/v4/wallets/{$wallet->id}/receipts/2020-05");
         $response->assertStatus(403);
 
         // Invalid receipt id (current month)
         $receiptId = date('Y-m');
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/receipts/{$receiptId}");
         $response->assertStatus(404);
 
         // Invalid receipt id
         $receiptId = '1000-03';
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/receipts/{$receiptId}");
         $response->assertStatus(404);
 
         // Valid receipt id
         $year = intval(date('Y')) - 1;
         $receiptId = "$year-12";
         $filename = \config('app.name') . " Receipt for $year-12";
 
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/receipts/{$receiptId}");
 
         $response->assertStatus(200);
         $response->assertHeader('content-type', 'application/pdf');
         $response->assertHeader('content-disposition', 'attachment; filename="' . $filename . '"');
         $response->assertHeader('content-length');
 
         $length = $response->headers->get('content-length');
         $content = $response->content();
         $this->assertStringStartsWith("%PDF-1.", $content);
         $this->assertEquals(strlen($content), $length);
     }
 
     /**
      * Test fetching list of receipts
      */
     public function testReceipts(): void
     {
         $user = $this->getTestUser('wallets-controller@kolabnow.com');
         $john = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
         $wallet->payments()->delete();
 
         // Unauth access not allowed
         $response = $this->get("api/v4/wallets/{$wallet->id}/receipts");
         $response->assertStatus(401);
         $response = $this->actingAs($john)->get("api/v4/wallets/{$wallet->id}/receipts");
         $response->assertStatus(403);
 
         // Empty list expected
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/receipts");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame([], $json['list']);
         $this->assertSame(1, $json['page']);
         $this->assertSame(0, $json['count']);
         $this->assertSame(false, $json['hasMore']);
 
         // Insert a payment to the database
         $date = Carbon::create(intval(date('Y')) - 1, 4, 30);
         $payment = Payment::create([
                 'id' => 'AAA1',
                 'status' => PaymentProvider::STATUS_PAID,
                 'type' => PaymentProvider::TYPE_ONEOFF,
                 'description' => 'Paid in April',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 1111,
         ]);
         $payment->updated_at = $date;
         $payment->save();
 
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/receipts");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame([$date->format('Y-m')], $json['list']);
         $this->assertSame(1, $json['page']);
         $this->assertSame(1, $json['count']);
         $this->assertSame(false, $json['hasMore']);
     }
 
     /**
      * Test fetching a wallet (GET /api/v4/wallets/:id)
      */
     public function testShow(): void
     {
         $john = $this->getTestUser('john@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
         $wallet = $john->wallets()->first();
+        $wallet->balance = -100;
+        $wallet->save();
 
         // Accessing a wallet of someone else
         $response = $this->actingAs($jack)->get("api/v4/wallets/{$wallet->id}");
         $response->assertStatus(403);
 
         // Accessing non-existing wallet
         $response = $this->actingAs($jack)->get("api/v4/wallets/aaa");
         $response->assertStatus(404);
 
         // Wallet owner
         $response = $this->actingAs($john)->get("api/v4/wallets/{$wallet->id}");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertSame($wallet->id, $json['id']);
         $this->assertSame('CHF', $json['currency']);
         $this->assertSame($wallet->balance, $json['balance']);
         $this->assertTrue(empty($json['description']));
         $this->assertTrue(!empty($json['notice']));
     }
 
     /**
      * Test fetching wallet transactions
      */
     public function testTransactions(): void
     {
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $user = $this->getTestUser('wallets-controller@kolabnow.com');
         $user->assignPackage($package_kolab);
         $john = $this->getTestUser('john@kolab.org');
         $wallet = $user->wallets()->first();
 
         // Unauth access not allowed
         $response = $this->get("api/v4/wallets/{$wallet->id}/transactions");
         $response->assertStatus(401);
         $response = $this->actingAs($john)->get("api/v4/wallets/{$wallet->id}/transactions");
         $response->assertStatus(403);
 
         // Expect empty list
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/transactions");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame([], $json['list']);
         $this->assertSame(1, $json['page']);
         $this->assertSame(0, $json['count']);
         $this->assertSame(false, $json['hasMore']);
 
         // Create some sample transactions
         $transactions = $this->createTestTransactions($wallet);
         $transactions = array_reverse($transactions);
         $pages = array_chunk($transactions, 10 /* page size*/);
 
         // Get the first page
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/transactions");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame(1, $json['page']);
         $this->assertSame(10, $json['count']);
         $this->assertSame(true, $json['hasMore']);
         $this->assertCount(10, $json['list']);
         foreach ($pages[0] as $idx => $transaction) {
             $this->assertSame($transaction->id, $json['list'][$idx]['id']);
             $this->assertSame($transaction->type, $json['list'][$idx]['type']);
             $this->assertSame($transaction->shortDescription(), $json['list'][$idx]['description']);
             $this->assertFalse($json['list'][$idx]['hasDetails']);
             $this->assertFalse(array_key_exists('user', $json['list'][$idx]));
         }
 
         $search = null;
 
         // Get the second page
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/transactions?page=2");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame(2, $json['page']);
         $this->assertSame(2, $json['count']);
         $this->assertSame(false, $json['hasMore']);
         $this->assertCount(2, $json['list']);
         foreach ($pages[1] as $idx => $transaction) {
             $this->assertSame($transaction->id, $json['list'][$idx]['id']);
             $this->assertSame($transaction->type, $json['list'][$idx]['type']);
             $this->assertSame($transaction->shortDescription(), $json['list'][$idx]['description']);
             $this->assertSame(
                 $transaction->type == Transaction::WALLET_DEBIT,
                 $json['list'][$idx]['hasDetails']
             );
             $this->assertFalse(array_key_exists('user', $json['list'][$idx]));
 
             if ($transaction->type == Transaction::WALLET_DEBIT) {
                 $search = $transaction->id;
             }
         }
 
         // Get a non-existing page
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/transactions?page=3");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame(3, $json['page']);
         $this->assertSame(0, $json['count']);
         $this->assertSame(false, $json['hasMore']);
         $this->assertCount(0, $json['list']);
 
         // Sub-transaction searching
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/transactions?transaction=123");
         $response->assertStatus(404);
 
         $response = $this->actingAs($user)->get("api/v4/wallets/{$wallet->id}/transactions?transaction={$search}");
         $response->assertStatus(200);
 
         $json = $response->json();
 
         $this->assertCount(5, $json);
         $this->assertSame('success', $json['status']);
         $this->assertSame(1, $json['page']);
         $this->assertSame(2, $json['count']);
         $this->assertSame(false, $json['hasMore']);
         $this->assertCount(2, $json['list']);
         $this->assertSame(Transaction::ENTITLEMENT_BILLED, $json['list'][0]['type']);
         $this->assertSame(Transaction::ENTITLEMENT_BILLED, $json['list'][1]['type']);
 
         // Test that John gets 404 if he tries to access
         // someone else's transaction ID on his wallet's endpoint
         $wallet = $john->wallets()->first();
         $response = $this->actingAs($john)->get("api/v4/wallets/{$wallet->id}/transactions?transaction={$search}");
         $response->assertStatus(404);
     }
 }
diff --git a/src/tests/Feature/Documents/ReceiptTest.php b/src/tests/Feature/Documents/ReceiptTest.php
index 3a815b09..e0fc5726 100644
--- a/src/tests/Feature/Documents/ReceiptTest.php
+++ b/src/tests/Feature/Documents/ReceiptTest.php
@@ -1,323 +1,367 @@
 <?php
 
 namespace Tests\Feature\Documents;
 
 use App\Documents\Receipt;
 use App\Payment;
 use App\Providers\PaymentProvider;
 use App\User;
 use App\Wallet;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Bus;
 use Tests\TestCase;
 
 class ReceiptTest extends TestCase
 {
     private $paymentIDs = ['AAA1', 'AAA2', 'AAA3', 'AAA4', 'AAA5', 'AAA6', 'AAA7'];
 
     public function setUp(): void
     {
         parent::setUp();
 
         Payment::whereIn('id', $this->paymentIDs)->delete();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('receipt-test@kolabnow.com');
 
         Payment::whereIn('id', $this->paymentIDs)->delete();
 
         parent::tearDown();
     }
 
     /**
      * Test receipt HTML output (without VAT)
      */
     public function testHtmlOutput(): void
     {
         $appName = \config('app.name');
         $wallet = $this->getTestData();
         $receipt = new Receipt($wallet, 2020, 5);
         $html = $receipt->htmlOutput();
 
         $this->assertStringStartsWith('<!DOCTYPE html>', $html);
 
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->loadHTML($html);
 
         // Title
         $title = $dom->getElementById('title');
         $this->assertSame("Receipt for May 2020", $title->textContent);
 
         // Company name/address
         $header = $dom->getElementById('header');
         $companyOutput = $this->getNodeContent($header->getElementsByTagName('td')[0]);
         $companyExpected = \config('app.company.name') . "\n" . \config('app.company.address');
         $this->assertSame($companyExpected, $companyOutput);
 
         // The main table content
         $content = $dom->getElementById('content');
         $records = $content->getElementsByTagName('tr');
-        $this->assertCount(5, $records);
+        $this->assertCount(7, $records);
 
         $headerCells = $records[0]->getElementsByTagName('th');
         $this->assertCount(3, $headerCells);
         $this->assertSame('Date', $this->getNodeContent($headerCells[0]));
         $this->assertSame('Description', $this->getNodeContent($headerCells[1]));
         $this->assertSame('Amount', $this->getNodeContent($headerCells[2]));
         $cells = $records[1]->getElementsByTagName('td');
         $this->assertCount(3, $cells);
         $this->assertSame('2020-05-01', $this->getNodeContent($cells[0]));
         $this->assertSame("$appName Services", $this->getNodeContent($cells[1]));
         $this->assertSame('12,34 CHF', $this->getNodeContent($cells[2]));
         $cells = $records[2]->getElementsByTagName('td');
         $this->assertCount(3, $cells);
         $this->assertSame('2020-05-10', $this->getNodeContent($cells[0]));
         $this->assertSame("$appName Services", $this->getNodeContent($cells[1]));
         $this->assertSame('0,01 CHF', $this->getNodeContent($cells[2]));
         $cells = $records[3]->getElementsByTagName('td');
         $this->assertCount(3, $cells);
-        $this->assertSame('2020-05-31', $this->getNodeContent($cells[0]));
+        $this->assertSame('2020-05-21', $this->getNodeContent($cells[0]));
         $this->assertSame("$appName Services", $this->getNodeContent($cells[1]));
         $this->assertSame('1,00 CHF', $this->getNodeContent($cells[2]));
-        $summaryCells = $records[4]->getElementsByTagName('td');
+        $cells = $records[4]->getElementsByTagName('td');
+        $this->assertCount(3, $cells);
+        $this->assertSame('2020-05-30', $this->getNodeContent($cells[0]));
+        $this->assertSame("Refund", $this->getNodeContent($cells[1]));
+        $this->assertSame('-1,00 CHF', $this->getNodeContent($cells[2]));
+        $cells = $records[5]->getElementsByTagName('td');
+        $this->assertCount(3, $cells);
+        $this->assertSame('2020-05-31', $this->getNodeContent($cells[0]));
+        $this->assertSame("Chargeback", $this->getNodeContent($cells[1]));
+        $this->assertSame('-0,10 CHF', $this->getNodeContent($cells[2]));
+        $summaryCells = $records[6]->getElementsByTagName('td');
         $this->assertCount(2, $summaryCells);
         $this->assertSame('Total', $this->getNodeContent($summaryCells[0]));
-        $this->assertSame('13,35 CHF', $this->getNodeContent($summaryCells[1]));
+        $this->assertSame('12,25 CHF', $this->getNodeContent($summaryCells[1]));
 
         // Customer data
         $customer = $dom->getElementById('customer');
         $customerCells = $customer->getElementsByTagName('td');
         $customerOutput = $this->getNodeContent($customerCells[0]);
         $customerExpected = "Firstname Lastname\nTest Unicode Straße 150\n10115 Berlin";
         $this->assertSame($customerExpected, $this->getNodeContent($customerCells[0]));
         $customerIdents = $this->getNodeContent($customerCells[1]);
         //$this->assertTrue(strpos($customerIdents, "Account ID {$wallet->id}") !== false);
         $this->assertTrue(strpos($customerIdents, "Customer No. {$wallet->owner->id}") !== false);
 
         // Company details in the footer
         $footer = $dom->getElementById('footer');
         $footerOutput = $footer->textContent;
         $this->assertStringStartsWith(\config('app.company.details'), $footerOutput);
         $this->assertTrue(strpos($footerOutput, \config('app.company.email')) !== false);
     }
 
     /**
      * Test receipt HTML output (with VAT)
      */
     public function testHtmlOutputVat(): void
     {
         \config(['app.vat.rate' => 7.7]);
         \config(['app.vat.countries' => 'ch']);
 
         $appName = \config('app.name');
         $wallet = $this->getTestData('CH');
         $receipt = new Receipt($wallet, 2020, 5);
         $html = $receipt->htmlOutput();
 
         $this->assertStringStartsWith('<!DOCTYPE html>', $html);
 
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->loadHTML($html);
 
         // The main table content
         $content = $dom->getElementById('content');
         $records = $content->getElementsByTagName('tr');
-        $this->assertCount(7, $records);
+        $this->assertCount(9, $records);
 
         $cells = $records[1]->getElementsByTagName('td');
         $this->assertCount(3, $cells);
         $this->assertSame('2020-05-01', $this->getNodeContent($cells[0]));
         $this->assertSame("$appName Services", $this->getNodeContent($cells[1]));
         $this->assertSame('11,39 CHF', $this->getNodeContent($cells[2]));
         $cells = $records[2]->getElementsByTagName('td');
         $this->assertCount(3, $cells);
         $this->assertSame('2020-05-10', $this->getNodeContent($cells[0]));
         $this->assertSame("$appName Services", $this->getNodeContent($cells[1]));
         $this->assertSame('0,01 CHF', $this->getNodeContent($cells[2]));
         $cells = $records[3]->getElementsByTagName('td');
         $this->assertCount(3, $cells);
-        $this->assertSame('2020-05-31', $this->getNodeContent($cells[0]));
+        $this->assertSame('2020-05-21', $this->getNodeContent($cells[0]));
         $this->assertSame("$appName Services", $this->getNodeContent($cells[1]));
         $this->assertSame('0,92 CHF', $this->getNodeContent($cells[2]));
-        $subtotalCells = $records[4]->getElementsByTagName('td');
+        $cells = $records[4]->getElementsByTagName('td');
+        $this->assertCount(3, $cells);
+        $this->assertSame('2020-05-30', $this->getNodeContent($cells[0]));
+        $this->assertSame("Refund", $this->getNodeContent($cells[1]));
+        $this->assertSame('-0,92 CHF', $this->getNodeContent($cells[2]));
+        $cells = $records[5]->getElementsByTagName('td');
+        $this->assertCount(3, $cells);
+        $this->assertSame('2020-05-31', $this->getNodeContent($cells[0]));
+        $this->assertSame("Chargeback", $this->getNodeContent($cells[1]));
+        $this->assertSame('-0,09 CHF', $this->getNodeContent($cells[2]));
+        $subtotalCells = $records[6]->getElementsByTagName('td');
         $this->assertCount(2, $subtotalCells);
         $this->assertSame('Subtotal', $this->getNodeContent($subtotalCells[0]));
-        $this->assertSame('12,32 CHF', $this->getNodeContent($subtotalCells[1]));
-        $vatCells = $records[5]->getElementsByTagName('td');
+        $this->assertSame('11,31 CHF', $this->getNodeContent($subtotalCells[1]));
+        $vatCells = $records[7]->getElementsByTagName('td');
         $this->assertCount(2, $vatCells);
         $this->assertSame('VAT (7.7%)', $this->getNodeContent($vatCells[0]));
-        $this->assertSame('1,03 CHF', $this->getNodeContent($vatCells[1]));
-        $totalCells = $records[6]->getElementsByTagName('td');
+        $this->assertSame('0,94 CHF', $this->getNodeContent($vatCells[1]));
+        $totalCells = $records[8]->getElementsByTagName('td');
         $this->assertCount(2, $totalCells);
         $this->assertSame('Total', $this->getNodeContent($totalCells[0]));
-        $this->assertSame('13,35 CHF', $this->getNodeContent($totalCells[1]));
+        $this->assertSame('12,25 CHF', $this->getNodeContent($totalCells[1]));
     }
 
     /**
      * Test receipt PDF output
      */
     public function testPdfOutput(): void
     {
         $wallet = $this->getTestData();
         $receipt = new Receipt($wallet, 2020, 5);
         $pdf = $receipt->PdfOutput();
 
         $this->assertStringStartsWith("%PDF-1.", $pdf);
         $this->assertTrue(strlen($pdf) > 5000);
 
         // TODO: Test the content somehow
     }
 
     /**
      * Prepare data for a test
      *
      * @param string $country User country code
      *
      * @return \App\Wallet
      */
     protected function getTestData(string $country = null): Wallet
     {
         Bus::fake();
 
         $user = $this->getTestUser('receipt-test@kolabnow.com');
         $user->setSettings([
                 'first_name' => 'Firstname',
                 'last_name' => 'Lastname',
                 'billing_address' => "Test Unicode Straße 150\n10115 Berlin",
                 'country' => $country
         ]);
 
         $wallet = $user->wallets()->first();
 
         // Create two payments out of the 2020-05 period
         // and three in it, plus one in the period but unpaid,
-        // and one with amount 0
+        // and one with amount 0, and an extra refund and chanrgeback
 
         $payment = Payment::create([
                 'id' => 'AAA1',
                 'status' => PaymentProvider::STATUS_PAID,
                 'type' => PaymentProvider::TYPE_ONEOFF,
                 'description' => 'Paid in April',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 1111,
         ]);
         $payment->updated_at = Carbon::create(2020, 4, 30, 12, 0, 0);
         $payment->save();
 
         $payment = Payment::create([
                 'id' => 'AAA2',
                 'status' => PaymentProvider::STATUS_PAID,
                 'type' => PaymentProvider::TYPE_ONEOFF,
                 'description' => 'Paid in June',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 2222,
         ]);
         $payment->updated_at = Carbon::create(2020, 6, 1, 0, 0, 0);
         $payment->save();
 
         $payment = Payment::create([
                 'id' => 'AAA3',
                 'status' => PaymentProvider::STATUS_PAID,
                 'type' => PaymentProvider::TYPE_ONEOFF,
                 'description' => 'Auto-Payment Setup',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 0,
         ]);
         $payment->updated_at = Carbon::create(2020, 5, 1, 0, 0, 0);
         $payment->save();
 
         $payment = Payment::create([
                 'id' => 'AAA4',
                 'status' => PaymentProvider::STATUS_OPEN,
                 'type' => PaymentProvider::TYPE_ONEOFF,
                 'description' => 'Payment not yet paid',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 999,
         ]);
         $payment->updated_at = Carbon::create(2020, 5, 1, 0, 0, 0);
         $payment->save();
 
-        // ... so we expect the last three on the receipt
+        // ... so we expect the five three on the receipt
         $payment = Payment::create([
                 'id' => 'AAA5',
                 'status' => PaymentProvider::STATUS_PAID,
                 'type' => PaymentProvider::TYPE_ONEOFF,
                 'description' => 'Payment OK',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 1234,
         ]);
         $payment->updated_at = Carbon::create(2020, 5, 1, 0, 0, 0);
         $payment->save();
 
         $payment = Payment::create([
                 'id' => 'AAA6',
                 'status' => PaymentProvider::STATUS_PAID,
                 'type' => PaymentProvider::TYPE_ONEOFF,
                 'description' => 'Payment OK',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 1,
         ]);
         $payment->updated_at = Carbon::create(2020, 5, 10, 0, 0, 0);
         $payment->save();
 
         $payment = Payment::create([
                 'id' => 'AAA7',
                 'status' => PaymentProvider::STATUS_PAID,
                 'type' => PaymentProvider::TYPE_RECURRING,
                 'description' => 'Payment OK',
                 'wallet_id' => $wallet->id,
                 'provider' => 'stripe',
                 'amount' => 100,
         ]);
+        $payment->updated_at = Carbon::create(2020, 5, 21, 23, 59, 0);
+        $payment->save();
+
+        $payment = Payment::create([
+                'id' => 'ref1',
+                'status' => PaymentProvider::STATUS_PAID,
+                'type' => PaymentProvider::TYPE_REFUND,
+                'description' => 'refund desc',
+                'wallet_id' => $wallet->id,
+                'provider' => 'stripe',
+                'amount' => -100,
+        ]);
+        $payment->updated_at = Carbon::create(2020, 5, 30, 23, 59, 0);
+        $payment->save();
+
+        $payment = Payment::create([
+                'id' => 'chback1',
+                'status' => PaymentProvider::STATUS_PAID,
+                'type' => PaymentProvider::TYPE_CHARGEBACK,
+                'description' => '',
+                'wallet_id' => $wallet->id,
+                'provider' => 'stripe',
+                'amount' => -10,
+        ]);
         $payment->updated_at = Carbon::create(2020, 5, 31, 23, 59, 0);
         $payment->save();
 
         // Make sure some config is set so we can test it's put into the receipt
         if (empty(\config('app.company.name'))) {
             \config(['app.company.name' => 'Company Co.']);
         }
         if (empty(\config('app.company.email'))) {
             \config(['app.company.email' => 'email@domina.tld']);
         }
         if (empty(\config('app.company.details'))) {
             \config(['app.company.details' => 'VAT No. 123456789']);
         }
         if (empty(\config('app.company.address'))) {
             \config(['app.company.address' => "Test Street 12\n12345 Some Place"]);
         }
 
         return $wallet;
     }
 
     /**
      * Extract text from a HTML element replacing <br> with \n
      *
      * @param \DOMElement $node The HTML element
      *
      * @return string The content
      */
     protected function getNodeContent(\DOMElement $node)
     {
         $content = [];
         foreach ($node->childNodes as $child) {
             if ($child->nodeName == 'br') {
                 $content[] = "\n";
             } else {
                 $content[] = $child->textContent;
             }
         }
 
         return trim(implode($content));
     }
 }
diff --git a/src/tests/Feature/DomainTest.php b/src/tests/Feature/DomainTest.php
index 63f47c59..a183e2e3 100644
--- a/src/tests/Feature/DomainTest.php
+++ b/src/tests/Feature/DomainTest.php
@@ -1,221 +1,300 @@
 <?php
 
 namespace Tests\Feature;
 
 use App\Domain;
 use App\Entitlement;
 use App\Sku;
 use App\User;
-use Illuminate\Foundation\Testing\WithFaker;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
 
 class DomainTest extends TestCase
 {
     private $domains = [
         'public-active.com',
         'gmail.com',
         'ci-success-cname.kolab.org',
         'ci-success-txt.kolab.org',
         'ci-failure-cname.kolab.org',
         'ci-failure-txt.kolab.org',
         'ci-failure-none.kolab.org',
     ];
 
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         foreach ($this->domains as $domain) {
             $this->deleteTestDomain($domain);
         }
+
+        $this->deleteTestUser('user@gmail.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         foreach ($this->domains as $domain) {
             $this->deleteTestDomain($domain);
         }
 
+        $this->deleteTestUser('user@gmail.com');
+
         parent::tearDown();
     }
 
     /**
      * Test domain create/creating observer
      */
     public function testCreate(): void
     {
         Queue::fake();
 
         $domain = Domain::create([
                 'namespace' => 'GMAIL.COM',
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
         ]);
 
         $result = Domain::where('namespace', 'gmail.com')->first();
 
         $this->assertSame('gmail.com', $result->namespace);
         $this->assertSame($domain->id, $result->id);
         $this->assertSame($domain->type, $result->type);
         $this->assertSame(Domain::STATUS_NEW, $result->status);
     }
 
     /**
      * Test domain creating jobs
      */
     public function testCreateJobs(): void
     {
         // Fake the queue, assert that no jobs were pushed...
         Queue::fake();
         Queue::assertNothingPushed();
 
         $domain = Domain::create([
                 'namespace' => 'gmail.com',
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
         ]);
 
         Queue::assertPushed(\App\Jobs\Domain\CreateJob::class, 1);
 
         Queue::assertPushed(
             \App\Jobs\Domain\CreateJob::class,
             function ($job) use ($domain) {
                 $domainId = TestCase::getObjectProperty($job, 'domainId');
                 $domainNamespace = TestCase::getObjectProperty($job, 'domainNamespace');
 
                 return $domainId === $domain->id &&
                     $domainNamespace === $domain->namespace;
             }
         );
 
         $job = new \App\Jobs\Domain\CreateJob($domain->id);
         $job->handle();
     }
 
     /**
      * Tests getPublicDomains() method
      */
     public function testGetPublicDomains(): void
     {
         $public_domains = Domain::getPublicDomains();
 
         $this->assertNotContains('public-active.com', $public_domains);
 
         $queue = Queue::fake();
 
         $domain = Domain::create([
                 'namespace' => 'public-active.com',
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
         ]);
 
         // External domains should not be returned
         $public_domains = Domain::getPublicDomains();
         $this->assertNotContains('public-active.com', $public_domains);
 
         $domain = Domain::where('namespace', 'public-active.com')->first();
         $domain->type = Domain::TYPE_PUBLIC;
         $domain->save();
 
         $public_domains = Domain::getPublicDomains();
         $this->assertContains('public-active.com', $public_domains);
     }
 
     /**
      * Test domain (ownership) confirmation
      *
      * @group dns
      */
     public function testConfirm(): void
     {
         /*
             DNS records for positive and negative tests - kolab.org:
 
             ci-success-cname                A       212.103.80.148
             ci-success-cname                MX      10  mx01.kolabnow.com.
             ci-success-cname                TXT     "v=spf1 mx -all"
             kolab-verify.ci-success-cname   CNAME   2b719cfa4e1033b1e1e132977ed4fe3e.ci-success-cname
 
             ci-failure-cname                A       212.103.80.148
             ci-failure-cname                MX      10  mx01.kolabnow.com.
             kolab-verify.ci-failure-cname   CNAME   2b719cfa4e1033b1e1e132977ed4fe3e.ci-failure-cname
 
             ci-success-txt                  A       212.103.80.148
             ci-success-txt                  MX      10  mx01.kolabnow.com.
             ci-success-txt                  TXT     "v=spf1 mx -all"
             ci-success-txt                  TXT     "kolab-verify=de5d04ababb52d52e2519a2f16d11422"
 
             ci-failure-txt                  A       212.103.80.148
             ci-failure-txt                  MX      10  mx01.kolabnow.com.
             kolab-verify.ci-failure-txt     TXT     "kolab-verify=de5d04ababb52d52e2519a2f16d11422"
 
             ci-failure-none                 A       212.103.80.148
             ci-failure-none                 MX      10  mx01.kolabnow.com.
         */
 
         $queue = Queue::fake();
 
         $domain_props = ['status' => Domain::STATUS_NEW, 'type' => Domain::TYPE_EXTERNAL];
 
         $domain = $this->getTestDomain('ci-failure-none.kolab.org', $domain_props);
 
         $this->assertTrue($domain->confirm() === false);
         $this->assertFalse($domain->isConfirmed());
 
         $domain = $this->getTestDomain('ci-failure-txt.kolab.org', $domain_props);
 
         $this->assertTrue($domain->confirm() === false);
         $this->assertFalse($domain->isConfirmed());
 
         $domain = $this->getTestDomain('ci-failure-cname.kolab.org', $domain_props);
 
         $this->assertTrue($domain->confirm() === false);
         $this->assertFalse($domain->isConfirmed());
 
         $domain = $this->getTestDomain('ci-success-txt.kolab.org', $domain_props);
 
         $this->assertTrue($domain->confirm());
         $this->assertTrue($domain->isConfirmed());
 
         $domain = $this->getTestDomain('ci-success-cname.kolab.org', $domain_props);
 
         $this->assertTrue($domain->confirm());
         $this->assertTrue($domain->isConfirmed());
     }
 
     /**
      * Test domain deletion
      */
     public function testDelete(): void
     {
         Queue::fake();
 
         $domain = $this->getTestDomain('gmail.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_PUBLIC,
         ]);
 
         $domain->delete();
 
         $this->assertTrue($domain->fresh()->trashed());
         $this->assertFalse($domain->fresh()->isDeleted());
 
         // Delete the domain for real
         $job = new \App\Jobs\Domain\DeleteJob($domain->id);
         $job->handle();
 
         $this->assertTrue(Domain::withTrashed()->where('id', $domain->id)->first()->isDeleted());
 
         $domain->forceDelete();
 
         $this->assertCount(0, Domain::withTrashed()->where('id', $domain->id)->get());
     }
+
+    /**
+     * Test domain restoring
+     */
+    public function testRestore(): void
+    {
+        Queue::fake();
+
+        $domain = $this->getTestDomain('gmail.com', [
+                'status' => Domain::STATUS_NEW | Domain::STATUS_SUSPENDED
+                    | Domain::STATUS_LDAP_READY | Domain::STATUS_CONFIRMED,
+                'type' => Domain::TYPE_PUBLIC,
+        ]);
+
+        $user = $this->getTestUser('user@gmail.com');
+        $sku = \App\Sku::where('title', 'domain-hosting')->first();
+        $now = \Carbon\Carbon::now();
+
+        // Assign two entitlements to the domain, so we can assert that only the
+        // ones deleted last will be restored
+        $ent1 = \App\Entitlement::create([
+                'wallet_id' => $user->wallets->first()->id,
+                'sku_id' => $sku->id,
+                'cost' => 0,
+                'entitleable_id' => $domain->id,
+                'entitleable_type' => Domain::class,
+        ]);
+        $ent2 = \App\Entitlement::create([
+                'wallet_id' => $user->wallets->first()->id,
+                'sku_id' => $sku->id,
+                'cost' => 0,
+                'entitleable_id' => $domain->id,
+                'entitleable_type' => Domain::class,
+        ]);
+
+        $domain->delete();
+
+        $this->assertTrue($domain->fresh()->trashed());
+        $this->assertFalse($domain->fresh()->isDeleted());
+        $this->assertTrue($ent1->fresh()->trashed());
+        $this->assertTrue($ent2->fresh()->trashed());
+
+        // Backdate some properties
+        \App\Entitlement::withTrashed()->where('id', $ent2->id)->update(['deleted_at' => $now->subMinutes(2)]);
+        \App\Entitlement::withTrashed()->where('id', $ent1->id)->update(['updated_at' => $now->subMinutes(10)]);
+
+        Queue::fake();
+
+        $domain->restore();
+        $domain->refresh();
+
+        $this->assertFalse($domain->trashed());
+        $this->assertFalse($domain->isDeleted());
+        $this->assertFalse($domain->isSuspended());
+        $this->assertFalse($domain->isLdapReady());
+        $this->assertTrue($domain->isActive());
+        $this->assertTrue($domain->isConfirmed());
+
+        // Assert entitlements
+        $this->assertTrue($ent2->fresh()->trashed());
+        $this->assertFalse($ent1->fresh()->trashed());
+        $this->assertTrue($ent1->updated_at->greaterThan(\Carbon\Carbon::now()->subSeconds(5)));
+
+        // We expect only one CreateJob and one UpdateJob
+        // Because how Illuminate/Database/Eloquent/SoftDeletes::restore() method
+        // is implemented we cannot skip the UpdateJob in any way.
+        // I don't want to overwrite this method, the extra job shouldn't do any harm.
+        $this->assertCount(2, Queue::pushedJobs()); // @phpstan-ignore-line
+        Queue::assertPushed(\App\Jobs\Domain\UpdateJob::class, 1);
+        Queue::assertPushed(\App\Jobs\Domain\CreateJob::class, 1);
+        Queue::assertPushed(
+            \App\Jobs\Domain\CreateJob::class,
+            function ($job) use ($domain) {
+                return $domain->id === TestCase::getObjectProperty($job, 'domainId');
+            }
+        );
+    }
 }
diff --git a/src/tests/Feature/EntitlementTest.php b/src/tests/Feature/EntitlementTest.php
index 7f86d0a4..a18f673b 100644
--- a/src/tests/Feature/EntitlementTest.php
+++ b/src/tests/Feature/EntitlementTest.php
@@ -1,186 +1,184 @@
 <?php
 
 namespace Tests\Feature;
 
 use App\Domain;
 use App\Entitlement;
 use App\Package;
 use App\Sku;
 use App\User;
 use Carbon\Carbon;
 use Tests\TestCase;
 
 class EntitlementTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('entitlement-test@kolabnow.com');
         $this->deleteTestUser('entitled-user@custom-domain.com');
         $this->deleteTestDomain('custom-domain.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('entitlement-test@kolabnow.com');
         $this->deleteTestUser('entitled-user@custom-domain.com');
         $this->deleteTestDomain('custom-domain.com');
 
         parent::tearDown();
     }
 
+    /**
+     * Test for Entitlement::costsPerDay()
+     */
     public function testCostsPerDay(): void
     {
         // 444
         // 28 days: 15.86
         // 31 days: 14.32
         $user = $this->getTestUser('entitlement-test@kolabnow.com');
         $package = Package::where('title', 'kolab')->first();
         $mailbox = Sku::where('title', 'mailbox')->first();
 
         $user->assignPackage($package);
 
         $entitlement = $user->entitlements->where('sku_id', $mailbox->id)->first();
 
         $costsPerDay = $entitlement->costsPerDay();
 
         $this->assertTrue($costsPerDay < 15.86);
         $this->assertTrue($costsPerDay > 14.32);
     }
 
     /**
-     * Tests for User::AddEntitlement()
+     * Tests for entitlements
+     * @todo This really should be in User or Wallet tests file
      */
-    public function testUserAddEntitlement(): void
+    public function testEntitlements(): void
     {
         $packageDomain = Package::where('title', 'domain-hosting')->first();
         $packageKolab = Package::where('title', 'kolab')->first();
 
         $skuDomain = Sku::where('title', 'domain-hosting')->first();
         $skuMailbox = Sku::where('title', 'mailbox')->first();
 
         $owner = $this->getTestUser('entitlement-test@kolabnow.com');
         $user = $this->getTestUser('entitled-user@custom-domain.com');
 
         $domain = $this->getTestDomain(
             'custom-domain.com',
             [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
             ]
         );
 
         $domain->assignPackage($packageDomain, $owner);
 
         $owner->assignPackage($packageKolab);
         $owner->assignPackage($packageKolab, $user);
 
         $wallet = $owner->wallets->first();
 
         $this->assertCount(4, $owner->entitlements()->get());
         $this->assertCount(1, $skuDomain->entitlements()->where('wallet_id', $wallet->id)->get());
         $this->assertCount(2, $skuMailbox->entitlements()->where('wallet_id', $wallet->id)->get());
         $this->assertCount(9, $wallet->entitlements);
 
         $this->backdateEntitlements(
             $owner->entitlements,
             Carbon::now()->subMonthsWithoutOverflow(1)
         );
 
         $wallet->chargeEntitlements();
 
         $this->assertTrue($wallet->fresh()->balance < 0);
     }
 
-    public function testAddExistingEntitlement(): void
-    {
-        $this->markTestIncomplete();
-    }
-
+    /**
+     * @todo This really should be in User tests file
+     */
     public function testEntitlementFunctions(): void
     {
         $user = $this->getTestUser('entitlement-test@kolabnow.com');
 
         $package = \App\Package::where('title', 'kolab')->first();
 
         $user->assignPackage($package);
 
         $wallet = $user->wallets()->first();
         $this->assertNotNull($wallet);
 
         $sku = \App\Sku::where('title', 'mailbox')->first();
-        $this->assertNotNull($sku);
 
         $entitlement = Entitlement::where('wallet_id', $wallet->id)
             ->where('sku_id', $sku->id)->first();
 
         $this->assertNotNull($entitlement);
-
-        $eSKU = $entitlement->sku;
-        $this->assertSame($sku->id, $eSKU->id);
-
-        $eWallet = $entitlement->wallet;
-        $this->assertSame($wallet->id, $eWallet->id);
-
-        $eEntitleable = $entitlement->entitleable;
-        $this->assertEquals($user->id, $eEntitleable->id);
-        $this->assertTrue($eEntitleable instanceof \App\User);
+        $this->assertSame($sku->id, $entitlement->sku->id);
+        $this->assertSame($wallet->id, $entitlement->wallet->id);
+        $this->assertEquals($user->id, $entitlement->entitleable->id);
+        $this->assertTrue($entitlement->entitleable instanceof \App\User);
     }
 
+    /**
+     * @todo This really should be in User or Wallet tests file
+     */
     public function testBillDeletedEntitlement(): void
     {
         $user = $this->getTestUser('entitlement-test@kolabnow.com');
         $package = \App\Package::where('title', 'kolab')->first();
 
         $storage = \App\Sku::where('title', 'storage')->first();
 
         $user->assignPackage($package);
         // some additional SKUs so we have something to delete.
         $user->assignSku($storage, 4);
 
         // the mailbox, the groupware, the 2 original storage and the additional 4
         $this->assertCount(8, $user->fresh()->entitlements);
 
         $wallet = $user->wallets()->first();
 
         $backdate = Carbon::now()->subWeeks(7);
         $this->backdateEntitlements($user->entitlements, $backdate);
 
         $charge = $wallet->chargeEntitlements();
 
         $this->assertSame(-1099, $wallet->balance);
 
         $balance = $wallet->balance;
         $discount = \App\Discount::where('discount', 30)->first();
         $wallet->discount()->associate($discount);
         $wallet->save();
 
         $user->removeSku($storage, 4);
 
         // we expect the wallet to have been charged for ~3 weeks of use of
         // 4 deleted storage entitlements, it should also take discount into account
         $backdate->addMonthsWithoutOverflow(1);
         $diffInDays = $backdate->diffInDays(Carbon::now());
 
         // entitlements-num * cost * discount * days-in-month
         $max = intval(4 * 25 * 0.7 * $diffInDays / 28);
         $min = intval(4 * 25 * 0.7 * $diffInDays / 31);
 
         $wallet->refresh();
         $this->assertTrue($wallet->balance >= $balance - $max);
         $this->assertTrue($wallet->balance <= $balance - $min);
 
         $transactions = \App\Transaction::where('object_id', $wallet->id)
             ->where('object_type', \App\Wallet::class)->get();
 
         // one round of the monthly invoicing, four sku deletions getting invoiced
         $this->assertCount(5, $transactions);
     }
 }
diff --git a/src/tests/Feature/GroupTest.php b/src/tests/Feature/GroupTest.php
new file mode 100644
index 00000000..fc423b03
--- /dev/null
+++ b/src/tests/Feature/GroupTest.php
@@ -0,0 +1,266 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Group;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class GroupTest extends TestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestUser('user-test@kolabnow.com');
+        $this->deleteTestGroup('group-test@kolabnow.com');
+    }
+
+    public function tearDown(): void
+    {
+        $this->deleteTestUser('user-test@kolabnow.com');
+        $this->deleteTestGroup('group-test@kolabnow.com');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Tests for Group::assignToWallet()
+     */
+    public function testAssignToWallet(): void
+    {
+        $user = $this->getTestUser('user-test@kolabnow.com');
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+
+        $result = $group->assignToWallet($user->wallets->first());
+
+        $this->assertSame($group, $result);
+        $this->assertSame(1, $group->entitlement()->count());
+
+        // Can't be done twice on the same group
+        $this->expectException(\Exception::class);
+        $result->assignToWallet($user->wallets->first());
+    }
+
+    /**
+     * Test group status assignment and is*() methods
+     */
+    public function testStatus(): void
+    {
+        $group = new Group();
+
+        $this->assertSame(false, $group->isNew());
+        $this->assertSame(false, $group->isActive());
+        $this->assertSame(false, $group->isDeleted());
+        $this->assertSame(false, $group->isLdapReady());
+        $this->assertSame(false, $group->isSuspended());
+
+        $group->status = Group::STATUS_NEW;
+
+        $this->assertSame(true, $group->isNew());
+        $this->assertSame(false, $group->isActive());
+        $this->assertSame(false, $group->isDeleted());
+        $this->assertSame(false, $group->isLdapReady());
+        $this->assertSame(false, $group->isSuspended());
+
+        $group->status |= Group::STATUS_ACTIVE;
+
+        $this->assertSame(true, $group->isNew());
+        $this->assertSame(true, $group->isActive());
+        $this->assertSame(false, $group->isDeleted());
+        $this->assertSame(false, $group->isLdapReady());
+        $this->assertSame(false, $group->isSuspended());
+
+        $group->status |= Group::STATUS_LDAP_READY;
+
+        $this->assertSame(true, $group->isNew());
+        $this->assertSame(true, $group->isActive());
+        $this->assertSame(false, $group->isDeleted());
+        $this->assertSame(true, $group->isLdapReady());
+        $this->assertSame(false, $group->isSuspended());
+
+        $group->status |= Group::STATUS_DELETED;
+
+        $this->assertSame(true, $group->isNew());
+        $this->assertSame(true, $group->isActive());
+        $this->assertSame(true, $group->isDeleted());
+        $this->assertSame(true, $group->isLdapReady());
+        $this->assertSame(false, $group->isSuspended());
+
+        $group->status |= Group::STATUS_SUSPENDED;
+
+        $this->assertSame(true, $group->isNew());
+        $this->assertSame(true, $group->isActive());
+        $this->assertSame(true, $group->isDeleted());
+        $this->assertSame(true, $group->isLdapReady());
+        $this->assertSame(true, $group->isSuspended());
+
+        // Unknown status value
+        $this->expectException(\Exception::class);
+        $group->status = 111;
+    }
+
+    /**
+     * Test creating a group
+     */
+    public function testCreate(): void
+    {
+        Queue::fake();
+
+        $group = Group::create(['email' => 'GROUP-test@kolabnow.com']);
+
+        $this->assertSame('group-test@kolabnow.com', $group->email);
+        $this->assertRegExp('/^[0-9]{1,20}$/', $group->id);
+        $this->assertSame([], $group->members);
+        $this->assertTrue($group->isNew());
+        $this->assertTrue($group->isActive());
+
+        Queue::assertPushed(
+            \App\Jobs\Group\CreateJob::class,
+            function ($job) use ($group) {
+                $groupEmail = TestCase::getObjectProperty($job, 'groupEmail');
+                $groupId = TestCase::getObjectProperty($job, 'groupId');
+
+                return $groupEmail === $group->email
+                    && $groupId === $group->id;
+            }
+        );
+    }
+
+    /**
+     * Test group deletion and force-deletion
+     */
+    public function testDelete(): void
+    {
+        Queue::fake();
+
+        $user = $this->getTestUser('user-test@kolabnow.com');
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+        $group->assignToWallet($user->wallets->first());
+
+        $entitlements = \App\Entitlement::where('entitleable_id', $group->id);
+
+        $this->assertSame(1, $entitlements->count());
+
+        $group->delete();
+
+        $this->assertTrue($group->fresh()->trashed());
+        $this->assertSame(0, $entitlements->count());
+        $this->assertSame(1, $entitlements->withTrashed()->count());
+
+        $group->forceDelete();
+
+        $this->assertSame(0, $entitlements->withTrashed()->count());
+        $this->assertCount(0, Group::withTrashed()->where('id', $group->id)->get());
+
+        Queue::assertPushed(\App\Jobs\Group\DeleteJob::class, 1);
+        Queue::assertPushed(
+            \App\Jobs\Group\DeleteJob::class,
+            function ($job) use ($group) {
+                $groupEmail = TestCase::getObjectProperty($job, 'groupEmail');
+                $groupId = TestCase::getObjectProperty($job, 'groupId');
+
+                return $groupEmail === $group->email
+                    && $groupId === $group->id;
+            }
+        );
+    }
+
+    /**
+     * Tests for Group::emailExists()
+     */
+    public function testEmailExists(): void
+    {
+        Queue::fake();
+
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+
+        $this->assertFalse(Group::emailExists('unknown@domain.tld'));
+        $this->assertTrue(Group::emailExists($group->email));
+
+        $result = Group::emailExists($group->email, true);
+        $this->assertSame($result->id, $group->id);
+
+        $group->delete();
+
+        $this->assertTrue(Group::emailExists($group->email));
+
+        $result = Group::emailExists($group->email, true);
+        $this->assertSame($result->id, $group->id);
+    }
+
+    /**
+     * Tests for Group::suspend()
+     */
+    public function testSuspend(): void
+    {
+        Queue::fake();
+
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+        $group->suspend();
+
+        $this->assertTrue($group->isSuspended());
+
+        Queue::assertPushed(\App\Jobs\Group\UpdateJob::class, 1);
+        Queue::assertPushed(
+            \App\Jobs\Group\UpdateJob::class,
+            function ($job) use ($group) {
+                $groupEmail = TestCase::getObjectProperty($job, 'groupEmail');
+                $groupId = TestCase::getObjectProperty($job, 'groupId');
+
+                return $groupEmail === $group->email
+                    && $groupId === $group->id;
+            }
+        );
+    }
+
+    /**
+     * Test updating a group
+     */
+    public function testUpdate(): void
+    {
+        Queue::fake();
+
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+        $group->status |= Group::STATUS_DELETED;
+        $group->save();
+
+        Queue::assertPushed(\App\Jobs\Group\UpdateJob::class, 1);
+        Queue::assertPushed(
+            \App\Jobs\Group\UpdateJob::class,
+            function ($job) use ($group) {
+                $groupEmail = TestCase::getObjectProperty($job, 'groupEmail');
+                $groupId = TestCase::getObjectProperty($job, 'groupId');
+
+                return $groupEmail === $group->email
+                    && $groupId === $group->id;
+            }
+        );
+    }
+
+    /**
+     * Tests for Group::unsuspend()
+     */
+    public function testUnsuspend(): void
+    {
+        Queue::fake();
+
+        $group = $this->getTestGroup('group-test@kolabnow.com');
+        $group->status = Group::STATUS_SUSPENDED;
+        $group->unsuspend();
+
+        $this->assertFalse($group->isSuspended());
+
+        Queue::assertPushed(\App\Jobs\Group\UpdateJob::class, 1);
+        Queue::assertPushed(
+            \App\Jobs\Group\UpdateJob::class,
+            function ($job) use ($group) {
+                $groupEmail = TestCase::getObjectProperty($job, 'groupEmail');
+                $groupId = TestCase::getObjectProperty($job, 'groupId');
+
+                return $groupEmail === $group->email
+                    && $groupId === $group->id;
+            }
+        );
+    }
+}
diff --git a/src/tests/Feature/Jobs/DomainCreateTest.php b/src/tests/Feature/Jobs/DomainCreateTest.php
index ad509ac1..f369362f 100644
--- a/src/tests/Feature/Jobs/DomainCreateTest.php
+++ b/src/tests/Feature/Jobs/DomainCreateTest.php
@@ -1,68 +1,74 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\Domain;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
 
 class DomainCreateTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestDomain('domain-create-test.com');
     }
 
     public function tearDown(): void
     {
         $this->deleteTestDomain('domain-create-test.com');
 
         parent::tearDown();
     }
 
     /**
      * Test job handle
      *
      * @group ldap
      */
     public function testHandle(): void
     {
         $domain = $this->getTestDomain(
             'domain-create-test.com',
             [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
             ]
         );
 
         $this->assertFalse($domain->isLdapReady());
 
         // Fake the queue, assert that no jobs were pushed...
         Queue::fake();
         Queue::assertNothingPushed();
 
         $job = new \App\Jobs\Domain\CreateJob($domain->id);
         $job->handle();
 
         $this->assertTrue($domain->fresh()->isLdapReady());
 
         Queue::assertPushed(\App\Jobs\Domain\VerifyJob::class, 1);
 
         Queue::assertPushed(
             \App\Jobs\Domain\VerifyJob::class,
             function ($job) use ($domain) {
                 $domainId = TestCase::getObjectProperty($job, 'domainId');
                 $domainNamespace = TestCase::getObjectProperty($job, 'domainNamespace');
 
                 return $domainId === $domain->id &&
                     $domainNamespace === $domain->namespace;
             }
         );
+
+        // Test job releasing on unknown identifier
+        $job = new \App\Jobs\Domain\CreateJob(123);
+        $job->handle();
+
+        $this->assertTrue($job->isReleased());
+        $this->assertFalse($job->hasFailed());
     }
 }
diff --git a/src/tests/Feature/Jobs/DomainVerifyTest.php b/src/tests/Feature/Jobs/DomainVerifyTest.php
index 7dff2a24..f0e12d5f 100644
--- a/src/tests/Feature/Jobs/DomainVerifyTest.php
+++ b/src/tests/Feature/Jobs/DomainVerifyTest.php
@@ -1,75 +1,81 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\Domain;
-use Illuminate\Support\Facades\Mail;
 use Tests\TestCase;
 
 class DomainVerifyTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestDomain('gmail.com');
         $this->deleteTestDomain('some-non-existing-domain.fff');
     }
 
     public function tearDown(): void
     {
         $this->deleteTestDomain('gmail.com');
         $this->deleteTestDomain('some-non-existing-domain.fff');
 
         parent::tearDown();
     }
 
     /**
      * Test job handle (existing domain)
      *
      * @group dns
      */
     public function testHandle(): void
     {
         $domain = $this->getTestDomain(
             'gmail.com',
             [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
             ]
         );
 
         $this->assertFalse($domain->isVerified());
 
         $job = new \App\Jobs\Domain\VerifyJob($domain->id);
         $job->handle();
 
         $this->assertTrue($domain->fresh()->isVerified());
+
+        // Test non-existing domain ID
+        $job = new \App\Jobs\Domain\VerifyJob(123);
+        $job->handle();
+
+        $this->assertTrue($job->hasFailed());
+        $this->assertSame("Domain 123 could not be found in the database.", $job->failureMessage);
     }
 
     /**
      * Test job handle (non-existing domain)
      *
      * @group dns
      */
     public function testHandleNonExisting(): void
     {
         $domain = $this->getTestDomain(
             'some-non-existing-domain.fff',
             [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_EXTERNAL,
             ]
         );
 
         $this->assertFalse($domain->isVerified());
 
         $job = new \App\Jobs\Domain\VerifyJob($domain->id);
         $job->handle();
 
         $this->assertFalse($domain->fresh()->isVerified());
     }
 }
diff --git a/src/tests/Feature/Jobs/Group/CreateTest.php b/src/tests/Feature/Jobs/Group/CreateTest.php
new file mode 100644
index 00000000..99b87a3b
--- /dev/null
+++ b/src/tests/Feature/Jobs/Group/CreateTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Feature\Jobs\Group;
+
+use App\Group;
+use Tests\TestCase;
+
+class CreateTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group@kolab.org');
+    }
+
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group@kolab.org');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test job handle
+     *
+     * @group ldap
+     */
+    public function testHandle(): void
+    {
+        $group = $this->getTestGroup('group@kolab.org', ['members' => []]);
+
+        $this->assertFalse($group->isLdapReady());
+
+        $job = new \App\Jobs\Group\CreateJob($group->id);
+        $job->handle();
+
+        $this->assertTrue($group->fresh()->isLdapReady());
+
+        // Test non-existing group ID
+        $job = new \App\Jobs\Group\CreateJob(123);
+        $job->handle();
+
+        $this->assertTrue($job->isReleased());
+        $this->assertFalse($job->hasFailed());
+    }
+}
diff --git a/src/tests/Feature/Jobs/Group/DeleteTest.php b/src/tests/Feature/Jobs/Group/DeleteTest.php
new file mode 100644
index 00000000..1a716173
--- /dev/null
+++ b/src/tests/Feature/Jobs/Group/DeleteTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Jobs\Group;
+
+use App\Group;
+use Tests\TestCase;
+
+class DeleteTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group@kolab.org');
+    }
+
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group@kolab.org');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test job handle
+     *
+     * @group ldap
+     */
+    public function testHandle(): void
+    {
+        $group = $this->getTestGroup('group@kolab.org', [
+                'members' => [],
+                'status' => Group::STATUS_NEW
+        ]);
+
+        // create to domain first
+        $job = new \App\Jobs\Group\CreateJob($group->id);
+        $job->handle();
+
+        $this->assertTrue($group->fresh()->isLdapReady());
+
+        $job = new \App\Jobs\Group\DeleteJob($group->id);
+        $job->handle();
+
+        $group->refresh();
+
+        $this->assertFalse($group->isLdapReady());
+        $this->assertTrue($group->isDeleted());
+
+        // Test non-existing group ID
+        $job = new \App\Jobs\Group\DeleteJob(123);
+        $job->handle();
+
+        $this->assertTrue($job->hasFailed());
+        $this->assertSame("Group 123 could not be found in the database.", $job->failureMessage);
+    }
+}
diff --git a/src/tests/Feature/Jobs/Group/UpdateTest.php b/src/tests/Feature/Jobs/Group/UpdateTest.php
new file mode 100644
index 00000000..723cbb68
--- /dev/null
+++ b/src/tests/Feature/Jobs/Group/UpdateTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Tests\Feature\Jobs\Group;
+
+use App\Group;
+use Tests\TestCase;
+
+class UpdateTest extends TestCase
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->deleteTestGroup('group@kolab.org');
+    }
+
+    public function tearDown(): void
+    {
+        $this->deleteTestGroup('group@kolab.org');
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test job handle
+     *
+     * @group ldap
+     */
+    public function testHandle(): void
+    {
+        $group = $this->getTestGroup('group@kolab.org', ['members' => []]);
+
+        $job = new \App\Jobs\Group\UpdateJob($group->id);
+        $job->handle();
+
+        // TODO: Test if group properties (members) actually changed in LDAP
+        $this->assertTrue(true);
+
+        // Test non-existing group ID
+        $job = new \App\Jobs\Group\UpdateJob(123);
+        $job->handle();
+
+        $this->assertTrue($job->hasFailed());
+        $this->assertSame("Group 123 could not be found in the database.", $job->failureMessage);
+    }
+}
diff --git a/src/tests/Feature/Jobs/PaymentEmailTest.php b/src/tests/Feature/Jobs/PaymentEmailTest.php
index 9ef6cfca..b2813a87 100644
--- a/src/tests/Feature/Jobs/PaymentEmailTest.php
+++ b/src/tests/Feature/Jobs/PaymentEmailTest.php
@@ -1,120 +1,122 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\Jobs\PaymentEmail;
 use App\Mail\PaymentFailure;
 use App\Mail\PaymentSuccess;
 use App\Payment;
 use App\Providers\PaymentProvider;
 use Illuminate\Support\Facades\Mail;
 use Tests\TestCase;
 
 class PaymentEmailTest extends TestCase
 {
     /**
      * {@inheritDoc}
      *
      * @return void
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('PaymentEmail@UserAccount.com');
     }
 
     /**
      * {@inheritDoc}
      *
      * @return void
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('PaymentEmail@UserAccount.com');
 
         parent::tearDown();
     }
 
     /**
      * Test job handle
      *
      * @return void
      */
     public function testHandle()
     {
         $user = $this->getTestUser('PaymentEmail@UserAccount.com');
         $user->setSetting('external_email', 'ext@email.tld');
         $wallet = $user->wallets()->first();
 
         $payment = new Payment();
         $payment->id = 'test-payment';
         $payment->wallet_id = $wallet->id;
         $payment->amount = 100;
+        $payment->currency_amount = 100;
+        $payment->currency = 'CHF';
         $payment->status = PaymentProvider::STATUS_PAID;
         $payment->description = 'test';
         $payment->provider = 'stripe';
         $payment->type = PaymentProvider::TYPE_ONEOFF;
         $payment->save();
 
         Mail::fake();
 
         // Assert that no jobs were pushed...
         Mail::assertNothingSent();
 
         $job = new PaymentEmail($payment);
         $job->handle();
 
         // Assert the email sending job was pushed once
         Mail::assertSent(PaymentSuccess::class, 1);
 
         // Assert the mail was sent to the user's email
         Mail::assertSent(PaymentSuccess::class, function ($mail) {
             return $mail->hasTo('ext@email.tld') && !$mail->hasCc('ext@email.tld');
         });
 
         $payment->status = PaymentProvider::STATUS_FAILED;
         $payment->save();
 
         $job = new PaymentEmail($payment);
         $job->handle();
 
         // Assert the email sending job was pushed once
         Mail::assertSent(PaymentFailure::class, 1);
 
         // Assert the mail was sent to the user's email
         Mail::assertSent(PaymentFailure::class, function ($mail) {
             return $mail->hasTo('ext@email.tld') && !$mail->hasCc('ext@email.tld');
         });
 
         $payment->status = PaymentProvider::STATUS_EXPIRED;
         $payment->save();
 
         $job = new PaymentEmail($payment);
         $job->handle();
 
         // Assert the email sending job was pushed twice
         Mail::assertSent(PaymentFailure::class, 2);
 
         // None of statuses below should trigger an email
         Mail::fake();
 
         $states = [
             PaymentProvider::STATUS_OPEN,
             PaymentProvider::STATUS_CANCELED,
             PaymentProvider::STATUS_PENDING,
             PaymentProvider::STATUS_AUTHORIZED,
         ];
 
         foreach ($states as $state) {
             $payment->status = $state;
             $payment->save();
 
             $job = new PaymentEmail($payment);
             $job->handle();
         }
 
         // Assert that no mailables were sent...
         Mail::assertNothingSent();
     }
 }
diff --git a/src/tests/Feature/Jobs/UserCreateTest.php b/src/tests/Feature/Jobs/UserCreateTest.php
index 3b21d101..0a67c562 100644
--- a/src/tests/Feature/Jobs/UserCreateTest.php
+++ b/src/tests/Feature/Jobs/UserCreateTest.php
@@ -1,78 +1,78 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\User;
 use Tests\TestCase;
 
 class UserCreateTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('new-job-user@' . \config('app.domain'));
     }
 
     public function tearDown(): void
     {
         $this->deleteTestUser('new-job-user@' . \config('app.domain'));
 
         parent::tearDown();
     }
 
     /**
      * Test job handle
      *
      * @group ldap
      */
     public function testHandle(): void
     {
         $user = $this->getTestUser('new-job-user@' . \config('app.domain'));
 
         $this->assertFalse($user->isLdapReady());
 
         $job = new \App\Jobs\User\CreateJob($user->id);
         $job->handle();
 
         $this->assertTrue($user->fresh()->isLdapReady());
         $this->assertFalse($job->hasFailed());
 
         // Test job failures
         $job = new \App\Jobs\User\CreateJob($user->id);
         $job->handle();
 
         $this->assertTrue($job->hasFailed());
         $this->assertSame("User {$user->id} is already marked as ldap-ready.", $job->failureMessage);
 
         $user->status |= User::STATUS_DELETED;
         $user->save();
 
         $job = new \App\Jobs\User\CreateJob($user->id);
         $job->handle();
 
         $this->assertTrue($job->hasFailed());
         $this->assertSame("User {$user->id} is marked as deleted.", $job->failureMessage);
 
         $user->status ^= User::STATUS_DELETED;
         $user->save();
         $user->delete();
 
         $job = new \App\Jobs\User\CreateJob($user->id);
         $job->handle();
 
         $this->assertTrue($job->hasFailed());
         $this->assertSame("User {$user->id} is actually deleted.", $job->failureMessage);
 
         // TODO: Test failures on domain sanity checks
 
         $job = new \App\Jobs\User\CreateJob(123);
         $job->handle();
 
-        $this->assertTrue($job->hasFailed());
-        $this->assertSame("User 123 could not be found in the database.", $job->failureMessage);
+        $this->assertTrue($job->isReleased());
+        $this->assertFalse($job->hasFailed());
     }
 }
diff --git a/src/tests/Feature/Jobs/UserUpdateTest.php b/src/tests/Feature/Jobs/UserUpdateTest.php
index ab57a564..27d371a3 100644
--- a/src/tests/Feature/Jobs/UserUpdateTest.php
+++ b/src/tests/Feature/Jobs/UserUpdateTest.php
@@ -1,87 +1,94 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\Backends\LDAP;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
 
 class UserUpdateTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('new-job-user@' . \config('app.domain'));
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $this->deleteTestUser('new-job-user@' . \config('app.domain'));
 
         parent::tearDown();
     }
 
     /**
      * Test job handle
      *
      * @group ldap
      */
     public function testHandle(): void
     {
         // Ignore any jobs created here (e.g. on setAliases() use)
         Queue::fake();
 
         $user = $this->getTestUser('new-job-user@' . \config('app.domain'));
 
         // Create the user in LDAP
         $job = new \App\Jobs\User\CreateJob($user->id);
         $job->handle();
 
         // Test setting two aliases
         $aliases = [
             'new-job-user1@' . \config('app.domain'),
             'new-job-user2@' . \config('app.domain'),
         ];
 
         $user->setAliases($aliases);
 
         $job = new \App\Jobs\User\UpdateJob($user->id);
         $job->handle();
 
         $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
 
         $this->assertSame($aliases, $ldap_user['alias']);
 
         // Test updating aliases list
         $aliases = [
             'new-job-user1@' . \config('app.domain'),
         ];
 
         $user->setAliases($aliases);
 
         $job = new \App\Jobs\User\UpdateJob($user->id);
         $job->handle();
 
         $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
 
         $this->assertSame($aliases, (array) $ldap_user['alias']);
 
         // Test unsetting aliases list
         $aliases = [];
         $user->setAliases($aliases);
 
         $job = new \App\Jobs\User\UpdateJob($user->id);
         $job->handle();
 
         $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
 
         $this->assertTrue(empty($ldap_user['alias']));
+
+        // Test non-existing user ID
+        $job = new \App\Jobs\User\UpdateJob(123);
+        $job->handle();
+
+        $this->assertTrue($job->hasFailed());
+        $this->assertSame("User 123 could not be found in the database.", $job->failureMessage);
     }
 }
diff --git a/src/tests/Feature/Jobs/UserVerifyTest.php b/src/tests/Feature/Jobs/UserVerifyTest.php
index 325bcdc7..d2130c18 100644
--- a/src/tests/Feature/Jobs/UserVerifyTest.php
+++ b/src/tests/Feature/Jobs/UserVerifyTest.php
@@ -1,67 +1,75 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\User;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
 
 class UserVerifyTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $ned = $this->getTestUser('ned@kolab.org');
         $ned->status |= User::STATUS_IMAP_READY;
         $ned->save();
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $ned = $this->getTestUser('ned@kolab.org');
         $ned->status |= User::STATUS_IMAP_READY;
         $ned->save();
 
         parent::tearDown();
     }
 
     /**
      * Test job handle
      *
      * @group imap
      */
     public function testHandle(): void
     {
         Queue::fake();
 
+        // Test non-existing user ID
+        $job = new \App\Jobs\User\VerifyJob(123);
+        $job->handle();
+
+        $this->assertTrue($job->hasFailed());
+        $this->assertSame("User 123 could not be found in the database.", $job->failureMessage);
+
+        // Test existing user
         $user = $this->getTestUser('ned@kolab.org');
 
         if ($user->isImapReady()) {
             $user->status ^= User::STATUS_IMAP_READY;
             $user->save();
         }
 
         $this->assertFalse($user->isImapReady());
 
         for ($i = 0; $i < 10; $i++) {
             $job = new \App\Jobs\User\VerifyJob($user->id);
             $job->handle();
 
             if ($user->fresh()->isImapReady()) {
                 $this->assertTrue(true);
                 return;
             }
 
             sleep(1);
         }
 
         $this->assertTrue(false, "Unable to verify the IMAP account is set up in time");
     }
 }
diff --git a/src/tests/Feature/Jobs/WalletCheckTest.php b/src/tests/Feature/Jobs/WalletCheckTest.php
index 72faaa5e..a58778b3 100644
--- a/src/tests/Feature/Jobs/WalletCheckTest.php
+++ b/src/tests/Feature/Jobs/WalletCheckTest.php
@@ -1,328 +1,328 @@
 <?php
 
 namespace Tests\Feature\Jobs;
 
 use App\Jobs\WalletCheck;
 use App\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Mail;
 use Tests\TestCase;
 
 class WalletCheckTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
     public function setUp(): void
     {
         parent::setUp();
 
         $ned = $this->getTestUser('ned@kolab.org');
         if ($ned->isSuspended()) {
             $ned->status -= User::STATUS_SUSPENDED;
             $ned->save();
         }
 
         $this->deleteTestUser('wallet-check@kolabnow.com');
     }
 
     /**
      * {@inheritDoc}
      */
     public function tearDown(): void
     {
         $ned = $this->getTestUser('ned@kolab.org');
         if ($ned->isSuspended()) {
             $ned->status -= User::STATUS_SUSPENDED;
             $ned->save();
         }
 
         $this->deleteTestUser('wallet-check@kolabnow.com');
 
         parent::tearDown();
     }
 
     /**
      * Test job handle, initial negative-balance notification
      */
     public function testHandleInitial(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance is not negative, double-update+save for proper resetting of the state
         $wallet->balance = -100;
         $wallet->save();
         $wallet->balance = 0;
         $wallet->save();
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
 
         // Balance is negative now
         $wallet->balance = -100;
         $wallet->save();
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
 
         // Balance turned negative 2 hours ago, expect mail sent
         $wallet->setSetting('balance_negative_since', $now->subHours(2)->toDateTimeString());
         $wallet->setSetting('balance_warning_initial', null);
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, but not to his external email
         Mail::assertSent(\App\Mail\NegativeBalance::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalance::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
         });
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
 
         // Test the migration scenario where a negative wallet has no balance_negative_since set yet
         Mail::fake();
         $wallet->setSetting('balance_negative_since', null);
         $wallet->setSetting('balance_warning_initial', null);
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, but not to his external email
         Mail::assertSent(\App\Mail\NegativeBalance::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalance::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
         });
 
         $wallet->refresh();
         $today_regexp = '/' . Carbon::now()->toDateString() . ' [0-9]{2}:[0-9]{2}:[0-9]{2}/';
         $this->assertRegExp($today_regexp, $wallet->getSetting('balance_negative_since'));
         $this->assertRegExp($today_regexp, $wallet->getSetting('balance_warning_initial'));
     }
 
     /**
      * Test job handle, top-up before reminder notification
      *
      * @depends testHandleInitial
      */
     public function testHandleBeforeReminder(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7-1 days ago
         $wallet->setSetting('balance_negative_since', $now->subDays(7 - 1)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $res = $job->handle();
 
         Mail::assertNothingSent();
 
         // TODO: Test that it actually executed the topUpWallet()
         $this->assertSame(WalletCheck::THRESHOLD_BEFORE_REMINDER, $res);
         $this->assertFalse($user->fresh()->isSuspended());
     }
 
     /**
      * Test job handle, reminder notification
      *
      * @depends testHandleBeforeReminder
      */
     public function testHandleReminder(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7+1 days ago, expect mail sent
         $wallet->setSetting('balance_negative_since', $now->subDays(7 + 1)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, but not to his external email
         Mail::assertSent(\App\Mail\NegativeBalanceReminder::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalanceReminder::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
         });
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
     }
 
     /**
      * Test job handle, top-up wallet before account suspending
      *
      * @depends testHandleReminder
      */
     public function testHandleBeforeSuspended(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7+14-1 days ago
         $days = 7 + 14 - 1;
         $wallet->setSetting('balance_negative_since', $now->subDays($days)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $res = $job->handle();
 
         Mail::assertNothingSent();
 
         // TODO: Test that it actually executed the topUpWallet()
         $this->assertSame(WalletCheck::THRESHOLD_BEFORE_SUSPEND, $res);
         $this->assertFalse($user->fresh()->isSuspended());
     }
 
     /**
      * Test job handle, account suspending
      *
      * @depends testHandleBeforeSuspended
      */
     public function testHandleSuspended(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7+14+1 days ago, expect mail sent
         $days = 7 + 14 + 1;
         $wallet->setSetting('balance_negative_since', $now->subDays($days)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, but not to his external email
         Mail::assertSent(\App\Mail\NegativeBalanceSuspended::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalanceSuspended::class, function ($mail) use ($user) {
-            return $mail->hasTo($user->email) && !$mail->hasCc('external@test.com');
+            return $mail->hasTo($user->email) && $mail->hasCc('external@test.com');
         });
 
         // Check that it has been suspended
         $this->assertTrue($user->fresh()->isSuspended());
 
         // TODO: Test that group account members/domain are also being suspended
         /*
         foreach ($wallet->entitlements()->fresh()->get() as $entitlement) {
             if (
                 $entitlement->entitleable_type == \App\Domain::class
                 || $entitlement->entitleable_type == \App\User::class
             ) {
                 $this->assertTrue($entitlement->entitleable->isSuspended());
             }
         }
         */
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
     }
 
     /**
      * Test job handle, final warning before delete
      *
      * @depends testHandleSuspended
      */
     public function testHandleBeforeDelete(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('ned@kolab.org');
         $user->setSetting('external_email', 'external@test.com');
         $wallet = $user->wallets()->first();
         $now = Carbon::now();
 
         // Balance turned negative 7+14+21-3+1 days ago, expect mail sent
         $days = 7 + 14 + 21 - 3 + 1;
         $wallet->setSetting('balance_negative_since', $now->subDays($days)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         // Assert the mail was sent to the user's email, and his external email
         Mail::assertSent(\App\Mail\NegativeBalanceBeforeDelete::class, 1);
         Mail::assertSent(\App\Mail\NegativeBalanceBeforeDelete::class, function ($mail) use ($user) {
             return $mail->hasTo($user->email) && $mail->hasCc('external@test.com');
         });
 
         // Check that it has not been deleted yet
         $this->assertFalse($user->fresh()->isDeleted());
 
         // Run the job again to make sure the notification is not sent again
         Mail::fake();
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
     }
 
     /**
      * Test job handle, account delete
      *
      * @depends testHandleBeforeDelete
      */
     public function testHandleDelete(): void
     {
         Mail::fake();
 
         $user = $this->getTestUser('wallet-check@kolabnow.com');
         $wallet = $user->wallets()->first();
         $wallet->balance = -100;
         $wallet->save();
         $now = Carbon::now();
 
         $package = \App\Package::where('title', 'kolab')->first();
         $user->assignPackage($package);
 
         $this->assertFalse($user->isDeleted());
         $this->assertCount(4, $user->entitlements()->get());
 
         // Balance turned negative 7+14+21+1 days ago, expect mail sent
         $days = 7 + 14 + 21 + 1;
         $wallet->setSetting('balance_negative_since', $now->subDays($days)->toDateTimeString());
 
         $job = new WalletCheck($wallet);
         $job->handle();
 
         Mail::assertNothingSent();
 
         // Check that it has not been deleted
         $this->assertTrue($user->fresh()->trashed());
         $this->assertCount(0, $user->entitlements()->get());
 
         // TODO: Test it deletes all members of the group account
     }
 }
diff --git a/src/tests/Feature/SignupCodeTest.php b/src/tests/Feature/SignupCodeTest.php
index d6576559..170a7205 100644
--- a/src/tests/Feature/SignupCodeTest.php
+++ b/src/tests/Feature/SignupCodeTest.php
@@ -1,45 +1,43 @@
 <?php
 
 namespace Tests\Feature;
 
 use App\SignupCode;
 use Carbon\Carbon;
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class SignupCodeTest extends TestCase
 {
     /**
      * Test SignupCode creation
      *
      * @return void
      */
     public function testSignupCodeCreate()
     {
         $data = [
             'data' => [
                 'email' => 'User@email.org',
             ]
         ];
 
         $now = Carbon::now();
 
         $code = SignupCode::create($data);
 
         $code_length = env('VERIFICATION_CODE_LENGTH', SignupCode::SHORTCODE_LENGTH);
         $exp = Carbon::now()->addHours(env('SIGNUP_CODE_EXPIRY', SignupCode::CODE_EXP_HOURS));
 
         $this->assertFalse($code->isExpired());
         $this->assertTrue(strlen($code->code) === SignupCode::CODE_LENGTH);
         $this->assertTrue(strlen($code->short_code) === $code_length);
         $this->assertSame($data['data'], $code->data);
         $this->assertInstanceOf(Carbon::class, $code->expires_at);
         $this->assertSame($code->expires_at->toDateTimeString(), $exp->toDateTimeString());
 
         $inst = SignupCode::find($code->code);
 
         $this->assertInstanceOf(SignupCode::class, $inst);
         $this->assertSame($inst->code, $code->code);
     }
 }
diff --git a/src/tests/Feature/UserTest.php b/src/tests/Feature/UserTest.php
index a17016c7..bd560d49 100644
--- a/src/tests/Feature/UserTest.php
+++ b/src/tests/Feature/UserTest.php
@@ -1,554 +1,701 @@
 <?php
 
 namespace Tests\Feature;
 
 use App\Domain;
+use App\Group;
 use App\User;
 use Illuminate\Support\Facades\Queue;
 use Tests\TestCase;
 
 class UserTest extends TestCase
 {
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('user-test@' . \config('app.domain'));
         $this->deleteTestUser('UserAccountA@UserAccount.com');
         $this->deleteTestUser('UserAccountB@UserAccount.com');
         $this->deleteTestUser('UserAccountC@UserAccount.com');
+        $this->deleteTestGroup('test-group@UserAccount.com');
         $this->deleteTestDomain('UserAccount.com');
+        $this->deleteTestDomain('UserAccountAdd.com');
     }
 
     public function tearDown(): void
     {
         $this->deleteTestUser('user-test@' . \config('app.domain'));
         $this->deleteTestUser('UserAccountA@UserAccount.com');
         $this->deleteTestUser('UserAccountB@UserAccount.com');
         $this->deleteTestUser('UserAccountC@UserAccount.com');
+        $this->deleteTestGroup('test-group@UserAccount.com');
         $this->deleteTestDomain('UserAccount.com');
+        $this->deleteTestDomain('UserAccountAdd.com');
 
         parent::tearDown();
     }
 
     /**
      * Tests for User::assignPackage()
      */
     public function testAssignPackage(): void
     {
         $this->markTestIncomplete();
     }
 
     /**
      * Tests for User::assignPlan()
      */
     public function testAssignPlan(): void
     {
         $this->markTestIncomplete();
     }
 
     /**
      * Tests for User::assignSku()
      */
     public function testAssignSku(): void
     {
         $this->markTestIncomplete();
     }
 
     /**
      * Verify a wallet assigned a controller is among the accounts of the assignee.
      */
     public function testAccounts(): void
     {
         $userA = $this->getTestUser('UserAccountA@UserAccount.com');
         $userB = $this->getTestUser('UserAccountB@UserAccount.com');
 
         $this->assertTrue($userA->wallets()->count() == 1);
 
         $userA->wallets()->each(
             function ($wallet) use ($userB) {
                 $wallet->addController($userB);
             }
         );
 
         $this->assertTrue($userB->accounts()->get()[0]->id === $userA->wallets()->get()[0]->id);
     }
 
     public function testCanDelete(): void
     {
         $this->markTestIncomplete();
     }
 
     public function testCanRead(): void
     {
         $this->markTestIncomplete();
     }
 
     public function testCanUpdate(): void
     {
         $this->markTestIncomplete();
     }
 
     /**
      * Test user create/creating observer
      */
     public function testCreate(): void
     {
         Queue::fake();
 
         $domain = \config('app.domain');
 
         $user = User::create(['email' => 'USER-test@' . \strtoupper($domain)]);
 
         $result = User::where('email', 'user-test@' . $domain)->first();
 
         $this->assertSame('user-test@' . $domain, $result->email);
         $this->assertSame($user->id, $result->id);
         $this->assertSame(User::STATUS_NEW | User::STATUS_ACTIVE, $result->status);
     }
 
     /**
      * Verify user creation process
      */
     public function testCreateJobs(): void
     {
         // Fake the queue, assert that no jobs were pushed...
         Queue::fake();
         Queue::assertNothingPushed();
 
         $user = User::create([
                 'email' => 'user-test@' . \config('app.domain')
         ]);
 
         Queue::assertPushed(\App\Jobs\User\CreateJob::class, 1);
 
         Queue::assertPushed(
             \App\Jobs\User\CreateJob::class,
             function ($job) use ($user) {
                 $userEmail = TestCase::getObjectProperty($job, 'userEmail');
                 $userId = TestCase::getObjectProperty($job, 'userId');
 
                 return $userEmail === $user->email
                     && $userId === $user->id;
             }
         );
 
         Queue::assertPushedWithChain(
             \App\Jobs\User\CreateJob::class,
             [
                 \App\Jobs\User\VerifyJob::class,
             ]
         );
 /*
         FIXME: Looks like we can't really do detailed assertions on chained jobs
                Another thing to consider is if we maybe should run these jobs
                independently (not chained) and make sure there's no race-condition
                in status update
 
         Queue::assertPushed(\App\Jobs\User\VerifyJob::class, 1);
         Queue::assertPushed(\App\Jobs\User\VerifyJob::class, function ($job) use ($user) {
             $userEmail = TestCase::getObjectProperty($job, 'userEmail');
             $userId = TestCase::getObjectProperty($job, 'userId');
 
             return $userEmail === $user->email
                 && $userId === $user->id;
         });
 */
     }
 
     /**
      * Tests for User::domains()
      */
     public function testDomains(): void
     {
         $user = $this->getTestUser('john@kolab.org');
         $domains = [];
 
         foreach ($user->domains() as $domain) {
             $domains[] = $domain->namespace;
         }
 
         $this->assertContains(\config('app.domain'), $domains);
         $this->assertContains('kolab.org', $domains);
 
         // Jack is not the wallet controller, so for him the list should not
         // include John's domains, kolab.org specifically
         $user = $this->getTestUser('jack@kolab.org');
         $domains = [];
 
         foreach ($user->domains() as $domain) {
             $domains[] = $domain->namespace;
         }
 
         $this->assertContains(\config('app.domain'), $domains);
         $this->assertNotContains('kolab.org', $domains);
     }
 
     public function testUserQuota(): void
     {
         // TODO: This test does not test much, probably could be removed
         //       or moved to somewhere else, or extended with
         //       other entitlements() related cases.
 
         $user = $this->getTestUser('john@kolab.org');
         $storage_sku = \App\Sku::where('title', 'storage')->first();
 
         $count = 0;
 
         foreach ($user->entitlements()->get() as $entitlement) {
             if ($entitlement->sku_id == $storage_sku->id) {
                 $count += 1;
             }
         }
 
         $this->assertTrue($count == 2);
     }
 
     /**
      * Test user deletion
      */
     public function testDelete(): void
     {
         Queue::fake();
 
         $user = $this->getTestUser('user-test@' . \config('app.domain'));
         $package = \App\Package::where('title', 'kolab')->first();
         $user->assignPackage($package);
 
         $id = $user->id;
 
         $this->assertCount(4, $user->entitlements()->get());
 
         $user->delete();
 
         $this->assertCount(0, $user->entitlements()->get());
         $this->assertTrue($user->fresh()->trashed());
         $this->assertFalse($user->fresh()->isDeleted());
 
         // Delete the user for real
         $job = new \App\Jobs\User\DeleteJob($id);
         $job->handle();
 
         $this->assertTrue(User::withTrashed()->where('id', $id)->first()->isDeleted());
 
         $user->forceDelete();
 
         $this->assertCount(0, User::withTrashed()->where('id', $id)->get());
 
-        // Test an account with users
+        // Test an account with users, domain, and group
         $userA = $this->getTestUser('UserAccountA@UserAccount.com');
         $userB = $this->getTestUser('UserAccountB@UserAccount.com');
         $userC = $this->getTestUser('UserAccountC@UserAccount.com');
         $package_kolab = \App\Package::where('title', 'kolab')->first();
         $package_domain = \App\Package::where('title', 'domain-hosting')->first();
         $domain = $this->getTestDomain('UserAccount.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_HOSTED,
         ]);
         $userA->assignPackage($package_kolab);
         $domain->assignPackage($package_domain, $userA);
         $userA->assignPackage($package_kolab, $userB);
         $userA->assignPackage($package_kolab, $userC);
+        $group = $this->getTestGroup('test-group@UserAccount.com');
+        $group->assignToWallet($userA->wallets->first());
 
         $entitlementsA = \App\Entitlement::where('entitleable_id', $userA->id);
         $entitlementsB = \App\Entitlement::where('entitleable_id', $userB->id);
         $entitlementsC = \App\Entitlement::where('entitleable_id', $userC->id);
         $entitlementsDomain = \App\Entitlement::where('entitleable_id', $domain->id);
+        $entitlementsGroup = \App\Entitlement::where('entitleable_id', $group->id);
+
         $this->assertSame(4, $entitlementsA->count());
         $this->assertSame(4, $entitlementsB->count());
         $this->assertSame(4, $entitlementsC->count());
         $this->assertSame(1, $entitlementsDomain->count());
+        $this->assertSame(1, $entitlementsGroup->count());
 
         // Delete non-controller user
         $userC->delete();
 
         $this->assertTrue($userC->fresh()->trashed());
         $this->assertFalse($userC->fresh()->isDeleted());
         $this->assertSame(0, $entitlementsC->count());
 
         // Delete the controller (and expect "sub"-users to be deleted too)
         $userA->delete();
 
         $this->assertSame(0, $entitlementsA->count());
         $this->assertSame(0, $entitlementsB->count());
         $this->assertSame(0, $entitlementsDomain->count());
+        $this->assertSame(0, $entitlementsGroup->count());
         $this->assertTrue($userA->fresh()->trashed());
         $this->assertTrue($userB->fresh()->trashed());
         $this->assertTrue($domain->fresh()->trashed());
+        $this->assertTrue($group->fresh()->trashed());
         $this->assertFalse($userA->isDeleted());
         $this->assertFalse($userB->isDeleted());
         $this->assertFalse($domain->isDeleted());
+        $this->assertFalse($group->isDeleted());
+
+        $userA->forceDelete();
+
+        $all_entitlements = \App\Entitlement::where('wallet_id', $userA->wallets->first()->id);
+
+        $this->assertSame(0, $all_entitlements->withTrashed()->count());
+        $this->assertCount(0, User::withTrashed()->where('id', $userA->id)->get());
+        $this->assertCount(0, User::withTrashed()->where('id', $userB->id)->get());
+        $this->assertCount(0, User::withTrashed()->where('id', $userC->id)->get());
+        $this->assertCount(0, Domain::withTrashed()->where('id', $domain->id)->get());
+        $this->assertCount(0, Group::withTrashed()->where('id', $group->id)->get());
+    }
+
+    /**
+     * Test user deletion vs. group membership
+     */
+    public function testDeleteAndGroups(): void
+    {
+        Queue::fake();
+
+        $package_kolab = \App\Package::where('title', 'kolab')->first();
+        $userA = $this->getTestUser('UserAccountA@UserAccount.com');
+        $userB = $this->getTestUser('UserAccountB@UserAccount.com');
+        $userA->assignPackage($package_kolab, $userB);
+        $group = $this->getTestGroup('test-group@UserAccount.com');
+        $group->members = ['test@gmail.com', $userB->email];
+        $group->assignToWallet($userA->wallets->first());
+        $group->save();
+
+        $userGroups = $userA->groups()->get();
+        $this->assertSame(1, $userGroups->count());
+        $this->assertSame($group->id, $userGroups->first()->id);
+
+        $userB->delete();
+
+        $this->assertSame(['test@gmail.com'], $group->fresh()->members);
+
+        // Twice, one for save() and one for delete() above
+        Queue::assertPushed(\App\Jobs\Group\UpdateJob::class, 2);
+    }
+
+    /**
+     * Tests for User::aliasExists()
+     */
+    public function testAliasExists(): void
+    {
+        $this->assertTrue(User::aliasExists('jack.daniels@kolab.org'));
+
+        $this->assertFalse(User::aliasExists('j.daniels@kolab.org'));
+        $this->assertFalse(User::aliasExists('john@kolab.org'));
     }
 
     /**
      * Tests for User::emailExists()
      */
     public function testEmailExists(): void
     {
-        $this->markTestIncomplete();
+        $this->assertFalse(User::emailExists('jack.daniels@kolab.org'));
+        $this->assertFalse(User::emailExists('j.daniels@kolab.org'));
+
+        $this->assertTrue(User::emailExists('john@kolab.org'));
+        $user = User::emailExists('john@kolab.org', true);
+        $this->assertSame('john@kolab.org', $user->email);
     }
 
     /**
      * Tests for User::findByEmail()
      */
     public function testFindByEmail(): void
     {
         $user = $this->getTestUser('john@kolab.org');
 
         $result = User::findByEmail('john');
         $this->assertNull($result);
 
         $result = User::findByEmail('non-existing@email.com');
         $this->assertNull($result);
 
         $result = User::findByEmail('john@kolab.org');
         $this->assertInstanceOf(User::class, $result);
         $this->assertSame($user->id, $result->id);
 
         // Use an alias
         $result = User::findByEmail('john.doe@kolab.org');
         $this->assertInstanceOf(User::class, $result);
         $this->assertSame($user->id, $result->id);
 
         // A case where two users have the same alias
         $ned = $this->getTestUser('ned@kolab.org');
         $ned->setAliases(['joe.monster@kolab.org']);
         $result = User::findByEmail('joe.monster@kolab.org');
         $this->assertNull($result);
         $ned->setAliases([]);
 
         // TODO: searching by external email (setting)
         $this->markTestIncomplete();
     }
 
     /**
      * Test User::name()
      */
     public function testName(): void
     {
         Queue::fake();
 
         $user = $this->getTestUser('user-test@' . \config('app.domain'));
 
         $this->assertSame('', $user->name());
         $this->assertSame(\config('app.name') . ' User', $user->name(true));
 
         $user->setSetting('first_name', 'First');
 
         $this->assertSame('First', $user->name());
         $this->assertSame('First', $user->name(true));
 
         $user->setSetting('last_name', 'Last');
 
         $this->assertSame('First Last', $user->name());
         $this->assertSame('First Last', $user->name(true));
     }
 
+    /**
+     * Test user restoring
+     */
+    public function testRestore(): void
+    {
+        Queue::fake();
+
+        // Test an account with users and domain
+        $userA = $this->getTestUser('UserAccountA@UserAccount.com', [
+                'status' => User::STATUS_LDAP_READY | User::STATUS_IMAP_READY | User::STATUS_SUSPENDED,
+        ]);
+        $userB = $this->getTestUser('UserAccountB@UserAccount.com');
+        $package_kolab = \App\Package::where('title', 'kolab')->first();
+        $package_domain = \App\Package::where('title', 'domain-hosting')->first();
+        $domainA = $this->getTestDomain('UserAccount.com', [
+                'status' => Domain::STATUS_NEW,
+                'type' => Domain::TYPE_HOSTED,
+        ]);
+        $domainB = $this->getTestDomain('UserAccountAdd.com', [
+                'status' => Domain::STATUS_NEW,
+                'type' => Domain::TYPE_HOSTED,
+        ]);
+        $userA->assignPackage($package_kolab);
+        $domainA->assignPackage($package_domain, $userA);
+        $domainB->assignPackage($package_domain, $userA);
+        $userA->assignPackage($package_kolab, $userB);
+
+        $storage_sku = \App\Sku::where('title', 'storage')->first();
+        $now = \Carbon\Carbon::now();
+        $wallet_id = $userA->wallets->first()->id;
+
+        // add an extra storage entitlement
+        $ent1 = \App\Entitlement::create([
+                'wallet_id' => $wallet_id,
+                'sku_id' => $storage_sku->id,
+                'cost' => 0,
+                'entitleable_id' => $userA->id,
+                'entitleable_type' => User::class,
+        ]);
+
+        $entitlementsA = \App\Entitlement::where('entitleable_id', $userA->id);
+        $entitlementsB = \App\Entitlement::where('entitleable_id', $userB->id);
+        $entitlementsDomain = \App\Entitlement::where('entitleable_id', $domainA->id);
+
+        // First delete the user
+        $userA->delete();
+
+        $this->assertSame(0, $entitlementsA->count());
+        $this->assertSame(0, $entitlementsB->count());
+        $this->assertSame(0, $entitlementsDomain->count());
+        $this->assertTrue($userA->fresh()->trashed());
+        $this->assertTrue($userB->fresh()->trashed());
+        $this->assertTrue($domainA->fresh()->trashed());
+        $this->assertTrue($domainB->fresh()->trashed());
+        $this->assertFalse($userA->isDeleted());
+        $this->assertFalse($userB->isDeleted());
+        $this->assertFalse($domainA->isDeleted());
+
+        // Backdate one storage entitlement (it's not expected to be restored)
+        \App\Entitlement::withTrashed()->where('id', $ent1->id)
+            ->update(['deleted_at' => $now->copy()->subMinutes(2)]);
+
+        // Backdate entitlements to assert that they were restored with proper updated_at timestamp
+        \App\Entitlement::withTrashed()->where('wallet_id', $wallet_id)
+            ->update(['updated_at' => $now->subMinutes(10)]);
+
+        Queue::fake();
+
+        // Then restore it
+        $userA->restore();
+        $userA->refresh();
+
+        $this->assertFalse($userA->trashed());
+        $this->assertFalse($userA->isDeleted());
+        $this->assertFalse($userA->isSuspended());
+        $this->assertFalse($userA->isLdapReady());
+        $this->assertFalse($userA->isImapReady());
+        $this->assertTrue($userA->isActive());
+
+        $this->assertTrue($userB->fresh()->trashed());
+        $this->assertTrue($domainB->fresh()->trashed());
+        $this->assertFalse($domainA->fresh()->trashed());
+
+        // Assert entitlements
+        $this->assertSame(4, $entitlementsA->count()); // mailbox + groupware + 2 x storage
+        $this->assertTrue($ent1->fresh()->trashed());
+        $entitlementsA->get()->each(function ($ent) {
+            $this->assertTrue($ent->updated_at->greaterThan(\Carbon\Carbon::now()->subSeconds(5)));
+        });
+
+        // We expect only CreateJob + UpdateJob pair for both user and domain.
+        // Because how Illuminate/Database/Eloquent/SoftDeletes::restore() method
+        // is implemented we cannot skip the UpdateJob in any way.
+        // I don't want to overwrite this method, the extra job shouldn't do any harm.
+        $this->assertCount(4, Queue::pushedJobs()); // @phpstan-ignore-line
+        Queue::assertPushed(\App\Jobs\Domain\UpdateJob::class, 1);
+        Queue::assertPushed(\App\Jobs\Domain\CreateJob::class, 1);
+        Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 1);
+        Queue::assertPushed(\App\Jobs\User\CreateJob::class, 1);
+        Queue::assertPushed(
+            \App\Jobs\User\CreateJob::class,
+            function ($job) use ($userA) {
+                return $userA->id === TestCase::getObjectProperty($job, 'userId');
+            }
+        );
+        Queue::assertPushedWithChain(
+            \App\Jobs\User\CreateJob::class,
+            [
+                \App\Jobs\User\VerifyJob::class,
+            ]
+        );
+    }
+
     /**
      * Tests for UserAliasesTrait::setAliases()
      */
     public function testSetAliases(): void
     {
         Queue::fake();
         Queue::assertNothingPushed();
 
         $user = $this->getTestUser('UserAccountA@UserAccount.com');
         $domain = $this->getTestDomain('UserAccount.com', [
                 'status' => Domain::STATUS_NEW,
                 'type' => Domain::TYPE_HOSTED,
         ]);
 
         $this->assertCount(0, $user->aliases->all());
 
         // Add an alias
         $user->setAliases(['UserAlias1@UserAccount.com']);
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 1);
 
         $aliases = $user->aliases()->get();
         $this->assertCount(1, $aliases);
         $this->assertSame('useralias1@useraccount.com', $aliases[0]['alias']);
 
         // Add another alias
         $user->setAliases(['UserAlias1@UserAccount.com', 'UserAlias2@UserAccount.com']);
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 2);
 
         $aliases = $user->aliases()->orderBy('alias')->get();
         $this->assertCount(2, $aliases);
         $this->assertSame('useralias1@useraccount.com', $aliases[0]->alias);
         $this->assertSame('useralias2@useraccount.com', $aliases[1]->alias);
 
         // Remove an alias
         $user->setAliases(['UserAlias1@UserAccount.com']);
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 3);
 
         $aliases = $user->aliases()->get();
         $this->assertCount(1, $aliases);
         $this->assertSame('useralias1@useraccount.com', $aliases[0]['alias']);
 
         // Remove all aliases
         $user->setAliases([]);
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 4);
 
         $this->assertCount(0, $user->aliases()->get());
-
-        // The test below fail since we removed validation code from the UserAliasObserver
-        $this->markTestIncomplete();
-
-        // Test sanity checks in UserAliasObserver
-        Queue::fake();
-
-        // Existing user
-        $user->setAliases(['john@kolab.org']);
-        $this->assertCount(0, $user->aliases()->get());
-
-        // Existing alias (in another account)
-        $user->setAliases(['john.doe@kolab.org']);
-        $this->assertCount(0, $user->aliases()->get());
-
-        Queue::assertNothingPushed();
-
-        // Existing user (in the same group account)
-        $ned = $this->getTestUser('ned@kolab.org');
-        $ned->setAliases(['john@kolab.org']);
-        $this->assertCount(0, $ned->aliases()->get());
-
-        // Existing alias (in the same group account)
-        $ned = $this->getTestUser('ned@kolab.org');
-        $ned->setAliases(['john.doe@kolab.org']);
-        $this->assertSame('john.doe@kolab.org', $ned->aliases()->first()->alias);
-
-        // Existing alias (in another account, public domain)
-        $user->setAliases(['alias@kolabnow.com']);
-        $ned->setAliases(['alias@kolabnow.com']);
-        $this->assertCount(0, $ned->aliases()->get());
-
-        // cleanup
-        $ned->setAliases([]);
     }
 
     /**
      * Tests for UserSettingsTrait::setSettings() and getSetting()
      */
     public function testUserSettings(): void
     {
         Queue::fake();
         Queue::assertNothingPushed();
 
         $user = $this->getTestUser('UserAccountA@UserAccount.com');
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 0);
 
         // Test default settings
         // Note: Technicly this tests UserObserver::created() behavior
         $all_settings = $user->settings()->orderBy('key')->get();
         $this->assertCount(2, $all_settings);
         $this->assertSame('country', $all_settings[0]->key);
         $this->assertSame('CH', $all_settings[0]->value);
         $this->assertSame('currency', $all_settings[1]->key);
         $this->assertSame('CHF', $all_settings[1]->value);
 
         // Add a setting
         $user->setSetting('first_name', 'Firstname');
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 1);
 
         // Note: We test both current user as well as fresh user object
         //       to make sure cache works as expected
         $this->assertSame('Firstname', $user->getSetting('first_name'));
         $this->assertSame('Firstname', $user->fresh()->getSetting('first_name'));
 
         // Update a setting
         $user->setSetting('first_name', 'Firstname1');
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 2);
 
         // Note: We test both current user as well as fresh user object
         //       to make sure cache works as expected
         $this->assertSame('Firstname1', $user->getSetting('first_name'));
         $this->assertSame('Firstname1', $user->fresh()->getSetting('first_name'));
 
         // Delete a setting (null)
         $user->setSetting('first_name', null);
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 3);
 
         // Note: We test both current user as well as fresh user object
         //       to make sure cache works as expected
         $this->assertSame(null, $user->getSetting('first_name'));
         $this->assertSame(null, $user->fresh()->getSetting('first_name'));
 
         // Delete a setting (empty string)
         $user->setSetting('first_name', 'Firstname1');
         $user->setSetting('first_name', '');
 
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 5);
 
         // Note: We test both current user as well as fresh user object
         //       to make sure cache works as expected
         $this->assertSame(null, $user->getSetting('first_name'));
         $this->assertSame(null, $user->fresh()->getSetting('first_name'));
 
         // Set multiple settings at once
         $user->setSettings([
                 'first_name' => 'Firstname2',
                 'last_name' => 'Lastname2',
                 'country' => null,
         ]);
 
         // TODO: This really should create a single UserUpdate job, not 3
         Queue::assertPushed(\App\Jobs\User\UpdateJob::class, 7);
 
         // Note: We test both current user as well as fresh user object
         //       to make sure cache works as expected
         $this->assertSame('Firstname2', $user->getSetting('first_name'));
         $this->assertSame('Firstname2', $user->fresh()->getSetting('first_name'));
         $this->assertSame('Lastname2', $user->getSetting('last_name'));
         $this->assertSame('Lastname2', $user->fresh()->getSetting('last_name'));
         $this->assertSame(null, $user->getSetting('country'));
         $this->assertSame(null, $user->fresh()->getSetting('country'));
 
         $all_settings = $user->settings()->orderBy('key')->get();
         $this->assertCount(3, $all_settings);
     }
 
     /**
      * Tests for User::users()
      */
     public function testUsers(): void
     {
         $jack = $this->getTestUser('jack@kolab.org');
         $joe = $this->getTestUser('joe@kolab.org');
         $john = $this->getTestUser('john@kolab.org');
         $ned = $this->getTestUser('ned@kolab.org');
         $wallet = $john->wallets()->first();
 
         $users = $john->users()->orderBy('email')->get();
 
         $this->assertCount(4, $users);
         $this->assertEquals($jack->id, $users[0]->id);
         $this->assertEquals($joe->id, $users[1]->id);
         $this->assertEquals($john->id, $users[2]->id);
         $this->assertEquals($ned->id, $users[3]->id);
         $this->assertSame($wallet->id, $users[0]->wallet_id);
         $this->assertSame($wallet->id, $users[1]->wallet_id);
         $this->assertSame($wallet->id, $users[2]->wallet_id);
         $this->assertSame($wallet->id, $users[3]->wallet_id);
 
         $users = $jack->users()->orderBy('email')->get();
 
         $this->assertCount(0, $users);
 
         $users = $ned->users()->orderBy('email')->get();
 
         $this->assertCount(4, $users);
     }
 
     public function testWallets(): void
     {
         $this->markTestIncomplete();
     }
 }
diff --git a/src/tests/Feature/VerificationCodeTest.php b/src/tests/Feature/VerificationCodeTest.php
index 4742ff5e..3abe155b 100644
--- a/src/tests/Feature/VerificationCodeTest.php
+++ b/src/tests/Feature/VerificationCodeTest.php
@@ -1,60 +1,58 @@
 <?php
 
 namespace Tests\Feature;
 
 use App\User;
 use App\VerificationCode;
 use Carbon\Carbon;
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class VerificationCodeTest extends TestCase
 {
     public function setUp(): void
     {
         parent::setUp();
 
         $this->deleteTestUser('UserAccountA@UserAccount.com');
     }
 
     public function tearDown(): void
     {
         $this->deleteTestUser('UserAccountA@UserAccount.com');
 
         parent::tearDown();
     }
 
     /**
      * Test VerificationCode creation
      */
     public function testVerificationCodeCreate(): void
     {
         $user = $this->getTestUser('UserAccountA@UserAccount.com');
         $data = [
             'user_id' => $user->id,
             'mode' => 'password-reset',
         ];
 
         $now = new \DateTime('now');
 
         $code = VerificationCode::create($data);
 
         $code_length = env('VERIFICATION_CODE_LENGTH', VerificationCode::SHORTCODE_LENGTH);
         $code_exp_hrs = env('VERIFICATION_CODE_EXPIRY', VerificationCode::CODE_EXP_HOURS);
         $exp = Carbon::now()->addHours($code_exp_hrs);
 
         $this->assertFalse($code->isExpired());
         $this->assertTrue(strlen($code->code) === VerificationCode::CODE_LENGTH);
         $this->assertTrue(strlen($code->short_code) === $code_length);
         $this->assertSame($data['mode'], $code->mode);
         $this->assertEquals($user->id, $code->user->id);
         $this->assertInstanceOf(\DateTime::class, $code->expires_at);
         $this->assertSame($code->expires_at->toDateTimeString(), $exp->toDateTimeString());
 
         $inst = VerificationCode::find($code->code);
 
         $this->assertInstanceOf(VerificationCode::class, $inst);
         $this->assertSame($inst->code, $code->code);
     }
 }
diff --git a/src/tests/Feature/WalletTest.php b/src/tests/Feature/WalletTest.php
index 7dc96664..36d13983 100644
--- a/src/tests/Feature/WalletTest.php
+++ b/src/tests/Feature/WalletTest.php
@@ -1,284 +1,282 @@
 <?php
 
 namespace Tests\Feature;
 
 use App\Package;
 use App\User;
 use App\Sku;
 use App\Wallet;
 use Carbon\Carbon;
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class WalletTest extends TestCase
 {
     private $users = [
         'UserWallet1@UserWallet.com',
         'UserWallet2@UserWallet.com',
         'UserWallet3@UserWallet.com',
         'UserWallet4@UserWallet.com',
         'UserWallet5@UserWallet.com',
         'WalletControllerA@WalletController.com',
         'WalletControllerB@WalletController.com',
         'WalletController2A@WalletController.com',
         'WalletController2B@WalletController.com',
         'jane@kolabnow.com'
     ];
 
     public function setUp(): void
     {
         parent::setUp();
 
         foreach ($this->users as $user) {
             $this->deleteTestUser($user);
         }
     }
 
     public function tearDown(): void
     {
         foreach ($this->users as $user) {
             $this->deleteTestUser($user);
         }
 
         parent::tearDown();
     }
 
     /**
      * Test that turning wallet balance from negative to positive
      * unsuspends the account
      */
     public function testBalancePositiveUnsuspend(): void
     {
         $user = $this->getTestUser('UserWallet1@UserWallet.com');
         $user->suspend();
 
         $wallet = $user->wallets()->first();
         $wallet->balance = -100;
         $wallet->save();
 
         $this->assertTrue($user->isSuspended());
         $this->assertNotNull($wallet->getSetting('balance_negative_since'));
 
         $wallet->balance = 100;
         $wallet->save();
 
         $this->assertFalse($user->fresh()->isSuspended());
         $this->assertNull($wallet->getSetting('balance_negative_since'));
 
         // TODO: Test group account and unsuspending domain/members
     }
 
     /**
      * Test for Wallet::balanceLastsUntil()
      */
     public function testBalanceLastsUntil(): void
     {
         // Monthly cost of all entitlements: 999
         // 28 days: 35.68 per day
         // 31 days: 32.22 per day
 
         $user = $this->getTestUser('jane@kolabnow.com');
         $package = Package::where('title', 'kolab')->first();
         $user->assignPackage($package);
         $wallet = $user->wallets()->first();
 
         // User/entitlements created today, balance=0
         $until = $wallet->balanceLastsUntil();
 
         $this->assertSame(
             Carbon::now()->addMonthsWithoutOverflow(1)->toDateString(),
             $until->toDateString()
         );
 
         // User/entitlements created today, balance=-10 CHF
         $wallet->balance = -1000;
         $until = $wallet->balanceLastsUntil();
 
         $this->assertSame(null, $until);
 
         // User/entitlements created today, balance=-9,99 CHF (monthly cost)
         $wallet->balance = 999;
         $until = $wallet->balanceLastsUntil();
 
         $daysInLastMonth = \App\Utils::daysInLastMonth();
 
         $this->assertSame(
             Carbon::now()->addMonthsWithoutOverflow(1)->addDays($daysInLastMonth)->toDateString(),
             $until->toDateString()
         );
 
         // Old entitlements, 100% discount
         $this->backdateEntitlements($wallet->entitlements, Carbon::now()->subDays(40));
         $discount = \App\Discount::where('discount', 100)->first();
         $wallet->discount()->associate($discount);
 
         $until = $wallet->refresh()->balanceLastsUntil();
 
         $this->assertSame(null, $until);
 
         // User with no entitlements
         $wallet->discount()->dissociate($discount);
         $wallet->entitlements()->delete();
 
         $until = $wallet->refresh()->balanceLastsUntil();
 
         $this->assertSame(null, $until);
     }
 
     /**
      * Test for Wallet::costsPerDay()
      */
     public function testCostsPerDay(): void
     {
         // 999
         // 28 days: 35.68
         // 31 days: 32.22
         $user = $this->getTestUser('jane@kolabnow.com');
 
         $package = Package::where('title', 'kolab')->first();
         $mailbox = Sku::where('title', 'mailbox')->first();
 
         $user->assignPackage($package);
 
         $wallet = $user->wallets()->first();
 
         $costsPerDay = $wallet->costsPerDay();
 
         $this->assertTrue($costsPerDay < 35.68);
         $this->assertTrue($costsPerDay > 32.22);
     }
 
     /**
      * Verify a wallet is created, when a user is created.
      */
     public function testCreateUserCreatesWallet(): void
     {
         $user = $this->getTestUser('UserWallet1@UserWallet.com');
 
         $this->assertCount(1, $user->wallets);
     }
 
     /**
      * Verify a user can haz more wallets.
      */
     public function testAddWallet(): void
     {
         $user = $this->getTestUser('UserWallet2@UserWallet.com');
 
         $user->wallets()->save(
             new Wallet(['currency' => 'USD'])
         );
 
         $this->assertCount(2, $user->wallets);
 
         $user->wallets()->each(
             function ($wallet) {
                 $this->assertEquals(0, $wallet->balance);
             }
         );
     }
 
     /**
      * Verify we can not delete a user wallet that holds balance.
      */
     public function testDeleteWalletWithCredit(): void
     {
         $user = $this->getTestUser('UserWallet3@UserWallet.com');
 
         $user->wallets()->each(
             function ($wallet) {
                 $wallet->credit(100)->save();
             }
         );
 
         $user->wallets()->each(
             function ($wallet) {
                 $this->assertFalse($wallet->delete());
             }
         );
     }
 
     /**
      * Verify we can not delete a wallet that is the last wallet.
      */
     public function testDeleteLastWallet(): void
     {
         $user = $this->getTestUser('UserWallet4@UserWallet.com');
 
         $this->assertCount(1, $user->wallets);
 
         $user->wallets()->each(
             function ($wallet) {
                 $this->assertFalse($wallet->delete());
             }
         );
     }
 
     /**
      * Verify we can remove a wallet that is an additional wallet.
      */
     public function testDeleteAddtWallet(): void
     {
         $user = $this->getTestUser('UserWallet5@UserWallet.com');
 
         $user->wallets()->save(
             new Wallet(['currency' => 'USD'])
         );
 
         $user->wallets()->each(
             function ($wallet) {
                 if ($wallet->currency == 'USD') {
                     $this->assertNotFalse($wallet->delete());
                 }
             }
         );
     }
 
     /**
      * Verify a wallet can be assigned a controller.
      */
     public function testAddWalletController(): void
     {
         $userA = $this->getTestUser('WalletControllerA@WalletController.com');
         $userB = $this->getTestUser('WalletControllerB@WalletController.com');
 
         $userA->wallets()->each(
             function ($wallet) use ($userB) {
                 $wallet->addController($userB);
             }
         );
 
         $this->assertCount(1, $userB->accounts);
 
         $aWallet = $userA->wallets()->first();
         $bAccount = $userB->accounts()->first();
 
         $this->assertTrue($bAccount->id === $aWallet->id);
     }
 
     /**
      * Verify controllers can also be removed from wallets.
      */
     public function testRemoveWalletController(): void
     {
         $userA = $this->getTestUser('WalletController2A@WalletController.com');
         $userB = $this->getTestUser('WalletController2B@WalletController.com');
 
         $userA->wallets()->each(
             function ($wallet) use ($userB) {
                 $wallet->addController($userB);
             }
         );
 
         $userB->refresh();
 
         $userB->accounts()->each(
             function ($wallet) use ($userB) {
                 $wallet->removeController($userB);
             }
         );
 
         $this->assertCount(0, $userB->accounts);
     }
 }
diff --git a/src/tests/Functional/HorizonTest.php b/src/tests/Functional/HorizonTest.php
new file mode 100644
index 00000000..4372b55c
--- /dev/null
+++ b/src/tests/Functional/HorizonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Functional;
+
+use Tests\TestCase;
+
+class HorizonTest extends TestCase
+{
+    public function testAdminAccess()
+    {
+        $this->useAdminUrl();
+
+        $response = $this->get('horizon/dashboard');
+
+        $response->assertStatus(200);
+    }
+
+    public function testRegularAccess()
+    {
+        $response = $this->get('horizon/dashboard');
+
+        $response->assertStatus(404);
+    }
+}
diff --git a/src/tests/StripeMockClient.php b/src/tests/StripeMockClient.php
index 9afefb3f..bafb0888 100644
--- a/src/tests/StripeMockClient.php
+++ b/src/tests/StripeMockClient.php
@@ -1,22 +1,26 @@
 <?php
 
 namespace Tests;
 
 use Stripe as StripeAPI;
 
 class StripeMockClient implements StripeAPI\HttpClient\ClientInterface
 {
     private $responses = [];
 
     public function request($method, $absUrl, $headers, $params, $hasFile)
     {
+        if (empty($this->responses)) {
+            throw new \Exception("StripeMockClient: Missing response for $absUrl.");
+        }
+
         $response = array_shift($this->responses);
 
         return $response;
     }
 
     public function addResponse($body, $code = 200, $headers = [])
     {
         $this->responses[] = [$body, $code, $headers];
     }
 }
diff --git a/src/tests/TestCase.php b/src/tests/TestCase.php
index 483ef4c1..47990f39 100644
--- a/src/tests/TestCase.php
+++ b/src/tests/TestCase.php
@@ -1,22 +1,23 @@
 <?php
 
 namespace Tests;
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
 {
     use TestCaseTrait;
+    use TestCaseMeetTrait;
 
     /**
      * Set baseURL to the admin UI location
      */
     protected static function useAdminUrl(): void
     {
         // This will set base URL for all tests in a file.
         // If we wanted to access both user and admin in one test
         // we can also just call post/get/whatever with full url
         \config(['app.url' => str_replace('//', '//admin.', \config('app.url'))]);
         url()->forceRootUrl(config('app.url'));
     }
 }
diff --git a/src/tests/TestCaseDusk.php b/src/tests/TestCaseDusk.php
index 92882119..6fb3f5cd 100644
--- a/src/tests/TestCaseDusk.php
+++ b/src/tests/TestCaseDusk.php
@@ -1,98 +1,105 @@
 <?php
 
 namespace Tests;
 
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Laravel\Dusk\TestCase as BaseTestCase;
 
 abstract class TestCaseDusk extends BaseTestCase
 {
     use TestCaseTrait;
+    use TestCaseMeetTrait;
 
     /**
      * Prepare for Dusk test execution.
      *
      * @beforeClass
      * @return void
      */
     public static function prepare()
     {
         static::startChromeDriver();
     }
 
     /**
      * Create the RemoteWebDriver instance.
      *
      * @return \Facebook\WebDriver\Remote\RemoteWebDriver
      */
     protected function driver()
     {
         $options = (new ChromeOptions())->addArguments([
             '--lang=en_US',
             '--disable-gpu',
             '--headless',
+            '--use-fake-ui-for-media-stream',
+            '--use-fake-device-for-media-stream',
+            '--enable-usermedia-screen-capturing',
+            // '--auto-select-desktop-capture-source="Entire screen"',
+            '--ignore-certificate-errors',
+            '--incognito',
         ]);
 
         // For file download handling
         $prefs = [
             'profile.default_content_settings.popups' => 0,
             'download.default_directory' => __DIR__ . '/Browser/downloads',
         ];
 
         $options->setExperimentalOption('prefs', $prefs);
 
         if (getenv('TESTS_MODE') == 'phone') {
             // Fake User-Agent string for mobile mode
             $ua = 'Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/537.36'
                 . ' (KHTML, like Gecko) Chrome/60.0.3112.90 Mobile Safari/537.36';
             $options->setExperimentalOption('mobileEmulation', ['userAgent' => $ua]);
             $options->addArguments(['--window-size=375,667']);
         } elseif (getenv('TESTS_MODE') == 'tablet') {
             // Fake User-Agent string for mobile mode
             $ua = 'Mozilla/5.0 (Linux; Android 6.0.1; vivo 1603 Build/MMB29M) AppleWebKit/537.36 '
                 . ' (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36';
             $options->setExperimentalOption('mobileEmulation', ['userAgent' => $ua]);
             $options->addArguments(['--window-size=800,640']);
         } else {
             $options->addArguments(['--window-size=1280,1024']);
         }
 
         // Make sure downloads dir exists and is empty
         if (!file_exists(__DIR__ . '/Browser/downloads')) {
             mkdir(__DIR__ . '/Browser/downloads', 0777, true);
         } else {
             foreach (glob(__DIR__ . '/Browser/downloads/*') as $file) {
                 @unlink($file);
             }
         }
 
         return RemoteWebDriver::create(
             'http://localhost:9515',
             DesiredCapabilities::chrome()->setCapability(
                 ChromeOptions::CAPABILITY,
                 $options
             )
         );
     }
 
     /**
      * Replace Dusk's Browser with our (extended) Browser
      */
     protected function newBrowser($driver)
     {
         return new Browser($driver);
     }
 
     /**
      * Set baseURL to the admin UI location
      */
     protected static function useAdminUrl(): void
     {
         // This will set baseURL for all tests in this file
         // If we wanted to visit both user and admin in one test
         // we can also just call visit() with full url
         Browser::$baseUrl = str_replace('//', '//admin.', \config('app.url'));
     }
 }
diff --git a/src/tests/TestCaseMeetTrait.php b/src/tests/TestCaseMeetTrait.php
new file mode 100644
index 00000000..862ec5d5
--- /dev/null
+++ b/src/tests/TestCaseMeetTrait.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests;
+
+use App\OpenVidu\Room;
+
+trait TestCaseMeetTrait
+{
+    /**
+     * Assign 'meet' entitlement to a user.
+     *
+     * @param string|\App\User $user The user
+     */
+    protected function assignMeetEntitlement($user): void
+    {
+        if (is_string($user)) {
+            $user = $this->getTestUser($user);
+        }
+
+        $user->assignSku(\App\Sku::where('title', 'meet')->first());
+    }
+
+    /**
+     * Removes all 'meet' entitlements from the database
+     */
+    protected function clearMeetEntitlements(): void
+    {
+        $meet_sku = \App\Sku::where('title', 'meet')->first();
+        \App\Entitlement::where('sku_id', $meet_sku->id)->delete();
+    }
+
+    /**
+     * Reset a room after tests
+     */
+    public function resetTestRoom($room_name = 'john'): void
+    {
+        $this->clearMeetEntitlements();
+
+        $room = Room::where('name', $room_name)->first();
+        $room->setSettings(['password' => null, 'locked' => null, 'nomedia' => null]);
+
+        if ($room->session_id) {
+            $room->session_id = null;
+            $room->save();
+        }
+    }
+
+    /**
+     * Prepare a room for testing
+     */
+    public function setupTestRoom($room_name = 'john'): void
+    {
+        $this->resetTestRoom($room_name);
+        $this->assignMeetEntitlement('john@kolab.org');
+    }
+}
diff --git a/src/tests/TestCaseTrait.php b/src/tests/TestCaseTrait.php
index 6122c367..f3b9efa6 100644
--- a/src/tests/TestCaseTrait.php
+++ b/src/tests/TestCaseTrait.php
@@ -1,410 +1,349 @@
 <?php
 
 namespace Tests;
 
 use App\Domain;
+use App\Group;
 use App\Transaction;
 use App\User;
 use Carbon\Carbon;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Support\Facades\Queue;
 use PHPUnit\Framework\Assert;
 
 trait TestCaseTrait
 {
     /**
-     * A domain that is hosted.
-     *
-     * @var \App\Domain
-     */
-    protected $domainHosted;
-
-    /**
-     * The hosted domain owner.
-     *
-     * @var \App\User
-     */
-    protected $domainOwner;
-
-    /**
-     * Some profile details for an owner of a domain
-     *
-     * @var array
-     */
-    protected $domainOwnerSettings = [
-        'first_name' => 'John',
-        'last_name' => 'Doe',
-        'organization' => 'Test Domain Owner',
-    ];
-
-    /**
-     * Some users for the hosted domain, ultimately including the owner.
-     *
-     * @var \App\User[]
-     */
-    protected $domainUsers = [];
-
-    /**
-     * A specific user that is a regular user in the hosted domain.
-     */
-    protected $jack;
-
-    /**
-     * A specific user that is a controller on the wallet to which the hosted domain is charged.
-     */
-    protected $jane;
-
-    /**
-     * A specific user that has a second factor configured.
-     */
-    protected $joe;
-
-    /**
-     * One of the domains that is available for public registration.
-     *
-     * @var \App\Domain
-     */
-    protected $publicDomain;
-
-    /**
-     * A newly generated user in a public domain.
-     *
-     * @var \App\User
-     */
-    protected $publicDomainUser;
-
-    /**
-     * A placeholder for a password that can be generated.
-     *
-     * Should be generated with `\App\Utils::generatePassphrase()`.
-     *
-     * @var string
-     */
-    protected $userPassword;
-
-    /**
-     * Assert that the entitlements for the user match the expected list of entitlements.
-     *
-     * @param \App\User $user The user for which the entitlements need to be pulled.
-     * @param array $expected An array of expected \App\SKU titles.
+     * Assert user entitlements state
      */
     protected function assertUserEntitlements($user, $expected)
     {
         // Assert the user entitlements
         $skus = $user->entitlements()->get()
             ->map(function ($ent) {
                 return $ent->sku->title;
             })
             ->toArray();
 
         sort($skus);
 
         Assert::assertSame($expected, $skus);
     }
 
     /**
-     * Backdate entitlements to the desired target date.
-     *
-     * @param \App\Entitlement[] $entitlements
-     * @param \Carbon\Carbon $targetDate
+     * Removes all beta entitlements from the database
      */
-    protected function backdateEntitlements($entitlements, $targetDate)
+    protected function clearBetaEntitlements(): void
     {
-        foreach ($entitlements as $entitlement) {
-            $entitlement->created_at = $targetDate;
-            $entitlement->updated_at = $targetDate;
-            $entitlement->save();
-
-            $owner = $entitlement->wallet->domainOwner;
-            $owner->created_at = $targetDate;
-            $owner->save();
-        }
+        $betas = \App\Sku::where('handler_class', 'like', 'App\\Handlers\\Beta\\%')
+            ->orWhere('handler_class', 'App\Handlers\Beta')
+            ->pluck('id')->all();
+
+        \App\Entitlement::whereIn('sku_id', $betas)->delete();
     }
 
     /**
      * Creates the application.
      *
      * @return \Illuminate\Foundation\Application
      */
     public function createApplication()
     {
         $app = require __DIR__ . '/../bootstrap/app.php';
 
         $app->make(Kernel::class)->bootstrap();
 
         return $app;
     }
 
     /**
      * Create a set of transaction log entries for a wallet
      */
     protected function createTestTransactions($wallet)
     {
         $result = [];
         $date = Carbon::now();
         $debit = 0;
         $entitlementTransactions = [];
 
         foreach ($wallet->entitlements as $entitlement) {
             if ($entitlement->cost) {
                 $debit += $entitlement->cost;
                 $entitlementTransactions[] = $entitlement->createTransaction(
                     Transaction::ENTITLEMENT_BILLED,
                     $entitlement->cost
                 );
             }
         }
 
         $transaction = Transaction::create(
             [
                 'user_email' => 'jeroen@jeroen.jeroen',
                 'object_id' => $wallet->id,
                 'object_type' => \App\Wallet::class,
                 'type' => Transaction::WALLET_DEBIT,
-                'amount' => $debit,
+                'amount' => $debit * -1,
                 'description' => 'Payment',
             ]
         );
 
         $result[] = $transaction;
 
         Transaction::whereIn('id', $entitlementTransactions)->update(['transaction_id' => $transaction->id]);
 
         $transaction = Transaction::create(
             [
                 'user_email' => null,
                 'object_id' => $wallet->id,
                 'object_type' => \App\Wallet::class,
                 'type' => Transaction::WALLET_CREDIT,
                 'amount' => 2000,
                 'description' => 'Payment',
             ]
         );
 
         $transaction->created_at = $date->next(Carbon::MONDAY);
         $transaction->save();
 
         $result[] = $transaction;
 
         $types = [
             Transaction::WALLET_AWARD,
             Transaction::WALLET_PENALTY,
         ];
 
         // The page size is 10, so we generate so many to have at least two pages
         $loops = 10;
         while ($loops-- > 0) {
-            $transaction = Transaction::create(
-                [
-                    'user_email' => 'jeroen.@jeroen.jeroen',
-                    'object_id' => $wallet->id,
-                    'object_type' => \App\Wallet::class,
-                    'type' => $types[count($result) % count($types)],
-                    'amount' => 11 * (count($result) + 1),
-                    'description' => 'TRANS' . $loops,
-                ]
-            );
-
+            $type = $types[count($result) % count($types)];
+            $transaction = Transaction::create([
+                'user_email' => 'jeroen.@jeroen.jeroen',
+                'object_id' => $wallet->id,
+                'object_type' => \App\Wallet::class,
+                'type' => $type,
+                'amount' => 11 * (count($result) + 1) * ($type == Transaction::WALLET_PENALTY ? -1 : 1),
+                'description' => 'TRANS' . $loops,
+            ]);
             $transaction->created_at = $date->next(Carbon::MONDAY);
             $transaction->save();
 
             $result[] = $transaction;
         }
 
         return $result;
     }
 
     /**
      * Delete a test domain whatever it takes.
      *
      * @coversNothing
      */
     protected function deleteTestDomain($name)
     {
         Queue::fake();
 
         $domain = Domain::withTrashed()->where('namespace', $name)->first();
 
         if (!$domain) {
             return;
         }
 
         $job = new \App\Jobs\Domain\DeleteJob($domain->id);
         $job->handle();
 
         $domain->forceDelete();
     }
 
-    /**
-     * Delete a test user whatever it takes.
-     *
-     * @coversNothing
-     */
+    protected function deleteTestGroup($email)
+    {
+        Queue::fake();
+
+        $group = Group::withTrashed()->where('email', $email)->first();
+
+        if (!$group) {
+            return;
+        }
+
+        $job = new \App\Jobs\Group\DeleteJob($group->id);
+        $job->handle();
+
+        $group->forceDelete();
+    }
+
     protected function deleteTestUser($email)
     {
         Queue::fake();
 
         $user = User::withTrashed()->where('email', $email)->first();
 
         if (!$user) {
             return;
         }
 
         $job = new \App\Jobs\User\DeleteJob($user->id);
         $job->handle();
 
         $user->forceDelete();
     }
 
     /**
      * Helper to access protected property of an object
      */
     protected static function getObjectProperty($object, $property_name)
     {
         $reflection = new \ReflectionClass($object);
         $property = $reflection->getProperty($property_name);
         $property->setAccessible(true);
 
         return $property->getValue($object);
     }
 
     /**
      * Get Domain object by namespace, create it if needed.
      * Skip LDAP jobs.
      *
      * @coversNothing
      */
     protected function getTestDomain($name, $attrib = [])
     {
         // Disable jobs (i.e. skip LDAP oprations)
         Queue::fake();
         return Domain::firstOrCreate(['namespace' => $name], $attrib);
     }
 
+    /**
+     * Get Group object by email, create it if needed.
+     * Skip LDAP jobs.
+     */
+    protected function getTestGroup($email, $attrib = [])
+    {
+        // Disable jobs (i.e. skip LDAP oprations)
+        Queue::fake();
+        return Group::firstOrCreate(['email' => $email], $attrib);
+    }
+
     /**
      * Get User object by email, create it if needed.
      * Skip LDAP jobs.
      *
      * @coversNothing
      */
     protected function getTestUser($email, $attrib = [])
     {
         // Disable jobs (i.e. skip LDAP oprations)
         Queue::fake();
-        $user = User::withTrashed()->where('email', $email)->first();
-
-        if (!$user) {
-            return User::firstOrCreate(['email' => $email], $attrib);
-        }
+        $user = User::firstOrCreate(['email' => $email], $attrib);
 
-        if ($user->deleted_at) {
-            $user->restore();
+        if ($user->trashed()) {
+            // Note: we do not want to use user restore here
+            User::where('id', $user->id)->forceDelete();
+            $user = User::create(['email' => $email] + $attrib);
         }
 
         return $user;
     }
 
     /**
      * Call protected/private method of a class.
      *
      * @param object $object     Instantiated object that we will run method on.
      * @param string $methodName Method name to call
      * @param array  $parameters Array of parameters to pass into method.
      *
      * @return mixed Method return.
      */
     protected function invokeMethod($object, $methodName, array $parameters = array())
     {
         $reflection = new \ReflectionClass(get_class($object));
         $method = $reflection->getMethod($methodName);
         $method->setAccessible(true);
 
         return $method->invokeArgs($object, $parameters);
     }
 
     public function setUp(): void
     {
         parent::setUp();
 
         $this->userPassword = \App\Utils::generatePassphrase();
 
         $this->domainHosted = $this->getTestDomain(
             'test.domain',
             [
                 'type' => \App\Domain::TYPE_EXTERNAL,
                 'status' => \App\Domain::STATUS_ACTIVE | \App\Domain::STATUS_CONFIRMED | \App\Domain::STATUS_VERIFIED
             ]
         );
 
         $packageKolab = \App\Package::where('title', 'kolab')->first();
 
         $this->domainOwner = $this->getTestUser('john@test.domain', ['password' => $this->userPassword]);
         $this->domainOwner->assignPackage($packageKolab);
         $this->domainOwner->setSettings($this->domainOwnerSettings);
 
         // separate for regular user
         $this->jack = $this->getTestUser('jack@test.domain', ['password' => $this->userPassword]);
 
         // separate for wallet controller
         $this->jane = $this->getTestUser('jane@test.domain', ['password' => $this->userPassword]);
 
         $this->joe = $this->getTestUser('joe@test.domain', ['password' => $this->userPassword]);
 
         $this->domainUsers[] = $this->jack;
         $this->domainUsers[] = $this->jane;
         $this->domainUsers[] = $this->joe;
         $this->domainUsers[] = $this->getTestUser('jill@test.domain', ['password' => $this->userPassword]);
 
         foreach ($this->domainUsers as $user) {
             $this->domainOwner->assignPackage($packageKolab, $user);
         }
 
         $this->domainUsers[] = $this->domainOwner;
 
         // assign second factor to joe
         $this->joe->assignSku(\App\Sku::where('title', '2fa')->first());
         \App\Auth\SecondFactor::seed($this->joe->email);
 
         usort(
             $this->domainUsers,
             function ($a, $b) {
                 return $a->email > $b->email;
             }
         );
 
         $this->domainHosted->assignPackage(
             \App\Package::where('title', 'domain-hosting')->first(),
             $this->domainOwner
         );
 
         $wallet = $this->domainOwner->wallets()->first();
 
         $wallet->addController($this->jane);
 
         $this->publicDomain = \App\Domain::where('type', \App\Domain::TYPE_PUBLIC)->first();
         $this->publicDomainUser = $this->getTestUser(
             'john@' . $this->publicDomain->namespace,
             ['password' => $this->userPassword]
         );
 
         $this->publicDomainUser->assignPackage($packageKolab);
     }
 
     public function tearDown(): void
     {
         foreach ($this->domainUsers as $user) {
             if ($user == $this->domainOwner) {
                 continue;
             }
 
             $this->deleteTestUser($user->email);
         }
 
         $this->deleteTestUser($this->domainOwner->email);
         $this->deleteTestDomain($this->domainHosted->namespace);
 
         $this->deleteTestUser($this->publicDomainUser->email);
 
         parent::tearDown();
     }
 }
diff --git a/src/tests/Unit/SignupCodeTest.php b/src/tests/Unit/SignupCodeTest.php
index ed2ed2fb..6ce97526 100644
--- a/src/tests/Unit/SignupCodeTest.php
+++ b/src/tests/Unit/SignupCodeTest.php
@@ -1,23 +1,23 @@
 <?php
 
 namespace Tests\Unit;
 
 use App\SignupCode;
 use Tests\TestCase;
 
 class SignupCodeTest extends TestCase
 {
     /**
      * Test SignupCode::generateShortCode()
      *
      * @return void
      */
     public function testGenerateShortCode()
     {
         $code = SignupCode::generateShortCode();
 
         $this->assertTrue(is_string($code));
         $this->assertTrue(strlen($code) === env('SIGNUP_CODE_LENGTH', SignupCode::SHORTCODE_LENGTH));
-        $this->assertTrue(strspn($code, env('SIGNUP_CODE_CHARS', SignupCode::SHORTCODE_CHARS)) === strlen($code));
+        $this->assertTrue(strspn($code, env('SIGNUP_CODE_CHARS', \App\Utils::CHARS)) === strlen($code));
     }
 }
diff --git a/src/tests/Unit/TransactionTest.php b/src/tests/Unit/TransactionTest.php
index 15c9976b..89898ba2 100644
--- a/src/tests/Unit/TransactionTest.php
+++ b/src/tests/Unit/TransactionTest.php
@@ -1,205 +1,205 @@
 <?php
 
 namespace Tests\Unit;
 
 use App\Entitlement;
 use App\Sku;
 use App\Transaction;
 use App\Wallet;
 use Tests\TestCase;
 
 class TransactionTest extends TestCase
 {
     /**
      * Test transaction short and long labels
      */
     public function testLabels(): void
     {
         // Prepare test environment
         Transaction::where('amount', '<', 20)->delete();
         $user = $this->getTestUser('jane@kolabnow.com');
         $wallet = $user->wallets()->first();
 
         // Create transactions
 
         $transaction = Transaction::create([
                 'object_id' => $wallet->id,
                 'object_type' => Wallet::class,
                 'type' => Transaction::WALLET_PENALTY,
-                'amount' => 9,
+                'amount' => -10,
                 'description' => "A test penalty"
         ]);
 
         $transaction = Transaction::create([
                 'object_id' => $wallet->id,
                 'object_type' => Wallet::class,
                 'type' => Transaction::WALLET_DEBIT,
-                'amount' => 10
+                'amount' => -9
         ]);
 
         $transaction = Transaction::create([
                 'object_id' => $wallet->id,
                 'object_type' => Wallet::class,
                 'type' => Transaction::WALLET_CREDIT,
                 'amount' => 11
         ]);
 
         $transaction = Transaction::create([
                 'object_id' => $wallet->id,
                 'object_type' => Wallet::class,
                 'type' => Transaction::WALLET_AWARD,
                 'amount' => 12,
                 'description' => "A test award"
         ]);
 
         $sku = Sku::where('title', 'mailbox')->first();
         $entitlement = Entitlement::where('sku_id', $sku->id)->first();
         $transaction = Transaction::create([
                 'user_email' => 'test@test.com',
                 'object_id' => $entitlement->id,
                 'object_type' => Entitlement::class,
                 'type' => Transaction::ENTITLEMENT_CREATED,
                 'amount' => 13
         ]);
 
         $sku = Sku::where('title', 'domain-hosting')->first();
         $entitlement = Entitlement::where('sku_id', $sku->id)->first();
         $transaction = Transaction::create([
                 'user_email' => 'test@test.com',
                 'object_id' => $entitlement->id,
                 'object_type' => Entitlement::class,
                 'type' => Transaction::ENTITLEMENT_BILLED,
                 'amount' => 14
         ]);
 
         $sku = Sku::where('title', 'storage')->first();
         $entitlement = Entitlement::where('sku_id', $sku->id)->first();
         $transaction = Transaction::create([
                 'user_email' => 'test@test.com',
                 'object_id' => $entitlement->id,
                 'object_type' => Entitlement::class,
                 'type' => Transaction::ENTITLEMENT_DELETED,
                 'amount' => 15
         ]);
 
         $transactions = Transaction::where('amount', '<', 20)->orderBy('amount')->get();
 
-        $this->assertSame(9, $transactions[0]->amount);
+        $this->assertSame(-10, $transactions[0]->amount);
         $this->assertSame(Transaction::WALLET_PENALTY, $transactions[0]->type);
         $this->assertSame(
-            "The balance of Default wallet was reduced by 0,09 CHF; A test penalty",
+            "The balance of Default wallet was reduced by 0,10 CHF; A test penalty",
             $transactions[0]->toString()
         );
         $this->assertSame(
             "Charge: A test penalty",
             $transactions[0]->shortDescription()
         );
 
-        $this->assertSame(10, $transactions[1]->amount);
+        $this->assertSame(-9, $transactions[1]->amount);
         $this->assertSame(Transaction::WALLET_DEBIT, $transactions[1]->type);
         $this->assertSame(
-            "0,10 CHF was deducted from the balance of Default wallet",
+            "0,09 CHF was deducted from the balance of Default wallet",
             $transactions[1]->toString()
         );
         $this->assertSame(
             "Deduction",
             $transactions[1]->shortDescription()
         );
 
         $this->assertSame(11, $transactions[2]->amount);
         $this->assertSame(Transaction::WALLET_CREDIT, $transactions[2]->type);
         $this->assertSame(
             "0,11 CHF was added to the balance of Default wallet",
             $transactions[2]->toString()
         );
         $this->assertSame(
             "Payment",
             $transactions[2]->shortDescription()
         );
 
         $this->assertSame(12, $transactions[3]->amount);
         $this->assertSame(Transaction::WALLET_AWARD, $transactions[3]->type);
         $this->assertSame(
             "Bonus of 0,12 CHF awarded to Default wallet; A test award",
             $transactions[3]->toString()
         );
         $this->assertSame(
             "Bonus: A test award",
             $transactions[3]->shortDescription()
         );
 
         $ent = $transactions[4]->entitlement();
         $this->assertSame(13, $transactions[4]->amount);
         $this->assertSame(Transaction::ENTITLEMENT_CREATED, $transactions[4]->type);
         $this->assertSame(
             "test@test.com created mailbox for " . $ent->entitleableTitle(),
             $transactions[4]->toString()
         );
         $this->assertSame(
             "Added mailbox for " . $ent->entitleableTitle(),
             $transactions[4]->shortDescription()
         );
 
         $ent = $transactions[5]->entitlement();
         $this->assertSame(14, $transactions[5]->amount);
         $this->assertSame(Transaction::ENTITLEMENT_BILLED, $transactions[5]->type);
         $this->assertSame(
             sprintf("%s for %s is billed at 0,14 CHF", $ent->sku->title, $ent->entitleableTitle()),
             $transactions[5]->toString()
         );
         $this->assertSame(
             sprintf("Billed %s for %s", $ent->sku->title, $ent->entitleableTitle()),
             $transactions[5]->shortDescription()
         );
 
         $ent = $transactions[6]->entitlement();
         $this->assertSame(15, $transactions[6]->amount);
         $this->assertSame(Transaction::ENTITLEMENT_DELETED, $transactions[6]->type);
         $this->assertSame(
             sprintf("test@test.com deleted %s for %s", $ent->sku->title, $ent->entitleableTitle()),
             $transactions[6]->toString()
         );
         $this->assertSame(
             sprintf("Deleted %s for %s", $ent->sku->title, $ent->entitleableTitle()),
             $transactions[6]->shortDescription()
         );
     }
 
     /**
      * Test that an exception is being thrown on invalid type
      */
     public function testInvalidType(): void
     {
         $this->expectException(\Exception::class);
 
         $transaction = Transaction::create(
             [
                 'object_id' => 'fake-id',
                 'object_type' => Wallet::class,
                 'type' => 'invalid',
                 'amount' => 9
             ]
         );
     }
 
     public function testEntitlementForWallet(): void
     {
         $transaction = \App\Transaction::where('object_type', \App\Wallet::class)
             ->whereIn('object_id', \App\Wallet::pluck('id'))->first();
 
         $entitlement = $transaction->entitlement();
         $this->assertNull($entitlement);
         $this->assertNotNull($transaction->wallet());
     }
 
     public function testWalletForEntitlement(): void
     {
         $transaction = \App\Transaction::where('object_type', \App\Entitlement::class)
             ->whereIn('object_id', \App\Entitlement::pluck('id'))->first();
 
         $wallet = $transaction->wallet();
         $this->assertNull($wallet);
 
         $this->assertNotNull($transaction->entitlement());
     }
 }
diff --git a/src/tests/Unit/VerificationCodeTest.php b/src/tests/Unit/VerificationCodeTest.php
index a1902dd6..515c16b3 100644
--- a/src/tests/Unit/VerificationCodeTest.php
+++ b/src/tests/Unit/VerificationCodeTest.php
@@ -1,26 +1,25 @@
 <?php
 
 namespace Tests\Unit;
 
 use App\VerificationCode;
 use Tests\TestCase;
 
 class VerificationCodeTest extends TestCase
 {
     /**
      * Test VerificationCode::generateShortCode()
      *
      * @return void
      */
     public function testGenerateShortCode()
     {
         $code = VerificationCode::generateShortCode();
 
         $code_length = env('VERIFICATION_CODE_LENGTH', VerificationCode::SHORTCODE_LENGTH);
-        $code_chars = env('VERIFICATION_CODE_CHARS', VerificationCode::SHORTCODE_CHARS);
 
         $this->assertTrue(is_string($code));
         $this->assertTrue(strlen($code) === $code_length);
-        $this->assertTrue(strspn($code, $code_chars) === strlen($code));
+        $this->assertTrue(strspn($code, \App\Utils::CHARS) === strlen($code));
     }
 }
diff --git a/src/webpack.mix.js b/src/webpack.mix.js
index 6e0c595f..8bc7d359 100644
--- a/src/webpack.mix.js
+++ b/src/webpack.mix.js
@@ -1,28 +1,50 @@
-const mix = require('laravel-mix');
 
 /*
  |--------------------------------------------------------------------------
  | Mix Asset Management
  |--------------------------------------------------------------------------
  |
  | Mix provides a clean, fluent API for defining some Webpack build steps
  | for your Laravel application. By default, we are compiling the Sass
  | file for the application as well as bundling up all the JS files.
  |
  */
 
+const fs = require('fs');
+const glob = require('glob');
+const mix = require('laravel-mix');
+
 mix.webpackConfig({
     output: {
-        publicPath: process.env.MIX_ASSET_PATH
+        publicPath: process.env.MIX_ASSET_PATH,
+        // Make sure chunks are also put into the public/js/ folder
+        chunkFilename: "js/[name].js"
+    },
+    optimization: {
+        splitChunks: {
+            // Disable chunking, so we have one chunk.js instead of chunk.js + vendor~chunk.js
+            maxAsyncRequests: 1
+        }
     },
     resolve: {
         alias: {
             'jquery$': 'jquery/dist/jquery.slim.js',
         }
     }
 })
 
 mix.js('resources/js/user.js', 'public/js')
     .js('resources/js/admin.js', 'public/js')
-    .sass('resources/sass/app.scss', 'public/css')
-    .sass('resources/sass/document.scss', 'public/css');
+
+glob.sync('resources/themes/*/', {}).forEach(fromDir => {
+    const toDir = fromDir.replace('resources/themes/', 'public/themes/')
+
+    mix.sass(fromDir + 'app.scss', toDir)
+        .sass(fromDir + 'document.scss', toDir);
+
+    fs.stat(fromDir + 'images', {}, (err, stats) => {
+        if (stats) {
+            mix.copyDirectory(fromDir + 'images', toDir + 'images')
+        }
+    })
+})