From 6be2861f0cdc27788b5f0feccfdee4571f1bef24 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 9 Jun 2020 09:55:45 -0300
Subject: [PATCH] Refactor components and views to Storybook compatibility
 (#17800)

---
 .storybook/{mocks => }/decorators.js          |   20 +-
 .storybook/hooks.js                           |   15 +
 .storybook/main.js                            |    1 +
 .storybook/preview.js                         |   10 +-
 .storybook/webpack.config.js                  |    4 +-
 app/2fa/server/code/EmailCheck.ts             |    2 +-
 app/2fa/server/code/index.ts                  |    2 +-
 .../server/functions/hasPermission.js         |    2 +-
 app/livechat/server/lib/stream/agentStatus.ts |   20 +-
 app/ui-message/client/blocks/MessageBlock.js  |    3 +-
 app/ui-message/client/blocks/ModalBlock.js    |    3 +-
 .../client/components/GenericTable.stories.js |    2 +-
 .../app/components/Directory/ChannelsTab.js   |    4 +-
 .../cloud/ManualWorkspaceRegistrationModal.js |    6 +-
 client/admin/invites/InvitesPage.js           |    2 +-
 client/admin/mailer/Mailer.js                 |    5 +-
 client/admin/settings/GroupPage.js            |    2 +-
 client/admin/settings/GroupPage.stories.js    |    6 -
 client/admin/settings/GroupSelector.js        |    4 +-
 .../admin/settings/GroupSelector.stories.js   |    4 -
 client/admin/settings/Section.js              |    9 +-
 client/admin/settings/Section.stories.js      |    4 -
 client/admin/settings/Setting.js              |    9 +-
 client/admin/settings/Setting.stories.js      |   11 +-
 client/admin/settings/SettingsState.js        |  210 +--
 .../admin/settings/groups/OAuthGroupPage.js   |    5 +-
 client/admin/users/UserInfo.js                |    2 +-
 client/admin/viewLogs/ViewLogs.js             |    3 +-
 client/components/basic/BurgerMenuButton.css  |   95 -
 client/components/basic/BurgerMenuButton.js   |   38 -
 .../basic/BurgerMenuButton.stories.js         |   46 -
 .../components/{setupWizard => basic}/Logo.js |    5 +-
 .../{setupWizard => basic}/Logo.stories.js    |    4 +-
 client/components/basic/MarkdownText.js       |   20 +-
 .../components/basic/MarkdownText.stories.js  |   39 +
 client/components/basic/Page.js               |   20 +-
 client/components/basic/Page.stories.js       |   46 +-
 client/components/basic/burger/BurgerBadge.js |   15 +
 .../basic/burger/BurgerBadge.stories.js       |   21 +
 client/components/basic/burger/BurgerIcon.js  |   69 +
 .../basic/burger/BurgerIcon.stories.js        |   22 +
 .../basic/burger/BurgerMenuButton.js          |   27 +
 .../basic/burger/BurgerMenuButton.stories.js  |   22 +
 .../connectionStatus/ConnectionStatusAlert.js |    4 +-
 .../ConnectionStatusAlert.stories.js          |   70 +-
 .../pageNotFound/PageNotFound.stories.js      |   10 -
 client/contexts/ModalContext.ts               |    7 +
 client/contexts/PrivateSettingsContext.ts     |  249 +++
 client/fuselage-hooks.d.ts                    |    4 +
 client/hooks/useIsReducedMotionPreferred.js   |    3 +
 client/hooks/useModal.js                      |    3 -
 client/providers/MeteorProvider.js            |   25 +-
 client/providers/ModalProvider.js             |   10 +
 client/routes.js                              |    4 +-
 .../notFound/NotFoundPage.js}                 |    8 +-
 client/views/notFound/NotFoundPage.stories.js |   10 +
 .../setupWizard/Pager.js                      |    0
 .../setupWizard/Pager.stories.js              |    2 +-
 .../setupWizard/SetupWizardPage.js            |    2 +-
 .../setupWizard/SetupWizardPage.stories.js    |    2 +-
 .../setupWizard/SetupWizardRoute.js           |    0
 .../setupWizard/SetupWizardState.js           |    0
 .../setupWizard/SideBar.css                   |    0
 .../setupWizard/SideBar.js                    |    2 +-
 .../setupWizard/SideBar.stories.js            |    2 +-
 .../setupWizard/Step.css                      |    0
 .../{components => views}/setupWizard/Step.js |    0
 .../setupWizard/StepHeader.js                 |    0
 .../setupWizard/StepHeader.stories.js         |    2 +-
 .../steps/AdminUserInformationStep.js         |    0
 .../steps/AdminUserInformationStep.stories.js |    2 +-
 .../setupWizard/steps/FinalStep.js            |    0
 .../setupWizard/steps/FinalStep.stories.js    |    2 +-
 .../setupWizard/steps/RegisterServerStep.js   |    0
 .../steps/RegisterServerStep.stories.js       |    2 +-
 .../setupWizard/steps/SettingsBasedStep.js    |    0
 .../steps/SettingsBasedStep.stories.js        |    2 +-
 .../components/ChannelsTab/index.stories.js   |    2 +-
 .../EngagementDashboardPage.stories.js        |    2 +-
 .../components/MessagesTab/index.stories.js   |    2 +-
 .../components/UsersTab/index.stories.js      |    2 +-
 .../client/components/data/Counter.stories.js |    2 +-
 .../components/data/CounterSet.stories.js     |    2 +-
 .../client/components/data/Growth.stories.js  |    2 +-
 .../components/data/Histogram.stories.js      |    2 +-
 .../components/data/LegendSymbol.stories.js   |    2 +-
 .../data/NegativeGrowthSymbol.stories.js      |    2 +-
 .../data/PositiveGrowthSymbol.stories.js      |    2 +-
 ee/app/license/server/license.ts              |    2 +-
 package-lock.json                             | 1554 +++++++++--------
 package.json                                  |   13 +-
 server/main.d.ts                              |    2 +-
 92 files changed, 1578 insertions(+), 1301 deletions(-)
 rename .storybook/{mocks => }/decorators.js (53%)
 create mode 100644 .storybook/hooks.js
 delete mode 100644 client/components/basic/BurgerMenuButton.css
 delete mode 100644 client/components/basic/BurgerMenuButton.js
 delete mode 100644 client/components/basic/BurgerMenuButton.stories.js
 rename client/components/{setupWizard => basic}/Logo.js (97%)
 rename client/components/{setupWizard => basic}/Logo.stories.js (54%)
 create mode 100644 client/components/basic/MarkdownText.stories.js
 create mode 100644 client/components/basic/burger/BurgerBadge.js
 create mode 100644 client/components/basic/burger/BurgerBadge.stories.js
 create mode 100644 client/components/basic/burger/BurgerIcon.js
 create mode 100644 client/components/basic/burger/BurgerIcon.stories.js
 create mode 100644 client/components/basic/burger/BurgerMenuButton.js
 create mode 100644 client/components/basic/burger/BurgerMenuButton.stories.js
 delete mode 100644 client/components/pageNotFound/PageNotFound.stories.js
 create mode 100644 client/contexts/ModalContext.ts
 create mode 100644 client/contexts/PrivateSettingsContext.ts
 create mode 100644 client/fuselage-hooks.d.ts
 create mode 100644 client/hooks/useIsReducedMotionPreferred.js
 delete mode 100644 client/hooks/useModal.js
 create mode 100644 client/providers/ModalProvider.js
 rename client/{components/pageNotFound/PageNotFound.js => views/notFound/NotFoundPage.js} (91%)
 create mode 100644 client/views/notFound/NotFoundPage.stories.js
 rename client/{components => views}/setupWizard/Pager.js (100%)
 rename client/{components => views}/setupWizard/Pager.stories.js (94%)
 rename client/{components => views}/setupWizard/SetupWizardPage.js (95%)
 rename client/{components => views}/setupWizard/SetupWizardPage.stories.js (92%)
 rename client/{components => views}/setupWizard/SetupWizardRoute.js (100%)
 rename client/{components => views}/setupWizard/SetupWizardState.js (100%)
 rename client/{components => views}/setupWizard/SideBar.css (100%)
 rename client/{components => views}/setupWizard/SideBar.js (97%)
 rename client/{components => views}/setupWizard/SideBar.stories.js (96%)
 rename client/{components => views}/setupWizard/Step.css (100%)
 rename client/{components => views}/setupWizard/Step.js (100%)
 rename client/{components => views}/setupWizard/StepHeader.js (100%)
 rename client/{components => views}/setupWizard/StepHeader.stories.js (87%)
 rename client/{components => views}/setupWizard/steps/AdminUserInformationStep.js (100%)
 rename client/{components => views}/setupWizard/steps/AdminUserInformationStep.stories.js (87%)
 rename client/{components => views}/setupWizard/steps/FinalStep.js (100%)
 rename client/{components => views}/setupWizard/steps/FinalStep.stories.js (82%)
 rename client/{components => views}/setupWizard/steps/RegisterServerStep.js (100%)
 rename client/{components => views}/setupWizard/steps/RegisterServerStep.stories.js (87%)
 rename client/{components => views}/setupWizard/steps/SettingsBasedStep.js (100%)
 rename client/{components => views}/setupWizard/steps/SettingsBasedStep.stories.js (87%)

diff --git a/.storybook/mocks/decorators.js b/.storybook/decorators.js
similarity index 53%
rename from .storybook/mocks/decorators.js
rename to .storybook/decorators.js
index 0c545d5c161..db662ca2303 100644
--- a/.storybook/mocks/decorators.js
+++ b/.storybook/decorators.js
@@ -1,13 +1,13 @@
 import React from 'react';
 
