diff --git a/.storybook/.babelrc b/.storybook/.babelrc
deleted file mode 100644
index 97ab12b7f95..00000000000
--- a/.storybook/.babelrc
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "shippedProposals": true,
-        "useBuiltIns": "usage",
-        "corejs": "3",
-        "modules": "commonjs"
-      }
-    ],
-    "@babel/preset-react",
-    "@babel/preset-flow"
-  ],
-  "plugins": [
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-optional-chaining"
-  ]
-}
diff --git a/.storybook/addons.js b/.storybook/addons.js
deleted file mode 100644
index 9d64a3d0a8f..00000000000
--- a/.storybook/addons.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import '@storybook/addon-actions/register';
-import '@storybook/addon-knobs/register';
-import '@storybook/addon-links/register';
-import '@storybook/addon-viewport/register';
diff --git a/.storybook/babel.config.js b/.storybook/babel.config.js
new file mode 100644
index 00000000000..f028aa2d294
--- /dev/null
+++ b/.storybook/babel.config.js
@@ -0,0 +1,20 @@
+module.exports = {
+	presets: [
+		[
+			'@babel/preset-env',
+			{
+				shippedProposals: true,
+				useBuiltIns: 'usage',
+				corejs: '3',
+				modules: 'commonjs',
+			},
+		],
+		'@babel/preset-react',
+		'@babel/preset-flow',
+	],
+	plugins: [
+		'@babel/plugin-proposal-class-properties',
+		'@babel/plugin-proposal-optional-chaining',
+		'@babel/plugin-proposal-nullish-coalescing-operator',
+	],
+};
diff --git a/.storybook/config.js b/.storybook/config.js
deleted file mode 100644
index c7fb95b2124..00000000000
--- a/.storybook/config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { withKnobs } from '@storybook/addon-knobs';
-import { MINIMAL_VIEWPORTS } from '@storybook/addon-viewport/dist/defaults';
-import { addDecorator, addParameters, configure } from '@storybook/react';
-
-import { rocketChatDecorator } from './mocks/decorators';
-
-addParameters({
-	viewport: {
-		viewports: MINIMAL_VIEWPORTS,
-	},
-});
-
-addDecorator(rocketChatDecorator);
-addDecorator(withKnobs);
-
-configure([
-	require.context('../app', true, /\.stories\.js$/),
-	require.context('../client', true, /\.stories\.js$/),
-	require.context('../ee/app', true, /\.stories\.js$/),
-], module);
diff --git a/.storybook/main.js b/.storybook/main.js
new file mode 100644
index 00000000000..2b53b2635b3
--- /dev/null
+++ b/.storybook/main.js
@@ -0,0 +1,11 @@
+module.exports = {
+	stories: [
+		'../app/**/*.stories.js',
+		'../client/**/*.stories.js',
+		'../ee/app/**/*.stories.js',
+	],
+	addons: [
+		'@storybook/addon-actions',
+		'@storybook/addon-knobs',
+	],
+};
diff --git a/.storybook/mocks/meteor.js b/.storybook/mocks/meteor.js
index d85c752a2b2..a690a4db684 100644
--- a/.storybook/mocks/meteor.js
+++ b/.storybook/mocks/meteor.js
@@ -4,7 +4,10 @@ export const Meteor = {
 	_localStorage: window.localStorage,
 	absoluteUrl: () => {},
 	userId: () => {},
-	Streamer: () => {},
+	Streamer: () => ({
+		on: () => {},
+		removeListener: () => {},
+	}),
 	startup: () => {},
 	methods: () => {},
 	call: () => {},
@@ -31,10 +34,13 @@ export const Mongo = {
 	}),
 };
 
-export const ReactiveVar = () => ({
-	get: () => {},
-	set: () => {},
-});
+export const ReactiveVar = (val) => {
+	let currentVal = val;
+	return {
+		get: () => currentVal,
+		set: (val) => { currentVal = val; },
+	};
+};
 
 export const ReactiveDict = () => ({
 	get: () => {},
diff --git a/.storybook/preview.js b/.storybook/preview.js
new file mode 100644
index 00000000000..c4b6fca4894
--- /dev/null
+++ b/.storybook/preview.js
@@ -0,0 +1,7 @@
+import { withKnobs } from '@storybook/addon-knobs';
+import { addDecorator } from '@storybook/react';
+
+import { rocketChatDecorator } from './mocks/decorators';
+
+addDecorator(rocketChatDecorator);
+addDecorator(withKnobs);
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
index 03a6a91feed..1d47404d267 100644
--- a/.storybook/webpack.config.js
+++ b/.storybook/webpack.config.js
@@ -31,15 +31,35 @@ module.exports = async ({ config }) => {
 		use: '@settlin/spacebars-loader',
 	});
 
-	config.plugins.push(new webpack.NormalModuleReplacementPlugin(
-		/^meteor/,
-		require.resolve('./mocks/meteor.js'),
-	));
-
-	config.plugins.push(new webpack.NormalModuleReplacementPlugin(
-		/\.\/server\/index.js/,
-		require.resolve('./mocks/empty.js'),
-	));
+	config.module.rules.push({
+		test: /\.(ts|tsx)$/,
+		use: [
+			{
+				loader: 'ts-loader',
+				options: {
+					compilerOptions: {
+						noEmit: false,
+					},
+				},
+			},
+			{
+				loader: 'react-docgen-typescript-loader',
+			},
+		],
+	});
+
+	config.resolve.extensions.push('.ts', '.tsx');
+
+	config.plugins.push(
+		new webpack.NormalModuleReplacementPlugin(
+			/^meteor/,
+			require.resolve('./mocks/meteor.js'),
+		),
+		new webpack.NormalModuleReplacementPlugin(
+			/\/server(\/index.js)$/,
+			require.resolve('./mocks/empty.js'),
+		),
+	);
 
 	config.mode = 'development';
 	config.optimization.usedExports = true;
diff --git a/app/api/server/lib/rooms.js b/app/api/server/lib/rooms.js
index 94eb63685f3..b9e73acbfa6 100644
--- a/app/api/server/lib/rooms.js
+++ b/app/api/server/lib/rooms.js
@@ -56,6 +56,34 @@ export async function findAdminRooms({ uid, filter, types = [], pagination: { of
 	};
 }
 
+export async function findAdminRoom({ uid, rid }) {
+	if (!await hasPermissionAsync(uid, 'view-room-administration')) {
+		throw new Error('error-not-authorized');
+	}
+	const fields = {
+		prid: 1,
+		fname: 1,
+		name: 1,
+		t: 1,
+		cl: 1,
+		u: 1,
+		usernames: 1,
+		usersCount: 1,
+		muted: 1,
+		unmuted: 1,
+		ro: 1,
+		default: 1,
+		favorite: 1,
+		featured: 1,
+		topic: 1,
+		msgs: 1,
+		archived: 1,
+		tokenpass: 1,
+	};
+
+	return Rooms.findOneById(rid, { fields });
+}
+
 export async function findChannelAndPrivateAutocomplete({ uid, selector }) {
 	if (!await hasPermissionAsync(uid, 'view-other-user-channels')) {
 		return { items: [] };
diff --git a/app/api/server/v1/rooms.js b/app/api/server/v1/rooms.js
index 2f8a7df23e0..86711691782 100644
--- a/app/api/server/v1/rooms.js
+++ b/app/api/server/v1/rooms.js
@@ -4,7 +4,7 @@ import Busboy from 'busboy';
 import { FileUpload } from '../../../file-upload';
 import { Rooms, Messages } from '../../../models';
 import { API } from '../api';
-import { findAdminRooms, findChannelAndPrivateAutocomplete } from '../lib/rooms';
+import { findAdminRooms, findChannelAndPrivateAutocomplete, findAdminRoom } from '../lib/rooms';
 
 function findRoomByIdOrName({ params, checkedArchived = true }) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
@@ -299,6 +299,22 @@ API.v1.addRoute('rooms.adminRooms', { authRequired: true }, {
 	},
 });
 
+API.v1.addRoute('rooms.adminRooms.getRoom', { authRequired: true }, {
+	get() {
+		const { rid } = this.requestParams();
+		const room = Promise.await(findAdminRoom({
+			uid: this.userId,
+			rid,
+		}));
+
+		if (!room) {
+			return API.v1.failure('not-allowed', 'Not Allowed');
+		}
+		return API.v1.success(room);
+	},
+});
+
+
 API.v1.addRoute('rooms.autocomplete.channelAndPrivate', { authRequired: true }, {
 	get() {
 		const { selector } = this.queryParams;
@@ -312,3 +328,28 @@ API.v1.addRoute('rooms.autocomplete.channelAndPrivate', { authRequired: true },
 		})));
 	},
 });
+
+API.v1.addRoute('rooms.saveRoomSettings', { authRequired: true }, {
+	post() {
+		const { rid, ...params } = this.bodyParams;
+
+		const result = Meteor.runAsUser(this.userId, () => Meteor.call('saveRoomSettings', rid, params));
+
+		return API.v1.success({ rid: result.rid });
+	},
+});
+
+API.v1.addRoute('rooms.changeArchivationState', { authRequired: true }, {
+	post() {
+		const { rid, action } = this.bodyParams;
+
+		let result;
+		if (action === 'archive') {
+			result = Meteor.runAsUser(this.userId, () => Meteor.call('archiveRoom', rid));
+		} else {
+			result = Meteor.runAsUser(this.userId, () => Meteor.call('unarchiveRoom', rid));
+		}
+
+		return API.v1.success({ result });
+	},
+});
diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index 0598d8a430a..5a8be4493a0 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -30,6 +30,8 @@ API.v1.addRoute('users.create', { authRequired: true }, {
 			password: String,
 			username: String,
 			active: Match.Maybe(Boolean),
+			bio: Match.Maybe(String),
+			statusText: Match.Maybe(String),
 			roles: Match.Maybe(Array),
 			joinDefaultChannels: Match.Maybe(Boolean),
 			requirePasswordChange: Match.Maybe(Boolean),
@@ -431,6 +433,7 @@ API.v1.addRoute('users.update', { authRequired: true, twoFactorRequired: true },
 				name: Match.Maybe(String),
 				password: Match.Maybe(String),
 				username: Match.Maybe(String),
+				bio: Match.Maybe(String),
 				statusText: Match.Maybe(String),
 				active: Match.Maybe(Boolean),
 				roles: Match.Maybe(Array),
diff --git a/app/apps/client/orchestrator.js b/app/apps/client/orchestrator.js
index 54c614044fe..0b7bdfd5883 100644
--- a/app/apps/client/orchestrator.js
+++ b/app/apps/client/orchestrator.js
@@ -4,7 +4,7 @@ import toastr from 'toastr';
 
 import { AppWebsocketReceiver } from './communication';
 import { APIClient } from '../../utils';
-import { registerAdminSidebarItem } from '../../ui-admin/client';
+import { registerAdminSidebarItem } from '../../../client/admin';
 import { CachedCollectionManager } from '../../ui-cached-collection';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { handleI18nResources } from './i18n';
diff --git a/app/apps/client/routes.js b/app/apps/client/routes.js
index 66005d26b87..c8ff516040e 100644
--- a/app/apps/client/routes.js
+++ b/app/apps/client/routes.js
@@ -1,7 +1,7 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { registerAdminRoute } from '../../ui-admin/client';
+import { registerAdminRoute } from '../../../client/admin';
 import { Apps } from './orchestrator';
 
 registerAdminRoute('/apps/what-is-it', {
diff --git a/app/authorization/client/route.js b/app/authorization/client/route.js
index 95ccd464cc4..2a09c78da6d 100644
--- a/app/authorization/client/route.js
+++ b/app/authorization/client/route.js
@@ -1,6 +1,6 @@
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { registerAdminRoute } from '../../ui-admin/client';
+import { registerAdminRoute } from '../../../client/admin';
 import { t } from '../../utils/client';
 
 registerAdminRoute('/permissions', {
diff --git a/app/authorization/client/startup.js b/app/authorization/client/startup.js
index 9e437c26c05..2dd50b95fa2 100644
--- a/app/authorization/client/startup.js
+++ b/app/authorization/client/startup.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { hasAtLeastOnePermission } from './hasPermission';
-import { registerAdminSidebarItem } from '../../ui-admin/client';
+import { registerAdminSidebarItem } from '../../../client/admin';
 import { CachedCollectionManager } from '../../ui-cached-collection';
 import { APIClient } from '../../utils/client';
 import { Roles } from '../../models/client';
diff --git a/app/channel-settings/client/views/Multiselect.js b/app/channel-settings/client/views/Multiselect.js
index a63fa1981cd..1f90cc45a38 100644
--- a/app/channel-settings/client/views/Multiselect.js
+++ b/app/channel-settings/client/views/Multiselect.js
@@ -4,7 +4,7 @@ import { createTemplateForComponent } from '../../../../client/reactAdapters';
 
 createTemplateForComponent(
 	'Multiselect',
-	() => import('../../../ui-admin/client/components/settings/inputs/MultiSelectSettingInput'),
+	() => import('../../../../client/admin/settings/inputs/MultiSelectSettingInput'),
 	{
 		// eslint-disable-next-line new-cap
 		renderContainerView: () => HTML.DIV({ class: 'rc-multiselect', style: 'display: flex;' }),
diff --git a/app/chatpal-search/client/route.js b/app/chatpal-search/client/route.js
index 86c6ad276c4..29695aa215a 100644
--- a/app/chatpal-search/client/route.js
+++ b/app/chatpal-search/client/route.js
@@ -1,6 +1,6 @@
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { registerAdminRoute } from '../../ui-admin/client';
+import { registerAdminRoute } from '../../../client/admin';
 import { t } from '../../utils';
 
 registerAdminRoute('/chatpal', {
diff --git a/app/cloud/client/index.js b/app/cloud/client/index.js
index 0c8025d22db..ce6ceecd3d5 100644
--- a/app/cloud/client/index.js
+++ b/app/cloud/client/index.js
@@ -4,7 +4,7 @@ import './admin/cloudRegisterManually';
 
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { registerAdminRoute, registerAdminSidebarItem } from '../../ui-admin/client';
+import { registerAdminRoute, registerAdminSidebarItem } from '../../../client/admin';
 import { hasAtLeastOnePermission } from '../../authorization';
 
 registerAdminRoute('/cloud', {
diff --git a/app/custom-sounds/assets/stylesheets/customSoundsAdmin.css b/app/custom-sounds/assets/stylesheets/customSoundsAdmin.css
deleted file mode 100644
index c96075a621e..00000000000
--- a/app/custom-sounds/assets/stylesheets/customSoundsAdmin.css
+++ /dev/null
@@ -1,111 +0,0 @@
-.sound-info {
-	& .icon-play-circled {
-		cursor: pointer;
-	}
-}
-
-.sound-view {
-	z-index: 15;
-
-	overflow-x: hidden;
-	overflow-y: auto;
-
-	& .thumb {
-		width: 100%;
-		height: 350px;
-		padding: 20px;
-	}
-
-	& nav {
-		padding: 0 20px;
-	}
-
-	& .info {
-		padding: 0 20px;
-
-		white-space: normal;
-
-		& h3 {
-			overflow: hidden;
-
-			width: 100%;
-			margin: 8px 0;
-
-			user-select: text;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-
-			font-size: 24px;
-			line-height: 27px;
-
-			& i::after {
-				display: inline-block;
-
-				width: 8px;
-				height: 8px;
-
-				content: " ";
-				vertical-align: middle;
-
-				border-radius: 4px;
-			}
-		}
-
-		& p {
-			-webkit-user-select: text;
-			-moz-user-select: text;
-			-ms-user-select: text;
-			user-select: text;
-
-			font-size: 12px;
-			font-weight: 300;
-			line-height: 18px;
-		}
-	}
-
-	& .edit-form {
-		padding: 20px 20px 0;
-
-		white-space: normal;
-
-		& h3 {
-			margin-bottom: 8px;
-
-			font-size: 24px;
-			line-height: 22px;
-		}
-
-		& p {
-			font-size: 12px;
-			font-weight: 300;
-			line-height: 18px;
-		}
-
-		& > .input-line {
-			margin-top: 20px;
-		}
-
-		& nav {
-			padding: 0;
-
-			&.buttons {
-				margin-top: 2em;
-			}
-		}
-
-		& .form-divisor {
-			height: 9px;
-			margin: 2em 0;
-
-			text-align: center;
-
-			& > span {
-				padding: 0 1em;
-			}
-		}
-	}
-
-	& .room-info-content > div {
-		margin: 0 0 20px;
-	}
-}
diff --git a/app/custom-sounds/client/admin/adminSoundEdit.html b/app/custom-sounds/client/admin/adminSoundEdit.html
deleted file mode 100644
index c6f4ef42f9b..00000000000
--- a/app/custom-sounds/client/admin/adminSoundEdit.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="adminSoundEdit">
-	<div class="content">
-		<div class="sound-view">
-			{{> soundEdit .}}
-		</div>
-	</div>
-</template>
diff --git a/app/custom-sounds/client/admin/adminSoundInfo.html b/app/custom-sounds/client/admin/adminSoundInfo.html
deleted file mode 100644
index f9676c22303..00000000000
--- a/app/custom-sounds/client/admin/adminSoundInfo.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="adminSoundInfo">
-	<div class="content">
-		<div class="sound-view">
-			{{> soundInfo .}}
-		</div>
-	</div>
-</template>
diff --git a/app/custom-sounds/client/admin/adminSounds.html b/app/custom-sounds/client/admin/adminSounds.html
deleted file mode 100644
index c9a20bd9c4f..00000000000
--- a/app/custom-sounds/client/admin/adminSounds.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<template name="adminSounds">
-	<div class="main-content-flex">
-		<section class="page-container page-list flex-tab-main-content">
-			{{> header sectionName="Custom_Sounds"}}
-			<div class="content">
-				{{#requiresPermission 'manage-sounds'}}
-					<form class="search-form" role="form">
-						<div class="rc-input__wrapper">
-							<div class="rc-input__icon">
-								{{#if isLoading}}
-									{{> loading }}
-								{{else}}
-									{{> icon block="rc-input__icon-svg" icon="magnifier" }}
-								{{/if}}
-							</div>
-							<input id="sound-filter" type="text" class="rc-input__element"
-									 placeholder="{{_ "Search"}}" autofocus dir="auto">
-						</div>
-					</form>
-					<div class="results">
-						{{{_ "Showing_results" customsounds.length}}}
-					</div>
-					{{#table fixed='true' onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize}}
-						<thead>
-							<tr>
-								<th width="95%">
-									<div class="table-fake-th">{{_ "Name"}}</div>
-								</th>
-								<th width="5%">
-									<div class="table-fake-th">{{_ "Action"}}</div>
-								</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{#each customsounds}}
-							<tr>
-								<td width="80%">
-									<div class="rc-table-wrapper">
-										<div class="rc-table-info">
-											<span class="rc-table-title">
-												{{name}}
-											</span>
-										</div>
-									</div>
-								</td>
-								<td width="20%">
-										<div class="rc-table-wrapper">
-												{{#if isPlaying _id}}
-													{{>icon _id=_id icon="pause" block="icon-pause-circled"}}
-												{{else}}
-													{{>icon _id=_id icon="play" block="icon-play-circled"}}
-												{{/if}}
-												{{>icon _id=_id icon="ban" block="icon-reset-circled"}}
-										</div>
-								</td>
-							</tr>
-							{{else}}
-								{{# with searchText}}
-									<tr class="table-no-click">
-										<td>{{_ "No_results_found_for"}} {{.}}</td>
-									</tr>
-								{{/with}}
-							{{/each}}
-							{{#if isLoading}}
-							<tr class="table-no-click">
-								<td class="table-loading-td">{{> loading}}</td>
-							</tr>
-							{{/if}}
-						</tbody>
-					{{/table}}
-				{{/requiresPermission}}
-			</div>
-		</section>
-		{{#with flexData}}
-			{{> flexTabBar}}
-		{{/with}}
-	</div>
-</template>
diff --git a/app/custom-sounds/client/admin/adminSounds.js b/app/custom-sounds/client/admin/adminSounds.js
deleted file mode 100644
index 9de092e3c14..00000000000
--- a/app/custom-sounds/client/admin/adminSounds.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Tracker } from 'meteor/tracker';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Template } from 'meteor/templating';
-import _ from 'underscore';
-
-import { RocketChatTabBar, SideNav, TabBar } from '../../../ui-utils';
-import { CustomSounds } from '../lib/CustomSounds';
-import { APIClient } from '../../../utils/client';
-
-const LIST_SIZE = 50;
-const DEBOUNCE_TIME_TO_SEARCH_IN_MS = 500;
-
-Template.adminSounds.helpers({
-	searchText() {
-		const instance = Template.instance();
-		return instance.filter && instance.filter.get();
-	},
-	isPlaying(_id) {
-		return Template.instance().isPlayingId.get() === _id;
-	},
-	customsounds() {
-		return Template.instance().sounds.get();
-	},
-	isLoading() {
-		return Template.instance().isLoading.get();
-	},
-	flexData() {
-		return {
-			tabBar: Template.instance().tabBar,
-			data: Template.instance().tabBarData.get(),
-		};
-	},
-
-	onTableScroll() {
-		const instance = Template.instance();
-		return function(currentTarget) {
-			if (currentTarget.offsetHeight + currentTarget.scrollTop < currentTarget.scrollHeight - 100) {
-				return;
-			}
-			const sounds = instance.sounds.get();
-			if (instance.total.get() > sounds.length) {
-				instance.offset.set(instance.offset.get() + LIST_SIZE);
-			}
-		};
-	},
-	onTableItemClick() {
-		const instance = Template.instance();
-		return function(item) {
-			instance.tabBarData.set({
-				sound: instance.sounds.get().find((sound) => sound._id === item._id),
-				onSuccess: instance.onSuccessCallback,
-			});
-			instance.tabBar.showGroup('custom-sounds-selected');
-			instance.tabBar.open('admin-sound-info');
-		};
-	},
-});
-
-Template.adminSounds.onCreated(function() {
-	const instance = this;
-	this.sounds = new ReactiveVar([]);
-	this.offset = new ReactiveVar(0);
-	this.total = new ReactiveVar(0);
-	this.query = new ReactiveVar({});
-	this.isLoading = new ReactiveVar(false);
-	this.filter = new ReactiveVar('');
-	this.isPlayingId = new ReactiveVar('');
-
-	this.tabBar = new RocketChatTabBar();
-	this.tabBar.showGroup(FlowRouter.current().route.name);
-	this.tabBarData = new ReactiveVar();
-
-	TabBar.addButton({
-		groups: ['custom-sounds', 'custom-sounds-selected'],
-		id: 'add-sound',
-		i18nTitle: 'Custom_Sound_Add',
-		icon: 'plus',
-		template: 'adminSoundEdit',
-		order: 1,
-	});
-
-	TabBar.addButton({
-		groups: ['custom-sounds-selected'],
-		id: 'admin-sound-info',
-		i18nTitle: 'Custom_Sound_Info',
-		icon: 'customize',
-		template: 'adminSoundInfo',
-		order: 2,
-	});
-
-	this.onSuccessCallback = () => {
-		this.offset.set(0);
-		return this.loadSounds(this.query.get(), this.offset.get());
-	};
-
-	this.tabBarData.set({
-		onSuccess: instance.onSuccessCallback,
-	});
-
-	this.loadSounds = _.debounce(async (query, offset) => {
-		this.isLoading.set(true);
-		const { sounds, total } = await APIClient.v1.get(`custom-sounds.list?count=${ LIST_SIZE }&offset=${ offset }&query=${ JSON.stringify(query) }`);
-		this.total.set(total);
-		if (offset === 0) {
-			this.sounds.set(sounds);
-		} else {
-			this.sounds.set(this.sounds.get().concat(sounds));
-		}
-		this.isLoading.set(false);
-	}, DEBOUNCE_TIME_TO_SEARCH_IN_MS);
-
-	this.autorun(() => {
-		const filter = this.filter.get() && this.filter.get().trim();
-		const offset = this.offset.get();
-		if (filter) {
-			const regex = { $regex: filter, $options: 'i' };
-			return this.loadSounds({ name: regex }, offset);
-		}
-		return this.loadSounds({}, offset);
-	});
-});
-
-Template.adminSounds.onRendered(() =>
-	Tracker.afterFlush(function() {
-		SideNav.setFlex('adminFlex');
-		SideNav.openFlex();
-	}),
-);
-
-Template.adminSounds.events({
-	'keydown #sound-filter'(e) {
-		// stop enter key
-		if (e.which === 13) {
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-	'keyup #sound-filter'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.filter.set(e.currentTarget.value);
-		t.offset.set(0);
-	},
-	'click .icon-play-circled'(e, t) {
-		e.preventDefault();
-		e.stopPropagation();
-		CustomSounds.play(this._id);
-		const audio = document.getElementById(t.isPlayingId.get());
-		if (audio) {
-			audio.pause();
-		}
-		document.getElementById(this._id).onended = () => {
-			t.isPlayingId.set('');
-			this.onended = null;
-		};
-		t.isPlayingId.set(this._id);
-	},
-	'click .icon-pause-circled'(e, t) {
-		e.preventDefault();
-		e.stopPropagation();
-		const audio = document.getElementById(this._id);
-		if (audio && !audio.paused) {
-			audio.pause();
-		}
-		t.isPlayingId.set('');
-	},
-	'click .icon-reset-circled'(e) {
-		e.preventDefault();
-		e.stopPropagation();
-		const audio = document.getElementById(this._id);
-		if (audio) {
-			audio.currentTime = 0;
-		}
-	},
-});
diff --git a/app/custom-sounds/client/admin/route.js b/app/custom-sounds/client/admin/route.js
deleted file mode 100644
index 0f181fda578..00000000000
--- a/app/custom-sounds/client/admin/route.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-
-import { registerAdminRoute } from '../../../ui-admin/client';
-
-registerAdminRoute('/custom-sounds', {
-	name: 'custom-sounds',
-	async action(/* params*/) {
-		await import('./views');
-		BlazeLayout.render('main', { center: 'adminSounds' });
-	},
-});
diff --git a/app/custom-sounds/client/admin/soundEdit.html b/app/custom-sounds/client/admin/soundEdit.html
deleted file mode 100644
index 63caf62d4dd..00000000000
--- a/app/custom-sounds/client/admin/soundEdit.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<template name="soundEdit">
-	{{#requiresPermission 'manage-sounds'}}
-		<div class="about clearfix">
-			<form class="edit-form" autocomplete="off">
-				{{#if sound}}
-					<h3>{{sound.name}}</h3>
-				{{else}}
-					<h3>{{_ "Custom_Sound_Add"}}</h3>
-				{{/if}}
-				<div class="input-line">
-					<label for="name">{{_ "Name"}}</label>
-					<input type="text" id="name" autocomplete="off" value="{{sound.name}}">
-				</div>
-				<div class="input-line">
-					<label for="image">{{_ "Sound_File_mp3"}}</label>
-					<input id="image" type="file" accept="audio/mp3,audio/mpeg,audio/x-mpeg,audio/mpeg3,audio/x-mpeg-3,.mp3"/>
-				</div>
-				<nav>
-					<button class='button button-block cancel' type="button"><span>{{_ "Cancel"}}</span></button>
-					<button class='button button-block primary save'><span>{{_ "Save"}}</span></button>
-				</nav>
-			</form>
-		</div>
-	{{/requiresPermission}}
-</template>
diff --git a/app/custom-sounds/client/admin/soundEdit.js b/app/custom-sounds/client/admin/soundEdit.js
deleted file mode 100644
index cffe9c92d10..00000000000
--- a/app/custom-sounds/client/admin/soundEdit.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import toastr from 'toastr';
-import s from 'underscore.string';
-
-import { t, handleError } from '../../../utils';
-
-Template.soundEdit.helpers({
-	sound() {
-		return Template.instance().sound;
-	},
-
-	name() {
-		return this.name || this._id;
-	},
-});
-
-Template.soundEdit.events({
-	'click .cancel'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		delete Template.instance().soundFile;
-		t.cancel(t.find('form'));
-	},
-
-	'submit form'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.save(e.currentTarget);
-	},
-
-	'change input[type=file]'(ev) {
-		const e = ev.originalEvent != null ? ev.originalEvent : ev;
-		let { files } = e.target;
-		if (e.target.files == null || files.length === 0) {
-			if (e.dataTransfer.files != null) {
-				files = e.dataTransfer.files;
-			} else {
-				files = [];
-			}
-		}
-
-		// using let x of y here seems to have incompatibility with some phones
-		for (const file in files) {
-			if (files.hasOwnProperty(file)) {
-				Template.instance().soundFile = files[file];
-			}
-		}
-	},
-});
-
-Template.soundEdit.onCreated(function() {
-	if (this.data != null) {
-		this.sound = this.data.sound;
-	} else {
-		this.sound = undefined;
-		this.data.tabBar.showGroup('custom-sounds');
-	}
-	this.onSuccess = Template.currentData().onSuccess;
-	this.cancel = (form, name) => {
-		form.reset();
-		this.data.tabBar.close();
-		if (this.sound) {
-			this.data.back(name);
-		}
-	};
-
-	this.getSoundData = () => {
-		const soundData = {};
-		if (this.sound != null) {
-			soundData._id = this.sound._id;
-			soundData.previousName = this.sound.name;
-			soundData.extension = this.sound.extension;
-			soundData.previousExtension = this.sound.extension;
-		}
-		soundData.name = s.trim(this.$('#name').val());
-		soundData.newFile = false;
-		return soundData;
-	};
-
-	this.validate = () => {
-		const soundData = this.getSoundData();
-
-		const errors = [];
-		if (!soundData.name) {
-			errors.push('Name');
-		}
-
-		if (!soundData._id) {
-			if (!this.soundFile) {
-				errors.push('Sound_File_mp3');
-			}
-		}
-
-		for (const error of errors) {
-			toastr.error(TAPi18n.__('error-the-field-is-required', { field: TAPi18n.__(error) }));
-		}
-
-		if (this.soundFile) {
-			if (!/audio\/mp3/.test(this.soundFile.type) && !/audio\/mpeg/.test(this.soundFile.type) && !/audio\/x-mpeg/.test(this.soundFile.type)) {
-				errors.push('FileType');
-				toastr.error(TAPi18n.__('error-invalid-file-type'));
-			}
-		}
-
-		return errors.length === 0;
-	};
-
-	this.save = (form) => {
-		if (this.validate()) {
-			const soundData = this.getSoundData();
-
-			if (this.soundFile) {
-				soundData.newFile = true;
-				soundData.extension = this.soundFile.name.split('.').pop();
-				soundData.type = this.soundFile.type;
-			}
-
-			Meteor.call('insertOrUpdateSound', soundData, (error, result) => {
-				if (result) {
-					soundData._id = result;
-					soundData.random = Math.round(Math.random() * 1000);
-
-					if (this.soundFile) {
-						toastr.info(TAPi18n.__('Uploading_file'));
-
-						const reader = new FileReader();
-						reader.readAsBinaryString(this.soundFile);
-						reader.onloadend = () => {
-							Meteor.call('uploadCustomSound', reader.result, this.soundFile.type, soundData, (uploadError/* , data*/) => {
-								if (uploadError != null) {
-									handleError(uploadError);
-									console.log(uploadError);
-								}
-							},
-							);
-							delete this.soundFile;
-							toastr.success(TAPi18n.__('File_uploaded'));
-						};
-					}
-
-					toastr.success(t('Custom_Sound_Saved_Successfully'));
-					this.onSuccess();
-
-					this.cancel(form, soundData.name);
-				}
-
-				if (error) {
-					handleError(error);
-				}
-			});
-		}
-	};
-});
diff --git a/app/custom-sounds/client/admin/soundInfo.html b/app/custom-sounds/client/admin/soundInfo.html
deleted file mode 100644
index 09374f00609..00000000000
--- a/app/custom-sounds/client/admin/soundInfo.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<template name="soundInfo">
-	{{#if editingSound}}
-		{{> soundEdit (soundToEdit)}}
-	{{else}}
-		{{#with sound}}
-		<div class="about clearfix">
-			<div class="info">
-				<h3 title="{{name}}">{{name}}</h3>
-			</div>
-		</div>
-		{{/with}}
-		<nav>
-			{{#if hasPermission 'manage-sounds'}}
-				<button class='button button-block danger delete'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
-				<button class='button button-block primary edit-sound'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
-			{{/if}}
-		</nav>
-	{{/if}}
-</template>
diff --git a/app/custom-sounds/client/admin/soundInfo.js b/app/custom-sounds/client/admin/soundInfo.js
deleted file mode 100644
index a27c74a03b2..00000000000
--- a/app/custom-sounds/client/admin/soundInfo.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-
-import { modal } from '../../../ui-utils';
-import { t, handleError } from '../../../utils';
-
-Template.soundInfo.helpers({
-	name() {
-		const sound = Template.instance().sound.get();
-		return sound.name;
-	},
-
-	sound() {
-		return Template.instance().sound.get();
-	},
-
-	editingSound() {
-		return Template.instance().editingSound.get();
-	},
-
-	soundToEdit() {
-		const instance = Template.instance();
-		return {
-			tabBar: instance.data.tabBar,
-			data: instance.data.data,
-			sound: instance.sound.get(),
-			onSuccess: instance.onSuccess,
-			back(name) {
-				instance.editingSound.set();
-
-				if (name != null) {
-					const sound = instance.sound.get();
-					if (sound.name != null && sound.name !== name) {
-						return instance.loadedName.set(name);
-					}
-				}
-			},
-		};
-	},
-});
-
-Template.soundInfo.events({
-	'click .delete'(e, instance) {
-		e.stopPropagation();
-		e.preventDefault();
-		const sound = instance.sound.get();
-		if (sound != null) {
-			const { _id } = sound;
-			modal.open({
-				title: t('Are_you_sure'),
-				text: t('Custom_Sound_Delete_Warning'),
-				type: 'warning',
-				showCancelButton: true,
-				confirmButtonColor: '#DD6B55',
-				confirmButtonText: t('Yes_delete_it'),
-				cancelButtonText: t('Cancel'),
-				closeOnConfirm: false,
-				html: false,
-			}, function() {
-				Meteor.call('deleteCustomSound', _id, (error/* , result*/) => {
-					if (error) {
-						handleError(error);
-					} else {
-						modal.open({
-							title: t('Deleted'),
-							text: t('Custom_Sound_Has_Been_Deleted'),
-							type: 'success',
-							timer: 2000,
-							showConfirmButton: false,
-						});
-						instance.onSuccess();
-						instance.data.tabBar.showGroup('custom-sounds');
-						instance.data.tabBar.close();
-					}
-				});
-			});
-		}
-	},
-
-	'click .edit-sound'(e, instance) {
-		e.stopPropagation();
-		e.preventDefault();
-
-		instance.editingSound.set(instance.sound.get()._id);
-	},
-});
-
-Template.soundInfo.onCreated(function() {
-	this.sound = new ReactiveVar();
-
-	this.editingSound = new ReactiveVar();
-
-	this.loadedName = new ReactiveVar();
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.autorun(() => {
-		const data = Template.currentData();
-		if (data && data.clear != null) {
-			this.clear = data.clear;
-		}
-	});
-
-	this.autorun(() => {
-		const data = Template.currentData().sound;
-		const sound = this.sound.get();
-		if (sound && sound.name != null) {
-			this.loadedName.set(sound.name);
-		} else if (data.name != null) {
-			this.loadedName.set(data.name);
-		}
-	});
-
-	this.autorun(() => {
-		const data = Template.currentData().sound;
-		this.sound.set(data);
-	});
-});
diff --git a/app/custom-sounds/client/admin/startup.js b/app/custom-sounds/client/admin/startup.js
deleted file mode 100644
index 2647b17ea42..00000000000
--- a/app/custom-sounds/client/admin/startup.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { hasAtLeastOnePermission } from '../../../authorization';
-import { registerAdminSidebarItem } from '../../../ui-admin/client';
-
-registerAdminSidebarItem({
-	href: 'custom-sounds',
-	i18nLabel: 'Custom_Sounds',
-	icon: 'volume',
-	permissionGranted() {
-		return hasAtLeastOnePermission(['manage-sounds']);
-	},
-});
diff --git a/app/custom-sounds/client/admin/views.js b/app/custom-sounds/client/admin/views.js
deleted file mode 100644
index 3a2397b2bda..00000000000
--- a/app/custom-sounds/client/admin/views.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import './adminSoundEdit.html';
-import './adminSoundInfo.html';
-import './adminSounds.html';
-import './adminSounds';
-import './soundEdit.html';
-import './soundEdit';
-import './soundInfo.html';
-import './soundInfo';
diff --git a/app/custom-sounds/client/index.js b/app/custom-sounds/client/index.js
index eb17166ef2b..77706dca50e 100644
--- a/app/custom-sounds/client/index.js
+++ b/app/custom-sounds/client/index.js
@@ -1,7 +1,4 @@
 import './notifications/deleteCustomSound';
 import './notifications/updateCustomSound';
-import './admin/route';
-import './admin/startup';
-import '../assets/stylesheets/customSoundsAdmin.css';
 
 export { CustomSounds } from './lib/CustomSounds';
diff --git a/app/custom-sounds/client/lib/CustomSounds.js b/app/custom-sounds/client/lib/CustomSounds.js
index 09c175ac6c0..a0422581f6a 100644
--- a/app/custom-sounds/client/lib/CustomSounds.js
+++ b/app/custom-sounds/client/lib/CustomSounds.js
@@ -4,6 +4,8 @@ import _ from 'underscore';
 
 import { CachedCollectionManager } from '../../../ui-cached-collection';
 
+const getCustomSoundId = (sound) => `custom-sound-${ sound }`;
+
 class CustomSoundsClass {
 	constructor() {
 		this.list = new ReactiveVar({});
@@ -19,7 +21,7 @@ class CustomSoundsClass {
 		if (!sound.src) {
 			sound.src = this.getURL(sound);
 		}
-		const audio = $('<audio />', { id: sound._id, preload: true }).append(
+		const audio = $('<audio />', { id: getCustomSoundId(sound._id), preload: true }).append(
 			$('<source />', { src: sound.src }),
 		);
 		const list = this.list.get();
@@ -59,7 +61,7 @@ class CustomSoundsClass {
 	}
 
 	play = (sound, { volume = 1, loop = false } = {}) => {
-		const audio = document.querySelector(`audio#${ sound }`);
+		const audio = document.querySelector(`#${ getCustomSoundId(sound) }`);
 		if (!audio || !audio.play) {
 			return;
 		}
diff --git a/app/custom-sounds/server/methods/insertOrUpdateSound.js b/app/custom-sounds/server/methods/insertOrUpdateSound.js
index 03a2ff69a4d..d3fe25e0173 100644
--- a/app/custom-sounds/server/methods/insertOrUpdateSound.js
+++ b/app/custom-sounds/server/methods/insertOrUpdateSound.js
@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import s from 'underscore.string';
+import { check } from 'meteor/check';
 
 import { hasPermission } from '../../../authorization';
 import { CustomSounds } from '../../../models';
@@ -32,6 +33,7 @@ Meteor.methods({
 		let matchingResults = [];
 
 		if (soundData._id) {
+			check(soundData._id, String);
 			matchingResults = CustomSounds.findByNameExceptId(soundData.name, soundData._id).fetch();
 		} else {
 			matchingResults = CustomSounds.findByName(soundData.name).fetch();
diff --git a/app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css b/app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css
deleted file mode 100644
index 30fb4da03c2..00000000000
--- a/app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css
+++ /dev/null
@@ -1,132 +0,0 @@
-.emojiAdminPreview {
-	position: relative;
-
-	overflow: hidden;
-
-	width: 100%;
-	height: 100%;
-
-	border-radius: 4px;
-
-	& .emojiAdminPreview-image {
-		position: relative;
-
-		display: block;
-
-		width: 100%;
-		min-width: 20px;
-		height: 100%;
-		min-height: 20px;
-
-		border-radius: 4px;
-		background-repeat: no-repeat;
-		background-position: center;
-		background-size: contain;
-	}
-}
-
-.emoji-view {
-	z-index: 15;
-
-	overflow-x: hidden;
-	overflow-y: auto;
-
-	& .thumb {
-		width: 100%;
-		height: 350px;
-		padding: 20px;
-	}
-
-	& nav {
-		padding: 0 20px;
-	}
-
-	& .info {
-		padding: 0 20px;
-
-		white-space: normal;
-
-		& h3 {
-			overflow: hidden;
-
-			width: 100%;
-			margin: 8px 0;
-
-			user-select: text;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-
-			font-size: 24px;
-			line-height: 27px;
-
-			& i::after {
-				display: inline-block;
-
-				width: 8px;
-				height: 8px;
-
-				content: " ";
-				vertical-align: middle;
-
-				border-radius: 4px;
-			}
-		}
-
-		& p {
-			-webkit-user-select: text;
-			-moz-user-select: text;
-			-ms-user-select: text;
-			user-select: text;
-
-			font-size: 12px;
-			font-weight: 300;
-			line-height: 18px;
-		}
-	}
-
-	& .edit-form {
-		padding: 20px 20px 0;
-
-		white-space: normal;
-
-		& h3 {
-			margin-bottom: 8px;
-
-			font-size: 24px;
-			line-height: 22px;
-		}
-
-		& p {
-			font-size: 12px;
-			font-weight: 300;
-			line-height: 18px;
-		}
-
-		& > .input-line {
-			margin-top: 20px;
-		}
-
-		& nav {
-			padding: 0;
-
-			&.buttons {
-				margin-top: 2em;
-			}
-		}
-
-		& .form-divisor {
-			height: 9px;
-			margin: 2em 0;
-
-			text-align: center;
-
-			& > span {
-				padding: 0 1em;
-			}
-		}
-	}
-
-	& .room-info-content > div {
-		margin: 0 0 20px;
-	}
-}
diff --git a/app/emoji-custom/client/admin/adminEmoji.html b/app/emoji-custom/client/admin/adminEmoji.html
deleted file mode 100644
index c2e59b84b84..00000000000
--- a/app/emoji-custom/client/admin/adminEmoji.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<template name="adminEmoji">
-	<div class="main-content-flex">
-		<section class="page-container page-list flex-tab-main-content">
-			{{> header sectionName="Custom_emoji"}}
-			<div class="content">
-				{{#unless hasPermission 'manage-emoji'}}
-					<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
-				{{else}}
-					<form class="search-form" role="form">
-						<div class="rc-input__wrapper">
-							<div class="rc-input__icon">
-								{{#if isLoading}}
-									{{> loading }}
-								{{else}}
-									{{> icon block="rc-input__icon-svg" icon="magnifier" }}
-								{{/if}}
-							</div>
-							<input id="emoji-filter" type="text" class="rc-input__element"
-								   placeholder="{{_ "Search"}}" autofocus dir="auto">
-					 	</div>
-					</form>
-					<div class="results">
-						{{{_ "Showing_results" customemoji.length}}}
-					</div>
-					{{#table fixed='true' onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize}}
-						<thead>
-							<tr>
-								<th width="50%">
-									<div class="table-fake-th">{{_ "Name"}}</div>
-								</th>
-								<th width="50%">
-									<div class="table-fake-th">{{_ "Aliases"}}</div>
-								</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{#each customemoji}}
-							<tr>
-								<td width="50%">
-									<div class="rc-table-wrapper">
-										<div class="rc-table-info">
-											<span class="rc-table-title">
-												{{name}}
-											</span>
-										</div>
-									</div>
-								</td>
-								<td width="50%">
-									<div class="rc-table-wrapper">
-										<div class="rc-table-info">
-											<span class="rc-table-title">
-												{{aliases}}
-											</span>
-										</div>
-									</div>
-								</td>
-							</tr>
-							{{else}} {{# with searchText}}
-							<tr class="table-no-click">
-								<td>{{_ "No_results_found_for"}} {{.}}</td>
-							</tr>
-							{{/with}} {{/each}} {{#if isLoading}}
-							<tr class="table-no-click">
-								<td class="table-loading-td">{{> loading}}</td>
-							</tr>
-							{{/if}}
-						</tbody>
-					{{/table}}
-				{{/unless}}
-			</div>
-		</section>
-		{{#with flexData}}
-			{{> flexTabBar}}
-		{{/with}}
-	</div>
-</template>
diff --git a/app/emoji-custom/client/admin/adminEmoji.js b/app/emoji-custom/client/admin/adminEmoji.js
deleted file mode 100644
index 6bbf479fbe2..00000000000
--- a/app/emoji-custom/client/admin/adminEmoji.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Tracker } from 'meteor/tracker';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Template } from 'meteor/templating';
-import _ from 'underscore';
-
-import { RocketChatTabBar, SideNav, TabBar } from '../../../ui-utils';
-import { APIClient } from '../../../utils/client';
-
-const LIST_SIZE = 50;
-const DEBOUNCE_TIME_TO_SEARCH_IN_MS = 500;
-
-Template.adminEmoji.helpers({
-	searchText() {
-		const instance = Template.instance();
-		return instance.filter && instance.filter.get();
-	},
-	customemoji() {
-		return Template.instance().emojis.get();
-	},
-	isLoading() {
-		return Template.instance().isLoading.get();
-	},
-	flexData() {
-		return {
-			tabBar: Template.instance().tabBar,
-			data: Template.instance().tabBarData.get(),
-		};
-	},
-	onTableScroll() {
-		const instance = Template.instance();
-		return function(currentTarget) {
-			if ((currentTarget.offsetHeight + currentTarget.scrollTop) < (currentTarget.scrollHeight - 100)) {
-				return;
-			}
-			const emojis = instance.emojis.get();
-			if (instance.total.get() > emojis.length) {
-				instance.offset.set(instance.offset.get() + LIST_SIZE);
-			}
-		};
-	},
-	onTableItemClick() {
-		const instance = Template.instance();
-		return function({ _id }) {
-			instance.tabBarData.set({
-				emoji: instance.emojis.get().find((emoji) => emoji._id === _id),
-				onSuccess: instance.onSuccessCallback,
-			});
-			instance.tabBar.open('admin-emoji-info');
-		};
-	},
-});
-
-Template.adminEmoji.onCreated(async function() {
-	const instance = this;
-	this.emojis = new ReactiveVar([]);
-	this.offset = new ReactiveVar(0);
-	this.total = new ReactiveVar(0);
-	this.filter = new ReactiveVar('');
-	this.query = new ReactiveVar({});
-	this.isLoading = new ReactiveVar(false);
-
-	this.tabBar = new RocketChatTabBar();
-	this.tabBar.showGroup(FlowRouter.current().route.name);
-	this.tabBarData = new ReactiveVar();
-
-	TabBar.addButton({
-		groups: ['emoji-custom'],
-		id: 'add-emoji',
-		i18nTitle: 'Custom_Emoji_Add',
-		icon: 'plus',
-		template: 'adminEmojiEdit',
-		order: 1,
-	});
-
-	TabBar.addButton({
-		groups: ['emoji-custom'],
-		id: 'admin-emoji-info',
-		i18nTitle: 'Custom_Emoji_Info',
-		icon: 'customize',
-		template: 'adminEmojiInfo',
-		order: 2,
-	});
-	this.onSuccessCallback = () => {
-		this.offset.set(0);
-		return this.loadEmojis(this.query.get(), this.offset.get());
-	};
-	this.tabBarData.set({
-		onSuccess: instance.onSuccessCallback,
-	});
-
-	this.loadEmojis = _.debounce(async (query, offset) => {
-		this.isLoading.set(true);
-		const { emojis, total } = await APIClient.v1.get(`emoji-custom.all?count=${ LIST_SIZE }&offset=${ offset }&query=${ JSON.stringify(query) }`);
-		this.total.set(total);
-		if (offset === 0) {
-			this.emojis.set(emojis);
-		} else {
-			this.emojis.set(this.emojis.get().concat(emojis));
-		}
-		this.isLoading.set(false);
-	}, DEBOUNCE_TIME_TO_SEARCH_IN_MS);
-
-	this.autorun(() => {
-		this.filter.get();
-		this.offset.set(0);
-	});
-
-	this.autorun(() => {
-		const filter = this.filter.get() && this.filter.get().trim();
-		const offset = this.offset.get();
-		if (filter) {
-			const regex = { $regex: filter, $options: 'i' };
-			return this.loadEmojis({ $or: [{ name: regex }, { aliases: regex }] }, offset);
-		}
-		return this.loadEmojis({}, offset);
-	});
-});
-
-Template.adminEmoji.onRendered(() =>
-	Tracker.afterFlush(function() {
-		SideNav.setFlex('adminFlex');
-		SideNav.openFlex();
-	}),
-);
-
-Template.adminEmoji.events({
-	'keydown #emoji-filter'(e) {
-		// stop enter key
-		if (e.which === 13) {
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-
-	'keyup #emoji-filter'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.filter.set(e.currentTarget.value);
-	},
-});
diff --git a/app/emoji-custom/client/admin/adminEmojiEdit.html b/app/emoji-custom/client/admin/adminEmojiEdit.html
deleted file mode 100644
index 1c7fd5d13ec..00000000000
--- a/app/emoji-custom/client/admin/adminEmojiEdit.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="adminEmojiEdit">
-	<div class="content">
-		<div class="emoji-view">
-			{{> emojiEdit .}}
-		</div>
-	</div>
-</template>
diff --git a/app/emoji-custom/client/admin/adminEmojiInfo.html b/app/emoji-custom/client/admin/adminEmojiInfo.html
deleted file mode 100644
index 0fec3a65ba8..00000000000
--- a/app/emoji-custom/client/admin/adminEmojiInfo.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="adminEmojiInfo">
-	<div class="content">
-		<div class="emoji-view">
-			{{> emojiInfo .}}
-		</div>
-	</div>
-</template>
diff --git a/app/emoji-custom/client/admin/emojiEdit.html b/app/emoji-custom/client/admin/emojiEdit.html
deleted file mode 100644
index 76b938cdf5b..00000000000
--- a/app/emoji-custom/client/admin/emojiEdit.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<template name="emojiEdit">
-	{{#unless hasPermission 'manage-emoji'}}
-		<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
-	{{else}}
-		<div class="about clearfix">
-			<form class="edit-form" autocomplete="off">
-				{{#if emoji}}
-					<h3>{{emoji.name}}</h3>
-				{{else}}
-					<h3>{{_ "Custom_Emoji_Add"}}</h3>
-				{{/if}}
-				<div class="input-line">
-					<label for="name">{{_ "Name"}}</label>
-					<input type="text" id="name" autocomplete="off" value="{{emoji.name}}" class="content-background-color">
-				</div>
-				<div class="input-line">
-					<label for="aliases">{{_ "Aliases"}}</label>
-					<input type="text" id="aliases" autocomplete="off" value="{{emoji.aliases}}"  class="content-background-color">
-				</div>
-				<div class="input-line">
-					<label for="image">{{_ "Image"}}</label>
-					<input id="image" type="file" />
-				</div>
-				<nav>
-					<button class='button button-block cancel' type="button"><span>{{_ "Cancel"}}</span></button>
-					<button class='button button-block primary save'><span>{{_ "Save"}}</span></button>
-				</nav>
-			</form>
-		</div>
-	{{/unless}}
-</template>
diff --git a/app/emoji-custom/client/admin/emojiEdit.js b/app/emoji-custom/client/admin/emojiEdit.js
deleted file mode 100644
index 30134afbd9e..00000000000
--- a/app/emoji-custom/client/admin/emojiEdit.js
+++ /dev/null
@@ -1,158 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import toastr from 'toastr';
-import s from 'underscore.string';
-
-import { t, handleError } from '../../../utils';
-
-Template.emojiEdit.helpers({
-	emoji() {
-		return Template.instance().emoji;
-	},
-
-	name() {
-		return this.name || this._id;
-	},
-});
-
-Template.emojiEdit.events({
-	'click .cancel'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		delete Template.instance().emojiFile;
-		t.cancel(t.find('form'));
-	},
-
-	'submit form'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.save(e.currentTarget);
-	},
-
-	'change input[type=file]'(ev) {
-		const e = ev.originalEvent != null ? ev.originalEvent : ev;
-		let { files } = e.target;
-		if (files == null || files.length === 0) {
-			if (e.dataTransfer != null && e.dataTransfer.files != null) {
-				files = e.dataTransfer.files;
-			} else {
-				files = [];
-			}
-		}
-
-		// using let x of y here seems to have incompatibility with some phones
-		for (const file in files) {
-			if (files.hasOwnProperty(file)) {
-				Template.instance().emojiFile = files[file];
-			}
-		}
-	},
-});
-
-Template.emojiEdit.onCreated(function() {
-	if (this.data != null) {
-		this.emoji = this.data.emoji;
-	} else {
-		this.emoji = undefined;
-	}
-
-	this.tabBar = Template.currentData().tabBar;
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.cancel = (form, name) => {
-		form.reset();
-		this.tabBar.close();
-		if (this.emoji) {
-			this.data.back(name);
-		}
-	};
-
-	this.getEmojiData = () => {
-		const emojiData = {};
-		if (this.emoji != null) {
-			emojiData._id = this.emoji._id;
-			emojiData.previousName = this.emoji.name;
-			emojiData.extension = this.emoji.extension;
-			emojiData.previousExtension = this.emoji.extension;
-		}
-		emojiData.name = s.trim(this.$('#name').val());
-		emojiData.aliases = s.trim(this.$('#aliases').val());
-		emojiData.newFile = false;
-		return emojiData;
-	};
-
-	this.validate = () => {
-		const emojiData = this.getEmojiData();
-
-		const errors = [];
-		if (!emojiData.name) {
-			errors.push('Name');
-		}
-
-		if (!emojiData._id) {
-			if (!this.emojiFile) {
-				errors.push('Image');
-			}
-		}
-
-		for (const error of errors) {
-			toastr.error(TAPi18n.__('error-the-field-is-required', { field: TAPi18n.__(error) }));
-		}
-
-		if (this.emojiFile) {
-			if (!/image\/.+/.test(this.emojiFile.type)) {
-				errors.push('FileType');
-				toastr.error(TAPi18n.__('error-invalid-file-type'));
-			}
-		}
-
-		return errors.length === 0;
-	};
-
-	this.save = (form) => {
-		if (this.validate()) {
-			const emojiData = this.getEmojiData();
-
-			if (this.emojiFile) {
-				emojiData.newFile = true;
-				emojiData.extension = this.emojiFile.name.split('.').pop();
-			}
-
-			Meteor.call('insertOrUpdateEmoji', emojiData, (error, result) => {
-				if (result) {
-					if (this.emojiFile) {
-						toastr.info(TAPi18n.__('Uploading_file'));
-
-						const reader = new FileReader();
-						reader.readAsBinaryString(this.emojiFile);
-						reader.onloadend = () => {
-							Meteor.call('uploadEmojiCustom', reader.result, this.emojiFile.type, emojiData, (uploadError/* , data*/) => {
-								if (uploadError != null) {
-									handleError(uploadError);
-									console.log(uploadError);
-								}
-							},
-							);
-							delete this.emojiFile;
-							toastr.success(TAPi18n.__('File_uploaded'));
-						};
-					}
-
-					if (emojiData._id) {
-						toastr.success(t('Custom_Emoji_Updated_Successfully'));
-					} else {
-						toastr.success(t('Custom_Emoji_Added_Successfully'));
-					}
-					this.onSuccess();
-
-					this.cancel(form, emojiData.name);
-				}
-
-				if (error) {
-					handleError(error);
-				}
-			});
-		}
-	};
-});
diff --git a/app/emoji-custom/client/admin/emojiInfo.html b/app/emoji-custom/client/admin/emojiInfo.html
deleted file mode 100644
index c9857c87b32..00000000000
--- a/app/emoji-custom/client/admin/emojiInfo.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<template name="emojiInfo">
-	{{#if editingEmoji}}
-		{{> emojiEdit (emojiToEdit)}}
-	{{else}}
-		{{#with emoji}}
-		<div class="about clearfix">
-			<div class="thumb">
-				{{> emojiPreview name=name extension=extension}}
-			</div>
-			<div class="info">
-				<h3 title="{{name}}">{{name}}</h3>
-				<h3 title="{{aliases}}">{{aliases}}</h3>
-			</div>
-		</div>
-		{{/with}}
-		<nav>
-			{{#if hasPermission 'manage-emoji'}}
-			<button class='button button-block danger delete'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
-			<button class='button button-block primary edit-emoji'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
-			{{/if}}
-		</nav>
-	{{/if}}
-</template>
diff --git a/app/emoji-custom/client/admin/emojiInfo.js b/app/emoji-custom/client/admin/emojiInfo.js
deleted file mode 100644
index 141dc2116c9..00000000000
--- a/app/emoji-custom/client/admin/emojiInfo.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-
-import { handleError, t } from '../../../utils';
-import { modal } from '../../../ui-utils';
-
-Template.emojiInfo.helpers({
-	name() {
-		const emoji = Template.instance().emoji.get();
-		return emoji.name;
-	},
-
-	aliases() {
-		const emoji = Template.instance().emoji.get();
-		return emoji.aliases;
-	},
-
-	emoji() {
-		return Template.instance().emoji.get();
-	},
-
-	editingEmoji() {
-		return Template.instance().editingEmoji.get();
-	},
-
-	emojiToEdit() {
-		const instance = Template.instance();
-		return {
-			tabBar: this.tabBar,
-			emoji: instance.emoji.get(),
-			onSuccess: instance.onSuccess,
-			back(name) {
-				instance.editingEmoji.set();
-
-				if (name != null) {
-					const emoji = instance.emoji.get();
-					if (emoji != null && emoji.name != null && emoji.name !== name) {
-						return instance.loadedName.set(name);
-					}
-				}
-			},
-		};
-	},
-});
-
-Template.emojiInfo.events({
-	'click .thumb'(e) {
-		$(e.currentTarget).toggleClass('bigger');
-	},
-
-	'click .delete'(e, instance) {
-		e.stopPropagation();
-		e.preventDefault();
-		const emoji = instance.emoji.get();
-		if (emoji != null) {
-			const { _id } = emoji;
-			modal.open({
-				title: t('Are_you_sure'),
-				text: t('Custom_Emoji_Delete_Warning'),
-				type: 'warning',
-				showCancelButton: true,
-				confirmButtonColor: '#DD6B55',
-				confirmButtonText: t('Yes_delete_it'),
-				cancelButtonText: t('Cancel'),
-				closeOnConfirm: false,
-				html: false,
-			}, function() {
-				Meteor.call('deleteEmojiCustom', _id, (error/* , result*/) => {
-					if (error) {
-						return handleError(error);
-					}
-					modal.open({
-						title: t('Deleted'),
-						text: t('Custom_Emoji_Has_Been_Deleted'),
-						type: 'success',
-						timer: 2000,
-						showConfirmButton: false,
-					});
-					instance.onSuccess();
-
-					instance.tabBar.close();
-				});
-			});
-		}
-	},
-
-	'click .edit-emoji'(e, instance) {
-		e.stopPropagation();
-		e.preventDefault();
-		instance.editingEmoji.set(instance.emoji.get()._id);
-	},
-});
-
-Template.emojiInfo.onCreated(function() {
-	this.emoji = new ReactiveVar();
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.editingEmoji = new ReactiveVar();
-
-	this.loadedName = new ReactiveVar();
-
-	this.tabBar = Template.currentData().tabBar;
-
-	this.autorun(() => {
-		const data = Template.currentData();
-		if (data != null && data.clear != null) {
-			this.clear = data.clear;
-		}
-	});
-
-	this.autorun(() => {
-		const data = Template.currentData().emoji;
-		const emoji = this.emoji.get();
-		if (emoji != null && emoji.name != null) {
-			this.loadedName.set(emoji.name);
-		} else if (data != null && data.name != null) {
-			this.loadedName.set(data.name);
-		}
-	});
-
-	this.autorun(() => {
-		const data = Template.currentData().emoji;
-		this.emoji.set(data);
-	});
-});
diff --git a/app/emoji-custom/client/admin/emojiPreview.html b/app/emoji-custom/client/admin/emojiPreview.html
deleted file mode 100644
index b2d6fc53f12..00000000000
--- a/app/emoji-custom/client/admin/emojiPreview.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<template name="emojiPreview">
-	<div class="emojiAdminPreview">
-		<div class="emojiAdminPreview-image" data-emoji="{{this.name}}" style="background-image:url('{{emojiUrlFromName this.name this.extension}}');"></div>
-	</div>
-</template>
diff --git a/app/emoji-custom/client/admin/route.js b/app/emoji-custom/client/admin/route.js
deleted file mode 100644
index 575e4783175..00000000000
--- a/app/emoji-custom/client/admin/route.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-
-import { registerAdminRoute } from '../../../ui-admin/client';
-
-registerAdminRoute('/emoji-custom', {
-	name: 'emoji-custom',
-	async action(/* params*/) {
-		await import('./views');
-		BlazeLayout.render('main', { center: 'adminEmoji' });
-	},
-});
diff --git a/app/emoji-custom/client/admin/startup.js b/app/emoji-custom/client/admin/startup.js
index 851786b584f..f3afbf55808 100644
--- a/app/emoji-custom/client/admin/startup.js
+++ b/app/emoji-custom/client/admin/startup.js
@@ -1,5 +1,5 @@
 import { hasPermission } from '../../../authorization';
-import { registerAdminSidebarItem } from '../../../ui-admin/client';
+import { registerAdminSidebarItem } from '../../../../client/admin';
 
 registerAdminSidebarItem({
 	href: 'emoji-custom',
diff --git a/app/emoji-custom/client/admin/views.js b/app/emoji-custom/client/admin/views.js
deleted file mode 100644
index 9c058a4610e..00000000000
--- a/app/emoji-custom/client/admin/views.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import './adminEmoji.html';
-import './adminEmoji';
-import './adminEmojiEdit.html';
-import './adminEmojiInfo.html';
-import './emojiEdit.html';
-import './emojiEdit';
-import './emojiInfo.html';
-import './emojiInfo';
-import './emojiPreview.html';
diff --git a/app/emoji-custom/client/index.js b/app/emoji-custom/client/index.js
index 1c143c92bd4..8432b7675b3 100644
--- a/app/emoji-custom/client/index.js
+++ b/app/emoji-custom/client/index.js
@@ -2,5 +2,3 @@ import './lib/emojiCustom';
 import './notifications/deleteEmojiCustom';
 import './notifications/updateEmojiCustom';
 import './admin/startup';
-import './admin/route';
-import '../assets/stylesheets/emojiCustomAdmin.css';
diff --git a/app/federation/client/admin/dashboard.js b/app/federation/client/admin/dashboard.js
index 3d68975bd35..a0d6aa6594c 100644
--- a/app/federation/client/admin/dashboard.js
+++ b/app/federation/client/admin/dashboard.js
@@ -5,7 +5,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
 import { hasRole } from '../../../authorization';
-import { registerAdminRoute, registerAdminSidebarItem } from '../../../ui-admin/client';
+import { registerAdminRoute, registerAdminSidebarItem } from '../../../../client/admin';
 
 import './dashboard.html';
 import './dashboard.css';
diff --git a/app/importer/client/ImporterWebsocketReceiver.js b/app/importer/client/ImporterWebsocketReceiver.js
deleted file mode 100644
index 83c70b32388..00000000000
--- a/app/importer/client/ImporterWebsocketReceiver.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { CachedCollectionManager } from '../../ui-cached-collection';
-
-class ImporterWebsocketReceiverDef {
-	constructor() {
-		this.streamer = new Meteor.Streamer('importers');
-
-		this.callbacks = [];
-		CachedCollectionManager.onLogin(() => {
-			this.streamer.on('progress', this.progressUpdated.bind(this));
-		});
-	}
-
-	progressUpdated(progress) {
-		this.callbacks.forEach((c) => c(progress));
-	}
-
-	registerCallback(callback) {
-		if (typeof callback !== 'function') {
-			throw new Error('Callback must be a function.');
-		}
-
-		this.callbacks.push(callback);
-	}
-
-	unregisterCallback(callback) {
-		const i = this.callbacks.indexOf(callback);
-		if (i >= 0) {
-			this.callbacks.splice(i, 1);
-		}
-	}
-}
-
-export const ImporterWebsocketReceiver = new ImporterWebsocketReceiverDef();
diff --git a/app/importer/client/admin/importOperationSummary.html b/app/importer/client/admin/importOperationSummary.html
deleted file mode 100644
index c033a4ffe3b..00000000000
--- a/app/importer/client/admin/importOperationSummary.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<template name="importOperationSummary">
-		<span style="font-weight: 600;">{{_ "Import_Type"}}:</span>
-		<span>{{_ type}} [{{ importerKey}}]</span>
-		<br/>
-
-		<span style="font-weight: 600;">{{_ "Last_Updated"}}:</span>
-		<span>{{ lastUpdated}}</span>
-		<br/>
-
-		{{#if valid}}
-			<span style="font-weight: 600;">{{_ "Status"}}:</span>
-		{{else}}
-			<span style="font-weight: 600;">{{_ "Last_Status"}}:</span>
-		{{/if}}
-
-		<span>{{ status}}</span>
-		<br/>
-
-		{{#if file}}
-			<span style="font-weight: 600;">{{_ "File"}}:</span>
-			<span>{{ fileName}}</span>
-			<br/>
-		{{/if}}
-
-		{{#if hasCounters}}
-			<span style="font-weight: 600;">{{_ "Counters"}}:</span>
-			<br/>
-
-			<span>{{_ "Users"}}:</span>
-			<span>{{ userCount}}</span>
-			<br/>
-			<span>{{_ "Channels"}}:</span>
-			<span>{{ channelCount}}</span>
-			<br/>
-			<span>{{_ "Messages"}}:</span>
-			<span>{{ messageCount}}</span>
-			<br/>
-			<span>{{_ "Total"}}:</span>
-			<span>{{ totalCount}}</span>
-			<br/>
-
-			<br/>
-		{{/if}}
-
-		{{#if hasErrors}}
-			<h2>{{_ "Errors_and_Warnings"}}:</h2>
-			<br/>
-
-			{{#if fileData.users}}
-				{{#each fileData.users}}
-					{{#if is_email_taken}}
-						<span style="color: red;">{{_ "Email_already_exists"}}:</span>
-						<span>{{ email}}</span>
-						<br/>
-					{{/if}}
-
-					{{#if error}}
-						<span>{{ email}}:</span>
-						<span style="color: red;">{{ formatedError}}</span>
-						<br/>
-					{{/if}}
-
-				{{/each}}
-			{{/if}}
-
-			{{#if errors}}
-				<br/>
-				<br/>
-				<h3>{{_ "Not_Imported_Messages_Title"}}</h3>
-				<br/>
-				{{#each errors}}
-					<br/>
-					{{#if msg}}
-						{{#if msg.id}}
-							<span style="font-weight: 600;">{{_ "Message_Id"}}:</span>
-							<span>{{ msg.id}}</span>
-							<br/>
-						{{/if}}
-						{{#if msg.userId}}
-							<span style="font-weight: 600;">{{_ "Message_UserId"}}:</span>
-							<span>{{ msg.userId}}</span>
-							<br/>
-						{{/if}}
-						{{#if msg.ts}}
-							<span style="font-weight: 600;">{{_ "Message_Time"}}:</span>
-							<span>{{ messageTime}}</span>
-							<br/>
-						{{/if}}
-					{{/if}}
-					{{#if error}}
-						{{#if error.error}}
-							<span style="font-weight: 500;">{{_ "Error"}}:</span>
-							<span style="color: red;">{{ error.error}}:</span>
-							<br/>
-						{{/if}}
-						{{#if error.message}}
-							<span style="font-weight: 500;">{{_ "Message"}}:</span>
-							<span style="color: red;">{{ error.message}}:</span>
-							<br/>
-						{{/if}}
-						{{#if error.details}}
-							{{#if error.details.method}}
-								<span style="font-weight: 500;">{{_ "Method"}}:</span>
-								<span style="color: red;">{{ error.details.method}}:</span>
-								<br/>
-							{{/if}}
-						{{/if}}
-					{{/if}}
-				{{/each}}
-			{{/if}}
-
-			<br/>
-		{{/if}}
-
-</template>
diff --git a/app/importer/client/functions/showImporterException.js b/app/importer/client/functions/showImporterException.js
deleted file mode 100644
index 4312e481484..00000000000
--- a/app/importer/client/functions/showImporterException.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import toastr from 'toastr';
-
-import { t } from '../../../utils';
-
-function showToastrForErrorType(errorType, defaultErrorString) {
-	let errorCode;
-
-	if (typeof errorType === 'string') {
-		errorCode = errorType;
-	} else if (typeof errorType === 'object') {
-		if (errorType.error && typeof errorType.error === 'string') {
-			errorCode = errorType.error;
-		}
-	}
-
-	if (errorCode) {
-		const errorTranslation = t(errorCode);
-		if (errorTranslation !== errorCode) {
-			toastr.error(errorTranslation);
-			return;
-		}
-	}
-
-	toastr.error(t(defaultErrorString || 'Failed_To_upload_Import_File'));
-}
-
-function showException(error, defaultErrorString) {
-	console.error(error);
-	if (error && error.xhr && error.xhr.responseJSON) {
-		console.log(error.xhr.responseJSON);
-
-		if (error.xhr.responseJSON.errorType) {
-			showToastrForErrorType(error.xhr.responseJSON.errorType, defaultErrorString);
-			return;
-		}
-	}
-
-	toastr.error(t(defaultErrorString || 'Failed_To_upload_Import_File'));
-}
-
-export const showImporterException = showException;
diff --git a/app/importer/client/index.js b/app/importer/client/index.js
index 54b80e9bea1..0bc7866ff53 100644
--- a/app/importer/client/index.js
+++ b/app/importer/client/index.js
@@ -1,6 +1,3 @@
-import './routes';
-
 export { Importers } from '../lib/Importers';
 export { ImporterInfo } from '../lib/ImporterInfo';
 export { ProgressStep } from '../lib/ImporterProgressStep';
-export { ImporterWebsocketReceiver } from './ImporterWebsocketReceiver';
diff --git a/app/importer/client/routes.js b/app/importer/client/routes.js
deleted file mode 100644
index 875a6b2fa3d..00000000000
--- a/app/importer/client/routes.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { registerAdminRoute } from '../../ui-admin/client';
-
-registerAdminRoute('/import', {
-	name: 'admin-import',
-	lazyRouteComponent: () => import('./components/ImportRoute'),
-	props: { page: 'history' },
-});
-
-registerAdminRoute('/import/new/:importerKey?', {
-	name: 'admin-import-new',
-	lazyRouteComponent: () => import('./components/ImportRoute'),
-	props: { page: 'new' },
-});
-
-registerAdminRoute('/import/prepare', {
-	name: 'admin-import-prepare',
-	lazyRouteComponent: () => import('./components/ImportRoute'),
-	props: { page: 'prepare' },
-});
-
-registerAdminRoute('/import/progress', {
-	name: 'admin-import-progress',
-	lazyRouteComponent: () => import('./components/ImportRoute'),
-	props: { page: 'progress' },
-});
diff --git a/app/integrations/client/route.js b/app/integrations/client/route.js
index fa97cf73974..08a7eb44465 100644
--- a/app/integrations/client/route.js
+++ b/app/integrations/client/route.js
@@ -1,6 +1,6 @@
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { registerAdminRoute } from '../../ui-admin/client';
+import { registerAdminRoute } from '../../../client/admin';
 import { t } from '../../utils';
 
 const dynamic = () => import('./views');
diff --git a/app/integrations/client/startup.js b/app/integrations/client/startup.js
index 7ed84fba42f..e663b8eecbc 100644
--- a/app/integrations/client/startup.js
+++ b/app/integrations/client/startup.js
@@ -1,5 +1,5 @@
 import { hasAtLeastOnePermission } from '../../authorization';
-import { registerAdminSidebarItem } from '../../ui-admin/client';
+import { registerAdminSidebarItem } from '../../../client/admin';
 
 registerAdminSidebarItem({
 	href: 'admin-integrations',
diff --git a/app/invites/client/admin/adminInvites.html b/app/invites/client/admin/adminInvites.html
deleted file mode 100644
index 51117122caf..00000000000
--- a/app/invites/client/admin/adminInvites.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<template name="adminInvites">
-	<div class="main-content-flex">
-		<section class="page-container page-list flex-tab-main-content">
-			{{> header sectionName="Invites"}}
-			<div class="content">
-				{{#unless hasPermission 'create-invite-links'}}
-				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
-				{{else}}
-				<div class="results">
-					{{{_ "Showing_results" invites.length}}}
-				</div>
-					{{#table fixed='true' onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize}}
-					<thead>
-						<tr class="admin-table-row">
-							<th class="content-background-color border-component-color" width="20%">
-								<div class="table-fake-th">{{_ "Token"}}</div>
-							</th>
-							<th class="content-background-color border-component-color" width="35%">
-								<div class="table-fake-th">{{_ "Created_at"}}</div>
-							</th>
-							<th class="content-background-color border-component-color" width="20%">
-								<div class="table-fake-th">{{_ "Expiration"}}</div>
-							</th>
-							<th class="content-background-color border-component-color" width="10%">
-								<div class="table-fake-th">{{_ "Uses"}}</div>
-							</th>
-							<th class="content-background-color border-component-color" width="15%">
-								<div class="table-fake-th">{{_ "Uses_left"}}</div>
-							</th>
-						</tr>
-					</thead>
-					<tbody>
-						{{#each invites}}
-						<tr class="invites-info row-link admin-table-row">
-							<td class="border-component-color">
-								<div class="rc-table-wrapper">
-									<div class="rc-table-info">
-										<span class="rc-table-title">{{_id}}</span></div>
-								</div>
-							</td>
-							<td class="border-component-color">
-								<div class="rc-table-wrapper">
-									<div class="rc-table-info">
-										<span class="rc-table-title">{{formatDateAndTime createdAt}}</span></div>
-								</div>
-							</td>
-							<td class="border-component-color">
-								<div class="rc-table-wrapper">
-									<div class="rc-table-info">
-										<span class="rc-table-title">{{daysToExpire}}</span></div>
-								</div>
-							</td>
-							<td class="border-component-color">
-								<div class="rc-table-wrapper">
-									<div class="rc-table-info">
-										<span class="rc-table-title">{{uses}}</span></div>
-								</div>
-							</td>
-							<td class="border-component-color">
-								<div class="rc-table-wrapper">
-									<div class="rc-table-info">
-										<span class="rc-table-title">{{maxUsesLeft}}</span></div>
-
-
-								<button class="rc-apps-section__app-menu-trigger js-remove" data-id="{{_id}}">
-									<svg class="rc-icon rc-icon--default-size rc-icon--default-size--menu" aria-hidden="true">
-										<use xlink:href="#icon-cross"></use>
-									</svg>
-								</button>
-							</div>
-							</td>
-						</tr>
-						{{/each}}
-					</tbody>
-					{{/table}}
-				{{/unless}}
-			</div>
-		</section>
-	</div>
-</template>
diff --git a/app/invites/client/admin/adminInvites.js b/app/invites/client/admin/adminInvites.js
deleted file mode 100644
index 2fd6bc32808..00000000000
--- a/app/invites/client/admin/adminInvites.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Template } from 'meteor/templating';
-import { ReactiveVar } from 'meteor/reactive-var';
-import moment from 'moment';
-import toastr from 'toastr';
-
-import { t, APIClient } from '../../../utils';
-import { formatDateAndTime } from '../../../lib/client/lib/formatDate';
-import { modal } from '../../../ui-utils/client';
-
-import './adminInvites.html';
-
-Template.adminInvites.helpers({
-	formatDateAndTime,
-	invites() {
-		return Template.instance().invites.get();
-	},
-	daysToExpire() {
-		const { expires, days } = this;
-
-		if (days > 0) {
-			if (expires < Date.now()) {
-				return t('Expired');
-			}
-
-			return moment(expires).fromNow(true);
-		}
-
-		return t('Never');
-	},
-	maxUsesLeft() {
-		const { maxUses, uses } = this;
-
-		if (maxUses > 0) {
-			if (uses >= maxUses) {
-				return 0;
-			}
-
-			return maxUses - uses;
-		}
-
-		return t('Unlimited');
-	},
-});
-
-Template.adminInvites.onCreated(async function() {
-	const instance = this;
-	this.invites = new ReactiveVar([]);
-
-	const result = await APIClient.v1.get('listInvites') || [];
-
-	const invites = result.map((data) => ({
-		...data,
-		createdAt: new Date(data.createdAt),
-		expires: data.expires ? new Date(data.expires) : '',
-	}));
-
-	instance.invites.set(invites);
-});
-
-Template.adminInvites.events({
-	async 'click .js-remove'(event, instance) {
-		event.stopPropagation();
-
-		modal.open({
-			text: t('Are_you_sure_you_want_to_delete_this_record'),
-			type: 'warning',
-			showCancelButton: true,
-			confirmButtonColor: '#DD6B55',
-			confirmButtonText: t('Yes'),
-			cancelButtonText: t('No'),
-			closeOnConfirm: true,
-			html: false,
-		}, async (confirmed) => {
-			if (!confirmed) {
-				return;
-			}
-
-			const { currentTarget } = event;
-
-			const { id } = currentTarget.dataset;
-
-			try {
-				await APIClient.v1.delete(`removeInvite/${ id }`);
-
-				const invites = instance.invites.get() || [];
-				invites.splice(invites.findIndex((i) => i._id === id), 1);
-				instance.invites.set(invites);
-			} catch (e) {
-				toastr.error(t(e.error));
-			}
-		});
-	},
-});
diff --git a/app/invites/client/admin/route.js b/app/invites/client/admin/route.js
deleted file mode 100644
index cb5dcb190f6..00000000000
--- a/app/invites/client/admin/route.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-
-import { registerAdminRoute } from '../../../ui-admin/client';
-
-registerAdminRoute('/invites', {
-	name: 'invites',
-	async action(/* params */) {
-		await import('./adminInvites');
-		BlazeLayout.render('main', { center: 'adminInvites' });
-	},
-});
diff --git a/app/invites/client/admin/startup.js b/app/invites/client/admin/startup.js
deleted file mode 100644
index a402aea6d14..00000000000
--- a/app/invites/client/admin/startup.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { hasAtLeastOnePermission } from '../../../authorization';
-import { registerAdminSidebarItem } from '../../../ui-admin/client';
-
-registerAdminSidebarItem({
-	href: 'invites',
-	i18nLabel: 'Invites',
-	icon: 'user-plus',
-	permissionGranted() {
-		return hasAtLeastOnePermission(['create-invite-links']);
-	},
-});
diff --git a/app/invites/client/index.js b/app/invites/client/index.js
deleted file mode 100644
index 47d6ffef1ff..00000000000
--- a/app/invites/client/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import './admin/route';
-import './admin/startup';
diff --git a/app/lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js
index 28295be6bcd..a8b7bc73d18 100644
--- a/app/lib/lib/roomTypes/direct.js
+++ b/app/lib/lib/roomTypes/direct.js
@@ -73,7 +73,7 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 			: Subscriptions.findOne({ rid: roomData._id });
 
 		if (subscription === undefined) {
-			return console.log('roomData', roomData);
+			return;
 		}
 
 		if (settings.get('UI_Use_Real_Name') && subscription.fname) {
diff --git a/app/logger/client/ansispan.js b/app/logger/client/ansispan.js
deleted file mode 100644
index 1ccf35296f7..00000000000
--- a/app/logger/client/ansispan.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const foregroundColors = {
-	30: 'gray',
-	31: 'red',
-	32: 'lime',
-	33: 'yellow',
-	34: '#6B98FF',
-	35: '#FF00FF',
-	36: 'cyan',
-	37: 'white',
-};
-
-export const ansispan = (str: string) => {
-	str =		str
-		.replace(/\s/g, '&nbsp;')
-		.replace(/(\\n|\n)/g, '<br>')
-		.replace(/>/g, '&gt;')
-		.replace(/</g, '&lt;')
-		.replace(/(.\d{8}-\d\d:\d\d:\d\d\.\d\d\d\(?.{0,2}\)?)/, '<span class="terminal-time">$1</span>')
-		.replace(/\033\[1m/g, '<strong>')
-		.replace(/\033\[22m/g, '</strong>')
-		.replace(/\033\[3m/g, '<em>')
-		.replace(/\033\[23m/g, '</em>')
-		.replace(/\033\[m/g, '</span>')
-		.replace(/\033\[0m/g, '</span>')
-		.replace(/\033\[39m/g, '</span>');
-	return Object.entries(foregroundColors).reduce((str, [ansiCode, color]) => {
-		const span = `<span style="color: ${ color }">`;
-		return (
-			str
-				.replace(new RegExp(`\\033\\[${ ansiCode }m`, 'g'), span)
-				.replace(new RegExp(`\\033\\[0;${ ansiCode }m`, 'g'), span)
-		);
-	}, str);
-};
diff --git a/app/logger/client/index.js b/app/logger/client/index.js
index 689a3ac95d8..91037ba8d97 100644
--- a/app/logger/client/index.js
+++ b/app/logger/client/index.js
@@ -1,2 +1 @@
 import './logger';
-import './viewLogs';
diff --git a/app/logger/client/viewLogs.js b/app/logger/client/viewLogs.js
deleted file mode 100644
index 7683f9d1d29..00000000000
--- a/app/logger/client/viewLogs.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { Meteor } from 'meteor/meteor';
-import { Mongo } from 'meteor/mongo';
-
-import { hasAllPermission } from '../../authorization';
-import { registerAdminRoute, registerAdminSidebarItem } from '../../ui-admin/client';
-import { t } from '../../utils';
-
-export const stdout = new Mongo.Collection(null);
-
-Meteor.startup(function() {
-	registerAdminSidebarItem({
-		href: 'admin-view-logs',
-		i18nLabel: 'View_Logs',
-		icon: 'post',
-		permissionGranted() {
-			return hasAllPermission('view-logs');
-		},
-	});
-});
-
-registerAdminRoute('/view-logs', {
-	name: 'admin-view-logs',
-	async action() {
-		await import('./views/viewLogs');
-		return BlazeLayout.render('main', {
-			center: 'pageSettingsContainer',
-			pageTitle: t('View_Logs'),
-			pageTemplate: 'viewLogs',
-			noScroll: true,
-		});
-	},
-});
diff --git a/app/logger/client/views/viewLogs.css b/app/logger/client/views/viewLogs.css
deleted file mode 100644
index e7619344c08..00000000000
--- a/app/logger/client/views/viewLogs.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.view-logs {
-	&__terminal {
-		overflow-y: scroll;
-		flex: 1;
-
-		margin: 0;
-		margin-bottom: 0 !important;
-		padding: 8px 10px !important;
-
-		color: var(--color-white);
-		border: none !important;
-		background-color: #444444 !important;
-
-		font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-		font-weight: 500;
-
-		&-line {
-			word-break: break-all;
-		}
-
-		&-time {
-			color: #7f7f7f;
-		}
-
-		.rtl & {
-			direction: ltr;
-		}
-	}
-}
diff --git a/app/logger/client/views/viewLogs.html b/app/logger/client/views/viewLogs.html
deleted file mode 100644
index 9c664aac2f8..00000000000
--- a/app/logger/client/views/viewLogs.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<template name="viewLogs">
-	{{#if hasPermission}}
-		<div class="section view-logs__terminal js-terminal">
-			{{#each logs}}
-				<div class="view-logs__terminal-line">
-					{{{ansispan string}}}
-				</div>
-			{{/each}}
-		</div>
-		<div class="view-logs__new-logs js-new-logs not color-primary-action-color">
-			<i class="icon-down-big"></i>
-			<span>{{_ "New_logs"}}</span>
-		</div>
-	{{else}}
-		{{_ "Not_authorized"}}
-	{{/if}}
-</template>
diff --git a/app/logger/client/views/viewLogs.js b/app/logger/client/views/viewLogs.js
deleted file mode 100644
index a10fbdef10c..00000000000
--- a/app/logger/client/views/viewLogs.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import _ from 'underscore';
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-import { Tracker } from 'meteor/tracker';
-
-import { ansispan } from '../ansispan';
-import { stdout } from '../viewLogs';
-import { hasAllPermission } from '../../../authorization';
-import { SideNav } from '../../../ui-utils/client';
-import './viewLogs.html';
-import './viewLogs.css';
-import { APIClient } from '../../../utils/client';
-
-const stdoutStreamer = new Meteor.Streamer('stdout');
-
-Template.viewLogs.onCreated(async function() {
-	const { queue } = await APIClient.v1.get('stdout.queue');
-	(queue || []).forEach((item) => stdout.insert(item));
-	stdoutStreamer.on('stdout', (item) => stdout.insert(item));
-	this.atBottom = true;
-});
-
-Template.viewLogs.onDestroyed(() => {
-	stdout.remove({});
-	stdoutStreamer.removeListener('stdout');
-});
-
-Template.viewLogs.helpers({
-	hasPermission() {
-		return hasAllPermission('view-logs');
-	},
-	logs() {
-		return stdout.find({}, { sort: { ts: 1 } });
-	},
-	ansispan,
-});
-
-Template.viewLogs.events({
-	'click .new-logs'(event, instance) {
-		instance.atBottom = true;
-		instance.sendToBottomIfNecessary();
-	},
-});
-
-Template.viewLogs.onRendered(function() {
-	Tracker.afterFlush(() => {
-		SideNav.setFlex('adminFlex');
-		SideNav.openFlex();
-	});
-
-	const wrapper = this.find('.js-terminal');
-	const newLogs = this.find('.js-new-logs');
-
-	this.isAtBottom = (scrollThreshold) => {
-		if (scrollThreshold == null) {
-			scrollThreshold = 0;
-		}
-		if (wrapper.scrollTop + scrollThreshold >= wrapper.scrollHeight - wrapper.clientHeight) {
-			newLogs.className = 'new-logs not';
-			return true;
-		}
-		return false;
-	};
-
-	this.sendToBottom = () => {
-		wrapper.scrollTop = wrapper.scrollHeight - wrapper.clientHeight;
-		newLogs.className = 'new-logs not';
-	};
-
-	this.checkIfScrollIsAtBottom = () => {
-		this.atBottom = this.isAtBottom(100);
-	};
-
-	this.sendToBottomIfNecessary = () => {
-		if (this.atBottom === true && this.isAtBottom() !== true) {
-			this.sendToBottom();
-		} else if (this.atBottom === false) {
-			newLogs.className = 'new-logs';
-		}
-	};
-
-	this.sendToBottomIfNecessaryDebounced = _.debounce(this.sendToBottomIfNecessary, 10);
-	this.sendToBottomIfNecessary();
-
-	if (window.MutationObserver) {
-		const observer = new MutationObserver((mutations) => {
-			mutations.forEach(() => this.sendToBottomIfNecessaryDebounced());
-		});
-		observer.observe(wrapper, { childList: true });
-	} else {
-		wrapper.addEventListener('DOMSubtreeModified', () => this.sendToBottomIfNecessaryDebounced());
-	}
-
-	this.onWindowResize = () => {
-		Meteor.defer(() => this.sendToBottomIfNecessaryDebounced());
-	};
-	window.addEventListener('resize', this.onWindowResize);
-
-	wrapper.addEventListener('mousewheel', () => {
-		this.atBottom = false;
-		Meteor.defer(() => this.checkIfScrollIsAtBottom());
-	});
-
-	wrapper.addEventListener('wheel', () => {
-		this.atBottom = false;
-		Meteor.defer(() => this.checkIfScrollIsAtBottom());
-	});
-
-	wrapper.addEventListener('touchstart', () => {
-		this.atBottom = false;
-	});
-
-	wrapper.addEventListener('touchend', () => {
-		Meteor.defer(() => this.checkIfScrollIsAtBottom());
-	});
-
-	wrapper.addEventListener('scroll', () => {
-		this.atBottom = false;
-		Meteor.defer(() => this.checkIfScrollIsAtBottom());
-	});
-});
diff --git a/app/mail-messages/client/startup.js b/app/mail-messages/client/startup.js
index 5148b91bd57..2aef29460b2 100644
--- a/app/mail-messages/client/startup.js
+++ b/app/mail-messages/client/startup.js
@@ -1,5 +1,5 @@
 import { hasAllPermission } from '../../authorization';
-import { registerAdminSidebarItem } from '../../ui-admin/client';
+import { registerAdminSidebarItem } from '../../../client/admin';
 
 registerAdminSidebarItem({
 	href: 'admin-mailer',
diff --git a/app/oauth2-server-config/client/admin/route.js b/app/oauth2-server-config/client/admin/route.js
index 4ba33c35c65..c274dbaa608 100644
--- a/app/oauth2-server-config/client/admin/route.js
+++ b/app/oauth2-server-config/client/admin/route.js
@@ -1,6 +1,6 @@
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { registerAdminRoute } from '../../../ui-admin/client';
+import { registerAdminRoute } from '../../../../client/admin';
 import { t } from '../../../utils';
 
 registerAdminRoute('/oauth-apps', {
diff --git a/app/oauth2-server-config/client/admin/startup.js b/app/oauth2-server-config/client/admin/startup.js
index 8ebe8aaf8b1..7ebf9d175ab 100644
--- a/app/oauth2-server-config/client/admin/startup.js
+++ b/app/oauth2-server-config/client/admin/startup.js
@@ -1,5 +1,5 @@
 import { hasAllPermission } from '../../../authorization';
-import { registerAdminSidebarItem } from '../../../ui-admin/client';
+import { registerAdminSidebarItem } from '../../../../client/admin';
 
 registerAdminSidebarItem({
 	href: 'admin-oauth-apps',
diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 2d66cf7c414..62e89ad03fa 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -4339,29 +4339,6 @@ rc-old select,
 	}
 }
 
-.rc-old .statistics-table {
-	width: 100%;
-	margin-bottom: 30px;
-
-	& th,
-	& td {
-		padding: 6px 8px;
-
-		text-align: left;
-		word-break: break-word;
-	}
-
-	& th {
-		width: 30%;
-
-		text-align: right;
-	}
-
-	& td {
-		width: 70%;
-	}
-}
-
 .rc-old .rocket-team {
 	display: block;
 
@@ -4704,30 +4681,6 @@ rc-old select,
 	background-color: #f8f8f8;
 }
 
-.rc-old .new-logs {
-	position: absolute;
-	bottom: 8px;
-	left: 50%;
-
-	width: 130px;
-	height: 30px;
-	margin: 0 -65px;
-
-	cursor: pointer;
-	transition: transform 0.3s ease-out;
-	transform: translateY(0);
-	text-align: center;
-
-	border-radius: 20px;
-
-	font-size: 0.8em;
-	line-height: 30px;
-
-	&.not {
-		transform: translateY(150%);
-	}
-}
-
 .rc-old .powered-by {
 	margin-top: 1em;
 }
diff --git a/app/theme/client/imports/general/rtl.css b/app/theme/client/imports/general/rtl.css
index 8af3e201c54..2be992c93db 100644
--- a/app/theme/client/imports/general/rtl.css
+++ b/app/theme/client/imports/general/rtl.css
@@ -466,13 +466,6 @@
 		}
 	}
 
-	& .statistics-table {
-		& th,
-		& td {
-			text-align: right;
-		}
-	}
-
 	& .code-mirror-box {
 		direction: ltr;
 
diff --git a/app/ui-admin/client/components/NotAuthorizedPage.js b/app/ui-admin/client/components/NotAuthorizedPage.js
deleted file mode 100644
index e7606e0fbdf..00000000000
--- a/app/ui-admin/client/components/NotAuthorizedPage.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Box } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import { useTranslation } from '../../../../client/contexts/TranslationContext';
-import { Page } from '../../../../client/components/basic/Page';
-
-function NotAuthorizedPage() {
-	const t = useTranslation();
-
-	return <Page>
-		<Page.Content>
-			<Box is='p' textColor='default' textStyle='p1'>{t('You_are_not_authorized_to_view_this_page')}</Box>
-		</Page.Content>
-	</Page>;
-}
-
-export default NotAuthorizedPage;
diff --git a/app/ui-admin/client/components/info/BuildEnvironmentSection.js b/app/ui-admin/client/components/info/BuildEnvironmentSection.js
deleted file mode 100644
index 25e0a702284..00000000000
--- a/app/ui-admin/client/components/info/BuildEnvironmentSection.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Subtitle } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
-import { DescriptionList } from './DescriptionList';
-import { formatDate } from './formatters';
-
-export function BuildEnvironmentSection({ info }) {
-	const t = useTranslation();
-	const build = info && (info.compile || info.build);
-
-	return <>
-		<Subtitle data-qa='build-env-title'>{t('Build_Environment')}</Subtitle>
-		<DescriptionList data-qa='build-env-list'>
-			<DescriptionList.Entry label={t('OS_Platform')}>{build.platform}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Arch')}>{build.arch}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Release')}>{build.osRelease}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Node_version')}>{build.nodeVersion}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Date')}>{formatDate(build.date)}</DescriptionList.Entry>
-		</DescriptionList>
-	</>;
-}
diff --git a/app/ui-admin/client/components/info/CommitSection.js b/app/ui-admin/client/components/info/CommitSection.js
deleted file mode 100644
index 90ea501c17f..00000000000
--- a/app/ui-admin/client/components/info/CommitSection.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Subtitle } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
-import { DescriptionList } from './DescriptionList';
-
-export function CommitSection({ info }) {
-	const t = useTranslation();
-	const { commit = {} } = info;
-
-	return <>
-		<Subtitle data-qa='commit-title'>{t('Commit')}</Subtitle>
-		<DescriptionList data-qa='commit-list'>
-			<DescriptionList.Entry label={t('Hash')}>{commit.hash}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Date')}>{commit.date}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Branch')}>{commit.branch}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Tag')}>{commit.tag}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Author')}>{commit.author}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Subject')}>{commit.subject}</DescriptionList.Entry>
-		</DescriptionList>
-	</>;
-}
diff --git a/app/ui-admin/client/components/info/DescriptionList.js b/app/ui-admin/client/components/info/DescriptionList.js
deleted file mode 100644
index f8f9113af71..00000000000
--- a/app/ui-admin/client/components/info/DescriptionList.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-
-export const DescriptionList = ({ children, ...props }) =>
-	<table className='statistics-table secondary-background-color' {...props}>
-		<tbody>
-			{children}
-		</tbody>
-	</table>;
-
-const Entry = ({ children, label, ...props }) =>
-	<tr className='admin-table-row' {...props}>
-		<th className='content-background-color border-component-color'>{label}</th>
-		<td className='border-component-color'>{children}</td>
-	</tr>;
-
-DescriptionList.Entry = Entry;
diff --git a/app/ui-admin/client/components/info/RocketChatSection.js b/app/ui-admin/client/components/info/RocketChatSection.js
deleted file mode 100644
index bf618db5997..00000000000
--- a/app/ui-admin/client/components/info/RocketChatSection.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Skeleton, Subtitle } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
-import { formatDate, formatHumanReadableTime } from './formatters';
-import { DescriptionList } from './DescriptionList';
-
-export function RocketChatSection({ info, statistics, isLoading }) {
-	const s = (fn) => (isLoading ? <Skeleton width='50%' /> : fn());
-	const t = useTranslation();
-
-	const appsEngineVersion = info && info.marketplaceApiVersion;
-
-	return <>
-		<Subtitle data-qa='rocket-chat-title'>{t('Rocket.Chat')}</Subtitle>
-		<DescriptionList data-qa='rocket-chat-list'>
-			<DescriptionList.Entry label={t('Version')}>{s(() => statistics.version)}</DescriptionList.Entry>
-			{appsEngineVersion && <DescriptionList.Entry label={t('Apps_Engine_Version')}>{appsEngineVersion}</DescriptionList.Entry>}
-			<DescriptionList.Entry label={t('DB_Migration')}>{s(() => statistics.migration.version)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('DB_Migration_Date')}>{s(() => formatDate(statistics.migration.lockedAt))}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Installed_at')}>{s(() => formatDate(statistics.installedAt))}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Uptime')}>{s(() => formatHumanReadableTime(statistics.process.uptime, t))}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Deployment_ID')}>{s(() => statistics.uniqueId)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('PID')}>{s(() => statistics.process.pid)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Running_Instances')}>{s(() => statistics.instanceCount)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OpLog')}>{s(() => (statistics.oplogEnabled ? t('Enabled') : t('Disabled')))}</DescriptionList.Entry>
-		</DescriptionList>
-	</>;
-}
diff --git a/app/ui-admin/client/components/info/RuntimeEnvironmentSection.js b/app/ui-admin/client/components/info/RuntimeEnvironmentSection.js
deleted file mode 100644
index 11d9b53eba3..00000000000
--- a/app/ui-admin/client/components/info/RuntimeEnvironmentSection.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Skeleton, Subtitle } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
-import { useFormatMemorySize } from '../../../../ui/client/views/app/components/hooks';
-import { DescriptionList } from './DescriptionList';
-import { formatHumanReadableTime, formatCPULoad } from './formatters';
-
-export function RuntimeEnvironmentSection({ statistics, isLoading }) {
-	const s = (fn) => (isLoading ? <Skeleton width='50%' /> : fn());
-	const t = useTranslation();
-	const formatMemorySize = useFormatMemorySize();
-
-	return <>
-		<Subtitle data-qa='runtime-env-title'>{t('Runtime_Environment')}</Subtitle>
-		<DescriptionList data-qa='runtime-env-list'>
-			<DescriptionList.Entry label={t('OS_Type')}>{s(() => statistics.os.type)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Platform')}>{s(() => statistics.os.platform)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Arch')}>{s(() => statistics.os.arch)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Release')}>{s(() => statistics.os.release)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Node_version')}>{s(() => statistics.process.nodeVersion)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Mongo_version')}>{s(() => statistics.mongoVersion)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Mongo_storageEngine')}>{s(() => statistics.mongoStorageEngine)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Uptime')}>{s(() => formatHumanReadableTime(statistics.os.uptime, t))}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Loadavg')}>{s(() => formatCPULoad(statistics.os.loadavg))}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Totalmem')}>{s(() => formatMemorySize(statistics.os.totalmem))}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Freemem')}>{s(() => formatMemorySize(statistics.os.freemem))}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('OS_Cpus')}>{s(() => statistics.os.cpus.length)}</DescriptionList.Entry>
-		</DescriptionList>
-	</>;
-}
diff --git a/app/ui-admin/client/components/info/UsageSection.js b/app/ui-admin/client/components/info/UsageSection.js
deleted file mode 100644
index b79c83b9f2b..00000000000
--- a/app/ui-admin/client/components/info/UsageSection.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Subtitle, Skeleton } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
-import { useFormatMemorySize } from '../../../../ui/client/views/app/components/hooks';
-import { DescriptionList } from './DescriptionList';
-
-export function UsageSection({ statistics, isLoading }) {
-	const s = (fn) => (isLoading ? <Skeleton width='50%' /> : fn());
-	const formatMemorySize = useFormatMemorySize();
-	const t = useTranslation();
-
-	return <>
-		<Subtitle data-qa='usage-title'>{t('Usage')}</Subtitle>
-		<DescriptionList data-qa='usage-list'>
-			<DescriptionList.Entry label={t('Stats_Total_Users')}>{s(() => statistics.totalUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Active_Users')}>{s(() => statistics.activeUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Active_Guests')}>{s(() => statistics.activeGuests)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_App_Users')}>{s(() => statistics.appUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Non_Active_Users')}>{s(() => statistics.nonActiveUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Connected_Users')}>{s(() => statistics.totalConnectedUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Online_Users')}>{s(() => statistics.onlineUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Away_Users')}>{s(() => statistics.awayUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Offline_Users')}>{s(() => statistics.offlineUsers)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Rooms')}>{s(() => statistics.totalRooms)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Channels')}>{s(() => statistics.totalChannels)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Private_Groups')}>{s(() => statistics.totalPrivateGroups)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Direct_Messages')}>{s(() => statistics.totalDirect)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Livechat_Rooms')}>{s(() => statistics.totalLivechat)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Total_Discussions')}>{s(() => statistics.totalDiscussions)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Total_Threads')}>{s(() => statistics.totalThreads)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Messages')}>{s(() => statistics.totalMessages)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Messages_Channel')}>{s(() => statistics.totalChannelMessages)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Messages_PrivateGroup')}>{s(() => statistics.totalPrivateGroupMessages)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Messages_Direct')}>{s(() => statistics.totalDirectMessages)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Messages_Livechat')}>{s(() => statistics.totalLivechatMessages)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Uploads')}>{s(() => statistics.uploadsTotal)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Uploads_Size')}>{s(() => formatMemorySize(statistics.uploadsTotalSize))}</DescriptionList.Entry>
-			{statistics && statistics.apps && <>
-				<DescriptionList.Entry label={t('Stats_Total_Installed_Apps')}>{statistics.apps.totalInstalled}</DescriptionList.Entry>
-				<DescriptionList.Entry label={t('Stats_Total_Active_Apps')}>{statistics.apps.totalActive}</DescriptionList.Entry>
-			</>}
-			<DescriptionList.Entry label={t('Stats_Total_Integrations')}>{s(() => statistics.integrations.totalIntegrations)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Incoming_Integrations')}>{s(() => statistics.integrations.totalIncoming)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Active_Incoming_Integrations')}>{s(() => statistics.integrations.totalIncomingActive)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Outgoing_Integrations')}>{s(() => statistics.integrations.totalOutgoing)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Active_Outgoing_Integrations')}>{s(() => statistics.integrations.totalOutgoingActive)}</DescriptionList.Entry>
-			<DescriptionList.Entry label={t('Stats_Total_Integrations_With_Script_Enabled')}>{s(() => statistics.integrations.totalWithScriptEnabled)}</DescriptionList.Entry>
-		</DescriptionList>
-	</>;
-}
diff --git a/app/ui-admin/client/components/info/formatters.js b/app/ui-admin/client/components/info/formatters.js
deleted file mode 100644
index ed1b906e453..00000000000
--- a/app/ui-admin/client/components/info/formatters.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import moment from 'moment';
-import s from 'underscore.string';
-
-export const formatNumber = (number) => s.numberFormat(number, 2);
-
-export const formatDate = (date) => {
-	if (!date) {
-		return null;
-	}
-
-	return moment(date).format('LLL');
-};
-
-export const formatHumanReadableTime = (time, t) => {
-	const days = Math.floor(time / 86400);
-	const hours = Math.floor((time % 86400) / 3600);
-	const minutes = Math.floor(((time % 86400) % 3600) / 60);
-	const seconds = Math.floor(((time % 86400) % 3600) % 60);
-	let out = '';
-	if (days > 0) {
-		out += `${ days } ${ t('days') }, `;
-	}
-	if (hours > 0) {
-		out += `${ hours } ${ t('hours') }, `;
-	}
-	if (minutes > 0) {
-		out += `${ minutes } ${ t('minutes') }, `;
-	}
-	if (seconds > 0) {
-		out += `${ seconds } ${ t('seconds') }`;
-	}
-	return out;
-};
-
-export const formatCPULoad = (load) => {
-	if (!load) {
-		return null;
-	}
-
-	const [oneMinute, fiveMinutes, fifteenMinutes] = load;
-
-	return `${ formatNumber(oneMinute) }, ${ formatNumber(fiveMinutes) }, ${ formatNumber(fifteenMinutes) }`;
-};
diff --git a/app/ui-admin/client/hooks/useAdminSideNav.js b/app/ui-admin/client/hooks/useAdminSideNav.js
deleted file mode 100644
index 25d3f293dc7..00000000000
--- a/app/ui-admin/client/hooks/useAdminSideNav.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useEffect } from 'react';
-
-import { SideNav } from '../../../ui-utils/client/lib/SideNav';
-
-export const useAdminSideNav = () => {
-	useEffect(() => {
-		SideNav.setFlex('adminFlex');
-		SideNav.openFlex();
-	}, []);
-};
diff --git a/app/ui-admin/client/rooms/adminRoomInfo.html b/app/ui-admin/client/rooms/adminRoomInfo.html
deleted file mode 100644
index 6478b8dd118..00000000000
--- a/app/ui-admin/client/rooms/adminRoomInfo.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<template name="adminRoomInfo">
-	{{#with selectedRoom}}
-		<section class="contextual-bar__content">
-			<div class="list-view channel-settings">
-				<div class="title">
-					<h2>{{_ "Room_Info"}}</h2>
-				</div>
-				<form>
-					<ul class="list clearfix">
-						{{#if notDirect}}
-							<li>
-								<label>{{_ "Name"}}</label>
-								<div>
-									{{#if editing 'roomName'}}
-										<input type="text" name="roomName" value="{{roomName}}" class="content-background-color editing" />
-										<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-										<button type="button" class="button primary save">{{_ "Save"}}</button>
-									{{else}}
-										<span>{{roomName}}{{#if canEdit}} <i class="icon-pencil" data-edit="roomName"></i>{{/if}}</span>
-									{{/if}}
-								</div>
-							</li>
-						{{/if}}
-						{{#if roomOwner}}
-							<li>
-								<label>{{_ "Owner"}}</label>
-								<div>
-									<span>{{roomOwner}}</span>
-								</div>
-							</li>
-						{{/if}}
-						<li>
-							<label>{{_ "Topic"}}</label>
-							<div>
-								{{#if editing 'roomTopic'}}
-									<input type="text" name="roomTopic" value="{{roomTopic}}" class="content-background-color editing" />
-									<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-									<button type="button" class="button primary save">{{_ "Save"}}</button>
-								{{else}}
-									<span>{{{RocketChatMarkdown roomTopic}}}{{#if canEdit}} <i class="icon-pencil" data-edit="roomTopic"></i>{{/if}}</span>
-								{{/if}}
-							</div>
-						</li>
-						{{#if notDirect}}
-							<li>
-								<label>{{_ "Type"}}</label>
-								<div>
-									{{#if editing 'roomType'}}
-										<label><input type="radio" name="roomType" class="editing" value="c" checked="{{$eq roomType 'c'}}" /> {{_ "Channel"}}</label>
-										<label><input type="radio" name="roomType" value="p" checked="{{$eq roomType 'p'}}" /> {{_ "Private_Group"}}</label>
-										<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-										<button type="button" class="button primary save">{{_ "Save"}}</button>
-									{{else}}
-										<span>{{roomTypeDescription}}{{#if canEdit}} <i class="icon-pencil" data-edit="roomType"></i>{{/if}}</span>
-									{{/if}}
-								</div>
-							</li>
-						{{/if}}
-						{{#if notDirect}}
-							<li>
-								<label>{{_ "Room_archivation_state"}}</label>
-								<div>
-									{{#if editing 'archivationState'}}
-										<label><input type="radio" name="archivationState" class="editing" value="true" checked="{{$eq archivationState true}}" /> {{_ "Room_archivation_state_true"}}</label>
-										<label><input type="radio" name="archivationState" value="false" checked="{{$neq archivationState true}}" /> {{_ "Room_archivation_state_false"}}</label>
-										<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-										<button type="button" class="button primary save">{{_ "Save"}}</button>
-									{{else}}
-										<span>{{archivationStateDescription}}{{#if canEdit}} <i class="icon-pencil" data-edit="archivationState"></i>{{/if}}</span>
-									{{/if}}
-								</div>
-							</li>
-						{{/if}}
-						{{#if notDirect}}
-							<li>
-								<label>{{_ "Read_only_channel"}}</label>
-								<div>
-									{{#if editing 'readOnly'}}
-										<label><input type="radio" name="readOnly" class="editing" value="true" checked="{{$eq readOnly true}}" /> {{_ "True"}}</label>
-										<label><input type="radio" name="readOnly" value="false" checked="{{$neq readOnly true}}" /> {{_ "False"}}</label>
-										<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-										<button type="button" class="button primary save">{{_ "Save"}}</button>
-									{{else}}
-										<span>{{readOnlyDescription}}{{#if canEdit}} <i class="icon-pencil" data-edit="readOnly"></i>{{/if}}</span>
-									{{/if}}
-								</div>
-							</li>
-						{{/if}}
-						{{#each channelSettings}}
-							{{> Template.dynamic template=template data=data}}
-						{{/each}}
-					</ul>
-				</form>
-				{{#if canDeleteRoom}}
-					<nav>
-						<button class='button danger delete'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
-					</nav>
-				{{/if}}
-			</div>
-		</section>
-	{{/with}}
-</template>
diff --git a/app/ui-admin/client/rooms/adminRoomInfo.js b/app/ui-admin/client/rooms/adminRoomInfo.js
deleted file mode 100644
index d32685367e9..00000000000
--- a/app/ui-admin/client/rooms/adminRoomInfo.js
+++ /dev/null
@@ -1,304 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Session } from 'meteor/session';
-import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import toastr from 'toastr';
-import s from 'underscore.string';
-
-import { t, handleError } from '../../../utils';
-import { call, modal } from '../../../ui-utils';
-import { hasAllPermission, hasAtLeastOnePermission } from '../../../authorization';
-import { ChannelSettings } from '../../../channel-settings';
-import { settings } from '../../../settings';
-import { callbacks } from '../../../callbacks';
-
-Template.adminRoomInfo.helpers({
-	selectedRoom() {
-		return Session.get('adminRoomsSelected');
-	},
-	canEdit() {
-		return hasAllPermission('edit-room', this.rid);
-	},
-	editing(field) {
-		return Template.instance().editing.get() === field;
-	},
-	notDirect() {
-		const room = Template.instance().room.get();
-		return room && room.t !== 'd';
-	},
-	roomType() {
-		const room = Template.instance().room.get();
-		return room && room.t;
-	},
-	channelSettings() {
-		return ChannelSettings.getOptions(undefined, 'admin-room');
-	},
-	roomTypeDescription() {
-		const room = Template.instance().room.get();
-		const roomType = room && room.t;
-		if (roomType === 'c') {
-			return t('Channel');
-		} if (roomType === 'p') {
-			return t('Private_Group');
-		}
-	},
-	roomName() {
-		const room = Template.instance().room.get();
-		return room && room.name;
-	},
-	roomOwner() {
-		const roomOwner = Template.instance().roomOwner.get();
-		return roomOwner && (roomOwner.name || roomOwner.username);
-	},
-	roomTopic() {
-		const room = Template.instance().room.get();
-		return room && room.topic;
-	},
-	archivationState() {
-		const room = Template.instance().room.get();
-		return room && room.archived;
-	},
-	archivationStateDescription() {
-		const room = Template.instance().room.get();
-		const archivationState = room && room.archived;
-		if (archivationState === true) {
-			return t('Room_archivation_state_true');
-		}
-		return t('Room_archivation_state_false');
-	},
-	canDeleteRoom() {
-		const room = Template.instance().room.get();
-		const roomType = room && room.t;
-		return (roomType != null) && hasAtLeastOnePermission(`delete-${ roomType }`);
-	},
-	readOnly() {
-		const room = Template.instance().room.get();
-		return room && room.ro;
-	},
-	readOnlyDescription() {
-		const room = Template.instance().room.get();
-		const readOnly = room && room.ro;
-
-		if (readOnly === true) {
-			return t('True');
-		}
-		return t('False');
-	},
-});
-
-Template.adminRoomInfo.events({
-	'click .delete'(event, instance) {
-		modal.open({
-			title: t('Are_you_sure'),
-			text: t('Delete_Room_Warning'),
-			type: 'warning',
-			showCancelButton: true,
-			confirmButtonColor: '#DD6B55',
-			confirmButtonText: t('Yes_delete_it'),
-			cancelButtonText: t('Cancel'),
-			closeOnConfirm: false,
-			html: false,
-		}, () => {
-			Meteor.call('eraseRoom', this.rid, function(error) {
-				if (error) {
-					handleError(error);
-				} else {
-					modal.open({
-						title: t('Deleted'),
-						text: t('Room_has_been_deleted'),
-						type: 'success',
-						timer: 2000,
-						showConfirmButton: false,
-					});
-					instance.onSuccess();
-					instance.data.tabBar.close();
-				}
-			});
-		});
-	},
-	'keydown input[type=text]'(e, t) {
-		if (e.keyCode === 13) {
-			e.preventDefault();
-			t.saveSetting(this.rid);
-		}
-	},
-	'click [data-edit]'(e, t) {
-		e.preventDefault();
-		t.editing.set($(e.currentTarget).data('edit'));
-		return setTimeout(function() {
-			t.$('input.editing').focus().select();
-		}, 100);
-	},
-	'click .cancel'(e, t) {
-		e.preventDefault();
-		t.editing.set();
-	},
-	'click .save'(e, t) {
-		e.preventDefault();
-		t.saveSetting(this.rid);
-	},
-});
-
-Template.adminRoomInfo.onCreated(function() {
-	const instance = this;
-	const currentData = Template.currentData();
-	this.editing = new ReactiveVar();
-	this.room = new ReactiveVar();
-	this.roomOwner = new ReactiveVar();
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.autorun(() => {
-		const { room } = Template.currentData();
-		this.room.set(room);
-	});
-
-	this.validateRoomType = () => {
-		const type = this.$('input[name=roomType]:checked').val();
-		if (type !== 'c' && type !== 'p') {
-			toastr.error(t('error-invalid-room-type', { type }));
-		}
-		return true;
-	};
-	this.validateRoomName = (rid) => {
-		const { room } = currentData;
-		let nameValidation;
-		if (!hasAllPermission('edit-room', rid) || (room.t !== 'c' && room.t !== 'p')) {
-			toastr.error(t('error-not-allowed'));
-			return false;
-		}
-		name = $('input[name=roomName]').val();
-		try {
-			nameValidation = new RegExp(`^${ settings.get('UTF8_Names_Validation') }$`);
-		} catch (_error) {
-			nameValidation = new RegExp('^[0-9a-zA-Z-_.]+$');
-		}
-		if (!nameValidation.test(name)) {
-			toastr.error(t('error-invalid-room-name', {
-				room_name: s.escapeHTML(name),
-			}));
-			return false;
-		}
-		return true;
-	};
-	this.validateRoomTopic = () => true;
-	this.saveSetting = (rid) => {
-		switch (this.editing.get()) {
-			case 'roomName':
-				if (this.validateRoomName(rid)) {
-					callbacks.run('roomNameChanged', currentData.room);
-					Meteor.call('saveRoomSettings', rid, 'roomName', this.$('input[name=roomName]').val(), function(err) {
-						if (err) {
-							return handleError(err);
-						}
-						toastr.success(TAPi18n.__('Room_name_changed_successfully'));
-						instance.onSuccess();
-						instance.data.tabBar.close();
-					});
-				}
-				break;
-			case 'roomTopic':
-				if (this.validateRoomTopic(rid)) {
-					Meteor.call('saveRoomSettings', rid, 'roomTopic', this.$('input[name=roomTopic]').val(), function(err) {
-						if (err) {
-							return handleError(err);
-						}
-						toastr.success(TAPi18n.__('Room_topic_changed_successfully'));
-						callbacks.run('roomTopicChanged', currentData.room);
-						instance.onSuccess();
-						instance.data.tabBar.close();
-					});
-				}
-				break;
-			case 'roomAnnouncement':
-				if (this.validateRoomTopic(rid)) {
-					Meteor.call('saveRoomSettings', rid, 'roomAnnouncement', this.$('input[name=roomAnnouncement]').val(), function(err) {
-						if (err) {
-							return handleError(err);
-						}
-						toastr.success(TAPi18n.__('Room_announcement_changed_successfully'));
-						callbacks.run('roomAnnouncementChanged', currentData.room);
-						instance.onSuccess();
-						instance.data.tabBar.close();
-					});
-				}
-				break;
-			case 'roomType':
-				const val = this.$('input[name=roomType]:checked').val();
-				if (this.validateRoomType(rid)) {
-					callbacks.run('roomTypeChanged', currentData.room);
-					const saveRoomSettings = function() {
-						Meteor.call('saveRoomSettings', rid, 'roomType', val, function(err) {
-							if (err) {
-								return handleError(err);
-							}
-							toastr.success(TAPi18n.__('Room_type_changed_successfully'));
-							instance.onSuccess();
-							instance.data.tabBar.close();
-						});
-					};
-					if (!currentData.room.default) {
-						return saveRoomSettings();
-					}
-					modal.open({
-						title: t('Room_default_change_to_private_will_be_default_no_more'),
-						type: 'warning',
-						showCancelButton: true,
-						confirmButtonColor: '#DD6B55',
-						confirmButtonText: t('Yes'),
-						cancelButtonText: t('Cancel'),
-						closeOnConfirm: true,
-						html: false,
-					}, function(confirmed) {
-						return !confirmed || saveRoomSettings();
-					});
-				}
-				break;
-			case 'archivationState':
-				const { room } = currentData;
-				if (this.$('input[name=archivationState]:checked').val() === 'true') {
-					if (room && room.archived !== true) {
-						Meteor.call('archiveRoom', rid, function(err) {
-							if (err) {
-								return handleError(err);
-							}
-							toastr.success(TAPi18n.__('Room_archived'));
-							callbacks.run('archiveRoom', currentData.room);
-							instance.onSuccess();
-							instance.data.tabBar.close();
-						});
-					}
-				} else if ((room && room.archived) === true) {
-					Meteor.call('unarchiveRoom', rid, function(err) {
-						if (err) {
-							return handleError(err);
-						}
-						toastr.success(TAPi18n.__('Room_unarchived'));
-						callbacks.run('unarchiveRoom', currentData.room);
-						instance.onSuccess();
-						instance.data.tabBar.close();
-					});
-				}
-				break;
-			case 'readOnly':
-				Meteor.call('saveRoomSettings', rid, 'readOnly', this.$('input[name=readOnly]:checked').val() === 'true', function(err) {
-					if (err) {
-						return handleError(err);
-					}
-					toastr.success(TAPi18n.__('Read_only_changed_successfully'));
-					instance.onSuccess();
-					instance.data.tabBar.close();
-				});
-		}
-		this.editing.set();
-	};
-
-	this.autorun(async () => {
-		this.roomOwner.set(null);
-		for (const { roles, u } of await call('getRoomRoles', Session.get('adminRoomsSelected').rid)) {
-			if (roles.includes('owner')) {
-				this.roomOwner.set(u);
-			}
-		}
-	});
-});
diff --git a/app/ui-admin/client/rooms/adminRooms.html b/app/ui-admin/client/rooms/adminRooms.html
deleted file mode 100644
index 9dc9595917d..00000000000
--- a/app/ui-admin/client/rooms/adminRooms.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<template name="adminRooms">
-	<div class="main-content-flex">
-		<section class="page-container page-list flex-tab-main-content">
-			{{> header sectionName="Rooms" fixedHeight="true" fullpage="true"}}
-			<div class="content">
-				{{#unless hasPermission 'view-room-administration'}}
-					<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
-				{{else}}
-					<form class="search-form" role="form">
-						<div class="rc-input__wrapper">
-							<div class="rc-input__icon">
-								{{#if isLoading}}
-									{{> loading }}
-								{{else}}
-									{{> icon block="rc-input__icon-svg" icon="magnifier" }}
-								{{/if}}
-							</div>
-							<input id="rooms-filter" type="text" class="rc-input__element"
-									 placeholder="{{_ "Search"}}" autofocus dir="auto">
-						</div>
-						<label><input type="checkbox" name="room-type" value="c"> {{_ "Channels"}}</label>
-						<label><input type="checkbox" name="room-type" value="d"> {{_ "Direct_Messages"}}</label>
-						<label><input type="checkbox" name="room-type" value="p"> {{_ "Private_Groups"}}</label>
-						<label><input type="checkbox" name="room-type" value="l"> {{_ "Omnichannel"}}</label>
-						<label><input type="checkbox" name="room-type" value="discussions"> {{_ "Discussions"}}</label>
-					</form>
-					<div class="results">
-						{{{_ "Showing_results" roomCount}}}
-					</div>
-					{{#table fixed='true' onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize}}
-						<thead>
-							<tr>
-								<th width="30%"><div class="table-fake-th">{{_ "Name"}}</div></th>
-								<th width="20%"><div class="table-fake-th">{{_ "Type"}}</div></th>
-								<th width="20%"><div class="table-fake-th">{{_ "Users"}}</div></th>
-								<th width="10%"><div class="table-fake-th">{{_ "Msgs"}}</div></th>
-								<th width="10%"><div class="table-fake-th">{{_ "Default"}}</div></th>
-								<th width="10%"><div class="table-fake-th">{{_ "Featured"}}</div></th>
-							</tr>
-						</thead>
-						<tbody>
-							{{#each rooms}}
-								<tr>
-									<td width="30%"><div class="rc-table-wrapper">
-										<div class="rc-table-avatar">{{> avatar url=url roomIcon="true"}}</div>
-										<div class="rc-table-info">
-											<span class="rc-table-title">
-												{{>icon icon=getIcon block="rc-table-icon"}} {{roomName}}
-											</span>
-										</div>
-									</div></td>
-									<td width="20%"><div class="rc-table-wrapper">{{type}}</div></td>
-									<td width="20%"><div class="rc-table-wrapper">{{usersCount}}</div></td>
-									<td width="10%"><div class="rc-table-wrapper">{{msgs}}</div></td>
-									<td width="10%"><div class="rc-table-wrapper">{{default}}</div></td>
-									<td width="10%"><div class="rc-table-wrapper">{{#if featured}}True{{else}}False{{/if}}</div></td>
-								</tr>
-							 {{else}} {{# with searchText}}
-							<tr class="table-no-click">
-								<td>{{_ "No_results_found_for"}} {{.}}</td>
-							</tr>
-							{{/with}}
-							{{/each}}
-							{{#if isLoading}}
-								<tr class="table-no-click">
-									<td class="table-loading-td" colspan="{{#if showLastMessage}}5{{else}}4{{/if}}">{{> loading}}</td>
-								</tr>
-							{{/if}}
-						</tbody>
-					{{/table}}
-				{{/unless}}
-			</div>
-		</section>
-		{{#with flexData}}
-			{{> flexTabBar}}
-		{{/with}}
-	</div>
-</template>
diff --git a/app/ui-admin/client/rooms/adminRooms.js b/app/ui-admin/client/rooms/adminRooms.js
deleted file mode 100644
index 9bf642ab72e..00000000000
--- a/app/ui-admin/client/rooms/adminRooms.js
+++ /dev/null
@@ -1,210 +0,0 @@
-import { Tracker } from 'meteor/tracker';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Session } from 'meteor/session';
-import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import _ from 'underscore';
-
-import { SideNav, RocketChatTabBar, TabBar } from '../../../ui-utils';
-import { t, roomTypes } from '../../../utils';
-import { hasAllPermission } from '../../../authorization';
-import { ChannelSettings } from '../../../channel-settings';
-import { getAvatarURL } from '../../../utils/lib/getAvatarURL';
-import { APIClient } from '../../../utils/client';
-
-const LIST_SIZE = 50;
-const DEBOUNCE_TIME_TO_SEARCH_IN_MS = 500;
-
-Template.adminRooms.helpers({
-	url() {
-		return this.t === 'd' ? getAvatarURL({ username: `@${ this.usernames[0] }` }) : roomTypes.getConfig(this.t).getAvatarPath(this);
-	},
-	getIcon() {
-		return roomTypes.getIcon(this);
-	},
-	roomName() {
-		return this.t === 'd' ? this.usernames.join(' x ') : roomTypes.getRoomName(this.t, this);
-	},
-	searchText() {
-		const instance = Template.instance();
-		return instance.filter && instance.filter.get();
-	},
-	rooms() {
-		return Template.instance().rooms.get();
-	},
-	isLoading() {
-		return Template.instance().isLoading.get();
-	},
-	roomCount() {
-		return Template.instance().rooms.get().length;
-	},
-	type() {
-		return TAPi18n.__(roomTypes.getConfig(this.t).label);
-	},
-	'default'() {
-		if (this.default) {
-			return t('True');
-		}
-		return t('False');
-	},
-	flexData() {
-		return {
-			tabBar: Template.instance().tabBar,
-			data: Template.instance().tabBarData.get(),
-		};
-	},
-	onTableScroll() {
-		const instance = Template.instance();
-		return function(currentTarget) {
-			if (currentTarget.offsetHeight + currentTarget.scrollTop < currentTarget.scrollHeight - 100) {
-				return;
-			}
-			const rooms = instance.rooms.get();
-			if (instance.total.get() > rooms.length) {
-				instance.offset.set(instance.offset.get() + LIST_SIZE);
-			}
-		};
-	},
-	onTableItemClick() {
-		const instance = Template.instance();
-		return function(item) {
-			Session.set('adminRoomsSelected', {
-				rid: item._id,
-			});
-			instance.tabBarData.set({
-				room: instance.rooms.get().find((room) => room._id === item._id),
-				onSuccess: instance.onSuccessCallback,
-			});
-			instance.tabBar.open('admin-room');
-		};
-	},
-
-});
-
-Template.adminRooms.onCreated(function() {
-	const instance = this;
-	this.offset = new ReactiveVar(0);
-	this.total = new ReactiveVar(0);
-	this.filter = new ReactiveVar('');
-	this.types = new ReactiveVar([]);
-	this.rooms = new ReactiveVar([]);
-	this.ready = new ReactiveVar(true);
-	this.isLoading = new ReactiveVar(false);
-	this.tabBar = new RocketChatTabBar();
-	this.tabBarData = new ReactiveVar();
-	this.tabBar.showGroup(FlowRouter.current().route.name);
-	TabBar.addButton({
-		groups: ['admin-rooms'],
-		id: 'admin-room',
-		i18nTitle: 'Room_Info',
-		icon: 'info-circled',
-		template: 'adminRoomInfo',
-		order: 7,
-	});
-
-	ChannelSettings.addOption({
-		group: ['admin-room'],
-		id: 'make-default',
-		template: 'channelSettingsDefault',
-		data() {
-			return {
-				room: instance.tabBarData.get().room,
-				onSuccess: instance.tabBarData.get().onSuccess,
-			};
-		},
-		validation() {
-			return hasAllPermission('view-room-administration');
-		},
-	});
-
-	ChannelSettings.addOption({
-		group: ['admin-room'],
-		id: 'make-featured',
-		template: 'channelSettingsFeatured',
-		data() {
-			return {
-				room: instance.tabBarData.get().room,
-				onSuccess: instance.tabBarData.get().onSuccess,
-			};
-		},
-		validation() {
-			return hasAllPermission('view-room-administration');
-		},
-	});
-
-	this.onSuccessCallback = () => {
-		instance.offset.set(0);
-		return instance.loadRooms(instance.types.get(), instance.filter.get(), instance.offset.get());
-	};
-
-	this.tabBarData.set({
-		onSuccess: instance.onSuccessCallback,
-	});
-
-	const mountTypesQueryParameter = (types) => types.reduce((acc, item) => {
-		acc += `types[]=${ item }&`;
-		return acc;
-	}, '');
-
-	this.loadRooms = _.debounce(async (types = [], filter, offset) => {
-		this.isLoading.set(true);
-		let url = `rooms.adminRooms?count=${ LIST_SIZE }&offset=${ offset }&${ mountTypesQueryParameter(types) }`;
-		if (filter) {
-			url += `filter=${ encodeURIComponent(filter) }`;
-		}
-		const { rooms, total } = await APIClient.v1.get(url);
-		this.total.set(total);
-		if (offset === 0) {
-			this.rooms.set(rooms);
-		} else {
-			this.rooms.set(this.rooms.get().concat(rooms));
-		}
-		this.isLoading.set(false);
-	}, DEBOUNCE_TIME_TO_SEARCH_IN_MS);
-
-	const allowedTypes = ['c', 'd', 'p'];
-	this.autorun(() => {
-		instance.filter.get();
-		instance.types.get();
-		instance.offset.set(0);
-	});
-	this.autorun(() => {
-		const filter = instance.filter.get();
-		const offset = instance.offset.get();
-		let types = instance.types.get();
-		if (types.length === 0) {
-			types = allowedTypes;
-		}
-		return this.loadRooms(types, filter, offset);
-	});
-	this.getSearchTypes = function() {
-		return _.map($('[name=room-type]:checked'), function(input) {
-			return $(input).val();
-		});
-	};
-});
-
-Template.adminRooms.onRendered(function() {
-	Tracker.afterFlush(function() {
-		SideNav.setFlex('adminFlex');
-		SideNav.openFlex();
-	});
-});
-
-Template.adminRooms.events({
-	'keydown #rooms-filter'(e) {
-		if (e.which === 13) {
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-	'keyup #rooms-filter'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.filter.set(e.currentTarget.value);
-	},
-	'change [name=room-type]'(e, t) {
-		t.types.set(t.getSearchTypes());
-	},
-});
diff --git a/app/ui-admin/client/rooms/channelSettingsDefault.html b/app/ui-admin/client/rooms/channelSettingsDefault.html
deleted file mode 100644
index 8360662079b..00000000000
--- a/app/ui-admin/client/rooms/channelSettingsDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<template name="channelSettingsDefault">
-	{{#if canMakeDefault}}
-		<li>
-			<label>{{_ "Default"}}</label>
-			<div>
-				{{#if editing 'default'}}
-					<label><input type="radio" name="default" class="editing" value="true" checked="{{$eq roomDefault true}}" /> {{_ "True"}}</label>
-					<label><input type="radio" name="default" value="false" checked="{{$neq roomDefault true}}" /> {{_ "False"}}</label>
-					{{#if roomDefault}}
-						<label><input type="checkbox" name="favorite" checked="{{isFavorite}}" /> {{_ "Set_as_favorite"}}</label>
-					{{/if}}
-					<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-					<button type="button" class="button primary save">{{_ "Save"}}</button>
-				{{else}}
-					<span>{{defaultDescription}} <i class="icon-pencil" data-edit="default"></i></span>
-				{{/if}}
-			</div>
-		</li>
-	{{/if}}
-</template>
diff --git a/app/ui-admin/client/rooms/channelSettingsDefault.js b/app/ui-admin/client/rooms/channelSettingsDefault.js
deleted file mode 100644
index 2b57af949eb..00000000000
--- a/app/ui-admin/client/rooms/channelSettingsDefault.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import toastr from 'toastr';
-
-import { t, handleError } from '../../../utils';
-
-Template.channelSettingsDefault.helpers({
-	canMakeDefault() {
-		const room = Template.instance().room.get();
-		return room && room.t === 'c';
-	},
-	editing(field) {
-		return Template.instance().editing.get() === field;
-	},
-	roomDefault() {
-		return Template.instance().isDefault.get();
-	},
-	isFavorite() {
-		return Template.instance().isFavorite.get();
-	},
-	defaultDescription() {
-		const { room, isDefault, isFavorite } = { room: Template.instance().room.get(), isDefault: Template.instance().isDefault.get(), isFavorite: Template.instance().isFavorite.get() };
-		let description = t('False');
-
-		if (room && isDefault) {
-			description = t('True');
-
-			if (isFavorite) {
-				description += `, ${ t('Set_as_favorite') }`;
-			}
-			return description;
-		}
-		return description;
-	},
-});
-
-Template.channelSettingsDefault.events({
-	'change input[name=default]'(e, t) {
-		t.isDefault.set(e.currentTarget.value === 'true');
-	},
-	'change input[name=favorite]'(e, t) {
-		t.isFavorite.set(e.currentTarget.checked);
-	},
-	'click [data-edit]'(e, t) {
-		e.preventDefault();
-		t.editing.set($(e.currentTarget).data('edit'));
-		setTimeout(() => {
-			t.$('input.editing').focus().select();
-		}, 100);
-	},
-	'click .cancel'(e, t) {
-		e.preventDefault();
-		t.editing.set();
-	},
-	'click .save'(e, t) {
-		e.preventDefault();
-
-		Meteor.call('saveRoomSettings', t.room.get()._id, { default: t.isDefault.get(), favorite: { defaultValue: t.isDefault.get(), favorite: t.isFavorite.get() } }, (err/* , result*/) => {
-			if (err) {
-				return handleError(err);
-			}
-			toastr.success(TAPi18n.__('Room_type_changed_successfully'));
-		});
-		t.onSuccess();
-		t.editing.set();
-	},
-});
-
-Template.channelSettingsDefault.onCreated(function() {
-	this.editing = new ReactiveVar();
-	this.isDefault = new ReactiveVar();
-	this.isFavorite = new ReactiveVar();
-	this.room = new ReactiveVar();
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.autorun(() => {
-		const { room } = Template.currentData();
-		this.isDefault.set(room && room.default);
-		this.isFavorite.set(room && room.favorite && room.default);
-		this.room.set(room);
-	});
-});
diff --git a/app/ui-admin/client/rooms/channelSettingsFeatured.html b/app/ui-admin/client/rooms/channelSettingsFeatured.html
deleted file mode 100644
index a6b00328673..00000000000
--- a/app/ui-admin/client/rooms/channelSettingsFeatured.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<template name="channelSettingsFeatured">
-	<li>
-		<label>{{_ "Featured"}}</label>
-		<div>
-			{{#if editing 'featured'}}
-				<label><input type="radio" name="featured" class="editing" value="true" checked="{{$eq roomFeatured true}}" /> {{_ "True"}}</label>
-				<label><input type="radio" name="featured" value="false" checked="{{$neq roomFeatured true}}" /> {{_ "False"}}</label>
-				<button type="button" class="button cancel">{{_ "Cancel"}}</button>
-				<button type="button" class="button primary save">{{_ "Save"}}</button>
-			{{else}}
-				<span>{{featuredDescription}} <i class="icon-pencil" data-edit="featured"></i></span>
-			{{/if}}
-		</div>
-	</li>
-</template>
diff --git a/app/ui-admin/client/rooms/channelSettingsFeatured.js b/app/ui-admin/client/rooms/channelSettingsFeatured.js
deleted file mode 100644
index a0ffb03881e..00000000000
--- a/app/ui-admin/client/rooms/channelSettingsFeatured.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import toastr from 'toastr';
-import './channelSettingsFeatured.html';
-
-import { t, handleError } from '../../../utils';
-
-Template.channelSettingsFeatured.helpers({
-	editing(field) {
-		return Template.instance().editing.get() === field;
-	},
-	roomFeatured() {
-		const room = Template.instance().room.get();
-
-		if (room) {
-			return room.featured;
-		}
-	},
-	featuredDescription() {
-		const room = Template.instance().room.get();
-		if (room && room.featured) {
-			return t('True');
-		}
-		return t('False');
-	},
-});
-
-Template.channelSettingsFeatured.events({
-	'click [data-edit]'(e, t) {
-		e.preventDefault();
-		t.editing.set($(e.currentTarget).data('edit'));
-		setTimeout(() => {
-			t.$('input.editing').focus().select();
-		}, 100);
-	},
-	'click .cancel'(e, t) {
-		e.preventDefault();
-		t.editing.set();
-	},
-	'click .save'(e, t) {
-		e.preventDefault();
-
-		Meteor.call('saveRoomSettings', Template.instance().room.get()._id, 'featured', $('input[name=featured]:checked').val(), (err/* , result*/) => {
-			if (err) {
-				return handleError(err);
-			}
-			toastr.success(TAPi18n.__('Room_changed_successfully'));
-		});
-		t.onSuccess();
-		t.editing.set();
-	},
-});
-
-Template.channelSettingsFeatured.onCreated(function() {
-	this.editing = new ReactiveVar();
-	this.room = new ReactiveVar();
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.autorun(() => {
-		const { room } = Template.currentData();
-		this.room.set(room);
-	});
-});
diff --git a/app/ui-admin/client/rooms/views.js b/app/ui-admin/client/rooms/views.js
deleted file mode 100644
index 9bfc9dcf830..00000000000
--- a/app/ui-admin/client/rooms/views.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import './adminRooms.html';
-import './adminRoomInfo.html';
-import './adminRoomInfo';
-import './channelSettingsDefault.html';
-import './channelSettingsDefault';
-import './channelSettingsFeatured';
-import './adminRooms';
diff --git a/app/ui-admin/client/routes.js b/app/ui-admin/client/routes.js
deleted file mode 100644
index b30d9cb3a40..00000000000
--- a/app/ui-admin/client/routes.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { Meteor } from 'meteor/meteor';
-
-import { renderRouteComponent } from '../../../client/reactAdapters';
-
-const routeGroup = FlowRouter.group({
-	name: 'admin',
-	prefix: '/admin',
-});
-
-export const registerAdminRoute = (path, { lazyRouteComponent, props, action, ...options } = {}) => {
-	routeGroup.route(path, {
-		...options,
-		action: (params, queryParams) => {
-			if (action) {
-				action(params, queryParams);
-				return;
-			}
-
-			renderRouteComponent(() => import('./components/AdministrationRouter'), {
-				template: 'main',
-				region: 'center',
-				propsFn: () => ({ lazyRouteComponent, ...options, params, queryParams, ...props }),
-			});
-		},
-	});
-};
-
-registerAdminRoute('/', {
-	triggersEnter: [(context, redirect) => {
-		redirect('admin-info');
-	}],
-});
-
-registerAdminRoute('/info', {
-	name: 'admin-info',
-	lazyRouteComponent: () => import('./components/info/InformationRoute'),
-});
-
-registerAdminRoute('/mailer', {
-	name: 'admin-mailer',
-	lazyRouteComponent: () => import('./components/mailer/MailerRoute'),
-});
-
-registerAdminRoute('/users', {
-	name: 'admin-users',
-	action: async () => {
-		await import('./users/views');
-		BlazeLayout.render('main', { center: 'adminUsers' });
-	},
-});
-
-registerAdminRoute('/rooms', {
-	name: 'admin-rooms',
-	action: async () => {
-		await import('./rooms/views');
-		BlazeLayout.render('main', { center: 'adminRooms' });
-	},
-});
-
-Meteor.startup(() => {
-	registerAdminRoute('/:group+', {
-		name: 'admin',
-		lazyRouteComponent: () => import('./components/settings/SettingsRoute'),
-	});
-});
diff --git a/app/ui-admin/client/sidebarItems.js b/app/ui-admin/client/sidebarItems.js
deleted file mode 100644
index f060c00e21d..00000000000
--- a/app/ui-admin/client/sidebarItems.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Tracker } from 'meteor/tracker';
-
-const items = new ReactiveVar([]);
-
-export const registerAdminSidebarItem = (itemOptions) => {
-	Tracker.nonreactive(() => items.set([...items.get(), itemOptions]));
-};
-
-export const getSidebarItems = () => items.get().filter((option) => !option.permissionGranted || option.permissionGranted());
diff --git a/app/ui-admin/client/users/adminInviteUser.html b/app/ui-admin/client/users/adminInviteUser.html
deleted file mode 100644
index 836c7bd8861..00000000000
--- a/app/ui-admin/client/users/adminInviteUser.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<template name="adminInviteUser">
-	{{#if isAllowed}}
-		<div class="content">
-			<div class="user-view">
-				<div class="about clearfix">
-					<form class="edit-form">
-						<h3>{{_ "Send_invitation_email"}}</h3>
-						<div class="input-line">
-							<label for="inviteEmails">{{_ "Send_invitation_email_info"}}</label>
-							<textarea id="inviteEmails" rows="3" style="height: auto" class="content-background-color"></textarea>
-						</div>
-					</form>
-				</div>
-				<nav>
-					<button class='button button-block cancel'><span>{{_ "Cancel"}}</span></button>
-					<button class='button button-block primary send' data-loading-text="{{_ "Please_wait"}}"><span>{{_ "Send"}}</span></button>
-				</nav>
-				{{#if inviteEmails.length}}
-				<div class="about clearfix" style="margin-top: 30px">
-					<p style="color: #51a351"> {{_ "Send_invitation_email_success"}} </p>
-					<ul style="margin: 5px 10px">
-						{{#each inviteEmails}}
-						<li style="margin-top: 5px">{{.}}</li>
-						{{/each}}
-					</ul>
-				</div>
-				{{/if}}
-			</div>
-		</div>
-	{{/if}}
-</template>
diff --git a/app/ui-admin/client/users/adminInviteUser.js b/app/ui-admin/client/users/adminInviteUser.js
deleted file mode 100644
index d765d45e9c9..00000000000
--- a/app/ui-admin/client/users/adminInviteUser.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-import _ from 'underscore';
-import toastr from 'toastr';
-
-import { hasAtLeastOnePermission } from '../../../authorization';
-import { t, handleError } from '../../../utils';
-
-Template.adminInviteUser.helpers({
-	isAllowed() {
-		return hasAtLeastOnePermission('bulk-register-user');
-	},
-	inviteEmails() {
-		return Template.instance().inviteEmails.get();
-	},
-});
-
-Template.adminInviteUser.events({
-	'click .send'(e, instance) {
-		const emails = $('#inviteEmails').val().split(/[\s,;]/);
-		const rfcMailPattern = /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
-		const validEmails = _.compact(_.map(emails, function(email) {
-			if (rfcMailPattern.test(email)) {
-				return email;
-			}
-		}));
-		if (validEmails.length) {
-			Meteor.call('sendInvitationEmail', validEmails, function(error, result) {
-				if (result) {
-					instance.clearForm();
-					instance.inviteEmails.set(validEmails);
-				}
-				if (error) {
-					handleError(error);
-				}
-			});
-		} else {
-			toastr.error(t('Send_invitation_email_error'));
-		}
-	},
-	'click .cancel'(e, instance) {
-		instance.clearForm();
-		instance.inviteEmails.set([]);
-		Template.currentData().tabBar.close();
-	},
-});
-
-Template.adminInviteUser.onCreated(function() {
-	this.inviteEmails = new ReactiveVar([]);
-	this.clearForm = function() {
-		$('#inviteEmails').val('');
-	};
-});
diff --git a/app/ui-admin/client/users/adminUserEdit.html b/app/ui-admin/client/users/adminUserEdit.html
deleted file mode 100644
index 48a621bd34c..00000000000
--- a/app/ui-admin/client/users/adminUserEdit.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="adminUserEdit">
-	{{> userEdit .}}
-</template>
diff --git a/app/ui-admin/client/users/adminUserInfo.html b/app/ui-admin/client/users/adminUserInfo.html
deleted file mode 100644
index 9b52cae393b..00000000000
--- a/app/ui-admin/client/users/adminUserInfo.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<template name="adminUserInfo">
-	{{#if _id}}
-		{{> userInfo .}}
-	{{else}}
-		<section class="contextual-bar__content">
-			<div>{{_ "Please_select_an_user"}}</div>
-		</section>
-	{{/if}}
-</template>
diff --git a/app/ui-admin/client/users/adminUsers.html b/app/ui-admin/client/users/adminUsers.html
deleted file mode 100644
index becdb5d67e3..00000000000
--- a/app/ui-admin/client/users/adminUsers.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<template name="adminUsers">
-	<div class="main-content-flex">
-		<section class="page-container page-list flex-tab-main-content">
-			{{> header sectionName="Users"}}
-			<div class="content">
-				{{#unless hasPermission 'view-user-administration'}}
-					<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
-				{{else}}
-					<form class="search-form" role="form">
-						<div class="rc-input__wrapper">
-							<div class="rc-input__icon">
-								{{#if isReady}}
-									{{> icon block="rc-input__icon-svg" icon="magnifier" }}
-								{{else}}
-									{{> loading }}
-								{{/if}}
-							</div>
-							<input id="users-filter" type="text" class="rc-input__element"
-								   placeholder="{{_ "Search"}}" autofocus dir="auto">
-					 	</div>
-					</form>
-					<div class="results">
-						{{{_ "Showing_results" users.length}}}
-					</div>
-					{{#table fixed='true' onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize}}
-						<thead>
-							<tr>
-								<th width="34%">
-									<div class="table-fake-th">{{_ "Name"}}</div>
-								</th>
-								<th width="33%">
-									<div class="table-fake-th">{{_ "Username"}}</div>
-								</th>
-								<th width="33%">
-									<div class="table-fake-th">{{_ "Email"}}</div>
-								</th>
-								<th width="33%">
-									<div class="table-fake-th">{{_ "Roles"}}</div>
-								</th>
-								<th width="33%">
-									<div class="table-fake-th">{{_ "Status"}}</div>
-								</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{#each users}}
-							<tr class='user-info'>
-								<td width="30%">
-									<div class="rc-table-wrapper">
-										<div class="rc-table-avatar">
-											{{> avatar username=username}}
-										</div>
-										<div class="rc-table-info">
-											<span class="rc-table-title">{{name}}</span>
-										</div>
-									</div>
-								</td>
-								<td width="20%">
-									<div class="rc-table-wrapper">
-										<div class="rc-table-info">
-											<span class="rc-table-title">{{username}}</span>
-										</div>
-									</div>
-								</td>
-								<td width="20%">
-									<div class="rc-table-wrapper">
-										<div class="rc-table-info">
-											<span class="rc-table-title">{{emailAddress}}</span>
-										</div>
-									</div>
-								</td>
-								<td width="10%">
-									<div class="rc-table-wrapper">
-										<div class="rc-table-info">
-											<span class="rc-table-title">{{roles}}</span>
-										</div>
-									</div>
-								</td>
-								<td width="20%">
-									<div class="rc-table-wrapper">{{#if $not active}}{{_"deactivated"}}{{else}}{{status}}{{/if}}</div>
-								</td>
-							</tr>
-							{{else}} {{# with searchText}}
-							<tr class="table-no-click">
-								<td>{{_ "No_results_found_for"}} {{.}}</td>
-							</tr>
-							{{/with}} {{/each}} {{#unless isReady}}
-							<tr class="table-no-click">
-								<td class="table-loading-td" colspan="{{#if showLastMessage}}5{{else}}4{{/if}}">{{> loading}}</td>
-							</tr>
-							{{/unless}}
-						</tbody>
-					{{/table}}
-				{{/unless}}
-			</div>
-		</section>
-		{{#with flexData}}
-			{{> flexTabBar}}
-		{{/with}}
-	</div>
-</template>
diff --git a/app/ui-admin/client/users/adminUsers.js b/app/ui-admin/client/users/adminUsers.js
deleted file mode 100644
index eddb440a1b7..00000000000
--- a/app/ui-admin/client/users/adminUsers.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Tracker } from 'meteor/tracker';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Template } from 'meteor/templating';
-import _ from 'underscore';
-
-import { SideNav, TabBar, RocketChatTabBar } from '../../../ui-utils';
-import { APIClient } from '../../../utils/client';
-
-const USERS_COUNT = 50;
-
-Template.adminUsers.helpers({
-	searchText() {
-		const instance = Template.instance();
-		return instance.filter && instance.filter.get();
-	},
-	isReady() {
-		const instance = Template.instance();
-		return instance.ready && instance.ready.get();
-	},
-	users() {
-		return Template.instance().users.get();
-	},
-	isLoading() {
-		const instance = Template.instance();
-		if (!(instance.ready && instance.ready.get())) {
-			return 'btn-loading';
-		}
-	},
-	hasMore() {
-		const instance = Template.instance();
-		const users = instance.users();
-		if (instance.offset && instance.offset.get() && users && users.length) {
-			return instance.offset.get() === users.length;
-		}
-	},
-	emailAddress() {
-		return _.map(this.emails, function(e) { return e.address; }).join(', ');
-	},
-	flexData() {
-		return {
-			tabBar: Template.instance().tabBar,
-			data: Template.instance().tabBarData.get(),
-		};
-	},
-	onTableScroll() {
-		const instance = Template.instance();
-		return function(currentTarget) {
-			if (
-				currentTarget.offsetHeight + currentTarget.scrollTop
-				>= currentTarget.scrollHeight - 100
-			) {
-				return instance.offset.set(instance.offset.get() + USERS_COUNT);
-			}
-		};
-	},
-	// onTableItemClick() {
-	// 	const instance = Template.instance();
-	// 	return function(item) {
-	// 		Session.set('adminRoomsSelected', {
-	// 			rid: item._id,
-	// 		});
-	// 		instance.tabBar.open('admin-room');
-	// 	};
-	// },
-});
-
-Template.adminUsers.onCreated(function() {
-	const instance = this;
-	this.offset = new ReactiveVar(0);
-	this.filter = new ReactiveVar('');
-	this.ready = new ReactiveVar(true);
-	this.tabBar = new RocketChatTabBar();
-	this.tabBar.showGroup(FlowRouter.current().route.name);
-	this.tabBarData = new ReactiveVar();
-	this.users = new ReactiveVar([]);
-
-	TabBar.addButton({
-		groups: ['admin-users'],
-		id: 'admin-user-info',
-		i18nTitle: 'User_Info',
-		icon: 'user',
-		template: 'adminUserInfo',
-		order: 3,
-	});
-
-	TabBar.addButton({
-		groups: ['admin-users'],
-		id: 'invite-user',
-		i18nTitle: 'Invite_Users',
-		icon: 'send',
-		template: 'adminInviteUser',
-		order: 1,
-	});
-
-	TabBar.addButton({
-		groups: ['admin-users'],
-		id: 'add-user',
-		i18nTitle: 'Add_User',
-		icon: 'plus',
-		template: 'adminUserEdit',
-		order: 2,
-	});
-
-	this.loadUsers = async (filter, offset) => {
-		this.ready.set(false);
-
-		const query = {
-			$or: [
-				{ 'emails.address': { $regex: filter, $options: 'i' } },
-				{ username: { $regex: filter, $options: 'i' } },
-				{ name: { $regex: filter, $options: 'i' } },
-			],
-		};
-		let url = `users.list?count=${ USERS_COUNT }&offset=${ offset }`;
-		if (filter) {
-			url += `&query=${ JSON.stringify(query) }`;
-		}
-		const { users } = await APIClient.v1.get(url);
-		if (offset === 0) {
-			this.users.set(users);
-		} else {
-			this.users.set(this.users.get().concat(users));
-		}
-		this.ready.set(true);
-	};
-
-	this.autorun(async () => {
-		const filter = instance.filter.get();
-		const offset = instance.offset.get();
-
-		this.loadUsers(filter, offset);
-	});
-});
-
-Template.adminUsers.onRendered(function() {
-	Tracker.afterFlush(function() {
-		SideNav.setFlex('adminFlex');
-		SideNav.openFlex();
-	});
-});
-
-const DEBOUNCE_TIME_FOR_SEARCH_USERS_IN_MS = 300;
-
-Template.adminUsers.events({
-	'keydown #users-filter'(e) {
-		if (e.which === 13) {
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-	'keyup #users-filter': _.debounce((e, t) => {
-		e.stopPropagation();
-		e.preventDefault();
-		t.filter.set(e.currentTarget.value);
-		t.offset.set(0);
-	}, DEBOUNCE_TIME_FOR_SEARCH_USERS_IN_MS),
-	'click .user-info'(e, instance) {
-		e.preventDefault();
-		instance.tabBarData.set({
-			...instance.users.get().find((user) => user._id === this._id),
-			onChange() {
-				const filter = instance.filter.get();
-				const offset = instance.offset.get();
-
-				instance.loadUsers(filter, offset);
-			},
-		});
-		instance.tabBar.open('admin-user-info');
-	},
-	'click .info-tabs button'(e) {
-		e.preventDefault();
-		$('.info-tabs button').removeClass('active');
-		$(e.currentTarget).addClass('active');
-		$('.user-info-content').hide();
-		$($(e.currentTarget).attr('href')).show();
-	},
-	'click .load-more'(e, t) {
-		e.preventDefault();
-		e.stopPropagation();
-		t.offset.set(t.offset.get() + USERS_COUNT);
-	},
-});
diff --git a/app/ui-admin/client/users/views.js b/app/ui-admin/client/users/views.js
deleted file mode 100644
index da3c6d5414b..00000000000
--- a/app/ui-admin/client/users/views.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import './adminInviteUser.html';
-import './adminUserEdit.html';
-import './adminUserInfo.html';
-import './adminUsers.html';
-import './adminInviteUser';
-import './adminUsers';
diff --git a/app/ui-message/client/blocks/MessageBlock.js b/app/ui-message/client/blocks/MessageBlock.js
index 3bd9a8739ff..2794b265583 100644
--- a/app/ui-message/client/blocks/MessageBlock.js
+++ b/app/ui-message/client/blocks/MessageBlock.js
@@ -2,6 +2,7 @@ import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/
 import { UiKitMessage, UiKitComponent, kitContext, messageParser } from '@rocket.chat/fuselage-ui-kit';
 import React, { useRef, useEffect } from 'react';
 
+import RawText from '../../../../client/components/basic/RawText';
 import { renderMessageBody } from '../../../ui-utils/client';
 import * as ActionManager from '../ActionManager';
 
@@ -11,7 +12,7 @@ messageParser.text = ({ text, type } = {}) => {
 		return text;
 	}
 
-	return <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
+	return <RawText>{renderMessageBody({ msg: text })}</RawText>;
 };
 
 export function MessageBlock({ mid: _mid, rid, blocks, appId }) {
diff --git a/app/ui-message/client/blocks/ModalBlock.js b/app/ui-message/client/blocks/ModalBlock.js
index cec19b7c74d..891c1b15c75 100644
--- a/app/ui-message/client/blocks/ModalBlock.js
+++ b/app/ui-message/client/blocks/ModalBlock.js
@@ -5,6 +5,7 @@ import { kitContext, UiKitComponent, UiKitModal, modalParser } from '@rocket.cha
 import { uiKitText } from '@rocket.chat/ui-kit';
 import React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 
+import RawText from '../../../../client/components/basic/RawText';
 import { renderMessageBody } from '../../../ui-utils/client';
 import { getURL } from '../../../utils/lib/getURL';
 import * as ActionManager from '../ActionManager';
@@ -15,7 +16,7 @@ modalParser.text = ({ text, type } = {}) => {
 		return text;
 	}
 
-	return <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
+	return <RawText>{renderMessageBody({ msg: text })}</RawText>;
 };
 
 const textParser = uiKitText({
diff --git a/app/ui-message/client/messageBox/messageBoxAutogrow.js b/app/ui-message/client/messageBox/messageBoxAutogrow.js
index b7174a5eacc..0e042d00d8a 100644
--- a/app/ui-message/client/messageBox/messageBoxAutogrow.js
+++ b/app/ui-message/client/messageBox/messageBoxAutogrow.js
@@ -1,8 +1,8 @@
 import _ from 'underscore';
 
-const replaceWhitespaces = (whitespaces: string) => `${ '&nbsp;'.repeat(whitespaces.length - 1) } `;
+const replaceWhitespaces = (whitespaces) => `${ '&nbsp;'.repeat(whitespaces.length - 1) } `;
 
-export const setupAutogrow = (textarea: HTMLTextAreaElement, shadow: HTMLDivElement, callback: () => void) => {
+export const setupAutogrow = (textarea, shadow, callback) => {
 	const width = textarea.clientWidth;
 	const height = textarea.clientHeight;
 	const { font, lineHeight, maxHeight: maxHeightPx } = window.getComputedStyle(textarea);
diff --git a/app/ui-sidenav/client/SortList.js b/app/ui-sidenav/client/SortList.js
index b0add853e97..71ca52af71e 100644
--- a/app/ui-sidenav/client/SortList.js
+++ b/app/ui-sidenav/client/SortList.js
@@ -16,7 +16,7 @@ function SortListItem({ text, icon, input }) {
 					</Flex.Item>
 					<Margins inline='x8'>
 						<Flex.Item grow={1}>
-							<Box is='span' textStyle='p2'>{text}</Box>
+							<Box is='span' fontScale='p2'>{text}</Box>
 						</Flex.Item>
 					</Margins>
 					<Flex.Item grow={0}>
@@ -54,7 +54,7 @@ function SortModeList() {
 
 	return <>
 		<Margins block='x8'>
-			<Box is='p' style={style} textStyle='micro'>{t('Sort_By')}</Box>
+			<Box is='p' style={style} fontScale='micro'>{t('Sort_By')}</Box>
 		</Margins>
 		<ul className='rc-popover__list'>
 			<Margins block='x8'>
@@ -84,7 +84,7 @@ function ViewModeList() {
 
 	return <>
 		<Margins block='x8'>
-			<Box is='p' style={style} textStyle='micro'>{t('View_mode')}</Box>
+			<Box is='p' style={style} fontScale='micro'>{t('View_mode')}</Box>
 		</Margins>
 		<ul className='rc-popover__list'>
 			<Margins block='x8'>
@@ -117,7 +117,7 @@ function GroupingList() {
 	const t = useTranslation();
 	return <>
 		<Margins block='x8'>
-			<Box is='p' style={style} textStyle='micro'>{t('Grouping')}</Box>
+			<Box is='p' style={style} fontScale='micro'>{t('Grouping')}</Box>
 		</Margins>
 		<ul className='rc-popover__list'>
 			<Margins block='x8'>
diff --git a/app/ui/client/views/app/components/Directory/DirectoryTable.js b/app/ui/client/components/GenericTable.js
similarity index 50%
rename from app/ui/client/views/app/components/Directory/DirectoryTable.js
rename to app/ui/client/components/GenericTable.js
index 96c73164102..9d50a456aff 100644
--- a/app/ui/client/views/app/components/Directory/DirectoryTable.js
+++ b/app/ui/client/components/GenericTable.js
@@ -1,9 +1,8 @@
 import React, { useMemo, useState, useEffect, useCallback } from 'react';
-import { Box, Icon, Pagination, Skeleton, Table, Flex, TextInput, Tile } from '@rocket.chat/fuselage';
+import { Box, Pagination, Skeleton, Table, Flex, Tile, Scrollable } from '@rocket.chat/fuselage';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 
-import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
-import { useDebounce } from '../hooks';
-import { Markdown as mrkd } from '../../../../../../markdown/client';
+import { useTranslation } from '../../../../client/contexts/TranslationContext';
 
 function SortIcon({ direction }) {
 	return <Box is='svg' width='x16' height='x16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
@@ -19,12 +18,6 @@ export function Th({ children, active, direction, sort, onClick, align, ...props
 	</Table.Cell>;
 }
 
-export function Markdown({ children, ...props }) {
-	return React.Children.map(children, function(text, index) {
-		return <Box { ...props } key={index} dangerouslySetInnerHTML={{ __html: mrkd.parse(text) }}/>;
-	});
-}
-
 const LoadingRow = ({ cols }) => <Table.Row>
 	<Table.Cell>
 		<Box display='flex'>
@@ -42,33 +35,28 @@ const LoadingRow = ({ cols }) => <Table.Row>
 	</Table.Cell>)}
 </Table.Row>;
 
-const style = { minHeight: '40px' };
-
-export function DirectoryTable({
-	data = {},
+export function GenericTable({
+	results,
+	total,
 	renderRow,
 	header,
-	searchPlaceholder = 'placeholder',
 	setParams = () => { },
+	params: paramsDefault = '',
+	FilterComponent = () => null,
 }) {
 	const t = useTranslation();
 
-	const [text, setText] = useState('');
+	const [filter, setFilter] = useState(paramsDefault);
 
 	const [itemsPerPage, setItemsPerPage] = useState(25);
 
 	const [current, setCurrent] = useState(0);
 
-	const term = useDebounce(text, 500);
+	const params = useDebouncedValue(filter, 500);
 
 	useEffect(() => {
-		setParams({ term, current, itemsPerPage });
-	}, [term, current, itemsPerPage]);
-
-	const { result: channels, total } = data;
-
-
-	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+		setParams({ ...params, current, itemsPerPage });
+	}, [params, current, itemsPerPage]);
 
 	const Loading = useCallback(() => Array.from({ length: 10 }, (_, i) => <LoadingRow cols={header.length} key={i}/>), [header && header.length]);
 
@@ -77,40 +65,40 @@ export function DirectoryTable({
 	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), []);
 
 	return <>
-		<Flex.Container direction='column'>
-			<Box>
-				<Box mb='x16' display='flex' flexDirection='column' style={style}>
-					<TextInput placeholder={searchPlaceholder} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
-				</Box>
-				{channels && !channels.length
-					? <Tile textStyle='p1' elevation='0' textColor='info' style={{ textAlign: 'center' }}>
-						{t('No_data_found')}
-					</Tile>
-					: <>
-						<Table fixed>
-							{ header && <Table.Head>
-								<Table.Row>
-									{header}
-								</Table.Row>
-							</Table.Head> }
-							<Table.Body>
-								{channels
-									? channels.map(renderRow)
-									:	<Loading/>}
-							</Table.Body>
-						</Table>
-						<Pagination
-							current={current}
-							itemsPerPage={itemsPerPage}
-							itemsPerPageLabel={itemsPerPageLabel}
-							showingResultsLabel={showingResultsLabel}
-							count={total || 0}
-							onSetItemsPerPage={setItemsPerPage}
-							onSetCurrent={setCurrent}
-						/>
-					</>
-				}
-			</Box>
-		</Flex.Container>
+		<>
+			<FilterComponent flexShrink={0} setFilter={setFilter}/>
+			{results && !results.length
+				? <Tile fontScale='p1' elevation='0' color='info' textAlign='center'>
+					{t('No_data_found')}
+				</Tile>
+				: <>
+					<Scrollable>
+						<Box mi='neg-x24' pi='x24' flexGrow={1}>
+							<Table fixed sticky>
+								{ header && <Table.Head>
+									<Table.Row>
+										{header}
+									</Table.Row>
+								</Table.Head> }
+								<Table.Body>
+									{results
+										? results.map(renderRow)
+										:	<Loading/>}
+								</Table.Body>
+							</Table>
+						</Box>
+					</Scrollable>
+					<Pagination
+						current={current}
+						itemsPerPage={itemsPerPage}
+						itemsPerPageLabel={itemsPerPageLabel}
+						showingResultsLabel={showingResultsLabel}
+						count={total || 0}
+						onSetItemsPerPage={setItemsPerPage}
+						onSetCurrent={setCurrent}
+					/>
+				</>
+			}
+		</>
 	</>;
 }
diff --git a/app/ui/client/components/GenericTable.stories.js b/app/ui/client/components/GenericTable.stories.js
new file mode 100644
index 00000000000..d475b0ac711
--- /dev/null
+++ b/app/ui/client/components/GenericTable.stories.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { TextInput, Box, Icon } from '@rocket.chat/fuselage';
+
+import { GenericTable, Th } from './GenericTable';
+
+
+export default {
+	title: 'directory/table',
+	component: GenericTable,
+	decorators: [(fn) => <div children={fn()} style={{ height: '100vh' }} />],
+};
+
+
+export const _default = () => {
+	const Search = () => <Box mb='x16' is='form' display='flex' flexDirection='column'>
+		<TextInput flexShrink={0} placeholder='Search...' addon={<Icon name='magnifier' size='x20'/>}/>
+	</Box>;
+
+
+	const header = [
+		<Th>Name</Th>,
+		<Th>Email</Th>,
+		<Th>Data</Th>,
+		<Th>Info</Th>,
+	];
+	return <GenericTable FilterComponent={Search} header={header} />;
+};
diff --git a/app/ui/client/views/app/RoomForeword.js b/app/ui/client/views/app/RoomForeword.js
index e9aee84793f..98998a38f3f 100644
--- a/app/ui/client/views/app/RoomForeword.js
+++ b/app/ui/client/views/app/RoomForeword.js
@@ -5,6 +5,7 @@ import { Rooms } from '../../../../models';
 import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { useReactiveValue } from '../../../../../client/hooks/useReactiveValue';
 import { useUser } from '../../../../../client/contexts/UserContext';
+import { roomTypes } from '../../../../utils/client';
 
 const RoomForeword = ({ _id: rid }) => {
 	const t = useTranslation();
@@ -21,41 +22,31 @@ const RoomForeword = ({ _id: rid }) => {
 		return null;
 	}
 
-	return <Avatar.Context.Provider value={{ baseUrl: '/avatar/' }}>
-		<Flex.Container justifyContent='center' direction='column'>
-			<Flex.Item grow={1}>
-				<Box is='div'>
-					<Flex.Item grow={1}>
-						<Margins block='x24'>
-							<Avatar.Stack>
-								{users.map((username, index) => <Avatar size='x48' title={username} url={username} key={index} data-username={username} />)}
-							</Avatar.Stack>
-						</Margins>
-					</Flex.Item>
-					<Flex.Item grow={1}>
-						<Box textColor='default' textStyle='headline' >
-							{ t('Direct_message_you_have_joined') }
-						</Box>
-					</Flex.Item>
-					<Flex.Item grow={1}>
-						<Margins block='x8'>
-							<Box is='div'>
-								{users.map((username, index) => <Margins inline='x4' key={index}>
-									<Tag
-										is='a'
-										textStyle='p2'
-										href={ `/direct/${ username }` }
-										data-username={username}
-										className='mention-link mention-link--user'
-									>{username}</Tag>
-								</Margins>)}
-							</Box>
-						</Margins>
-					</Flex.Item>
-				</Box>
-			</Flex.Item>
-		</Flex.Container>
-	</Avatar.Context.Provider>;
+	return <Box is='div' flexGrow={1} display='flex' justifyContent='center' flexDirection='column'>
+		<Flex.Item grow={1}>
+			<Margins block='x24'>
+				<Avatar.Stack>
+					{users.map(
+						(username, index) => {
+							const avatarUrl = roomTypes.getConfig('d').getAvatarPath({ name: username, type: 'd' });
+							return <Avatar size='x48' title={username} url={avatarUrl} key={index} data-username={username} />;
+						})}
+				</Avatar.Stack>
+			</Margins>
+		</Flex.Item>
+		<Box color='default' fontScale='h1' flexGrow={1}>{t('Direct_message_you_have_joined')}</Box>
+		<Box is='div' mb='x8' flexGrow={1}>
+			{users.map((username, index) => <Margins inline='x4' key={index}>
+				<Tag
+					is='a'
+					fontScale='p2'
+					href={`/direct/${ username }`}
+					data-username={username}
+					className='mention-link mention-link--user'
+				>{username}</Tag>
+			</Margins>)}
+		</Box>
+	</Box>;
 };
 
 export default RoomForeword;
diff --git a/app/ui/client/views/app/components/Directory/ChannelsTab.js b/app/ui/client/views/app/components/Directory/ChannelsTab.js
index d8ef60b8f5f..5d61650ee5f 100644
--- a/app/ui/client/views/app/components/Directory/ChannelsTab.js
+++ b/app/ui/client/views/app/components/Directory/ChannelsTab.js
@@ -1,14 +1,16 @@
-import React, { useMemo, useState, useCallback } from 'react';
-import { Box, Margins, Table, Avatar, Tag, Icon } from '@rocket.chat/fuselage';
+import React, { useMemo, useState, useCallback, useEffect } from 'react';
+import { Box, Margins, Table, Avatar, Tag, Icon, TextInput } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 
-import { useEndpointData } from '../../../../../../../ee/app/engagement-dashboard/client/hooks/useEndpointData';
-import { DirectoryTable, Th, Markdown } from './DirectoryTable';
+import { GenericTable, Th } from '../../../../components/GenericTable';
+import MarkdownText from '../../../../../../../client/components/basic/MarkdownText';
 import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
+import { usePermission } from '../../../../../../../client/contexts/AuthorizationContext';
 import { useRoute } from '../../../../../../../client/contexts/RouterContext';
-import { useQuery, useFormatDate } from '../hooks';
+import { useEndpointData } from '../../../../../../../client/hooks/useEndpointData';
+import { useFormatDate } from '../../../../../../../client/hooks/useFormatDate';
 import { roomTypes } from '../../../../../../utils/client';
-import { usePermission } from '../../../../../../../client/contexts/AuthorizationContext';
+import { useQuery } from '../hooks';
 
 const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
 
@@ -22,10 +24,24 @@ function RoomTags({ room }) {
 	</Box>;
 }
 
+const FilterByText = ({ setFilter, ...props }) => {
+	const t = useTranslation();
+	const [text, setText] = useState('');
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+
+	useEffect(() => {
+		setFilter({ text });
+	}, [text]);
+
+	return <Box flexShrink={0} mb='x16' is='form' display='flex' flexDirection='column' {...props}>
+		<TextInput flexShrink={0} placeholder={t('Search_Channels')} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
+	</Box>;
+};
+
 export function ChannelsTab() {
 	const t = useTranslation();
 	const [sort, setSort] = useState(['name', 'asc']);
-	const [params, setParams] = useState({});
+	const [params, setParams] = useState({ current: 0, itemsPerPage: 25 });
 
 	const mediaQuery = useMediaQuery('(min-width: 768px)');
 
@@ -52,7 +68,7 @@ export function ChannelsTab() {
 
 	const canViewPublicRooms = usePermission('view-c-room');
 
-	const data = (canViewPublicRooms && useEndpointData('GET', 'directory', query)) || { result: [] };
+	const data = (canViewPublicRooms && useEndpointData('directory', query)) || { result: [] };
 
 	const onClick = useMemo(() => (name) => (e) => {
 		if (e.type === 'click' || e.key === 'Enter') {
@@ -61,29 +77,35 @@ export function ChannelsTab() {
 	}, [channelRoute]);
 
 	const formatDate = useFormatDate();
-	const renderRow = useCallback(({ _id, ts, name, fname, description, usersCount, lastMessage, topic, ...room }) => <Table.Row key={_id} onKeyDown={onClick(name)} onClick={onClick(name)} tabIndex={0} role='link' action>
-		<Table.Cell>
-			<Box display='flex'>
-				<Avatar size='x40' title={fname || name} url={`%40${ fname || name }`} flexGrow={0} />
-				<Box grow={1} mi='x8' style={style}>
-					<Box display='flex' alignItems='center'>
-						<Icon name={roomTypes.getIcon(room)} textColor='hint' /> <Box textStyle='p2' textColor='default' mi='x4'>{fname || name}</Box><RoomTags room={room} style={style} />
+	const renderRow = useCallback(({ _id, ts, name, fname, description, usersCount, lastMessage, topic, ...room }) => {
+		const avatarUrl = roomTypes.getConfig('d').getAvatarPath({ name: name || fname, type: 'd', _id });
+
+		return <Table.Row key={_id} onKeyDown={onClick(name)} onClick={onClick(name)} tabIndex={0} role='link' action>
+			<Table.Cell>
+				<Box display='flex'>
+					<Avatar size='x40' title={fname || name} url={avatarUrl} flexGrow={0} />
+					<Box grow={1} mi='x8' style={style}>
+						<Box display='flex' alignItems='center'>
+							<Icon name={roomTypes.getIcon(room)} color='hint' /> <Box fontScale='p2' mi='x4'>{fname || name}</Box><RoomTags room={room} style={style} />
+						</Box>
+						{topic && <Box fontScale='p1' color='hint' style={style}>
+							<MarkdownText>{topic}</MarkdownText>
+						</Box>}
 					</Box>
-					{topic && <Markdown textStyle='p1' textColor='hint' style={style}>{topic}</Markdown> }
 				</Box>
-			</Box>
-		</Table.Cell>
-		<Table.Cell textStyle='p1' textColor='hint' style={style}>
-			{usersCount}
-		</Table.Cell>
-		{ mediaQuery && <Table.Cell textStyle='p1' textColor='hint' style={style}>
-			{formatDate(ts)}
-		</Table.Cell>}
-		{ mediaQuery && <Table.Cell textStyle='p1' textColor='hint' style={style}>
-			{lastMessage && formatDate(lastMessage.ts)}
-		</Table.Cell>}
-	</Table.Row>
+			</Table.Cell>
+			<Table.Cell fontScale='p1' color='hint' style={style}>
+				{usersCount}
+			</Table.Cell>
+			{ mediaQuery && <Table.Cell fontScale='p1' color='hint' style={style}>
+				{formatDate(ts)}
+			</Table.Cell>}
+			{ mediaQuery && <Table.Cell fontScale='p1' color='hint' style={style}>
+				{lastMessage && formatDate(lastMessage.ts)}
+			</Table.Cell>}
+		</Table.Row>;
+	}
 	, [mediaQuery]);
 
-	return <DirectoryTable searchPlaceholder={t('Search_Channels')} header={header} renderRow={renderRow} data={data} setParams={setParams} />;
+	return <GenericTable FilterComponent={FilterByText} header={header} renderRow={renderRow} results={data.result} total={data.total} setParams={setParams} />;
 }
diff --git a/app/ui/client/views/app/components/Directory/Directory.stories.js b/app/ui/client/views/app/components/Directory/Directory.stories.js
deleted file mode 100644
index 13f1cef83ed..00000000000
--- a/app/ui/client/views/app/components/Directory/Directory.stories.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-
-import { DirectoryTable, Th } from './DirectoryTable';
-
-export default {
-	title: 'directory/table',
-	component: DirectoryTable,
-	decorators: [(fn) => <div children={fn()} style={{ height: '100vh' }} />],
-};
-
-export const _default = () => {
-	const header = [
-		<Th>Name</Th>,
-		<Th>Email</Th>,
-		<Th>Data</Th>,
-		<Th>Info</Th>,
-	];
-	return <DirectoryTable header={header} />;
-};
diff --git a/app/ui/client/views/app/components/Directory/UserTab.js b/app/ui/client/views/app/components/Directory/UserTab.js
index ee095aeacd4..25145c0a7c7 100644
--- a/app/ui/client/views/app/components/Directory/UserTab.js
+++ b/app/ui/client/views/app/components/Directory/UserTab.js
@@ -1,20 +1,36 @@
-import React, { useMemo, useState, useCallback } from 'react';
-import { Box, Table, Flex, Avatar } from '@rocket.chat/fuselage';
+import React, { useMemo, useState, useCallback, useEffect } from 'react';
+import { Box, Table, Flex, Avatar, TextInput, Icon } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 
-import { useEndpointData } from '../../../../../../../ee/app/engagement-dashboard/client/hooks/useEndpointData';
-import { DirectoryTable, Th } from './DirectoryTable';
+import { GenericTable, Th } from '../../../../components/GenericTable';
 import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
 import { useRoute } from '../../../../../../../client/contexts/RouterContext';
 import { usePermission } from '../../../../../../../client/contexts/AuthorizationContext';
-import { useQuery, useFormatDate } from '../hooks';
+import { useQuery } from '../hooks';
+import { roomTypes } from '../../../../../../utils/client';
+import { useEndpointData } from '../../../../../../../client/hooks/useEndpointData';
+import { useFormatDate } from '../../../../../../../client/hooks/useFormatDate';
 
 const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
 
+const FilterByText = ({ setFilter, ...props }) => {
+	const t = useTranslation();
+	const [text, setText] = useState('');
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+
+	useEffect(() => {
+		setFilter({ text });
+	}, [text]);
+
+	return <Box mb='x16' is='form' display='flex' flexDirection='column' {...props}>
+		<TextInput flexShrink={0} placeholder={t('Search_Channels')} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
+	</Box>;
+};
+
 export function UserTab({
 	workspace = 'local',
 }) {
-	const [params, setParams] = useState({});
+	const [params, setParams] = useState({ current: 0, itemsPerPage: 25 });
 	const [sort, setSort] = useState(['name', 'asc']);
 	const canViewFullOtherUserInfo = usePermission('view-full-other-user-info');
 	const t = useTranslation();
@@ -47,7 +63,7 @@ export function UserTab({
 	const canViewOutsideRoom = usePermission('view-outside-room');
 	const canViewDM = usePermission('view-d-room');
 
-	const data = (canViewOutsideRoom && canViewDM && useEndpointData('GET', 'directory', query)) || { result: [] };
+	const data = (canViewOutsideRoom && canViewDM && useEndpointData('directory', query)) || { result: [] };
 
 	const onClick = useMemo(() => (username) => (e) => {
 		if (e.type === 'click' || e.key === 'Enter') {
@@ -58,34 +74,38 @@ export function UserTab({
 
 	const formatDate = useFormatDate();
 
-	const renderRow = useCallback(({ createdAt, emails, _id, username, name, domain, bio }) => <Table.Row key={_id} onKeyDown={onClick(username)} onClick={onClick(username)} tabIndex={0} role='link' action>
-		<Table.Cell>
-			<Flex.Container>
-				<Box>
-					<Flex.Item>
-						<Avatar size='x40' title={username} url={username} />
-					</Flex.Item>
-					<Box style={style} grow={1} mi='x8'>
-						<Box display='flex'>
-							<Box textStyle='p2' style={style} textColor='default'>{name || username}</Box> <Box mi='x4'/> <Box textStyle='p1' textColor='hint' style={style}>{username}</Box>
+	const renderRow = useCallback(({ createdAt, emails, _id, username, name, domain, bio }) => {
+		const avatarUrl = roomTypes.getConfig('d').getAvatarPath({ name: username || name, type: 'd', _id });
+
+		return <Table.Row key={_id} onKeyDown={onClick(username)} onClick={onClick(username)} tabIndex={0} role='link' action>
+			<Table.Cell>
+				<Flex.Container>
+					<Box>
+						<Flex.Item>
+							<Avatar size='x40' title={username} url={avatarUrl} />
+						</Flex.Item>
+						<Box style={style} grow={1} mi='x8'>
+							<Box display='flex'>
+								<Box fontScale='p2' style={style}>{name || username}</Box> <Box mi='x4'/> <Box fontScale='p1' color='hint' style={style}>{username}</Box>
+							</Box>
+							<Box fontScale='p1' color='hint' style={style}> {bio} </Box>
 						</Box>
-						<Box textStyle='p1' textColor='hint' style={style}> {bio} </Box>
 					</Box>
-				</Box>
-			</Flex.Container>
-		</Table.Cell>
-		{mediaQuery && canViewFullOtherUserInfo
+				</Flex.Container>
+			</Table.Cell>
+			{mediaQuery && canViewFullOtherUserInfo
 			&& <Table.Cell style={style} >
 				{emails && emails[0].address}
 			</Table.Cell>}
-		{federation
+			{federation
 		&& <Table.Cell style={style}>
 			{domain}
 		</Table.Cell>}
-		{mediaQuery && <Table.Cell textStyle='p1' textColor='hint' style={style}>
-			{formatDate(createdAt)}
-		</Table.Cell>}
-	</Table.Row>, [mediaQuery, federation, canViewFullOtherUserInfo]);
+			{mediaQuery && <Table.Cell fontScale='p1' color='hint' style={style}>
+				{formatDate(createdAt)}
+			</Table.Cell>}
+		</Table.Row>;
+	}, [mediaQuery, federation, canViewFullOtherUserInfo]);
 
-	return <DirectoryTable searchPlaceholder={t('Search_Users')} header={header} renderRow={renderRow} data={data} setParams={setParams} />;
+	return <GenericTable FilterComponent={FilterByText} header={header} renderRow={renderRow} results={data.result} total={data.total} setParams={setParams} />;
 }
diff --git a/app/ui/client/views/app/components/Directory/index.js b/app/ui/client/views/app/components/Directory/index.js
index 3b8b2c7c064..cfa1fdb9e82 100644
--- a/app/ui/client/views/app/components/Directory/index.js
+++ b/app/ui/client/views/app/components/Directory/index.js
@@ -1,15 +1,13 @@
 import React, { useEffect, useCallback } from 'react';
-import { Box, Margins, Tabs, Avatar } from '@rocket.chat/fuselage';
+import { Tabs } from '@rocket.chat/fuselage';
 
-import { Page } from '../../../../../../../client/components/basic/Page';
+import Page from '../../../../../../../client/components/basic/Page';
 import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
 import { UserTab } from './UserTab';
 import { ChannelsTab } from './ChannelsTab';
 import { useRoute, useRouteParameter } from '../../../../../../../client/contexts/RouterContext';
 import { useSetting } from '../../../../../../../client/contexts/SettingsContext';
 
-const style = { padding: 0 };
-const avatarBase = { baseUrl: '/avatar/' };
 export function DirectoryPage() {
 	const t = useTranslation();
 
@@ -28,25 +26,22 @@ export function DirectoryPage() {
 		}
 	}, [directoryRoute, tab, federationEnabled, defaultTab]);
 
-	return <Avatar.Context.Provider value={avatarBase}><Page>
+	return <Page>
 		<Page.Header title={t('Directory')} />
 		<Tabs flexShrink={0} >
 			<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')}</Tabs.Item>
 			<Tabs.Item selected={tab === 'users'} onClick={handleTabClick('users')}>{t('Users')}</Tabs.Item>
 			{ federationEnabled && <Tabs.Item selected={tab === 'external'} onClick={handleTabClick('external')}>{t('External_Users')}</Tabs.Item> }
 		</Tabs>
-		<Page.Content style={style}>
-			<Margins inline='x24'>
-				<Box>
-					{
-						(tab === 'users' && <UserTab />)
-					|| (tab === 'channels' && <ChannelsTab />)
-					|| (federationEnabled && tab === 'external' && <UserTab workspace='external' />)
-					}
-				</Box>
-			</Margins>
+		<Page.Content>
+			{
+				(tab === 'users' && <UserTab />)
+			|| (tab === 'channels' && <ChannelsTab />)
+			|| (federationEnabled && tab === 'external' && <UserTab workspace='external' />)
+			}
+
 		</Page.Content>
-	</Page></Avatar.Context.Provider>;
+	</Page>;
 }
 
 
diff --git a/app/ui/client/views/app/components/hooks.js b/app/ui/client/views/app/components/hooks.js
index 5c8bb40f29e..016849ffa42 100644
--- a/app/ui/client/views/app/components/hooks.js
+++ b/app/ui/client/views/app/components/hooks.js
@@ -1,106 +1,14 @@
-import { useState, useEffect, useMemo, useCallback } from 'react';
-import moment from 'moment';
-import s from 'underscore.string';
-
-import { useUserPreference } from '../../../../../../client/contexts/UserContext';
-import { useSetting } from '../../../../../../client/contexts/SettingsContext';
-
-export function useDebounce(value, delay) {
-	const [debouncedValue, setDebouncedValue] = useState(value);
-
-	useEffect(() => {
-		const handler = setTimeout(() => {
-			setDebouncedValue(value);
-		}, delay);
-		return () => clearTimeout(handler);
-	}, [value]);
-
-	return debouncedValue;
-}
-
-export function useMediaQuery(query) {
-	const [matches, setQuery] = useState(window.matchMedia(query).matches);
-
-	useEffect(() => {
-		const resizeObserver = new ResizeObserver(() => {
-			setQuery(window.matchMedia(query).matches);
-		});
-		resizeObserver.observe(document.body);
-
-		return () => {
-			resizeObserver.unobserve(document.body);
-		};
-	}, [query]);
-
-	return matches;
-}
+import { useMemo } from 'react';
 
 export function useQuery(params, sort, type, workspace = 'local') {
 	return useMemo(() => ({
 		query: JSON.stringify({
 			type,
-			text: params.term,
+			text: params.text,
 			workspace,
 		}),
 		sort: JSON.stringify({ [sort[0]]: sort[1] === 'asc' ? 1 : 0 }),
 		...params.itemsPerPage && { count: params.itemsPerPage },
 		...params.current && { offset: params.current },
-	}), [params, sort, type, workspace]);
+	}), [params.itemsPerPage, params.current, sort, type, workspace, params.text]);
 }
-
-const dayFormat = ['h:mm A', 'H:mm'];
-export function useFormatTime() {
-	const clockMode = useUserPreference('clockMode', false);
-	const format = useSetting('Message_TimeFormat');
-	const sameDay = dayFormat[clockMode - 1] || format;
-	return useCallback((time) => {
-		switch (clockMode) {
-			case 1:
-			case 2:
-				return moment(time).format(sameDay);
-			default:
-				return moment(time).format(format);
-		}
-	}, [clockMode, format]);
-}
-
-export function useFormatDateAndTime() {
-	const clockMode = useUserPreference('clockMode', false);
-	const format = useSetting('Message_TimeAndDateFormat');
-	return useCallback((time) => {
-		switch (clockMode) {
-			case 1:
-				return moment(time).format('MMMM D, Y h:mm A');
-			case 2:
-				return moment(time).format('MMMM D, Y H:mm');
-			default:
-				return moment(time).format(format);
-		}
-	}, [clockMode, format]);
-}
-
-export function useFormatDate() {
-	const format = useSetting('Message_DateFormat');
-	return useCallback((time) => moment(time).format(format), [format]);
-}
-
-export const useFormatMemorySize = () => useCallback((memorySize) => {
-	if (typeof memorySize !== 'number') {
-		return null;
-	}
-
-	const units = ['bytes', 'kB', 'MB', 'GB'];
-
-	let order;
-	for (order = 0; order < units.length - 1; ++order) {
-		const upperLimit = Math.pow(1024, order + 1);
-
-		if (memorySize < upperLimit) {
-			break;
-		}
-	}
-
-	const divider = Math.pow(1024, order);
-	const decimalDigits = order === 0 ? 0 : 2;
-	return `${ s.numberFormat(memorySize / divider, decimalDigits) } ${ units[order] }`;
-}, []);
diff --git a/app/user-status/client/admin/adminUserStatus.html b/app/user-status/client/admin/adminUserStatus.html
deleted file mode 100644
index cef52df927c..00000000000
--- a/app/user-status/client/admin/adminUserStatus.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<template name="adminUserStatus">
-	<div class="main-content-flex">
-		<section class="page-container page-list flex-tab-main-content">
-			{{> header sectionName="Custom_User_Status"}}
-			<div class="content">
-				{{#unless hasPermission 'manage-user-status'}}
-				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
-				{{else}}
-				<form class="search-form" role="form">
-					<div class="rc-input__wrapper">
-						<div class="rc-input__icon">
-							{{#if isLoading}}
-								{{> loading }}
-							{{else}}
-								{{> icon block="rc-input__icon-svg" icon="magnifier" }}
-							{{/if}}
-						</div>
-						<input id="user-status-filter" type="text" class="rc-input__element" placeholder="{{_ " Search "}}" autofocus dir="auto">
-					</div>
-				</form>
-				<div class="results">
-					{{{_ "Showing_results" customUserStatus.length}}}
-				</div>
-					{{#table fixed='true' onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize}}
-					<thead>
-						<tr class="admin-table-row">
-							<th class="content-background-color border-component-color" width="1%">
-								<div class="table-fake-th">&nbsp;</div>
-							</th>
-							<th class="content-background-color border-component-color" width="49%">
-								<div class="table-fake-th">{{_ "Name"}}</div>
-							</th>
-							<th class="content-background-color border-component-color" width="50%">
-								<div class="table-fake-th">{{_ "Presence"}}</div>
-							</th>
-						</tr>
-					</thead>
-					<tbody>
-						{{#each customUserStatus}}
-						<tr class="user-status-info row-link admin-table-row">
-							<td class="border-component-color">
-								<div class="rc-table-wrapper userStatusAdminPreview">
-									<div class="rc-table-info">
-										<span class="rc-table-title">
-											{{> userStatusPreview name=name}}
-										</span>
-									</div>
-								</div>
-							</td>
-							<td class="border-component-color">
-								<div class="rc-table-wrapper">
-									<div class="rc-table-info">
-										<span class="rc-table-title">{{name}}</span></div>
-								</div>
-							</td>
-							<td class="border-component-color">
-								<div class="rc-table-wrapper">
-									<div class="rc-table-info">
-										<span class="rc-table-title">{{localizedStatusType}}</span></div>
-								</div>
-							</td>
-						</tr>
-						{{/each}}
-						{{#if isLoading}}
-							<tr class="table-no-click">
-								<td class="table-loading-td">{{> loading}}</td>
-							</tr>
-						{{/if}}
-					</tbody>
-					{{/table}}
-				{{/unless}}
-			</div>
-		</section>
-		{{#with flexData}}
-			{{> flexTabBar}}
-		{{/with}}
-	</div>
-</template>
diff --git a/app/user-status/client/admin/adminUserStatus.js b/app/user-status/client/admin/adminUserStatus.js
deleted file mode 100644
index 593cb787459..00000000000
--- a/app/user-status/client/admin/adminUserStatus.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import _ from 'underscore';
-import { Template } from 'meteor/templating';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Tracker } from 'meteor/tracker';
-
-import { TabBar, SideNav, RocketChatTabBar } from '../../../ui-utils';
-import { t } from '../../../utils';
-import { APIClient } from '../../../utils/client';
-
-const LIST_SIZE = 50;
-const DEBOUNCE_TIME_TO_SEARCH_IN_MS = 500;
-
-Template.adminUserStatus.helpers({
-	searchText() {
-		const instance = Template.instance();
-		return instance.filter && instance.filter.get();
-	},
-	customUserStatus() {
-		return Template.instance().statuses.get().map((userStatus) => {
-			const { _id, name, statusType } = userStatus;
-			const localizedStatusType = statusType ? t(statusType) : '';
-
-			return {
-				_id,
-				name,
-				statusType,
-				localizedStatusType,
-			};
-		});
-	},
-	isLoading() {
-		return Template.instance().isLoading.get();
-	},
-	flexData() {
-		return {
-			tabBar: Template.instance().tabBar,
-			data: Template.instance().tabBarData.get(),
-		};
-	},
-	onTableScroll() {
-		const instance = Template.instance();
-		return function(currentTarget) {
-			if (currentTarget.offsetHeight + currentTarget.scrollTop < currentTarget.scrollHeight - 100) {
-				return;
-			}
-			const statuses = instance.statuses.get();
-			if (instance.total.get() > statuses.length) {
-				instance.offset.set(instance.offset.get() + LIST_SIZE);
-			}
-		};
-	},
-	onTableItemClick() {
-		const instance = Template.instance();
-		return function(item) {
-			instance.tabBarData.set({
-				status: instance.statuses.get().find((status) => status._id === item._id),
-				onSuccess: instance.onSuccessCallback,
-			});
-			instance.tabBar.showGroup('user-status-custom-selected');
-			instance.tabBar.open('admin-user-status-info');
-		};
-	},
-});
-
-Template.adminUserStatus.onCreated(function() {
-	const instance = this;
-	this.limit = new ReactiveVar(50);
-	this.filter = new ReactiveVar('');
-	this.ready = new ReactiveVar(false);
-	this.total = new ReactiveVar(0);
-	this.query = new ReactiveVar({});
-	this.statuses = new ReactiveVar([]);
-	this.isLoading = new ReactiveVar(false);
-	this.offset = new ReactiveVar(0);
-
-	this.tabBar = new RocketChatTabBar();
-	this.tabBar.showGroup(FlowRouter.current().route.name);
-	this.tabBarData = new ReactiveVar();
-
-	TabBar.addButton({
-		groups: ['user-status-custom', 'user-status-custom-selected'],
-		id: 'add-user-status',
-		i18nTitle: 'Custom_User_Status_Add',
-		icon: 'plus',
-		template: 'adminUserStatusEdit',
-		order: 1,
-	});
-
-	TabBar.addButton({
-		groups: ['user-status-custom-selected'],
-		id: 'admin-user-status-info',
-		i18nTitle: 'Custom_User_Status_Info',
-		icon: 'customize',
-		template: 'adminUserStatusInfo',
-		order: 2,
-	});
-
-	this.onSuccessCallback = () => {
-		this.offset.set(0);
-		return this.loadStatus(this.query.get(), this.offset.get());
-	};
-
-	this.tabBarData.set({
-		onSuccess: instance.onSuccessCallback,
-	});
-
-	this.loadStatus = _.debounce(async (query, offset) => {
-		this.isLoading.set(true);
-		const { statuses, total } = await APIClient.v1.get('custom-user-status.list', {
-			count: LIST_SIZE,
-			offset,
-			query: JSON.stringify(query),
-		});
-		this.total.set(total);
-		if (offset === 0) {
-			this.statuses.set(statuses);
-		} else {
-			this.statuses.set(this.statuses.get().concat(statuses));
-		}
-		this.isLoading.set(false);
-	}, DEBOUNCE_TIME_TO_SEARCH_IN_MS);
-
-	this.autorun(() => {
-		const filter = this.filter.get() && this.filter.get().trim();
-		const offset = this.offset.get();
-		if (filter) {
-			const regex = { $regex: filter, $options: 'i' };
-			return this.loadStatus({ name: regex }, offset);
-		}
-		return this.loadStatus({}, offset);
-	});
-});
-
-Template.adminUserStatus.onRendered(() =>
-	Tracker.afterFlush(function() {
-		SideNav.setFlex('adminFlex');
-		SideNav.openFlex();
-	}),
-);
-
-Template.adminUserStatus.events({
-	'keydown #user-status-filter'(e) {
-		// stop enter key
-		if (e.which === 13) {
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-
-	'keyup #user-status-filter'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.filter.set(e.currentTarget.value);
-		t.offset.set(0);
-	},
-
-	'click .load-more'(e, t) {
-		e.preventDefault();
-		e.stopPropagation();
-		t.limit.set(t.limit.get() + 50);
-	},
-});
diff --git a/app/user-status/client/admin/adminUserStatusEdit.html b/app/user-status/client/admin/adminUserStatusEdit.html
deleted file mode 100644
index afe5682b0ba..00000000000
--- a/app/user-status/client/admin/adminUserStatusEdit.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="adminUserStatusEdit">
-	<div class="content">
-		<div class="user-status-view">
-			{{> userStatusEdit .}}
-		</div>
-	</div>
-</template>
diff --git a/app/user-status/client/admin/adminUserStatusInfo.html b/app/user-status/client/admin/adminUserStatusInfo.html
deleted file mode 100644
index e6f68e9c66e..00000000000
--- a/app/user-status/client/admin/adminUserStatusInfo.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="adminUserStatusInfo">
-	<div class="content">
-		<div class="user-status-view">
-			{{> userStatusInfo .}}
-		</div>
-	</div>
-</template>
diff --git a/app/user-status/client/admin/route.js b/app/user-status/client/admin/route.js
deleted file mode 100644
index 5363f68141a..00000000000
--- a/app/user-status/client/admin/route.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-
-import { registerAdminRoute } from '../../../ui-admin/client';
-
-registerAdminRoute('/user-status-custom', {
-	name: 'user-status-custom',
-	async action() {
-		await import('./views');
-		BlazeLayout.render('main', { center: 'adminUserStatus' });
-	},
-});
diff --git a/app/user-status/client/admin/startup.js b/app/user-status/client/admin/startup.js
index 0075e441370..b4afad43ecb 100644
--- a/app/user-status/client/admin/startup.js
+++ b/app/user-status/client/admin/startup.js
@@ -1,8 +1,8 @@
 import { hasAtLeastOnePermission } from '../../../authorization';
-import { registerAdminSidebarItem } from '../../../ui-admin/client';
+import { registerAdminSidebarItem } from '../../../../client/admin';
 
 registerAdminSidebarItem({
-	href: 'user-status-custom',
+	href: 'custom-user-status',
 	i18nLabel: 'Custom_User_Status',
 	icon: 'user',
 	permissionGranted() {
diff --git a/app/user-status/client/admin/userStatusEdit.html b/app/user-status/client/admin/userStatusEdit.html
deleted file mode 100644
index 75597ad3972..00000000000
--- a/app/user-status/client/admin/userStatusEdit.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<template name="userStatusEdit">
-	{{#unless hasPermission 'manage-user-status'}}
-		<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
-	{{else}}
-		<div class="about">
-			<form class="edit-form" autocomplete="off">
-				{{#if userStatus}}
-					<h3>{{userStatus.name}}</h3>
-				{{else}}
-					<h3>{{_ "Custom_User_Status_Add"}}</h3>
-				{{/if}}
-				<div class="rc-input">
-					<label class="rc-input__label">
-						<div class="rc-input__title">{{_ "Name"}}</div>
-						<div class="rc-input__wrapper">
-							<input id="name" type="text" maxlength="120" value="{{userStatus.name}}" class="rc-input__element" placeholder="{{_ " Name "}}" autocomplete="off">
-						</div>
-					</label>
-				</div>
-
-				<div class="rc-input">
-					<label class="rc-input__label">
-						<div class="rc-input__title">{{_ "Presence"}}</div>
-						<div class="rc-input__wrapper">
-							<div class="rc-select">
-								<select class="rc-select__element" id="statusType">
-									<option value="">{{_ "None"}}</option>
-									{{#each options}}
-										<option value="{{value}}" {{selected}}>{{name}}</option>
-									{{/each}}
-								</select>
-								{{> icon block="rc-select__arrow" icon="arrow-down" }}
-							</div>
-						</div>
-					</label>
-				</div>
-				<nav class="rc-button__group rc-button__group--stretch">
-					<button class='rc-button rc-button--secondary cancel' type="button"><span>{{_ "Cancel"}}</span></button>
-					<button class='rc-button rc-button--primary save'><span>{{_ "Save"}}</span></button>
-				</nav>
-			</form>
-		</div>
-	{{/unless}}
-</template>
diff --git a/app/user-status/client/admin/userStatusEdit.js b/app/user-status/client/admin/userStatusEdit.js
deleted file mode 100644
index b1b16496334..00000000000
--- a/app/user-status/client/admin/userStatusEdit.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import toastr from 'toastr';
-import s from 'underscore.string';
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-
-import { t, handleError } from '../../../utils';
-
-Template.userStatusEdit.helpers({
-	userStatus() {
-		return Template.instance().userStatus;
-	},
-
-	options() {
-		const userStatusType = this.userStatus ? this.userStatus.statusType : '';
-
-		return [{
-			value: 'online',
-			name: t('Online'),
-			selected: userStatusType === 'online' ? 'selected' : '',
-		}, {
-			value: 'away',
-			name: t('Away'),
-			selected: userStatusType === 'away' ? 'selected' : '',
-		}, {
-			value: 'busy',
-			name: t('Busy'),
-			selected: userStatusType === 'busy' ? 'selected' : '',
-		}, {
-			value: 'offline',
-			name: t('Invisible'),
-			selected: userStatusType === 'offline' ? 'selected' : '',
-		}];
-	},
-});
-
-Template.userStatusEdit.events({
-	'click .cancel'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.cancel(t.find('form'));
-	},
-
-	'submit form'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		t.save(e.currentTarget);
-	},
-});
-
-Template.userStatusEdit.onCreated(function() {
-	if (this.data != null) {
-		this.userStatus = this.data.userStatus;
-	} else {
-		this.userStatus = undefined;
-	}
-
-	this.tabBar = Template.currentData().tabBar;
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.cancel = (form, name) => {
-		form.reset();
-		this.tabBar.close();
-		if (this.userStatus) {
-			this.data.back(name);
-		}
-	};
-
-	this.getUserStatusData = () => {
-		const userStatusData = {};
-		if (this.userStatus != null) {
-			userStatusData._id = this.userStatus._id;
-			userStatusData.previousName = this.userStatus.name;
-		}
-		userStatusData.name = s.trim(this.$('#name').val());
-		userStatusData.statusType = s.trim(this.$('#statusType').val());
-		return userStatusData;
-	};
-
-	this.validate = () => {
-		const userStatusData = this.getUserStatusData();
-
-		const errors = [];
-		if (!userStatusData.name) {
-			errors.push('Name');
-		}
-
-		for (const error of errors) {
-			toastr.error(TAPi18n.__('error-the-field-is-required', { field: TAPi18n.__(error) }));
-		}
-
-		return errors.length === 0;
-	};
-
-	this.save = (form) => {
-		if (this.validate()) {
-			const userStatusData = this.getUserStatusData();
-
-			Meteor.call('insertOrUpdateUserStatus', userStatusData, (error, result) => {
-				if (result) {
-					if (userStatusData._id) {
-						toastr.success(t('Custom_User_Status_Updated_Successfully'));
-					} else {
-						toastr.success(t('Custom_User_Status_Added_Successfully'));
-					}
-					this.onSuccess();
-					this.cancel(form, userStatusData.name);
-				}
-
-				if (error) {
-					handleError(error);
-				}
-			});
-		}
-	};
-});
diff --git a/app/user-status/client/admin/userStatusInfo.html b/app/user-status/client/admin/userStatusInfo.html
deleted file mode 100644
index e3cd7948b14..00000000000
--- a/app/user-status/client/admin/userStatusInfo.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<template name="userStatusInfo">
-	{{#if editingUserStatus}}
-		{{> userStatusEdit (userStatusToEdit)}}
-	{{else}}
-		{{#with userStatus}}
-		<div class="edit-form">
-			<div class="thumb">
-				{{> userStatusPreview name=name}}
-			</div>
-			<div class="info">
-				<h3 title="{{name}}">{{name}}</h3>
-			</div>
-			<nav class="rc-button__group rc-button__group--stretch">
-				{{#if hasPermission 'manage-user-status'}}
-				<button class='rc-button rc-button--cancel delete'><span><i class='icon-trash'></i> {{_ "Delete"}}</span></button>
-				<button class='rc-button rc-button--primary edit-user-satus'><span><i class='icon-edit'></i> {{_ "Edit"}}</span></button>
-				{{/if}}
-			</nav>
-		</div>
-		{{/with}}
-	{{/if}}
-</template>
diff --git a/app/user-status/client/admin/userStatusInfo.js b/app/user-status/client/admin/userStatusInfo.js
deleted file mode 100644
index 51e52ccbee1..00000000000
--- a/app/user-status/client/admin/userStatusInfo.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-import { ReactiveVar } from 'meteor/reactive-var';
-
-import { t, handleError } from '../../../utils';
-import { modal } from '../../../ui-utils';
-
-Template.userStatusInfo.helpers({
-	name() {
-		const userStatus = Template.instance().userStatus.get();
-		return userStatus.name;
-	},
-
-	userStatus() {
-		return Template.instance().userStatus.get();
-	},
-
-	editingUserStatus() {
-		return Template.instance().editingUserStatus.get();
-	},
-
-	userStatusToEdit() {
-		const instance = Template.instance();
-		return {
-			tabBar: this.tabBar,
-			userStatus: instance.userStatus.get(),
-			onSuccess: instance.onSuccess,
-			back(name) {
-				instance.editingUserStatus.set();
-
-				if (name != null) {
-					const userStatus = instance.userStatus.get();
-					if (userStatus != null && userStatus.name != null && userStatus.name !== name) {
-						return instance.loadedName.set(name);
-					}
-				}
-			},
-		};
-	},
-});
-
-Template.userStatusInfo.events({
-	'click .thumb'(e) {
-		$(e.currentTarget).toggleClass('bigger');
-	},
-
-	'click .delete'(e, instance) {
-		e.stopPropagation();
-		e.preventDefault();
-		const userStatus = instance.userStatus.get();
-		if (userStatus != null) {
-			const { _id } = userStatus;
-			modal.open({
-				title: t('Are_you_sure'),
-				text: t('Custom_User_Status_Delete_Warning'),
-				type: 'warning',
-				showCancelButton: true,
-				confirmButtonColor: '#DD6B55',
-				confirmButtonText: t('Yes_delete_it'),
-				cancelButtonText: t('Cancel'),
-				closeOnConfirm: false,
-				html: false,
-			}, function() {
-				Meteor.call('deleteCustomUserStatus', _id, (error/* , result */) => {
-					if (error) {
-						return handleError(error);
-					}
-
-					modal.open({
-						title: t('Deleted'),
-						text: t('Custom_User_Status_Has_Been_Deleted'),
-						type: 'success',
-						timer: 2000,
-						showConfirmButton: false,
-					});
-					instance.onSuccess();
-					instance.tabBar.close();
-				});
-			});
-		}
-	},
-
-	'click .edit-user-satus'(e, instance) {
-		e.stopPropagation();
-		e.preventDefault();
-
-		instance.editingUserStatus.set(instance.userStatus.get()._id);
-	},
-});
-
-Template.userStatusInfo.onCreated(function() {
-	this.userStatus = new ReactiveVar();
-	this.editingUserStatus = new ReactiveVar();
-	this.loadedName = new ReactiveVar();
-	this.tabBar = Template.currentData().tabBar;
-	this.onSuccess = Template.currentData().onSuccess;
-
-	this.autorun(() => {
-		const data = Template.currentData();
-		if (data != null && data.clear != null) {
-			this.clear = data.clear;
-		}
-	});
-
-	this.autorun(() => {
-		const data = Template.currentData().status;
-		const userStatus = this.userStatus.get();
-		if (userStatus != null && userStatus.name != null) {
-			this.loadedName.set(userStatus.name);
-		} else if (data != null && data.name != null) {
-			this.loadedName.set(data.name);
-		}
-	});
-
-	this.autorun(() => {
-		const data = Template.currentData().status;
-		this.userStatus.set(data);
-	});
-});
diff --git a/app/user-status/client/admin/userStatusPreview.html b/app/user-status/client/admin/userStatusPreview.html
deleted file mode 100644
index 5279a07cfdc..00000000000
--- a/app/user-status/client/admin/userStatusPreview.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<template name="userStatusPreview">
-	<div class="userStatusAdminPreview">
-		<div class="userStatusAdminPreview" data-user-status="{{this.name}}"></div>
-	</div>
-</template>
diff --git a/app/user-status/client/admin/views.js b/app/user-status/client/admin/views.js
deleted file mode 100644
index f7a4098c9b9..00000000000
--- a/app/user-status/client/admin/views.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import './adminUserStatus.html';
-import './adminUserStatus';
-import './adminUserStatusEdit.html';
-import './adminUserStatusInfo.html';
-import './userStatusEdit.html';
-import './userStatusEdit';
-import './userStatusInfo.html';
-import './userStatusInfo';
-import './userStatusPreview.html';
diff --git a/app/user-status/client/index.js b/app/user-status/client/index.js
index 84c2a9c7579..6c9a73b43f5 100644
--- a/app/user-status/client/index.js
+++ b/app/user-status/client/index.js
@@ -1,4 +1,3 @@
-import './admin/route';
 import './admin/startup';
 
 import './notifications/deleteCustomUserStatus';
diff --git a/app/utils/client/lib/RestApiClient.js b/app/utils/client/lib/RestApiClient.js
index 511c9eb988e..a0338a5355d 100644
--- a/app/utils/client/lib/RestApiClient.js
+++ b/app/utils/client/lib/RestApiClient.js
@@ -49,7 +49,12 @@ export const APIClient = {
 			Object.keys(params).forEach((key) => {
 				query += query === '' ? '?' : '&';
 
-				query += `${ key }=${ params[key] }`;
+				if (Array.isArray(params[key])) {
+					const joinedArray = params[key].join(`&${ key }[]=`);
+					query += `${ key }[]=${ joinedArray }`;
+				} else {
+					query += `${ key }=${ params[key] }`;
+				}
 			});
 		}
 
diff --git a/app/ui-admin/client/components/AdministrationRouter.js b/client/admin/AdministrationRouter.js
similarity index 62%
rename from app/ui-admin/client/components/AdministrationRouter.js
rename to client/admin/AdministrationRouter.js
index 5efe3aff39a..ed329405bdd 100644
--- a/app/ui-admin/client/components/AdministrationRouter.js
+++ b/client/admin/AdministrationRouter.js
@@ -1,10 +1,13 @@
-import React, { lazy, useMemo, Suspense } from 'react';
+import React, { lazy, useMemo, Suspense, useEffect } from 'react';
 
-import { useAdminSideNav } from '../hooks/useAdminSideNav';
+import { SideNav } from '../../app/ui-utils/client';
 import PageSkeleton from './PageSkeleton';
 
 function AdministrationRouter({ lazyRouteComponent, ...props }) {
-	useAdminSideNav();
+	useEffect(() => {
+		SideNav.setFlex('adminFlex');
+		SideNav.openFlex();
+	}, []);
 
 	const LazyRouteComponent = useMemo(() => lazy(lazyRouteComponent), [lazyRouteComponent]);
 
diff --git a/client/admin/NotAuthorizedPage.js b/client/admin/NotAuthorizedPage.js
new file mode 100644
index 00000000000..99f190c3d24
--- /dev/null
+++ b/client/admin/NotAuthorizedPage.js
@@ -0,0 +1,17 @@
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { useTranslation } from '../contexts/TranslationContext';
+import Page from '../components/basic/Page';
+
+function NotAuthorizedPage() {
+	const t = useTranslation();
+
+	return <Page>
+		<Page.Content>
+			<Box is='p' fontScale='p1'>{t('You_are_not_authorized_to_view_this_page')}</Box>
+		</Page.Content>
+	</Page>;
+}
+
+export default NotAuthorizedPage;
diff --git a/app/ui-admin/client/components/NotAuthorizedPage.stories.js b/client/admin/NotAuthorizedPage.stories.js
similarity index 100%
rename from app/ui-admin/client/components/NotAuthorizedPage.stories.js
rename to client/admin/NotAuthorizedPage.stories.js
diff --git a/app/ui-admin/client/components/PageSkeleton.js b/client/admin/PageSkeleton.js
similarity index 59%
rename from app/ui-admin/client/components/PageSkeleton.js
rename to client/admin/PageSkeleton.js
index 8960697eecc..875b6a7fa2d 100644
--- a/app/ui-admin/client/components/PageSkeleton.js
+++ b/client/admin/PageSkeleton.js
@@ -1,14 +1,14 @@
 import { Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { Page } from '../../../../client/components/basic/Page';
+import Page from '../components/basic/Page';
 
 function PageSkeleton() {
 	return <Page>
-		<Page.Header title={<Skeleton width='20rem' />}>
+		<Page.Header title={<Skeleton width='x320' maxWidth='full' />}>
 			<ButtonGroup>
 				<Button
-					children={<Skeleton width='5rem' />}
+					children={<Skeleton width='x80' />}
 					disabled
 					primary
 				/>
@@ -16,8 +16,8 @@ function PageSkeleton() {
 		</Page.Header>
 
 		<Page.Content>
-			<Box mb='0' mi='auto' width='full' maxWidth='590px'>
-				<Box is='p' textColor='hint' textStyle='p1'>
+			<Box marginBlock='none' marginInline='auto' width='full' maxWidth='x580'>
+				<Box is='p' color='hint' fontScale='p1'>
 					<Skeleton />
 					<Skeleton />
 					<Skeleton width='75%' />
diff --git a/app/ui-admin/client/SettingsCachedCollection.js b/client/admin/PrivateSettingsCachedCollection.js
similarity index 80%
rename from app/ui-admin/client/SettingsCachedCollection.js
rename to client/admin/PrivateSettingsCachedCollection.js
index 6637eee2894..a2d0bf40ea9 100644
--- a/app/ui-admin/client/SettingsCachedCollection.js
+++ b/client/admin/PrivateSettingsCachedCollection.js
@@ -1,5 +1,5 @@
-import { CachedCollection } from '../../ui-cached-collection';
-import { Notifications } from '../../notifications/client';
+import { CachedCollection } from '../../app/ui-cached-collection';
+import { Notifications } from '../../app/notifications/client';
 
 export class PrivateSettingsCachedCollection extends CachedCollection {
 	constructor() {
diff --git a/app/ui-admin/client/adminFlex.html b/client/admin/adminFlex.html
similarity index 59%
rename from app/ui-admin/client/adminFlex.html
rename to client/admin/adminFlex.html
index 35ef735fee2..0402664008c 100644
--- a/app/ui-admin/client/adminFlex.html
+++ b/client/admin/adminFlex.html
@@ -6,26 +6,10 @@
 				{{> icon block="sidebar-flex__close-icon" icon="cross"}}
 			</button>
 		</header>
-		<div class="rooms-list {{#if embeddedVersion}}rooms-list--embedded{{/if}}" aria-label="{{_ "Administration"}}">
+		<div class="rooms-list {{#if isEmbedded}}rooms-list--embedded{{/if}}" aria-label="{{_ "Administration"}}">
 			<ul class="rooms-list__list">
-				{{> sidebarItem menuItem "Info" "info-circled" "admin-info" "" }}
-
-				{{#if hasPermission 'run-import'}}
-					{{> sidebarItem menuItem "Import" "import" "admin-import" "" }}
-				{{/if}}
-
-				{{#if hasPermission 'view-room-administration'}}
-					{{> sidebarItem menuItem "Rooms" "hashtag" "admin-rooms" "" }}
-				{{/if}}
-
-				{{#if hasPermission 'view-user-administration'}}
-					{{> sidebarItem menuItem "Users" "team" "admin-users" "" }}
-				{{/if}}
-
-				{{#each adminBoxOptions}}
-					{{#if permissionGranted}}
-						{{> sidebarItem menuItem label icon href "" }}
-					{{/if}}
+				{{#each _sidebarItem in sidebarItems}}
+					{{> sidebarItem _sidebarItem }}
 				{{/each}}
 			</ul>
 
@@ -42,8 +26,8 @@
 					</label>
 				</div>
 				<ul class="rooms-list__list">
-					{{#each groups}}
-						{{> sidebarItem menuItem label false "admin" _id }}
+					{{#each _group in groups}}
+						{{> sidebarItem _group}}
 					{{else}}
 						<div class="rc-input sidebar-flex__search">
 							<div class="rc-input__wrapper">
diff --git a/app/ui-admin/client/adminFlex.js b/client/admin/adminFlex.js
similarity index 51%
rename from app/ui-admin/client/adminFlex.js
rename to client/admin/adminFlex.js
index dc9dfb51039..ad4752da223 100644
--- a/app/ui-admin/client/adminFlex.js
+++ b/client/admin/adminFlex.js
@@ -5,15 +5,15 @@ import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 
-import { settings } from '../../settings';
-import { menu, SideNav, Layout } from '../../ui-utils/client';
-import { t } from '../../utils';
-import { PrivateSettingsCachedCollection } from './SettingsCachedCollection';
-import { hasAtLeastOnePermission } from '../../authorization/client';
-import { getSidebarItems } from './sidebarItems';
+import { settings } from '../../app/settings';
+import { menu, SideNav, Layout } from '../../app/ui-utils/client';
+import { t } from '../../app/utils/client';
+import { PrivateSettingsCachedCollection } from './PrivateSettingsCachedCollection';
+import { hasAtLeastOnePermission } from '../../app/authorization/client';
+import { sidebarItems } from './sidebarItems';
+import './adminFlex.html';
 
 Template.adminFlex.onCreated(function() {
-	this.isEmbedded = Layout.isEmbedded();
 	this.settingsFilter = new ReactiveVar('');
 	if (settings.cachedCollectionPrivate == null) {
 		settings.cachedCollectionPrivate = new PrivateSettingsCachedCollection();
@@ -22,16 +22,21 @@ Template.adminFlex.onCreated(function() {
 	}
 });
 
-const label = function() {
-	return TAPi18n.__(this.i18nLabel || this._id);
-};
-
 Template.adminFlex.helpers({
-	hasSettingPermission() {
-		return hasAtLeastOnePermission(['view-privileged-setting', 'edit-privileged-setting', 'manage-selected-settings']);
-	},
-
-	groups() {
+	isEmbedded: () => Layout.isEmbedded(),
+	sidebarItems: () => sidebarItems.get()
+		.filter((sidebarItem) => !sidebarItem.permissionGranted || sidebarItem.permissionGranted())
+		.map(({ _id, i18nLabel, icon, href }) => ({
+			name: t(i18nLabel || _id),
+			icon,
+			pathSection: href,
+			darken: true,
+			isLightSidebar: true,
+			active: href === FlowRouter.getRouteName(),
+		})),
+	hasSettingPermission: () =>
+		hasAtLeastOnePermission(['view-privileged-setting', 'edit-privileged-setting', 'manage-selected-settings']),
+	groups: () => {
 		const filter = Template.instance().settingsFilter.get();
 		const query = {
 			type: 'group',
@@ -52,45 +57,29 @@ Template.adminFlex.helpers({
 				};
 			}
 		}
+
 		if (filter && groups.length === 0) {
-			return 0;
+			return [];
 		}
-		return settings.collectionPrivate.find(query).fetch().map(function(el) {
-			el.label = label.apply(el);
-			return el;
-		}).sort(function(a, b) {
-			if (a.label.toLowerCase() >= b.label.toLowerCase()) {
-				return 1;
-			}
-			return -1;
-		});
-	},
-	label,
-	adminBoxOptions() {
-		return getSidebarItems();
-	},
-	menuItem(name, icon, section, group) {
-		const routeParam = FlowRouter.getParam('group');
-		const routeName = FlowRouter.getRouteName();
 
-		return {
-			name: t(name),
-			icon,
-			pathSection: section,
-			pathGroup: group,
-			darken: true,
-			isLightSidebar: true,
-			active: (routeParam && routeParam === group) || (routeName !== 'admin' && routeName === section),
-		};
-	},
-	embeddedVersion() {
-		return this.isEmbedded;
+		return settings.collectionPrivate.find(query)
+			.fetch()
+			.map((item) => ({ ...item, name: t(item.i18nLabel || item._id) }))
+			.sort(({ name: a }, { name: b }) => (a.toLowerCase() >= b.toLowerCase() ? 1 : -1))
+			.map(({ _id, name }) => ({
+				name,
+				pathSection: 'admin',
+				pathGroup: _id,
+				darken: true,
+				isLightSidebar: true,
+				active: _id === FlowRouter.getParam('group'),
+			}));
 	},
 });
 
 Template.adminFlex.events({
-	'click [data-action="close"]'(e, instance) {
-		if (instance.isEmbedded) {
+	'click [data-action="close"]'() {
+		if (Layout.isEmbedded()) {
 			menu.close();
 			return;
 		}
diff --git a/client/admin/customEmoji/AddCustomEmoji.js b/client/admin/customEmoji/AddCustomEmoji.js
new file mode 100644
index 00000000000..f429710763d
--- /dev/null
+++ b/client/admin/customEmoji/AddCustomEmoji.js
@@ -0,0 +1,79 @@
+import React, { useCallback, useState } from 'react';
+import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useFileInput } from '../../hooks/useFileInput';
+import { useEndpointUpload } from '../../hooks/useEndpointUpload';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+export function AddCustomEmoji({ close, onChange, ...props }) {
+	const t = useTranslation();
+
+	const [name, setName] = useState('');
+	const [aliases, setAliases] = useState('');
+	const [emojiFile, setEmojiFile] = useState();
+	const [newEmojiPreview, setNewEmojiPreview] = useState('');
+
+	const setEmojiPreview = useCallback(async (file) => {
+		setEmojiFile(file);
+		setNewEmojiPreview(URL.createObjectURL(file));
+	}, [setEmojiFile]);
+
+	const saveAction = useEndpointUpload('emoji-custom.create', {}, t('Custom_Emoji_Added_Successfully'));
+
+	const handleSave = useCallback(async () => {
+		const formData = new FormData();
+		formData.append('emoji', emojiFile);
+		formData.append('name', name);
+		formData.append('aliases', aliases);
+		const result = await saveAction(formData);
+
+		if (result.success) {
+			onChange();
+			close();
+		}
+	}, [name, aliases, emojiFile]);
+
+	const clickUpload = useFileInput(setEmojiPreview, 'emoji');
+
+	return <VerticalBar.ScrollableContent {...props}>
+		<Field>
+			<Field.Label>{t('Name')}</Field.Label>
+			<Field.Row>
+				<TextInput value={name} onChange={(e) => setName(e.currentTarget.value)} placeholder={t('Name')} />
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Aliases')}</Field.Label>
+			<Field.Row>
+				<TextInput value={aliases} onChange={(e) => setAliases(e.currentTarget.value)} placeholder={t('Aliases')} />
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label alignSelf='stretch' display='flex' justifyContent='space-between' alignItems='center'>
+				{t('Custom_Emoji')}
+				<Button square onClick={clickUpload}><Icon name='upload' size='x20'/></Button>
+			</Field.Label>
+			{ newEmojiPreview && <Box display='flex' flexDirection='row' mi='neg-x4' justifyContent='center'>
+				<Margins inline='x4'>
+					<Box is='img' style={{ objectFit: 'contain' }} w='x120' h='x120' src={newEmojiPreview}/>
+				</Margins>
+			</Box> }
+		</Field>
+		<Field>
+			<Field.Row>
+				<ButtonGroup stretch w='full'>
+					<Button onClick={close}>{t('Cancel')}</Button>
+					<Button primary onClick={handleSave}>{t('Save')}</Button>
+				</ButtonGroup>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<ButtonGroup stretch w='full'>
+					<Button primary danger><Icon name='trash' mie='x4'/>{t('Delete')}</Button>
+				</ButtonGroup>
+			</Field.Row>
+		</Field>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/customEmoji/CustomEmoji.js b/client/admin/customEmoji/CustomEmoji.js
new file mode 100644
index 00000000000..a12987a5bfd
--- /dev/null
+++ b/client/admin/customEmoji/CustomEmoji.js
@@ -0,0 +1,44 @@
+import React, { useMemo, useCallback, useState, useEffect } from 'react';
+import { Box, Table, TextInput, Icon } from '@rocket.chat/fuselage';
+
+import { GenericTable, Th } from '../../../app/ui/client/components/GenericTable';
+import { useTranslation } from '../../contexts/TranslationContext';
+
+const FilterByText = ({ setFilter, ...props }) => {
+	const t = useTranslation();
+	const [text, setText] = useState('');
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+
+	useEffect(() => {
+		setFilter({ text });
+	}, [text]);
+	return <Box mb='x16' is='form' display='flex' flexDirection='column' {...props}>
+		<TextInput flexShrink={0} placeholder={t('Search')} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
+	</Box>;
+};
+
+export function CustomEmoji({
+	data,
+	sort,
+	onClick,
+	onHeaderClick,
+	setParams,
+	params,
+}) {
+	const t = useTranslation();
+
+	const header = useMemo(() => [
+		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name' w='x200'>{t('Name')}</Th>,
+		<Th key={'aliases'} w='x200'>{t('Aliases')}</Th>,
+	], [sort]);
+
+	const renderRow = (emojis) => {
+		const { _id, name, aliases } = emojis;
+		return <Table.Row key={_id} onKeyDown={onClick(_id, emojis)} onClick={onClick(_id, emojis)} tabIndex={0} role='link' action qa-user-id={_id}>
+			<Table.Cell fontScale='p1' color='default'><Box withTruncatedText>{name}</Box></Table.Cell>
+			<Table.Cell fontScale='p1' color='default'><Box withTruncatedText>{aliases}</Box></Table.Cell>
+		</Table.Row>;
+	};
+
+	return <GenericTable FilterComponent={FilterByText} header={header} renderRow={renderRow} results={data.emojis} total={data.total} setParams={setParams} params={params} />;
+}
diff --git a/app/ui-admin/README.md b/client/admin/customEmoji/CustomEmoji.stories.js
similarity index 100%
rename from app/ui-admin/README.md
rename to client/admin/customEmoji/CustomEmoji.stories.js
diff --git a/client/admin/customEmoji/CustomEmojiRoute.js b/client/admin/customEmoji/CustomEmojiRoute.js
new file mode 100644
index 00000000000..fa80981c77c
--- /dev/null
+++ b/client/admin/customEmoji/CustomEmojiRoute.js
@@ -0,0 +1,106 @@
+import React, { useMemo, useState, useCallback } from 'react';
+import { Button, Icon } from '@rocket.chat/fuselage';
+import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+
+import { usePermission } from '../../contexts/AuthorizationContext';
+import { useTranslation } from '../../contexts/TranslationContext';
+import Page from '../../components/basic/Page';
+import NotAuthorizedPage from '../NotAuthorizedPage';
+import { CustomEmoji } from './CustomEmoji';
+import { EditCustomEmojiWithData } from './EditCustomEmoji';
+import { AddCustomEmoji } from './AddCustomEmoji';
+import { useRoute, useRouteParameter } from '../../contexts/RouterContext';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+const sortDir = (sortDir) => (sortDir === 'asc' ? 1 : -1);
+
+export const useQuery = (params, sort, cache) => useMemo(() => ({
+	query: JSON.stringify({ name: { $regex: params.text || '', $options: 'i' } }),
+	sort: JSON.stringify({ [sort[0]]: sortDir(sort[1]) }),
+	...params.itemsPerPage && { count: params.itemsPerPage },
+	...params.current && { offset: params.current },
+}), [JSON.stringify(params), JSON.stringify(sort), cache]);
+
+export default function CustomEmojiRoute({ props }) {
+	const t = useTranslation();
+	const canManageEmoji = usePermission('manage-emoji');
+
+	const routeName = 'emoji-custom';
+
+	const [params, setParams] = useState({ text: '', current: 0, itemsPerPage: 25 });
+	const [sort, setSort] = useState(['name', 'asc']);
+	const [cache, setCache] = useState();
+
+	const debouncedParams = useDebouncedValue(params, 500);
+	const debouncedSort = useDebouncedValue(sort, 500);
+
+	const query = useQuery(debouncedParams, debouncedSort, cache);
+
+	const data = useEndpointData('emoji-custom.all', query) || { emojis: { } };
+
+	const router = useRoute(routeName);
+
+	const mobile = useMediaQuery('(max-width: 420px)');
+	const small = useMediaQuery('(max-width: 780px)');
+
+	const context = useRouteParameter('context');
+	const id = useRouteParameter('id');
+
+	const onClick = (_id) => () => {
+		router.push({
+			context: 'edit',
+			id: _id,
+		});
+	};
+
+	const onHeaderClick = (id) => {
+		const [sortBy, sortDirection] = sort;
+
+		if (sortBy === id) {
+			setSort([id, sortDirection === 'asc' ? 'desc' : 'asc']);
+			return;
+		}
+		setSort([id, 'asc']);
+	};
+
+	const handleHeaderButtonClick = useCallback((context) => () => {
+		router.push({ context });
+	}, [router]);
+
+	const close = () => {
+		router.push({});
+	};
+
+	const onChange = useCallback(() => {
+		setCache(new Date());
+	}, []);
+
+	if (!canManageEmoji) {
+		return <NotAuthorizedPage />;
+	}
+
+	return <Page {...props} flexDirection='row'>
+		<Page name='admin-emoji-custom'>
+			<Page.Header title={t('Custom_Emoji')}>
+				<Button small onClick={handleHeaderButtonClick('new')} aria-label={t('New')}>
+					<Icon name='plus'/>
+				</Button>
+			</Page.Header>
+			<Page.Content>
+				<CustomEmoji setParams={setParams} params={params} onHeaderClick={onHeaderClick} data={data} onClick={onClick} sort={sort}/>
+			</Page.Content>
+		</Page>
+		{ context
+			&& <VerticalBar mod-small={small} mod-mobile={mobile} style={{ width: '378px' }} qa-context-name={`admin-user-and-room-context-${ context }`} flexShrink={0}>
+				<VerticalBar.Header>
+					{ context === 'edit' && t('Custom_Emoji_Info') }
+					{ context === 'new' && t('Custom_Emoji_Add') }
+					<VerticalBar.Close onClick={close}/></VerticalBar.Header>
+				<VerticalBar.Content>
+					{context === 'edit' && <EditCustomEmojiWithData _id={id} close={close} onChange={onChange} cache={cache}/>}
+					{context === 'new' && <AddCustomEmoji close={close} onChange={onChange}/>}
+				</VerticalBar.Content>
+			</VerticalBar>}
+	</Page>;
+}
diff --git a/client/admin/customEmoji/EditCustomEmoji.js b/client/admin/customEmoji/EditCustomEmoji.js
new file mode 100644
index 00000000000..e56af8ce2db
--- /dev/null
+++ b/client/admin/customEmoji/EditCustomEmoji.js
@@ -0,0 +1,178 @@
+import React, { useCallback, useState, useMemo, useEffect } from 'react';
+import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { Modal } from '../../components/basic/Modal';
+import { useFileInput } from '../../hooks/useFileInput';
+import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../hooks/useEndpointDataExperimental';
+import { useEndpointUpload } from '../../hooks/useEndpointUpload';
+import { useEndpointAction } from '../../hooks/useEndpointAction';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+const DeleteWarningModal = ({ onDelete, onCancel, ...props }) => {
+	const t = useTranslation();
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='danger' name='modal-warning' size={20}/>
+			<Modal.Title>{t('Are_you_sure')}</Modal.Title>
+			<Modal.Close onClick={onCancel}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t('Custom_Emoji_Delete_Warning')}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button ghost onClick={onCancel}>{t('Cancel')}</Button>
+				<Button primary danger onClick={onDelete}>{t('Delete')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+const SuccessModal = ({ onClose, ...props }) => {
+	const t = useTranslation();
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='success' name='checkmark-circled' size={20}/>
+			<Modal.Title>{t('Deleted')}</Modal.Title>
+			<Modal.Close onClick={onClose}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t('Custom_Emoji_Has_Been_Deleted')}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button primary onClick={onClose}>{t('Ok')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+export function EditCustomEmojiWithData({ _id, cache, onChange, ...props }) {
+	const t = useTranslation();
+	const query = useMemo(() => ({
+		query: JSON.stringify({ _id }),
+	}), [_id, cache]);
+
+	const { data = { emojis: {} }, state, error } = useEndpointDataExperimental('emoji-custom.list', query);
+
+	if (state === ENDPOINT_STATES.LOADING) {
+		return <Box pb='x20'>
+			<Skeleton mbs='x8'/>
+			<InputBox.Skeleton w='full'/>
+			<Skeleton mbs='x8'/>
+			<InputBox.Skeleton w='full'/>
+			<ButtonGroup stretch w='full' mbs='x8'>
+				<Button disabled><Throbber inheritColor/></Button>
+				<Button primary disabled><Throbber inheritColor/></Button>
+			</ButtonGroup>
+			<ButtonGroup stretch w='full' mbs='x8'>
+				<Button primary danger disabled><Throbber inheritColor/></Button>
+			</ButtonGroup>
+		</Box>;
+	}
+
+	if (error || !data || !data.emojis || data.emojis.update.length < 1) {
+		return <Box fontScale='h1' pb='x20'>{t('Custom_User_Status_Error_Invalid_User_Status')}</Box>;
+	}
+
+	return <EditCustomEmoji data={data.emojis.update[0]} onChange={onChange} {...props}/>;
+}
+
+export function EditCustomEmoji({ close, onChange, data, ...props }) {
+	const t = useTranslation();
+
+	const { _id, name: previousName, aliases: previousAliases, extension: previousExtension } = data || {};
+	const previousEmoji = data || {};
+
+	const [name, setName] = useState(previousName);
+	const [aliases, setAliases] = useState(previousAliases.join(', '));
+	const [emojiFile, setEmojiFile] = useState();
+	const [modal, setModal] = useState();
+	const [newEmojiPreview, setNewEmojiPreview] = useState(`/emoji-custom/${ encodeURIComponent(previousName) }.${ previousExtension }`);
+
+	useEffect(() => {
+		setName(previousName || '');
+		setAliases((previousAliases && previousAliases.join(', ')) || '');
+	}, [previousName, previousAliases, previousEmoji, _id]);
+
+	const setEmojiPreview = useCallback(async (file) => {
+		setEmojiFile(file);
+		setNewEmojiPreview(URL.createObjectURL(file));
+	}, [setEmojiFile]);
+
+	const hasUnsavedChanges = useMemo(() => previousName !== name || aliases !== previousAliases.join(', ') || !!emojiFile, [name, aliases, emojiFile]);
+
+	const saveAction = useEndpointUpload('emoji-custom.update', {}, t('Custom_Emoji_Updated_Successfully'));
+
+	const handleSave = useCallback(async () => {
+		const formData = new FormData();
+		formData.append('emoji', emojiFile);
+		formData.append('_id', _id);
+		formData.append('name', name);
+		formData.append('aliases', aliases);
+		const result = await saveAction(formData);
+		if (result.success) {
+			onChange();
+		}
+	}, [name, _id, aliases, emojiFile]);
+
+	const deleteAction = useEndpointAction('POST', 'emoji-custom.delete', useMemo(() => ({ emojiId: _id }), [_id]));
+
+	const onDeleteConfirm = useCallback(async () => {
+		const result = await deleteAction();
+		if (result.success) {
+			setModal(() => <SuccessModal onClose={() => { setModal(undefined); close(); onChange(); }}/>);
+		}
+	}, [_id]);
+
+	const openConfirmDelete = useCallback(() => setModal(() => <DeleteWarningModal onDelete={onDeleteConfirm} onCancel={() => setModal(undefined)}/>), [onDeleteConfirm, setModal]);
+
+	const handleAliasesChange = useCallback((e) => setAliases(e.currentTarget.value, []));
+
+	const clickUpload = useFileInput(setEmojiPreview, 'emoji');
+
+	return <>
+		<VerticalBar.ScrollableContent {...props}>
+			<Field>
+				<Field.Label>{t('Name')}</Field.Label>
+				<Field.Row>
+					<TextInput value={name} onChange={(e) => setName(e.currentTarget.value)} placeholder={t('Name')} />
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Label>{t('Aliases')}</Field.Label>
+				<Field.Row>
+					<TextInput value={aliases} onChange={handleAliasesChange} placeholder={t('Aliases')} />
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Label alignSelf='stretch' display='flex' justifyContent='space-between' alignItems='center'>
+					{t('Custom_Emoji')}
+					<Button square onClick={clickUpload}><Icon name='upload' size='x20'/></Button>
+				</Field.Label>
+				{ newEmojiPreview && <Box display='flex' flexDirection='row' mbs='none' justifyContent='center'>
+					<Margins inline='x4'>
+						<Box is='img' style={{ objectFit: 'contain' }} w='x120' h='x120' src={newEmojiPreview}/>
+					</Margins>
+				</Box> }
+			</Field>
+			<Field>
+				<Field.Row>
+					<ButtonGroup stretch w='full'>
+						<Button onClick={close}>{t('Cancel')}</Button>
+						<Button primary onClick={handleSave} disabled={!hasUnsavedChanges}>{t('Save')}</Button>
+					</ButtonGroup>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<ButtonGroup stretch w='full'>
+						<Button primary danger onClick={openConfirmDelete}><Icon name='trash' mie='x4'/>{t('Delete')}</Button>
+					</ButtonGroup>
+				</Field.Row>
+			</Field>
+		</VerticalBar.ScrollableContent>
+		{ modal }
+	</>;
+}
diff --git a/client/admin/customSounds/AddCustomSound.js b/client/admin/customSounds/AddCustomSound.js
new file mode 100644
index 00000000000..15be04aceb6
--- /dev/null
+++ b/client/admin/customSounds/AddCustomSound.js
@@ -0,0 +1,100 @@
+import React, { useState, useCallback } from 'react';
+import { Field, TextInput, Box, Icon, Margins, Button, ButtonGroup } from '@rocket.chat/fuselage';
+
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useMethod } from '../../contexts/ServerContext';
+import { useFileInput } from '../../hooks/useFileInput';
+import { validate, createSoundData } from './lib';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+export function AddCustomSound({ goToNew, close, onChange, ...props }) {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const [name, setName] = useState('');
+	const [sound, setSound] = useState();
+
+	const uploadCustomSound = useMethod('uploadCustomSound');
+
+	const insertOrUpdateSound = useMethod('insertOrUpdateSound');
+
+	const handleChangeFile = (soundFile) => {
+		setSound(soundFile);
+	};
+
+	const clickUpload = useFileInput(handleChangeFile, 'audio/mp3');
+
+	const saveAction = async (name, soundFile) => {
+		const soundData = createSoundData(soundFile, name);
+		const validation = validate(soundData, sound);
+		if (validation.length === 0) {
+			let soundId;
+			try {
+				soundId = await insertOrUpdateSound(soundData);
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			}
+
+			soundData._id = soundId;
+			soundData.random = Math.round(Math.random() * 1000);
+
+			if (soundId) {
+				dispatchToastMessage({ type: 'success', message: t('Uploading_file') });
+
+				const reader = new FileReader();
+				reader.readAsBinaryString(soundFile);
+				reader.onloadend = () => {
+					try {
+						uploadCustomSound(reader.result, soundFile.type, soundData);
+						dispatchToastMessage({ type: 'success', message: t('File_uploaded') });
+					} catch (error) {
+						dispatchToastMessage({ type: 'error', message: error });
+					}
+				};
+			}
+			return soundId;
+		}
+		validation.forEach((error) => { throw new Error({ type: 'error', message: t('error-the-field-is-required', { field: t(error) }) }); });
+	};
+
+	const handleSave = useCallback(async () => {
+		try {
+			const result = await saveAction(
+				name,
+				sound,
+			);
+			dispatchToastMessage({ type: 'success', message: t('Custom_Sound_Updated_Successfully') });
+			goToNew(result)();
+			onChange();
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		}
+	}, [name, sound]);
+
+	return <VerticalBar.ScrollableContent {...props}>
+		<Field>
+			<Field.Label>{t('Name')}</Field.Label>
+			<Field.Row>
+				<TextInput value={name} onChange={(e) => setName(e.currentTarget.value)} placeholder={t('Name')} />
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label alignSelf='stretch'>{t('Sound_File_mp3')}</Field.Label>
+			<Box display='flex' flexDirection='row' mbs='none'>
+				<Margins inline='x4'>
+					<Button square onClick={clickUpload}><Icon name='upload' size='x20'/></Button>
+					{(sound && sound.name) || 'none'}
+				</Margins>
+			</Box>
+		</Field>
+		<Field>
+			<Field.Row>
+				<ButtonGroup stretch w='full'>
+					<Button mie='x4' onClick={close}>{t('Cancel')}</Button>
+					<Button primary onClick={handleSave} disabled={name === ''}>{t('Save')}</Button>
+				</ButtonGroup>
+			</Field.Row>
+		</Field>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/customSounds/AdminSounds.js b/client/admin/customSounds/AdminSounds.js
new file mode 100644
index 00000000000..f6e45a71671
--- /dev/null
+++ b/client/admin/customSounds/AdminSounds.js
@@ -0,0 +1,56 @@
+import React, { useMemo, useCallback, useState, useEffect } from 'react';
+import { Box, Table, TextInput, Icon, Button } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { GenericTable, Th } from '../../../app/ui/client/components/GenericTable';
+import { useCustomSound } from '../../contexts/CustomSoundContext';
+
+const FilterByText = ({ setFilter, ...props }) => {
+	const t = useTranslation();
+	const [text, setText] = useState('');
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+
+	useEffect(() => {
+		setFilter({ text });
+	}, [text]);
+	return <Box mb='x16' is='form' display='flex' flexDirection='column' {...props}>
+		<TextInput flexShrink={0} placeholder={t('Search')} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
+	</Box>;
+};
+
+export function AdminSounds({
+	data,
+	sort,
+	onClick,
+	onHeaderClick,
+	setParams,
+	params,
+}) {
+	const t = useTranslation();
+
+	const header = useMemo(() => [
+		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name'>{t('Name')}</Th>,
+		<Th w='x40' key='action'></Th>,
+	], [sort]);
+
+	const customSound = useCustomSound();
+
+	const handlePlay = useCallback((sound) => {
+		customSound.play(sound);
+	}, []);
+
+	const renderRow = (sound) => {
+		const { _id, name } = sound;
+
+		return <Table.Row key={_id} onKeyDown={onClick(_id, sound)} onClick={onClick(_id, sound)} tabIndex={0} role='link' action qa-user-id={_id}>
+			<Table.Cell fontScale='p1' color='default'><Box withTruncatedText>{name}</Box></Table.Cell>
+			<Table.Cell alignItems={'end'}>
+				<Button ghost small square aria-label={t('Play')} onClick={(e) => e.preventDefault() & e.stopPropagation() & handlePlay(_id)}>
+					<Icon name='play' size='x20' />
+				</Button>
+			</Table.Cell>
+		</Table.Row>;
+	};
+
+	return <GenericTable FilterComponent={FilterByText} header={header} renderRow={renderRow} results={data.sounds} total={data.total} setParams={setParams} params={params} />;
+}
diff --git a/client/admin/customSounds/AdminSoundsRoute.js b/client/admin/customSounds/AdminSoundsRoute.js
new file mode 100644
index 00000000000..9a5ad6e8516
--- /dev/null
+++ b/client/admin/customSounds/AdminSoundsRoute.js
@@ -0,0 +1,109 @@
+// eslint-disable
+
+import React, { useMemo, useState, useCallback } from 'react';
+import { Button, Icon } from '@rocket.chat/fuselage';
+import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+
+import { usePermission } from '../../contexts/AuthorizationContext';
+import { useTranslation } from '../../contexts/TranslationContext';
+import Page from '../../components/basic/Page';
+import { AdminSounds } from './AdminSounds';
+import { AddCustomSound } from './AddCustomSound';
+import { EditCustomSound } from './EditCustomSound';
+import { useRoute, useRouteParameter } from '../../contexts/RouterContext';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import VerticalBar from '../../components/basic/VerticalBar';
+import NotAuthorizedPage from '../NotAuthorizedPage';
+
+const sortDir = (sortDir) => (sortDir === 'asc' ? 1 : -1);
+
+export const useQuery = (params, sort, cache) => useMemo(() => ({
+	query: JSON.stringify({ name: { $regex: params.text || '', $options: 'i' } }),
+	sort: JSON.stringify({ [sort[0]]: sortDir(sort[1]) }),
+	...params.itemsPerPage && { count: params.itemsPerPage },
+	...params.current && { offset: params.current },
+}), [JSON.stringify(params), JSON.stringify(sort), cache]);
+
+export default function CustomSoundsRoute({ props }) {
+	const t = useTranslation();
+	const canManageCustomSounds = usePermission('manage-sounds');
+
+	const routeName = 'custom-sounds';
+
+	const [params, setParams] = useState({ text: '', current: 0, itemsPerPage: 25 });
+	const [sort, setSort] = useState(['name', 'asc']);
+	const [cache, setCache] = useState();
+
+	const debouncedParams = useDebouncedValue(params, 500);
+	const debouncedSort = useDebouncedValue(sort, 500);
+
+	const query = useQuery(debouncedParams, debouncedSort, cache);
+
+	const data = useEndpointData('custom-sounds.list', query) || {};
+
+
+	const router = useRoute(routeName);
+
+	const mobile = useMediaQuery('(max-width: 420px)');
+	const small = useMediaQuery('(max-width: 780px)');
+
+	const context = useRouteParameter('context');
+	const id = useRouteParameter('id');
+
+	const onClick = (_id) => () => {
+		router.push({
+			context: 'edit',
+			id: _id,
+		});
+	};
+
+	const onHeaderClick = (id) => {
+		const [sortBy, sortDirection] = sort;
+
+		if (sortBy === id) {
+			setSort([id, sortDirection === 'asc' ? 'desc' : 'asc']);
+			return;
+		}
+		setSort([id, 'asc']);
+	};
+
+	const handleHeaderButtonClick = useCallback((context) => () => {
+		router.push({ context });
+	}, [router]);
+
+	const close = () => {
+		router.push({});
+	};
+
+	if (!canManageCustomSounds) {
+		return <NotAuthorizedPage />;
+	}
+
+	const onChange = useCallback(() => {
+		setCache(new Date());
+	}, []);
+
+	return <Page {...props} flexDirection='row'>
+		<Page name='admin-custom-sounds'>
+			<Page.Header title={t('Custom_Sounds')}>
+				<Button small onClick={handleHeaderButtonClick('new')} aria-label={t('New')}>
+					<Icon name='plus'/>
+				</Button>
+			</Page.Header>
+			<Page.Content>
+				<AdminSounds setParams={setParams} params={params} onHeaderClick={onHeaderClick} data={data} onClick={onClick} sort={sort}/>
+			</Page.Content>
+		</Page>
+		{ context
+			&& <VerticalBar mod-small={small} mod-mobile={mobile} style={{ width: '378px' }} qa-context-name={`admin-user-and-room-context-${ context }`} flexShrink={0}>
+				<VerticalBar.Header>
+					{ context === 'edit' && t('Custom_Sound_Edit') }
+					{ context === 'new' && t('Custom_Sound_Add') }
+					<VerticalBar.Close onClick={close}/></VerticalBar.Header>
+				<VerticalBar.Content>
+					{context === 'edit' && <EditCustomSound _id={id} close={close} onChange={onChange} cache={cache}/>}
+					{context === 'new' && <AddCustomSound goToNew={onClick} close={close} onChange={onChange}/>}
+				</VerticalBar.Content>
+			</VerticalBar>}
+	</Page>;
+}
diff --git a/client/admin/customSounds/EditCustomSound.js b/client/admin/customSounds/EditCustomSound.js
new file mode 100644
index 00000000000..43170fb5dde
--- /dev/null
+++ b/client/admin/customSounds/EditCustomSound.js
@@ -0,0 +1,201 @@
+import React, { useCallback, useState, useMemo, useEffect } from 'react';
+import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useMethod } from '../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { Modal } from '../../components/basic/Modal';
+import { useFileInput } from '../../hooks/useFileInput';
+import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../hooks/useEndpointDataExperimental';
+import { validate, createSoundData } from './lib';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+const DeleteWarningModal = ({ onDelete, onCancel, ...props }) => {
+	const t = useTranslation();
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='danger' name='modal-warning' size={20}/>
+			<Modal.Title>{t('Are_you_sure')}</Modal.Title>
+			<Modal.Close onClick={onCancel}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t('Custom_Sound_Status_Delete_Warning')}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button ghost onClick={onCancel}>{t('Cancel')}</Button>
+				<Button primary danger onClick={onDelete}>{t('Delete')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+const SuccessModal = ({ onClose, ...props }) => {
+	const t = useTranslation();
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='success' name='checkmark-circled' size={20}/>
+			<Modal.Title>{t('Deleted')}</Modal.Title>
+			<Modal.Close onClick={onClose}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t('Custom_Sound_Has_Been_Deleted')}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button primary onClick={onClose}>{t('Ok')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+export function EditSound({ _id, cache, ...props }) {
+	const t = useTranslation();
+	const query = useMemo(() => ({
+		query: JSON.stringify({ _id }),
+	}), [_id]);
+
+	const { data, state, error } = useEndpointDataExperimental('custom-sounds.list', query);
+
+
+	if (state === ENDPOINT_STATES.LOADING) {
+		return <Box pb='x20'>
+			<Skeleton mbs='x8'/>
+			<InputBox.Skeleton w='full'/>
+			<Skeleton mbs='x8'/>
+			<InputBox.Skeleton w='full'/>
+			<ButtonGroup stretch w='full' mbs='x8'>
+				<Button disabled><Throbber inheritColor/></Button>
+				<Button primary disabled><Throbber inheritColor/></Button>
+			</ButtonGroup>
+			<ButtonGroup stretch w='full' mbs='x8'>
+				<Button primary danger disabled><Throbber inheritColor/></Button>
+			</ButtonGroup>
+		</Box>;
+	}
+
+	if (error || !data || data.sounds.length < 1) {
+		return <Box fontScale='h1' pb='x20'>{t('Custom_User_Status_Error_Invalid_User_Status')}</Box>;
+	}
+
+	return <EditCustomSound data={data.sounds[0]} {...props}/>;
+}
+
+export function EditCustomSound({ close, onChange, data, ...props }) {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const { _id, name: previousName } = data || {};
+	const previousSound = data || {};
+
+	const [name, setName] = useState('');
+	const [sound, setSound] = useState();
+	const [modal, setModal] = useState();
+
+	useEffect(() => {
+		setName(previousName || '');
+		setSound(previousSound || '');
+	}, [previousName, previousSound, _id]);
+
+	const deleteCustomSound = useMethod('deleteCustomSound');
+	const uploadCustomSound = useMethod('uploadCustomSound');
+	const insertOrUpdateSound = useMethod('insertOrUpdateSound');
+
+	const handleChangeFile = (soundFile) => {
+		setSound(soundFile);
+	};
+
+	const hasUnsavedChanges = useMemo(() => previousName !== name || previousSound !== sound, [name, sound]);
+
+	const saveAction = async (sound) => {
+		const soundData = createSoundData(sound, name, { previousName, previousSound, _id });
+		const validation = validate(soundData, sound);
+		if (validation.length === 0) {
+			let soundId;
+			try {
+				soundId = await insertOrUpdateSound(soundData);
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			}
+
+			soundData._id = soundId;
+			soundData.random = Math.round(Math.random() * 1000);
+
+			if (sound && sound !== previousSound) {
+				dispatchToastMessage({ type: 'success', message: t('Uploading_file') });
+
+				const reader = new FileReader();
+				reader.readAsBinaryString(sound);
+				reader.onloadend = () => {
+					try {
+						uploadCustomSound(reader.result, sound.type, soundData);
+						return dispatchToastMessage({ type: 'success', message: t('File_uploaded') });
+					} catch (error) {
+						dispatchToastMessage({ type: 'error', message: error });
+					}
+				};
+			}
+		}
+
+		validation.forEach((error) => dispatchToastMessage({ type: 'error', message: t('error-the-field-is-required', { field: t(error) }) }));
+	};
+
+	const handleSave = useCallback(async () => {
+		saveAction(sound);
+		onChange();
+	}, [name, _id, sound]);
+
+	const onDeleteConfirm = useCallback(async () => {
+		try {
+			await deleteCustomSound(_id);
+			setModal(() => <SuccessModal onClose={() => { setModal(undefined); close(); onChange(); }}/>);
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+			onChange();
+		}
+	}, [_id]);
+
+	const openConfirmDelete = () => setModal(() => <DeleteWarningModal onDelete={onDeleteConfirm} onCancel={() => setModal(undefined)}/>);
+
+
+	const clickUpload = useFileInput(handleChangeFile, 'audio/mp3');
+
+
+	return <>
+		<VerticalBar.ScrollableContent {...props}>
+			<Field>
+				<Field.Label>{t('Name')}</Field.Label>
+				<Field.Row>
+					<TextInput value={name} onChange={(e) => setName(e.currentTarget.value)} placeholder={t('Name')} />
+				</Field.Row>
+			</Field>
+
+			<Field>
+				<Field.Label alignSelf='stretch'>{t('Sound_File_mp3')}</Field.Label>
+				<Box display='flex' flexDirection='row' mbs='none'>
+					<Margins inline='x4'>
+						<Button square onClick={clickUpload}><Icon name='upload' size='x20'/></Button>
+						{(sound && sound.name) || 'none'}
+					</Margins>
+				</Box>
+			</Field>
+
+			<Field>
+				<Field.Row>
+					<ButtonGroup stretch w='full'>
+						<Button onClick={close}>{t('Cancel')}</Button>
+						<Button primary onClick={handleSave} disabled={!hasUnsavedChanges}>{t('Save')}</Button>
+					</ButtonGroup>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<ButtonGroup stretch w='full'>
+						<Button primary danger onClick={openConfirmDelete}><Icon name='trash' mie='x4'/>{t('Delete')}</Button>
+					</ButtonGroup>
+				</Field.Row>
+			</Field>
+		</VerticalBar.ScrollableContent>
+		{ modal }
+	</>;
+}
diff --git a/client/admin/customSounds/lib.js b/client/admin/customSounds/lib.js
new file mode 100644
index 00000000000..bff7ad4c15e
--- /dev/null
+++ b/client/admin/customSounds/lib.js
@@ -0,0 +1,41 @@
+// Here previousData will define if it is an update or a new entry
+export function validate(soundData, soundFile) {
+	const errors = [];
+
+	if (!soundData.name) {
+		errors.push('Name');
+	}
+
+	if (!soundData._id && !soundFile) {
+		errors.push('Sound File');
+	}
+
+	if (soundFile) {
+		if (!soundData.previousSound || soundData.previousSound !== soundFile) {
+			if (!/audio\/mp3/.test(soundFile.type) && !/audio\/mpeg/.test(soundFile.type) && !/audio\/x-mpeg/.test(soundFile.type)) {
+				errors.push('FileType');
+			}
+		}
+	}
+
+	return errors;
+}
+
+export function createSoundData(soundFile, name = '', previousData) {
+	const soundData = {};
+
+	if (previousData) {
+		soundData._id = previousData._id;
+		soundData.previousName = previousData.previousName;
+		soundData.previousSound = previousData.previousSound;
+		soundData.extension = soundFile.name.split('.').pop();
+		soundData.previousExtension = previousData.previousSound.extension;
+		soundData.name = name;
+		soundData.newFile = false;
+	} else {
+		soundData.name = name.trim();
+		soundData.newFile = true;
+	}
+
+	return soundData;
+}
diff --git a/client/admin/customUserStatus/AddCustomUserStatus.js b/client/admin/customUserStatus/AddCustomUserStatus.js
new file mode 100644
index 00000000000..1597e90ef00
--- /dev/null
+++ b/client/admin/customUserStatus/AddCustomUserStatus.js
@@ -0,0 +1,60 @@
+import React, { useCallback, useState } from 'react';
+import { Button, ButtonGroup, TextInput, Field, Select } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useMethod } from '../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+export function AddCustomUserStatus({ goToNew, close, onChange, ...props }) {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const [name, setName] = useState('');
+	const [statusType, setStatusType] = useState('online');
+
+	const saveStatus = useMethod('insertOrUpdateUserStatus');
+	const handleSave = useCallback(async () => {
+		try {
+			const result = await saveStatus({
+				name,
+				statusType,
+			});
+			dispatchToastMessage({ type: 'success', message: t('Custom_User_Status_Updated_Successfully') });
+			goToNew(result)();
+			onChange();
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		}
+	}, [name, statusType]);
+
+	const presenceOptions = [
+		['online', t('Online')],
+		['busy', t('Busy')],
+		['away', t('Away')],
+		['offline', t('Offline')],
+	];
+
+	return <VerticalBar.ScrollableContent {...props}>
+		<Field>
+			<Field.Label>{t('Name')}</Field.Label>
+			<Field.Row>
+				<TextInput value={name} onChange={(e) => setName(e.currentTarget.value)} placeholder={t('Name')} />
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Presence')}</Field.Label>
+			<Field.Row>
+				<Select value={statusType} onChange={(value) => setStatusType(value)} placeholder={t('Presence')} options={presenceOptions}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<ButtonGroup stretch w='full'>
+					<Button mie='x4' onClick={close}>{t('Cancel')}</Button>
+					<Button primary onClick={handleSave} disabled={name === ''}>{t('Save')}</Button>
+				</ButtonGroup>
+			</Field.Row>
+		</Field>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/customUserStatus/CustomUserStatus.js b/client/admin/customUserStatus/CustomUserStatus.js
new file mode 100644
index 00000000000..0052bdfa7c6
--- /dev/null
+++ b/client/admin/customUserStatus/CustomUserStatus.js
@@ -0,0 +1,46 @@
+import React, { useMemo, useCallback, useState, useEffect } from 'react';
+import { Box, Table, TextInput, Icon } from '@rocket.chat/fuselage';
+
+import { GenericTable, Th } from '../../../app/ui/client/components/GenericTable';
+import { useTranslation } from '../../contexts/TranslationContext';
+
+const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
+
+const FilterByText = ({ setFilter, ...props }) => {
+	const t = useTranslation();
+	const [text, setText] = useState('');
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+
+	useEffect(() => {
+		setFilter({ text });
+	}, [text]);
+	return <Box mb='x16' is='form' display='flex' flexDirection='column' {...props}>
+		<TextInput flexShrink={0} placeholder={t('Search')} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
+	</Box>;
+};
+
+export function CustomUserStatus({
+	data,
+	sort,
+	onClick,
+	onHeaderClick,
+	setParams,
+	params,
+}) {
+	const t = useTranslation();
+
+	const header = useMemo(() => [
+		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name'>{t('Name')}</Th>,
+		<Th key={'presence'} direction={sort[1]} active={sort[0] === 'statusType'} onClick={onHeaderClick} sort='statusType'>{t('Presence')}</Th>,
+	].filter(Boolean), [sort]);
+
+	const renderRow = (status) => {
+		const { _id, name, statusType } = status;
+		return <Table.Row key={_id} onKeyDown={onClick(_id, status)} onClick={onClick(_id, status)} tabIndex={0} role='link' action qa-user-id={_id}>
+			<Table.Cell fontScale='p1' color='default' style={style}>{name}</Table.Cell>
+			<Table.Cell fontScale='p1' color='default' style={style}>{statusType}</Table.Cell>
+		</Table.Row>;
+	};
+
+	return <GenericTable FilterComponent={FilterByText} header={header} renderRow={renderRow} results={data.statuses} total={data.total} setParams={setParams} params={params} />;
+}
diff --git a/client/admin/customUserStatus/CustomUserStatusRoute.js b/client/admin/customUserStatus/CustomUserStatusRoute.js
new file mode 100644
index 00000000000..c5e5aef163e
--- /dev/null
+++ b/client/admin/customUserStatus/CustomUserStatusRoute.js
@@ -0,0 +1,106 @@
+import React, { useMemo, useState, useCallback } from 'react';
+import { Button, Icon } from '@rocket.chat/fuselage';
+import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+
+import { usePermission } from '../../contexts/AuthorizationContext';
+import { useTranslation } from '../../contexts/TranslationContext';
+import Page from '../../components/basic/Page';
+import { CustomUserStatus } from './CustomUserStatus';
+import { EditCustomUserStatusWithData } from './EditCustomUserStatus';
+import { AddCustomUserStatus } from './AddCustomUserStatus';
+import { useRoute, useRouteParameter } from '../../contexts/RouterContext';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import VerticalBar from '../../components/basic/VerticalBar';
+import NotAuthorizedPage from '../NotAuthorizedPage';
+
+const sortDir = (sortDir) => (sortDir === 'asc' ? 1 : -1);
+
+export const useQuery = (params, sort, cache) => useMemo(() => ({
+	query: JSON.stringify({ name: { $regex: params.text || '', $options: 'i' } }),
+	sort: JSON.stringify({ [sort[0]]: sortDir(sort[1]) }),
+	...params.itemsPerPage && { count: params.itemsPerPage },
+	...params.current && { offset: params.current },
+}), [JSON.stringify(params), JSON.stringify(sort), cache]);
+
+export default function CustomUserStatusRoute({ props }) {
+	const t = useTranslation();
+	const canManageUserStatus = usePermission('manage-user-status');
+
+	const routeName = 'custom-user-status';
+
+	const [params, setParams] = useState({ text: '', current: 0, itemsPerPage: 25 });
+	const [sort, setSort] = useState(['name', 'asc']);
+	const [cache, setCache] = useState();
+
+	const debouncedParams = useDebouncedValue(params, 500);
+	const debouncedSort = useDebouncedValue(sort, 500);
+
+	const query = useQuery(debouncedParams, debouncedSort, cache);
+
+	const data = useEndpointData('custom-user-status.list', query) || {};
+
+	const router = useRoute(routeName);
+
+	const mobile = useMediaQuery('(max-width: 420px)');
+	const small = useMediaQuery('(max-width: 780px)');
+
+	const context = useRouteParameter('context');
+	const id = useRouteParameter('id');
+
+	const onClick = (_id) => () => {
+		router.push({
+			context: 'edit',
+			id: _id,
+		});
+	};
+
+	const onHeaderClick = (id) => {
+		const [sortBy, sortDirection] = sort;
+
+		if (sortBy === id) {
+			setSort([id, sortDirection === 'asc' ? 'desc' : 'asc']);
+			return;
+		}
+		setSort([id, 'asc']);
+	};
+
+	const handleHeaderButtonClick = useCallback((context) => () => {
+		router.push({ context });
+	}, [router]);
+
+	const close = () => {
+		router.push({});
+	};
+
+	if (!canManageUserStatus) {
+		return <NotAuthorizedPage />;
+	}
+
+	const onChange = useCallback(() => {
+		setCache(new Date());
+	}, []);
+
+	return <Page {...props} flexDirection='row'>
+		<Page name='admin-custom-user-status'>
+			<Page.Header title={t('Custom_User_Status')}>
+				<Button small onClick={handleHeaderButtonClick('new')} aria-label={t('New')}>
+					<Icon name='plus'/>
+				</Button>
+			</Page.Header>
+			<Page.Content>
+				<CustomUserStatus setParams={setParams} params={params} onHeaderClick={onHeaderClick} data={data} onClick={onClick} sort={sort}/>
+			</Page.Content>
+		</Page>
+		{ context
+			&& <VerticalBar mod-small={small} mod-mobile={mobile} style={{ width: '378px' }} qa-context-name={`admin-user-and-room-context-${ context }`} flexShrink={0}>
+				<VerticalBar.Header>
+					{ context === 'edit' && t('Custom_User_Status_Edit') }
+					{ context === 'new' && t('Custom_User_Status_Add') }
+					<VerticalBar.Close onClick={close}/></VerticalBar.Header>
+				<VerticalBar.Content>
+					{context === 'edit' && <EditCustomUserStatusWithData _id={id} close={close} onChange={onChange} cache={cache}/>}
+					{context === 'new' && <AddCustomUserStatus goToNew={onClick} close={close} onChange={onChange}/>}
+				</VerticalBar.Content>
+			</VerticalBar>}
+	</Page>;
+}
diff --git a/client/admin/customUserStatus/EditCustomUserStatus.js b/client/admin/customUserStatus/EditCustomUserStatus.js
new file mode 100644
index 00000000000..7a7853d5b1a
--- /dev/null
+++ b/client/admin/customUserStatus/EditCustomUserStatus.js
@@ -0,0 +1,167 @@
+import React, { useCallback, useState, useMemo, useEffect } from 'react';
+import { Box, Button, ButtonGroup, TextInput, Field, Select, Icon, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useMethod } from '../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { Modal } from '../../components/basic/Modal';
+import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../hooks/useEndpointDataExperimental';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+const DeleteWarningModal = ({ onDelete, onCancel, ...props }) => {
+	const t = useTranslation();
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='danger' name='modal-warning' size={20}/>
+			<Modal.Title>{t('Are_you_sure')}</Modal.Title>
+			<Modal.Close onClick={onCancel}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t('Custom_User_Status_Delete_Warning')}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button ghost onClick={onCancel}>{t('Cancel')}</Button>
+				<Button primary danger onClick={onDelete}>{t('Delete')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+const SuccessModal = ({ onClose, ...props }) => {
+	const t = useTranslation();
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='success' name='checkmark-circled' size={20}/>
+			<Modal.Title>{t('Deleted')}</Modal.Title>
+			<Modal.Close onClick={onClose}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t('Custom_User_Status_Has_Been_Deleted')}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button primary onClick={onClose}>{t('Ok')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+export function EditCustomUserStatusWithData({ _id, cache, ...props }) {
+	const t = useTranslation();
+	const query = useMemo(() => ({
+		query: JSON.stringify({ _id }),
+	}), [_id]);
+
+	const { data, state, error } = useEndpointDataExperimental('custom-user-status.list', query);
+
+	if (state === ENDPOINT_STATES.LOADING) {
+		return <Box pb='x20'>
+			<Skeleton mbs='x8'/>
+			<InputBox.Skeleton w='full'/>
+			<Skeleton mbs='x8'/>
+			<InputBox.Skeleton w='full'/>
+			<ButtonGroup stretch w='full' mbs='x8'>
+				<Button disabled><Throbber inheritColor/></Button>
+				<Button primary disabled><Throbber inheritColor/></Button>
+			</ButtonGroup>
+			<ButtonGroup stretch w='full' mbs='x8'>
+				<Button primary danger disabled><Throbber inheritColor/></Button>
+			</ButtonGroup>
+		</Box>;
+	}
+
+	if (error || !data || data.statuses.length < 1) {
+		return <Box fontScale='h1' pb='x20'>{t('Custom_User_Status_Error_Invalid_User_Status')}</Box>;
+	}
+
+	return <EditCustomUserStatus data={data.statuses[0]} {...props}/>;
+}
+
+export function EditCustomUserStatus({ close, onChange, data, ...props }) {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const { _id, name: previousName, statusType: previousStatusType } = data || {};
+
+	const [name, setName] = useState('');
+	const [statusType, setStatusType] = useState('');
+	const [modal, setModal] = useState();
+
+	useEffect(() => {
+		setName(previousName || '');
+		setStatusType(previousStatusType || '');
+	}, [previousName, previousStatusType, _id]);
+
+	const saveStatus = useMethod('insertOrUpdateUserStatus');
+	const deleteStatus = useMethod('deleteCustomUserStatus');
+
+	const hasUnsavedChanges = useMemo(() => previousName !== name || previousStatusType !== statusType, [name, statusType]);
+	const handleSave = useCallback(async () => {
+		try {
+			await saveStatus({
+				_id,
+				previousName,
+				previousStatusType,
+				name,
+				statusType,
+			});
+			dispatchToastMessage({ type: 'success', message: t('Custom_User_Status_Updated_Successfully') });
+			onChange();
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		}
+	}, [name, statusType, _id]);
+
+	const onDeleteConfirm = useCallback(async () => {
+		try {
+			await deleteStatus(_id);
+			setModal(() => <SuccessModal onClose={() => { setModal(undefined); close(); onChange(); }}/>);
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+			onChange();
+		}
+	}, [_id]);
+
+	const openConfirmDelete = () => setModal(() => <DeleteWarningModal onDelete={onDeleteConfirm} onCancel={() => setModal(undefined)}/>);
+
+	const presenceOptions = [
+		['online', t('Online')],
+		['busy', t('Busy')],
+		['away', t('Away')],
+		['offline', t('Offline')],
+	];
+
+	return <>
+		<VerticalBar.ScrollableContent {...props}>
+			<Field>
+				<Field.Label>{t('Name')}</Field.Label>
+				<Field.Row>
+					<TextInput value={name} onChange={(e) => setName(e.currentTarget.value)} placeholder={t('Name')} />
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Label>{t('Presence')}</Field.Label>
+				<Field.Row>
+					<Select value={statusType} onChange={(value) => setStatusType(value)} placeholder={t('Presence')} options={presenceOptions}/>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<ButtonGroup stretch w='full'>
+						<Button onClick={close}>{t('Cancel')}</Button>
+						<Button primary onClick={handleSave} disabled={!hasUnsavedChanges}>{t('Save')}</Button>
+					</ButtonGroup>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<ButtonGroup stretch w='full'>
+						<Button primary danger onClick={openConfirmDelete}><Icon name='trash' mie='x4'/>{t('Delete')}</Button>
+					</ButtonGroup>
+				</Field.Row>
+			</Field>
+		</VerticalBar.ScrollableContent>
+		{ modal }
+	</>;
+}
diff --git a/app/importer/client/components/ImportHistoryPage.js b/client/admin/import/ImportHistoryPage.js
similarity index 86%
rename from app/importer/client/components/ImportHistoryPage.js
rename to client/admin/import/ImportHistoryPage.js
index 60b5051ac1e..4474d2b7cc1 100644
--- a/app/importer/client/components/ImportHistoryPage.js
+++ b/client/admin/import/ImportHistoryPage.js
@@ -1,15 +1,14 @@
 import { Button, ButtonGroup, Table } from '@rocket.chat/fuselage';
+import { useMediaQuery, useSafely } from '@rocket.chat/fuselage-hooks';
 import React, { useState, useEffect, useMemo } from 'react';
 
-import { Page } from '../../../../client/components/basic/Page';
-import { useTranslation } from '../../../../client/contexts/TranslationContext';
-import { useToastMessageDispatch } from '../../../../client/contexts/ToastMessagesContext';
-import { useRoute } from '../../../../client/contexts/RouterContext';
-import { useEndpoint } from '../../../../client/contexts/ServerContext';
-import { ProgressStep } from '../../lib/ImporterProgressStep';
+import Page from '../../components/basic/Page';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useRoute } from '../../contexts/RouterContext';
+import { useEndpoint } from '../../contexts/ServerContext';
+import { ProgressStep } from '../../../app/importer/lib/ImporterProgressStep';
 import ImportOperationSummary from './ImportOperationSummary';
-import { useSafely } from '../../../../client/hooks/useSafely';
-import { useMediaQuery } from '../../../ui/client/views/app/components/hooks';
 
 function ImportHistoryPage() {
 	const t = useTranslation();
@@ -87,7 +86,7 @@ function ImportHistoryPage() {
 					&& <Button disabled={isLoading} onClick={handleDownloadPendingFilesClick}>{t('Download_Pending_Files')}</Button>}
 			</ButtonGroup>
 		</Page.Header>
-		<Page.ContentShadowScroll>
+		<Page.ScrollableContentWithShadow>
 			<Table fixed>
 				<Table.Head>
 					<Table.Row>
@@ -116,7 +115,7 @@ function ImportHistoryPage() {
 						</>}
 				</Table.Body>
 			</Table>
-		</Page.ContentShadowScroll>
+		</Page.ScrollableContentWithShadow>
 	</Page>;
 }
 
diff --git a/app/importer/client/components/ImportHistoryPage.stories.js b/client/admin/import/ImportHistoryPage.stories.js
similarity index 100%
rename from app/importer/client/components/ImportHistoryPage.stories.js
rename to client/admin/import/ImportHistoryPage.stories.js
diff --git a/app/importer/client/components/ImportOperationSummary.js b/client/admin/import/ImportOperationSummary.js
similarity index 90%
rename from app/importer/client/components/ImportOperationSummary.js
rename to client/admin/import/ImportOperationSummary.js
index c940aef934c..c163cab58d8 100644
--- a/app/importer/client/components/ImportOperationSummary.js
+++ b/client/admin/import/ImportOperationSummary.js
@@ -1,16 +1,16 @@
 import { Skeleton, Table } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 
-import { useTranslation } from '../../../../client/contexts/TranslationContext';
-import { useRoute } from '../../../../client/contexts/RouterContext';
-import { useFormatDateAndTime } from '../../../ui/client/views/app/components/hooks';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useRoute } from '../../contexts/RouterContext';
+import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
 import {
 	ImportWaitingStates,
 	ImportFileReadyStates,
 	ImportPreparingStartedStates,
 	ImportingStartedStates,
 	ProgressStep,
-} from '../../lib/ImporterProgressStep';
+} from '../../../app/importer/lib/ImporterProgressStep';
 
 function ImportOperationSummary({
 	type,
diff --git a/app/importer/client/components/ImportOperationSummary.stories.js b/client/admin/import/ImportOperationSummary.stories.js
similarity index 100%
rename from app/importer/client/components/ImportOperationSummary.stories.js
rename to client/admin/import/ImportOperationSummary.stories.js
diff --git a/app/importer/client/components/ImportProgressPage.js b/client/admin/import/ImportProgressPage.js
similarity index 68%
rename from app/importer/client/components/ImportProgressPage.js
rename to client/admin/import/ImportProgressPage.js
index ec8416cea6b..c06c034c46c 100644
--- a/app/importer/client/components/ImportProgressPage.js
+++ b/client/admin/import/ImportProgressPage.js
@@ -1,19 +1,21 @@
 import { Box, Margins, Throbber } from '@rocket.chat/fuselage';
+import { useSafely } from '@rocket.chat/fuselage-hooks';
 import React, { useEffect, useState, useMemo } from 'react';
 import s from 'underscore.string';
+import { Meteor } from 'meteor/meteor';
 
-import { useTranslation } from '../../../../client/contexts/TranslationContext';
-import { ProgressStep, ImportingStartedStates } from '../../lib/ImporterProgressStep';
-import { useToastMessageDispatch } from '../../../../client/contexts/ToastMessagesContext';
-import { ImporterWebsocketReceiver } from '../ImporterWebsocketReceiver';
-import { useSafely } from '../../../../client/hooks/useSafely';
-import { useEndpoint } from '../../../../client/contexts/ServerContext';
-import { useRoute } from '../../../../client/contexts/RouterContext';
-import { Page } from '../../../../client/components/basic/Page';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { ProgressStep, ImportingStartedStates } from '../../../app/importer/lib/ImporterProgressStep';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useEndpoint } from '../../contexts/ServerContext';
+import { useRoute } from '../../contexts/RouterContext';
+import Page from '../../components/basic/Page';
+import { useErrorHandler } from './useErrorHandler';
 
 function ImportProgressPage() {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
+	const handleError = useErrorHandler();
 
 	const [importerKey, setImporterKey] = useSafely(useState(null));
 	const [step, setStep] = useSafely(useState('Loading...'));
@@ -45,7 +47,7 @@ function ImportProgressPage() {
 				setCompleted(operation.count.completed);
 				setTotal(operation.count.total);
 			} catch (error) {
-				dispatchToastMessage({ type: 'error', message: error || t('Failed_To_Load_Import_Data') });
+				handleError(error, t('Failed_To_Load_Import_Data'));
 				importHistoryRoute.push();
 			}
 		};
@@ -71,7 +73,7 @@ function ImportProgressPage() {
 
 				case ProgressStep.ERROR:
 				case ProgressStep.CANCELLED:
-					dispatchToastMessage({ type: 'error', message: t(step[0].toUpperCase() + step.slice(1)) });
+					handleError(t(step[0].toUpperCase() + step.slice(1)));
 					importHistoryRoute.push();
 					return;
 
@@ -83,6 +85,8 @@ function ImportProgressPage() {
 			}
 		};
 
+		const streamer = new Meteor.Streamer('importers');
+
 		const loadImportProgress = async () => {
 			try {
 				const progress = await getImportProgress();
@@ -93,10 +97,10 @@ function ImportProgressPage() {
 					return;
 				}
 
-				ImporterWebsocketReceiver.registerCallback(handleProgressUpdated);
+				streamer.on('progress', handleProgressUpdated);
 				handleProgressUpdated(progress);
 			} catch (error) {
-				dispatchToastMessage({ type: 'error', message: error || t('Failed_To_Load_Import_Data') });
+				handleError(error, t('Failed_To_Load_Import_Data'));
 				importHistoryRoute.push();
 			}
 		};
@@ -104,7 +108,7 @@ function ImportProgressPage() {
 		loadImportProgress();
 
 		return () => {
-			ImporterWebsocketReceiver.unregisterCallback(handleProgressUpdated);
+			streamer.removeListener('progress', handleProgressUpdated);
 		};
 	}, [importerKey]);
 
@@ -119,19 +123,19 @@ function ImportProgressPage() {
 	return <Page>
 		<Page.Header title={t('Importing_Data')} />
 
-		<Page.ContentShadowScroll>
+		<Page.ScrollableContentWithShadow>
 			<Box marginInline='auto' marginBlock='neg-x24' width='full' maxWidth='x580'>
 				<Margins block='x24'>
-					<Box is='p' textStyle='p1' textColor='default'>{t(step[0].toUpperCase() + step.slice(1))}</Box>
+					<Box is='p' fontScale='p1'>{t(step[0].toUpperCase() + step.slice(1))}</Box>
 					{progressRate
-						? <Box display='flex' justifyContent='center' textStyle='p1' textColor='default'>
+						? <Box display='flex' justifyContent='center'>
 							<Box is='progress' value={completed} max={total} marginInlineEnd='x24' />
-							<Box is='span'>{completed}/{total} ({s.numberFormat(progressRate, 0) }%)</Box>
+							<Box is='span' fontScale='p1'>{completed}/{total} ({s.numberFormat(progressRate, 0) }%)</Box>
 						</Box>
 						: <Throbber justifyContent='center' />}
 				</Margins>
 			</Box>
-		</Page.ContentShadowScroll>
+		</Page.ScrollableContentWithShadow>
 	</Page>;
 }
 
diff --git a/app/importer/client/components/ImportRoute.js b/client/admin/import/ImportRoute.js
similarity index 80%
rename from app/importer/client/components/ImportRoute.js
rename to client/admin/import/ImportRoute.js
index d44d70efa40..a9b0713213e 100644
--- a/app/importer/client/components/ImportRoute.js
+++ b/client/admin/import/ImportRoute.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { usePermission } from '../../../../client/contexts/AuthorizationContext';
-import NotAuthorizedPage from '../../../ui-admin/client/components/NotAuthorizedPage';
+import { usePermission } from '../../contexts/AuthorizationContext';
+import NotAuthorizedPage from '../NotAuthorizedPage';
 import ImportHistoryPage from './ImportHistoryPage';
 import NewImportPage from './NewImportPage';
 import PrepareImportPage from './PrepareImportPage';
diff --git a/app/importer/client/components/NewImportPage.js b/client/admin/import/NewImportPage.js
similarity index 87%
rename from app/importer/client/components/NewImportPage.js
rename to client/admin/import/NewImportPage.js
index 242a44c4bfe..637201a159b 100644
--- a/app/importer/client/components/NewImportPage.js
+++ b/client/admin/import/NewImportPage.js
@@ -13,23 +13,23 @@ import {
 	Throbber,
 	UrlInput,
 } from '@rocket.chat/fuselage';
-import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useUniqueId, useSafely } from '@rocket.chat/fuselage-hooks';
 import React, { useState, useMemo, useEffect } from 'react';
 
-import { Page } from '../../../../client/components/basic/Page';
-import { useTranslation } from '../../../../client/contexts/TranslationContext';
-import { useSetting } from '../../../../client/contexts/SettingsContext';
-import { useToastMessageDispatch } from '../../../../client/contexts/ToastMessagesContext';
-import { useRoute, useRouteParameter } from '../../../../client/contexts/RouterContext';
-import { showImporterException } from '../functions/showImporterException';
-import { useEndpoint } from '../../../../client/contexts/ServerContext';
-import { Importers } from '../index';
-import { useSafely } from '../../../../client/hooks/useSafely';
-import { useFormatMemorySize } from '../../../ui/client/views/app/components/hooks';
+import Page from '../../components/basic/Page';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useSetting } from '../../contexts/SettingsContext';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useRoute, useRouteParameter } from '../../contexts/RouterContext';
+import { useErrorHandler } from './useErrorHandler';
+import { useEndpoint } from '../../contexts/ServerContext';
+import { Importers } from '../../../app/importer/client/index';
+import { useFormatMemorySize } from '../../hooks/useFormatMemorySize';
 
 function NewImportPage() {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
+	const handleError = useErrorHandler();
 
 	const [isLoading, setLoading] = useSafely(useState(false));
 	const [fileType, setFileType] = useSafely(useState('upload'));
@@ -100,7 +100,7 @@ function NewImportPage() {
 							});
 							dispatchToastMessage({ type: 'success', message: t('File_uploaded_successfully') });
 						} catch (error) {
-							showImporterException(error);
+							handleError(error, t('Failed_To_upload_Import_File'));
 						} finally {
 							resolve();
 						}
@@ -128,7 +128,7 @@ function NewImportPage() {
 			dispatchToastMessage({ type: 'success', message: t('Import_requested_successfully') });
 			prepareImportRoute.push();
 		} catch (error) {
-			showImporterException(error);
+			handleError(error, t('Failed_To_upload_Import_File'));
 		} finally {
 			setLoading(false);
 		}
@@ -148,7 +148,7 @@ function NewImportPage() {
 			dispatchToastMessage({ type: 'success', message: t('Import_requested_successfully') });
 			prepareImportRoute.push();
 		} catch (error) {
-			showImporterException(error);
+			handleError(error, t('Failed_To_upload_Import_File'));
 		} finally {
 			setLoading(false);
 		}
@@ -172,7 +172,7 @@ function NewImportPage() {
 				</Button>}
 			</ButtonGroup>
 		</Page.Header>
-		<Page.ContentShadowScroll>
+		<Page.ScrollableContentWithShadow>
 			<Box marginInline='auto' marginBlock='neg-x24' width='full' maxWidth='x580'>
 				<Margins block='x24'>
 					<Field>
@@ -240,7 +240,7 @@ function NewImportPage() {
 					</>}
 				</Margins>
 			</Box>
-		</Page.ContentShadowScroll>
+		</Page.ScrollableContentWithShadow>
 	</Page>;
 }
 
diff --git a/app/importer/client/components/NewImportPage.stories.js b/client/admin/import/NewImportPage.stories.js
similarity index 100%
rename from app/importer/client/components/NewImportPage.stories.js
rename to client/admin/import/NewImportPage.stories.js
diff --git a/app/importer/client/components/PrepareImportPage.js b/client/admin/import/PrepareImportPage.js
similarity index 85%
rename from app/importer/client/components/PrepareImportPage.js
rename to client/admin/import/PrepareImportPage.js
index 48e05b7c91e..687e78fde25 100644
--- a/app/importer/client/components/PrepareImportPage.js
+++ b/client/admin/import/PrepareImportPage.js
@@ -12,12 +12,13 @@ import {
 	Pagination,
 	Tabs,
 } from '@rocket.chat/fuselage';
+import { useDebouncedValue, useSafely } from '@rocket.chat/fuselage-hooks';
 import React, { useEffect, useState, useMemo, useCallback } from 'react';
 import s from 'underscore.string';
+import { Meteor } from 'meteor/meteor';
 
-import { Page } from '../../../../client/components/basic/Page';
-import { useTranslation } from '../../../../client/contexts/TranslationContext';
-import { useToastMessageDispatch } from '../../../../client/contexts/ToastMessagesContext';
+import Page from '../../components/basic/Page';
+import { useTranslation } from '../../contexts/TranslationContext';
 import {
 	ProgressStep,
 	ImportWaitingStates,
@@ -25,13 +26,10 @@ import {
 	ImportPreparingStartedStates,
 	ImportingStartedStates,
 	ImportingErrorStates,
-} from '../../lib/ImporterProgressStep';
-import { ImporterWebsocketReceiver } from '../ImporterWebsocketReceiver';
-import { showImporterException } from '../functions/showImporterException';
-import { useRoute } from '../../../../client/contexts/RouterContext';
-import { useSafely } from '../../../../client/hooks/useSafely';
-import { useEndpoint } from '../../../../client/contexts/ServerContext';
-import { useDebounce } from '../../../ui/client/views/app/components/hooks';
+} from '../../../app/importer/lib/ImporterProgressStep';
+import { useErrorHandler } from './useErrorHandler';
+import { useRoute } from '../../contexts/RouterContext';
+import { useEndpoint } from '../../contexts/ServerContext';
 
 const waitFor = (fn, predicate) => new Promise((resolve, reject) => {
 	const callPromise = () => {
@@ -182,7 +180,7 @@ function PrepareChannels({ channels, channelsCount, setChannels }) {
 
 function PrepareImportPage() {
 	const t = useTranslation();
-	const dispatchToastMessage = useToastMessageDispatch();
+	const handleError = useErrorHandler();
 
 	const [isPreparing, setPreparing] = useSafely(useState(true));
 	const [progressRate, setProgressRate] = useSafely(useState(null));
@@ -204,14 +202,16 @@ function PrepareImportPage() {
 	const startImport = useEndpoint('POST', 'startImport');
 
 	useEffect(() => {
+		const streamer = new Meteor.Streamer('importers');
+
 		const handleProgressUpdated = ({ rate }) => {
 			setProgressRate(rate);
 		};
 
-		ImporterWebsocketReceiver.registerCallback(handleProgressUpdated);
+		streamer.on('progress', handleProgressUpdated);
 
 		return () => {
-			ImporterWebsocketReceiver.unregisterCallback(handleProgressUpdated);
+			streamer.removeListener('progress', handleProgressUpdated);
 		};
 	}, []);
 
@@ -221,13 +221,13 @@ function PrepareImportPage() {
 				const data = await waitFor(getImportFileData, (data) => data && !data.waiting);
 
 				if (!data) {
-					dispatchToastMessage({ type: 'error', message: t('Importer_not_setup') });
+					handleError(t('Importer_not_setup'));
 					importHistoryRoute.push();
 					return;
 				}
 
 				if (data.step) {
-					dispatchToastMessage({ type: 'error', message: t('Failed_To_Load_Import_Data') });
+					handleError(t('Failed_To_Load_Import_Data'));
 					importHistoryRoute.push();
 					return;
 				}
@@ -238,7 +238,7 @@ function PrepareImportPage() {
 				setPreparing(false);
 				setProgressRate(null);
 			} catch (error) {
-				showImporterException(error, 'Failed_To_Load_Import_Data');
+				handleError(error, t('Failed_To_Load_Import_Data'));
 				importHistoryRoute.push();
 			}
 		};
@@ -267,7 +267,7 @@ function PrepareImportPage() {
 				}
 
 				if (ImportingErrorStates.includes(operation.status)) {
-					dispatchToastMessage({ type: 'error', message: t('Import_Operation_Failed') });
+					handleError(t('Import_Operation_Failed'));
 					importHistoryRoute.push();
 					return;
 				}
@@ -277,10 +277,10 @@ function PrepareImportPage() {
 					return;
 				}
 
-				dispatchToastMessage({ type: 'error', message: t('Unknown_Import_State') });
+				handleError(t('Unknown_Import_State'));
 				importHistoryRoute.push();
 			} catch (error) {
-				dispatchToastMessage({ type: 'error', message: t('Failed_To_Load_Import_Data') });
+				handleError(t('Failed_To_Load_Import_Data'));
 				importHistoryRoute.push();
 			}
 		};
@@ -299,7 +299,7 @@ function PrepareImportPage() {
 			await startImport({ input: { users, channels } });
 			importProgressRoute.push();
 		} catch (error) {
-			showImporterException(error, 'Failed_To_Start_Import');
+			handleError(error, t('Failed_To_Start_Import'));
 			importHistoryRoute.push();
 		}
 	};
@@ -307,7 +307,8 @@ function PrepareImportPage() {
 	const [tab, setTab] = useState('users');
 	const handleTabClick = useMemo(() => (tab) => () => setTab(tab), []);
 
-	const statusDebounced = useDebounce(status, 100);
+	const statusDebounced = useDebouncedValue(status, 100);
+
 	return <Page>
 		<Page.Header title={t('Importing_Data')}>
 			<ButtonGroup>
@@ -320,9 +321,9 @@ function PrepareImportPage() {
 			</ButtonGroup>
 		</Page.Header>
 
-		<Page.Content>
+		<Page.ScrollableContentWithShadow>
 			<Box marginInline='auto' marginBlock='x24' width='full' maxWidth='590px'>
-				<Box is='h2' textStyle='p2' textColor='default'>{statusDebounced && t(statusDebounced.replace('importer_', 'importer_status_'))}</Box>
+				<Box is='h2' fontScale='p2'>{statusDebounced && t(statusDebounced.replace('importer_', 'importer_status_'))}</Box>
 				{!isPreparing && <Tabs flexShrink={0} >
 					<Tabs.Item disabled={usersCount === 0} selected={tab === 'users'} onClick={handleTabClick('users')}>{t('Users')} <Badge is='span'>{usersCount}</Badge></Tabs.Item>
 					<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')} <Badge is='span'>{channelsCount}</Badge></Tabs.Item>
@@ -331,7 +332,7 @@ function PrepareImportPage() {
 				<Margins block='x24'>
 					{isPreparing && <>
 						{progressRate
-							? <Box display='flex' justifyContent='center' textStyle='p1' textColor='default'>
+							? <Box display='flex' justifyContent='center' fontScale='p1'>
 								<Box is='progress' value={(progressRate * 10).toFixed(0)} max='1000' marginInlineEnd='x24' />
 								<Box is='span'>{s.numberFormat(progressRate, 0) }%</Box>
 							</Box>
@@ -341,7 +342,7 @@ function PrepareImportPage() {
 					{!isPreparing && tab === 'channels' && <PrepareChannels channels={channels} channelsCount={channelsCount} setChannels={setChannels}/>}
 				</Margins>
 			</Box>
-		</Page.Content>
+		</Page.ScrollableContentWithShadow>
 	</Page>;
 }
 
diff --git a/client/admin/import/useErrorHandler.js b/client/admin/import/useErrorHandler.js
new file mode 100644
index 00000000000..762028de891
--- /dev/null
+++ b/client/admin/import/useErrorHandler.js
@@ -0,0 +1,34 @@
+import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useTranslation } from '../../contexts/TranslationContext';
+
+export const useErrorHandler = () => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	return useMutableCallback((error, defaultMessage) => {
+		console.error(error);
+
+		if (typeof error === 'string') {
+			dispatchToastMessage({ type: 'error', message: error });
+			return;
+		}
+
+		const errorType = error?.xhr?.responseJSON?.errorType;
+
+		if (typeof errorType === 'string' && t.has(errorType)) {
+			dispatchToastMessage({ type: 'error', message: t(errorType) });
+			return;
+		}
+
+		if (typeof errorType?.error === 'string' && t.has(errorType.error)) {
+			dispatchToastMessage({ type: 'error', message: t(errorType?.error) });
+			return;
+		}
+
+		if (defaultMessage) {
+			dispatchToastMessage({ type: 'error', message: defaultMessage });
+		}
+	});
+};
diff --git a/app/ui-admin/client/index.js b/client/admin/index.js
similarity index 82%
rename from app/ui-admin/client/index.js
rename to client/admin/index.js
index 891abf1781d..eb3b7e29f7a 100644
--- a/app/ui-admin/client/index.js
+++ b/client/admin/index.js
@@ -1,4 +1,3 @@
-import './adminFlex.html';
 import './adminFlex';
 
 export { registerAdminRoute } from './routes';
diff --git a/client/admin/info/BuildEnvironmentSection.js b/client/admin/info/BuildEnvironmentSection.js
new file mode 100644
index 00000000000..4e51e879e27
--- /dev/null
+++ b/client/admin/info/BuildEnvironmentSection.js
@@ -0,0 +1,23 @@
+import React from 'react';
+
+import Subtitle from '../../components/basic/Subtitle';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
+import { DescriptionList } from './DescriptionList';
+
+export function BuildEnvironmentSection({ info }) {
+	const t = useTranslation();
+	const formatDateAndTime = useFormatDateAndTime();
+	const build = info && (info.compile || info.build);
+
+	return <DescriptionList
+		data-qa='build-env-list'
+		title={<Subtitle data-qa='build-env-title'>{t('Build_Environment')}</Subtitle>}
+	>
+		<DescriptionList.Entry label={t('OS_Platform')}>{build.platform}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Arch')}>{build.arch}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Release')}>{build.osRelease}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Node_version')}>{build.nodeVersion}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Date')}>{formatDateAndTime(build.date)}</DescriptionList.Entry>
+	</DescriptionList>;
+}
diff --git a/app/ui-admin/client/components/info/BuildEnvironmentSection.stories.js b/client/admin/info/BuildEnvironmentSection.stories.js
similarity index 89%
rename from app/ui-admin/client/components/info/BuildEnvironmentSection.stories.js
rename to client/admin/info/BuildEnvironmentSection.stories.js
index 9985ea06de5..b7cabc5630a 100644
--- a/app/ui-admin/client/components/info/BuildEnvironmentSection.stories.js
+++ b/client/admin/info/BuildEnvironmentSection.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { dummyDate } from '../../../../../.storybook/helpers';
+import { dummyDate } from '../../../.storybook/helpers';
 import { BuildEnvironmentSection } from './BuildEnvironmentSection';
 
 export default {
diff --git a/client/admin/info/CommitSection.js b/client/admin/info/CommitSection.js
new file mode 100644
index 00000000000..23d71669072
--- /dev/null
+++ b/client/admin/info/CommitSection.js
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import Subtitle from '../../components/basic/Subtitle';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { DescriptionList } from './DescriptionList';
+
+export function CommitSection({ info }) {
+	const t = useTranslation();
+	const { commit = {} } = info;
+
+	return <DescriptionList
+		data-qa='commit-list'
+		title={<Subtitle data-qa='commit-title'>{t('Commit')}</Subtitle>}
+	>
+		<DescriptionList.Entry label={t('Hash')}>{commit.hash}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Date')}>{commit.date}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Branch')}>{commit.branch}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Tag')}>{commit.tag}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Author')}>{commit.author}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Subject')}>{commit.subject}</DescriptionList.Entry>
+	</DescriptionList>;
+}
diff --git a/app/ui-admin/client/components/info/CommitSection.stories.js b/client/admin/info/CommitSection.stories.js
similarity index 100%
rename from app/ui-admin/client/components/info/CommitSection.stories.js
rename to client/admin/info/CommitSection.stories.js
diff --git a/client/admin/info/DescriptionList.js b/client/admin/info/DescriptionList.js
new file mode 100644
index 00000000000..d680e93ebcc
--- /dev/null
+++ b/client/admin/info/DescriptionList.js
@@ -0,0 +1,23 @@
+import { Box, Table } from '@rocket.chat/fuselage';
+import React from 'react';
+
+const style = { wordBreak: 'break-word' };
+
+export const DescriptionList = ({ children, title, ...props }) => <>
+	{title && <Box display='flex' justifyContent='flex-end' width='30%' paddingInline='x8'>
+		{title}
+	</Box>}
+	<Table striped marginBlockEnd='x32' width='full' {...props}>
+		<Table.Body>
+			{children}
+		</Table.Body>
+	</Table>
+</>;
+
+const Entry = ({ children, label, ...props }) =>
+	<Table.Row {...props}>
+		<Table.Cell is='th' scope='col' width='30%' align='end' color='hint' backgroundColor='surface' fontScale='p2' style={style}>{label}</Table.Cell>
+		<Table.Cell width='70%' align='start' color='default' style={style}>{children}</Table.Cell>
+	</Table.Row>;
+
+DescriptionList.Entry = Entry;
diff --git a/app/ui-admin/client/components/info/DescriptionList.stories.js b/client/admin/info/DescriptionList.stories.js
similarity index 86%
rename from app/ui-admin/client/components/info/DescriptionList.stories.js
rename to client/admin/info/DescriptionList.stories.js
index c53baaf5dd1..4571c2476db 100644
--- a/app/ui-admin/client/components/info/DescriptionList.stories.js
+++ b/client/admin/info/DescriptionList.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { DescriptionList } from './DescriptionList';
-import { Page } from '../../../../../client/components/basic/Page';
+import Page from '../../components/basic/Page';
 
 export default {
 	title: 'admin/info/DescriptionList',
diff --git a/app/ui-admin/client/components/info/InformationPage.js b/client/admin/info/InformationPage.js
similarity index 51%
rename from app/ui-admin/client/components/info/InformationPage.js
rename to client/admin/info/InformationPage.js
index 055f3d5299c..1da56cc3c75 100644
--- a/app/ui-admin/client/components/info/InformationPage.js
+++ b/client/admin/info/InformationPage.js
@@ -1,9 +1,8 @@
-import { Button, ButtonGroup, Callout, Icon, Margins } from '@rocket.chat/fuselage';
+import { Box, Button, ButtonGroup, Callout, Icon } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { Link } from '../../../../../client/components/basic/Link';
-import { Page } from '../../../../../client/components/basic/Page';
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import Page from '../../components/basic/Page';
+import { useTranslation } from '../../contexts/TranslationContext';
 import { RocketChatSection } from './RocketChatSection';
 import { CommitSection } from './CommitSection';
 import { RuntimeEnvironmentSection } from './RuntimeEnvironmentSection';
@@ -41,27 +40,36 @@ export function InformationPage({
 				</ButtonGroup>}
 		</Page.Header>
 
-		<Page.Content>
-			{alertOplogForMultipleInstances
-				&& <Margins blockEnd='x16'>
-					<Callout type='danger' title={t('Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances')}>
+		<Page.ScrollableContentWithShadow>
+			<Box marginBlock='none' marginInline='auto' width='full'>
+				{alertOplogForMultipleInstances && <Callout
+					type='danger'
+					title={t('Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances')}
+					marginBlockEnd='x16'
+				>
+					<Box withRichContent>
 						<p>
 							{t('Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details')}
 						</p>
 						<p>
-							<Link external href='https://rocket.chat/docs/installation/manual-installation/multiple-instances-to-improve-performance/#running-multiple-instances-per-host-to-improve-performance'>
+							<a
+								rel='noopener noreferrer'
+								target='_blank'
+								href={'https://rocket.chat/docs/installation/manual-installation/multiple-instances-to-improve-'
+							+ 'performance/#running-multiple-instances-per-host-to-improve-performance'}>
 								{t('Click_here_for_more_info')}
-							</Link>
+							</a>
 						</p>
-					</Callout>
-				</Margins>}
+					</Box>
+				</Callout>}
 
-			{canViewStatistics && <RocketChatSection info={info} statistics={statistics} isLoading={isLoading} />}
-			<CommitSection info={info} />
-			{canViewStatistics && <RuntimeEnvironmentSection statistics={statistics} isLoading={isLoading} />}
-			<BuildEnvironmentSection info={info} />
-			{canViewStatistics && <UsageSection statistics={statistics} isLoading={isLoading} />}
-			<InstancesSection instances={instances} />
-		</Page.Content>
+				{canViewStatistics && <RocketChatSection info={info} statistics={statistics} isLoading={isLoading} />}
+				<CommitSection info={info} />
+				{canViewStatistics && <RuntimeEnvironmentSection statistics={statistics} isLoading={isLoading} />}
+				<BuildEnvironmentSection info={info} />
+				{canViewStatistics && <UsageSection statistics={statistics} isLoading={isLoading} />}
+				<InstancesSection instances={instances} />
+			</Box>
+		</Page.ScrollableContentWithShadow>
 	</Page>;
 }
diff --git a/app/ui-admin/client/components/info/InformationPage.stories.js b/client/admin/info/InformationPage.stories.js
similarity index 98%
rename from app/ui-admin/client/components/info/InformationPage.stories.js
rename to client/admin/info/InformationPage.stories.js
index f337ee71aa6..fee5326ea4d 100644
--- a/app/ui-admin/client/components/info/InformationPage.stories.js
+++ b/client/admin/info/InformationPage.stories.js
@@ -2,7 +2,7 @@ import { action } from '@storybook/addon-actions';
 import { boolean, object } from '@storybook/addon-knobs/react';
 import React from 'react';
 
-import { dummyDate } from '../../../../../.storybook/helpers';
+import { dummyDate } from '../../../.storybook/helpers';
 import { InformationPage } from './InformationPage';
 
 export default {
diff --git a/app/ui-admin/client/components/info/InformationRoute.js b/client/admin/info/InformationRoute.js
similarity index 89%
rename from app/ui-admin/client/components/info/InformationRoute.js
rename to client/admin/info/InformationRoute.js
index 5ac48677b18..1e9a419d6ae 100644
--- a/app/ui-admin/client/components/info/InformationRoute.js
+++ b/client/admin/info/InformationRoute.js
@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
 
-import { usePermission } from '../../../../../client/contexts/AuthorizationContext';
-import { useMethod, useServerInformation, useEndpoint } from '../../../../../client/contexts/ServerContext';
-import { downloadJsonAsAFile } from '../../../../../client/helpers/download';
+import { usePermission } from '../../contexts/AuthorizationContext';
+import { useMethod, useServerInformation, useEndpoint } from '../../contexts/ServerContext';
+import { downloadJsonAsAFile } from '../../helpers/download';
 import { InformationPage } from './InformationPage';
 
 export function InformationRoute() {
diff --git a/app/ui-admin/client/components/info/InstancesSection.js b/client/admin/info/InstancesSection.js
similarity index 71%
rename from app/ui-admin/client/components/info/InstancesSection.js
rename to client/admin/info/InstancesSection.js
index c2643c97c1c..58f5408a265 100644
--- a/app/ui-admin/client/components/info/InstancesSection.js
+++ b/client/admin/info/InstancesSection.js
@@ -1,21 +1,21 @@
-import { Subtitle } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import Subtitle from '../../components/basic/Subtitle';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
 import { DescriptionList } from './DescriptionList';
-import { formatDate } from './formatters';
 
 export function InstancesSection({ instances }) {
 	const t = useTranslation();
+	const formatDateAndTime = useFormatDateAndTime();
 
 	if (!instances || !instances.length) {
 		return null;
 	}
 
 	return <>
-		<Subtitle>{t('Broadcast_Connected_Instances')}</Subtitle>
 		{instances.map(({ address, broadcastAuth, currentStatus, instanceRecord }, i) =>
-			<DescriptionList key={i}>
+			<DescriptionList key={i} title={<Subtitle>{t('Broadcast_Connected_Instances')}</Subtitle>}>
 				<DescriptionList.Entry label={t('Address')}>{address}</DescriptionList.Entry>
 				<DescriptionList.Entry label={t('Auth')}>{broadcastAuth ? 'true' : 'false'}</DescriptionList.Entry>
 				<DescriptionList.Entry label={<>{t('Current_Status')} > {t('Connected')}</>}>{currentStatus.connected ? 'true' : 'false'}</DescriptionList.Entry>
@@ -23,8 +23,8 @@ export function InstancesSection({ instances }) {
 				<DescriptionList.Entry label={<>{t('Current_Status')} > {t('Status')}</>}>{currentStatus.status}</DescriptionList.Entry>
 				<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('ID')}</>}>{instanceRecord._id}</DescriptionList.Entry>
 				<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('PID')}</>}>{instanceRecord.pid}</DescriptionList.Entry>
-				<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('Created_at')}</>}>{formatDate(instanceRecord._createdAt)}</DescriptionList.Entry>
-				<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('Updated_at')}</>}>{formatDate(instanceRecord._updatedAt)}</DescriptionList.Entry>
+				<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('Created_at')}</>}>{formatDateAndTime(instanceRecord._createdAt)}</DescriptionList.Entry>
+				<DescriptionList.Entry label={<>{t('Instance_Record')} > {t('Updated_at')}</>}>{formatDateAndTime(instanceRecord._updatedAt)}</DescriptionList.Entry>
 			</DescriptionList>,
 		)}
 	</>;
diff --git a/app/ui-admin/client/components/info/InstancesSection.stories.js b/client/admin/info/InstancesSection.stories.js
similarity index 92%
rename from app/ui-admin/client/components/info/InstancesSection.stories.js
rename to client/admin/info/InstancesSection.stories.js
index 4b93772d893..948f197d3f8 100644
--- a/app/ui-admin/client/components/info/InstancesSection.stories.js
+++ b/client/admin/info/InstancesSection.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { dummyDate } from '../../../../../.storybook/helpers';
+import { dummyDate } from '../../../.storybook/helpers';
 import { InstancesSection } from './InstancesSection';
 
 export default {
diff --git a/client/admin/info/RocketChatSection.js b/client/admin/info/RocketChatSection.js
new file mode 100644
index 00000000000..03bf46584ca
--- /dev/null
+++ b/client/admin/info/RocketChatSection.js
@@ -0,0 +1,34 @@
+import { Skeleton } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import Subtitle from '../../components/basic/Subtitle';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
+import { useFormatDuration } from '../../hooks/useFormatDuration';
+import { DescriptionList } from './DescriptionList';
+
+export function RocketChatSection({ info, statistics, isLoading }) {
+	const t = useTranslation();
+	const formatDateAndTime = useFormatDateAndTime();
+	const formatDuration = useFormatDuration();
+
+	const s = (fn) => (isLoading ? <Skeleton width='50%' /> : fn());
+
+	const appsEngineVersion = info && info.marketplaceApiVersion;
+
+	return <DescriptionList
+		data-qa='rocket-chat-list'
+		title={<Subtitle data-qa='rocket-chat-title'>{t('Rocket.Chat')}</Subtitle>}
+	>
+		<DescriptionList.Entry label={t('Version')}>{s(() => statistics.version)}</DescriptionList.Entry>
+		{appsEngineVersion && <DescriptionList.Entry label={t('Apps_Engine_Version')}>{appsEngineVersion}</DescriptionList.Entry>}
+		<DescriptionList.Entry label={t('DB_Migration')}>{s(() => statistics.migration.version)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('DB_Migration_Date')}>{s(() => formatDateAndTime(statistics.migration.lockedAt))}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Installed_at')}>{s(() => formatDateAndTime(statistics.installedAt))}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Uptime')}>{s(() => formatDuration(statistics.process.uptime))}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Deployment_ID')}>{s(() => statistics.uniqueId)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('PID')}>{s(() => statistics.process.pid)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Running_Instances')}>{s(() => statistics.instanceCount)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OpLog')}>{s(() => (statistics.oplogEnabled ? t('Enabled') : t('Disabled')))}</DescriptionList.Entry>
+	</DescriptionList>;
+}
diff --git a/app/ui-admin/client/components/info/RocketChatSection.stories.js b/client/admin/info/RocketChatSection.stories.js
similarity index 92%
rename from app/ui-admin/client/components/info/RocketChatSection.stories.js
rename to client/admin/info/RocketChatSection.stories.js
index ec1d148d682..71046e11ba9 100644
--- a/app/ui-admin/client/components/info/RocketChatSection.stories.js
+++ b/client/admin/info/RocketChatSection.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { dummyDate } from '../../../../../.storybook/helpers';
+import { dummyDate } from '../../../.storybook/helpers';
 import { RocketChatSection } from './RocketChatSection';
 
 export default {
diff --git a/client/admin/info/RuntimeEnvironmentSection.js b/client/admin/info/RuntimeEnvironmentSection.js
new file mode 100644
index 00000000000..3dddf52e129
--- /dev/null
+++ b/client/admin/info/RuntimeEnvironmentSection.js
@@ -0,0 +1,43 @@
+import { Skeleton } from '@rocket.chat/fuselage';
+import React from 'react';
+import s from 'underscore.string';
+
+import Subtitle from '../../components/basic/Subtitle';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useFormatMemorySize } from '../../hooks/useFormatMemorySize';
+import { useFormatDuration } from '../../hooks/useFormatDuration';
+import { DescriptionList } from './DescriptionList';
+
+const formatCPULoad = (load) => {
+	if (!load) {
+		return null;
+	}
+
+	const [oneMinute, fiveMinutes, fifteenMinutes] = load;
+	return `${ s.numberFormat(oneMinute, 2) }, ${ s.numberFormat(fiveMinutes, 2) }, ${ s.numberFormat(fifteenMinutes, 2) }`;
+};
+
+export function RuntimeEnvironmentSection({ statistics, isLoading }) {
+	const s = (fn) => (isLoading ? <Skeleton width='50%' /> : fn());
+	const t = useTranslation();
+	const formatMemorySize = useFormatMemorySize();
+	const formatDuration = useFormatDuration();
+
+	return <DescriptionList
+		data-qa='runtime-env-list'
+		title={<Subtitle data-qa='runtime-env-title'>{t('Runtime_Environment')}</Subtitle>}
+	>
+		<DescriptionList.Entry label={t('OS_Type')}>{s(() => statistics.os.type)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Platform')}>{s(() => statistics.os.platform)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Arch')}>{s(() => statistics.os.arch)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Release')}>{s(() => statistics.os.release)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Node_version')}>{s(() => statistics.process.nodeVersion)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Mongo_version')}>{s(() => statistics.mongoVersion)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Mongo_storageEngine')}>{s(() => statistics.mongoStorageEngine)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Uptime')}>{s(() => formatDuration(statistics.os.uptime))}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Loadavg')}>{s(() => formatCPULoad(statistics.os.loadavg))}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Totalmem')}>{s(() => formatMemorySize(statistics.os.totalmem))}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Freemem')}>{s(() => formatMemorySize(statistics.os.freemem))}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('OS_Cpus')}>{s(() => statistics.os.cpus.length)}</DescriptionList.Entry>
+	</DescriptionList>;
+}
diff --git a/app/ui-admin/client/components/info/RuntimeEnvironmentSection.stories.js b/client/admin/info/RuntimeEnvironmentSection.stories.js
similarity index 100%
rename from app/ui-admin/client/components/info/RuntimeEnvironmentSection.stories.js
rename to client/admin/info/RuntimeEnvironmentSection.stories.js
diff --git a/client/admin/info/UsageSection.js b/client/admin/info/UsageSection.js
new file mode 100644
index 00000000000..75a4c014b0e
--- /dev/null
+++ b/client/admin/info/UsageSection.js
@@ -0,0 +1,52 @@
+import { Skeleton } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import Subtitle from '../../components/basic/Subtitle';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useFormatMemorySize } from '../../hooks/useFormatMemorySize';
+import { DescriptionList } from './DescriptionList';
+
+export function UsageSection({ statistics, isLoading }) {
+	const s = (fn) => (isLoading ? <Skeleton width='50%' /> : fn());
+	const formatMemorySize = useFormatMemorySize();
+	const t = useTranslation();
+
+	return <DescriptionList
+		data-qa='usage-list'
+		title={<Subtitle data-qa='usage-title'>{t('Usage')}</Subtitle>}
+	>
+		<DescriptionList.Entry label={t('Stats_Total_Users')}>{s(() => statistics.totalUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Active_Users')}>{s(() => statistics.activeUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Active_Guests')}>{s(() => statistics.activeGuests)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_App_Users')}>{s(() => statistics.appUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Non_Active_Users')}>{s(() => statistics.nonActiveUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Connected_Users')}>{s(() => statistics.totalConnectedUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Online_Users')}>{s(() => statistics.onlineUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Away_Users')}>{s(() => statistics.awayUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Offline_Users')}>{s(() => statistics.offlineUsers)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Rooms')}>{s(() => statistics.totalRooms)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Channels')}>{s(() => statistics.totalChannels)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Private_Groups')}>{s(() => statistics.totalPrivateGroups)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Direct_Messages')}>{s(() => statistics.totalDirect)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Livechat_Rooms')}>{s(() => statistics.totalLivechat)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Total_Discussions')}>{s(() => statistics.totalDiscussions)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Total_Threads')}>{s(() => statistics.totalThreads)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Messages')}>{s(() => statistics.totalMessages)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Messages_Channel')}>{s(() => statistics.totalChannelMessages)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Messages_PrivateGroup')}>{s(() => statistics.totalPrivateGroupMessages)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Messages_Direct')}>{s(() => statistics.totalDirectMessages)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Messages_Livechat')}>{s(() => statistics.totalLivechatMessages)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Uploads')}>{s(() => statistics.uploadsTotal)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Uploads_Size')}>{s(() => formatMemorySize(statistics.uploadsTotalSize))}</DescriptionList.Entry>
+		{statistics && statistics.apps && <>
+			<DescriptionList.Entry label={t('Stats_Total_Installed_Apps')}>{statistics.apps.totalInstalled}</DescriptionList.Entry>
+			<DescriptionList.Entry label={t('Stats_Total_Active_Apps')}>{statistics.apps.totalActive}</DescriptionList.Entry>
+		</>}
+		<DescriptionList.Entry label={t('Stats_Total_Integrations')}>{s(() => statistics.integrations.totalIntegrations)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Incoming_Integrations')}>{s(() => statistics.integrations.totalIncoming)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Active_Incoming_Integrations')}>{s(() => statistics.integrations.totalIncomingActive)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Outgoing_Integrations')}>{s(() => statistics.integrations.totalOutgoing)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Active_Outgoing_Integrations')}>{s(() => statistics.integrations.totalOutgoingActive)}</DescriptionList.Entry>
+		<DescriptionList.Entry label={t('Stats_Total_Integrations_With_Script_Enabled')}>{s(() => statistics.integrations.totalWithScriptEnabled)}</DescriptionList.Entry>
+	</DescriptionList>;
+}
diff --git a/app/ui-admin/client/components/info/UsageSection.stories.js b/client/admin/info/UsageSection.stories.js
similarity index 100%
rename from app/ui-admin/client/components/info/UsageSection.stories.js
rename to client/admin/info/UsageSection.stories.js
diff --git a/client/admin/invites/InvitesPage.js b/client/admin/invites/InvitesPage.js
new file mode 100644
index 00000000000..ca12b21c2c7
--- /dev/null
+++ b/client/admin/invites/InvitesPage.js
@@ -0,0 +1,158 @@
+import {
+	Button,
+	Icon,
+	Table,
+	Box,
+} from '@rocket.chat/fuselage';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import React, { useState, useEffect } from 'react';
+import moment from 'moment';
+
+import Page from '../../components/basic/Page';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useEndpoint } from '../../contexts/ServerContext';
+import { useModal } from '../../hooks/useModal';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { GenericTable } from '../../../app/ui/client/components/GenericTable';
+import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
+
+
+function InviteRow({ _id, createdAt, expires, days, uses, maxUses, onRemove }) {
+	const t = useTranslation();
+	const formatDateAndTime = useFormatDateAndTime();
+	const modal = useModal();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const removeInvite = useEndpoint('DELETE', `removeInvite/${ _id }`);
+
+	const daysToExpire = ({ expires, days }) => {
+		if (days > 0) {
+			if (expires < Date.now()) {
+				return t('Expired');
+			}
+
+			return moment(expires).fromNow(true);
+		}
+
+		return t('Never');
+	};
+
+	const maxUsesLeft = ({ maxUses, uses }) => {
+		if (maxUses > 0) {
+			if (uses >= maxUses) {
+				return 0;
+			}
+
+			return maxUses - uses;
+		}
+
+		return t('Unlimited');
+	};
+
+	const handleRemoveButtonClick = async (event) => {
+		event.stopPropagation();
+
+		modal.open({ // TODO REFACTOR
+			text: t('Are_you_sure_you_want_to_delete_this_record'),
+			type: 'warning',
+			showCancelButton: true,
+			confirmButtonColor: '#DD6B55',
+			confirmButtonText: t('Yes'),
+			cancelButtonText: t('No'),
+			closeOnConfirm: true,
+			html: false,
+		}, async (confirmed) => {
+			if (!confirmed) {
+				return;
+			}
+
+			try {
+				await removeInvite();
+				onRemove && onRemove(_id);
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			}
+		});
+	};
+
+	const notSmall = useMediaQuery('(min-width: 768px)');
+
+	return <Table.Row>
+		<Table.Cell>
+			<Box color='hint' fontScale='p1'>{_id}</Box>
+		</Table.Cell>
+		{notSmall && <>
+			<Table.Cell>
+				{formatDateAndTime(createdAt)}
+			</Table.Cell>
+			<Table.Cell>
+				{daysToExpire({ expires, days })}
+			</Table.Cell>
+			<Table.Cell>
+				{uses}
+			</Table.Cell>
+			<Table.Cell>
+				{maxUsesLeft({ maxUses, uses })}
+			</Table.Cell>
+		</>}
+		<Table.Cell>
+			<Button ghost danger small square onClick={handleRemoveButtonClick}>
+				<Icon name='cross' size='x20' />
+			</Button>
+		</Table.Cell>
+	</Table.Row>;
+}
+
+function InvitesPage() {
+	const t = useTranslation();
+
+	const [invites, setInvites] = useState([]);
+
+	const listInvites = useEndpoint('GET', 'listInvites');
+
+	useEffect(() => {
+		const loadInvites = async () => {
+			const result = await listInvites() || [];
+
+			const invites = result.map((data) => ({
+				...data,
+				createdAt: new Date(data.createdAt),
+				expires: data.expires ? new Date(data.expires) : '',
+			}));
+
+			setInvites(invites);
+		};
+
+		loadInvites();
+	}, []);
+
+	const handleInviteRemove = (_id) => {
+		setInvites((invites = []) => invites.filter((invite) => invite._id !== _id));
+	};
+
+	const notSmall = useMediaQuery('(min-width: 768px)');
+
+	return <Page>
+		<Page.Header title={t('Invites')} />
+		<Page.Content>
+			<GenericTable
+				results={invites}
+				header={
+					<>
+						<Table.Cell is='th' width={notSmall ? '20%' : '80%'}>{t('Token')}</Table.Cell>
+						{ notSmall && <>
+							<Table.Cell is='th' width='35%'>{t('Created_at')}</Table.Cell>
+							<Table.Cell is='th' width='20%'>{t('Expiration')}</Table.Cell>
+							<Table.Cell is='th' width='10%'>{t('Uses')}</Table.Cell>
+							<Table.Cell is='th' width='10%'>{t('Uses_left')}</Table.Cell>
+						</>}
+						<Table.Cell is='th' />
+					</>
+				}
+				renderRow={(invite) => <InviteRow key={invite._id} {...invite} onRemove={handleInviteRemove} />}
+			/>
+		</Page.Content>
+	</Page>;
+}
+
+export default InvitesPage;
diff --git a/client/admin/invites/InvitesRoute.js b/client/admin/invites/InvitesRoute.js
new file mode 100644
index 00000000000..bb7a8f951f9
--- /dev/null
+++ b/client/admin/invites/InvitesRoute.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { usePermission } from '../../contexts/AuthorizationContext';
+import NotAuthorizedPage from '../NotAuthorizedPage';
+import InvitesPage from './InvitesPage';
+
+function InvitesRoute() {
+	const canCreateInviteLinks = usePermission('create-invite-links');
+
+	if (!canCreateInviteLinks) {
+		return <NotAuthorizedPage />;
+	}
+
+	return <InvitesPage />;
+}
+
+export default InvitesRoute;
diff --git a/app/ui-admin/client/components/mailer/Mailer.js b/client/admin/mailer/Mailer.js
similarity index 65%
rename from app/ui-admin/client/components/mailer/Mailer.js
rename to client/admin/mailer/Mailer.js
index 7c3d6c8acb8..b96718bad53 100644
--- a/app/ui-admin/client/components/mailer/Mailer.js
+++ b/client/admin/mailer/Mailer.js
@@ -1,23 +1,30 @@
 import React, { useState } from 'react';
 import { TextInput, TextAreaInput, Field, FieldGroup, CheckBox, Button, Icon, ButtonGroup } from '@rocket.chat/fuselage';
 
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
-import { Page } from '../../../../../client/components/basic/Page';
-import { isEmail } from '../../../../utils/lib/isEmail.js';
-import { isJSON } from '../../../../utils/lib/isJSON.js';
+import { isEmail } from '../../../app/utils/lib/isEmail.js';
+import { isJSON } from '../../../app/utils/lib/isJSON.js';
+import Page from '../../components/basic/Page';
+import RawText from '../../components/basic/RawText';
+import { useTranslation } from '../../contexts/TranslationContext';
 
-export function Mailer({ sendMail = () => {}, ...props }) {
+export function Mailer({ sendMail = () => {} }) {
 	const t = useTranslation();
 
-	const [fromEmail, setFromEmail] = useState({ value: '', error: false });
+	const [fromEmail, setFromEmail] = useState({ value: '' });
 	const [dryRun, setDryRun] = useState(false);
-	const [query, setQuery] = useState({ value: '', error: false });
+	const [query, setQuery] = useState({ value: '' });
 	const [subject, setSubject] = useState('');
 	const [emailBody, setEmailBody] = useState('');
 
-	return <Page _id='mailer' {...props}>
-		<Page.Header title={t('Mailer')}></Page.Header>
-		<Page.ContentShadowScroll alignSelf='center' w='100%' display='flex' flexDirection='column' alignItems='center'>
+	return <Page>
+		<Page.Header title={t('Mailer')}>
+			<ButtonGroup align='end'>
+				<Button primary onClick={() => { sendMail({ fromEmail, dryRun, query, subject, emailBody }); }}>
+					<Icon name='send' size='x20' mie='x8'/>{t('Send_email')}
+				</Button>
+			</ButtonGroup>
+		</Page.Header>
+		<Page.ScrollableContentWithShadow alignSelf='center' w='100%' display='flex' flexDirection='column' alignItems='center'>
 			<FieldGroup maxWidth='x600' is='form' method='post'>
 				<Field>
 					<Field.Label>{t('From')}</Field.Label>
@@ -30,7 +37,7 @@ export function Mailer({ sendMail = () => {}, ...props }) {
 							onChange={(e) => {
 								setFromEmail({
 									value: e.currentTarget.value,
-									error: !isEmail(e.currentTarget.value),
+									error: !isEmail(e.currentTarget.value) ? t('Invalid_Email') : undefined,
 								});
 							}}
 						/>
@@ -58,7 +65,7 @@ export function Mailer({ sendMail = () => {}, ...props }) {
 							onChange={(e) => {
 								setQuery({
 									value: e.currentTarget.value,
-									error: e.currentTarget.value && !isJSON(e.currentTarget.value),
+									error: e.currentTarget.value && !isJSON(e.currentTarget.value) ? t('Invalid_JSON') : undefined,
 								});
 							}}
 						/>
@@ -88,12 +95,11 @@ export function Mailer({ sendMail = () => {}, ...props }) {
 							onChange={(e) => setEmailBody(e.currentTarget.value)}
 						/>
 					</Field.Row>
-					<Field.Hint dangerouslySetInnerHTML={{ __html: t('Mailer_body_tags') }}></Field.Hint>
+					<Field.Hint>
+						<RawText>{t('Mailer_body_tags')}</RawText>
+					</Field.Hint>
 				</Field>
-				<ButtonGroup align='end'>
-					<Button primary onClick={() => { sendMail({ fromEmail, dryRun, query, subject, emailBody }); }}><Icon name='send' size='x20' mie='x8'/>{t('Send_email')}</Button>
-				</ButtonGroup>
 			</FieldGroup>
-		</Page.ContentShadowScroll>
+		</Page.ScrollableContentWithShadow>
 	</Page>;
 }
diff --git a/app/ui-admin/client/components/mailer/Mailer.stories.js b/client/admin/mailer/Mailer.stories.js
similarity index 100%
rename from app/ui-admin/client/components/mailer/Mailer.stories.js
rename to client/admin/mailer/Mailer.stories.js
diff --git a/app/ui-admin/client/components/mailer/MailerRoute.js b/client/admin/mailer/MailerRoute.js
similarity index 73%
rename from app/ui-admin/client/components/mailer/MailerRoute.js
rename to client/admin/mailer/MailerRoute.js
index a1ebfdf8f4c..0b70fba2758 100644
--- a/app/ui-admin/client/components/mailer/MailerRoute.js
+++ b/client/admin/mailer/MailerRoute.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import toastr from 'toastr';
 
-import { usePermission } from '../../../../../client/contexts/AuthorizationContext';
-import { useMethod } from '../../../../../client/contexts/ServerContext';
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import { usePermission } from '../../contexts/AuthorizationContext';
+import { useMethod } from '../../contexts/ServerContext';
+import { useTranslation } from '../../contexts/TranslationContext';
 import { Mailer } from './Mailer';
 import NotAuthorizedPage from '../NotAuthorizedPage';
 
@@ -29,7 +29,7 @@ const useSendMail = () => {
 	};
 };
 
-export default function MailerRoute(props) {
+export default function MailerRoute() {
 	const canAccessMailer = usePermission('access-mailer');
 	const sendMail = useSendMail();
 
@@ -37,5 +37,5 @@ export default function MailerRoute(props) {
 		return <NotAuthorizedPage/>;
 	}
 
-	return <Mailer sendMail={sendMail} {...props} />;
+	return <Mailer sendMail={sendMail} />;
 }
diff --git a/client/admin/rooms/EditRoom.js b/client/admin/rooms/EditRoom.js
new file mode 100644
index 00000000000..d60ca438a58
--- /dev/null
+++ b/client/admin/rooms/EditRoom.js
@@ -0,0 +1,191 @@
+import React, { useCallback, useState, useMemo } from 'react';
+import { Box, Headline, Button, Margins, TextInput, Skeleton, Field, ToggleSwitch, Divider, Icon, Callout } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../hooks/useEndpointDataExperimental';
+import { roomTypes } from '../../../app/utils/client';
+import { useMethod } from '../../contexts/ServerContext';
+import { usePermission } from '../../contexts/AuthorizationContext';
+import NotAuthorizedPage from '../NotAuthorizedPage';
+import { useEndpointAction } from '../../hooks/useEndpointAction';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+export function EditRoomContextBar({ rid }) {
+	const canViewRoomAdministration = usePermission('view-room-administration');
+	return canViewRoomAdministration ? <EditRoomWithData rid={rid}/> : <NotAuthorizedPage/>;
+}
+
+function EditRoomWithData({ rid }) {
+	const [cache, setState] = useState();
+
+	const { data = {}, state, error } = useEndpointDataExperimental('rooms.adminRooms.getRoom', useMemo(() => ({ rid }), [rid, cache]));
+
+	if (state === ENDPOINT_STATES.LOADING) {
+		return <Box w='full' pb='x24'>
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8' />
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8'/>
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8'/>
+		</Box>;
+	}
+
+	if (state === ENDPOINT_STATES.ERROR) {
+		return error.message;
+	}
+
+	return <EditRoom room={data} onChange={() => setState(new Date())}/>;
+}
+
+function EditRoom({ room, onChange }) {
+	const t = useTranslation();
+
+	const [deleted, setDeleted] = useState(false);
+	const [newData, setNewData] = useState({});
+	const [changeArchivation, setChangeArchivation] = useState(false);
+
+	const canDelete = usePermission(`delete-${ room.t }`);
+
+	const hasUnsavedChanges = useMemo(() => Object.values(newData).filter((current) => current === null).length < Object.keys(newData).length, [JSON.stringify(newData)]);
+	const saveQuery = useMemo(() => ({ rid: room._id, ...Object.fromEntries(Object.entries(newData).filter(([, value]) => value !== null)) }), [room._id, JSON.stringify(newData)]);
+
+	const archiveSelector = room.archived ? 'unarchive' : 'archive';
+	const archiveMessage = archiveSelector === 'archive' ? 'Room_has_been_archived' : 'Room_has_been_archived';
+	const archiveQuery = useMemo(() => ({ rid: room._id, action: room.archived ? 'unarchive' : 'archive' }), [room.rid, changeArchivation]);
+
+	const saveAction = useEndpointAction('POST', 'rooms.saveRoomSettings', saveQuery, t('Room_updated_successfully'));
+	const archiveAction = useEndpointAction('POST', 'rooms.changeArchivationState', archiveQuery, t(archiveMessage));
+
+	const updateType = (type) => () => (type === 'p' ? 'c' : 'p');
+	const areEqual = (a, b) => a === b || !(a || b);
+
+	const handleChange = (field, currentValue, getValue = (e) => e.currentTarget.value) => (e) => setNewData({ ...newData, [field]: areEqual(getValue(e), currentValue) ? null : getValue(e) });
+	const handleSave = async () => {
+		await Promise.all([hasUnsavedChanges && saveAction(), changeArchivation && archiveAction()].filter(Boolean));
+		onChange('update');
+	};
+
+	const deleteRoom = useMethod('eraseRoom');
+
+	const handleDelete = useCallback(async () => {
+		await deleteRoom(room._id);
+		setDeleted(true);
+	}, [room]);
+
+	const roomName = room.t === 'd' ? room.usernames.join(' x ') : roomTypes.getRoomName(room.t, { type: room.t, ...room });
+	const roomType = newData.roomType ?? room.t;
+	const readOnly = newData.readOnly ?? !!room.ro;
+	const isArchived = changeArchivation ? !room.archived : !!room.archived;
+	const isDefault = newData.default ?? !!room.default;
+	const isFavorite = newData.favorite ?? !!room.favorite;
+	const isFeatured = newData.featured ?? !!room.featured;
+
+	return <VerticalBar.ScrollableContent is='form'>
+		{deleted && <Callout type='danger' title={t('Room_has_been_deleted')}></Callout>}
+
+		<Field>
+			<Field.Label>{t('Name')}</Field.Label>
+			<Field.Row>
+				<TextInput disabled={deleted || room.t === 'd'} value={newData.roomName ?? roomName} onChange={handleChange('roomName', roomName)} flexGrow={1}/>
+			</Field.Row>
+		</Field>
+		{ room.t !== 'd' && <>
+			<Field>
+				<Field.Label>{t('Owner')}</Field.Label>
+				<Field.Row>
+					<Box fontScale='p1'>{room.u?.username}</Box>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Label>{t('Topic')}</Field.Label>
+				<Field.Row>
+					<TextInput disabled={deleted} value={(newData.roomTopic ?? room.topic) || ''} onChange={handleChange('roomTopic', room.topic)} flexGrow={1}/>
+				</Field.Row>
+			</Field>
+			<Field mbs='x20'>
+				<Field.Row>
+					<Box display='flex' flexDirection='row' alignItems='flex-start'>
+						<Box display='flex' flexDirection='column' alignItems='flex-end' flexGrow='1' color={roomType !== 'c' ? 'hint' : 'default'}>
+							<Box fontScale='s1'>{t('Public')}</Box>
+							<Box fontScale='p1' style={{ textAlign: 'end' }}>{t('All_users_in_the_channel_can_write_new_messages')}</Box>
+						</Box>
+						<Margins inline='x16'>
+							<ToggleSwitch disabled={deleted} checked={roomType === 'p'} onChange={handleChange('roomType', room.t, updateType(roomType))}/>
+						</Margins>
+						<Box display='flex' flexDirection='column' alignItems='flex-start' flexGrow='1' color={roomType !== 'p' ? 'hint' : 'default'}>
+							<Box fontScale='s1'>{t('Private')}</Box>
+							<Box fontScale='p1' style={{ textAlign: 'start' }}>{t('Just_invited_people_can_access_this_channel')}</Box>
+						</Box>
+					</Box>
+				</Field.Row>
+				<Divider />
+			</Field>
+			<Field mbs='x20'>
+				<Field.Row>
+					<Box display='flex' flexDirection='row' alignItems='flex-start'>
+						<Box display='flex' flexDirection='column' alignItems='flex-end' flexGrow='1' color={readOnly ? 'hint' : 'default'}>
+							<Box fontScale='s1'>{t('Collaborative')}</Box>
+							<Box fontScale='p1' style={{ textAlign: 'end' }}>{t('All_users_in_the_channel_can_write_new_messages')}</Box>
+						</Box>
+						<Margins inline='x16'>
+							<ToggleSwitch disabled={deleted} checked={readOnly} onChange={handleChange('readOnly', room.ro, () => !readOnly)}/>
+						</Margins>
+						<Box display='flex' flexDirection='column' alignItems='flex-start' flexGrow='1' color={!readOnly ? 'hint' : 'default'}>
+							<Box fontScale='s1'>{t('Read_only')}</Box>
+							<Box fontScale='p1' style={{ textAlign: 'start' }}>{t('Only_authorized_users_can_write_new_messages')}</Box>
+						</Box>
+					</Box>
+				</Field.Row>
+				<Divider />
+			</Field>
+			<Field>
+				<Field.Row>
+					<Box display='flex' flexDirection='row' justifyContent='space-between' flexGrow={1}>
+						<Field.Label>{t('Archived')}</Field.Label>
+						<ToggleSwitch disabled={deleted} checked={isArchived} onChange={() => setChangeArchivation(!changeArchivation)}/>
+					</Box>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<Box display='flex' flexDirection='row' justifyContent='space-between' flexGrow={1}>
+						<Field.Label>{t('Default')}</Field.Label>
+						<ToggleSwitch disabled={deleted} checked={isDefault} onChange={handleChange('default', room.default, () => !isDefault)}/>
+					</Box>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<Box display='flex' flexDirection='row' justifyContent='space-between' flexGrow={1}>
+						<Field.Label>{t('Favorite')}</Field.Label>
+						<ToggleSwitch disabled={deleted} checked={isFavorite} onChange={handleChange('favorite', room.default, () => !isFavorite)}/>
+					</Box>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<Box display='flex' flexDirection='row' justifyContent='space-between' flexGrow={1}>
+						<Field.Label>{t('Featured')}</Field.Label>
+						<ToggleSwitch disabled={deleted} checked={isFeatured} onChange={handleChange('featured', room.default, () => !isFeatured)}/>
+					</Box>
+				</Field.Row>
+			</Field>
+			<Field>
+				<Field.Row>
+					<Box display='flex' flexDirection='row' justifyContent='space-between' w='full'>
+						<Margins inlineEnd='x4'>
+							<Button disabled={deleted} flexGrow={1} type='reset' disabled={!hasUnsavedChanges && !changeArchivation} onClick={() => setNewData({})}>{t('Reset')}</Button>
+							<Button disabled={deleted} mie='none' flexGrow={1} disabled={!hasUnsavedChanges && !changeArchivation} onClick={handleSave}>{t('Save')}</Button>
+						</Margins>
+					</Box>
+				</Field.Row>
+			</Field>
+		</>}
+		<Field>
+			<Field.Row>
+				<Button primary danger disabled={deleted || !canDelete} onClick={handleDelete} display='flex' alignItems='center' justifyContent='center' flexGrow={1}><Icon name='trash' size='x16' />{t('Delete')}</Button>
+			</Field.Row>
+		</Field>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/rooms/RoomsPage.js b/client/admin/rooms/RoomsPage.js
new file mode 100644
index 00000000000..515bdea3101
--- /dev/null
+++ b/client/admin/rooms/RoomsPage.js
@@ -0,0 +1,41 @@
+import React from 'react';
+
+import Page from '../../components/basic/Page';
+import VerticalBar from '../../components/basic/VerticalBar';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useRouteParameter, useRoute } from '../../contexts/RouterContext';
+import { EditRoomContextBar } from './EditRoom';
+import RoomsTable from './RoomsTable';
+
+export function RoomsPage() {
+	const t = useTranslation();
+
+	const context = useRouteParameter('context');
+	const id = useRouteParameter('id');
+
+	const roomsRoute = useRoute('admin-rooms');
+
+	const handleVerticalBarCloseButtonClick = () => {
+		roomsRoute.push({});
+	};
+
+	return <Page flexDirection='row'>
+		<Page>
+			<Page.Header title={t('Rooms')} />
+			<Page.Content>
+				<RoomsTable />
+			</Page.Content>
+		</Page>
+		{context && <VerticalBar>
+			<VerticalBar.Header>
+				{t('Room_Info')}
+				<VerticalBar.Close onClick={handleVerticalBarCloseButtonClick} />
+			</VerticalBar.Header>
+			<VerticalBar.Content>
+				<EditRoomContextBar rid={id} />
+			</VerticalBar.Content>
+		</VerticalBar>}
+	</Page>;
+}
+
+export default RoomsPage;
diff --git a/client/admin/rooms/RoomsRoute.js b/client/admin/rooms/RoomsRoute.js
new file mode 100644
index 00000000000..c8b3e7eb82a
--- /dev/null
+++ b/client/admin/rooms/RoomsRoute.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { usePermission } from '../../contexts/AuthorizationContext';
+import NotAuthorizedPage from '../NotAuthorizedPage';
+import RoomsPage from './RoomsPage';
+
+function RoomsRoute() {
+	const canViewRoomAdministration = usePermission('view-room-administration');
+
+	if (!canViewRoomAdministration) {
+		return <NotAuthorizedPage />;
+	}
+
+	return <RoomsPage />;
+}
+
+export default RoomsRoute;
diff --git a/client/admin/rooms/RoomsTable.js b/client/admin/rooms/RoomsTable.js
new file mode 100644
index 00000000000..e85b975c58d
--- /dev/null
+++ b/client/admin/rooms/RoomsTable.js
@@ -0,0 +1,168 @@
+import { Box, Table, Icon, TextInput, Field, CheckBox, Margins } from '@rocket.chat/fuselage';
+import { useMediaQuery, useUniqueId, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import React, { useMemo, useCallback, useState, useEffect } from 'react';
+
+import { GenericTable, Th } from '../../../app/ui/client/components/GenericTable';
+import { useTranslation } from '../../contexts/TranslationContext';
+import RoomAvatar from '../../components/basic/avatar/RoomAvatar';
+import { roomTypes } from '../../../app/utils/client';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import { useRoute } from '../../contexts/RouterContext';
+
+const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
+
+export const DEFAULT_TYPES = ['d', 'p', 'c'];
+
+export const roomTypeI18nMap = {
+	l: 'Omnichannel',
+	c: 'Channel',
+	d: 'Direct',
+	p: 'Group',
+	discussion: 'Discussion',
+};
+
+const FilterByTypeAndText = ({ setFilter, ...props }) => {
+	const [text, setText] = useState('');
+	const [types, setTypes] = useState({ d: false, c: false, p: false, l: false, discussions: false });
+
+	const t = useTranslation();
+
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+	const handleCheckBox = useCallback((type) => setTypes({ ...types, [type]: !types[type] }), [types]);
+
+	useEffect(() => {
+		if (Object.values(types).filter(Boolean).length === 0) {
+			return setFilter({ text, types: DEFAULT_TYPES });
+		}
+		const _types = Object.entries(types).filter(([, value]) => Boolean(value)).map(([key]) => key);
+		setFilter({ text, types: _types });
+	}, [text, types]);
+
+	const idDirect = useUniqueId();
+	const idDPublic = useUniqueId();
+	const idPrivate = useUniqueId();
+	const idOmnichannel = useUniqueId();
+	const idDiscussions = useUniqueId();
+
+	return <Box mb='x16' is='form' display='flex' flexDirection='column' {...props}>
+		<TextInput flexShrink={0} placeholder={t('Search_Rooms')} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
+		<Field>
+			<Box display='flex' flexDirection='row' flexWrap='wrap' justifyContent='flex-start' mbs='x8' mi='neg-x8'>
+				<Margins inline='x8'>
+					<Field.Row>
+						<CheckBox checked={types.d} id={idDirect} onChange={() => handleCheckBox('d')}/>
+						<Field.Label htmlFor={idDirect} >{t('Direct')}</Field.Label>
+					</Field.Row>
+					<Field.Row>
+						<CheckBox checked={types.c} id={idDPublic} onChange={() => handleCheckBox('c')}/>
+						<Field.Label htmlFor={idDPublic}>{t('Public')}</Field.Label>
+					</Field.Row>
+					<Field.Row>
+						<CheckBox checked={types.p} id={idPrivate} onChange={() => handleCheckBox('p')}/>
+						<Field.Label htmlFor={idPrivate}>{t('Private')}</Field.Label>
+					</Field.Row>
+					<Field.Row>
+						<CheckBox checked={types.l} id={idOmnichannel} onChange={() => handleCheckBox('l')}/>
+						<Field.Label htmlFor={idOmnichannel}>{t('Omnichannel')}</Field.Label>
+					</Field.Row>
+					<Field.Row>
+						<CheckBox checked={types.discussions} id={idDiscussions} onChange={() => handleCheckBox('discussions')}/>
+						<Field.Label htmlFor={idDiscussions}>{t('Discussions')}</Field.Label>
+					</Field.Row>
+				</Margins>
+			</Box>
+		</Field>
+	</Box>;
+};
+
+const useQuery = (params, sort) => useMemo(() => ({
+	filter: params.text || '',
+	types: params.types,
+	sort: JSON.stringify({ [sort[0]]: sort[1] === 'asc' ? 1 : -1 }),
+	...params.itemsPerPage && { count: params.itemsPerPage },
+	...params.current && { offset: params.current },
+}), [JSON.stringify(params), JSON.stringify(sort)]);
+
+function RoomsTable() {
+	const t = useTranslation();
+
+	const mediaQuery = useMediaQuery('(min-width: 1024px)');
+
+	const [params, setParams] = useState({ text: '', types: DEFAULT_TYPES, current: 0, itemsPerPage: 25 });
+	const [sort, setSort] = useState(['name', 'asc']);
+
+	const routeName = 'admin-rooms';
+
+	const debouncedParams = useDebouncedValue(params, 500);
+	const debouncedSort = useDebouncedValue(sort, 500);
+
+	const query = useQuery(debouncedParams, debouncedSort);
+
+	const data = useEndpointData('rooms.adminRooms', query) || {};
+
+	const router = useRoute(routeName);
+
+	const onClick = (rid) => () => router.push({
+		context: 'edit',
+		id: rid,
+	});
+
+	const onHeaderClick = (id) => {
+		const [sortBy, sortDirection] = sort;
+
+		if (sortBy === id) {
+			setSort([id, sortDirection === 'asc' ? 'desc' : 'asc']);
+			return;
+		}
+		setSort([id, 'asc']);
+	};
+
+	if (sort[0] === 'name' && data.rooms) {
+		data.rooms = data.rooms.sort((a, b) => {
+			const aName = a.type === 'd' ? a.usernames.join(' x ') : roomTypes.getRoomName(a.t, a);
+			const bName = b.type === 'd' ? b.usernames.join(' x ') : roomTypes.getRoomName(b.t, b);
+			if (aName === bName) { return 0; }
+			const result = aName < bName ? -1 : 1;
+			return sort[1] === 'asc' ? result : result * -1;
+		});
+	}
+
+	const header = useMemo(() => [
+		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name' w='x200'>{t('Name')}</Th>,
+		<Th key={'type'} direction={sort[1]} active={sort[0] === 't'} onClick={onHeaderClick} sort='t' w='x100'>{t('Type')}</Th>,
+		<Th key={'users'} direction={sort[1]} active={sort[0] === 'usersCount'} onClick={onHeaderClick} sort='usersCount' w='x80'>{t('Users')}</Th>,
+		mediaQuery && <Th key={'messages'} direction={sort[1]} active={sort[0] === 'msgs'} onClick={onHeaderClick} sort='msgs' w='x80'>{t('Msgs')}</Th>,
+		mediaQuery && <Th key={'default'} direction={sort[1]} active={sort[0] === 'default'} onClick={onHeaderClick} sort='default' w='x80' >{t('Default')}</Th>,
+		mediaQuery && <Th key={'featured'} direction={sort[1]} active={sort[0] === 'featured'} onClick={onHeaderClick} sort='featured' w='x80'>{t('Featured')}</Th>,
+	].filter(Boolean), [sort, mediaQuery]);
+
+	const renderRow = useCallback(({ _id, name, t: type, usersCount, msgs, default: isDefault, featured, usernames, ...args }) => {
+		const icon = roomTypes.getIcon({ t: type, usernames, ...args });
+		const roomName = type === 'd' ? usernames.join(' x ') : roomTypes.getRoomName(type, { name, type, _id, ...args });
+
+		return <Table.Row action key={_id} onKeyDown={onClick(_id)} onClick={onClick(_id)} tabIndex={0} role='link'qa-room-id={_id}>
+			<Table.Cell style={style}>
+				<Box display='flex' alignContent='center'>
+					<RoomAvatar size={mediaQuery ? 'x28' : 'x40'} room={{ type, name: roomName, _id, ...args }} />
+					<Box display='flex' style={style} mi='x8'>
+						<Box display='flex' flexDirection='row' alignSelf='center' alignItems='center' style={style}>
+							<Icon mi='x2' name={icon === 'omnichannel' ? 'livechat' : icon} fontScale='p2' color='hint'/><Box fontScale='p2' style={style} color='default'>{roomName}</Box>
+						</Box>
+					</Box>
+				</Box>
+			</Table.Cell>
+			<Table.Cell>
+				<Box color='hint' fontScale='p2' style={style}>{ t(roomTypeI18nMap[type]) }</Box>
+				<Box mi='x4'/>
+			</Table.Cell>
+			<Table.Cell style={style}>{usersCount}</Table.Cell>
+			{mediaQuery && <Table.Cell style={style}>{msgs}</Table.Cell>}
+			{mediaQuery && <Table.Cell style={style}>{isDefault ? t('True') : t('False')}</Table.Cell>}
+			{mediaQuery && <Table.Cell style={style}>{featured ? t('True') : t('False')}</Table.Cell>}
+		</Table.Row>;
+	}, [mediaQuery]);
+
+	return <GenericTable FilterComponent={FilterByTypeAndText} header={header} renderRow={renderRow} results={data.rooms} total={data.total} setParams={setParams} params={params}/>;
+}
+
+export default RoomsTable;
diff --git a/client/admin/routes.js b/client/admin/routes.js
new file mode 100644
index 00000000000..4df15266052
--- /dev/null
+++ b/client/admin/routes.js
@@ -0,0 +1,110 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Meteor } from 'meteor/meteor';
+
+import { renderRouteComponent } from '../reactAdapters';
+
+const routeGroup = FlowRouter.group({
+	name: 'admin',
+	prefix: '/admin',
+});
+
+export const registerAdminRoute = (path, { lazyRouteComponent, props, action, ...options } = {}) => {
+	routeGroup.route(path, {
+		...options,
+		action: (params, queryParams) => {
+			if (action) {
+				action(params, queryParams);
+				return;
+			}
+
+			renderRouteComponent(() => import('./AdministrationRouter'), {
+				template: 'main',
+				region: 'center',
+				propsFn: () => ({ lazyRouteComponent, ...options, params, queryParams, ...props }),
+			});
+		},
+	});
+};
+
+registerAdminRoute('/', {
+	triggersEnter: [(context, redirect) => {
+		redirect('admin-info');
+	}],
+});
+
+registerAdminRoute('/custom-sounds/:context?/:id?', {
+	name: 'custom-sounds',
+	lazyRouteComponent: () => import('./customSounds/AdminSoundsRoute'),
+});
+
+
+registerAdminRoute('/info', {
+	name: 'admin-info',
+	lazyRouteComponent: () => import('./info/InformationRoute'),
+});
+
+registerAdminRoute('/import', {
+	name: 'admin-import',
+	lazyRouteComponent: () => import('./import/ImportRoute'),
+	props: { page: 'history' },
+});
+
+registerAdminRoute('/import/new/:importerKey?', {
+	name: 'admin-import-new',
+	lazyRouteComponent: () => import('./import/ImportRoute'),
+	props: { page: 'new' },
+});
+
+registerAdminRoute('/import/prepare', {
+	name: 'admin-import-prepare',
+	lazyRouteComponent: () => import('./import/ImportRoute'),
+	props: { page: 'prepare' },
+});
+
+registerAdminRoute('/import/progress', {
+	name: 'admin-import-progress',
+	lazyRouteComponent: () => import('./import/ImportRoute'),
+	props: { page: 'progress' },
+});
+
+registerAdminRoute('/mailer', {
+	name: 'admin-mailer',
+	lazyRouteComponent: () => import('./mailer/MailerRoute'),
+});
+
+registerAdminRoute('/custom-user-status/:context?/:id?', {
+	name: 'custom-user-status',
+	lazyRouteComponent: () => import('./customUserStatus/CustomUserStatusRoute'),
+});
+
+registerAdminRoute('/emoji-custom/:context?/:id?', {
+	name: 'emoji-custom',
+	lazyRouteComponent: () => import('./customEmoji/CustomEmojiRoute'),
+});
+
+registerAdminRoute('/users/:context?/:id?', {
+	name: 'admin-users',
+	lazyRouteComponent: () => import('./users/UsersRoute'),
+});
+
+registerAdminRoute('/rooms/:context?/:id?', {
+	name: 'admin-rooms',
+	lazyRouteComponent: () => import('./rooms/RoomsRoute'),
+});
+
+registerAdminRoute('/invites', {
+	name: 'invites',
+	lazyRouteComponent: () => import('./invites/InvitesRoute'),
+});
+
+registerAdminRoute('/view-logs', {
+	name: 'admin-view-logs',
+	lazyRouteComponent: () => import('./viewLogs/ViewLogsRoute'),
+});
+
+Meteor.startup(() => {
+	registerAdminRoute('/:group+', {
+		name: 'admin',
+		lazyRouteComponent: () => import('./settings/SettingsRoute'),
+	});
+});
diff --git a/app/ui-admin/client/components/settings/GroupPage.js b/client/admin/settings/GroupPage.js
similarity index 84%
rename from app/ui-admin/client/components/settings/GroupPage.js
rename to client/admin/settings/GroupPage.js
index 27ed3906079..f27d512d1bc 100644
--- a/app/ui-admin/client/components/settings/GroupPage.js
+++ b/client/admin/settings/GroupPage.js
@@ -1,9 +1,9 @@
 import { Accordion, Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import { useTranslation } from '../../contexts/TranslationContext';
 import { Section } from './Section';
-import { Page } from '../../../../../client/components/basic/Page';
+import Page from '../../components/basic/Page';
 
 export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabel, i18nDescription, changed }) {
 	const t = useTranslation();
@@ -46,15 +46,15 @@ export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabe
 			</ButtonGroup>
 		</Page.Header>
 
-		<Page.ContentShadowScroll>
+		<Page.ScrollableContentWithShadow>
 			<Box style={useMemo(() => ({ margin: '0 auto', width: '100%', maxWidth: '590px' }), [])}>
-				{t.has(i18nDescription) && <Box is='p' textColor='hint' textStyle='p1'>{t(i18nDescription)}</Box>}
+				{t.has(i18nDescription) && <Box is='p' color='hint' fontScale='p1'>{t(i18nDescription)}</Box>}
 
 				<Accordion className='page-settings'>
 					{children}
 				</Accordion>
 			</Box>
-		</Page.ContentShadowScroll>
+		</Page.ScrollableContentWithShadow>
 	</Page>;
 }
 
@@ -74,7 +74,7 @@ export function GroupPageSkeleton() {
 
 		<Page.Content>
 			<Box style={useMemo(() => ({ margin: '0 auto', width: '100%', maxWidth: '590px' }), [])}>
-				<Box is='p' textColor='hint' textStyle='p1'>
+				<Box is='p' color='hint' fontScale='p1'>
 					<Skeleton />
 					<Skeleton />
 					<Skeleton width='75%' />
diff --git a/app/ui-admin/client/components/settings/GroupPage.stories.js b/client/admin/settings/GroupPage.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/GroupPage.stories.js
rename to client/admin/settings/GroupPage.stories.js
diff --git a/app/ui-admin/client/components/settings/GroupSelector.js b/client/admin/settings/GroupSelector.js
similarity index 100%
rename from app/ui-admin/client/components/settings/GroupSelector.js
rename to client/admin/settings/GroupSelector.js
diff --git a/app/ui-admin/client/components/settings/GroupSelector.stories.js b/client/admin/settings/GroupSelector.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/GroupSelector.stories.js
rename to client/admin/settings/GroupSelector.stories.js
diff --git a/app/ui-admin/client/components/settings/ResetSettingButton.js b/client/admin/settings/ResetSettingButton.js
similarity index 79%
rename from app/ui-admin/client/components/settings/ResetSettingButton.js
rename to client/admin/settings/ResetSettingButton.js
index f968defb601..6f99ea8b5ab 100644
--- a/app/ui-admin/client/components/settings/ResetSettingButton.js
+++ b/client/admin/settings/ResetSettingButton.js
@@ -1,7 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import { useTranslation } from '../../contexts/TranslationContext';
 
 export function ResetSettingButton(props) {
 	const t = useTranslation();
diff --git a/app/ui-admin/client/components/settings/ResetSettingButton.stories.js b/client/admin/settings/ResetSettingButton.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/ResetSettingButton.stories.js
rename to client/admin/settings/ResetSettingButton.stories.js
diff --git a/app/ui-admin/client/components/settings/Section.js b/client/admin/settings/Section.js
similarity index 86%
rename from app/ui-admin/client/components/settings/Section.js
rename to client/admin/settings/Section.js
index d658359f518..5f4c440d75b 100644
--- a/app/ui-admin/client/components/settings/Section.js
+++ b/client/admin/settings/Section.js
@@ -1,7 +1,7 @@
 import { Accordion, Box, Button, FieldGroup, Skeleton } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import { useTranslation } from '../../contexts/TranslationContext';
 import { Setting } from './Setting';
 import { useSection, useSectionChangedState } from './SettingsState';
 
@@ -20,7 +20,7 @@ export function Section({ children, groupId, hasReset = true, help, sectionName,
 		noncollapsible={solo || !section.name}
 		title={section.name && t(section.name)}
 	>
-		{help && <Box is='p' textColor='hint' textStyle='p1'>{help}</Box>}
+		{help && <Box is='p' color='hint' fontScale='p1'>{help}</Box>}
 
 		<FieldGroup>
 			{section.settings.map((settingId) => <Setting key={settingId} settingId={settingId} sectionChanged={changed} />)}
@@ -40,7 +40,7 @@ export function Section({ children, groupId, hasReset = true, help, sectionName,
 
 export function SectionSkeleton() {
 	return <Accordion.Item noncollapsible title={<Skeleton />}>
-		<Box is='p' textColor='hint' textStyle='p1'>
+		<Box is='p' color='hint' fontScale='p1'>
 			<Skeleton />
 		</Box>
 
diff --git a/app/ui-admin/client/components/settings/Section.stories.js b/client/admin/settings/Section.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/Section.stories.js
rename to client/admin/settings/Section.stories.js
diff --git a/app/ui-admin/client/components/settings/Setting.js b/client/admin/settings/Setting.js
similarity index 94%
rename from app/ui-admin/client/components/settings/Setting.js
rename to client/admin/settings/Setting.js
index 223ae37437c..1cae6ac6517 100644
--- a/app/ui-admin/client/components/settings/Setting.js
+++ b/client/admin/settings/Setting.js
@@ -1,9 +1,9 @@
 import { Callout, Field, Flex, InputBox, Margins, Skeleton } from '@rocket.chat/fuselage';
 import React, { memo, useEffect, useMemo, useState, useCallback } from 'react';
 
-import { MarkdownText } from '../../../../../client/components/basic/MarkdownText';
-import { RawText } from '../../../../../client/components/basic/RawText';
-import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import MarkdownText from '../../components/basic/MarkdownText';
+import RawText from '../../components/basic/RawText';
+import { useTranslation } from '../../contexts/TranslationContext';
 import { GenericSettingInput } from './inputs/GenericSettingInput';
 import { BooleanSettingInput } from './inputs/BooleanSettingInput';
 import { StringSettingInput } from './inputs/StringSettingInput';
diff --git a/app/ui-admin/client/components/settings/Setting.stories.js b/client/admin/settings/Setting.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/Setting.stories.js
rename to client/admin/settings/Setting.stories.js
diff --git a/app/ui-admin/client/components/settings/SettingsRoute.js b/client/admin/settings/SettingsRoute.js
similarity index 76%
rename from app/ui-admin/client/components/settings/SettingsRoute.js
rename to client/admin/settings/SettingsRoute.js
index 4d10c0b0cb0..42f5323f104 100644
--- a/app/ui-admin/client/components/settings/SettingsRoute.js
+++ b/client/admin/settings/SettingsRoute.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { useAtLeastOnePermission } from '../../../../../client/contexts/AuthorizationContext';
-import { useRouteParameter } from '../../../../../client/contexts/RouterContext';
+import { useAtLeastOnePermission } from '../../contexts/AuthorizationContext';
+import { useRouteParameter } from '../../contexts/RouterContext';
 import { GroupSelector } from './GroupSelector';
 import NotAuthorizedPage from '../NotAuthorizedPage';
 import { SettingsState } from './SettingsState';
diff --git a/app/ui-admin/client/components/settings/SettingsState.js b/client/admin/settings/SettingsState.js
similarity index 90%
rename from app/ui-admin/client/components/settings/SettingsState.js
rename to client/admin/settings/SettingsState.js
index acf8c60a5a5..99094c7780d 100644
--- a/app/ui-admin/client/components/settings/SettingsState.js
+++ b/client/admin/settings/SettingsState.js
@@ -1,15 +1,14 @@
-import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
+import { useDebouncedCallback, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { Mongo } from 'meteor/mongo';
 import { Tracker } from 'meteor/tracker';
 import React, { createContext, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useReducer, useRef, useState } from 'react';
 
-import { PrivateSettingsCachedCollection } from '../../SettingsCachedCollection';
-import { useBatchSettingsDispatch } from '../../../../../client/contexts/SettingsContext';
-import { useToastMessageDispatch } from '../../../../../client/contexts/ToastMessagesContext';
-import { useEventCallback } from '../../../../../client/hooks/useEventCallback';
-import { useReactiveValue } from '../../../../../client/hooks/useReactiveValue';
-import { useTranslation, useLoadLanguage } from '../../../../../client/contexts/TranslationContext';
-import { useUser } from '../../../../../client/contexts/UserContext';
+import { PrivateSettingsCachedCollection } from '../PrivateSettingsCachedCollection';
+import { useBatchSettingsDispatch } from '../../contexts/SettingsContext';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useReactiveValue } from '../../hooks/useReactiveValue';
+import { useTranslation, useLoadLanguage } from '../../contexts/TranslationContext';
+import { useUser } from '../../contexts/UserContext';
 
 const SettingsContext = createContext({});
 
@@ -220,13 +219,13 @@ const useSelector = (selector, equalityFunction = (a, b) => a === b) => {
 	const { subscribers, stateRef } = useContext(SettingsContext);
 	const [value, setValue] = useState(() => selector(stateRef.current));
 
-	const handleUpdate = useEventCallback((selector, equalityFunction, value, state) => {
+	const handleUpdate = useMutableCallback((state) => {
 		const newValue = selector(state);
 
 		if (!equalityFunction(newValue, value)) {
 			setValue(newValue);
 		}
-	}, selector, equalityFunction, value);
+	});
 
 	useEffect(() => {
 		subscribers.add(handleUpdate);
@@ -259,7 +258,8 @@ export const useGroup = (groupId) => {
 	const loadLanguage = useLoadLanguage();
 	const user = useUser();
 
-	const save = useEventCallback(async (filterSettings, { current: state }, batchSetSettings, user) => {
+	const save = useMutableCallback(async () => {
+		const state = stateRef.current;
 		const settings = filterSettings(state.settings);
 
 		const changes = settings.filter(({ changed }) => changed)
@@ -290,9 +290,10 @@ export const useGroup = (groupId) => {
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
-	}, filterSettings, stateRef, batchSetSettings, user);
+	});
 
-	const cancel = useEventCallback((filterSettings, { current: state }, hydrate) => {
+	const cancel = useMutableCallback(() => {
+		const state = stateRef.current;
 		const settings = filterSettings(state.settings);
 		const persistedSettings = filterSettings(state.persistedSettings);
 
@@ -303,7 +304,7 @@ export const useGroup = (groupId) => {
 			});
 
 		hydrate(changes);
-	}, filterSettings, stateRef, hydrate);
+	});
 
 	return group && { ...group, sections, changed, save, cancel };
 };
@@ -319,7 +320,8 @@ export const useSection = (groupId, sectionName) => {
 
 	const { stateRef, hydrate, isDisabled } = useContext(SettingsContext);
 
-	const reset = useEventCallback((filterSettings, { current: state }, hydrate) => {
+	const reset = useMutableCallback(() => {
+		const state = stateRef.current;
 		const settings = filterSettings(state.settings)
 			.filter((setting) => Tracker.nonreactive(() => !isDisabled(setting))); // Ignore disabled settings
 		const persistedSettings = filterSettings(state.persistedSettings);
@@ -335,7 +337,7 @@ export const useSection = (groupId, sectionName) => {
 		});
 
 		hydrate(changes);
-	}, filterSettings, stateRef, hydrate);
+	});
 
 	return {
 		name: sectionName,
diff --git a/app/ui-admin/client/components/settings/groups/AssetsGroupPage.js b/client/admin/settings/groups/AssetsGroupPage.js
similarity index 79%
rename from app/ui-admin/client/components/settings/groups/AssetsGroupPage.js
rename to client/admin/settings/groups/AssetsGroupPage.js
index b0379dc4d62..344aa6e213d 100644
--- a/app/ui-admin/client/components/settings/groups/AssetsGroupPage.js
+++ b/client/admin/settings/groups/AssetsGroupPage.js
@@ -1,9 +1,9 @@
 import { Button } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useMethod } from '../../../../../../client/contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useMethod } from '../../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
 import { GroupPage } from '../GroupPage';
 import { Section } from '../Section';
 
diff --git a/app/ui-admin/client/components/settings/groups/GenericGroupPage.js b/client/admin/settings/groups/GenericGroupPage.js
similarity index 100%
rename from app/ui-admin/client/components/settings/groups/GenericGroupPage.js
rename to client/admin/settings/groups/GenericGroupPage.js
diff --git a/app/ui-admin/client/components/settings/groups/OAuthGroupPage.js b/client/admin/settings/groups/OAuthGroupPage.js
similarity index 88%
rename from app/ui-admin/client/components/settings/groups/OAuthGroupPage.js
rename to client/admin/settings/groups/OAuthGroupPage.js
index f0b21b53313..a8c9ab2d0be 100644
--- a/app/ui-admin/client/components/settings/groups/OAuthGroupPage.js
+++ b/client/admin/settings/groups/OAuthGroupPage.js
@@ -2,11 +2,11 @@ import { Button } from '@rocket.chat/fuselage';
 import React from 'react';
 import s from 'underscore.string';
 
-import { RawText } from '../../../../../../client/components/basic/RawText';
-import { useAbsoluteUrl, useMethod } from '../../../../../../client/contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
-import { useModal } from '../../../../../../client/hooks/useModal';
+import RawText from '../../../components/basic/RawText';
+import { useAbsoluteUrl, useMethod } from '../../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
+import { useModal } from '../../../hooks/useModal';
 import { GroupPage } from '../GroupPage';
 import { Section } from '../Section';
 
diff --git a/app/ui-admin/client/components/settings/inputs/ActionSettingInput.js b/client/admin/settings/inputs/ActionSettingInput.js
similarity index 77%
rename from app/ui-admin/client/components/settings/inputs/ActionSettingInput.js
rename to client/admin/settings/inputs/ActionSettingInput.js
index 3d55c9429f2..f518d8d0028 100644
--- a/app/ui-admin/client/components/settings/inputs/ActionSettingInput.js
+++ b/client/admin/settings/inputs/ActionSettingInput.js
@@ -1,9 +1,9 @@
 import { Button, Field } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useMethod } from '../../../../../../client/contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useMethod } from '../../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
 
 export function ActionSettingInput({
 	_id,
diff --git a/app/ui-admin/client/components/settings/inputs/ActionSettingInput.stories.js b/client/admin/settings/inputs/ActionSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/ActionSettingInput.stories.js
rename to client/admin/settings/inputs/ActionSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/AssetSettingInput.css b/client/admin/settings/inputs/AssetSettingInput.css
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/AssetSettingInput.css
rename to client/admin/settings/inputs/AssetSettingInput.css
diff --git a/app/ui-admin/client/components/settings/inputs/AssetSettingInput.js b/client/admin/settings/inputs/AssetSettingInput.js
similarity index 89%
rename from app/ui-admin/client/components/settings/inputs/AssetSettingInput.js
rename to client/admin/settings/inputs/AssetSettingInput.js
index 6986f903f21..ea74a175d29 100644
--- a/app/ui-admin/client/components/settings/inputs/AssetSettingInput.js
+++ b/client/admin/settings/inputs/AssetSettingInput.js
@@ -2,9 +2,9 @@ import { Button, Field, Icon } from '@rocket.chat/fuselage';
 import { Random } from 'meteor/random';
 import React from 'react';
 
-import { useMethod } from '../../../../../../client/contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useMethod } from '../../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
 import './AssetSettingInput.css';
 
 export function AssetSettingInput({
diff --git a/app/ui-admin/client/components/settings/inputs/AssetSettingInput.stories.js b/client/admin/settings/inputs/AssetSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/AssetSettingInput.stories.js
rename to client/admin/settings/inputs/AssetSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/BooleanSettingInput.js b/client/admin/settings/inputs/BooleanSettingInput.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/BooleanSettingInput.js
rename to client/admin/settings/inputs/BooleanSettingInput.js
diff --git a/app/ui-admin/client/components/settings/inputs/BooleanSettingInput.stories.js b/client/admin/settings/inputs/BooleanSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/BooleanSettingInput.stories.js
rename to client/admin/settings/inputs/BooleanSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/CodeSettingInput.js b/client/admin/settings/inputs/CodeSettingInput.js
similarity index 95%
rename from app/ui-admin/client/components/settings/inputs/CodeSettingInput.js
rename to client/admin/settings/inputs/CodeSettingInput.js
index dbfb863f6c4..7c8548e1ac5 100644
--- a/app/ui-admin/client/components/settings/inputs/CodeSettingInput.js
+++ b/client/admin/settings/inputs/CodeSettingInput.js
@@ -2,7 +2,7 @@ import { Box, Button, Field, Flex } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import React, { useEffect, useRef, useState } from 'react';
 
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 function CodeMirror({
@@ -31,7 +31,7 @@ function CodeMirror({
 
 		const setupCodeMirror = async () => {
 			const CodeMirror = await import('codemirror/lib/codemirror.js');
-			await import('../../../../../ui/client/lib/codeMirror/codeMirror');
+			await import('../../../../app/ui/client/lib/codeMirror/codeMirror');
 			await import('codemirror/lib/codemirror.css');
 
 			const { current: textarea } = ref;
diff --git a/app/ui-admin/client/components/settings/inputs/CodeSettingInput.stories.js b/client/admin/settings/inputs/CodeSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/CodeSettingInput.stories.js
rename to client/admin/settings/inputs/CodeSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/ColorSettingInput.js b/client/admin/settings/inputs/ColorSettingInput.js
similarity index 96%
rename from app/ui-admin/client/components/settings/inputs/ColorSettingInput.js
rename to client/admin/settings/inputs/ColorSettingInput.js
index 4fcc3740cab..1469a9b3d8b 100644
--- a/app/ui-admin/client/components/settings/inputs/ColorSettingInput.js
+++ b/client/admin/settings/inputs/ColorSettingInput.js
@@ -9,7 +9,7 @@ import {
 } from '@rocket.chat/fuselage';
 import React, { useCallback } from 'react';
 
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function ColorSettingInput({
diff --git a/app/ui-admin/client/components/settings/inputs/ColorSettingInput.stories.js b/client/admin/settings/inputs/ColorSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/ColorSettingInput.stories.js
rename to client/admin/settings/inputs/ColorSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/FontSettingInput.js b/client/admin/settings/inputs/FontSettingInput.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/FontSettingInput.js
rename to client/admin/settings/inputs/FontSettingInput.js
diff --git a/app/ui-admin/client/components/settings/inputs/FontSettingInput.stories.js b/client/admin/settings/inputs/FontSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/FontSettingInput.stories.js
rename to client/admin/settings/inputs/FontSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/GenericSettingInput.js b/client/admin/settings/inputs/GenericSettingInput.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/GenericSettingInput.js
rename to client/admin/settings/inputs/GenericSettingInput.js
diff --git a/app/ui-admin/client/components/settings/inputs/GenericSettingInput.stories.js b/client/admin/settings/inputs/GenericSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/GenericSettingInput.stories.js
rename to client/admin/settings/inputs/GenericSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/IntSettingInput.js b/client/admin/settings/inputs/IntSettingInput.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/IntSettingInput.js
rename to client/admin/settings/inputs/IntSettingInput.js
diff --git a/app/ui-admin/client/components/settings/inputs/IntSettingInput.stories.js b/client/admin/settings/inputs/IntSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/IntSettingInput.stories.js
rename to client/admin/settings/inputs/IntSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/LanguageSettingInput.js b/client/admin/settings/inputs/LanguageSettingInput.js
similarity index 92%
rename from app/ui-admin/client/components/settings/inputs/LanguageSettingInput.js
rename to client/admin/settings/inputs/LanguageSettingInput.js
index d80d459f7da..4a3b9e860d0 100644
--- a/app/ui-admin/client/components/settings/inputs/LanguageSettingInput.js
+++ b/client/admin/settings/inputs/LanguageSettingInput.js
@@ -1,7 +1,7 @@
 import { Box, Field, Flex, Select } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useLanguages } from '../../../../../../client/contexts/TranslationContext';
+import { useLanguages } from '../../../contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function LanguageSettingInput({
diff --git a/app/ui-admin/client/components/settings/inputs/LanguageSettingInput.stories.js b/client/admin/settings/inputs/LanguageSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/LanguageSettingInput.stories.js
rename to client/admin/settings/inputs/LanguageSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.js b/client/admin/settings/inputs/MultiSelectSettingInput.js
similarity index 94%
rename from app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.js
rename to client/admin/settings/inputs/MultiSelectSettingInput.js
index e3228d3cbba..76993072376 100644
--- a/app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.js
+++ b/client/admin/settings/inputs/MultiSelectSettingInput.js
@@ -1,7 +1,7 @@
 import { Field, Flex, Box, MultiSelectFiltered, MultiSelect } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function MultiSelectSettingInput({
diff --git a/app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.stories.js b/client/admin/settings/inputs/MultiSelectSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.stories.js
rename to client/admin/settings/inputs/MultiSelectSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/PasswordSettingInput.js b/client/admin/settings/inputs/PasswordSettingInput.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/PasswordSettingInput.js
rename to client/admin/settings/inputs/PasswordSettingInput.js
diff --git a/app/ui-admin/client/components/settings/inputs/PasswordSettingInput.stories.js b/client/admin/settings/inputs/PasswordSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/PasswordSettingInput.stories.js
rename to client/admin/settings/inputs/PasswordSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.js b/client/admin/settings/inputs/RelativeUrlSettingInput.js
similarity index 92%
rename from app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.js
rename to client/admin/settings/inputs/RelativeUrlSettingInput.js
index e0d761bd94a..4c61757493c 100644
--- a/app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.js
+++ b/client/admin/settings/inputs/RelativeUrlSettingInput.js
@@ -1,7 +1,7 @@
 import { Box, Field, Flex, UrlInput } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useAbsoluteUrl } from '../../../../../../client/contexts/ServerContext';
+import { useAbsoluteUrl } from '../../../contexts/ServerContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function RelativeUrlSettingInput({
diff --git a/app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.stories.js b/client/admin/settings/inputs/RelativeUrlSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.stories.js
rename to client/admin/settings/inputs/RelativeUrlSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/RoomPickSettingInput.js b/client/admin/settings/inputs/RoomPickSettingInput.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/RoomPickSettingInput.js
rename to client/admin/settings/inputs/RoomPickSettingInput.js
diff --git a/app/ui-admin/client/components/settings/inputs/SelectSettingInput.js b/client/admin/settings/inputs/SelectSettingInput.js
similarity index 93%
rename from app/ui-admin/client/components/settings/inputs/SelectSettingInput.js
rename to client/admin/settings/inputs/SelectSettingInput.js
index 061eacc9ab4..66534f61902 100644
--- a/app/ui-admin/client/components/settings/inputs/SelectSettingInput.js
+++ b/client/admin/settings/inputs/SelectSettingInput.js
@@ -6,7 +6,7 @@ import {
 } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useTranslation } from '../../../contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function SelectSettingInput({
diff --git a/app/ui-admin/client/components/settings/inputs/SelectSettingInput.stories.js b/client/admin/settings/inputs/SelectSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/SelectSettingInput.stories.js
rename to client/admin/settings/inputs/SelectSettingInput.stories.js
diff --git a/app/ui-admin/client/components/settings/inputs/StringSettingInput.js b/client/admin/settings/inputs/StringSettingInput.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/StringSettingInput.js
rename to client/admin/settings/inputs/StringSettingInput.js
diff --git a/app/ui-admin/client/components/settings/inputs/StringSettingInput.stories.js b/client/admin/settings/inputs/StringSettingInput.stories.js
similarity index 100%
rename from app/ui-admin/client/components/settings/inputs/StringSettingInput.stories.js
rename to client/admin/settings/inputs/StringSettingInput.stories.js
diff --git a/client/admin/sidebarItems.js b/client/admin/sidebarItems.js
new file mode 100644
index 00000000000..a76b96d08dd
--- /dev/null
+++ b/client/admin/sidebarItems.js
@@ -0,0 +1,59 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import { hasPermission } from '../../app/authorization/client';
+
+export const sidebarItems = new ReactiveVar([]);
+
+export const registerAdminSidebarItem = (itemOptions) => {
+	sidebarItems.set([...sidebarItems.get(), itemOptions]);
+};
+
+registerAdminSidebarItem({
+	href: 'admin-info',
+	i18nLabel: 'Info',
+	icon: 'info-circled',
+});
+
+registerAdminSidebarItem({
+	href: 'admin-import',
+	i18nLabel: 'Import',
+	icon: 'import',
+	permissionGranted: () => hasPermission('run-import'),
+});
+
+registerAdminSidebarItem({
+	href: 'admin-users',
+	i18nLabel: 'Users',
+	icon: 'team',
+	permissionGranted: () => hasPermission('view-user-administration'),
+});
+
+registerAdminSidebarItem({
+	href: 'admin-rooms',
+	i18nLabel: 'Rooms',
+	icon: 'hashtag',
+	permissionGranted: () => hasPermission('view-room-administration'),
+});
+
+registerAdminSidebarItem({
+	href: 'invites',
+	i18nLabel: 'Invites',
+	icon: 'user-plus',
+	permissionGranted: () => hasPermission('create-invite-links'),
+});
+
+registerAdminSidebarItem({
+	href: 'admin-view-logs',
+	i18nLabel: 'View_Logs',
+	icon: 'post',
+	permissionGranted: () => hasPermission('view-logs'),
+});
+
+registerAdminSidebarItem({
+	href: 'custom-sounds',
+	i18nLabel: 'Custom_Sounds',
+	icon: 'volume',
+	permissionGranted() {
+		return hasPermission(['manage-sounds']);
+	},
+});
diff --git a/client/admin/users/AddUser.js b/client/admin/users/AddUser.js
new file mode 100644
index 00000000000..a84f3682452
--- /dev/null
+++ b/client/admin/users/AddUser.js
@@ -0,0 +1,147 @@
+import React, { useMemo, useState } from 'react';
+import { Field, TextInput, Box, ToggleSwitch, Icon, TextAreaInput, MultiSelectFiltered, Margins, Button } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import { useEndpointAction } from '../../hooks/useEndpointAction';
+import { isEmail } from '../../../app/utils/lib/isEmail.js';
+import { useRoute } from '../../contexts/RouterContext';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+
+export function AddUser({ roles, ...props }) {
+	const t = useTranslation();
+
+	const [newData, setNewData] = useState({});
+
+	const router = useRoute('admin-users');
+
+	const roleData = useEndpointData('roles.list', '') || {};
+
+	const goToUser = (id) => router.push({
+		context: 'info',
+		id,
+	});
+
+	const saveQuery = useMemo(() => ({
+		...Object.fromEntries(Object.entries(newData).filter(([, value]) => value !== null)),
+	}), [JSON.stringify(newData)]);
+
+	const saveAction = useEndpointAction('POST', 'users.create', saveQuery, t('User_created_successfully'));
+
+	const handleSave = async () => {
+		if (Object.keys(newData).length) {
+			const result = await saveAction();
+			if (result.success) {
+				goToUser(result.user._id);
+			}
+		}
+	};
+
+	const handleChange = (field, getValue = (e) => e.currentTarget.value) => (e) => setNewData({ ...newData, [field]: getValue(e) });
+
+	const {
+		roles: selectedRoles = [],
+		name = '',
+		username = '',
+		statusText = '',
+		bio = '',
+		email = '',
+		password = '',
+		verified = false,
+		requirePasswordChange = false,
+		setRandomPassword = false,
+		sendWelcomeEmail = true,
+		joinDefaultChannels = true,
+	} = newData;
+
+	const availableRoles = roleData && roleData.roles ? roleData.roles.map(({ _id, description }) => [_id, description || _id]) : [];
+
+	return <VerticalBar.ScrollableContent is='form' { ...props }>
+		<Field>
+			<Field.Label>{t('Name')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={name} onChange={handleChange('name')}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Username')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={username} onChange={handleChange('username')} addon={<Icon name='at' size='x20'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Email')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={email} error={!isEmail(email) && email.length > 0 ? 'error' : undefined} onChange={handleChange('email')} addon={<Icon name='mail' size='x20'/>}/>
+			</Field.Row>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' mbs='x4'>
+					<Box>{t('Verified')}</Box><ToggleSwitch checked={verified} onChange={handleChange('verified', () => !verified)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('StatusMessage')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={statusText} onChange={handleChange('statusText')} addon={<Icon name='edit' size='x20'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Bio')}</Field.Label>
+			<Field.Row>
+				<TextAreaInput rows={3} flexGrow={1} value={bio} onChange={handleChange('bio')} addon={<Icon name='edit' size='x20' alignSelf='center'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Password')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={password} onChange={handleChange('password')} addon={<Icon name='key' size='x20'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between'>
+					<Box>{t('Require_password_change')}</Box><ToggleSwitch disabled={setRandomPassword} checked={setRandomPassword || requirePasswordChange} onChange={handleChange('requirePasswordChange', () => !requirePasswordChange)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between'>
+					<Box>{t('Set_random_password_and_send_by_email')}</Box><ToggleSwitch checked={setRandomPassword} onChange={handleChange('setRandomPassword', () => !setRandomPassword)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Roles')}</Field.Label>
+			<Field.Row>
+				<MultiSelectFiltered options={availableRoles} value={selectedRoles} onChange={handleChange('roles', (value) => value)} placeholder={t('Select_role')} />
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between'>
+					<Box>{t('Join_default_channels')}</Box><ToggleSwitch checked={joinDefaultChannels} onChange={handleChange('joinDefaultChannels', () => !joinDefaultChannels)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between'>
+					<Box>{t('Send_welcome_email')}</Box><ToggleSwitch checked={sendWelcomeEmail} onChange={handleChange('sendWelcomeEmail', () => !sendWelcomeEmail)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box display='flex' flexDirection='row' justifyContent='space-between' w='full'>
+					<Margins inlineEnd='x4'>
+						<Button flexGrow={1} onClick={() => setNewData({})}>{t('Cancel')}</Button>
+						<Button mie='none' flexGrow={1} onClick={handleSave}>{t('Save')}</Button>
+					</Margins>
+				</Box>
+			</Field.Row>
+		</Field>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/users/EditUser.js b/client/admin/users/EditUser.js
new file mode 100644
index 00000000000..a7b287f234a
--- /dev/null
+++ b/client/admin/users/EditUser.js
@@ -0,0 +1,189 @@
+import React, { useMemo, useState } from 'react';
+import { Field, TextInput, Box, Headline, Skeleton, ToggleSwitch, Icon, TextAreaInput, MultiSelectFiltered, Margins, Button } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../hooks/useEndpointDataExperimental';
+import { useEndpointAction } from '../../hooks/useEndpointAction';
+import { useEndpointUpload } from '../../hooks/useEndpointUpload';
+import { isEmail } from '../../../app/utils/lib/isEmail.js';
+import { useRoute } from '../../contexts/RouterContext';
+import UserAvatarEditor from '../../components/basic/avatar/UserAvatarEditor';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+export function EditUserWithData({ userId, ...props }) {
+	const t = useTranslation();
+	const roleData = useEndpointData('roles.list', '') || {};
+	const { data, state, error } = useEndpointDataExperimental('users.info', useMemo(() => ({ userId }), [userId]));
+
+	if (state === ENDPOINT_STATES.LOADING) {
+		return <Box w='full' pb='x24' {...props}>
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8' />
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8'/>
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8'/>
+		</Box>;
+	}
+
+	if (error) {
+		return <Box mbs='x16' {...props}>{t('User_not_found')}</Box>;
+	}
+
+	return <EditUser data={data.user} roles={roleData.roles} {...props}/>;
+}
+
+export function EditUser({ data, roles, ...props }) {
+	const t = useTranslation();
+
+	const [newData, setNewData] = useState({});
+	const [avatarObj, setAvatarObj] = useState();
+	const hasUnsavedChanges = useMemo(() => Object.values(newData).filter((current) => current === null).length < Object.keys(newData).length, [JSON.stringify(newData)]) || avatarObj;
+
+	const router = useRoute('admin-users');
+
+	const goToUser = (id) => router.push({
+		context: 'info',
+		id,
+	});
+
+	const saveQuery = useMemo(() => ({
+		userId: data._id,
+		data: Object.fromEntries(Object.entries(newData).filter(([, value]) => value !== null)),
+	}), [data._id, JSON.stringify(newData)]);
+
+	const saveAvatarQuery = useMemo(() => ({
+		userId: data._id,
+		avatarUrl: avatarObj && avatarObj.avatarUrl,
+	}), [data._id, JSON.stringify(avatarObj)]);
+
+	const resetAvatarQuery = useMemo(() => ({
+		userId: data._id,
+	}), [data._id]);
+
+	const saveAction = useEndpointAction('POST', 'users.update', saveQuery, t('User_updated_successfully'));
+	const saveAvatarAction = useEndpointUpload('users.setAvatar', saveAvatarQuery, t('Avatar_changed_successfully'));
+	const saveAvatarUrlAction = useEndpointAction('POST', 'users.setAvatar', saveAvatarQuery, t('Avatar_changed_successfully'));
+	const resetAvatarAction = useEndpointAction('POST', 'users.resetAvatar', resetAvatarQuery, t('Avatar_changed_successfully'));
+
+	const updateAvatar = async () => {
+		if (avatarObj === 'reset') {
+			return resetAvatarAction();
+		}
+		if (avatarObj.avatarUrl) {
+			return saveAvatarUrlAction();
+		}
+		return saveAvatarAction(avatarObj);
+	};
+
+	const handleSave = async () => {
+		if (hasUnsavedChanges) {
+			const result = await saveAction();
+			if (result.success) {
+				if (avatarObj) {
+					await updateAvatar();
+				}
+				goToUser(data._id);
+			}
+		}
+	};
+
+	const rolesAreEqual = (a, b) => {
+		if (a.length !== b.length) { return false; }
+		const result = a.reduce((acc, aValue) => {
+			const onlyOneMatches = b.reduce((acc, bValue) => (aValue === bValue ? acc + 1 : acc + 0), 0) === 1;
+			return onlyOneMatches ? acc + 1 : acc + 0;
+		}, 0);
+		return result === a.length;
+	};
+
+	const testEqual = (a, b) => a === b || !(a || b);
+	const handleChange = (field, currentValue, getValue = (e) => e.currentTarget.value, areEqual = testEqual) => (e) => setNewData({ ...newData, [field]: areEqual(getValue(e), currentValue) ? null : getValue(e) });
+
+	const availableRoles = roles.map(({ _id, description }) => [_id, description || _id]);
+	const selectedRoles = newData.roles ?? data.roles;
+	const name = newData.name ?? data.name ?? '';
+	const username = newData.username ?? data.username;
+	const status = newData.status ?? data.status;
+	const bio = newData.bio ?? data.bio ?? '';
+	const email = newData.email ?? (data.emails && data.emails[0].address);
+	const emailVerified = newData.verified ?? (data.emails && data.emails[0].verified);
+	const setRandomPassword = newData.setRandomPassword || false;
+	const requirePasswordChange = setRandomPassword || newData.requirePasswordChange || false;
+
+	return <VerticalBar.ScrollableContent is='form' qa-admin-user-edit='form' { ...props }>
+		<UserAvatarEditor username={data.username} setAvatarObj={setAvatarObj}/>
+		<Field>
+			<Field.Label>{t('Name')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={name} onChange={handleChange('name', data.name)}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Username')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={username} onChange={handleChange('username', data.username)} addon={<Icon name='at' size='x20'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Email')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={email} error={!isEmail(email) ? 'error' : undefined} onChange={handleChange('email', data.emails && data.emails[0].address)} addon={<Icon name='mail' size='x20'/>}/>
+			</Field.Row>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' mbs='x4'>
+					<Box>{t('Verified')}</Box><ToggleSwitch checked={emailVerified} onChange={handleChange('verified', data.emails && data.emails[0].verified, () => !emailVerified)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('StatusMessage')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={status} onChange={handleChange('status', data.status)} addon={<Icon name='edit' size='x20'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Bio')}</Field.Label>
+			<Field.Row>
+				<TextAreaInput rows={3} flexGrow={1} value={bio} onChange={handleChange('bio', data.bio)} addon={<Icon name='edit' size='x20' alignSelf='center'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Password')}</Field.Label>
+			<Field.Row>
+				<TextInput flexGrow={1} value={newData.password || ''} onChange={handleChange('password', '')} addon={<Icon name='key' size='x20'/>}/>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between'>
+					<Box>{t('Require_password_change')}</Box><ToggleSwitch checked={requirePasswordChange} disabled={setRandomPassword} onChange={handleChange('requirePasswordChange', false, () => !requirePasswordChange)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box flexGrow={1} display='flex' flexDirection='row' alignItems='center' justifyContent='space-between'>
+					<Box>{t('Set_random_password_and_send_by_email')}</Box><ToggleSwitch checked={setRandomPassword} onChange={handleChange('setRandomPassword', false, () => !setRandomPassword)} />
+				</Box>
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Label>{t('Roles')}</Field.Label>
+			<Field.Row>
+				<MultiSelectFiltered options={availableRoles} value={selectedRoles} onChange={handleChange('roles', data.roles, (value) => value, rolesAreEqual)} placeholder={t('Select_role')} />
+			</Field.Row>
+		</Field>
+		<Field>
+			<Field.Row>
+				<Box display='flex' flexDirection='row' justifyContent='space-between' w='full'>
+					<Margins inlineEnd='x4'>
+						<Button flexGrow={1} type='reset' disabled={!hasUnsavedChanges} onClick={() => setNewData({})}>{t('Reset')}</Button>
+						<Button mie='none' flexGrow={1} disabled={!hasUnsavedChanges} onClick={handleSave}>{t('Save')}</Button>
+					</Margins>
+				</Box>
+			</Field.Row>
+		</Field>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/users/InviteUsers.js b/client/admin/users/InviteUsers.js
new file mode 100644
index 00000000000..5804f498c86
--- /dev/null
+++ b/client/admin/users/InviteUsers.js
@@ -0,0 +1,35 @@
+import React, { useCallback, useState } from 'react';
+import { Box, Headline, Button, Icon, TextAreaInput } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useMethod } from '../../contexts/ServerContext';
+import { isEmail } from '../../../app/utils/lib/isEmail.js';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+export function InviteUsers({ data, ...props }) {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const [text, setText] = useState('');
+	const sendInvites = useMethod('sendInvitationEmail');
+	const getEmails = useCallback((text) => text.split(/[\ ,;]+/i).filter((val) => isEmail(val)), []);
+	const handleClick = () => {
+		sendInvites(getEmails(text), (error, result) => {
+			if (result) {
+				return dispatchToastMessage({ type: 'success', message: t('Emails_sent_successfully!') });
+			}
+			if (error) {
+				return dispatchToastMessage({ type: 'error', message: error });
+			}
+		});
+	};
+	return <VerticalBar.ScrollableContent {...props}>
+		<Headline mbs='x8'>{t('Send_invitation_email')}</Headline>
+		<Box fontScale='p1' mb='x8'>{t('Send_invitation_email_info')}</Box>
+		<TextAreaInput rows={5} flexGrow={0} onChange={(e) => setText(e.currentTarget.value)}/>
+		<Button primary onClick={handleClick} alignItems='stretch' mb='x8'>
+			<Icon name='send' size='x16'/>
+			{t('Send')}
+		</Button>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/users/UserInfo.js b/client/admin/users/UserInfo.js
new file mode 100644
index 00000000000..23831613eab
--- /dev/null
+++ b/client/admin/users/UserInfo.js
@@ -0,0 +1,113 @@
+import React, { useMemo, useState, useEffect } from 'react';
+import { Box, Avatar, Margins, Headline, Skeleton, Chip, Tag } from '@rocket.chat/fuselage';
+import moment from 'moment';
+
+import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../hooks/useEndpointDataExperimental';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { roomTypes } from '../../../app/utils/client';
+import { DateFormat } from '../../../app/lib';
+import { UserInfoActions } from './UserInfoActions';
+import MarkdownText from '../../components/basic/MarkdownText';
+import VerticalBar from '../../components/basic/VerticalBar';
+
+const useTimezoneClock = (utcOffset = 0, updateInterval) => {
+	const [time, setTime] = useState();
+	useEffect(() => {
+		const updateTime = () => setTime(DateFormat.formatTime(moment().get().utcOffset(utcOffset)));
+		const interval = setInterval(() => updateTime(), updateInterval);
+		updateTime();
+
+		return () => clearInterval(interval);
+	}, [utcOffset, updateInterval]);
+
+	return time;
+};
+
+const UTCClock = ({ utcOffset, ...props }) => {
+	const time = useTimezoneClock(utcOffset, 10000);
+	return <Box {...props}>{time} UTC {utcOffset}</Box>;
+};
+
+export function UserInfoWithData({ userId, ...props }) {
+	const t = useTranslation();
+	const [cache, setCache] = useState();
+
+	const onChange = () => setCache(new Date());
+
+	const { data, state, error } = useEndpointDataExperimental('users.info', useMemo(() => ({ userId }), [userId, cache]));
+
+	if (state === ENDPOINT_STATES.LOADING) {
+		return <Box w='full' pb='x24'>
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8' />
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8'/>
+			<Headline.Skeleton mbe='x4'/>
+			<Skeleton mbe='x8'/>
+		</Box>;
+	}
+
+	if (error) {
+		return <Box mbs='x16'>{t('User_not_found')}</Box>;
+	}
+
+	return <UserInfo data={data.user} onChange={onChange} {...props} />;
+}
+
+
+export function UserInfo({ data, onChange, ...props }) {
+	const t = useTranslation();
+
+	const createdAt = DateFormat.formatDateAndTime(data.createdAt);
+
+	const lastLogin = data.lastLogin ? DateFormat.formatDateAndTime(data.lastLogin) : '';
+
+	const avatarUrl = roomTypes.getConfig('d').getAvatarPath({ name: data.username || data.name, type: 'd', _id: data._id });
+
+	return <VerticalBar.ScrollableContent is='form' {...props}>
+		<Box display='flex' flexDirection='column' alignItems='center'>
+			<Margins block='x2'>
+				<Avatar size={'x120'} title={data.username} url={avatarUrl}/>
+				<Box fontScale='h1'>{data.name || data.username}</Box>
+				{!!data.name && <Box fontScale='p1' color='hint'>@{data.username}</Box>}
+				<Box fontScale='p1' color='hint'>{data.status}</Box>
+			</Margins>
+		</Box>
+
+		<UserInfoActions isActive={data.active} isAdmin={data.roles.includes('admin')} _id={data._id} username={data.username} onChange={onChange}/>
+		<Box display='flex' flexDirection='column' w='full' backgroundColor='neutral-200' p='x16'>
+			<Margins blockEnd='x4'>
+				{data.bio && data.bio.trim().length > 0 && <MarkdownText fontScale='s1'>{data.bio}</MarkdownText>}
+				{!!data.roles.length && <>
+					<Box fontScale='micro' color='hint' mbs='none'>{t('Roles')}</Box>
+					<Box display='flex' flexDirection='row' flexWrap='wrap'>
+						<Margins inlineEnd='x4' blockEnd='x4'>
+							{data.roles.map((val) => <Chip pi='x4' key={val}>{val}</Chip>)}
+						</Margins>
+					</Box>
+				</>}
+
+				{data.emails && <> <Box fontScale='micro' color='hint'>{t('Email')}</Box>
+					<Box display='flex' flexDirection='row' alignItems='center'>
+						<Box fontScale='s1'>{data.emails[0].address}</Box>
+						<Margins inline='x4'>
+							{data.emails[0].verified && <Tag variant='primary'>{t('Verified')}</Tag>}
+							{data.emails[0].verified || <Tag disabled>{t('Not_verified')}</Tag>}
+						</Margins>
+					</Box>
+				</>}
+
+				<Box fontScale='micro' color='hint'>{t('Created_at')}</Box>
+				<Box fontScale='s1'>{createdAt}</Box>
+
+				<Box fontScale='micro' color='hint'>{t('Last_login')}</Box>
+				<Box fontScale='s1' >{lastLogin || t('Never')}</Box>
+
+				{!!data.utcOffset && <>
+					<Box fontScale='micro' color='hint'>{t('Timezone')}</Box>
+					<UTCClock utcOffset={data.utcOffset} mbe='none' fontScale='s1' />
+				</>}
+			</Margins>
+		</Box>
+	</VerticalBar.ScrollableContent>;
+}
diff --git a/client/admin/users/UserInfoActions.js b/client/admin/users/UserInfoActions.js
new file mode 100644
index 00000000000..7dd3551035f
--- /dev/null
+++ b/client/admin/users/UserInfoActions.js
@@ -0,0 +1,157 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import { Box, Button, ButtonGroup, Icon, Menu } from '@rocket.chat/fuselage';
+
+import { Modal } from '../../components/basic/Modal';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useRoute } from '../../contexts/RouterContext';
+import { usePermission } from '../../contexts/AuthorizationContext';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useMethod } from '../../contexts/ServerContext';
+import { useSetting } from '../../contexts/SettingsContext';
+import { useEndpointAction } from '../../hooks/useEndpointAction';
+
+
+const DeleteWarningModal = ({ onDelete, onCancel, ...props }) => {
+	const t = useTranslation();
+	const erasureType = useSetting('Message_ErasureType');
+
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='danger' name='modal-warning' size={20}/>
+			<Modal.Title>{t('Are_you_sure')}</Modal.Title>
+			<Modal.Close onClick={onCancel}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t(`Delete_User_Warning_${ erasureType }`)}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button ghost onClick={onCancel}>{t('Cancel')}</Button>
+				<Button primary danger onClick={onDelete}>{t('Delete')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+const SuccessModal = ({ onClose, ...props }) => {
+	const t = useTranslation();
+	return <Modal {...props}>
+		<Modal.Header>
+			<Icon color='success' name='checkmark-circled' size={20}/>
+			<Modal.Title>{t('Deleted')}</Modal.Title>
+			<Modal.Close onClick={onClose}/>
+		</Modal.Header>
+		<Modal.Content fontScale='p1'>
+			{t('User_has_been_deleted')}
+		</Modal.Content>
+		<Modal.Footer>
+			<ButtonGroup align='end'>
+				<Button primary onClick={onClose}>{t('Ok')}</Button>
+			</ButtonGroup>
+		</Modal.Footer>
+	</Modal>;
+};
+
+
+export const UserInfoActions = ({ username, _id, isActive, isAdmin, onChange, ...props }) => {
+	const t = useTranslation();
+	const [modal, setModal] = useState();
+
+	const directRoute = useRoute('direct');
+	const userRoute = useRoute('admin-users');
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const canDirectMessage = usePermission('create-d');
+	const canEditOtherUserInfo = usePermission('edit-other-user-info');
+	const canAssignAdminRole = usePermission('assign-admin-role');
+	const canEditOtherUserActiveStatus = usePermission('edit-other-user-active-status');
+	const canDeleteUser = usePermission('delete-user');
+
+	const deleteUserQuery = useMemo(() => ({ userId: _id }), [_id]);
+	const deleteUser = useEndpointAction('POST', 'users.delete', deleteUserQuery);
+
+	const willDeleteUser = useCallback(async () => {
+		const result = await deleteUser();
+		if (result.success) {
+			setModal(<SuccessModal onClose={() => { setModal(); onChange(); }}/>);
+		} else {
+			setModal();
+		}
+	}, [deleteUser]);
+	const confirmDeleteUser = useCallback(() => {
+		setModal(<DeleteWarningModal onDelete={willDeleteUser} onCancel={() => setModal()}/>);
+	}, [deleteUser]);
+
+	const setAdminStatus = useMethod('setAdminStatus');
+	const changeAdminStatus = useCallback(() => {
+		try {
+			setAdminStatus(_id, !isAdmin);
+			const message = isAdmin ? 'User_is_no_longer_an_admin' : 'User_is_now_an_admin';
+			dispatchToastMessage({ type: 'success', message: t(message) });
+			onChange();
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		}
+	}, [isAdmin]);
+
+	const activeStatusQuery = useMemo(() => ({
+		userId: _id,
+		activeStatus: !isActive,
+	}), [_id, isActive]);
+	const changeActiveStatusMessage = isActive ? 'User_has_been_deactivated' : 'User_has_been_activated';
+	const changeActiveStatus = useEndpointAction('POST', 'users.setActiveStatus', activeStatusQuery, t(changeActiveStatusMessage));
+
+	const directMessageClick = () => directRoute.push({
+		rid: username,
+	});
+
+	const editUserClick = () => userRoute.push({
+		context: 'edit',
+		id: _id,
+	});
+
+	const menuOptions = useMemo(() => ({
+		...canDirectMessage && { directMessage: {
+			label: <><Icon name='chat' size='x16' mie='x8'/>{t('Direct_Message')}</>,
+			action: directMessageClick,
+		} },
+		...canEditOtherUserInfo && { editUser: {
+			label: <><Icon name='edit' size='x16' mie='x8'/>{t('Edit')}</>,
+			action: editUserClick,
+		} },
+		...canAssignAdminRole && { makeAdmin: {
+			label: <><Icon mie='x4' name='key' size='x16'/>{ isAdmin ? t('Remove_Admin') : t('Make_Admin')}</>,
+			action: changeAdminStatus,
+		} },
+		...canDeleteUser && { delete: {
+			label: <Box color='danger'><Icon mie='x4' name='trash' size='x16'/>{t('Delete')}</Box>,
+			action: confirmDeleteUser,
+		} },
+		...canEditOtherUserActiveStatus && { changeActiveStatus: {
+			label: <><Icon mie='x4' name='user' size='x16'/>{ isActive ? t('Deactivate') : t('Activate')}</>,
+			action: async () => {
+				const result = await changeActiveStatus();
+				result.success ? onChange() : undefined;
+			},
+		} },
+	}), [canAssignAdminRole, canDeleteUser, canEditOtherUserActiveStatus, canEditOtherUserInfo, canDirectMessage, isActive, isAdmin]);
+
+	const [actions, moreActions] = useMemo(() => {
+		const keys = Object.keys(menuOptions);
+
+		const firstHalf = keys.slice(0, 2);
+		const secondHalf = keys.slice(2, keys.length);
+
+		return [firstHalf.length && firstHalf.map((key) => menuOptions[key]), secondHalf.length && Object.fromEntries(secondHalf.map((key) => [key, menuOptions[key]]))];
+	}, menuOptions);
+
+	return <>
+		<Box display='flex' flexDirection='row' {...props}>
+			<ButtonGroup flexGrow={1} justifyContent='center'>
+				{ actions && actions.map((action, index) => (<Button key={index} onClick={action.action}>{action.label}</Button>))}
+				{ moreActions && <Menu options={moreActions} placement='bottom left'/> }
+			</ButtonGroup>
+		</Box>
+		{ modal }
+	</>;
+};
diff --git a/client/admin/users/UsersPage.js b/client/admin/users/UsersPage.js
new file mode 100644
index 00000000000..f9060964b63
--- /dev/null
+++ b/client/admin/users/UsersPage.js
@@ -0,0 +1,68 @@
+import { Button, ButtonGroup, Icon } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import Page from '../../components/basic/Page';
+import VerticalBar from '../../components/basic/VerticalBar';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { useRouteParameter, useRoute } from '../../contexts/RouterContext';
+import { UserInfoWithData } from './UserInfo';
+import { EditUserWithData } from './EditUser';
+import { AddUser } from './AddUser';
+import { InviteUsers } from './InviteUsers';
+import UsersTable from './UsersTable';
+
+function UsersPage() {
+	const t = useTranslation();
+
+	const usersRoute = useRoute('admin-users');
+
+	const handleVerticalBarCloseButtonClick = () => {
+		usersRoute.push({});
+	};
+
+	const handleNewButtonClick = () => {
+		usersRoute.push({ context: 'new' });
+	};
+
+	const handleInviteButtonClick = () => {
+		usersRoute.push({ context: 'invite' });
+	};
+
+	const context = useRouteParameter('context');
+	const id = useRouteParameter('id');
+
+	return <Page flexDirection='row'>
+		<Page>
+			<Page.Header title={t('Users')}>
+				<ButtonGroup>
+					<Button onClick={handleNewButtonClick}>
+						<Icon name='plus'/> {t('New')}
+					</Button>
+					<Button onClick={handleInviteButtonClick}>
+						<Icon name='send'/> {t('Invite')}
+					</Button>
+				</ButtonGroup>
+			</Page.Header>
+			<Page.Content>
+				<UsersTable />
+			</Page.Content>
+		</Page>
+		{context && <VerticalBar>
+			<VerticalBar.Header>
+				{context === 'info' && t('User_Info')}
+				{context === 'edit' && t('Edit_User')}
+				{context === 'new' && t('Add_User')}
+				{context === 'invite' && t('Invite_Users')}
+				<VerticalBar.Close onClick={handleVerticalBarCloseButtonClick} />
+			</VerticalBar.Header>
+			<VerticalBar.Content>
+				{context === 'info' && <UserInfoWithData userId={id}/>}
+				{context === 'edit' && <EditUserWithData userId={id}/>}
+				{context === 'new' && <AddUser/>}
+				{context === 'invite' && <InviteUsers/>}
+			</VerticalBar.Content>
+		</VerticalBar>}
+	</Page>;
+}
+
+export default UsersPage;
diff --git a/client/admin/users/UsersRoute.js b/client/admin/users/UsersRoute.js
new file mode 100644
index 00000000000..a897c58c71a
--- /dev/null
+++ b/client/admin/users/UsersRoute.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { usePermission } from '../../contexts/AuthorizationContext';
+import NotAuthorizedPage from '../NotAuthorizedPage';
+import UsersPage from './UsersPage';
+
+function UsersRoute() {
+	const canViewUserAdministration = usePermission('view-user-administration');
+
+	if (!canViewUserAdministration) {
+		return <NotAuthorizedPage />;
+	}
+
+	return <UsersPage />;
+}
+
+export default UsersRoute;
diff --git a/client/admin/users/UsersTable.js b/client/admin/users/UsersTable.js
new file mode 100644
index 00000000000..d664b3b96c3
--- /dev/null
+++ b/client/admin/users/UsersTable.js
@@ -0,0 +1,108 @@
+import { Box, Table, Avatar, TextInput, Icon } from '@rocket.chat/fuselage';
+import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import React, { useMemo, useCallback, useState, useEffect } from 'react';
+
+import { GenericTable, Th } from '../../../app/ui/client/components/GenericTable';
+import { useTranslation } from '../../contexts/TranslationContext';
+import { roomTypes } from '../../../app/utils/client';
+import { useRoute } from '../../contexts/RouterContext';
+import { useEndpointData } from '../../hooks/useEndpointData';
+
+const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
+
+const FilterByText = ({ setFilter, ...props }) => {
+	const t = useTranslation();
+	const [text, setText] = useState('');
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+
+	useEffect(() => {
+		setFilter({ text });
+	}, [text]);
+	return <Box mb='x16' is='form' display='flex' flexDirection='column' {...props}>
+		<TextInput flexShrink={0} placeholder={t('Search_Users')} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
+	</Box>;
+};
+
+const sortDir = (sortDir) => (sortDir === 'asc' ? 1 : -1);
+
+const useQuery = (params, sort) => useMemo(() => ({
+	fields: JSON.stringify({ name: 1, username: 1, emails: 1, roles: 1, status: 1 }),
+	query: JSON.stringify({
+		$or: [
+			{ 'emails.address': { $regex: params.text || '', $options: 'i' } },
+			{ username: { $regex: params.text || '', $options: 'i' } },
+			{ name: { $regex: params.text || '', $options: 'i' } },
+		],
+	}),
+	sort: JSON.stringify({ [sort[0]]: sortDir(sort[1]), usernames: sort[0] === 'name' ? sortDir(sort[1]) : undefined }),
+	...params.itemsPerPage && { count: params.itemsPerPage },
+	...params.current && { offset: params.current },
+}), [JSON.stringify(params), JSON.stringify(sort)]);
+
+export function UsersTable() {
+	const t = useTranslation();
+
+	const [params, setParams] = useState({ text: '', current: 0, itemsPerPage: 25 });
+	const [sort, setSort] = useState(['name', 'asc']);
+
+	const debouncedParams = useDebouncedValue(params, 500);
+	const debouncedSort = useDebouncedValue(sort, 500);
+	const query = useQuery(debouncedParams, debouncedSort);
+
+	const data = useEndpointData('users.list', query) || {};
+
+	const usersRoute = useRoute('admin-users');
+
+	const onClick = (username) => () => usersRoute.push({
+		context: 'info',
+		id: username,
+	});
+
+	const onHeaderClick = (id) => {
+		const [sortBy, sortDirection] = sort;
+
+		if (sortBy === id) {
+			setSort([id, sortDirection === 'asc' ? 'desc' : 'asc']);
+			return;
+		}
+		setSort([id, 'asc']);
+	};
+
+	const mediaQuery = useMediaQuery('(min-width: 1024px)');
+
+	const header = useMemo(() => [
+		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name' w='x200'>{t('Name')}</Th>,
+		mediaQuery && <Th key={'username'} direction={sort[1]} active={sort[0] === 'username'} onClick={onHeaderClick} sort='username' w='x140'>{t('Username')}</Th>,
+		<Th key={'email'} direction={sort[1]} active={sort[0] === 'emails.adress'} onClick={onHeaderClick} sort='emails.address' w='x120'>{t('Email')}</Th>,
+		mediaQuery && <Th key={'roles'} direction={sort[1]} active={sort[0] === 'roles'} onClick={onHeaderClick} sort='roles' w='x120'>{t('Roles')}</Th>,
+		<Th key={'status'} direction={sort[1]} active={sort[0] === 'status'} onClick={onHeaderClick} sort='status' w='x100'>{t('Status')}</Th>,
+	].filter(Boolean), [sort, mediaQuery]);
+
+	const renderRow = useCallback(({ emails, _id, username, name, roles, status, ...args }) => {
+		const avatarUrl = roomTypes.getConfig('d').getAvatarPath({ name: username || name, type: 'd', _id, ...args });
+
+		return <Table.Row key={_id} onKeyDown={onClick(_id)} onClick={onClick(_id)} tabIndex={0} role='link' action qa-user-id={_id}>
+			<Table.Cell style={style}>
+				<Box display='flex' alignItems='center'>
+					<Avatar size={mediaQuery ? 'x28' : 'x40'} title={username} url={avatarUrl} />
+					<Box display='flex' style={style} mi='x8'>
+						<Box display='flex' flexDirection='column' alignSelf='center' style={style}>
+							<Box fontScale='p2' style={style} color='default'>{name || username}</Box>
+							{!mediaQuery && name && <Box fontScale='p1' color='hint' style={style}> {`@${ username }`} </Box>}
+						</Box>
+					</Box>
+				</Box>
+			</Table.Cell>
+			{mediaQuery && <Table.Cell>
+				<Box fontScale='p2' style={style} color='hint'>{ username }</Box> <Box mi='x4'/>
+			</Table.Cell>}
+			<Table.Cell style={style}>{emails && emails[0].address}</Table.Cell>
+			{mediaQuery && <Table.Cell style={style}>{roles && roles.join(', ')}</Table.Cell>}
+			<Table.Cell fontScale='p1' color='hint' style={style}>{status}</Table.Cell>
+		</Table.Row>;
+	}, [mediaQuery]);
+
+	return <GenericTable FilterComponent={FilterByText} header={header} renderRow={renderRow} results={data.users} total={data.total} setParams={setParams} params={params} />;
+}
+
+export default UsersTable;
diff --git a/client/admin/viewLogs/ViewLogs.js b/client/admin/viewLogs/ViewLogs.js
new file mode 100644
index 00000000000..361227edc5b
--- /dev/null
+++ b/client/admin/viewLogs/ViewLogs.js
@@ -0,0 +1,245 @@
+import { Meteor } from 'meteor/meteor';
+import React, { useEffect, useRef, useState, useCallback } from 'react';
+import { Box, Icon, Scrollable } from '@rocket.chat/fuselage';
+
+import Page from '../../components/basic/Page';
+import RawText from '../../components/basic/RawText';
+import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
+import { useEndpoint } from '../../contexts/ServerContext';
+import { useTranslation } from '../../contexts/TranslationContext';
+
+const foregroundColors = {
+	30: 'gray',
+	31: 'red',
+	32: 'lime',
+	33: 'yellow',
+	34: '#6B98FF',
+	35: '#FF00FF',
+	36: 'cyan',
+	37: 'white',
+};
+
+const ansispan = (str) => {
+	str =	str
+		.replace(/\s/g, '&nbsp;')
+		.replace(/(\\n|\n)/g, '<br>')
+		.replace(/>/g, '&gt;')
+		.replace(/</g, '&lt;')
+		.replace(/(.\d{8}-\d\d:\d\d:\d\d\.\d\d\d\(?.{0,2}\)?)/, '<span>$1</span>')
+		.replace(/\033\[1m/g, '<strong>')
+		.replace(/\033\[22m/g, '</strong>')
+		.replace(/\033\[3m/g, '<em>')
+		.replace(/\033\[23m/g, '</em>')
+		.replace(/\033\[m/g, '</span>')
+		.replace(/\033\[0m/g, '</span>')
+		.replace(/\033\[39m/g, '</span>');
+	return Object.entries(foregroundColors).reduce((str, [ansiCode, color]) => {
+		const span = `<span style="color: ${ color }">`;
+		return (
+			str
+				.replace(new RegExp(`\\033\\[${ ansiCode }m`, 'g'), span)
+				.replace(new RegExp(`\\033\\[0;${ ansiCode }m`, 'g'), span)
+		);
+	}, str);
+};
+
+function ViewLogs() {
+	const [lines, setLines] = useState([]);
+	window.setLines = setLines;
+
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const getStdoutQueue = useEndpoint('GET', 'stdout.queue');
+
+	useEffect(() => {
+		const fetchLines = async () => {
+			try {
+				const { queue } = await getStdoutQueue();
+				setLines(queue);
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			}
+		};
+
+		fetchLines();
+	}, []);
+
+	useEffect(() => {
+		const stdoutStreamer = new Meteor.Streamer('stdout');
+
+		const handleStdout = (line) => {
+			setLines((lines) => [...lines, line]);
+		};
+
+		stdoutStreamer.on('stdout', handleStdout);
+
+		return () => {
+			stdoutStreamer.removeListener('stdout');
+		};
+	}, []);
+
+	const t = useTranslation();
+
+	const wrapperRef = useRef();
+	const atBottomRef = useRef();
+
+	const [newLogsVisible, setNewLogsVisible] = useState(false);
+
+	const isAtBottom = useCallback((scrollThreshold) => {
+		const wrapper = wrapperRef.current;
+
+		if (scrollThreshold == null) {
+			scrollThreshold = 0;
+		}
+		if (wrapper.scrollTop + scrollThreshold >= wrapper.scrollHeight - wrapper.clientHeight) {
+			setNewLogsVisible(false);
+			return true;
+		}
+		return false;
+	}, []);
+
+	const sendToBottom = useCallback(() => {
+		const wrapper = wrapperRef.current;
+
+		wrapper.scrollTop = wrapper.scrollHeight - wrapper.clientHeight;
+		setNewLogsVisible(false);
+	}, []);
+
+	const checkIfScrollIsAtBottom = useCallback(() => {
+		atBottomRef.current = isAtBottom(100);
+	}, [isAtBottom]);
+
+	const sendToBottomIfNecessary = useCallback(() => {
+		if (atBottomRef.current === true && isAtBottom() !== true) {
+			sendToBottom();
+		} else if (atBottomRef.current === false) {
+			setNewLogsVisible(true);
+		}
+	}, [isAtBottom, sendToBottom]);
+
+	useEffect(() => {
+		if (window.MutationObserver) {
+			const observer = new MutationObserver((mutations) => {
+				mutations.forEach(() => {
+					sendToBottomIfNecessary();
+				});
+			});
+			observer.observe(wrapperRef.current, { childList: true });
+
+			return () => {
+				observer.disconnect();
+			};
+		}
+
+		const handleSubtreeModified = () => {
+			sendToBottomIfNecessary();
+		};
+		wrapperRef.current.addEventListener('DOMSubtreeModified', handleSubtreeModified);
+
+		return () => {
+			wrapperRef.current.removeEventListener('DOMSubtreeModified', handleSubtreeModified);
+		};
+	}, [sendToBottomIfNecessary]);
+
+	useEffect(() => {
+		const handleWindowResize = () => {
+			setTimeout(() => {
+				sendToBottomIfNecessary();
+			}, 100);
+		};
+
+		window.addEventListener('resize', handleWindowResize);
+
+		return () => {
+			window.removeEventListener('resize', handleWindowResize);
+		};
+	}, [sendToBottomIfNecessary]);
+
+	const handleWheel = useCallback(() => {
+		atBottomRef.current = false;
+		setTimeout(() => {
+			checkIfScrollIsAtBottom();
+		}, 100);
+	}, [checkIfScrollIsAtBottom]);
+
+	const handleTouchStart = () => {
+		atBottomRef.current = false;
+	};
+
+	const handleTouchEnd = useCallback(() => {
+		setTimeout(() => {
+			checkIfScrollIsAtBottom();
+		}, 100);
+	}, [checkIfScrollIsAtBottom]);
+
+	const handleScroll = useCallback(() => {
+		atBottomRef.current = false;
+		setTimeout(() => {
+			checkIfScrollIsAtBottom();
+		}, 100);
+	}, [checkIfScrollIsAtBottom]);
+
+	const handleClick = useCallback(() => {
+		atBottomRef.current = true;
+		sendToBottomIfNecessary();
+	}, [sendToBottomIfNecessary]);
+
+	return <Page>
+		<Page.Header title={t('View Logs')} />
+		<Page.Content>
+			<Box
+				width='full'
+				height='full'
+				overflow='hidden'
+				position='relative'
+				display='flex'
+				marginBlock='x8'
+			>
+				<Scrollable vertical>
+					<Box
+						ref={wrapperRef}
+						display='flex'
+						flexDirection='column'
+						padding='x8'
+						flexGrow={1}
+						fontFamily='mono'
+						color='alternative'
+						backgroundColor='neutral-800'
+						style={{ wordBreak: 'break-all' }}
+						onWheel={handleWheel}
+						onTouchStart={handleTouchStart}
+						onTouchEnd={handleTouchEnd}
+						onScroll={handleScroll}
+					>
+						{lines.sort((a, b) => a.ts - b.ts).map(({ string }, i) =>
+							<RawText key={i}>{ansispan(string)}</RawText>)}
+					</Box>
+				</Scrollable>
+				<Box
+					position='absolute'
+					insetBlockEnd='x8'
+					insetInlineStart='50%'
+					width='x132'
+					height='x32'
+					marginInline='neg-x64'
+					paddingBlock='x8'
+					fontScale='c1'
+					borderRadius='full'
+					color='primary-500'
+					backgroundColor='surface'
+					onClick={handleClick}
+					textAlign='center'
+					style={{
+						cursor: 'pointer',
+						transition: 'transform 0.3s ease-out',
+						transform: newLogsVisible ? 'translateY(0)' : 'translateY(150%)',
+					}}
+				>
+					<Icon name='jump' size='x16' /> {t('New_logs')}
+				</Box>
+			</Box>
+		</Page.Content>
+	</Page>;
+}
+
+export default ViewLogs;
diff --git a/client/admin/viewLogs/ViewLogs.stories.js b/client/admin/viewLogs/ViewLogs.stories.js
new file mode 100644
index 00000000000..3ca844e9726
--- /dev/null
+++ b/client/admin/viewLogs/ViewLogs.stories.js
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import ViewLogs from './ViewLogs';
+
+export default {
+	title: 'admin/pages/ViewLogs',
+	component: ViewLogs,
+	decorators: [
+		(storyFn) => <div className='rc-old' style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}>
+			{storyFn()}
+		</div>,
+	],
+};
+
+export const _default = () =>
+	<ViewLogs />;
diff --git a/client/admin/viewLogs/ViewLogsRoute.js b/client/admin/viewLogs/ViewLogsRoute.js
new file mode 100644
index 00000000000..64ca4dd2c74
--- /dev/null
+++ b/client/admin/viewLogs/ViewLogsRoute.js
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import NotAuthorizedPage from '../NotAuthorizedPage';
+import { usePermission } from '../../contexts/AuthorizationContext';
+import ViewLogs from './ViewLogs';
+
+export default function ViewLogsRoute() {
+	const canViewLogs = usePermission('view-logs');
+
+	if (!canViewLogs) {
+		return <NotAuthorizedPage />;
+	}
+
+	return <ViewLogs />;
+}
diff --git a/client/components/basic/BurgerMenuButton.js b/client/components/basic/BurgerMenuButton.js
index 4cfbf9ea03a..6c091b7f053 100644
--- a/client/components/basic/BurgerMenuButton.js
+++ b/client/components/basic/BurgerMenuButton.js
@@ -6,7 +6,7 @@ import { useSession } from '../../contexts/SessionContext';
 import { useSidebar } from '../../contexts/SidebarContext';
 import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 
-export const BurgerMenuButton = () => {
+export const BurgerMenuButton = (props) => {
 	const [isSidebarOpen, setSidebarOpen] = useSidebar();
 	const isLayoutEmbedded = useEmbeddedLayout();
 	const unreadMessagesBadge = useSession('unread');
@@ -25,6 +25,7 @@ export const BurgerMenuButton = () => {
 		].filter(Boolean).join(' ')}
 		type='button'
 		onClick={handleClick}
+		{...props}
 	>
 		<Box is='i' className='burger__line' aria-hidden='true' />
 		<Box is='i' className='burger__line' aria-hidden='true' />
diff --git a/client/components/basic/Button.js b/client/components/basic/Button.js
deleted file mode 100644
index 187409e31e9..00000000000
--- a/client/components/basic/Button.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-
-export const Button = ({
-	children,
-	className,
-	invisible,
-	primary,
-	secondary,
-	cancel,
-	nude,
-	submit,
-	...props
-}) => <button
-	type={(submit && 'submit') || 'button'}
-	className={[
-		'rc-button',
-		primary && 'rc-button--primary',
-		secondary && 'rc-button--secondary',
-		invisible && 'rc-button--invisible',
-		cancel && 'rc-button--cancel',
-		nude && 'rc-button--nude',
-		className,
-	].filter(Boolean).join(' ')}
-	{...props}
->
-	{children}
-</button>;
diff --git a/client/components/basic/Button.stories.js b/client/components/basic/Button.stories.js
deleted file mode 100644
index 435dc9569ce..00000000000
--- a/client/components/basic/Button.stories.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { action } from '@storybook/addon-actions';
-import { boolean, text } from '@storybook/addon-knobs';
-import React from 'react';
-
-import { Button } from './Button';
-
-export default {
-	title: 'basic/Button',
-	component: Button,
-};
-
-export const _default = () => <Button
-	children={text('children', 'Button')}
-	invisible={boolean('invisible')}
-	primary={boolean('primary')}
-	secondary={boolean('secondary')}
-	cancel={boolean('cancel')}
-	nude={boolean('nude')}
-	submit={boolean('submit')}
-	onClick={action('click')}
-/>;
-
-export const invisible = () => <Button invisible>Button</Button>;
-
-export const primary = () => <Button primary>Button</Button>;
-
-export const secondary = () => <Button secondary>Button</Button>;
-
-export const cancel = () => <Button cancel>Button</Button>;
-
-export const nude = () => <Button nude>Button</Button>;
-
-export const submit = () => <Button submit>Button</Button>;
diff --git a/client/components/basic/Icon.js b/client/components/basic/Icon.js
deleted file mode 100644
index 88cc2478681..00000000000
--- a/client/components/basic/Icon.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-
-const SvgIcon = ({ icon, block = '', baseUrl = '', className }) => <svg
-	className={[
-		'rc-icon',
-		block,
-		block && icon && `${ block }--${ icon }`,
-		className,
-	].filter(Boolean).join(' ')}
-	aria-hidden='true'
->
-	<use xlinkHref={`${ baseUrl }#icon-${ icon }`} />
-</svg>;
-
-const FontIcon = ({ icon, className }) => <i
-	className={[icon, className].filter(Boolean).join(' ')}
-/>;
-
-export const Icon = ({ icon, ...props }) =>
-	(/^icon-/.test(icon)
-		? <FontIcon icon={icon} {...props} />
-		: <SvgIcon icon={icon} {...props} />);
diff --git a/client/components/basic/Input.js b/client/components/basic/Input.js
deleted file mode 100644
index 712d917e463..00000000000
--- a/client/components/basic/Input.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, { useEffect, useRef } from 'react';
-
-import { Icon } from './Icon';
-
-export const Input = ({
-	error,
-	title,
-	icon,
-	type = 'text',
-	className,
-	placeholder,
-	options,
-	focused,
-	...props
-}) => {
-	const ref = useRef(null);
-
-	useEffect(() => {
-		if (focused && ref.current) {
-			ref.current.focus();
-		}
-	}, [focused]);
-
-	return <div
-		className={[
-			'rc-input',
-			error && 'rc-input--error',
-		].filter(Boolean).join(' ')}
-	>
-		<label className='rc-input__label'>
-			{title && <div className='rc-input__title'>{title}</div>}
-			{['text', 'email', 'password'].includes(type) && <div className='rc-input__wrapper'>
-				{icon && <div className='rc-input__icon'>
-					<Icon block='rc-input__icon-sv' icon={icon} />
-				</div>}<input
-					type={type}
-					className={['rc-input__element', className].filter(Boolean).join(' ')}
-					placeholder={placeholder}
-					ref={ref}
-					{...props}
-				/>
-			</div>}
-			{type === 'select' && <div className='rc-select'>
-				<select
-					className={['rc-select__element', className].filter(Boolean).join(' ')}
-					ref={ref}
-					{...props}
-				>
-					{placeholder && <option
-						disabled
-						value=''
-					>{placeholder}</option>}
-					{options.map(({ label, value }, i) =>
-						<option key={i} className='rc-select__option' value={value}>{label}</option>,
-					)}
-				</select>
-				<Icon block='rc-select__arrow' icon='arrow-down' />
-			</div>}
-			{typeof error === 'string' && error && <div className='rc-input__error'>
-				<div className='rc-input__error-icon'>
-					<Icon block='rc-input__error-icon' icon='warning' className='rc-input__error-icon-svg'/>
-				</div>
-				<div className='rc-input__error-message'>{error}</div>
-			</div>}
-		</label>
-	</div>;
-};
diff --git a/client/components/basic/Input.stories.js b/client/components/basic/Input.stories.js
deleted file mode 100644
index 95891b0c6fd..00000000000
--- a/client/components/basic/Input.stories.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-
-import { Input } from './Input';
-
-export default {
-	title: 'basic/Input',
-	component: Input,
-};
-
-export const _default = () => <Input />;
-
-export const withTitle = () => <Input title='Title' />;
-
-export const withError = () => <Input error='Error' />;
-
-export const withIcon = () => <Input icon='key' />;
-
-export const withPlaceholder = () => <Input placeholder='Placeholder' />;
-
-export const focused = () => <Input focused />;
-
-export const ofTypeSelect = () => <Input type='select' options={[
-	{ label: 'A', value: 'a' },
-	{ label: 'B', value: 'b' },
-	{ label: 'C', value: 'c' },
-]} />;
diff --git a/client/components/basic/Link.js b/client/components/basic/Link.js
deleted file mode 100644
index 6197c4f5a39..00000000000
--- a/client/components/basic/Link.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-
-export function Link({ external, ...props }) {
-	return <a
-		{...external ? {
-			rel: 'noopener noreferrer',
-			target: '_blank',
-		} : {}}
-		{...props}
-	/>;
-}
diff --git a/client/components/basic/Link.stories.js b/client/components/basic/Link.stories.js
deleted file mode 100644
index 90694dae636..00000000000
--- a/client/components/basic/Link.stories.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-
-import { Link } from './Link';
-
-export default {
-	title: 'basic/Link',
-	component: Link,
-};
-
-export const _default = () => <Link href='#'>Link</Link>;
-
-export const withTitle = () => <Link external href='#'>Content</Link>;
diff --git a/client/components/basic/MarkdownText.js b/client/components/basic/MarkdownText.js
index 698d5bde6b2..991e072f356 100644
--- a/client/components/basic/MarkdownText.js
+++ b/client/components/basic/MarkdownText.js
@@ -1,5 +1,9 @@
 import React from 'react';
 
 import { Markdown } from '../../../app/markdown/client';
+import RawText from './RawText';
 
-export const MarkdownText = ({ children }) => <span dangerouslySetInnerHTML={{ __html: Markdown.parseNotEscaped(children) }} />;
+const MarkdownText = ({ children }) =>
+	<RawText>{Markdown.parse(children)}</RawText>;
+
+export default MarkdownText;
diff --git a/client/components/basic/Modal.js b/client/components/basic/Modal.js
new file mode 100644
index 00000000000..7444bcb3c56
--- /dev/null
+++ b/client/components/basic/Modal.js
@@ -0,0 +1,45 @@
+
+import { createPortal } from 'react-dom';
+import React, { useMemo, useEffect } from 'react';
+import { Modal as ModalComponent, ModalBackdrop } from '@rocket.chat/fuselage';
+
+const getModalRoot = () => {
+	const modalRoot = document.getElementById('modal-root');
+	if (modalRoot) {
+		return modalRoot;
+	}
+	const newElement = document.createElement('div');
+
+	newElement.id = 'modal-root';
+
+	document.body.appendChild(newElement);
+	return newElement;
+};
+
+function ModalPortal({ children = '' }) {
+	const modalRoot = useMemo(getModalRoot, []);
+	const node = useMemo(() => document.createElement('div'), []);
+
+	useEffect(() => {
+		modalRoot.appendChild(node);
+		return () => modalRoot.removeChild(node);
+	}, [node]);
+	return createPortal(
+		<div>{children}</div>,
+		node,
+	);
+}
+
+export function Modal({ ...props }) {
+	return <ModalPortal>
+		<ModalBackdrop>
+			<ModalComponent {...props}/>
+		</ModalBackdrop>
+	</ModalPortal>;
+}
+
+Modal.Header = ModalComponent.Header;
+Modal.Footer = ModalComponent.Footer;
+Modal.Content = ModalComponent.Content;
+Modal.Title = ModalComponent.Title;
+Modal.Close = ModalComponent.Close;
diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js
index 49111df7bd0..0c11a99ac40 100644
--- a/client/components/basic/Page.js
+++ b/client/components/basic/Page.js
@@ -1,48 +1,77 @@
-import { Box, Flex, Margins, Scrollable } from '@rocket.chat/fuselage';
-import React, { useMemo, createContext, useContext, useState } from 'react';
+import { Box, Scrollable } from '@rocket.chat/fuselage';
+import React, { createContext, useContext, useState } from 'react';
 
 import { BurgerMenuButton } from './BurgerMenuButton';
 
 const PageContext = createContext();
-export function Page(props) {
+
+function Page(props) {
 	const [border, setBorder] = useState(false);
 	return <PageContext.Provider value={[border, setBorder]}>
-		<Flex.Container direction='column'>
-			<Box is='section' style={useMemo(() => ({ overflow: 'hidden', flex: '1 1 auto', height: '100%' }), [])} {...props} />
-		</Flex.Container>
+		<Box
+			is='section'
+			display='flex'
+			flexDirection='column'
+			flexGrow={1}
+			flexShrink={1}
+			height='full'
+			overflow='hidden'
+			{...props}
+		/>
 	</PageContext.Provider>;
 }
 
-export function PageHeader({ children, title, ...props }) {
+function PageHeader({ children, title, ...props }) {
 	const [border] = useContext(PageContext);
-	return <Box style={{ borderBlockEndColor: border ? 'var(--color-gray-lightest)' : 'transparent', transition: 'border-block-end-color 0.3s', borderBlockEnd: '2px solid transparent' }}>
-		<Margins block='x16' all='x24'>
-			<Flex.Container wrap='no-wrap' alignItems='center' direction='row'>
-				<Box {...props}>
-					<Margins inlineEnd='x8'>
-						<BurgerMenuButton />
-					</Margins>
-					<Flex.Item grow={1}>
-						<Box is='h1' textStyle='h1' textColor='default'>{title}</Box>
-					</Flex.Item>
-					{children}
-				</Box>
-			</Flex.Container>
-		</Margins>
+	return <Box borderBlockEndWidth='x2' borderBlockEndColor={border ? 'neutral-200' : 'transparent'}>
+		<Box
+			marginBlock='x16'
+			marginInline='x24'
+			minHeight='x40'
+			display='flex'
+			flexDirection='row'
+			flexWrap='nowrap'
+			alignItems='center'
+			{...props}
+		>
+			<BurgerMenuButton marginInlineEnd='x8' />
+			<Box is='h1' fontScale='h1' flexGrow={1}>{title}</Box>
+			{children}
+		</Box>
 	</Box>;
 }
 
-export function PageContentShadowScroll({ onScrollContent, ...props }) {
-	const [, setBorder] = useContext(PageContext);
-	return <PageContent onScrollContent={({ top, ...args }) => { setBorder(!top); onScrollContent && onScrollContent({ top, ...args }); }} { ...props } ></PageContent>;
+function PageContent(props) {
+	return <Box
+		paddingInline='x24'
+		display='flex'
+		flexDirection='column'
+		overflowY='hidden'
+		height='full'
+		{...props}
+	/>;
 }
 
-export function PageContent({ onScrollContent, ...props }) {
+function PageScrollableContent({ onScrollContent, ...props }) {
 	return <Scrollable onScrollContent={onScrollContent} >
-		<Box style={useMemo(() => ({ padding: '1rem' }), [])} {...props} />
+		<Box padding='x16' display='flex' flexDirection='column' flexGrow={1} {...props} />
 	</Scrollable>;
 }
 
+function PageScrollableContentWithShadow({ onScrollContent, ...props }) {
+	const [, setBorder] = useContext(PageContext);
+	return <PageScrollableContent
+		onScrollContent={({ top, ...args }) => {
+			setBorder(!top);
+			onScrollContent && onScrollContent({ top, ...args });
+		}}
+		{ ...props }
+	/>;
+}
+
 Page.Header = PageHeader;
 Page.Content = PageContent;
-Page.ContentShadowScroll = PageContentShadowScroll;
+Page.ScrollableContent = PageScrollableContent;
+Page.ScrollableContentWithShadow = PageScrollableContentWithShadow;
+
+export default Page;
diff --git a/client/components/basic/Page.stories.js b/client/components/basic/Page.stories.js
index 549fc272d1d..a7869c96ced 100644
--- a/client/components/basic/Page.stories.js
+++ b/client/components/basic/Page.stories.js
@@ -1,7 +1,7 @@
 import { Button, ButtonGroup, Margins, Tile } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { Page } from './Page';
+import Page from './Page';
 
 export default {
 	title: 'basic/Page',
diff --git a/client/components/basic/RawText.js b/client/components/basic/RawText.js
index 70cd9339336..dbeec79f334 100644
--- a/client/components/basic/RawText.js
+++ b/client/components/basic/RawText.js
@@ -1,3 +1,5 @@
 import React from 'react';
 
-export const RawText = ({ children }) => <span dangerouslySetInnerHTML={{ __html: children }} />;
+const RawText = ({ children }) => <span dangerouslySetInnerHTML={{ __html: children }} />;
+
+export default RawText;
diff --git a/client/components/basic/Subtitle.js b/client/components/basic/Subtitle.js
new file mode 100644
index 00000000000..30b37630446
--- /dev/null
+++ b/client/components/basic/Subtitle.js
@@ -0,0 +1,15 @@
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+
+function Subtitle(props) {
+	return <Box
+		color='default'
+		fontFamily='sans'
+		fontScale='s1'
+		marginBlockEnd='x8'
+		withRichContent
+		{...props}
+	/>;
+}
+
+export default Subtitle;
diff --git a/client/components/basic/VerticalBar.js b/client/components/basic/VerticalBar.js
new file mode 100644
index 00000000000..52e0dae7677
--- /dev/null
+++ b/client/components/basic/VerticalBar.js
@@ -0,0 +1,66 @@
+import { Box, Tile, Button, Icon, Margins } from '@rocket.chat/fuselage';
+import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import React from 'react';
+
+import Page from './Page';
+
+function VerticalBar({ children, ...props }) {
+	const mobile = useDebouncedValue(useMediaQuery('(max-width: 420px)'), 50);
+	const small = useDebouncedValue(useMediaQuery('(max-width: 780px)'), 50);
+
+	return <Box
+		display='flex'
+		flexShrink={0}
+		width={mobile ? 'full' : 'x380'}
+		height='full'
+		position={small ? 'absolute' : undefined}
+		insetInlineEnd={small ? 'none' : undefined}
+		{...props}
+	>
+		<Tile
+			margin='none'
+			padding='none'
+			display='flex'
+			flexDirection='column'
+			flexGrow={1}
+		>
+			{children}
+		</Tile>
+	</Box>;
+}
+
+function VerticalBarHeader(props) {
+	return <Box
+		paddingBlock='x32'
+		paddingInline='x24'
+		display='flex'
+		alignItems='center'
+		justifyContent='space-between'
+		backgroundColor='neutral-200'
+		fontScale='s2'
+		{...props}
+	/>;
+}
+
+function VerticalBarClose(props) {
+	return <Button small flexShrink={0} ghost square {...props}>
+		<Icon name='cross' size='x20' />
+	</Button>;
+}
+
+function VerticalBarContent(props) {
+	return <Page.Content {...props} />;
+}
+
+function VerticalBarScrollableContent({ children, props }) {
+	return <Page.ScrollableContent padding='x24' mi='neg-x24' {...props}>
+		<Margins blockEnd='x16'>{children}</Margins>
+	</Page.ScrollableContent>;
+}
+
+VerticalBar.Header = VerticalBarHeader;
+VerticalBar.Close = VerticalBarClose;
+VerticalBar.Content = VerticalBarContent;
+VerticalBar.ScrollableContent = VerticalBarScrollableContent;
+
+export default VerticalBar;
diff --git a/client/components/basic/avatar/RoomAvatar.js b/client/components/basic/avatar/RoomAvatar.js
new file mode 100644
index 00000000000..a66741e10b8
--- /dev/null
+++ b/client/components/basic/avatar/RoomAvatar.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Avatar } from '@rocket.chat/fuselage';
+
+import { roomTypes } from '../../../../app/utils/client';
+
+function RoomAvatar({ room: { type, ...room }, ...props }) {
+	const avatarUrl = roomTypes.getConfig(type).getAvatarPath({ type, ...room });
+
+	return <Avatar url={avatarUrl} title={avatarUrl} {...props}/>;
+}
+
+export default RoomAvatar;
diff --git a/client/components/basic/avatar/UserAvatar.js b/client/components/basic/avatar/UserAvatar.js
new file mode 100644
index 00000000000..d5bc6b16a3c
--- /dev/null
+++ b/client/components/basic/avatar/UserAvatar.js
@@ -0,0 +1,9 @@
+import React from 'react';
+import { Avatar } from '@rocket.chat/fuselage';
+
+function UserAvatar({ url, username, ...props }) {
+	const avatarUrl = url || `/avatar/${ username }`;
+	return <Avatar url={avatarUrl} title={username} {...props}/>;
+}
+
+export default UserAvatar;
diff --git a/client/components/basic/avatar/UserAvatarEditor.js b/client/components/basic/avatar/UserAvatarEditor.js
new file mode 100644
index 00000000000..13152a3f934
--- /dev/null
+++ b/client/components/basic/avatar/UserAvatarEditor.js
@@ -0,0 +1,54 @@
+import React, { useState, useCallback } from 'react';
+import { Box, Button, Icon, TextInput, Margins } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../../contexts/TranslationContext';
+import { useFileInput } from '../../../hooks/useFileInput';
+import UserAvatar from './UserAvatar';
+
+export function UserAvatarEditor({ username, setAvatarObj }) {
+	const t = useTranslation();
+	const [avatarFromUrl, setAvatarFromUrl] = useState('');
+	const [newAvatarSource, setNewAvatarSource] = useState();
+
+	const setUploadedPreview = useCallback(async (file, formData) => {
+		setAvatarObj(formData);
+		setNewAvatarSource(URL.createObjectURL(file));
+	}, [setAvatarObj]);
+
+	const clickUpload = useFileInput(setUploadedPreview);
+
+	const clickUrl = () => {
+		setNewAvatarSource(avatarFromUrl);
+		setAvatarObj({ avatarUrl: avatarFromUrl });
+	};
+	const clickReset = () => {
+		setNewAvatarSource(`/avatar/%40${ username }`);
+		setAvatarObj('reset');
+	};
+
+	const url = newAvatarSource || undefined;
+
+	const handleAvatarFromUrlChange = (event) => {
+		setAvatarFromUrl(event.currentTarget.value);
+	};
+
+	return <Box display='flex' flexDirection='column' fontScale='p2'>
+		{t('Profile_picture')}
+		<Box display='flex' flexDirection='row' mbs='x4'>
+			<UserAvatar size='x120' url={url} username={username} style={{ objectFit: 'contain' }} mie='x4'/>
+			<Box display='flex' flexDirection='column' flexGrow='1' justifyContent='space-between' mis='x4'>
+				<Box display='flex' flexDirection='row' mbs='none'>
+					<Margins inline='x4'>
+						<Button square mis='none' onClick={clickReset}><UserAvatar size='x36' username={`%40${ username }`} mie='x4'/></Button>
+						<Button square onClick={clickUpload}><Icon name='upload' size='x20'/></Button>
+						<Button square mie='none' onClick={clickUrl}><Icon name='permalink' size='x20'/></Button>
+					</Margins>
+				</Box>
+				<Box>{t('Use_url_for_avatar')}</Box>
+				<TextInput flexGrow={0} placehloder={t('Use_url_for_avatar')} value={avatarFromUrl} onChange={handleAvatarFromUrlChange}/>
+			</Box>
+		</Box>
+	</Box>;
+}
+
+export default UserAvatarEditor;
diff --git a/client/components/pageNotFound/PageNotFound.css b/client/components/pageNotFound/PageNotFound.css
deleted file mode 100644
index 436900ea6fc..00000000000
--- a/client/components/pageNotFound/PageNotFound.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.PageNotFound {
-	width: 100%;
-	min-height: 100vh;
-
-	text-align: center;
-
-	background-color: var(--rc-color-primary);
-	background-image: url('/images/404.svg');
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: cover;
-
-	&__404 {
-		font-size: 4em;
-		font-weight: bold;
-	}
-}
diff --git a/client/components/pageNotFound/PageNotFound.js b/client/components/pageNotFound/PageNotFound.js
index a7ff34c356b..232ea63ac6c 100644
--- a/client/components/pageNotFound/PageNotFound.js
+++ b/client/components/pageNotFound/PageNotFound.js
@@ -5,9 +5,8 @@ import { useRoute } from '../../contexts/RouterContext';
 import { useWipeInitialPageLoading } from '../../hooks/useWipeInitialPageLoading';
 import { ConnectionStatusAlert } from '../connectionStatus/ConnectionStatusAlert';
 import { useTranslation } from '../../contexts/TranslationContext';
-import './PageNotFound.css';
 
-export function PageNotFound() {
+function PageNotFound() {
 	useWipeInitialPageLoading();
 
 	const t = useTranslation();
@@ -24,27 +23,30 @@ export function PageNotFound() {
 	return <>
 		<ConnectionStatusAlert />
 		<Flex.Container direction='column' justifyContent='center' alignItems='center'>
-			<Box is='section' componentClassName='PageNotFound'>
+			<Box is='section' width='full' minHeight='sh' textAlign='center' backgroundColor='neutral-800' style={{
+				backgroundImage: 'url(\'/images/404.svg\')',
+				backgroundRepeat: 'no-repeat',
+				backgroundPosition: 'center',
+				backgroundSize: 'cover',
+			}}>
 				<Flex.Item>
 					<Box>
 						<Margins all='x12'>
-							<Box componentClassName='PageNotFound__404' textColor='alternative'>404</Box>
+							<Box fontWeight='p2' fontSize='x64' color='alternative'>404</Box>
 
-							<Box textStyle='h1' textColor='alternative'>
+							<Box fontScale='h1' color='alternative'>
 								{t('Oops_page_not_found')}
 							</Box>
 
-							<Box textStyle='p1' textColor='alternative'>
+							<Box fontScale='p1' color='alternative'>
 								{t('Sorry_page_you_requested_does_not_exist_or_was_deleted')}
 							</Box>
 						</Margins>
 
-						<Margins all='x32'>
-							<ButtonGroup align='center'>
-								<Button type='button' primary onClick={handleGoToPreviousPageClick}>{t('Return_to_previous_page')}</Button>
-								<Button type='button' primary onClick={handleGoHomeClick}>{t('Return_to_home')}</Button>
-							</ButtonGroup>
-						</Margins>
+						<ButtonGroup align='center' margin='x64'>
+							<Button type='button' primary onClick={handleGoToPreviousPageClick}>{t('Return_to_previous_page')}</Button>
+							<Button type='button' primary onClick={handleGoHomeClick}>{t('Return_to_home')}</Button>
+						</ButtonGroup>
 					</Box>
 				</Flex.Item>
 			</Box>
diff --git a/client/components/pageNotFound/PageNotFound.stories.js b/client/components/pageNotFound/PageNotFound.stories.js
index 44c6e33737d..592e41af076 100644
--- a/client/components/pageNotFound/PageNotFound.stories.js
+++ b/client/components/pageNotFound/PageNotFound.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { PageNotFound } from './PageNotFound';
+import PageNotFound from './PageNotFound';
 
 export default {
 	title: 'pageNotFound/PageNotFound',
diff --git a/client/components/setupWizard/Logo.js b/client/components/setupWizard/Logo.js
index 303bf21a69d..7e05f231993 100644
--- a/client/components/setupWizard/Logo.js
+++ b/client/components/setupWizard/Logo.js
@@ -1,10 +1,19 @@
+import { Box } from '@rocket.chat/fuselage';
 import React, { useState } from 'react';
 
-export function Logo({ src = 'images/logo/logo.svg', ...props }) {
-	const [isFallbacked, setFallbacked] = useState(false);
+function Logo({ src = 'images/logo/logo.svg', ...props }) {
+	const [isLoaded, setLoaded] = useState(false);
 
-	if (isFallbacked) {
-		return <svg viewBox='0 0 1000 182' xmlns='http://www.w3.org/2000/svg' {...props}>
+	const handleLoad = () => {
+		setLoaded(true);
+	};
+
+	const handleError = () => {
+		setLoaded(false);
+	};
+
+	return <>
+		{!isLoaded && <Box is='svg' viewBox='0 0 1000 182' xmlns='http://www.w3.org/2000/svg' {...props}>
 			<g fill='none' fillRule='evenodd'>
 				<g fill='#9ea2a8' fillRule='nonzero' transform='translate(245.154709 29.581775)'>
 					<path d='m62.5717573 58.8485839c0 10.1578288-3.791296 16.8288535-11.0711519 20.01071l10.4656798 39.7212001c.4541041 1.822594-.454104 2.727981-2.1238826 2.727981h-15.7753863c-1.5160454 0-2.2728855-.756459-2.5779867-2.122813l-10.1629438-38.5061381h-10.4656799v38.2059181c0 1.517646-.9082081 2.423033-2.4266186 2.423033h-15.77538636c-1.51604538 0-2.42661865-.910115-2.42661865-2.423033v-116.43561996c0-1.51528236.91057327-2.42539734 2.42661865-2.42539734h38.07142346c14.2569758 0 21.8419329 7.58113963 21.8419329 21.83094zm-26.6951702 1.817866c3.942664 0 6.0665466-2.1228136 6.0665466-6.0634933v-28.5019646c0-3.9406797-2.1238826-6.0611294-6.0665466-6.0611294h-15.0161812v40.6289513z'/>
@@ -23,8 +32,9 @@ export function Logo({ src = 'images/logo/logo.svg', ...props }) {
 				<path d='m41.6969487 124.026456c-11.6079642-9.147807-18.5755614-20.853906-18.5755614-33.6127751 0-29.2774081 36.6879889-53.0114368 81.9449167-53.0114368 45.256928 0 81.944917 23.7340287 81.944917 53.0114368s-36.687989 53.0114371-81.944917 53.0114371c-11.153988 0-21.7874802-1.441656-31.4795213-4.052646l-7.0858271 6.833734c-3.8501553 3.713177-8.3628437 7.073426-13.0666687 9.72133-6.2348704 3.061887-12.3916858 4.732411-18.4830125 5.242134.3436223-.624722.6600359-1.257578.9997137-1.883283 7.099975-13.078552 9.0152952-24.831862 5.7459606-35.259931z' fill='#fff'/>
 				<path d='m65.7703624 103.026182c-6.6534511 0-12.047139-5.4803639-12.047139-12.2407349 0-6.7603709 5.3936879-12.2407344 12.047139-12.2407344 6.6534512 0 12.047139 5.4803635 12.047139 12.2407344 0 6.760371-5.3936878 12.2407349-12.047139 12.2407349zm38.7859106 0c-6.6534508 0-12.0471386-5.4803639-12.0471386-12.2407349 0-6.7603709 5.3936878-12.2407344 12.0471386-12.2407344 6.653452 0 12.047139 5.4803635 12.047139 12.2407344 0 6.760371-5.393687 12.2407349-12.047139 12.2407349zm38.785911 0c-6.653451 0-12.047139-5.4803639-12.047139-12.2407349 0-6.7603709 5.393688-12.2407344 12.047139-12.2407344 6.653452 0 12.047139 5.4803635 12.047139 12.2407344 0 6.760371-5.393687 12.2407349-12.047139 12.2407349z' fill='#db2323' fillRule='nonzero'/>
 			</g>
-		</svg>;
-	}
-
-	return <img onError={() => setFallbacked(true)} src={src} {...props} />;
+		</Box>}
+		<Box is='img' src={src} hidden={!isLoaded} onLoad={handleLoad} onError={handleError} {...props} />
+	</>;
 }
+
+export default Logo;
diff --git a/client/components/setupWizard/Logo.stories.js b/client/components/setupWizard/Logo.stories.js
index 8dac0e67e82..d0f1fb645f3 100644
--- a/client/components/setupWizard/Logo.stories.js
+++ b/client/components/setupWizard/Logo.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Logo } from './Logo';
+import Logo from './Logo';
 
 export default {
 	title: 'setupWizard/Logo',
diff --git a/client/components/setupWizard/SetupWizardPage.css b/client/components/setupWizard/SetupWizardPage.css
deleted file mode 100644
index a21f1d886d8..00000000000
--- a/client/components/setupWizard/SetupWizardPage.css
+++ /dev/null
@@ -1,37 +0,0 @@
-.SetupWizard {
-	display: flex;
-
-	width: 100%;
-	min-height: 100vh;
-
-	background-color: var(--color-dark-05);
-	align-items: stretch;
-
-	justify-content: center;
-
-	&__wrapper {
-		display: flex;
-		flex: 1 1 auto;
-
-		height: 100vh;
-		flex-flow: column nowrap;
-	}
-
-	&__steps {
-		flex: 1 1 auto;
-		justify-content: center;
-	}
-}
-
-@media (width <= 760px) {
-	.SetupWizard {
-		flex-direction: column;
-
-		min-height: 100vh;
-		justify-content: stretch;
-
-		&__wrapper {
-			min-height: 0;
-		}
-	}
-}
diff --git a/client/components/setupWizard/SetupWizardPage.js b/client/components/setupWizard/SetupWizardPage.js
index 455ea3455df..693034d1833 100644
--- a/client/components/setupWizard/SetupWizardPage.js
+++ b/client/components/setupWizard/SetupWizardPage.js
@@ -1,25 +1,34 @@
 import { Box, Margins, Scrollable, Tile } from '@rocket.chat/fuselage';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import React from 'react';
 
 import { useTranslation } from '../../contexts/TranslationContext';
 import { useWipeInitialPageLoading } from '../../hooks/useWipeInitialPageLoading';
 import { ConnectionStatusAlert } from '../connectionStatus/ConnectionStatusAlert';
 import { finalStep } from './SetupWizardState';
-import { FinalStep } from './steps/FinalStep';
-import { SideBar } from './SideBar';
-import { AdminUserInformationStep } from './steps/AdminUserInformationStep';
-import { SettingsBasedStep } from './steps/SettingsBasedStep';
-import { RegisterServerStep } from './steps/RegisterServerStep';
+import FinalStep from './steps/FinalStep';
+import SideBar from './SideBar';
+import AdminUserInformationStep from './steps/AdminUserInformationStep';
+import SettingsBasedStep from './steps/SettingsBasedStep';
+import RegisterServerStep from './steps/RegisterServerStep';
 
-import './SetupWizardPage.css';
-
-export function SetupWizardPage({ currentStep = 1 }) {
+function SetupWizardPage({ currentStep = 1 }) {
 	useWipeInitialPageLoading();
+
 	const t = useTranslation();
+	const small = useMediaQuery('(max-width: 760px)');
 
 	return <>
 		<ConnectionStatusAlert />
-		<Box className='SetupWizard' data-qa='setup-wizard'>
+		<Box
+			width='full'
+			height='sh'
+			display='flex'
+			flexDirection={small ? 'column' : 'row'}
+			alignItems='stretch'
+			style={{ backgroundColor: 'var(--color-dark-05, #f1f2f4)' }}
+			data-qa='setup-wizard'
+		>
 			{(currentStep === finalStep && <FinalStep />)
 			|| <>
 				<SideBar
@@ -43,10 +52,16 @@ export function SetupWizardPage({ currentStep = 1 }) {
 					]}
 					currentStep={currentStep}
 				/>
-				<Box className='SetupWizard__wrapper'>
+				<Box
+					flexGrow={1}
+					flexShrink={1}
+					minHeight='none'
+					display='flex'
+					flexDirection='column'
+				>
 					<Scrollable>
 						<Margins all='x16'>
-							<Tile is='section' className='SetupWizard__steps'>
+							<Tile is='section' flexGrow={1} flexShrink={1}>
 								<AdminUserInformationStep step={1} title={t('Admin_Info')} active={currentStep === 1} />
 								<SettingsBasedStep step={2} title={t('Organization_Info')} active={currentStep === 2} />
 								<SettingsBasedStep step={3} title={t('Server_Info')} active={currentStep === 3} />
@@ -59,3 +74,5 @@ export function SetupWizardPage({ currentStep = 1 }) {
 		</Box>
 	</>;
 }
+
+export default SetupWizardPage;
diff --git a/client/components/setupWizard/SetupWizardPage.stories.js b/client/components/setupWizard/SetupWizardPage.stories.js
index 5b2039c4d2c..91ee0c9084a 100644
--- a/client/components/setupWizard/SetupWizardPage.stories.js
+++ b/client/components/setupWizard/SetupWizardPage.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SetupWizardPage } from './SetupWizardPage';
+import SetupWizardPage from './SetupWizardPage';
 import { finalStep } from './SetupWizardState';
 
 export default {
diff --git a/client/components/setupWizard/SetupWizardRoute.js b/client/components/setupWizard/SetupWizardRoute.js
index a1abd2c9ff4..51cbf0647be 100644
--- a/client/components/setupWizard/SetupWizardRoute.js
+++ b/client/components/setupWizard/SetupWizardRoute.js
@@ -1,16 +1,17 @@
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import React, { useEffect, useState } from 'react';
 
 import { useRole } from '../../contexts/AuthorizationContext';
 import { useRoute } from '../../contexts/RouterContext';
 import { useSetting } from '../../contexts/SettingsContext';
 import { useUserId, useUser } from '../../contexts/UserContext';
-import { SetupWizardState } from './SetupWizardState';
+import SetupWizardState from './SetupWizardState';
 
 const useRouteLock = () => {
 	const [locked, setLocked] = useState(true);
 	const setupWizardState = useSetting('Show_Setup_Wizard');
 	const userId = useUserId();
-	const user = useUser();
+	const user = useDebouncedValue(useUser(), 100);
 	const hasAdminRole = useRole('admin');
 	const homeRoute = useRoute('home');
 
@@ -19,7 +20,7 @@ const useRouteLock = () => {
 			return;
 		}
 
-		if (userId && (!user || !user.status)) {
+		if (userId && !user?.status) {
 			return;
 		}
 
diff --git a/client/components/setupWizard/SetupWizardState.js b/client/components/setupWizard/SetupWizardState.js
index d068cb656ce..5383e4a7cef 100644
--- a/client/components/setupWizard/SetupWizardState.js
+++ b/client/components/setupWizard/SetupWizardState.js
@@ -3,7 +3,7 @@ import React, { createContext, useContext, useEffect, useState, useCallback, use
 import { useRouteParameter, useRoute } from '../../contexts/RouterContext';
 import { useMethod } from '../../contexts/ServerContext';
 import { useUserId } from '../../contexts/UserContext';
-import { SetupWizardPage } from './SetupWizardPage';
+import SetupWizardPage from './SetupWizardPage';
 
 export const finalStep = 'final';
 
@@ -90,7 +90,7 @@ const SetupWizardContext = createContext({
 	goToFinalStep: () => {},
 });
 
-export function SetupWizardState() {
+function SetupWizardState() {
 	const [currentStep, setCurrentStep] = useStepRouting();
 	const {
 		loaded,
@@ -123,3 +123,5 @@ export function SetupWizardState() {
 }
 
 export const useSetupWizardContext = () => useContext(SetupWizardContext);
+
+export default SetupWizardState;
diff --git a/client/components/setupWizard/SetupWizardState.stories.js b/client/components/setupWizard/SetupWizardState.stories.js
deleted file mode 100644
index d0732f88803..00000000000
--- a/client/components/setupWizard/SetupWizardState.stories.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-
-import { SetupWizardState } from './SetupWizardState';
-
-export default {
-	title: 'setupWizard/SetupWizardState',
-	component: SetupWizardState,
-};
-
-export const _default = () => <SetupWizardState />;
diff --git a/client/components/setupWizard/SideBar.css b/client/components/setupWizard/SideBar.css
index f65304394b2..80d2c7c8259 100644
--- a/client/components/setupWizard/SideBar.css
+++ b/client/components/setupWizard/SideBar.css
@@ -1,91 +1,7 @@
 .SetupWizard__SideBar {
-	&.SetupWizard__SideBar {
-		display: flex;
-		overflow: hidden;
-		flex: 0 1 350px;
-
-		max-height: 100vh;
-		flex-flow: column nowrap;
-	}
-
-	.SetupWizard__SideBar-header {
-		display: flex;
-
-		margin: 2rem 1.625rem;
-		align-items: center;
-		flex-flow: row wrap;
-	}
-
-	.SetupWizard__SideBar-headerLogo {
-		width: auto;
-		height: 1.5rem;
-		margin: 0.25rem 0.375rem;
-	}
-
-	.SetupWizard__SideBar-headerTag {
-		margin: 0.25rem 0.375rem;
-
-		padding: 4px 8px;
-
-		white-space: nowrap;
-
-		text-transform: uppercase;
-
-		color: var(--color-white);
-
-		border-radius: 50px;
-		background-color: var(--color-dark);
-
-		font-size: 10px;
-
-		line-height: 1rem;
-	}
-
-	.SetupWizard__SideBar-content {
-		flex: 1;
-
-		margin: 0 0 1rem;
-		padding: 0 2rem;
-	}
-
-	.SetupWizard__SideBar-title {
-		margin-bottom: 1rem;
-
-		letter-spacing: 0.03rem;
-
-		color: var(--color-dark);
-
-		font-size: 2rem;
-
-		font-weight: 600;
-
-		line-height: 2.6rem;
-	}
-
-	.SetupWizard__SideBar-text {
-		margin-bottom: 3rem;
-
-		color: var(--color-gray);
-
-		font-size: 1rem;
-
-		font-weight: 500;
-
-		line-height: 1.5rem;
-	}
-
 	.SetupWizard__SideBar-step {
-		position: relative;
-
-		margin: 0 -0.5rem 2rem;
-
-		color: var(--color-dark-10);
-
-		font-size: 0.875rem;
-		font-weight: 500;
-
 		&::before {
-			display: inline-flex;
+			display: flex;
 
 			width: 1.5rem;
 			height: 1.5rem;
@@ -93,24 +9,23 @@
 
 			content: attr(data-number);
 
-			color: var(--color-dark-10);
-
-			border: 1px solid var(--color-dark-10);
+			border-width: 0.0625rem;
 			border-radius: 9999px;
 
-			font-size: 0.75rem;
+			font: inherit;
+			font-size: 0.875em;
 			align-items: center;
 			justify-content: center;
 		}
 
 		&::after {
 			position: absolute;
-			bottom: -2rem;
-			left: 1.2rem;
+			top: 100%;
+			left: 1.1875rem;
 
 			display: block;
 
-			width: 0.0625rem;
+			width: 0.125rem;
 			height: 2rem;
 
 			content: '';
@@ -118,27 +33,11 @@
 			background-color: var(--color-dark-10);
 		}
 
-		&:last-child {
-			margin-bottom: 0;
-
-			&::after {
-				display: none;
-			}
-		}
-
-		&--active {
-			color: var(--rc-color-button-primary);
-
-			&::before {
-				color: var(--rc-color-button-primary);
-				border-color: var(--rc-color-button-primary);
-				background-color: transparent;
-			}
+		&:last-child::after {
+			display: none;
 		}
 
 		&--past {
-			color: var(--rc-color-primary);
-
 			&::before {
 				color: var(--rc-color-content);
 				border-color: var(--rc-color-button-primary);
@@ -151,20 +50,8 @@
 		}
 
 		.rtl &::after {
-			right: 1.2rem;
+			right: 1.1875rem;
 			left: auto;
 		}
 	}
 }
-
-@media (width <= 760px) {
-	.SetupWizard__SideBar {
-		&.SetupWizard__SideBar {
-			flex-basis: auto;
-		}
-
-		.SetupWizard__SideBar-content {
-			display: none;
-		}
-	}
-}
diff --git a/client/components/setupWizard/SideBar.js b/client/components/setupWizard/SideBar.js
index eafda873950..11ea598ab14 100644
--- a/client/components/setupWizard/SideBar.js
+++ b/client/components/setupWizard/SideBar.js
@@ -1,46 +1,103 @@
-import { Box, Headline, Margins, Scrollable } from '@rocket.chat/fuselage';
+import { Box, Margins, Scrollable } from '@rocket.chat/fuselage';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import React from 'react';
 
 import { useTranslation } from '../../contexts/TranslationContext';
-import { Logo } from './Logo';
+import Logo from './Logo';
 import './SideBar.css';
 
-export function SideBar({
+function SideBar({
 	logoSrc = 'images/logo/logo.svg',
 	currentStep = 1,
 	steps = [],
 }) {
 	const t = useTranslation();
+	const small = useMediaQuery('(max-width: 760px)');
 
-	return <Box is='aside' className='SetupWizard__SideBar'>
-		<header className='SetupWizard__SideBar-header'>
-			<Logo className='SetupWizard__SideBar-headerLogo' src={logoSrc} />
-			<span className='SetupWizard__SideBar-headerTag'>{t('Setup_Wizard')}</span>
-		</header>
+	return <Box
+		is='aside'
+		className='SetupWizard__SideBar'
+		flexGrow={0}
+		flexShrink={1}
+		flexBasis={small ? 'auto' : '350px'}
+		maxHeight='sh'
+		display='flex'
+		flexDirection='column'
+		flexWrap='nowrap'
+		style={{ overflow: 'hidden' }}
+	>
+		<Box
+			is='header'
+			marginBlockStart={small ? 'x16' : 'x32'}
+			marginBlockEnd={small ? 'none' : 'x32'}
+			marginInline='x24'
+			display='flex'
+			flexDirection='row'
+			flexWrap='wrap'
+			alignItems='center'
+		>
+			<Logo
+				src={logoSrc}
+				width='auto'
+				height='x24'
+				margin='x4'
+			/>
+			<Box
+				is='span'
+				margin='x4'
+				paddingBlock='x4'
+				paddingInline='x8'
+				color='alternative'
+				fontScale='micro'
+				style={{
+					whiteSpace: 'nowrap',
+					textTransform: 'uppercase',
+					backgroundColor: 'var(--color-dark, #2f343d)',
+					borderRadius: '9999px',
+				}}
+			>
+				{t('Setup_Wizard')}
+			</Box>
+		</Box>
 
-		<Scrollable>
-			<Box className='SetupWizard__SideBar-content'>
-				<Headline level={2}>{t('Setup_Wizard')}</Headline>
+		{!small && <Scrollable>
+			<Box
+				flexGrow={1}
+				marginBlockEnd='x16'
+				paddingInline='x32'
+			>
 				<Margins blockEnd='x16'>
-					<Box is='p' textColor='hint' textStyle='p1'>{t('Setup_Wizard_Info')}</Box>
+					<Box is='h2' fontScale='h1' color='default'>{t('Setup_Wizard')}</Box>
+					<Box is='p' color='hint' fontScale='p1'>{t('Setup_Wizard_Info')}</Box>
 				</Margins>
 
-				<ol className='SetupWizard__SideBar-steps'>
+				<Box is='ol'>
 					{steps.map(({ step, title }) =>
-						<li
+						<Box
 							key={step}
+							is='li'
 							className={[
 								'SetupWizard__SideBar-step',
-								step === currentStep && 'SetupWizard__SideBar-step--active',
 								step < currentStep && 'SetupWizard__SideBar-step--past',
 							].filter(Boolean).join(' ')}
 							data-number={step}
+							marginBlock='x32'
+							marginInline='neg-x8'
+							display='flex'
+							alignItems='center'
+							fontScale='p2'
+							color={(step === currentStep && 'primary')
+							|| (step < currentStep && 'default')
+							|| 'disabled'}
+							style={{ position: 'relative' }}
 						>
 							{title}
-						</li>,
+						</Box>,
 					)}
-				</ol>
+				</Box>
 			</Box>
-		</Scrollable>
+		</Scrollable>}
 	</Box>;
 }
+
+export default SideBar;
diff --git a/client/components/setupWizard/SideBar.stories.js b/client/components/setupWizard/SideBar.stories.js
index ec2cf54d4cc..4542505ba24 100644
--- a/client/components/setupWizard/SideBar.stories.js
+++ b/client/components/setupWizard/SideBar.stories.js
@@ -1,7 +1,7 @@
 import { select } from '@storybook/addon-knobs';
 import React from 'react';
 
-import { SideBar } from './SideBar';
+import SideBar from './SideBar';
 
 export default {
 	title: 'setupWizard/SideBar',
diff --git a/client/components/setupWizard/StepHeader.js b/client/components/setupWizard/StepHeader.js
index 5188b7bdcb1..d46c86c01b7 100644
--- a/client/components/setupWizard/StepHeader.js
+++ b/client/components/setupWizard/StepHeader.js
@@ -8,7 +8,7 @@ export function StepHeader({ number, title }) {
 
 	return <Margins blockEnd='32'>
 		<Box is='header' className='SetupWizard__StepHeader'>
-			<Box is='p' textStyle='c1' textColor='hint'>
+			<Box is='p' fontScale='c1' color='hint'>
 				{t('Step')} {number}
 			</Box>
 			<Headline is='h2'>{title}</Headline>
diff --git a/client/components/setupWizard/steps/AdminUserInformationStep.js b/client/components/setupWizard/steps/AdminUserInformationStep.js
index 6e359c32a62..b746ccd7b4c 100644
--- a/client/components/setupWizard/steps/AdminUserInformationStep.js
+++ b/client/components/setupWizard/steps/AdminUserInformationStep.js
@@ -7,7 +7,7 @@ import {
 	PasswordInput,
 	TextInput,
 } from '@rocket.chat/fuselage';
-import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import React, { useMemo, useState } from 'react';
 
 import { useMethod } from '../../../contexts/ServerContext';
@@ -17,12 +17,11 @@ import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext'
 import { useTranslation } from '../../../contexts/TranslationContext';
 import { useLoginWithPassword } from '../../../contexts/UserContext';
 import { useCallbacks } from '../../../hooks/useCallbacks';
-import { useFocus } from '../../../hooks/useFocus';
 import { Pager } from '../Pager';
 import { Step } from '../Step';
 import { StepHeader } from '../StepHeader';
 
-export function AdminUserInformationStep({ step, title, active }) {
+function AdminUserInformationStep({ step, title, active }) {
 	const loginWithPassword = useLoginWithPassword();
 	const registerUser = useMethod('registerUser');
 	const defineUsername = useMethod('setUsername');
@@ -86,7 +85,7 @@ export function AdminUserInformationStep({ step, title, active }) {
 
 	const t = useTranslation();
 
-	const autoFocusRef = useFocus(active);
+	const autoFocusRef = useAutoFocus(active);
 
 	const handleSubmit = async (event) => {
 		event.preventDefault();
@@ -132,11 +131,11 @@ export function AdminUserInformationStep({ step, title, active }) {
 						<TextInput
 							ref={autoFocusRef}
 							id={nameInputId}
-							addon={<Icon name='user' size='20' />}
+							addon={<Icon name='user' size='x20' />}
 							placeholder={t('Type_your_name')}
 							value={name}
 							onChange={({ currentTarget: { value } }) => setName(value)}
-							error={!isNameValid}
+							error={!isNameValid ? 'error' : ''}
 						/>
 					</Field.Row>
 				</Field>
@@ -145,11 +144,11 @@ export function AdminUserInformationStep({ step, title, active }) {
 					<Field.Row>
 						<TextInput
 							id={usernameInputId}
-							addon={<Icon name='at' size='20' />}
+							addon={<Icon name='at' size='x20' />}
 							placeholder={t('Type_your_username')}
 							value={username}
 							onChange={({ currentTarget: { value } }) => setUsername(value)}
-							error={!isUsernameValid}
+							error={!isUsernameValid ? 'error' : ''}
 						/>
 					</Field.Row>
 					{!isUsernameValid && <Field.Error>{t('Invalid_username')}</Field.Error>}
@@ -159,11 +158,11 @@ export function AdminUserInformationStep({ step, title, active }) {
 					<Field.Row>
 						<EmailInput
 							id={emailInputId}
-							addon={<Icon name='mail' size='20' />}
+							addon={<Icon name='mail' size='x20' />}
 							placeholder={t('Type_your_email')}
 							value={email}
 							onChange={({ currentTarget: { value } }) => setEmail(value)}
-							error={!isEmailValid}
+							error={!isEmailValid ? 'error' : ''}
 						/>
 					</Field.Row>
 					{!isEmailValid && <Field.Error>{t('Invalid_email')}</Field.Error>}
@@ -173,11 +172,11 @@ export function AdminUserInformationStep({ step, title, active }) {
 					<Field.Row>
 						<PasswordInput
 							id={passwordInputId}
-							addon={<Icon name='key' size='20' />}
+							addon={<Icon name='key' size='x20' />}
 							placeholder={t('Type_your_password')}
 							value={password}
 							onChange={({ currentTarget: { value } }) => setPassword(value)}
-							error={!isPasswordValid}
+							error={!isPasswordValid ? 'error' : ''}
 						/>
 					</Field.Row>
 				</Field>
@@ -187,3 +186,5 @@ export function AdminUserInformationStep({ step, title, active }) {
 		<Pager disabled={commiting} isContinueEnabled={isContinueEnabled} />
 	</Step>;
 }
+
+export default AdminUserInformationStep;
diff --git a/client/components/setupWizard/steps/AdminUserInformationStep.stories.js b/client/components/setupWizard/steps/AdminUserInformationStep.stories.js
index 4a9fc568d10..717de3b9b31 100644
--- a/client/components/setupWizard/steps/AdminUserInformationStep.stories.js
+++ b/client/components/setupWizard/steps/AdminUserInformationStep.stories.js
@@ -1,7 +1,7 @@
 import { boolean, select, text } from '@storybook/addon-knobs';
 import React from 'react';
 
-import { AdminUserInformationStep } from './AdminUserInformationStep';
+import AdminUserInformationStep from './AdminUserInformationStep';
 
 export default {
 	title: 'setupWizard/steps/AdminUserInformationStep',
diff --git a/client/components/setupWizard/steps/FinalStep.css b/client/components/setupWizard/steps/FinalStep.css
deleted file mode 100644
index e88f88373b4..00000000000
--- a/client/components/setupWizard/steps/FinalStep.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.SetupWizard__FinalStep {
-	&.SetupWizard__FinalStep {
-		max-width: 930px;
-		margin: auto;
-	}
-
-	.SetupWizard__FinalStep-runningHead {
-		letter-spacing: 0.05rem;
-
-		text-transform: uppercase;
-
-		font-size: 0.75rem;
-
-		line-height: 1.125rem;
-	}
-
-	.SetupWizard__FinalStep-title {
-		font-size: 2rem;
-
-		font-weight: 600;
-
-		line-height: 2.6rem;
-	}
-
-	.SetupWizard__FinalStep-link {
-		margin-bottom: 1.5rem;
-
-		letter-spacing: 0;
-
-		color: var(--rc-color-button-primary);
-
-		font-size: 1rem;
-
-		line-height: 1.5rem;
-	}
-
-	.SetupWizard__FinalStep-linkLabel {
-		text-transform: uppercase;
-	}
-}
diff --git a/client/components/setupWizard/steps/FinalStep.js b/client/components/setupWizard/steps/FinalStep.js
index c56e786e3a1..6d37663e64b 100644
--- a/client/components/setupWizard/steps/FinalStep.js
+++ b/client/components/setupWizard/steps/FinalStep.js
@@ -1,11 +1,10 @@
-import { Box, Button, Margins, Tile } from '@rocket.chat/fuselage';
+import { Box, Button, Tile } from '@rocket.chat/fuselage';
 import React from 'react';
 
 import { useSetting, useSettingDispatch } from '../../../contexts/SettingsContext';
 import { useTranslation } from '../../../contexts/TranslationContext';
-import './FinalStep.css';
 
-export function FinalStep() {
+function FinalStep() {
 	const t = useTranslation();
 	const siteUrl = useSetting('Site_Url');
 	const setShowSetupWizard = useSettingDispatch('Show_Setup_Wizard');
@@ -14,21 +13,17 @@ export function FinalStep() {
 		setShowSetupWizard('completed');
 	};
 
-	return <Box is='section' className='SetupWizard__FinalStep'>
+	return <Box is='section' width='full' maxWidth='x480' margin='auto'>
 		<Tile is='main' padding='x40'>
-			<Margins all='x32'>
-				<Box>
-					<Box is='span' textColor='hint' className='SetupWizard__FinalStep-runningHead'>
-						{t('Launched_successfully')}
-					</Box>
-					<Margins blockEnd='x32'>
-						<Box is='h1' textColor='default' className='SetupWizard__FinalStep-title'>{t('Your_workspace_is_ready')}</Box>
-					</Margins>
-					<Box textColor='default' textStyle='micro' className='SetupWizard__FinalStep-linkLabel'>{t('Your_server_link')}</Box>
-					<Box textColor='primary' textStyle='p1' className='SetupWizard__FinalStep-link'>{siteUrl}</Box>
-					<Button primary data-qa='go-to-workspace' onClick={handleClick}>{t('Go_to_your_workspace')}</Button>
-				</Box>
-			</Margins>
+			<Box margin='x32'>
+				<Box is='span' color='hint' fontScale='c2'>{t('Launched_successfully')}</Box>
+				<Box is='h1' fontScale='h1' marginBlockEnd='x32'>{t('Your_workspace_is_ready')}</Box>
+				<Box fontScale='micro'>{t('Your_server_link')}</Box>
+				<Box color='primary' fontScale='s1' marginBlockEnd='x24'>{siteUrl}</Box>
+				<Button primary data-qa='go-to-workspace' onClick={handleClick}>{t('Go_to_your_workspace')}</Button>
+			</Box>
 		</Tile>
 	</Box>;
 }
+
+export default FinalStep;
diff --git a/client/components/setupWizard/steps/FinalStep.stories.js b/client/components/setupWizard/steps/FinalStep.stories.js
index e1098edf7e2..c3169224cf6 100644
--- a/client/components/setupWizard/steps/FinalStep.stories.js
+++ b/client/components/setupWizard/steps/FinalStep.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { FinalStep } from './FinalStep';
+import FinalStep from './FinalStep';
 
 export default {
 	title: 'setupWizard/steps/FinalStep',
diff --git a/client/components/setupWizard/steps/RegisterServerStep.css b/client/components/setupWizard/steps/RegisterServerStep.css
deleted file mode 100644
index 7859ca17a7c..00000000000
--- a/client/components/setupWizard/steps/RegisterServerStep.css
+++ /dev/null
@@ -1,96 +0,0 @@
-.SetupWizard__RegisterServerStep-text {
-	margin-bottom: 3rem;
-
-	color: var(--color-gray);
-
-	font-size: 1rem;
-
-	font-weight: 500;
-
-	line-height: 1.5rem;
-}
-
-.SetupWizard__RegisterServerStep-content {
-	display: flex;
-	flex-direction: column;
-
-	& > .SetupWizard__RegisterServerStep__PrivacyTerms {
-		margin-top: 1rem;
-	}
-}
-
-.SetupWizard__RegisterServerStep-option.SetupWizard__RegisterServerStep-option {
-	display: block;
-
-	padding: 1.5rem;
-
-	cursor: pointer;
-
-	color: var(--color-dark);
-	border: 2px solid var(--color-dark-10);
-
-	border-radius: 2px;
-
-	font-size: 0.875rem;
-
-	line-height: 1.25rem;
-
-	&:first-child {
-		margin-bottom: 1rem;
-	}
-
-	&--selected {
-		border-color: var(--rc-color-button-primary);
-	}
-
-	&--disabled {
-		opacity: 0.25;
-	}
-}
-
-.SetupWizard__RegisterServerStep-items {
-	margin: 1rem 0;
-
-	& + * {
-		margin-top: 1rem;
-	}
-}
-
-.SetupWizard__RegisterServerStep-item {
-	display: flex;
-
-	margin: 0 -0.5rem 0.5rem;
-	align-items: center;
-
-	&:last-child {
-		margin-bottom: 0;
-	}
-
-	& > .SetupWizard__RegisterServerStep-item-icon {
-		width: 20px;
-		min-width: 20px;
-		height: 20px;
-		margin: 0 0.5rem;
-		align-self: baseline;
-
-		&--check {
-			color: var(--rc-color-button-primary);
-		}
-
-		&--circle {
-			height: 6px;
-			margin: 7px 0.5rem;
-		}
-	}
-}
-
-/* TODO: remove this dirty hack */
-.SetupWizard__RegisterServerStep__optIn.SetupWizard__RegisterServerStep__optIn {
-	& > div {
-		flex-basis: 0;
-
-		& > span {
-			white-space: normal;
-		}
-	}
-}
diff --git a/client/components/setupWizard/steps/RegisterServerStep.js b/client/components/setupWizard/steps/RegisterServerStep.js
index 46cccdf4c56..19089dea6c4 100644
--- a/client/components/setupWizard/steps/RegisterServerStep.js
+++ b/client/components/setupWizard/steps/RegisterServerStep.js
@@ -2,35 +2,43 @@ import {
 	Box,
 	CheckBox,
 	Field,
+	Icon,
 	Margins,
 	RadioButton,
 } from '@rocket.chat/fuselage';
-import { useMergedRefs, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useAutoFocus, useMergedRefs, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import React, { useRef, useState } from 'react';
 
 import { useMethod } from '../../../contexts/ServerContext';
 import { useBatchSettingsDispatch } from '../../../contexts/SettingsContext';
 import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
 import { useTranslation } from '../../../contexts/TranslationContext';
-import { useFocus } from '../../../hooks/useFocus';
-import { Icon } from '../../basic/Icon';
 import { Pager } from '../Pager';
 import { useSetupWizardContext } from '../SetupWizardState';
 import { Step } from '../Step';
 import { StepHeader } from '../StepHeader';
-import './RegisterServerStep.css';
 
 const Option = React.forwardRef(({ children, label, selected, disabled, ...props }, ref) => {
 	const innerRef = useRef();
 	const mergedRef = useMergedRefs(ref, innerRef);
 	const id = useUniqueId();
 
-	return <span
+	return <Box
 		className={[
 			'SetupWizard__RegisterServerStep-option',
 			selected && 'SetupWizard__RegisterServerStep-option--selected',
-			disabled && 'SetupWizard__RegisterServerStep-option--disabled',
 		].filter(Boolean).join(' ')}
+		display='block'
+		marginBlock='x8'
+		padding='x24'
+		color={selected ? 'primary' : 'disabled'}
+		style={{
+			borderColor: 'currentColor',
+			borderRadius: 2,
+			borderWidth: 2,
+			cursor: 'pointer',
+			...disabled && { opacity: 0.25 },
+		}}
 		onClick={() => {
 			innerRef.current.click();
 		}}
@@ -42,18 +50,37 @@ const Option = React.forwardRef(({ children, label, selected, disabled, ...props
 			</Field.Row>
 		</Field>
 		{children}
-	</span>;
+	</Box>;
 });
 
-const Items = (props) => <ul className='SetupWizard__RegisterServerStep-items' {...props} />;
+const Items = (props) => <Box is='ul' marginBlock='x16' {...props} />;
 
 const Item = ({ children, icon, ...props }) =>
-	<li className='SetupWizard__RegisterServerStep-item' {...props}>
-		<Icon block='SetupWizard__RegisterServerStep-item-icon' icon={icon} />
+	<Box
+		is='li'
+		marginBlockEnd='x8'
+		display='flex'
+		alignItems='center'
+		color='default'
+		{...props}
+	>
+		{icon === 'check' && <Icon
+			name='check'
+			size='x20'
+			marginInlineEnd='x8'
+			color='primary'
+		/>}
+		{icon === 'circle' && <Icon
+			name='circle'
+			size='x8'
+			marginInlineStart='x8'
+			marginInlineEnd='x12'
+			color='default'
+		/>}
 		{children}
-	</li>;
+	</Box>;
 
-export function RegisterServerStep({ step, title, active }) {
+function RegisterServerStep({ step, title, active }) {
 	const { canDeclineServerRegistration, goToPreviousStep, goToFinalStep } = useSetupWizardContext();
 
 	const [registerServer, setRegisterServer] = useState(true);
@@ -119,7 +146,7 @@ export function RegisterServerStep({ step, title, active }) {
 		}
 	};
 
-	const autoFocusRef = useFocus(active);
+	const autoFocusRef = useAutoFocus(active);
 
 	const agreeTermsAndPrivacyId = useUniqueId();
 	const optInMarketingEmailsId = useUniqueId();
@@ -129,9 +156,9 @@ export function RegisterServerStep({ step, title, active }) {
 
 		<Margins blockEnd='x32'>
 			<Box>
-				<p className='SetupWizard__RegisterServerStep-text'>{t('Register_Server_Info')}</p>
+				<Box is='p' fontScale='s1' color='hint' marginBlockEnd='x16'>{t('Register_Server_Info')}</Box>
 
-				<div className='SetupWizard__RegisterServerStep-content'>
+				<Box display='flex' flexDirection='column'>
 					<Option
 						ref={autoFocusRef}
 						data-qa='register-server'
@@ -165,9 +192,6 @@ export function RegisterServerStep({ step, title, active }) {
 								<Field.Label htmlFor={optInMarketingEmailsId}>{t('Register_Server_Opt_In')}</Field.Label>
 							</Field.Row>
 						</Field>
-						<Field.Label text={t('Register_Server_Opt_In')} position='end' className='SetupWizard__RegisterServerStep__optIn'>
-
-						</Field.Label>
 					</Option>
 					<Option
 						data-qa='register-server-standalone'
@@ -208,10 +232,12 @@ export function RegisterServerStep({ step, title, active }) {
 							</Field.Row>
 						</Field>
 					</Margins>
-				</div>
+				</Box>
 			</Box>
 		</Margins>
 
 		<Pager disabled={commiting} onBackClick={handleBackClick} />
 	</Step>;
 }
+
+export default RegisterServerStep;
diff --git a/client/components/setupWizard/steps/RegisterServerStep.stories.js b/client/components/setupWizard/steps/RegisterServerStep.stories.js
index cccb66ea23c..9d06067a69d 100644
--- a/client/components/setupWizard/steps/RegisterServerStep.stories.js
+++ b/client/components/setupWizard/steps/RegisterServerStep.stories.js
@@ -1,7 +1,7 @@
 import { boolean, select, text } from '@storybook/addon-knobs';
 import React from 'react';
 
-import { RegisterServerStep } from './RegisterServerStep';
+import RegisterServerStep from './RegisterServerStep';
 
 export default {
 	title: 'setupWizard/steps/RegisterServerStep',
diff --git a/client/components/setupWizard/steps/SettingsBasedStep.js b/client/components/setupWizard/steps/SettingsBasedStep.js
index 331f02b658e..25202a1448e 100644
--- a/client/components/setupWizard/steps/SettingsBasedStep.js
+++ b/client/components/setupWizard/steps/SettingsBasedStep.js
@@ -8,12 +8,12 @@ import {
 	Skeleton,
 	TextInput,
 } from '@rocket.chat/fuselage';
+import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
 import React, { useEffect, useReducer, useState } from 'react';
 
 import { useBatchSettingsDispatch } from '../../../contexts/SettingsContext';
 import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
 import { useTranslation, useLanguages } from '../../../contexts/TranslationContext';
-import { useFocus } from '../../../hooks/useFocus';
 import { Pager } from '../Pager';
 import { useSetupWizardContext } from '../SetupWizardState';
 import { Step } from '../Step';
@@ -42,7 +42,7 @@ const useFields = () => {
 	return { fields, resetFields, setFieldValue };
 };
 
-export function SettingsBasedStep({ step, title, active }) {
+function SettingsBasedStep({ step, title, active }) {
 	const { settings, currentStep, goToPreviousStep, goToNextStep } = useSetupWizardContext();
 	const { fields, resetFields, setFieldValue } = useFields();
 	const [commiting, setCommiting] = useState(false);
@@ -63,7 +63,7 @@ export function SettingsBasedStep({ step, title, active }) {
 
 	const batchSetSettings = useBatchSettingsDispatch();
 
-	const autoFocusRef = useFocus(active);
+	const autoFocusRef = useAutoFocus(active);
 
 	const dispatchToastMessage = useToastMessageDispatch();
 
@@ -125,7 +125,6 @@ export function SettingsBasedStep({ step, title, active }) {
 							/>}
 
 							{type === 'select' && <Select
-								type='select'
 								data-qa={_id}
 								id={_id}
 								name={_id}
@@ -136,7 +135,6 @@ export function SettingsBasedStep({ step, title, active }) {
 							/>}
 
 							{type === 'boolean' && <Select
-								type='select'
 								data-qa={_id}
 								id={_id}
 								name={_id}
@@ -150,7 +148,6 @@ export function SettingsBasedStep({ step, title, active }) {
 							/>}
 
 							{type === 'language' && <Select
-								type='select'
 								data-qa={_id}
 								id={_id}
 								name={_id}
@@ -173,3 +170,5 @@ export function SettingsBasedStep({ step, title, active }) {
 		/>
 	</Step>;
 }
+
+export default SettingsBasedStep;
diff --git a/client/components/setupWizard/steps/SettingsBasedStep.stories.js b/client/components/setupWizard/steps/SettingsBasedStep.stories.js
index 9d9a1ec10be..6c0515d9e0d 100644
--- a/client/components/setupWizard/steps/SettingsBasedStep.stories.js
+++ b/client/components/setupWizard/steps/SettingsBasedStep.stories.js
@@ -1,7 +1,7 @@
 import { boolean, select, text } from '@storybook/addon-knobs';
 import React from 'react';
 
-import { SettingsBasedStep } from './SettingsBasedStep';
+import SettingsBasedStep from './SettingsBasedStep';
 
 export default {
 	title: 'setupWizard/steps/SettingsBasedStep',
diff --git a/client/contexts/CustomSoundContext.js b/client/contexts/CustomSoundContext.js
new file mode 100644
index 00000000000..d10547e2bd1
--- /dev/null
+++ b/client/contexts/CustomSoundContext.js
@@ -0,0 +1,7 @@
+import { createContext, useContext } from 'react';
+
+export const CustomSoundContext = createContext({
+	play: () => {},
+});
+
+export const useCustomSound = () => useContext(CustomSoundContext);
diff --git a/client/contexts/ServerContext.js b/client/contexts/ServerContext.js
index bc5a816243f..f2ba6ebf69c 100644
--- a/client/contexts/ServerContext.js
+++ b/client/contexts/ServerContext.js
@@ -5,6 +5,7 @@ export const ServerContext = createContext({
 	absoluteUrl: (path) => path,
 	callMethod: async () => {},
 	callEndpoint: async () => {},
+	upload: async () => {},
 });
 
 export const useServerInformation = () => useContext(ServerContext).info;
@@ -20,3 +21,8 @@ export const useEndpoint = (httpMethod, endpoint) => {
 	const { callEndpoint } = useContext(ServerContext);
 	return useCallback((...args) => callEndpoint(httpMethod, endpoint, ...args), [callEndpoint, httpMethod, endpoint]);
 };
+
+export const useUpload = (endpoint) => {
+	const { upload } = useContext(ServerContext);
+	return useCallback((...args) => upload(endpoint, ...args), [upload]);
+};
diff --git a/client/hooks/useEndpointAction.js b/client/hooks/useEndpointAction.js
new file mode 100644
index 00000000000..7abf93140fa
--- /dev/null
+++ b/client/hooks/useEndpointAction.js
@@ -0,0 +1,26 @@
+import { useCallback } from 'react';
+
+import { useEndpoint } from '../contexts/ServerContext';
+import { useToastMessageDispatch } from '../contexts/ToastMessagesContext';
+
+export const useEndpointAction = (httpMethod, endpoint, params = {}, successMessage) => {
+	const sendData = useEndpoint(httpMethod, endpoint);
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	return useCallback(async (...args) => {
+		try {
+			const data = await sendData(params, ...args);
+
+			if (!data.success) {
+				throw new Error(data.status);
+			}
+
+			successMessage && dispatchToastMessage({ type: 'success', message: successMessage });
+
+			return data;
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+			return { success: false };
+		}
+	}, [JSON.stringify(params)]);
+};
diff --git a/ee/app/engagement-dashboard/client/hooks/useEndpointData.js b/client/hooks/useEndpointData.js
similarity index 72%
rename from ee/app/engagement-dashboard/client/hooks/useEndpointData.js
rename to client/hooks/useEndpointData.js
index d35a956ab5f..b97bb47d380 100644
--- a/ee/app/engagement-dashboard/client/hooks/useEndpointData.js
+++ b/client/hooks/useEndpointData.js
@@ -1,12 +1,12 @@
 import { useEffect, useState } from 'react';
 
-import { useEndpoint } from '../../../../../client/contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../../client/contexts/ToastMessagesContext';
+import { useEndpoint } from '../contexts/ServerContext';
+import { useToastMessageDispatch } from '../contexts/ToastMessagesContext';
 
-export const useEndpointData = (httpMethod, endpoint, params = {}) => {
+export const useEndpointData = (endpoint, params = {}) => {
 	const [data, setData] = useState(null);
 
-	const getData = useEndpoint(httpMethod, endpoint);
+	const getData = useEndpoint('GET', endpoint);
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	useEffect(() => {
diff --git a/client/hooks/useEndpointDataExperimental.js b/client/hooks/useEndpointDataExperimental.js
new file mode 100644
index 00000000000..5e3e16361cf
--- /dev/null
+++ b/client/hooks/useEndpointDataExperimental.js
@@ -0,0 +1,62 @@
+import { useEffect, useState } from 'react';
+
+import { useEndpoint } from '../contexts/ServerContext';
+import { useToastMessageDispatch } from '../contexts/ToastMessagesContext';
+
+export const ENDPOINT_STATES = {
+	LOADING: 'LOADING',
+	DELAYING: 'DELAYING',
+	DONE: 'DONE',
+	ERROR: 'ERROR',
+};
+
+const defaultState = { data: null, state: ENDPOINT_STATES.LOADING };
+
+export const useEndpointDataExperimental = (endpoint, params = {}) => {
+	const [data, setData] = useState(defaultState);
+
+	const getData = useEndpoint('GET', endpoint);
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	useEffect(() => {
+		let mounted = true;
+
+		const fetchData = async () => {
+			const timer = setTimeout(() => {
+				if (!mounted) {
+					return;
+				}
+
+				setData({ state: ENDPOINT_STATES.DELAYING });
+			}, 1000);
+
+			try {
+				setData(defaultState);
+				const data = await getData(params);
+
+				if (!data.success) {
+					throw new Error(data.status);
+				}
+
+				if (!mounted) {
+					return;
+				}
+
+				setData({ data, state: ENDPOINT_STATES.DONE });
+			} catch (error) {
+				setData({ error, state: ENDPOINT_STATES.ERROR });
+				dispatchToastMessage({ type: 'error', message: error });
+			} finally {
+				clearTimeout(timer);
+			}
+		};
+
+		fetchData();
+
+		return () => {
+			mounted = false;
+		};
+	}, [getData, params]);
+
+	return data;
+};
diff --git a/client/hooks/useEndpointUpload.js b/client/hooks/useEndpointUpload.js
new file mode 100644
index 00000000000..7a73876c388
--- /dev/null
+++ b/client/hooks/useEndpointUpload.js
@@ -0,0 +1,28 @@
+import { useCallback } from 'react';
+
+import { useUpload } from '../contexts/ServerContext';
+import { useToastMessageDispatch } from '../contexts/ToastMessagesContext';
+
+export const useEndpointUpload = (endpoint, params = {}, successMessage) => {
+	const sendData = useUpload(endpoint);
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	return useCallback(async (...args) => {
+		try {
+			let data = sendData(params, ...args);
+
+			data = await data.promise;
+
+			if (!data.success) {
+				throw new Error(data.status);
+			}
+
+			successMessage && dispatchToastMessage({ type: 'success', message: successMessage });
+
+			return data;
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+			return { success: false };
+		}
+	}, [JSON.stringify(params)]);
+};
diff --git a/client/hooks/useEventCallback.js b/client/hooks/useEventCallback.js
deleted file mode 100644
index f623844f961..00000000000
--- a/client/hooks/useEventCallback.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useCallback, useLayoutEffect, useRef } from 'react';
-
-export const useEventCallback = (fn, ...deps) => {
-	const fnRef = useRef(fn);
-	const depsRef = useRef(deps);
-
-	useLayoutEffect(() => {
-		fnRef.current = fn;
-		depsRef.current = deps;
-	});
-
-	return useCallback((...args) => (0, fnRef.current)(...depsRef.current, ...args), []);
-};
diff --git a/client/hooks/useFileInput.js b/client/hooks/useFileInput.js
new file mode 100644
index 00000000000..ded5860976c
--- /dev/null
+++ b/client/hooks/useFileInput.js
@@ -0,0 +1,25 @@
+import { useState, useEffect } from 'react';
+
+export const useFileInput = (onSetFile, fileType = 'image') => {
+	const [openInput, setOpenInput] = useState();
+
+	useEffect(() => {
+		const fileInput = document.createElement('input');
+		const formData = new FormData();
+		fileInput.setAttribute('type', 'file');
+		fileInput.setAttribute('style', 'display: none');
+		document.body.appendChild(fileInput);
+
+		const handleFiles = function() {
+			formData.append(fileType, this.files[0]);
+			onSetFile(this.files[0], formData);
+		};
+		fileInput.addEventListener('change', handleFiles, false);
+		setOpenInput(() => () => fileInput.click());
+		return () => {
+			fileInput.parentNode.removeChild(fileInput);
+		};
+	}, [onSetFile]);
+
+	return openInput;
+};
diff --git a/client/hooks/useFocus.js b/client/hooks/useFocus.js
deleted file mode 100644
index cc0700b1e57..00000000000
--- a/client/hooks/useFocus.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useEffect, useRef } from 'react';
-
-export const useFocus = (isFocused) => {
-	const elementRef = useRef();
-
-	useEffect(() => {
-		if (isFocused && elementRef.current) {
-			elementRef.current.focus();
-		}
-	}, [elementRef, isFocused]);
-
-	return elementRef;
-};
diff --git a/client/hooks/useFormatDate.js b/client/hooks/useFormatDate.js
new file mode 100644
index 00000000000..f6e3b4dc3b6
--- /dev/null
+++ b/client/hooks/useFormatDate.js
@@ -0,0 +1,9 @@
+import { useCallback } from 'react';
+import moment from 'moment';
+
+import { useSetting } from '../contexts/SettingsContext';
+
+export const useFormatDate = () => {
+	const format = useSetting('Message_DateFormat');
+	return useCallback((time) => moment(time).format(format), [format]);
+};
diff --git a/client/hooks/useFormatDateAndTime.js b/client/hooks/useFormatDateAndTime.js
new file mode 100644
index 00000000000..2c8229e9fa4
--- /dev/null
+++ b/client/hooks/useFormatDateAndTime.js
@@ -0,0 +1,21 @@
+import { useCallback } from 'react';
+import moment from 'moment';
+
+import { useUserPreference } from '../contexts/UserContext';
+import { useSetting } from '../contexts/SettingsContext';
+
+export const useFormatDateAndTime = () => {
+	const clockMode = useUserPreference('clockMode', false);
+	const format = useSetting('Message_TimeAndDateFormat');
+
+	return useCallback((time) => {
+		switch (clockMode) {
+			case 1:
+				return moment(time).format('MMMM D, Y h:mm A');
+			case 2:
+				return moment(time).format('MMMM D, Y H:mm');
+			default:
+				return moment(time).format(format);
+		}
+	}, [clockMode, format]);
+};
diff --git a/client/hooks/useFormatDuration.js b/client/hooks/useFormatDuration.js
new file mode 100644
index 00000000000..4800ab81a0a
--- /dev/null
+++ b/client/hooks/useFormatDuration.js
@@ -0,0 +1,28 @@
+import { useCallback } from 'react';
+
+import { useTranslation } from '../contexts/TranslationContext';
+
+export const useFormatDuration = () => {
+	const t = useTranslation();
+
+	return useCallback((duration) => {
+		const days = Math.floor(duration / 86400);
+		const hours = Math.floor((duration % 86400) / 3600);
+		const minutes = Math.floor(((duration % 86400) % 3600) / 60);
+		const seconds = Math.floor(((duration % 86400) % 3600) % 60);
+		let out = '';
+		if (days > 0) {
+			out += `${ days } ${ t('days') }, `;
+		}
+		if (hours > 0) {
+			out += `${ hours } ${ t('hours') }, `;
+		}
+		if (minutes > 0) {
+			out += `${ minutes } ${ t('minutes') }, `;
+		}
+		if (seconds > 0) {
+			out += `${ seconds } ${ t('seconds') }`;
+		}
+		return out;
+	}, [t]);
+};
diff --git a/client/hooks/useFormatMemorySize.js b/client/hooks/useFormatMemorySize.js
new file mode 100644
index 00000000000..fd92edc41ce
--- /dev/null
+++ b/client/hooks/useFormatMemorySize.js
@@ -0,0 +1,24 @@
+import s from 'underscore.string';
+
+const formatMemorySize = (memorySize) => {
+	if (typeof memorySize !== 'number') {
+		return null;
+	}
+
+	const units = ['bytes', 'kB', 'MB', 'GB'];
+
+	let order;
+	for (order = 0; order < units.length - 1; ++order) {
+		const upperLimit = Math.pow(1024, order + 1);
+
+		if (memorySize < upperLimit) {
+			break;
+		}
+	}
+
+	const divider = Math.pow(1024, order);
+	const decimalDigits = order === 0 ? 0 : 2;
+	return `${ s.numberFormat(memorySize / divider, decimalDigits) } ${ units[order] }`;
+};
+
+export const useFormatMemorySize = () => formatMemorySize;
diff --git a/client/hooks/useFormatTime.js b/client/hooks/useFormatTime.js
new file mode 100644
index 00000000000..de72d4e5026
--- /dev/null
+++ b/client/hooks/useFormatTime.js
@@ -0,0 +1,22 @@
+import { useCallback } from 'react';
+import moment from 'moment';
+
+import { useUserPreference } from '../contexts/UserContext';
+import { useSetting } from '../contexts/SettingsContext';
+
+const dayFormat = ['h:mm A', 'H:mm'];
+
+export const useFormatTime = () => {
+	const clockMode = useUserPreference('clockMode', false);
+	const format = useSetting('Message_TimeFormat');
+	const sameDay = dayFormat[clockMode - 1] || format;
+	return useCallback((time) => {
+		switch (clockMode) {
+			case 1:
+			case 2:
+				return moment(time).format(sameDay);
+			default:
+				return moment(time).format(format);
+		}
+	}, [clockMode, format]);
+};
diff --git a/client/hooks/useLazyRef.js b/client/hooks/useLazyRef.js
deleted file mode 100644
index a45e92a3828..00000000000
--- a/client/hooks/useLazyRef.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useRef, useState } from 'react';
-
-export const useLazyRef = (fn) => {
-	const [value] = useState(fn);
-	return useRef(value);
-};
diff --git a/client/hooks/useSafely.js b/client/hooks/useSafely.js
deleted file mode 100644
index 90e13a666ed..00000000000
--- a/client/hooks/useSafely.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useEffect, useRef } from 'react';
-
-export const useSafely = ([state, updater]) => {
-	const mountedRef = useRef();
-
-	useEffect(() => {
-		mountedRef.current = true;
-
-		return () => {
-			mountedRef.current = false;
-		};
-	});
-
-	const safeUpdater = useMutableCallback((...args) => {
-		if (!mountedRef.current) {
-			return;
-		}
-
-		updater(...args);
-	});
-
-	return [state, safeUpdater];
-};
diff --git a/client/importPackages.js b/client/importPackages.js
index 714cb0ebf25..db055fd38e4 100644
--- a/client/importPackages.js
+++ b/client/importPackages.js
@@ -32,7 +32,6 @@ import '../app/importer-hipchat-enterprise/client';
 import '../app/importer-slack/client';
 import '../app/importer-slack-users/client';
 import '../app/integrations/client';
-import '../app/invites/client';
 import '../app/issuelinks/client';
 import '../app/katex/client';
 import '../app/ldap/client';
@@ -73,7 +72,6 @@ import '../app/spotify/client';
 import '../app/tokenpass/client';
 import '../app/ui';
 import '../app/ui-account';
-import '../app/ui-admin/client';
 import '../app/ui-clean-history';
 import '../app/ui-flextab';
 import '../app/ui-login';
diff --git a/client/main.js b/client/main.js
index 1ad6bbc71e8..c86d54802f1 100644
--- a/client/main.js
+++ b/client/main.js
@@ -28,3 +28,4 @@ import './startup/startup';
 import './startup/unread';
 import './startup/userSetUtcOffset';
 import './startup/usersObserve';
+import './admin';
diff --git a/client/polyfills/index.js b/client/polyfills/index.js
index a9086d63167..31cada9ea9f 100644
--- a/client/polyfills/index.js
+++ b/client/polyfills/index.js
@@ -1,3 +1,7 @@
 import '@rocket.chat/fuselage-polyfills';
 import 'url-polyfill';
 import './customEventPolyfill';
+
+Object.fromEntries = Object.fromEntries || function fromEntries(iterable) {
+	return [...iterable].reduce((obj, { 0: key, 1: val }) => Object.assign(obj, { [key]: val }), {});
+};
diff --git a/client/providers/AvatarUrlProvider.js b/client/providers/AvatarUrlProvider.js
new file mode 100644
index 00000000000..a23b49dd333
--- /dev/null
+++ b/client/providers/AvatarUrlProvider.js
@@ -0,0 +1,14 @@
+import React, { useMemo } from 'react';
+import { Avatar } from '@rocket.chat/fuselage';
+
+import { useSetting } from '../contexts/SettingsContext';
+
+const base = '';
+
+export function AvatarUrlProvider({ children }) {
+	const cdn = useSetting('CDN_PREFIX_ALL');
+	const cdnPrefix = useSetting('CDN_PREFIX');
+
+	const avatarBase = useMemo(() => ({ baseUrl: `${ cdn && cdnPrefix }${ base }` }), [cdn, cdnPrefix]);
+	return <Avatar.Context.Provider children={children} value={avatarBase} />;
+}
diff --git a/client/providers/CustomSoundProvides.js b/client/providers/CustomSoundProvides.js
new file mode 100644
index 00000000000..d5a41bc54fa
--- /dev/null
+++ b/client/providers/CustomSoundProvides.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+import { CustomSounds } from '../../app/custom-sounds/client/lib/CustomSounds';
+import { CustomSoundContext } from '../contexts/CustomSoundContext';
+
+
+export function CustomSoundProvider({ children }) {
+	return <CustomSoundContext.Provider children={children} value={CustomSounds} />;
+}
diff --git a/client/providers/MeteorProvider.js b/client/providers/MeteorProvider.js
index 2b4056bff0a..482906b7c68 100644
--- a/client/providers/MeteorProvider.js
+++ b/client/providers/MeteorProvider.js
@@ -10,6 +10,8 @@ import { SidebarProvider } from './SidebarProvider';
 import { TranslationProvider } from './TranslationProvider';
 import { ToastMessagesProvider } from './ToastMessagesProvider';
 import { UserProvider } from './UserProvider';
+import { AvatarUrlProvider } from './AvatarUrlProvider';
+import { CustomSoundProvider } from './CustomSoundProvides';
 
 export function MeteorProvider({ children }) {
 	return <ConnectionStatusProvider>
@@ -20,11 +22,15 @@ export function MeteorProvider({ children }) {
 						<SidebarProvider>
 							<ToastMessagesProvider>
 								<SettingsProvider>
-									<UserProvider>
-										<AuthorizationProvider>
-											{children}
-										</AuthorizationProvider>
-									</UserProvider>
+									<CustomSoundProvider>
+										<AvatarUrlProvider>
+											<UserProvider>
+												<AuthorizationProvider>
+													{children}
+												</AuthorizationProvider>
+											</UserProvider>
+										</AvatarUrlProvider>
+									</CustomSoundProvider>
 								</SettingsProvider>
 							</ToastMessagesProvider>
 						</SidebarProvider>
diff --git a/client/providers/ServerProvider.js b/client/providers/ServerProvider.js
index 397a6651bdb..a6d9cf7e10f 100644
--- a/client/providers/ServerProvider.js
+++ b/client/providers/ServerProvider.js
@@ -32,11 +32,14 @@ const callEndpoint = (httpMethod, endpoint, ...args) => {
 	return APIClient.v1[httpMethod.toLowerCase()](endpoint, ...args);
 };
 
+const upload = (endpoint, params, formData) => APIClient.v1.upload(endpoint, params, formData);
+
 const contextValue = {
 	info,
 	absoluteUrl,
 	callMethod,
 	callEndpoint,
+	upload,
 };
 
 export function ServerProvider({ children }) {
diff --git a/client/reactAdapters.js b/client/reactAdapters.js
index eec3a38382a..c23f0049429 100644
--- a/client/reactAdapters.js
+++ b/client/reactAdapters.js
@@ -153,6 +153,10 @@ export const renderRouteComponent = (importFn, {
 } = {}) => {
 	const routeName = FlowRouter.getRouteName();
 
+	if (portalsMap.has(routeName)) {
+		return;
+	}
+
 	Tracker.autorun(async (computation) => {
 		if (routeName !== FlowRouter.getRouteName()) {
 			unregisterPortal(routeName);
diff --git a/ee/app/authorization/client/index.ts b/ee/app/authorization/client/index.ts
index c4f3ed7a07c..5be1412642f 100644
--- a/ee/app/authorization/client/index.ts
+++ b/ee/app/authorization/client/index.ts
@@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { addRoleRestrictions } from '../lib/addRoleRestrictions';
 
 Meteor.startup(() => {
-	Meteor.call('license:isEnterprise', (err, result) => {
+	Meteor.call('license:isEnterprise', (err: any, result: any) => {
 		if (err) {
 			throw err;
 		}
diff --git a/ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js b/ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js
index 673b2079bb6..55424e16244 100644
--- a/ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js
+++ b/ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js
@@ -3,9 +3,9 @@ import moment from 'moment';
 import React, { useMemo, useState } from 'react';
 
 import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
 import { Growth } from '../data/Growth';
 import { Section } from '../Section';
-import { useEndpointData } from '../../hooks/useEndpointData';
 
 export function TableSection() {
 	const t = useTranslation();
@@ -52,7 +52,7 @@ export function TableSection() {
 		count: itemsPerPage,
 	}), [period, current, itemsPerPage]);
 
-	const data = useEndpointData('GET', 'engagement-dashboard/channels/list', params);
+	const data = useEndpointData('engagement-dashboard/channels/list', params);
 
 	const channels = useMemo(() => {
 		if (!data) {
@@ -75,7 +75,7 @@ export function TableSection() {
 
 	return <Section filter={<Select options={periodOptions} value={periodId} onChange={handlePeriodChange} />}>
 		<Box>
-			{channels && !channels.length && <Tile textStyle='p1' textColor='info' style={{ textAlign: 'center' }}>
+			{channels && !channels.length && <Tile fontScale='p1' color='info' style={{ textAlign: 'center' }}>
 				{t('No_data_found')}
 			</Tile>}
 			{(!channels || channels.length)
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
index e77a75fbac5..88ca44e24a8 100644
--- a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
@@ -2,7 +2,7 @@ import { Box, Margins, Tabs } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 
 import { useTranslation } from '../../../../../client/contexts/TranslationContext';
-import { Page } from '../../../../../client/components/basic/Page';
+import Page from '../../../../../client/components/basic/Page';
 import { UsersTab } from './UsersTab';
 import { MessagesTab } from './MessagesTab';
 import { ChannelsTab } from './ChannelsTab';
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
index 8b782edf8a2..6f48862df3d 100644
--- a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
@@ -1,12 +1,9 @@
 import React, { useEffect } from 'react';
 
 import { useRoute, useRouteParameter } from '../../../../../client/contexts/RouterContext';
-import { useAdminSideNav } from '../../../../../app/ui-admin/client/hooks/useAdminSideNav';
 import { EngagementDashboardPage } from './EngagementDashboardPage';
 
 export function EngagementDashboardRoute() {
-	useAdminSideNav();
-
 	const engagementDashboardRoute = useRoute('engagement-dashboard');
 
 	const tab = useRouteParameter('tab');
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js
index bfa2527d893..43ae81085be 100644
--- a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js
@@ -4,8 +4,8 @@ import moment from 'moment';
 import React, { useMemo, useState } from 'react';
 
 import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
 import { LegendSymbol } from '../data/LegendSymbol';
-import { useEndpointData } from '../../hooks/useEndpointData';
 import { Section } from '../Section';
 
 export function MessagesPerChannelSection() {
@@ -48,8 +48,8 @@ export function MessagesPerChannelSection() {
 		end: period.end.toISOString(),
 	}), [period]);
 
-	const pieData = useEndpointData('GET', 'engagement-dashboard/messages/origin', params);
-	const tableData = useEndpointData('GET', 'engagement-dashboard/messages/top-five-popular-channels', params);
+	const pieData = useEndpointData('engagement-dashboard/messages/origin', params);
+	const tableData = useEndpointData('engagement-dashboard/messages/top-five-popular-channels', params);
 
 	const [pie, table] = useMemo(() => {
 		if (!pieData || !tableData) {
@@ -132,7 +132,7 @@ export function MessagesPerChannelSection() {
 																		},
 																	},
 																}}
-																tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+																tooltip={({ value }) => <Box fontScale='p2' color='alternative'>
 																	{t('Value_messages', { value })}
 																</Box>}
 															/>
@@ -144,15 +144,15 @@ export function MessagesPerChannelSection() {
 												<Margins block='neg-x4'>
 													<Box>
 														<Margins block='x4'>
-															<Box textColor='info' textStyle='p1'>
+															<Box color='info' fontScale='p1'>
 																<LegendSymbol color='#FFD031' />
 																{t('Private_Chats')}
 															</Box>
-															<Box textColor='info' textStyle='p1'>
+															<Box color='info' fontScale='p1'>
 																<LegendSymbol color='#2DE0A5' />
 																{t('Private_Channels')}
 															</Box>
-															<Box textColor='info' textStyle='p1'>
+															<Box color='info' fontScale='p1'>
 																<LegendSymbol color='#1D74F5' />
 																{t('Public_Channels')}
 															</Box>
@@ -168,9 +168,9 @@ export function MessagesPerChannelSection() {
 						<Flex.Item grow={1} shrink={0} basis='0'>
 							<Box>
 								<Margins blockEnd='x16'>
-									{table ? <Box textStyle='p1'>{t('Most_popular_channels_top_5')}</Box> : <Skeleton width='50%' />}
+									{table ? <Box fontScale='p1'>{t('Most_popular_channels_top_5')}</Box> : <Skeleton width='50%' />}
 								</Margins>
-								{table && !table.length && <Tile textStyle='p1' textColor='info' style={{ textAlign: 'center' }}>
+								{table && !table.length && <Tile fontScale='p1' color='info' style={{ textAlign: 'center' }}>
 									{t('Not_enough_data')}
 								</Tile>}
 								{(!table || !!table.length) && <Table>
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
index e3d96d4271c..0908351bcd0 100644
--- a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
@@ -4,9 +4,9 @@ import moment from 'moment';
 import React, { useMemo, useState } from 'react';
 
 import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
 import { CounterSet } from '../data/CounterSet';
 import { Section } from '../Section';
-import { useEndpointData } from '../../hooks/useEndpointData';
 
 export function MessagesSentSection() {
 	const t = useTranslation();
@@ -48,7 +48,7 @@ export function MessagesSentSection() {
 		end: period.end.toISOString(),
 	}), [period]);
 
-	const data = useEndpointData('GET', 'engagement-dashboard/messages/messages-sent', params);
+	const data = useEndpointData('engagement-dashboard/messages/messages-sent', params);
 
 	const [
 		countFromPeriod,
@@ -157,7 +157,7 @@ export function MessagesSentSection() {
 											},
 										},
 									}}
-									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+									tooltip={({ value }) => <Box fontScale='p2' color='alternative'>
 										{t('Value_messages', { value })}
 									</Box>}
 								/>
diff --git a/ee/app/engagement-dashboard/client/components/Section.js b/ee/app/engagement-dashboard/client/components/Section.js
index 8d52f7be627..31d7f79167c 100644
--- a/ee/app/engagement-dashboard/client/components/Section.js
+++ b/ee/app/engagement-dashboard/client/components/Section.js
@@ -11,7 +11,7 @@ export function Section({
 			<Flex.Container alignItems='center' wrap='no-wrap'>
 				<Box>
 					<Flex.Item grow={1}>
-						<Box textStyle='s2' textColor='default'>{title}</Box>
+						<Box fontScale='s2' color='default'>{title}</Box>
 					</Flex.Item>
 					{filter && <Flex.Item grow={0}>
 						{filter}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js
index d90e5c64947..4a471d2e923 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js
@@ -4,9 +4,9 @@ import moment from 'moment';
 import React, { useMemo } from 'react';
 
 import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
 import { CounterSet } from '../data/CounterSet';
 import { LegendSymbol } from '../data/LegendSymbol';
-import { useEndpointData } from '../../hooks/useEndpointData';
 import { Section } from '../Section';
 
 export function ActiveUsersSection() {
@@ -22,7 +22,7 @@ export function ActiveUsersSection() {
 		end: period.end.toISOString(),
 	}), [period]);
 
-	const data = useEndpointData('GET', 'engagement-dashboard/users/active-users', params);
+	const data = useEndpointData('engagement-dashboard/users/active-users', params);
 
 	const [
 		countDailyActiveUsers,
@@ -206,7 +206,7 @@ export function ActiveUsersSection() {
 									enableSlices='x'
 									sliceTooltip={({ slice: { points } }) => <Tile elevation='2'>
 										{points.map(({ serieId, data: { y: activeUsers } }) =>
-											<Box key={serieId} textStyle='p2'>
+											<Box key={serieId} fontScale='p2'>
 												{(serieId === 'dau' && t('DAU_value', { value: activeUsers }))
 										|| (serieId === 'wau' && t('WAU_value', { value: activeUsers }))
 										|| (serieId === 'mau' && t('MAU_value', { value: activeUsers }))}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
index 445ef0cb60b..a9f4e8d0fb1 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
@@ -4,8 +4,8 @@ import moment from 'moment';
 import React, { useMemo, useState } from 'react';
 
 import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
 import { Section } from '../Section';
-import { useEndpointData } from '../../hooks/useEndpointData';
 
 function ContentForHours({ displacement, onPreviousDateClick, onNextDateClick }) {
 	const t = useTranslation();
@@ -14,7 +14,7 @@ function ContentForHours({ displacement, onPreviousDateClick, onNextDateClick })
 		moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
 			.subtract(1).subtract(displacement, 'days'), [displacement]);
 	const params = useMemo(() => ({ start: currentDate.toISOString() }), [currentDate]);
-	const data = useEndpointData('GET', 'engagement-dashboard/users/chat-busier/hourly-data', params);
+	const data = useEndpointData('engagement-dashboard/users/chat-busier/hourly-data', params);
 	const values = useMemo(() => {
 		if (!data) {
 			return [];
@@ -111,7 +111,7 @@ function ContentForHours({ displacement, onPreviousDateClick, onNextDateClick })
 											},
 										},
 									}}
-									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+									tooltip={({ value }) => <Box fontScale='p2' color='alternative'>
 										{t('Value_users', { value })}
 									</Box>}
 								/>
@@ -131,7 +131,7 @@ function ContentForDays({ displacement, onPreviousDateClick, onNextDateClick })
 		return `${ startOfWeekDate.format('L') } - ${ currentDate.format('L') }`;
 	}, [currentDate]);
 	const params = useMemo(() => ({ start: currentDate.toISOString() }), [currentDate]);
-	const data = useEndpointData('GET', 'engagement-dashboard/users/chat-busier/weekly-data', params);
+	const data = useEndpointData('engagement-dashboard/users/chat-busier/weekly-data', params);
 	const values = useMemo(() => (data ? data.month.map(({ users, day, month, year }) => ({
 		users,
 		day: String(moment.utc([year, month - 1, day, 0, 0, 0]).valueOf()),
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
index 8fcd11a91bd..9d76708d523 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
@@ -4,7 +4,7 @@ import moment from 'moment';
 import React, { useMemo, useState } from 'react';
 
 import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
-import { useEndpointData } from '../../hooks/useEndpointData';
+import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
 import { CounterSet } from '../data/CounterSet';
 import { Section } from '../Section';
 
@@ -48,7 +48,7 @@ export function NewUsersSection() {
 		end: period.end.toISOString(),
 	}), [period]);
 
-	const data = useEndpointData('GET', 'engagement-dashboard/users/new-users', params);
+	const data = useEndpointData('engagement-dashboard/users/new-users', params);
 
 	const [
 		countFromPeriod,
@@ -157,7 +157,7 @@ export function NewUsersSection() {
 											},
 										},
 									}}
-									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+									tooltip={({ value }) => <Box fontScale='p2' color='alternative'>
 										{t('Value_users', { value })}
 									</Box>}
 								/>
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js b/ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js
index 08b17733f26..52046a69769 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js
@@ -4,8 +4,8 @@ import moment from 'moment';
 import React, { useMemo, useState } from 'react';
 
 import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useEndpointData } from '../../../../../../client/hooks/useEndpointData';
 import { Section } from '../Section';
-import { useEndpointData } from '../../hooks/useEndpointData';
 
 export function UsersByTimeOfTheDaySection() {
 	const t = useTranslation();
@@ -47,7 +47,7 @@ export function UsersByTimeOfTheDaySection() {
 		end: period.end.toISOString(),
 	}), [period]);
 
-	const data = useEndpointData('GET', 'engagement-dashboard/users/users-by-time-of-the-day-in-a-week', params);
+	const data = useEndpointData('engagement-dashboard/users/users-by-time-of-the-day-in-a-week', params);
 
 	const [
 		dates,
@@ -152,7 +152,7 @@ export function UsersByTimeOfTheDaySection() {
 											},
 										},
 									}}
-									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+									tooltip={({ value }) => <Box fontScale='p2' color='alternative'>
 										{t('Value_users', { value })}
 									</Box>}
 								/>
diff --git a/ee/app/engagement-dashboard/client/components/data/Counter.js b/ee/app/engagement-dashboard/client/components/data/Counter.js
index 9093b5e863a..396e66e3751 100644
--- a/ee/app/engagement-dashboard/client/components/data/Counter.js
+++ b/ee/app/engagement-dashboard/client/components/data/Counter.js
@@ -7,15 +7,15 @@ export function Counter({ count, variation = 0, description }) {
 	return <>
 		<Flex.Container alignItems='end'>
 			<Box>
-				<Box is='span' textColor='default' textStyle='h1' style={{ fontSize: '3em', lineHeight: 1 }}>
+				<Box is='span' color='default' fontScale='h1' style={{ fontSize: '3em', lineHeight: 1 }}>
 					{count}
 				</Box>
-				<Growth textStyle='s1'>{variation}</Growth>
+				<Growth fontScale='s1'>{variation}</Growth>
 			</Box>
 		</Flex.Container>
 		<Margins block='x12'>
 			<Flex.Container alignItems='center'>
-				<Box textStyle='p1' textColor='hint'>
+				<Box fontScale='p1' color='hint'>
 					{description}
 				</Box>
 			</Flex.Container>
diff --git a/ee/app/engagement-dashboard/client/components/data/Growth.js b/ee/app/engagement-dashboard/client/components/data/Growth.js
index 46548abed93..e7babfefcfa 100644
--- a/ee/app/engagement-dashboard/client/components/data/Growth.js
+++ b/ee/app/engagement-dashboard/client/components/data/Growth.js
@@ -9,7 +9,7 @@ export function Growth({ children, ...props }) {
 		return null;
 	}
 
-	return <Box is='span' textColor={children < 0 ? 'danger' : 'success'} {...props}>
+	return <Box is='span' color={children < 0 ? 'danger' : 'success'} {...props}>
 		{children < 0 ? <NegativeGrowthSymbol /> : <PositiveGrowthSymbol />}
 		{String(Math.abs(children))}
 	</Box>;
diff --git a/ee/app/engagement-dashboard/client/components/data/Growth.stories.js b/ee/app/engagement-dashboard/client/components/data/Growth.stories.js
index d90790f004d..31f90185933 100644
--- a/ee/app/engagement-dashboard/client/components/data/Growth.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/Growth.stories.js
@@ -17,7 +17,7 @@ export const negative = () => <Growth>{-3}</Growth>;
 
 export const withTextStyle = () =>
 	['h1', 's1', 'c1', 'micro']
-		.map((textStyle) => <Box key={textStyle}>
-			<Growth textStyle={textStyle}>{3}</Growth>
-			<Growth textStyle={textStyle}>{-3}</Growth>
+		.map((fontScale) => <Box key={fontScale}>
+			<Growth fontScale={fontScale}>{3}</Growth>
+			<Growth fontScale={fontScale}>{-3}</Growth>
 		</Box>);
diff --git a/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js b/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
index 6daa6bb7641..76e3c3c9f64 100644
--- a/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
@@ -11,6 +11,6 @@ export default {
 
 export const _default = () => <NegativeGrowthSymbol />;
 
-export const withColor = () => <Box textColor='danger'>
+export const withColor = () => <Box color='danger'>
 	<NegativeGrowthSymbol />
 </Box>;
diff --git a/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js b/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
index d5edb0c0434..d12c8f7c9ab 100644
--- a/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
@@ -11,6 +11,6 @@ export default {
 
 export const _default = () => <PositiveGrowthSymbol />;
 
-export const withColor = () => <Box textColor='success'>
+export const withColor = () => <Box color='success'>
 	<PositiveGrowthSymbol />
 </Box>;
diff --git a/ee/app/engagement-dashboard/client/routes.js b/ee/app/engagement-dashboard/client/routes.js
index 36ee55bbd15..2ccf13ba66d 100644
--- a/ee/app/engagement-dashboard/client/routes.js
+++ b/ee/app/engagement-dashboard/client/routes.js
@@ -1,5 +1,5 @@
 import { hasAllPermission } from '../../../../app/authorization';
-import { registerAdminRoute, registerAdminSidebarItem } from '../../../../app/ui-admin/client';
+import { registerAdminRoute, registerAdminSidebarItem } from '../../../../client/admin';
 import { renderRouteComponent } from '../../../../client/reactAdapters';
 import { hasLicense } from '../../license/client';
 
diff --git a/package-lock.json b/package-lock.json
index 315039a0f88..957953310ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -395,16 +395,16 @@
 			}
 		},
 		"@babel/helper-create-class-features-plugin": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz",
-			"integrity": "sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA==",
+			"version": "7.9.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz",
+			"integrity": "sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-function-name": "^7.8.3",
+				"@babel/helper-function-name": "^7.9.5",
 				"@babel/helper-member-expression-to-functions": "^7.8.3",
 				"@babel/helper-optimise-call-expression": "^7.8.3",
 				"@babel/helper-plugin-utils": "^7.8.3",
-				"@babel/helper-replace-supers": "^7.8.3",
+				"@babel/helper-replace-supers": "^7.8.6",
 				"@babel/helper-split-export-declaration": "^7.8.3"
 			},
 			"dependencies": {
@@ -418,26 +418,26 @@
 					}
 				},
 				"@babel/generator": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz",
-					"integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
+					"integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
 					"dev": true,
 					"requires": {
-						"@babel/types": "^7.8.3",
+						"@babel/types": "^7.9.5",
 						"jsesc": "^2.5.1",
 						"lodash": "^4.17.13",
 						"source-map": "^0.5.0"
 					}
 				},
 				"@babel/helper-function-name": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
-					"integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+					"integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
 					"dev": true,
 					"requires": {
 						"@babel/helper-get-function-arity": "^7.8.3",
 						"@babel/template": "^7.8.3",
-						"@babel/types": "^7.8.3"
+						"@babel/types": "^7.9.5"
 					}
 				},
 				"@babel/helper-get-function-arity": {
@@ -474,15 +474,15 @@
 					"dev": true
 				},
 				"@babel/helper-replace-supers": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz",
-					"integrity": "sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==",
+					"version": "7.8.6",
+					"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+					"integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
 					"dev": true,
 					"requires": {
 						"@babel/helper-member-expression-to-functions": "^7.8.3",
 						"@babel/helper-optimise-call-expression": "^7.8.3",
-						"@babel/traverse": "^7.8.3",
-						"@babel/types": "^7.8.3"
+						"@babel/traverse": "^7.8.6",
+						"@babel/types": "^7.8.6"
 					}
 				},
 				"@babel/helper-split-export-declaration": {
@@ -495,57 +495,57 @@
 					}
 				},
 				"@babel/highlight": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-					"integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+					"version": "7.9.0",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+					"integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
 					"dev": true,
 					"requires": {
+						"@babel/helper-validator-identifier": "^7.9.0",
 						"chalk": "^2.0.0",
-						"esutils": "^2.0.2",
 						"js-tokens": "^4.0.0"
 					}
 				},
 				"@babel/parser": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz",
-					"integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==",
+					"version": "7.9.4",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+					"integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
 					"dev": true
 				},
 				"@babel/template": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
-					"integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==",
+					"version": "7.8.6",
+					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+					"integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/parser": "^7.8.3",
-						"@babel/types": "^7.8.3"
+						"@babel/parser": "^7.8.6",
+						"@babel/types": "^7.8.6"
 					}
 				},
 				"@babel/traverse": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz",
-					"integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
+					"integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/generator": "^7.8.4",
-						"@babel/helper-function-name": "^7.8.3",
+						"@babel/generator": "^7.9.5",
+						"@babel/helper-function-name": "^7.9.5",
 						"@babel/helper-split-export-declaration": "^7.8.3",
-						"@babel/parser": "^7.8.4",
-						"@babel/types": "^7.8.3",
+						"@babel/parser": "^7.9.0",
+						"@babel/types": "^7.9.5",
 						"debug": "^4.1.0",
 						"globals": "^11.1.0",
 						"lodash": "^4.17.13"
 					}
 				},
 				"@babel/types": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
-					"integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+					"integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
 					"dev": true,
 					"requires": {
-						"esutils": "^2.0.2",
+						"@babel/helper-validator-identifier": "^7.9.5",
 						"lodash": "^4.17.13",
 						"to-fast-properties": "^2.0.0"
 					}
@@ -960,6 +960,12 @@
 				"@babel/types": "^7.0.0"
 			}
 		},
+		"@babel/helper-validator-identifier": {
+			"version": "7.9.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+			"integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+			"dev": true
+		},
 		"@babel/helper-wrap-function": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
@@ -1188,6 +1194,24 @@
 				"@babel/plugin-syntax-json-strings": "^7.2.0"
 			}
 		},
+		"@babel/plugin-proposal-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+			},
+			"dependencies": {
+				"@babel/helper-plugin-utils": {
+					"version": "7.8.3",
+					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+					"integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+					"dev": true
+				}
+			}
+		},
 		"@babel/plugin-proposal-object-rest-spread": {
 			"version": "7.6.2",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
@@ -1327,6 +1351,23 @@
 				"@babel/helper-plugin-utils": "^7.0.0"
 			}
 		},
+		"@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"
+			},
+			"dependencies": {
+				"@babel/helper-plugin-utils": {
+					"version": "7.8.3",
+					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+					"integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+					"dev": true
+				}
+			}
+		},
 		"@babel/plugin-syntax-object-rest-spread": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
@@ -1539,9 +1580,9 @@
 			}
 		},
 		"@babel/plugin-transform-flow-strip-types": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz",
-			"integrity": "sha512-g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA==",
+			"version": "7.9.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz",
+			"integrity": "sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.8.3",
@@ -1723,46 +1764,19 @@
 			}
 		},
 		"@babel/plugin-transform-react-constant-elements": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz",
-			"integrity": "sha512-glrzN2U+egwRfkNFtL34xIBYTxbbUF2qJTP8HD3qETBBqzAWSeNB821X0GjU06+dNpq/UyCIjI72FmGE5NNkQQ==",
+			"version": "7.9.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz",
+			"integrity": "sha512-wXMXsToAUOxJuBBEHajqKLFWcCkOSLshTI2ChCFFj1zDd7od4IOxiwLCOObNUvOpkxLpjIuaIdBMmNt6ocCPAw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.8.3",
 				"@babel/helper-plugin-utils": "^7.8.3"
 			},
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
-					"integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
-					"dev": true,
-					"requires": {
-						"@babel/types": "^7.8.3"
-					}
-				},
 				"@babel/helper-plugin-utils": {
 					"version": "7.8.3",
 					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
 					"integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
 					"dev": true
-				},
-				"@babel/types": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
-					"integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2",
-						"lodash": "^4.17.13",
-						"to-fast-properties": "^2.0.0"
-					}
-				},
-				"lodash": {
-					"version": "4.17.15",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-					"dev": true
 				}
 			}
 		},
@@ -2008,13 +2022,13 @@
 			}
 		},
 		"@babel/preset-flow": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.8.3.tgz",
-			"integrity": "sha512-iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ==",
+			"version": "7.9.0",
+			"resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.9.0.tgz",
+			"integrity": "sha512-88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.8.3",
-				"@babel/plugin-transform-flow-strip-types": "^7.8.3"
+				"@babel/plugin-transform-flow-strip-types": "^7.9.0"
 			},
 			"dependencies": {
 				"@babel/helper-plugin-utils": {
@@ -2097,157 +2111,6 @@
 				"to-fast-properties": "^2.0.0"
 			}
 		},
-		"@chromaui/localtunnel": {
-			"version": "1.10.1",
-			"resolved": "https://registry.npmjs.org/@chromaui/localtunnel/-/localtunnel-1.10.1.tgz",
-			"integrity": "sha512-LXhAogVc9SOQ45+mtk2mhcQxW4bE8aadfx9WbDzuDlBXcDgDMFBaxOmd5VYsPxQYA+cLFkKeuKOpROzsZSEySA==",
-			"dev": true,
-			"requires": {
-				"axios": "0.19.0",
-				"debug": "^3.0.1",
-				"openurl": "1.1.1",
-				"yargs": "6.6.0"
-			},
-			"dependencies": {
-				"axios": {
-					"version": "0.19.0",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
-					"integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
-					"dev": true,
-					"requires": {
-						"follow-redirects": "1.5.10",
-						"is-buffer": "^2.0.2"
-					}
-				},
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"dev": true,
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"is-buffer": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-					"integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-					"dev": true
-				},
-				"load-json-file": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-					"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0",
-						"strip-bom": "^2.0.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
-				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"dev": true,
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-					"dev": true,
-					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
-					}
-				},
-				"read-pkg-up": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-					"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-					"dev": true,
-					"requires": {
-						"find-up": "^1.0.0",
-						"read-pkg": "^1.0.0"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "^0.2.0"
-					}
-				},
-				"yargs": {
-					"version": "6.6.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-					"integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^3.0.0",
-						"cliui": "^3.2.0",
-						"decamelize": "^1.1.1",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^1.4.0",
-						"read-pkg-up": "^1.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^1.0.2",
-						"which-module": "^1.0.0",
-						"y18n": "^3.2.1",
-						"yargs-parser": "^4.2.0"
-					}
-				}
-			}
-		},
 		"@cypress/listr-verbose-renderer": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
@@ -2321,9 +2184,9 @@
 			}
 		},
 		"@emotion/cache": {
-			"version": "10.0.27",
-			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.27.tgz",
-			"integrity": "sha512-Zp8BEpbMunFsTcqAK4D7YTm3MvCp1SekflSLJH8lze2fCcSZ/yMkXHo8kb3t1/1Tdd3hAqf3Fb7z9VZ+FMiC9w==",
+			"version": "10.0.29",
+			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
+			"integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
 			"dev": true,
 			"requires": {
 				"@emotion/sheet": "0.9.4",
@@ -2333,9 +2196,9 @@
 			}
 		},
 		"@emotion/core": {
-			"version": "10.0.27",
-			"resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.27.tgz",
-			"integrity": "sha512-XbD5R36pVbohQMnKfajHv43g8EbN4NHdF6Zh9zg/C0nr0jqwOw3gYnC07Xj3yG43OYSRyrGsoQ5qPwc8ycvLZw==",
+			"version": "10.0.28",
+			"resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.28.tgz",
+			"integrity": "sha512-pH8UueKYO5jgg0Iq+AmCLxBsvuGtvlmiDCOuv8fGNYn3cowFpLN98L8zO56U0H1PjDIyAlXymgL3Wu7u7v6hbA==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.5.5",
@@ -2358,10 +2221,9 @@
 			}
 		},
 		"@emotion/hash": {
-			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.4.tgz",
-			"integrity": "sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A==",
-			"dev": true
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+			"integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
 		},
 		"@emotion/is-prop-valid": {
 			"version": "0.8.3",
@@ -2377,12 +2239,12 @@
 			"integrity": "sha512-2Md9mH6mvo+ygq1trTeVp2uzAKwE2P7In0cRpD/M9Q70aH8L+rxMLbb3JCN2JoSWsV2O+DdFjfbbXoMoLBczow=="
 		},
 		"@emotion/serialize": {
-			"version": "0.11.15",
-			"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.15.tgz",
-			"integrity": "sha512-YE+qnrmGwyR+XB5j7Bi+0GT1JWsdcjM/d4POu+TXkcnrRs4RFCCsi3d/Ebf+wSStHqAlTT2+dfd+b9N9EO2KBg==",
+			"version": "0.11.16",
+			"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
+			"integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
 			"dev": true,
 			"requires": {
-				"@emotion/hash": "0.7.4",
+				"@emotion/hash": "0.8.0",
 				"@emotion/memoize": "0.7.4",
 				"@emotion/unitless": "0.7.5",
 				"@emotion/utils": "0.11.3",
@@ -2420,21 +2282,21 @@
 			}
 		},
 		"@emotion/styled-base": {
-			"version": "10.0.27",
-			"resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.27.tgz",
-			"integrity": "sha512-ufHM/HhE3nr309hJG9jxuFt71r6aHn7p+bwXduFxcwPFEfBIqvmZUMtZ9YxIsY61PVwK3bp4G1XhaCzy9smVvw==",
+			"version": "10.0.31",
+			"resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.31.tgz",
+			"integrity": "sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.5.5",
-				"@emotion/is-prop-valid": "0.8.6",
+				"@emotion/is-prop-valid": "0.8.8",
 				"@emotion/serialize": "^0.11.15",
 				"@emotion/utils": "0.11.3"
 			},
 			"dependencies": {
 				"@emotion/is-prop-valid": {
-					"version": "0.8.6",
-					"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.6.tgz",
-					"integrity": "sha512-mnZMho3Sq8BfzkYYRVc8ilQTnc8U02Ytp6J1AwM6taQStZ3AhsEJBX2LzhA/LJirNCwM2VtHL3VFIZ+sNJUgUQ==",
+					"version": "0.8.8",
+					"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+					"integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
 					"dev": true,
 					"requires": {
 						"@emotion/memoize": "0.7.4"
@@ -2506,9 +2368,9 @@
 			}
 		},
 		"@google-cloud/language": {
-			"version": "3.7.2",
-			"resolved": "https://registry.npmjs.org/@google-cloud/language/-/language-3.7.2.tgz",
-			"integrity": "sha512-CKcxMNEMeCzzjSYQ/fixA+18dwR4VJsR4fKdabr+J5dEPldxxvEMyivRxkEaPR0sBpl4n/79eiHAAf+Qp3fguQ==",
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/@google-cloud/language/-/language-3.7.1.tgz",
+			"integrity": "sha512-yA96htfUvIyMccaD9JoVc5nZf22OZ6NCYvKc+ZcXwpP2a4UhNX90LlMjWq487lLwlyKesOOeMu3d72E+4yIpHg==",
 			"requires": {
 				"google-gax": "^1.9.0"
 			}
@@ -2574,9 +2436,9 @@
 			}
 		},
 		"@google-cloud/vision": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/@google-cloud/vision/-/vision-1.9.0.tgz",
-			"integrity": "sha512-6ka0MggI8u4WgGJe1wAIdxIAKE9gRp1CQ5ADXNM+JmSUniEZfbeNwOG8twFCxyWBlUqC+cQJaG4Amd6SLXzk/w==",
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/@google-cloud/vision/-/vision-1.8.0.tgz",
+			"integrity": "sha512-MNWogL5xI8VJEJIdIFbQKjLarNkeezi5RcnHRZPXOh+D0Dp3EBavWtDGm6FtdXWG5iqZ3vjIIRyM24QAV7G3wA==",
 			"requires": {
 				"@google-cloud/promisify": "^1.0.0",
 				"google-gax": "^1.7.5",
@@ -2591,9 +2453,9 @@
 			}
 		},
 		"@grpc/grpc-js": {
-			"version": "0.6.17",
-			"resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-0.6.17.tgz",
-			"integrity": "sha512-NDEhTBTo0b1/3YzD46wkm1hIPIyuZptoVRiuqF9nuWK+47Di5gQbNipTtjY7eXT1qRwrdFvMfo1utVMS3bifxg==",
+			"version": "0.6.15",
+			"resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-0.6.15.tgz",
+			"integrity": "sha512-BFK5YMu8JILedibo0nr3NYM0ZC5hCZuXtzk10wEUp3d3pH11PjdvTfN1yEJ0VsfBY5Gtp3WOQ+t7Byq0NzH/iQ==",
 			"requires": {
 				"semver": "^6.2.0"
 			},
@@ -2621,9 +2483,9 @@
 			"dev": true
 		},
 		"@juggle/resize-observer": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.1.2.tgz",
-			"integrity": "sha512-Yao5AFq8HKHsyLCLZn15BybqN67cdbgDbVDnnaN54IUaffkwDHj0VMgBp1C/IxOsFsNltsI7LdnW4GEHmQarLQ=="
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.1.3.tgz",
+			"integrity": "sha512-y7qc6SzZBlSpx8hEDfV0S9Cx6goROX/vBhS2Ru1Q78Jp1FlCMbxp7UcAN90rLgB3X8DSMBgDFxcmoG/VfdAhFA=="
 		},
 		"@kossnocorp/desvg": {
 			"version": "0.2.0",
@@ -2916,9 +2778,9 @@
 			"integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
 		},
 		"@reach/router": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.1.tgz",
-			"integrity": "sha512-Ov1j1J+pSgXliJHFL7XWhjyREwc6GxeWfgBTa5MMH5eRmYtHbPhaovba4xKo7aTVCg8fxkt2yDMNSpvwfUP+pA==",
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.3.tgz",
+			"integrity": "sha512-gOIAiFhWdiVGSVjukKeNKkCRBLmnORoTPyBihI/jLunICPgxdP30DroAvPQuf1eVfQbfGJQDJkwhJXsNPMnVWw==",
 			"dev": true,
 			"requires": {
 				"create-react-context": "0.3.0",
@@ -2928,9 +2790,9 @@
 			}
 		},
 		"@rocket.chat/apps-engine": {
-			"version": "1.15.0-alpha.3202",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.15.0-alpha.3202.tgz",
-			"integrity": "sha512-cNPPjTJE6V6OHp/6vY86LFOKEaaMELWocDxncMp2JetyYinYsU8rlHu8s/KHz7Nhptka5YMkXsZ4ozseld/wuw==",
+			"version": "1.15.0-beta.3262",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.15.0-beta.3262.tgz",
+			"integrity": "sha512-Rh8aVd8L5d8RWf6i2nk+vUuTIz6rJLBux0Px8gdC+7uO8r5C7ZKxhs7TaeEqxPBAq05KLhor120sMjkIGN8xGA==",
 			"requires": {
 				"adm-zip": "^0.4.9",
 				"cryptiles": "^4.1.3",
@@ -2949,19 +2811,12 @@
 			}
 		},
 		"@rocket.chat/css-in-js": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.7.1.tgz",
-			"integrity": "sha512-Qlwhf3i1w7kOpOKSbf/x/2Xl+EYgol4F/nO4F3Pz5SWFf+y/kJCR7GUoUbXq2d7cZNCA2us4/tQ7on/KVNvxWA==",
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.8.0.tgz",
+			"integrity": "sha512-G6RlTlzUwJR/ske8PjY1CsE2ktnA7YOkErkEBp5+FpXMGxCpNb8zqLqx3jrxJqyRKwXIBnX/6PO7dWPFMHTPpw==",
 			"requires": {
 				"@emotion/hash": "^0.8.0",
 				"@emotion/stylis": "^0.8.5"
-			},
-			"dependencies": {
-				"@emotion/hash": {
-					"version": "0.8.0",
-					"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
-					"integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
-				}
 			}
 		},
 		"@rocket.chat/eslint-config": {
@@ -2974,58 +2829,62 @@
 			}
 		},
 		"@rocket.chat/fuselage": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.7.1.tgz",
-			"integrity": "sha512-vyziOK0H9P13H+BBWk2q20/TNVVlOD+kpQy6cs4X+qWEIX3evzRUYSTF589AlSEJDCqEoEJSo1ODI6k8P1TwYw==",
+			"version": "0.6.3-dev.39",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.39.tgz",
+			"integrity": "sha512-nEIeFRIOtWeVNlpO/aeTjzyZ634wn/xOGdHvvX7ByGy3QfY9IAkeyFtT2D4Sp3jOmTWvQQd3/PHxI4Q595URHQ==",
 			"requires": {
-				"@rocket.chat/css-in-js": "^0.7.1",
-				"@rocket.chat/fuselage-tokens": "^0.7.1",
-				"@rocket.chat/icons": "^0.7.1"
+				"@rocket.chat/css-in-js": "^0.8.0",
+				"@rocket.chat/fuselage-tokens": "^0.8.0",
+				"@rocket.chat/icons": "^0.8.0",
+				"invariant": "^2.2.4",
+				"mem": "^6.1.0"
+			},
+			"dependencies": {
+				"@rocket.chat/icons": {
+					"version": "0.8.0",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.8.0.tgz",
+					"integrity": "sha512-5GGgIeIwK3QdtsalNuhtrzGr2iYDbkYnhjHaABo2j6hENB+xIn1p3AkkrKaYQXLqGvIlzwuTMyTGn9b49HzNPg=="
+				}
 			}
 		},
 		"@rocket.chat/fuselage-hooks": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.7.1.tgz",
-			"integrity": "sha512-MEl5M1wedMefGKs9wKRCFRzw+7qtpCnzmUzstf2oSLcQyWDybwYQm7OYZuo8x+jThVpSXZPF4oZ8hJGXSlHMjQ=="
+			"version": "0.6.3-dev.35",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.3-dev.35.tgz",
+			"integrity": "sha512-hvnNmiDBYhFGa1rvzuZAuPm1gI79YdJAIy9PZDQ77+deYzTpcR8aTCYsTa4p3hHc3RwflmqrXHDbRAjTiHR/1Q=="
 		},
 		"@rocket.chat/fuselage-polyfills": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.7.1.tgz",
-			"integrity": "sha512-DueoxzoCsQehpoJQt4ej0xVfSnnnYwQSLqK4iqa5sCh0uKgDXcZNHMqgIbBr6abH7SNbXTMG/9SHW8rbNilG9Q==",
+			"version": "0.6.3-dev.23",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.6.3-dev.23.tgz",
+			"integrity": "sha512-C+lFerSowMvU80CDH+atHwq0fuqvVK5/yCgiri7KHDKX6mHXBFXdT7xU2+UNqpT2geMkNS4bLS3/1piaSHDiBw==",
 			"requires": {
 				"@juggle/resize-observer": "^3.1.2",
 				"focus-visible": "^5.0.2"
 			}
 		},
 		"@rocket.chat/fuselage-tokens": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.7.1.tgz",
-			"integrity": "sha512-huCqiXeA7VRN6D5xZ7XNdhmrlxqr+gikR9V/eF3WRiB0lXorui8hy46oKphTvZwcO4/6CuK02pe9c43ktTrb/g=="
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.8.0.tgz",
+			"integrity": "sha512-TVPEckSbzHr+Ix3h4OuEd5OyDVAVnviSQRqwYzAbfRvb4B9riZwqUlvdNKgRofy1og5ovRMZUL9CqduGbsdhsA=="
 		},
 		"@rocket.chat/fuselage-ui-kit": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.7.1.tgz",
-			"integrity": "sha512-3OhOJ2yA1i/npYK9BeFFLuPGh9zBXCVS9PfWpN+Mc5dlCvB3CCduYExiIfho8+JZW83IXwIm9HlYsLyqMhpBpg==",
+			"version": "0.6.3-dev.35",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.3-dev.35.tgz",
+			"integrity": "sha512-E/C7voGjzfnp8WGqflOau/BtXSQa7Zaf2zc4cOXeudlagPLsG3K0uSU99ZiazKXZOR01h3QZM3Ikw5mEXTkeww==",
 			"requires": {
-				"@rocket.chat/ui-kit": "^0.7.1"
+				"@rocket.chat/ui-kit": "^0.8.0"
 			},
 			"dependencies": {
-				"@babel/preset-react": {
-					"version": "7.9.4",
-					"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz",
-					"integrity": "sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ=="
-				},
 				"@rocket.chat/ui-kit": {
-					"version": "0.7.1",
-					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.1.tgz",
-					"integrity": "sha512-CUpJt35zq56n4lBwWs17PRa+GGY+NKILv2ydjlL+dQNbtb9peEEzTVmglLRXUJhIwNKndSAr0eqoeTkRIsWL6A=="
+					"version": "0.8.0",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.8.0.tgz",
+					"integrity": "sha512-JNpwGcVQfBHjfG/sLJmMwau0BNvUWx210UAji4MnARAvfxBUslUYWzTRDkvxryKX0223dbTC91HOMt1HZDNNLQ=="
 				}
 			}
 		},
 		"@rocket.chat/icons": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.7.1.tgz",
-			"integrity": "sha512-u5Mn5PUskxZmY7S3xUPo7442xbruJ8/Z5Em5CquB1grQ+SwApdnKMP5tL2OfqRFqYHqppJhcl3sFAfKPfxvmKg=="
+			"version": "0.6.3-dev.23",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.3-dev.23.tgz",
+			"integrity": "sha512-MGljJJkGVe9g3UnKq2tSnfFq1gI6nIFociIXmOx9h/ZISeRc+xL6HpJ9pnbLXubFTPppNYn8JiVDlVB8Mm0flw=="
 		},
 		"@rocket.chat/livechat": {
 			"version": "1.4.0",
@@ -3132,9 +2991,9 @@
 			}
 		},
 		"@rocket.chat/ui-kit": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.1.tgz",
-			"integrity": "sha512-CUpJt35zq56n4lBwWs17PRa+GGY+NKILv2ydjlL+dQNbtb9peEEzTVmglLRXUJhIwNKndSAr0eqoeTkRIsWL6A=="
+			"version": "0.6.3-dev.23",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.3-dev.23.tgz",
+			"integrity": "sha512-fMBwA4wyyEPa0FlXp8w2807U2Ro8pTsA9dMEuDt1Qh2cZ8hZ8y4sNMiHOULttG3W3zAjHINTPjxLQnJrExoacw=="
 		},
 		"@samverschueren/stream-to-observable": {
 			"version": "0.3.0",
@@ -3211,17 +3070,17 @@
 			}
 		},
 		"@storybook/addon-actions": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-5.3.13.tgz",
-			"integrity": "sha512-NoKTI/7Zf/IpbfeIFPWQT3eN0As1yICLcSklj9BjHq7itSssaqZzvP/vxmeAvdagIBcPM58GaN9XXXLQIn5HLg==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-5.3.18.tgz",
+			"integrity": "sha512-jdBVCcfyWin274Lkwg5cL+1fJ651NCuIWxuJVsmHQtIl2xTjf2MyoMoKQZNdt4xtE+W9w+rS4bYt04elrizThg==",
 			"dev": true,
 			"requires": {
-				"@storybook/addons": "5.3.13",
-				"@storybook/api": "5.3.13",
-				"@storybook/client-api": "5.3.13",
-				"@storybook/components": "5.3.13",
-				"@storybook/core-events": "5.3.13",
-				"@storybook/theming": "5.3.13",
+				"@storybook/addons": "5.3.18",
+				"@storybook/api": "5.3.18",
+				"@storybook/client-api": "5.3.18",
+				"@storybook/components": "5.3.18",
+				"@storybook/core-events": "5.3.18",
+				"@storybook/theming": "5.3.18",
 				"core-js": "^3.0.1",
 				"fast-deep-equal": "^2.0.1",
 				"global": "^4.3.2",
@@ -3233,25 +3092,25 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/addon-knobs": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-5.3.13.tgz",
-			"integrity": "sha512-Ef3D8bbV+6fywjR4JUX699gT7ZfuNBXlXqZB1qgGde5swbuttEGty1+RRwK1fqIeBr6EbzPvhRBTVOFIQp5Ysg==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-5.3.18.tgz",
+			"integrity": "sha512-X0WxGKoso3j5mS4c4enM8BvCjbO6Wwfxc++swQTqtANpBZ8k+w0piiEF1fiJf+ssgEAWe5brgIqnQ9kiBGLqKA==",
 			"dev": true,
 			"requires": {
-				"@storybook/addons": "5.3.13",
-				"@storybook/api": "5.3.13",
-				"@storybook/client-api": "5.3.13",
-				"@storybook/components": "5.3.13",
-				"@storybook/core-events": "5.3.13",
-				"@storybook/theming": "5.3.13",
+				"@storybook/addons": "5.3.18",
+				"@storybook/api": "5.3.18",
+				"@storybook/client-api": "5.3.18",
+				"@storybook/components": "5.3.18",
+				"@storybook/core-events": "5.3.18",
+				"@storybook/theming": "5.3.18",
 				"@types/react-color": "^3.0.1",
 				"copy-to-clipboard": "^3.0.8",
 				"core-js": "^3.0.1",
@@ -3267,9 +3126,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"lodash": {
@@ -3279,108 +3138,49 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-					"integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/addon-links": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-5.3.13.tgz",
-			"integrity": "sha512-pMX205RM2/pEW5Sdq8nXAwMnVQPCofEmQjCiePw4awrAFqje6jmzZttjwImfzbc0BWtYDc1J97loI/Spo2q55A==",
-			"dev": true,
-			"requires": {
-				"@storybook/addons": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/core-events": "5.3.13",
-				"@storybook/csf": "0.0.1",
-				"@storybook/router": "5.3.13",
-				"core-js": "^3.0.1",
-				"global": "^4.3.2",
-				"prop-types": "^15.7.2",
-				"qs": "^6.6.0",
-				"ts-dedent": "^1.1.0"
-			},
-			"dependencies": {
-				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.9.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-					"integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
-					"dev": true
-				}
-			}
-		},
-		"@storybook/addon-viewport": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-5.3.13.tgz",
-			"integrity": "sha512-sFhWhyhN1k9VdSXPRkO7QMy1MLib9m6YtBzPCTnNsz8CjAuMNtCA+7zNW/fqGGJAHxuVTTJaHRc51Zk35E4WJA==",
-			"dev": true,
-			"requires": {
-				"@storybook/addons": "5.3.13",
-				"@storybook/api": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/components": "5.3.13",
-				"@storybook/core-events": "5.3.13",
-				"@storybook/theming": "5.3.13",
-				"core-js": "^3.0.1",
-				"global": "^4.3.2",
-				"memoizerific": "^1.11.3",
-				"prop-types": "^15.7.2",
-				"util-deprecate": "^1.0.2"
-			},
-			"dependencies": {
-				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "6.9.3",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
+					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/addons": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.13.tgz",
-			"integrity": "sha512-Yjn8PXhSYw4bnB/l8ybhMw3eqpJlV3HlwMECYhRtVm+wTqal9OQlZkam5xclWm6PF/6DhyiPCt6vlXN3vfVGPA==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.18.tgz",
+			"integrity": "sha512-ZQjDgTUDFRLvAiBg2d8FgPgghfQ+9uFyXQbtiGlTBLinrPCeQd7J86qiUES0fcGoohCCw0wWKtvB0WF2z1XNDg==",
 			"dev": true,
 			"requires": {
-				"@storybook/api": "5.3.13",
-				"@storybook/channels": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/core-events": "5.3.13",
+				"@storybook/api": "5.3.18",
+				"@storybook/channels": "5.3.18",
+				"@storybook/client-logger": "5.3.18",
+				"@storybook/core-events": "5.3.18",
 				"core-js": "^3.0.1",
 				"global": "^4.3.2",
 				"util-deprecate": "^1.0.2"
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/api": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/api/-/api-5.3.13.tgz",
-			"integrity": "sha512-ZOBUOz0aRPD7w8UngcVOjwcXt417Zboi0ERW+Atn22ZUYqI3zri8M9EerLHvyKw7J42/gEIqQqg5PyfPcLJmeQ==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/api/-/api-5.3.18.tgz",
+			"integrity": "sha512-QXaccNCARHzPWOuxYndiebGWBZmwiUvRgB9ji0XTJBS3y8K0ZPb5QyuqiKPaEWUj8dBA8rzdDtkW3Yt95Namaw==",
 			"dev": true,
 			"requires": {
 				"@reach/router": "^1.2.1",
-				"@storybook/channels": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/core-events": "5.3.13",
+				"@storybook/channels": "5.3.18",
+				"@storybook/client-logger": "5.3.18",
+				"@storybook/core-events": "5.3.18",
 				"@storybook/csf": "0.0.1",
-				"@storybook/router": "5.3.13",
-				"@storybook/theming": "5.3.13",
+				"@storybook/router": "5.3.18",
+				"@storybook/theming": "5.3.18",
 				"@types/reach__router": "^1.2.3",
 				"core-js": "^3.0.1",
 				"fast-deep-equal": "^2.0.1",
@@ -3397,9 +3197,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"lodash": {
@@ -3417,54 +3217,54 @@
 			}
 		},
 		"@storybook/channel-postmessage": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-5.3.13.tgz",
-			"integrity": "sha512-FMrl49ipHPXB0XPuwXm/2GWM5b53iFFz9V4/SQC1s31kxAU99QFmWXWvRKbM29FpAVHvTdjQllIiOWgdTH8jAA==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-5.3.18.tgz",
+			"integrity": "sha512-awxBW/aVfNtY9QvYZgsPaMXgUpC2+W3vEyQcl/w4ce0YVH+7yWx3wt3Ku49lQwxZwDrxP3QoC0U+mkPc9hBJwA==",
 			"dev": true,
 			"requires": {
-				"@storybook/channels": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
+				"@storybook/channels": "5.3.18",
+				"@storybook/client-logger": "5.3.18",
 				"core-js": "^3.0.1",
 				"global": "^4.3.2",
 				"telejson": "^3.2.0"
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/channels": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.13.tgz",
-			"integrity": "sha512-lD4HXmfoKJAnAlAYwQJ5dDXG3WnW7jpW3wJieRwvQGDFHQSXdJ3Lv5/zv2y+TM06Jx8O2esaepNw+VzjMw3/Qg==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.18.tgz",
+			"integrity": "sha512-scP/6td/BJSEOgfN+qaYGDf3E793xye7tIw6W+sYqwg+xdMFO39wVXgVZNpQL6sLEwpJZTaPywCjC6p6ksErqQ==",
 			"dev": true,
 			"requires": {
 				"core-js": "^3.0.1"
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/client-api": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-5.3.13.tgz",
-			"integrity": "sha512-GZCFtpU764X8TW+RYRNybIGHKJOa2fYW28I0hEPXXE0J4BeU4Z++SCeNhVBa+0tPoQ3jbsdA7M4Q5Q5UeaG2Nw==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-5.3.18.tgz",
+			"integrity": "sha512-QiXTDUpjdyW19BlocLw07DrkOnEzVaWGJcRze2nSs29IKKuq1Ncv2LOAZt6ySSq0PmIKsjBou3bmS1/aXmDMdw==",
 			"dev": true,
 			"requires": {
-				"@storybook/addons": "5.3.13",
-				"@storybook/channel-postmessage": "5.3.13",
-				"@storybook/channels": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/core-events": "5.3.13",
+				"@storybook/addons": "5.3.18",
+				"@storybook/channel-postmessage": "5.3.18",
+				"@storybook/channels": "5.3.18",
+				"@storybook/client-logger": "5.3.18",
+				"@storybook/core-events": "5.3.18",
 				"@storybook/csf": "0.0.1",
 				"@types/webpack-env": "^1.15.0",
 				"core-js": "^3.0.1",
@@ -3480,9 +3280,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"eventemitter3": {
@@ -3513,39 +3313,39 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-					"integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
+					"version": "6.9.3",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
+					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/client-logger": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.13.tgz",
-			"integrity": "sha512-unfhCgsGWWqNpM8t8S5coDcTgpWtOq3Kj4LEHivNjdHZFdf8WMLidW79ZTiyk/Nzx7RvZKgkvf7f6EtZniD55w==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.18.tgz",
+			"integrity": "sha512-RZjxw4uqZX3Yk27IirbB/pQG+wRsQSSRlKqYa8KQ5bSanm4IrcV9VA1OQbuySW9njE+CexAnakQJ/fENdmurNg==",
 			"dev": true,
 			"requires": {
 				"core-js": "^3.0.1"
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/components": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/components/-/components-5.3.13.tgz",
-			"integrity": "sha512-AwMnLCStwqLWsBzXp7m/QXuJin//0l4FH+OXmnD/6GC8qEy4JuutEOPW35IE/Mp9KAvbapHcnPTRMmDohUsTcw==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/components/-/components-5.3.18.tgz",
+			"integrity": "sha512-LIN4aVCCDY7klOwtuqQhfYz4tHaMADhXEzZpij+3r8N68Inck6IJ1oo9A9umXQPsTioQi8e6FLobH1im90j/2A==",
 			"dev": true,
 			"requires": {
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/theming": "5.3.13",
-				"@types/react-syntax-highlighter": "11.0.2",
+				"@storybook/client-logger": "5.3.18",
+				"@storybook/theming": "5.3.18",
+				"@types/react-syntax-highlighter": "11.0.4",
 				"@types/react-textarea-autosize": "^4.3.3",
 				"core-js": "^3.0.1",
 				"global": "^4.3.2",
@@ -3567,9 +3367,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"lodash": {
@@ -3581,9 +3381,9 @@
 			}
 		},
 		"@storybook/core": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/core/-/core-5.3.13.tgz",
-			"integrity": "sha512-HS//95j14XOb9ChYJBDHyZKAqFD2WsUh1q7sMMynSpKgHJjyfYI12rwxH5vDIrJ7CLBQbrMWrgOITjB9/cLJKA==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/core/-/core-5.3.18.tgz",
+			"integrity": "sha512-XQb/UQb+Ohuaw0GhKKYzvmuuh5Tit93f2cLZD9QCSWUPvDGmLG5g91Y9NbUr4Ap3mANT3NksMNhkAV0GxExEkg==",
 			"dev": true,
 			"requires": {
 				"@babel/plugin-proposal-class-properties": "^7.7.0",
@@ -3591,16 +3391,16 @@
 				"@babel/plugin-syntax-dynamic-import": "^7.2.0",
 				"@babel/plugin-transform-react-constant-elements": "^7.2.0",
 				"@babel/preset-env": "^7.4.5",
-				"@storybook/addons": "5.3.13",
-				"@storybook/channel-postmessage": "5.3.13",
-				"@storybook/client-api": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/core-events": "5.3.13",
+				"@storybook/addons": "5.3.18",
+				"@storybook/channel-postmessage": "5.3.18",
+				"@storybook/client-api": "5.3.18",
+				"@storybook/client-logger": "5.3.18",
+				"@storybook/core-events": "5.3.18",
 				"@storybook/csf": "0.0.1",
-				"@storybook/node-logger": "5.3.13",
-				"@storybook/router": "5.3.13",
-				"@storybook/theming": "5.3.13",
-				"@storybook/ui": "5.3.13",
+				"@storybook/node-logger": "5.3.18",
+				"@storybook/router": "5.3.18",
+				"@storybook/theming": "5.3.18",
+				"@storybook/ui": "5.3.18",
 				"airbnb-js-shims": "^2.2.1",
 				"ansi-to-html": "^0.6.11",
 				"autoprefixer": "^9.7.2",
@@ -3662,178 +3462,177 @@
 			},
 			"dependencies": {
 				"@webassemblyjs/ast": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-					"integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+					"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.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/wast-parser": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-					"integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-					"integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-					"integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-					"integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+					"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.8.5"
+						"@webassemblyjs/wast-printer": "1.9.0"
 					}
 				},
 				"@webassemblyjs/helper-fsm": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-					"integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-					"integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+					"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.8.5",
-						"mamacro": "^0.0.3"
+						"@webassemblyjs/ast": "1.9.0"
 					}
 				},
 				"@webassemblyjs/helper-wasm-bytecode": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-					"integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-					"integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-					"integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-					"integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-					"integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-					"integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/helper-wasm-section": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5",
-						"@webassemblyjs/wasm-opt": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5",
-						"@webassemblyjs/wast-printer": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-					"integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+					"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.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/ieee754": "1.8.5",
-						"@webassemblyjs/leb128": "1.8.5",
-						"@webassemblyjs/utf8": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-					"integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-					"integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+					"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.8.5",
-						"@webassemblyjs/helper-api-error": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/ieee754": "1.8.5",
-						"@webassemblyjs/leb128": "1.8.5",
-						"@webassemblyjs/utf8": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-					"integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+					"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.8.5",
-						"@webassemblyjs/floating-point-hex-parser": "1.8.5",
-						"@webassemblyjs/helper-api-error": "1.8.5",
-						"@webassemblyjs/helper-code-frame": "1.8.5",
-						"@webassemblyjs/helper-fsm": "1.8.5",
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-					"integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+					"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.8.5",
-						"@webassemblyjs/wast-parser": "1.8.5",
+						"@webassemblyjs/ast": "1.9.0",
+						"@webassemblyjs/wast-parser": "1.9.0",
 						"@xtuc/long": "4.2.2"
 					}
 				},
@@ -3843,16 +3642,10 @@
 					"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 					"dev": true
 				},
-				"acorn": {
-					"version": "6.4.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-					"integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
-					"dev": true
-				},
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -3868,30 +3661,57 @@
 					"dev": true
 				},
 				"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==",
+					"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": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
+						"color-convert": "^1.9.0"
 					}
 				},
-				"big.js": {
-					"version": "5.2.2",
-					"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-					"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-					"dev": true
-				},
-				"bluebird": {
-					"version": "3.7.2",
-					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-					"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-					"dev": true
-				},
-				"body-parser": {
-					"version": "1.19.0",
-					"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+				"autoprefixer": {
+					"version": "9.7.6",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz",
+					"integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==",
+					"dev": true,
+					"requires": {
+						"browserslist": "^4.11.1",
+						"caniuse-lite": "^1.0.30001039",
+						"chalk": "^2.4.2",
+						"normalize-range": "^0.1.2",
+						"num2fraction": "^1.2.2",
+						"postcss": "^7.0.27",
+						"postcss-value-parser": "^4.0.3"
+					},
+					"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"
+							}
+						}
+					}
+				},
+				"big.js": {
+					"version": "5.2.2",
+					"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+					"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+					"dev": true
+				},
+				"bluebird": {
+					"version": "3.7.2",
+					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+					"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+					"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": {
@@ -3924,6 +3744,18 @@
 						"fill-range": "^7.0.1"
 					}
 				},
+				"browserslist": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
+					"integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30001043",
+						"electron-to-chromium": "^1.3.413",
+						"node-releases": "^1.1.53",
+						"pkg-up": "^2.0.0"
+					}
+				},
 				"buffer": {
 					"version": "4.9.2",
 					"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
@@ -3967,6 +3799,12 @@
 						"unique-filename": "^1.1.1"
 					}
 				},
+				"caniuse-lite": {
+					"version": "1.0.30001045",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001045.tgz",
+					"integrity": "sha512-Y8o2Iz1KPcD6FjySbk1sPpvJqchgxk/iow0DABpGyzA1UeQAuxh63Xh0Enj5/BrsYbXtCN32JmR4ZxQTCQ6E6A==",
+					"dev": true
+				},
 				"chalk": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -3975,6 +3813,48 @@
 					"requires": {
 						"ansi-styles": "^4.1.0",
 						"supports-color": "^7.1.0"
+					},
+					"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"
+							}
+						},
+						"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.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"
+							}
+						}
 					}
 				},
 				"chownr": {
@@ -3993,14 +3873,20 @@
 					}
 				},
 				"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==",
+					"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.4"
+						"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
+				},
 				"commander": {
 					"version": "4.1.1",
 					"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -4023,9 +3909,9 @@
 					"dev": true
 				},
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"ejs": {
@@ -4034,6 +3920,12 @@
 					"integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
 					"dev": true
 				},
+				"electron-to-chromium": {
+					"version": "1.3.414",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.414.tgz",
+					"integrity": "sha512-UfxhIvED++qLwWrAq9uYVcqF8FdeV9sU2S7qhiHYFODxzXRrd1GZRl/PjITHsTEejgibcWDraD8TQqoHb1aCBQ==",
+					"dev": true
+				},
 				"emojis-list": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
@@ -4123,9 +4015,9 @@
 					}
 				},
 				"find-cache-dir": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
-					"integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
+					"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",
@@ -4143,17 +4035,6 @@
 						"path-exists": "^4.0.0"
 					}
 				},
-				"fs-extra": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-					"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.2.0",
-						"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",
@@ -4183,12 +4064,6 @@
 					"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
 					"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
-				},
 				"http-errors": {
 					"version": "1.7.2",
 					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
@@ -4215,21 +4090,12 @@
 					"dev": true
 				},
 				"json5": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-					"integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+					"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.0"
-					}
-				},
-				"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"
+						"minimist": "^1.2.5"
 					}
 				},
 				"loader-utils": {
@@ -4283,9 +4149,9 @@
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"minipass": {
@@ -4340,10 +4206,16 @@
 						"vm-browserify": "^1.0.1"
 					}
 				},
+				"node-releases": {
+					"version": "1.1.53",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
+					"integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+					"dev": true
+				},
 				"p-limit": {
-					"version": "2.2.2",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-					"integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+					"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"
@@ -4400,6 +4272,56 @@
 						"find-up": "^4.0.0"
 					}
 				},
+				"postcss": {
+					"version": "7.0.27",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
+					"integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+					"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"
+									}
+								}
+							}
+						},
+						"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-value-parser": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz",
+					"integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==",
+					"dev": true
+				},
 				"proxy-addr": {
 					"version": "2.0.6",
 					"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
@@ -4417,9 +4339,9 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-					"integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
+					"version": "6.9.3",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
+					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
 					"dev": true
 				},
 				"raw-body": {
@@ -4435,9 +4357,9 @@
 					}
 				},
 				"resolve": {
-					"version": "1.15.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-					"integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+					"version": "1.16.1",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz",
+					"integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==",
 					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
@@ -4453,12 +4375,12 @@
 					}
 				},
 				"schema-utils": {
-					"version": "2.6.4",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-					"integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+					"version": "2.6.6",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+					"integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.10.2",
+						"ajv": "^6.12.0",
 						"ajv-keywords": "^3.4.1"
 					}
 				},
@@ -4487,9 +4409,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.16",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-					"integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+					"version": "0.5.18",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
+					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -4513,12 +4435,12 @@
 					"dev": true
 				},
 				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+					"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": "^4.0.0"
+						"has-flag": "^3.0.0"
 					}
 				},
 				"tapable": {
@@ -4528,9 +4450,9 @@
 					"dev": true
 				},
 				"terser": {
-					"version": "4.6.4",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz",
-					"integrity": "sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==",
+					"version": "4.6.11",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
+					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -4615,17 +4537,28 @@
 					"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
 					"dev": true
 				},
+				"watchpack": {
+					"version": "1.6.1",
+					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
+					"integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+					"dev": true,
+					"requires": {
+						"chokidar": "^2.1.8",
+						"graceful-fs": "^4.1.2",
+						"neo-async": "^2.5.0"
+					}
+				},
 				"webpack": {
-					"version": "4.41.6",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
-					"integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
+					"version": "4.43.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+					"integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.8.5",
-						"@webassemblyjs/helper-module-context": "1.8.5",
-						"@webassemblyjs/wasm-edit": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5",
-						"acorn": "^6.2.1",
+						"@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",
@@ -4636,13 +4569,13 @@
 						"loader-utils": "^1.2.3",
 						"memory-fs": "^0.4.1",
 						"micromatch": "^3.1.10",
-						"mkdirp": "^0.5.1",
+						"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.6.0",
+						"watchpack": "^1.6.1",
 						"webpack-sources": "^1.4.1"
 					},
 					"dependencies": {
@@ -4676,9 +4609,9 @@
 							}
 						},
 						"cacache": {
-							"version": "12.0.3",
-							"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-							"integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+							"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",
@@ -4802,6 +4735,15 @@
 								"to-regex": "^3.0.2"
 							}
 						},
+						"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"
+							}
+						},
 						"p-locate": {
 							"version": "3.0.0",
 							"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
@@ -4915,18 +4857,18 @@
 			}
 		},
 		"@storybook/core-events": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.13.tgz",
-			"integrity": "sha512-RAnQe/I+1Ri+aYGhaNn07467cyespNX9R9i1AzFT/baBOQF2N+998mfgRu4/i/Q9YuOXIyHhw1a7JHbE/8e1lw==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.18.tgz",
+			"integrity": "sha512-uQ6NYJ5WODXK8DJ7m8y3yUAtWB3n+6XtYztjY+tdkCsLYvTYDXNS+epV+f5Hu9+gB+/Dm+b5Su4jDD+LZB2QWA==",
 			"dev": true,
 			"requires": {
 				"core-js": "^3.0.1"
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
@@ -4949,9 +4891,9 @@
 			}
 		},
 		"@storybook/node-logger": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.13.tgz",
-			"integrity": "sha512-ZpuyKALHq/ZyynXnsW254JaULWZLPBFw007tkJhE5z/CLy059cIVovQhX/8Ivt3FG3qwWmcqQ0ISHFi0dJpqnA==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.18.tgz",
+			"integrity": "sha512-Go/hdtaPTtjgJP+GYk8VXcOmecrdG7cXm0yyTlatd6s8xXI0txHme1/0MOZmEPows1Ec7KAQ20+NnaCGUPZUUg==",
 			"dev": true,
 			"requires": {
 				"@types/npmlog": "^4.1.2",
@@ -4992,9 +4934,9 @@
 					}
 				},
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"has-flag": {
@@ -5015,17 +4957,17 @@
 			}
 		},
 		"@storybook/react": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/react/-/react-5.3.13.tgz",
-			"integrity": "sha512-McBwRjGbe6vgjSqdcDtVxKyjGhRGBaN6JLsRr/Bi49KM/sw9SpXuoYxCQVQjK5jMpUV+1UeEpS/5j7HNeVc6YA==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/react/-/react-5.3.18.tgz",
+			"integrity": "sha512-6yNg+phcrEqEjC2NOiu0mJuxbTwX7yzbkcusIn0S7N/KTXNO7CGvYjAkdjfw0gTLjfuVDZIjDQfoosslvfsj3w==",
 			"dev": true,
 			"requires": {
 				"@babel/plugin-transform-react-constant-elements": "^7.6.3",
 				"@babel/preset-flow": "^7.0.0",
 				"@babel/preset-react": "^7.0.0",
-				"@storybook/addons": "5.3.13",
-				"@storybook/core": "5.3.13",
-				"@storybook/node-logger": "5.3.13",
+				"@storybook/addons": "5.3.18",
+				"@storybook/core": "5.3.18",
+				"@storybook/node-logger": "5.3.18",
 				"@svgr/webpack": "^4.0.3",
 				"@types/webpack-env": "^1.15.0",
 				"babel-plugin-add-react-displayname": "^0.0.5",
@@ -5044,178 +4986,177 @@
 			},
 			"dependencies": {
 				"@webassemblyjs/ast": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-					"integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+					"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.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/wast-parser": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-					"integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-					"integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-					"integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-					"integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+					"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.8.5"
+						"@webassemblyjs/wast-printer": "1.9.0"
 					}
 				},
 				"@webassemblyjs/helper-fsm": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-					"integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-					"integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+					"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.8.5",
-						"mamacro": "^0.0.3"
+						"@webassemblyjs/ast": "1.9.0"
 					}
 				},
 				"@webassemblyjs/helper-wasm-bytecode": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-					"integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-					"integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-					"integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-					"integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-					"integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-					"integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/helper-wasm-section": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5",
-						"@webassemblyjs/wasm-opt": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5",
-						"@webassemblyjs/wast-printer": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-					"integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+					"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.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/ieee754": "1.8.5",
-						"@webassemblyjs/leb128": "1.8.5",
-						"@webassemblyjs/utf8": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-					"integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-					"integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+					"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.8.5",
-						"@webassemblyjs/helper-api-error": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/ieee754": "1.8.5",
-						"@webassemblyjs/leb128": "1.8.5",
-						"@webassemblyjs/utf8": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-					"integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+					"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.8.5",
-						"@webassemblyjs/floating-point-hex-parser": "1.8.5",
-						"@webassemblyjs/helper-api-error": "1.8.5",
-						"@webassemblyjs/helper-code-frame": "1.8.5",
-						"@webassemblyjs/helper-fsm": "1.8.5",
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-					"integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+					"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.8.5",
-						"@webassemblyjs/wast-parser": "1.8.5",
+						"@webassemblyjs/ast": "1.9.0",
+						"@webassemblyjs/wast-parser": "1.9.0",
 						"@xtuc/long": "4.2.2"
 					}
 				},
@@ -5225,16 +5166,10 @@
 					"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 					"dev": true
 				},
-				"acorn": {
-					"version": "6.4.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-					"integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
-					"dev": true
-				},
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -5273,9 +5208,9 @@
 					}
 				},
 				"cacache": {
-					"version": "12.0.3",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-					"integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+					"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",
@@ -5311,9 +5246,9 @@
 					"dev": true
 				},
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"emojis-list": {
@@ -5404,11 +5339,20 @@
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
+				"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"
+					}
+				},
 				"neo-async": {
 					"version": "2.6.1",
 					"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
@@ -5512,9 +5456,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.16",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-					"integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+					"version": "0.5.18",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
+					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -5528,9 +5472,9 @@
 					"dev": true
 				},
 				"terser": {
-					"version": "4.6.4",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz",
-					"integrity": "sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==",
+					"version": "4.6.11",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
+					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -5588,17 +5532,28 @@
 					"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
 					"dev": true
 				},
+				"watchpack": {
+					"version": "1.6.1",
+					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
+					"integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+					"dev": true,
+					"requires": {
+						"chokidar": "^2.1.8",
+						"graceful-fs": "^4.1.2",
+						"neo-async": "^2.5.0"
+					}
+				},
 				"webpack": {
-					"version": "4.41.6",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
-					"integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
+					"version": "4.43.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+					"integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.8.5",
-						"@webassemblyjs/helper-module-context": "1.8.5",
-						"@webassemblyjs/wasm-edit": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5",
-						"acorn": "^6.2.1",
+						"@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",
@@ -5609,13 +5564,13 @@
 						"loader-utils": "^1.2.3",
 						"memory-fs": "^0.4.1",
 						"micromatch": "^3.1.10",
-						"mkdirp": "^0.5.1",
+						"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.6.0",
+						"watchpack": "^1.6.1",
 						"webpack-sources": "^1.4.1"
 					}
 				},
@@ -5647,9 +5602,9 @@
 			}
 		},
 		"@storybook/router": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/router/-/router-5.3.13.tgz",
-			"integrity": "sha512-C6PNKHxKwpNHPeQkd9ZfsIBfSBTEhWEbn9cVMPSTrUyjfaGWxbKBP8zuBIXhezIv8B2gv2bQrT62hrmsXUcCVg==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/router/-/router-5.3.18.tgz",
+			"integrity": "sha512-6B2U2C75KTSVaCuYYgcubeJGcCSnwsXuEf50hEd5mGqWgHZfojCtGvB7Ko4X+0h8rEC+eNA4p7YBOhlUv9WNrQ==",
 			"dev": true,
 			"requires": {
 				"@reach/router": "^1.2.1",
@@ -5664,9 +5619,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"lodash": {
@@ -5676,22 +5631,22 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-					"integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
+					"version": "6.9.3",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
+					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/theming": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.13.tgz",
-			"integrity": "sha512-Zb07pDt8Sv5uq+xDW3TsiTXS9IGwUNwpkR6UQgKILFJ7HX2q4Tt9r+wIi1QCwozcROx4w/bP/8MAKpEAT212lw==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.18.tgz",
+			"integrity": "sha512-lfFTeLoYwLMKg96N3gn0umghMdAHgJBGuk2OM8Ll84yWtdl9RGnzfiI1Fl7Cr5k95dCF7drLJlJCao1VxUkFSA==",
 			"dev": true,
 			"requires": {
 				"@emotion/core": "^10.0.20",
 				"@emotion/styled": "^10.0.17",
-				"@storybook/client-logger": "5.3.13",
+				"@storybook/client-logger": "5.3.18",
 				"core-js": "^3.0.1",
 				"deep-object-diff": "^1.1.0",
 				"emotion-theming": "^10.0.19",
@@ -5704,28 +5659,28 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/ui": {
-			"version": "5.3.13",
-			"resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-5.3.13.tgz",
-			"integrity": "sha512-pEXWFPF097OjvbgwvMjLsjLsDViu6yBMmUcL+nd3jvtxyxkuzv5X+2J14N8Nz0veJysbp+5+5A8kKGTO+spZfA==",
+			"version": "5.3.18",
+			"resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-5.3.18.tgz",
+			"integrity": "sha512-xyXK53fNe9lkGPmXf3Nk+n0gz9gOgXI+fDxetyDLpX79k3DIN/jCKEnv45vXof7OQ45mTmyBvUNTKrNLqKTt5Q==",
 			"dev": true,
 			"requires": {
 				"@emotion/core": "^10.0.20",
-				"@storybook/addons": "5.3.13",
-				"@storybook/api": "5.3.13",
-				"@storybook/channels": "5.3.13",
-				"@storybook/client-logger": "5.3.13",
-				"@storybook/components": "5.3.13",
-				"@storybook/core-events": "5.3.13",
-				"@storybook/router": "5.3.13",
-				"@storybook/theming": "5.3.13",
+				"@storybook/addons": "5.3.18",
+				"@storybook/api": "5.3.18",
+				"@storybook/channels": "5.3.18",
+				"@storybook/client-logger": "5.3.18",
+				"@storybook/components": "5.3.18",
+				"@storybook/core-events": "5.3.18",
+				"@storybook/router": "5.3.18",
+				"@storybook/theming": "5.3.18",
 				"copy-to-clipboard": "^3.0.8",
 				"core-js": "^3.0.1",
 				"core-js-pure": "^3.0.1",
@@ -5754,9 +5709,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"lodash": {
@@ -5766,9 +5721,9 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-					"integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
+					"version": "6.9.3",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
+					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
 					"dev": true
 				},
 				"semver": {
@@ -5910,12 +5865,12 @@
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
-					"integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+					"integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
 					"dev": true,
 					"requires": {
-						"esutils": "^2.0.2",
+						"@babel/helper-validator-identifier": "^7.9.5",
 						"lodash": "^4.17.13",
 						"to-fast-properties": "^2.0.0"
 					}
@@ -6040,13 +5995,19 @@
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				}
 			}
 		},
+		"@types/anymatch": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
+			"integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
+			"dev": true
+		},
 		"@types/bcrypt": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/@types/bcrypt/-/bcrypt-3.0.0.tgz",
@@ -6159,9 +6120,9 @@
 			}
 		},
 		"@types/fs-extra": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.0.tgz",
-			"integrity": "sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.0.1.tgz",
+			"integrity": "sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==",
 			"requires": {
 				"@types/node": "*"
 			}
@@ -6172,6 +6133,12 @@
 			"integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==",
 			"dev": true
 		},
+		"@types/html-minifier-terser": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz",
+			"integrity": "sha512-q95SP4FdkmF0CwO0F2q0H6ZgudsApaY/yCtAQNRn1gduef5fGpyEphzy0YCq/N0UFvDSnLg5V8jFK/YGXlDiCw==",
+			"dev": true
+		},
 		"@types/is-function": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.0.tgz",
@@ -6203,9 +6170,9 @@
 			"integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
 		},
 		"@types/meteor": {
-			"version": "1.4.40",
-			"resolved": "https://registry.npmjs.org/@types/meteor/-/meteor-1.4.40.tgz",
-			"integrity": "sha512-qkgqCe6LQzq/Diw4ZCYEJUhu3N4UzBz2wN0RQ97dirm6VJ7xnGKcBvBpvzqDHJJ4UNJGEdtWdBbSg5nnFMVuKg==",
+			"version": "1.4.39",
+			"resolved": "https://registry.npmjs.org/@types/meteor/-/meteor-1.4.39.tgz",
+			"integrity": "sha512-9Q7j/x4sajgelT224Vj1U0CVEPtwhWCPCsd1Za1JcwnhS0iOXa1FJAbBBKiMouLI/yAA7fU0jBEpgZWyDUnvEA==",
 			"dev": true,
 			"requires": {
 				"@types/connect": "*",
@@ -6296,9 +6263,9 @@
 			"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
 		},
 		"@types/reach__router": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.0.tgz",
-			"integrity": "sha512-0aL79bFPJzJOJOOMZm2301ErQVaveBdpW88uuavXymUlcYIAOCmI1ujJ2XLH6Mzn76O94eQCHIl1FDzNNKJCYA==",
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.4.tgz",
+			"integrity": "sha512-DZgYfxUIlVSjvf0AvBbYNbpXLrTFNNpU1HrvCRbnMtx3nvGUUWC1/zlAe4dD4FCPFtc+LQuIPEsDiTb0zQkthg==",
 			"dev": true,
 			"requires": {
 				"@types/history": "*",
@@ -6306,9 +6273,9 @@
 			}
 		},
 		"@types/react": {
-			"version": "16.9.22",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.22.tgz",
-			"integrity": "sha512-7OSt4EGiLvy0h5R7X+r0c7S739TCU/LvWbkNOrm10lUwNHe7XPz5OLhLOSZeCkqO9JSCly1NkYJ7ODTUqVnHJQ==",
+			"version": "16.9.19",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.19.tgz",
+			"integrity": "sha512-LJV97//H+zqKWMms0kvxaKYJDG05U2TtQB3chRLF8MPNs+MQh/H1aGlyDUxjaHvu08EAGerdX2z4LTBc7ns77A==",
 			"dev": true,
 			"requires": {
 				"@types/prop-types": "*",
@@ -6325,9 +6292,9 @@
 			}
 		},
 		"@types/react-syntax-highlighter": {
-			"version": "11.0.2",
-			"resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.2.tgz",
-			"integrity": "sha512-iMNcixH8330f2dq0RY+VOXCP8JFehgmOhLOtnO85Ty+qu0fHXJNEqWx5VuFv8v0aEq0U/N9d/k1yvA+c6PEmPw==",
+			"version": "11.0.4",
+			"resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz",
+			"integrity": "sha512-9GfTo3a0PHwQeTVoqs0g5bS28KkSY48pp5659wA+Dp4MqceDEa8EHBqrllJvvtyusszyJhViUEap0FDvlk/9Zg==",
 			"dev": true,
 			"requires": {
 				"@types/react": "*"
@@ -6373,23 +6340,93 @@
 			"integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
 			"dev": true
 		},
+		"@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+			"dev": true
+		},
+		"@types/tapable": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.5.tgz",
+			"integrity": "sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ==",
+			"dev": true
+		},
 		"@types/tough-cookie": {
 			"version": "2.3.4",
 			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.4.tgz",
 			"integrity": "sha512-Set5ZdrAaKI/qHdFlVMgm/GsAv/wkXhSTuZFkJ+JI7HK+wIkIlOaUXSXieIvJ0+OvGIqtREFoE+NHJtEq0gtEw=="
 		},
+		"@types/uglify-js": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.0.tgz",
+			"integrity": "sha512-3ZcoyPYHVOCcLpnfZwD47KFLr8W/mpUcgjpf1M4Q78TMJIw7KMAHSjiCLJp1z3ZrBR9pTLbe191O0TldFK5zcw==",
+			"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
+				}
+			}
+		},
 		"@types/underscore": {
 			"version": "1.9.4",
 			"resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.4.tgz",
 			"integrity": "sha512-CjHWEMECc2/UxOZh0kpiz3lEyX2Px3rQS9HzD20lxMvx571ivOBQKeLnqEjxUY0BMgp6WJWo/pQLRBwMW5v4WQ==",
 			"dev": true
 		},
+		"@types/webpack": {
+			"version": "4.41.12",
+			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.12.tgz",
+			"integrity": "sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w==",
+			"dev": true,
+			"requires": {
+				"@types/anymatch": "*",
+				"@types/node": "*",
+				"@types/tapable": "*",
+				"@types/uglify-js": "*",
+				"@types/webpack-sources": "*",
+				"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
+				}
+			}
+		},
 		"@types/webpack-env": {
 			"version": "1.15.1",
 			"resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.15.1.tgz",
 			"integrity": "sha512-eWN5ElDTeBc5lRDh95SqA8x18D0ll2pWudU3uWiyfsRmIZcmUXpEsxPU+7+BsdCrO2vfLRC629u/MmjbmF+2tA==",
 			"dev": true
 		},
+		"@types/webpack-sources": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz",
+			"integrity": "sha512-XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"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
+				}
+			}
+		},
 		"@types/ws": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz",
@@ -6400,12 +6437,12 @@
 			}
 		},
 		"@typescript-eslint/eslint-plugin": {
-			"version": "2.20.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.20.0.tgz",
-			"integrity": "sha512-cimIdVDV3MakiGJqMXw51Xci6oEDEoPkvh8ggJe2IIzcc0fYqAxOXN6Vbeanahz6dLZq64W+40iUEc9g32FLDQ==",
+			"version": "2.18.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.18.0.tgz",
+			"integrity": "sha512-kuO8WQjV+RCZvAXVRJfXWiJ8iYEtfHlKgcqqqXg9uUkIolEHuUaMmm8/lcO4xwCOtaw6mY0gStn2Lg4/eUXXYQ==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/experimental-utils": "2.20.0",
+				"@typescript-eslint/experimental-utils": "2.18.0",
 				"eslint-utils": "^1.4.3",
 				"functional-red-black-tree": "^1.0.1",
 				"regexpp": "^3.0.0",
@@ -6413,13 +6450,13 @@
 			}
 		},
 		"@typescript-eslint/experimental-utils": {
-			"version": "2.20.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.20.0.tgz",
-			"integrity": "sha512-fEBy9xYrwG9hfBLFEwGW2lKwDRTmYzH3DwTmYbT+SMycmxAoPl0eGretnBFj/s+NfYBG63w/5c3lsvqqz5mYag==",
+			"version": "2.18.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.18.0.tgz",
+			"integrity": "sha512-J6MopKPHuJYmQUkANLip7g9I82ZLe1naCbxZZW3O2sIxTiq/9YYoOELEKY7oPg0hJ0V/AQ225h2z0Yp+RRMXhw==",
 			"dev": true,
 			"requires": {
 				"@types/json-schema": "^7.0.3",
-				"@typescript-eslint/typescript-estree": "2.20.0",
+				"@typescript-eslint/typescript-estree": "2.18.0",
 				"eslint-scope": "^5.0.0"
 			},
 			"dependencies": {
@@ -6436,21 +6473,21 @@
 			}
 		},
 		"@typescript-eslint/parser": {
-			"version": "2.20.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.20.0.tgz",
-			"integrity": "sha512-o8qsKaosLh2qhMZiHNtaHKTHyCHc3Triq6aMnwnWj7budm3xAY9owSZzV1uon5T9cWmJRJGzTFa90aex4m77Lw==",
+			"version": "2.18.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.18.0.tgz",
+			"integrity": "sha512-SJJPxFMEYEWkM6pGfcnjLU+NJIPo+Ko1QrCBL+i0+zV30ggLD90huEmMMhKLHBpESWy9lVEeWlQibweNQzyc+A==",
 			"dev": true,
 			"requires": {
 				"@types/eslint-visitor-keys": "^1.0.0",
-				"@typescript-eslint/experimental-utils": "2.20.0",
-				"@typescript-eslint/typescript-estree": "2.20.0",
+				"@typescript-eslint/experimental-utils": "2.18.0",
+				"@typescript-eslint/typescript-estree": "2.18.0",
 				"eslint-visitor-keys": "^1.1.0"
 			}
 		},
 		"@typescript-eslint/typescript-estree": {
-			"version": "2.20.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.20.0.tgz",
-			"integrity": "sha512-WlFk8QtI8pPaE7JGQGxU7nGcnk1ccKAJkhbVookv94ZcAef3m6oCE/jEDL6dGte3JcD7reKrA0o55XhBRiVT3A==",
+			"version": "2.18.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.18.0.tgz",
+			"integrity": "sha512-gVHylf7FDb8VSi2ypFuEL3hOtoC4HkZZ5dOjXvVjoyKdRrvXAOPSzpNRnKMfaUUEiSLP8UF9j9X9EDLxC0lfZg==",
 			"dev": true,
 			"requires": {
 				"debug": "^4.1.1",
@@ -6686,6 +6723,93 @@
 				"@xtuc/long": "4.2.1"
 			}
 		},
+		"@webpack-contrib/schema-utils": {
+			"version": "1.0.0-beta.0",
+			"resolved": "https://registry.npmjs.org/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz",
+			"integrity": "sha512-LonryJP+FxQQHsjGBi6W786TQB1Oym+agTpY0c+Kj8alnIw+DLUJb6SI8Y1GHGhLCH1yPRrucjObUmxNICQ1pg==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.1.0",
+				"ajv-keywords": "^3.1.0",
+				"chalk": "^2.3.2",
+				"strip-ansi": "^4.0.0",
+				"text-table": "^0.2.0",
+				"webpack-log": "^1.1.2"
+			},
+			"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
+				},
+				"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"
+					}
+				},
+				"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"
+					}
+				},
+				"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
+				},
+				"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"
+					}
+				},
+				"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"
+					}
+				},
+				"webpack-log": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
+					"integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
+					"dev": true,
+					"requires": {
+						"chalk": "^2.1.0",
+						"log-symbols": "^2.1.0",
+						"loglevelnext": "^1.0.1",
+						"uuid": "^3.1.0"
+					}
+				}
+			}
+		},
 		"@xtuc/ieee754": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -6830,9 +6954,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -7029,6 +7153,27 @@
 			"integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
 			"dev": true
 		},
+		"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"
+					}
+				}
+			}
+		},
 		"apn": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/apn/-/apn-2.2.0.tgz",
@@ -7344,9 +7489,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -7415,9 +7560,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -7564,15 +7709,6 @@
 			"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
 			"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
 		},
-		"async-retry": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.1.tgz",
-			"integrity": "sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA==",
-			"dev": true,
-			"requires": {
-				"retry": "0.12.0"
-			}
-		},
 		"asynckit": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -7595,18 +7731,18 @@
 			"integrity": "sha512-ZaoiP6SApAcbx+BeUSMJEvY02sl6pWKJzkmP0RvmD+b0Cp7Umev7PMgPGnDMe572/eAKbOgjAW/XsECfx7IFiQ=="
 		},
 		"autoprefixer": {
-			"version": "9.7.3",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.3.tgz",
-			"integrity": "sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==",
+			"version": "9.7.6",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz",
+			"integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.8.0",
-				"caniuse-lite": "^1.0.30001012",
+				"browserslist": "^4.11.1",
+				"caniuse-lite": "^1.0.30001039",
 				"chalk": "^2.4.2",
 				"normalize-range": "^0.1.2",
 				"num2fraction": "^1.2.2",
-				"postcss": "^7.0.23",
-				"postcss-value-parser": "^4.0.2"
+				"postcss": "^7.0.27",
+				"postcss-value-parser": "^4.0.3"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -7619,20 +7755,21 @@
 					}
 				},
 				"browserslist": {
-					"version": "4.8.2",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.2.tgz",
-					"integrity": "sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
+					"integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
 					"dev": true,
 					"requires": {
-						"caniuse-lite": "^1.0.30001015",
-						"electron-to-chromium": "^1.3.322",
-						"node-releases": "^1.1.42"
+						"caniuse-lite": "^1.0.30001043",
+						"electron-to-chromium": "^1.3.413",
+						"node-releases": "^1.1.53",
+						"pkg-up": "^2.0.0"
 					}
 				},
 				"caniuse-lite": {
-					"version": "1.0.30001015",
-					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz",
-					"integrity": "sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==",
+					"version": "1.0.30001051",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001051.tgz",
+					"integrity": "sha512-sw8UUnTlRevawTMZKN7vpfwSjCBVoiMPlYd8oT2VwNylyPCBdMAUmLGUApnYYTtIm5JXsQegUAY7GPHqgfDzjw==",
 					"dev": true
 				},
 				"chalk": {
@@ -7662,24 +7799,21 @@
 					"dev": true
 				},
 				"electron-to-chromium": {
-					"version": "1.3.322",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz",
-					"integrity": "sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==",
+					"version": "1.3.428",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.428.tgz",
+					"integrity": "sha512-u3+5jEfgLKq/hGO96YfAoOAM1tgFnRDTCD5mLuev44tttcXix+INtVegAkmGzUcfDsnzkPt51XXurXZLLwXt0w==",
 					"dev": true
 				},
 				"node-releases": {
-					"version": "1.1.42",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.42.tgz",
-					"integrity": "sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.3.0"
-					}
+					"version": "1.1.55",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz",
+					"integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==",
+					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.23.tgz",
-					"integrity": "sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==",
+					"version": "7.0.29",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz",
+					"integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -7699,15 +7833,9 @@
 					}
 				},
 				"postcss-value-parser": {
-					"version": "4.0.2",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
-					"integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"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
 				},
 				"source-map": {
@@ -7818,9 +7946,9 @@
 			},
 			"dependencies": {
 				"resolve": {
-					"version": "1.15.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-					"integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+					"version": "1.15.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+					"integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
 					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
@@ -7849,12 +7977,6 @@
 					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
 					"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
 					"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
 				}
 			}
 		},
@@ -8202,15 +8324,15 @@
 			}
 		},
 		"babel-plugin-emotion": {
-			"version": "10.0.27",
-			"resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.27.tgz",
-			"integrity": "sha512-SUNYcT4FqhOqvwv0z1oeYhqgheU8qrceLojuHyX17ngo7WtWqN5I9l3IGHzf21Xraj465CVzF4IvOlAF+3ed0A==",
+			"version": "10.0.33",
+			"resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz",
+			"integrity": "sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-module-imports": "^7.0.0",
-				"@emotion/hash": "0.7.4",
+				"@emotion/hash": "0.8.0",
 				"@emotion/memoize": "0.7.4",
-				"@emotion/serialize": "^0.11.15",
+				"@emotion/serialize": "^0.11.16",
 				"babel-plugin-macros": "^2.0.0",
 				"babel-plugin-syntax-jsx": "^6.18.0",
 				"convert-source-map": "^1.5.0",
@@ -8224,12 +8346,6 @@
 					"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
 					"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
 					"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
 				}
 			}
 		},
@@ -8286,9 +8402,9 @@
 					"dev": true
 				},
 				"resolve": {
-					"version": "1.15.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-					"integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+					"version": "1.16.1",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz",
+					"integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==",
 					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
@@ -9123,14 +9239,6 @@
 						"private": "^0.1.8",
 						"slash": "^1.0.0",
 						"source-map": "^0.5.7"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
 					}
 				}
 			}
@@ -9342,12 +9450,12 @@
 			"dev": true
 		},
 		"bcrypt": {
-			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.8.tgz",
-			"integrity": "sha512-jKV6RvLhI36TQnPDvUFqBEnGX9c8dRRygKxCZu7E+MgLfKZbmmXL8a7/SFFOyHoPNX9nV81cKRC5tbQfvEQtpw==",
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.7.tgz",
+			"integrity": "sha512-K5UglF9VQvBMHl/1elNyyFvAfOY9Bj+rpKrCSR9sFwcW8FywAYJSRwTURNej5TaAK2TEJkcJ6r6lh1YPmspx5Q==",
 			"requires": {
 				"nan": "2.14.0",
-				"node-pre-gyp": "0.14.0"
+				"node-pre-gyp": "0.13.0"
 			},
 			"dependencies": {
 				"nan": {
@@ -10132,9 +10240,9 @@
 			},
 			"dependencies": {
 				"tslib": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz",
-					"integrity": "sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==",
+					"version": "1.11.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
 					"dev": true
 				}
 			}
@@ -10452,6 +10560,34 @@
 				"lodash.some": "^4.4.0"
 			}
 		},
+		"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"
+			},
+			"dependencies": {
+				"upath": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+					"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+					"dev": true
+				}
+			}
+		},
 		"chownr": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
@@ -11068,9 +11204,9 @@
 			}
 		},
 		"core-js-pure": {
-			"version": "3.6.4",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz",
-			"integrity": "sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==",
+			"version": "3.6.5",
+			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
+			"integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==",
 			"dev": true
 		},
 		"core-util-is": {
@@ -11089,178 +11225,177 @@
 			},
 			"dependencies": {
 				"@webassemblyjs/ast": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-					"integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+					"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.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/wast-parser": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-					"integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-					"integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-					"integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-					"integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+					"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.8.5"
+						"@webassemblyjs/wast-printer": "1.9.0"
 					}
 				},
 				"@webassemblyjs/helper-fsm": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-					"integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-					"integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+					"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.8.5",
-						"mamacro": "^0.0.3"
+						"@webassemblyjs/ast": "1.9.0"
 					}
 				},
 				"@webassemblyjs/helper-wasm-bytecode": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-					"integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-					"integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-					"integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-					"integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-					"integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+					"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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-					"integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/helper-wasm-section": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5",
-						"@webassemblyjs/wasm-opt": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5",
-						"@webassemblyjs/wast-printer": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-					"integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+					"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.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/ieee754": "1.8.5",
-						"@webassemblyjs/leb128": "1.8.5",
-						"@webassemblyjs/utf8": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-					"integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+					"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.8.5",
-						"@webassemblyjs/helper-buffer": "1.8.5",
-						"@webassemblyjs/wasm-gen": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-					"integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+					"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.8.5",
-						"@webassemblyjs/helper-api-error": "1.8.5",
-						"@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-						"@webassemblyjs/ieee754": "1.8.5",
-						"@webassemblyjs/leb128": "1.8.5",
-						"@webassemblyjs/utf8": "1.8.5"
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-					"integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+					"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.8.5",
-						"@webassemblyjs/floating-point-hex-parser": "1.8.5",
-						"@webassemblyjs/helper-api-error": "1.8.5",
-						"@webassemblyjs/helper-code-frame": "1.8.5",
-						"@webassemblyjs/helper-fsm": "1.8.5",
+						"@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.8.5",
-					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-					"integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+					"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.8.5",
-						"@webassemblyjs/wast-parser": "1.8.5",
+						"@webassemblyjs/ast": "1.9.0",
+						"@webassemblyjs/wast-parser": "1.9.0",
 						"@xtuc/long": "4.2.2"
 					}
 				},
@@ -11270,16 +11405,10 @@
 					"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 					"dev": true
 				},
-				"acorn": {
-					"version": "6.4.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-					"integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
-					"dev": true
-				},
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -11318,9 +11447,9 @@
 					}
 				},
 				"cacache": {
-					"version": "12.0.3",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-					"integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+					"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",
@@ -11429,11 +11558,20 @@
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
+				"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"
+					}
+				},
 				"neo-async": {
 					"version": "2.6.1",
 					"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
@@ -11531,9 +11669,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.16",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-					"integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+					"version": "0.5.18",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
+					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -11547,9 +11685,9 @@
 					"dev": true
 				},
 				"terser": {
-					"version": "4.6.4",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz",
-					"integrity": "sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==",
+					"version": "4.6.11",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
+					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -11607,17 +11745,28 @@
 					"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
 					"dev": true
 				},
+				"watchpack": {
+					"version": "1.6.1",
+					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
+					"integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+					"dev": true,
+					"requires": {
+						"chokidar": "^2.1.8",
+						"graceful-fs": "^4.1.2",
+						"neo-async": "^2.5.0"
+					}
+				},
 				"webpack": {
-					"version": "4.41.6",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
-					"integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
+					"version": "4.43.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+					"integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.8.5",
-						"@webassemblyjs/helper-module-context": "1.8.5",
-						"@webassemblyjs/wasm-edit": "1.8.5",
-						"@webassemblyjs/wasm-parser": "1.8.5",
-						"acorn": "^6.2.1",
+						"@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",
@@ -11628,13 +11777,13 @@
 						"loader-utils": "^1.2.3",
 						"memory-fs": "^0.4.1",
 						"micromatch": "^3.1.10",
-						"mkdirp": "^0.5.1",
+						"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.6.0",
+						"watchpack": "^1.6.1",
 						"webpack-sources": "^1.4.1"
 					}
 				},
@@ -11843,9 +11992,9 @@
 			"integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
 		},
 		"css-loader": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.4.2.tgz",
-			"integrity": "sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==",
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.2.tgz",
+			"integrity": "sha512-hDL0DPopg6zQQSRlZm0hyeaqIRnL0wbWjay9BZxoiJBpbfOW4WHfbaYQhwnDmEa0kZUc1CJ3IFo15ot1yULMIQ==",
 			"dev": true,
 			"requires": {
 				"camelcase": "^5.3.1",
@@ -11853,19 +12002,20 @@
 				"icss-utils": "^4.1.1",
 				"loader-utils": "^1.2.3",
 				"normalize-path": "^3.0.0",
-				"postcss": "^7.0.23",
+				"postcss": "^7.0.27",
 				"postcss-modules-extract-imports": "^2.0.0",
 				"postcss-modules-local-by-default": "^3.0.2",
-				"postcss-modules-scope": "^2.1.1",
+				"postcss-modules-scope": "^2.2.0",
 				"postcss-modules-values": "^3.0.0",
-				"postcss-value-parser": "^4.0.2",
-				"schema-utils": "^2.6.0"
+				"postcss-value-parser": "^4.0.3",
+				"schema-utils": "^2.6.5",
+				"semver": "^6.3.0"
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -11971,9 +12121,9 @@
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"postcss": {
@@ -11994,15 +12144,21 @@
 					"dev": true
 				},
 				"schema-utils": {
-					"version": "2.6.4",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-					"integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+					"version": "2.6.6",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+					"integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.10.2",
+						"ajv": "^6.12.0",
 						"ajv-keywords": "^3.4.1"
 					}
 				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -12077,12 +12233,36 @@
 			"dev": true
 		},
 		"csso": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz",
-			"integrity": "sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+			"integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
 			"dev": true,
 			"requires": {
-				"css-tree": "1.0.0-alpha.37"
+				"css-tree": "1.0.0-alpha.39"
+			},
+			"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==",
+					"dev": true,
+					"requires": {
+						"mdn-data": "2.0.6",
+						"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==",
+					"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
+				}
 			}
 		},
 		"cssom": {
@@ -12099,9 +12279,9 @@
 			}
 		},
 		"csstype": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.9.tgz",
-			"integrity": "sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==",
+			"version": "2.6.8",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.8.tgz",
+			"integrity": "sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==",
 			"dev": true
 		},
 		"csv-parse": {
@@ -12491,6 +12671,16 @@
 				}
 			}
 		},
+		"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"
+			}
+		},
 		"d3-array": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
@@ -12944,12 +13134,6 @@
 			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
 			"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
 		},
-		"denodeify": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
-			"integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=",
-			"dev": true
-		},
 		"denque": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz",
@@ -13089,12 +13273,30 @@
 			}
 		},
 		"dom-helpers": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-			"integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.4.tgz",
+			"integrity": "sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.1.2"
+				"@babel/runtime": "^7.8.7",
+				"csstype": "^2.6.7"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.9.2",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+					"integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+					"dev": true,
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				},
+				"regenerator-runtime": {
+					"version": "0.13.5",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+					"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+					"dev": true
+				}
 			}
 		},
 		"dom-serializer": {
@@ -13114,9 +13316,9 @@
 			}
 		},
 		"dom-walk": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-			"integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+			"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
 			"dev": true
 		},
 		"domain-browser": {
@@ -13165,29 +13367,10 @@
 				"tslib": "^1.10.0"
 			},
 			"dependencies": {
-				"lower-case": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
-					"integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.10.0"
-					}
-				},
-				"no-case": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
-					"integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
-					"dev": true,
-					"requires": {
-						"lower-case": "^2.0.1",
-						"tslib": "^1.10.0"
-					}
-				},
 				"tslib": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz",
-					"integrity": "sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==",
+					"version": "1.11.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
 					"dev": true
 				}
 			}
@@ -13422,52 +13605,6 @@
 			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
 			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 		},
-		"env-ci": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/env-ci/-/env-ci-2.6.0.tgz",
-			"integrity": "sha512-tnOi9qgtDxY3mvf69coXLHbSZtFMNGAJ1s/huirAhJZTx9rs/1qgFjl+6Z5ULQCfpDmlsf34L7wm+eJGwMazYg==",
-			"dev": true,
-			"requires": {
-				"execa": "^1.0.0",
-				"java-properties": "^0.2.9"
-			},
-			"dependencies": {
-				"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"
-					}
-				},
-				"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"
-					}
-				},
-				"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"
-					}
-				}
-			}
-		},
 		"errno": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
@@ -13525,9 +13662,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -13599,12 +13736,34 @@
 				"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"
+			}
+		},
 		"es5-shim": {
-			"version": "4.5.13",
-			"resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.13.tgz",
-			"integrity": "sha512-xi6hh6gsvDE0MaW4Vp1lgNEBpVcCXRWfPXj5egDvtgLz4L9MEvNwYEMdJH+JJinWkwa8c3c3o5HduV7dB/e1Hw==",
+			"version": "4.5.14",
+			"resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.14.tgz",
+			"integrity": "sha512-7SwlpL+2JpymWTt8sNLuC2zdhhc+wrfe5cMPI2j0o6WsPdfAiPwmFy2f0AocPB4RQVBOZ9kNTgi5YF7TdhkvEg==",
 			"dev": true
 		},
+		"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-promise": {
 			"version": "4.2.5",
 			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
@@ -13624,6 +13783,16 @@
 			"integrity": "sha512-E9kK/bjtCQRpN1K28Xh4BlmP8egvZBGJJ+9GtnzOwt7mdqtrjHFuVGr7QJfdjBIKqrlU5duPf3pCBoDrkjVYFg==",
 			"dev": true
 		},
+		"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"
+			}
+		},
 		"escape-html": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -13700,9 +13869,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"version": "6.11.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
+					"integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -14005,9 +14174,9 @@
 			},
 			"dependencies": {
 				"resolve": {
-					"version": "1.15.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-					"integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+					"version": "1.15.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+					"integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
 					"requires": {
 						"path-parse": "^1.0.6"
 					}
@@ -14024,9 +14193,9 @@
 			}
 		},
 		"eslint-plugin-import": {
-			"version": "2.20.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz",
-			"integrity": "sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==",
+			"version": "2.20.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz",
+			"integrity": "sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==",
 			"requires": {
 				"array-includes": "^3.0.3",
 				"array.prototype.flat": "^1.2.1",
@@ -14105,9 +14274,9 @@
 					}
 				},
 				"resolve": {
-					"version": "1.15.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-					"integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+					"version": "1.15.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+					"integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
 					"requires": {
 						"path-parse": "^1.0.6"
 					}
@@ -14115,9 +14284,9 @@
 			}
 		},
 		"eslint-plugin-react": {
-			"version": "7.18.3",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz",
-			"integrity": "sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg==",
+			"version": "7.18.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.18.1.tgz",
+			"integrity": "sha512-GTAhnWckqzzQzbbmqfoOPtpuVJAUPGliNyJRedvyboxAnZlui0INTmfVzQB0WjK9lbqKXixptMsd98LKamccPA==",
 			"dev": true,
 			"requires": {
 				"array-includes": "^3.1.1",
@@ -14223,9 +14392,9 @@
 					}
 				},
 				"resolve": {
-					"version": "1.15.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-					"integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+					"version": "1.15.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+					"integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
 					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
@@ -14283,9 +14452,9 @@
 			"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
 		},
 		"esquery": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz",
-			"integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+			"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
 			"dev": true,
 			"requires": {
 				"estraverse": "^4.0.0"
@@ -14689,6 +14858,23 @@
 				}
 			}
 		},
+		"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.0.0",
+					"resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
+					"integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+					"dev": true
+				}
+			}
+		},
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -14830,12 +15016,6 @@
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
 		},
-		"fake-tag": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/fake-tag/-/fake-tag-1.0.1.tgz",
-			"integrity": "sha512-qmewZoBpa71mM+y6oxXYW/d1xOYQmeIvnEXAt1oCmdP0sqcogWYLepR87QL1jQVLSVMVYDq2cjY6ec/Wu8/4pg==",
-			"dev": true
-		},
 		"fast-async": {
 			"version": "6.3.8",
 			"resolved": "https://registry.npmjs.org/fast-async/-/fast-async-6.3.8.tgz",
@@ -14865,12 +15045,6 @@
 				"micromatch": "^3.1.10"
 			}
 		},
-		"fast-json-parse": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
-			"integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
-			"dev": true
-		},
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -14881,12 +15055,6 @@
 			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
 			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
 		},
-		"fast-safe-stringify": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz",
-			"integrity": "sha512-QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==",
-			"dev": true
-		},
 		"fast-text-encoding": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz",
@@ -14901,6 +15069,15 @@
 				"format": "^0.2.0"
 			}
 		},
+		"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"
+			}
+		},
 		"fbjs": {
 			"version": "0.8.17",
 			"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
@@ -14976,9 +15153,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -15032,18 +15209,18 @@
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"schema-utils": {
-					"version": "2.6.4",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-					"integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+					"version": "2.6.6",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+					"integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.10.2",
+						"ajv": "^6.12.0",
 						"ajv-keywords": "^3.4.1"
 					}
 				}
@@ -15202,12 +15379,6 @@
 				}
 			}
 		},
-		"flatstr": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/flatstr/-/flatstr-1.0.12.tgz",
-			"integrity": "sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw==",
-			"dev": true
-		},
 		"flatted": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
@@ -15243,15 +15414,15 @@
 			"integrity": "sha1-PjKNj95BKtR+c44751C00pAENJg="
 		},
 		"focus-lock": {
-			"version": "0.6.6",
-			"resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.6.tgz",
-			"integrity": "sha512-Dx69IXGCq1qsUExWuG+5wkiMqVM/zGx/reXSJSLogECwp3x6KeNQZ+NAetgxEFpnC41rD8U3+jRCW68+LNzdtw==",
+			"version": "0.6.7",
+			"resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.7.tgz",
+			"integrity": "sha512-KRo93U/afEqt7w5tBm4t0FHf/Li8tEYav3n4GUiZdeRlRfrtMbL8yQg0xRVnY/kmBRmQ4xkqIlbaMvuqlu53kg==",
 			"dev": true
 		},
 		"focus-visible": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.0.2.tgz",
-			"integrity": "sha512-zT2fj/bmOgEBjqGbURGlowTmCwsIs3bRDMr/sFZz8Ly7VkEiwuCn9swNTL3pPuf8Oua2de7CLuKdnuNajWdDsQ=="
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.1.0.tgz",
+			"integrity": "sha512-nPer0rjtzdZ7csVIu233P2cUm/ks/4aVSI+5KUkYrYpgA7ujgC3p6J7FtFU+AIMWwnwYQOB/yeiOITxFeYIXiw=="
 		},
 		"follow-redirects": {
 			"version": "1.5.10",
@@ -15316,27 +15487,6 @@
 						"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"
-							}
-						}
-					}
-				},
 				"chalk": {
 					"version": "2.4.2",
 					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -15348,26 +15498,6 @@
 						"supports-color": "^5.3.0"
 					}
 				},
-				"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"
-					}
-				},
 				"color-convert": {
 					"version": "1.9.3",
 					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -15391,12 +15521,6 @@
 					"requires": {
 						"has-flag": "^3.0.0"
 					}
-				},
-				"upath": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-					"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-					"dev": true
 				}
 			}
 		},
@@ -15528,25 +15652,29 @@
 			"dependencies": {
 				"abbrev": {
 					"version": "1.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+					"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 					"dev": true,
 					"optional": true
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 					"dev": true,
 					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+					"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 					"dev": true,
 					"optional": true
 				},
 				"are-we-there-yet": {
 					"version": "1.1.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+					"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15556,13 +15684,15 @@
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 					"dev": true,
 					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15572,37 +15702,43 @@
 				},
 				"chownr": {
 					"version": "1.1.1",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
 					"dev": true,
 					"optional": true
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 					"dev": true,
 					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 					"dev": true,
 					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 					"dev": true,
 					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 					"dev": true,
 					"optional": true
 				},
 				"debug": {
 					"version": "4.1.1",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15611,25 +15747,29 @@
 				},
 				"deep-extend": {
 					"version": "0.6.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+					"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 					"dev": true,
 					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+					"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 					"dev": true,
 					"optional": true
 				},
 				"detect-libc": {
 					"version": "1.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+					"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
 					"dev": true,
 					"optional": true
 				},
 				"fs-minipass": {
 					"version": "1.2.5",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15638,13 +15778,15 @@
 				},
 				"fs.realpath": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+					"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 					"dev": true,
 					"optional": true
 				},
 				"gauge": {
 					"version": "2.7.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+					"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15660,7 +15802,8 @@
 				},
 				"glob": {
 					"version": "7.1.3",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15674,13 +15817,15 @@
 				},
 				"has-unicode": {
 					"version": "2.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+					"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 					"dev": true,
 					"optional": true
 				},
 				"iconv-lite": {
 					"version": "0.4.24",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15689,7 +15834,8 @@
 				},
 				"ignore-walk": {
 					"version": "3.0.1",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15698,7 +15844,8 @@
 				},
 				"inflight": {
 					"version": "1.0.6",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+					"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15708,19 +15855,22 @@
 				},
 				"inherits": {
 					"version": "2.0.3",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
 					"dev": true,
 					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+					"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
 					"dev": true,
 					"optional": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15729,13 +15879,15 @@
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"dev": true,
 					"optional": true
 				},
 				"minimatch": {
 					"version": "3.0.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15744,13 +15896,15 @@
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"dev": true,
 					"optional": true
 				},
 				"minipass": {
 					"version": "2.3.5",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15760,7 +15914,8 @@
 				},
 				"minizlib": {
 					"version": "1.2.1",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15769,7 +15924,8 @@
 				},
 				"mkdirp": {
 					"version": "0.5.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15778,7 +15934,8 @@
 				},
 				"ms": {
 					"version": "2.1.1",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true,
 					"optional": true
 				},
@@ -15791,7 +15948,8 @@
 				},
 				"needle": {
 					"version": "2.3.0",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15802,7 +15960,8 @@
 				},
 				"node-pre-gyp": {
 					"version": "0.12.0",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15820,7 +15979,8 @@
 				},
 				"nopt": {
 					"version": "4.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15830,13 +15990,15 @@
 				},
 				"npm-bundled": {
 					"version": "1.0.6",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 					"dev": true,
 					"optional": true
 				},
 				"npm-packlist": {
 					"version": "1.4.1",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15846,7 +16008,8 @@
 				},
 				"npmlog": {
 					"version": "4.1.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15858,19 +16021,22 @@
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 					"dev": true,
 					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
 					"dev": true,
 					"optional": true
 				},
 				"once": {
 					"version": "1.4.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15879,19 +16045,22 @@
 				},
 				"os-homedir": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
 					"dev": true,
 					"optional": true
 				},
 				"os-tmpdir": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
 					"dev": true,
 					"optional": true
 				},
 				"osenv": {
 					"version": "0.1.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15901,19 +16070,22 @@
 				},
 				"path-is-absolute": {
 					"version": "1.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 					"dev": true,
 					"optional": true
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
 					"dev": true,
 					"optional": true
 				},
 				"rc": {
 					"version": "1.2.8",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15925,7 +16097,8 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"bundled": true,
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
 						}
@@ -15933,7 +16106,8 @@
 				},
 				"readable-stream": {
 					"version": "2.3.6",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15948,7 +16122,8 @@
 				},
 				"rimraf": {
 					"version": "2.6.3",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -15957,43 +16132,50 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 					"dev": true,
 					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 					"dev": true,
 					"optional": true
 				},
 				"sax": {
 					"version": "1.2.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 					"dev": true,
 					"optional": true
 				},
 				"semver": {
 					"version": "5.7.0",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
 					"dev": true,
 					"optional": true
 				},
 				"set-blocking": {
 					"version": "2.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 					"dev": true,
 					"optional": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
 					"dev": true,
 					"optional": true
 				},
 				"string-width": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -16004,7 +16186,8 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -16013,7 +16196,8 @@
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -16022,13 +16206,15 @@
 				},
 				"strip-json-comments": {
 					"version": "2.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 					"dev": true,
 					"optional": true
 				},
 				"tar": {
 					"version": "4.4.8",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -16043,13 +16229,15 @@
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 					"dev": true,
 					"optional": true
 				},
 				"wide-align": {
 					"version": "1.1.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 					"dev": true,
 					"optional": true,
 					"requires": {
@@ -16058,13 +16246,15 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 					"dev": true,
 					"optional": true
 				},
 				"yallist": {
 					"version": "3.0.3",
-					"bundled": true,
+					"resolved": false,
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
 					"dev": true,
 					"optional": true
 				}
@@ -16087,9 +16277,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -16158,9 +16348,9 @@
 			"dev": true
 		},
 		"fuse.js": {
-			"version": "3.4.6",
-			"resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.4.6.tgz",
-			"integrity": "sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg==",
+			"version": "3.6.1",
+			"resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz",
+			"integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==",
 			"dev": true
 		},
 		"gauge": {
@@ -16179,24 +16369,21 @@
 			}
 		},
 		"gaxios": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-2.3.1.tgz",
-			"integrity": "sha512-DQOesWEx59/bm63lTX0uHDDXpGTW9oKqNsoigwCoRe2lOb5rFqxzHjLTa6aqEBecLcz69dHLw7rbS068z1fvIQ==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-2.3.0.tgz",
+			"integrity": "sha512-VgC4JKJQAAAGK5rFZbPcS5mXsdIYVMIUJOxMjSOkYdfhB74R0L6y8PFQDdS0r1ObG6hdP11e71EjHh3xbI+6fQ==",
 			"requires": {
 				"abort-controller": "^3.0.0",
 				"extend": "^3.0.2",
-				"https-proxy-agent": "^5.0.0",
+				"https-proxy-agent": "^4.0.0",
 				"is-stream": "^2.0.0",
 				"node-fetch": "^2.3.0"
 			},
 			"dependencies": {
 				"agent-base": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
-					"integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
-					"requires": {
-						"debug": "4"
-					}
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+					"integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
 				},
 				"debug": {
 					"version": "4.1.1",
@@ -16206,15 +16393,6 @@
 						"ms": "^2.1.1"
 					}
 				},
-				"https-proxy-agent": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-					"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-					"requires": {
-						"agent-base": "6",
-						"debug": "4"
-					}
-				},
 				"is-stream": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -17128,13 +17306,12 @@
 					}
 				},
 				"google-auth-library": {
-					"version": "5.10.0",
-					"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-5.10.0.tgz",
-					"integrity": "sha512-Kfa0GDYYzaRGtvegI64c+oF8Adv3ZW8hWfOegiu53/h4etBdsdXI3uox/TKlyIHKFu8/YhpKv3Z30sJH986YKA==",
+					"version": "5.9.2",
+					"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-5.9.2.tgz",
+					"integrity": "sha512-rBE1YTOZ3/Hu6Mojkr+UUmbdc/F28hyMGYEGxjyfVA9ZFmq12oqS3AeftX4h9XpdVIcxPooSo8hECYGT6B9XqQ==",
 					"requires": {
 						"arrify": "^2.0.0",
 						"base64-js": "^1.3.0",
-						"ecdsa-sig-formatter": "^1.0.11",
 						"fast-text-encoding": "^1.0.0",
 						"gaxios": "^2.1.0",
 						"gcp-metadata": "^3.3.0",
@@ -17426,15 +17603,15 @@
 			}
 		},
 		"hast-util-parse-selector": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.3.tgz",
-			"integrity": "sha512-nxbeqjQNxsvo/uYYAw9kij6td05YVUlf1qti09rVfbWSLT5H6wo3c+USIwX6nzXWk5kFZzXnEqO82856r0aM2Q==",
+			"version": "2.2.4",
+			"resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz",
+			"integrity": "sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==",
 			"dev": true
 		},
 		"hastscript": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/hastscript/-/hastscript-5.1.1.tgz",
-			"integrity": "sha512-xHo1Hkcqd0LlWNuDL3/BxwhgAGp3d7uEvCMgCTrBY+zsOooPPH+8KAvW8PCgl+GB8H3H44nfSaF0A4BQ+4xlYg==",
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz",
+			"integrity": "sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ==",
 			"dev": true,
 			"requires": {
 				"comma-separated-tokens": "^1.0.0",
@@ -17537,15 +17714,15 @@
 			}
 		},
 		"html-entities": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+			"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-minifier-terser": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.4.tgz",
-			"integrity": "sha512-fHwmKQ+GzhlqdxEtwrqLT7MSuheiA+rif5/dZgbz3GjoMXJzcRzy1L9NXoiiyxrnap+q5guSiv8Tz5lrh9g42g==",
+			"version": "5.0.5",
+			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz",
+			"integrity": "sha512-cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew==",
 			"dev": true,
 			"requires": {
 				"camel-case": "^4.1.1",
@@ -17563,16 +17740,6 @@
 					"integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
 					"dev": true
 				},
-				"param-case": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz",
-					"integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==",
-					"dev": true,
-					"requires": {
-						"dot-case": "^3.0.3",
-						"tslib": "^1.10.0"
-					}
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -17580,9 +17747,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.16",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-					"integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+					"version": "0.5.18",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
+					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -17590,9 +17757,9 @@
 					}
 				},
 				"terser": {
-					"version": "4.6.4",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz",
-					"integrity": "sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==",
+					"version": "4.6.11",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
+					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -17607,12 +17774,6 @@
 							"dev": true
 						}
 					}
-				},
-				"tslib": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz",
-					"integrity": "sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==",
-					"dev": true
 				}
 			}
 		},
@@ -17634,11 +17795,14 @@
 			}
 		},
 		"html-webpack-plugin": {
-			"version": "4.0.0-beta.11",
-			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz",
-			"integrity": "sha512-4Xzepf0qWxf8CGg7/WQM5qBB2Lc/NFI7MhU59eUDTkuQp3skZczH4UA1d6oQyDEIoMDgERVhRyTdtUPZ5s5HBg==",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.2.0.tgz",
+			"integrity": "sha512-zL7LYTuq/fcJX6vV6tmmvFR508Bd9e6kvVGbS76YAjZ2CPVRzsjkvDYs/SshPevpolSdTWgaDV39D6k6oQoVFw==",
 			"dev": true,
 			"requires": {
+				"@types/html-minifier-terser": "^5.0.0",
+				"@types/tapable": "^1.0.5",
+				"@types/webpack": "^4.41.8",
 				"html-minifier-terser": "^5.0.1",
 				"loader-utils": "^1.2.3",
 				"lodash": "^4.17.15",
@@ -17686,9 +17850,9 @@
 					"dev": true
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"tapable": {
@@ -17773,6 +17937,35 @@
 			"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
 			"dev": true
 		},
+		"https-proxy-agent": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+			"integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+			"requires": {
+				"agent-base": "5",
+				"debug": "4"
+			},
+			"dependencies": {
+				"agent-base": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+					"integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
+				},
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"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=="
+				}
+			}
+		},
 		"human-signals": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
@@ -18368,9 +18561,9 @@
 					"dev": true
 				},
 				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz",
+					"integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==",
 					"dev": true,
 					"requires": {
 						"escape-string-regexp": "^1.0.5"
@@ -18518,7 +18711,6 @@
 			"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"
 			}
@@ -18543,6 +18735,12 @@
 				"ipaddr.js": "^1.0.1"
 			}
 		},
+		"ip-regex": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz",
+			"integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==",
+			"dev": true
+		},
 		"ipaddr.js": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
@@ -18925,12 +19123,6 @@
 				"url-regex": "^5.0.0"
 			},
 			"dependencies": {
-				"ip-regex": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz",
-					"integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==",
-					"dev": true
-				},
 				"url-regex": {
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/url-regex/-/url-regex-5.0.0.tgz",
@@ -18943,12 +19135,6 @@
 				}
 			}
 		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-			"dev": true
-		},
 		"is-what": {
 			"version": "3.3.1",
 			"resolved": "https://registry.npmjs.org/is-what/-/is-what-3.3.1.tgz",
@@ -19046,16 +19232,10 @@
 				"iterate-iterator": "^1.0.1"
 			}
 		},
-		"java-properties": {
-			"version": "0.2.10",
-			"resolved": "https://registry.npmjs.org/java-properties/-/java-properties-0.2.10.tgz",
-			"integrity": "sha512-CpKJh9VRNhS+XqZtg1UMejETGEiqwCGDC/uwPEEQwc2nfdbSm73SIE29TplG2gLYuBOOTNDqxzG6A9NtEPLt0w==",
-			"dev": true
-		},
 		"jest-worker": {
-			"version": "25.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
-			"integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
+			"version": "25.4.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz",
+			"integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==",
 			"dev": true,
 			"requires": {
 				"merge-stream": "^2.0.0",
@@ -19558,9 +19738,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				},
 				"dotenv": {
@@ -20472,6 +20652,16 @@
 			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
 			"integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po="
 		},
+		"loglevelnext": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz",
+			"integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
+			"dev": true,
+			"requires": {
+				"es6-symbol": "^3.1.1",
+				"object.assign": "^4.1.0"
+			}
+		},
 		"long": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
@@ -20502,10 +20692,21 @@
 			}
 		},
 		"lower-case": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-			"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-			"dev": true
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
+			"integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.10.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "1.11.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+					"dev": true
+				}
+			}
 		},
 		"lowlight": {
 			"version": "1.11.0",
@@ -20591,12 +20792,6 @@
 			"integrity": "sha512-0ekbPHqxcdRcmjZ43TkRuejK5rXgMF1OjG4FVnVHgCvOcjrexaSX7a0dfAvqhOm1qWPgjYnXtmz3cHpHW5ZewA==",
 			"dev": true
 		},
-		"mamacro": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-			"integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-			"dev": true
-		},
 		"map-age-cleaner": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -20666,9 +20861,9 @@
 			"dev": true
 		},
 		"markdown-to-jsx": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-6.11.0.tgz",
-			"integrity": "sha512-RH7LCJQ4RFmPqVeZEesKaO1biRzB/k4utoofmTCp3Eiw6D7qfvK8fzZq/2bjEJAtVkfPrM5SMt5APGf2rnaKMg==",
+			"version": "6.11.1",
+			"resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-6.11.1.tgz",
+			"integrity": "sha512-FdtDAv8d9/tjyHxdCvWZxxOgK2icwzBkTq/dPk+XlQ2B+DYDcwE89FWGzT92erXQ0CQR/bQbpNK3loNYhYL70g==",
 			"dev": true,
 			"requires": {
 				"prop-types": "^15.6.2",
@@ -21086,7 +21281,8 @@
 			"dependencies": {
 				"asn1.js": {
 					"version": "4.10.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+					"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 					"requires": {
 						"bn.js": "^4.0.0",
 						"inherits": "^2.0.1",
@@ -21095,14 +21291,16 @@
 				},
 				"assert": {
 					"version": "1.4.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+					"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
 					"requires": {
 						"util": "0.10.3"
 					},
 					"dependencies": {
 						"util": {
 							"version": "0.10.3",
-							"bundled": true,
+							"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+							"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
 							"requires": {
 								"inherits": "2.0.1"
 							}
@@ -21111,19 +21309,23 @@
 				},
 				"base64-js": {
 					"version": "1.3.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
 				},
 				"bn.js": {
 					"version": "4.11.8",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+					"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
 				},
 				"brorand": {
 					"version": "1.1.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+					"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
 				},
 				"browserify-aes": {
 					"version": "1.2.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+					"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 					"requires": {
 						"buffer-xor": "^1.0.3",
 						"cipher-base": "^1.0.0",
@@ -21135,7 +21337,8 @@
 				},
 				"browserify-cipher": {
 					"version": "1.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+					"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 					"requires": {
 						"browserify-aes": "^1.0.4",
 						"browserify-des": "^1.0.0",
@@ -21144,7 +21347,8 @@
 				},
 				"browserify-des": {
 					"version": "1.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+					"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 					"requires": {
 						"cipher-base": "^1.0.1",
 						"des.js": "^1.0.0",
@@ -21154,7 +21358,8 @@
 				},
 				"browserify-rsa": {
 					"version": "4.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+					"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
 					"requires": {
 						"bn.js": "^4.1.0",
 						"randombytes": "^2.0.1"
@@ -21162,7 +21367,8 @@
 				},
 				"browserify-sign": {
 					"version": "4.0.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+					"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
 					"requires": {
 						"bn.js": "^4.1.1",
 						"browserify-rsa": "^4.0.0",
@@ -21175,14 +21381,16 @@
 				},
 				"browserify-zlib": {
 					"version": "0.2.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+					"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 					"requires": {
 						"pako": "~1.0.5"
 					}
 				},
 				"buffer": {
 					"version": "5.2.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+					"integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
 					"requires": {
 						"base64-js": "^1.0.2",
 						"ieee754": "^1.1.4"
@@ -21190,15 +21398,18 @@
 				},
 				"buffer-xor": {
 					"version": "1.0.3",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+					"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
 				},
 				"builtin-status-codes": {
 					"version": "3.0.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+					"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
 				},
 				"cipher-base": {
 					"version": "1.0.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+					"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 					"requires": {
 						"inherits": "^2.0.1",
 						"safe-buffer": "^5.0.1"
@@ -21206,22 +21417,26 @@
 				},
 				"console-browserify": {
 					"version": "1.1.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+					"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
 					"requires": {
 						"date-now": "^0.1.4"
 					}
 				},
 				"constants-browserify": {
 					"version": "1.0.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+					"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
 				},
 				"create-ecdh": {
 					"version": "4.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+					"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
 					"requires": {
 						"bn.js": "^4.1.0",
 						"elliptic": "^6.0.0"
@@ -21229,7 +21444,8 @@
 				},
 				"create-hash": {
 					"version": "1.2.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+					"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 					"requires": {
 						"cipher-base": "^1.0.1",
 						"inherits": "^2.0.1",
@@ -21240,7 +21456,8 @@
 				},
 				"create-hmac": {
 					"version": "1.1.7",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+					"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 					"requires": {
 						"cipher-base": "^1.0.3",
 						"create-hash": "^1.1.0",
@@ -21252,7 +21469,8 @@
 				},
 				"crypto-browserify": {
 					"version": "3.12.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+					"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
 					"requires": {
 						"browserify-cipher": "^1.0.0",
 						"browserify-sign": "^4.0.0",
@@ -21269,11 +21487,13 @@
 				},
 				"date-now": {
 					"version": "0.1.4",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+					"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
 				},
 				"des.js": {
 					"version": "1.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+					"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
 					"requires": {
 						"inherits": "^2.0.1",
 						"minimalistic-assert": "^1.0.0"
@@ -21281,7 +21501,8 @@
 				},
 				"diffie-hellman": {
 					"version": "5.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+					"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 					"requires": {
 						"bn.js": "^4.1.0",
 						"miller-rabin": "^4.0.0",
@@ -21290,11 +21511,13 @@
 				},
 				"domain-browser": {
 					"version": "1.2.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+					"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
 				},
 				"elliptic": {
 					"version": "6.4.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+					"integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
 					"requires": {
 						"bn.js": "^4.4.0",
 						"brorand": "^1.0.1",
@@ -21307,11 +21530,13 @@
 				},
 				"events": {
 					"version": "3.0.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+					"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
 				},
 				"evp_bytestokey": {
 					"version": "1.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+					"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 					"requires": {
 						"md5.js": "^1.3.4",
 						"safe-buffer": "^5.1.1"
@@ -21319,7 +21544,8 @@
 				},
 				"hash-base": {
 					"version": "3.0.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+					"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
 					"requires": {
 						"inherits": "^2.0.1",
 						"safe-buffer": "^5.0.1"
@@ -21327,7 +21553,8 @@
 				},
 				"hash.js": {
 					"version": "1.1.7",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+					"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 					"requires": {
 						"inherits": "^2.0.3",
 						"minimalistic-assert": "^1.0.1"
@@ -21335,13 +21562,15 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"bundled": true
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"hmac-drbg": {
 					"version": "1.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+					"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
 					"requires": {
 						"hash.js": "^1.0.3",
 						"minimalistic-assert": "^1.0.0",
@@ -21350,23 +21579,28 @@
 				},
 				"https-browserify": {
 					"version": "1.0.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+					"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
 				},
 				"ieee754": {
 					"version": "1.1.13",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+					"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 				},
 				"inherits": {
 					"version": "2.0.1",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+					"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 				},
 				"md5.js": {
 					"version": "1.3.5",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+					"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 					"requires": {
 						"hash-base": "^3.0.0",
 						"inherits": "^2.0.1",
@@ -21375,7 +21609,8 @@
 				},
 				"miller-rabin": {
 					"version": "4.0.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+					"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 					"requires": {
 						"bn.js": "^4.0.0",
 						"brorand": "^1.0.1"
@@ -21383,23 +21618,28 @@
 				},
 				"minimalistic-assert": {
 					"version": "1.0.1",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+					"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 				},
 				"minimalistic-crypto-utils": {
 					"version": "1.0.1",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+					"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
 				},
 				"os-browserify": {
 					"version": "0.3.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+					"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
 				},
 				"pako": {
 					"version": "1.0.10",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+					"integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
 				},
 				"parse-asn1": {
 					"version": "5.1.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+					"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 					"requires": {
 						"asn1.js": "^4.0.0",
 						"browserify-aes": "^1.0.0",
@@ -21411,11 +21651,13 @@
 				},
 				"path-browserify": {
 					"version": "1.0.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.0.tgz",
+					"integrity": "sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g=="
 				},
 				"pbkdf2": {
 					"version": "3.0.17",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+					"integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
 					"requires": {
 						"create-hash": "^1.1.2",
 						"create-hmac": "^1.1.4",
@@ -21426,15 +21668,18 @@
 				},
 				"process": {
 					"version": "0.11.10",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+					"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 				},
 				"public-encrypt": {
 					"version": "4.0.3",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+					"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 					"requires": {
 						"bn.js": "^4.1.0",
 						"browserify-rsa": "^4.0.0",
@@ -21446,26 +21691,31 @@
 				},
 				"punycode": {
 					"version": "2.1.1",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 				},
 				"querystring": {
 					"version": "0.2.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+					"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
 				},
 				"querystring-es3": {
 					"version": "0.2.1",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+					"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
 				},
 				"randombytes": {
 					"version": "2.1.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+					"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 					"requires": {
 						"safe-buffer": "^5.1.0"
 					}
 				},
 				"randomfill": {
 					"version": "1.0.4",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+					"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 					"requires": {
 						"randombytes": "^2.0.5",
 						"safe-buffer": "^5.1.0"
@@ -21473,7 +21723,8 @@
 				},
 				"readable-stream": {
 					"version": "3.3.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
+					"integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
 					"requires": {
 						"inherits": "^2.0.3",
 						"string_decoder": "^1.1.1",
@@ -21482,13 +21733,15 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"bundled": true
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"ripemd160": {
 					"version": "2.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+					"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 					"requires": {
 						"hash-base": "^3.0.0",
 						"inherits": "^2.0.1"
@@ -21496,15 +21749,18 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 				},
 				"setimmediate": {
 					"version": "1.0.5",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+					"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
 				},
 				"sha.js": {
 					"version": "2.4.11",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+					"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 					"requires": {
 						"inherits": "^2.0.1",
 						"safe-buffer": "^5.0.1"
@@ -21512,7 +21768,8 @@
 				},
 				"stream-browserify": {
 					"version": "2.0.2",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+					"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
 					"requires": {
 						"inherits": "~2.0.1",
 						"readable-stream": "^2.0.2"
@@ -21520,7 +21777,8 @@
 					"dependencies": {
 						"readable-stream": {
 							"version": "2.3.6",
-							"bundled": true,
+							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+							"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 							"requires": {
 								"core-util-is": "~1.0.0",
 								"inherits": "~2.0.3",
@@ -21533,13 +21791,15 @@
 							"dependencies": {
 								"inherits": {
 									"version": "2.0.3",
-									"bundled": true
+									"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+									"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 								}
 							}
 						},
 						"string_decoder": {
 							"version": "1.1.1",
-							"bundled": true,
+							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+							"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 							"requires": {
 								"safe-buffer": "~5.1.0"
 							}
@@ -21548,7 +21808,8 @@
 				},
 				"stream-http": {
 					"version": "3.0.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.0.0.tgz",
+					"integrity": "sha512-JELJfd+btL9GHtxU3+XXhg9NLYrKFnhybfvRuDghtyVkOFydz3PKNT1df07AMr88qW03WHF+FSV0PySpXignCA==",
 					"requires": {
 						"builtin-status-codes": "^3.0.0",
 						"inherits": "^2.0.1",
@@ -21558,25 +21819,29 @@
 				},
 				"string_decoder": {
 					"version": "1.2.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+					"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
 					"requires": {
 						"safe-buffer": "~5.1.0"
 					}
 				},
 				"timers-browserify": {
 					"version": "2.0.10",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+					"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 					"requires": {
 						"setimmediate": "^1.0.4"
 					}
 				},
 				"tty-browserify": {
 					"version": "0.0.1",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+					"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
 				},
 				"url": {
 					"version": "0.11.0",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+					"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
 					"requires": {
 						"punycode": "1.3.2",
 						"querystring": "0.2.0"
@@ -21584,34 +21849,40 @@
 					"dependencies": {
 						"punycode": {
 							"version": "1.3.2",
-							"bundled": true
+							"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+							"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
 						}
 					}
 				},
 				"util": {
 					"version": "0.11.1",
-					"bundled": true,
+					"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+					"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
 					"requires": {
 						"inherits": "2.0.3"
 					},
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"bundled": true
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 				},
 				"vm-browserify": {
 					"version": "1.1.0",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+					"integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
 				},
 				"xtend": {
 					"version": "4.0.1",
-					"bundled": true
+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 				}
 			}
 		},
@@ -22402,9 +22673,9 @@
 			"optional": true
 		},
 		"needle": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/needle/-/needle-2.3.2.tgz",
-			"integrity": "sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==",
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
+			"integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
 			"requires": {
 				"debug": "^3.2.6",
 				"iconv-lite": "^0.4.4",
@@ -22443,18 +22714,33 @@
 			"integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
 			"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=="
 		},
 		"no-case": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-			"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
+			"integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
 			"dev": true,
 			"requires": {
-				"lower-case": "^1.1.1"
+				"lower-case": "^2.0.1",
+				"tslib": "^1.10.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "1.11.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+					"dev": true
+				}
 			}
 		},
 		"node-abi": {
@@ -22465,12 +22751,6 @@
 				"semver": "^5.4.1"
 			}
 		},
-		"node-ask": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/node-ask/-/node-ask-1.0.1.tgz",
-			"integrity": "sha1-yqoQdsxY4DZCZ6CQPj6t+sFYOWs=",
-			"dev": true
-		},
 		"node-dir": {
 			"version": "0.1.17",
 			"resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
@@ -22646,21 +22926,10 @@
 				}
 			}
 		},
-		"node-loggly-bulk": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/node-loggly-bulk/-/node-loggly-bulk-2.2.4.tgz",
-			"integrity": "sha512-DfhtsDfkSBU6Dp1zvK+H1MgHRcA2yb4z07ctyA6uo+bNwKtv1exhohN910zcWNkdSYq1TImCq+O+3bOTuYHvmQ==",
-			"dev": true,
-			"requires": {
-				"json-stringify-safe": "5.0.x",
-				"moment": "^2.18.1",
-				"request": ">=2.76.0 <3.0.0"
-			}
-		},
 		"node-pre-gyp": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz",
-			"integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==",
+			"version": "0.13.0",
+			"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz",
+			"integrity": "sha512-Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ==",
 			"requires": {
 				"detect-libc": "^1.0.2",
 				"mkdirp": "^0.5.1",
@@ -22671,7 +22940,7 @@
 				"rc": "^1.2.7",
 				"rimraf": "^2.6.1",
 				"semver": "^5.3.0",
-				"tar": "^4.4.2"
+				"tar": "^4"
 			},
 			"dependencies": {
 				"nopt": {
@@ -22777,6 +23046,43 @@
 					"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
 					"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
 					"optional": true
+				},
+				"node-pre-gyp": {
+					"version": "0.14.0",
+					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz",
+					"integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==",
+					"optional": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.1",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.2.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4.4.2"
+					}
+				},
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+					"optional": true,
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"rimraf": {
+					"version": "2.7.1",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"optional": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
 				}
 			}
 		},
@@ -22802,12 +23108,6 @@
 					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
 					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
 					"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
 				}
 			}
 		},
@@ -22978,31 +23278,94 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"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.7.0",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+			"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+		},
+		"object-is": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
+			"integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+			"dev": true,
+			"requires": {
+				"define-properties": "^1.1.3",
+				"es-abstract": "^1.17.5"
+			},
+			"dependencies": {
+				"es-abstract": {
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+					"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.1.5",
+						"is-regex": "^1.0.5",
+						"object-inspect": "^1.7.0",
+						"object-keys": "^1.1.1",
+						"object.assign": "^4.1.0",
+						"string.prototype.trimleft": "^2.1.1",
+						"string.prototype.trimright": "^2.1.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"
 					}
 				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+				"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
+				},
+				"is-callable": {
+					"version": "1.1.5",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+					"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+					"dev": true
+				},
+				"is-regex": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+					"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"has": "^1.0.3"
 					}
+				},
+				"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-inspect": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-			"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
-		},
-		"object-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
-			"integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
-			"dev": true
-		},
 		"object-keys": {
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
@@ -23189,9 +23552,9 @@
 			}
 		},
 		"open": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/open/-/open-7.0.2.tgz",
-			"integrity": "sha512-70E/pFTPr7nZ9nLDPNTcj3IVqnNvKuP4VsBmoKV9YGTnChe0mlS3C4qM7qKarhZ8rGaHKLfo+vBTHXDp6ZSyLQ==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/open/-/open-7.0.3.tgz",
+			"integrity": "sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==",
 			"dev": true,
 			"requires": {
 				"is-docker": "^2.0.0",
@@ -23206,12 +23569,6 @@
 				}
 			}
 		},
-		"openurl": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz",
-			"integrity": "sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=",
-			"dev": true
-		},
 		"optimist": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
@@ -23388,12 +23745,21 @@
 			}
 		},
 		"param-case": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-			"integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz",
+			"integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==",
 			"dev": true,
 			"requires": {
-				"no-case": "^2.2.0"
+				"dot-case": "^3.0.3",
+				"tslib": "^1.10.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "1.11.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+					"dev": true
+				}
 			}
 		},
 		"parent-module": {
@@ -23466,29 +23832,10 @@
 				"tslib": "^1.10.0"
 			},
 			"dependencies": {
-				"lower-case": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
-					"integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.10.0"
-					}
-				},
-				"no-case": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
-					"integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
-					"dev": true,
-					"requires": {
-						"lower-case": "^2.0.1",
-						"tslib": "^1.10.0"
-					}
-				},
 				"tslib": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz",
-					"integrity": "sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==",
+					"version": "1.11.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
 					"dev": true
 				}
 			}
@@ -23635,77 +23982,6 @@
 				"pinkie": "^2.0.0"
 			}
 		},
-		"pino": {
-			"version": "4.10.2",
-			"resolved": "https://registry.npmjs.org/pino/-/pino-4.10.2.tgz",
-			"integrity": "sha512-hNNDgOju2UvK4iKqXR3ZwEutoOujBRN9jfQgty/X4B3q1QOqpWqvmVn+GT/a20o8Jw5Wd7VkGJAdgFQg55a+mw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.3.0",
-				"fast-json-parse": "^1.0.0",
-				"fast-safe-stringify": "^1.2.1",
-				"flatstr": "^1.0.4",
-				"pump": "^1.0.3",
-				"quick-format-unescaped": "^1.1.1",
-				"split2": "^2.2.0"
-			},
-			"dependencies": {
-				"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"
-					}
-				},
-				"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"
-					}
-				},
-				"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
-				},
-				"pump": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
-					"integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"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"
-					}
-				}
-			}
-		},
 		"pinyin": {
 			"version": "2.9.0",
 			"resolved": "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz",
@@ -23875,12 +24151,29 @@
 			}
 		},
 		"polished": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/polished/-/polished-3.4.4.tgz",
-			"integrity": "sha512-x9PKeExyI9AhWrJP3Q57I1k7GInujjiVBJMPFmycj9hX1yCOo/X9eu9eZwxgOziiXge3WbFQ5XOmkzunOntBSA==",
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/polished/-/polished-3.5.2.tgz",
+			"integrity": "sha512-vWoRDg3gY5RQBtUfcj9MRN10VCIf4EkdUikGxyXItg2Hnwk+eIVtdBiLajN0ldFeT3Vq4r/QNbjrQdhqBKrTug==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.6.3"
+				"@babel/runtime": "^7.8.7"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.9.2",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+					"integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+					"dev": true,
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				},
+				"regenerator-runtime": {
+					"version": "0.13.5",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+					"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+					"dev": true
+				}
 			}
 		},
 		"pop-iterate": {
@@ -23991,9 +24284,9 @@
 			}
 		},
 		"postcss-custom-properties": {
-			"version": "9.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-9.0.2.tgz",
-			"integrity": "sha512-WHaQrEp3gJ6mgxBA4mGJKW6DSVfy2IFnKPFAb2IEulgxGUW8nWp1NkOD/rWR6e2uIuAdnTa0LXSupST7daniAw==",
+			"version": "9.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-9.1.1.tgz",
+			"integrity": "sha512-GVu+j7vwMTKUGhGXckYAFAAG5tTJUkSt8LuSyimtZdVVmdAEZYYqserkAgX8vwMhgGDPA4vJtWt7VgFxgiooDA==",
 			"dev": true,
 			"requires": {
 				"postcss": "^7.0.17",
@@ -24047,9 +24340,9 @@
 					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.23.tgz",
-					"integrity": "sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==",
+					"version": "7.0.29",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz",
+					"integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -24495,9 +24788,9 @@
 			}
 		},
 		"postcss-modules-scope": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz",
-			"integrity": "sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+			"integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
 			"dev": true,
 			"requires": {
 				"postcss": "^7.0.6",
@@ -24584,9 +24877,9 @@
 					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.23.tgz",
-					"integrity": "sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==",
+					"version": "7.0.29",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz",
+					"integrity": "sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -24776,30 +25069,17 @@
 			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
 		},
 		"postcss-values-parser": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-3.0.5.tgz",
-			"integrity": "sha512-0N6EUBx2Vzl0c9LQipuus90EkVh7saBQFRhgAYpHHcDCIvxRt+K/q0zwcIYtDQVNs5Y9NGqei4AuCEvAOsePfQ==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-3.2.1.tgz",
+			"integrity": "sha512-SQ7/88VE9LhJh9gc27/hqnSU/aZaREVJcRVccXBmajgP2RkjdJzNyH/a9GCVMI5nsRhT0jC5HpUMwfkz81DVVg==",
 			"dev": true,
 			"requires": {
 				"color-name": "^1.1.4",
-				"is-number": "^7.0.0",
 				"is-url-superb": "^3.0.0",
 				"postcss": "^7.0.5",
 				"url-regex": "^5.0.0"
 			},
 			"dependencies": {
-				"ip-regex": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz",
-					"integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==",
-					"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
-				},
 				"url-regex": {
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/url-regex/-/url-regex-5.0.0.tgz",
@@ -24972,9 +25252,9 @@
 			"dev": true
 		},
 		"prismjs": {
-			"version": "1.19.0",
-			"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.19.0.tgz",
-			"integrity": "sha512-IVFtbW9mCWm9eOIaEkNyo2Vl4NnEifis2GQ7/MLRG5TQe6t+4Sj9J5QWI9i3v+SS43uZBlCAOn+zYTVYQcPXJw==",
+			"version": "1.20.0",
+			"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz",
+			"integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==",
 			"dev": true,
 			"requires": {
 				"clipboard": "^2.0.0"
@@ -25003,16 +25283,6 @@
 			"integrity": "sha512-/OLz5F9beZUWwSHZDreXgap1XShX6W+DCHQCqwCF7uZ88s6uTlD2cR3JBE77SegCmNtb1Idst+NfmwcdU6KVhw==",
 			"dev": true
 		},
-		"progress-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-2.0.0.tgz",
-			"integrity": "sha1-+sY6Cz0R3qy7CWmrzJOyFLzhntU=",
-			"dev": true,
-			"requires": {
-				"speedometer": "~1.0.0",
-				"through2": "~2.0.3"
-			}
-		},
 		"prom-client": {
 			"version": "12.0.0",
 			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz",
@@ -25058,9 +25328,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -25128,9 +25398,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -25226,9 +25496,9 @@
 			},
 			"dependencies": {
 				"@types/node": {
-					"version": "10.17.16",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.16.tgz",
-					"integrity": "sha512-A4283YSA1OmnIivcpy/4nN86YlnKRiQp8PYwI2KdPCONEBN093QTb0gCtERtkLyVNGKKIGazTZ2nAmVzQU51zA=="
+					"version": "10.17.14",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.14.tgz",
+					"integrity": "sha512-G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw=="
 				}
 			}
 		},
@@ -25338,9 +25608,9 @@
 			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
 		},
 		"query-string": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.11.0.tgz",
-			"integrity": "sha512-jS+me8X3OEGFTsF6kF+vUUMFG/d3WUCvD7bHhfZP5784nOq1pjj8yau/u86nfOncmcN6ZkSWKWkKAvv/MGxzLA==",
+			"version": "6.10.1",
+			"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.10.1.tgz",
+			"integrity": "sha512-SHTUV6gDlgMXg/AQUuLpTiBtW/etZ9JT6k6RCtCyqADquApLX0Aq5oK/s5UeTUAWBG50IExjIr587GqfXRfM4A==",
 			"requires": {
 				"decode-uri-component": "^0.2.0",
 				"split-on-first": "^1.0.0",
@@ -25371,15 +25641,6 @@
 				"dbly-linked-list": "0.2.0"
 			}
 		},
-		"quick-format-unescaped": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz",
-			"integrity": "sha1-DKWB3jF0vs7yWsPC6JVjQjgdtpg=",
-			"dev": true,
-			"requires": {
-				"fast-safe-stringify": "^1.0.8"
-			}
-		},
 		"quick-lru": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
@@ -25492,9 +25753,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -25516,12 +25777,12 @@
 					"dev": true
 				},
 				"schema-utils": {
-					"version": "2.6.4",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-					"integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+					"version": "2.6.6",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+					"integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.10.2",
+						"ajv": "^6.12.0",
 						"ajv-keywords": "^3.4.1"
 					}
 				}
@@ -25546,14 +25807,13 @@
 			}
 		},
 		"react": {
-			"version": "16.8.6",
-			"resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
-			"integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
+			"version": "16.13.1",
+			"resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
+			"integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
 			"requires": {
 				"loose-envify": "^1.1.0",
 				"object-assign": "^4.1.1",
-				"prop-types": "^15.6.2",
-				"scheduler": "^0.13.6"
+				"prop-types": "^15.6.2"
 			}
 		},
 		"react-clientside-effect": {
@@ -25705,9 +25965,9 @@
 					}
 				},
 				"electron-to-chromium": {
-					"version": "1.3.360",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz",
-					"integrity": "sha512-RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==",
+					"version": "1.3.414",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.414.tgz",
+					"integrity": "sha512-UfxhIvED++qLwWrAq9uYVcqF8FdeV9sU2S7qhiHYFODxzXRrd1GZRl/PjITHsTEejgibcWDraD8TQqoHb1aCBQ==",
 					"dev": true
 				},
 				"figures": {
@@ -25808,9 +26068,9 @@
 					"dev": true
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"mute-stream": {
@@ -25820,13 +26080,10 @@
 					"dev": true
 				},
 				"node-releases": {
-					"version": "1.1.50",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz",
-					"integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.3.0"
-					}
+					"version": "1.1.53",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
+					"integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+					"dev": true
 				},
 				"onetime": {
 					"version": "2.0.1",
@@ -25856,12 +26113,6 @@
 						"signal-exit": "^3.0.2"
 					}
 				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				},
 				"string-width": {
 					"version": "2.1.1",
 					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -25912,9 +26163,9 @@
 			}
 		},
 		"react-docgen": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.2.1.tgz",
-			"integrity": "sha512-3nvsiDKN/KIlgRyHCdkLrm8ajjSMZ4NIHuwYTAdBvQF3O7A2tmCBB3gwTjJ4zXH8aUpIjFwlVIjffzkJHIZ5/Q==",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.3.0.tgz",
+			"integrity": "sha512-hUrv69k6nxazOuOmdGeOpC/ldiKy7Qj/UFpxaQi0eDMrUFUTIPGtY5HJu7BggSmiyAMfREaESbtBL9UzdQ+hyg==",
 			"dev": true,
 			"requires": {
 				"@babel/core": "^7.7.5",
@@ -25937,22 +26188,23 @@
 					}
 				},
 				"@babel/core": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz",
-					"integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==",
+					"version": "7.9.0",
+					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
+					"integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/generator": "^7.8.4",
-						"@babel/helpers": "^7.8.4",
-						"@babel/parser": "^7.8.4",
-						"@babel/template": "^7.8.3",
-						"@babel/traverse": "^7.8.4",
-						"@babel/types": "^7.8.3",
+						"@babel/generator": "^7.9.0",
+						"@babel/helper-module-transforms": "^7.9.0",
+						"@babel/helpers": "^7.9.0",
+						"@babel/parser": "^7.9.0",
+						"@babel/template": "^7.8.6",
+						"@babel/traverse": "^7.9.0",
+						"@babel/types": "^7.9.0",
 						"convert-source-map": "^1.7.0",
 						"debug": "^4.1.0",
 						"gensync": "^1.0.0-beta.1",
-						"json5": "^2.1.0",
+						"json5": "^2.1.2",
 						"lodash": "^4.17.13",
 						"resolve": "^1.3.2",
 						"semver": "^5.4.1",
@@ -25960,26 +26212,26 @@
 					}
 				},
 				"@babel/generator": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz",
-					"integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
+					"integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
 					"dev": true,
 					"requires": {
-						"@babel/types": "^7.8.3",
+						"@babel/types": "^7.9.5",
 						"jsesc": "^2.5.1",
 						"lodash": "^4.17.13",
 						"source-map": "^0.5.0"
 					}
 				},
 				"@babel/helper-function-name": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
-					"integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+					"integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
 					"dev": true,
 					"requires": {
 						"@babel/helper-get-function-arity": "^7.8.3",
 						"@babel/template": "^7.8.3",
-						"@babel/types": "^7.8.3"
+						"@babel/types": "^7.9.5"
 					}
 				},
 				"@babel/helper-get-function-arity": {
@@ -25991,6 +26243,70 @@
 						"@babel/types": "^7.8.3"
 					}
 				},
+				"@babel/helper-member-expression-to-functions": {
+					"version": "7.8.3",
+					"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+					"integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
+					"dev": true,
+					"requires": {
+						"@babel/types": "^7.8.3"
+					}
+				},
+				"@babel/helper-module-imports": {
+					"version": "7.8.3",
+					"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+					"integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
+					"dev": true,
+					"requires": {
+						"@babel/types": "^7.8.3"
+					}
+				},
+				"@babel/helper-module-transforms": {
+					"version": "7.9.0",
+					"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
+					"integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
+					"dev": true,
+					"requires": {
+						"@babel/helper-module-imports": "^7.8.3",
+						"@babel/helper-replace-supers": "^7.8.6",
+						"@babel/helper-simple-access": "^7.8.3",
+						"@babel/helper-split-export-declaration": "^7.8.3",
+						"@babel/template": "^7.8.6",
+						"@babel/types": "^7.9.0",
+						"lodash": "^4.17.13"
+					}
+				},
+				"@babel/helper-optimise-call-expression": {
+					"version": "7.8.3",
+					"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+					"integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
+					"dev": true,
+					"requires": {
+						"@babel/types": "^7.8.3"
+					}
+				},
+				"@babel/helper-replace-supers": {
+					"version": "7.8.6",
+					"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+					"integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+					"dev": true,
+					"requires": {
+						"@babel/helper-member-expression-to-functions": "^7.8.3",
+						"@babel/helper-optimise-call-expression": "^7.8.3",
+						"@babel/traverse": "^7.8.6",
+						"@babel/types": "^7.8.6"
+					}
+				},
+				"@babel/helper-simple-access": {
+					"version": "7.8.3",
+					"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+					"integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+					"dev": true,
+					"requires": {
+						"@babel/template": "^7.8.3",
+						"@babel/types": "^7.8.3"
+					}
+				},
 				"@babel/helper-split-export-declaration": {
 					"version": "7.8.3",
 					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
@@ -26001,68 +26317,68 @@
 					}
 				},
 				"@babel/helpers": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
-					"integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
+					"version": "7.9.2",
+					"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
+					"integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
 					"dev": true,
 					"requires": {
 						"@babel/template": "^7.8.3",
-						"@babel/traverse": "^7.8.4",
-						"@babel/types": "^7.8.3"
+						"@babel/traverse": "^7.9.0",
+						"@babel/types": "^7.9.0"
 					}
 				},
 				"@babel/highlight": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-					"integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+					"version": "7.9.0",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+					"integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
 					"dev": true,
 					"requires": {
+						"@babel/helper-validator-identifier": "^7.9.0",
 						"chalk": "^2.0.0",
-						"esutils": "^2.0.2",
 						"js-tokens": "^4.0.0"
 					}
 				},
 				"@babel/parser": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz",
-					"integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==",
+					"version": "7.9.4",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+					"integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
 					"dev": true
 				},
 				"@babel/template": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
-					"integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==",
+					"version": "7.8.6",
+					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+					"integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/parser": "^7.8.3",
-						"@babel/types": "^7.8.3"
+						"@babel/parser": "^7.8.6",
+						"@babel/types": "^7.8.6"
 					}
 				},
 				"@babel/traverse": {
-					"version": "7.8.4",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz",
-					"integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
+					"integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/generator": "^7.8.4",
-						"@babel/helper-function-name": "^7.8.3",
+						"@babel/generator": "^7.9.5",
+						"@babel/helper-function-name": "^7.9.5",
 						"@babel/helper-split-export-declaration": "^7.8.3",
-						"@babel/parser": "^7.8.4",
-						"@babel/types": "^7.8.3",
+						"@babel/parser": "^7.9.0",
+						"@babel/types": "^7.9.5",
 						"debug": "^4.1.0",
 						"globals": "^11.1.0",
 						"lodash": "^4.17.13"
 					}
 				},
 				"@babel/types": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
-					"integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
+					"version": "7.9.5",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+					"integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
 					"dev": true,
 					"requires": {
-						"esutils": "^2.0.2",
+						"@babel/helper-validator-identifier": "^7.9.5",
 						"lodash": "^4.17.13",
 						"to-fast-properties": "^2.0.0"
 					}
@@ -26077,9 +26393,9 @@
 					}
 				},
 				"ast-types": {
-					"version": "0.13.2",
-					"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.2.tgz",
-					"integrity": "sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==",
+					"version": "0.13.3",
+					"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz",
+					"integrity": "sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==",
 					"dev": true
 				},
 				"chalk": {
@@ -26142,12 +26458,12 @@
 					}
 				},
 				"json5": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-					"integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+					"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.0"
+						"minimist": "^1.2.5"
 					}
 				},
 				"lodash": {
@@ -26157,9 +26473,9 @@
 					"dev": true
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"ms": {
@@ -26194,6 +26510,63 @@
 				}
 			}
 		},
+		"react-docgen-typescript": {
+			"version": "1.16.3",
+			"resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-1.16.3.tgz",
+			"integrity": "sha512-xYISCr8mFKfV15talgpicOF/e0DudTucf1BXzu/HteMF4RM3KsfxXkhWybZC3LTVbYrdbammDV26Z4Yuk+MoWg==",
+			"dev": true
+		},
+		"react-docgen-typescript-loader": {
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/react-docgen-typescript-loader/-/react-docgen-typescript-loader-3.7.2.tgz",
+			"integrity": "sha512-fNzUayyUGzSyoOl7E89VaPKJk9dpvdSgyXg81cUkwy0u+NBvkzQG3FC5WBIlXda0k/iaxS+PWi+OC+tUiGxzPA==",
+			"dev": true,
+			"requires": {
+				"@webpack-contrib/schema-utils": "^1.0.0-beta.0",
+				"loader-utils": "^1.2.3",
+				"react-docgen-typescript": "^1.15.0"
+			},
+			"dependencies": {
+				"big.js": {
+					"version": "5.2.2",
+					"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+					"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+					"dev": true
+				},
+				"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"
+					}
+				},
+				"minimist": {
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+					"dev": true
+				}
+			}
+		},
 		"react-dom": {
 			"version": "16.8.6",
 			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz",
@@ -26206,9 +26579,9 @@
 			}
 		},
 		"react-draggable": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.2.0.tgz",
-			"integrity": "sha512-5wFq//gEoeTYprnd4ze8GrFc+Rbnx+9RkOMR3vk4EbWxj02U6L6T3yrlKeiw4X5CtjD2ma2+b3WujghcXNRzkw==",
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.3.1.tgz",
+			"integrity": "sha512-m8QeV+eIi7LhD5mXoLqDzLbokc6Ncwa0T34fF6uJzWSs4vc4fdZI/XGqHYoEn91T8S6qO+BSXslONh7Jz9VPQQ==",
 			"dev": true,
 			"requires": {
 				"classnames": "^2.2.5",
@@ -26216,25 +26589,25 @@
 			}
 		},
 		"react-error-overlay": {
-			"version": "6.0.6",
-			"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.6.tgz",
-			"integrity": "sha512-Yzpno3enVzSrSCnnljmr4b/2KUQSMZaPuqmS26t9k4nW7uwJk6STWmH9heNjPuvqUTO3jOSPkHoKgO4+Dw7uIw==",
+			"version": "6.0.7",
+			"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
+			"integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==",
 			"dev": true
 		},
 		"react-fast-compare": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz",
-			"integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.0.1.tgz",
+			"integrity": "sha512-C5vP0J644ofZGd54P8++O7AvrqMEbrGf8Ue0eAUJLJyw168dAX2aiYyX/zcY/eSNwO0IDjsKUaLE6n83D+TnEg==",
 			"dev": true
 		},
 		"react-focus-lock": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.2.1.tgz",
-			"integrity": "sha512-47g0xYcCTZccdzKRGufepY8oZ3W1Qg+2hn6u9SHZ0zUB6uz/4K4xJe7yYFNZ1qT6m+2JDm82F6QgKeBTbjW4PQ==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.3.1.tgz",
+			"integrity": "sha512-j15cWLPzH0gOmRrUg01C09Peu8qbcdVqr6Bjyfxj80cNZmH+idk/bNBYEDSmkAtwkXI+xEYWSmHYqtaQhZ8iUQ==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.0.0",
-				"focus-lock": "^0.6.6",
+				"focus-lock": "^0.6.7",
 				"prop-types": "^15.6.2",
 				"react-clientside-effect": "^1.2.2",
 				"use-callback-ref": "^1.2.1",
@@ -26242,16 +26615,33 @@
 			}
 		},
 		"react-helmet-async": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.4.tgz",
-			"integrity": "sha512-KTGHE9sz8N7+fCkZ2a3vzXH9eIkiTNhL2NhKR7XzzQl3WsGlCHh76arauJUIiGdfhjeMp7DY7PkASAmYFXeJYg==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.5.tgz",
+			"integrity": "sha512-nqGA5a1HRZsw1lzDn+bYuUN2FyHRiY+DgjRVhEOKVBDTrrqJCpCIOuY/IRHdobr+KD1gGTP0WabZsTrIHnFKJA==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.3.4",
+				"@babel/runtime": "^7.9.2",
 				"invariant": "^2.2.4",
 				"prop-types": "^15.7.2",
-				"react-fast-compare": "^2.0.4",
+				"react-fast-compare": "^3.0.1",
 				"shallowequal": "^1.1.0"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.9.2",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+					"integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+					"dev": true,
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				},
+				"regenerator-runtime": {
+					"version": "0.13.5",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+					"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+					"dev": true
+				}
 			}
 		},
 		"react-hotkeys": {
@@ -26273,15 +26663,14 @@
 			}
 		},
 		"react-inspector": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-4.0.0.tgz",
-			"integrity": "sha512-heh4THBeJg0HLYO/3VBAOaFPkdEHoTZq9VFgP4rOzGw/jyqdVd5spfXSl3LNB1fwrwaWef75Q1hCuwlY4GaKjQ==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-4.0.1.tgz",
+			"integrity": "sha512-xSiM6CE79JBqSj8Fzd9dWBHv57tLTH7OM57GP3VrE5crzVF3D5Khce9w1Xcw75OAbvrA0Mi2vBneR1OajKmXFg==",
 			"dev": true,
 			"requires": {
-				"babel-runtime": "^6.26.0",
+				"@babel/runtime": "^7.6.3",
 				"is-dom": "^1.0.9",
-				"prop-types": "^15.6.1",
-				"storybook-chromatic": "^2.2.2"
+				"prop-types": "^15.6.1"
 			}
 		},
 		"react-is": {
@@ -26338,19 +26727,36 @@
 			}
 		},
 		"react-popper-tooltip": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-2.10.1.tgz",
-			"integrity": "sha512-cib8bKiyYcrIlHo9zXx81G0XvARfL8Jt+xum709MFCgQa3HTqTi4au3iJ9tm7vi7WU7ngnqbpWkMinBOtwo+IQ==",
+			"version": "2.11.1",
+			"resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-2.11.1.tgz",
+			"integrity": "sha512-04A2f24GhyyMicKvg/koIOQ5BzlrRbKiAgP6L+Pdj1MVX3yJ1NeZ8+EidndQsbejFT55oW1b++wg2Z8KlAyhfQ==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.7.4",
-				"react-popper": "^1.3.6"
+				"@babel/runtime": "^7.9.2",
+				"react-popper": "^1.3.7"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.9.2",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+					"integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+					"dev": true,
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				},
+				"regenerator-runtime": {
+					"version": "0.13.5",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+					"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+					"dev": true
+				}
 			}
 		},
 		"react-select": {
-			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/react-select/-/react-select-3.0.8.tgz",
-			"integrity": "sha512-v9LpOhckLlRmXN5A6/mGGEft4FMrfaBFTGAnuPHcUgVId7Je42kTq9y0Z+Ye5z8/j0XDT3zUqza8gaRaI1PZIg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/react-select/-/react-select-3.1.0.tgz",
+			"integrity": "sha512-wBFVblBH1iuCBprtpyGtd1dGMadsG36W5/t2Aj8OE6WbByDg5jIFyT7X5gT+l0qmT5TqWhxX+VsKJvCEl2uL9g==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.4.4",
@@ -26360,7 +26766,7 @@
 				"memoize-one": "^5.0.0",
 				"prop-types": "^15.6.0",
 				"react-input-autosize": "^2.2.2",
-				"react-transition-group": "^2.2.1"
+				"react-transition-group": "^4.3.0"
 			}
 		},
 		"react-sizeme": {
@@ -26407,15 +26813,15 @@
 			}
 		},
 		"react-transition-group": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
-			"integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz",
+			"integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==",
 			"dev": true,
 			"requires": {
-				"dom-helpers": "^3.4.0",
+				"@babel/runtime": "^7.5.5",
+				"dom-helpers": "^5.0.1",
 				"loose-envify": "^1.4.0",
-				"prop-types": "^15.6.2",
-				"react-lifecycles-compat": "^3.0.4"
+				"prop-types": "^15.6.2"
 			}
 		},
 		"reactcss": {
@@ -26999,24 +27405,12 @@
 				"tough-cookie": ">=2.3.3"
 			}
 		},
-		"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-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
 			"dev": true
 		},
-		"require-main-filename": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-			"integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-			"dev": true
-		},
 		"require_optional": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
@@ -27240,9 +27634,9 @@
 			},
 			"dependencies": {
 				"async": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-					"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/async/-/async-3.1.1.tgz",
+					"integrity": "sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g=="
 				}
 			}
 		},
@@ -27708,9 +28102,9 @@
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.4",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+					"version": "3.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
@@ -27914,15 +28308,6 @@
 						"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",
@@ -27947,9 +28332,9 @@
 			"dev": true
 		},
 		"source-map": {
-			"version": "0.5.6",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-			"integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
 		},
 		"source-map-resolve": {
 			"version": "0.5.2",
@@ -28051,12 +28436,6 @@
 			"integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
 			"dev": true
 		},
-		"speedometer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz",
-			"integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI=",
-			"dev": true
-		},
 		"split-array-stream": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz",
@@ -28079,15 +28458,6 @@
 				"extend-shallow": "^3.0.0"
 			}
 		},
-		"split2": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-			"integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-			"dev": true,
-			"requires": {
-				"through2": "^2.0.2"
-			}
-		},
 		"sprintf-js": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
@@ -28172,86 +28542,11 @@
 			"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
 		},
 		"store2": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/store2/-/store2-2.10.0.tgz",
-			"integrity": "sha512-tWEpK0snS2RPUq1i3R6OahfJNjWCQYNxq0+by1amCSuw0mXtymJpzmZIeYpA1UAa+7B0grCpNYIbDcd7AgTbFg==",
+			"version": "2.11.1",
+			"resolved": "https://registry.npmjs.org/store2/-/store2-2.11.1.tgz",
+			"integrity": "sha512-llZqXAXjG2E4FvWsZxFmBDfh6kqQuGFZm64TX23qW02Hf4dyElhDEbYx1IIVTEMKWrrDnDA9oqOjY8WHo2NgcA==",
 			"dev": true
 		},
-		"storybook-chromatic": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/storybook-chromatic/-/storybook-chromatic-2.2.2.tgz",
-			"integrity": "sha512-n79eX0MQEHzDCnXqgOjvDOQ1xfBOTyQHy1RNxEMQvZolfAle8YVS0NnRpcW0xh/Ye621Iote3dwFI3uQmlcqPw==",
-			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.3.1",
-				"@chromaui/localtunnel": "1.10.1",
-				"async-retry": "^1.1.4",
-				"commander": "^2.9.0",
-				"debug": "^3.0.1",
-				"denodeify": "^1.2.1",
-				"env-ci": "^2.1.0",
-				"fake-tag": "^1.0.0",
-				"jsdom": "^11.5.1",
-				"jsonfile": "^4.0.0",
-				"minimatch": "^3.0.4",
-				"node-ask": "^1.0.1",
-				"node-fetch": "^2.6.0",
-				"node-loggly-bulk": "^2.2.4",
-				"param-case": "^2.1.1",
-				"pino": "4.10.2",
-				"progress": "^2.0.3",
-				"progress-stream": "^2.0.0",
-				"semver": "^6.2.0",
-				"strip-color": "^0.1.0",
-				"tmp": "^0.1.0",
-				"tree-kill": "^1.1.0",
-				"uuid": "^3.3.2"
-			},
-			"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"
-					}
-				},
-				"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"
-					}
-				},
-				"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
-				},
-				"node-fetch": {
-					"version": "2.6.0",
-					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-					"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
-					"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
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
 		"stream-browserify": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
@@ -28460,9 +28755,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -28529,9 +28824,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -28638,12 +28933,6 @@
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
 			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
 		},
-		"strip-color": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/strip-color/-/strip-color-0.1.0.tgz",
-			"integrity": "sha1-EG9l09PmotlAHKwOsM6LinArT3s=",
-			"dev": true
-		},
 		"strip-dirs": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
@@ -28682,19 +28971,19 @@
 			"integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
 		},
 		"style-loader": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.3.tgz",
-			"integrity": "sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==",
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.4.tgz",
+			"integrity": "sha512-SbBHRD8fwK3pX+4UDF4ETxUF0+rCvk29LWTTI7Rt0cgsDjAj3SWM76ByTe6u2+4IlJ/WwluB7wuslWETCoPQdg==",
 			"dev": true,
 			"requires": {
-				"loader-utils": "^1.2.3",
-				"schema-utils": "^2.6.4"
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^2.6.5"
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -28728,38 +29017,38 @@
 					"dev": true
 				},
 				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+					"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.0"
+						"minimist": "^1.2.5"
 					}
 				},
 				"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==",
+					"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": {
 						"big.js": "^5.2.2",
 						"emojis-list": "^3.0.0",
-						"json5": "^1.0.1"
+						"json5": "^2.1.2"
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"schema-utils": {
-					"version": "2.6.4",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-					"integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+					"version": "2.6.6",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+					"integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.10.2",
+						"ajv": "^6.12.0",
 						"ajv-keywords": "^3.4.1"
 					}
 				}
@@ -29060,9 +29349,9 @@
 			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
 		},
 		"svg-parser": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.3.tgz",
-			"integrity": "sha512-fnCWiifNhK8i2Z7b9R5tbNahpxrRdAaQbnoxKlT2KrSCj9Kq/yBSgulCRgBJRhy1dPnSY5slg5ehPUnzpEcHlg==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
+			"integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
 			"dev": true
 		},
 		"svg-tags": {
@@ -29156,9 +29445,9 @@
 					}
 				},
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -29278,9 +29567,9 @@
 			},
 			"dependencies": {
 				"es-abstract": {
-					"version": "1.17.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+					"version": "1.17.5",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+					"integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
 					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
@@ -29843,12 +30132,6 @@
 				"punycode": "^2.1.0"
 			}
 		},
-		"tree-kill": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-			"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-			"dev": true
-		},
 		"trim": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
@@ -29936,9 +30219,9 @@
 			}
 		},
 		"ts-pnp": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz",
-			"integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+			"integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
 			"dev": true
 		},
 		"tslib": {
@@ -30065,6 +30348,12 @@
 				}
 			}
 		},
+		"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",
@@ -30111,9 +30400,9 @@
 			"integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
 		},
 		"typescript": {
-			"version": "3.8.2",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz",
-			"integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==",
+			"version": "3.7.5",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
+			"integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
 			"dev": true
 		},
 		"ua-parser-js": {
@@ -30133,9 +30422,9 @@
 			"dev": true
 		},
 		"uglify-js": {
-			"version": "3.8.0",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz",
-			"integrity": "sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==",
+			"version": "3.7.6",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.6.tgz",
+			"integrity": "sha512-yYqjArOYSxvqeeiYH2VGjZOqq6SVmhxzaPjJC1W2F9e+bqvFL9QXQ2osQuKUFjM2hGjKG2YclQnRKWQSt/nOTQ==",
 			"requires": {
 				"commander": "~2.20.3",
 				"source-map": "~0.6.1"
@@ -30517,9 +30806,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+					"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",
@@ -30579,18 +30868,18 @@
 					"dev": true
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"schema-utils": {
-					"version": "2.6.4",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-					"integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+					"version": "2.6.6",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+					"integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.10.2",
+						"ajv": "^6.12.0",
 						"ajv-keywords": "^3.4.1"
 					}
 				}
@@ -30640,9 +30929,9 @@
 			"dev": true
 		},
 		"use-callback-ref": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.1.tgz",
-			"integrity": "sha512-C3nvxh0ZpaOxs9RCnWwAJ+7bJPwQI8LHF71LzbQ3BvzH5XkdtlkMadqElGevg5bYBDFip4sAnD4m06zAKebg1w==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.3.tgz",
+			"integrity": "sha512-DPBPh1i2adCZoIArRlTuKRy7yue7QogtEnfv0AKrWsY+GA+4EKe37zhRDouNnyWMoNQFYZZRF+2dLHsWE4YvJA==",
 			"dev": true
 		},
 		"use-sidecar": {
@@ -31186,12 +31475,6 @@
 				"isexe": "^2.0.0"
 			}
 		},
-		"which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-			"dev": true
-		},
 		"which-pm-runs": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
@@ -31461,12 +31744,29 @@
 			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
 		},
 		"yaml": {
-			"version": "1.7.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.7.2.tgz",
-			"integrity": "sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw==",
+			"version": "1.9.2",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz",
+			"integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.6.3"
+				"@babel/runtime": "^7.9.2"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.9.2",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+					"integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+					"dev": true,
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				},
+				"regenerator-runtime": {
+					"version": "0.13.5",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+					"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+					"dev": true
+				}
 			}
 		},
 		"yaqrcode": {
@@ -31489,23 +31789,6 @@
 				"y18n": "^3.2.0"
 			}
 		},
-		"yargs-parser": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-			"integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
-			"dev": true,
-			"requires": {
-				"camelcase": "^3.0.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-					"dev": true
-				}
-			}
-		},
 		"yauzl": {
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
diff --git a/package.json b/package.json
index 132bbde45e8..fc15d157f51 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
 	},
 	"devDependencies": {
 		"@babel/core": "^7.6.2",
+		"@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
 		"@babel/plugin-proposal-optional-chaining": "^7.9.0",
 		"@babel/preset-env": "^7.6.2",
 		"@babel/preset-react": "^7.0.0",
@@ -56,12 +57,10 @@
 		"@rocket.chat/eslint-config": "^0.3.0",
 		"@rocket.chat/livechat": "^1.4.0",
 		"@settlin/spacebars-loader": "^1.0.7",
-		"@storybook/addon-actions": "^5.2.8",
-		"@storybook/addon-knobs": "^5.2.8",
-		"@storybook/addon-links": "^5.2.8",
-		"@storybook/addon-viewport": "^5.2.8",
-		"@storybook/addons": "^5.2.8",
-		"@storybook/react": "^5.2.8",
+		"@storybook/addon-actions": "^5.3.18",
+		"@storybook/addon-knobs": "^5.3.18",
+		"@storybook/addons": "^5.3.18",
+		"@storybook/react": "^5.3.18",
 		"@types/bcrypt": "^3.0.0",
 		"@types/chai": "^4.2.11",
 		"@types/meteor": "^1.4.37",
@@ -104,6 +103,7 @@
 		"postcss-url": "^8.0.0",
 		"progress": "^2.0.2",
 		"proxyquire": "^2.1.0",
+		"react-docgen-typescript-loader": "^3.7.2",
 		"simple-git": "^1.107.0",
 		"source-map": "^0.5.6",
 		"stylelint": "^9.9.0",
@@ -124,13 +124,13 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/apps-engine": "^1.15.0-alpha.3202",
-		"@rocket.chat/fuselage": "^0.7.1",
-		"@rocket.chat/fuselage-hooks": "^0.7.1",
-		"@rocket.chat/fuselage-polyfills": "^0.7.1",
-		"@rocket.chat/fuselage-ui-kit": "^0.7.1",
-		"@rocket.chat/icons": "^0.7.1",
-		"@rocket.chat/ui-kit": "^0.7.1",
+		"@rocket.chat/apps-engine": "^1.15.0-beta.3262",
+		"@rocket.chat/fuselage": "^0.6.3-dev.39",
+		"@rocket.chat/fuselage-hooks": "^0.6.3-dev.35",
+		"@rocket.chat/fuselage-polyfills": "^0.6.3-dev.23",
+		"@rocket.chat/fuselage-ui-kit": "^0.6.3-dev.35",
+		"@rocket.chat/icons": "^0.6.3-dev.23",
+		"@rocket.chat/ui-kit": "^0.6.3-dev.23",
 		"@slack/client": "^4.8.0",
 		"adm-zip": "RocketChat/adm-zip",
 		"apn": "2.2.0",
@@ -209,7 +209,7 @@
 		"prometheus-gc-stats": "^0.6.2",
 		"querystring": "^0.2.0",
 		"queue-fifo": "^0.2.5",
-		"react": "^16.8.6",
+		"react": "^16.13.1",
 		"react-dom": "^16.8.6",
 		"redis": "^2.8.0",
 		"semver": "^5.6.0",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index ba2f37ccc8d..7031d64c846 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1078,6 +1078,7 @@
   "Custom_Translations": "Custom Translations",
   "Custom_Translations_Description": "Should be a valid JSON where keys are languages containing a dictionary of key and translations. Example:<br/><code>{\n \"en\": {\n  \"Channels\": \"Rooms\"\n },\n \"pt\": {\n  \"Channels\": \"Salas\"\n }\n}</code> ",
   "Custom_User_Status": "Custom User Status",
+  "Custom_User_Status_Edit": "Edit Custom User Status",
   "Custom_User_Status_Add": "Add Custom User Status",
   "Custom_User_Status_Added_Successfully": "Custom User Status Added Successfully",
   "Custom_User_Status_Delete_Warning": "Deleting a Custom User Status cannot be undone.",
@@ -1242,6 +1243,7 @@
   "E2E_password_request_text": "To access your encrypted private groups and direct messages, enter your encryption password. <br/>You need to enter this password to encode/decode your messages on every client you use, since the key is not stored on the server.",
   "E2E_Reset_Key_Explanation": "This option will remove your current E2E key and log you out. <BR/>When you login again, Rocket.Chat will generate you a new key and restore your access to any encrypted room that has one or more members online.<BR/>Due to the nature of the E2E encryption, Rocket.Chat will not be able to restore access to any encrypted room that has no member online.",
   "Edit": "Edit",
+  "Edit_User": "Edit User",
   "Edit_Invite": "Edit Invite",
   "Edit_Status": "Edit Status",
   "edit-message": "Edit Message",
@@ -1292,6 +1294,7 @@
   "email_style_description": "Avoid nested selectors",
   "Email_verified": "Email verified",
   "email_plain_text_only": "Send only plain text emails",
+  "Emails_sent_successfully!": "Emails sent successfully!",
   "Emoji": "Emoji",
   "Emoji_provided_by_JoyPixels": "Emoji provided by <strong>JoyPixels</strong>",
   "EmojiCustomFilesystem": "Custom Emoji Filesystem",
@@ -2219,6 +2222,7 @@
   "Mail_Messages": "Mail Messages",
   "Mail_Messages_Instructions": "Choose which messages you want to send via email by clicking the messages",
   "Room_uploaded_file_list": "Files List",
+  "Room_updated_successfully": "Room updated successfully!",
   "Mail_Messages_Subject": "Here's a selected portion of %s messages",
   "Mailer": "Mailer",
   "Mailer_body_tags": "You <b>must</b> use [unsubscribe] for the unsubscription link.<br/>You may use [name], [fname], [lname] for the user's full name, first name or last name, respectively.<br/>You may use [email] for the user's email.",
@@ -2448,6 +2452,7 @@
   "Name_optional": "Name (optional)",
   "Name_Placeholder": "Please enter your name...",
   "Navigation_History": "Navigation History",
+  "Never": "Never",
   "New_users": "New users",
   "New_Application": "New Application",
   "New_chat_in_queue": "New chat in queue",
@@ -2999,6 +3004,7 @@
   "Search_Private_Groups": "Search Private Groups",
   "Search_Provider": "Search Provider",
   "Search_Users": "Search Users",
+  "Search_Rooms": "Search Rooms",
   "seconds": "seconds",
   "Secret_token": "Secret Token",
   "Security": "Security",
@@ -3136,6 +3142,7 @@
   "Smarsh_MissingEmail_Email": "Missing Email",
   "Smarsh_MissingEmail_Email_Description": "The email to show for a user account when their email address is missing, generally happens with bot accounts.",
   "Smarsh_Timezone": "Smarsh Timezone",
+  "Timezone": "Timezone",
   "Smileys_and_People": "Smileys & People",
   "SMS_Default_Omnichannel_Department": "Omnichannel Department (Default)",
   "SMS_Default_Omnichannel_Department_Description": "If set, all new incoming chats initiated by this integration will be routed to this department.",
@@ -3504,7 +3511,9 @@
   "Use_url_for_avatar": "Use URL for avatar",
   "Use_User_Preferences_or_Global_Settings": "Use User Preferences or Global Settings",
   "User": "User",
+  "Users_and_rooms": "Users and Rooms",
   "User Search": "User Search",
+  "User_created_successfully!": "User create successfully!",
   "User Search (Group Validation)": "User Search (Group Validation)",
   "user-generate-access-token": "User Generate Access Token",
   "user-generate-access-token_description": "Permission for users to generate access tokens",
@@ -3612,6 +3621,7 @@
   "Verification_email_sent": "Verification email sent",
   "Verification_Email_Subject": "[Site_Name] - Email address verification",
   "Verified": "Verified",
+  "Not_verified": "Not verified",
   "Verify": "Verify",
   "Verify_your_email": "Verify your email",
   "Verify_your_email_for_the_code_we_sent": "Verify your email for the code we sent",
@@ -3776,4 +3786,4 @@
   "Your_server_link": "Your server link",
   "Your_temporary_password_is_password": "Your temporary password is <strong>[password]</strong>.",
   "Your_workspace_is_ready": "Your workspace is ready to use 🎉"
-}
\ No newline at end of file
+}
diff --git a/private/server/colors.less b/private/server/colors.less
index 476b7590918..638946d86c8 100755
--- a/private/server/colors.less
+++ b/private/server/colors.less
@@ -480,10 +480,6 @@ input:-webkit-autofill {
 	}
 }
 
-.new-logs {
-	background: @primary-action-contrast;
-}
-
 .avatar-suggestion-item {
 	.question-mark::before {
 		color: @secondary-font-color;
diff --git a/typings.d.ts b/typings.d.ts
new file mode 100644
index 00000000000..905575c445a
--- /dev/null
+++ b/typings.d.ts
@@ -0,0 +1,2 @@
+declare module 'meteor/rocketchat:tap-i18n';
+declare module 'meteor/ddp-common';