-import { MeteorProviderMock } from './providers';
+import { MeteorProviderMock } from './mocks/providers';
 
 export const rocketChatDecorator = (fn) => {
 	const linkElement = document.getElementById('theme-styles') || document.createElement('link');
 	if (linkElement.id !== 'theme-styles') {
-		require('../../app/theme/client/main.css');
-		require('../../app/theme/client/vendor/fontello/css/fontello.css');
-		require('../../app/theme/client/rocketchat.font.css');
+		require('../app/theme/client/main.css');
+		require('../app/theme/client/vendor/fontello/css/fontello.css');
+		require('../app/theme/client/rocketchat.font.css');
 		linkElement.setAttribute('id', 'theme-styles');
 		linkElement.setAttribute('rel', 'stylesheet');
 		linkElement.setAttribute('href', 'https://open.rocket.chat/theme.css');
@@ -15,7 +15,7 @@ export const rocketChatDecorator = (fn) => {
 	}
 
 	// eslint-disable-next-line import/no-unresolved
-	const { default: icons } = require('!!raw-loader!../../private/public/icons.svg');
+	const { default: icons } = require('!!raw-loader!../private/public/icons.svg');
 
 	return <MeteorProviderMock>
 		<style>{`
@@ -29,3 +29,13 @@ export const rocketChatDecorator = (fn) => {
 		</div>
 	</MeteorProviderMock>;
 };
+
+export const fullHeightDecorator = (storyFn) =>
+	<div style={{ display: 'flex', flexDirection: 'column', maxHeight: '100vh' }}>
+		{storyFn()}
+	</div>;
+
+export const centeredDecorator = (storyFn) =>
+	<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', minHeight: '100vh' }}>
+		{storyFn()}
+	</div>;
diff --git a/.storybook/hooks.js b/.storybook/hooks.js
new file mode 100644
index 00000000000..d5e2dcd1c06
--- /dev/null
+++ b/.storybook/hooks.js
@@ -0,0 +1,15 @@
+import { useEffect, useState } from 'react';
+
+export const useAutoToggle = (initialValue = false, ms = 1000) => {
+	const [value, setValue] = useState(initialValue);
+
+	useEffect(() => {
+		const timer = setInterval(() => setValue((value) => !value), ms);
+
+		return () => {
+			clearInterval(timer);
+		};
+	}, []);
+
+	return value;
+};
diff --git a/.storybook/main.js b/.storybook/main.js
index 2b53b2635b3..d3ce1eb94ef 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -7,5 +7,6 @@ module.exports = {
 	addons: [
 		'@storybook/addon-actions',
 		'@storybook/addon-knobs',
+		'@storybook/addon-viewport',
 	],
 };
diff --git a/.storybook/preview.js b/.storybook/preview.js
index c4b6fca4894..39bdd05fd48 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -1,7 +1,13 @@
 import { withKnobs } from '@storybook/addon-knobs';
-import { addDecorator } from '@storybook/react';
+import { addDecorator, addParameters } from '@storybook/react';
 
-import { rocketChatDecorator } from './mocks/decorators';
+import { rocketChatDecorator } from './decorators';
 
 addDecorator(rocketChatDecorator);
 addDecorator(withKnobs);
+
+addParameters({
+	options: {
+		showRoots: true,
+	},
+});
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
index 1d47404d267..b5cac9abccd 100644
--- a/.storybook/webpack.config.js
+++ b/.storybook/webpack.config.js
@@ -42,9 +42,7 @@ module.exports = async ({ config }) => {
 					},
 				},
 			},
-			{
-				loader: 'react-docgen-typescript-loader',
-			},
+			'react-docgen-typescript-loader',
 		],
 	});
 
diff --git a/app/2fa/server/code/EmailCheck.ts b/app/2fa/server/code/EmailCheck.ts
index 1199c22397b..925520547e2 100644
--- a/app/2fa/server/code/EmailCheck.ts
+++ b/app/2fa/server/code/EmailCheck.ts
@@ -99,7 +99,7 @@ ${ t('If_you_didnt_try_to_login_in_your_account_please_ignore_this_email') }
 		const random = Random._randomString(6, '0123456789');
 		const encryptedRandom = bcrypt.hashSync(random, Accounts._bcryptRounds());
 		const expire = new Date();
-		const expirationInSeconds = parseInt(settings.get('Accounts_TwoFactorAuthentication_By_Email_Code_Expiration'));
+		const expirationInSeconds = parseInt(settings.get('Accounts_TwoFactorAuthentication_By_Email_Code_Expiration') as string, 10);
 
 		expire.setSeconds(expire.getSeconds() + expirationInSeconds);
 
diff --git a/app/2fa/server/code/index.ts b/app/2fa/server/code/index.ts
index cdc12e6520a..7da60086296 100644
--- a/app/2fa/server/code/index.ts
+++ b/app/2fa/server/code/index.ts
@@ -95,7 +95,7 @@ export function isAuthorizedForToken(connection: IMethodConnection, user: IUser,
 export function rememberAuthorization(connection: IMethodConnection, user: IUser): void {
 	const currentToken = Accounts._getLoginToken(connection.id);
 
-	const rememberFor = parseInt(settings.get('Accounts_TwoFactorAuthentication_RememberFor'));
+	const rememberFor = parseInt(settings.get('Accounts_TwoFactorAuthentication_RememberFor') as string, 10);
 
 	if (rememberFor <= 0) {
 		return;
diff --git a/app/authorization/server/functions/hasPermission.js b/app/authorization/server/functions/hasPermission.js
index 0512c6a07e2..eb3d9019160 100644
--- a/app/authorization/server/functions/hasPermission.js
+++ b/app/authorization/server/functions/hasPermission.js
@@ -12,7 +12,7 @@ const rolesHasPermission = mem(async (permission, roles) => {
 	return !!result;
 }, {
 	cacheKey: JSON.stringify,
-	...process.env.TEST_MODE === 'true' && { maxAge: 0 },
+	...process.env.TEST_MODE === 'true' && { maxAge: 1 },
 });
 
 const getRoles = mem(async (uid, scope) => {
diff --git a/app/livechat/server/lib/stream/agentStatus.ts b/app/livechat/server/lib/stream/agentStatus.ts
index 00ae13968d3..0634f78bc39 100644
--- a/app/livechat/server/lib/stream/agentStatus.ts
+++ b/app/livechat/server/lib/stream/agentStatus.ts
@@ -9,19 +9,31 @@ let actionTimeout = 60000;
 let action = 'none';
 let comment = '';
 
-settings.get('Livechat_agent_leave_action_timeout', function(_key: string, value: number) {
+settings.get('Livechat_agent_leave_action_timeout', (_key, value) => {
+	if (typeof value !== 'number') {
+		return;
+	}
 	actionTimeout = value * 1000;
 });
 
-settings.get('Livechat_agent_leave_action', function(_key: string, value: boolean) {
+settings.get('Livechat_agent_leave_action', (_key, value) => {
+	if (typeof value !== 'boolean') {
+		return;
+	}
 	monitorAgents = value;
 });
 
-settings.get('Livechat_agent_leave_action', function(_key: string, value: string) {
+settings.get('Livechat_agent_leave_action', (_key, value) => {
+	if (typeof value !== 'string') {
+		return;
+	}
 	action = value;
 });
 
-settings.get('Livechat_agent_leave_comment', function(_key: string, value: string) {
+settings.get('Livechat_agent_leave_comment', (_key, value) => {
+	if (typeof value !== 'string') {
+		return;
+	}
 	comment = value;
 });
 
diff --git a/app/ui-message/client/blocks/MessageBlock.js b/app/ui-message/client/blocks/MessageBlock.js
index 2794b265583..3bd9a8739ff 100644
--- a/app/ui-message/client/blocks/MessageBlock.js
+++ b/app/ui-message/client/blocks/MessageBlock.js
@@ -2,7 +2,6 @@ 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';
 
@@ -12,7 +11,7 @@ messageParser.text = ({ text, type } = {}) => {
 		return text;
 	}
 
-	return <RawText>{renderMessageBody({ msg: text })}</RawText>;
+	return <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
 };
 
 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 891c1b15c75..cec19b7c74d 100644
--- a/app/ui-message/client/blocks/ModalBlock.js
+++ b/app/ui-message/client/blocks/ModalBlock.js
@@ -5,7 +5,6 @@ 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';
@@ -16,7 +15,7 @@ modalParser.text = ({ text, type } = {}) => {
 		return text;
 	}
 
-	return <RawText>{renderMessageBody({ msg: text })}</RawText>;
+	return <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
 };
 
 const textParser = uiKitText({
diff --git a/app/ui/client/components/GenericTable.stories.js b/app/ui/client/components/GenericTable.stories.js
index d475b0ac711..ac6ba252d36 100644
--- a/app/ui/client/components/GenericTable.stories.js
+++ b/app/ui/client/components/GenericTable.stories.js
@@ -5,7 +5,7 @@ import { GenericTable, Th } from './GenericTable';
 
 
 export default {
-	title: 'directory/table',
+	title: 'uncategorized/GenericTable',
 	component: GenericTable,
 	decorators: [(fn) => <div children={fn()} style={{ height: '100vh' }} />],
 };
diff --git a/app/ui/client/views/app/components/Directory/ChannelsTab.js b/app/ui/client/views/app/components/Directory/ChannelsTab.js
index 5d61650ee5f..5348354e50c 100644
--- a/app/ui/client/views/app/components/Directory/ChannelsTab.js
+++ b/app/ui/client/views/app/components/Directory/ChannelsTab.js
@@ -88,9 +88,7 @@ export function ChannelsTab() {
 						<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>}
+						{topic && <MarkdownText fontScale='p1' color='hint' style={style} content={topic} />}
 					</Box>
 				</Box>
 			</Table.Cell>
diff --git a/client/admin/cloud/ManualWorkspaceRegistrationModal.js b/client/admin/cloud/ManualWorkspaceRegistrationModal.js
index 7952a3aa705..ffd3a68bc4b 100644
--- a/client/admin/cloud/ManualWorkspaceRegistrationModal.js
+++ b/client/admin/cloud/ManualWorkspaceRegistrationModal.js
@@ -67,11 +67,7 @@ function CopyStep({ onNextButtonClick }) {
 					<Icon name='copy' /> {t('Copy')}
 				</Button>
 			</Box>
-			<Box withRichContent>
-				<p>
-					<MarkdownText>{t('Cloud_click_here', { cloudConsoleUrl })}</MarkdownText>
-				</p>
-			</Box>
+			<MarkdownText is='p' withRichContent content={t('Cloud_click_here', { cloudConsoleUrl })} />
 		</Modal.Content>
 		<Modal.Footer>
 			<ButtonGroup>
diff --git a/client/admin/invites/InvitesPage.js b/client/admin/invites/InvitesPage.js
index ca12b21c2c7..ec646e9a850 100644
--- a/client/admin/invites/InvitesPage.js
+++ b/client/admin/invites/InvitesPage.js
@@ -9,9 +9,9 @@ import React, { useState, useEffect } from 'react';
 import moment from 'moment';
 
 import Page from '../../components/basic/Page';
+import { useModal } from '../../contexts/ModalContext';
 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';
diff --git a/client/admin/mailer/Mailer.js b/client/admin/mailer/Mailer.js
index fb423b97b4c..3a5849db7a3 100644
--- a/client/admin/mailer/Mailer.js
+++ b/client/admin/mailer/Mailer.js
@@ -4,7 +4,6 @@ import { TextInput, TextAreaInput, Field, FieldGroup, CheckBox, Button, Icon, Bu
 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 = () => {} }) {
@@ -95,9 +94,7 @@ export function Mailer({ sendMail = () => {} }) {
 							onChange={(e) => setEmailBody(e.currentTarget.value)}
 						/>
 					</Field.Row>
-					<Field.Hint>
-						<RawText>{t('Mailer_body_tags')}</RawText>
-					</Field.Hint>
+					<Field.Hint dangerouslySetInnerHTML={{ __html: t('Mailer_body_tags') }} />
 				</Field>
 			</FieldGroup>
 		</Page.ScrollableContentWithShadow>
diff --git a/client/admin/settings/GroupPage.js b/client/admin/settings/GroupPage.js
index f27d512d1bc..2b8448b0b28 100644
--- a/client/admin/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 Page from '../../components/basic/Page';
 import { useTranslation } from '../../contexts/TranslationContext';
 import { Section } from './Section';
-import Page from '../../components/basic/Page';
 
 export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabel, i18nDescription, changed }) {
 	const t = useTranslation();
diff --git a/client/admin/settings/GroupPage.stories.js b/client/admin/settings/GroupPage.stories.js
index 1b1fa4a7093..64fabeccacd 100644
--- a/client/admin/settings/GroupPage.stories.js
+++ b/client/admin/settings/GroupPage.stories.js
@@ -1,16 +1,10 @@
 import React from 'react';
 
 import { GroupPage } from './GroupPage';
-import { SettingsState } from './SettingsState';
 
 export default {
 	title: 'admin/settings/GroupPage',
 	component: GroupPage,
-	decorators: [
-		(storyFn) => <SettingsState>
-			{storyFn()}
-		</SettingsState>,
-	],
 };
 
 export const _default = () =>
diff --git a/client/admin/settings/GroupSelector.js b/client/admin/settings/GroupSelector.js
index 6cbd557b740..2b4e9e45e4e 100644
--- a/client/admin/settings/GroupSelector.js
+++ b/client/admin/settings/GroupSelector.js
@@ -1,13 +1,13 @@
 import React from 'react';
 
+import { usePrivateSettingsGroup } from '../../contexts/PrivateSettingsContext';
 import { AssetsGroupPage } from './groups/AssetsGroupPage';
 import { OAuthGroupPage } from './groups/OAuthGroupPage';
 import { GenericGroupPage } from './groups/GenericGroupPage';
 import { GroupPage } from './GroupPage';
-import { useGroup } from './SettingsState';
 
 export function GroupSelector({ groupId }) {
-	const group = useGroup(groupId);
+	const group = usePrivateSettingsGroup(groupId);
 
 	if (!group) {
 		return <GroupPage.Skeleton />;
diff --git a/client/admin/settings/GroupSelector.stories.js b/client/admin/settings/GroupSelector.stories.js
index d53c3a57fdf..a96aea68f5d 100644
--- a/client/admin/settings/GroupSelector.stories.js
+++ b/client/admin/settings/GroupSelector.stories.js
@@ -1,14 +1,10 @@
 import React from 'react';
 
 import { GroupSelector } from './GroupSelector';
-import { SettingsState } from './SettingsState';
 
 export default {
 	title: 'admin/settings/GroupSelector',
 	component: GroupSelector,
-	decorators: [
-		(storyFn) => <SettingsState>{storyFn()}</SettingsState>,
-	],
 };
 
 export const _default = () => <GroupSelector />;
diff --git a/client/admin/settings/Section.js b/client/admin/settings/Section.js
index 5f4c440d75b..e249c7ca04d 100644
--- a/client/admin/settings/Section.js
+++ b/client/admin/settings/Section.js
@@ -1,13 +1,16 @@
 import { Accordion, Box, Button, FieldGroup, Skeleton } from '@rocket.chat/fuselage';
 import React from 'react';
 
+import {
+	usePrivateSettingsSection,
+	usePrivateSettingsSectionChangedState,
+} from '../../contexts/PrivateSettingsContext';
 import { useTranslation } from '../../contexts/TranslationContext';
 import { Setting } from './Setting';
-import { useSection, useSectionChangedState } from './SettingsState';
 
 export function Section({ children, groupId, hasReset = true, help, sectionName, solo }) {
-	const section = useSection(groupId, sectionName);
-	const changed = useSectionChangedState(groupId, sectionName);
+	const section = usePrivateSettingsSection(groupId, sectionName);
+	const changed = usePrivateSettingsSectionChangedState(groupId, sectionName);
 
 	const t = useTranslation();
 
diff --git a/client/admin/settings/Section.stories.js b/client/admin/settings/Section.stories.js
index 6790d3bb16c..1c5998f4aef 100644
--- a/client/admin/settings/Section.stories.js
+++ b/client/admin/settings/Section.stories.js
@@ -1,14 +1,10 @@
 import React from 'react';
 
 import { Section } from './Section';
-import { SettingsState } from './SettingsState';
 
 export default {
 	title: 'admin/settings/Section',
 	component: Section,
-	decorators: [
-		(storyFn) => <SettingsState>{storyFn()}</SettingsState>,
-	],
 };
 
 export const _default = () => <Section groupId='General' />;
diff --git a/client/admin/settings/Setting.js b/client/admin/settings/Setting.js
index 1cae6ac6517..86add049c19 100644
--- a/client/admin/settings/Setting.js
+++ b/client/admin/settings/Setting.js
@@ -2,7 +2,7 @@ import { Callout, Field, Flex, InputBox, Margins, Skeleton } from '@rocket.chat/
 import React, { memo, useEffect, useMemo, useState, useCallback } from 'react';
 
 import MarkdownText from '../../components/basic/MarkdownText';
-import RawText from '../../components/basic/RawText';
+import { usePrivateSetting } from '../../contexts/PrivateSettingsContext';
 import { useTranslation } from '../../contexts/TranslationContext';
 import { GenericSettingInput } from './inputs/GenericSettingInput';
 import { BooleanSettingInput } from './inputs/BooleanSettingInput';
@@ -19,7 +19,6 @@ import { CodeSettingInput } from './inputs/CodeSettingInput';
 import { ActionSettingInput } from './inputs/ActionSettingInput';
 import { AssetSettingInput } from './inputs/AssetSettingInput';
 import { RoomPickSettingInput } from './inputs/RoomPickSettingInput';
-import { useSetting } from './SettingsState';
 
 export const MemoizedSetting = memo(function MemoizedSetting({
 	type,
@@ -71,7 +70,7 @@ export function Setting({ settingId, sectionChanged }) {
 		update,
 		reset,
 		...setting
-	} = useSetting(settingId);
+	} = usePrivateSetting(settingId);
 
 
 	const t = useTranslation();
@@ -116,8 +115,8 @@ export function Setting({ settingId, sectionChanged }) {
 	} = setting;
 
 	const label = (i18nLabel && t(i18nLabel)) || (_id || t(_id));
-	const hint = useMemo(() => t.has(i18nDescription) && <MarkdownText>{t(i18nDescription)}</MarkdownText>, [i18nDescription]);
-	const callout = useMemo(() => alert && <RawText>{t(alert)}</RawText>, [alert]);
+	const hint = useMemo(() => t.has(i18nDescription) && <MarkdownText content={t(i18nDescription)} />, [i18nDescription]);
+	const callout = useMemo(() => alert && <span dangerouslySetInnerHTML={{ __html: t(alert) }} />, [alert]);
 	const hasResetButton = !disableReset && !readonly && type !== 'asset' && (JSON.stringify(packageEditor) !== JSON.stringify(editor) || JSON.stringify(value) !== JSON.stringify(packageValue)) && !disabled;
 
 	return <MemoizedSetting
diff --git a/client/admin/settings/Setting.stories.js b/client/admin/settings/Setting.stories.js
index 5b92b613ca3..81418780f1a 100644
--- a/client/admin/settings/Setting.stories.js
+++ b/client/admin/settings/Setting.stories.js
@@ -2,19 +2,16 @@ import { FieldGroup } from '@rocket.chat/fuselage';
 import React from 'react';
 
 import { Setting } from './Setting';
-import { SettingsState } from './SettingsState';
 
 export default {
 	title: 'admin/settings/Setting',
 	component: Setting,
 	decorators: [
-		(storyFn) => <SettingsState>
-			<div className='rc-old'>
-				<div className='page-settings'>
-					{storyFn()}
-				</div>
+		(storyFn) => <div className='rc-old'>
+			<div className='page-settings'>
+				{storyFn()}
 			</div>
-		</SettingsState>,
+		</div>,
 	],
 };
 
diff --git a/client/admin/settings/SettingsState.js b/client/admin/settings/SettingsState.js
index 99094c7780d..ce4016cd278 100644
--- a/client/admin/settings/SettingsState.js
+++ b/client/admin/settings/SettingsState.js
@@ -1,16 +1,8 @@
-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 React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 
 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({});
+import { PrivateSettingsContext } from '../../contexts/PrivateSettingsContext';
 
 let privateSettingsCachedCollection; // Remove this singleton (╯°□°)╯︵ ┻━┻
 
@@ -212,194 +204,14 @@ export function SettingsState({ children }) {
 		isDisabled,
 	]);
 
-	return <SettingsContext.Provider children={children} value={contextValue} />;
+	return <PrivateSettingsContext.Provider children={children} value={contextValue} />;
 }
 
-const useSelector = (selector, equalityFunction = (a, b) => a === b) => {
-	const { subscribers, stateRef } = useContext(SettingsContext);
-	const [value, setValue] = useState(() => selector(stateRef.current));
-
-	const handleUpdate = useMutableCallback((state) => {
-		const newValue = selector(state);
-
-		if (!equalityFunction(newValue, value)) {
-			setValue(newValue);
-		}
-	});
-
-	useEffect(() => {
-		subscribers.add(handleUpdate);
-
-		return () => {
-			subscribers.delete(handleUpdate);
-		};
-	}, [handleUpdate]);
-
-	useLayoutEffect(() => {
-		handleUpdate(stateRef.current);
-	});
-
-	return value;
-};
-
-export const useGroup = (groupId) => {
-	const group = useSelector((state) => state.settings.find(({ _id, type }) => _id === groupId && type === 'group'));
-
-	const filterSettings = (settings) => settings.filter(({ group }) => group === groupId);
-
-	const changed = useSelector((state) => filterSettings(state.settings).some(({ changed }) => changed));
-	const sections = useSelector((state) => Array.from(new Set(filterSettings(state.settings).map(({ section }) => section || ''))), (a, b) => a.length === b.length && a.join() === b.join());
-
-	const batchSetSettings = useBatchSettingsDispatch();
-	const { stateRef, hydrate } = useContext(SettingsContext);
-
-	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
-	const loadLanguage = useLoadLanguage();
-	const user = useUser();
-
-	const save = useMutableCallback(async () => {
-		const state = stateRef.current;
-		const settings = filterSettings(state.settings);
-
-		const changes = settings.filter(({ changed }) => changed)
-			.map(({ _id, value, editor }) => ({ _id, value, editor }));
-
-		if (changes.length === 0) {
-			return;
-		}
-
-		try {
-			await batchSetSettings(changes);
-
-			if (changes.some(({ _id }) => _id === 'Language')) {
-				const lng = user.language
-					|| changes.filter(({ _id }) => _id === 'Language').shift().value
-					|| 'en';
-
-				try {
-					await loadLanguage(lng);
-					dispatchToastMessage({ type: 'success', message: t('Settings_updated', { lng }) });
-				} catch (error) {
-					dispatchToastMessage({ type: 'error', message: error });
-				}
-				return;
-			}
-
-			dispatchToastMessage({ type: 'success', message: t('Settings_updated') });
-		} catch (error) {
-			dispatchToastMessage({ type: 'error', message: error });
-		}
-	});
-
-	const cancel = useMutableCallback(() => {
-		const state = stateRef.current;
-		const settings = filterSettings(state.settings);
-		const persistedSettings = filterSettings(state.persistedSettings);
-
-		const changes = settings.filter(({ changed }) => changed)
-			.map((field) => {
-				const { _id, value, editor } = persistedSettings.find(({ _id }) => _id === field._id);
-				return { _id, value, editor, changed: false };
-			});
-
-		hydrate(changes);
-	});
-
-	return group && { ...group, sections, changed, save, cancel };
-};
-
-export const useSection = (groupId, sectionName) => {
-	sectionName = sectionName || '';
-
-	const filterSettings = (settings) =>
-		settings.filter(({ group, section }) => group === groupId && ((!sectionName && !section) || (sectionName === section)));
-
-	const canReset = useSelector((state) => filterSettings(state.settings).some(({ value, packageValue }) => JSON.stringify(value) !== JSON.stringify(packageValue)));
-	const settingsIds = useSelector((state) => filterSettings(state.settings).map(({ _id }) => _id), (a, b) => a.length === b.length && a.join() === b.join());
-
-	const { stateRef, hydrate, isDisabled } = useContext(SettingsContext);
-
-	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);
-
-		const changes = settings.map((setting) => {
-			const { _id, value, packageValue, packageEditor } = persistedSettings.find(({ _id }) => _id === setting._id);
-			return {
-				_id,
-				value: packageValue,
-				editor: packageEditor,
-				changed: JSON.stringify(packageValue) !== JSON.stringify(value),
-			};
-		});
-
-		hydrate(changes);
-	});
-
-	return {
-		name: sectionName,
-		canReset,
-		settings: settingsIds,
-		reset,
-	};
-};
-
-export const useSettingActions = (persistedSetting) => {
-	const { hydrate } = useContext(SettingsContext);
-
-	const update = useDebouncedCallback(({ value, editor }) => {
-		const changes = [{
-			_id: persistedSetting._id,
-			...value !== undefined && { value },
-			...editor !== undefined && { editor },
-			changed: JSON.stringify(persistedSetting.value) !== JSON.stringify(value) || JSON.stringify(editor) !== JSON.stringify(persistedSetting.editor),
-		}];
-
-		hydrate(changes);
-	}, 100, [hydrate, persistedSetting]);
-
-	const reset = useDebouncedCallback(() => {
-		const { _id, value, packageValue, packageEditor, editor } = persistedSetting;
-
-		const changes = [{
-			_id,
-			value: packageValue,
-			editor: packageEditor,
-			changed: JSON.stringify(packageValue) !== JSON.stringify(value) || JSON.stringify(packageEditor) !== JSON.stringify(editor),
-		}];
-
-		hydrate(changes);
-	}, 100, [hydrate, persistedSetting]);
-
-	return { update, reset };
-};
-
-export const useSettingDisabledState = ({ blocked, enableQuery }) => {
-	const { isDisabled } = useContext(SettingsContext);
-	return useReactiveValue(() => isDisabled({ blocked, enableQuery }), [blocked, enableQuery]);
-};
-
-export const useSectionChangedState = (groupId, sectionName) =>
-	useSelector((state) =>
-		state.settings.some(({ group, section, changed }) =>
-			group === groupId && ((!sectionName && !section) || (sectionName === section)) && changed));
-
-export const useSetting = (_id) => {
-	const selectSetting = (settings) => settings.find((setting) => setting._id === _id);
-
-	const setting = useSelector((state) => selectSetting(state.settings));
-	const persistedSetting = useSelector((state) => selectSetting(state.persistedSettings));
-
-	const { update, reset } = useSettingActions(persistedSetting);
-	const disabled = useSettingDisabledState(persistedSetting);
-
-	return {
-		...setting,
-		disabled,
-		update,
-		reset,
-	};
-};
+export {
+	usePrivateSettingsGroup as useGroup,
+	usePrivateSettingsSection as useSection,
+	usePrivateSettingActions as useSettingActions,
+	usePrivateSettingDisabledState as useSettingDisabledState,
+	usePrivateSettingsSectionChangedState as useSectionChangedState,
+	usePrivateSetting as useSetting,
+} from '../../contexts/PrivateSettingsContext';
diff --git a/client/admin/settings/groups/OAuthGroupPage.js b/client/admin/settings/groups/OAuthGroupPage.js
index a8c9ab2d0be..7d5f6608086 100644
--- a/client/admin/settings/groups/OAuthGroupPage.js
+++ b/client/admin/settings/groups/OAuthGroupPage.js
@@ -2,11 +2,10 @@ import { Button } from '@rocket.chat/fuselage';
 import React from 'react';
 import s from 'underscore.string';
 
-import RawText from '../../../components/basic/RawText';
+import { useModal } from '../../../contexts/ModalContext';
 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';
 
@@ -92,7 +91,7 @@ export function OAuthGroupPage({ _id, sections, ...group }) {
 				return <Section
 					key={sectionName}
 					groupId={_id}
-					help={<RawText>{t('Custom_oauth_helper', callbackURL(sectionName))}</RawText>}
+					help={<span dangerouslySetInnerHTML={{ __html: t('Custom_oauth_helper', callbackURL(sectionName)) }} />}
 					sectionName={sectionName}
 					solo={solo}
 				>
diff --git a/client/admin/users/UserInfo.js b/client/admin/users/UserInfo.js
index 538d308705d..b5f74a9719e 100644
--- a/client/admin/users/UserInfo.js
+++ b/client/admin/users/UserInfo.js
@@ -71,7 +71,7 @@ export function UserInfo({ data, onChange, ...props }) {
 		<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' withTruncatedTex flexShrink={0}t>
 			<Margins blockEnd='x4'>
-				{data.bio && data.bio.trim().length > 0 && <Box withTruncatedText> <MarkdownText fontScale='s1'>{data.bio}</MarkdownText></Box>}
+				{data.bio && data.bio.trim().length > 0 && <MarkdownText withTruncatedText fontScale='s1' content={data.bio} />}
 				{!!data.roles.length && <>
 					<Box fontScale='micro' color='hint' mbs='none'>{t('Roles')}</Box>
 					<Box display='flex' flexDirection='row' flexWrap='wrap'>
diff --git a/client/admin/viewLogs/ViewLogs.js b/client/admin/viewLogs/ViewLogs.js
index 361227edc5b..e7445d9eca3 100644
--- a/client/admin/viewLogs/ViewLogs.js
+++ b/client/admin/viewLogs/ViewLogs.js
@@ -3,7 +3,6 @@ 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';
@@ -212,7 +211,7 @@ function ViewLogs() {
 						onScroll={handleScroll}
 					>
 						{lines.sort((a, b) => a.ts - b.ts).map(({ string }, i) =>
-							<RawText key={i}>{ansispan(string)}</RawText>)}
+							<span key={i} dangerouslySetInnerHTML={{ __html: ansispan(string) }} />)}
 					</Box>
 				</Scrollable>
 				<Box
diff --git a/client/components/basic/BurgerMenuButton.css b/client/components/basic/BurgerMenuButton.css
deleted file mode 100644
index c9a50467515..00000000000
--- a/client/components/basic/BurgerMenuButton.css
+++ /dev/null
@@ -1,95 +0,0 @@
-.burger {
-	position: relative;
-
-	display: none;
-	visibility: hidden;
-
-	cursor: pointer;
-	transition: transform 0.2s ease-out 0.1s;
-	will-change: transform;
-
-	& .burger__line {
-		display: block;
-
-		width: 20px;
-		height: 2px;
-		margin: 5px 0;
-
-		transition: transform 0.2s ease-out;
-
-		opacity: 0.8;
-
-		background-color: var(--rc-color-primary);
-	}
-
-	/* TODO: unread-burger-alert -> burger__unread-badge */
-	& .unread-burger-alert {
-		position: absolute;
-		z-index: 3;
-		bottom: 13px;
-		left: 10px;
-
-		min-width: 18px;
-		height: 18px;
-		padding: 0 4px;
-
-		text-align: center;
-
-		color: var(--rc-color-content);
-
-		border-radius: 20px;
-		background-color: var(--rc-color-error-light);
-
-		font-size: 12px;
-		font-weight: bold;
-		line-height: 18px;
-	}
-
-	/* TODO: .menu-opened -> .burger--open */
-	&.menu-opened .burger__line {
-		&:nth-child(1),
-		&:nth-child(3) {
-			transform-origin: 50%, 50%, 0;
-
-			opacity: 1;
-		}
-
-		&:nth-child(1) {
-			transform: translate(-25%, 3px) rotate(-45deg) scale(0.5, 1);
-		}
-
-		&:nth-child(3) {
-			transform: translate(-25%, -3px) rotate(45deg) scale(0.5, 1);
-		}
-	}
-
-	.rtl & {
-		right: 0;
-		left: auto;
-
-		margin-right: 7px;
-		margin-left: auto;
-
-		& .unread-burger-alert {
-			right: auto;
-			left: 4px;
-		}
-
-		&.menu-opened .burger__line {
-			&:nth-child(1) {
-				transform: translate(25%, 3px) rotate(45deg) scale(0.5, 1);
-			}
-
-			&:nth-child(3) {
-				transform: translate(25%, -3px) rotate(-45deg) scale(0.5, 1);
-			}
-		}
-	}
-}
-
-@media (max-width: 780px) {
-	.burger {
-		display: inline-block;
-		visibility: visible;
-	}
-}
diff --git a/client/components/basic/BurgerMenuButton.js b/client/components/basic/BurgerMenuButton.js
deleted file mode 100644
index 6c091b7f053..00000000000
--- a/client/components/basic/BurgerMenuButton.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Box } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import './BurgerMenuButton.css';
-import { useSession } from '../../contexts/SessionContext';
-import { useSidebar } from '../../contexts/SidebarContext';
-import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
-
-export const BurgerMenuButton = (props) => {
-	const [isSidebarOpen, setSidebarOpen] = useSidebar();
-	const isLayoutEmbedded = useEmbeddedLayout();
-	const unreadMessagesBadge = useSession('unread');
-
-	const handleClick = () => {
-		setSidebarOpen(!isSidebarOpen);
-	};
-
-	return <Box
-		is='button'
-		aria-label={isSidebarOpen ? 'Close menu' : 'Open menu'}
-		className={[
-			'rc-old',
-			'burger',
-			!!isSidebarOpen && 'menu-opened',
-		].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' />
-		<Box is='i' className='burger__line' aria-hidden='true' />
-		{!isLayoutEmbedded && unreadMessagesBadge
-		&& <Box className='unread-burger-alert color-error-contrast background-error-color'>
-			{unreadMessagesBadge}
-		</Box>}
-	</Box>;
-};
diff --git a/client/components/basic/BurgerMenuButton.stories.js b/client/components/basic/BurgerMenuButton.stories.js
deleted file mode 100644
index d143ba49050..00000000000
--- a/client/components/basic/BurgerMenuButton.stories.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { action } from '@storybook/addon-actions';
-import { boolean, text } from '@storybook/addon-knobs/react';
-import React from 'react';
-
-import { BurgerMenuButton } from './BurgerMenuButton';
-import { SidebarContext } from '../../contexts/SidebarContext';
-import { SessionContext } from '../../contexts/SessionContext';
-
-export default {
-	title: 'basic/BurgerMenuButton',
-	component: BurgerMenuButton,
-	decorators: [(fn) => <div style={{ margin: '1rem' }}>{fn()}</div>],
-	parameters: {
-		viewport: { defaultViewport: 'mobile1' },
-	},
-};
-
-export const _default = () => <BurgerMenuButton
-	isSidebarOpen={boolean('isSidebarOpen')}
-	isLayoutEmbedded={boolean('isLayoutEmbedded')}
-	unreadMessagesBadge={text('unreadMessagesBadge')}
-	onClick={action('click')}
-/>;
-_default.story = {
-	decorators: [
-		(fn) => <SidebarContext.Provider children={fn()} value={[false, action('setSidebarOpen')]} />,
-	],
-};
-
-export const whenSidebarOpen = () => <BurgerMenuButton />;
-whenSidebarOpen.story = {
-	decorators: [
-		(fn) => <SidebarContext.Provider children={fn()} value={[true, action('setSidebarOpen')]} />,
-	],
-};
-
-export const unreadMessagesBadge = () => <BurgerMenuButton />;
-unreadMessagesBadge.story = {
-	decorators: [
-		(fn) => <SessionContext.Provider value={{
-			get: (name) => name === 'unread' && '99',
-		}}>
-			<SidebarContext.Provider children={fn()} value={[false, action('setSidebarOpen')]} />
-		</SessionContext.Provider>,
-	],
-};
diff --git a/client/components/setupWizard/Logo.js b/client/components/basic/Logo.js
similarity index 97%
rename from client/components/setupWizard/Logo.js
rename to client/components/basic/Logo.js
index 7e05f231993..70b6dc3e57e 100644
--- a/client/components/setupWizard/Logo.js
+++ b/client/components/basic/Logo.js
@@ -3,6 +3,7 @@ import React, { useState } from 'react';
 
 function Logo({ src = 'images/logo/logo.svg', ...props }) {
 	const [isLoaded, setLoaded] = useState(false);
+	const isPlaceholderVisible = !src || !isLoaded;
 
 	const handleLoad = () => {
 		setLoaded(true);
@@ -13,7 +14,7 @@ function Logo({ src = 'images/logo/logo.svg', ...props }) {
 	};
 
 	return <>
-		{!isLoaded && <Box is='svg' viewBox='0 0 1000 182' xmlns='http://www.w3.org/2000/svg' {...props}>
+		{isPlaceholderVisible && <Box {...props} is='svg' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1000 182'>
 			<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'/>
@@ -33,7 +34,7 @@ function Logo({ src = 'images/logo/logo.svg', ...props }) {
 				<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>
 		</Box>}
-		<Box is='img' src={src} hidden={!isLoaded} onLoad={handleLoad} onError={handleError} {...props} />
+		{src && <Box {...props} is='img' src={src} hidden={!isLoaded} onLoad={handleLoad} onError={handleError} />}
 	</>;
 }
 
diff --git a/client/components/setupWizard/Logo.stories.js b/client/components/basic/Logo.stories.js
similarity index 54%
rename from client/components/setupWizard/Logo.stories.js
rename to client/components/basic/Logo.stories.js
index d0f1fb645f3..c978daa5116 100644
--- a/client/components/setupWizard/Logo.stories.js
+++ b/client/components/basic/Logo.stories.js
@@ -3,8 +3,8 @@ import React from 'react';
 import Logo from './Logo';
 
 export default {
-	title: 'setupWizard/Logo',
+	title: 'components/basic/Logo',
 	component: Logo,
 };
 
-export const _default = () => <Logo />;
+export const AsPlaceholder = () => <Logo />;
diff --git a/client/components/basic/MarkdownText.js b/client/components/basic/MarkdownText.js
index 991e072f356..df6b1dc9172 100644
--- a/client/components/basic/MarkdownText.js
+++ b/client/components/basic/MarkdownText.js
@@ -1,9 +1,19 @@
-import React from 'react';
+import { Box } from '@rocket.chat/fuselage';
+import React, { useMemo } from 'react';
+import marked from 'marked';
 
-import { Markdown } from '../../../app/markdown/client';
-import RawText from './RawText';
+marked.InlineLexer.rules.gfm.strong = /^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/;
+marked.InlineLexer.rules.gfm.em = /^__(?=\S)([\s\S]*?\S)__(?!_)|^_(?=\S)([\s\S]*?\S)_(?!_)/;
 
-const MarkdownText = ({ children }) =>
-	<RawText>{Markdown.parse(children)}</RawText>;
+function MarkdownText({ content, ...props }) {
+	const options = useMemo(() => ({
+		gfm: true,
+		headerIds: false,
+	}), []);
+
+	const __html = useMemo(() => marked(content, options), [content, options]);
+
+	return <Box dangerouslySetInnerHTML={{ __html }} withRichContent {...props} />;
+}
 
 export default MarkdownText;
diff --git a/client/components/basic/MarkdownText.stories.js b/client/components/basic/MarkdownText.stories.js
new file mode 100644
index 00000000000..1caf3e73578
--- /dev/null
+++ b/client/components/basic/MarkdownText.stories.js
@@ -0,0 +1,39 @@
+import React from 'react';
+
+import MarkdownText from './MarkdownText';
+
+export default {
+	title: 'components/basic/MarkdownText',
+	component: MarkdownText,
+};
+
+export const Example = () =>
+	<MarkdownText
+		content={`
+# h1 Heading
+## h2 Heading
+### h3 Heading
+#### h4 Heading
+##### h5 Heading
+###### h6 Heading
+
+___
+
+*This is bold text*
+
+_This is italic text_
+
+~Strikethrough~
+
++ Lorem ipsum dolor sit amet
++ Consectetur adipiscing elit
++ Integer molestie lorem at massa
+
+1. Lorem ipsum dolor sit amet
+2. Consectetur adipiscing elit
+3. Integer molestie lorem at massa
+
+\`rocket.chat();\`
+
+https://rocket.chat`}
+	/>;
diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js
index 0c11a99ac40..13853cc9c74 100644
--- a/client/components/basic/Page.js
+++ b/client/components/basic/Page.js
@@ -1,7 +1,10 @@
 import { Box, Scrollable } from '@rocket.chat/fuselage';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import React, { createContext, useContext, useState } from 'react';
 
-import { BurgerMenuButton } from './BurgerMenuButton';
+import { useSidebar } from '../../contexts/SidebarContext';
+import BurgerMenuButton from './burger/BurgerMenuButton';
+import { useSession } from '../../contexts/SessionContext';
 
 const PageContext = createContext();
 
@@ -23,6 +26,14 @@ function Page(props) {
 
 function PageHeader({ children, title, ...props }) {
 	const [border] = useContext(PageContext);
+	const hasBurgerMenuButton = useMediaQuery('(max-width: 780px)');
+	const [isSidebarOpen, setSidebarOpen] = useSidebar();
+	const unreadMessagesBadge = useSession('unread');
+
+	const handleBurgerMenuButtonClick = () => {
+		setSidebarOpen((isSidebarOpen) => !isSidebarOpen);
+	};
+
 	return <Box borderBlockEndWidth='x2' borderBlockEndColor={border ? 'neutral-200' : 'transparent'}>
 		<Box
 			marginBlock='x16'
@@ -34,7 +45,12 @@ function PageHeader({ children, title, ...props }) {
 			alignItems='center'
 			{...props}
 		>
-			<BurgerMenuButton marginInlineEnd='x8' />
+			{hasBurgerMenuButton && <BurgerMenuButton
+				open={isSidebarOpen}
+				badge={unreadMessagesBadge}
+				marginInlineEnd='x8'
+				onClick={handleBurgerMenuButtonClick}
+			/>}
 			<Box is='h1' fontScale='h1' flexGrow={1}>{title}</Box>
 			{children}
 		</Box>
diff --git a/client/components/basic/Page.stories.js b/client/components/basic/Page.stories.js
index a7869c96ced..3c9d24f1411 100644
--- a/client/components/basic/Page.stories.js
+++ b/client/components/basic/Page.stories.js
@@ -1,27 +1,27 @@
-import { Button, ButtonGroup, Margins, Tile } from '@rocket.chat/fuselage';
+import { Button, ButtonGroup, Tile } from '@rocket.chat/fuselage';
 import React from 'react';
 
+import { fullHeightDecorator } from '../../../.storybook/decorators';
 import Page from './Page';
 
 export default {
-	title: 'basic/Page',
+	title: 'components/basic/Page',
 	component: Page,
-	decorators: [
-		(fn) => <div className='rc-old'>{fn()}</div>,
-	],
 };
 
-export const _default = () =>
+const DummyContent = () => <>
+	{Array.from({ length: 60 }, (_, i) => <Tile key={i} children='Content slice' marginBlock='x16' />)}
+</>;
+
+export const Basic = () =>
 	<Page>
 		<Page.Header title='Header' />
 		<Page.Content>
-			<Margins block='x16'>
-				{Array.from({ length: 60 }, (_, i) => <Tile key={i} children='Content slice' />)}
-			</Margins>
+			<DummyContent />
 		</Page.Content>
 	</Page>;
 
-export const withButtonsAtTheHeader = () =>
+export const WithButtonsAtTheHeader = () =>
 	<Page>
 		<Page.Header title='Header'>
 			<ButtonGroup>
@@ -29,8 +29,28 @@ export const withButtonsAtTheHeader = () =>
 			</ButtonGroup>
 		</Page.Header>
 		<Page.Content>
-			<Margins block='x16'>
-				{Array.from({ length: 60 }, (_, i) => <Tile key={i} children='Content slice' />)}
-			</Margins>
+			<DummyContent />
 		</Page.Content>
 	</Page>;
+
+export const WithScrollableContent = () =>
+	<Page>
+		<Page.Header title='Header' />
+		<Page.ScrollableContent>
+			<DummyContent />
+		</Page.ScrollableContent>
+	</Page>;
+WithScrollableContent.story = {
+	decorators: [fullHeightDecorator],
+};
+
+export const WithScrollableContentWithShadow = () =>
+	<Page>
+		<Page.Header title='Header' />
+		<Page.ScrollableContentWithShadow>
+			<DummyContent />
+		</Page.ScrollableContentWithShadow>
+	</Page>;
+WithScrollableContentWithShadow.story = {
+	decorators: [fullHeightDecorator],
+};
diff --git a/client/components/basic/burger/BurgerBadge.js b/client/components/basic/burger/BurgerBadge.js
new file mode 100644
index 00000000000..8a9af978666
--- /dev/null
+++ b/client/components/basic/burger/BurgerBadge.js
@@ -0,0 +1,15 @@
+import { Badge } from '@rocket.chat/fuselage';
+import React from 'react';
+
+function BurgerBadge({ children }) {
+	return <Badge
+		position='absolute'
+		insetInlineEnd='neg-x8'
+		insetBlockStart='neg-x4'
+		zIndex='3'
+		variant='danger'
+		children={children}
+	/>;
+}
+
+export default BurgerBadge;
diff --git a/client/components/basic/burger/BurgerBadge.stories.js b/client/components/basic/burger/BurgerBadge.stories.js
new file mode 100644
index 00000000000..f0c89f7bf60
--- /dev/null
+++ b/client/components/basic/burger/BurgerBadge.stories.js
@@ -0,0 +1,21 @@
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import BurgerBadge from './BurgerBadge';
+import { centeredDecorator } from '../../../../.storybook/decorators';
+
+export default {
+	title: 'components/basic/burger/BurgerBadge',
+	component: BurgerBadge,
+	decorators: [
+		(storyFn) => <Box size='x24' borderWidth='x1' borderStyle='dashed' position='relative'>
+			{storyFn()}
+		</Box>,
+		centeredDecorator,
+	],
+};
+
+export const Basic = () =>
+	<BurgerBadge>
+		99
+	</BurgerBadge>;
diff --git a/client/components/basic/burger/BurgerIcon.js b/client/components/basic/burger/BurgerIcon.js
new file mode 100644
index 00000000000..51549a99567
--- /dev/null
+++ b/client/components/basic/burger/BurgerIcon.js
@@ -0,0 +1,69 @@
+import { css } from '@rocket.chat/css-in-js';
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { useIsReducedMotionPreferred } from '../../../hooks/useIsReducedMotionPreferred';
+
+const Wrapper = ({ children }) =>
+	<Box
+		is='span'
+		display='inline-flex'
+		flexDirection='column'
+		alignItems='center'
+		justifyContent='space-between'
+		size='x24'
+		paddingBlock='x4'
+		paddingInline='x2'
+		verticalAlign='middle'
+		children={children}
+	/>;
+
+const Line = ({ animated, moved }) =>
+	<Box
+		is='span'
+		width='x20'
+		height='x2'
+		backgroundColor='currentColor'
+		className={[
+			animated && css`
+				will-change: transform;
+				transition: transform 0.2s ease-out;
+			`,
+			moved && css`
+				&:nth-child(1),
+				&:nth-child(3) {
+					transform-origin: 50%, 50%, 0;
+				}
+
+				&:nth-child(1) {
+					transform: translate(-25%, 3px) rotate(-45deg) scale(0.5, 1);
+				}
+
+				[dir=rtl] &:nth-child(1) {
+					transform: translate(25%, 3px) rotate(45deg) scale(0.5, 1);
+				}
+
+				&:nth-child(3) {
+					transform: translate(-25%, -3px) rotate(45deg) scale(0.5, 1);
+				}
+
+				[dir=rtl] &:nth-child(3) {
+					transform: translate(25%, -3px) rotate(-45deg) scale(0.5, 1);
+				}
+			`,
+		]}
+		aria-hidden='true'
+	/>;
+
+function BurgerIcon({ children, open }) {
+	const isReducedMotionPreferred = useIsReducedMotionPreferred();
+
+	return <Wrapper>
+		<Line animated={!isReducedMotionPreferred} moved={open} />
+		<Line animated={!isReducedMotionPreferred} moved={open} />
+		<Line animated={!isReducedMotionPreferred} moved={open} />
+		{children}
+	</Wrapper>;
+}
+
+export default BurgerIcon;
diff --git a/client/components/basic/burger/BurgerIcon.stories.js b/client/components/basic/burger/BurgerIcon.stories.js
new file mode 100644
index 00000000000..553f6c9e091
--- /dev/null
+++ b/client/components/basic/burger/BurgerIcon.stories.js
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { centeredDecorator } from '../../../../.storybook/decorators';
+import { useAutoToggle } from '../../../../.storybook/hooks';
+import BurgerIcon from './BurgerIcon';
+
+export default {
+	title: 'components/basic/burger/BurgerIcon',
+	component: BurgerIcon,
+	decorators: [
+		centeredDecorator,
+	],
+};
+
+export const Normal = () =>
+	<BurgerIcon />;
+
+export const Open = () =>
+	<BurgerIcon open />;
+
+export const Transitioning = () =>
+	<BurgerIcon open={useAutoToggle()} />;
diff --git a/client/components/basic/burger/BurgerMenuButton.js b/client/components/basic/burger/BurgerMenuButton.js
new file mode 100644
index 00000000000..221a3919ca1
--- /dev/null
+++ b/client/components/basic/burger/BurgerMenuButton.js
@@ -0,0 +1,27 @@
+import { css } from '@rocket.chat/css-in-js';
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { useTranslation } from '../../../contexts/TranslationContext';
+import { useEmbeddedLayout } from '../../../hooks/useEmbeddedLayout';
+import BurgerIcon from './BurgerIcon';
+import BurgerBadge from './BurgerBadge';
+
+function BurgerMenuButton({ open, badge, ...props }) {
+	const isLayoutEmbedded = useEmbeddedLayout();
+	const t = useTranslation();
+
+	return <Box
+		is='button'
+		aria-label={open ? t('Close menu') : t('Open menu')}
+		type='button'
+		position='relative'
+		className={css`cursor: pointer;`}
+		{...props}
+	>
+		<BurgerIcon open={open} />
+		{!isLayoutEmbedded && badge && <BurgerBadge>{badge}</BurgerBadge>}
+	</Box>;
+}
+
+export default BurgerMenuButton;
diff --git a/client/components/basic/burger/BurgerMenuButton.stories.js b/client/components/basic/burger/BurgerMenuButton.stories.js
new file mode 100644
index 00000000000..42eb5427442
--- /dev/null
+++ b/client/components/basic/burger/BurgerMenuButton.stories.js
@@ -0,0 +1,22 @@
+import { action } from '@storybook/addon-actions';
+import React from 'react';
+
+import { centeredDecorator } from '../../../../.storybook/decorators';
+import BurgerMenuButton from './BurgerMenuButton';
+
+export default {
+	title: 'components/basic/burger/BurgerMenuButton',
+	component: BurgerMenuButton,
+	decorators: [
+		centeredDecorator,
+	],
+};
+
+export const Basic = () =>
+	<BurgerMenuButton onClick={action('click')} />;
+
+export const Open = () =>
+	<BurgerMenuButton open onClick={action('click')} />;
+
+export const WithBadge = () =>
+	<BurgerMenuButton badge='99' onClick={action('click')} />;
diff --git a/client/components/connectionStatus/ConnectionStatusAlert.js b/client/components/connectionStatus/ConnectionStatusAlert.js
index 1f381784c20..c70e631e6fb 100644
--- a/client/components/connectionStatus/ConnectionStatusAlert.js
+++ b/client/components/connectionStatus/ConnectionStatusAlert.js
@@ -37,7 +37,7 @@ const useReconnectCountdown = (retryTime, status) => {
 	return reconnectCountdown;
 };
 
-export function ConnectionStatusAlert() {
+function ConnectionStatusAlert() {
 	const { connected, retryTime, status, reconnect } = useConnectionStatus();
 	const reconnectCountdown = useReconnectCountdown(retryTime, status);
 	const t = useTranslation();
@@ -69,3 +69,5 @@ export function ConnectionStatusAlert() {
 		</>}
 	</div>;
 }
+
+export default ConnectionStatusAlert;
diff --git a/client/components/connectionStatus/ConnectionStatusAlert.stories.js b/client/components/connectionStatus/ConnectionStatusAlert.stories.js
index 7aa78e8c619..47974d5f9d2 100644
--- a/client/components/connectionStatus/ConnectionStatusAlert.stories.js
+++ b/client/components/connectionStatus/ConnectionStatusAlert.stories.js
@@ -2,65 +2,59 @@ import { action } from '@storybook/addon-actions';
 import React from 'react';
 
 import { ConnectionStatusContext } from '../../contexts/ConnectionStatusContext';
-import { ConnectionStatusAlert } from './ConnectionStatusAlert';
+import ConnectionStatusAlert from './ConnectionStatusAlert';
+
+const stateDecorator = ({
+	status = 'connected',
+} = {}) =>
+	(storyFn) =>
+		<ConnectionStatusContext.Provider
+			value={{
+				connected: status === 'connected',
+				status,
+				retryTime: status === 'waiting' && Date.now() + 300000,
+				reconnect: action('reconnect'),
+			}}
+		>
+			{storyFn()}
+		</ConnectionStatusContext.Provider>;
 
 export default {
-	title: 'connectionStatus/ConnectionStatusAlert',
+	title: 'components/connectionStatus/ConnectionStatusAlert',
 	component: ConnectionStatusAlert,
 };
 
-export const connected = () => <ConnectionStatusAlert />;
-connected.story = {
+export const Connected = () => <ConnectionStatusAlert />;
+Connected.story = {
 	decorators: [
-		(fn) => <ConnectionStatusContext.Provider children={fn()} value={{
-			connected: true,
-			status: 'connected',
-			reconnect: action('reconnect'),
-		}} />,
+		stateDecorator(),
 	],
 };
 
-export const connecting = () => <ConnectionStatusAlert />;
-connecting.story = {
+export const Connecting = () => <ConnectionStatusAlert />;
+Connecting.story = {
 	decorators: [
-		(fn) => <ConnectionStatusContext.Provider children={fn()} value={{
-			connected: false,
-			status: 'connecting',
-			reconnect: action('reconnect'),
-		}} />,
+		stateDecorator({ status: 'connecting' }),
 	],
 };
 
-export const failed = () => <ConnectionStatusAlert />;
-failed.story = {
+export const Failed = () => <ConnectionStatusAlert />;
+Failed.story = {
 	decorators: [
-		(fn) => <ConnectionStatusContext.Provider children={fn()} value={{
-			connected: false,
-			status: 'failed',
-			reconnect: action('reconnect'),
-		}} />,
+		stateDecorator({ status: 'failed' }),
 	],
 };
 
-export const waiting = () => <ConnectionStatusAlert />;
-waiting.story = {
+export const Waiting = () => <ConnectionStatusAlert />;
+Waiting.story = {
 	decorators: [
-		(fn) => <ConnectionStatusContext.Provider children={fn()} value={{
-			connected: false,
-			status: 'waiting',
-			retryTime: Date.now() + 300000,
-			reconnect: action('reconnect'),
-		}} />,
+		stateDecorator({ status: 'waiting' }),
 	],
 };
 
-export const offline = () => <ConnectionStatusAlert />;
-offline.story = {
+export const Offline = () => <ConnectionStatusAlert />;
+Offline.story = {
 	decorators: [
-		(fn) => <ConnectionStatusContext.Provider children={fn()} value={{
-			connected: false,
-			status: 'offline',
-			reconnect: action('reconnect'),
-		}} />,
+		stateDecorator({ status: 'offline' }),
 	],
 };
diff --git a/client/components/pageNotFound/PageNotFound.stories.js b/client/components/pageNotFound/PageNotFound.stories.js
deleted file mode 100644
index 592e41af076..00000000000
--- a/client/components/pageNotFound/PageNotFound.stories.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-
-import PageNotFound from './PageNotFound';
-
-export default {
-	title: 'pageNotFound/PageNotFound',
-	component: PageNotFound,
-};
-
-export const _default = () => <PageNotFound />;
diff --git a/client/contexts/ModalContext.ts b/client/contexts/ModalContext.ts
new file mode 100644
index 00000000000..bb7534f5353
--- /dev/null
+++ b/client/contexts/ModalContext.ts
@@ -0,0 +1,7 @@
+import { createContext, useContext } from 'react';
+
+type ModalContextValue = unknown;
+
+export const ModalContext = createContext<ModalContextValue>({});
+
+export const useModal = (): ModalContextValue => useContext(ModalContext);
diff --git a/client/contexts/PrivateSettingsContext.ts b/client/contexts/PrivateSettingsContext.ts
new file mode 100644
index 00000000000..e900175f542
--- /dev/null
+++ b/client/contexts/PrivateSettingsContext.ts
@@ -0,0 +1,249 @@
+import { useDebouncedCallback, useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { Tracker } from 'meteor/tracker';
+import { createContext, useContext, RefObject, useState, useEffect, useLayoutEffect } from 'react';
+
+import { useReactiveValue } from '../hooks/useReactiveValue';
+import { useBatchSettingsDispatch } from './SettingsContext';
+import { useToastMessageDispatch } from './ToastMessagesContext';
+import { useTranslation, useLoadLanguage } from './TranslationContext';
+import { useUser } from './UserContext';
+
+type Setting = object & {
+	_id: unknown;
+	type: string;
+	blocked: boolean;
+	enableQuery: unknown;
+	group: string;
+	section: string;
+	changed: boolean;
+	value: unknown;
+	packageValue: unknown;
+	packageEditor: unknown;
+	editor: unknown;
+	disabled?: boolean;
+	update?: () => void;
+	reset?: () => void;
+};
+
+type PrivateSettingsState = {
+	settings: Setting[];
+	persistedSettings: Setting[];
+};
+
+type EqualityFunction<T> = (a: T, b: T) => boolean;
+
+type PrivateSettingsContextValue = {
+	subscribers: Set<(state: PrivateSettingsState) => void>;
+	stateRef: RefObject<PrivateSettingsState>;
+	hydrate: (changes: any[]) => void;
+	isDisabled: (setting: Setting) => boolean;
+};
+
+export const PrivateSettingsContext = createContext<PrivateSettingsContextValue>({
+	subscribers: new Set<(state: PrivateSettingsState) => void>(),
+	stateRef: {
+		current: {
+			settings: [],
+			persistedSettings: [],
+		},
+	},
+	hydrate: () => undefined,
+	isDisabled: () => false,
+});
+
+const useSelector = <T>(
+	selector: (state: PrivateSettingsState) => T,
+	equalityFunction: EqualityFunction<T> = Object.is,
+): T | null => {
+	const { subscribers, stateRef } = useContext(PrivateSettingsContext);
+	const [value, setValue] = useState<T | null>(() => (stateRef.current ? selector(stateRef.current) : null));
+
+	const handleUpdate = useMutableCallback((state: PrivateSettingsState) => {
+		const newValue = selector(state);
+
+		if (!value || !equalityFunction(newValue, value)) {
+			setValue(newValue);
+		}
+	});
+
+	useEffect(() => {
+		subscribers.add(handleUpdate);
+
+		return (): void => {
+			subscribers.delete(handleUpdate);
+		};
+	}, [handleUpdate]);
+
+	useLayoutEffect(() => {
+		handleUpdate(stateRef.current);
+	});
+
+	return value;
+};
+
+export const usePrivateSettingsGroup = (groupId: string): any => {
+	const group = useSelector((state) => state.settings.find(({ _id, type }) => _id === groupId && type === 'group'));
+
+	const filterSettings = (settings: any[]): any[] => settings.filter(({ group }) => group === groupId);
+
+	const changed = useSelector((state) => filterSettings(state.settings).some(({ changed }) => changed));
+	const sections = useSelector((state) => Array.from(new Set(filterSettings(state.settings).map(({ section }) => section || ''))), (a, b) => a.length === b.length && a.join() === b.join());
+
+	const batchSetSettings = useBatchSettingsDispatch();
+	const { stateRef, hydrate } = useContext(PrivateSettingsContext);
+
+	const dispatchToastMessage = useToastMessageDispatch() as any;
+	const t = useTranslation() as (key: string, ...args: any[]) => string;
+	const loadLanguage = useLoadLanguage() as any;
+	const user = useUser() as any;
+
+	const save = useMutableCallback(async () => {
+		const state = stateRef.current;
+		const settings = filterSettings(state?.settings ?? []);
+
+		const changes = settings.filter(({ changed }) => changed)
+			.map(({ _id, value, editor }) => ({ _id, value, editor }));
+
+		if (changes.length === 0) {
+			return;
+		}
+
+		try {
+			await batchSetSettings(changes);
+
+			if (changes.some(({ _id }) => _id === 'Language')) {
+				const lng = user?.language
+					|| changes.filter(({ _id }) => _id === 'Language').shift()?.value
+					|| 'en';
+
+				try {
+					await loadLanguage(lng);
+					dispatchToastMessage({ type: 'success', message: t('Settings_updated', { lng }) });
+				} catch (error) {
+					dispatchToastMessage({ type: 'error', message: error });
+				}
+				return;
+			}
+
+			dispatchToastMessage({ type: 'success', message: t('Settings_updated') });
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		}
+	});
+
+	const cancel = useMutableCallback(() => {
+		const state = stateRef.current;
+		const settings = filterSettings(state?.settings ?? []);
+		const persistedSettings = filterSettings(state?.persistedSettings ?? []);
+
+		const changes = settings.filter(({ changed }) => changed)
+			.map((field) => {
+				const { _id, value, editor } = persistedSettings.find(({ _id }) => _id === field._id);
+				return { _id, value, editor, changed: false };
+			});
+
+		hydrate(changes);
+	});
+
+	return group && { ...group, sections, changed, save, cancel };
+};
+
+export const usePrivateSettingsSection = (groupId: string, sectionName?: string): any => {
+	sectionName = sectionName || '';
+
+	const filterSettings = (settings: any[]): any[] =>
+		settings.filter(({ group, section }) => group === groupId && ((!sectionName && !section) || (sectionName === section)));
+
+	const canReset = useSelector((state) => filterSettings(state.settings).some(({ value, packageValue }) => JSON.stringify(value) !== JSON.stringify(packageValue)));
+	const settingsIds = useSelector((state) => filterSettings(state.settings).map(({ _id }) => _id), (a, b) => a.length === b.length && a.join() === b.join());
+
+	const { stateRef, hydrate, isDisabled } = useContext(PrivateSettingsContext);
+
+	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 ?? []);
+
+		const changes = settings.map((setting) => {
+			const { _id, value, packageValue, packageEditor } = persistedSettings.find(({ _id }) => _id === setting._id);
+			return {
+				_id,
+				value: packageValue,
+				editor: packageEditor,
+				changed: JSON.stringify(packageValue) !== JSON.stringify(value),
+			};
+		});
+
+		hydrate(changes);
+	});
+
+	return {
+		name: sectionName,
+		canReset,
+		settings: settingsIds,
+		reset,
+	};
+};
+
+export const usePrivateSettingActions = (persistedSetting: Setting | null | undefined): {
+	update: () => void;
+	reset: () => void;
+} => {
+	const { hydrate } = useContext(PrivateSettingsContext);
+
+	const update = useDebouncedCallback(({ value, editor }) => {
+		const changes = [{
+			_id: persistedSetting?._id,
+			...value !== undefined && { value },
+			...editor !== undefined && { editor },
+			changed: JSON.stringify(persistedSetting?.value) !== JSON.stringify(value) || JSON.stringify(editor) !== JSON.stringify(persistedSetting?.editor),
+		}];
+
+		hydrate(changes);
+	}, 100, [hydrate, persistedSetting]) as () => void;
+
+	const reset = useDebouncedCallback(() => {
+		const changes = [{
+			_id: persistedSetting?._id,
+			value: persistedSetting?.packageValue,
+			editor: persistedSetting?.packageEditor,
+			changed: JSON.stringify(persistedSetting?.packageValue) !== JSON.stringify(persistedSetting?.value) || JSON.stringify(persistedSetting?.packageEditor) !== JSON.stringify(persistedSetting?.editor),
+		}];
+
+		hydrate(changes);
+	}, 100, [hydrate, persistedSetting]) as () => void;
+
+	return { update, reset };
+};
+
+export const usePrivateSettingDisabledState = (setting: Setting | null | undefined): boolean => {
+	const { isDisabled } = useContext(PrivateSettingsContext);
+	return useReactiveValue(() => (setting ? isDisabled(setting) : false), [setting?.blocked, setting?.enableQuery]) as unknown as boolean;
+};
+
+export const usePrivateSettingsSectionChangedState = (groupId: string, sectionName: string): boolean =>
+	!!useSelector((state) =>
+		state.settings.some(({ group, section, changed }) =>
+			group === groupId && ((!sectionName && !section) || (sectionName === section)) && changed));
+
+export const usePrivateSetting = (_id: string): Setting | null | undefined => {
+	const selectSetting = (settings: Setting[]): Setting | undefined => settings.find((setting) => setting._id === _id);
+
+	const setting = useSelector((state) => selectSetting(state.settings));
+	const persistedSetting = useSelector((state) => selectSetting(state.persistedSettings));
+
+	const { update, reset } = usePrivateSettingActions(persistedSetting);
+	const disabled = usePrivateSettingDisabledState(persistedSetting);
+
+	if (!setting) {
+		return null;
+	}
+
+	return {
+		...setting,
+		disabled,
+		update,
+		reset,
+	};
+};
diff --git a/client/fuselage-hooks.d.ts b/client/fuselage-hooks.d.ts
new file mode 100644
index 00000000000..2bef8fec95a
--- /dev/null
+++ b/client/fuselage-hooks.d.ts
@@ -0,0 +1,4 @@
+declare module '@rocket.chat/fuselage-hooks' {
+	export const useDebouncedCallback: (fn: (...args: any[]) => any, ms: number, deps: any[]) => (...args: any[]) => any;
+	export const useMutableCallback: (fn: (...args: any[]) => any) => (...args: any[]) => any;
+}
diff --git a/client/hooks/useIsReducedMotionPreferred.js b/client/hooks/useIsReducedMotionPreferred.js
new file mode 100644
index 00000000000..47ccaf545be
--- /dev/null
+++ b/client/hooks/useIsReducedMotionPreferred.js
@@ -0,0 +1,3 @@
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+
+export const useIsReducedMotionPreferred = () => useMediaQuery('(prefers-reduced-motion: reduce)');
diff --git a/client/hooks/useModal.js b/client/hooks/useModal.js
deleted file mode 100644
index 9af4cd81728..00000000000
--- a/client/hooks/useModal.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { modal } from '../../app/ui-utils/client/lib/modal';
-
-export const useModal = () => modal;
diff --git a/client/providers/MeteorProvider.js b/client/providers/MeteorProvider.js
index 482906b7c68..0ebb65d27b6 100644
--- a/client/providers/MeteorProvider.js
+++ b/client/providers/MeteorProvider.js
@@ -12,6 +12,7 @@ import { ToastMessagesProvider } from './ToastMessagesProvider';
 import { UserProvider } from './UserProvider';
 import { AvatarUrlProvider } from './AvatarUrlProvider';
 import { CustomSoundProvider } from './CustomSoundProvides';
+import ModalProvider from './ModalProvider';
 
 export function MeteorProvider({ children }) {
 	return <ConnectionStatusProvider>
@@ -21,17 +22,19 @@ export function MeteorProvider({ children }) {
 					<SessionProvider>
 						<SidebarProvider>
 							<ToastMessagesProvider>
-								<SettingsProvider>
-									<CustomSoundProvider>
-										<AvatarUrlProvider>
-											<UserProvider>
-												<AuthorizationProvider>
-													{children}
-												</AuthorizationProvider>
-											</UserProvider>
-										</AvatarUrlProvider>
-									</CustomSoundProvider>
-								</SettingsProvider>
+								<ModalProvider>
+									<SettingsProvider>
+										<CustomSoundProvider>
+											<AvatarUrlProvider>
+												<UserProvider>
+													<AuthorizationProvider>
+														{children}
+													</AuthorizationProvider>
+												</UserProvider>
+											</AvatarUrlProvider>
+										</CustomSoundProvider>
+									</SettingsProvider>
+								</ModalProvider>
 							</ToastMessagesProvider>
 						</SidebarProvider>
 					</SessionProvider>
diff --git a/client/providers/ModalProvider.js b/client/providers/ModalProvider.js
new file mode 100644
index 00000000000..aa34be165f8
--- /dev/null
+++ b/client/providers/ModalProvider.js
@@ -0,0 +1,10 @@
+import React from 'react';
+
+import { ModalContext } from '../contexts/ModalContext';
+import { modal } from '../../app/ui-utils/client/lib/modal';
+
+function ModalProvider({ children }) {
+	return <ModalContext.Provider children={children} value={modal} />;
+}
+
+export default ModalProvider;
diff --git a/client/routes.js b/client/routes.js
index 6c8a7d5c6f1..6a7602a2ac1 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -167,13 +167,13 @@ FlowRouter.route('/invite/:hash', {
 FlowRouter.route('/setup-wizard/:step?', {
 	name: 'setup-wizard',
 	action: () => {
-		renderRouteComponent(() => import('./components/setupWizard/SetupWizardRoute'));
+		renderRouteComponent(() => import('./views/setupWizard/SetupWizardRoute'));
 	},
 });
 
 FlowRouter.notFound = {
 	action: () => {
-		renderRouteComponent(() => import('./components/pageNotFound/PageNotFound'));
+		renderRouteComponent(() => import('./views/notFound/NotFoundPage'));
 	},
 };
 
diff --git a/client/components/pageNotFound/PageNotFound.js b/client/views/notFound/NotFoundPage.js
similarity index 91%
rename from client/components/pageNotFound/PageNotFound.js
rename to client/views/notFound/NotFoundPage.js
index 232ea63ac6c..64159a856b7 100644
--- a/client/components/pageNotFound/PageNotFound.js
+++ b/client/views/notFound/NotFoundPage.js
@@ -1,12 +1,12 @@
 import { Box, Button, ButtonGroup, Flex, Margins } from '@rocket.chat/fuselage';
 import React from 'react';
 
+import ConnectionStatusAlert from '../../components/connectionStatus/ConnectionStatusAlert';
 import { useRoute } from '../../contexts/RouterContext';
-import { useWipeInitialPageLoading } from '../../hooks/useWipeInitialPageLoading';
-import { ConnectionStatusAlert } from '../connectionStatus/ConnectionStatusAlert';
 import { useTranslation } from '../../contexts/TranslationContext';
+import { useWipeInitialPageLoading } from '../../hooks/useWipeInitialPageLoading';
 
-function PageNotFound() {
+function NotFoundPage() {
 	useWipeInitialPageLoading();
 
 	const t = useTranslation();
@@ -54,4 +54,4 @@ function PageNotFound() {
 	</>;
 }
 
-export default PageNotFound;
+export default NotFoundPage;
diff --git a/client/views/notFound/NotFoundPage.stories.js b/client/views/notFound/NotFoundPage.stories.js
new file mode 100644
index 00000000000..c399f1f7885
--- /dev/null
+++ b/client/views/notFound/NotFoundPage.stories.js
@@ -0,0 +1,10 @@
+import React from 'react';
+
+import NotFoundPage from './NotFoundPage';
+
+export default {
+	title: 'views/notFound/NotFoundPage',
+	component: NotFoundPage,
+};
+
+export const Default = () => <NotFoundPage />;
diff --git a/client/components/setupWizard/Pager.js b/client/views/setupWizard/Pager.js
similarity index 100%
rename from client/components/setupWizard/Pager.js
rename to client/views/setupWizard/Pager.js
diff --git a/client/components/setupWizard/Pager.stories.js b/client/views/setupWizard/Pager.stories.js
similarity index 94%
rename from client/components/setupWizard/Pager.stories.js
rename to client/views/setupWizard/Pager.stories.js
index 5bdfdb6cf0f..90ef496bb56 100644
--- a/client/components/setupWizard/Pager.stories.js
+++ b/client/views/setupWizard/Pager.stories.js
@@ -5,7 +5,7 @@ import React from 'react';
 import { Pager } from './Pager';
 
 export default {
-	title: 'setupWizard/Pager',
+	title: 'views/setupWizard/Pager',
 	component: Pager,
 };
 
diff --git a/client/components/setupWizard/SetupWizardPage.js b/client/views/setupWizard/SetupWizardPage.js
similarity index 95%
rename from client/components/setupWizard/SetupWizardPage.js
rename to client/views/setupWizard/SetupWizardPage.js
index 693034d1833..96770dd1640 100644
--- a/client/components/setupWizard/SetupWizardPage.js
+++ b/client/views/setupWizard/SetupWizardPage.js
@@ -4,7 +4,7 @@ import React from 'react';
 
 import { useTranslation } from '../../contexts/TranslationContext';
 import { useWipeInitialPageLoading } from '../../hooks/useWipeInitialPageLoading';
-import { ConnectionStatusAlert } from '../connectionStatus/ConnectionStatusAlert';
+import ConnectionStatusAlert from '../../components/connectionStatus/ConnectionStatusAlert';
 import { finalStep } from './SetupWizardState';
 import FinalStep from './steps/FinalStep';
 import SideBar from './SideBar';
diff --git a/client/components/setupWizard/SetupWizardPage.stories.js b/client/views/setupWizard/SetupWizardPage.stories.js
similarity index 92%
rename from client/components/setupWizard/SetupWizardPage.stories.js
rename to client/views/setupWizard/SetupWizardPage.stories.js
index 91ee0c9084a..6ece80137d9 100644
--- a/client/components/setupWizard/SetupWizardPage.stories.js
+++ b/client/views/setupWizard/SetupWizardPage.stories.js
@@ -4,7 +4,7 @@ import SetupWizardPage from './SetupWizardPage';
 import { finalStep } from './SetupWizardState';
 
 export default {
-	title: 'setupWizard/SetupWizardPage',
+	title: 'views/setupWizard/SetupWizardPage',
 	component: SetupWizardPage,
 };
 
diff --git a/client/components/setupWizard/SetupWizardRoute.js b/client/views/setupWizard/SetupWizardRoute.js
similarity index 100%
rename from client/components/setupWizard/SetupWizardRoute.js
rename to client/views/setupWizard/SetupWizardRoute.js
diff --git a/client/components/setupWizard/SetupWizardState.js b/client/views/setupWizard/SetupWizardState.js
similarity index 100%
rename from client/components/setupWizard/SetupWizardState.js
rename to client/views/setupWizard/SetupWizardState.js
diff --git a/client/components/setupWizard/SideBar.css b/client/views/setupWizard/SideBar.css
similarity index 100%
rename from client/components/setupWizard/SideBar.css
rename to client/views/setupWizard/SideBar.css
diff --git a/client/components/setupWizard/SideBar.js b/client/views/setupWizard/SideBar.js
similarity index 97%
rename from client/components/setupWizard/SideBar.js
rename to client/views/setupWizard/SideBar.js
index 11ea598ab14..7c5e7b88f9b 100644
--- a/client/components/setupWizard/SideBar.js
+++ b/client/views/setupWizard/SideBar.js
@@ -3,7 +3,7 @@ import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import React from 'react';
 
 import { useTranslation } from '../../contexts/TranslationContext';
-import Logo from './Logo';
+import Logo from '../../components/basic/Logo';
 import './SideBar.css';
 
 function SideBar({
diff --git a/client/components/setupWizard/SideBar.stories.js b/client/views/setupWizard/SideBar.stories.js
similarity index 96%
rename from client/components/setupWizard/SideBar.stories.js
rename to client/views/setupWizard/SideBar.stories.js
index 4542505ba24..7de95b73293 100644
--- a/client/components/setupWizard/SideBar.stories.js
+++ b/client/views/setupWizard/SideBar.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import SideBar from './SideBar';
 
 export default {
-	title: 'setupWizard/SideBar',
+	title: 'views/setupWizard/SideBar',
 	component: SideBar,
 };
 
diff --git a/client/components/setupWizard/Step.css b/client/views/setupWizard/Step.css
similarity index 100%
rename from client/components/setupWizard/Step.css
rename to client/views/setupWizard/Step.css
diff --git a/client/components/setupWizard/Step.js b/client/views/setupWizard/Step.js
similarity index 100%
rename from client/components/setupWizard/Step.js
rename to client/views/setupWizard/Step.js
diff --git a/client/components/setupWizard/StepHeader.js b/client/views/setupWizard/StepHeader.js
similarity index 100%
rename from client/components/setupWizard/StepHeader.js
rename to client/views/setupWizard/StepHeader.js
diff --git a/client/components/setupWizard/StepHeader.stories.js b/client/views/setupWizard/StepHeader.stories.js
similarity index 87%
rename from client/components/setupWizard/StepHeader.stories.js
rename to client/views/setupWizard/StepHeader.stories.js
index ece0dba6ee9..f4a6a8fb347 100644
--- a/client/components/setupWizard/StepHeader.stories.js
+++ b/client/views/setupWizard/StepHeader.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { StepHeader } from './StepHeader';
 
 export default {
-	title: 'setupWizard/StepHeader',
+	title: 'views/setupWizard/StepHeader',
 	component: StepHeader,
 };
 
diff --git a/client/components/setupWizard/steps/AdminUserInformationStep.js b/client/views/setupWizard/steps/AdminUserInformationStep.js
similarity index 100%
rename from client/components/setupWizard/steps/AdminUserInformationStep.js
rename to client/views/setupWizard/steps/AdminUserInformationStep.js
diff --git a/client/components/setupWizard/steps/AdminUserInformationStep.stories.js b/client/views/setupWizard/steps/AdminUserInformationStep.stories.js
similarity index 87%
rename from client/components/setupWizard/steps/AdminUserInformationStep.stories.js
rename to client/views/setupWizard/steps/AdminUserInformationStep.stories.js
index 717de3b9b31..e7869d5a3ff 100644
--- a/client/components/setupWizard/steps/AdminUserInformationStep.stories.js
+++ b/client/views/setupWizard/steps/AdminUserInformationStep.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import AdminUserInformationStep from './AdminUserInformationStep';
 
 export default {
-	title: 'setupWizard/steps/AdminUserInformationStep',
+	title: 'views/setupWizard/steps/AdminUserInformationStep',
 	component: AdminUserInformationStep,
 };
 
diff --git a/client/components/setupWizard/steps/FinalStep.js b/client/views/setupWizard/steps/FinalStep.js
similarity index 100%
rename from client/components/setupWizard/steps/FinalStep.js
rename to client/views/setupWizard/steps/FinalStep.js
diff --git a/client/components/setupWizard/steps/FinalStep.stories.js b/client/views/setupWizard/steps/FinalStep.stories.js
similarity index 82%
rename from client/components/setupWizard/steps/FinalStep.stories.js
rename to client/views/setupWizard/steps/FinalStep.stories.js
index c3169224cf6..dc01e5b7e3b 100644
--- a/client/components/setupWizard/steps/FinalStep.stories.js
+++ b/client/views/setupWizard/steps/FinalStep.stories.js
@@ -3,7 +3,7 @@ import React from 'react';
 import FinalStep from './FinalStep';
 
 export default {
-	title: 'setupWizard/steps/FinalStep',
+	title: 'views/setupWizard/steps/FinalStep',
 	component: FinalStep,
 };
 
diff --git a/client/components/setupWizard/steps/RegisterServerStep.js b/client/views/setupWizard/steps/RegisterServerStep.js
similarity index 100%
rename from client/components/setupWizard/steps/RegisterServerStep.js
rename to client/views/setupWizard/steps/RegisterServerStep.js
diff --git a/client/components/setupWizard/steps/RegisterServerStep.stories.js b/client/views/setupWizard/steps/RegisterServerStep.stories.js
similarity index 87%
rename from client/components/setupWizard/steps/RegisterServerStep.stories.js
rename to client/views/setupWizard/steps/RegisterServerStep.stories.js
index 9d06067a69d..c263ea525f3 100644
--- a/client/components/setupWizard/steps/RegisterServerStep.stories.js
+++ b/client/views/setupWizard/steps/RegisterServerStep.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import RegisterServerStep from './RegisterServerStep';
 
 export default {
-	title: 'setupWizard/steps/RegisterServerStep',
+	title: 'views/setupWizard/steps/RegisterServerStep',
 	component: RegisterServerStep,
 };
 
diff --git a/client/components/setupWizard/steps/SettingsBasedStep.js b/client/views/setupWizard/steps/SettingsBasedStep.js
similarity index 100%
rename from client/components/setupWizard/steps/SettingsBasedStep.js
rename to client/views/setupWizard/steps/SettingsBasedStep.js
diff --git a/client/components/setupWizard/steps/SettingsBasedStep.stories.js b/client/views/setupWizard/steps/SettingsBasedStep.stories.js
similarity index 87%
rename from client/components/setupWizard/steps/SettingsBasedStep.stories.js
rename to client/views/setupWizard/steps/SettingsBasedStep.stories.js
index 6c0515d9e0d..d66959ab279 100644
--- a/client/components/setupWizard/steps/SettingsBasedStep.stories.js
+++ b/client/views/setupWizard/steps/SettingsBasedStep.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import SettingsBasedStep from './SettingsBasedStep';
 
 export default {
-	title: 'setupWizard/steps/SettingsBasedStep',
+	title: 'views/setupWizard/steps/SettingsBasedStep',
 	component: SettingsBasedStep,
 };
 
diff --git a/ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js b/ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js
index c9878245fdf..b7603d0e5ae 100644
--- a/ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js
+++ b/ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { ChannelsTab } from '.';
 
 export default {
-	title: 'admin/engagement/ChannelsTab',
+	title: 'admin/enterprise/engagement/ChannelsTab',
 	component: ChannelsTab,
 	decorators: [
 		(fn) => <Margins children={fn()} all='x24' />,
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js
index 0ac38d641bf..f8b0af335c0 100644
--- a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { EngagementDashboardPage } from './EngagementDashboardPage';
 
 export default {
-	title: 'admin/engagement/EngagementDashboardPage',
+	title: 'admin/enterprise/engagement/EngagementDashboardPage',
 	component: EngagementDashboardPage,
 	decorators: [(fn) => <div children={fn()} style={{ height: '100vh' }} />],
 };
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js b/ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js
index 196bf07ea4b..cd3fe61d3d0 100644
--- a/ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { MessagesTab } from '.';
 
 export default {
-	title: 'admin/engagement/MessagesTab',
+	title: 'admin/enterprise/engagement/MessagesTab',
 	component: MessagesTab,
 	decorators: [
 		(fn) => <Margins children={fn()} all='x24' />,
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js b/ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js
index 43684456328..bf925ca34cf 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { UsersTab } from '.';
 
 export default {
-	title: 'admin/engagement/UsersTab',
+	title: 'admin/enterprise/engagement/UsersTab',
 	component: UsersTab,
 	decorators: [
 		(fn) => <Margins children={fn()} all='x24' />,
diff --git a/ee/app/engagement-dashboard/client/components/data/Counter.stories.js b/ee/app/engagement-dashboard/client/components/data/Counter.stories.js
index b61686bf630..75966df87f9 100644
--- a/ee/app/engagement-dashboard/client/components/data/Counter.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/Counter.stories.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { Counter } from './Counter';
 
 export default {
-	title: 'admin/engagement/data/Counter',
+	title: 'admin/enterprise/engagement/data/Counter',
 	component: Counter,
 };
 
diff --git a/ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js b/ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js
index ba8e26d67f5..fe23896f6a9 100644
--- a/ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { CounterSet } from './CounterSet';
 
 export default {
-	title: 'admin/engagement/data/CounterSet',
+	title: 'admin/enterprise/engagement/data/CounterSet',
 	component: CounterSet,
 };
 
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 31f90185933..6c04a30ee55 100644
--- a/ee/app/engagement-dashboard/client/components/data/Growth.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/Growth.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { Growth } from './Growth';
 
 export default {
-	title: 'admin/engagement/data/Growth',
+	title: 'admin/enterprise/engagement/data/Growth',
 	component: Growth,
 	decorators: [(fn) => <Margins children={fn()} all='x16' />],
 };
diff --git a/ee/app/engagement-dashboard/client/components/data/Histogram.stories.js b/ee/app/engagement-dashboard/client/components/data/Histogram.stories.js
index 48e3f015ff5..e38e87275b7 100644
--- a/ee/app/engagement-dashboard/client/components/data/Histogram.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/Histogram.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { Histogram } from './Histogram';
 
 export default {
-	title: 'admin/engagement/data/Histogram',
+	title: 'admin/enterprise/engagement/data/Histogram',
 	component: Histogram,
 	decorators: [(fn) => <Margins all='x16'>
 		<Flex.Container>
diff --git a/ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js b/ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js
index 457456da286..ca8a466d7b9 100644
--- a/ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js
@@ -5,7 +5,7 @@ import { LegendSymbol } from './LegendSymbol';
 import { monochromaticColors, polychromaticColors } from './colors';
 
 export default {
-	title: 'admin/engagement/data/LegendSymbol',
+	title: 'admin/enterprise/engagement/data/LegendSymbol',
 	component: LegendSymbol,
 	decorators: [(fn) => <Margins children={fn()} all='x16' />],
 };
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 76e3c3c9f64..f7b7a2197f7 100644
--- a/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { NegativeGrowthSymbol } from './NegativeGrowthSymbol';
 
 export default {
-	title: 'admin/engagement/data/NegativeGrowthSymbol',
+	title: 'admin/enterprise/engagement/data/NegativeGrowthSymbol',
 	component: NegativeGrowthSymbol,
 	decorators: [(fn) => <Margins children={fn()} all='x16' />],
 };
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 d12c8f7c9ab..f750dad1015 100644
--- a/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
+++ b/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
@@ -4,7 +4,7 @@ import React from 'react';
 import { PositiveGrowthSymbol } from './PositiveGrowthSymbol';
 
 export default {
-	title: 'admin/engagement/data/PositiveGrowthSymbol',
+	title: 'admin/enterprise/engagement/data/PositiveGrowthSymbol',
 	component: PositiveGrowthSymbol,
 	decorators: [(fn) => <Margins children={fn()} all='x16' />],
 };
diff --git a/ee/app/license/server/license.ts b/ee/app/license/server/license.ts
index 71ff33fbb70..6edb121c440 100644
--- a/ee/app/license/server/license.ts
+++ b/ee/app/license/server/license.ts
@@ -1,4 +1,4 @@
-import EventEmitter from 'events';
+import { EventEmitter } from 'events';
 
 import { Users } from '../../../../app/models/server';
 import { resetEnterprisePermissions } from '../../authorization/server/resetEnterprisePermissions';
diff --git a/package-lock.json b/package-lock.json
index 8bfc9808c34..0427269a54a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -395,16 +395,16 @@
 			}
 		},
 		"@babel/helper-create-class-features-plugin": {
-			"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==",
+			"version": "7.9.6",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz",
+			"integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==",
 			"dev": true,
 			"requires": {
 				"@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.6",
+				"@babel/helper-replace-supers": "^7.9.6",
 				"@babel/helper-split-export-declaration": "^7.8.3"
 			},
 			"dependencies": {
@@ -418,12 +418,12 @@
 					}
 				},
 				"@babel/generator": {
-					"version": "7.9.5",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-					"integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+					"integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
 					"dev": true,
 					"requires": {
-						"@babel/types": "^7.9.5",
+						"@babel/types": "^7.9.6",
 						"jsesc": "^2.5.1",
 						"lodash": "^4.17.13",
 						"source-map": "^0.5.0"
@@ -474,15 +474,15 @@
 					"dev": true
 				},
 				"@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==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz",
+					"integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==",
 					"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/traverse": "^7.9.6",
+						"@babel/types": "^7.9.6"
 					}
 				},
 				"@babel/helper-split-export-declaration": {
@@ -506,9 +506,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.9.4",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-					"integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+					"integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
 					"dev": true
 				},
 				"@babel/template": {
@@ -523,26 +523,26 @@
 					}
 				},
 				"@babel/traverse": {
-					"version": "7.9.5",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-					"integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
+					"integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/generator": "^7.9.5",
+						"@babel/generator": "^7.9.6",
 						"@babel/helper-function-name": "^7.9.5",
 						"@babel/helper-split-export-declaration": "^7.8.3",
-						"@babel/parser": "^7.9.0",
-						"@babel/types": "^7.9.5",
+						"@babel/parser": "^7.9.6",
+						"@babel/types": "^7.9.6",
 						"debug": "^4.1.0",
 						"globals": "^11.1.0",
 						"lodash": "^4.17.13"
 					}
 				},
 				"@babel/types": {
-					"version": "7.9.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-					"integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+					"integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
 					"dev": true,
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.9.5",
@@ -2919,6 +2919,25 @@
 				"wolfy87-eventemitter": "^5.2.5"
 			},
 			"dependencies": {
+				"entities": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
+					"integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
+					"dev": true
+				},
+				"markdown-it": {
+					"version": "10.0.0",
+					"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+					"integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+					"dev": true,
+					"requires": {
+						"argparse": "^1.0.7",
+						"entities": "~2.0.0",
+						"linkify-it": "^2.0.0",
+						"mdurl": "^1.0.1",
+						"uc.micro": "^1.0.5"
+					}
+				},
 				"mem": {
 					"version": "5.1.1",
 					"resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
@@ -3071,17 +3090,17 @@
 			}
 		},
 		"@storybook/addon-actions": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-5.3.18.tgz",
-			"integrity": "sha512-jdBVCcfyWin274Lkwg5cL+1fJ651NCuIWxuJVsmHQtIl2xTjf2MyoMoKQZNdt4xtE+W9w+rS4bYt04elrizThg==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-5.3.19.tgz",
+			"integrity": "sha512-gXF29FFUgYlUoFf1DcVCmH1chg2ElaHWMmCi5h7aZe+g6fXBQw0UtEdJnYLMOqZCIiWoZyuf1ETD0RbNHPhRIw==",
 			"dev": true,
 			"requires": {
-				"@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",
+				"@storybook/addons": "5.3.19",
+				"@storybook/api": "5.3.19",
+				"@storybook/client-api": "5.3.19",
+				"@storybook/components": "5.3.19",
+				"@storybook/core-events": "5.3.19",
+				"@storybook/theming": "5.3.19",
 				"core-js": "^3.0.1",
 				"fast-deep-equal": "^2.0.1",
 				"global": "^4.3.2",
@@ -3101,17 +3120,17 @@
 			}
 		},
 		"@storybook/addon-knobs": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-5.3.18.tgz",
-			"integrity": "sha512-X0WxGKoso3j5mS4c4enM8BvCjbO6Wwfxc++swQTqtANpBZ8k+w0piiEF1fiJf+ssgEAWe5brgIqnQ9kiBGLqKA==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-5.3.19.tgz",
+			"integrity": "sha512-e7z6KhvVOUGjygK4VL5Un1U3t0XG0jkb/BOHVWQMtH5dWNn3zofD3LrZZy24eAsyre/ej/LGo/BzwDSXkKLTog==",
 			"dev": true,
 			"requires": {
-				"@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",
+				"@storybook/addons": "5.3.19",
+				"@storybook/api": "5.3.19",
+				"@storybook/client-api": "5.3.19",
+				"@storybook/components": "5.3.19",
+				"@storybook/core-events": "5.3.19",
+				"@storybook/theming": "5.3.19",
 				"@types/react-color": "^3.0.1",
 				"copy-to-clipboard": "^3.0.8",
 				"core-js": "^3.0.1",
@@ -3139,23 +3158,50 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.3",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
+					"version": "6.9.4",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+					"integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
+					"dev": true
+				}
+			}
+		},
+		"@storybook/addon-viewport": {
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-5.3.19.tgz",
+			"integrity": "sha512-/+9pN9yR/Dnwj/JEOwfnmERxDvh9alaFg7snnbiHSuycbPc+xy3CziqGUE9ofRxrYqOrd4aHhJ/5sxkZvewlAg==",
+			"dev": true,
+			"requires": {
+				"@storybook/addons": "5.3.19",
+				"@storybook/api": "5.3.19",
+				"@storybook/client-logger": "5.3.19",
+				"@storybook/components": "5.3.19",
+				"@storybook/core-events": "5.3.19",
+				"@storybook/theming": "5.3.19",
+				"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.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/addons": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.18.tgz",
-			"integrity": "sha512-ZQjDgTUDFRLvAiBg2d8FgPgghfQ+9uFyXQbtiGlTBLinrPCeQd7J86qiUES0fcGoohCCw0wWKtvB0WF2z1XNDg==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.19.tgz",
+			"integrity": "sha512-Ky/k22p6i6FVNvs1VhuFyGvYJdcp+FgXqFgnPyY/OXJW/vPDapdElpTpHJZLFI9I2FQBDcygBPU5RXkumQ+KUQ==",
 			"dev": true,
 			"requires": {
-				"@storybook/api": "5.3.18",
-				"@storybook/channels": "5.3.18",
-				"@storybook/client-logger": "5.3.18",
-				"@storybook/core-events": "5.3.18",
+				"@storybook/api": "5.3.19",
+				"@storybook/channels": "5.3.19",
+				"@storybook/client-logger": "5.3.19",
+				"@storybook/core-events": "5.3.19",
 				"core-js": "^3.0.1",
 				"global": "^4.3.2",
 				"util-deprecate": "^1.0.2"
@@ -3170,18 +3216,18 @@
 			}
 		},
 		"@storybook/api": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/api/-/api-5.3.18.tgz",
-			"integrity": "sha512-QXaccNCARHzPWOuxYndiebGWBZmwiUvRgB9ji0XTJBS3y8K0ZPb5QyuqiKPaEWUj8dBA8rzdDtkW3Yt95Namaw==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/api/-/api-5.3.19.tgz",
+			"integrity": "sha512-U/VzDvhNCPmw2igvJYNNM+uwJCL+3teiL6JmuoL4/cmcqhI6IqqG9dZmMP1egoCd19wXEP7rnAfB/VcYVg41dQ==",
 			"dev": true,
 			"requires": {
 				"@reach/router": "^1.2.1",
-				"@storybook/channels": "5.3.18",
-				"@storybook/client-logger": "5.3.18",
-				"@storybook/core-events": "5.3.18",
+				"@storybook/channels": "5.3.19",
+				"@storybook/client-logger": "5.3.19",
+				"@storybook/core-events": "5.3.19",
 				"@storybook/csf": "0.0.1",
-				"@storybook/router": "5.3.18",
-				"@storybook/theming": "5.3.18",
+				"@storybook/router": "5.3.19",
+				"@storybook/theming": "5.3.19",
 				"@types/reach__router": "^1.2.3",
 				"core-js": "^3.0.1",
 				"fast-deep-equal": "^2.0.1",
@@ -3218,13 +3264,13 @@
 			}
 		},
 		"@storybook/channel-postmessage": {
-			"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==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-5.3.19.tgz",
+			"integrity": "sha512-Iq0f4NPHR0UVVFCWt0cI7Myadk4/SATXYJPT6sv95KhnLjKEeYw571WBlThfp8a9FM80887xG+eIRe93c8dleA==",
 			"dev": true,
 			"requires": {
-				"@storybook/channels": "5.3.18",
-				"@storybook/client-logger": "5.3.18",
+				"@storybook/channels": "5.3.19",
+				"@storybook/client-logger": "5.3.19",
 				"core-js": "^3.0.1",
 				"global": "^4.3.2",
 				"telejson": "^3.2.0"
@@ -3239,9 +3285,9 @@
 			}
 		},
 		"@storybook/channels": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.18.tgz",
-			"integrity": "sha512-scP/6td/BJSEOgfN+qaYGDf3E793xye7tIw6W+sYqwg+xdMFO39wVXgVZNpQL6sLEwpJZTaPywCjC6p6ksErqQ==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.19.tgz",
+			"integrity": "sha512-38seaeyshRGotTEZJppyYMg/Vx2zRKgFv1L6uGqkJT0LYoNSYtJhsiNFCJ2/KUJu2chAJ/j8h80bpVBVLQ/+WA==",
 			"dev": true,
 			"requires": {
 				"core-js": "^3.0.1"
@@ -3256,16 +3302,16 @@
 			}
 		},
 		"@storybook/client-api": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-5.3.18.tgz",
-			"integrity": "sha512-QiXTDUpjdyW19BlocLw07DrkOnEzVaWGJcRze2nSs29IKKuq1Ncv2LOAZt6ySSq0PmIKsjBou3bmS1/aXmDMdw==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-5.3.19.tgz",
+			"integrity": "sha512-Dh8ZLrLH91j9Fa28Gmp0KFUvvgK348aNMrDNAUdj4m4witz/BWQ2pxz6qq9/xFVErk/GanVC05kazGElqgYCRQ==",
 			"dev": true,
 			"requires": {
-				"@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/addons": "5.3.19",
+				"@storybook/channel-postmessage": "5.3.19",
+				"@storybook/channels": "5.3.19",
+				"@storybook/client-logger": "5.3.19",
+				"@storybook/core-events": "5.3.19",
 				"@storybook/csf": "0.0.1",
 				"@types/webpack-env": "^1.15.0",
 				"core-js": "^3.0.1",
@@ -3287,9 +3333,9 @@
 					"dev": true
 				},
 				"eventemitter3": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-					"integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+					"version": "4.0.4",
+					"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+					"integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
 					"dev": true
 				},
 				"is-plain-object": {
@@ -3314,17 +3360,17 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.3",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
+					"version": "6.9.4",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+					"integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/client-logger": {
-			"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==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.19.tgz",
+			"integrity": "sha512-nHftT9Ow71YgAd2/tsu79kwKk30mPuE0sGRRUHZVyCRciGFQweKNOS/6xi2Aq+WwBNNjPKNlbgxwRt1yKe1Vkg==",
 			"dev": true,
 			"requires": {
 				"core-js": "^3.0.1"
@@ -3339,19 +3385,19 @@
 			}
 		},
 		"@storybook/components": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/components/-/components-5.3.18.tgz",
-			"integrity": "sha512-LIN4aVCCDY7klOwtuqQhfYz4tHaMADhXEzZpij+3r8N68Inck6IJ1oo9A9umXQPsTioQi8e6FLobH1im90j/2A==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/components/-/components-5.3.19.tgz",
+			"integrity": "sha512-3g23/+ktlocaHLJKISu9Neu3XKa6aYP2ctDYkRtGchSB0Q55hQsUVGO+BEVuT7Pk2D59mVCxboBjxcRoPUY4pw==",
 			"dev": true,
 			"requires": {
-				"@storybook/client-logger": "5.3.18",
-				"@storybook/theming": "5.3.18",
+				"@storybook/client-logger": "5.3.19",
+				"@storybook/theming": "5.3.19",
 				"@types/react-syntax-highlighter": "11.0.4",
 				"@types/react-textarea-autosize": "^4.3.3",
 				"core-js": "^3.0.1",
 				"global": "^4.3.2",
 				"lodash": "^4.17.15",
-				"markdown-to-jsx": "^6.9.1",
+				"markdown-to-jsx": "^6.11.4",
 				"memoizerific": "^1.11.3",
 				"polished": "^3.3.1",
 				"popper.js": "^1.14.7",
@@ -3382,9 +3428,9 @@
 			}
 		},
 		"@storybook/core": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/core/-/core-5.3.18.tgz",
-			"integrity": "sha512-XQb/UQb+Ohuaw0GhKKYzvmuuh5Tit93f2cLZD9QCSWUPvDGmLG5g91Y9NbUr4Ap3mANT3NksMNhkAV0GxExEkg==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/core/-/core-5.3.19.tgz",
+			"integrity": "sha512-4EYzglqb1iD6x9gxtAYpRGwGP6qJGiU2UW4GiYrErEmeu6y6tkyaqW5AwGlIo9+6jAfwD0HjaK8afvjKTtmmMQ==",
 			"dev": true,
 			"requires": {
 				"@babel/plugin-proposal-class-properties": "^7.7.0",
@@ -3392,16 +3438,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.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/addons": "5.3.19",
+				"@storybook/channel-postmessage": "5.3.19",
+				"@storybook/client-api": "5.3.19",
+				"@storybook/client-logger": "5.3.19",
+				"@storybook/core-events": "5.3.19",
 				"@storybook/csf": "0.0.1",
-				"@storybook/node-logger": "5.3.18",
-				"@storybook/router": "5.3.18",
-				"@storybook/theming": "5.3.18",
-				"@storybook/ui": "5.3.18",
+				"@storybook/node-logger": "5.3.19",
+				"@storybook/router": "5.3.19",
+				"@storybook/theming": "5.3.19",
+				"@storybook/ui": "5.3.19",
 				"airbnb-js-shims": "^2.2.1",
 				"ansi-to-html": "^0.6.11",
 				"autoprefixer": "^9.7.2",
@@ -3662,40 +3708,13 @@
 					"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"
-					}
-				},
-				"autoprefixer": {
-					"version": "9.7.6",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz",
-					"integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==",
+					"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": {
-						"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"
-							}
-						}
+						"@types/color-name": "^1.1.1",
+						"color-convert": "^2.0.1"
 					}
 				},
 				"big.js": {
@@ -3745,18 +3764,6 @@
 						"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",
@@ -3800,12 +3807,6 @@
 						"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",
@@ -3814,48 +3815,6 @@
 					"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": {
@@ -3874,20 +3833,14 @@
 					}
 				},
 				"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==",
+					"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.3"
+						"color-name": "~1.1.4"
 					}
 				},
-				"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",
@@ -3921,12 +3874,6 @@
 					"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",
@@ -4060,9 +4007,15 @@
 					}
 				},
 				"graceful-fs": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-					"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+					"version": "4.2.4",
+					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+					"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+					"dev": true
+				},
+				"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": {
@@ -4131,9 +4084,9 @@
 					}
 				},
 				"make-dir": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
-					"integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
 					"dev": true,
 					"requires": {
 						"semver": "^6.0.0"
@@ -4156,9 +4109,9 @@
 					"dev": true
 				},
 				"minipass": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
-					"integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+					"integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
 					"dev": true,
 					"requires": {
 						"yallist": "^4.0.0"
@@ -4207,12 +4160,6 @@
 						"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.3.0",
 					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -4273,56 +4220,6 @@
 						"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",
@@ -4340,9 +4237,9 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.3",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
+					"version": "6.9.4",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+					"integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
 					"dev": true
 				},
 				"raw-body": {
@@ -4358,9 +4255,9 @@
 					}
 				},
 				"resolve": {
-					"version": "1.16.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz",
-					"integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==",
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
 					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
@@ -4392,9 +4289,9 @@
 					"dev": true
 				},
 				"serialize-javascript": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
-					"integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
+					"integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==",
 					"dev": true
 				},
 				"setprototypeof": {
@@ -4410,9 +4307,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.18",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
-					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
+					"version": "0.5.19",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+					"integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -4436,12 +4333,12 @@
 					"dev": true
 				},
 				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"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": "^3.0.0"
+						"has-flag": "^4.0.0"
 					}
 				},
 				"tapable": {
@@ -4451,9 +4348,9 @@
 					"dev": true
 				},
 				"terser": {
-					"version": "4.6.11",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
-					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
+					"version": "4.7.0",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+					"integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -4470,19 +4367,19 @@
 					}
 				},
 				"terser-webpack-plugin": {
-					"version": "2.3.5",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz",
-					"integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==",
+					"version": "2.3.6",
+					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.6.tgz",
+					"integrity": "sha512-I8IDsQwZrqjdmOicNeE8L/MhwatAap3mUrtcAKJuilsemUNcX+Hier/eAzwStVqhlCxq0aG3ni9bK/0BESXkTg==",
 					"dev": true,
 					"requires": {
 						"cacache": "^13.0.1",
-						"find-cache-dir": "^3.2.0",
-						"jest-worker": "^25.1.0",
-						"p-limit": "^2.2.2",
-						"schema-utils": "^2.6.4",
-						"serialize-javascript": "^2.1.2",
+						"find-cache-dir": "^3.3.1",
+						"jest-worker": "^25.4.0",
+						"p-limit": "^2.3.0",
+						"schema-utils": "^2.6.6",
+						"serialize-javascript": "^3.0.0",
 						"source-map": "^0.6.1",
-						"terser": "^4.4.3",
+						"terser": "^4.6.12",
 						"webpack-sources": "^1.4.3"
 					}
 				},
@@ -4539,14 +4436,15 @@
 					"dev": true
 				},
 				"watchpack": {
-					"version": "1.6.1",
-					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
-					"integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+					"version": "1.7.2",
+					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+					"integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
 					"dev": true,
 					"requires": {
-						"chokidar": "^2.1.8",
+						"chokidar": "^3.4.0",
 						"graceful-fs": "^4.1.2",
-						"neo-async": "^2.5.0"
+						"neo-async": "^2.5.0",
+						"watchpack-chokidar2": "^2.0.0"
 					}
 				},
 				"webpack": {
@@ -4786,6 +4684,12 @@
 							"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
 							"dev": true
 						},
+						"serialize-javascript": {
+							"version": "2.1.2",
+							"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+							"integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+							"dev": true
+						},
 						"ssri": {
 							"version": "6.0.1",
 							"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -4858,9 +4762,9 @@
 			}
 		},
 		"@storybook/core-events": {
-			"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==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.19.tgz",
+			"integrity": "sha512-lh78ySqMS7pDdMJAQAe35d1I/I4yPTqp09Cq0YIYOxx9BQZhah4DZTV1QIZt22H5p2lPb5MWLkWSxBaexZnz8A==",
 			"dev": true,
 			"requires": {
 				"core-js": "^3.0.1"
@@ -4892,9 +4796,9 @@
 			}
 		},
 		"@storybook/node-logger": {
-			"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==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.19.tgz",
+			"integrity": "sha512-hKshig/u5Nj9fWy0OsyU04yqCxr0A9pydOHIassr4fpLAaePIN2YvqCqE2V+TxQHjZUnowSSIhbXrGt0DI5q2A==",
 			"dev": true,
 			"requires": {
 				"@types/npmlog": "^4.1.2",
@@ -4958,17 +4862,17 @@
 			}
 		},
 		"@storybook/react": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/react/-/react-5.3.18.tgz",
-			"integrity": "sha512-6yNg+phcrEqEjC2NOiu0mJuxbTwX7yzbkcusIn0S7N/KTXNO7CGvYjAkdjfw0gTLjfuVDZIjDQfoosslvfsj3w==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/react/-/react-5.3.19.tgz",
+			"integrity": "sha512-OBRUqol3YLQi/qE55x2pWkv4YpaAmmfj6/Km+7agx+og+oNQl0nnlXy7r27X/4j3ERczzURa5pJHtSjwiNaJNw==",
 			"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.18",
-				"@storybook/core": "5.3.18",
-				"@storybook/node-logger": "5.3.18",
+				"@storybook/addons": "5.3.19",
+				"@storybook/core": "5.3.19",
+				"@storybook/node-logger": "5.3.19",
 				"@svgr/webpack": "^4.0.3",
 				"@types/webpack-env": "^1.15.0",
 				"babel-plugin-add-react-displayname": "^0.0.5",
@@ -5457,9 +5361,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.18",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
-					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
+					"version": "0.5.19",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+					"integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -5473,9 +5377,9 @@
 					"dev": true
 				},
 				"terser": {
-					"version": "4.6.11",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
-					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
+					"version": "4.7.0",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+					"integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -5534,14 +5438,15 @@
 					"dev": true
 				},
 				"watchpack": {
-					"version": "1.6.1",
-					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
-					"integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+					"version": "1.7.2",
+					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+					"integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
 					"dev": true,
 					"requires": {
-						"chokidar": "^2.1.8",
+						"chokidar": "^3.4.0",
 						"graceful-fs": "^4.1.2",
-						"neo-async": "^2.5.0"
+						"neo-async": "^2.5.0",
+						"watchpack-chokidar2": "^2.0.0"
 					}
 				},
 				"webpack": {
@@ -5603,9 +5508,9 @@
 			}
 		},
 		"@storybook/router": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/router/-/router-5.3.18.tgz",
-			"integrity": "sha512-6B2U2C75KTSVaCuYYgcubeJGcCSnwsXuEf50hEd5mGqWgHZfojCtGvB7Ko4X+0h8rEC+eNA4p7YBOhlUv9WNrQ==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/router/-/router-5.3.19.tgz",
+			"integrity": "sha512-yNClpuP7BXQlBTRf6Ggle3/R349/k6kvI5Aim4jf6X/2cFVg2pzBXDAF41imNm9PcvdxwabQLm6I48p7OvKr/w==",
 			"dev": true,
 			"requires": {
 				"@reach/router": "^1.2.1",
@@ -5632,22 +5537,22 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.3",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
+					"version": "6.9.4",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+					"integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
 					"dev": true
 				}
 			}
 		},
 		"@storybook/theming": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.18.tgz",
-			"integrity": "sha512-lfFTeLoYwLMKg96N3gn0umghMdAHgJBGuk2OM8Ll84yWtdl9RGnzfiI1Fl7Cr5k95dCF7drLJlJCao1VxUkFSA==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.19.tgz",
+			"integrity": "sha512-ecG+Rq3hc1GOzKHamYnD4wZ0PEP9nNg0mXbC3RhbxfHj+pMMCWWmx9B2Uu75SL1PTT8WcfkFO0hU/0IO84Pzlg==",
 			"dev": true,
 			"requires": {
 				"@emotion/core": "^10.0.20",
 				"@emotion/styled": "^10.0.17",
-				"@storybook/client-logger": "5.3.18",
+				"@storybook/client-logger": "5.3.19",
 				"core-js": "^3.0.1",
 				"deep-object-diff": "^1.1.0",
 				"emotion-theming": "^10.0.19",
@@ -5668,20 +5573,20 @@
 			}
 		},
 		"@storybook/ui": {
-			"version": "5.3.18",
-			"resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-5.3.18.tgz",
-			"integrity": "sha512-xyXK53fNe9lkGPmXf3Nk+n0gz9gOgXI+fDxetyDLpX79k3DIN/jCKEnv45vXof7OQ45mTmyBvUNTKrNLqKTt5Q==",
+			"version": "5.3.19",
+			"resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-5.3.19.tgz",
+			"integrity": "sha512-r0VxdWab49nm5tzwvveVDnsHIZHMR76veYOu/NHKDUZ5hnQl1LMG1YyMCFFa7KiwD/OrZxRWr6/Ma7ep9kR4Gw==",
 			"dev": true,
 			"requires": {
 				"@emotion/core": "^10.0.20",
-				"@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",
+				"@storybook/addons": "5.3.19",
+				"@storybook/api": "5.3.19",
+				"@storybook/channels": "5.3.19",
+				"@storybook/client-logger": "5.3.19",
+				"@storybook/components": "5.3.19",
+				"@storybook/core-events": "5.3.19",
+				"@storybook/router": "5.3.19",
+				"@storybook/theming": "5.3.19",
 				"copy-to-clipboard": "^3.0.8",
 				"core-js": "^3.0.1",
 				"core-js-pure": "^3.0.1",
@@ -5690,7 +5595,7 @@
 				"fuse.js": "^3.4.6",
 				"global": "^4.3.2",
 				"lodash": "^4.17.15",
-				"markdown-to-jsx": "^6.9.3",
+				"markdown-to-jsx": "^6.11.4",
 				"memoizerific": "^1.11.3",
 				"polished": "^3.3.1",
 				"prop-types": "^15.7.2",
@@ -5722,9 +5627,9 @@
 					"dev": true
 				},
 				"qs": {
-					"version": "6.9.3",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-					"integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
+					"version": "6.9.4",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+					"integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
 					"dev": true
 				},
 				"semver": {
@@ -5835,9 +5740,9 @@
 					"dev": true
 				},
 				"js-yaml": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-					"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+					"version": "3.14.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+					"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
 					"dev": true,
 					"requires": {
 						"argparse": "^1.0.7",
@@ -5866,9 +5771,9 @@
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.9.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-					"integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+					"integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
 					"dev": true,
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.9.5",
@@ -5926,9 +5831,9 @@
 					"dev": true
 				},
 				"js-yaml": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-					"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+					"version": "3.14.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+					"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
 					"dev": true,
 					"requires": {
 						"argparse": "^1.0.7",
@@ -6138,15 +6043,15 @@
 			}
 		},
 		"@types/history": {
-			"version": "4.7.5",
-			"resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz",
-			"integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==",
+			"version": "4.7.6",
+			"resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.6.tgz",
+			"integrity": "sha512-GRTZLeLJ8ia00ZH8mxMO8t0aC9M1N9bN461Z2eaRurJo6Fpa+utgCwLzI4jQHcrdzuzp5WPN9jRwpsCQ1VhJ5w==",
 			"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==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz",
+			"integrity": "sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==",
 			"dev": true
 		},
 		"@types/is-function": {
@@ -6262,9 +6167,9 @@
 			"dev": true
 		},
 		"@types/q": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
-			"integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+			"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
 			"dev": true
 		},
 		"@types/range-parser": {
@@ -6273,9 +6178,9 @@
 			"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
 		},
 		"@types/reach__router": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.4.tgz",
-			"integrity": "sha512-DZgYfxUIlVSjvf0AvBbYNbpXLrTFNNpU1HrvCRbnMtx3nvGUUWC1/zlAe4dD4FCPFtc+LQuIPEsDiTb0zQkthg==",
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.5.tgz",
+			"integrity": "sha512-h0NbqXN/tJuBY/xggZSej1SKQEstbHO7J/omt1tYoFGmj3YXOodZKbbqD4mNDh7zvEGYd7YFrac1LTtAr3xsYQ==",
 			"dev": true,
 			"requires": {
 				"@types/history": "*",
@@ -6293,9 +6198,9 @@
 			}
 		},
 		"@types/react-color": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.1.tgz",
-			"integrity": "sha512-J6mYm43Sid9y+OjZ7NDfJ2VVkeeuTPNVImNFITgQNXodHteKfl/t/5pAR5Z9buodZ2tCctsZjgiMlQOpfntakw==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.2.tgz",
+			"integrity": "sha512-FhrRy0xEYEpysl1iKL11ynJc79H6ztyYc4xD1pliZyygEChleTlHGohb/bClTYPN8XeSw6yaz45l3YW5SGYftQ==",
 			"dev": true,
 			"requires": {
 				"@types/react": "*"
@@ -6368,9 +6273,9 @@
 			"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==",
+			"version": "3.9.2",
+			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz",
+			"integrity": "sha512-d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ==",
 			"dev": true,
 			"requires": {
 				"source-map": "^0.6.1"
@@ -6390,10 +6295,15 @@
 			"integrity": "sha512-CjHWEMECc2/UxOZh0kpiz3lEyX2Px3rQS9HzD20lxMvx571ivOBQKeLnqEjxUY0BMgp6WJWo/pQLRBwMW5v4WQ==",
 			"dev": true
 		},
+		"@types/use-subscription": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@types/use-subscription/-/use-subscription-1.0.0.tgz",
+			"integrity": "sha512-0WWZ5GUDKMXUY/1zy4Ur5/zsC0s/B+JjXfHdkvx6JgDNZzZV5eW+KKhDqsTGyqX56uh99gwGwbsKbVwkcVIKQA=="
+		},
 		"@types/webpack": {
-			"version": "4.41.12",
-			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.12.tgz",
-			"integrity": "sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w==",
+			"version": "4.41.13",
+			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.13.tgz",
+			"integrity": "sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==",
 			"dev": true,
 			"requires": {
 				"@types/anymatch": "*",
@@ -6413,9 +6323,9 @@
 			}
 		},
 		"@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==",
+			"version": "1.15.2",
+			"resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.15.2.tgz",
+			"integrity": "sha512-67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ==",
 			"dev": true
 		},
 		"@types/webpack-sources": {
@@ -7021,14 +6931,13 @@
 					"dev": true
 				},
 				"object.entries": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz",
-					"integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==",
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
+					"integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
 					"dev": true,
 					"requires": {
 						"define-properties": "^1.1.3",
-						"es-abstract": "^1.17.0-next.1",
-						"function-bind": "^1.1.1",
+						"es-abstract": "^1.17.5",
 						"has": "^1.0.3"
 					}
 				},
@@ -7164,24 +7073,14 @@
 			"dev": true
 		},
 		"anymatch": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+			"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"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"
-					}
-				}
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
 			}
 		},
 		"apn": {
@@ -8412,9 +8311,9 @@
 					"dev": true
 				},
 				"resolve": {
-					"version": "1.16.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz",
-					"integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==",
+					"version": "1.17.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+					"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
 					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
@@ -10250,9 +10149,9 @@
 			},
 			"dependencies": {
 				"tslib": {
-					"version": "1.11.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+					"version": "1.13.0",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+					"integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
 					"dev": true
 				}
 			}
@@ -10672,30 +10571,112 @@
 			}
 		},
 		"chokidar": {
-			"version": "2.1.8",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-			"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+			"integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"anymatch": "^2.0.0",
-				"async-each": "^1.0.1",
-				"braces": "^2.3.2",
-				"fsevents": "^1.2.7",
-				"glob-parent": "^3.1.0",
-				"inherits": "^2.0.3",
-				"is-binary-path": "^1.0.0",
-				"is-glob": "^4.0.0",
-				"normalize-path": "^3.0.0",
-				"path-is-absolute": "^1.0.0",
-				"readdirp": "^2.2.1",
-				"upath": "^1.1.1"
+				"anymatch": "~3.1.1",
+				"braces": "~3.0.2",
+				"fsevents": "~2.1.2",
+				"glob-parent": "~5.1.0",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.4.0"
 			},
 			"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
+				"binary-extensions": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+					"integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+					"dev": true,
+					"optional": true
+				},
+				"braces": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"fill-range": "^7.0.1"
+					}
+				},
+				"fill-range": {
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"to-regex-range": "^5.0.1"
+					}
+				},
+				"fsevents": {
+					"version": "2.1.3",
+					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+					"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+					"dev": true,
+					"optional": true
+				},
+				"glob-parent": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+					"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"is-glob": "^4.0.1"
+					}
+				},
+				"is-binary-path": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+					"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"binary-extensions": "^2.0.0"
+					}
+				},
+				"is-glob": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+					"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"is-extglob": "^2.1.1"
+					}
+				},
+				"is-number": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+					"dev": true,
+					"optional": true
+				},
+				"readdirp": {
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+					"integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"picomatch": "^2.2.1"
+					}
+				},
+				"to-regex-range": {
+					"version": "5.0.1",
+					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"is-number": "^7.0.0"
+					}
 				}
 			}
 		},
@@ -11827,9 +11808,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.18",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
-					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
+					"version": "0.5.19",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+					"integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -11843,9 +11824,9 @@
 					"dev": true
 				},
 				"terser": {
-					"version": "4.6.11",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
-					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
+					"version": "4.7.0",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+					"integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -11904,14 +11885,15 @@
 					"dev": true
 				},
 				"watchpack": {
-					"version": "1.6.1",
-					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
-					"integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
+					"version": "1.7.2",
+					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+					"integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
 					"dev": true,
 					"requires": {
-						"chokidar": "^2.1.8",
+						"chokidar": "^3.4.0",
 						"graceful-fs": "^4.1.2",
-						"neo-async": "^2.5.0"
+						"neo-async": "^2.5.0",
+						"watchpack-chokidar2": "^2.0.0"
 					}
 				},
 				"webpack": {
@@ -12150,9 +12132,9 @@
 			"integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
 		},
 		"css-loader": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.2.tgz",
-			"integrity": "sha512-hDL0DPopg6zQQSRlZm0hyeaqIRnL0wbWjay9BZxoiJBpbfOW4WHfbaYQhwnDmEa0kZUc1CJ3IFo15ot1yULMIQ==",
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
+			"integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
 			"dev": true,
 			"requires": {
 				"camelcase": "^5.3.1",
@@ -12166,7 +12148,7 @@
 				"postcss-modules-scope": "^2.2.0",
 				"postcss-modules-values": "^3.0.0",
 				"postcss-value-parser": "^4.0.3",
-				"schema-utils": "^2.6.5",
+				"schema-utils": "^2.6.6",
 				"semver": "^6.3.0"
 			},
 			"dependencies": {
@@ -12285,9 +12267,9 @@
 					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.27",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
-					"integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+					"version": "7.0.30",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
+					"integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -12296,9 +12278,9 @@
 					}
 				},
 				"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==",
+					"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
 				},
 				"schema-utils": {
@@ -13438,23 +13420,6 @@
 			"requires": {
 				"@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": {
@@ -13578,9 +13543,9 @@
 			"dev": true
 		},
 		"dotenv-webpack": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz",
-			"integrity": "sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==",
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz",
+			"integrity": "sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==",
 			"dev": true,
 			"requires": {
 				"dotenv-defaults": "^1.0.2"
@@ -15587,9 +15552,9 @@
 			"integrity": "sha1-PjKNj95BKtR+c44751C00pAENJg="
 		},
 		"focus-lock": {
-			"version": "0.6.7",
-			"resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.7.tgz",
-			"integrity": "sha512-KRo93U/afEqt7w5tBm4t0FHf/Li8tEYav3n4GUiZdeRlRfrtMbL8yQg0xRVnY/kmBRmQ4xkqIlbaMvuqlu53kg==",
+			"version": "0.6.8",
+			"resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.8.tgz",
+			"integrity": "sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og==",
 			"dev": true
 		},
 		"focus-visible": {
@@ -15660,6 +15625,27 @@
 						"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",
@@ -15671,6 +15657,26 @@
 						"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",
@@ -15694,6 +15700,12 @@
 					"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
 				}
 			}
 		},
@@ -17909,9 +17921,9 @@
 			"dev": true
 		},
 		"html-minifier-terser": {
-			"version": "5.0.5",
-			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz",
-			"integrity": "sha512-cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
+			"integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
 			"dev": true,
 			"requires": {
 				"camel-case": "^4.1.1",
@@ -17936,9 +17948,9 @@
 					"dev": true
 				},
 				"source-map-support": {
-					"version": "0.5.18",
-					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz",
-					"integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==",
+					"version": "0.5.19",
+					"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+					"integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
 					"dev": true,
 					"requires": {
 						"buffer-from": "^1.0.0",
@@ -17946,9 +17958,9 @@
 					}
 				},
 				"terser": {
-					"version": "4.6.11",
-					"resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz",
-					"integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==",
+					"version": "4.7.0",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+					"integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
 					"dev": true,
 					"requires": {
 						"commander": "^2.20.0",
@@ -17984,9 +17996,9 @@
 			}
 		},
 		"html-webpack-plugin": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.2.0.tgz",
-			"integrity": "sha512-zL7LYTuq/fcJX6vV6tmmvFR508Bd9e6kvVGbS76YAjZ2CPVRzsjkvDYs/SshPevpolSdTWgaDV39D6k6oQoVFw==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz",
+			"integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==",
 			"dev": true,
 			"requires": {
 				"@types/html-minifier-terser": "^5.0.0",
@@ -18101,9 +18113,9 @@
 			}
 		},
 		"http-parser-js": {
-			"version": "0.4.10",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-			"integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz",
+			"integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==",
 			"dev": true
 		},
 		"http-signature": {
@@ -18466,9 +18478,9 @@
 					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.27",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
-					"integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+					"version": "7.0.30",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
+					"integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -19131,9 +19143,9 @@
 			}
 		},
 		"is-function": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz",
-			"integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+			"integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
 			"dev": true
 		},
 		"is-glob": {
@@ -19422,9 +19434,9 @@
 			}
 		},
 		"jest-worker": {
-			"version": "25.4.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz",
-			"integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==",
+			"version": "25.5.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+			"integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
 			"dev": true,
 			"requires": {
 				"merge-stream": "^2.0.0",
@@ -21005,27 +21017,6 @@
 			"integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
 			"dev": true
 		},
-		"markdown-it": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
-			"integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
-			"dev": true,
-			"requires": {
-				"argparse": "^1.0.7",
-				"entities": "~2.0.0",
-				"linkify-it": "^2.0.0",
-				"mdurl": "^1.0.1",
-				"uc.micro": "^1.0.5"
-			},
-			"dependencies": {
-				"entities": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
-					"integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
-					"dev": true
-				}
-			}
-		},
 		"markdown-table": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
@@ -21033,9 +21024,9 @@
 			"dev": true
 		},
 		"markdown-to-jsx": {
-			"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==",
+			"version": "6.11.4",
+			"resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz",
+			"integrity": "sha512-3lRCD5Sh+tfA52iGgfs/XZiw33f7fFX9Bn55aNnVNUd2GzLDkOWyKYYD8Yju2B1Vn+feiEdgJs8T6Tg0xNokPw==",
 			"dev": true,
 			"requires": {
 				"prop-types": "^15.6.2",
@@ -22278,9 +22269,9 @@
 			},
 			"dependencies": {
 				"minipass": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
-					"integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+					"integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
 					"dev": true,
 					"requires": {
 						"yallist": "^4.0.0"
@@ -22304,9 +22295,9 @@
 			},
 			"dependencies": {
 				"minipass": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
-					"integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+					"integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
 					"dev": true,
 					"requires": {
 						"yallist": "^4.0.0"
@@ -22321,18 +22312,18 @@
 			}
 		},
 		"minipass-pipeline": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
-			"integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
+			"integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
 			"dev": true,
 			"requires": {
 				"minipass": "^3.0.0"
 			},
 			"dependencies": {
 				"minipass": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
-					"integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+					"integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
 					"dev": true,
 					"requires": {
 						"yallist": "^4.0.0"
@@ -23706,9 +23697,9 @@
 			}
 		},
 		"open": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/open/-/open-7.0.3.tgz",
-			"integrity": "sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==",
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+			"integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
 			"dev": true,
 			"requires": {
 				"is-docker": "^2.0.0",
@@ -23716,10 +23707,13 @@
 			},
 			"dependencies": {
 				"is-wsl": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
-					"integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
-					"dev": true
+					"version": "2.2.0",
+					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+					"dev": true,
+					"requires": {
+						"is-docker": "^2.0.0"
+					}
 				}
 			}
 		},
@@ -23909,9 +23903,9 @@
 			},
 			"dependencies": {
 				"tslib": {
-					"version": "1.11.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-					"integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+					"version": "1.13.0",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+					"integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
 					"dev": true
 				}
 			}
@@ -24336,29 +24330,12 @@
 			}
 		},
 		"polished": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/polished/-/polished-3.5.2.tgz",
-			"integrity": "sha512-vWoRDg3gY5RQBtUfcj9MRN10VCIf4EkdUikGxyXItg2Hnwk+eIVtdBiLajN0ldFeT3Vq4r/QNbjrQdhqBKrTug==",
+			"version": "3.6.3",
+			"resolved": "https://registry.npmjs.org/polished/-/polished-3.6.3.tgz",
+			"integrity": "sha512-QJ0q0b6gX1+0OJtPMfgVJxV0vg5XTa4im+Rca989dAtmsd/fEky3X+0A+V+OUXq1nyiDGplJwqD853dTS0gkPg==",
 			"dev": true,
 			"requires": {
-				"@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
-				}
+				"@babel/runtime": "^7.9.2"
 			}
 		},
 		"pop-iterate": {
@@ -24666,9 +24643,9 @@
 			}
 		},
 		"postcss-flexbugs-fixes": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.0.tgz",
-			"integrity": "sha512-QRE0n3hpkxxS/OGvzOa+PDuy4mh/Jg4o9ui22/ko5iGYOG3M5dfJabjnAZjTdh2G9F85c7Hv8hWcEDEKW/xceQ==",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz",
+			"integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==",
 			"dev": true,
 			"requires": {
 				"postcss": "^7.0.26"
@@ -24721,9 +24698,9 @@
 					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.27",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
-					"integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+					"version": "7.0.30",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
+					"integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -24928,9 +24905,9 @@
 					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.27",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
-					"integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+					"version": "7.0.30",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz",
+					"integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -24950,9 +24927,9 @@
 					}
 				},
 				"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==",
+					"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": {
@@ -25652,9 +25629,9 @@
 			}
 		},
 		"property-information": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz",
-			"integrity": "sha512-nmMWAm/3vKFGmmOWOcdLjgq/Hlxa+hsuR/px1Lp/UGEyc5A22A6l78Shc2C0E71sPmAqglni+HrS7L7VJ7AUCA==",
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz",
+			"integrity": "sha512-RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA==",
 			"dev": true,
 			"requires": {
 				"xtend": "^4.0.0"
@@ -26011,9 +25988,9 @@
 			}
 		},
 		"react-color": {
-			"version": "2.18.0",
-			"resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.0.tgz",
-			"integrity": "sha512-FyVeU1kQiSokWc8NPz22azl1ezLpJdUyTbWL0LPUpcuuYDrZ/Y1veOk9rRK5B3pMlyDGvTk4f4KJhlkIQNRjEA==",
+			"version": "2.18.1",
+			"resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.1.tgz",
+			"integrity": "sha512-X5XpyJS6ncplZs74ak0JJoqPi+33Nzpv5RYWWxn17bslih+X7OlgmfpmGC1fNvdkK7/SGWYf1JJdn7D2n5gSuQ==",
 			"dev": true,
 			"requires": {
 				"@icons/material": "^0.2.4",
@@ -26150,9 +26127,9 @@
 					}
 				},
 				"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==",
+					"version": "1.3.451",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz",
+					"integrity": "sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==",
 					"dev": true
 				},
 				"figures": {
@@ -26265,9 +26242,9 @@
 					"dev": true
 				},
 				"node-releases": {
-					"version": "1.1.53",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
-					"integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+					"version": "1.1.56",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.56.tgz",
+					"integrity": "sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==",
 					"dev": true
 				},
 				"onetime": {
@@ -26373,19 +26350,19 @@
 					}
 				},
 				"@babel/core": {
-					"version": "7.9.0",
-					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
-					"integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+					"integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/generator": "^7.9.0",
+						"@babel/generator": "^7.9.6",
 						"@babel/helper-module-transforms": "^7.9.0",
-						"@babel/helpers": "^7.9.0",
-						"@babel/parser": "^7.9.0",
+						"@babel/helpers": "^7.9.6",
+						"@babel/parser": "^7.9.6",
 						"@babel/template": "^7.8.6",
-						"@babel/traverse": "^7.9.0",
-						"@babel/types": "^7.9.0",
+						"@babel/traverse": "^7.9.6",
+						"@babel/types": "^7.9.6",
 						"convert-source-map": "^1.7.0",
 						"debug": "^4.1.0",
 						"gensync": "^1.0.0-beta.1",
@@ -26397,12 +26374,12 @@
 					}
 				},
 				"@babel/generator": {
-					"version": "7.9.5",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-					"integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+					"integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
 					"dev": true,
 					"requires": {
-						"@babel/types": "^7.9.5",
+						"@babel/types": "^7.9.6",
 						"jsesc": "^2.5.1",
 						"lodash": "^4.17.13",
 						"source-map": "^0.5.0"
@@ -26471,15 +26448,15 @@
 					}
 				},
 				"@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==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz",
+					"integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==",
 					"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/traverse": "^7.9.6",
+						"@babel/types": "^7.9.6"
 					}
 				},
 				"@babel/helper-simple-access": {
@@ -26502,14 +26479,14 @@
 					}
 				},
 				"@babel/helpers": {
-					"version": "7.9.2",
-					"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
-					"integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz",
+					"integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==",
 					"dev": true,
 					"requires": {
 						"@babel/template": "^7.8.3",
-						"@babel/traverse": "^7.9.0",
-						"@babel/types": "^7.9.0"
+						"@babel/traverse": "^7.9.6",
+						"@babel/types": "^7.9.6"
 					}
 				},
 				"@babel/highlight": {
@@ -26524,9 +26501,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.9.4",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-					"integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+					"integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
 					"dev": true
 				},
 				"@babel/template": {
@@ -26541,26 +26518,26 @@
 					}
 				},
 				"@babel/traverse": {
-					"version": "7.9.5",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-					"integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
+					"integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
 					"dev": true,
 					"requires": {
 						"@babel/code-frame": "^7.8.3",
-						"@babel/generator": "^7.9.5",
+						"@babel/generator": "^7.9.6",
 						"@babel/helper-function-name": "^7.9.5",
 						"@babel/helper-split-export-declaration": "^7.8.3",
-						"@babel/parser": "^7.9.0",
-						"@babel/types": "^7.9.5",
+						"@babel/parser": "^7.9.6",
+						"@babel/types": "^7.9.6",
 						"debug": "^4.1.0",
 						"globals": "^11.1.0",
 						"lodash": "^4.17.13"
 					}
 				},
 				"@babel/types": {
-					"version": "7.9.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-					"integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+					"version": "7.9.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+					"integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
 					"dev": true,
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.9.5",
@@ -26764,9 +26741,9 @@
 			}
 		},
 		"react-draggable": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.3.1.tgz",
-			"integrity": "sha512-m8QeV+eIi7LhD5mXoLqDzLbokc6Ncwa0T34fF6uJzWSs4vc4fdZI/XGqHYoEn91T8S6qO+BSXslONh7Jz9VPQQ==",
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.2.tgz",
+			"integrity": "sha512-zLQs4R4bnBCGnCVTZiD8hPsHtkiJxgMpGDlRESM+EHQo8ysXhKJ2GKdJ8UxxLJdRVceX1j19jy+hQS2wHislPQ==",
 			"dev": true,
 			"requires": {
 				"classnames": "^2.2.5",
@@ -26780,9 +26757,9 @@
 			"dev": true
 		},
 		"react-fast-compare": {
-			"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==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.1.1.tgz",
+			"integrity": "sha512-SCsAORWK59BvauR2L1BTdjQbJcSGJJz03U0awektk2hshLKrITDDFTlgGCqIZpTDlPC/NFlZee6xTMzXPVLiHw==",
 			"dev": true
 		},
 		"react-focus-lock": {
@@ -26800,9 +26777,9 @@
 			}
 		},
 		"react-helmet-async": {
-			"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==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.6.tgz",
+			"integrity": "sha512-t+bhAI4NgxfEv8ez4r77cLfR4O4Z55E/FH2DT+uiE4U7yfWgAk7OAOi7IxHxuYEVLI26bqjZvlVCkpC5/5AoNA==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.9.2",
@@ -26810,23 +26787,6 @@
 				"prop-types": "^15.7.2",
 				"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": {
@@ -26919,23 +26879,6 @@
 			"requires": {
 				"@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": {
@@ -26998,9 +26941,9 @@
 			}
 		},
 		"react-transition-group": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz",
-			"integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==",
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
+			"integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.5.5",
@@ -27272,9 +27215,9 @@
 			}
 		},
 		"regenerator-runtime": {
-			"version": "0.13.3",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-			"integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+			"version": "0.13.5",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+			"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
 			"dev": true
 		},
 		"regenerator-transform": {
@@ -28166,9 +28109,9 @@
 			"dev": true
 		},
 		"shelljs": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
-			"integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
+			"version": "0.8.4",
+			"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
+			"integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
 			"dev": true,
 			"requires": {
 				"glob": "^7.0.0",
@@ -28778,9 +28721,9 @@
 			"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
 		},
 		"store2": {
-			"version": "2.11.1",
-			"resolved": "https://registry.npmjs.org/store2/-/store2-2.11.1.tgz",
-			"integrity": "sha512-llZqXAXjG2E4FvWsZxFmBDfh6kqQuGFZm64TX23qW02Hf4dyElhDEbYx1IIVTEMKWrrDnDA9oqOjY8WHo2NgcA==",
+			"version": "2.11.2",
+			"resolved": "https://registry.npmjs.org/store2/-/store2-2.11.2.tgz",
+			"integrity": "sha512-TQMKs+C6n9idtzLpxluikmDCYiDJrTbbIGn9LFxMg0BVTu+8JZKSlXTWYRpOFKlfKD5HlDWLVpJJyNGZ2e9l1A==",
 			"dev": true
 		},
 		"stream-browserify": {
@@ -29207,13 +29150,13 @@
 			"integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
 		},
 		"style-loader": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.4.tgz",
-			"integrity": "sha512-SbBHRD8fwK3pX+4UDF4ETxUF0+rCvk29LWTTI7Rt0cgsDjAj3SWM76ByTe6u2+4IlJ/WwluB7wuslWETCoPQdg==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
+			"integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
 			"dev": true,
 			"requires": {
 				"loader-utils": "^2.0.0",
-				"schema-utils": "^2.6.5"
+				"schema-utils": "^2.6.6"
 			},
 			"dependencies": {
 				"ajv": {
@@ -29738,9 +29681,9 @@
 					}
 				},
 				"js-yaml": {
-					"version": "3.13.1",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-					"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+					"version": "3.14.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+					"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
 					"dev": true,
 					"requires": {
 						"argparse": "^1.0.7",
@@ -30423,6 +30366,114 @@
 			"integrity": "sha512-UGTRZu1evMw4uTPyYF66/KFd22XiU+jMaIuHrkIHQ2GivAXVlLV0v/vHrpOuTRf9BmpNHi/SO7Vd0rLu0y57jg==",
 			"dev": true
 		},
+		"ts-loader": {
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-7.0.5.tgz",
+			"integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.3.0",
+				"enhanced-resolve": "^4.0.0",
+				"loader-utils": "^1.0.2",
+				"micromatch": "^4.0.0",
+				"semver": "^6.0.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"
+					}
+				},
+				"braces": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+					"dev": true,
+					"requires": {
+						"fill-range": "^7.0.1"
+					}
+				},
+				"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
+				},
+				"fill-range": {
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+					"dev": true,
+					"requires": {
+						"to-regex-range": "^5.0.1"
+					}
+				},
+				"is-number": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+					"dev": true
+				},
+				"micromatch": {
+					"version": "4.0.2",
+					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+					"integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+					"dev": true,
+					"requires": {
+						"braces": "^3.0.1",
+						"picomatch": "^2.0.5"
+					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				},
+				"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"
+					}
+				},
+				"to-regex-range": {
+					"version": "5.0.1",
+					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+					"dev": true,
+					"requires": {
+						"is-number": "^7.0.0"
+					}
+				}
+			}
+		},
 		"ts-node": {
 			"version": "8.8.2",
 			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.8.2.tgz",
@@ -31113,9 +31164,9 @@
 					}
 				},
 				"mime": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-					"integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+					"version": "2.4.5",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+					"integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==",
 					"dev": true
 				},
 				"minimist": {
@@ -31459,6 +31510,69 @@
 				}
 			}
 		},
+		"watchpack-chokidar2": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+			"integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"chokidar": "^2.1.8"
+			},
+			"dependencies": {
+				"anymatch": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+					"dev": true,
+					"optional": 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,
+							"optional": true,
+							"requires": {
+								"remove-trailing-separator": "^1.0.1"
+							}
+						}
+					}
+				},
+				"chokidar": {
+					"version": "2.1.8",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
+					}
+				},
+				"upath": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+					"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"weak-map": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz",
@@ -31600,9 +31714,9 @@
 			},
 			"dependencies": {
 				"mime": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-					"integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+					"version": "2.4.5",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+					"integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==",
 					"dev": true
 				}
 			}
@@ -31648,9 +31762,9 @@
 			}
 		},
 		"webpack-virtual-modules": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.1.tgz",
-			"integrity": "sha512-0PWBlxyt4uGDofooIEanWhhyBOHdd+lr7QpYNDLC7/yc5lqJT8zlc04MTIBnKj+c2BlQNNuwE5er/Tg4wowHzA==",
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz",
+			"integrity": "sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==",
 			"dev": true,
 			"requires": {
 				"debug": "^3.0.0"
@@ -31674,12 +31788,12 @@
 			}
 		},
 		"websocket-driver": {
-			"version": "0.7.3",
-			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-			"integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
 			"dev": true,
 			"requires": {
-				"http-parser-js": ">=0.4.0 <0.4.11",
+				"http-parser-js": ">=0.5.1",
 				"safe-buffer": ">=5.1.0",
 				"websocket-extensions": ">=0.1.1"
 			}
@@ -31995,30 +32109,10 @@
 			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
 		},
 		"yaml": {
-			"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.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
-				}
-			}
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
+			"integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+			"dev": true
 		},
 		"yaqrcode": {
 			"version": "0.2.1",
diff --git a/package.json b/package.json
index dd95758fc37..3e3b71fdd88 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
 		"tslint": "eslint --ext .ts,.tsx .",
 		"eslint": "meteor npm run jslint && meteor npm run tslint",
 		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
+		"typecheck": "tsc --noEmit --skipLibCheck",
 		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"postinstall": "node .scripts/npm-postinstall.js",
 		"coverage": "nyc -r html mocha --opts ./mocha.opts",
@@ -56,10 +57,11 @@
 		"@rocket.chat/eslint-config": "^0.3.0",
 		"@rocket.chat/livechat": "^1.5.0",
 		"@settlin/spacebars-loader": "^1.0.7",
-		"@storybook/addon-actions": "^5.3.18",
-		"@storybook/addon-knobs": "^5.3.18",
-		"@storybook/addons": "^5.3.18",
-		"@storybook/react": "^5.3.18",
+		"@storybook/addon-actions": "^5.3.19",
+		"@storybook/addon-knobs": "^5.3.19",
+		"@storybook/addon-viewport": "^5.3.19",
+		"@storybook/addons": "^5.3.19",
+		"@storybook/react": "^5.3.19",
 		"@types/bcrypt": "^3.0.0",
 		"@types/chai": "^4.2.11",
 		"@types/chai-spies": "^1.0.1",
@@ -110,6 +112,7 @@
 		"stylelint": "^9.9.0",
 		"stylelint-order": "^2.0.0",
 		"supertest": "^3.3.0",
+		"ts-loader": "^7.0.5",
 		"ts-node": "^8.8.2",
 		"typescript": "^3.7.3",
 		"webpack": "^4.29.3"
@@ -126,6 +129,7 @@
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
 		"@rocket.chat/apps-engine": "1.15.0",
+		"@rocket.chat/css-in-js": "^0.9.0",
 		"@rocket.chat/fuselage": "^0.9.0",
 		"@rocket.chat/fuselage-hooks": "^0.9.0",
 		"@rocket.chat/fuselage-polyfills": "^0.9.0",
@@ -133,6 +137,7 @@
 		"@rocket.chat/icons": "^0.6.3-dev.23",
 		"@rocket.chat/ui-kit": "^0.6.3-dev.23",
 		"@slack/client": "^4.8.0",
+		"@types/use-subscription": "^1.0.0",
 		"adm-zip": "RocketChat/adm-zip",
 		"apn": "2.2.0",
 		"archiver": "^3.0.0",
diff --git a/server/main.d.ts b/server/main.d.ts
index 16772014e5f..2d8a01c20b0 100644
--- a/server/main.d.ts
+++ b/server/main.d.ts
@@ -24,7 +24,7 @@ declare module 'meteor/meteor' {
 		interface Error extends globalError {
 			error: string | number;
 			reason?: string;
-			details?: any;
+			details?: string | undefined;
 		}
 
 		const server: any;