diff --git a/.eslintrc.js b/.eslintrc.js
index 2a4c9b03f..f4e3b4196 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,57 +1,60 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "jasmine": true
+    'env': {
+        'browser': true,
+        'es6': true,
+        'jasmine': true
     },
-    "globals": {
-        "$": true,
-        "sectionNames": "readonly",
+    'globals': {
+        '$': true,
+        'sectionNames': 'readonly',
     },
-    "extends": ["eslint:recommended", "plugin:react/recommended"],
-    "parserOptions": {
-        "ecmaFeatures": {
-            "experimentalObjectRestSpread": true,
-            "jsx": true
+    'extends': ['eslint:recommended', 'plugin:react/recommended', 'plugin:@typescript-eslint/recommended'],
+    'parser': '@typescript-eslint/parser',
+    'parserOptions': {
+        'ecmaFeatures': {
+            'experimentalObjectRestSpread': true,
+            'jsx': true
         },
-        "sourceType": "module"
+        'sourceType': 'module'
     },
-    "plugins": [
-        "react"
+    'plugins': [
+        'react',
+        '@typescript-eslint',
     ],
-    "rules": {
-        "indent": [
-            "error",
+    'rules': {
+        '@typescript-eslint/no-explicit-any': 0,
+        'indent': [
+            'error',
             4
         ],
-        "linebreak-style": [
-            "error",
-            "unix"
+        'linebreak-style': [
+            'error',
+            'unix'
         ],
-        "quotes": [
-            "error",
-            "single"
+        'quotes': [
+            'error',
+            'single'
         ],
-        "semi": [
-            "error",
-            "always"
+        'semi': [
+            'error',
+            'always'
         ],
-        "no-console": [
-            "error",
-            {"allow": ["warn", "error"]}
+        'no-console': [
+            'error',
+            {'allow': ['warn', 'error']}
         ],
-        "object-curly-spacing": ["error", "never"],
-        "react/no-deprecated": [
+        'object-curly-spacing': ['error', 'never'],
+        'react/no-deprecated': [
             1,
         ],
-        "react/jsx-no-target-blank": [
+        'react/jsx-no-target-blank': [
             0,
         ],
-        "react/display-name": [0]
+        'react/display-name': [0]
     },
-    "settings": {
-        "react": {
-            "version": "16.2"
+    'settings': {
+        'react': {
+            'version': '16.2'
         }
     }
 };
diff --git a/assets/actions.js b/assets/actions.ts
similarity index 73%
rename from assets/actions.js
rename to assets/actions.ts
index 77e4b2b98..f7179d1a8 100644
--- a/assets/actions.js
+++ b/assets/actions.ts
@@ -2,7 +2,7 @@ import {get, differenceBy} from 'lodash';
 import server from 'server';
 
 export const RENDER_MODAL = 'RENDER_MODAL';
-export function renderModal(modal, data) {
+export function renderModal(modal: any, data: any) {
     return {type: RENDER_MODAL, modal, data};
 }
 
@@ -11,19 +11,25 @@ export function closeModal() {
     return {type: CLOSE_MODAL};
 }
 
+export const SET_USER = 'SET_USER';
+export function setUser(user: any) {
+    return {type: SET_USER, data: user};
+}
+
+
 export const SAVED_ITEMS_COUNT = 'SAVED_ITEMS_COUNT';
-export function setSavedItemsCount(count) {
+export function setSavedItemsCount(count: any) {
     return {type: SAVED_ITEMS_COUNT, count: count};
 }
 
 export const SET_UI_CONFIG = 'SET_UI_CONFIG';
-export function setUiConfig(config) {
+export function setUiConfig(config: any) {
     return {type: SET_UI_CONFIG, config: config};
 }
 
 export const MODAL_FORM_VALID = 'MODAL_FORM_VALID';
 export function modalFormValid() {
-    return (dispatch, getState) => {
+    return (dispatch: any, getState: any) => {
         if (!get(getState(), 'modal.formValid')) {
             dispatch({type: MODAL_FORM_VALID});
         }
@@ -34,7 +40,7 @@ export function modalFormValid() {
 
 export const MODAL_FORM_INVALID = 'MODAL_FORM_INVALID';
 export function modalFormInvalid() {
-    return (dispatch, getState) => {
+    return (dispatch: any, getState: any) => {
         if (get(getState(), 'modal.formValid')) {
             dispatch({type: MODAL_FORM_INVALID});
         }
@@ -49,30 +55,30 @@ export function userProfileClosed() {
 }
 
 export const ADD_EDIT_USERS = 'ADD_EDIT_USERS';
-export function getEditUsers(item) {
-    return function (dispatch, getState) {
+export function getEditUsers(item: any) {
+    return function (dispatch: any, getState: any) {
         let findUsers = [];
         const itemUsers = ([
             item.original_creator,
             item.version_creator
-        ].filter((u) => u));
+        ].filter((u: any) => u));
         const editUsers = getState().editUsers || [];
 
         if (!get(item, 'version_creator') && !get(item, 'original_creator')) {
             return Promise.resolve();
         }
-        
-        findUsers = differenceBy(editUsers, itemUsers.map((u) => ({'_id': u})), '_id');
+
+        findUsers = differenceBy(editUsers, itemUsers.map((u: any) => ({'_id': u})), '_id');
         if (editUsers.length === 0 || findUsers.length > 0) {
             return server.get(`/users/search?ids=${itemUsers.join(',')}`)
-                .then((data) => {
+                .then((data: any) => {
                     dispatch({
                         type: ADD_EDIT_USERS,
                         data
                     });
-                });    
+                });
         }
 
         return Promise.resolve();
-    };    
+    };
 }
diff --git a/assets/agenda/actions.js b/assets/agenda/actions.ts
similarity index 75%
rename from assets/agenda/actions.js
rename to assets/agenda/actions.ts
index 82b60a2b6..578555693 100644
--- a/assets/agenda/actions.js
+++ b/assets/agenda/actions.ts
@@ -38,34 +38,34 @@ const WATCH_URL = '/agenda_watch';
 const WATCH_COVERAGE_URL = '/agenda_coverage_watch';
 
 export const SET_STATE = 'SET_STATE';
-export function setState(state) {
+export function setState(state: any) {
     return {type: SET_STATE, state};
 }
 
 export const SET_ITEMS = 'SET_ITEMS';
-export function setItems(items) {
+export function setItems(items: any) {
     return {type: SET_ITEMS, items};
 }
 
 export const SET_ACTIVE = 'SET_ACTIVE';
-export function setActive(item) {
+export function setActive(item: any) {
     return {type: SET_ACTIVE, item};
 }
 
 
 export const PREVIEW_ITEM = 'PREVIEW_ITEM';
-export function preview(item, group, plan) {
+export function preview(item: any, group?: any, plan?: any) {
     return {type: PREVIEW_ITEM, item, group, plan};
 }
 
-export function previewAndCopy(item) {
-    return (dispatch) => {
+export function previewAndCopy(item: any) {
+    return (dispatch: any) => {
         dispatch(copyPreviewContents(item));
     };
 }
 
-export function previewItem(item, group, plan) {
-    return (dispatch, getState) => {
+export function previewItem(item?: any, group?: any, plan?: any) {
+    return (dispatch: any, getState: any) => {
         dispatch(fetchWireItemsForAgenda(item));
         markItemAsRead(item, getState());
         dispatch(preview(item, group, plan));
@@ -73,10 +73,10 @@ export function previewItem(item, group, plan) {
     };
 }
 
-export function fetchWireItemsForAgenda(item) {
-    return (dispatch) => {
-        let wireIds = [];
-        (get(item, 'coverages') || []).forEach((c) => {
+export function fetchWireItemsForAgenda(item: any) {
+    return (dispatch: any) => {
+        const wireIds: Array<any> = [];
+        (get(item, 'coverages') || []).forEach((c: any) => {
             if (c.coverage_type === 'text' && c.delivery_id) {
                 wireIds.push(c.delivery_id);
             }
@@ -84,37 +84,39 @@ export function fetchWireItemsForAgenda(item) {
 
         if (wireIds.length > 0){
             return server.get(`/wire/items/${wireIds.join(',')}`)
-                .then((items) => {
+                .then((items: any) => {
                     dispatch(agendaWireItems(items));
                     return Promise.resolve(items);
                 })
-                .catch((error) => errorHandler(error, dispatch));
+                .catch((error: any) => errorHandler(error, dispatch));
         }
     };
 }
 
 export const AGENDA_WIRE_ITEMS = 'AGENDA_WIRE_ITEMS';
-export function agendaWireItems(items) {
+export function agendaWireItems(items: any) {
     return {type: AGENDA_WIRE_ITEMS, items};
 }
 
 export const OPEN_ITEM = 'OPEN_ITEM';
-export function openItemDetails(item, group, plan) {
+export function openItemDetails(item: any, group?: any, plan?: any) {
     return {type: OPEN_ITEM, item, group, plan};
 }
 
-export function requestCoverage(item, message) {
+export function requestCoverage(item: any, message: any) {
     return () => {
         const url = '/agenda/request_coverage';
-        const data = {item: item._id, message};
+        const data: any = {item: item._id, message};
         return server.post(url, data)
             .then(() => notify.success(gettext('Your inquiry has been sent successfully')))
-            .catch(errorHandler);
+            .catch((arg: any) => {
+                errorHandler(arg);
+            });
     };
 }
 
-export function openItem(item, group, plan) {
-    return (dispatch, getState) => {
+export function openItem(item: any, group: any, plan: any) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         markItemAsRead(item, state);
         dispatch(fetchWireItemsForAgenda(item));
@@ -137,40 +139,40 @@ export function queryItems() {
 }
 
 export const RECIEVE_ITEMS = 'RECIEVE_ITEMS';
-export function recieveItems(data) {
+export function recieveItems(data: any) {
     return {type: RECIEVE_ITEMS, data};
 }
 
 export const RECIEVE_ITEM = 'RECIEVE_ITEM';
-export function recieveItem(data) {
+export function recieveItem(data: any) {
     return {type: RECIEVE_ITEM, data};
 }
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(agendaData, readData, activeDate, featuredOnly) {
+export function initData(agendaData: any, readData: any, activeDate: any, featuredOnly: any) {
     return {type: INIT_DATA, agendaData, readData, activeDate, featuredOnly};
 }
 
 export const SELECT_DATE = 'SELECT_DATE';
-export function selectDate(dateString, grouping) {
+export function selectDate(dateString: any, grouping: any) {
     return {type: SELECT_DATE, dateString, grouping};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
 export const SET_ERROR_MESSAGE = 'SET_ERROR_MESSAGE';
-export function setErrorMessage(message) {
+export function setErrorMessage(message: any) {
     return {
         type: SET_ERROR_MESSAGE,
         message
     };
 }
 
-export function printItem(item) {
-    return (dispatch, getState) => {
+export function printItem(item: any) {
+    return (dispatch: any, getState: any) => {
         const map = encodeURIComponent(getMapSource(getLocations(item), 2));
         window.open(`/agenda/${item._id}?print&map=${map}`, '_blank');
 
@@ -187,16 +189,16 @@ export function printItem(item) {
  *
  * This is an initial version, should be updated with preview markup changes.
  */
-export function copyPreviewContents(item) {
-    return (dispatch, getState) => {
+export function copyPreviewContents(item: any) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
 
         if (!state.user) {
             return;
         }
 
-        server.post(`/wire/${item._id}/copy?type=${state.context}`)
-            .then((response) => {
+        (server as any).post(`/wire/${item._id}/copy?type=${state.context}`)
+            .then((response: any) => {
                 dispatch(setCopyItem(item._id));
                 copyTextToClipboard(response.data, item);
             })
@@ -211,19 +213,19 @@ export function copyPreviewContents(item) {
  * @param {bool} next
  * @return {Promise}
  */
-function search(state, next) {
+function search(state: any, next?: any) {
     const currentMoment = moment();
-    const searchParams = searchParamsSelector(state);
-    const createdFilter = get(searchParams, 'created') || {};
-    const itemTypeFilter = get(state, 'agenda.itemType');
-    const eventsOnlyFilter = !state.bookmarks && itemTypeFilter === 'events';
+    const searchParams: any = searchParamsSelector(state);
+    const createdFilter: any = get(searchParams, 'created') || {};
+    const itemTypeFilter: any = get(state, 'agenda.itemType');
+    const eventsOnlyFilter: any = !state.bookmarks && itemTypeFilter === 'events';
 
     const featuredFilter = noNavigationSelected(searchParams.navigation) &&
         !state.bookmarks &&
         !eventsOnlyFilter &&
         get(state, 'agenda.featuredOnly');
 
-    let fromDateFilter;
+    let fromDateFilter: any;
 
     if (featuredFilter) {
         fromDateFilter = getMomentDate(get(state, 'agenda.activeDate')).set({
@@ -244,7 +246,7 @@ function search(state, next) {
         dateTo = createdFilter.from;
     }
 
-    const params = {
+    const params: any = {
         q: searchParams.query,
         id: state.queryId,
         bookmarks: state.bookmarks && state.user,
@@ -261,8 +263,8 @@ function search(state, next) {
     };
 
     const queryString = Object.keys(params)
-        .filter((key) => params[key])
-        .map((key) => [key, params[key]].join('='))
+        .filter((key: any) => params[key])
+        .map((key: any) => [key, params[key]].join('='))
         .join('&');
 
     return server.get(`/agenda/search?${queryString}&tick=${Date.now().toString()}`);
@@ -271,12 +273,12 @@ function search(state, next) {
 /**
  * Fetch items for current query
  */
-export function fetchItems() {
-    return (dispatch, getState) => {
+export function fetchItems(): any {
+    return (dispatch: any, getState: any) => {
         const start = Date.now();
         dispatch(queryItems());
         return search(getState())
-            .then((data) => dispatch(recieveItems(data)))
+            .then((data: any) => dispatch(recieveItems(data)))
             .then(() => {
                 analytics.timingComplete('search', Date.now() - start);
             })
@@ -284,29 +286,29 @@ export function fetchItems() {
     };
 }
 
-export function fetchItem(id) {
-    return (dispatch) => {
+export function fetchItem(id: any) {
+    return (dispatch: any) => {
         return server.get(`/agenda/${id}?format=json`)
-            .then((data) => dispatch(recieveItem(data)))
+            .then((data: any) => dispatch(recieveItem(data)))
             .catch(errorHandler);
     };
 }
 
 export const WATCH_EVENTS = 'WATCH_EVENTS';
-export function watchEvents(ids) {
-    return (dispatch, getState) => {
+export function watchEvents(ids: any) {
+    return (dispatch: any, getState: any) => {
         server.post(WATCH_URL, {items: ids})
             .then(() => {
                 dispatch({type: WATCH_EVENTS, items: ids});
                 notify.success(gettext('Started watching items successfully.'));
-                analytics.multiItemEvent('watch', ids.map((_id) => getState().itemsById[_id]));
+                analytics.multiItemEvent('watch', ids.map((_id: any) => getState().itemsById[_id]));
             });
     };
 }
 
 export const STOP_WATCHING_EVENTS = 'STOP_WATCHING_EVENTS';
-export function stopWatchingEvents(items) {
-    return (dispatch, getState) => {
+export function stopWatchingEvents(items: any) {
+    return (dispatch: any, getState: any) => {
         server.del(getState().bookmarks ? `${WATCH_URL}?bookmarks=true` : WATCH_URL, {items})
             .then(() => {
                 notify.success(gettext('Stopped watching items successfully.'));
@@ -328,29 +330,29 @@ export function stopWatchingEvents(items) {
  *
  * @return {function}
  */
-export function shareItems(items) {
-    return (dispatch, getState) => {
+export function shareItems(items: any) {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         const company = getState().company;
         return server.get(`/companies/${company}/users`)
-            .then((users) => users.filter((u) => u._id !== user))
-            .then((users) => dispatch(renderModal('shareItem', {items, users})))
+            .then((users: any) => users.filter((u: any) => u._id !== user))
+            .then((users: any) => dispatch(renderModal('shareItem', {items, users})))
             .catch(errorHandler);
     };
 }
 
 export const BOOKMARK_ITEMS = 'BOOKMARK_ITEMS';
-export function setBookmarkItems(items) {
+export function setBookmarkItems(items: any) {
     return {type: BOOKMARK_ITEMS, items};
 }
 
 export const REMOVE_BOOKMARK = 'REMOVE_BOOKMARK';
-export function removeBookmarkItems(items) {
+export function removeBookmarkItems(items: any) {
     return {type: REMOVE_BOOKMARK, items};
 }
 
-export function bookmarkItems(items) {
-    return (dispatch, getState) =>
+export function bookmarkItems(items: any) {
+    return (dispatch: any, getState: any) =>
         server.post('/agenda_bookmark', {items})
             .then(() => {
                 if (items.length > 1) {
@@ -360,14 +362,14 @@ export function bookmarkItems(items) {
                 }
             })
             .then(() => {
-                analytics.multiItemEvent('bookmark', items.map((_id) => getState().itemsById[_id]));
+                analytics.multiItemEvent('bookmark', items.map((_id: any) => getState().itemsById[_id]));
             })
             .then(() => dispatch(setBookmarkItems(items)))
             .catch(errorHandler);
 }
 
-export function removeBookmarks(items) {
-    return (dispatch, getState) =>
+export function removeBookmarks(items: any) {
+    return (dispatch: any, getState: any) =>
         server.del('/agenda_bookmark', {items})
             .then(() => {
                 if (items.length > 1) {
@@ -382,27 +384,27 @@ export function removeBookmarks(items) {
 }
 
 export const TOGGLE_SELECTED = 'TOGGLE_SELECTED';
-export function toggleSelected(item) {
+export function toggleSelected(item: any) {
     return {type: TOGGLE_SELECTED, item};
 }
 
 export const SHARE_ITEMS = 'SHARE_ITEMS';
-export function setShareItems(items) {
+export function setShareItems(items: any) {
     return {type: SHARE_ITEMS, items};
 }
 
 export const DOWNLOAD_ITEMS = 'DOWNLOAD_ITEMS';
-export function setDownloadItems(items) {
+export function setDownloadItems(items: any) {
     return {type: DOWNLOAD_ITEMS, items};
 }
 
 export const COPY_ITEMS = 'COPY_ITEMS';
-export function setCopyItem(item) {
+export function setCopyItem(item: any) {
     return {type: COPY_ITEMS, items: [item]};
 }
 
 export const PRINT_ITEMS = 'PRINT_ITEMS';
-export function setPrintItem(item) {
+export function setPrintItem(item: any) {
     return {type: PRINT_ITEMS, items: [item]};
 }
 
@@ -412,12 +414,21 @@ export function setPrintItem(item) {
  *
  * @param {Array} items
  */
-export function downloadItems(items) {
+export function downloadItems(items: any) {
     return renderModal('downloadItems', {items});
 }
 
+/**
+ * Personalize Home - display modal to personalize home
+ *
+ * @param {Array} items
+ */
+export function personalizeHome(items?: any) {
+    return renderModal('personalizeHome', {items});
+}
+
 export const REMOVE_NEW_ITEMS = 'REMOVE_NEW_ITEMS';
-export function removeNewItems(data) {
+export function removeNewItems(data: any) {
     return {type: REMOVE_NEW_ITEMS, data};
 }
 
@@ -426,8 +437,8 @@ export function removeNewItems(data) {
  *
  * @param {Object} data
  */
-export function pushNotification(push) {
-    return (dispatch, getState) => {
+export function pushNotification(push: any) {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         const company = getState().company;
 
@@ -456,11 +467,11 @@ export function pushNotification(push) {
     };
 }
 
-export function reloadMyTopics(reloadTopic = false) {
-    return function(dispatch) {
+export function reloadMyTopics(reloadTopic: any = false) {
+    return function(dispatch: any) {
         return loadMyTopics()
-            .then((data) => {
-                const agendaTopics = data.filter((topic) => topic.topic_type === 'agenda');
+            .then((data: any) => {
+                const agendaTopics = data.filter((topic: any) => topic.topic_type === 'agenda');
                 dispatch(setTopics(agendaTopics));
 
                 if (reloadTopic) {
@@ -475,8 +486,8 @@ export function reloadMyTopics(reloadTopic = false) {
 }
 
 export const SET_NEW_ITEM = 'SET_NEW_ITEM';
-export function setAndUpdateNewItems(data) {
-    return function(dispatch, getState) {
+export function setAndUpdateNewItems(data: any) {
+    return function(dispatch: any, getState: any) {
         const item = data.item || {};
 
         if (item.type !== 'agenda') {
@@ -493,7 +504,7 @@ export function setAndUpdateNewItems(data) {
                 return Promise.resolve();
             }
 
-            const coveragesToCheck = (agendaItem.coverages || []).map((c) => c.coverage_id);
+            const coveragesToCheck = (agendaItem.coverages || []).map((c: any) => c.coverage_id);
 
             if (coveragesToCheck.includes(item.coverage_id)) {
                 dispatch(fetchWireItemsForAgenda(agendaItem));
@@ -515,12 +526,12 @@ export function setAndUpdateNewItems(data) {
 }
 
 export const UPDATE_ITEM = 'UPDATE_ITEM';
-export function updateItem(item) {
+export function updateItem(item: any) {
     return {type: UPDATE_ITEM, item: item};
 }
 
-export function toggleDropdownFilter(key, val) {
-    return (dispatch) => {
+export function toggleDropdownFilter(key: any, val: any) {
+    return (dispatch: any) => {
         dispatch(setActive(null));
         dispatch(preview(null));
 
@@ -536,8 +547,8 @@ export function toggleDropdownFilter(key, val) {
     };
 }
 
-function setLocationFilter(location) {
-    return (dispatch, getState) => {
+function setLocationFilter(location: any) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const currentFilters = cloneDeep(searchFilterSelector(state));
         const currentLocation = get(currentFilters, 'location') || {};
@@ -563,13 +574,13 @@ export function startLoading() {
 }
 
 export const RECIEVE_NEXT_ITEMS = 'RECIEVE_NEXT_ITEMS';
-export function recieveNextItems(data) {
+export function recieveNextItems(data: any) {
     return {type: RECIEVE_NEXT_ITEMS, data};
 }
 
 const MAX_ITEMS = 1000; // server limit
 export function fetchMoreItems() {
-    return (dispatch, getState) => {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const limit = Math.min(MAX_ITEMS, state.totalItems);
 
@@ -579,7 +590,7 @@ export function fetchMoreItems() {
 
         dispatch(startLoading());
         return search(getState(), true)
-            .then((data) => dispatch(recieveNextItems(data)))
+            .then((data: any) => dispatch(recieveNextItems(data)))
             .catch(errorHandler);
     };
 }
@@ -589,12 +600,12 @@ export function fetchMoreItems() {
  *
  * @param {URLSearchParams} params
  */
-export function initParams(params) {
+export function initParams(params: any): any {
     if (params.get('filter') || params.get('created')) {
         clearAgendaDropdownFilters();
     }
 
-    return (dispatch, getState) => {
+    return (dispatch: any, getState: any) => {
         const featuredParam = params.get('featured');
         if (featuredParam && featuredParam !== get(getState(), 'agenda.featuredOnly', false).toString()) {
             dispatch(toggleFeaturedFilter(false));
@@ -619,8 +630,8 @@ export function initParams(params) {
  * @param {String} topicId
  * @return {Promise}
  */
-export function loadMyAgendaTopic(topicId) {
-    return (dispatch, getState) => {
+export function loadMyAgendaTopic(topicId: any) {
+    return (dispatch: any, getState: any) => {
         // Set featured query option to false when using navigations
         if (get(getState(), 'agenda.featuredOnly')) {
             dispatch({type: TOGGLE_FEATURED_FILTER});
@@ -632,8 +643,8 @@ export function loadMyAgendaTopic(topicId) {
 }
 
 export const TOGGLE_FEATURED_FILTER = 'TOGGLE_FEATURED_FILTER';
-export function toggleFeaturedFilter(fetch = true) {
-    return (dispatch) => {
+export function toggleFeaturedFilter(fetch: any = true) {
+    return (dispatch: any) => {
         toggleFeaturedOnlyParam();
         dispatch({type: TOGGLE_FEATURED_FILTER});
         if (!fetch) {
@@ -645,13 +656,13 @@ export function toggleFeaturedFilter(fetch = true) {
 }
 
 export const SET_ITEM_TYPE_FILTER = 'SET_ITEM_TYPE_FILTER';
-export function setItemTypeFilter(value) {
+export function setItemTypeFilter(value: any) {
     return {type: SET_ITEM_TYPE_FILTER, value};
 }
 
 export const WATCH_COVERAGE = 'WATCH_COVERAGE';
-export function watchCoverage(coverage, item) {
-    return (dispatch) => {
+export function watchCoverage(coverage: any, item: any) {
+    return (dispatch: any) => {
         server.post(WATCH_COVERAGE_URL, {
             coverage_id: coverage.coverage_id,
             item_id: item._id
@@ -663,13 +674,13 @@ export function watchCoverage(coverage, item) {
                     item
                 });
                 notify.success(gettext('Started watching coverage successfully.'));
-            }, (error) => { errorHandler(error, dispatch);});
+            }, (error: any) => { errorHandler(error, dispatch);});
     };
 }
 
 export const STOP_WATCHING_COVERAGE = 'STOP_WATCHING_COVERAGE';
-export function stopWatchingCoverage(coverage, item) {
-    return (dispatch, getState) => {
+export function stopWatchingCoverage(coverage: any, item: any) {
+    return (dispatch: any, getState: any) => {
         server.del(WATCH_COVERAGE_URL, {
             coverage_id: coverage.coverage_id,
             item_id: item._id
@@ -685,18 +696,18 @@ export function stopWatchingCoverage(coverage, item) {
                 if (getState().bookmarks) {
                     dispatch(fetchItems()); // item should get removed from the list in bookmarks view
                 }
-            }, (error) => { errorHandler(error, dispatch);});
+            }, (error: any) => { errorHandler(error, dispatch);});
     };
 }
 
-export function errorHandler(error, dispatch, setError) {
+export function errorHandler(error: any, dispatch?: any, setError?: any) {
     console.error('error', error);
     if (setError) {
         if (error.response && error.response.status === 403) {
             dispatch(setErrorMessage(gettext(
                 'There is no product associated with your user. Please reach out to your Company Admin')));
         } else {
-            error.response.json().then(function(data) {
+            error.response.json().then(function(data: any) {
                 dispatch(setError(data));
             });
         }
diff --git a/assets/agenda/components/AgendaApp.jsx b/assets/agenda/components/AgendaApp.tsx
similarity index 93%
rename from assets/agenda/components/AgendaApp.jsx
rename to assets/agenda/components/AgendaApp.tsx
index 4538f155b..bca3f122d 100644
--- a/assets/agenda/components/AgendaApp.jsx
+++ b/assets/agenda/components/AgendaApp.tsx
@@ -62,7 +62,12 @@ const modals = {
 };
 
 class AgendaApp extends BaseApp {
-    constructor(props) {
+    static propTypes: any;
+
+    modals: any;
+    tabs: any;
+
+    constructor(props: any) {
         super(props);
         this.modals = modals;
 
@@ -70,7 +75,7 @@ class AgendaApp extends BaseApp {
     }
 
     getTabs() {
-        return this.props.featuredOnly ?  this.tabs.filter((t) => t.id !== 'filters') : this.tabs;
+        return this.props.featuredOnly ?  this.tabs.filter((t: any) => t.id !== 'filters') : this.tabs;
     }
 
 
@@ -98,14 +103,14 @@ class AgendaApp extends BaseApp {
         const modal = this.renderModal(this.props.modal);
         const showDatePicker = isEmpty(this.props.createdFilter.from) && isEmpty(this.props.createdFilter.to) && !this.props.bookmarks;
 
-        const panesCount = [this.state.withSidebar, this.props.itemToPreview].filter((x) => x).length;
+        const panesCount = [this.state.withSidebar, this.props.itemToPreview].filter((x: any) => x).length;
         const mainClassName = classNames('wire-column__main', {
             'wire-articles__one-side-pane': panesCount === 1,
             'wire-articles__two-side-panes': panesCount === 2,
         });
 
         const onDetailClose = this.props.detail ? null :
-            () => this.props.actions.filter(a => a.id === 'open')[0].action(null, this.props.previewGroup, this.props.previewPlan);
+            () => this.props.actions.filter((a: any) => a.id === 'open')[0].action(null, this.props.previewGroup, this.props.previewPlan);
         const eventsOnly = this.props.itemTypeFilter === 'events' || this.props.eventsOnlyAccess;
         const hideFeaturedToggle = !noNavigationSelected(this.props.activeNavigation) ||
             this.props.bookmarks ||
@@ -113,12 +118,12 @@ class AgendaApp extends BaseApp {
             eventsOnly;
 
         const numNavigations = get(this.props, 'searchParams.navigation.length', 0);
-        let showSaveTopic = this.props.showSaveTopic &&
+        const showSaveTopic = this.props.showSaveTopic &&
             !this.props.bookmarks &&
             !this.props.featuredOnly;
         let showTotalItems = false;
         let showTotalLabel = false;
-        let totalItemsLabel;
+        let totalItemsLabel: any;
 
         if (get(this.props, 'activeTopic.label')) {
             totalItemsLabel = this.props.activeTopic.label;
@@ -155,7 +160,7 @@ class AgendaApp extends BaseApp {
                 restrictCoverageInfo={this.props.restrictCoverageInfo}
             />] : [
                 <section key="contentHeader" className='content-header'>
-                    <h3 className="a11y-only">{gettext('{{agenda}} Content', sectionNames)}</h3>
+                    <h3 className="a11y-only">{gettext('{{agenda}} Content', window.sectionNames)}</h3>
                     <SelectedItemsBar
                         actions={this.props.actions}
                     />
@@ -286,7 +291,7 @@ class AgendaApp extends BaseApp {
                         />
                     </div>
                 </section>
-            ]).concat([
+            ] as any).concat([
                 modal,
                 this.renderNavBreadcrumb(
                     this.props.navigations,
@@ -353,7 +358,7 @@ AgendaApp.propTypes = {
     groups: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     state: state,
     isLoading: state.isLoading,
     totalItems: state.totalItems,
@@ -398,26 +403,28 @@ const mapStateToProps = (state) => ({
     errorMessage:state.errorMessage
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch: any) => ({
     fetchItems: () => dispatch(fetchItems()),
     actions: getAgendaItemActions(dispatch),
     coverageActions: getCoverageItemActions(dispatch),
     fetchMoreItems: () => dispatch(fetchMoreItems()),
-    setView: (view) => dispatch(setView(view)),
+    setView: (view: any) => dispatch(setView(view)),
     closePreview: () => dispatch(previewItem(null)),
-    toggleDropdownFilter: (field, value) => {
+    toggleDropdownFilter: (field: any, value: any) => {
         setAgendaDropdownFilter(field, value);
         dispatch(toggleDropdownFilter(field, value));
     },
-    selectDate: (dateString, grouping) => {
+    selectDate: (dateString: any, grouping: any) => {
         dispatch(selectDate(dateString, grouping));
         setActiveDate(dateString);
         dispatch(fetchItems());
     },
-    openItemDetails: (item) => dispatch(openItemDetails(item)),
-    requestCoverage: (item, message) => dispatch(requestCoverage(item, message)),
-    toggleFeaturedFilter: (fetch) => dispatch(toggleFeaturedFilter(fetch)),
-    setQuery: (query) => dispatch(setQuery(query)),
+    openItemDetails: (item: any) => dispatch(openItemDetails(item)),
+    requestCoverage: (item: any, message: any) => dispatch(requestCoverage(item, message)),
+    toggleFeaturedFilter: (fetch: any) => dispatch(toggleFeaturedFilter(fetch)),
+    setQuery: (query: any) => dispatch(setQuery(query)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(AgendaApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(AgendaApp);
+
+export default component;
diff --git a/assets/agenda/components/AgendaAttachments.jsx b/assets/agenda/components/AgendaAttachments.tsx
similarity index 92%
rename from assets/agenda/components/AgendaAttachments.jsx
rename to assets/agenda/components/AgendaAttachments.tsx
index 48d4888f1..0f2044c54 100644
--- a/assets/agenda/components/AgendaAttachments.jsx
+++ b/assets/agenda/components/AgendaAttachments.tsx
@@ -8,7 +8,7 @@ import {bem} from 'ui/utils';
 const kB = 1024;
 const MB = kB * kB;
 
-function filesize (size) {
+function filesize (size: any) {
     if (size > MB) {
         return (size / MB).toFixed(1) + ' MB';
     } else if (size > kB) {
@@ -18,12 +18,12 @@ function filesize (size) {
     }
 }
 
-export default function AgendaAttachments({item}) {
+export default function AgendaAttachments({item}: any) {
     if (!hasAttachments(item)) {
         return null;
     }
 
-    return getAttachments(item).map((attachment) => (
+    return getAttachments(item).map((attachment: any) => (
         <div key={attachment.media} className="coverage-item flex-row">
             <div className={bem('coverage-item', 'column', 'grow')}>
                 <div className="coverage-item__row">
diff --git a/assets/agenda/components/AgendaCalendarAgendaFilter.jsx b/assets/agenda/components/AgendaCalendarAgendaFilter.tsx
similarity index 95%
rename from assets/agenda/components/AgendaCalendarAgendaFilter.jsx
rename to assets/agenda/components/AgendaCalendarAgendaFilter.tsx
index 2cb602d94..bda053cdf 100644
--- a/assets/agenda/components/AgendaCalendarAgendaFilter.jsx
+++ b/assets/agenda/components/AgendaCalendarAgendaFilter.tsx
@@ -7,7 +7,8 @@ import {processBuckets} from '../../components/DropdownFilter';
 
 import {getDropdownItems} from './AgendaFilters';
 
-export class AgendaCalendarAgendaFilter extends React.PureComponent {
+export class AgendaCalendarAgendaFilter extends React.PureComponent<any, any> {
+    static propTypes: any;
     render() {
         const isActive = !!(this.props.activeFilter.calendar) || !!(this.props.activeFilter.agendas);
         const calendarFilter = {
@@ -15,7 +16,7 @@ export class AgendaCalendarAgendaFilter extends React.PureComponent {
             field: 'calendar',
             icon: 'icon-small--calendar',
             itemTypes: ['events', 'combined'],
-            isItemActive: (key) => (
+            isItemActive: (key: any) => (
                 (this.props.activeFilter.calendar || []).includes(key)
             ),
         };
@@ -25,7 +26,7 @@ export class AgendaCalendarAgendaFilter extends React.PureComponent {
             nestedField: 'agenda',
             icon: 'icon-small--calendar',
             itemTypes: ['planning', 'combined'],
-            isItemActive: (key) => (
+            isItemActive: (key: any) => (
                 (this.props.activeFilter.agendas || []).includes(key)
             ),
         };
diff --git a/assets/agenda/components/AgendaCoverageExistsFilter.jsx b/assets/agenda/components/AgendaCoverageExistsFilter.tsx
similarity index 95%
rename from assets/agenda/components/AgendaCoverageExistsFilter.jsx
rename to assets/agenda/components/AgendaCoverageExistsFilter.tsx
index 41ef97de9..4179d965b 100644
--- a/assets/agenda/components/AgendaCoverageExistsFilter.jsx
+++ b/assets/agenda/components/AgendaCoverageExistsFilter.tsx
@@ -17,7 +17,7 @@ const FILTER_VALUES = {
     NOT_PLANNED: 'not planned',
 };
 
-function getActiveFilterLabel(filter, activeFilter) {
+function getActiveFilterLabel(filter: any, activeFilter: any) {
     const filterValue = get(activeFilter, `${filter.field}[0]`);
 
     switch (filterValue) {
@@ -30,7 +30,7 @@ function getActiveFilterLabel(filter, activeFilter) {
     return filter.label;
 }
 
-function AgendaCoverageExistsFilter ({toggleFilter, activeFilter}) {
+function AgendaCoverageExistsFilter ({toggleFilter, activeFilter}: any) {
     return (
         <AgendaDropdown
             filter={filter}
diff --git a/assets/agenda/components/AgendaCoverageRequest.jsx b/assets/agenda/components/AgendaCoverageRequest.tsx
similarity index 93%
rename from assets/agenda/components/AgendaCoverageRequest.jsx
rename to assets/agenda/components/AgendaCoverageRequest.tsx
index 894f0f856..dc94452a4 100644
--- a/assets/agenda/components/AgendaCoverageRequest.jsx
+++ b/assets/agenda/components/AgendaCoverageRequest.tsx
@@ -5,8 +5,9 @@ import classNames from 'classnames';
 import {gettext} from 'utils';
 
 
-class AgendaCoverageRequest extends React.Component {
-    constructor(props, context) {
+class AgendaCoverageRequest extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
         this.onRequestClick = this.onRequestClick.bind(this);
         this.reset = this.reset.bind(this);
@@ -23,7 +24,7 @@ class AgendaCoverageRequest extends React.Component {
         this.setState({opened: false, message: '', status: null});
     }
 
-    onMessageChange(event) {
+    onMessageChange(event: any) {
         this.setState({message: event.target.value, status: null});
     }
 
diff --git a/assets/agenda/components/AgendaCoverages.jsx b/assets/agenda/components/AgendaCoverages.tsx
similarity index 85%
rename from assets/agenda/components/AgendaCoverages.jsx
rename to assets/agenda/components/AgendaCoverages.tsx
index 3bae66124..add31bdaa 100644
--- a/assets/agenda/components/AgendaCoverages.jsx
+++ b/assets/agenda/components/AgendaCoverages.tsx
@@ -18,25 +18,25 @@ import {
 import {agendaContentLinkTarget} from 'ui/selectors';
 
 
-function AgendaCoveragesComponent({item, coverages, wireItems, actions, user, onClick, hideViewContentItems, contentLinkTarget}) {
+function AgendaCoveragesComponent({item, coverages, wireItems, actions, user, onClick, hideViewContentItems, contentLinkTarget}: any) {
     if (isEmpty(coverages)) {
         return null;
     }
 
-    const getSlugline = (coverage) => {
+    const getSlugline = (coverage: any) => {
         const slugline = coverage.item_slugline || coverage.slugline;
 
         return slugline ? ` | ${slugline}` : '';
     };
 
-    const coveragesWithoutState = coverages.filter((coverage) => WORKFLOW_COLORS[coverage.workflow_status] == null);
-    const coveragesWithState = coverages.filter((coverage) => WORKFLOW_COLORS[coverage.workflow_status] != null);
+    const coveragesWithoutState = coverages.filter((coverage: any) => WORKFLOW_COLORS[coverage.workflow_status] == null);
+    const coveragesWithState = coverages.filter((coverage: any) => WORKFLOW_COLORS[coverage.workflow_status] != null);
 
     return (
         <React.Fragment>
             {!coveragesWithoutState.length ? null : (
                 <div>
-                    {coveragesWithoutState.map((coverage) => (
+                    {coveragesWithoutState.map((coverage: any) => (
                         <i
                             className={`icon--coverage-${getCoverageIcon(coverage.coverage_type)} me-2`}
                             key={coverage.coverage_id}
@@ -45,7 +45,7 @@ function AgendaCoveragesComponent({item, coverages, wireItems, actions, user, on
                     ))}
                 </div>
             )}
-            {coveragesWithState.map((coverage) => (
+            {coveragesWithState.map((coverage: any) => (
                 <div
                     className={classNames(
                         'coverage-item',
@@ -53,7 +53,7 @@ function AgendaCoveragesComponent({item, coverages, wireItems, actions, user, on
                     )}
                     key={coverage.coverage_id}
                     onClick={onClick}
-                    title={onClick ? gettext('Open {{agenda}} in a new tab', sectionNames) : onClick}
+                    title={onClick ? gettext('Open {{agenda}} in a new tab', window.sectionNames) : onClick}
                 >
                     <div
                         className='coverage-item__row flex-column align-items-start'
@@ -104,10 +104,10 @@ AgendaCoveragesComponent.propTypes = {
     contentLinkTarget: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     contentLinkTarget: agendaContentLinkTarget(state),
 });
 
-const AgendaCoverages = connect(mapStateToProps)(AgendaCoveragesComponent);
+const AgendaCoverages: React.ComponentType<any> = connect(mapStateToProps)(AgendaCoveragesComponent);
 
 export default AgendaCoverages;
diff --git a/assets/agenda/components/AgendaDateButtons.jsx b/assets/agenda/components/AgendaDateButtons.tsx
similarity index 95%
rename from assets/agenda/components/AgendaDateButtons.jsx
rename to assets/agenda/components/AgendaDateButtons.tsx
index 61fda9d4f..277f62760 100644
--- a/assets/agenda/components/AgendaDateButtons.jsx
+++ b/assets/agenda/components/AgendaDateButtons.tsx
@@ -5,7 +5,7 @@ import {gettext} from 'utils';
 import {formatNavigationDate, getNext, getPrevious} from '../utils';
 
 
-function AgendaDateButtons({selectDate, activeDate, activeGrouping}) {
+function AgendaDateButtons({selectDate, activeDate, activeGrouping}: any): any {
     return ([<span className='me-3' key='label'>{formatNavigationDate(activeDate, activeGrouping)}</span>,
         <button
             key='today'
@@ -59,4 +59,6 @@ AgendaDateButtons.propTypes = {
     activeGrouping: PropTypes.string,
 };
 
-export default AgendaDateButtons;
+const component: React.ComponentType<any> = AgendaDateButtons;
+
+export default component;
diff --git a/assets/agenda/components/AgendaDateNavigation.jsx b/assets/agenda/components/AgendaDateNavigation.tsx
similarity index 92%
rename from assets/agenda/components/AgendaDateNavigation.jsx
rename to assets/agenda/components/AgendaDateNavigation.tsx
index 6093c6fd2..3796a1723 100644
--- a/assets/agenda/components/AgendaDateNavigation.jsx
+++ b/assets/agenda/components/AgendaDateNavigation.tsx
@@ -4,7 +4,7 @@ import AgendaDateButtons from './AgendaDateButtons';
 import CalendarButton from '../../components/CalendarButton';
 
 
-function AgendaDateNavigation({selectDate, activeDate, activeGrouping, displayCalendar}) {
+function AgendaDateNavigation({selectDate, activeDate, activeGrouping, displayCalendar}: any) {
     return (<div className='d-none d-lg-flex align-items-center me-3'>
         {displayCalendar && <CalendarButton selectDate={selectDate} activeDate={activeDate} />}
 
@@ -18,6 +18,7 @@ AgendaDateNavigation.propTypes = {
     activeDate: PropTypes.number,
     activeGrouping: PropTypes.string,
     displayCalendar: PropTypes.bool,
+    createdFilter: PropTypes.any,
 };
 
 export default AgendaDateNavigation;
diff --git a/assets/agenda/components/AgendaDetailCoverages.jsx b/assets/agenda/components/AgendaDetailCoverages.tsx
similarity index 90%
rename from assets/agenda/components/AgendaDetailCoverages.jsx
rename to assets/agenda/components/AgendaDetailCoverages.tsx
index c35303a56..8340ff018 100644
--- a/assets/agenda/components/AgendaDetailCoverages.jsx
+++ b/assets/agenda/components/AgendaDetailCoverages.tsx
@@ -6,7 +6,7 @@ import {gettext} from 'utils';
 import {hasCoverages} from '../utils';
 import AgendaCoverages from './AgendaCoverages';
 
-export default function AgendaDetailCoverages({item}) {
+export default function AgendaDetailCoverages({item}: any) {
     if (!hasCoverages(item)) {
         return null;
     }
diff --git a/assets/agenda/components/AgendaDropdown.jsx b/assets/agenda/components/AgendaDropdown.tsx
similarity index 91%
rename from assets/agenda/components/AgendaDropdown.jsx
rename to assets/agenda/components/AgendaDropdown.tsx
index 262e5b51b..ffb86589d 100644
--- a/assets/agenda/components/AgendaDropdown.jsx
+++ b/assets/agenda/components/AgendaDropdown.tsx
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 import {Dropdown} from '../../components/Dropdown';
 
-export function AgendaDropdown({filter, activeFilter, toggleFilter, children, getFilterLabel}) {
+export function AgendaDropdown({filter, activeFilter, toggleFilter, children, getFilterLabel}: any) {
 
     const isActive = activeFilter[filter.field];
     const getActiveFilterLabel = getFilterLabel != null ?
         getFilterLabel :
-        (filter, activeFilter, isActive) => {
+        (filter: any, activeFilter: any, isActive: any) => {
             return isActive ? gettext(activeFilter[filter.field][0]) : gettext(filter.label);
         };
 
diff --git a/assets/agenda/components/AgendaDropdownFilter.jsx b/assets/agenda/components/AgendaDropdownFilter.tsx
similarity index 78%
rename from assets/agenda/components/AgendaDropdownFilter.jsx
rename to assets/agenda/components/AgendaDropdownFilter.tsx
index f8ffdc252..cff9f58b5 100644
--- a/assets/agenda/components/AgendaDropdownFilter.jsx
+++ b/assets/agenda/components/AgendaDropdownFilter.tsx
@@ -2,16 +2,16 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {AgendaDropdown} from './AgendaDropdown';
 
-const compareFunction = (a, b) => String(a.key).localeCompare(String(b.key));
+const compareFunction = (a: any, b: any) => String(a.key).localeCompare(String(b.key));
 
-const processBuckets = (buckets, filter, toggleFilter) => buckets.sort(compareFunction).map((bucket) =>
+const processBuckets = (buckets: any, filter: any, toggleFilter: any) => buckets.sort(compareFunction).map((bucket: any) =>
     <button
         key={bucket.key}
         className='dropdown-item'
         onClick={() => toggleFilter(filter.field, bucket.key)}
     >{filter.transform ? filter.transform(bucket.key) : bucket.key}</button>);
 
-function AgendaDropdownFilter({aggregations, filter, toggleFilter, activeFilter, getDropdownItems}) {
+function AgendaDropdownFilter({aggregations, filter, toggleFilter, activeFilter, getDropdownItems}: any) {
     return (
         <AgendaDropdown
             filter={filter}
diff --git a/assets/agenda/components/AgendaEdNote.jsx b/assets/agenda/components/AgendaEdNote.tsx
similarity index 90%
rename from assets/agenda/components/AgendaEdNote.jsx
rename to assets/agenda/components/AgendaEdNote.tsx
index 019ff86f7..c5b43210e 100644
--- a/assets/agenda/components/AgendaEdNote.jsx
+++ b/assets/agenda/components/AgendaEdNote.tsx
@@ -6,7 +6,7 @@ import {get} from 'lodash';
 import {gettext} from 'utils';
 import {STATUS_CANCELED, STATUS_POSTPONED, STATUS_RESCHEDULED} from '../utils';
 
-export default function AgendaEdNote({item, plan, secondaryNoteField, noMargin}) {
+export default function AgendaEdNote({item, plan, secondaryNoteField, noMargin}: any) {
     const planEdnote = get(plan, 'ednote');
 
     // We display Secondary Note only from 'item' for now
@@ -17,19 +17,19 @@ export default function AgendaEdNote({item, plan, secondaryNoteField, noMargin})
     }
 
     const tooltip = !item.ednote && !planEdnote ? gettext('Reason') : gettext('Editorial Note');
-    const fixText = (text) => {
+    const fixText = (text: any) => {
         // remove prefixes added by planning
         // which are always in english
         const POSTPONED = 0;
         const RESCHEDULED = 1;
         const CANCELLED = 2;
-        const prefixes = [];
+        const prefixes: Array<any> = [];
 
         prefixes[POSTPONED] = 'Event Postponed: ';
         prefixes[RESCHEDULED] = 'Event Rescheduled: ';
         prefixes[CANCELLED] = 'Event Cancelled: ';
 
-        const index = prefixes.findIndex((_prefix) => text.startsWith(_prefix));
+        const index = prefixes.findIndex((_prefix: any) => text.startsWith(_prefix));
 
         if (index !== -1) {
             const reason = text.substr(prefixes[index].length);
@@ -58,7 +58,7 @@ export default function AgendaEdNote({item, plan, secondaryNoteField, noMargin})
         return text;
     };
 
-    const getMultiLineNote = (note) => (note && fixText(note).split('\n').map((t, key) =>
+    const getMultiLineNote = (note: any) => (note && fixText(note).split('\n').map((t: any, key: any) =>
         <span key={key}>{t}<br/></span>)
     );
 
diff --git a/assets/agenda/components/AgendaEventInfo.jsx b/assets/agenda/components/AgendaEventInfo.tsx
similarity index 92%
rename from assets/agenda/components/AgendaEventInfo.jsx
rename to assets/agenda/components/AgendaEventInfo.tsx
index c7a607b29..ed7f1eb42 100644
--- a/assets/agenda/components/AgendaEventInfo.jsx
+++ b/assets/agenda/components/AgendaEventInfo.tsx
@@ -8,7 +8,7 @@ import AgendaName from './AgendaName';
 import AgendaMetaTime from './AgendaMetaTime';
 import AgendaLocation from'./AgendaLocation';
 
-const AgendaEventInfo = ({item, onClick}) => {
+const AgendaEventInfo = ({item, onClick}: any) => {
     const event = get(item, 'event');
     if (isEmpty(event)) {
         return null;
@@ -16,7 +16,7 @@ const AgendaEventInfo = ({item, onClick}) => {
 
     return (
         <div className={classNames('coverage-item mt-3', {'coverage-item--clickable': onClick})} onClick={onClick}
-            title={onClick ? gettext('Open {{agenda}} in new tab', sectionNames) : onClick}>
+            title={onClick ? gettext('Open {{agenda}} in new tab', window.sectionNames) : onClick}>
             <div className='coverage-item__row'>
                 <AgendaName item={item} noMargin small/>
             </div>
diff --git a/assets/agenda/components/AgendaFeaturedStoriesToogle.jsx b/assets/agenda/components/AgendaFeaturedStoriesToogle.tsx
similarity index 99%
rename from assets/agenda/components/AgendaFeaturedStoriesToogle.jsx
rename to assets/agenda/components/AgendaFeaturedStoriesToogle.tsx
index 9551cf981..f8e2f7025 100644
--- a/assets/agenda/components/AgendaFeaturedStoriesToogle.jsx
+++ b/assets/agenda/components/AgendaFeaturedStoriesToogle.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import Toggle from 'react-toggle';
 import {gettext} from 'utils';
 
-function AgendaFeaturedStoriesToogle ({featuredFilter, onChange}) {
+function AgendaFeaturedStoriesToogle ({featuredFilter, onChange}: any) {
     return (
         <div className="react-toggle__wrapper">
             <label htmlFor='featured-stories' className="me-2 featured-stories__toggle-label-sm">{gettext('Top/Featured Stories')}</label>
diff --git a/assets/agenda/components/AgendaFilterButton.jsx b/assets/agenda/components/AgendaFilterButton.tsx
similarity index 91%
rename from assets/agenda/components/AgendaFilterButton.jsx
rename to assets/agenda/components/AgendaFilterButton.tsx
index 2b7afeb29..0b2829c7e 100644
--- a/assets/agenda/components/AgendaFilterButton.jsx
+++ b/assets/agenda/components/AgendaFilterButton.tsx
@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 import classNames from 'classnames';
 
-const getActiveFilterLabel = (filter, activeFilter, isActive) => {
+const getActiveFilterLabel = (filter: any, activeFilter: any, isActive: any) => {
     return isActive ? gettext(activeFilter[filter.field][0]) : gettext(filter.label);
 };
 
-function AgendaFilterButton({filter, activeFilter, autoToggle, onClick, getFilterLabel}) {
+function AgendaFilterButton({filter, activeFilter, autoToggle, onClick, getFilterLabel}: any) {
     const filterLabel = getFilterLabel ? getFilterLabel : getActiveFilterLabel;
     const isActive = activeFilter[filter.field];
     return (<button
diff --git a/assets/agenda/components/AgendaFilters.jsx b/assets/agenda/components/AgendaFilters.tsx
similarity index 84%
rename from assets/agenda/components/AgendaFilters.jsx
rename to assets/agenda/components/AgendaFilters.tsx
index 7e694dad9..88a13ed97 100644
--- a/assets/agenda/components/AgendaFilters.jsx
+++ b/assets/agenda/components/AgendaFilters.tsx
@@ -13,7 +13,7 @@ import AgendaItemTypeFilter from './AgendaItemTypeFilter';
 import {AgendaCalendarAgendaFilter} from './AgendaCalendarAgendaFilter';
 import {LocationFilter} from './LocationFilter';
 
-export const transformFilterBuckets = (filter, aggregations, props) => {
+export const transformFilterBuckets = (filter: any, aggregations: any, props: any) => {
     if (!filter.transformBuckets) {
         return aggregations[filter.field].buckets;
     }
@@ -21,18 +21,17 @@ export const transformFilterBuckets = (filter, aggregations, props) => {
     return filter.transformBuckets(filter, aggregations, props);
 };
 
-const renderFilter = {
-    item_type: (props) => (
+const renderFilter: any = {
+    item_type: (props: any) => (
         <AgendaItemTypeFilter
             key="item_type"
-            activeFilter={props.activeFilter}
             itemTypeFilter={props.itemTypeFilter}
             toggleFilter={props.toggleFilter}
             eventsOnlyAccess={props.eventsOnlyAccess}
             restrictCoverageInfo={props.restrictCoverageInfo}
         />
     ),
-    calendar: (props) => (
+    calendar: (props: any) => (
         <AgendaCalendarAgendaFilter
             key="calendar"
             aggregations={props.aggregations}
@@ -41,7 +40,7 @@ const renderFilter = {
             itemTypeFilter={props.itemTypeFilter}
         />
     ),
-    location: (props) => (
+    location: (props: any) => (
         !['events', 'combined'].includes(props.itemTypeFilter || 'combined') ? null : (
             <LocationFilter
                 key="location"
@@ -50,7 +49,7 @@ const renderFilter = {
             />
         )
     ),
-    region: (props) => (
+    region: (props: any) => (
         !['events', 'planning', 'combined'].includes(props.itemTypeFilter || 'combined') ? null : (
             <DropdownFilter
                 key="region"
@@ -59,14 +58,14 @@ const renderFilter = {
                 activeFilter={props.activeFilter}
                 getDropdownItems={getDropdownItems}
                 locators={props.locators}
-                getFilterLabel={(filter, activeFilter, isActive, props) => {
+                getFilterLabel={(filter: any, activeFilter: any, isActive: any, props: any) => {
                     if (!isActive) {
                         return filter.label;
                     }
 
-                    let region;
+                    let region: any;
                     if (get(activeFilter, `${filter.field}[0]`) && props.locators) {
-                        region = (Object.values(props.locators) || []).find((l) => l.name === get(activeFilter, `${filter.field}[0]`));
+                        region = (Object.values(props.locators) || []).find((l: any) => l.name === get(activeFilter, `${filter.field}[0]`));
                     }
 
                     return region ? (get(region, 'state') || get(region, 'country') || get(region, 'world_region')) : get(activeFilter, `${filter.field}[0]`);
@@ -83,7 +82,7 @@ const renderFilter = {
             />
         )
     ),
-    coverage_type: (props) => (
+    coverage_type: (props: any) => (
         !['planning', 'combined'].includes(props.itemTypeFilter || 'combined') ? null : (
             <DropdownFilter
                 key="coverage_type"
@@ -101,7 +100,7 @@ const renderFilter = {
             />
         )
     ),
-    coverage_status: (props) => (
+    coverage_status: (props: any) => (
         (props.eventsOnlyAccess || props.itemTypeFilter === 'events') ? null : (
             <AgendaCoverageExistsFilter
                 key="coverage_status"
@@ -112,7 +111,7 @@ const renderFilter = {
     ),
 };
 
-export function getDropdownItems(filter, aggregations, toggleFilter, processBuckets, props) {
+export function getDropdownItems(filter: any, aggregations: any, toggleFilter: any, processBuckets: any, props: any) {
     if (!filter.nestedField && aggregations && aggregations[filter.field]) {
         return processBuckets(transformFilterBuckets(filter, aggregations, props), filter, toggleFilter);
     }
@@ -124,10 +123,10 @@ export function getDropdownItems(filter, aggregations, toggleFilter, processBuck
     return [];
 }
 
-function AgendaFiltersComponent(props) {
+function AgendaFiltersComponent(props: any) {
     return (
         <div className='wire-column__main-header-agenda d-flex m-0 px-3 align-items-center flex-wrap flex-sm-nowrap'>
-            {props.filtersConfig.map((filterName) => (
+            {props.filtersConfig.map((filterName: any) => (
                 renderFilter[filterName](props)
             ))}
         </div>
@@ -145,10 +144,10 @@ AgendaFiltersComponent.propTypes = {
     filtersConfig: PropTypes.arrayOf(PropTypes.string),
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     filtersConfig: agendaFiltersConfigSelector(state),
 });
 
-const AgendaFilters = connect(mapStateToProps)(AgendaFiltersComponent);
+const AgendaFilters: React.ComponentType<any> = connect(mapStateToProps)(AgendaFiltersComponent);
 
 export default AgendaFilters;
diff --git a/assets/agenda/components/AgendaInternalNote.jsx b/assets/agenda/components/AgendaInternalNote.tsx
similarity index 95%
rename from assets/agenda/components/AgendaInternalNote.jsx
rename to assets/agenda/components/AgendaInternalNote.tsx
index abcb90690..92a0592c5 100644
--- a/assets/agenda/components/AgendaInternalNote.jsx
+++ b/assets/agenda/components/AgendaInternalNote.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {gettext, getPlainTextMemoized} from 'utils';
 
-export default function AgendaInternalNote({internalNote, onlyIcon, noMargin, mt2, alignCenter, marginRightAuto, borderRight, noPaddingRight}) {
+export default function AgendaInternalNote({internalNote, onlyIcon, noMargin, mt2, alignCenter, marginRightAuto, borderRight, noPaddingRight}: any) {
     const note = getPlainTextMemoized(internalNote);
 
     if (!note) {
@@ -39,7 +39,7 @@ export default function AgendaInternalNote({internalNote, onlyIcon, noMargin, mt
                 <i className="icon--info icon--red icon--info--smaller" title={labelText}/>
                 <span className='ms-1'>
                     {internalNote[0] !== '<' ?
-                        internalNote.split('\n').map((item, key) => (
+                        internalNote.split('\n').map((item: any, key: any) => (
                             <p key={key}>{item}</p>
                         ))
                         : (
diff --git a/assets/agenda/components/AgendaItemDetails.jsx b/assets/agenda/components/AgendaItemDetails.tsx
similarity index 95%
rename from assets/agenda/components/AgendaItemDetails.jsx
rename to assets/agenda/components/AgendaItemDetails.tsx
index 5c697e1d3..685c1c1f3 100644
--- a/assets/agenda/components/AgendaItemDetails.jsx
+++ b/assets/agenda/components/AgendaItemDetails.tsx
@@ -30,8 +30,7 @@ import {AgendaPreviewPlanning} from './AgendaPreviewPlanning';
 import {AgendaPreviewEvent} from './AgendaPreviewEvent';
 import {AgendaRegistrationInvitationDetails} from './AgendaRegistrationInvitationDetails';
 
-
-export default function AgendaItemDetails(
+function AgendaItemDetails(
     {
         item,
         user,
@@ -45,7 +44,7 @@ export default function AgendaItemDetails(
         coverageActions,
         detailsConfig,
         restrictCoverageInfo,
-    })
+    }: any)
 {
     const locations = getLocations(item);
     let map = null;
@@ -60,7 +59,7 @@ export default function AgendaItemDetails(
         map = <StaticMap locations={locations} scale={2} />;
     }
 
-    const plan = (get(item, 'planning_items') || []).find((p) => p.guid === planningId);
+    const plan = (get(item, 'planning_items') || []).find((p: any) => p.guid === planningId);
     const internalNotes = getInternalNote(item, plan);
 
     return (
@@ -133,3 +132,7 @@ AgendaItemDetails.propTypes = {
     detailsConfig: PropTypes.object,
     restrictCoverageInfo: PropTypes.bool,
 };
+
+const component: React.ComponentType<any> = AgendaItemDetails;
+
+export default component;
\ No newline at end of file
diff --git a/assets/agenda/components/AgendaItemTimeUpdater.jsx b/assets/agenda/components/AgendaItemTimeUpdater.tsx
similarity index 89%
rename from assets/agenda/components/AgendaItemTimeUpdater.jsx
rename to assets/agenda/components/AgendaItemTimeUpdater.tsx
index ac63bcb9b..1fd28007a 100644
--- a/assets/agenda/components/AgendaItemTimeUpdater.jsx
+++ b/assets/agenda/components/AgendaItemTimeUpdater.tsx
@@ -7,8 +7,14 @@ import classNames from 'classnames';
 import {bem} from 'ui/utils';
 import {gettext} from 'utils';
 
-class AgendaItemTimeUpdater extends React.Component {
-    constructor(props) {
+class AgendaItemTimeUpdater extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+
+    interval: number;
+    timerIntervalId: any;
+
+    constructor(props: any) {
         super(props);
 
         this.state = {timeText: ''};
@@ -22,7 +28,7 @@ class AgendaItemTimeUpdater extends React.Component {
         this.activateTimer(this.props.item);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (get(this.props, 'item._created') !== get(nextProps, 'item._created') ||
             get(this.props, 'item._updated') !== get(nextProps, 'item._updated')) {
             this.activateTimer(nextProps.item);
@@ -33,7 +39,7 @@ class AgendaItemTimeUpdater extends React.Component {
         this.deactivateTimer();
     }
 
-    activateTimer(item) {
+    activateTimer(item: any) {
         // Deactivate if a timer already exits
         this.deactivateTimer();
 
@@ -55,13 +61,13 @@ class AgendaItemTimeUpdater extends React.Component {
         }
     }
 
-    isItemPastTime(item) {
+    isItemPastTime(item: any) {
         // Check if the updated (and created) time is past the interval duration
         return item && (moment().diff(moment(item._created), 'minutes') >= this.interval &&
             moment().diff(moment(item._updated), 'minutes') >= this.interval);
     }
 
-    updateState(item, checkPastTime = true) {
+    updateState(item: any, checkPastTime: any = true) {
         if (checkPastTime && this.isItemPastTime(item)) {
             this.deactivateTimer();
             return;
diff --git a/assets/agenda/components/AgendaItemTypeFilter.jsx b/assets/agenda/components/AgendaItemTypeFilter.tsx
similarity index 95%
rename from assets/agenda/components/AgendaItemTypeFilter.jsx
rename to assets/agenda/components/AgendaItemTypeFilter.tsx
index dbf81646c..88b93f700 100644
--- a/assets/agenda/components/AgendaItemTypeFilter.jsx
+++ b/assets/agenda/components/AgendaItemTypeFilter.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 import {AgendaDropdown} from './AgendaDropdown';
 
-function AgendaItemTypeFilter ({toggleFilter, itemTypeFilter, eventsOnlyAccess, restrictCoverageInfo}) {
+function AgendaItemTypeFilter ({toggleFilter, itemTypeFilter, eventsOnlyAccess, restrictCoverageInfo}: any) {
     if (eventsOnlyAccess) {
         return null;
     }
@@ -16,7 +16,7 @@ function AgendaItemTypeFilter ({toggleFilter, itemTypeFilter, eventsOnlyAccess,
         ]
     };
 
-    const filter = {
+    const filter: any = {
         label: gettext('Events & Coverages'),
         field: 'itemType',
         icon: 'icon-small--coverage-infographics'
diff --git a/assets/agenda/components/AgendaList.jsx b/assets/agenda/components/AgendaList.tsx
similarity index 89%
rename from assets/agenda/components/AgendaList.jsx
rename to assets/agenda/components/AgendaList.tsx
index 74fafbbe3..007bf3556 100644
--- a/assets/agenda/components/AgendaList.jsx
+++ b/assets/agenda/components/AgendaList.tsx
@@ -19,21 +19,21 @@ import {AGENDA_DATE_FORMAT_LONG, AGENDA_DATE_FORMAT_SHORT} from '../../utils';
 
 const PREVIEW_TIMEOUT = 500; // time to preview an item after selecting using kb
 const CLICK_TIMEOUT = 200; // time when we wait for double click after click
-const EMPTY_ARRAY = [];
+const EMPTY_ARRAY: Array<any> = [];
 const EMPTY_OBJECT = {};
 
-const itemIdsSelector = (state) => state.items || EMPTY_ARRAY;
-const itemsByIdSelector = (state) => state.itemsById || EMPTY_OBJECT;
+const itemIdsSelector = (state: any) => state.items || EMPTY_ARRAY;
+const itemsByIdSelector = (state: any) => state.itemsById || EMPTY_OBJECT;
 
 
 const itemsSelector = createSelector(
     [itemIdsSelector, itemsByIdSelector],
-    (ids, items) => ids.map((itemId) => items[itemId])
+    (ids, items) => ids.map((itemId: any) => items[itemId])
 );
 
-const activeDateSelector = (state) => get(state, 'agenda.activeDate');
-const activeGroupingSelector = (state) => get(state, 'agenda.activeGrouping');
-const featuredOnlySelector = (state) => get(state, 'agenda.featuredOnly', false);
+const activeDateSelector = (state: any) => get(state, 'agenda.activeDate');
+const activeGroupingSelector = (state: any) => get(state, 'agenda.activeGrouping');
+const featuredOnlySelector = (state: any) => get(state, 'agenda.featuredOnly', false);
 
 const groupedItemsSelector = createSelector(
     [itemsSelector, activeDateSelector, activeGroupingSelector, featuredOnlySelector],
@@ -50,8 +50,13 @@ const listItemsSelector = createSelector(
 );
 
 
-class AgendaList extends React.Component {
-    constructor(props) {
+class AgendaList extends React.Component<any, any> {
+    static propTypes: any;
+    previewTimeout: any;
+    clickTimeout: any;
+    elem: any;
+
+    constructor(props: any) {
         super(props);
 
         this.state = {actioningItem: null};
@@ -65,7 +70,7 @@ class AgendaList extends React.Component {
         this.isActiveItem = this.isActiveItem.bind(this);
     }
 
-    onKeyDown(event) {
+    onKeyDown(event: any) {
         let diff = 0;
         switch (event.key) {
         case 'ArrowDown':
@@ -91,7 +96,7 @@ class AgendaList extends React.Component {
         event.preventDefault();
         const activeItem = this.props.activeItem;
 
-        const activeIndex = this.props.activeItem ? this.props.listItems.findIndex((item) => {
+        const activeIndex = this.props.activeItem ? this.props.listItems.findIndex((item: any) => {
             return item._id === activeItem._id &&
                 item.group === activeItem.group &&
                 get(item, 'plan._id') === get(activeItem, 'plan._id');
@@ -133,7 +138,7 @@ class AgendaList extends React.Component {
         }
     }
 
-    onItemClick(item, group, plan) {
+    onItemClick(item: any, group: any, plan: any) {
         const itemId = item._id;
         this.setState({actioningItem: null});
         this.cancelPreviewTimeout();
@@ -156,13 +161,13 @@ class AgendaList extends React.Component {
         this.setState({actioningItem: null});
     }
 
-    onItemDoubleClick(item, group, plan) {
+    onItemDoubleClick(item: any, group: any, plan: any) {
         this.cancelClickTimeout();
         this.props.dispatch(setActive({_id: item._id, group: group, plan: plan}));
         this.props.dispatch(openItem(item, group, plan));
     }
 
-    onActionList(event, item, group, plan) {
+    onActionList(event: any, item: any, group: any, plan: any) {
         event.stopPropagation();
         if (this.state.actioningItem && this.state.actioningItem._id === item._id &&
             (!this.state.activePlan || (this.state.activePlan && this.state.activePlan.guid === get(plan, 'guid')))) {
@@ -172,12 +177,12 @@ class AgendaList extends React.Component {
         }
     }
 
-    filterActions(item, config) {
-        return this.props.actions.filter((action) =>  (!config || isDisplayed(action.id, config)) &&
+    filterActions(item: any, config: any) {
+        return this.props.actions.filter((action: any) =>  (!config || isDisplayed(action.id, config)) &&
           (!action.when || action.when(this.props, item)));
     }
 
-    isActiveItem(_id, group, plan) {
+    isActiveItem(_id: any, group: any, plan: any) {
         const {activeItem} = this.props;
 
         if (!activeItem || (!_id && !group && !plan)) {
@@ -195,7 +200,7 @@ class AgendaList extends React.Component {
         return _id === activeItem._id;
     }
 
-    componentDidUpdate(nextProps) {
+    componentDidUpdate(nextProps: any) {
         if (!isEqual(nextProps.activeDate, this.props.activeDate) ||
           !isEqual(nextProps.activeNavigation, this.props.activeNavigation) ||
           (!nextProps.searchInitiated && this.props.searchInitiated)) {
@@ -203,7 +208,7 @@ class AgendaList extends React.Component {
         }
     }
 
-    getListGroupDate(group) {
+    getListGroupDate(group: any) {
         if (get(group, 'date')) {
             const groupDate = moment(group.date, DATE_FORMAT);
             const today = moment();
@@ -233,21 +238,21 @@ class AgendaList extends React.Component {
         } = this.props;
         const isExtended = activeView === EXTENDED_VIEW;
         const showShortcutActionIcons = shouldShowListShortcutActionIcons(this.props.listConfig, isExtended);
-        const articleGroups = groupedItems.map((group) =>
+        const articleGroups = groupedItems.map((group: any) =>
             [
                 <div className='wire-articles__header' key={`${group.date}header`}>
                     {this.getListGroupDate(group)}
                 </div>,
 
                 <div className = 'wire-articles__group' key={`${group.date}group`}>
-                    {group.items.map((_id, groupIndex) => {
+                    {group.items.map((_id: any, groupIndex: any) => {
 
                         const plans = getPlanningItemsByGroup(itemsById[_id], group.date);
 
                         if (plans.length > 0) {
                             return (<Fragment key={`${_id}--${groupIndex}`}>
                                 {
-                                    plans.map((plan) =>
+                                    plans.map((plan: any) =>
                                         <AgendaListItem
                                             key={`${_id}--${plan._id}`}
                                             group={group.date}
@@ -310,7 +315,7 @@ class AgendaList extends React.Component {
         return (
             <div className={listClassName}
                 onKeyDown={this.onKeyDown}
-                ref={(elem) => {
+                ref={(elem: any) => {
                     if (elem) {
                         refNode(elem);
                         this.elem = elem;
@@ -359,7 +364,7 @@ AgendaList.propTypes = {
     listConfig: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     itemsById: state.itemsById,
     activeItem: state.activeItem,
     previewItem: state.previewItem,
@@ -382,4 +387,6 @@ const mapStateToProps = (state) => ({
     listConfig: listConfigSelector(state),
 });
 
-export default connect(mapStateToProps)(AgendaList);
+const component: React.ComponentType<any> = connect(mapStateToProps)(AgendaList);
+
+export default component;
diff --git a/assets/agenda/components/AgendaListCoverageItem.jsx b/assets/agenda/components/AgendaListCoverageItem.tsx
similarity index 88%
rename from assets/agenda/components/AgendaListCoverageItem.jsx
rename to assets/agenda/components/AgendaListCoverageItem.tsx
index 528000e90..a44adb354 100644
--- a/assets/agenda/components/AgendaListCoverageItem.jsx
+++ b/assets/agenda/components/AgendaListCoverageItem.tsx
@@ -13,32 +13,33 @@ import {
     WORKFLOW_COLORS,
 } from '../utils';
 
-class AgendaListCoverageItem extends React.Component {
-    constructor(props) {
+class AgendaListCoverageItem extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = this.getUpdatedState(props);
     }
 
-    shouldComponentUpdate(nextProps) {
+    shouldComponentUpdate(nextProps: any) {
         return !isEqual(this.props.coverage, nextProps.coverage);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (!isEqual(this.props.coverage, nextProps.coverage)) {
             this.setState(this.getUpdatedState(nextProps));
         }
     }
 
-    getUpdatedState(props) {
+    getUpdatedState(props: any) {
         const watched = isWatched(props.coverage, props.user);
 
-        const state = {
+        const state: any = {
             coverageClass: `icon--coverage-${getCoverageIcon(props.coverage.coverage_type)}`,
             beingUpdated: isCoverageBeingUpdated(props.coverage),
             isWatched: watched,
             watchText: watched ? gettext('(Watching)') : '',
-            isCoverageForExtraDay: isCoverageForExtraDay(props.coverage, props.group),
+            isCoverageForExtraDay: isCoverageForExtraDay(props.coverage),
         };
 
         state.tooltip = `${state.watchText} ${getCoverageTooltip(props.coverage, state.beingUpdated)}`;
diff --git a/assets/agenda/components/AgendaListItem.jsx b/assets/agenda/components/AgendaListItem.tsx
similarity index 94%
rename from assets/agenda/components/AgendaListItem.jsx
rename to assets/agenda/components/AgendaListItem.tsx
index 36bc5a02b..4fd628780 100644
--- a/assets/agenda/components/AgendaListItem.jsx
+++ b/assets/agenda/components/AgendaListItem.tsx
@@ -25,8 +25,14 @@ import {
 import ActionMenu from '../../components/ActionMenu';
 import {LIST_ANIMATIONS, isMobilePhone} from 'utils';
 
-class AgendaListItem extends React.Component {
-    constructor(props) {
+class AgendaListItem extends React.Component<any, any> {
+    static propTypes: any;
+
+    slugline: any;
+    state: any;
+    dom: any;
+
+    constructor(props: any) {
         super(props);
         this.slugline = props.item.slugline && props.item.slugline.trim();
 
@@ -40,7 +46,7 @@ class AgendaListItem extends React.Component {
         this.onMouseEnter = this.onMouseEnter.bind(this);
     }
 
-    onKeyDown(event) {
+    onKeyDown(event: any) {
         switch (event.key) {
         case ' ':  // on space toggle selected item
             this.props.toggleSelected();
@@ -53,7 +59,7 @@ class AgendaListItem extends React.Component {
         event.preventDefault();
     }
 
-    setArticleRef(elem) {
+    setArticleRef(elem: any) {
         this.dom.article = elem;
     }
 
@@ -71,7 +77,7 @@ class AgendaListItem extends React.Component {
         }
     }
 
-    shouldComponentUpdate(nextProps, nextState) {
+    shouldComponentUpdate(nextProps: any, nextState: any) {
         const {props, state} = this;
 
         return props.item._etag !== nextProps.item._etag || state.hover !== nextState.hover ||
@@ -92,11 +98,11 @@ class AgendaListItem extends React.Component {
         }
     }
 
-    stopPropagation(event) {
+    stopPropagation(event: any) {
         event.stopPropagation();
     }
 
-    getClassNames(isExtended) {
+    getClassNames(isExtended: any) {
         return {
             card: classNames('wire-articles__item-wrap col-12 agenda-item'),
             wrap: classNames('wire-articles__item wire-articles__item--list', {
@@ -120,10 +126,10 @@ class AgendaListItem extends React.Component {
         };
     }
 
-    renderListItem(isMobile, children) {
+    renderListItem(isMobile: any, children: any) {
         const {item, isExtended, group, planningId, listConfig} = this.props;
         const classes = this.getClassNames(isExtended);
-        const planningItem = (get(item, 'planning_items') || []).find((p) => p.guid === planningId) || {};
+        const planningItem = (get(item, 'planning_items') || []).find((p: any) => p.guid === planningId) || {};
         const description =item.es_highlight ? getHighlightedDescription(item, planningItem) : getDescription(item,planningItem);
         // Show headline for adhoc planning items
         const showHeadline = !item.event && get(item, 'headline.length', 0) > 0;
@@ -137,7 +143,7 @@ class AgendaListItem extends React.Component {
                 onMouseEnter={this.onMouseEnter}
                 onKeyDown={this.onKeyDown}
             >
-                <div className={classes.wrap} tabIndex='0'>
+                <div className={classes.wrap} tabIndex={0}>
                     <div className={classes.article} key="article">
                         <h4 className='wire-articles__item-headline'>
                             <div className={classes.select} onClick={this.stopPropagation}>
@@ -191,7 +197,7 @@ class AgendaListItem extends React.Component {
 
     renderNonMobile() {
         const {item, planningId} = this.props;
-        const planningItem = (get(item, 'planning_items') || []).find((p) => p.guid === planningId) || {};
+        const planningItem = (get(item, 'planning_items') || []).find((p: any) => p.guid === planningId) || {};
 
         return this.renderListItem(false, !this.props.actions.length ? null : (
             <div className='wire-articles__item-actions' onClick={this.stopPropagation}>
@@ -206,7 +212,7 @@ class AgendaListItem extends React.Component {
                     showShortcutActions={!this.props.showShortcutActionIcons}
                 />
 
-                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action) => action.shortcut && (
+                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action: any) => action.shortcut && (
                     <ActionButton
                         key={action.name}
                         className="icon-button icon-button--primary"
@@ -221,7 +227,7 @@ class AgendaListItem extends React.Component {
 
     renderMobile() {
         const {item, planningId} = this.props;
-        const planningItem = (get(item, 'planning_items') || []).find((p) => p.guid === planningId) || {};
+        const planningItem = (get(item, 'planning_items') || []).find((p: any) => p.guid === planningId) || {};
         const internalNote = getInternalNote(item, planningItem);
 
         return this.renderListItem(true, (
@@ -236,7 +242,7 @@ class AgendaListItem extends React.Component {
                     noPaddingRight={true}
                 />
 
-                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action) => action.shortcut && (
+                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action: any) => action.shortcut && (
                     <ActionButton
                         key={action.name}
                         className="icon-button icon-button--primary"
diff --git a/assets/agenda/components/AgendaListItemIcons.jsx b/assets/agenda/components/AgendaListItemIcons.tsx
similarity index 86%
rename from assets/agenda/components/AgendaListItemIcons.jsx
rename to assets/agenda/components/AgendaListItemIcons.tsx
index f3484e2ce..b29227ab8 100644
--- a/assets/agenda/components/AgendaListItemIcons.jsx
+++ b/assets/agenda/components/AgendaListItemIcons.tsx
@@ -20,51 +20,54 @@ import AgendaLocation from './AgendaLocation';
 import {gettext} from 'utils';
 
 class AgendaListItemIcons extends React.Component {
-    constructor(props) {
+    static propTypes: any;
+    static defaultProps: any;
+
+    constructor(props: any) {
         super(props);
 
         this.state = this.getUpdatedState(props);
     }
 
-    itemChanged(nextProps) {
+    itemChanged(nextProps: any) {
         return get(this.props, 'item._id') !== get(nextProps, 'item._id') ||
             get(this.props, 'item._etag') !== get(nextProps, 'item._etag') ||
             !isEqual(get(this.props, 'item.coverages'), get(nextProps, 'item.coverages'));
     }
 
-    shouldComponentUpdate(nextProps) {
+    shouldComponentUpdate(nextProps: any) {
         return this.itemChanged(nextProps);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (this.itemChanged(nextProps)) {
             this.setState(this.getUpdatedState(nextProps));
         }
     }
 
-    getUpdatedState(props) {
+    getUpdatedState(props: any) {
         return {
             internalNote: getInternalNote(props.item, props.planningItem),
             coveragesToDisplay: !hasCoverages(props.item) || props.hideCoverages ?
                 [] :
-                (props.item.coverages || []).filter((c) => (
+                (props.item.coverages || []).filter((c: any) => (
                     !props.group ||
                     c.scheduled == null ||
-                    (isCoverageForExtraDay(c, props.group) && c.planning_id === get(props, 'planningItem.guid'))
+                    (isCoverageForExtraDay(c) && c.planning_id === get(props, 'planningItem.guid'))
                 )),
             attachments: (getAttachments(props.item)).length,
             isRecurring: isRecurring(props.item),
         };
     }
 
-    getItemByschema(props) {
+    getItemByschema(props: any) {
         const {listConfig} = props;
         if ((listConfig || {}).subject != null) {
             const scheme = listConfig.subject.scheme;
             const subjects = getSubjects(props.item);
             return scheme == null ?
                 subjects :
-                subjects.filter((item) => Array.isArray(scheme) ?
+                subjects.filter((item: any) => Array.isArray(scheme) ?
                     scheme.includes(item.scheme) :
                     item.scheme === scheme
                 );
@@ -73,8 +76,8 @@ class AgendaListItemIcons extends React.Component {
     }
 
     render() {
-        const props = this.props;
-        const state = this.state;
+        const props: any = this.props;
+        const state: any = this.state;
         const className = bem('wire-articles', 'item__meta', {row: props.row});
         const subject = this.getItemByschema(props);
 
@@ -90,7 +93,7 @@ class AgendaListItemIcons extends React.Component {
 
                 {state.coveragesToDisplay.length > 0 && (
                     <div className='wire-articles__item__icons wire-articles__item__icons--dashed-border'>
-                        {state.coveragesToDisplay.map((coverage, index) => (
+                        {state.coveragesToDisplay.map((coverage: any, index: any) => (
                             <AgendaListCoverageItem
                                 key={index}
                                 planningItem={props.planningItem}
@@ -105,7 +108,7 @@ class AgendaListItemIcons extends React.Component {
 
                 {subject.length !== 0 && (
                     <div>
-                        {subject.map((item) => (
+                        {subject.map((item: any) => (
                             <span
                                 key={item.qcode}
                                 className={`label label--rounded subject--${item.qcode}`}
diff --git a/assets/agenda/components/AgendaListItemLabels.jsx b/assets/agenda/components/AgendaListItemLabels.tsx
similarity index 91%
rename from assets/agenda/components/AgendaListItemLabels.jsx
rename to assets/agenda/components/AgendaListItemLabels.tsx
index d332bb9ee..f14b5c29f 100644
--- a/assets/agenda/components/AgendaListItemLabels.jsx
+++ b/assets/agenda/components/AgendaListItemLabels.tsx
@@ -6,10 +6,10 @@ import {get} from 'lodash';
 import {isPostponed, isRescheduled, isCanceled} from '../utils';
 import {gettext} from 'utils';
 
-function AgendaListItemLabels({item, right}) {
+function AgendaListItemLabels({item, right}: any) {
     const getLabel = () => {
-        let labelText;
-        let labelColor;
+        let labelText: any;
+        let labelColor: any;
         if (isPostponed(item)) {
             labelText = gettext('postponed');
             labelColor = 'label--blue';
@@ -35,7 +35,7 @@ function AgendaListItemLabels({item, right}) {
         }
 
         return (<div><span className={classNames('label', labelColor, {'pull-right': right})}>{labelText}</span></div>);
-        
+
     };
 
     return getLabel();
diff --git a/assets/agenda/components/AgendaListViewControls.jsx b/assets/agenda/components/AgendaListViewControls.tsx
similarity index 97%
rename from assets/agenda/components/AgendaListViewControls.jsx
rename to assets/agenda/components/AgendaListViewControls.tsx
index 9e9f5c8ab..309d7c8ba 100644
--- a/assets/agenda/components/AgendaListViewControls.jsx
+++ b/assets/agenda/components/AgendaListViewControls.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import AgendaFeaturedStoriesToogle from './AgendaFeaturedStoriesToogle.jsx';
+import AgendaFeaturedStoriesToogle from './AgendaFeaturedStoriesToogle';
 import {DISPLAY_AGENDA_FEATURED_STORIES_ONLY} from 'utils';
 import ListViewOptions from 'components/ListViewOptions';
 
-function AgendaListViewControls({activeView, setView, hideFeaturedToggle, toggleFeaturedFilter, featuredFilter, hasAgendaFeaturedItems}) {
+function AgendaListViewControls({activeView, setView, hideFeaturedToggle, toggleFeaturedFilter, featuredFilter, hasAgendaFeaturedItems}: any) {
     return (
         <div className="navbar navbar--flex navbar--small">
             <div className="navbar__inner navbar__inner--end">
diff --git a/assets/agenda/components/AgendaLocation.jsx b/assets/agenda/components/AgendaLocation.tsx
similarity index 98%
rename from assets/agenda/components/AgendaLocation.jsx
rename to assets/agenda/components/AgendaLocation.tsx
index 4999af12f..a7fb45754 100644
--- a/assets/agenda/components/AgendaLocation.jsx
+++ b/assets/agenda/components/AgendaLocation.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 
 import {hasLocation, getLocationString} from '../utils';
 
-export default function AgendaLocation({item, isMobilePhone, border}) {
+export default function AgendaLocation({item, isMobilePhone, border}: any) {
     if  (!hasLocation(item)) {
         return null;
     }
diff --git a/assets/agenda/components/AgendaLongDescription.jsx b/assets/agenda/components/AgendaLongDescription.tsx
similarity index 90%
rename from assets/agenda/components/AgendaLongDescription.jsx
rename to assets/agenda/components/AgendaLongDescription.tsx
index bc0efe907..73f8e98ae 100644
--- a/assets/agenda/components/AgendaLongDescription.jsx
+++ b/assets/agenda/components/AgendaLongDescription.tsx
@@ -4,7 +4,7 @@ import {get} from 'lodash';
 import {getHighlightedDescription} from '../utils';
 
 
-export default function AgendaLongDescription({item, plan}) {
+export default function AgendaLongDescription({item, plan}: {item: any, plan: any}) {
     const description = item.es_highlight ? getHighlightedDescription(item, plan) : get(
         plan, 'description_text') || item.definition_long || item.definition_short;
 
diff --git a/assets/agenda/components/AgendaMap.jsx b/assets/agenda/components/AgendaMap.tsx
similarity index 77%
rename from assets/agenda/components/AgendaMap.jsx
rename to assets/agenda/components/AgendaMap.tsx
index 2d81b1611..dca2ca366 100644
--- a/assets/agenda/components/AgendaMap.jsx
+++ b/assets/agenda/components/AgendaMap.tsx
@@ -2,12 +2,12 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 
-export default function AgendaMap({image}) {
+export default function AgendaMap({image}: any) {
     return (
         image && <figure className="wire-column__preview__image">
             <span>
                 {image}
-            </span>            
+            </span>
         </figure>
     );
 }
diff --git a/assets/agenda/components/AgendaMeta.jsx b/assets/agenda/components/AgendaMeta.tsx
similarity index 86%
rename from assets/agenda/components/AgendaMeta.jsx
rename to assets/agenda/components/AgendaMeta.tsx
index a17351f3e..6af7d33c4 100644
--- a/assets/agenda/components/AgendaMeta.jsx
+++ b/assets/agenda/components/AgendaMeta.tsx
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import {hasLocation, hasLocationNotes, getEventLinks, getLocationString, getPublicContacts,
     getCalendars} from 'agenda/utils';
 
-const url = (link) => link.startsWith('http') ? link : 'https://' + link;
+const url = (link: any) => link.startsWith('http') ? link : 'https://' + link;
 
-function AgendaPreviewMeta({item}) {
+function AgendaPreviewMeta({item}: any) {
     return (
         <div className='wire-articles__item__meta'>
             <div className='wire-articles__item__meta-info'>
@@ -19,7 +19,7 @@ function AgendaPreviewMeta({item}) {
                         <span>{item.location[0].details[0]}</span>
                     </div>
                 )}
-                {getPublicContacts(item).map((contact, index) => <div
+                {getPublicContacts(item).map((contact: any, index: any) => <div
                     className='wire-articles__item__meta-row'
                     key={`${contact.name}-${index}`}>
                     <i className='icon-small--user icon--gray-dark'></i>
@@ -27,7 +27,7 @@ function AgendaPreviewMeta({item}) {
                         {contact.email && <a href={`mailto:${contact.email}`} target="_blank">{contact.email}</a>}
                     </span>
                 </div>)}
-                {getEventLinks(item).map((link) => <div className='wire-articles__item__meta-row' key={link}>
+                {getEventLinks(item).map((link: any) => <div className='wire-articles__item__meta-row' key={link}>
                     <i className='icon-small--globe icon--gray-dark'></i>
                     <span><a href={url(link)} target="_blank">{link}</a></span>
                 </div>)}
diff --git a/assets/agenda/components/AgendaMetaTime.jsx b/assets/agenda/components/AgendaMetaTime.tsx
similarity index 90%
rename from assets/agenda/components/AgendaMetaTime.jsx
rename to assets/agenda/components/AgendaMetaTime.tsx
index 79be696b7..8b5e2fafb 100644
--- a/assets/agenda/components/AgendaMetaTime.jsx
+++ b/assets/agenda/components/AgendaMetaTime.tsx
@@ -3,12 +3,11 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import {bem} from 'ui/utils';
-import {hasCoverages} from '../utils';
-import {formatAgendaDate} from 'utils';
+import {formatAgendaDate, hasCoverages} from '../utils';
 
 import AgendaItemTimeUpdater from './AgendaItemTimeUpdater';
 
-function format(item, group, onlyDates) {
+function format(item: any, group: any, onlyDates: any) {
     return (
         <span key="date">
             {formatAgendaDate(item, group, {onlyDates})}
@@ -16,7 +15,7 @@ function format(item, group, onlyDates) {
     );
 }
 
-function getCalendarClass(item) {
+function getCalendarClass(item: any) {
     if (item.state === 'rescheduled') {
         return 'icon--orange';
     }
@@ -32,7 +31,7 @@ function getCalendarClass(item) {
     }
 }
 
-export default function AgendaMetaTime({item, borderRight, isRecurring, group, isMobilePhone, onlyDates}) {
+export default function AgendaMetaTime({item, borderRight, isRecurring, group, isMobilePhone, onlyDates}: any): any {
     const times = (
         <div key="times" className={classNames(
             bem('wire-articles__item', 'meta-time', {'border-right': borderRight}),
diff --git a/assets/agenda/components/AgendaName.jsx b/assets/agenda/components/AgendaName.tsx
similarity index 90%
rename from assets/agenda/components/AgendaName.jsx
rename to assets/agenda/components/AgendaName.tsx
index f9752c62b..5a23672e3 100644
--- a/assets/agenda/components/AgendaName.jsx
+++ b/assets/agenda/components/AgendaName.tsx
@@ -4,7 +4,7 @@ import classNames from  'classnames';
 
 import {getName, getHighlightedName} from '../utils';
 
-export default function AgendaName({item, noMargin, small}) {
+export default function AgendaName({item, noMargin, small}: any) {
     return (
         <h2 className={classNames({'wire-column__preview__headline': !small},
             {'wire-articles__item__text wire-column__preview__versions__box-headline': small},
diff --git a/assets/agenda/components/AgendaPreview.jsx b/assets/agenda/components/AgendaPreview.tsx
similarity index 94%
rename from assets/agenda/components/AgendaPreview.jsx
rename to assets/agenda/components/AgendaPreview.tsx
index 0bf6a33c4..36775bbf7 100644
--- a/assets/agenda/components/AgendaPreview.jsx
+++ b/assets/agenda/components/AgendaPreview.tsx
@@ -23,12 +23,15 @@ import {AgendaPreviewPlanning} from './AgendaPreviewPlanning';
 import {AgendaPreviewEvent} from './AgendaPreviewEvent';
 import {AgendaRegistrationInvitationDetails} from './AgendaRegistrationInvitationDetails';
 
-class AgendaPreview extends React.PureComponent {
-    constructor(props) {
+class AgendaPreview extends React.PureComponent<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+    preview: any;
+    constructor(props: any) {
         super(props);
     }
 
-    componentDidUpdate(nextProps) {
+    componentDidUpdate(nextProps: any) {
         if (!isEqualItem(nextProps.item, this.props.item) && this.props.item) {
             this.preview.scrollTop = 0; // reset scroll on change
         }
@@ -66,7 +69,7 @@ class AgendaPreview extends React.PureComponent {
             'wire-column__preview--watched': isWatching,
         });
 
-        const plan = (get(item, 'planning_items') || []).find((p) => p.guid === previewPlan);
+        const plan = (get(item, 'planning_items') || []).find((p: any) => p.guid === previewPlan);
         const previewInnerElement = (<AgendaListItemLabels item={item} />);
 
         return (
@@ -78,14 +81,14 @@ class AgendaPreview extends React.PureComponent {
 
                     <div
                         id='preview-article'
-                        ref={(preview) => this.preview = preview}
+                        ref={(preview: any) => this.preview = preview}
                         className={classNames(
                             'wire-column__preview__content pt-0',
                             {noselect: this.props.previewConfig.disable_text_selection}
                         )}
                     >
                         <AgendaName item={item} />
-                        <AgendaTime item={item} group={previewGroup}>
+                        <AgendaTime item={item}>
                             <AgendaListItemLabels
                                 item={item}
                             />
diff --git a/assets/agenda/components/AgendaPreviewAttachments.jsx b/assets/agenda/components/AgendaPreviewAttachments.tsx
similarity index 89%
rename from assets/agenda/components/AgendaPreviewAttachments.jsx
rename to assets/agenda/components/AgendaPreviewAttachments.tsx
index d2373f620..85925ccb9 100644
--- a/assets/agenda/components/AgendaPreviewAttachments.jsx
+++ b/assets/agenda/components/AgendaPreviewAttachments.tsx
@@ -7,7 +7,7 @@ import {hasAttachments} from '../utils';
 import PreviewBox from 'ui/components/PreviewBox';
 import AgendaAttachments from './AgendaAttachments';
 
-export default function AgendaPreviewAttachments({item}) {
+export default function AgendaPreviewAttachments({item}: any) {
     if (!hasAttachments(item)) {
         return null;
     }
diff --git a/assets/agenda/components/AgendaPreviewCoverages.jsx b/assets/agenda/components/AgendaPreviewCoverages.tsx
similarity index 96%
rename from assets/agenda/components/AgendaPreviewCoverages.jsx
rename to assets/agenda/components/AgendaPreviewCoverages.tsx
index 2da2a83e2..d044a3b65 100644
--- a/assets/agenda/components/AgendaPreviewCoverages.jsx
+++ b/assets/agenda/components/AgendaPreviewCoverages.tsx
@@ -11,8 +11,9 @@ import AgendaCoverages from './AgendaCoverages';
 import AgendaInternalNote from './AgendaInternalNote';
 import AgendaEdNote from './AgendaEdNote';
 
-class AgendaPreviewCoverages extends React.Component {
-    constructor(props) {
+class AgendaPreviewCoverages extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {expanded: true};
@@ -20,7 +21,7 @@ class AgendaPreviewCoverages extends React.Component {
     }
 
     toggleExpanded() {
-        this.setState((prevState) => ({expanded: !prevState.expanded}));
+        this.setState((prevState: any) => ({expanded: !prevState.expanded}));
     }
 
     render() {
@@ -78,7 +79,7 @@ class AgendaPreviewCoverages extends React.Component {
                 </p>
                 {!this.state.expanded ? (
                     <div style={{display: 'flex', flexDirection: 'row', flexWrap: 'wrap'}}>
-                        {displayCoverages.current.concat(displayCoverages.previous).map((coverage) => (
+                        {displayCoverages.current.concat(displayCoverages.previous).map((coverage: any) => (
                             <i
                                 key={coverage.coverage_id}
                                 className={`icon-small--coverage-${getCoverageIcon(coverage.coverage_type)} me-2`}
diff --git a/assets/agenda/components/AgendaPreviewEvent.jsx b/assets/agenda/components/AgendaPreviewEvent.tsx
similarity index 92%
rename from assets/agenda/components/AgendaPreviewEvent.jsx
rename to assets/agenda/components/AgendaPreviewEvent.tsx
index 27a2447b4..fae081830 100644
--- a/assets/agenda/components/AgendaPreviewEvent.jsx
+++ b/assets/agenda/components/AgendaPreviewEvent.tsx
@@ -17,8 +17,9 @@ import AgendaTags from './AgendaTags';
 import AgendaEdNote from './AgendaEdNote';
 import AgendaInternalNote from './AgendaInternalNote';
 
-class AgendaPreviewEventComponent extends React.Component {
-    constructor(props) {
+class AgendaPreviewEventComponent extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -32,7 +33,7 @@ class AgendaPreviewEventComponent extends React.Component {
         this.reloadEvent();
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         if (get(prevProps.item, 'event_id') !== get(this.props.item, 'event_id')) {
             this.reloadEvent();
         }
@@ -49,7 +50,7 @@ class AgendaPreviewEventComponent extends React.Component {
     }
 
     toggleExpanded() {
-        this.setState((prevState) => ({expanded: !prevState.expanded}));
+        this.setState((prevState: any) => ({expanded: !prevState.expanded}));
     }
 
     render() {
@@ -121,12 +122,12 @@ AgendaPreviewEventComponent.propTypes = {
     fetchEvent: PropTypes.func,
 };
 
-const mapStateToProps = (state, ownProps) => ({
+const mapStateToProps = (state: any, ownProps: any) => ({
     event: state.itemsById[ownProps.item.event_id],
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    fetchEvent: (eventId) => dispatch(fetchItem(eventId)),
+const mapDispatchToProps = (dispatch: any) => ({
+    fetchEvent: (eventId: any) => dispatch(fetchItem(eventId)),
 });
 
 export const AgendaPreviewEvent = connect(mapStateToProps, mapDispatchToProps)(AgendaPreviewEventComponent);
diff --git a/assets/agenda/components/AgendaPreviewImage.jsx b/assets/agenda/components/AgendaPreviewImage.tsx
similarity index 93%
rename from assets/agenda/components/AgendaPreviewImage.jsx
rename to assets/agenda/components/AgendaPreviewImage.tsx
index 9f35b4114..9df3a33fd 100644
--- a/assets/agenda/components/AgendaPreviewImage.jsx
+++ b/assets/agenda/components/AgendaPreviewImage.tsx
@@ -11,7 +11,7 @@ import {get} from 'lodash';
  * @param {Object} item
  * @param {function} onClick
  */
-export default function AgendaPreviewImage({item, onClick}) {
+export default function AgendaPreviewImage({item, onClick}: any) {
     if (!shouldRenderLocation(item)) {
         return null;
     }
diff --git a/assets/agenda/components/AgendaPreviewPlanning.jsx b/assets/agenda/components/AgendaPreviewPlanning.tsx
similarity index 92%
rename from assets/agenda/components/AgendaPreviewPlanning.jsx
rename to assets/agenda/components/AgendaPreviewPlanning.tsx
index 0db68fa50..2c424b971 100644
--- a/assets/agenda/components/AgendaPreviewPlanning.jsx
+++ b/assets/agenda/components/AgendaPreviewPlanning.tsx
@@ -6,7 +6,8 @@ import {gettext} from 'utils';
 import {isPlanningItem} from '../utils';
 import AgendaPreviewCoverages from './AgendaPreviewCoverages';
 
-export class AgendaPreviewPlanning extends React.Component {
+export class AgendaPreviewPlanning extends React.Component<any, any> {
+    static propTypes: any;
     render() {
         const {
             item,
@@ -19,8 +20,8 @@ export class AgendaPreviewPlanning extends React.Component {
         } = this.props;
 
         const planningItems = get(item, 'planning_items') || [];
-        const plan = planningItems.find((p) => p.guid === planningId);
-        const otherPlanningItems = planningItems.filter((p) => p.guid !== planningId);
+        const plan = planningItems.find((p: any) => p.guid === planningId);
+        const otherPlanningItems = planningItems.filter((p: any) => p.guid !== planningId);
 
         if (isPlanningItem(item) || restrictCoverageInfo) {
             return (
@@ -63,7 +64,7 @@ export class AgendaPreviewPlanning extends React.Component {
                             <span className="info-box__label">
                                 {gettext('Other Planning Items')}
                             </span>
-                            {otherPlanningItems.map((planningItem) => (
+                            {otherPlanningItems.map((planningItem: any) => (
                                 <AgendaPreviewCoverages
                                     key={planningItem.guid}
                                     item={item}
diff --git a/assets/agenda/components/AgendaRegistrationInvitationDetails.jsx b/assets/agenda/components/AgendaRegistrationInvitationDetails.tsx
similarity index 94%
rename from assets/agenda/components/AgendaRegistrationInvitationDetails.jsx
rename to assets/agenda/components/AgendaRegistrationInvitationDetails.tsx
index d97a462f2..0ce3dafe1 100644
--- a/assets/agenda/components/AgendaRegistrationInvitationDetails.jsx
+++ b/assets/agenda/components/AgendaRegistrationInvitationDetails.tsx
@@ -8,7 +8,7 @@ import PreviewTagsBlock from 'wire/components/PreviewTagsBlock';
 import {PreviewText} from 'ui/components/PreviewText';
 
 
-export function AgendaRegistrationInvitationDetails({item}) {
+export function AgendaRegistrationInvitationDetails({item}: any) {
     if (!get(item, 'registration_details.length') && !get(item, 'invitation_details.length')) {
         return null;
     }
diff --git a/assets/agenda/components/AgendaTags.jsx b/assets/agenda/components/AgendaTags.tsx
similarity index 91%
rename from assets/agenda/components/AgendaTags.jsx
rename to assets/agenda/components/AgendaTags.tsx
index c65d75976..85f6a0df5 100644
--- a/assets/agenda/components/AgendaTags.jsx
+++ b/assets/agenda/components/AgendaTags.tsx
@@ -13,7 +13,7 @@ import {PreviewTagsSubjects} from 'wire/components/PreviewTagsSubjects';
 import {getSubjects} from '../utils';
 
 
-function AgendaTagsComponent({item, plan, isItemDetail, displayConfig, filterGroupLabels}) {
+function AgendaTagsComponent({item, plan, isItemDetail, displayConfig, filterGroupLabels}: any) {
     const services = !isDisplayed('services', displayConfig) ? null : (
         <PreviewTagsLinkList
             urlPrefix="/agenda?filter="
@@ -58,10 +58,10 @@ AgendaTagsComponent.propTypes = {
     filterGroupLabels: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     filterGroupLabels: filterGroupsToLabelMap(state),
 });
 
-const AgendaTags = connect(mapStateToProps)(AgendaTagsComponent);
+const AgendaTags: React.ComponentType<any> = connect(mapStateToProps)(AgendaTagsComponent);
 
 export default AgendaTags;
diff --git a/assets/agenda/components/AgendaTime.jsx b/assets/agenda/components/AgendaTime.tsx
similarity index 89%
rename from assets/agenda/components/AgendaTime.jsx
rename to assets/agenda/components/AgendaTime.tsx
index fdaac55d5..870c3398e 100644
--- a/assets/agenda/components/AgendaTime.jsx
+++ b/assets/agenda/components/AgendaTime.tsx
@@ -5,20 +5,19 @@ import {get} from 'lodash';
 import classNames from 'classnames';
 
 import {bem} from 'ui/utils';
-import {isItemTBC} from '../utils';
-import {formatAgendaDate} from 'utils';
+import {formatAgendaDate, isItemTBC} from '../utils';
 import {shouldRenderLocation} from'maps/utils';
 
-export default function AgendaTime({item, children}) {
+export default function AgendaTime({item, children}: any) {
     const tbcItem = isItemTBC(item);
-    const getClassNames = (modifier = 'event') => {
+    const getClassNames = (modifier: any = 'event') => {
         return bem('wire-column__preview', 'date', modifier);
     };
     const startDateInRemoteTZ = moment.tz(moment(item.dates.start).utc(), item.dates.tz);
     const isRemoteTimezone = get(item, 'dates.tz') &&
         moment.tz(moment.tz.guess()).format('Z') !== startDateInRemoteTZ.format('Z');
 
-    const getDates = (remoteTz = false) => {
+    const getDates = (remoteTz: any = false) => {
         if (remoteTz) {
             if (!isRemoteTimezone) {
                 return null;
@@ -47,7 +46,7 @@ export default function AgendaTime({item, children}) {
 
         return (
             <div key='time' className={getClassNames('event')}>
-                {formatAgendaDate(item, null)}
+                {formatAgendaDate(item, null, {})}
             </div>
         );
     };
diff --git a/assets/agenda/components/CoverageItemStatus.jsx b/assets/agenda/components/CoverageItemStatus.tsx
similarity index 91%
rename from assets/agenda/components/CoverageItemStatus.jsx
rename to assets/agenda/components/CoverageItemStatus.tsx
index 9a425c270..98f219003 100644
--- a/assets/agenda/components/CoverageItemStatus.jsx
+++ b/assets/agenda/components/CoverageItemStatus.tsx
@@ -13,23 +13,25 @@ import AgendaInternalNote from './AgendaInternalNote';
 import AgendaEdNote from './AgendaEdNote';
 import ActionButton from 'components/ActionButton';
 
-function getDeliveryHref(coverage) {
+function getDeliveryHref(coverage: any) {
     return get(coverage, 'delivery_href');
 }
 
-function getDeliveryId(coverage) {
+function getDeliveryId(coverage: any) {
     return get(coverage, 'delivery_id');
 }
 
-export default class CoverageItemStatus extends React.Component {
-    constructor(props) {
+export default class CoverageItemStatus extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+    constructor(props: any) {
         super(props);
         this.state = {wireItem: null};
         this.filterActions = this.filterActions.bind(this);
         this.onAnchorClick = this.onAnchorClick.bind(this);
     }
 
-    onAnchorClick(e) {
+    onAnchorClick(e: any) {
         e.stopPropagation();
     }
 
@@ -37,14 +39,14 @@ export default class CoverageItemStatus extends React.Component {
         this.setWireItem(this.props);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         this.setWireItem(nextProps);
     }
 
-    setWireItem(props) {
+    setWireItem(props: any) {
         const wireId = getDeliveryId(props.coverage);
         if (wireId && get(props, 'wireItems.length', 0) > 0) {
-            this.setState({wireItem: props.wireItems.find((w) => w._id === wireId)});
+            this.setState({wireItem: props.wireItems.find((w: any) => w._id === wireId)});
         }
     }
 
@@ -58,10 +60,10 @@ export default class CoverageItemStatus extends React.Component {
         return '';
     }
 
-    getStatusContent(coverage) {
+    getStatusContent(coverage: any) {
         const actionsToShow = this.filterActions();
         const parentWatched = isWatched(this.props.item, this.props.user);
-        const actions = actionsToShow.map((action) =>
+        const actions = actionsToShow.map((action: any) =>
             <span className="coverage-item--element-grow" key="action-button">
                 <ActionButton
                     key={action.name}
@@ -74,7 +76,7 @@ export default class CoverageItemStatus extends React.Component {
                 />
             </span>);
 
-        let content = [
+        const content = [
             (<span key="topRow" className={get(actions, 'length', 0) === 0 ? 'coverage-item--element-grow' : ''} >
                 <span key="label" className='coverage-item__text-label me-1'>{gettext('Status')}:</span>
                 <span key="value">{getCoverageStatusText(coverage)}</span>
@@ -122,7 +124,7 @@ export default class CoverageItemStatus extends React.Component {
     }
 
     filterActions() {
-        return this.props.actions.filter((action) => !action.when ||
+        return this.props.actions.filter((action: any) => !action.when ||
             action.when(this.props.coverage, this.props.user, this.props.item));
     }
 
@@ -147,7 +149,7 @@ export default class CoverageItemStatus extends React.Component {
 
     render() {
         const coverage = this.props.coverage;
-        const wireText = this.getItemText(coverage);
+        const wireText = this.getItemText();
         const internalNote = get(this.props, 'coverageData.internal_note', {})[coverage.coverage_id];
         const edNote = this.state.wireItem ? this.state.wireItem.ednote :
             get(this.props, 'coverageData.ednote', {})[coverage.coverage_id];
diff --git a/assets/agenda/components/LocationFilter.jsx b/assets/agenda/components/LocationFilter.tsx
similarity index 93%
rename from assets/agenda/components/LocationFilter.jsx
rename to assets/agenda/components/LocationFilter.tsx
index 50f6642ed..668accfde 100644
--- a/assets/agenda/components/LocationFilter.jsx
+++ b/assets/agenda/components/LocationFilter.tsx
@@ -16,8 +16,13 @@ const LOCATION_TYPE = {
     PLACE: 'location',
 };
 
-export class LocationFilter extends React.Component {
-    constructor(props) {
+export class LocationFilter extends React.Component<any, any> {
+    static propTypes: any;
+
+    dom: any;
+    handleSearch: any;
+
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -101,7 +106,7 @@ export class LocationFilter extends React.Component {
      *
      * @param {MouseEvent} event
      */
-    handleClickOutside(event) {
+    handleClickOutside(event: any) {
         if (!this.dom.container ||
             this.dom.container.contains(event.target) ||
             !document.contains(event.target) ||
@@ -120,7 +125,7 @@ export class LocationFilter extends React.Component {
      *
      * @param {KeyboardEvent} event
      */
-    handleKeydown(event) {
+    handleKeydown(event: any) {
         if (event.code === KEYS.ESCAPE) {
             event.preventDefault();
             event.stopPropagation();
@@ -130,8 +135,8 @@ export class LocationFilter extends React.Component {
 
         const activeElement = document.activeElement;
         const numResults = this.state.results.places.length + this.state.results.regions.length;
-        const activeIndex = activeElement.getAttribute('data-item-index') != null ?
-            parseInt(activeElement.getAttribute('data-item-index'), 10) :
+        const activeIndex = activeElement?.getAttribute('data-item-index') != null ?
+            parseInt(activeElement.getAttribute('data-item-index') as any, 10) :
             null;
 
         if (event.code === KEYS.UP) {
@@ -151,7 +156,7 @@ export class LocationFilter extends React.Component {
      * @param {Number} numResults - The number of search results (both regions & places)
      * @param {Number | null} activeIndex - The `data-item-index` attribute of current focused element
      */
-    handleKeyUpArrow(event, activeElement, numResults, activeIndex) {
+    handleKeyUpArrow(event: any, activeElement: any, numResults: any, activeIndex: any) {
         if (activeElement === this.dom.searchInput) {
             // Place focus on the last item in the search results
             event.preventDefault();
@@ -188,7 +193,7 @@ export class LocationFilter extends React.Component {
      * @param {Number} numResults - The number of search results (both regions & places)
      * @param {Number | null} activeIndex - The `data-item-index` attribute of current focused element
      */
-    handleKeyDownArrow(event, activeElement, numResults, activeIndex) {
+    handleKeyDownArrow(event: any, activeElement: any, numResults: any, activeIndex: any) {
         if (activeElement === this.dom.searchInput) {
             // Place focus on either the 'Any Location' button or first item in search results
             event.preventDefault();
@@ -230,7 +235,7 @@ export class LocationFilter extends React.Component {
      * @param {Number} numResults - The number of search results (both regions & places)
      * @param {Number | null} activeIndex - The `data-item-index` attribute of current focused element
      */
-    handleKeyEnter(event, activeElement, numResults, activeIndex) {
+    handleKeyEnter(event: any, activeElement: any, numResults: any, activeIndex: any) {
         if (activeElement === this.dom.searchInput && numResults === 1) {
             // If there is only 1 result, then select that one
             event.preventDefault();
@@ -241,7 +246,7 @@ export class LocationFilter extends React.Component {
         } else if (activeIndex != null) {
             // If a search result item is currently focused, select that
             event.preventDefault();
-            document.querySelector(`[data-item-index="${activeIndex}"]`).click();
+            (document.querySelector(`[data-item-index="${activeIndex}"]`) as HTMLElement).click();
         }
     }
 
@@ -250,9 +255,9 @@ export class LocationFilter extends React.Component {
      *
      * @param {Number} index
      */
-    focusItem(index) {
+    focusItem(index: any) {
         this.setState({selectedIndex: index});
-        const item = document.querySelector(`[data-item-index="${index}"]`);
+        const item: HTMLElement = document.querySelector(`[data-item-index="${index}"]`) as HTMLElement;
 
         if (item != null) {
             item.focus();
@@ -264,7 +269,7 @@ export class LocationFilter extends React.Component {
      *
      * @param {Object} selected
      */
-    onChange(selected) {
+    onChange(selected?: any) {
         this.toggleDropdown();
         this.props.toggleFilter('location', selected);
     }
@@ -274,7 +279,7 @@ export class LocationFilter extends React.Component {
      *
      * @param {Event} e
      */
-    onSearchInputChange(e) {
+    onSearchInputChange(e: any) {
         this.handleSearch(e.target.value);
     }
 
@@ -284,7 +289,7 @@ export class LocationFilter extends React.Component {
      * @param {String | undefined} query
      * @private
      */
-    _handleSearch(query) {
+    _handleSearch(query?: any) {
         this.setState({isSearchLoading: true});
         let searchURL = '/agenda/search_locations';
 
@@ -293,7 +298,7 @@ export class LocationFilter extends React.Component {
         }
 
         server.get(searchURL)
-            .then((results) => {
+            .then((results: any) => {
                 this.setState({
                     isSearchLoading: false,
                     results: results,
@@ -308,7 +313,7 @@ export class LocationFilter extends React.Component {
      * @param {Number} index - The index in the results list
      * @returns {JSX.Element}
      */
-    renderRegionSearchResult(item, index) {
+    renderRegionSearchResult(item: any, index: any) {
         const {selectedIndex} = this.state;
 
         if (item.type === LOCATION_TYPE.CITY) {
@@ -417,7 +422,7 @@ export class LocationFilter extends React.Component {
             <div
                 key="location"
                 className="d-inline-flex position-relative"
-                ref={(ref) => this.dom.container = ref}
+                ref={(ref: any) => this.dom.container = ref}
             >
                 <DropdownFilterButton
                     id="subnav_location"
@@ -441,13 +446,13 @@ export class LocationFilter extends React.Component {
                                 className="form-control"
                                 placeholder={gettext('Search for a region or place')}
                                 onChange={this.onSearchInputChange}
-                                aria-activedescendant={true}
+                                // aria-activedescendant={true}
                                 aria-autocomplete="both"
                                 aria-expanded={true}
                                 aria-haspopup="listbox"
                                 aria-owns="dropdown-list-menu"
                                 role="combobox"
-                                ref={(ref) => this.dom.searchInput = ref}
+                                ref={(ref: any) => this.dom.searchInput = ref}
                             />
                         </div>
                         <div
@@ -463,7 +468,7 @@ export class LocationFilter extends React.Component {
                                         type="button"
                                         className="dropdown-item"
                                         onClick={() => this.onChange()}
-                                        ref={(ref) => this.dom.clearButton = ref}
+                                        ref={(ref: any) => this.dom.clearButton = ref}
                                     >
                                         {gettext('Any location')}
                                     </button>
diff --git a/assets/agenda/index.js b/assets/agenda/index.ts
similarity index 84%
rename from assets/agenda/index.js
rename to assets/agenda/index.ts
index b5286e4b9..96d27682b 100644
--- a/assets/agenda/index.js
+++ b/assets/agenda/index.ts
@@ -1,4 +1,5 @@
-import {createStore, render, initWebSocket, getInitData, isMobilePhone, closeItemOnMobile} from 'utils';
+import {createStore, render, getInitData, isMobilePhone, closeItemOnMobile} from 'utils';
+import {initWebSocket} from 'websocket';
 
 import agendaReducer from './reducers';
 import {getActiveDate, getReadItems, getFeaturedOnlyParam} from 'local-store';
@@ -11,7 +12,6 @@ const store = createStore(agendaReducer, 'Agenda');
 // init data
 store.dispatch(initData(getInitData(window.agendaData), getReadItems(), getActiveDate(), getFeaturedOnlyParam()));
 
-
 // init query
 const params = new URLSearchParams(window.location.search);
 store.dispatch(initParams(params));
@@ -22,12 +22,12 @@ if (localStorage.getItem('view')) {
 }
 
 // handle history
-window.onpopstate = function(event) {
+window.onpopstate = function(event: any) {
     if (event.state) {
         closeItemOnMobile(store.dispatch, event.state, openItemDetails, previewItem);
         if (!isMobilePhone()) {
             store.dispatch(setState(event.state));
-            store.dispatch(fetchItems(false));
+            store.dispatch(fetchItems());
         }
     }
 };
diff --git a/assets/agenda/item-actions.js b/assets/agenda/item-actions.js
deleted file mode 100644
index e165fd760..000000000
--- a/assets/agenda/item-actions.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import {get} from 'lodash';
-import {getItemActions} from '../item-actions';
-import * as agendaActions from './actions';
-import {gettext} from '../utils';
-import {isWatched} from './utils';
-
-const canWatchAgendaItem = (state, item, includeCoverages) => {
-    let result = state.user && !isWatched(item, state.user);
-    if (!state.bookmarks || includeCoverages) {
-        return result;
-    }
-
-    const coveragesWatched = (get(item, 'coverages') || []).filter((c) => isWatched(c, state.user));
-    return coveragesWatched.length > 0 ? false : result;
-};
-
-export const getAgendaItemActions = (dispatch) => {
-    const {watchEvents, stopWatchingEvents} = agendaActions;
-    return getItemActions(dispatch, {...agendaActions}).concat([
-        {
-            name: gettext('Watch'),
-            icon: 'watch',
-            multi: true,
-            when: (state, item, includeCoverages) => canWatchAgendaItem(state, item, includeCoverages),
-            action: (items) => dispatch(watchEvents(items)),
-        },
-        {
-            name: gettext('Stop watching'),
-            icon: 'unwatch',
-            multi: true,
-            when: (state, item, includeCoverages) => !canWatchAgendaItem(state, item, includeCoverages),
-            action: (items) => dispatch(stopWatchingEvents(items)),
-        },
-    ]);
-};
-
-export const getCoverageItemActions = (dispatch) => {
-    const {watchCoverage, stopWatchingCoverage} = agendaActions;
-    return [
-        {
-            name: gettext('Watch'),
-            icon: 'watch',
-            when: (cov, user) => user && !isWatched(cov, user),
-            action: (coverage, group, item) => dispatch(watchCoverage(coverage, item)),
-            tooltip: gettext('Watch this coverage'),
-        },
-        {
-            name: gettext('Stop watching'),
-            icon: 'unwatch',
-            when: (cov, user) => user && isWatched(cov, user),
-            action: (coverage, group, item) => dispatch(stopWatchingCoverage(coverage, item)),
-        },
-    ];
-};
-
diff --git a/assets/agenda/item-actions.ts b/assets/agenda/item-actions.ts
new file mode 100644
index 000000000..3863899e7
--- /dev/null
+++ b/assets/agenda/item-actions.ts
@@ -0,0 +1,55 @@
+import {get} from 'lodash';
+import {getItemActions} from '../item-actions';
+import * as agendaActions from './actions';
+import {gettext} from '../utils';
+import {isWatched} from './utils';
+
+const canWatchAgendaItem = (state: any, item: any, includeCoverages: any) => {
+    const result = state.user && !isWatched(item, state.user);
+    if (!state.bookmarks || includeCoverages) {
+        return result;
+    }
+
+    const coveragesWatched = (get(item, 'coverages') || []).filter((c: any) => isWatched(c, state.user));
+    return coveragesWatched.length > 0 ? false : result;
+};
+
+export const getAgendaItemActions = (dispatch: any) => {
+    const {watchEvents, stopWatchingEvents} = agendaActions;
+    return (getItemActions(dispatch, {...agendaActions}) as any).concat([
+        {
+            name: gettext('Watch'),
+            icon: 'watch',
+            multi: true,
+            when: (state: any, item: any, includeCoverages: any) => canWatchAgendaItem(state, item, includeCoverages),
+            action: (items: any) => dispatch(watchEvents(items)),
+        },
+        {
+            name: gettext('Stop watching'),
+            icon: 'unwatch',
+            multi: true,
+            when: (state: any, item: any, includeCoverages: any) => !canWatchAgendaItem(state, item, includeCoverages),
+            action: (items: any) => dispatch(stopWatchingEvents(items)),
+        },
+    ]);
+};
+
+export const getCoverageItemActions = (dispatch: any) => {
+    const {watchCoverage, stopWatchingCoverage} = agendaActions;
+    return [
+        {
+            name: gettext('Watch'),
+            icon: 'watch',
+            when: (cov: any, user: any) => user && !isWatched(cov, user),
+            action: (coverage: any, group: any, item: any) => dispatch(watchCoverage(coverage, item)),
+            tooltip: gettext('Watch this coverage'),
+        },
+        {
+            name: gettext('Stop watching'),
+            icon: 'unwatch',
+            when: (cov: any, user: any) => user && isWatched(cov, user),
+            action: (coverage: any, group: any, item: any) => dispatch(stopWatchingCoverage(coverage, item)),
+        },
+    ];
+};
+
diff --git a/assets/agenda/reducers.js b/assets/agenda/reducers.js
index be70c9e8f..4a05f8404 100644
--- a/assets/agenda/reducers.js
+++ b/assets/agenda/reducers.js
@@ -1,5 +1,4 @@
 import {
-    SET_EVENT_QUERY,
     RECIEVE_ITEMS,
     INIT_DATA,
     SELECT_DATE,
@@ -106,9 +105,6 @@ export default function agendaReducer(state = initialState, action) {
     case RECIEVE_ITEMS:
         return recieveItems(state, action.data);
 
-    case SET_EVENT_QUERY:
-        return {...state, query: action.query, activeItem: null};
-
     case WATCH_EVENTS: {
         const itemsById = Object.assign({}, state.itemsById);
         action.items.forEach((_id) => {
diff --git a/assets/agenda/reducers.ts b/assets/agenda/reducers.ts
new file mode 100644
index 000000000..287128feb
--- /dev/null
+++ b/assets/agenda/reducers.ts
@@ -0,0 +1,249 @@
+import {
+    RECIEVE_ITEMS,
+    INIT_DATA,
+    SELECT_DATE,
+    WATCH_EVENTS,
+    STOP_WATCHING_EVENTS,
+    UPDATE_ITEM,
+    TOGGLE_FEATURED_FILTER,
+    SET_ITEM_TYPE_FILTER,
+    AGENDA_WIRE_ITEMS,
+    WATCH_COVERAGE,
+    STOP_WATCHING_COVERAGE,
+} from './actions';
+
+import {get, uniq} from 'lodash';
+import {EXTENDED_VIEW} from 'wire/defaults';
+import {searchReducer} from 'search/reducers';
+import {defaultReducer} from '../reducers';
+import {EARLIEST_DATE} from './utils';
+import {ITopic} from 'interfaces/topic';
+
+const initialState = {
+    items: [],
+    itemsById: {},
+    aggregations: null,
+    activeItem: null,
+    previewItem: null,
+    previewGroup: null,
+    previewPlan: null,
+    openItem: null,
+    isLoading: false,
+    resultsFiltered: false,
+    totalItems: null,
+    activeQuery: null,
+    user: null,
+    company: null,
+    topics: [],
+    selectedItems: [],
+    bookmarks: false,
+    context: 'agenda',
+    formats: [],
+    newItems: [],
+    newItemsByTopic: {},
+    readItems: {},
+    agenda: {
+        activeView: EXTENDED_VIEW,
+        activeDate: Date.now(),
+        activeGrouping: 'day',
+        eventsOnlyAccess: false,
+        itemType: null,
+        featuredOnly: false,
+        agendaWireItems: [],
+    },
+    search: searchReducer(undefined, undefined, 'agenda'),
+    detail: false,
+    userSections: {},
+    searchInitiated: false,
+    uiConfig: {},
+    groups: [],
+    hasAgendaFeaturedItems: false,
+};
+
+export interface IAgendaState {
+    topics: Array<ITopic>;
+}
+
+function recieveItems(state: any, data: any) {
+    const itemsById = Object.assign({}, state.itemsById);
+    const items = data._items.map((item: any) => {
+        itemsById[item._id] = item;
+        return item._id;
+    });
+
+    return {
+        ...state,
+        items,
+        itemsById,
+        isLoading: false,
+        totalItems: data._meta.total,
+        aggregations: data._aggregations || null,
+        newItems: [],
+        searchInitiated: false,
+    };
+}
+
+function _agendaReducer(state: any, action: any) {
+    switch (action.type) {
+
+    case SELECT_DATE:
+        return {
+            ...state,
+            selectedItems: [],
+            activeDate: action.dateString,
+            activeGrouping: action.grouping || 'day',
+        };
+
+    default:
+        return state;
+    }
+}
+
+export default function agendaReducer(state: any = initialState, action: any): IAgendaState {
+    switch (action.type) {
+
+    case RECIEVE_ITEMS:
+        return recieveItems(state, action.data);
+
+    case WATCH_EVENTS: {
+        const itemsById = Object.assign({}, state.itemsById);
+        action.items.forEach((_id: any) => {
+            const watches = get(itemsById[_id], 'watches', []).concat(state.user);
+            itemsById[_id] = Object.assign({}, itemsById[_id], {watches});
+            (get(itemsById[_id], 'coverages') || []).forEach((c: any) => {
+                if (get(c, 'watches.length', 0) > 0) {
+                    c.watches = [];
+                }
+            });
+        });
+
+        return {...state, itemsById};
+    }
+
+    case WATCH_COVERAGE: {
+        const itemsById = Object.assign({}, state.itemsById);
+        const item = itemsById[get(action, 'item._id')];
+        const coverage = (get(item, 'coverages') || []).find((c: any) => c.coverage_id === action.coverage.coverage_id);
+        if (coverage) {
+            coverage['watches'] = uniq([
+                ...(get(coverage, 'watches') || []),
+                state.user
+            ]);
+        }
+
+        return {...state, itemsById};
+    }
+
+    case STOP_WATCHING_COVERAGE: {
+        const itemsById = Object.assign({}, state.itemsById);
+        const item = itemsById[get(action, 'item._id')];
+        const coverage = (get(item, 'coverages') || []).find((c: any) => c.coverage_id === action.coverage.coverage_id);
+        if (coverage) {
+            coverage['watches'] = (get(coverage, 'watches') || []).filter((u: any) => u !== state.user);
+        }
+
+        return {...state, itemsById};
+    }
+
+    case STOP_WATCHING_EVENTS: {
+        const itemsById = Object.assign({}, state.itemsById);
+        action.items.forEach((_id: any) => {
+            const watches = get(itemsById[_id], 'watches', []).filter((userId: any) => userId !== state.user);
+            itemsById[_id] = Object.assign({}, itemsById[_id], {watches});
+        });
+
+        return {...state, itemsById};
+    }
+
+    case UPDATE_ITEM: {
+        // Update existing items, remove killed items
+        const itemsById = Object.assign({}, state.itemsById);
+        let updatedItems = [ ...state.items ];
+        const item = action.item;
+        if(itemsById[item._id]) {
+            if (get(item, 'state') === 'killed') {
+                delete itemsById[item._id];
+                updatedItems = updatedItems.filter((i: any) => i !== item._id);
+            } else {
+                itemsById[item._id] = item;
+            }
+        }
+
+        return {
+            ...state,
+            itemsById: itemsById,
+            items: updatedItems,
+        };
+    }
+
+    case INIT_DATA: {
+        const navigations = get(action, 'agendaData.navigations', []);
+        const openItem = get(action, 'agendaData.item', null);
+        const agenda: any = {
+            ...state.agenda,
+            activeDate: action.agendaData.bookmarks ? EARLIEST_DATE : action.activeDate || state.agenda.activeDate,
+            eventsOnlyAccess: action.agendaData.events_only,
+            restrictCoverageInfo: action.agendaData.restrict_coverage_info,
+            featuredOnly: action.featuredOnly,
+        };
+
+        return {
+            ...state,
+            readItems: action.readData || {},
+            user: (action.agendaData.user || {})._id || null,
+            topics: action.agendaData.topics || [],
+            company: action.agendaData.company || null,
+            bookmarks: action.agendaData.bookmarks || false,
+            formats: action.agendaData.formats || [],
+            search: Object.assign({}, state.search, {navigations}),
+            context: 'agenda',
+            openItem: openItem,
+            detail: !!openItem,
+            agenda,
+            savedItemsCount: action.agendaData.saved_items || null,
+            userSections: action.agendaData.userSections || {},
+            locators: action.agendaData.locators || null,
+            uiConfig: action.agendaData.ui_config || {},
+            groups: action.agendaData.groups || [],
+            hasAgendaFeaturedItems: action.agendaData.has_agenda_featured_items || false,
+        };
+    }
+
+    case SELECT_DATE:
+        return {
+            ...state,
+            activeItem: null,
+            previewItem: null,
+            agenda: _agendaReducer(state.agenda, action)
+        };
+
+    case TOGGLE_FEATURED_FILTER:
+        return {
+            ...state,
+            agenda: {
+                ...state.agenda,
+                featuredOnly: !state.agenda.featuredOnly,
+            }
+        };
+    case SET_ITEM_TYPE_FILTER:
+        return {
+            ...state,
+            agenda: {
+                ...state.agenda,
+                itemType: action.value,
+            },
+        };
+
+    case AGENDA_WIRE_ITEMS:
+        return {
+            ...state,
+            agenda: {
+                ...state.agenda,
+                agendaWireItems: action.items
+            }
+        };
+
+    default:
+        return defaultReducer(state || initialState, action);
+    }
+}
diff --git a/assets/agenda/selectors.js b/assets/agenda/selectors.ts
similarity index 62%
rename from assets/agenda/selectors.js
rename to assets/agenda/selectors.ts
index f3d01440b..7b2d6b96f 100644
--- a/assets/agenda/selectors.js
+++ b/assets/agenda/selectors.ts
@@ -1,7 +1,7 @@
 import {get} from 'lodash';
 import {uiConfigSelector} from 'ui/selectors';
 
-export const agendaFiltersConfigSelector = (state) => get(uiConfigSelector(state), 'subnav.filters') || [
+export const agendaFiltersConfigSelector = (state: any) => get(uiConfigSelector(state), 'subnav.filters') || [
     'item_type',
     'calendar',
     'location',
diff --git a/assets/agenda/tests/CoverageItemStatus.spec.js b/assets/agenda/tests/CoverageItemStatus.spec.tsx
similarity index 98%
rename from assets/agenda/tests/CoverageItemStatus.spec.js
rename to assets/agenda/tests/CoverageItemStatus.spec.tsx
index d2550e27b..b0a524d06 100644
--- a/assets/agenda/tests/CoverageItemStatus.spec.js
+++ b/assets/agenda/tests/CoverageItemStatus.spec.tsx
@@ -5,7 +5,7 @@ import CoverageItemStatus from '../components/CoverageItemStatus';
 
 import 'tests/setup';
 
-function setup(coverage) {
+function setup(coverage: any) {
     return shallow(<CoverageItemStatus coverage={coverage} />);
 }
 
diff --git a/assets/agenda/tests/utils.spec.js b/assets/agenda/tests/utils.spec.ts
similarity index 94%
rename from assets/agenda/tests/utils.spec.js
rename to assets/agenda/tests/utils.spec.ts
index 07ec7bb62..4d2e8489f 100644
--- a/assets/agenda/tests/utils.spec.js
+++ b/assets/agenda/tests/utils.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 import {keyBy} from 'lodash';
 import * as utils from '../utils';
 
@@ -18,7 +19,7 @@ describe('utils', () => {
                 },
             ];
 
-            const groupedItems = keyBy(utils.groupItems(items, '2018-10-13', 'day'), 'date');
+            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-13', 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('13-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('14-10-2018')).toBe(false);
@@ -42,7 +43,7 @@ describe('utils', () => {
                 },
             ];
 
-            const groupedItems = keyBy(utils.groupItems(items, '2018-10-21', 'day'), 'date');
+            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-21', 'day'), 'date');
 
             expect(groupedItems['15-10-2018']['items']).toEqual(['foo']);
             expect(groupedItems['16-10-2018']['items']).toEqual(['foo']);
@@ -60,7 +61,7 @@ describe('utils', () => {
                     event: {_id: 'foo'}
                 }];
 
-            const groupedItems = keyBy(utils.groupItems(items, '2018-10-11', 'day'), 'date');
+            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-11', 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('11-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('12-10-2018')).toBe(false);
@@ -84,7 +85,7 @@ describe('utils', () => {
                     event: null
                 }];
 
-            const groupedItems = keyBy(utils.groupItems(items, '2018-10-15', 'day'), 'date');
+            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-15', 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('15-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('17-10-2018')).toBe(false);
@@ -103,7 +104,7 @@ describe('utils', () => {
                     event: null
                 }];
 
-            const groupedItems = keyBy(utils.groupItems(items, '2018-10-15', 'day'), 'date');
+            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-15', 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('15-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('16-10-2018')).toBe(false);
diff --git a/assets/agenda/utils.js b/assets/agenda/utils.ts
similarity index 68%
rename from assets/agenda/utils.js
rename to assets/agenda/utils.ts
index 8e0ce6a71..cef30fbaf 100644
--- a/assets/agenda/utils.js
+++ b/assets/agenda/utils.ts
@@ -12,6 +12,7 @@ import {
     parseDate,
     AGENDA_DATE_FORMAT_SHORT,
     formatTime,
+    DAY_IN_MINUTES,
 } from '../utils';
 
 export const STATUS_KILLED = 'killed';
@@ -19,32 +20,32 @@ export const STATUS_CANCELED = 'cancelled';
 export const STATUS_POSTPONED = 'postponed';
 export const STATUS_RESCHEDULED = 'rescheduled';
 
-const navigationFunctions = {
+const navigationFunctions: any = {
     'day': {
         'next': getNextDay,
         'previous': getPreviousDay,
-        'format': (dateString) => moment(dateString).format(AGENDA_DATE_FORMAT_SHORT),
+        'format': (dateString: any) => moment(dateString).format(AGENDA_DATE_FORMAT_SHORT),
     },
     'week': {
         'next': getNextWeek,
         'previous': getPreviousWeek,
-        'format': (dateString) => `${moment(dateString).format('D MMMM')} - 
+        'format': (dateString: any) => `${moment(dateString).format('D MMMM')} -
         ${moment(dateString).add(6, 'days').format('D MMMM')}`,
     },
     'month': {
         'next': getNextMonth,
         'previous': getPreviousMonth,
-        'format': (dateString) => moment(dateString).format('MMMM, YYYY'),
+        'format': (dateString: any) => moment(dateString).format('MMMM, YYYY'),
     }
 };
 
-const Groupers = {
+const Groupers: any = {
     'day': formatDate,
     'week': formatWeek,
     'month': formatMonth,
 };
 
-export function getCoverageStatusText(coverage) {
+export function getCoverageStatusText(coverage: any) {
     if (coverage.workflow_status === WORKFLOW_STATUS.DRAFT) {
         return get(DRAFT_STATUS_TEXTS, coverage.coverage_status, '');
     }
@@ -115,7 +116,7 @@ export const EARLIEST_DATE = moment('20170101').valueOf();
  * @param {Object} item
  * @return {Boolean}
  */
-export function isCanceled(item) {
+export function isCanceled(item: any) {
     return item && (item.state === STATUS_CANCELED || item.state === STATUS_KILLED);
 }
 
@@ -125,7 +126,7 @@ export function isCanceled(item) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function isPostponed(item) {
+export function isPostponed(item: any) {
     return item && item.state === STATUS_POSTPONED;
 }
 
@@ -135,7 +136,7 @@ export function isPostponed(item) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function isRescheduled(item) {
+export function isRescheduled(item: any) {
     return item && item.state === STATUS_RESCHEDULED;
 }
 
@@ -145,7 +146,7 @@ export function isRescheduled(item) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function hasCoverages(item) {
+export function hasCoverages(item: any) {
     return !isEmpty(get(item, 'coverages'));
 }
 
@@ -155,7 +156,7 @@ export function hasCoverages(item) {
  * @param coverageType
  * @returns {*}
  */
-export function getCoverageIcon(coverageType) {
+export function getCoverageIcon(coverageType: any) {
     const coverageTypes = getConfig('coverage_types', {});
     return get(coverageTypes, `${coverageType}.icon`, 'unrecognized');
 }
@@ -166,7 +167,7 @@ export function getCoverageIcon(coverageType) {
  * @param coverageType
  * @returns {*}
  */
-export function getCoverageDisplayName(coverageType) {
+export function getCoverageDisplayName(coverageType: any) {
     const coverageTypes = getConfig('coverage_types', {});
     const locale = (window.locale || 'en').toLowerCase();
 
@@ -181,7 +182,7 @@ export function getCoverageDisplayName(coverageType) {
  * @param {String} userId
  * @return {Boolean}
  */
-export function isWatched(item, userId) {
+export function isWatched(item: any, userId: any) {
     return userId && includes(get(item, 'watches', []), userId);
 }
 
@@ -192,7 +193,7 @@ export function isWatched(item, userId) {
  * @param {String} dateString
  * @return {Boolean}
  */
-export function isCoverageForExtraDay(coverage) {
+export function isCoverageForExtraDay(coverage: any) {
     return coverage.scheduled != null;
 }
 
@@ -202,7 +203,7 @@ export function isCoverageForExtraDay(coverage) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function isRecurring(item) {
+export function isRecurring(item: any) {
     return item && !!item.recurrence_id;
 }
 
@@ -212,7 +213,7 @@ export function isRecurring(item) {
  * @param {Object} item
  * @return {String}
  */
-export function getGeoLocation(item) {
+export function getGeoLocation(item: any) {
     return get(item, 'location.location', null);
 }
 
@@ -222,7 +223,7 @@ export function getGeoLocation(item) {
  * @param {Object} item
  * @return {String}
  */
-export function getLocationString(item) {
+export function getLocationString(item: any) {
     return [
         get(item, 'location.0.name', get(item, 'location.0.address.title')),
         get(item, 'location.0.address.line.0'),
@@ -230,7 +231,7 @@ export function getLocationString(item) {
         get(item, 'location.0.address.state') || get(item, 'location.0.address.locality'),
         get(item, 'location.0.address.postal_code'),
         get(item, 'location.0.address.country'),
-    ].filter((d) => d).join(', ');
+    ].filter((d: any) => d).join(', ');
 }
 
 /**
@@ -239,11 +240,11 @@ export function getLocationString(item) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function hasLocation(item) {
+export function hasLocation(item: any) {
     return !!getLocationString(item);
 }
 
-export function hasLocationNotes(item) {
+export function hasLocationNotes(item: any) {
     return get(item, 'location[0].details[0].length', 0) > 0;
 }
 
@@ -253,14 +254,14 @@ export function hasLocationNotes(item) {
  * @param {Object} item
  * @return {String}
  */
-export function getPublicContacts(item) {
+export function getPublicContacts(item: any) {
     const contacts = get(item, 'event.event_contact_info', []);
-    return contacts.filter(c => c.public).map(c => ({
-        name: [c.first_name, c.last_name].filter((x) => !!x).join(' '),
+    return contacts.filter((c: any) => c.public).map((c: any) => ({
+        name: [c.first_name, c.last_name].filter((x: any) => !!x).join(' '),
         organisation: c.organisation || '',
         email: (c.contact_email || []).join(', '),
-        phone: (c.contact_phone || []).filter(m => m.public).map(m => m.number).join(', '),
-        mobile: (c.mobile || []).filter(m => m.public).map(m => m.number).join(', '),
+        phone: (c.contact_phone || []).filter((m: any) => m.public).map((m: any) => m.number).join(', '),
+        mobile: (c.mobile || []).filter((m: any) => m.public).map((m: any) => m.number).join(', '),
     }));
 }
 
@@ -270,24 +271,24 @@ export function getPublicContacts(item) {
  * @param {Object} item
  * @return {String}
  */
-export function getCalendars(item) {
-    return (get(item, 'calendars') || []).map(cal => cal.name).join(', ');
+export function getCalendars(item: any) {
+    return (get(item, 'calendars') || []).map((cal: any) => cal.name).join(', ');
 }
 
-export function getAgendaNames(item) {
+export function getAgendaNames(item: any) {
     return (get(item, 'agendas') || [])
-        .map((agenda) => agenda.name)
+        .map((agenda: any) => agenda.name)
         .join(', ');
 }
 
-export function isPlanningItem(item) {
+export function isPlanningItem(item: any) {
     return item.item_type === 'planning' || (
         item.item_type == null &&
         item.event_id == null
     );
 }
 
-export function planHasEvent(item) {
+export function planHasEvent(item: any) {
     return isPlanningItem(item) && item.event_id != null;
 }
 
@@ -297,7 +298,7 @@ export function planHasEvent(item) {
  * @param {Object} item
  * @return {String}
  */
-export function getEventLinks(item) {
+export function getEventLinks(item: any) {
     return get(item, 'event.links') || [];
 }
 
@@ -308,7 +309,7 @@ export function getEventLinks(item) {
  * @param {String} dateString
  * @return {String}
  */
-export function formatNavigationDate(dateString, grouping) {
+export function formatNavigationDate(dateString: any, grouping: any) {
     return navigationFunctions[grouping].format(dateString);
 }
 
@@ -319,7 +320,7 @@ export function formatNavigationDate(dateString, grouping) {
  * @param {String} dateString
  * @return {String}
  */
-export function getDateInputDate(dateString) {
+export function getDateInputDate(dateString: any) {
     if (dateString) {
         const parsed = moment(parseInt(dateString));
         return parsed.format('YYYY-MM-DD');
@@ -334,7 +335,7 @@ export function getDateInputDate(dateString) {
  * @param {String} dateString
  * @return {String}
  */
-export function getMomentDate(dateString) {
+export function getMomentDate(dateString: any): any {
     if (dateString) {
         return moment(parseInt(dateString));
     }
@@ -348,7 +349,7 @@ export function getMomentDate(dateString) {
  * @param {String} dateString
  * @return {String} number of milliseconds since the Unix Epoch
  */
-function getNextDay(dateString) {
+function getNextDay(dateString: any) {
     return moment(dateString).add(1, 'days').valueOf();
 }
 
@@ -359,7 +360,7 @@ function getNextDay(dateString) {
  * @param {String} dateString
  * @return {String} number of milliseconds since the Unix Epoch
  */
-function getPreviousDay(dateString) {
+function getPreviousDay(dateString: any) {
     return moment(dateString).add(-1, 'days').valueOf();
 }
 
@@ -369,7 +370,7 @@ function getPreviousDay(dateString) {
  * @param {String} dateString
  * @return {String} number of milliseconds since the Unix Epoch
  */
-function getNextWeek(dateString) {
+function getNextWeek(dateString: any) {
     return moment(dateString).add(7, 'days').isoWeekday(1).valueOf();
 }
 
@@ -380,7 +381,7 @@ function getNextWeek(dateString) {
  * @param {String} dateString
  * @return {String} number of milliseconds since the Unix Epoch
  */
-function getPreviousWeek(dateString) {
+function getPreviousWeek(dateString: any) {
     return moment(dateString).add(-7, 'days').isoWeekday(1).valueOf();
 }
 
@@ -390,7 +391,7 @@ function getPreviousWeek(dateString) {
  * @param {String} dateString
  * @return {String} number of milliseconds since the Unix Epoch
  */
-function getNextMonth(dateString) {
+function getNextMonth(dateString: any) {
     return moment(dateString).add(1, 'months').startOf('month').valueOf();
 }
 
@@ -401,7 +402,7 @@ function getNextMonth(dateString) {
  * @param {String} dateString
  * @return {String} number of milliseconds since the Unix Epoch
  */
-export function getPreviousMonth(dateString) {
+export function getPreviousMonth(dateString: any) {
     return moment(dateString).add(-1, 'months').startOf('month').valueOf();
 }
 
@@ -412,7 +413,7 @@ export function getPreviousMonth(dateString) {
  * @param {String} grouping: day, week or month
  * @return {String} number of milliseconds since the Unix Epoch
  */
-export function getNext(dateString, grouping) {
+export function getNext(dateString: any, grouping: any) {
     return navigationFunctions[grouping].next(dateString);
 }
 
@@ -423,7 +424,7 @@ export function getNext(dateString, grouping) {
  * @param {String} grouping: day, week or month
  * @return {String} number of milliseconds since the Unix Epoch
  */
-export function getPrevious(dateString, grouping) {
+export function getPrevious(dateString: any, grouping: any) {
     return navigationFunctions[grouping].previous(dateString);
 }
 
@@ -433,7 +434,7 @@ export function getPrevious(dateString, grouping) {
  * @param {Object} item
  * @return {Array}
  */
-export function getAttachments(item) {
+export function getAttachments(item: any) {
     return get(item, 'event.files', []);
 }
 
@@ -443,7 +444,7 @@ export function getAttachments(item) {
  * @param {Object} item
  * @return {Array}
  */
-export function getInternalNote(item, plan) {
+export function getInternalNote(item: any, plan: any) {
     return get(plan, 'internal_note') || get(item, 'event.internal_note');
 }
 
@@ -453,18 +454,18 @@ export function getInternalNote(item, plan) {
  * @param {Object} item
  * @return {Object}
  */
-export function getDataFromCoverages(item) {
+export function getDataFromCoverages(item: any) {
     const planningItems = get(item, 'planning_items', []);
-    let data = {
+    const data: any = {
         'internal_note': {},
         'ednote': {},
         'workflow_status_reason': {},
         'scheduled_update_status': {},
     };
 
-    planningItems.forEach(p => {
-        (get(p, 'coverages') || []).forEach((c) => {
-            ['internal_note', 'ednote', 'workflow_status_reason'].forEach((field) => {
+    planningItems.forEach((p: any) => {
+        (get(p, 'coverages') || []).forEach((c: any) => {
+            ['internal_note', 'ednote', 'workflow_status_reason'].forEach((field: any) => {
 
                 // Don't populate if the value is same as the field in upper level planning_item
                 // Don't populate workflow_status_reason is planning_item is cancelled to avoid UI duplication
@@ -490,7 +491,7 @@ export function getDataFromCoverages(item) {
     return data;
 }
 
-const getNextPendingScheduledUpdate = (coverage) => {
+const getNextPendingScheduledUpdate = (coverage: any) => {
     if (coverage.scheduled == null) {
         // Not privileged to see coverage details
         return null;
@@ -505,13 +506,13 @@ const getNextPendingScheduledUpdate = (coverage) => {
         return coverage.scheduled_updates[0];
     }
 
-    const lastScheduledDelivery = (coverage.deliveries.reverse()).find((d) => d.scheduled_update_id);
+    const lastScheduledDelivery = (coverage.deliveries.reverse()).find((d: any) => d.scheduled_update_id);
     // More deliveries, but no scheduled_update was published
     if (!lastScheduledDelivery) {
         return coverage.scheduled_updates[0];
     }
 
-    const lastPublishedShceduledUpdateIndex = coverage.scheduled_updates.findIndex((s) =>
+    const lastPublishedShceduledUpdateIndex = coverage.scheduled_updates.findIndex((s: any) =>
         s.scheduled_update_id === lastScheduledDelivery.scheduled_update_id);
 
     if (lastPublishedShceduledUpdateIndex === coverage.scheduled_updates.length - 1) {
@@ -531,7 +532,7 @@ const getNextPendingScheduledUpdate = (coverage) => {
  * @param {Object} item
  * @return {Array}
  */
-export function getSubjects(item) {
+export function getSubjects(item: any) {
     return get(item, 'subject') || [];
 }
 
@@ -541,7 +542,7 @@ export function getSubjects(item) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function hasAttachments(item) {
+export function hasAttachments(item: any) {
     return !isEmpty(getAttachments(item));
 }
 
@@ -551,11 +552,11 @@ export function hasAttachments(item) {
  * @param {Object} item
  * @return {String}
  */
-export function getName(item) {
+export function getName(item: any) {
     return item.name || item.slugline || item.headline;
 }
 
-export function getHighlightedName(item) {
+export function getHighlightedName(item: any) {
     if (item.es_highlight.name){
         return item.es_highlight.name[0];
     }
@@ -577,8 +578,8 @@ export function getHighlightedName(item) {
  * @param {Object} plan
  * @return {String}
  */
-export function getDescription(item, plan) {
-    return plan.description_text || item.definition_short;
+export function getDescription(item: any, plan: any) {
+    return plan ? plan.description_text : (item ? item.definition_short : '');
 }
 
 /**
@@ -588,7 +589,7 @@ export function getDescription(item, plan) {
  * @param {Object} plan
  * @return {String}
  */
-export function getHighlightedDescription(item, plan) {
+export function getHighlightedDescription(item: any, plan: any) {
 
     if (item.es_highlight.description_text) {
         return item.es_highlight.description_text[0];
@@ -611,8 +612,8 @@ export function getHighlightedDescription(item, plan) {
  * @param {Object} item
  * @return {Array} list of dates
  */
-export function getExtraDates(item) {
-    return getDisplayDates(item).map((ed) => moment(ed.date));
+export function getExtraDates(item: any) {
+    return getDisplayDates(item).map((ed: any) => moment(ed.date));
 }
 
 /**
@@ -620,34 +621,34 @@ export function getExtraDates(item) {
  * @param item: Event or Planning item
  * @returns {Array.<{date: moment.Moment}>}
  */
-export function getDisplayDates(item) {
+export function getDisplayDates(item: any) {
     const matchedPlanning = get(item, '_hits.matched_planning_items');
 
     if (matchedPlanning == null) {
         return get(item, 'display_dates') || [];
     }
 
-    const dates = [];
+    const dates: Array<any> = [];
     const planningItems = get(item, 'planning_items') || [];
     const planningIds = item._hits.matched_planning_items;
     const coverageIds = get(item, '_hits.matched_coverages') != null ?
         item._hits.matched_coverages :
-        (get(item, 'coverages') || []).map((coverage) => coverage.coverage_id);
+        (get(item, 'coverages') || []).map((coverage: any) => coverage.coverage_id);
 
     planningItems
-        .forEach((plan) => {
+        .forEach((plan: any) => {
             if (!planningIds.includes(plan._id)) {
                 return;
             }
 
-            const coverages = (get(plan, 'coverages') || []).filter((coverage) => coverage.scheduled);
+            const coverages = (get(plan, 'coverages') || []).filter((coverage: any) => coverage.scheduled);
 
             if (!coverages.length) {
                 dates.push({date: plan.planning_date});
                 return;
             }
 
-            coverages.forEach((coverage) => {
+            coverages.forEach((coverage: any) => {
                 if (!coverageIds.includes(coverage.coverage_id)) {
                     return;
                 }
@@ -666,24 +667,24 @@ export function getDisplayDates(item) {
  * @param {Date} date to check (moment)
  * @return {Boolean}
  */
-export function containsExtraDate(item, dateToCheck) {
-    return getDisplayDates(item).map(ed => moment(ed.date).format('YYYY-MM-DD')).includes(dateToCheck.format('YYYY-MM-DD'));
+export function containsExtraDate(item: any, dateToCheck: any) {
+    return getDisplayDates(item).map((ed: any) => moment(ed.date).format('YYYY-MM-DD')).includes(dateToCheck.format('YYYY-MM-DD'));
 }
 
 // get start date in utc mode if there is no time info
-const getStartDate = (item) => item.dates.all_day ? moment.utc(item.dates.start) : moment(item.dates.start);
+const getStartDate = (item: any) => item.dates.all_day ? moment.utc(item.dates.start) : moment(item.dates.start);
 
 // get end date in utc mode if there is no end time info
-const getEndDate = (item) => item.dates.no_end_time || item.dates.all_day ?
+const getEndDate = (item: any) => item.dates.no_end_time || item.dates.all_day ?
     moment.utc(item.dates.end || item.dates.start) :
     moment(item.dates.end || item.dates.start);
 
 // compare days without being affected by timezone
-const isBetweenDay = (day, start, end) => {
+const isBetweenDay = (day: any, start: any, end: any) => {
     // it will be converted to local time
     // if passed as string which we need
     // for all day events which are in utc mode
-    const startDate = start.format('YYYY-MM-DD'); 
+    const startDate = start.format('YYYY-MM-DD');
     const endDate = end.format('YYYY-MM-DD');
 
     return day.isBetween(startDate, endDate, 'day', '[]');
@@ -695,19 +696,19 @@ const isBetweenDay = (day, start, end) => {
  * @param activeDate: date that the grouping will start from
  * @param activeGrouping: type of grouping i.e. day, week, month
  */
-export function groupItems(items, activeDate, activeGrouping, featuredOnly) {
+export function groupItems(items: any, activeDate: any, activeGrouping: any, featuredOnly?: any) {
     const maxStart = moment(activeDate).set({'h': 0, 'm': 0, 's': 0});
-    const groupedItems = {};
+    const groupedItems: any = {};
     const grouper = Groupers[activeGrouping];
 
     items
         // Filter out items that didn't match any Planning items
-        .filter((item) => (
+        .filter((item: any) => (
             get(item, 'planning_items.length', 0) === 0 ||
             get(item, '_hits.matched_planning_items') == null ||
             get(item, '_hits.matched_planning_items.length', 0) > 0)
         )
-        .forEach((item) => {
+        .forEach((item: any) => {
             const itemExtraDates = getExtraDates(item);
             const itemStartDate = getStartDate(item);
             const start = item._display_from ? moment(item._display_from) :
@@ -748,26 +749,26 @@ export function groupItems(items, activeDate, activeGrouping, featuredOnly) {
             }
         });
 
-    Object.keys(groupedItems).forEach((k) => {
+    Object.keys(groupedItems).forEach((k: any) => {
         if (featuredOnly) {
-            groupedItems[k] = groupedItems[k].map((i) => i._id);
+            groupedItems[k] = groupedItems[k].map((i: any) => i._id);
         } else {
             const tbcPartitioned = partition(groupedItems[k], (i) => isItemTBC(i));
             groupedItems[k] = [
                 ...tbcPartitioned[0],
                 ...tbcPartitioned[1],
-            ].map((i) => i._id);
+            ].map((i: any) => i._id);
         }
     });
 
     return sortBy(
-        Object.keys(groupedItems).map((k) => (
+        Object.keys(groupedItems).map((k: any) => (
             {
                 date: k,
                 items: groupedItems[k],
                 _sortDate: moment(k, DATE_FORMAT)
             })),
-        (g) => g._sortDate);
+        (g: any) => g._sortDate);
 }
 
 /**
@@ -775,7 +776,7 @@ export function groupItems(items, activeDate, activeGrouping, featuredOnly) {
  * @param item: Agenda item
  * @param group: Group Date
  */
-export function getPlanningItemsByGroup(item, group) {
+export function getPlanningItemsByGroup(item: any, group: any) {
     const planningItems = get(item, 'planning_items') || [];
 
     if (planningItems.length === 0) {
@@ -783,16 +784,16 @@ export function getPlanningItemsByGroup(item, group) {
     }
 
     // Planning item without coverages
-    const plansWithoutCoverages = planningItems.filter((p) =>
+    const plansWithoutCoverages = planningItems.filter((p: any) =>
         formatDate(p.planning_date) === group && get(p, 'coverages.length', 0) === 0);
 
     const allPlans = keyBy(planningItems, '_id');
-    const processed = {};
+    const processed: any = {};
 
     // get unique plans for that group based on the coverage.
     const plansWithCoverages = (item.coverages || [])
-        .map((coverage) => {
-            if (isCoverageForExtraDay(coverage, group)) {
+        .map((coverage: any) => {
+            if (isCoverageForExtraDay(coverage)) {
                 if (!processed[coverage.planning_id]) {
                     processed[coverage.planning_id] = 1;
                     return allPlans[coverage.planning_id];
@@ -801,12 +802,12 @@ export function getPlanningItemsByGroup(item, group) {
             }
             return null;
         })
-        .filter((p) => p);
+        .filter((p: any) => p);
 
     return [...plansWithCoverages, ...plansWithoutCoverages];
 }
 
-export function isCoverageOnPreviousDay(coverage, group) {
+export function isCoverageOnPreviousDay(coverage: any, group: any) {
     return (
         coverage.scheduled != null &&
         moment(coverage.scheduled).isBefore(moment(group, DATE_FORMAT), 'day')
@@ -814,14 +815,14 @@ export function isCoverageOnPreviousDay(coverage, group) {
 }
 
 
-export function getCoveragesForDisplay(item, plan, group) {
-    const currentCoverage = [];
-    const previousCoverage = [];
+export function getCoveragesForDisplay(item: any, plan: any, group: any) {
+    const currentCoverage: any = [];
+    const previousCoverage: any = [];
     // get current and preview coverages
     (get(item, 'coverages') || [])
-        .forEach((coverage) => {
+        .forEach((coverage: any) => {
             if (!get(plan, 'guid') || coverage.planning_id === get(plan, 'guid')) {
-                if (isCoverageForExtraDay(coverage, group)) {
+                if (isCoverageForExtraDay(coverage)) {
                     currentCoverage.push(coverage);
                 } else if (isCoverageOnPreviousDay(coverage, group)) {
                     previousCoverage.push(coverage);
@@ -834,14 +835,14 @@ export function getCoveragesForDisplay(item, plan, group) {
     return {current: currentCoverage, previous: previousCoverage};
 }
 
-export function getListItems(groups, itemsById) {
-    const listItems = [];
+export function getListItems(groups: any, itemsById: any) {
+    const listItems: any = [];
 
-    groups.forEach((group) => {
-        group.items.forEach((_id) => {
+    groups.forEach((group: any) => {
+        group.items.forEach((_id: any) => {
             const plans = getPlanningItemsByGroup(itemsById[_id], group.date);
             if (plans.length > 0) {
-                plans.forEach((plan) => {
+                plans.forEach((plan: any) => {
                     listItems.push({_id, group: group.date, plan});
                 });
             } else {
@@ -852,16 +853,16 @@ export function getListItems(groups, itemsById) {
     return listItems;
 }
 
-export function isCoverageBeingUpdated(coverage) {
+export function isCoverageBeingUpdated(coverage: any) {
     return get(coverage, 'deliveries[0].delivery_state', null) &&
         !['published', 'corrected'].includes(coverage.deliveries[0].delivery_state);
 }
 
-export const groupRegions = (filter, aggregations, props) => {
+export const groupRegions = (filter: any, aggregations: any, props: any) => {
     if (props.locators && Object.keys(props.locators).length > 0) {
-        let regions = sortBy(props.locators.filter((l) => l.state).map((l) => ({...l, 'key': l.name, 'label': l.state})), 'label');
-        const others = props.locators.filter((l) => !l.state).map((l) => ({...l, 'key': l.name, 'label': l.country || l.world_region}));
-        const separator = {'key': 'divider'};
+        let regions = sortBy(props.locators.filter((l: any) => l.state).map((l: any) => ({...l, 'key': l.name, 'label': l.state})), 'label');
+        const others = props.locators.filter((l: any) => !l.state).map((l: any) => ({...l, 'key': l.name, 'label': l.country || l.world_region}));
+        const separator: any = {'key': 'divider'};
 
         if (others.length > 0) {
             if (regions.length > 0) {
@@ -876,9 +877,9 @@ export const groupRegions = (filter, aggregations, props) => {
     return aggregations[filter.field].buckets;
 };
 
-export const getRegionName = (key, locator) => locator.label || key;
+export const getRegionName = (key: any, locator: any) => locator.label || key;
 
-export const isItemTBC = (item) => (
+export const isItemTBC = (item: any) => (
     !get(item, 'event') ? get(item, `planning_items[0].${TO_BE_CONFIRMED_FIELD}`) : get(item, `event.${TO_BE_CONFIRMED_FIELD}`)
 );
 
@@ -889,13 +890,13 @@ export const isItemTBC = (item) => (
  * @param {String} dateString
  * @return {String}
  */
-export function formatCoverageDate(coverage) {
+export function formatCoverageDate(coverage: any) {
     return get(coverage, TO_BE_CONFIRMED_FIELD) ?
         `${parseDate(coverage.scheduled).format(COVERAGE_DATE_FORMAT)} ${TO_BE_CONFIRMED_TEXT}` :
         parseDate(coverage.scheduled).format(COVERAGE_DATE_TIME_FORMAT);
 }
 
-export const getCoverageTooltip = (coverage, beingUpdated) => {
+export const getCoverageTooltip = (coverage: any, beingUpdated?: any) => {
     const slugline = coverage.item_slugline || coverage.slugline;
     const coverageType = getCoverageDisplayName(coverage.coverage_type);
     const coverageScheduled = moment(coverage.scheduled);
@@ -926,7 +927,7 @@ export const getCoverageTooltip = (coverage, beingUpdated) => {
             slugline: slugline,
         });
     } else if (coverage.workflow_status === WORKFLOW_STATUS.COMPLETED) {
-        let deliveryState;
+        let deliveryState: any;
         if (get(coverage, 'deliveries.length', 0) > 1) {
             deliveryState = beingUpdated ? gettext('(update to come)') : gettext('(updated)');
         }
@@ -940,3 +941,153 @@ export const getCoverageTooltip = (coverage, beingUpdated) => {
 
     return gettext('{{ type }} coverage', {type: coverageType});
 };
+
+function getScheduleType(item: any) {
+    const start = moment(item.dates.start);
+    const end = moment(item.dates.end);
+    const duration = end.diff(start, 'minutes');
+
+    if (item.dates.all_day) {
+        return duration === 0 ? SCHEDULE_TYPE.ALL_DAY : SCHEDULE_TYPE.MULTI_DAY;
+    }
+
+    if (item.dates.no_end_time) {
+        return SCHEDULE_TYPE.NO_DURATION;
+    }
+
+    if (duration > DAY_IN_MINUTES || !start.isSame(end, 'day')) {
+        return SCHEDULE_TYPE.MULTI_DAY;
+    }
+
+    if (duration === DAY_IN_MINUTES && start.isSame(end, 'day')) {
+        return SCHEDULE_TYPE.ALL_DAY;
+    }
+
+    if (duration === 0) {
+        return SCHEDULE_TYPE.NO_DURATION;
+    }
+
+    return SCHEDULE_TYPE.REGULAR;
+}
+
+/**
+ * Format agenda item start and end dates
+ *
+ * @param {String} dateString
+ * @param {String} group: date of the selected event group
+ * @param {Object} options
+ * @return {Array} [time string, date string]
+ */
+export function formatAgendaDate(item: any, group: any, {localTimeZone = true, onlyDates = false}) {
+    const getFormattedTimezone = (date: any) => {
+        const tzStr = date.format('z');
+        if (tzStr.indexOf('+0') >= 0) {
+            return tzStr.replace('+0', 'GMT+');
+        }
+
+        if (tzStr.indexOf('+') >= 0) {
+            return tzStr.replace('+', 'GMT+');
+        }
+
+        return tzStr;
+    };
+
+    const isTBCItem = isItemTBC(item);
+    let start = parseDate(item.dates.start, item.dates.all_day);
+    const end = parseDate(item.dates.end, item.dates.all_day || item.dates.no_end_time);
+    const dateGroup = group ? moment(group, DATE_FORMAT) : null;
+
+    const isGroupBetweenEventDates = dateGroup ?
+        start.isSameOrBefore(dateGroup, 'day') && end.isSameOrAfter(dateGroup, 'day') : true;
+
+    if (!isGroupBetweenEventDates && hasCoverages(item)) {
+        // we rendering for extra days
+        const scheduleDates = item.coverages
+            .map((coverage: any) => {
+                if (isCoverageForExtraDay(coverage)) {
+                    return coverage.scheduled;
+                }
+                return null;
+            })
+            .filter((d: any) => d)
+            .sort((a: any, b: any) => {
+                if (a < b) return -1;
+                if (a > b) return 1;
+                return 0;
+            });
+        if (scheduleDates.length > 0) {
+            start = moment(scheduleDates[0]);
+        }
+    }
+
+    const scheduleType = getScheduleType(item);
+    const startDate = formatDate(start);
+    const startTime = formatTime(start);
+    const endDate = formatDate(end);
+    const endTime = formatTime(end);
+    const timezone = localTimeZone ? '' : getFormattedTimezone(start);
+
+    switch (true) {
+    case isTBCItem && startDate !== endDate:
+        return gettext('{{startDate}} to {{endDate}} (Time to be confirmed)', {
+            startDate,
+            endDate,
+        });
+
+    case isTBCItem:
+        return gettext('{{startDate}} (Time to be confirmed)', {
+            startDate,
+        });
+
+    case startDate !== endDate && (item.dates.all_day || onlyDates || (startTime === '00:00' && endTime === '23:59')):
+        return gettext('{{startDate}} to {{endDate}}', {
+            startDate,
+            endDate,
+        });
+
+    case startDate === endDate && (item.dates.all_day || onlyDates || scheduleType === SCHEDULE_TYPE.ALL_DAY):
+        return startDate;
+
+    case item.dates.no_end_time && startDate !== endDate:
+        return gettext('{{startTime}} {{startDate}} - {{endDate}} {{timezone}}', {
+            startTime,
+            startDate,
+            endDate,
+            timezone,
+        });
+
+    case item.dates.no_end_time || scheduleType === SCHEDULE_TYPE.NO_DURATION:
+        return gettext('{{startTime}} {{startDate}} {{timezone}}', {
+            startTime,
+            startDate,
+            timezone,
+        });
+
+    case scheduleType === SCHEDULE_TYPE.REGULAR:
+        return gettext('{{startTime}} - {{endTime}} {{startDate}} {{timezone}}', {
+            startTime,
+            startDate,
+            endTime,
+            timezone,
+        });
+
+    case scheduleType === SCHEDULE_TYPE.MULTI_DAY:
+        return gettext('{{startTime}} {{startDate}} to {{endTime}} {{endDate}} {{timezone}}', {
+            startTime,
+            startDate,
+            endTime,
+            endDate,
+            timezone,
+        });
+
+    default:
+        console.warn('not sure about the datetime format', item, scheduleType);
+        return gettext('{{startTime}} {{startDate}} to {{endTime}} {{endDate}} {{timezone}}', {
+            startTime,
+            startDate,
+            endTime,
+            endDate,
+            timezone
+        });
+    }
+}
diff --git a/assets/am-news/components/AmNewsApp.jsx b/assets/am-news/components/AmNewsApp.tsx
similarity index 93%
rename from assets/am-news/components/AmNewsApp.jsx
rename to assets/am-news/components/AmNewsApp.tsx
index 4492e8311..ea189637d 100644
--- a/assets/am-news/components/AmNewsApp.jsx
+++ b/assets/am-news/components/AmNewsApp.tsx
@@ -43,21 +43,26 @@ import {
 } from 'search/selectors';
 
 
-const modals = {
+const modals: any = {
     shareItem: ShareItemModal,
     downloadItems: DownloadItemsModal,
 };
 
 class AmNewsApp extends BaseApp {
-    constructor(props) {
+    static propTypes: any;
+
+    modals: any;
+    tabs: any;
+
+    constructor(props: any) {
         super(props);
         this.modals = modals;
         this.state = {isMobile: false};    // to cater for responsive behaviour during widnow resize
         this.setIsMobile = this.setIsMobile.bind(this);
-        this.tabs = this.tabs.filter((t) => get(this.props.advancedSearchTabConfig, t.id, true));
+        this.tabs = this.tabs.filter((t: any) => get(this.props.advancedSearchTabConfig, t.id, true));
     }
 
-    getSnapshotBeforeUpdate(prevProps) {
+    getSnapshotBeforeUpdate(prevProps: any) {
         if (prevProps.itemToOpen && !this.props.itemToOpen && noNavigationSelected(this.props.activeNavigation)) {
             // enable first navigation
             this.props.toggleNavigation(get(this.props, 'navigations[0]'));
@@ -87,13 +92,13 @@ class AmNewsApp extends BaseApp {
                 user={this.props.user}
                 actions={this.filterActions(this.props.itemToOpen)}
                 detailsConfig={this.props.detailsConfig}
-                onClose={() => this.props.actions.filter(a => a.id === 'open')[0].action(null)} />
+                onClose={() => this.props.actions.filter((a: any) => a.id === 'open')[0].action(null)} />
         ]);
     }
 
     renderListAndPreview() {
         let mainClassName = '';
-        const panesCount = [this.state.withSidebar, this.props.itemToPreview].filter((x) => x).length;
+        const panesCount = [this.state.withSidebar, this.props.itemToPreview].filter((x: any) => x).length;
         if (this.state.isMobile) {
             mainClassName = classNames('wire-column__main', {
                 'wire-articles__one-side-pane': panesCount === 1,
@@ -203,7 +208,7 @@ class AmNewsApp extends BaseApp {
         const modal = this.renderModal(this.props.modal);
 
         return (
-            (this.props.itemToOpen ? this.renderItemDetails() : this.renderListAndPreview())
+            (this.props.itemToOpen ? this.renderItemDetails() : this.renderListAndPreview() as any)
                 .concat([
                     modal,
                     this.renderNavBreadcrumb(
@@ -246,7 +251,7 @@ AmNewsApp.propTypes = {
     context: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     state: state,
     isLoading: state.isLoading,
     totalItems: state.totalItems,
@@ -270,13 +275,15 @@ const mapStateToProps = (state) => ({
     context: state.context,
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch: any) => ({
     fetchItems: () => dispatch(fetchItems()),
-    setQuery: (query) => dispatch(setQuery(query)),
+    setQuery: (query: any) => dispatch(setQuery(query)),
     actions: getItemActions(dispatch),
     fetchMoreItems: () => dispatch(fetchMoreItems()),
     closePreview: () => dispatch(previewItem(null)),
-    toggleNavigation: (navigation) => dispatch(toggleNavigation(navigation)),
+    toggleNavigation: (navigation: any) => dispatch(toggleNavigation(navigation)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(AmNewsApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(AmNewsApp);
+
+export default component;
diff --git a/assets/am-news/components/AmNewsIcon.jsx b/assets/am-news/components/AmNewsIcon.tsx
similarity index 91%
rename from assets/am-news/components/AmNewsIcon.jsx
rename to assets/am-news/components/AmNewsIcon.tsx
index a45a4ca07..bae2f38ac 100644
--- a/assets/am-news/components/AmNewsIcon.jsx
+++ b/assets/am-news/components/AmNewsIcon.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import {bem} from 'ui/utils';
 
 
-const AMNewsIcon = ({iconType, borderRight, toolTip}) => {
+const AMNewsIcon = ({iconType, borderRight, toolTip}: any) => {
     const css = classNames(
         'wire-articles__item__am-icons',
         bem('wire-articles__item', 'meta-time', {'border-right': borderRight})
diff --git a/assets/am-news/components/AmNewsList.jsx b/assets/am-news/components/AmNewsList.tsx
similarity index 88%
rename from assets/am-news/components/AmNewsList.jsx
rename to assets/am-news/components/AmNewsList.tsx
index b532a4499..415fd4040 100644
--- a/assets/am-news/components/AmNewsList.jsx
+++ b/assets/am-news/components/AmNewsList.tsx
@@ -14,11 +14,11 @@ import {getContextName} from 'selectors';
 const PREVIEW_TIMEOUT = 500; // time to preview an item after selecting using kb
 const CLICK_TIMEOUT = 200; // time when we wait for double click after click
 
-const itemsSelector = (state) => state.items.map((_id) => state.itemsById[_id]);
+const itemsSelector = (state: any) => state.items.map((_id: any) => state.itemsById[_id]);
 const groupedItemsSelector = createSelector(
     [itemsSelector],
-    (items) => {
-        const groupByDate = (item) => {
+    (items: any) => {
+        const groupByDate = (item: any) => {
             const date =  moment(item.versioncreated).set({'h': 0, 'm': 0, 's': 0});
             return formatDate(date);
         };
@@ -30,8 +30,12 @@ const groupedItemsSelector = createSelector(
 );
 
 
-class AmNewsList extends React.Component {
-    constructor(props) {
+class AmNewsList extends React.Component<any, any> {
+    static propTypes: any;
+    previewTimeout: any;
+    clickTimeout: any;
+
+    constructor(props: any) {
         super(props);
 
         this.state = {actioningItem: null};
@@ -43,7 +47,7 @@ class AmNewsList extends React.Component {
         this.filterActions = this.filterActions.bind(this);
     }
 
-    onKeyDown(event) {
+    onKeyDown(event: any) {
         let diff = 0;
         switch (event.key) {
         case 'ArrowDown':
@@ -103,7 +107,7 @@ class AmNewsList extends React.Component {
         }
     }
 
-    onItemClick(item) {
+    onItemClick(item: any) {
         const itemId = item._id;
         this.setState({actioningItem: null});
         this.cancelPreviewTimeout();
@@ -120,13 +124,13 @@ class AmNewsList extends React.Component {
         }, CLICK_TIMEOUT);
     }
 
-    onItemDoubleClick(item) {
+    onItemDoubleClick(item: any) {
         this.cancelClickTimeout();
         this.props.dispatch(setActive(item._id));
         this.props.dispatch(openItem(item));
     }
 
-    onActionList(event, item) {
+    onActionList(event: any, item: any) {
         event.stopPropagation();
         if (this.state.actioningItem && this.state.actioningItem._id === item._id) {
             this.setState({actioningItem: null});
@@ -135,8 +139,8 @@ class AmNewsList extends React.Component {
         }
     }
 
-    filterActions(item) {
-        return this.props.actions.filter((action) => !action.when || action.when(this.props, item));
+    filterActions(item: any) {
+        return this.props.actions.filter((action: any) => !action.when || action.when(this.props, item));
     }
 
     render() {
@@ -144,8 +148,8 @@ class AmNewsList extends React.Component {
         const todayMoment = moment();
         const today = formatDate(todayMoment);
 
-        const groups = Object.keys(groupedItems).map((keyDate) => {
-            const groupItem = [];
+        const groups = Object.keys(groupedItems).map((keyDate: any) => {
+            const groupItem: Array<any> = [];
 
             if(today !== keyDate) {
                 const keyDateMoment = moment(keyDate, DATE_FORMAT);
@@ -159,7 +163,7 @@ class AmNewsList extends React.Component {
             groupItem.push(
                 <div className = 'wire-articles__group' key={`${keyDate}group`}>
                     {
-                        groupedItems[keyDate].map((item) =>
+                        groupedItems[keyDate].map((item: any) =>
                             <AmNewsListItem
                                 key={item._id}
                                 item={item}
@@ -219,7 +223,7 @@ AmNewsList.propTypes = {
     contextName: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     items: state.items,
     itemsById: state.itemsById,
     activeItem: state.activeItem,
@@ -234,4 +238,6 @@ const mapStateToProps = (state) => ({
     contextName: getContextName(state),
 });
 
-export default connect(mapStateToProps)(AmNewsList);
+const component: React.ComponentType<any> = connect(mapStateToProps)(AmNewsList);
+
+export default component;
diff --git a/assets/am-news/components/AmNewsListItem.jsx b/assets/am-news/components/AmNewsListItem.tsx
similarity index 93%
rename from assets/am-news/components/AmNewsListItem.jsx
rename to assets/am-news/components/AmNewsListItem.tsx
index 7a052aa89..17e7584aa 100644
--- a/assets/am-news/components/AmNewsListItem.jsx
+++ b/assets/am-news/components/AmNewsListItem.tsx
@@ -22,8 +22,12 @@ import {
 } from '../utils';
 
 
-class AmNewsListItem extends React.Component {
-    constructor(props) {
+class AmNewsListItem extends React.Component<any, any> {
+    static propTypes: any;
+    wordCount: any;
+    articleElem: any;
+
+    constructor(props: any) {
         super(props);
         this.wordCount = wordCount(props.item);
         this.state = {previousVersions: false};
@@ -31,7 +35,7 @@ class AmNewsListItem extends React.Component {
         this.togglePreviousVersions = this.togglePreviousVersions.bind(this);
     }
 
-    onKeyDown(event) {
+    onKeyDown(event: any) {
         switch (event.key) {
         case ' ':  // on space toggle selected item
             this.props.toggleSelected();
@@ -44,7 +48,7 @@ class AmNewsListItem extends React.Component {
         event.preventDefault();
     }
 
-    togglePreviousVersions(event) {
+    togglePreviousVersions(event: any) {
         event.stopPropagation();
         this.setState({previousVersions: !this.state.previousVersions});
     }
@@ -55,7 +59,7 @@ class AmNewsListItem extends React.Component {
         }
     }
 
-    stopPropagation(event) {
+    stopPropagation(event: any) {
         event.stopPropagation();
     }
 
@@ -93,12 +97,12 @@ class AmNewsListItem extends React.Component {
         return (
             <article key={item._id}
                 className={cardClassName}
-                ref={(elem) => this.articleElem = elem}
+                ref={(elem: any) => this.articleElem = elem}
                 onClick={() => onClick(item)}
                 onDoubleClick={() => onDoubleClick(item)}
                 onKeyDown={this.onKeyDown}
             >
-                <div className={wrapClassName} tabIndex='0'>
+                <div className={wrapClassName} tabIndex={0}>
                     <div className='wire-articles__item-text-block'>
                         <h4 className='wire-articles__item-headline'>
                             <div className={selectClassName} onClick={this.stopPropagation}>
@@ -138,7 +142,7 @@ class AmNewsListItem extends React.Component {
                             showActions={this.props.showActions}
                         />
 
-                        {this.props.actions.map((action) =>
+                        {this.props.actions.map((action: any) =>
                             action.shortcut &&
                           <ActionButton
                               key={action.name}
diff --git a/assets/am-news/components/Navigations.jsx b/assets/am-news/components/Navigations.tsx
similarity index 82%
rename from assets/am-news/components/Navigations.jsx
rename to assets/am-news/components/Navigations.tsx
index 1df070839..9cb89c1df 100644
--- a/assets/am-news/components/Navigations.jsx
+++ b/assets/am-news/components/Navigations.tsx
@@ -6,16 +6,16 @@ import {get} from 'lodash';
 import {gettext} from 'utils';
 
 
-const Navigations = ({navigations=[], activeNavigation, toggleNavigation, fetchItems}) => {
+const Navigations: React.ComponentType<any> = ({navigations=[], activeNavigation, toggleNavigation, fetchItems}) => {
 
-    const tabs = navigations.map((navigation) => (
+    const tabs = navigations.map((navigation: any) => (
         <li className="nav-item" key={navigation.name}>
             <a href=""
                 className={classNames(
                     'nav-link',
                     {active: get(activeNavigation, '[0]') === navigation._id}
                 )}
-                onClick={(event) => {
+                onClick={(event: any) => {
                     event.preventDefault();
                     toggleNavigation(navigation);
                     fetchItems();
diff --git a/assets/am-news/index.js b/assets/am-news/index.ts
similarity index 90%
rename from assets/am-news/index.js
rename to assets/am-news/index.ts
index 08a769090..55b529fc4 100644
--- a/assets/am-news/index.js
+++ b/assets/am-news/index.ts
@@ -1,6 +1,7 @@
 import {get, startsWith} from 'lodash';
 
-import {createStore, render, initWebSocket, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {createStore, render, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {initWebSocket} from 'websocket';
 
 import {getReadItems} from 'local-store';
 import  AmNewsApp from './components/AmNewsApp';
@@ -41,7 +42,7 @@ if (navigationId) {
 }
 
 // handle history
-window.onpopstate = function(event) {
+window.onpopstate = function(event: any) {
     if (event.state) {
         closeItemOnMobile(store.dispatch, event.state, openItemDetails, previewItem);
         if (!isMobilePhone()) {
diff --git a/assets/am-news/style.js b/assets/am-news/style.ts
similarity index 100%
rename from assets/am-news/style.js
rename to assets/am-news/style.ts
diff --git a/assets/am-news/utils.js b/assets/am-news/utils.ts
similarity index 56%
rename from assets/am-news/utils.js
rename to assets/am-news/utils.ts
index 6db63c227..8be7b41bd 100644
--- a/assets/am-news/utils.js
+++ b/assets/am-news/utils.ts
@@ -2,16 +2,16 @@ import {get} from 'lodash';
 import {gettext} from '../utils';
 
 
-export const isFuel = (item) => (get(item, 'slugline') || '').match(/fuel/gi);
-export const isWeather = (item) => (get(item, 'slugline') || '').match(/weather|observation|forecast/gi);
-export const isTraffic = (item) => (get(item, 'slugline') || '').match(/traffic/gi);
-export const isPublicTransport = (item) => (get(item, 'slugline') || '').match(/public transport/gi);
-export const isAlert = (item) => !isFuel(item) && (get(item, 'slugline') || '').match(/^alert /gi);
-export const isQuote = (item) => !isFuel(item) && (get(item, 'slugline') || '').match(/^quote /gi);
-export const isHeadlines = (item) => !isFuel(item) && (get(item, 'slugline') || '').match(/headlines/gi);
-export const isDataItem = (item) => (isFuel(item) || isWeather(item));
-
-export const getAMNewsIcon = (item) => {
+export const isFuel = (item: any) => (get(item, 'slugline') || '').match(/fuel/gi);
+export const isWeather = (item: any) => (get(item, 'slugline') || '').match(/weather|observation|forecast/gi);
+export const isTraffic = (item: any) => (get(item, 'slugline') || '').match(/traffic/gi);
+export const isPublicTransport = (item: any) => (get(item, 'slugline') || '').match(/public transport/gi);
+export const isAlert = (item: any) => !isFuel(item) && (get(item, 'slugline') || '').match(/^alert /gi);
+export const isQuote = (item: any) => !isFuel(item) && (get(item, 'slugline') || '').match(/^quote /gi);
+export const isHeadlines = (item: any) => !isFuel(item) && (get(item, 'slugline') || '').match(/headlines/gi);
+export const isDataItem = (item: any) => (isFuel(item) || isWeather(item));
+
+export const getAMNewsIcon = (item: any) => {
     let iconType = 'text';
 
     if (isDataItem(item)) {
@@ -33,7 +33,7 @@ export const getAMNewsIcon = (item) => {
     return iconType;
 };
 
-export const getAMNewsToolTip = (item) => {
+export const getAMNewsToolTip = (item: any) => {
     let iconType = gettext('Text');
 
     if (isDataItem(item)) {
diff --git a/assets/analytics.js b/assets/analytics.ts
similarity index 70%
rename from assets/analytics.js
rename to assets/analytics.ts
index 2c91966f2..8ab34a06a 100644
--- a/assets/analytics.js
+++ b/assets/analytics.ts
@@ -1,11 +1,11 @@
 import {get} from 'lodash';
 
 class Analytics {
-    _event(name, params) {
+    _event(name: any, params?: any) {
         if (window.gtag) {
             const company = get(window, 'profileData.companyName', 'none');
             const user = get(window, 'profileData.user.first_name', 'unknown');
-            const userParams = {
+            const userParams: any = {
                 event_category: company,
                 company: company,
                 user: user,
@@ -15,28 +15,28 @@ class Analytics {
         }
     }
 
-    event(name, label, params) {
+    event(name: any, label: any, params: any) {
         this._event(name, Object.assign({
             event_label: label,
         }, params));
     }
 
-    itemEvent(name, item, params) {
+    itemEvent(name: any, item: any, params?: any) {
         this.event(name, item.headline || item.name || item.slugline, params);
     }
 
-    timingComplete(name, value) {
+    timingComplete(name: any, value: any) {
         this._event('timing_complete', {name, value});
     }
 
-    pageview(title, path) {
+    pageview(title?: any, path?: any) {
         this._event('page_view', {
             page_title: title,
             page_path: path,
         });
     }
 
-    itemView(item) {
+    itemView(item: any) {
         if (item) {
             this.pageview(item.headline || item.slugline, `/${item._type}/${item._id}`);
         } else {
@@ -44,14 +44,14 @@ class Analytics {
         }
     }
 
-    sendEvents(events) {
-        events.forEach((event) => {
+    sendEvents(events: any) {
+        events.forEach((event: any) => {
             this._event(event);
         });
     }
 
-    multiItemEvent(event, items) {
-        items.forEach((item) => item && this.itemEvent(event, item));
+    multiItemEvent(event: any, items: any) {
+        items.forEach((item: any) => item && this.itemEvent(event, item));
     }
 }
 
diff --git a/assets/cards/actions.js b/assets/cards/actions.ts
similarity index 75%
rename from assets/cards/actions.js
rename to assets/cards/actions.ts
index 7cdbbbbb8..e2403d49d 100644
--- a/assets/cards/actions.js
+++ b/assets/cards/actions.ts
@@ -5,12 +5,12 @@ import {searchQuerySelector} from 'search/selectors';
 
 
 export const SELECT_CARD = 'SELECT_CARD';
-export function selectCard(id) {
+export function selectCard(id: any) {
     return {type: SELECT_CARD, id};
 }
 
 export const EDIT_CARD = 'EDIT_CARD';
-export function editCard(event) {
+export function editCard(event: any) {
     return {type: EDIT_CARD, event};
 }
 
@@ -20,7 +20,7 @@ export function newCard() {
 }
 
 export const CANCEL_EDIT = 'CANCEL_EDIT';
-export function cancelEdit(event) {
+export function cancelEdit(event: any) {
     return {type: CANCEL_EDIT, event};
 }
 
@@ -30,22 +30,22 @@ export function queryCards() {
 }
 
 export const GET_CARDS = 'GET_CARDS';
-export function getCards(data) {
+export function getCards(data: any) {
     return {type: GET_CARDS, data};
 }
 
 export const GET_PRODUCTS = 'GET_PRODUCTS';
-export function getProducts(data) {
+export function getProducts(data: any) {
     return {type: GET_PRODUCTS, data};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
 export const GET_NAVIGATIONS = 'GET_NAVIGATIONS';
-export function getNavigations(data) {
+export function getNavigations(data: any) {
     return {type: GET_NAVIGATIONS, data};
 }
 
@@ -54,13 +54,13 @@ export function getNavigations(data) {
  *
  */
 export function fetchCards() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryCards());
         const query = searchQuerySelector(getState()) || '';
 
         return server.get(`/cards/search?q=${query}`)
-            .then((data) => dispatch(getCards(data)))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .then((data: any) => dispatch(getCards(data)))
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -70,21 +70,21 @@ export function fetchCards() {
  *
  */
 export function postCard() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const card = getState().cardToEdit;
-        let data = new FormData();
+        const data = new FormData();
         data.append('card', JSON.stringify(card));
 
         if (card.type === '4-photo-gallery') {
-            const errors = {
+            const errors: any = {
                 config: {
                     sources: [{}, {}, {}, {}]
                 }
             };
             let errorFound = false;
             let mediaCount = 0;
-            (card.config.sources || []).forEach((source, index) => {
+            (card.config.sources || []).forEach((source: any, index: any) => {
                 if (!source.url && parseInt(source.count, 10) > 0) {
                     errors.config.sources[index].url = gettext('Invalid Url.');
                     errorFound = true;
@@ -116,8 +116,8 @@ export function postCard() {
         }
 
         if (card.type === '2x2-events') {
-            [...Array(4)].forEach((_, i) => {
-                const input = document.getElementById(`config.events[${i}].file`);
+            [...Array(4)].forEach((_: any, i: any) => {
+                const input: any = document.getElementById(`config.events[${i}].file`);
                 if (input && input.files.length > 0) {
                     data.append(`file${i}`, input.files[0]);
                 }
@@ -135,7 +135,7 @@ export function postCard() {
                 }
                 dispatch(fetchCards());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
@@ -146,17 +146,17 @@ export function postCard() {
  *
  */
 export function deleteCard() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const card = getState().cardToEdit;
         const url = `/cards/${card._id}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Card deleted successfully'));
                 dispatch(fetchCards());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -166,18 +166,18 @@ export function deleteCard() {
  *
  */
 export function fetchProducts() {
-    return function (dispatch) {
+    return function (dispatch: any) {
         return server.get('/products/search')
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getProducts(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 
-export function initViewData(data) {
-    return function (dispatch) {
+export function initViewData(data: any): any {
+    return function (dispatch: any) {
         dispatch(getCards(data.cards));
         dispatch(getProducts(data.products));
         dispatch(getNavigations(data.navigations));
diff --git a/assets/cards/components/CardList.jsx b/assets/cards/components/CardList.tsx
similarity index 91%
rename from assets/cards/components/CardList.jsx
rename to assets/cards/components/CardList.tsx
index 93325883d..853ed62b5 100644
--- a/assets/cards/components/CardList.jsx
+++ b/assets/cards/components/CardList.tsx
@@ -4,8 +4,8 @@ import CardListItem from './CardListItem';
 import {gettext} from 'utils';
 
 
-function CardList({cards, products, onClick, activeCardId}) {
-    const list = cards.map((card) =>
+function CardList({cards, products, onClick, activeCardId}: any) {
+    const list = cards.map((card: any) =>
         <CardListItem
             key={card._id}
             products={products}
diff --git a/assets/cards/components/CardListItem.jsx b/assets/cards/components/CardListItem.tsx
similarity index 74%
rename from assets/cards/components/CardListItem.jsx
rename to assets/cards/components/CardListItem.tsx
index 15c8406d9..cc8431ab6 100644
--- a/assets/cards/components/CardListItem.jsx
+++ b/assets/cards/components/CardListItem.tsx
@@ -4,15 +4,15 @@ import {shortDate} from 'utils';
 import {gettext} from '../../utils';
 
 
-function getProductName(products, id) {
-    const product = products.find((product) => product._id == id);
+function getProductName(products: any, id: any) {
+    const product = products.find((product: any) => product._id == id);
     return product && product.name;
 }
 
-function CardListItem({card, products, isActive, onClick}) {
+function CardListItem({card, products, isActive, onClick}: any) {
     return (
         <tr key={card._id}
-            className={isActive?'table--selected':null}
+            className={isActive ? 'table--selected' : undefined}
             onClick={() => onClick(card._id)}>
             <td className="name">{card.label}</td>
             <td>{gettext(card.type)}</td>
diff --git a/assets/cards/components/Cards.jsx b/assets/cards/components/Cards.tsx
similarity index 83%
rename from assets/cards/components/Cards.jsx
rename to assets/cards/components/Cards.tsx
index dc8f2b1c5..bb3a9a6ad 100644
--- a/assets/cards/components/Cards.jsx
+++ b/assets/cards/components/Cards.tsx
@@ -20,8 +20,9 @@ import EditCard from './EditCard';
 import CardList from './CardList';
 import SearchResults from 'search/components/SearchResults';
 
-class Cards extends React.Component {
-    constructor(props, context) {
+class Cards extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.isFormValid = this.isFormValid.bind(this);
@@ -31,7 +32,7 @@ class Cards extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.cardToEdit.label) {
             errors.label = [gettext('Please provide card label')];
@@ -48,7 +49,7 @@ class Cards extends React.Component {
         return valid;
     }
 
-    save(event) {
+    save(event: any) {
         event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -58,7 +59,7 @@ class Cards extends React.Component {
         this.props.saveCard();
     }
 
-    deleteCard(event) {
+    deleteCard(event: any) {
         event.preventDefault();
 
         if (confirm(gettext('Would you like to delete card: {{label}}', {label: this.props.cardToEdit.label}))) {
@@ -67,8 +68,8 @@ class Cards extends React.Component {
     }
 
     render() {
-        const progressStyle = {width: '25%'};
-        const cardFilter = (card) =>  !this.props.activeDashboard ||
+        const progressStyle: any = {width: '25%'};
+        const cardFilter = (card: any) =>  !this.props.activeDashboard ||
             get(card, 'dashboard', 'newsroom') === this.props.activeDashboard;
 
         return (
@@ -133,8 +134,8 @@ Cards.propTypes = {
     dashboards: PropTypes.arrayOf(PropTypes.object),
 };
 
-const mapStateToProps = (state) => ({
-    cards: state.cards.map((id) => state.cardsById[id]),
+const mapStateToProps = (state: any) => ({
+    cards: state.cards.map((id: any) => state.cardsById[id]),
     cardToEdit: state.cardToEdit,
     activeCardId: state.activeCardId,
     isLoading: state.isLoading,
@@ -147,14 +148,16 @@ const mapStateToProps = (state) => ({
     dashboards: state.dashboards.list,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectCard: (_id) => dispatch(selectCard(_id)),
-    editCard: (event) => dispatch(editCard(event)),
-    saveCard: (type) => dispatch(postCard(type)),
-    deleteCard: (type) => dispatch(deleteCard(type)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectCard: (_id: any) => dispatch(selectCard(_id)),
+    editCard: (event: any) => dispatch(editCard(event)),
+    saveCard: (type: any) => dispatch(postCard()),
+    deleteCard: (type: any) => dispatch(deleteCard()),
     newCard: () => dispatch(newCard()),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
+    cancelEdit: (event: any) => dispatch(cancelEdit(event)),
     dispatch: dispatch,
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(Cards);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(Cards);
+
+export default component;
diff --git a/assets/cards/components/CardsApp.jsx b/assets/cards/components/CardsApp.tsx
similarity index 87%
rename from assets/cards/components/CardsApp.jsx
rename to assets/cards/components/CardsApp.tsx
index 8676875b6..b0ee84cd0 100644
--- a/assets/cards/components/CardsApp.jsx
+++ b/assets/cards/components/CardsApp.tsx
@@ -13,8 +13,9 @@ import ListBar from 'components/ListBar';
 import DashboardSwitch from 'features/dashboard/DashboardSwitch';
 
 
-class CardsApp extends React.Component {
-    constructor(props, context) {
+class CardsApp extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
     }
 
@@ -45,12 +46,12 @@ CardsApp.propTypes = {
     activeDashboard: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     dashboards: state.dashboards.list,
     activeDashboard: state.dashboards.active,
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     newCard,
     fetchCards,
     setQuery: setSearchQuery,
diff --git a/assets/cards/components/EditCard.jsx b/assets/cards/components/EditCard.tsx
similarity index 91%
rename from assets/cards/components/EditCard.jsx
rename to assets/cards/components/EditCard.tsx
index 4e0c8f244..2422f509f 100644
--- a/assets/cards/components/EditCard.jsx
+++ b/assets/cards/components/EditCard.tsx
@@ -13,22 +13,23 @@ import {
 } from 'components/cards/utils';
 
 
-class EditCard extends React.Component {
-    constructor(props) {
+class EditCard extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
     }
 
     render() {
-        const dashboard = (get(this.props, 'dashboards') || []).find((d) => d._id === this.props.card.dashboard);
+        const dashboard = (get(this.props, 'dashboards') || []).find((d: any) => d._id === this.props.card.dashboard);
         const cardType = this.props.card.type || '';
         const CardComponent = getCardEditComponent(cardType);
-        const cardTypes = CARD_TYPES.filter(
-            (card) =>  dashboard.cards.includes(card._id)
-        ).map((c) => ({value: c._id, text: c.text}));
+        const cardTypes: any = CARD_TYPES.filter(
+            (card: any) =>  dashboard.cards.includes(card._id)
+        ).map((c: any) => ({value: c._id, text: c.text}));
 
         cardTypes.unshift({value: '', text: '', component: getCardEditComponent('')});
 
-        const cardProps = {
+        const cardProps: any = {
             card: this.props.card,
             onChange: this.props.onChange,
             errors: this.props.errors
diff --git a/assets/cards/index.js b/assets/cards/index.ts
similarity index 100%
rename from assets/cards/index.js
rename to assets/cards/index.ts
diff --git a/assets/cards/reducers.js b/assets/cards/reducers.ts
similarity index 92%
rename from assets/cards/reducers.js
rename to assets/cards/reducers.ts
index 8d23e0aac..5cdca88a0 100644
--- a/assets/cards/reducers.js
+++ b/assets/cards/reducers.ts
@@ -18,7 +18,7 @@ import {searchReducer} from 'search/reducers';
 import {getCard} from 'components/cards/utils';
 
 
-const initialState = {
+const initialState: any = {
     query: null,
     cards: [],
     cardsById: {},
@@ -32,11 +32,11 @@ const initialState = {
     search: searchReducer(undefined, undefined, 'settings'),
 };
 
-export default function cardReducer(state = initialState, action) {
+export default function cardReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case SELECT_CARD: {
-        const defaultCard = {
+        const defaultCard: any = {
             label: '',
             type: '',
             config: {},
@@ -53,8 +53,8 @@ export default function cardReducer(state = initialState, action) {
     case EDIT_CARD: {
         const target = action.event.target;
         const field = target.name;
-        let card = {...state.cardToEdit};
-        let size = get(getCard(card.type), 'size', 0);
+        const card: any = {...state.cardToEdit};
+        const size = get(getCard(card.type), 'size', 0);
 
         if (!card.dashboard) {
             card.dashboard = 'newsroom';
@@ -93,7 +93,7 @@ export default function cardReducer(state = initialState, action) {
     }
 
     case NEW_CARD: {
-        const cardToEdit = {
+        const cardToEdit: any = {
             label: '',
             type: '',
             config: {},
@@ -119,7 +119,7 @@ export default function cardReducer(state = initialState, action) {
 
     case GET_CARDS: {
         const cardsById = Object.assign({}, state.cardsById);
-        const cards = action.data.map((card) => {
+        const cards = action.data.map((card: any) => {
             cardsById[card._id] = card;
             return card._id;
         });
diff --git a/assets/common.js b/assets/common.ts
similarity index 95%
rename from assets/common.js
rename to assets/common.ts
index b5f56f471..e057d7785 100644
--- a/assets/common.js
+++ b/assets/common.ts
@@ -1,5 +1,4 @@
 import 'alertifyjs';
-import 'babel-polyfill';
 
 import 'bootstrap';
 import 'classnames';
diff --git a/assets/companies/actions.js b/assets/companies/actions.ts
similarity index 70%
rename from assets/companies/actions.js
rename to assets/companies/actions.ts
index 037dcd605..819ff0fa1 100644
--- a/assets/companies/actions.js
+++ b/assets/companies/actions.ts
@@ -4,29 +4,29 @@ import {searchQuerySelector} from 'search/selectors';
 
 
 export const SELECT_COMPANY = 'SELECT_COMPANY';
-export function selectCompany(id) {
-    return function (dispatch) {
+export function selectCompany(id: any) {
+    return function (dispatch: any) {
         dispatch(select(id));
         dispatch(fetchCompanyUsers(id));
     };
 }
 
-function select(id) {
+function select(id: any) {
     return {type: SELECT_COMPANY, id};
 }
 
 export const EDIT_COMPANY = 'EDIT_COMPANY';
-export function editCompany(event) {
+export function editCompany(event: any) {
     return {type: EDIT_COMPANY, event};
 }
 
 export const TOGGLE_COMPANY_SECTION = 'TOGGLE_COMPANY_SECTION';
-export function toggleCompanySection(sectionId) {
+export function toggleCompanySection(sectionId: any) {
     return {type: TOGGLE_COMPANY_SECTION, sectionId: sectionId};
 }
 
 export const TOGGLE_COMPANY_PRODUCT = 'TOGGLE_COMPANY_PRODUCT';
-export function toggleCompanyProduct(productId, sectionId, enable) {
+export function toggleCompanyProduct(productId: any, sectionId: any, enable: any) {
     return {type: TOGGLE_COMPANY_PRODUCT, payload: {
         productId: productId,
         sectionId: sectionId,
@@ -35,7 +35,7 @@ export function toggleCompanyProduct(productId, sectionId, enable) {
 }
 
 export const UPDATE_COMPANY_SEATS = 'UPDATE_COMPANY_SEATS';
-export function updateCompanySeats(productId, seats) {
+export function updateCompanySeats(productId: any, seats: any) {
     return {type: UPDATE_COMPANY_SEATS, payload: {
         productId: productId,
         seats: seats,
@@ -43,12 +43,12 @@ export function updateCompanySeats(productId, seats) {
 }
 
 export const NEW_COMPANY = 'NEW_COMPANY';
-export function newCompany(data) {
+export function newCompany(data: any) {
     return {type: NEW_COMPANY, data};
 }
 
 export const CANCEL_EDIT = 'CANCEL_EDIT';
-export function cancelEdit(event) {
+export function cancelEdit(event?: any) {
     return {type: CANCEL_EDIT, event};
 }
 
@@ -58,22 +58,22 @@ export function queryCompanies() {
 }
 
 export const GET_COMPANIES = 'GET_COMPANIES';
-export function getCompanies(data) {
+export function getCompanies(data: any) {
     return {type: GET_COMPANIES, data};
 }
 
 export const GET_COMPANY_USERS = 'GET_COMPANY_USERS';
-export function getCompanyUsers(data) {
+export function getCompanyUsers(data: any) {
     return {type: GET_COMPANY_USERS, data};
 }
 
 export const GET_PRODUCTS = 'GET_PRODUCTS';
-export function getProducts(data) {
+export function getProducts(data: any) {
     return {type: GET_PRODUCTS, data};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
@@ -83,15 +83,15 @@ export function setError(errors) {
  *
  */
 export function fetchCompanies() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryCompanies());
         const query = searchQuerySelector(getState()) || '';
 
         return server.get(`/companies/search?q=${query}`)
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getCompanies(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -100,17 +100,17 @@ export function fetchCompanies() {
  *
  * @param {String} companyId
  */
-export function fetchCompanyUsers(companyId, force = false) {
-    return function (dispatch, getState) {
+export function fetchCompanyUsers(companyId: any, force: any = false) {
+    return function (dispatch: any, getState: any) {
         if (!force && !getState().companiesById[companyId].name) {
             return;
         }
 
         return server.get(`/companies/${companyId}/users`)
-            .then((data) => {
+            .then((data: any) => {
                 return dispatch(getCompanyUsers(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -120,7 +120,7 @@ export function fetchCompanyUsers(companyId, force = false) {
  *
  */
 export function postCompany() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         const company = getState().companyToEdit;
         const url = `/companies/${company._id ? company._id : 'new'}`;
 
@@ -135,7 +135,7 @@ export function postCompany() {
                 dispatch(fetchCompanies());
                 dispatch(cancelEdit());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -145,12 +145,12 @@ export function postCompany() {
  *
  */
 export function fetchProducts() {
-    return function (dispatch) {
+    return function (dispatch: any) {
         return server.get('/products/search')
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getProducts(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -160,19 +160,19 @@ export function fetchProducts() {
  *
  */
 export function deleteCompany() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const company = getState().companyToEdit;
         const url = `/companies/${company._id}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Company deleted successfully'));
                 dispatch(fetchCompanies());
             })
-            .catch((error) => {
+            .catch((error: any) => {
                 if (error.response.status == 403) {
-                    error.response.json().then(function(data) {
+                    error.response.json().then(function(data: any) {
                         notify.error(data['error']);
                     });
                 }
@@ -182,6 +182,6 @@ export function deleteCompany() {
 }
 
 export const INIT_VIEW_DATA = 'INIT_VIEW_DATA';
-export function initViewData(data) {
+export function initViewData(data: any) {
     return {type: INIT_VIEW_DATA, data};
 }
diff --git a/assets/companies/components/CompaniesApp.jsx b/assets/companies/components/CompaniesApp.tsx
similarity index 89%
rename from assets/companies/components/CompaniesApp.jsx
rename to assets/companies/components/CompaniesApp.tsx
index 76fa91c22..942cdf7ed 100644
--- a/assets/companies/components/CompaniesApp.jsx
+++ b/assets/companies/components/CompaniesApp.tsx
@@ -20,8 +20,8 @@ function CompaniesApp({
     activeQuery,
     totalCompanies,
     companyToEdit,
-    countries
-}) {
+    countries,
+}: any) {
     return (
         <React.Fragment>
             <ListBar
@@ -45,13 +45,13 @@ function CompaniesApp({
                                 totalItemsLabel={activeQuery}
                             />
                         )}
-                        <CompanyList 
+                        <CompanyList
                             countries = {countries}
                         />
                     </div>
                 )}
                 {!companyToEdit ? null : (
-                    <EditCompany key={companyToEdit._id || '_new'} countries = {countries} />
+                    <EditCompany key={companyToEdit._id || '_new'} />
                 )}
             </div>
         </React.Fragment>
@@ -69,7 +69,7 @@ CompaniesApp.propTypes = {
     countries: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     isLoading: state.isLoading,
     totalCompanies: state.totalCompanies,
     activeQuery: searchQuerySelector(state),
@@ -77,10 +77,12 @@ const mapStateToProps = (state) => ({
     countries: state.countries,
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     newCompany: newCompany,
     fetchCompanies: fetchCompanies,
     setQuery: setSearchQuery,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(CompaniesApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(CompaniesApp);
+
+export default component;
\ No newline at end of file
diff --git a/assets/companies/components/CompanyList.jsx b/assets/companies/components/CompanyList.tsx
similarity index 81%
rename from assets/companies/components/CompanyList.jsx
rename to assets/companies/components/CompanyList.tsx
index d978ff502..fd11f48c1 100644
--- a/assets/companies/components/CompanyList.jsx
+++ b/assets/companies/components/CompanyList.tsx
@@ -9,14 +9,14 @@ import {companiesSubscriberIdEnabled} from 'ui/selectors';
 import CompanyListItem from './CompanyListItem';
 
 
-function CompanyList({companies, selectCompany, activeCompanyId, companyTypes, showSubscriberId, countries}) {
-    const list = companies.map((company) =>
+function CompanyList({companies, selectCompany, activeCompanyId, companyTypes, showSubscriberId, countries}: any) {
+    const list = companies.map((company: any) =>
         <CompanyListItem
             key={company._id}
             company={company}
             onClick={selectCompany}
             isActive={activeCompanyId===company._id}
-            type={companyTypes.find((ctype) => ctype.id === company.company_type)}
+            type={companyTypes.find((ctype: any) => ctype.id === company.company_type)}
             showSubscriberId={showSubscriberId}
             countries = {countries}
         />
@@ -27,7 +27,7 @@ function CompanyList({companies, selectCompany, activeCompanyId, companyTypes, s
             <div className="list-items-container">
                 <table
                     className="table table-hover"
-                    tabIndex='-1'
+                    tabIndex={-1}
                     data-test-id="company-list"
                 >
                     <thead>
@@ -60,15 +60,17 @@ CompanyList.propTypes = {
     countries: PropTypes.array
 };
 
-const mapStateToProps = (state) => ({
-    companies: state.companies.map((id) => state.companiesById[id]),
+const mapStateToProps = (state: any) => ({
+    companies: state.companies.map((id: any) => state.companiesById[id]),
     activeCompanyId: state.activeCompanyId,
     companyTypes: state.companyTypes,
     showSubscriberId: companiesSubscriberIdEnabled(state),
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     selectCompany: selectCompany,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(CompanyList);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(CompanyList);
+
+export default component;
diff --git a/assets/companies/components/CompanyListItem.jsx b/assets/companies/components/CompanyListItem.tsx
similarity index 95%
rename from assets/companies/components/CompanyListItem.jsx
rename to assets/companies/components/CompanyListItem.tsx
index 6ee7ba65f..bb5e7d99c 100644
--- a/assets/companies/components/CompanyListItem.jsx
+++ b/assets/companies/components/CompanyListItem.tsx
@@ -4,19 +4,19 @@ import classNames from 'classnames';
 import {gettext, shortDate, isInPast} from 'utils';
 import {getCountryLabel} from '../utils';
 
-function CompanyListItem({company, type, isActive, onClick, showSubscriberId, countries}) {
+function CompanyListItem({company, type, isActive, onClick, showSubscriberId, countries}: any) {
     return (
         <tr key={company._id}
             className={classNames({'table--selected': isActive, 'table-secondary': !company.is_enabled})}
             onClick={() => onClick(company._id)}
-            tabIndex="0"
+            tabIndex={0}
             data-test-id={`company-list-item--${company._id}`}
         >
             <td className="name">{company.name}</td>
             <td className="type">{type ? gettext(type.name) : ''}</td>
             {showSubscriberId && <td>{company.sd_subscriber_id}</td>}
             <td>{company.account_manager}</td>
-            <td className={isInPast(company.expiry_date) ? 'text-danger' : null}>
+            <td className={isInPast(company.expiry_date) ? 'text-danger' : undefined}>
                 {(company.is_enabled ? gettext('Enabled') : gettext('Disabled'))}
             </td>
             <td>{company.contact_name}</td>
diff --git a/assets/companies/components/CompanyPermissions.jsx b/assets/companies/components/CompanyPermissions.tsx
similarity index 94%
rename from assets/companies/components/CompanyPermissions.jsx
rename to assets/companies/components/CompanyPermissions.tsx
index b04c4b78d..db902a702 100644
--- a/assets/companies/components/CompanyPermissions.jsx
+++ b/assets/companies/components/CompanyPermissions.tsx
@@ -13,9 +13,9 @@ function CompanyPermissions({
     toggleCompanySection,
     toggleCompanyProduct,
     updateCompanySeats,
-}) {
-    const productsEnabled = (company.products || []).map((product) => product._id);
-    const seats = (company.products || []).reduce((productSeats, product) => {
+}: any) {
+    const productsEnabled = (company.products || []).map((product: any) => product._id);
+    const seats = (company.products || []).reduce((productSeats: any, product: any) => {
         productSeats[product._id] = product.seats;
 
         return productSeats;
@@ -39,7 +39,7 @@ function CompanyPermissions({
                             <li className="item--min-height-40">
                                 <CheckboxInput
                                     name="archive_access"
-                                    label={gettext('Grant Access To Archived {{wire}}', sectionNames)}
+                                    label={gettext('Grant Access To Archived {{wire}}', window.sectionNames)}
                                     value={company.archive_access === true}
                                     onChange={onChange}
                                 />
@@ -75,7 +75,7 @@ function CompanyPermissions({
                             </div>
                         </div>
                         <ul className="list-unstyled">
-                            {sections.map((item) => (
+                            {sections.map((item: any) => (
                                 <li className="item--min-height-40" key={item._id}>
                                     <CheckboxInput
                                         name={item._id}
@@ -93,7 +93,7 @@ function CompanyPermissions({
                         className="form-group"
                         key="products"
                     >
-                        {sections.filter((section) => (company.sections || {})[section._id] === true).map((section) => (
+                        {sections.filter((section: any) => (company.sections || {})[section._id] === true).map((section: any) => (
                             [<div key={`${section.id}product`} className="list-item__preview-collapsible list-item__preview-collapsible--read-only list-item__preview-collapsible--small mb-2">
                                 <div className="list-item__preview-collapsible-header">
                                     <i className="icon--arrow-right icon--rotate-90"></i>
@@ -106,8 +106,8 @@ function CompanyPermissions({
                                 <span className="item--right">{gettext('Number of seats')}</span>
                             </div>,
                             <ul key={`${section.id}product`} className="list-unstyled">
-                                {products.filter((p) => (p.product_type || 'wire').toLowerCase() === section._id.toLowerCase())
-                                    .map((product) => (
+                                {products.filter((p: any) => (p.product_type || 'wire').toLowerCase() === section._id.toLowerCase())
+                                    .map((product: any) => (
                                         <li key={product._id}>
                                             <div className="products-list__product">
                                                 <div className="products-list__product-select">
@@ -140,7 +140,7 @@ function CompanyPermissions({
                                                             className="form-control form-control--small form-control--right form-control--compact"
                                                             style={{maxWidth: '60px'}}
                                                             min="0"
-                                                            tabIndex="0"
+                                                            tabIndex={0}
                                                             value={(seats[product._id] || 0).toString()}
                                                             onChange={(event) => {
                                                                 updateCompanySeats(
diff --git a/assets/companies/components/EditCompany.jsx b/assets/companies/components/EditCompany.tsx
similarity index 82%
rename from assets/companies/components/EditCompany.jsx
rename to assets/companies/components/EditCompany.tsx
index a61b73310..a826b0d2d 100644
--- a/assets/companies/components/EditCompany.jsx
+++ b/assets/companies/components/EditCompany.tsx
@@ -22,8 +22,11 @@ import EditCompanyAPI from './EditCompanyAPI';
 import AuditInformation from 'components/AuditInformation';
 import {EditCompanyDetails} from './EditCompanyDetails';
 
-class EditCompany extends React.Component {
-    constructor(props) {
+class EditCompany extends React.Component<any, any> {
+    static propTypes: any;
+    tabs: Array<{label: any; name: string}>;
+
+    constructor(props: any) {
         super(props);
         this.handleTabClick = this.handleTabClick.bind(this);
         this.getUsers = this.getUsers.bind(this);
@@ -44,9 +47,10 @@ class EditCompany extends React.Component {
         }
     }
 
-    handleTabClick(event) {
-        this.setState({activeTab: event.target.name});
-        if (event.target.name === 'users' && this.props.company._id) {
+    handleTabClick(name: string) {
+        this.setState({activeTab: name});
+
+        if (name === 'users' && this.props.company._id) {
             this.props.fetchCompanyUsers(this.props.company._id);
         }
     }
@@ -55,12 +59,12 @@ class EditCompany extends React.Component {
         if (isEmpty(this.props.users)) {
             return (
                 <tr>
-                    <td colSpan="2">{gettext('There are no users in the company.')}</td>
+                    <td colSpan={2}>{gettext('There are no users in the company.')}</td>
                 </tr>
             );
         }
 
-        return this.props.users.map((user) => (
+        return this.props.users.map((user: any) => (
             <tr key={user._id}>
                 <td>{user.first_name} {user.last_name}</td>
                 <td>{shortDate(user._created)}</td>
@@ -70,7 +74,7 @@ class EditCompany extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.company.name) {
             errors.name = [gettext('Please provide company name')];
@@ -81,7 +85,7 @@ class EditCompany extends React.Component {
         return valid;
     }
 
-    save(externalEvent) {
+    save(externalEvent: any) {
         if (externalEvent) {
             externalEvent.preventDefault();
 
@@ -94,7 +98,7 @@ class EditCompany extends React.Component {
         this.props.saveCompany();
     }
 
-    deleteCompany(event) {
+    deleteCompany(event: any) {
         event.preventDefault();
 
         if (confirm(gettext('Would you like to delete company: {{name}}', {name: this.props.company.name}))) {
@@ -120,7 +124,6 @@ class EditCompany extends React.Component {
                         id='hide-sidebar'
                         type='button'
                         className='icon-button'
-                        data-bs-dismiss='modal'
                         aria-label={gettext('Close')}
                         onClick={this.props.cancelEdit}>
                         <i className="icon--close-thin icon--gray-dark" aria-hidden='true' />
@@ -131,14 +134,18 @@ class EditCompany extends React.Component {
                     data-test-id="form-tabs"
                     className='nav nav-tabs'
                 >
-                    {this.tabs.filter((tab, index) => index === 0 || this.props.company._id).map((tab) => (
+                    {this.tabs.filter((tab: any, index: any) => index === 0 || this.props.company._id).map((tab: any) => (
                         <li key={tab.name} className='nav-item'>
                             <a
                                 data-test-id={`tab-${tab.name}`}
-                                name={tab.name}
+                                title={tab.name}
                                 className={`nav-link ${this.state.activeTab === tab.name && 'active'}`}
                                 href='#'
-                                onClick={this.handleTabClick}>{tab.label}
+                                onClick={() => {
+                                    this.handleTabClick(tab.name);
+                                }}
+                            >
+                                {tab.label}
                             </a>
                         </li>
                     ))}
@@ -227,7 +234,7 @@ EditCompany.propTypes = {
     countries : PropTypes.array
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     company: state.companyToEdit,
     companiesById: state.companiesById,
     sections: state.sections,
@@ -237,18 +244,19 @@ const mapStateToProps = (state) => ({
     companyTypes: state.companyTypes,
     apiEnabled: state.apiEnabled,
     ssoEnabled: state.ssoEnabled,
+    countries: state.countries,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    onChange: (event) => dispatch(editCompany(event)),
-    toggleCompanySection: (sectionId) => dispatch(toggleCompanySection(sectionId)),
-    toggleCompanyProduct: (productId, sectionId, enable) => dispatch(toggleCompanyProduct(productId, sectionId, enable)),
-    updateCompanySeats: (productId, seats) => dispatch(updateCompanySeats(productId, seats)),
-    saveCompany: (permissions) => dispatch(postCompany(permissions)),
-    setError: (errors) => dispatch(setError(errors)),
+const mapDispatchToProps = (dispatch: any) => ({
+    onChange: (event: any) => dispatch(editCompany(event)),
+    toggleCompanySection: (sectionId: any) => dispatch(toggleCompanySection(sectionId)),
+    toggleCompanyProduct: (productId: any, sectionId: any, enable: any) => dispatch(toggleCompanyProduct(productId, sectionId, enable)),
+    updateCompanySeats: (productId: any, seats: any) => dispatch(updateCompanySeats(productId, seats)),
+    saveCompany: () => dispatch(postCompany()),
+    setError: (errors: any) => dispatch(setError(errors)),
     deleteCompany: () => dispatch(deleteCompany()),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
-    fetchCompanyUsers: (companyId) => dispatch(fetchCompanyUsers(companyId)),
+    cancelEdit: (event: any) => dispatch(cancelEdit(event)),
+    fetchCompanyUsers: (companyId: any) => dispatch(fetchCompanyUsers(companyId)),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(EditCompany);
diff --git a/assets/companies/components/EditCompanyAPI.jsx b/assets/companies/components/EditCompanyAPI.tsx
similarity index 91%
rename from assets/companies/components/EditCompanyAPI.jsx
rename to assets/companies/components/EditCompanyAPI.tsx
index 27970bc89..a524407ab 100644
--- a/assets/companies/components/EditCompanyAPI.jsx
+++ b/assets/companies/components/EditCompanyAPI.tsx
@@ -8,8 +8,9 @@ import TextListInput from 'components/TextListInput';
 import CardEditor from 'components/CardEditor';
 
 
-export default class EditCompanyAPI extends React.Component {
-    constructor(props) {
+export default class EditCompanyAPI extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.onIpWhitelistChange = this.onIpWhitelistChange.bind(this);
         this.onCardEdit = this.onCardEdit.bind(this);
@@ -19,17 +20,17 @@ export default class EditCompanyAPI extends React.Component {
         this.state = {noListInput: true};
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (!isEqual(get(this.props, 'company.allowed_ip_list'), get(nextProps, 'company.allowed_ip_list'))) {
             this.setState({noListInput: true});
         }
 
         if (get(nextProps, 'errors.allowed_ip_list')) {
-            this.setState({noListInput: false});   
+            this.setState({noListInput: false});
         }
     }
 
-    onIpWhitelistChange(event) {
+    onIpWhitelistChange(event: any) {
         this.props.onEditCompany({
             target: {
                 name: 'allowed_ip_list',
@@ -86,7 +87,7 @@ export default class EditCompanyAPI extends React.Component {
                 forceEditor={get(this.props, 'errors.allowed_ip_list')} />
         );
     }
-    
+
     render() {
         return (
             <Fragment>
diff --git a/assets/companies/components/EditCompanyDetails.jsx b/assets/companies/components/EditCompanyDetails.tsx
similarity index 96%
rename from assets/companies/components/EditCompanyDetails.jsx
rename to assets/companies/components/EditCompanyDetails.tsx
index cdc722db5..bbe2441ac 100644
--- a/assets/companies/components/EditCompanyDetails.jsx
+++ b/assets/companies/components/EditCompanyDetails.tsx
@@ -9,7 +9,7 @@ import DateInput from 'components/DateInput';
 import CheckboxInput from 'components/CheckboxInput';
 
 
-export function EditCompanyDetails({company, companyTypes, users, errors, onChange, save, deleteCompany, ssoEnabled, countries}) {
+export function EditCompanyDetails({company, companyTypes, users, errors, onChange, save, deleteCompany, ssoEnabled, countries}: any) {
     return (
         <form>
             <div className="list-item__preview-form">
@@ -25,7 +25,7 @@ export function EditCompanyDetails({company, companyTypes, users, errors, onChan
                     name='company_type'
                     label={gettext('Company Type')}
                     value={company.company_type || ''}
-                    options={companyTypes.map((ctype) => ({text: gettext(ctype.name), value: ctype.id}))}
+                    options={companyTypes.map((ctype: any) => ({text: gettext(ctype.name), value: ctype.id}))}
                     defaultOption=""
                     onChange={onChange}
                     error={errors ? errors.company_type : null}
@@ -108,9 +108,9 @@ export function EditCompanyDetails({company, companyTypes, users, errors, onChan
 
                 {get(company, 'sections.monitoring') && <SelectInput
                     name='monitoring_administrator'
-                    label={gettext('{{monitoring}} Administrator', sectionNames)}
+                    label={gettext('{{monitoring}} Administrator', window.sectionNames)}
                     value={company.monitoring_administrator}
-                    options={sortBy(users || [], 'first_name').map((u) => ({
+                    options={sortBy(users || [], 'first_name').map((u: any) => ({
                         text: `${u.first_name} ${u.last_name}`,
                         value: u._id}))}
                     defaultOption=""
diff --git a/assets/companies/index.js b/assets/companies/index.ts
similarity index 100%
rename from assets/companies/index.js
rename to assets/companies/index.ts
diff --git a/assets/companies/reducers.js b/assets/companies/reducers.ts
similarity index 91%
rename from assets/companies/reducers.js
rename to assets/companies/reducers.ts
index ff3ada9e0..2cf1c8490 100644
--- a/assets/companies/reducers.js
+++ b/assets/companies/reducers.ts
@@ -19,7 +19,7 @@ import {ADD_EDIT_USERS} from 'actions';
 
 import {searchReducer} from 'search/reducers';
 
-const initialState = {
+const initialState: any = {
     query: null,
     companies: [],
     companiesById: {},
@@ -34,10 +34,10 @@ const initialState = {
     search: searchReducer(undefined, undefined, 'settings'),
 };
 
-function setupCompanies(companyList, state) {
-    const companiesById = {};
-    const companyOptions = [];
-    const companies = companyList.map((company) => {
+function setupCompanies(companyList: any, state: any) {
+    const companiesById: any = {};
+    const companyOptions: any = [];
+    const companies = companyList.map((company: any) => {
         companiesById[company._id] = company;
         companyOptions.push({value: company._id, text: company.name});
         return company._id;
@@ -53,11 +53,11 @@ function setupCompanies(companyList, state) {
     };
 }
 
-export default function companyReducer(state = initialState, action) {
+export default function companyReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case SELECT_COMPANY: {
-        const defaultCompany = {
+        const defaultCompany: any = {
             is_enabled: true,
             _id: null,
             name: '',
@@ -115,7 +115,7 @@ export default function companyReducer(state = initialState, action) {
             });
         } else {
             company.products = company.products.filter(
-                (product) => (
+                (product: any) => (
                     product._id !== productId
                 )
             );
@@ -132,7 +132,7 @@ export default function companyReducer(state = initialState, action) {
             company.products = [];
         }
 
-        company.products.forEach((product) => {
+        company.products.forEach((product: any) => {
             if (product._id === productId) {
                 product.seats = seats;
             }
@@ -153,7 +153,7 @@ export default function companyReducer(state = initialState, action) {
             company: '',
         };
 
-        const newCompany = {
+        const newCompany: any = {
             name: '',
             sd_subscriber_id: '',
             account_manager: '',
@@ -191,7 +191,7 @@ export default function companyReducer(state = initialState, action) {
         return {...state, products: action.data};
 
     case INIT_VIEW_DATA: {
-        const nextState = {
+        const nextState: any = {
             ...state,
             services: action.data.services,
             products: action.data.products,
diff --git a/assets/companies/utils.js b/assets/companies/utils.js
deleted file mode 100644
index b792d2c11..000000000
--- a/assets/companies/utils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-
-export function getCountryLabel(code, _countries) {
-    return (_countries.find(c => c.value === code) || {}).text;
-}
-
-export function isProductEnabled(products, productId) {
-    return products.findIndex((product) => product._id === productId) !== -1;
-}
diff --git a/assets/companies/utils.ts b/assets/companies/utils.ts
new file mode 100644
index 000000000..71774c573
--- /dev/null
+++ b/assets/companies/utils.ts
@@ -0,0 +1,8 @@
+
+export function getCountryLabel(code: any, _countries: any) {
+    return (_countries.find((c: any) => c.value === code) || {}).text;
+}
+
+export function isProductEnabled(products: any, productId: any) {
+    return products.findIndex((product: any) => product._id === productId) !== -1;
+}
diff --git a/assets/company-admin/actions.js b/assets/company-admin/actions.ts
similarity index 66%
rename from assets/company-admin/actions.js
rename to assets/company-admin/actions.ts
index 5f09b58d1..e240f79ac 100644
--- a/assets/company-admin/actions.js
+++ b/assets/company-admin/actions.ts
@@ -3,30 +3,30 @@ import server from 'server';
 import {initViewData as initUserViewData, setError, fetchUsers} from 'users/actions';
 
 export const INIT_VIEW_DATA = 'INIT_VIEW_DATA';
-export function initViewData(data) {
-    return (dispatch) => {
+export function initViewData(data?: any): any {
+    return (dispatch: any) => {
         dispatch({type: INIT_VIEW_DATA, data: data});
         dispatch(initUserViewData(data));
     };
 }
 
 export const SET_SECTION = 'SET_SECTION';
-export function setSection(id) {
+export function setSection(id: any) {
     return {type: SET_SECTION, id: id};
 }
 
 export const SET_PRODUCT_FILTER = 'SET_PRODUCT_FILTER';
-export function setProductFilter(id) {
-    return function(dispatch) {
+export function setProductFilter(id: any) {
+    return function(dispatch: any) {
         dispatch({type: SET_PRODUCT_FILTER, id: id});
         dispatch(fetchUsers());
     };
 }
 
-export function sendProductSeatRequest(data) {
-    return function (dispatch) {
+export function sendProductSeatRequest(data: any) {
+    return function (dispatch: any) {
         return server.post('/company_admin/send_product_seat_request', data)
             .then(() => notify.success(gettext('Product Seat request sent')))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
diff --git a/assets/company-admin/components/CompanyAdminApp.jsx b/assets/company-admin/components/CompanyAdminApp.tsx
similarity index 92%
rename from assets/company-admin/components/CompanyAdminApp.jsx
rename to assets/company-admin/components/CompanyAdminApp.tsx
index a928d5af3..1720010e4 100644
--- a/assets/company-admin/components/CompanyAdminApp.jsx
+++ b/assets/company-admin/components/CompanyAdminApp.tsx
@@ -33,8 +33,10 @@ import EditUser from 'users/components/EditUser';
 import {CompanyDetailsProductFilter} from './CompanyDetailsProductFilter';
 import {CompanyAdminProductSeatRequestModal} from './CompanyAdminProductSeatRequestModal';
 
-class CompanyAdminAppComponent extends React.Component {
-    constructor(props) {
+class CompanyAdminAppComponent extends React.Component<any, any> {
+    static propTypes: any;
+    modals: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -57,7 +59,7 @@ class CompanyAdminAppComponent extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.userToEdit.email) {
             errors.email = [gettext('Please provide email')];
@@ -68,7 +70,7 @@ class CompanyAdminAppComponent extends React.Component {
         return valid;
     }
 
-    saveUser(event) {
+    saveUser(event: any) {
         event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -78,7 +80,7 @@ class CompanyAdminAppComponent extends React.Component {
         this.props.saveUser();
     }
 
-    deleteUser(event) {
+    deleteUser(event: any) {
         event.preventDefault();
 
         confirm(gettext('Would you like to delete user: {{ name }}', {name: this.props.userToEdit.first_name})) &&
@@ -97,7 +99,7 @@ class CompanyAdminAppComponent extends React.Component {
         return null;
     }
 
-    setProductFilterQuery(query) {
+    setProductFilterQuery(query: any) {
         this.setState({productFilter: query});
     }
 
@@ -243,7 +245,7 @@ CompanyAdminAppComponent.propTypes = {
     totalUsers:PropTypes.number
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     sectionId: state.sectionId,
     usersById: state.usersById,
     user: currentUserSelector(state),
@@ -258,22 +260,22 @@ const mapStateToProps = (state) => ({
     totalUsers:state.totalUsers
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    setSection: (sectionId) => dispatch(setSection(sectionId)),
+const mapDispatchToProps = (dispatch: any) => ({
+    setSection: (sectionId: any) => dispatch(setSection(sectionId)),
     newUser: () => dispatch(newUser()),
-    editUser: (event) => dispatch(editUser(event)),
-    setError: (errors) => dispatch(setError(errors)),
+    editUser: (event: any) => dispatch(editUser(event)),
+    setError: (errors: any) => dispatch(setError(errors)),
     saveUser: () => dispatch(postUser()),
     closeUserEditor: () => dispatch(cancelEdit()),
     deleteUser: () => dispatch(deleteUser()),
     resetPassword: () => dispatch(resetPassword()),
     resendUserInvite: () => dispatch(resendUserInvite()),
 
-    setQuery: (query) => dispatch(setSearchQuery(query)),
+    setQuery: (query: any) => dispatch(setSearchQuery(query)),
     fetchUsers: () => dispatch(fetchUsers()),
-    setSort: (param) => dispatch(setSort(param)),
+    setSort: (param: any) => dispatch(setSort(param)),
     toggleSortDirection: () => dispatch(toggleSortDirection()),
-    setProductFilter: (productId) => dispatch(setProductFilter(productId)),
+    setProductFilter: (productId: any) => dispatch(setProductFilter(productId)),
 });
 
-export const CompanyAdminApp = connect(mapStateToProps, mapDispatchToProps)(CompanyAdminAppComponent);
+export const CompanyAdminApp: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(CompanyAdminAppComponent);
diff --git a/assets/company-admin/components/CompanyAdminProductSeatRequestModal.jsx b/assets/company-admin/components/CompanyAdminProductSeatRequestModal.tsx
similarity index 87%
rename from assets/company-admin/components/CompanyAdminProductSeatRequestModal.jsx
rename to assets/company-admin/components/CompanyAdminProductSeatRequestModal.tsx
index 1771aae41..2ee1604aa 100644
--- a/assets/company-admin/components/CompanyAdminProductSeatRequestModal.jsx
+++ b/assets/company-admin/components/CompanyAdminProductSeatRequestModal.tsx
@@ -13,8 +13,9 @@ import TextInput from 'components/TextInput';
 import TextAreaInput from 'components/TextAreaInput';
 import {Tag} from 'components/Tag';
 
-class CompanyAdminProductSeatRequestModalComponent extends React.Component {
-    constructor(props) {
+class CompanyAdminProductSeatRequestModalComponent extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -42,11 +43,11 @@ class CompanyAdminProductSeatRequestModalComponent extends React.Component {
         });
     }
 
-    toggleProduct(productId) {
+    toggleProduct(productId: any) {
         let productIds = Array.from(this.state.productIds);
 
         if (productIds.includes(productId)) {
-            productIds = productIds.filter((pId) => pId !== productId);
+            productIds = productIds.filter((pId: any) => pId !== productId);
         } else {
             productIds.push(productId);
         }
@@ -54,23 +55,23 @@ class CompanyAdminProductSeatRequestModalComponent extends React.Component {
         this.setState({productIds: productIds}, this.validateForm);
     }
 
-    updateNumberOfSeats(event) {
+    updateNumberOfSeats(event: any) {
         this.setState({numberOfSeats: parseInt(event.target.value, 10)}, this.validateForm);
     }
 
-    updateNote(event) {
+    updateNote(event: any) {
         this.setState({note: event.target.value});
     }
 
     getProductGroups() {
-        const products = [];
+        const products: Array<any> = [];
 
-        this.props.sections.forEach((section) => {
+        this.props.sections.forEach((section: any) => {
             products.push({
                 _id: section._id,
                 name: section.name,
                 products: this.props.products.filter(
-                    (product) => (product.product_type === section._id)
+                    (product: any) => (product.product_type === section._id)
                 ),
             });
         });
@@ -88,8 +89,8 @@ class CompanyAdminProductSeatRequestModalComponent extends React.Component {
 
     render() {
         const sectionProducts = this.getProductGroups();
-        const selectedProducts = this.state.productIds.map((productId) => (
-            this.props.products.find((product) => product._id === productId)
+        const selectedProducts = this.state.productIds.map((productId: any) => (
+            this.props.products.find((product: any) => product._id === productId)
         ));
 
         return (
@@ -114,13 +115,13 @@ class CompanyAdminProductSeatRequestModalComponent extends React.Component {
                             <i className="icon--plus"></i>
                         </button>
                         <ul className="dropdown-menu">
-                            {sectionProducts.map((section, index) => (
+                            {sectionProducts.map((section: any, index: any) => (
                                 <React.Fragment key={section._id}>
                                     <h6 className="dropdown-header">
                                         {section.name}
                                     </h6>
                                     <div className="dropdown-divider" />
-                                    {section.products.map((product) => (
+                                    {section.products.map((product: any) => (
                                         <li key={product._id}>
                                             <button
                                                 className="dropdown-item"
@@ -137,10 +138,10 @@ class CompanyAdminProductSeatRequestModalComponent extends React.Component {
                                 </React.Fragment>
                             ))}
                         </ul>
-                        {selectedProducts.map((product) => (
+                        {selectedProducts.map((product: any) => (
                             <Tag
                                 key={product._id}
-                                label={product.product_type === 'wire' ? sectionNames.wire : sectionNames.agenda}
+                                label={product.product_type === 'wire' ? window.sectionNames.wire : window.sectionNames.agenda}
                                 text={product.name}
                                 keyValue={product._id}
                                 onClick={() => this.toggleProduct(product._id)}
@@ -183,20 +184,20 @@ CompanyAdminProductSeatRequestModalComponent.propTypes = {
     modalFormValid: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     products: productListSelector(state),
     productIds: get(state, 'modal.data.productIds') || [],
     sections: currentCompanySectionListSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch: any) => ({
     closeModal: () => dispatch(closeModal()),
-    sendRequest: (data) => dispatch(sendProductSeatRequest(data)),
+    sendRequest: (data: any) => dispatch(sendProductSeatRequest(data)),
     modalFormInvalid: () => dispatch(modalFormInvalid()),
     modalFormValid: () => dispatch(modalFormValid()),
 });
 
-export const CompanyAdminProductSeatRequestModal = connect(
+export const CompanyAdminProductSeatRequestModal: React.ComponentType<any> = connect(
     mapStateToProps,
     mapDispatchToProps
 )(CompanyAdminProductSeatRequestModalComponent);
diff --git a/assets/company-admin/components/CompanyAdminSideNav.jsx b/assets/company-admin/components/CompanyAdminSideNav.tsx
similarity index 100%
rename from assets/company-admin/components/CompanyAdminSideNav.jsx
rename to assets/company-admin/components/CompanyAdminSideNav.tsx
diff --git a/assets/company-admin/components/CompanyDetails.jsx b/assets/company-admin/components/CompanyDetails.tsx
similarity index 80%
rename from assets/company-admin/components/CompanyDetails.jsx
rename to assets/company-admin/components/CompanyDetails.tsx
index bc6e858a7..bc3af7763 100644
--- a/assets/company-admin/components/CompanyDetails.jsx
+++ b/assets/company-admin/components/CompanyDetails.tsx
@@ -7,7 +7,7 @@ import {setSection as _setSection, setProductFilter as _setProductFilter} from '
 import {CompanyDetailsProductRow} from './CompanyDetailsProductRow';
 import {searchQuerySelector} from 'search/selectors';
 import {companySectionListSelector, companyProductSeatsSelector, currentCompanySelector} from '../selectors';
-function CompanyDetailsComponent({company, showSeatRequestModal, setSection, companySections, products, query}) {
+function CompanyDetailsComponent({company, showSeatRequestModal, setSection, companySections, products, query}: any) {
     const sections = companySections[company._id];
     const numSections = sections.length;
 
@@ -25,21 +25,21 @@ function CompanyDetailsComponent({company, showSeatRequestModal, setSection, com
                     </tr>
                 </thead>
                 <tbody>
-                    {sections.map((section) => (
+                    {sections.map((section: any) => (
                         <React.Fragment key={section._id}>
-                            <tr colSpan={2 + numSections} className="subheading">
+                            <tr className="subheading">
                                 <td>{section.name}</td>
                             </tr>
 
                             {
                                 (query === null ?
-                                    Object.values(products[company._id]).filter((product) => product.section === section._id) :
-                                    Object.values(products[company._id]).filter((product) => 
-                                        product.section === section._id && 
+                                    Object.values(products[company._id]).filter((product: any) => product.section === section._id) :
+                                    Object.values(products[company._id]).filter((product: any) =>
+                                        product.section === section._id &&
                                       product.name.toString().toLowerCase().includes(query.toLowerCase())
                                     )
                                 )
-                                    .map((product) => (
+                                    .map((product: any) => (
 
                                         <CompanyDetailsProductRow
                                             key={product._id}
@@ -65,19 +65,19 @@ CompanyDetailsComponent.propTypes = {
     query: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     company: currentCompanySelector(state),
     companySections: companySectionListSelector(state),
     products: companyProductSeatsSelector(state),
     query: searchQuerySelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    showSeatRequestModal: (productIds) => dispatch(renderModal('productSeatRequest', {productIds})),
-    setSection: (sectionId, productId) => {
+const mapDispatchToProps = (dispatch: any) => ({
+    showSeatRequestModal: (productIds: any) => dispatch(renderModal('productSeatRequest', {productIds})),
+    setSection: (sectionId: any, productId: any) => {
         dispatch(_setSection(sectionId));
         dispatch(_setProductFilter(productId));
     },
 });
 
-export const CompanyDetails = connect(mapStateToProps, mapDispatchToProps)(CompanyDetailsComponent);
+export const CompanyDetails:  React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(CompanyDetailsComponent);
diff --git a/assets/company-admin/components/CompanyDetailsProductFilter.jsx b/assets/company-admin/components/CompanyDetailsProductFilter.tsx
similarity index 76%
rename from assets/company-admin/components/CompanyDetailsProductFilter.jsx
rename to assets/company-admin/components/CompanyDetailsProductFilter.tsx
index c4ee0ae3e..fa0e877ef 100644
--- a/assets/company-admin/components/CompanyDetailsProductFilter.jsx
+++ b/assets/company-admin/components/CompanyDetailsProductFilter.tsx
@@ -8,8 +8,10 @@ import {currentCompanySelector, companySectionListSelector} from '../selectors';
 
 import DropdownFilter from 'components/DropdownFilter';
 
-class CompanyDetailsProductFilterComponent extends React.PureComponent {
-    constructor(props) {
+class CompanyDetailsProductFilterComponent extends React.PureComponent<any, any> {
+    static propTypes: any;
+    filter: any;
+    constructor(props: any) {
         super(props);
 
         this.filter = {
@@ -21,16 +23,16 @@ class CompanyDetailsProductFilterComponent extends React.PureComponent {
         this.getDropdownItems = this.getDropdownItems.bind(this);
     }
 
-    onChange(field, value) {
+    onChange(field: any, value: any) {
         this.props.setProductFilter(value);
     }
 
-    getDropdownItems(filter) {
-        const sectionIds = this.props.companySections[this.props.currentCompany._id].map((section) => section._id);
+    getDropdownItems(filter: any) {
+        const sectionIds = this.props.companySections[this.props.currentCompany._id].map((section: any) => section._id);
 
         return this.props.products
-            .filter((product) => sectionIds.includes(product.product_type))
-            .map((product) => (
+            .filter((product: any) => sectionIds.includes(product.product_type))
+            .map((product: any) => (
                 <button
                     key={product._id}
                     className="dropdown-item"
@@ -45,7 +47,7 @@ class CompanyDetailsProductFilterComponent extends React.PureComponent {
     getActiveQuery() {
         return {
             product: !this.props.product ? null : [
-                get(this.props.products.find((product) => product._id === this.props.product), 'name')
+                get(this.props.products.find((product: any) => product._id === this.props.product), 'name')
             ]
         };
     }
@@ -74,9 +76,9 @@ CompanyDetailsProductFilterComponent.propTypes = {
     companySections: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     currentCompany: currentCompanySelector(state),
     companySections: companySectionListSelector(state),
 });
 
-export const CompanyDetailsProductFilter = connect(mapStateToProps)(CompanyDetailsProductFilterComponent);
+export const CompanyDetailsProductFilter: React.ComponentType<any> = connect(mapStateToProps)(CompanyDetailsProductFilterComponent);
diff --git a/assets/company-admin/components/CompanyDetailsProductRow.jsx b/assets/company-admin/components/CompanyDetailsProductRow.tsx
similarity index 98%
rename from assets/company-admin/components/CompanyDetailsProductRow.jsx
rename to assets/company-admin/components/CompanyDetailsProductRow.tsx
index c0ba9337c..b4f4b85c6 100644
--- a/assets/company-admin/components/CompanyDetailsProductRow.jsx
+++ b/assets/company-admin/components/CompanyDetailsProductRow.tsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import {gettext, getConfig} from 'utils';
 import classNames from 'classnames';
 
-export function CompanyDetailsProductRow({product, onNameClicked, showSeatRequestModal}) {
+export function CompanyDetailsProductRow({product, onNameClicked, showSeatRequestModal}: any) {
     const unlimited = product.max_seats == null || product.max_seats < 1;
     const textClassName = classNames({
         'text-danger': product.max_reached,
diff --git a/assets/company-admin/components/CompanyUserListItem.jsx b/assets/company-admin/components/CompanyUserListItem.tsx
similarity index 90%
rename from assets/company-admin/components/CompanyUserListItem.jsx
rename to assets/company-admin/components/CompanyUserListItem.tsx
index bd06f79be..c9708fe61 100644
--- a/assets/company-admin/components/CompanyUserListItem.jsx
+++ b/assets/company-admin/components/CompanyUserListItem.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 
 import {gettext, fullDate} from 'utils';
 
-export function getUserStateLabelDetails(user) {
+export function getUserStateLabelDetails(user: any) {
     if (user.is_approved && user.is_enabled && user.is_validated) {
         return {
             colour: 'green',
@@ -23,11 +23,11 @@ export function getUserStateLabelDetails(user) {
     }
 }
 
-export function CompanyUserListItem({user, onClick, selected, sections}) {
+export function CompanyUserListItem({user, onClick, selected, sections}: any) {
     const stateLabelDetails = getUserStateLabelDetails(user);
-    const productNumbers = sections.reduce((sectionProductCount, section) => {
+    const productNumbers = sections.reduce((sectionProductCount: any, section: any) => {
         sectionProductCount[section._id] = (user.products || [])
-            .filter((product) => product.section === section._id)
+            .filter((product: any) => product.section === section._id)
             .length;
 
         return sectionProductCount;
@@ -38,7 +38,7 @@ export function CompanyUserListItem({user, onClick, selected, sections}) {
             data-test-id={`user-list-item--${user._id}`}
             onClick={onClick}
             className={!selected ? undefined : 'table--selected'}
-            tabIndex="0"
+            tabIndex={0}
         >
             <td>
                 <div className="name">
@@ -62,7 +62,7 @@ export function CompanyUserListItem({user, onClick, selected, sections}) {
                 </label>
             </td>
 
-            {sections.map((section) => (
+            {sections.map((section: any) => (
                 <td key={section._id} data-test-id={`user-seats--${section._id}`}>
                     <span className={classNames(
                         'badge rounded-pill bg-secondary text-dark',
diff --git a/assets/company-admin/components/CompanyUsers.jsx b/assets/company-admin/components/CompanyUsers.tsx
similarity index 84%
rename from assets/company-admin/components/CompanyUsers.jsx
rename to assets/company-admin/components/CompanyUsers.tsx
index a8a081fca..ad4be6977 100644
--- a/assets/company-admin/components/CompanyUsers.jsx
+++ b/assets/company-admin/components/CompanyUsers.tsx
@@ -8,14 +8,14 @@ import {currentCompanySelector, companySectionListSelector, userIdSelector, user
 
 import {CompanyUserListItem} from './CompanyUserListItem';
 
-function CompanyUsersComponent({users, usersById, selectUser, activeUserId, currentCompany, companySections}) {
+function CompanyUsersComponent({users, usersById, selectUser, activeUserId, currentCompany, companySections}: any) {
     const allowCompaniesToManageProducts = getConfig('allow_companies_to_manage_products');
     const sections = allowCompaniesToManageProducts ? companySections[currentCompany._id] : [];
 
     return (
         <table
             className="table table-hover table--extended"
-            tabIndex="-1"
+            tabIndex={-1}
             data-test-id="company-admin--users-list"
         >
             <thead>
@@ -25,7 +25,7 @@ function CompanyUsersComponent({users, usersById, selectUser, activeUserId, curr
                         <div>{gettext('Email')}</div>
                     </th>
                     <th>{gettext('Status')}</th>
-                    {allowCompaniesToManageProducts && sections.map(section => (
+                    {allowCompaniesToManageProducts && sections.map((section: any) => (
                         <th key={section._id}>
                             {gettext('{{ section }} Products', {section: section.name})}
                         </th>
@@ -37,7 +37,7 @@ function CompanyUsersComponent({users, usersById, selectUser, activeUserId, curr
                 </tr>
             </thead>
             <tbody>
-                {users.map((userId) => (
+                {users.map((userId: any) => (
                     <CompanyUserListItem
                         key={userId}
                         user={usersById[userId]}
@@ -60,7 +60,7 @@ CompanyUsersComponent.propTypes = {
     companySections: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     users: userIdSelector(state),
     usersById: userIdMapSelector(state),
     activeUserId: state.activeUserId,
@@ -68,8 +68,8 @@ const mapStateToProps = (state) => ({
     companySections: companySectionListSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectUser: (userId) => dispatch(_selectUser(userId)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectUser: (userId: any) => dispatch(_selectUser(userId)),
 });
 
-export const CompanyUsers = connect(mapStateToProps, mapDispatchToProps)(CompanyUsersComponent);
+export const CompanyUsers: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(CompanyUsersComponent);
diff --git a/assets/company-admin/index.js b/assets/company-admin/index.ts
similarity index 100%
rename from assets/company-admin/index.js
rename to assets/company-admin/index.ts
diff --git a/assets/company-admin/reducers.js b/assets/company-admin/reducers.ts
similarity index 93%
rename from assets/company-admin/reducers.js
rename to assets/company-admin/reducers.ts
index a76b2366d..3e1b58c44 100644
--- a/assets/company-admin/reducers.js
+++ b/assets/company-admin/reducers.ts
@@ -5,7 +5,7 @@ import {modalReducer} from 'reducers';
 import {searchReducer} from 'search/reducers';
 import userReducer from 'users/reducers';
 
-const initialState = {
+const initialState: any = {
     user: null,
     query: null,
     users: [],
@@ -30,7 +30,7 @@ const initialState = {
     productId: null,
 };
 
-export function companyAdminReducer(state = initialState, action) {
+export function companyAdminReducer(state: any = initialState, action: any) {
     switch (action.type) {
     case INIT_VIEW_DATA:
         return {
diff --git a/assets/company-admin/selectors.js b/assets/company-admin/selectors.ts
similarity index 59%
rename from assets/company-admin/selectors.js
rename to assets/company-admin/selectors.ts
index f1a996f05..261571b55 100644
--- a/assets/company-admin/selectors.js
+++ b/assets/company-admin/selectors.ts
@@ -1,26 +1,26 @@
 import {createSelector} from 'reselect';
 
-export const sectionListSelector = (state) => state.sections || [];
+export const sectionListSelector = (state: any) => state.sections || [];
 
-export const productListSelector = (state) => state.products || [];
+export const productListSelector = (state: any) => state.products || [];
 export const productIdMapSelector = createSelector(
     [productListSelector],
-    (productList) => (
-        productList.reduce((products, product) => {
+    (productList: any) => (
+        productList.reduce((products: any, product: any) => {
             products[product._id] = product;
 
             return products;
         }, {})
     )
 );
-export const companyListSelector = (state) => state.companies || [];
+export const companyListSelector = (state: any) => state.companies || [];
 
 export const companySectionListSelector = createSelector(
     [sectionListSelector, companyListSelector],
-    (sectionList, companyList) => (
-        companyList.reduce((companySections, company) => {
+    (sectionList: any, companyList: any) => (
+        companyList.reduce((companySections: any, company: any) => {
             companySections[company._id] = sectionList.filter(
-                (section) => (
+                (section: any) => (
                     (company.sections || {})[section._id] === true
                 )
             );
@@ -30,31 +30,32 @@ export const companySectionListSelector = createSelector(
     )
 );
 
-export const currentUserSelector = (state) => state.user || {};
-export const userIdSelector = (state) => state.users || [];
-export const userIdMapSelector = (state) => state.usersById || {};
+export const getCurrentUser = (state: any) => state.currentUser;
+export const currentUserSelector = (state: any) => state.user || {};
+export const userIdSelector = (state: any) => state.users || [];
+export const userIdMapSelector = (state: any) => state.usersById || {};
 
 export const currentCompanySelector = createSelector(
     [currentUserSelector, companyListSelector],
-    (user, companyList) => (
-        companyList.find((company) => company._id === user.company) || {}
+    (user: any, companyList: any) => (
+        companyList.find((company: any) => company._id === user.company) || {}
     )
 );
 
 export const currentCompanySectionListSelector = createSelector(
     [currentCompanySelector, companySectionListSelector],
-    (currentCompany, companySectionMap) => (
+    (currentCompany: any, companySectionMap: any) => (
         companySectionMap[currentCompany._id] || []
     )
 );
 
 export const companyUserListSelector = createSelector(
     [companyListSelector, userIdMapSelector],
-    (companyList, userMap) => (
-        companyList.reduce((companyUsers, company) => {
+    (companyList: any, userMap: any) => (
+        companyList.reduce((companyUsers: any, company: any) => {
             companyUsers[company._id] = Object
                 .values(userMap)
-                .filter((user) => user.company === company._id);
+                .filter((user: any) => user.company === company._id);
 
             return companyUsers;
         }, {})
@@ -63,13 +64,13 @@ export const companyUserListSelector = createSelector(
 
 export const companyProductsSelector = createSelector(
     [companyListSelector, productListSelector],
-    (companyList, productList) => (
-        companyList.reduce((companyProducts, company) => {
+    (companyList: any, productList: any) => (
+        companyList.reduce((companyProducts: any, company: any) => {
             const companyProductIds = (company.products || []).map(
-                (product) => product._id
+                (product: any) => product._id
             );
             companyProducts[company._id] = productList.filter(
-                (product) => companyProductIds.includes(product._id)
+                (product: any) => companyProductIds.includes(product._id)
             );
 
             return companyProducts;
@@ -79,13 +80,13 @@ export const companyProductsSelector = createSelector(
 
 export const companyProductSeatsSelector = createSelector(
     [companyListSelector, companyUserListSelector, productIdMapSelector],
-    (companyList, companyUserList, productMap) => (
-        companyList.reduce((companyProducts, company) => {
+    (companyList: any, companyUserList: any, productMap: any) => (
+        companyList.reduce((companyProducts: any, company: any) => {
             companyProducts[company._id] = (company.products || []).reduce(
-                (productSeats, companyProduct) => {
+                (productSeats: any, companyProduct: any) => {
                     const userSeats = companyUserList[company._id].filter(
-                        (user) => (user.products || []).some(
-                            (userProduct) => userProduct._id === companyProduct._id
+                        (user: any) => (user.products || []).some(
+                            (userProduct: any) => userProduct._id === companyProduct._id
                         )
                     );
                     productSeats[companyProduct._id] = {
diff --git a/assets/company-reports/actions.js b/assets/company-reports/actions.ts
similarity index 76%
rename from assets/company-reports/actions.js
rename to assets/company-reports/actions.ts
index 9beeca5a5..585f74149 100644
--- a/assets/company-reports/actions.js
+++ b/assets/company-reports/actions.ts
@@ -16,7 +16,7 @@ export const REPORTS_NAMES = {
 };
 
 
-export const REPORTS = {
+export const REPORTS: any = {
     [REPORTS_NAMES.COMPANY_SAVED_SEARCHES]: '/reports/company-saved-searches',
     [REPORTS_NAMES.USER_SAVED_SEARCHES]: '/reports/user-saved-searches',
     [REPORTS_NAMES.COMPANY_PRODUCTS]: '/reports/company-products',
@@ -29,8 +29,8 @@ export const REPORTS = {
     [REPORTS_NAMES.EXPIRED_COMPANIES]: '/reports/expired-companies',
 };
 
-function getReportQueryString(currentState, next, exportReport, notify) {
-    let params = cloneDeep(currentState.reportParams);
+function getReportQueryString(currentState: any, next: any, exportReport: any, notify: any) {
+    const params = cloneDeep(currentState.reportParams);
     if (params) {
         if (params.company) {
             params.company = get(getItemFromArray(params.company, currentState.companies, 'name'), '_id');
@@ -62,16 +62,16 @@ function getReportQueryString(currentState, next, exportReport, notify) {
 
         params['from'] = next ? get(currentState, 'results.length') : 0;
         const queryString = Object.keys(params)
-            .filter((key) => params[key])
-            .map((key) => [key, params[key]].join('='))
+            .filter((key: any) => params[key])
+            .map((key: any) => [key, params[key]].join('='))
             .join('&');
         return queryString;
     }
 }
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(data) {
-    return function (dispatch) {
+export function initData(data: any): any {
+    return function (dispatch: any) {
         dispatch(fetchProducts());
         dispatch({type: INIT_DATA, data});
     };
@@ -83,48 +83,48 @@ export function queryReport() {
 }
 
 export const SET_ACTIVE_REPORT = 'SET_ACTIVE_REPORT';
-export function setActiveReport(data) {
+export function setActiveReport(data: any) {
     return {type: SET_ACTIVE_REPORT, data};
 }
 
 export const RECEIVED_DATA = 'RECEIVED_DATA';
-export function receivedData(data) {
+export function receivedData(data: any) {
     return {type: RECEIVED_DATA, data};
 }
 
 export const ADD_RESULTS = 'ADD_RESULTS';
-export function addResults(results) {
+export function addResults(results: any) {
     return {type: ADD_RESULTS, data: results};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
 export const SET_IS_LOADING = 'SET_IS_LOADING';
-export function isLoading(data = false) {
+export function isLoading(data: any = false) {
     return {type: SET_IS_LOADING, data};
 }
 
 export const GET_PRODUCTS = 'GET_PRODUCTS';
-export function getProducts(data) {
+export function getProducts(data: any) {
     return {type: GET_PRODUCTS, data};
 }
 
 export function runReport() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryReport());
         dispatch(fetchReport(REPORTS[getState().activeReport]));
     };
 }
 
-export function fetchAggregations(url) {
-    return function(dispatch, getState) {
-        let queryString = getReportQueryString(getState(), 0, false, notify);
+export function fetchAggregations(url: any) {
+    return function(dispatch: any, getState: any) {
+        const queryString = getReportQueryString(getState(), 0, false, notify);
 
         server.get(`${url}?${queryString}&aggregations=1`)
-            .then((data) => {
+            .then((data: any) => {
                 dispatch({
                     type: 'RECEIVE_REPORT_AGGREGATIONS',
                     data: data,
@@ -137,14 +137,14 @@ export function fetchAggregations(url) {
  * Fetches the report data
  *
  */
-export function fetchReport(url, next, exportReport) {
-    return function (dispatch, getState) {
+export function fetchReport(url: any, next?: any, exportReport?: any) {
+    return function (dispatch: any, getState: any) {
         if (next) {
             dispatch(isLoading(next));
         }
 
-        let queryString = getReportQueryString(getState(), next, exportReport, notify);
-        let apiRequest;
+        const queryString = getReportQueryString(getState(), next, exportReport, notify);
+        let apiRequest: any;
 
         if (exportReport) {
             if (getState().results.length <= 0) {
@@ -162,7 +162,7 @@ export function fetchReport(url, next, exportReport) {
             apiRequest = server.get(url);
         }
 
-        return apiRequest.then((data) => {
+        return apiRequest.then((data: any) => {
             if (!next) {
                 dispatch(receivedData(data));
             } else {
@@ -170,12 +170,12 @@ export function fetchReport(url, next, exportReport) {
                 dispatch(addResults(get(data, 'results', [])));
             }
         })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 export const TOGGLE_REPORT_FILTER = 'TOGGLE_REPORT_FILTER';
-export function toggleFilter(filter, value) {
+export function toggleFilter(filter: any, value: any) {
     return {
         type: TOGGLE_REPORT_FILTER,
         data: {
@@ -185,15 +185,15 @@ export function toggleFilter(filter, value) {
     };
 }
 
-export function toggleFilterAndQuery(filter, value) {
-    return function (dispatch) {
+export function toggleFilterAndQuery(filter: any, value: any) {
+    return function (dispatch: any) {
         dispatch(toggleFilter(filter, value));
         return dispatch(runReport());
     };
 }
 
 export function printReport() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         const state = getState();
         const activeReport = state.activeReport;
 
@@ -213,11 +213,11 @@ export function printReport() {
  *
  */
 export function fetchProducts() {
-    return function (dispatch) {
+    return function (dispatch: any) {
         return server.get('/products/search')
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getProducts(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
diff --git a/assets/company-reports/components/ComapnyNewsApiUsage.jsx b/assets/company-reports/components/ComapnyNewsApiUsage.tsx
similarity index 88%
rename from assets/company-reports/components/ComapnyNewsApiUsage.jsx
rename to assets/company-reports/components/ComapnyNewsApiUsage.tsx
index 391436ecb..64250b44e 100644
--- a/assets/company-reports/components/ComapnyNewsApiUsage.jsx
+++ b/assets/company-reports/components/ComapnyNewsApiUsage.tsx
@@ -8,8 +8,10 @@ import {gettext} from 'utils';
 import {REPORTS} from '../actions';
 
 
-class ComapnyNewsApiUsage extends React.Component {
-    constructor(props) {
+class ComapnyNewsApiUsage extends React.Component<any, any> {
+    static propTypes: any;
+    previousScrollTop: any;
+    constructor(props: any) {
         super(props);
 
         this.onFromDateChange = this.onFromDateChange.bind(this);
@@ -19,14 +21,14 @@ class ComapnyNewsApiUsage extends React.Component {
         this.previousScrollTop = 0;
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (this.props.reportParams !== nextProps.reportParams) {
             // Filtering done
             this.previousScrollTop = 0;
         }
     }
 
-    onScroll(event) {
+    onScroll(event: any) {
         if (this.props.isLoading) {
             return;
         }
@@ -46,21 +48,21 @@ class ComapnyNewsApiUsage extends React.Component {
         this.props.runReport();
     }
 
-    onFromDateChange(value) {
+    onFromDateChange(value: any) {
         this.props.toggleFilterAndQuery('date_from', value);
     }
 
-    onEndDateChange(value) {
+    onEndDateChange(value: any) {
         this.props.toggleFilterAndQuery('date_to', value);
     }
 
     render() {
         const {results, print, reportParams, resultHeaders} = this.props;
-        let list = [];
-        Object.keys(results).forEach((company) => {
+        let list: Array<any> = [];
+        Object.keys(results).forEach((company: any) => {
             const rowColums = [
                 (<td key={'name-' + company}>{company}</td>),
-                ...resultHeaders.map((headerName, index) => 
+                ...resultHeaders.map((headerName: any, index: any) =>
                     (<td key={index}>{get(results[company], headerName, 0)}</td>))
             ];
             list.push((<tr key={company}>{rowColums}</tr>));
diff --git a/assets/company-reports/components/Company.jsx b/assets/company-reports/components/Company.tsx
similarity index 81%
rename from assets/company-reports/components/Company.jsx
rename to assets/company-reports/components/Company.tsx
index 458ddda2b..32f6606d2 100644
--- a/assets/company-reports/components/Company.jsx
+++ b/assets/company-reports/components/Company.tsx
@@ -5,15 +5,15 @@ import {get, groupBy} from 'lodash';
 import ReportsTable from './ReportsTable';
 
 
-function getProductDetails(products = []) {
+function getProductDetails(products: Array<any> = []) {
     const productsByGroup = groupBy(products, (p) => p.product_type);
-    const getProductSectionName = (productType) => {
+    const getProductSectionName = (productType: any) => {
         if (productType === 'am_news') {
             return gettext('AM');
         }
 
         if (productType !== 'aapX') {
-            return productType.toLowerCase().replace(/\b\w/g, (l) => l.toUpperCase());
+            return productType.toLowerCase().replace(/\b\w/g, (l: any) => l.toUpperCase());
         }
 
         return productType;
@@ -22,15 +22,15 @@ function getProductDetails(products = []) {
     return (
         <div className="m-2">
             <div><span className="font-italic">{gettext('Products')}: </span></div>
-            {Object.keys(productsByGroup).map((productType) =>
+            {Object.keys(productsByGroup).map((productType: any) =>
                 <div className='ps-3' key={productType}>{getProductSectionName(productType)}
-                    <div className='ps-3'>{productsByGroup[productType].map((p) => <div key={p._id}>{p.name}</div>)}</div>
+                    <div className='ps-3'>{productsByGroup[productType].map((p: any) => <div key={p._id}>{p.name}</div>)}</div>
                 </div>
             )}
         </div>);
 }
 
-function getContactDetails(company) {
+function getContactDetails(company: any) {
     const contactInfo = company.contact_email ? `${company.contact_name} (${company.contact_email})` : company.contact_name;
     return (
         <div className="d-flex align-items-center m-2">
@@ -39,8 +39,8 @@ function getContactDetails(company) {
         </div>);
 }
 
-function getUsers(users = []) {
-    const usersInfo = users.length <= 0 ? '-' : users.map((u) =>
+function getUsers(users: Array<any> = []) {
+    const usersInfo = users.length <= 0 ? '-' : users.map((u: any) =>
         `${u.first_name} ${u.last_name} (${u.email})`).join(', ');
 
     return (
@@ -49,22 +49,22 @@ function getUsers(users = []) {
         </div>);
 }
 
-function Company({results, print}) {
+function Company({results, print}: any) {
 
-    const list = results && results.map((item) =>
-        [<tr key={item._id} className="table-secondary" tabIndex='0'>
+    const list = results && results.map((item: any) =>
+        [<tr key={item._id} className="table-secondary" tabIndex={0}>
             <td>{item.name}</td>
             <td className='fw-bold'>{item.is_enabled ? gettext('Active') : gettext('Disabled')}</td>
             <td>{formatDate(get(item, 'company._created'))}</td>
             <td>{get(item, 'company.expiry_date') ? formatDate(item.company.expiry_date) : gettext('Unspecified')}</td>
         </tr>,
         <tr key={`${item._id}-contact`}>
-            <td colSpan="4">
+            <td colSpan={4}>
                 {getContactDetails(item.company)}
             </td>
         </tr>,
         <tr key={`${item._id}-account_manager`}>
-            <td colSpan="4">
+            <td colSpan={4}>
                 <div className="d-flex align-items-center m-2">
                     <div><span className="font-italic">{gettext('Account Manager')}: </span>
                         {item.account_manager}</div>
@@ -72,12 +72,12 @@ function Company({results, print}) {
             </td>
         </tr>,
         <tr key={`${item._id}-users`}>
-            <td colSpan="5">
+            <td colSpan={5}>
                 {getUsers(item.users)}
             </td>
         </tr>,
         <tr key={`${item._id}-products`}>
-            <td colSpan="5">
+            <td colSpan={5}>
                 {getProductDetails(item.products)}
             </td>
         </tr>]
diff --git a/assets/company-reports/components/CompanyProducts.jsx b/assets/company-reports/components/CompanyProducts.tsx
similarity index 81%
rename from assets/company-reports/components/CompanyProducts.jsx
rename to assets/company-reports/components/CompanyProducts.tsx
index 3e9a6e551..0428d94b1 100644
--- a/assets/company-reports/components/CompanyProducts.jsx
+++ b/assets/company-reports/components/CompanyProducts.tsx
@@ -5,8 +5,8 @@ import ReportsTable from './ReportsTable';
 import {gettext} from 'utils';
 
 
-function getProductDetails(products) {
-    return (products.map((product) => (<div key={product._id} className="d-flex align-items-center m-2">
+function getProductDetails(products: any) {
+    return (products.map((product: any) => (<div key={product._id} className="d-flex align-items-center m-2">
         <div><span className="font-italic">{gettext('Product name')}:</span> {product.name}</div>
         <div className="ms-3"><span className="font-italic">{gettext('Is enabled')}:</span>{product.is_enabled.toString()}</div>
         {product.query && <div className="ms-3"><span className="font-italic">{gettext('Query')}:</span>{product.query}</div>}
@@ -14,16 +14,16 @@ function getProductDetails(products) {
     </div>)));
 }
 
-function CompanyProducts({results, print}) {
+function CompanyProducts({results, print}: any) {
 
-    const list = results && results.map((item) =>
-        [<tr key={item._id} className="table-secondary" tabIndex='0'>
+    const list = results && results.map((item: any) =>
+        [<tr key={item._id} className="table-secondary" tabIndex={0}>
             <td>{item.name}</td>
             <td>{item.is_enabled.toString()}</td>
             <td>{item.products.length}</td>
         </tr>,
         <tr key={`${item._id}-products`}>
-            <td colSpan="3">
+            <td colSpan={3}>
                 {getProductDetails(item.products)}
             </td>
         </tr>]
diff --git a/assets/company-reports/components/CompanyReportsApp.jsx b/assets/company-reports/components/CompanyReportsApp.tsx
similarity index 86%
rename from assets/company-reports/components/CompanyReportsApp.jsx
rename to assets/company-reports/components/CompanyReportsApp.tsx
index 52c9bc0c6..467643b43 100644
--- a/assets/company-reports/components/CompanyReportsApp.jsx
+++ b/assets/company-reports/components/CompanyReportsApp.tsx
@@ -25,8 +25,9 @@ const options = [
 ];
 
 
-class CompanyReportsApp extends React.Component {
-    constructor(props, context) {
+class CompanyReportsApp extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.getPanel = this.getPanel.bind(this);
@@ -53,8 +54,8 @@ class CompanyReportsApp extends React.Component {
                             id={'company-reports'}
                             name={'company-reports'}
                             value={this.props.activeReport || ''}
-                            onChange={(event) => this.props.setActiveReport(event.target.value)}>
-                            {reportOptions.map((option) => <option key={option.value} value={option.value}>{option.text}</option>)}
+                            onChange={(event: any) => this.props.setActiveReport(event.target.value)}>
+                            {reportOptions.map((option: any) => <option key={option.value} value={option.value}>{option.text}</option>)}
                         </select>
                     </div>
 
@@ -92,7 +93,7 @@ CompanyReportsApp.propTypes = {
     products: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     activeReport: state.activeReport,
     results: state.results,
     companies: state.companies,
@@ -103,11 +104,13 @@ const mapStateToProps = (state) => ({
     products: state.products,
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     setActiveReport,
     runReport,
     printReport,
     toggleFilterAndQuery,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(CompanyReportsApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(CompanyReportsApp);
+
+export default component;
\ No newline at end of file
diff --git a/assets/company-reports/components/CompanySavedSearches.jsx b/assets/company-reports/components/CompanySavedSearches.tsx
similarity index 85%
rename from assets/company-reports/components/CompanySavedSearches.jsx
rename to assets/company-reports/components/CompanySavedSearches.tsx
index 864fcd4e9..321a28269 100644
--- a/assets/company-reports/components/CompanySavedSearches.jsx
+++ b/assets/company-reports/components/CompanySavedSearches.tsx
@@ -5,8 +5,8 @@ import ReportsTable from './ReportsTable';
 import {gettext} from 'utils';
 
 
-function CompanySavedSearches({results, print}) {
-    const list = results && results.map((item) =>
+function CompanySavedSearches({results, print}: any) {
+    const list = results && results.map((item: any) =>
         <tr key={item._id}>
             <td>{item.name}</td>
             <td>{item.is_enabled.toString()}</td>
diff --git a/assets/company-reports/components/ContentActivity.jsx b/assets/company-reports/components/ContentActivity.tsx
similarity index 89%
rename from assets/company-reports/components/ContentActivity.jsx
rename to assets/company-reports/components/ContentActivity.tsx
index 2902ea9f1..cf8fd9128 100644
--- a/assets/company-reports/components/ContentActivity.jsx
+++ b/assets/company-reports/components/ContentActivity.tsx
@@ -11,8 +11,9 @@ import CalendarButton from '../../components/CalendarButton';
 import MultiSelectDropdown from '../../components/MultiSelectDropdown';
 import ReportsTable from './ReportsTable';
 
-class ContentActivity extends React.Component {
-    constructor(props) {
+class ContentActivity extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.onDateChange = this.onDateChange.bind(this);
@@ -26,9 +27,9 @@ class ContentActivity extends React.Component {
                 field: 'section',
                 label: gettext('Section'),
                 options: this.props.sections
-                    .filter((section) => section.group === 'wire' || (section.group === 'api' && this.props.apiEnabled)
+                    .filter((section: any) => section.group === 'wire' || (section.group === 'api' && this.props.apiEnabled)
                     || section.group === 'monitoring')
-                    .map((section) => ({
+                    .map((section: any) => ({
                         label: section.name,
                         value: section.name,
                     })),
@@ -81,7 +82,7 @@ class ContentActivity extends React.Component {
         this.props.fetchAggregations(REPORTS['content-activity']);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (this.props.results !== nextProps.results) {
             this.updateResults(nextProps);
         }
@@ -126,19 +127,19 @@ class ContentActivity extends React.Component {
         return headers;
     }
 
-    updateAggregations(props) {
+    updateAggregations(props: any) {
         const genre = cloneDeep(this.state.genre);
         const company = cloneDeep(this.state.company);
 
         genre.options = props.aggregations.genres
             .sort()
-            .map((genre) => ({
+            .map((genre: any) => ({
                 label: genre,
                 value: genre,
             }));
         company.options = props.companies
-            .filter((company) => props.aggregations.companies.includes(company._id))
-            .map((company) => ({
+            .filter((company: any) => props.aggregations.companies.includes(company._id))
+            .map((company: any) => ({
                 label: company.name,
                 value: company.name,
             }));
@@ -149,27 +150,27 @@ class ContentActivity extends React.Component {
         });
     }
 
-    updateResults(props) {
+    updateResults(props: any) {
         const companies = keyBy(this.props.companies, '_id');
 
         const results = props.results.map(
-            (item) => ({
+            (item: any) => ({
                 _id: item._id,
                 versioncreated: formatTime(get(item, 'versioncreated') || ''),
                 headline: get(item, 'headline') || '',
                 anpa_take_key: get(item, 'anpa_take_key') || '',
                 place: (get(item, 'place') || [])
-                    .map((place) => place.name)
+                    .map((place: any) => place.name)
                     .sort(),
                 service: (get(item, 'service') || [])
-                    .map((service) => service.name)
+                    .map((service: any) => service.name)
                     .sort(),
                 subject: (get(item, 'subject') || [])
-                    .map((subject) => subject.name)
+                    .map((subject: any) => subject.name)
                     .sort(),
                 total: get(item, 'aggs.total') || 0,
                 companies: (get(item, 'aggs.companies') || [])
-                    .map((company) => companies[company].name)
+                    .map((company: any) => companies[company].name)
                     .sort(),
                 actions: {
                     download: get(item, 'aggs.actions.download') || 0,
@@ -186,12 +187,12 @@ class ContentActivity extends React.Component {
         this.setState({results});
     }
 
-    onDateChange(value) {
+    onDateChange(value: any) {
         this.props.toggleFilter('date_from', value);
         this.props.fetchAggregations(REPORTS['content-activity']);
     }
 
-    onChangeSection(field, value) {
+    onChangeSection(field: any, value: any) {
         this.props.toggleFilter('section', value);
         this.props.fetchAggregations(REPORTS['content-activity']);
     }
@@ -209,27 +210,27 @@ class ContentActivity extends React.Component {
         const actions = this.getFilteredActions();
 
         if (get(results, 'length', 0) > 0) {
-            return results.map((item) =>
+            return results.map((item: any) =>
                 <tr key={item._id}>
                     <td>{item.versioncreated}</td>
                     <td>{item.headline}</td>
                     <td>{item.anpa_take_key}</td>
-                    <td>{item.place.map((place) => (
+                    <td>{item.place.map((place: any) => (
                         <Fragment key={place}>
                             {place}<br />
                         </Fragment>
                     ))}</td>
-                    <td>{item.service.map((service) => (
+                    <td>{item.service.map((service: any) => (
                         <Fragment key={service}>
                             {service}<br />
                         </Fragment>
                     ))}</td>
-                    <td>{item.subject.map((subject) => (
+                    <td>{item.subject.map((subject: any) => (
                         <Fragment key={subject}>
                             {subject}<br />
                         </Fragment>
                     ))}</td>
-                    <td>{item.companies.map((company) => (
+                    <td>{item.companies.map((company: any) => (
                         <Fragment key={company}>
                             {company}<br />
                         </Fragment>
@@ -269,7 +270,7 @@ class ContentActivity extends React.Component {
                         />
                     </div>
 
-                    {filters.map((filterName) => {
+                    {filters.map((filterName: any) => {
                         const filter = this.state[filterName];
 
                         return (
@@ -315,7 +316,7 @@ ContentActivity.propTypes = {
     apiEnabled: PropTypes.bool,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     companies: state.companies,
     reportParams: state.reportParams,
     isLoading: state.isLoading,
@@ -323,7 +324,7 @@ const mapStateToProps = (state) => ({
     aggregations: state.reportAggregations,
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     toggleFilter,
     fetchReport,
     runReport,
diff --git a/assets/company-reports/components/ExpiredCompanies.jsx b/assets/company-reports/components/ExpiredCompanies.tsx
similarity index 88%
rename from assets/company-reports/components/ExpiredCompanies.jsx
rename to assets/company-reports/components/ExpiredCompanies.tsx
index 23463ef4b..44b476349 100644
--- a/assets/company-reports/components/ExpiredCompanies.jsx
+++ b/assets/company-reports/components/ExpiredCompanies.tsx
@@ -5,8 +5,8 @@ import {get} from 'lodash';
 import ReportsTable from './ReportsTable';
 
 
-function ExpiredCompanies({results, print}) {
-    const list = results && results.map((item) =>
+function ExpiredCompanies({results, print}: any) {
+    const list = results && results.map((item: any) =>
         <tr key={item._id}>
             <td>{get(item, 'name')}</td>
             <td className='fw-bold'>{item.is_enabled ? gettext('Active') : gettext('Disabled')}</td>
diff --git a/assets/company-reports/components/ProductCompanies.jsx b/assets/company-reports/components/ProductCompanies.tsx
similarity index 74%
rename from assets/company-reports/components/ProductCompanies.jsx
rename to assets/company-reports/components/ProductCompanies.tsx
index 7bec8decc..abdfee537 100644
--- a/assets/company-reports/components/ProductCompanies.jsx
+++ b/assets/company-reports/components/ProductCompanies.tsx
@@ -8,11 +8,15 @@ import {toggleFilterAndQuery, runReport} from '../actions';
 
 import {gettext} from 'utils';
 
-class ProductCompanies extends React.Component {
-    constructor(props, context) {
+class ProductCompanies extends React.Component<any, any> {
+    static propTypes: any;
+    products: any;
+    filters: any;
+    results: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
-        this.products = [...this.props.products.map((p) => ({...p, 'label': p.name}))];
+        this.products = [...this.props.products.map((p: any) => ({...p, 'label': p.name}))];
         this.state = {product: this.props.products[0]};
 
         this.filters = [{
@@ -23,24 +27,24 @@ class ProductCompanies extends React.Component {
         this.results = [];
     }
 
-    getDropdownItems(filter) {
+    getDropdownItems(filter: any) {
         const {toggleFilterAndQuery} = this.props;
-        let getName = (text) => (text);
-        let itemsArray = [];
+        const getName = (text: any) => (text);
+        let itemsArray: Array<any> = [];
         switch (filter.field) {
         case 'product':
             itemsArray = this.products;
             break;
         }
 
-        return itemsArray.map((item, i) => (<button
+        return itemsArray.map((item: any, i: any) => (<button
             key={i}
             className='dropdown-item'
             onClick={() => toggleFilterAndQuery(filter.field, item.name)}
         >{getName(item.name)}</button>));
     }
 
-    getFilterLabel(filter, activeFilter) {
+    getFilterLabel(filter: any, activeFilter: any) {
         if (activeFilter[filter.field]) {
             return activeFilter[filter.field];
         } else {
@@ -51,15 +55,15 @@ class ProductCompanies extends React.Component {
     render() {
         const {results, print, reportParams, toggleFilterAndQuery} = this.props;
         const headers = [gettext('Product'), gettext('Active Companies'), gettext('Disabled Companies')];
-        const list = get(results, 'length', 0) > 0 ? results.map((item) =>
+        const list = get(results, 'length', 0) > 0 ? results.map((item: any) =>
             <tr key={item._id}>
                 <td>{item.product}</td>
-                <td>{item.enabled_companies.map((company) => (
+                <td>{item.enabled_companies.map((company: any) => (
                     <Fragment key={company}>
                         {company}<br />
                     </Fragment>
                 ))}</td>
-                <td>{item.disabled_companies.map((company) => (
+                <td>{item.disabled_companies.map((company: any) => (
                     <Fragment key={company}>
                         {company}<br />
                     </Fragment>
@@ -71,7 +75,7 @@ class ProductCompanies extends React.Component {
             <td></td>
         </tr>)]);
 
-        let filterNodes = this.filters.map((filter) => (
+        const filterNodes = this.filters.map((filter: any) => (
             <DropdownFilter
                 key={filter.label}
                 filter={filter}
@@ -99,12 +103,14 @@ ProductCompanies.propTypes = {
     isLoading: PropTypes.bool,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     products: state.products,
     reportParams: state.reportParams,
     isLoading: state.isLoading,
 });
 
-const mapDispatchToProps = {toggleFilterAndQuery, runReport};
+const mapDispatchToProps: any = {toggleFilterAndQuery, runReport};
 
-export default connect(mapStateToProps, mapDispatchToProps)(ProductCompanies);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(ProductCompanies);
+
+export default component;
diff --git a/assets/company-reports/components/ProductStories.jsx b/assets/company-reports/components/ProductStories.tsx
similarity index 91%
rename from assets/company-reports/components/ProductStories.jsx
rename to assets/company-reports/components/ProductStories.tsx
index 37976b662..dfbe635b7 100644
--- a/assets/company-reports/components/ProductStories.jsx
+++ b/assets/company-reports/components/ProductStories.tsx
@@ -5,8 +5,8 @@ import ReportsTable from './ReportsTable';
 import {gettext} from 'utils';
 
 
-function ProductStories({results, print}) {
-    const list = results && results.map((item) =>
+function ProductStories({results, print}: any) {
+    const list = results && results.map((item: any) =>
         <tr key={item._id}>
             <td>{item.name}</td>
             <td>{item.is_enabled.toString()}</td>
diff --git a/assets/company-reports/components/ReportsTable.jsx b/assets/company-reports/components/ReportsTable.tsx
similarity index 91%
rename from assets/company-reports/components/ReportsTable.jsx
rename to assets/company-reports/components/ReportsTable.tsx
index c3c9a2ad5..ddf5e9553 100644
--- a/assets/company-reports/components/ReportsTable.jsx
+++ b/assets/company-reports/components/ReportsTable.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-function ReportsTable({headers, rows, print, onScroll, tableClass}) {
+function ReportsTable({headers, rows, print, onScroll, tableClass}: any) {
     return (
         <section className="content-main">
             <div className="list-items-container reports-container" onScroll={onScroll}>
@@ -13,7 +13,7 @@ function ReportsTable({headers, rows, print, onScroll, tableClass}) {
                 )}>
                     <thead className={classNames({'report-thead': !print}, 'thead-dark')}>
                         <tr>
-                            {headers.map((h, i) => (<th key={i}>{h}</th>))}
+                            {headers.map((h: any, i: any) => (<th key={i}>{h}</th>))}
                         </tr>
                     </thead>
                     <tbody>{rows}</tbody>
diff --git a/assets/company-reports/components/SubscriberActivity.jsx b/assets/company-reports/components/SubscriberActivity.tsx
similarity index 88%
rename from assets/company-reports/components/SubscriberActivity.jsx
rename to assets/company-reports/components/SubscriberActivity.tsx
index d12ba6d7e..340aaa9a8 100644
--- a/assets/company-reports/components/SubscriberActivity.jsx
+++ b/assets/company-reports/components/SubscriberActivity.tsx
@@ -9,11 +9,15 @@ import DropdownFilter from '../../components/DropdownFilter';
 import CalendarButton from '../../components/CalendarButton';
 import {toggleFilterAndQuery, fetchReport, REPORTS, runReport} from '../actions';
 
-class SubscriberActivity extends React.Component {
-    constructor(props, context) {
+class SubscriberActivity extends React.Component<any, any> {
+    static propTypes: any;
+    companies: Array<any>;
+    filters: Array<any>;
+    previousScrollTop: number;
+    constructor(props: any, context: any) {
         super(props, context);
 
-        this.companies = [...this.props.companies.map((c) => ({...c, 'label': c.name}))];
+        this.companies = [...this.props.companies.map((c: any) => ({...c, 'label': c.name}))];
         this.state = {company: this.props.companies[0]};
 
         this.filters = [{
@@ -40,17 +44,17 @@ class SubscriberActivity extends React.Component {
         this.props.runReport();
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (this.props.reportParams !== nextProps.reportParams) {
             // Filtering done
             this.previousScrollTop = 0;
         }
     }
 
-    getDropdownItems(filter) {
+    getDropdownItems(filter: any) {
         const {toggleFilterAndQuery, sections, apiEnabled} = this.props;
-        let getName = (text) => (text);
-        let itemsArray = [];
+        let getName = (text: any) => (text);
+        let itemsArray: Array<any> = [];
         // Company is not filtered, always show full list
         switch(filter.field) {
         case 'company':
@@ -95,14 +99,14 @@ class SubscriberActivity extends React.Component {
         }
 
 
-        return itemsArray.map((item, i) => (<button
+        return itemsArray.map((item: any, i: any) => (<button
             key={i}
             className='dropdown-item'
             onClick={() => toggleFilterAndQuery(filter.field, item.value || item.name)}
         >{getName(item.name)}</button>));
     }
 
-    getFilterLabel(filter, activeFilter) {
+    getFilterLabel(filter: any, activeFilter: any) {
         if (activeFilter[filter.field]) {
             if (activeFilter.action === 'api' && filter.field === 'action')
                 return 'api retrieval';
@@ -112,7 +116,7 @@ class SubscriberActivity extends React.Component {
         }
     }
 
-    onScroll(event) {
+    onScroll(event: any) {
         if (this.props.isLoading) {
             return;
         }
@@ -127,19 +131,19 @@ class SubscriberActivity extends React.Component {
         }
     }
 
-    onFromDateChange(value) {
+    onFromDateChange(value: any) {
         this.props.toggleFilterAndQuery('date_from', value);
 
     }
 
-    onEndDateChange(value) {
+    onEndDateChange(value: any) {
         this.props.toggleFilterAndQuery('date_to', value);
     }
 
     render() {
         const {results, print, reportParams, toggleFilterAndQuery} = this.props;
         const headers = [gettext('Company'), gettext('Section'), gettext('Item'), gettext('Action'), gettext('User'), gettext('Time')];
-        let list = get(results, 'length', 0) > 0 ? results.map((item) =>
+        const list = get(results, 'length', 0) > 0 ? results.map((item: any) =>
             <tr key={item._id}>
                 <td>{item.company}</td>
                 <td>{item.section}</td>
@@ -161,7 +165,7 @@ class SubscriberActivity extends React.Component {
             <td></td>
         </tr>)]);
 
-        let filterNodes = this.filters.map((filter) => (
+        let filterNodes = this.filters.map((filter: any) => (
             <DropdownFilter
                 key={filter.label}
                 filter={filter}
@@ -213,13 +217,13 @@ SubscriberActivity.propTypes = {
     apiEnabled: PropTypes.bool,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     companies: state.companies,
     reportParams: state.reportParams,
     isLoading: state.isLoading,
     sections: state.sections,
 });
 
-const mapDispatchToProps = {toggleFilterAndQuery, fetchReport, runReport};
+const mapDispatchToProps: any = {toggleFilterAndQuery, fetchReport, runReport};
 
 export default connect(mapStateToProps, mapDispatchToProps)(SubscriberActivity);
diff --git a/assets/company-reports/components/UserSavedSearches.jsx b/assets/company-reports/components/UserSavedSearches.tsx
similarity index 87%
rename from assets/company-reports/components/UserSavedSearches.jsx
rename to assets/company-reports/components/UserSavedSearches.tsx
index 3198d9820..324d5c153 100644
--- a/assets/company-reports/components/UserSavedSearches.jsx
+++ b/assets/company-reports/components/UserSavedSearches.tsx
@@ -5,8 +5,8 @@ import ReportsTable from './ReportsTable';
 import {gettext} from 'utils';
 
 
-function UserSavedSearches({results, print}) {
-    const list = results && results.map((item) =>
+function UserSavedSearches({results, print}: any) {
+    const list = results && results.map((item: any) =>
         <tr key={item._id}>
             <td>{item.name}</td>
             <td>{item.is_enabled.toString()}</td>
diff --git a/assets/company-reports/components/index.js b/assets/company-reports/components/index.ts
similarity index 100%
rename from assets/company-reports/components/index.js
rename to assets/company-reports/components/index.ts
diff --git a/assets/company-reports/index.js b/assets/company-reports/index.ts
similarity index 100%
rename from assets/company-reports/index.js
rename to assets/company-reports/index.ts
diff --git a/assets/company-reports/reducers.js b/assets/company-reports/reducers.ts
similarity index 93%
rename from assets/company-reports/reducers.js
rename to assets/company-reports/reducers.ts
index 9ea568802..98a68d796 100644
--- a/assets/company-reports/reducers.js
+++ b/assets/company-reports/reducers.ts
@@ -13,7 +13,7 @@ import {
     GET_PRODUCTS,
 } from './actions';
 
-const initialState = {
+const initialState: any = {
     isLoading: false,
     activeReport: null,
     results: [],
@@ -34,7 +34,7 @@ const initialState = {
 };
 
 
-export default function companyReportReducer(state = initialState, action) {
+export default function companyReportReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case INIT_DATA:
@@ -97,7 +97,7 @@ export default function companyReportReducer(state = initialState, action) {
         };
 
     case GET_PRODUCTS:
-        return {...state, products: action.data};        
+        return {...state, products: action.data};
 
     case 'RECEIVE_REPORT_AGGREGATIONS':
         return {
diff --git a/assets/company-reports/utils.js b/assets/company-reports/utils.ts
similarity index 97%
rename from assets/company-reports/utils.js
rename to assets/company-reports/utils.ts
index 6ac2de778..ead2a379a 100644
--- a/assets/company-reports/utils.js
+++ b/assets/company-reports/utils.ts
@@ -10,7 +10,7 @@ import ProductCompanies from './components/ProductCompanies';
 import ExpiredCompanies from './components/ExpiredCompanies';
 import {REPORTS_NAMES} from './actions';
 
-export const panels = {
+export const panels: any = {
     [REPORTS_NAMES.COMPANY_SAVED_SEARCHES]: CompanySavedSearches,
     [REPORTS_NAMES.USER_SAVED_SEARCHES]: UserSavedSearches,
     [REPORTS_NAMES.COMPANY_PRODUCTS]: CompanyProducts,
diff --git a/assets/components/ActionButton.jsx b/assets/components/ActionButton.tsx
similarity index 91%
rename from assets/components/ActionButton.jsx
rename to assets/components/ActionButton.tsx
index 74977fb1f..a920e5e9f 100644
--- a/assets/components/ActionButton.jsx
+++ b/assets/components/ActionButton.tsx
@@ -5,8 +5,11 @@ import {Tooltip} from 'bootstrap';
 import {isTouchDevice} from 'utils';
 
 
-class ActionButton extends React.Component {
-    constructor(props) {
+class ActionButton extends React.Component<any, any> {
+    static propTypes: any;
+    tooltip: any;
+    elem: any;
+    constructor(props: any) {
         super(props);
 
         this.tooltip = null;
@@ -45,7 +48,7 @@ class ActionButton extends React.Component {
                         }
                     }
                 }
-                ref={(elem) => this.elem = elem}
+                ref={(elem: any) => this.elem = elem}
                 title={!this.props.displayName ? this.props.action.tooltip || this.props.action.name : ''}
                 aria-label={!this.props.displayName ? this.props.action.tooltip || this.props.action.name : this.props.action.name }>
                 <i className={classes}></i>
diff --git a/assets/components/ActionList.jsx b/assets/components/ActionList.tsx
similarity index 89%
rename from assets/components/ActionList.jsx
rename to assets/components/ActionList.tsx
index 6f3cb7a20..0d7c6ce60 100644
--- a/assets/components/ActionList.jsx
+++ b/assets/components/ActionList.tsx
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import ActionButton from './ActionButton';
 
 
-function ActionList({item, group, plan, user, actions, onMouseLeave, showShortcutActions}) {
+function ActionList({item, group, plan, user, actions, onMouseLeave, showShortcutActions}: any) {
     return (
         <div onMouseLeave={onMouseLeave}>
-            {actions.map((action) => (showShortcutActions || !action.shortcut) &&
+            {actions.map((action: any) => (showShortcutActions || !action.shortcut) &&
                 <ActionButton
                     key={action.name}
                     action={action}
diff --git a/assets/components/ActionMenu.jsx b/assets/components/ActionMenu.tsx
similarity index 87%
rename from assets/components/ActionMenu.jsx
rename to assets/components/ActionMenu.tsx
index 9363684cc..b0adfd37f 100644
--- a/assets/components/ActionMenu.jsx
+++ b/assets/components/ActionMenu.tsx
@@ -5,13 +5,15 @@ import {Popover, PopoverBody} from 'reactstrap';
 
 import {gettext} from 'utils';
 
-class ActionMenu extends React.Component {
-    constructor(props) {
+class ActionMenu extends React.Component<any, any> {
+    static propTypes: any;
+    referenceElem: any;
+    constructor(props: any) {
         super(props);
         this.onMouseLeave = this.onMouseLeave.bind(this);
     }
 
-    onMouseLeave(event) {
+    onMouseLeave(event: any) {
         if (this.props.showActions) {
             this.props.onActionList(event, this.props.item, this.props.group);
         }
@@ -22,8 +24,8 @@ class ActionMenu extends React.Component {
         return (
             <div className='btn-group'>
                 <button
-                    ref={(elem) => this.referenceElem = elem}
-                    onClick={(event) => onActionList(event, item, group, plan)}
+                    ref={(elem: any) => this.referenceElem = elem}
+                    onClick={(event: any) => onActionList(event, item, group, plan)}
                     className="icon-button icon-button--secondary"
                     aria-label={gettext('More Actions')}>
                     <i className='icon--more'></i>
diff --git a/assets/components/AuditInformation.jsx b/assets/components/AuditInformation.tsx
similarity index 85%
rename from assets/components/AuditInformation.jsx
rename to assets/components/AuditInformation.tsx
index 36807517b..7ce083240 100644
--- a/assets/components/AuditInformation.jsx
+++ b/assets/components/AuditInformation.tsx
@@ -7,14 +7,15 @@ import {get} from 'lodash';
 import {getEditUsers} from 'actions';
 import {gettext, fullDate, getItemFromArray} from 'utils';
 
-class AuditInformation extends React.Component {
+class AuditInformation extends React.Component<any, any> {
+    static propTypes: any;
     componentWillMount() {
         if (!get(this.props, 'users.length')) {
             this.props.getEditUsers(this.props.item);
         }
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (!get(this.props, 'users.length') && (
             get(this.props, 'item._created') !== get(nextProps, 'item._created') ||
             get(this.props, 'item._updated') !== get(nextProps, 'item._updated')
@@ -23,7 +24,7 @@ class AuditInformation extends React.Component {
         }
     }
 
-    getElement(field) {
+    getElement(field: any) {
         const {item} = this.props;
         const users = get(this.props, 'users.length') ? this.props.users : this.props.editUsers;
         const system = gettext('System');
@@ -87,10 +88,12 @@ AuditInformation.propTypes = {
     className: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({editUsers: state.editUsers});
+const mapStateToProps = (state: any) => ({editUsers: state.editUsers});
 
-const mapDispatchToProps = (dispatch) => ({
-    getEditUsers: (item) => dispatch(getEditUsers(item))
+const mapDispatchToProps = (dispatch: any) => ({
+    getEditUsers: (item: any) => dispatch(getEditUsers(item))
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(AuditInformation);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(AuditInformation);
+
+export default component;
diff --git a/assets/components/BannerDrop.jsx b/assets/components/BannerDrop.tsx
similarity index 91%
rename from assets/components/BannerDrop.jsx
rename to assets/components/BannerDrop.tsx
index bb3465ae8..e1ab4d631 100644
--- a/assets/components/BannerDrop.jsx
+++ b/assets/components/BannerDrop.tsx
@@ -2,14 +2,15 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-class BannerDrop extends React.Component {
-    constructor(props) {
+class BannerDrop extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.state = {open: this.props.isOpen};
         this.toggleOpen = this.toggleOpen.bind(this);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (this.props.id !== nextProps.id &&
                 this.state.open !== nextProps.isOpen) {
             this.setState({open: nextProps.isOpen});
diff --git a/assets/components/BookmarkTabs.jsx b/assets/components/BookmarkTabs.tsx
similarity index 85%
rename from assets/components/BookmarkTabs.jsx
rename to assets/components/BookmarkTabs.tsx
index fa4840fe6..1a1e77dd4 100644
--- a/assets/components/BookmarkTabs.jsx
+++ b/assets/components/BookmarkTabs.tsx
@@ -3,8 +3,8 @@ import PropTypes from  'prop-types';
 import {gettext} from '../utils';
 
 
-export default function BookmarkTabs(props) {
-    const sections = Object.keys(props.sections).map((id) => {
+export default function BookmarkTabs(props: any) {
+    const sections = Object.keys(props.sections).map((id: any) => {
         const section = props.sections[id];
 
         return <a key={section._id}
diff --git a/assets/components/CalendarButton.jsx b/assets/components/CalendarButton.tsx
similarity index 90%
rename from assets/components/CalendarButton.jsx
rename to assets/components/CalendarButton.tsx
index 0e2c09c69..faa985d32 100644
--- a/assets/components/CalendarButton.jsx
+++ b/assets/components/CalendarButton.tsx
@@ -6,20 +6,21 @@ import moment from 'moment';
 import CalendarButtonWrapper from './CalendarButtonWrapper';
 import {EARLIEST_DATE} from '../agenda/utils';
 
-class CalendarButton extends React.Component {
-    constructor (props) {
+class CalendarButton extends React.Component<any, any> {
+    static propTypes: any;
+    constructor (props: any) {
         super(props);
 
         this.state = {startDate: moment(this.props.activeDate).toDate()};
         this.handleChange = this.handleChange.bind(this);
     }
 
-    handleChange(date) {
+    handleChange(date: any) {
         this.props.selectDate(date.valueOf(), 'day');
         this.setState({startDate: date});
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         prevProps.activeDate === EARLIEST_DATE && this.setState({startDate: moment(this.props.activeDate)});
     }
 
diff --git a/assets/components/CalendarButtonWrapper.jsx b/assets/components/CalendarButtonWrapper.tsx
similarity index 88%
rename from assets/components/CalendarButtonWrapper.jsx
rename to assets/components/CalendarButtonWrapper.tsx
index 22b187577..d7ec1328b 100644
--- a/assets/components/CalendarButtonWrapper.jsx
+++ b/assets/components/CalendarButtonWrapper.tsx
@@ -4,7 +4,8 @@ import classNames from 'classnames';
 import moment from 'moment';
 import {AGENDA_DATE_PICKER_FORMAT_SHORT} from '../utils';
 
-class CalendarButtonWrapper extends React.Component {
+class CalendarButtonWrapper extends React.Component<any, any> {
+    static propTypes: any;
     render() {
         return (
             <button className={
diff --git a/assets/components/CardEditor.jsx b/assets/components/CardEditor.tsx
similarity index 92%
rename from assets/components/CardEditor.jsx
rename to assets/components/CardEditor.tsx
index a730ce064..b1d0c0367 100644
--- a/assets/components/CardEditor.jsx
+++ b/assets/components/CardEditor.tsx
@@ -3,8 +3,9 @@ import PropTypes from 'prop-types';
 
 import {gettext} from 'utils';
 
-export default class CardEditor extends React.Component {
-    constructor(props) {
+export default class CardEditor extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.state = {open: this.props.forceEditor};
 
@@ -13,7 +14,7 @@ export default class CardEditor extends React.Component {
         this.onSave = this.onSave.bind(this);
     }
 
-    componentWillReceiveProps(nextProps, nextState) {
+    componentWillReceiveProps(nextProps: any, nextState: any) {
         if (!nextState.open && nextProps.forceEditor) {
             this.setState({open: true});
         }
@@ -33,7 +34,7 @@ export default class CardEditor extends React.Component {
         }
     }
 
-    onSave(event) {
+    onSave(event: any) {
         this.props.onSave(event);
         this.setState({open: false});
     }
@@ -51,7 +52,7 @@ export default class CardEditor extends React.Component {
 
         return (
             <div className={`tab-pane active tab-pane--no-scroll ${editorClassNames}`} id='card-editor'>
-                <form onSubmit={(event) => {event.preventDefault();}}>
+                <form onSubmit={(event: any) => {event.preventDefault();}}>
                     <div className="list-item__preview-form list-item__preview-form--no-scroll pb-0 pt-0">
                         <div className="card mt-3 d-block">
                             <div className="card-header d-flex flex-row">{editorTitle || label}</div>
@@ -94,7 +95,7 @@ export default class CardEditor extends React.Component {
 
         return (
             <div className={`tab-pane active ${previewClassNames}`} id='card-preview'>
-                <form onSubmit={(event) => {event.preventDefault();}}>
+                <form onSubmit={(event: any) => {event.preventDefault();}}>
                     <div className="list-item__preview-form  pb-0 pt-0">
                         <div className="card mt-3 d-block">
                             <div className="card-header d-flex justify-content-start align-items-center">
diff --git a/assets/components/CheckboxInput.jsx b/assets/components/CheckboxInput.tsx
similarity index 83%
rename from assets/components/CheckboxInput.jsx
rename to assets/components/CheckboxInput.tsx
index 26808fca2..859a53048 100644
--- a/assets/components/CheckboxInput.jsx
+++ b/assets/components/CheckboxInput.tsx
@@ -3,13 +3,13 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
 
-function CheckboxInput({name, label, onChange, value, labelClass, readOnly}) {
+function CheckboxInput({name, label, onChange, value, labelClass, readOnly}: any) {
     if (!name) {
         name = `input-${label}`;
     }
 
     return (
-        <div className='form-check' tabIndex='-1' data-test-id={`field-${name}`}>
+        <div className={classNames('form-check', {'form-check--checked': value})} tabIndex={-1} data-test-id={`field-${name}`}>
             <input type="checkbox"
                 name={name}
                 className="form-check-input"
@@ -17,7 +17,7 @@ function CheckboxInput({name, label, onChange, value, labelClass, readOnly}) {
                 id={name}
                 onChange={onChange}
                 disabled={readOnly}
-                tabIndex='0'
+                tabIndex={0}
             />
             <label className={classNames('form-check-label', labelClass)} htmlFor={name}>{label}</label>
         </div>
diff --git a/assets/components/CloseButton.jsx b/assets/components/CloseButton.tsx
similarity index 91%
rename from assets/components/CloseButton.jsx
rename to assets/components/CloseButton.tsx
index 19d164b3b..6b83aaf6e 100644
--- a/assets/components/CloseButton.jsx
+++ b/assets/components/CloseButton.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-function CloseButton({onClick}) {
+function CloseButton({onClick}: any) {
     return (
         <button type="button"
             className="close"
diff --git a/assets/components/DateInput.jsx b/assets/components/DateInput.tsx
similarity index 98%
rename from assets/components/DateInput.jsx
rename to assets/components/DateInput.tsx
index 8d8ba3a4f..5c2ffe571 100644
--- a/assets/components/DateInput.jsx
+++ b/assets/components/DateInput.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import InputWrapper from './InputWrapper';
 
-function DateInput({name, label, onChange, value, error, required}) {
+function DateInput({name, label, onChange, value, error, required}: any) {
     return (
         <InputWrapper error={error} name={name} testId={`field-${name}`}>
             <label htmlFor={name}>{label}</label>
diff --git a/assets/components/Dropdown.jsx b/assets/components/Dropdown.tsx
similarity index 91%
rename from assets/components/Dropdown.jsx
rename to assets/components/Dropdown.tsx
index 014ee2fd0..a260b3b84 100644
--- a/assets/components/Dropdown.jsx
+++ b/assets/components/Dropdown.tsx
@@ -3,13 +3,12 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Dropdown as BootstrapDropdown} from 'bootstrap';
 
-export function Dropdown({children, isActive, icon, label, className, buttonProps, small, stretch}) {
-
-    const dropdown = React.useRef();
-    let dropdownInstance = null;
+export function Dropdown({children, isActive, icon, label, className, buttonProps, small, stretch}: any) {
+    const dropdown: any = React.useRef();
+    let dropdownInstance: any = null;
 
     React.useEffect(() => {
-        dropdownInstance = BootstrapDropdown.getOrCreateInstance(dropdown.current, {boundary: 'window'});
+        dropdownInstance = BootstrapDropdown.getOrCreateInstance(dropdown.current, {boundary: 'window'} as any);
 
         function clickOutside() {
             dropdownInstance.hide();
@@ -29,7 +28,7 @@ export function Dropdown({children, isActive, icon, label, className, buttonProp
             'dropdown',
             className ? className : ''
         )}
-        onClick={(event) => {
+        onClick={(event: any) => {
             event.stopPropagation();
             dropdownInstance.toggle();
         }}
diff --git a/assets/components/DropdownFilter.jsx b/assets/components/DropdownFilter.tsx
similarity index 85%
rename from assets/components/DropdownFilter.jsx
rename to assets/components/DropdownFilter.tsx
index d65f53c6e..3fa56da82 100644
--- a/assets/components/DropdownFilter.jsx
+++ b/assets/components/DropdownFilter.tsx
@@ -4,10 +4,10 @@ import classNames from 'classnames';
 import {gettext} from 'utils';
 import {Dropdown} from './Dropdown';
 
-const compareFunction = (a, b) => String(a.key).localeCompare(String(b.key));
+const compareFunction = (a: any, b: any) => String(a.key).localeCompare(String(b.key));
 
-export const processBuckets = (buckets, filter, toggleFilter) => (filter.notSorted ? buckets : buckets.sort(compareFunction)).map(
-    (bucket, index) =>
+export const processBuckets = (buckets: any, filter: any, toggleFilter: any) => (filter.notSorted ? buckets : buckets.sort(compareFunction)).map(
+    (bucket: any, index: any) =>
         bucket.key === 'divider' ?
             <div className="dropdown-divider" key={index}/> :
             <button
@@ -22,7 +22,7 @@ export const processBuckets = (buckets, filter, toggleFilter) => (filter.notSort
             >{filter.transform ? filter.transform(bucket.key, bucket) : bucket.key}</button>);
 
 
-function getActiveFilterLabel(filter, activeFilter, isActive) {
+function getActiveFilterLabel(filter: any, activeFilter: any, isActive: any) {
     if (isActive) {
         return filter.transform ? filter.transform(activeFilter[filter.field][0]) : gettext(activeFilter[filter.field][0]);
     }
@@ -40,7 +40,7 @@ function DropdownFilter({
     getFilterLabel,
     className,
     buttonProps,
-    ...props}) {
+    ...props}: any) {
     const isActive = !!(activeFilter[filter.field]);
     const filterLabel = getFilterLabel ? getFilterLabel : getActiveFilterLabel;
     const label = filterLabel(filter, activeFilter, isActive, {...props});
@@ -50,7 +50,6 @@ function DropdownFilter({
             key={filter.field}
             icon={filter.icon}
             label={label}
-            resetLabel={gettext(filter.label)}
             className={className}
             buttonProps={buttonProps}
         >
@@ -75,6 +74,7 @@ DropdownFilter.propTypes = {
     className: PropTypes.string,
     autoToggle: PropTypes.bool,
     onClick: PropTypes.func,
+    locators: PropTypes.any,
     buttonProps: PropTypes.shape({
         textOnly: PropTypes.bool,
     }),
diff --git a/assets/components/DropdownFilterButton.jsx b/assets/components/DropdownFilterButton.tsx
similarity index 97%
rename from assets/components/DropdownFilterButton.jsx
rename to assets/components/DropdownFilterButton.tsx
index 083705747..30888670d 100644
--- a/assets/components/DropdownFilterButton.jsx
+++ b/assets/components/DropdownFilterButton.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-function DropdownFilterButton({id, isActive, autoToggle, onClick, icon, label, textOnly}) {
+function DropdownFilterButton({id, isActive, autoToggle, onClick, icon, label, textOnly}: any) {
     return (
         <button
             id={id}
diff --git a/assets/components/EditPanel.jsx b/assets/components/EditPanel.tsx
similarity index 85%
rename from assets/components/EditPanel.jsx
rename to assets/components/EditPanel.tsx
index 7ef87856b..7da41513f 100644
--- a/assets/components/EditPanel.jsx
+++ b/assets/components/EditPanel.tsx
@@ -4,8 +4,9 @@ import {gettext} from '../utils';
 import {isEmpty, get, pickBy, isEqual, every} from 'lodash';
 import CheckboxInput from 'components/CheckboxInput';
 
-class EditPanel extends React.Component {
-    constructor(props) {
+class EditPanel extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.onItemChange = this.onItemChange.bind(this);
         this.toggleSelectAll = this.toggleSelectAll.bind(this);
@@ -14,18 +15,18 @@ class EditPanel extends React.Component {
         this.state = {activeParent: props.parent._id, items: {}};
     }
 
-    onItemChange(event) {
+    onItemChange(event: any) {
         const item = event.target.name;
         const items = Object.assign({}, this.state.items);
         items[item] = !items[item];
         this.updateItems(items);
     }
 
-    toggleSelectAll(availableItems, allActive) {
-        let items = {};
+    toggleSelectAll(availableItems: any, allActive: any) {
+        const items: any = {};
 
         if (!allActive) {
-            availableItems.forEach((item) => {
+            availableItems.forEach((item: any) => {
                 items[item._id] = true;
             });
         }
@@ -33,26 +34,26 @@ class EditPanel extends React.Component {
         this.updateItems(items);
     }
 
-    updateItems(items) {
+    updateItems(items: any) {
         this.setState({items});
         if (this.props.onChange) {
             this.props.onChange({
                 target: {
                     name: this.props.field,
-                    value: Object.keys(items).filter((k) => items[k])
+                    value: Object.keys(items).filter((k: any) => items[k])
                 }
             });
         }
     }
 
-    saveItems(event) {
+    saveItems(event: any) {
         event.preventDefault();
         this.props.onSave(Object.keys(pickBy(this.state.items)));
     }
 
-    initItems(props) {
-        const items = {};
-        props.items.map((item) =>
+    initItems(props: any) {
+        const items: any = {};
+        props.items.map((item: any) =>
             items[item._id] = (props.parent[props.field] || []).includes(item._id));
 
         this.setState({activeParent: props.parent._id, items});
@@ -62,15 +63,15 @@ class EditPanel extends React.Component {
         this.initItems(this.props);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (this.state.activeParent !== nextProps.parent._id ||
             get(this.props, 'items.length', 0) !== get(nextProps, 'items.length', 0)) {
             this.initItems(nextProps);
             return;
         }
 
-        let items = {};
-        nextProps.items.map((item) =>
+        const items: any = {};
+        nextProps.items.map((item: any) =>
             items[item._id] = (nextProps.parent[nextProps.field] || []).includes(item._id));
         if (!isEqual(this.state.items, items)) {
             this.initItems(nextProps);
@@ -78,7 +79,7 @@ class EditPanel extends React.Component {
 
     }
 
-    renderList(items) {
+    renderList(items: any) {
         const allActive = every(items, (item) => {
             return !!this.state.items[item._id];
         });
@@ -95,7 +96,7 @@ class EditPanel extends React.Component {
                         />
                     </li>
                 )}
-                {items.map((item) => (
+                {items.map((item: any) => (
                     <li key={item._id}>
                         <CheckboxInput
                             name={item._id}
@@ -116,10 +117,10 @@ class EditPanel extends React.Component {
                         {!this.props.title ? null : (
                             <div>{this.props.title}</div>
                         )}
-                        {!isEmpty(this.props.groups) && this.props.groups.map((group) => (
+                        {!isEmpty(this.props.groups) && this.props.groups.map((group: any) => (
                             <div className="form-group" key={group._id}>
                                 <label>{group.name}</label>
-                                {this.renderList(this.props.items.filter((item) => get(item, this.props.groupField, this.props.groupDefaultValue) === group._id))}
+                                {this.renderList(this.props.items.filter((item: any) => get(item, this.props.groupField, this.props.groupDefaultValue) === group._id))}
                             </div>
                         ))}
                         {isEmpty(this.props.groups) && this.renderList(this.props.items)}
diff --git a/assets/components/ExpiryButtonWrapper.jsx b/assets/components/ExpiryButtonWrapper.tsx
similarity index 94%
rename from assets/components/ExpiryButtonWrapper.jsx
rename to assets/components/ExpiryButtonWrapper.tsx
index c399d570d..1223ab596 100644
--- a/assets/components/ExpiryButtonWrapper.jsx
+++ b/assets/components/ExpiryButtonWrapper.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-export default class ExpiryButtonWrapper extends React.PureComponent {
+export default class ExpiryButtonWrapper extends React.PureComponent<any, any> {
+    static propTypes: any;
     render() {
         return (
             <button
diff --git a/assets/components/ExpiryDateInput.jsx b/assets/components/ExpiryDateInput.tsx
similarity index 90%
rename from assets/components/ExpiryDateInput.jsx
rename to assets/components/ExpiryDateInput.tsx
index 05266f014..5691077bc 100644
--- a/assets/components/ExpiryDateInput.jsx
+++ b/assets/components/ExpiryDateInput.tsx
@@ -7,9 +7,13 @@ import ExpiryButtonWrapper from './ExpiryButtonWrapper';
 
 import {gettext} from '../utils';
 
+const DatePickerComponent: React.ComponentType<any> = DatePicker;
 
-export default class ExpiryDateInput extends React.Component {
-    constructor(props) {
+
+export default class ExpiryDateInput extends React.Component<any, any> {
+    static propTypes: any;
+    options: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {value: !this.props.value ? 'never' : 'on'};
@@ -28,9 +32,9 @@ export default class ExpiryDateInput extends React.Component {
         this.onDateChange = this.onDateChange.bind(this);
     }
 
-    onSelectChange(event) {
+    onSelectChange(event: any) {
         this.setState({value: event.target.value});
-        let newDate;
+        let newDate: any;
 
         switch (event.target.value) {
         case '1 week':
@@ -57,7 +61,7 @@ export default class ExpiryDateInput extends React.Component {
         }
     }
 
-    onDateChange(newExpiry) {
+    onDateChange(newExpiry: any) {
         this.setState({value: 'on'});
         this.props.onChange(newExpiry.format('YYYY-MM-DD'));
     }
@@ -74,14 +78,14 @@ export default class ExpiryDateInput extends React.Component {
                         onChange={this.onSelectChange}
                         className="form-control expiry-date__select-input"
                     >
-                        {this.options.map((option) => {
+                        {this.options.map((option: any) => {
                             return (
                                 <option key={option.value} value={option.value}>{option.text}</option>
                             );
                         })}
                     </select>
 
-                    <DatePicker
+                    <DatePickerComponent
                         dropdownMode="select"
                         disabled={this.state.value === 'never'}
                         customInput={<ExpiryButtonWrapper />}
diff --git a/assets/components/FileInput.jsx b/assets/components/FileInput.tsx
similarity index 98%
rename from assets/components/FileInput.jsx
rename to assets/components/FileInput.tsx
index b311063d0..2dc3db81f 100644
--- a/assets/components/FileInput.jsx
+++ b/assets/components/FileInput.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import InputWrapper from './InputWrapper';
 
-function FileInput({name, label, onChange, error, accept, required}) {
+function FileInput({name, label, onChange, error, accept, required}: any) {
     return (
         <InputWrapper error={error} name={name}>
             <label htmlFor={name}>{label}</label>
diff --git a/assets/components/InputWrapper.jsx b/assets/components/InputWrapper.tsx
similarity index 88%
rename from assets/components/InputWrapper.jsx
rename to assets/components/InputWrapper.tsx
index cfb117ffa..cf4a76948 100644
--- a/assets/components/InputWrapper.jsx
+++ b/assets/components/InputWrapper.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-function InputWrapper({error, name, label, children, testId}) {
+function InputWrapper({error, name, label, children, testId}: any) {
     let wrapperClass = 'form-group';
 
     if (error && error.length > 0) {
diff --git a/assets/components/ListBar.jsx b/assets/components/ListBar.tsx
similarity index 90%
rename from assets/components/ListBar.jsx
rename to assets/components/ListBar.tsx
index adb0d9fe6..93913c020 100644
--- a/assets/components/ListBar.jsx
+++ b/assets/components/ListBar.tsx
@@ -4,7 +4,9 @@ import classNames from 'classnames';
 
 import SearchBar from 'search/components/SearchBar';
 
-class ListBar extends React.Component {
+class ListBar extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
     render() {
         return (
             <section className="content-header" data-test-id={this.props.testId}>
@@ -26,8 +28,9 @@ class ListBar extends React.Component {
                     <div className="content-bar__right">
                         {this.props.onNewItem && (
                             <button
-                                data-test-id="new-item-btn"
                                 className="nh-button nh-button--primary"
+                                data-test-id="new-item-btn"
+                                disabled={this.props.disabled}
                                 onClick={() => this.props.onNewItem()}
                             >
                                 {this.props.buttonText}
@@ -50,6 +53,7 @@ ListBar.propTypes = {
     noLeftPadding: PropTypes.bool,
     enableQueryAction: PropTypes.bool,
     testId: PropTypes.string,
+    disabled: PropTypes.bool,
 };
 
 ListBar.defaultProps = {enableQueryAction: true};
diff --git a/assets/components/ListViewOptions.jsx b/assets/components/ListViewOptions.tsx
similarity index 90%
rename from assets/components/ListViewOptions.jsx
rename to assets/components/ListViewOptions.tsx
index 27bc5433e..9810195d8 100644
--- a/assets/components/ListViewOptions.jsx
+++ b/assets/components/ListViewOptions.tsx
@@ -7,8 +7,13 @@ import {gettext} from 'utils';
 import {EXTENDED_VIEW, COMPACT_VIEW} from 'wire/defaults';
 import {isTouchDevice} from 'utils';
 
-class ListViewOptions extends React.PureComponent {
-    constructor(props) {
+class ListViewOptions extends React.PureComponent<any, any> {
+    static propTypes: any;
+    views: any;
+    tooltip: any;
+    elem: any;
+
+    constructor(props: any) {
         super(props);
         this.state = {isOpen: false};
         this.views = [
@@ -26,7 +31,7 @@ class ListViewOptions extends React.PureComponent {
         this.setState({isOpen: !this.state.isOpen});
     }
 
-    setView(view) {
+    setView(view: any) {
         this.setState({isOpen: false});
         this.props.setView(view.type);
     }
@@ -47,7 +52,7 @@ class ListViewOptions extends React.PureComponent {
         document.removeEventListener('mousedown', this.handleClickOutside);
     }
 
-    handleClickOutside(e) {
+    handleClickOutside(e: any) {
         if (this.state.isOpen && !this.elem.contains(e.target)) {
             this.setState({isOpen: false});
         }
@@ -66,7 +71,7 @@ class ListViewOptions extends React.PureComponent {
                 {this.state.isOpen && (
                     <div className='dropdown-menu dropdown-menu-right show'>
                         <h6 className='dropdown-header'>{gettext('Change view')}</h6>
-                        {this.views.map((view) => (
+                        {this.views.map((view: any) => (
                             <button
                                 key={view.type}
                                 className='dropdown-item'
diff --git a/assets/components/Modal.jsx b/assets/components/Modal.tsx
similarity index 81%
rename from assets/components/Modal.jsx
rename to assets/components/Modal.tsx
index 48b8a3ba4..cc3028da2 100644
--- a/assets/components/Modal.jsx
+++ b/assets/components/Modal.tsx
@@ -17,7 +17,7 @@ import classNames from 'classnames';
  * @param {string} type
  * @param {func} onClick
  */
-export function ModalPrimaryButton({label, type, onClick, disabled}) {
+export function ModalPrimaryButton({label, type, onClick, disabled}: any) {
     assertButtonHandler(label, type, onClick);
     return (
         <button type={type || 'button'}
@@ -42,7 +42,7 @@ ModalPrimaryButton.propTypes = {
  * @param {string} type
  * @param {func} onClick
  */
-export function ModalSecondaryButton({label, type, onClick}) {
+export function ModalSecondaryButton({label, type, onClick}: any) {
     assertButtonHandler(label, type, onClick);
     return (
         <button type={type || 'button'}
@@ -67,14 +67,19 @@ ModalSecondaryButton.propTypes = {
  * @param {string} type
  * @param {func} onClick
  */
-function assertButtonHandler(label, type, onClick) {
+function assertButtonHandler(label: any, type: any, onClick: any) {
     if (!type && !onClick) {
         console.warn('You should use either type or onClick handler for button', label);
     }
 }
 
-class Modal extends React.Component {
-    constructor(props) {
+class Modal extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+
+    modal: any;
+    elem: any;
+    constructor(props: any) {
         super(props);
         this.onSubmit = this.onSubmit.bind(this);
         this.state = {submitting: false};
@@ -82,7 +87,7 @@ class Modal extends React.Component {
     }
 
     componentDidMount() {
-        const options = {};
+        const options: any = {};
 
         if (!this.props.clickOutsideToClose) {
             options.backdrop = 'static';
@@ -103,7 +108,7 @@ class Modal extends React.Component {
         }
     }
 
-    onSubmit(e) {
+    onSubmit(e: any) {
         if (this.props.disableButtonOnSubmit) {
             this.setState({submitting: true});
             this.props.onSubmit(e);
@@ -114,11 +119,21 @@ class Modal extends React.Component {
     }
 
     render() {
+        const className = ['modal'];
+
+        if (this.props.width === 'full') {
+            className.push('modal--full-width');
+        } else {
+            className.push('mt-xl-5'); // adds top margin
+        }
+
         return (
-            <div className={classNames('modal mt-xl-5', {
-                'modal--full-width': this.props.width === 'full',
-            })}
-            ref={(elem) => this.elem = elem} role={gettext('dialog')} aria-label={this.props.title}>
+            <div
+                className={className.join(' ')}
+                ref={(elem: any) => this.elem = elem}
+                role={gettext('dialog')}
+                aria-label={this.props.title}
+            >
                 <h3 className="a11y-only">{this.props.title}</h3>
                 <div className="modal-dialog">
                     <div className="modal-content">
@@ -169,6 +184,8 @@ Modal.defaultProps = {
     clickOutsideToClose: false,
 };
 
-const mapStateToProps = (state) => ({formValid: get(state, 'modal.formValid')});
+const mapStateToProps = (state: any) => ({formValid: get(state, 'modal.formValid')});
+
+const component: React.ComponentType<any> = connect(mapStateToProps, {closeModal})(Modal);
 
-export default connect(mapStateToProps, {closeModal})(Modal);
+export default component;
diff --git a/assets/components/MultiSelectDropdown.jsx b/assets/components/MultiSelectDropdown.tsx
similarity index 94%
rename from assets/components/MultiSelectDropdown.jsx
rename to assets/components/MultiSelectDropdown.tsx
index b8cc6af88..14229d8f2 100644
--- a/assets/components/MultiSelectDropdown.jsx
+++ b/assets/components/MultiSelectDropdown.tsx
@@ -4,13 +4,13 @@ import classNames from 'classnames';
 import {gettext} from 'utils';
 import {Dropdown} from './Dropdown';
 
-function MultiSelectDropdown({values, label, field, options, onChange, showAllButton, multi}) {
-    const onChanged = (option) => {
+function MultiSelectDropdown({values, label, field, options, onChange, showAllButton, multi}: any) {
+    const onChanged = (option: any) => {
         if (multi) {
             if (option === 'all') {
                 onChange(field, []);
             } else if (values.includes(option)) {
-                onChange(field, values.filter((o) => o !== option));
+                onChange(field, values.filter((o: any) => o !== option));
             } else {
                 onChange(field, [...values, option]);
             }
@@ -61,7 +61,7 @@ function MultiSelectDropdown({values, label, field, options, onChange, showAllBu
                     <div className='dropdown-divider' />
                 </Fragment>
             )}
-            {options.map((option) => (
+            {options.map((option: any) => (
                 <Fragment key={option.value}>
                     <button
                         className='dropdown-item'
diff --git a/assets/components/NotificationList.jsx b/assets/components/NotificationList.tsx
similarity index 90%
rename from assets/components/NotificationList.jsx
rename to assets/components/NotificationList.tsx
index b28f3aa06..673b5cedc 100644
--- a/assets/components/NotificationList.jsx
+++ b/assets/components/NotificationList.tsx
@@ -8,8 +8,12 @@ import {gettext} from 'utils';
 import {isTouchDevice} from '../utils';
 import NotificationListItem from './NotificationListItem';
 
-class NotificationList extends React.Component {
-    constructor(props) {
+class NotificationList extends React.Component<any, any> {
+    static propTypes: any;
+    tooltip: any;
+    elem: any;
+
+    constructor(props: any) {
         super(props);
         this.state = {
             displayItems: false,
@@ -49,7 +53,7 @@ class NotificationList extends React.Component {
         this.setState({connected: false});
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         if (this.state.displayItems && this.props.count !== prevProps.count) {
             this.props.loadNotifications();
         }
@@ -59,9 +63,9 @@ class NotificationList extends React.Component {
         this.setState({displayItems:!this.state.displayItems});
         if (!this.state.displayItems) {
             this.props.loadNotifications();
-            document.getElementById('header-notification').classList.add('navbar-notifications--open');
+            (document.getElementById('header-notification') as HTMLElement).classList.add('navbar-notifications--open');
         } else {
-            document.getElementById('header-notification').classList.remove('navbar-notifications--open');
+            (document.getElementById('header-notification') as HTMLElement).classList.remove('navbar-notifications--open');
         }
     }
 
@@ -80,7 +84,7 @@ class NotificationList extends React.Component {
                         'navbar-notifications__inner-circle',
                         {'navbar-notifications__inner-circle--disconnected': !this.state.connected}
                     )}
-                    ref={(elem) => this.elem = elem}
+                    ref={(elem: any) => this.elem = elem}
                     title={gettext('Notifications')}>
                     <h3 className="a11y-only">Notification bell</h3>
                     <i className='icon--alert' onClick={this.toggleDisplay} />
@@ -110,7 +114,7 @@ class NotificationList extends React.Component {
                                 {gettext('Loading...')}
                             </div>
                         ) : (
-                            this.props.notifications.map((notification) => (
+                            this.props.notifications.map((notification: any) => (
                                 <NotificationListItem
                                     key={get(this.props.items, `${notification.item}._id`, 'test')}
                                     item={get(
diff --git a/assets/components/NotificationListItem.jsx b/assets/components/NotificationListItem.tsx
similarity index 97%
rename from assets/components/NotificationListItem.jsx
rename to assets/components/NotificationListItem.tsx
index 8b479a1d3..e58009e49 100644
--- a/assets/components/NotificationListItem.jsx
+++ b/assets/components/NotificationListItem.tsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import CloseButton from './CloseButton';
 import {renderNotificationComponent} from 'notifications/components/notificationItems';
 
-function NotificationListItem({notification, item, clearNotification}) {
+function NotificationListItem({notification, item, clearNotification}: any) {
     return (
         <div key={item._id} className='notif__list__item'>
             <CloseButton onClick={() => clearNotification(item._id)}/>
diff --git a/assets/components/PersonalizeHomeModal.tsx b/assets/components/PersonalizeHomeModal.tsx
new file mode 100644
index 000000000..c58199a7d
--- /dev/null
+++ b/assets/components/PersonalizeHomeModal.tsx
@@ -0,0 +1,356 @@
+/* eslint-disable react/no-unescaped-entities */
+import React from 'react';
+import {connect} from 'react-redux';
+import {partition} from 'lodash';
+import {gettext} from 'utils';
+import Modal from 'components/Modal';
+import {Input} from 'reactstrap';
+import CheckboxInput from './CheckboxInput';
+import {IUser, IUserDashboard} from 'interfaces/user';
+import {RadioButtonGroup} from 'features/sections/SectionSwitch';
+import {modalFormInvalid, modalFormValid} from 'actions';
+import {updateUser} from 'users/actions';
+import {getCurrentUser} from 'company-admin/selectors';
+import {IAgendaState} from 'agenda/reducers';
+import {ITopic} from 'interfaces/topic';
+
+interface IMapStateProps {
+    topics: Array<ITopic>;
+    currentUser: IUser;
+}
+
+interface IMapDispatchProps {
+    saveUser: (updates: Partial<IUser>) => void;
+    modalFormValid: () => void;
+    modalFormInvalid: () => void;
+}
+
+interface IOwnProps {
+    closeModal?: () => void;
+}
+
+type IProps = IMapStateProps & IMapDispatchProps & IOwnProps;
+
+interface IState {
+    selectedTopicIds: Array<string>;
+    activeSection: string;
+    searchTerm: string;
+    isLoading: boolean;
+}
+
+const MAX_SELECTED_TOPICS = 6;
+
+const getSelectedTopicIds = (user: IUser) => {
+    if (user.dashboards?.length) {
+        return user.dashboards[0].topic_ids ?? [];
+    }
+
+    return [];
+};
+
+class PersonalizeHomeModal extends React.Component<IProps, IState> {
+
+    wireTopics: Array<ITopic>;
+    wireTopicsById: Map<ITopic['_id'], ITopic>;
+
+    constructor(props: any) {
+        super(props);
+
+        const [wireTopics, agendaTopics] = partition(this.props.topics, (topic) => topic.topic_type === 'wire');
+
+        this.wireTopics = wireTopics ?? [];
+        this.wireTopicsById = new Map(this.wireTopics.map((topic) => [topic._id, topic]));
+
+        this.state = {
+            selectedTopicIds: getSelectedTopicIds(this.props.currentUser),
+            activeSection: '1',
+            searchTerm: '',
+            isLoading: false,
+        };
+    }
+
+    componentDidUpdate(): void {
+        if (this.state.selectedTopicIds.length > 0) {
+            this.props.modalFormValid();
+        } else {
+            this.props.modalFormInvalid();
+        }
+    }
+
+    handleChange(topicId: string) {
+        let updatedTopics = this.state.selectedTopicIds.concat();
+
+        if (this.state.selectedTopicIds.includes(topicId)) {
+            updatedTopics = updatedTopics.filter((_id) => _id !== topicId);
+        } else if (this.state.selectedTopicIds.length < MAX_SELECTED_TOPICS) {
+            updatedTopics.unshift(topicId);
+        }
+
+        this.setState({
+            selectedTopicIds: updatedTopics,
+        });
+    }
+
+    addCustomDashboard(name: string) {
+        this.setState({isLoading: true});
+
+        const newDashboard: IUserDashboard = {
+            type: '4-picture-text',
+            topic_ids: this.state.selectedTopicIds,
+            name: name,
+        };
+
+        this.props.saveUser({dashboards: [newDashboard]});
+
+        this.setState({isLoading: false});
+    }
+
+    getSelectedTopics() {
+        const topics: Array<ITopic> = [];
+
+        this.state.selectedTopicIds.map((topicId) => this.wireTopicsById.get(topicId)).forEach((topic) => {
+            if (topic != null) {
+                topics.push(topic);
+            }
+        });
+
+        return topics;
+    }
+
+    render() {
+        const NoSearchMatches = () => (
+            <div className="empty-state__container mt-3">
+                <div className="empty-state">
+                    <figure className="empty-state__graphic">
+                        <img src="/static/empty-states/empty_state--small.svg" role="presentation" alt="" />
+                    </figure>
+                    <figcaption className="empty-state__text">
+                        <h4 className="empty-state__text-heading">{gettext('You don\'t have any saved Topics yet.')}</h4>
+                        <p className="empty-state__text-description">
+                            {gettext('You can create Topics by saving search terms and/or filters from the Wire and Agenda sections.')}
+                        </p>
+                        <div className="empty-state__links">
+                            <a className="" href="/wire">{gettext('Go to Wire')}</a>
+                            <a className="" href="/agenda">{gettext('Go to Agenda')}</a>
+                        </div>
+                    </figcaption>
+                </div>
+            </div>
+        );
+
+        const NoSelectedTopics = () => (
+            <div className="empty-state__container empty-state__container--full-height">
+                <div
+                    style={{
+                        display: 'flex',
+                        flexDirection: 'column',
+                        alignItems: 'center',
+                    }}
+                    className="empty-state empty-state--large"
+                >
+                    <figure className="empty-state__graphic">
+                        <img src="/static/empty-states/empty_state--small.svg" role="presentation" alt="" />
+                    </figure>
+                    <figcaption className="empty-state__text">
+                        <h4 className="empty-state__text-heading">{gettext('You don\'t have any saved Topics yet')}</h4>
+                        <p className="empty-state__text-description">
+                            {gettext('You can create Topics by saving search terms and/or filters from the Wire and Agenda sections.')}
+                        </p>
+                    </figcaption>
+                </div>
+            </div>
+        );
+
+        const filteredTopics = (topics: Array<ITopic>) =>
+            topics.filter(({is_global}) => this.state.activeSection === '1' ? is_global != true : is_global === true);
+
+        const searchMatches = filteredTopics(this.wireTopics)
+            .filter((topic) => topic.label.toLowerCase().includes(this.state.searchTerm.toLowerCase()))
+            .map((topic) => (
+                <CheckboxInput
+                    key={topic._id}
+                    value={this.state.selectedTopicIds.includes(topic._id)}
+                    onChange={() => {
+                        this.handleChange(topic._id);
+                    }}
+                    label={gettext(topic.label)}
+                />
+            ));
+
+        const topicSearch = (searchMatches?.length ?? 0) > 0
+            ? (
+                <div style={{padding: 4}}>
+                    {searchMatches}
+                </div>
+            ) : <NoSearchMatches />;
+
+        const groupedTopics = (this.props.topics?.length ?? 0) > 0 ? (
+            <div>
+                <div className='boxed-checklist'>
+                    {filteredTopics(this.wireTopics).map((wireTopic) => (
+                        <CheckboxInput
+                            key={wireTopic._id}
+                            value={this.state.selectedTopicIds.includes(wireTopic._id)}
+                            onChange={() => {
+                                this.handleChange(wireTopic._id);
+                            }}
+                            label={gettext(wireTopic.label)}
+                        />
+                    ))}
+                </div>
+            </div>
+        ) : (
+            NoSearchMatches()
+        );
+
+        const selectedTopics = (
+            <div className="simple-card__list pt-3">
+                {this.getSelectedTopics().map((topic) => {
+                    return (
+                        <div
+                            style={{
+                                width: '100%',
+                            }}
+                            key={topic._id}
+                            className="simple-card flex-row simple-card--compact simple-card--draggable"
+                        >
+                            <div style={{paddingLeft: 24}} className='simple-card__content'>
+                                <h6 className="simple-card__headline" title="">{topic.label}</h6>
+                                <div className="simple-card__row">
+                                    <div className="simple-card__column simple-card__column--align-start">
+                                        <span className="simple-card__date">
+                                            {topic.is_global != false ? gettext('Company Topics') : gettext('My Topics')}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div className='simple-card__actions'>
+                                <button
+                                    type="button"
+                                    className="icon-button icon-button--secondary icon-button--small"
+                                    title=""
+                                    aria-label={gettext('Delete')}
+                                    onClick={() => {
+                                        this.handleChange(topic._id);
+                                    }}
+                                >
+                                    <i className="icon--trash" />
+                                </button>
+                            </div>
+                        </div>
+                    );
+                })}
+            </div>
+        );
+
+        return (
+            <Modal
+                width="full"
+                closeModal={this.props.closeModal}
+                title={gettext('Personalize Home')}
+                onSubmitLabel={gettext('Save')}
+                disableButtonOnSubmit={this.state.isLoading}
+                onSubmit={() => {
+                    this.addCustomDashboard(gettext('My Home'));
+                }}
+            >
+                <div
+                    style={{
+                        display: 'flex',
+                        flexDirection: 'row',
+                        justifyContent: 'space-between',
+                        gap: 12,
+                        height: '100%',
+                    }}
+                >
+                    <aside style={{width: '25%'}} className="full-page-layout__content-aside">
+                        <div className="full-page-layout__content-aside-inner">
+                            <p className='font-size--medium text-color--muted mt-1 mb-3'>
+                                {gettext('Select up to 6 Topics you want to display on your personal Home screen.')}
+                            </p>
+                            <p className='font-size--large'>{gettext('{{size}} out of 6 topics selected', {size: this.state.selectedTopicIds.length || 0})}</p>
+                            <RadioButtonGroup
+                                activeOptionId={this.state.activeSection}
+                                options={[
+                                    {
+                                        _id: '1',
+                                        name: gettext('My topics'),
+                                    },
+                                    {
+                                        _id: '2',
+                                        name: gettext('Company topics'),
+                                    },
+                                ]}
+                                switchOptions={(optionId) => {
+                                    this.setState({
+                                        activeSection: optionId
+                                    });
+                                }}
+                            />
+                            <div style={{padding: 6}} />
+                            <div className="search search--small search--with-icon search--bordered m-0">
+                                <form className="search__form" role="search" aria-label="search">
+                                    <i className="icon--search icon--muted-2"></i>
+                                    <input
+                                        onChange={(e) => {
+                                            this.setState({
+                                                searchTerm: e.target.value,
+                                            });
+                                        }}
+                                        value={this.state.searchTerm}
+                                        type="text"
+                                        name="q"
+                                        className="search__input form-control"
+                                        placeholder={gettext('Search Topics')}
+                                        aria-label={gettext('Search Topics')}
+                                    />
+                                    <div className="search__form-buttons">
+                                        <button className="search__button-clear" aria-label={gettext('Clear search')} type="reset">
+                                            <svg fill="none" height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg">
+                                                <path clipRule="evenodd" d="m9 18c4.9706 0 9-4.0294 9-9 0-4.97056-4.0294-9-9-9-4.97056 0-9 4.02944-9 9 0 4.9706 4.02944 9 9 9zm4.9884-12.58679-3.571 3.57514 3.5826 3.58675-1.4126 1.4143-3.58252-3.5868-3.59233 3.5965-1.41255-1.4142 3.59234-3.59655-3.54174-3.54592 1.41254-1.41422 3.54174 3.54593 3.57092-3.57515z" fill="var(--color-text)" fillRule="evenodd" opacity="1"></path>
+                                            </svg>
+                                        </button>
+                                    </div>
+                                </form>
+                            </div>
+                            {this.state.searchTerm ? topicSearch : groupedTopics}
+                        </div>
+                    </aside>
+                    <div
+                        style={{
+                            width: '75%',
+                            display: 'flex',
+                            flexDirection: 'column',
+                            alignItems: 'center',
+                        }}
+                        className='full-page-layout__content-main'
+                    >
+                        <Input disabled value={gettext('My Home')} />
+                        {/* FIXME: For the MVP we won't have the option for draggable list items sorting */}
+                        {/* <div className="py-3 mt-4 mb-2 border border--medium border-start-0 border-end-0 border--dotted">
+                            <p className='font-size--medium text-color--muted m-0'>
+                                <span className='text-color--default fw-bold'>Hint: </span>
+                                Drag and drop items to change the order. This will change the order of the topics are displayed on the Home screen.
+                            </p>
+                        </div> */}
+                        {this.state.selectedTopicIds.length > 0 ? selectedTopics : <NoSelectedTopics />}
+                    </div>
+                </div>
+            </Modal>
+        );
+    }
+}
+
+const mapStateToProps = (state: IAgendaState) => ({
+    topics: state.topics,
+    currentUser: getCurrentUser(state),
+});
+
+const mapDispatchToProps = ({
+    modalFormValid: () => modalFormValid(),
+    modalFormInvalid: () => modalFormInvalid(),
+    saveUser: (updates: Partial<IUser>) => updateUser(updates),
+});
+
+export const PersonalizeHomeSettingsModal =
+    connect<IMapStateProps, IMapDispatchProps, IOwnProps, IAgendaState>(mapStateToProps, mapDispatchToProps)(PersonalizeHomeModal);
diff --git a/assets/components/PreviewActionButtons.jsx b/assets/components/PreviewActionButtons.tsx
similarity index 93%
rename from assets/components/PreviewActionButtons.jsx
rename to assets/components/PreviewActionButtons.tsx
index 8d21711be..13e314220 100644
--- a/assets/components/PreviewActionButtons.jsx
+++ b/assets/components/PreviewActionButtons.tsx
@@ -4,8 +4,8 @@ import ActionButton from './ActionButton';
 import types from 'wire/types';
 
 
-function PreviewActionButtons({item, user, actions, plan, group}) {
-    const actionButtons = actions.map((action) =>
+function PreviewActionButtons({item, user, actions, plan, group}: any) {
+    const actionButtons = actions.map((action: any) =>
         <ActionButton
             key={action.name}
             item={item}
diff --git a/assets/components/SelectInput.jsx b/assets/components/SelectInput.tsx
similarity index 95%
rename from assets/components/SelectInput.jsx
rename to assets/components/SelectInput.tsx
index fc4d56316..0261d1d5c 100644
--- a/assets/components/SelectInput.jsx
+++ b/assets/components/SelectInput.tsx
@@ -11,7 +11,7 @@ const SelectInput = ({
     error,
     options,
     className,
-    readOnly}) => {
+    readOnly}: any) => {
     return (
         <div
             className={className ? className : 'form-group'}
@@ -29,7 +29,7 @@ const SelectInput = ({
                     {defaultOption != null &&
                         <option value="">{defaultOption}</option>
                     }
-                    {options.map((option) => {
+                    {options.map((option: any) => {
                         return <option key={option.value} value={option.value}>{gettext(option.text)}</option>;
                     })}
                 </select>
diff --git a/assets/components/ShareItemModal.jsx b/assets/components/ShareItemModal.jsx
deleted file mode 100644
index a81c4d89e..000000000
--- a/assets/components/ShareItemModal.jsx
+++ /dev/null
@@ -1,160 +0,0 @@
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import {connect} from 'react-redux';
-import {omit, get, sortBy} from 'lodash';
-import {gettext, toggleValue} from 'utils';
-import {submitShareItem} from 'search/actions';
-import {submitShareTopic} from 'user-profile/actions';
-import {modalFormInvalid, modalFormValid} from 'actions';
-
-import Modal from 'components/Modal';
-import SearchBar from 'search/components/SearchBar';
-
-class ShareItemModal extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            message: '',
-            users: [],
-            displayUsers: this.props.data.users,
-            items: this.props.data.items
-        };
-        this.onSubmit = this.onSubmit.bind(this);
-        this.getUsers = this.getUsers.bind(this);
-    }
-
-    onSubmit(event) {
-        event.preventDefault();
-        if (this.state.users.length) {
-            return this.props.submit(!!this.props.data.isTopic, omit(this.state, 'displayUsers'));
-        }
-    }
-
-    onChangeHandler(field) {
-        return (event) => {
-            this.setState({
-                [field]: event.target.value,
-            });
-        };
-    }
-
-    toggleUser(userId, all) {
-        let newValue;
-        if (all) {
-            newValue = this.props.data.users.length === this.state.users.length ? [] :
-                this.props.data.users.map((u) => u._id);
-        } else {
-            newValue = toggleValue(this.state.users, userId);
-        }
-
-        this.setState({users: newValue});
-
-        if (newValue.length === 0) {
-            this.props.modalFormInvalid();
-        } else {
-            this.props.modalFormValid();
-        }
-    }
-
-    toggleAllUsers() {
-        this.toggleUser(null, true);
-    }
-
-    getUsers(q) {
-        this.setState({
-            displayUsers: q ? this.props.data.users.filter((u) =>
-                (this.getUserName(u).toLowerCase()).includes(q.toLowerCase())) : this.props.data.users
-        });
-    }
-
-    getUserName(user) {
-        return `${user.first_name} ${user.last_name}`;
-    }
-
-    render() {
-        const selectAllText = this.props.data.users.length === this.state.users.length ? gettext('Deselect All') :
-            gettext('Select All');
-        const usersList = sortBy(this.state.displayUsers, 'first_name').map((user, index) => (
-            <tr key={index}>
-                <td>
-                    <input id={user._id} type="checkbox"
-                        checked={this.state.users.indexOf(user._id) > -1}
-                        onChange={() => this.toggleUser(user._id)} />
-                </td>
-                <td>
-                    <label htmlFor={user._id}>{this.getUserName(user)}</label>
-                </td>
-            </tr>
-        ));
-
-        return (
-            <Modal
-                onSubmit={this.onSubmit}
-                title={gettext('Share Item')}
-                onSubmitLabel={gettext('Share')}
-                disableButtonOnSubmit >
-                <SearchBar
-                    fetchItems={this.getUsers}
-                    enableQueryAction={false}
-                />
-                <form onSubmit={this.onSubmit}>
-                    <div className="form-group search-user-list">
-                        <label htmlFor="users">{gettext('People')}</label>
-                        <table className="table">
-                            <thead>
-                                {usersList.length > 0 && <tr>
-                                    <th>
-                                        <input id="check-all" type="checkbox"
-                                            onChange={() => this.toggleAllUsers()}
-                                            checked={this.state.users.length === this.props.data.users.length}
-                                        />
-                                    </th>
-                                    <th>
-                                        <label htmlFor="check-all">{selectAllText}</label>
-                                    </th>
-                                </tr>}
-                            </thead>
-                            <tbody>
-                                {usersList}
-                            </tbody>
-                        </table>
-                    </div>
-                    <div className="form-group user-msg">
-                        <label htmlFor="message">{gettext('Message')}</label>
-                        <textarea className="form-control"
-                            id="message"
-                            value={this.state.message}
-                            onChange={this.onChangeHandler('message')}
-                        />
-                    </div>
-                </form>
-            </Modal>
-        );
-    }
-}
-
-ShareItemModal.propTypes = {
-    submit: PropTypes.func.isRequired,
-    modalFormInvalid: PropTypes.func,
-    modalFormValid: PropTypes.func,
-    data: PropTypes.shape({
-        items: PropTypes.arrayOf(PropTypes.string).isRequired,
-        users: PropTypes.arrayOf(PropTypes.shape({
-            _id: PropTypes.string.isRequired,
-            first_name: PropTypes.string.isRequired,
-            last_name: PropTypes.string.isRequired,
-        })),
-        isTopic: PropTypes.bool,
-    }),
-};
-
-const mapStateToProps = (state) => ({formValid: get(state, 'modal.formValid')});
-
-const mapDispatchToProps = (dispatch) => ({
-    submit: (isFolllowedTopic, data) => isFolllowedTopic ? dispatch(submitShareTopic(data)) : dispatch(submitShareItem(data)),
-    modalFormInvalid: () => dispatch(modalFormInvalid()),
-    modalFormValid: () => dispatch(modalFormValid()),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ShareItemModal);
diff --git a/assets/components/ShareItemModal.tsx b/assets/components/ShareItemModal.tsx
new file mode 100644
index 000000000..204f186c2
--- /dev/null
+++ b/assets/components/ShareItemModal.tsx
@@ -0,0 +1,185 @@
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {connect} from 'react-redux';
+import {omit, get, sortBy} from 'lodash';
+import {gettext, toggleValue} from 'utils';
+import {submitShareItem} from 'search/actions';
+import {submitShareTopic} from 'user-profile/actions';
+import {modalFormInvalid, modalFormValid} from 'actions';
+
+import Modal from 'components/Modal';
+import SearchBar from 'search/components/SearchBar';
+
+class ShareItemModal extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
+        super(props);
+        this.state = {
+            message: '',
+            users: [],
+            displayUsers: this.props.data.users,
+            items: this.props.data.items
+        };
+        this.onSubmit = this.onSubmit.bind(this);
+        this.getUsers = this.getUsers.bind(this);
+    }
+
+    onSubmit(event: any) {
+        event.preventDefault();
+        if (this.state.users.length) {
+            return this.props.submit(!!this.props.data.isTopic, omit(this.state, 'displayUsers'));
+        }
+    }
+
+    onChangeHandler(field: any) {
+        return (event: any) => {
+            this.setState({
+                [field]: event.target.value,
+            });
+        };
+    }
+
+    toggleUser(userId: any, all?: any) {
+        let newValue: any;
+        if (all) {
+            newValue = this.props.data.users.length === this.state.users.length ? [] :
+                this.props.data.users.map((u: any) => u._id);
+        } else {
+            newValue = toggleValue(this.state.users, userId);
+        }
+
+        this.setState({users: newValue});
+
+        if (newValue.length === 0) {
+            this.props.modalFormInvalid();
+        } else {
+            this.props.modalFormValid();
+        }
+    }
+
+    toggleAllUsers() {
+        this.toggleUser(null, true);
+    }
+
+    getUsers(q: any) {
+        this.setState({
+            displayUsers: q ? this.props.data.users.filter((u: any) =>
+                (this.getUserName(u).toLowerCase()).includes(q.toLowerCase())) : this.props.data.users
+        });
+    }
+
+    getUserName(user: any) {
+        return `${user.first_name} ${user.last_name}`;
+    }
+
+    render() {
+        const selectAllText = this.props.data.users.length === this.state.users.length ? gettext('Deselect All') :
+            gettext('Select All');
+        const usersList = sortBy(this.state.displayUsers, 'first_name').map((user: any, index: any) => (
+            <tr key={index}>
+                <td>
+                    <div className="form-check form-check--flex">
+                        <input id={user._id} type="checkbox"
+                            className="form-check-input"
+                            checked={this.state.users.indexOf(user._id) > -1}
+                            onChange={() => this.toggleUser(user._id)} />
+                    </div>
+                </td>
+                <td>
+                    <div className="form-check form-check--flex">
+                        <label className="form-check-label" htmlFor={user._id}>{this.getUserName(user)}</label>
+                    </div>
+                    
+                </td>
+            </tr>
+        ));
+
+        return (
+            <Modal
+                onSubmit={this.onSubmit}
+                title={gettext('Share Item')}
+                onSubmitLabel={gettext('Share')}
+                disableButtonOnSubmit >
+
+                <div className='modal-body__inner'>
+                    <div className="modal-body__inner-header">
+                        <SearchBar
+                            fetchItems={this.getUsers}
+                            enableQueryAction={false}
+                        />
+                    </div>
+                    <form className="modal-body__inner-content inner-content-grid" onSubmit={this.onSubmit}>
+                        <div className="form-group inner-content-grid__main">
+                            <table className="table table--small mt-3">
+                                <colgroup>
+                                    <col style={{width: '8%'}} />
+                                    <col style={{width: '92%'}} />
+                                </colgroup>
+                                <thead>
+                                    {usersList.length > 0 && <tr>
+                                        <th>
+                                            <div className="form-check form-check--flex">
+                                                <input id="check-all" type="checkbox"
+                                                    className="form-check-input"
+                                                    onChange={() => this.toggleAllUsers()}
+                                                    checked={this.state.users.length === this.props.data.users.length}
+                                                />
+                                                
+                                            </div>
+                                        </th>
+                                        <th>
+                                            <div className="form-check form-check--flex">
+                                                <label className="form-check-label form-check-label--strong" htmlFor="check-all">{selectAllText}</label>
+                                            </div>
+                                            
+                                        </th>
+                                    </tr>}
+                                </thead>
+                                <tbody>
+                                    {usersList}
+                                </tbody>
+                            </table>
+                        </div>
+                        <div className="form-group user-msg inner-content-grid__footer">
+                            <label className="a11y-only" htmlFor="message">{gettext('Message')}</label>
+                            <textarea className="form-control"
+                                id="message"
+                                placeholder={gettext('Message')}
+                                value={this.state.message}
+                                onChange={this.onChangeHandler('message')}
+                            />
+                        </div>
+                    </form>
+                </div>
+            </Modal>
+        );
+    }
+}
+
+ShareItemModal.propTypes = {
+    submit: PropTypes.func.isRequired,
+    modalFormInvalid: PropTypes.func,
+    modalFormValid: PropTypes.func,
+    data: PropTypes.shape({
+        items: PropTypes.arrayOf(PropTypes.string).isRequired,
+        users: PropTypes.arrayOf(PropTypes.shape({
+            _id: PropTypes.string.isRequired,
+            first_name: PropTypes.string.isRequired,
+            last_name: PropTypes.string.isRequired,
+        })),
+        isTopic: PropTypes.bool,
+    }),
+};
+
+const mapStateToProps = (state: any) => ({formValid: get(state, 'modal.formValid')});
+
+const mapDispatchToProps = (dispatch: any) => ({
+    submit: (isFolllowedTopic: any, data: any) => isFolllowedTopic ? dispatch(submitShareTopic(data)) : dispatch(submitShareItem(data)),
+    modalFormInvalid: () => dispatch(modalFormInvalid()),
+    modalFormValid: () => dispatch(modalFormValid()),
+});
+
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(ShareItemModal);
+
+export default component;
diff --git a/assets/components/SortItems.jsx b/assets/components/SortItems.tsx
similarity index 77%
rename from assets/components/SortItems.jsx
rename to assets/components/SortItems.tsx
index a62f3de4b..ef88a7edf 100644
--- a/assets/components/SortItems.jsx
+++ b/assets/components/SortItems.tsx
@@ -4,8 +4,10 @@ import {SortableContainer, SortableElement, arrayMove} from 'react-sortable-hoc'
 import {gettext} from 'utils';
 
 
-class SortItems extends React.Component {
-    constructor(props) {
+class SortItems extends React.Component<any, any> {
+    static propTypes: any;
+    cursor: any;
+    constructor(props: any) {
         super(props);
         this.state = {items: this.props.items};
         this.onSortEnd = this.onSortEnd.bind(this);
@@ -13,17 +15,17 @@ class SortItems extends React.Component {
         this.onRemove = this.onRemove.bind(this);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         this.setState({items: nextProps.items});
     }
 
-    onRemove(itemToRemove) {
-        const items = [...this.state.items].filter((item) => itemToRemove.value !== item.value);
+    onRemove(itemToRemove: any) {
+        const items = [...this.state.items].filter((item: any) => itemToRemove.value !== item.value);
         this.setState({items: items});
         this.props.onChange(items);
     }
 
-    onSortEnd({oldIndex, newIndex}) {
+    onSortEnd({oldIndex, newIndex}: any) {
         const items = arrayMove(this.state.items, oldIndex, newIndex);
         this.setState({items});
         document.body.style.cursor = this.cursor;
@@ -38,13 +40,13 @@ class SortItems extends React.Component {
 
 
     render() {
-        const SortableItem = SortableElement(({item}) =>
+        const SortableItem = SortableElement(({item}: any) =>
             <li className="list-group-item">
                 <span>{item.text}</span>
                 <button type="button"
                     className="icon-button icon-button--small float-end"
                     aria-label={gettext('Close')}
-                    onClick={(e) => {
+                    onClick={(e: any) => {
                         e.preventDefault();
                         e.stopPropagation();
                         this.onRemove(item);
@@ -53,10 +55,10 @@ class SortItems extends React.Component {
             </li>
         );
 
-        const SortableList = SortableContainer(({items}) => {
+        const SortableList = SortableContainer(({items}: any) => {
             return (
                 <ul className="list-group flex-grow-1">
-                    {items.map((item, index) => (
+                    {items.map((item: any, index: any) => (
                         <SortableItem key={`item-${index}`} index={index} item={item}/>
                     ))}
                 </ul>
diff --git a/assets/components/Tag.jsx b/assets/components/Tag.tsx
similarity index 96%
rename from assets/components/Tag.jsx
rename to assets/components/Tag.tsx
index a4d42cca9..daf04b606 100644
--- a/assets/components/Tag.jsx
+++ b/assets/components/Tag.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-export function Tag({testId, text, keyValue, shade, readOnly, onClick, label, operator}) {
-    let classes = classNames('tag-label', {
+export function Tag({testId, text, keyValue, shade, readOnly, onClick, label, operator}: any): any {
+    const classes = classNames('tag-label', {
         [`tag-label--${shade}`]: shade && shade !== 'light',
         'tag-label--operator': operator,
     });
diff --git a/assets/components/TagList.jsx b/assets/components/TagList.tsx
similarity index 82%
rename from assets/components/TagList.jsx
rename to assets/components/TagList.tsx
index 4a495578a..f08910af9 100644
--- a/assets/components/TagList.jsx
+++ b/assets/components/TagList.tsx
@@ -4,10 +4,10 @@ import {get} from 'lodash';
 
 import {Tag} from './Tag';
 
-export default function TagList({tags, onClick, readOnly}) {
+export default function TagList({tags, onClick, readOnly}: any) {
     return ((get(tags, 'length', 0) > 0 && <div className='tag-list'>
         <ul>
-            {tags.map((t, index) => (
+            {tags.map((t: any, index: any) => (
                 <Tag
                     key={index}
                     text={t}
diff --git a/assets/components/TextAreaInput.jsx b/assets/components/TextAreaInput.tsx
similarity index 95%
rename from assets/components/TextAreaInput.jsx
rename to assets/components/TextAreaInput.tsx
index 472b00091..926fea8fd 100644
--- a/assets/components/TextAreaInput.jsx
+++ b/assets/components/TextAreaInput.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import InputWrapper from './InputWrapper';
 
-function TextAreaInput({name, label, onChange, value, error, required, readOnly, maxLength, children, rows}) {
+function TextAreaInput({name, label, onChange, value, error, required, readOnly, maxLength, children, rows}: any) {
     return (
         <InputWrapper error={error} name={name}>
             <label htmlFor={name}>{label}</label>
diff --git a/assets/components/TextInput.jsx b/assets/components/TextInput.tsx
similarity index 91%
rename from assets/components/TextInput.jsx
rename to assets/components/TextInput.tsx
index 98c4e1e09..96f510dd5 100644
--- a/assets/components/TextInput.jsx
+++ b/assets/components/TextInput.tsx
@@ -22,7 +22,7 @@ function TextInput({
     autoFocus,
     copyAction,
     ...props
-}) {
+}: any) {
     return (
         <InputWrapper error={error} name={name} testId={`field-${name}`}>
             {label && (
@@ -31,7 +31,7 @@ function TextInput({
             {copyAction &&
                 <button
                     className='icon-button'
-                    onClick={(e) => {e.preventDefault();navigator.clipboard.writeText(value);}}
+                    onClick={(e: any) => {e.preventDefault();navigator.clipboard.writeText(value);}}
                     title={gettext('Copy')}
                 >
                     <i className='icon--copy'></i>
@@ -81,4 +81,6 @@ TextInput.propTypes = {
 
 TextInput.defaultProps = {autoFocus: false};
 
-export default TextInput;
+const component: React.ComponentType<any> = TextInput;
+
+export default component;
diff --git a/assets/components/TextListInput.jsx b/assets/components/TextListInput.tsx
similarity index 93%
rename from assets/components/TextListInput.jsx
rename to assets/components/TextListInput.tsx
index 835728212..9506ee77b 100644
--- a/assets/components/TextListInput.jsx
+++ b/assets/components/TextListInput.tsx
@@ -12,8 +12,9 @@ import {gettext, KEYCODES} from 'utils';
  * @name TextListInput
  * @description Component to select tags like Keyword of a news story
  */
-class TextListInput extends React.Component {
-    constructor(props) {
+class TextListInput extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {inputText: ''};
@@ -47,7 +48,7 @@ class TextListInput extends React.Component {
         }
     }
 
-    removeKeyword(index) {
+    removeKeyword(index: any) {
         const newValue = [...this.props.value];
 
         newValue.splice(index, 1);
@@ -59,7 +60,7 @@ class TextListInput extends React.Component {
         });
     }
 
-    inputChange(event) {
+    inputChange(event: any) {
         this.setState({inputText: get(event, 'target.value')});
     }
 
@@ -79,7 +80,7 @@ class TextListInput extends React.Component {
                 {!readOnly && <TextInput
                     name={name}
                     onChange={this.inputChange}
-                    onKeyDown={(event) => {
+                    onKeyDown={(event: any) => {
                         if (event.keyCode === KEYCODES.ENTER ||
                             event.keyCode === KEYCODES.DOWN) {
                             event.preventDefault();
diff --git a/assets/components/cards/edit/ConfigEvent.jsx b/assets/components/cards/edit/ConfigEvent.tsx
similarity index 96%
rename from assets/components/cards/edit/ConfigEvent.jsx
rename to assets/components/cards/edit/ConfigEvent.tsx
index d71aff58d..64dca3040 100644
--- a/assets/components/cards/edit/ConfigEvent.jsx
+++ b/assets/components/cards/edit/ConfigEvent.tsx
@@ -8,12 +8,12 @@ import TextAreaInput from'components/TextAreaInput';
 import {gettext} from 'utils';
 
 
-function ConfigEvent ({card, onChange, errors}) {
+function ConfigEvent ({card, onChange, errors}: any) {
 
     const events = card.config.events || [{}, {}, {}, {}];
 
     return (
-        events.map((event, index) => {
+        events.map((event: any, index: any) => {
             const prefix = `config.events[${index}].`;
             return (
                 <div key={prefix} className='card' style={{display:'block', marginBottom: '20px'}}>
diff --git a/assets/components/cards/edit/ConfigExternalMedia.jsx b/assets/components/cards/edit/ConfigExternalMedia.tsx
similarity index 95%
rename from assets/components/cards/edit/ConfigExternalMedia.jsx
rename to assets/components/cards/edit/ConfigExternalMedia.tsx
index 4718a3b2d..80c2d17ef 100644
--- a/assets/components/cards/edit/ConfigExternalMedia.jsx
+++ b/assets/components/cards/edit/ConfigExternalMedia.tsx
@@ -5,7 +5,7 @@ import {gettext} from 'utils';
 import {get} from 'lodash';
 
 
-function ConfigExternalMedia ({card, onChange, errors}) {
+function ConfigExternalMedia ({card, onChange, errors}: any) {
     const sources = card.config.sources || [{}, {}, {}, {}];
 
     return (
@@ -27,7 +27,7 @@ function ConfigExternalMedia ({card, onChange, errors}) {
             <div className="alert alert-primary" key="info">
                 {gettext('Total media count across all media config should be between 1 and 4.')}
             </div>,
-            sources.map((source, index) => {
+            sources.map((source: any, index: any) => {
                 const prefix = `config.sources[${index}].`;
                 return (
                     <div key={prefix} className='card' style={{display:'block', marginBottom: '20px'}}>
diff --git a/assets/components/cards/edit/ConfigNavigation.jsx b/assets/components/cards/edit/ConfigNavigation.tsx
similarity index 84%
rename from assets/components/cards/edit/ConfigNavigation.jsx
rename to assets/components/cards/edit/ConfigNavigation.tsx
index b49078aee..fe2ef2c69 100644
--- a/assets/components/cards/edit/ConfigNavigation.jsx
+++ b/assets/components/cards/edit/ConfigNavigation.tsx
@@ -7,8 +7,10 @@ import SortItems from 'components/SortItems';
 import {gettext, notify} from 'utils';
 
 
-class ConfigNavigation extends React.Component {
-    constructor(props) {
+class ConfigNavigation extends React.Component<any, any> {
+    static propTypes: any;
+    navigationsById: any;
+    constructor(props: any) {
         super(props);
 
         this.getNavigations = this.getNavigations.bind(this);
@@ -23,16 +25,16 @@ class ConfigNavigation extends React.Component {
         };
     }
 
-    getCardNavigations(items) {
+    getCardNavigations(items: any) {
         return items ? items.map(
-            item => ({
+            (item: any) => ({
                 value: this.navigationsById[item]._id,
                 text: this.navigationsById[item].name,
             })
         ) : [];
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (nextProps.card._id !== this.props.card._id) {
             this.setState({items: this.getCardNavigations(get(nextProps.card, 'config.navigations') || [])});
         }
@@ -41,8 +43,8 @@ class ConfigNavigation extends React.Component {
     getNavigations() {
         const navigationList = [{value: '', text: ''}];
         const dashboard = this.props.card.dashboard === 'newsroom' ? 'wire' : this.props.card.dashboard;
-        this.props.navigations.forEach((navigation) => {
-            if (!(get(this.props.card.config.navigations) || []).includes(navigation._id) &&
+        this.props.navigations.forEach((navigation: any) => {
+            if (!((get as any)(this.props.card.config.navigations) || []).includes(navigation._id) &&
                 navigation.product_type === dashboard) {
                 navigationList.push({value: navigation._id, text: navigation.name});
             }
@@ -50,13 +52,13 @@ class ConfigNavigation extends React.Component {
         return navigationList;
     }
 
-    onAdd(navigation) {
+    onAdd(navigation: any) {
         if(!navigation) {
             notify.error(gettext('Select a navigation.'));
             return;
         }
 
-        if (this.state.items.find((item) => item.value === navigation)) {
+        if (this.state.items.find((item: any) => item.value === navigation)) {
             notify.error(gettext('Navigation is already added.'));
             return;
         }
@@ -66,16 +68,16 @@ class ConfigNavigation extends React.Component {
         this.onChange([...this.state.items, {text: nav.name, value:nav._id}]);
     }
 
-    onSelect(event) {
+    onSelect(event: any) {
         this.setState({selected: event.target.value});
     }
 
-    onChange(items) {
+    onChange(items: any) {
         this.setState({items});
         this.props.onChange({
             target: {
                 name: 'config.navigations',
-                value: items.map((item) => item.value) || []
+                value: items.map((item: any) => item.value) || []
             }
         });
     }
diff --git a/assets/components/cards/edit/ConfigProduct.jsx b/assets/components/cards/edit/ConfigProduct.tsx
similarity index 86%
rename from assets/components/cards/edit/ConfigProduct.jsx
rename to assets/components/cards/edit/ConfigProduct.tsx
index 2a01a5dee..c6baceeff 100644
--- a/assets/components/cards/edit/ConfigProduct.jsx
+++ b/assets/components/cards/edit/ConfigProduct.tsx
@@ -5,8 +5,9 @@ import SelectInput from 'components/SelectInput';
 import {gettext} from 'utils';
 
 
-class ConfigProduct extends React.Component {
-    constructor(props) {
+class ConfigProduct extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.getProducts = this.getProducts.bind(this);
@@ -14,7 +15,7 @@ class ConfigProduct extends React.Component {
 
     getProducts() {
         const productList = [{value: '', text: ''}];
-        this.props.products.map((product) => {
+        this.props.products.map((product: any) => {
             productList.push({value: product._id, text: product.name});
         });
         return productList;
diff --git a/assets/components/cards/render/CardBody.jsx b/assets/components/cards/render/CardBody.tsx
similarity index 97%
rename from assets/components/cards/render/CardBody.jsx
rename to assets/components/cards/render/CardBody.tsx
index 79b8d4018..23592e1ec 100644
--- a/assets/components/cards/render/CardBody.jsx
+++ b/assets/components/cards/render/CardBody.tsx
@@ -5,7 +5,7 @@ import {shortText} from 'wire/utils';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 
 
-function CardBody({item, displayMeta, displayDescription, displaySource, listConfig}) {
+function CardBody({item, displayMeta, displayDescription, displaySource, listConfig}: any) {
     return (<div className="card-body">
         <h4 className="card-title">{item.headline}</h4>
 
diff --git a/assets/components/cards/render/CardFooter.jsx b/assets/components/cards/render/CardFooter.tsx
similarity index 88%
rename from assets/components/cards/render/CardFooter.jsx
rename to assets/components/cards/render/CardFooter.tsx
index 7351c1045..1d4a1fced 100644
--- a/assets/components/cards/render/CardFooter.jsx
+++ b/assets/components/cards/render/CardFooter.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import CardMeta from './CardMeta';
 
-function CardFooter({item, picture, listConfig}) {
+function CardFooter({item, picture, listConfig}: any) {
     return (<div className="card-footer">
         <CardMeta
             item={item}
diff --git a/assets/components/cards/render/CardMeta.jsx b/assets/components/cards/render/CardMeta.tsx
similarity index 98%
rename from assets/components/cards/render/CardMeta.jsx
rename to assets/components/cards/render/CardMeta.tsx
index 237c2b209..795e997a5 100644
--- a/assets/components/cards/render/CardMeta.jsx
+++ b/assets/components/cards/render/CardMeta.tsx
@@ -4,7 +4,7 @@ import {gettext, shortDate, fullDate, isDisplayed} from 'utils';
 import {characterCount, wordCount} from 'utils';
 import WireListItemIcons from 'wire/components/WireListItemIcons';
 
-function CardMeta({item, picture, displayDivider, slugline, listConfig}) {
+function CardMeta({item, picture, displayDivider, slugline, listConfig}: any) {
     return (<div className="wire-articles__item__meta">
         <WireListItemIcons item={item} picture={picture} divider={displayDivider} />
         <div className="wire-articles__item__meta-info">
diff --git a/assets/components/cards/render/CardRow.jsx b/assets/components/cards/render/CardRow.tsx
similarity index 74%
rename from assets/components/cards/render/CardRow.jsx
rename to assets/components/cards/render/CardRow.tsx
index 639c60aa2..5971083c2 100644
--- a/assets/components/cards/render/CardRow.jsx
+++ b/assets/components/cards/render/CardRow.tsx
@@ -3,8 +3,12 @@ import PropTypes from 'prop-types';
 import MoreNewsButton from './MoreNewsButton';
 import {connect} from 'react-redux';
 
-class CardRow extends React.Component {
-    constructor(props) {
+class CardRow extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+    cardElem: any;
+
+    constructor(props: any) {
         super(props);
     }
 
@@ -17,7 +21,7 @@ class CardRow extends React.Component {
         const {title, productId, children, userProducts,userType} = this.props;
         let moreNews = this.props.moreNews;
         if (userType !== 'administrator'){
-            moreNews = userProducts.some((userProduct) => userProduct._id === productId);
+            moreNews = userProducts.some((userProduct: any) => userProduct._id === productId);
         }
 
         return (
@@ -40,7 +44,7 @@ CardRow.propTypes = {
     userType: PropTypes.string,
 };
 
-const mapStateToProps = (state) =>  ({
+const mapStateToProps = (state: any) =>  ({
     userProducts: state.userProducts,
     userType: state.userType,
 });
@@ -49,4 +53,7 @@ CardRow.defaultProps = {
     moreNews: true
 };
 
-export default connect(mapStateToProps)(CardRow);
+
+const component: React.ComponentType<any> = connect(mapStateToProps)(CardRow);
+
+export default component;
diff --git a/assets/components/cards/render/EventsTwoByTwoCard.jsx b/assets/components/cards/render/EventsTwoByTwoCard.tsx
similarity index 85%
rename from assets/components/cards/render/EventsTwoByTwoCard.jsx
rename to assets/components/cards/render/EventsTwoByTwoCard.tsx
index 260c5c2e3..07e1e3fdc 100644
--- a/assets/components/cards/render/EventsTwoByTwoCard.jsx
+++ b/assets/components/cards/render/EventsTwoByTwoCard.tsx
@@ -5,24 +5,24 @@ import moment from 'moment/moment';
 import {gettext} from 'utils';
 
 
-const getEventPanel = (event, index) => {
+const getEventPanel = (event: any, index: any) => {
 
-    const isSameMonth = (d1, d2) => !!d2 && d1.format('MMMM') === d2.format('MMMM');
+    const isSameMonth = (d1: any, d2: any) => !!d2 && d1.format('MMMM') === d2.format('MMMM');
 
-    const isDifferentMonth = (d1, d2) => !!d2 && d1.format('MMMM') !== d2.format('MMMM');
+    const isDifferentMonth = (d1: any, d2: any) => !!d2 && d1.format('MMMM') !== d2.format('MMMM');
 
     // Checks if the date range is for the whole month
-    const isWholeMonth = (d1, d2) => {
+    const isWholeMonth = (d1: any, d2: any) => {
         if (!d2) {
             return false;
         }
-        let date1 = moment(d1), date2 = moment(d2);
+        const date1 = moment(d1), date2 = moment(d2);
         return date1.format('MMMM') === date2.format('MMMM') &&
           date1.format('MMMM') !== date2.add(1, 'days').format('MMMM') &&
           date1.add(-1, 'days').format('MMMM') !== date2.format('MMMM');
     };
 
-    const getDateSpans = (d1, d2) => ([
+    const getDateSpans = (d1: any, d2: any) => ([
         isWholeMonth(d1, d2) ? <div key='day' className='date-round__number'><span>{gettext('all')}</span></div> :
             <div key='day' className='date-round__number'>
                 <span>{d1.format('D')}</span>{isSameMonth(d1, d2) && '-'}<span>{isSameMonth(d1, d2) && d2.format('D')}</span>
@@ -75,11 +75,11 @@ const getEventPanel = (event, index) => {
 };
 
 
-function EventsTwoByTwoCard({events, title}) {
+function EventsTwoByTwoCard({events, title}: any) {
     return (
         <div className='row'>
             <MoreNewsButton title={title}/>
-            {events.map((event, index) => getEventPanel(event, index))}
+            {events.map((event: any, index: any) => getEventPanel(event, index))}
         </div>
     );
 }
diff --git a/assets/components/cards/render/LargePictureTextCard.jsx b/assets/components/cards/render/LargePictureTextCard.tsx
similarity index 85%
rename from assets/components/cards/render/LargePictureTextCard.jsx
rename to assets/components/cards/render/LargePictureTextCard.tsx
index d51fae0da..a648721fb 100644
--- a/assets/components/cards/render/LargePictureTextCard.jsx
+++ b/assets/components/cards/render/LargePictureTextCard.tsx
@@ -5,7 +5,7 @@ import CardFooter from './CardFooter';
 import CardBody from './CardBody';
 import CardRow from './CardRow';
 
-const getPictureTextPanel = (item, picture, openItem, cardId, listConfig) => {
+const getPictureTextPanel = (item: any, picture: any, openItem: any, cardId: any, listConfig: any) => {
     const rendition = getThumbnailRendition(picture);
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
@@ -27,10 +27,10 @@ const getPictureTextPanel = (item, picture, openItem, cardId, listConfig) => {
     </div>);
 };
 
-function LargePictureTextCard ({items, title, productId, openItem, isActive, cardId, listConfig}) {
+function LargePictureTextCard ({items, title, productId, openItem, isActive, cardId, listConfig}: any) {
     return (
         <CardRow title={title} productId={productId} isActive={isActive}>
-            {items.map((item) => getPictureTextPanel(item, getPicture(item), openItem, cardId, listConfig))}
+            {items.map((item: any) => getPictureTextPanel(item, getPicture(item), openItem, cardId, listConfig))}
         </CardRow>
     );
 }
diff --git a/assets/components/cards/render/LargeTextOnlyCard.jsx b/assets/components/cards/render/LargeTextOnlyCard.tsx
similarity index 83%
rename from assets/components/cards/render/LargeTextOnlyCard.jsx
rename to assets/components/cards/render/LargeTextOnlyCard.tsx
index 9c79da670..c0332a873 100644
--- a/assets/components/cards/render/LargeTextOnlyCard.jsx
+++ b/assets/components/cards/render/LargeTextOnlyCard.tsx
@@ -5,7 +5,7 @@ import CardBody from './CardBody';
 import CardRow from './CardRow';
 import {getPicture} from 'wire/utils';
 
-const getTextOnlyPanel = (item, openItem, cardId, listConfig) => (
+const getTextOnlyPanel = (item: any, openItem: any, cardId: any, listConfig: any) => (
     <div key={item._id} className='col-sm-6 col-lg-4 d-flex mb-4'>
         <div className='card card--home' onClick={() => openItem(item, cardId)}>
             <CardBody item={item} displaySource={false} listConfig={listConfig} />
@@ -18,10 +18,10 @@ const getTextOnlyPanel = (item, openItem, cardId, listConfig) => (
     </div>
 );
 
-function LargeTextOnlyCard ({items, title, productId, openItem, isActive, cardId, listConfig}) {
+function LargeTextOnlyCard ({items, title, productId, openItem, isActive, cardId, listConfig}: any) {
     return (
         <CardRow title={title} productId={productId} isActive={isActive}>
-            {items.map((item) => getTextOnlyPanel(item, openItem, cardId, listConfig))}
+            {items.map((item: any) => getTextOnlyPanel(item, openItem, cardId, listConfig))}
         </CardRow>
     );
 }
diff --git a/assets/components/cards/render/MediaGalleryCard.jsx b/assets/components/cards/render/MediaGalleryCard.tsx
similarity index 88%
rename from assets/components/cards/render/MediaGalleryCard.jsx
rename to assets/components/cards/render/MediaGalleryCard.tsx
index 588e1b833..4dc5c4c4f 100644
--- a/assets/components/cards/render/MediaGalleryCard.jsx
+++ b/assets/components/cards/render/MediaGalleryCard.tsx
@@ -5,7 +5,7 @@ import {getPicture, getThumbnailRendition, getCaption} from 'wire/utils';
 import CardRow from './CardRow';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 
-const getMediaPanel = (item, picture, openItem, cardId) => {
+const getMediaPanel = (item: any, picture: any, openItem: any, cardId: any) => {
 
     const rendition = getThumbnailRendition(picture);
     const imageUrl = rendition && rendition.href;
@@ -27,10 +27,10 @@ const getMediaPanel = (item, picture, openItem, cardId) => {
     </div>);
 };
 
-function MediaGalleryCard ({items, title, productId, openItem, isActive, cardId}) {
+function MediaGalleryCard ({items, title, productId, openItem, isActive, cardId}: any) {
     return (
         <CardRow title={title} productId={productId} isActive={isActive}>
-            {items.map((item) => getMediaPanel(item, getPicture(item), openItem, cardId))}
+            {items.map((item: any) => getMediaPanel(item, getPicture(item), openItem, cardId))}
         </CardRow>
     );
 }
diff --git a/assets/components/cards/render/MoreNewsButton.jsx b/assets/components/cards/render/MoreNewsButton.tsx
similarity index 89%
rename from assets/components/cards/render/MoreNewsButton.jsx
rename to assets/components/cards/render/MoreNewsButton.tsx
index 225431925..61c7adf19 100644
--- a/assets/components/cards/render/MoreNewsButton.jsx
+++ b/assets/components/cards/render/MoreNewsButton.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-function MoreNewsButton({title, productId, photoUrl, photoUrlLabel, moreNews}) {
+function MoreNewsButton({title, productId, photoUrl, photoUrlLabel, moreNews}: any): any {
     return ([<div key='heading' className='col-6 col-sm-8'>
         <h3 className='home-section-heading'>{title}</h3>
     </div>,
@@ -25,4 +25,6 @@ MoreNewsButton.propTypes = {
     photoUrlLabel: PropTypes.string,
 };
 
-export default MoreNewsButton;
+const component: React.ComponentType<any> = MoreNewsButton;
+
+export default component;
diff --git a/assets/components/cards/render/NavigationCard.jsx b/assets/components/cards/render/NavigationCard.tsx
similarity index 90%
rename from assets/components/cards/render/NavigationCard.jsx
rename to assets/components/cards/render/NavigationCard.tsx
index c2c6d5255..aa7589950 100644
--- a/assets/components/cards/render/NavigationCard.jsx
+++ b/assets/components/cards/render/NavigationCard.tsx
@@ -4,13 +4,13 @@ import {get} from 'lodash';
 import {gettext} from 'utils';
 
 
-const NavigationCard = ({navigation}) => {
-    const imageUrl = (navigation) => {
+const NavigationCard = ({navigation}: any) => {
+    const imageUrl = (navigation: any) => {
         if (get(navigation, 'tile_images.length', 0) === 0) {
             return null;
         }
 
-        const urls = get(navigation, 'tile_images', []).map((image) => image.file_url).filter((url) => url);
+        const urls = get(navigation, 'tile_images', []).map((image: any) => image.file_url).filter((url: any) => url);
 
         if (urls.length === 1) {
             return urls[0];
diff --git a/assets/components/cards/render/NavigationSixPerRow.jsx b/assets/components/cards/render/NavigationSixPerRow.tsx
similarity index 86%
rename from assets/components/cards/render/NavigationSixPerRow.jsx
rename to assets/components/cards/render/NavigationSixPerRow.tsx
index 12dee0559..ada77a614 100644
--- a/assets/components/cards/render/NavigationSixPerRow.jsx
+++ b/assets/components/cards/render/NavigationSixPerRow.tsx
@@ -4,10 +4,10 @@ import {get} from 'lodash';
 import NavigationCard from './NavigationCard';
 
 
-function NavigationSixPerRow({card}) {
+function NavigationSixPerRow({card}: any) {
     const navigations = get(card, 'config.navigations') || [];
 
-    const cards = navigations.map((nav) => <NavigationCard
+    const cards = navigations.map((nav: any) => <NavigationCard
         navigation={nav}
         key={nav._id} />);
 
diff --git a/assets/components/cards/render/PhotoGalleryCard.jsx b/assets/components/cards/render/PhotoGalleryCard.tsx
similarity index 87%
rename from assets/components/cards/render/PhotoGalleryCard.jsx
rename to assets/components/cards/render/PhotoGalleryCard.tsx
index 5a729684f..b51e6bba3 100644
--- a/assets/components/cards/render/PhotoGalleryCard.jsx
+++ b/assets/components/cards/render/PhotoGalleryCard.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import MoreNewsButton from './MoreNewsButton';
 
-const getMediaPanel = (photo, index) => {
+const getMediaPanel = (photo: any, index: any) => {
     return (<div key={index} className='col-sm-6 col-lg-3 d-flex mb-4'>
         <div className='card card--home card--gallery'
             onClick={()=>{window.open(photo.href,'_blank');}}>
@@ -14,11 +14,11 @@ const getMediaPanel = (photo, index) => {
     </div>);
 };
 
-function PhotoGalleryCard({photos, title, moreUrl, moreUrlLabel}) {
+function PhotoGalleryCard({photos, title, moreUrl, moreUrlLabel}: any) {
     return (
         <div className='row'>
             <MoreNewsButton key="more" title={title} photoUrl={moreUrl} photoUrlLabel={moreUrlLabel} />
-            {photos.map((photo, index) => getMediaPanel(photo, index))}
+            {photos.map((photo: any, index: any) => getMediaPanel(photo, index))}
         </div>
     );
 }
diff --git a/assets/components/cards/render/PictureTextCard.jsx b/assets/components/cards/render/PictureTextCard.tsx
similarity index 84%
rename from assets/components/cards/render/PictureTextCard.jsx
rename to assets/components/cards/render/PictureTextCard.tsx
index 42a4d0094..4448e9ccb 100644
--- a/assets/components/cards/render/PictureTextCard.jsx
+++ b/assets/components/cards/render/PictureTextCard.tsx
@@ -5,7 +5,7 @@ import CardBody from './CardBody';
 import CardFooter from './CardFooter';
 import CardRow from './CardRow';
 
-const getPictureTextPanel = (item, picture, openItem, withPictures, cardId, listConfig) => {
+const getPictureTextPanel = (item: any, picture: any, openItem: any, withPictures: any, cardId: any, listConfig: any) => {
     const rendition = withPictures && getThumbnailRendition(picture);
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
@@ -28,12 +28,12 @@ const getPictureTextPanel = (item, picture, openItem, withPictures, cardId, list
 };
 
 
-function PictureTextCard ({type, items, title, productId, openItem, isActive, cardId, listConfig}) {
+function PictureTextCard ({type, items, title, productId, openItem, isActive, cardId, listConfig}: any) {
     const withPictures = type.indexOf('picture') > -1;
 
     return (
         <CardRow title={title} productId={productId} isActive={isActive}>
-            {items.map((item) => getPictureTextPanel(item, getPicture(item), openItem, withPictures, cardId, listConfig))}
+            {items.map((item: any) => getPictureTextPanel(item, getPicture(item), openItem, withPictures, cardId, listConfig))}
         </CardRow>
     );
 }
diff --git a/assets/components/cards/render/TextOnlyCard.jsx b/assets/components/cards/render/TextOnlyCard.tsx
similarity index 84%
rename from assets/components/cards/render/TextOnlyCard.jsx
rename to assets/components/cards/render/TextOnlyCard.tsx
index 251dfcead..518250e22 100644
--- a/assets/components/cards/render/TextOnlyCard.jsx
+++ b/assets/components/cards/render/TextOnlyCard.tsx
@@ -5,7 +5,7 @@ import CardFooter from './CardFooter';
 import {getPicture, shortText} from 'wire/utils';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 
-const getTextOnlyPanel = (item, openItem, picture, cardId, listConfig) => (
+const getTextOnlyPanel = (item: any, openItem: any, picture: any, cardId: any, listConfig: any) => (
     <div key={item._id} className='col-sm-6 col-md-4 col-lg-3 col-xxl-2 d-flex mb-4'>
         <div className='card card--home' onClick={() => openItem(item, cardId)}>
             <div className='card-body'>
@@ -25,10 +25,10 @@ const getTextOnlyPanel = (item, openItem, picture, cardId, listConfig) => (
 );
 
 
-function TextOnlyCard ({items, title, productId, openItem, isActive, cardId, listConfig}) {
+function TextOnlyCard ({items, title, productId, openItem, isActive, cardId, listConfig}: any): any {
     return (
         <CardRow title={title} productId={productId} isActive={isActive}>
-            {items.map((item) => getTextOnlyPanel(item, openItem, getPicture(item), cardId, listConfig))}
+            {items.map((item: any) => getTextOnlyPanel(item, openItem, getPicture(item), cardId, listConfig))}
         </CardRow>
     );
 }
diff --git a/assets/components/cards/render/TopNewsOneByOneCard.jsx b/assets/components/cards/render/TopNewsOneByOneCard.tsx
similarity index 87%
rename from assets/components/cards/render/TopNewsOneByOneCard.jsx
rename to assets/components/cards/render/TopNewsOneByOneCard.tsx
index 31ef2395c..1092c91ec 100644
--- a/assets/components/cards/render/TopNewsOneByOneCard.jsx
+++ b/assets/components/cards/render/TopNewsOneByOneCard.tsx
@@ -5,7 +5,7 @@ import CardRow from './CardRow';
 import CardMeta from './CardMeta';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 
-const getTopNewsPanel = (item, picture, openItem, cardId, listConfig) => {
+const getTopNewsPanel = (item: any, picture: any, openItem: any, cardId: any, listConfig: any) => {
 
     const rendition = getThumbnailRendition(picture, true);
     const imageUrl = rendition && rendition.href;
@@ -31,10 +31,10 @@ const getTopNewsPanel = (item, picture, openItem, cardId, listConfig) => {
     </div>);
 };
 
-function TopNewsOneByOneCard ({items, title, productId, openItem, isActive, cardId, listConfig}) {
+function TopNewsOneByOneCard ({items, title, productId, openItem, isActive, cardId, listConfig}: any): any {
     return (
         <CardRow title={title} productId={productId} isActive={isActive}>
-            {items.map((item) => getTopNewsPanel(item, getPicture(item), openItem, cardId, listConfig))}
+            {items.map((item: any) => getTopNewsPanel(item, getPicture(item), openItem, cardId, listConfig))}
         </CardRow>
     );
 }
diff --git a/assets/components/cards/render/TopNewsTwoByTwoCard.jsx b/assets/components/cards/render/TopNewsTwoByTwoCard.tsx
similarity index 87%
rename from assets/components/cards/render/TopNewsTwoByTwoCard.jsx
rename to assets/components/cards/render/TopNewsTwoByTwoCard.tsx
index 19a18e7b2..0211326cb 100644
--- a/assets/components/cards/render/TopNewsTwoByTwoCard.jsx
+++ b/assets/components/cards/render/TopNewsTwoByTwoCard.tsx
@@ -8,7 +8,7 @@ import CardMeta from './CardMeta';
 import CardBody from './CardBody';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 
-const getTopNewsLeftPanel = (item, picture, openItem, cardId, listConfig) => {
+const getTopNewsLeftPanel = (item: any, picture: any, openItem: any, cardId: any, listConfig: any) => {
 
     const rendition = getThumbnailRendition(picture, true);
     const imageUrl = rendition && rendition.href;
@@ -37,7 +37,7 @@ const getTopNewsLeftPanel = (item, picture, openItem, cardId, listConfig) => {
     );
 };
 
-const getTopNewsRightPanel = (item, picture, openItem, cardId, listConfig) => {
+const getTopNewsRightPanel = (item: any, picture: any, openItem: any, cardId: any, listConfig?: any): any => {
 
     const rendition = getThumbnailRendition(picture);
     const imageUrl = rendition && rendition.href;
@@ -55,9 +55,9 @@ const getTopNewsRightPanel = (item, picture, openItem, cardId, listConfig) => {
     </div>);
 };
 
-const getTopNews = (items, openItem, cardId, listConfig) => {
-    const topNews = [];
-    for(var i=0; i<items.length; i+=2) {
+const getTopNews = (items: any, openItem: any, cardId: any, listConfig: any) => {
+    const topNews: Array<any> = [];
+    for(let i=0; i<items.length; i+=2) {
         topNews.push(getTopNewsLeftPanel(items[i], getPicture(items[i]), openItem, cardId, listConfig));
         if (i+1 < items.length) {
             topNews.push(getTopNewsRightPanel(items[i+1], getPicture(items[i+1]), openItem, cardId));
@@ -66,7 +66,7 @@ const getTopNews = (items, openItem, cardId, listConfig) => {
     return topNews;
 };
 
-function TopNewsTwoByTwoCard ({items, title, productId, openItem, isActive, cardId, listConfig}) {
+function TopNewsTwoByTwoCard ({items, title, productId, openItem, isActive, cardId, listConfig}: any): any {
     return (
         <CardRow title={title} productId={productId} isActive={isActive}>
             {getTopNews(items, openItem, cardId, listConfig)}
diff --git a/assets/components/cards/utils.js b/assets/components/cards/utils.ts
similarity index 90%
rename from assets/components/cards/utils.js
rename to assets/components/cards/utils.ts
index 54dc4c5e6..49ffb1b23 100644
--- a/assets/components/cards/utils.js
+++ b/assets/components/cards/utils.ts
@@ -97,9 +97,9 @@ const CARD_TYPES = [
     }
 ];
 
-const getCard = memoize((cardId) => CARD_TYPES.find((card) => card._id === cardId));
-const getCardEditComponent = (cardId) => get(getCard(cardId), 'editComponent', ConfigProduct);
-const getCardDashboardComponent = (cardId) => get(getCard(cardId), 'dashboardComponent');
+const getCard = memoize((cardId: any) => CARD_TYPES.find((card: any) => card._id === cardId));
+const getCardEditComponent: any = (cardId: any) => get(getCard(cardId), 'editComponent', ConfigProduct);
+const getCardDashboardComponent: (cardId: any) => any = (cardId: any) => get(getCard(cardId), 'dashboardComponent');
 
 export {
     CARD_TYPES,
diff --git a/assets/components/general-components.md b/assets/components/general-components.md
new file mode 100644
index 000000000..313369671
--- /dev/null
+++ b/assets/components/general-components.md
@@ -0,0 +1,8 @@
+# Show/hide content
+    - FormToggle
+# Checkbox
+    - CheckboxInput
+# Input
+    - Input
+# Radio Buttons
+    - SectionSwitch
diff --git a/assets/defaults.js b/assets/defaults.ts
similarity index 100%
rename from assets/defaults.js
rename to assets/defaults.ts
diff --git a/assets/design_pages.js b/assets/design_pages.ts
similarity index 91%
rename from assets/design_pages.js
rename to assets/design_pages.ts
index b879c9a24..118dbcd61 100644
--- a/assets/design_pages.js
+++ b/assets/design_pages.ts
@@ -1,4 +1,3 @@
-import 'babel-polyfill';
 import 'url-search-params-polyfill';
 import 'whatwg-fetch';
 import {Tooltip, Dropdown} from 'bootstrap';
@@ -107,7 +106,7 @@ function setupContentNavbarScroll() {
 function setupTogglingLeftBarNavigation() {
     // Toggle left bar navigation
     if (document.getElementsByClassName('content-bar__menu--nav')[0]) {
-        document.getElementsByClassName('content-bar__menu--nav')[0].onclick = function(){
+        (document.getElementsByClassName('content-bar__menu--nav')[0] as any).onclick = function(){
             document.getElementsByClassName('wire-column__nav')[0].classList.toggle('wire-column__nav--open');
             document.getElementsByClassName('content-bar__menu--nav')[0].classList.toggle('content-bar__menu--nav--open');
 
@@ -120,11 +119,11 @@ function setupTogglingLeftBarNavigation() {
 
 function setupOpenArticleFromWireList() {
     // Open article from wire list
-    var listItem = document.getElementsByClassName('wire-articles__item');
+    const listItem = document.getElementsByClassName('wire-articles__item');
 
-    var currentItem;
-    for(var i = 0; i < listItem.length; i++) {
-        listItem[i].onclick = function(event) {
+    let currentItem: any;
+    for(let i = 0; i < listItem.length; i++) {
+        (listItem[i] as any).onclick = function(event: any) {
             document.getElementsByClassName('wire-articles__item')[0].classList.toggle('wire-articles__item--open');
 
             // responsive wire item
@@ -138,6 +137,7 @@ function setupOpenArticleFromWireList() {
 
             if (currentItem !== this) {
                 document.getElementsByClassName('wire-column__preview')[0].classList.add('wire-column__preview--open');
+                // eslint-disable-next-line @typescript-eslint/no-this-alias
                 return currentItem = this;
             } else {
                 document.getElementsByClassName('wire-column__preview')[0].classList.remove('wire-column__preview--open');
@@ -150,10 +150,10 @@ function setupOpenArticleFromWireList() {
 function setupTopBarSearchFocus() {
     // Top bar search items
     // TODO: Use CSS to achieve the same goal here
-    var searchForm = document.getElementsByClassName('search__form')[0];
-    var searchInput = document.getElementsByClassName('search__input')[0];
+    const searchForm = document.getElementsByClassName('search__form')[0];
+    const searchInput = document.getElementsByClassName('search__input')[0];
     if (searchInput) {
-        searchInput.onfocus = function() {
+        (searchInput as any).onfocus = function() {
             searchForm.classList.add('search_form--active');
         };
     }
@@ -173,13 +173,13 @@ function setupClosePreviewOnMobile() {
 
 function setupBootstrapElementsFromServerTemplates() {
     if (!isTouchDevice()) {
-        document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach((ele) => {
+        document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach((ele: any) => {
             new Tooltip(ele);
         });
     }
 
     // design view dropdown fix
-    document.querySelectorAll('[data-bs-toggle="dropdown"]').forEach((ele) => {
+    document.querySelectorAll('[data-bs-toggle="dropdown"]').forEach((ele: any) => {
         new Dropdown(ele);
     });
 }
diff --git a/assets/domUtils.js b/assets/domUtils.ts
similarity index 62%
rename from assets/domUtils.js
rename to assets/domUtils.ts
index 3589d8fef..b450fdfc0 100644
--- a/assets/domUtils.js
+++ b/assets/domUtils.ts
@@ -1,5 +1,5 @@
 
-export function setElementStyle(selector, field, value) {
+export function setElementStyle(selector: any, field: any, value: any) {
     const ele = document.querySelector(selector);
 
     if (ele) {
@@ -7,13 +7,13 @@ export function setElementStyle(selector, field, value) {
     }
 }
 
-export function elementHasClass(selector, className) {
+export function elementHasClass(selector: any, className: any) {
     const ele = document.querySelector(selector);
 
     return ele && ele.classList.contains(className);
 }
 
-export function replaceElementClasses(selector, classNames) {
+export function replaceElementClasses(selector: any, classNames: any) {
     const ele = document.querySelector(selector);
 
     if (ele) {
@@ -21,7 +21,7 @@ export function replaceElementClasses(selector, classNames) {
     }
 }
 
-export function removeElementClass(selector, className) {
+export function removeElementClass(selector: any, className: any) {
     const ele = document.querySelector(selector);
 
     if (ele) {
@@ -29,7 +29,7 @@ export function removeElementClass(selector, className) {
     }
 }
 
-export function onElementClicked(selector, callback) {
+export function onElementClicked(selector: any, callback: any) {
     const ele = document.querySelector(selector);
 
     if (ele) {
diff --git a/assets/factcheck/index.js b/assets/factcheck/index.ts
similarity index 88%
rename from assets/factcheck/index.js
rename to assets/factcheck/index.ts
index c5956d380..a353a4119 100644
--- a/assets/factcheck/index.js
+++ b/assets/factcheck/index.ts
@@ -1,4 +1,5 @@
-import {createStore, render, initWebSocket, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {createStore, render, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {initWebSocket} from 'websocket';
 
 import {getReadItems} from 'local-store';
 import WireApp from '../wire/components/WireApp';
@@ -28,7 +29,7 @@ const params = new URLSearchParams(window.location.search);
 store.dispatch(initParams(params));
 
 // handle history
-window.onpopstate = function(event) {
+window.onpopstate = function(event: any) {
     if (event.state) {
         closeItemOnMobile(store.dispatch, event.state, openItemDetails, previewItem);
         if (!isMobilePhone()) {
diff --git a/assets/features/dashboard/DashboardSwitch.jsx b/assets/features/dashboard/DashboardSwitch.tsx
similarity index 81%
rename from assets/features/dashboard/DashboardSwitch.jsx
rename to assets/features/dashboard/DashboardSwitch.tsx
index 2e0e2810f..0140ef894 100644
--- a/assets/features/dashboard/DashboardSwitch.jsx
+++ b/assets/features/dashboard/DashboardSwitch.tsx
@@ -6,7 +6,7 @@ import {get} from 'lodash';
 import {selectDashboard} from './actions';
 import {dashboardPropType} from './types';
 
-function DashboardSwitch({dashboards, activeDashboard, selectDashboard}) {
+function DashboardSwitch({dashboards, activeDashboard, selectDashboard}: any): any {
     if (get(dashboards, 'length', 0) <= 1) {
         // don't render the switch if configure dashboards is one
         return null;
@@ -14,7 +14,7 @@ function DashboardSwitch({dashboards, activeDashboard, selectDashboard}) {
 
     return (
         <div className="toggle-button__group toggle-button__group--navbar ms-0 me-3">
-            {dashboards.map((dashboard) => (
+            {dashboards.map((dashboard: any) => (
                 <button key={dashboard._id}
                     className={'toggle-button' + (dashboard._id === activeDashboard ? ' toggle-button--active' : '')}
                     onClick={() => selectDashboard(dashboard._id)}
@@ -31,8 +31,10 @@ DashboardSwitch.propTypes = {
     selectDashboard: PropTypes.func.isRequired,
 };
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     selectDashboard,
 };
 
-export default connect(null, mapDispatchToProps)(DashboardSwitch);
\ No newline at end of file
+const component: React.ComponentType<any> = connect(null, mapDispatchToProps)(DashboardSwitch);
+
+export default component;
\ No newline at end of file
diff --git a/assets/features/dashboard/actions.js b/assets/features/dashboard/actions.ts
similarity index 69%
rename from assets/features/dashboard/actions.js
rename to assets/features/dashboard/actions.ts
index e9f43523b..03b77c0b6 100644
--- a/assets/features/dashboard/actions.js
+++ b/assets/features/dashboard/actions.ts
@@ -1,10 +1,10 @@
 
 export const INIT_DASHBOARD = 'INIT_DASHBOARD';
-export function initDashboard(dashboards) {
+export function initDashboard(dashboards: any) {
     return {type: INIT_DASHBOARD, dashboards: dashboards};
 }
 
 export const SELECT_DASHBOARD = 'SELECT_DASHBOARD';
-export function selectDashboard(dashboard) {
+export function selectDashboard(dashboard: any) {
     return {type: SELECT_DASHBOARD, dashboard: dashboard};
 }
diff --git a/assets/features/dashboard/reducers.js b/assets/features/dashboard/reducers.ts
similarity index 84%
rename from assets/features/dashboard/reducers.js
rename to assets/features/dashboard/reducers.ts
index 97f4fd0b6..c6b64b80e 100644
--- a/assets/features/dashboard/reducers.js
+++ b/assets/features/dashboard/reducers.ts
@@ -8,16 +8,16 @@ const INITIAL_STATE = {
     active: '',
 };
 
-export function dashboardReducer(state=INITIAL_STATE, action) {
+export function dashboardReducer(state: any = INITIAL_STATE, action?: any): any {
     if (!action) {
         return state;
     }
 
     switch (action.type) {
-    
+
     case INIT_DASHBOARD:
         return {...state, list: action.dashboards, active: action.dashboards[0]._id};
-    
+
     case SELECT_DASHBOARD:
         return {...state, active: action.dashboard || ''};
 
diff --git a/assets/features/dashboard/types.js b/assets/features/dashboard/types.ts
similarity index 100%
rename from assets/features/dashboard/types.js
rename to assets/features/dashboard/types.ts
diff --git a/assets/features/sections/SectionSwitch.jsx b/assets/features/sections/SectionSwitch.jsx
deleted file mode 100644
index 4db491e0f..000000000
--- a/assets/features/sections/SectionSwitch.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import {connect} from 'react-redux';
-
-import {selectSection} from './actions';
-import {sectionsPropType} from './types';
-import {gettext} from '../../utils';
-
-function SectionSwitch({sections, activeSection, selectSection}) {
-    return (
-        <div className="toggle-button__group toggle-button__group--navbar ms-0 me-3">
-            {sections.map((section) => (
-                <button key={section._id}
-                    className={'toggle-button' + (section._id === activeSection ? ' toggle-button--active' : '')}
-                    onClick={() => selectSection(section._id)}
-                >{gettext(section.name)}</button>
-            ))}
-        </div>
-    );
-}
-
-SectionSwitch.propTypes = {
-    sections: sectionsPropType,
-    activeSection: PropTypes.string,
-
-    selectSection: PropTypes.func.isRequired,
-};
-
-const mapDispatchToProps = {
-    selectSection,
-};
-
-export default connect(null, mapDispatchToProps)(SectionSwitch);
\ No newline at end of file
diff --git a/assets/features/sections/SectionSwitch.tsx b/assets/features/sections/SectionSwitch.tsx
new file mode 100644
index 000000000..7086f30d8
--- /dev/null
+++ b/assets/features/sections/SectionSwitch.tsx
@@ -0,0 +1,60 @@
+/* eslint-disable react/prop-types */
+import React from 'react';
+import PropTypes from 'prop-types';
+import {connect} from 'react-redux';
+
+import {selectSection} from './actions';
+import {sectionsPropType} from './types';
+import {gettext} from '../../utils';
+
+function SectionSwitch({sections, activeSection, selectSection}: any) {
+    return (
+        <div className="toggle-button__group toggle-button__group--navbar ms-0 me-3">
+            {sections.map((section: any) => (
+                <button key={section._id}
+                    className={'toggle-button' + (section._id === activeSection ? ' toggle-button--active' : '')}
+                    onClick={() => selectSection(section._id)}
+                >{gettext(section.name)}</button>
+            ))}
+        </div>
+    );
+}
+
+interface IProps {
+    options: Array<{_id: string, name: string}>;
+    switchOptions: (optionId: string) => void;
+    activeOptionId: string;
+}
+
+export const RadioButtonGroup: React.ComponentType<IProps> = ({options, switchOptions, activeOptionId}) => {
+    return (
+        <div className="toggle-button__group toggle-button__group--navbar ms-0 me-3">
+            {
+                options.map((section: any) => (
+                    <button
+                        key={section._id}
+                        className={'toggle-button' + (section._id === activeOptionId ? ' toggle-button--active' : '')}
+                        onClick={() => switchOptions(section._id)}
+                    >
+                        {gettext(section.name)}
+                    </button>
+                ))
+            }
+        </div>
+    );
+};
+
+SectionSwitch.propTypes = {
+    sections: sectionsPropType,
+    activeSection: PropTypes.string,
+
+    selectSection: PropTypes.func.isRequired,
+};
+
+const mapDispatchToProps: any = {
+    selectSection,
+};
+
+const component: React.ComponentType<any> = connect(null, mapDispatchToProps)(SectionSwitch);
+
+export default component;
diff --git a/assets/features/sections/actions.js b/assets/features/sections/actions.ts
similarity index 69%
rename from assets/features/sections/actions.js
rename to assets/features/sections/actions.ts
index a790f383d..8ee5a6e15 100644
--- a/assets/features/sections/actions.js
+++ b/assets/features/sections/actions.ts
@@ -1,10 +1,10 @@
 
 export const INIT_SECTIONS = 'INIT_SECTIONS';
-export function initSections(sections) {
+export function initSections(sections: any) {
     return {type: INIT_SECTIONS, sections: sections};
 }
 
 export const SELECT_SECTION = 'SELECT_SECTION';
-export function selectSection(section) {
+export function selectSection(section: any) {
     return {type: SELECT_SECTION, section: section};
 }
diff --git a/assets/features/sections/reducers.js b/assets/features/sections/reducers.ts
similarity index 83%
rename from assets/features/sections/reducers.js
rename to assets/features/sections/reducers.ts
index 2d5a8a417..ccc392f3e 100644
--- a/assets/features/sections/reducers.js
+++ b/assets/features/sections/reducers.ts
@@ -8,16 +8,16 @@ const INITIAL_STATE = {
     active: '',
 };
 
-export function sectionsReducer(state=INITIAL_STATE, action) {
+export function sectionsReducer(state: any = INITIAL_STATE, action?: any): any {
     if (!action) {
         return state;
     }
 
     switch (action.type) {
-    
+
     case INIT_SECTIONS:
         return {...state, list: action.sections, active: action.sections[0]._id};
-    
+
     case SELECT_SECTION:
         return {...state, active: action.section || ''};
 
diff --git a/assets/features/sections/selectors.js b/assets/features/sections/selectors.js
deleted file mode 100644
index 787f11f7f..000000000
--- a/assets/features/sections/selectors.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import {get} from 'lodash';
-
-export const sectionsSelector = (state) => get(state, 'sections.list') || [];
-export const activeSectionSelector = (state) => get(state, 'sections.active') || '';
-export const uiSectionsSelector = (state) => sectionsSelector(state).filter(
-    (section) => get(section, 'group') !== 'api'
-);
diff --git a/assets/features/sections/selectors.ts b/assets/features/sections/selectors.ts
new file mode 100644
index 000000000..61935a630
--- /dev/null
+++ b/assets/features/sections/selectors.ts
@@ -0,0 +1,7 @@
+import {get} from 'lodash';
+
+export const sectionsSelector = (state: any) => get(state, 'sections.list') || [];
+export const activeSectionSelector = (state: any) => get(state, 'sections.active') || '';
+export const uiSectionsSelector = (state: any) => sectionsSelector(state).filter(
+    (section: any) => get(section, 'group') !== 'api'
+);
diff --git a/assets/features/sections/types.js b/assets/features/sections/types.ts
similarity index 100%
rename from assets/features/sections/types.js
rename to assets/features/sections/types.ts
diff --git a/assets/general-settings/actions.js b/assets/general-settings/actions.ts
similarity index 67%
rename from assets/general-settings/actions.js
rename to assets/general-settings/actions.ts
index 5de8fb9f8..4af5019a6 100644
--- a/assets/general-settings/actions.js
+++ b/assets/general-settings/actions.ts
@@ -3,21 +3,21 @@ import {errorHandler} from '../utils';
 import {gettext, notify} from 'utils';
 
 export const UPDATE_VALUES = 'UPDATE_VALUES';
-function updateValues(data) {
+function updateValues(data: any) {
     return {type: UPDATE_VALUES, data};
 }
 
-export function save(values) {
-    return (dispatch) => {
+export function save(values: any) {
+    return (dispatch: any) => {
         server.post('/settings/general_settings', values)
-            .then((data) => {
+            .then((data: any) => {
                 notify.success(gettext('Settings were updated successfully.'));
                 dispatch(updateValues(data));
-            }, (reason) => errorHandler(reason));
+            }, (reason: any) => errorHandler(reason));
     };
 }
 
 export const INIT_VIEW_DATA = 'INIT_VIEW_DATA';
-export function initViewData(data) {
+export function initViewData(data: any) {
     return {type: INIT_VIEW_DATA, data: data};
 }
diff --git a/assets/general-settings/components/GeneralSettingsApp.jsx b/assets/general-settings/components/GeneralSettingsApp.tsx
similarity index 81%
rename from assets/general-settings/components/GeneralSettingsApp.jsx
rename to assets/general-settings/components/GeneralSettingsApp.tsx
index 056e44dff..84be80f06 100644
--- a/assets/general-settings/components/GeneralSettingsApp.jsx
+++ b/assets/general-settings/components/GeneralSettingsApp.tsx
@@ -10,18 +10,20 @@ import TextInput from 'components/TextInput';
 import CheckboxInput from 'components/CheckboxInput';
 import AuditInformation from 'components/AuditInformation';
 
-function isInput(field) {
+function isInput(field: any) {
     return ['text', 'number', 'boolean'].includes(field.type);
 }
 
-class GeneralSettingsApp extends React.Component {
-    constructor(props) {
+class GeneralSettingsApp extends React.Component<any, any> {
+    static propTypes: any;
+
+    constructor(props: any) {
         super(props);
         this.state = {
             values: {},
             _updated: get(this.props, 'config._updated'),
         };
-        Object.keys(props.config).forEach((key) => {
+        Object.keys(props.config).forEach((key: any) => {
             const config = props.config[key] || {};
 
             this.state.values[key] = (() => {
@@ -39,7 +41,7 @@ class GeneralSettingsApp extends React.Component {
         this.onSubmit = this.onSubmit.bind(this);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (nextProps.updatedTime !== this.props.updatedTime) {
             this.setState({
                 _updated: nextProps.updatedTime
@@ -47,24 +49,24 @@ class GeneralSettingsApp extends React.Component {
         }
     }
 
-    onChange(key, val) {
-        const values = {...this.state.values, [key]: val};
+    onChange(key: any, val: any) {
+        const values: any = {...this.state.values, [key]: val};
         this.setState({values});
     }
 
-    onBooleanChange(key) {
-        const values = {...this.state.values, [key]: !this.state.values[key]};
+    onBooleanChange(key: any) {
+        const values: any = {...this.state.values, [key]: !this.state.values[key]};
         this.setState({values});
     }
 
-    onSubmit(event) {
+    onSubmit(event: any) {
         event.preventDefault();
         this.props.save(this.state.values);
     }
 
     render() {
         const {config} = this.props;
-        const fields = sortBy(Object.keys(config), (_id) => config[_id].weight).map((_id) => {
+        const fields = sortBy(Object.keys(config), (_id) => config[_id].weight).map((_id: any) => {
             const field = config[_id];
             if (isInput(field)) {
                 return field.type === 'boolean' ? (
@@ -85,7 +87,7 @@ class GeneralSettingsApp extends React.Component {
                         label={gettext(field.label)}
                         value={this.state.values[_id]}
                         placeholder={field.default ? field.default.toString() : ''}
-                        onChange={(event) => this.onChange(_id, event.target.value)}
+                        onChange={(event: any) => this.onChange(_id, event.target.value)}
                         description={gettext(field.description)}
                         min={field.min}
                     />
@@ -93,7 +95,7 @@ class GeneralSettingsApp extends React.Component {
             }
             return null;
         });
-        const audit = {
+        const audit: any = {
             '_updated': this.props.updatedTime,
             'version_creator': this.props.versionCreator
         };
@@ -124,14 +126,16 @@ GeneralSettingsApp.propTypes = {
     versionCreator: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     config: state.config,
     updatedTime: state._updated,
     versionCreator: state.version_creator,
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     save,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(GeneralSettingsApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(GeneralSettingsApp);
+
+export default component;
diff --git a/assets/general-settings/index.js b/assets/general-settings/index.ts
similarity index 100%
rename from assets/general-settings/index.js
rename to assets/general-settings/index.ts
diff --git a/assets/general-settings/reducers.js b/assets/general-settings/reducers.ts
similarity index 77%
rename from assets/general-settings/reducers.js
rename to assets/general-settings/reducers.ts
index 421cbf759..1e4abbb9f 100644
--- a/assets/general-settings/reducers.js
+++ b/assets/general-settings/reducers.ts
@@ -4,11 +4,11 @@ import {
     UPDATE_VALUES,
 } from './actions';
 
-const initialState = {
+const initialState: any = {
     config: {},
 };
 
-export default function settingsReducer(state=initialState, action) {
+export default function settingsReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case INIT_VIEW_DATA:
@@ -18,10 +18,10 @@ export default function settingsReducer(state=initialState, action) {
             _updated: action.data._updated,
             version_creator: action.data.version_creator,
         };
-    
+
     case UPDATE_VALUES: {
-        let config = Object.assign({}, state.config);
-        Object.keys(action.data.values).forEach((key) => {
+        const config = Object.assign({}, state.config);
+        Object.keys(action.data.values).forEach((key: any) => {
             if (!['_updated', 'version_creator'].includes(key)) {
                 config[key].value = action.data.values[key] || null;
             }
diff --git a/assets/globals.d.ts b/assets/globals.d.ts
new file mode 100644
index 000000000..feb33b156
--- /dev/null
+++ b/assets/globals.d.ts
@@ -0,0 +1,50 @@
+interface Window {
+    sectionNames: {
+        home: string;
+        wire: string;
+        agenda: string;
+        monitoring: string;
+        saved: string;
+    };
+
+    newsroom: {
+        client_config: {
+            debug: boolean;
+            news_only_filter?: any;
+        }
+        websocket?: any;
+    };
+
+    locale: any;
+    gtag: any;
+    analytics: any;
+    google: any;
+    iframely: any;
+    translations: any;
+    profileData: any;
+    wireData: any;
+    homeData: any;
+    agendaData: any;
+    amNewsData: any;
+    viewData: any;
+    report: any;
+    factCheckData: any;
+    companyReportsData: any;
+    mapsLoaded: any;
+    googleMapsKey: any;
+    mediaReleasesData: any;
+    notificationData: any;
+    twttr: any;
+    instgrm: any;
+    locales: any;
+    marketPlaceData: {
+        home_page: any;
+    };
+
+    __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: any;
+}
+
+type Dictionary<T> = {[key: string]: T};
+
+declare module 'expect';
+declare module 'alertifyjs';
diff --git a/assets/home/actions.js b/assets/home/actions.ts
similarity index 65%
rename from assets/home/actions.js
rename to assets/home/actions.ts
index 5be079a52..1b3536126 100644
--- a/assets/home/actions.js
+++ b/assets/home/actions.ts
@@ -4,57 +4,57 @@ import {pushNotification as wirePushNotification} from 'wire/actions';
 import {get} from 'lodash';
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(data) {
+export function initData(data: any) {
     return {type: INIT_DATA, data};
 }
 
-function openItem(item) {
+function openItem(item: any) {
     return {type: OPEN_ITEM, item};
 }
 
 export const OPEN_ITEM = 'OPEN_ITEM';
-export function openItemDetails(item) {
-    return (dispatch, getState) => {
-        dispatch(openItem(item, get(getState(), 'context')));
+export function openItemDetails(item: any) {
+    return (dispatch: any, getState: any) => {
+        dispatch(openItem(item));
         recordAction(item, 'open');
     };
 }
 
 export const SET_ACTIVE = 'SET_ACTIVE';
-export function setActive(cardId) {
+export function setActive(cardId: any) {
     return {type: SET_ACTIVE, cardId};
 }
 
 export const SET_CARD_ITEMS = 'SET_CARD_ITEMS';
-export function setCardItems(cardLabel, items) {
+export function setCardItems(cardLabel: any, items: any) {
     return {type: SET_CARD_ITEMS, payload: {card: cardLabel, items: items}};
 }
 
 export const SET_MULTIPLE_CARD_ITEMS = 'SET_MULTIPLE_CARD_ITEMS';
-export function getMultipleCardItems(itemsByCard) {
+export function getMultipleCardItems(itemsByCard: any) {
     return {type: SET_MULTIPLE_CARD_ITEMS, payload: itemsByCard};
 }
 
 export function fetchCompanyCardItems() {
-    return (dispatch) => {
+    return (dispatch: any) => {
         return server.get('/card_items')
-            .then((data) => dispatch(getMultipleCardItems(data._items)))
+            .then((data: any) => dispatch(getMultipleCardItems(data._items)))
             .catch(errorHandler);
     };
 }
 
-export function fetchCardExternalItems(cardId, cardLabel) {
-    return (dispatch) => {
+export function fetchCardExternalItems(cardId: any, cardLabel: any) {
+    return (dispatch: any) => {
         return server.get(`/media_card_external/${cardId}`)
-            .then((data) => dispatch(
+            .then((data: any) => dispatch(
                 setCardItems(cardLabel, get(data, '_items', []))
             ))
             .catch(errorHandler);
     };
 }
 
-export function pushNotification(push) {
-    return (dispatch) => {
+export function pushNotification(push: any) {
+    return (dispatch: any) => {
         if (push.event === 'items_deleted') {
             setTimeout(
                 () => window.location.reload(),
diff --git a/assets/home/components/HomeApp.jsx b/assets/home/components/HomeApp.jsx
deleted file mode 100644
index a13d4a0f6..000000000
--- a/assets/home/components/HomeApp.jsx
+++ /dev/null
@@ -1,274 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import {connect} from 'react-redux';
-import {gettext, isDisplayed, isMobilePhone} from 'utils';
-import {get} from 'lodash';
-import {
-    getCardDashboardComponent,
-} from 'components/cards/utils';
-
-
-import getItemActions from 'wire/item-actions';
-import ItemDetails from 'wire/components/ItemDetails';
-import {openItemDetails, setActive, fetchCardExternalItems, fetchCompanyCardItems} from '../actions';
-import ShareItemModal from 'components/ShareItemModal';
-import DownloadItemsModal from 'wire/components/DownloadItemsModal';
-import WirePreview from 'wire/components/WirePreview';
-import {followStory} from 'search/actions';
-import {downloadMedia} from 'wire/actions';
-import {SearchBar} from './search-bar';
-import {previewConfigSelector, listConfigSelector, detailsConfigSelector, isSearchEnabled} from 'ui/selectors';
-import {filterGroupsToLabelMap} from 'search/selectors';
-import CardRow from 'components/cards/render/CardRow';
-
-const modals = {
-    shareItem: ShareItemModal,
-    downloadItems: DownloadItemsModal,
-};
-
-class HomeApp extends React.Component {
-    constructor(props, context) {
-        super(props, context);
-        this.getPanels = this.getPanels.bind(this);
-        this.filterActions = this.filterActions.bind(this);
-        this.renderModal = this.renderModal.bind(this);
-        this.onHomeScroll = this.onHomeScroll.bind(this);
-        this.height = 0;
-
-        this.state = {loadingItems: true};
-    }
-
-    componentDidMount() {
-        document.getElementById('footer').className = 'footer footer--home';
-        this.height = this.elem.offsetHeight;
-
-        // Load items for cards
-        Promise.all([
-            this.props.fetchCompanyCardItems(),
-            ...this.props.cards
-                .filter((card) => card.dashboard === 'newsroom' && card.type === '4-photo-gallery')
-                .map((card) => (
-                    this.props.fetchCardExternalItems(get(card, '_id'), get(card, 'label'))
-                )),
-        ])
-            .then(() => {
-                this.setState({loadingItems: false});
-            });
-    }
-
-    renderModal(specs) {
-        if (specs) {
-            const Modal = modals[specs.modal];
-            return (
-                <Modal key="modal" data={specs.data} />
-            );
-        }
-    }
-
-    onHomeScroll(event) {
-        const container = event.target;
-        const BUFFER = 100;
-        if(container.scrollTop + this.height + BUFFER >= container.scrollHeight) {
-            document.getElementById('footer').className = 'footer';
-        } else {
-            document.getElementById('footer').className = 'footer footer--home';
-        }
-    }
-
-    getProductId(card) {
-        return card.config.product;
-    }
-
-    getPanels(card) {
-        if (this.state.loadingItems) {
-            return (
-                <CardRow key={card.label} title={card.label} productId={this.getProductId(card)} isActive={this.props.activeCard === card._id}>
-                    <div className='col-sm-6 col-md-4 col-lg-3 col-xxl-2 d-flex mb-4'>
-                        <div className="spinner-border text-success" />
-                        <span className="a11y-only">{gettext('Loading Card Items')}</span>
-                    </div>
-                </CardRow>
-            );
-        }
-
-        const Panel = getCardDashboardComponent(card.type);
-        const items = this.props.itemsByCard[card.label] || [];
-
-        if (card.type === '4-photo-gallery') {
-            return <Panel
-                key={card.label}
-                photos={items}
-                title={card.label}
-                moreUrl={card.config.more_url}
-                moreUrlLabel={card.config.more_url_label}
-                listConfig={this.props.listConfig}
-            />;
-        }
-        if (card.type === '2x2-events') {
-            return <Panel
-                key={card.label}
-                events={get(card, 'config.events')}
-                title={card.label}
-                listConfig={this.props.listConfig}
-            />;
-        }
-
-        return <Panel
-            key={card.label}
-            type={card.type}
-            items={items}
-            title={card.label}
-            productId={this.getProductId(card)}
-            openItem={this.props.openItemDetails}
-            isActive={this.props.activeCard === card._id}
-            cardId={card._id}
-            listConfig={this.props.listConfig}
-        />;
-    }
-
-    filterActions(item, config) {
-        return this.props.actions.filter((action) =>  (!config || isDisplayed(action.id, config)) &&
-          (!action.when || action.when(this.props, item)));
-    }
-
-    renderContent(children) {
-        return (
-            <React.Fragment>
-                {this.props.isSearchEnabled && (
-                    <SearchBar />
-                )}
-
-                <section className="content-main d-block py-4 px-2 p-md-3 p-lg-4"
-                    onScroll={this.onHomeScroll}
-                    ref={(elem) => this.elem = elem}
-                >
-                    <div className="container-fluid">
-                        {this.props.cards.length > 0 &&
-                        this.props.cards.filter((c) => c.dashboard === 'newsroom').map((card) => this.getPanels(card))}
-                        {this.props.cards.length === 0 &&
-                        <div className="alert alert-warning" role="alert">
-                            <strong>{gettext('Warning')}!</strong> {gettext('There\'s no card defined for {{home}} page!', sectionNames)}
-                        </div>
-                        }
-                    </div>
-                    {children}
-                </section>
-            </React.Fragment>
-        );
-    }
-
-    renderNonMobile() {
-        const modal = this.renderModal(this.props.modal);
-
-        return (
-            (this.props.itemToOpen ? [<ItemDetails key="itemDetails"
-                item={this.props.itemToOpen}
-                user={this.props.user}
-                topics={this.props.topics}
-                actions={this.filterActions(this.props.itemToOpen, this.props.previewConfig)}
-                onClose={() => this.props.actions.filter(a => a.id === 'open')[0].action(null)}
-                followStory={this.props.followStory}
-                detailsConfig={this.props.detailsConfig}
-                filterGroupLabels={this.props.filterGroupLabels}
-                downloadMedia={this.props.downloadMedia}
-            />, modal] :
-                this.renderContent()
-            )
-        );
-    }
-
-    renderMobile() {
-        const modal = this.renderModal(this.props.modal);
-        const isFollowing = get(this.props, 'itemToOpen.slugline') && this.props.topics &&
-            this.props.topics.find((topic) => topic.query === `slugline:"${this.props.itemToOpen.slugline}"`);
-
-        return this.renderContent([
-            <div key='preview_test' className={`wire-column__preview ${this.props.itemToOpen ? 'wire-column__preview--open' : ''}`}>
-                {this.props.itemToOpen && (
-                    <WirePreview
-                        item={this.props.itemToOpen}
-                        user={this.props.user}
-                        actions={this.filterActions(this.props.itemToOpen, this.props.previewConfig)}
-                        followStory={this.props.followStory}
-                        isFollowing={!!isFollowing}
-                        closePreview={() => this.props.actions.filter(a => a.id === 'open')[0].action(null)}
-                        previewConfig={this.props.previewConfig}
-                        downloadMedia={this.props.downloadMedia}
-                        listConfig={this.props.listConfig}
-                        filterGroupLabels={this.props.filterGroupLabels}
-                    />
-                )}
-            </div>,
-            modal
-        ]);
-    }
-
-    render() {
-        return isMobilePhone() ?
-            this.renderMobile() :
-            this.renderNonMobile();
-    }
-}
-
-HomeApp.propTypes = {
-    cards: PropTypes.arrayOf(PropTypes.object),
-    itemsByCard: PropTypes.object,
-    products: PropTypes.array,
-    user: PropTypes.string,
-    userType: PropTypes.string,
-    company: PropTypes.string,
-    format: PropTypes.array,
-    itemToOpen: PropTypes.object,
-    modal: PropTypes.object,
-    openItemDetails: PropTypes.func,
-    activeCard: PropTypes.string,
-    actions: PropTypes.arrayOf(PropTypes.shape({
-        name: PropTypes.string,
-        action: PropTypes.func,
-    })),
-    fetchCardExternalItems: PropTypes.func,
-    fetchCompanyCardItems: PropTypes.func,
-    followStory: PropTypes.func,
-    previewConfig: PropTypes.object,
-    listConfig: PropTypes.object,
-    detailsConfig: PropTypes.object,
-    downloadMedia: PropTypes.func,
-    topics: PropTypes.array,
-    isFollowing: PropTypes.bool,
-    isSearchEnabled: PropTypes.bool,
-    filterGroupLabels: PropTypes.object,
-};
-
-const mapStateToProps = (state) =>({
-    cards: state.cards,
-    itemsByCard: state.itemsByCard,
-    products: state.products,
-    user: state.user,
-    userType: state.userType,
-    company: state.company,
-    format: PropTypes.format,
-    itemToOpen: state.itemToOpen,
-    modal: state.modal,
-    activeCard: state.activeCard,
-    previewConfig: previewConfigSelector(state),
-    listConfig: listConfigSelector(state),
-    detailsConfig: detailsConfigSelector(state),
-    topics: state.topics || [],
-    isSearchEnabled: isSearchEnabled(state),
-    filterGroupLabels: filterGroupsToLabelMap(state),
-});
-
-const mapDispatchToProps = (dispatch) => ({
-    openItemDetails: (item, cardId) => {
-        dispatch(openItemDetails(item));
-        dispatch(setActive(cardId));
-    },
-    actions: getItemActions(dispatch),
-    fetchCardExternalItems: (cardId, cardLabel) => dispatch(fetchCardExternalItems(cardId, cardLabel)),
-    fetchCompanyCardItems: () => dispatch(fetchCompanyCardItems()),
-    followStory: (item) => followStory(item, 'wire'),
-    downloadMedia: (href, id, mimeType) => dispatch(downloadMedia(href, id, mimeType)),
-});
-
-
-export default connect(mapStateToProps, mapDispatchToProps)(HomeApp);
diff --git a/assets/home/components/HomeApp.tsx b/assets/home/components/HomeApp.tsx
new file mode 100644
index 000000000..d9c8adf95
--- /dev/null
+++ b/assets/home/components/HomeApp.tsx
@@ -0,0 +1,403 @@
+import React from 'react';
+import {connect} from 'react-redux';
+import {gettext, isDisplayed, isMobilePhone} from 'utils';
+import {get} from 'lodash';
+import {getCardDashboardComponent} from 'components/cards/utils';
+import getItemActions from 'wire/item-actions';
+import ItemDetails from 'wire/components/ItemDetails';
+import {openItemDetails, setActive, fetchCardExternalItems, fetchCompanyCardItems} from '../actions';
+import ShareItemModal from 'components/ShareItemModal';
+import DownloadItemsModal from 'wire/components/DownloadItemsModal';
+import WirePreview from 'wire/components/WirePreview';
+import {followStory} from 'search/actions';
+import {downloadMedia, fetchItems} from 'wire/actions';
+import {SearchBar} from './search-bar';
+import {previewConfigSelector, listConfigSelector, detailsConfigSelector, isSearchEnabled} from 'ui/selectors';
+import {filterGroupsToLabelMap} from 'search/selectors';
+import CardRow from 'components/cards/render/CardRow';
+import {PersonalizeHomeSettingsModal} from 'components/PersonalizeHomeModal';
+import {personalizeHome} from 'agenda/actions';
+import {RadioButtonGroup} from 'features/sections/SectionSwitch';
+import {getCurrentUser} from 'company-admin/selectors';
+import {IPersonalizedDashboardsWithData} from 'home/reducers';
+import {ITopic} from 'interfaces/topic';
+
+const modals: any = {
+    shareItem: ShareItemModal,
+    downloadItems: DownloadItemsModal,
+    personalizeHome: PersonalizeHomeSettingsModal,
+};
+
+interface IState {
+    loadingItems: boolean;
+    activeOptionId: 'default' | 'my-home';
+}
+
+interface IProps {
+    cards: Array<any>;
+    itemsByCard: any;
+    products: Array<any>;
+    user: string;
+    userType: string;
+    company: string;
+    format: Array<any>;
+    itemToOpen: any;
+    personalizedDashboards: Array<IPersonalizedDashboardsWithData>;
+    modal: any;
+    openItemDetails: () => void;
+    activeCard: string;
+    actions: Array<{name: string; action: (action?: any) => void;}>;
+    fetchCardExternalItems: (cardId: string, cardLabel: string) => void;
+    personalizeHome: () => void;
+    fetchCompanyCardItems: () => void;
+    followStory: () => void;
+    previewConfig: any;
+    listConfig: any;
+    detailsConfig: any;
+    downloadMedia: () => void;
+    topics: Array<ITopic>;
+    isFollowing: boolean;
+    isSearchEnabled: boolean;
+    filterGroupLabels: any;
+    currentUser: any;
+    fetchItems: () => any;
+}
+
+class HomeApp extends React.Component<IProps, IState> {
+    static propTypes: any;
+
+    height: number;
+    elem: any;
+    constructor(props: any, context: any) {
+        super(props, context);
+        this.getPanels = this.getPanels.bind(this);
+        this.filterActions = this.filterActions.bind(this);
+        this.renderModal = this.renderModal.bind(this);
+        this.onHomeScroll = this.onHomeScroll.bind(this);
+        this.height = 0;
+
+        this.state = {
+            loadingItems: true,
+            activeOptionId: this.props.personalizedDashboards.length > 0 ? 'my-home' : 'default',
+        };
+    }
+
+    componentDidMount() {
+        (document.getElementById('footer') as any).className = 'footer footer--home';
+        this.height = this.elem.offsetHeight;
+
+        // Load items for cards
+        Promise.all([
+            this.props.fetchCompanyCardItems(),
+            ...this.props.cards
+                .filter((card: any) => card.dashboard === 'newsroom' && card.type === '4-photo-gallery')
+                .map((card: any) => (
+                    this.props.fetchCardExternalItems(get(card, '_id'), get(card, 'label'))
+                )),
+        ])
+            .then(() => {
+                this.setState({loadingItems: false});
+            });
+    }
+
+    renderModal(specs: any) {
+        if (specs) {
+            const Modal = modals[specs.modal];
+            return (
+                <Modal key="modal" data={specs.data} />
+            );
+        }
+    }
+
+    onHomeScroll(event: any) {
+        const container = event.target;
+        const BUFFER = 100;
+        if(container.scrollTop + this.height + BUFFER >= container.scrollHeight) {
+            (document.getElementById('footer') as any).className = 'footer';
+        } else {
+            (document.getElementById('footer') as any).className = 'footer footer--home';
+        }
+    }
+
+    getProductId(card: any) {
+        return card.config.product;
+    }
+
+    getPanelsForPersonalizedDashboard() {
+        const {personalizedDashboards} = this.props;
+        const Panel: React.ComponentType<any> = getCardDashboardComponent('4-media-gallery');
+        const personalizedDashboardTopicIds = personalizedDashboards?.[0].topic_items?.map(({_id}: any) => _id);
+        const topicItems = this.props.topics.filter((topic) => personalizedDashboardTopicIds?.includes(topic._id));
+
+        return (
+            personalizedDashboards?.[0].topic_items?.map((item: any) => {
+                const currentTopic = topicItems.find((x) => x._id === item._id);
+
+                return (
+                    <Panel
+                        key={item._id}
+                        type="4-picture-text"
+                        items={item.items}
+                        title={currentTopic?.label}
+                        productId={item.items[0].productId ?? ''}
+                        openItem={this.props.openItemDetails}
+                        isActive={this.props.activeCard === item._id}
+                        cardId={item._id}
+                        listConfig={this.props.listConfig}
+                    />
+                );
+            })
+        );
+    }
+
+    getPanels(card: any) {
+        if (this.state.loadingItems) {
+            return (
+                <CardRow key={card.label} title={card.label} productId={this.getProductId(card)} isActive={this.props.activeCard === card._id}>
+                    <div className='col-sm-6 col-md-4 col-lg-3 col-xxl-2 d-flex mb-4'>
+                        <div className="spinner-border text-success" />
+                        <span className="a11y-only">{gettext('Loading Card Items')}</span>
+                    </div>
+                </CardRow>
+            );
+        }
+
+        const Panel: React.ComponentType<any> = getCardDashboardComponent(card.type);
+        const items = this.props.itemsByCard[card.label] || [];
+
+        if (card.type === '4-photo-gallery') {
+            return <Panel
+                key={card.label}
+                photos={items}
+                title={card.label}
+                moreUrl={card.config.more_url}
+                moreUrlLabel={card.config.more_url_label}
+                listConfig={this.props.listConfig}
+            />;
+        }
+        if (card.type === '2x2-events') {
+            return <Panel
+                key={card.label}
+                events={get(card, 'config.events')}
+                title={card.label}
+                listConfig={this.props.listConfig}
+            />;
+        }
+
+        return <Panel
+            key={card.label}
+            type={card.type}
+            items={items}
+            title={card.label}
+            productId={this.getProductId(card)}
+            openItem={this.props.openItemDetails}
+            isActive={this.props.activeCard === card._id}
+            cardId={card._id}
+            listConfig={this.props.listConfig}
+        />;
+    }
+
+    filterActions(item: any, config: any) {
+        return this.props.actions.filter((action: any) =>  (!config || isDisplayed(action.id, config)) &&
+          (!action.when || action.when(this.props, item)));
+    }
+
+    renderContent(children?: any): any {
+        const {cards} = this.props;
+
+        return (
+            <React.Fragment>
+                {this.props.isSearchEnabled && (
+                    <SearchBar />
+                )}
+
+                <section
+                    className="content-main d-block py-4 px-2 p-md-3 p-lg-4"
+                    onScroll={this.onHomeScroll}
+                    ref={(elem: any) => this.elem = elem}
+                >
+                    <div className="container-fluid">
+                        <div
+                            style={{
+                                display: 'flex',
+                                flexDirection: 'column',
+                                alignItems: 'center',
+                                gap: 8,
+                            }}
+                        >
+                            {
+                                (this.props.personalizedDashboards?.length ?? 0) < 1 ? (
+                                    <div className="home-tools">
+                                        <button
+                                            onClick={() => {
+                                                this.props.personalizeHome();
+                                            }}
+                                            type="button"
+                                            className="nh-button nh-button--secondary nh-button--small"
+                                            title={gettext('Personalize Home')}
+                                        >
+                                            {gettext('Personalize Home')}
+                                        </button>
+                                    </div>
+                                ) : (
+                                    <div>
+                                        <div
+                                            style={{
+                                                display: 'flex',
+                                                flexDirection: 'row',
+                                                alignItems: 'center'
+                                            }}
+                                            className="home-tools"
+                                        >
+                                            <RadioButtonGroup
+                                                options={[
+                                                    {
+                                                        _id: 'default',
+                                                        name: gettext('Default')
+                                                    },
+                                                    {
+                                                        _id: 'my-home',
+                                                        name: gettext('My home')
+                                                    },
+                                                ]}
+                                                activeOptionId={this.state.activeOptionId}
+                                                switchOptions={(optionId) => {
+                                                    if (optionId === 'default' || optionId === 'my-home') {
+                                                        this.setState({
+                                                            activeOptionId: optionId
+                                                        });
+                                                    }
+                                                }}
+                                            />
+                                            <button
+                                                onClick={() => {
+                                                    this.props.personalizeHome();
+                                                }}
+                                                type="button"
+                                                className="icon-button icon-button--small icon-button--tertiary icon-button--bordered"
+                                                title={gettext('Edit personal Home')}
+                                            >
+                                                <i className="icon--settings"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                )
+                            }
+                        </div>
+                        {this.props.modal?.modal === 'personalizeHome' && <PersonalizeHomeSettingsModal />}
+                        {
+                            this.state.activeOptionId === 'my-home' ? (
+                                this.getPanelsForPersonalizedDashboard()
+                            ) : (
+                                cards.length === 0 ? (
+                                    <div className="alert alert-warning my-4" role="alert">
+                                        <strong>{gettext('Warning')}!</strong>
+                                        {gettext('There\'s no card defined for {{home}} page!', window.sectionNames)}
+                                    </div>
+                                ) : (
+                                    this.props.cards.filter((c: any) => c.dashboard === 'newsroom')
+                                        .map((card: any) => this.getPanels(card))
+                                )
+                            )
+                        }
+                    </div>
+                    {children}
+                </section>
+            </React.Fragment>
+        );
+    }
+
+    renderNonMobile() {
+        const modal = this.renderModal(this.props.modal);
+
+        return (
+            (
+                this.props.itemToOpen ? [
+                    <ItemDetails key="itemDetails"
+                        item={this.props.itemToOpen}
+                        user={this.props.user}
+                        topics={this.props.topics}
+                        actions={this.filterActions(this.props.itemToOpen, this.props.previewConfig)}
+                        onClose={() => this.props.actions.filter((a: any) => a.id === 'open')[0].action(null)}
+                        followStory={this.props.followStory}
+                        detailsConfig={this.props.detailsConfig}
+                        filterGroupLabels={this.props.filterGroupLabels}
+                        downloadMedia={this.props.downloadMedia}
+                    />,
+                    modal
+                ] : this.renderContent()
+            )
+        );
+    }
+
+    renderMobile() {
+        const modal = this.renderModal(this.props.modal);
+        const isFollowing = get(this.props, 'itemToOpen.slugline') && this.props.topics &&
+            this.props.topics.find((topic: any) => topic.query === `slugline:"${this.props.itemToOpen.slugline}"`);
+
+        return this.renderContent([
+            <div key='preview_test' className={`wire-column__preview ${this.props.itemToOpen ? 'wire-column__preview--open' : ''}`}>
+                {this.props.itemToOpen && (
+                    <WirePreview
+                        item={this.props.itemToOpen}
+                        user={this.props.user}
+                        actions={this.filterActions(this.props.itemToOpen, this.props.previewConfig)}
+                        followStory={this.props.followStory}
+                        isFollowing={!!isFollowing}
+                        closePreview={() => this.props.actions.filter((a: any) => a.id === 'open')[0].action(null)}
+                        previewConfig={this.props.previewConfig}
+                        downloadMedia={this.props.downloadMedia}
+                        listConfig={this.props.listConfig}
+                        filterGroupLabels={this.props.filterGroupLabels}
+                    />
+                )}
+            </div>,
+            modal
+        ]);
+    }
+
+    render() {
+        return isMobilePhone() ?
+            this.renderMobile() :
+            this.renderNonMobile();
+    }
+}
+
+const mapStateToProps = (state: any) =>({
+    cards: state.cards,
+    personalizedDashboards: state.personalizedDashboards,
+    itemsByCard: state.itemsByCard,
+    products: state.products,
+    user: state.user,
+    userType: state.userType,
+    company: state.company,
+    itemToOpen: state.itemToOpen,
+    modal: state.modal,
+    activeCard: state.activeCard,
+    previewConfig: previewConfigSelector(state),
+    listConfig: listConfigSelector(state),
+    detailsConfig: detailsConfigSelector(state),
+    topics: state.topics || [],
+    isSearchEnabled: isSearchEnabled(state),
+    filterGroupLabels: filterGroupsToLabelMap(state),
+    currentUser: getCurrentUser(state),
+});
+
+const mapDispatchToProps = (dispatch: any, state: any) => ({
+    openItemDetails: (item: any, cardId: any) => {
+        dispatch(openItemDetails(item));
+        dispatch(setActive(cardId));
+    },
+    fetchItems: () => dispatch(fetchItems()),
+    personalizeHome: () => {
+        dispatch(personalizeHome());
+    },
+    actions: getItemActions(dispatch),
+    fetchCardExternalItems: (cardId: any, cardLabel: any) => dispatch(fetchCardExternalItems(cardId, cardLabel)),
+    fetchCompanyCardItems: () => dispatch(fetchCompanyCardItems()),
+    followStory: (item: any) => followStory(item, 'wire'),
+    downloadMedia: (href: any, id: any) => dispatch(downloadMedia(href, id)),
+});
+
+
+export default connect(mapStateToProps, mapDispatchToProps)(HomeApp);
diff --git a/assets/home/components/search-bar.jsx b/assets/home/components/search-bar.tsx
similarity index 90%
rename from assets/home/components/search-bar.jsx
rename to assets/home/components/search-bar.tsx
index 5a492f62f..863e6028d 100644
--- a/assets/home/components/search-bar.jsx
+++ b/assets/home/components/search-bar.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import {gettext} from 'utils';
 import classNames from 'classnames';
 
-export class SearchBar extends React.PureComponent {
-    constructor(props) {
+export class SearchBar extends React.PureComponent<any, any> {
+    constructor(props: any) {
         super(props);
         this.state = {value: ''};
     }
@@ -23,11 +23,11 @@ export class SearchBar extends React.PureComponent {
                                 className="search__input form-control"
                                 placeholder={gettext('Search for...')}
                                 aria-label={gettext('Search for...')}
-                                onChange={(event) => this.setState({value: event.target.value})}
+                                onChange={(event: any) => this.setState({value: event.target.value})}
                             />
                             <div className="search__form-buttons">
                                 {this.state.value && (
-                                    <button 
+                                    <button
                                         type="reset"
                                         className="search__button-clear"
                                         title={gettext('Clear search')}>
diff --git a/assets/home/index.js b/assets/home/index.ts
similarity index 59%
rename from assets/home/index.js
rename to assets/home/index.ts
index 102dd9469..dfdf5d52c 100644
--- a/assets/home/index.js
+++ b/assets/home/index.ts
@@ -1,4 +1,5 @@
-import {createStore, render, getInitData, initWebSocket} from 'utils';
+import {createStore, render, getInitData} from 'utils';
+import {initWebSocket} from 'websocket';
 import homeReducer from './reducers';
 import HomeApp from './components/HomeApp';
 import {initData, pushNotification} from './actions';
@@ -8,7 +9,9 @@ const store = createStore(homeReducer, 'Home');
 
 
 if (window.homeData) {
-    store.dispatch(initData(getInitData(window.homeData)));
+    const data = getInitData({...window.homeData, currentUser: {...window.profileData.user}});
+
+    store.dispatch(initData(data));
 }
 
 render(
diff --git a/assets/home/reducers.js b/assets/home/reducers.ts
similarity index 71%
rename from assets/home/reducers.js
rename to assets/home/reducers.ts
index ae8dd7ef5..6d12a50ba 100644
--- a/assets/home/reducers.js
+++ b/assets/home/reducers.ts
@@ -7,11 +7,29 @@ import {
     SET_MULTIPLE_CARD_ITEMS,
 } from './actions';
 import {BOOKMARK_ITEMS, REMOVE_BOOKMARK} from '../wire/actions';
-import {CLOSE_MODAL, MODAL_FORM_VALID, RENDER_MODAL} from '../actions';
+import {CLOSE_MODAL, MODAL_FORM_VALID, RENDER_MODAL, SET_USER} from '../actions';
 import {modalReducer} from '../reducers';
 import {topicsReducer} from '../topics/reducer';
 
-const initialState = {
+export interface IPersonalizedDashboardsWithData {
+    dashboard_id?: string;
+    dashboard_name?: string;
+    topic_items?: Array<{_id: string, items: Array<any>}>;
+}
+
+interface IState {
+    personalizedDashboards: Array<IPersonalizedDashboardsWithData>;
+    cards: Array<any>;
+    topics: Array<any>;
+    products: Array<any>;
+    itemsByCard: any;
+    activeCard: any;
+    uiConfig: any;
+    userProducts: Array<any>;
+    currentUser: any;
+}
+
+const initialState: IState = {
     cards: [],
     topics: [],
     products: [],
@@ -19,17 +37,21 @@ const initialState = {
     activeCard: null,
     uiConfig: {},
     userProducts: [],
+    currentUser: {},
+    personalizedDashboards: [],
 };
 
-export default function homeReducer(state=initialState, action) {
+export default function homeReducer(state: IState & any = initialState, action: any): IState {
 
     switch (action.type) {
 
     case INIT_DATA:
         return {
             ...state,
+            personalizedDashboards: action.data?.personalizedDashboards,
             cards: action.data.cards,
             itemsByCard: {},
+            currentUser: action.data.currentUser,
             products: action.data.products,
             user: action.data.user,
             userType: action.data.userType,
@@ -50,6 +72,13 @@ export default function homeReducer(state=initialState, action) {
         };
     }
 
+    case SET_USER: {
+        return {
+            ...state,
+            currentUser: action.data
+        };
+    }
+
     case SET_ACTIVE:
         return {
             ...state,
@@ -68,7 +97,7 @@ export default function homeReducer(state=initialState, action) {
 
     case REMOVE_BOOKMARK: {
         const itemToOpen = Object.assign({}, state.itemToOpen);
-        itemToOpen.bookmarks = (itemToOpen.bookmarks || []).filter((val) => val !== state.user);
+        itemToOpen.bookmarks = (itemToOpen.bookmarks || []).filter((val: any) => val !== state.user);
 
         return {
             ...state,
diff --git a/assets/home/utils.js b/assets/home/utils.ts
similarity index 65%
rename from assets/home/utils.js
rename to assets/home/utils.ts
index 8cd4f8b73..d50278947 100644
--- a/assets/home/utils.js
+++ b/assets/home/utils.ts
@@ -1,11 +1,11 @@
 import {get} from 'lodash';
 
-export function getNavigationImageUrl(navigation) {
+export function getNavigationImageUrl(navigation: any) {
     if (get(navigation, 'tile_images.length', 0) === 0) {
         return null;
     }
 
-    const urls = get(navigation, 'tile_images', []).map((image) => image.file_url).filter((url) => url);
+    const urls = get(navigation, 'tile_images', []).map((image: any) => image.file_url).filter((url: any) => url);
 
     if (urls.length === 1) {
         return urls[0];
diff --git a/assets/index.js b/assets/index.ts
similarity index 100%
rename from assets/index.js
rename to assets/index.ts
diff --git a/assets/interfaces/topic.ts b/assets/interfaces/topic.ts
new file mode 100644
index 000000000..203c1787f
--- /dev/null
+++ b/assets/interfaces/topic.ts
@@ -0,0 +1,20 @@
+import {IUser} from './user';
+
+export interface ITopic {
+    _id: string;
+    label: string;
+    query?: string;
+    filter?: Dictionary<string>;
+    created?: Dictionary<string>;
+    user: IUser['_id'];
+    company: any;
+    is_global?: boolean;
+    subscribers: Array<IUser['_id']>;
+    timezone_offset?: number;
+    topic_type: 'wire' | 'agenda';
+    navigation?: Array<string>;
+    original_creator: IUser['_id'];
+    version_creator: IUser['_id'];
+    folder: string;
+    advanced?: Dictionary<string>;
+}
\ No newline at end of file
diff --git a/assets/interfaces/user.ts b/assets/interfaces/user.ts
new file mode 100644
index 000000000..a73a61efb
--- /dev/null
+++ b/assets/interfaces/user.ts
@@ -0,0 +1,25 @@
+export interface IUserDashboard {
+    type: string;
+    name: string;
+    topic_ids: Array<string>;
+}
+
+export interface IUser {
+    user_type: 'administrator' | 'company_admin' | 'public';
+    is_approved: boolean;
+    is_enabled: boolean;
+    company?: string;
+    phone: string;
+    email: string;
+    name: string;
+    is_validated: boolean;
+    first_name: string;
+    last_name: string;
+    mobile: any;
+    locale: any;
+    role: any;
+    manage_company_topics: boolean;
+    expiry_alert: boolean;
+    _id: string | null;
+    dashboards?: Array<IUserDashboard>;
+}
diff --git a/assets/item-actions.js b/assets/item-actions.js
deleted file mode 100644
index d35a7de4a..000000000
--- a/assets/item-actions.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import {gettext, isActionEnabled} from './utils';
-
-export function getItemActions(dispatch, actions) {
-    const {
-        openItem,
-        shareItems,
-        printItem,
-        previewAndCopy,
-        downloadItems,
-        bookmarkItems,
-        removeBookmarks,
-        removeItems,
-    } = actions;
-
-    return [
-        {
-            id: 'open',
-            name: gettext('Open'),
-            icon: 'text',
-            when: (state) => !state.itemToOpen && !state.openItem,
-            action: (item, group, plan) => dispatch(openItem(item, group, plan)),
-        },
-        {
-            id: 'share',
-            name: gettext('Share'),
-            icon: 'share',
-            multi: true,
-            shortcut: true,
-            visited: (user, item) => user && item && item.shares &&  item.shares.includes(user),
-            when: (state) => state.user && state.company,
-            action: (items) => dispatch(shareItems(items)),
-        },
-        {
-            id: 'print',
-            name: gettext('Print'),
-            icon: 'print',
-            visited: (user, item) => user && item && item.prints &&  item.prints.includes(user),
-            action: (item) => dispatch(printItem(item)),
-        },
-        {
-            id: 'copy',
-            name: gettext('Copy'),
-            icon: 'copy',
-            visited: (user, item) => user && item && item.copies &&  item.copies.includes(user),
-            action: (item) => dispatch(previewAndCopy(item)),
-        },
-        {
-            id: 'download',
-            name: gettext('Download'),
-            icon: 'download',
-            multi: true,
-            visited: (user, item) => user && item && item.downloads &&  item.downloads.includes(user),
-            when: (state) => state.user && (state.company || state.userType === 'administrator'),
-            action: (items) => dispatch(downloadItems(items)),
-        },
-        {
-            id: 'save',
-            name: gettext('Save'),
-            icon: 'bookmark-add',
-            multi: true,
-            shortcut: true,
-            when: (state, item) => state.user && (!item || !item.bookmarks ||  !item.bookmarks.includes(state.user)),
-            action: (items) => dispatch(bookmarkItems(items)),
-        },
-        {
-            id: 'unsave',
-            name: gettext('Unsave'),
-            icon: 'bookmark-remove',
-            multi: true,
-            shortcut: true,
-            when: (state, item) => state.user && item && item.bookmarks && item.bookmarks.includes(state.user),
-            action: (items) => dispatch(removeBookmarks(items)),
-        },
-        {
-            id: 'remove',
-            name: gettext('Remove'),
-            icon: 'trash',
-            multi: true,
-            when: (state) => state.user && state.userType === 'administrator',
-            action: (items) => removeItems(items),
-        }
-    ].filter(isActionEnabled('item_actions'));
-}
diff --git a/assets/item-actions.ts b/assets/item-actions.ts
new file mode 100644
index 000000000..941d875be
--- /dev/null
+++ b/assets/item-actions.ts
@@ -0,0 +1,83 @@
+import {gettext, isActionEnabled} from './utils';
+
+export function getItemActions(dispatch: any, actions: any) {
+    const {
+        openItem,
+        shareItems,
+        printItem,
+        previewAndCopy,
+        downloadItems,
+        bookmarkItems,
+        removeBookmarks,
+        removeItems,
+    } = actions;
+
+    return [
+        {
+            id: 'open',
+            name: gettext('Open'),
+            icon: 'text',
+            when: (state: any) => !state.itemToOpen && !state.openItem,
+            action: (item: any, group: any, plan: any) => dispatch(openItem(item, group, plan)),
+        },
+        {
+            id: 'share',
+            name: gettext('Share'),
+            icon: 'share',
+            multi: true,
+            shortcut: true,
+            visited: (user: any, item: any) => user && item && item.shares &&  item.shares.includes(user),
+            when: (state: any) => state.user && state.company,
+            action: (items: any) => dispatch(shareItems(items)),
+        },
+        {
+            id: 'print',
+            name: gettext('Print'),
+            icon: 'print',
+            visited: (user: any, item: any) => user && item && item.prints &&  item.prints.includes(user),
+            action: (item: any) => dispatch(printItem(item)),
+        },
+        {
+            id: 'copy',
+            name: gettext('Copy'),
+            icon: 'copy',
+            visited: (user: any, item: any) => user && item && item.copies &&  item.copies.includes(user),
+            action: (item: any) => dispatch(previewAndCopy(item)),
+        },
+        {
+            id: 'download',
+            name: gettext('Download'),
+            icon: 'download',
+            multi: true,
+            visited: (user: any, item: any) => user && item && item.downloads &&  item.downloads.includes(user),
+            when: (state: any) => state.user && (state.company || state.userType === 'administrator'),
+            action: (items: any) => dispatch(downloadItems(items)),
+        },
+        {
+            id: 'save',
+            name: gettext('Save'),
+            icon: 'bookmark-add',
+            multi: true,
+            shortcut: true,
+            when: (state: any, item: any) => state.user && (!item || !item.bookmarks ||  !item.bookmarks.includes(state.user)),
+            action: (items: any) => dispatch(bookmarkItems(items)),
+        },
+        {
+            id: 'unsave',
+            name: gettext('Unsave'),
+            icon: 'bookmark-remove',
+            multi: true,
+            shortcut: true,
+            when: (state: any, item: any) => state.user && item && item.bookmarks && item.bookmarks.includes(state.user),
+            action: (items: any) => dispatch(removeBookmarks(items)),
+        },
+        {
+            id: 'remove',
+            name: gettext('Remove'),
+            icon: 'trash',
+            multi: true,
+            when: (state: any) => state.user && state.userType === 'administrator',
+            action: (items: any) => removeItems(items),
+        }
+    ].filter(isActionEnabled('item_actions'));
+}
diff --git a/assets/layout/components/BaseApp.jsx b/assets/layout/components/BaseApp.tsx
similarity index 86%
rename from assets/layout/components/BaseApp.jsx
rename to assets/layout/components/BaseApp.tsx
index 08cbecfb2..865695b7b 100644
--- a/assets/layout/components/BaseApp.jsx
+++ b/assets/layout/components/BaseApp.tsx
@@ -14,8 +14,13 @@ import NavigationTab from 'wire/components/filters/NavigationTab';
 import {AdvancedSearchPanel} from 'search/components/AdvancedSearchPanel';
 import {SearchTipsPanel} from 'search/components/SearchTipsPanel';
 
-export default class BaseApp extends React.Component {
-    constructor(props) {
+export default class BaseApp extends React.Component<any, any> {
+    static propTypes: any;
+    dom: any;
+    tooltips: any;
+    tabs: any;
+    modals: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -52,7 +57,7 @@ export default class BaseApp extends React.Component {
         ];
     }
 
-    static getDerivedStateFromProps(props) {
+    static getDerivedStateFromProps(props: any) {
         if (props.isLoading === false) {
             return {initialLoad: false};
         }
@@ -60,20 +65,20 @@ export default class BaseApp extends React.Component {
         return null;
     }
 
-    setOpenRef(elem) {
+    setOpenRef(elem: any) {
         this.dom.open = elem;
     }
 
-    setCloseRef(elem) {
+    setCloseRef(elem: any) {
         this.dom.close = elem;
     }
 
-    setListRef(elem) {
+    setListRef(elem: any) {
         this.dom.list = elem;
     }
 
     toggleAdvancedSearchPanel() {
-        this.setState((prevState) => ({isAdvancedSearchShown: !prevState.isAdvancedSearchShown}));
+        this.setState((prevState: any) => ({isAdvancedSearchShown: !prevState.isAdvancedSearchShown}));
 
         if (this.props.setQuery != null) {
             this.props.setQuery('');
@@ -84,10 +89,10 @@ export default class BaseApp extends React.Component {
     }
 
     toggleSearchTipsPanel() {
-        this.setState((prevState) => ({isSearchTipsShown: !prevState.isSearchTipsShown}));
+        this.setState((prevState: any) => ({isSearchTipsShown: !prevState.isSearchTipsShown}));
     }
 
-    renderModal(specs) {
+    renderModal(specs: any) {
         if (specs) {
             const Modal = this.modals[specs.modal];
             return (
@@ -96,13 +101,13 @@ export default class BaseApp extends React.Component {
         }
     }
 
-    renderNavBreadcrumb(navigations, activeNavigation, activeTopic, activeProduct = null, activeFilter = null) {
+    renderNavBreadcrumb(navigations: any, activeNavigation: any, activeTopic: any, activeProduct: any = null, activeFilter: any = null) {
         const dest = document.getElementById('nav-breadcrumb');
         if (!dest) {
             return null;
         }
 
-        let name;
+        let name: any;
         const numNavigations = get(activeNavigation, 'length', 0);
         const filterValue = getSingleFilterValue(activeFilter, ['genre', 'subject']);
 
@@ -111,7 +116,7 @@ export default class BaseApp extends React.Component {
         } else if (numNavigations > 1) {
             name = '/ ' + gettext('Custom View');
         } else if (numNavigations === 1) {
-            name = '/ ' + get(navigations.find((nav) => nav._id === activeNavigation[0]), 'name', '');
+            name = '/ ' + get(navigations.find((nav: any) => nav._id === activeNavigation[0]), 'name', '');
         } else if (activeProduct != null) {
             name = `/ ${activeProduct.name}`;
         } else if (filterValue !== null) {
@@ -140,13 +145,13 @@ export default class BaseApp extends React.Component {
         );
     }
 
-    toggleSidebar(event) {
+    toggleSidebar(event: any) {
         event.preventDefault();
         this.setState({withSidebar: !this.state.withSidebar});
         setFilterPanelOpenState(!this.state.withSidebar, this.props.context);
     }
 
-    onListScroll(event) {
+    onListScroll(event: any) {
         const BUFFER = 10;
         const container = event.target;
 
@@ -173,8 +178,8 @@ export default class BaseApp extends React.Component {
         }
     }
 
-    filterActions(item, config, includeCoverages=false) {
-        return this.props.actions.filter((action) => (!config || isDisplayed(action.id, config)) &&
+    filterActions(item: any, config?: any, includeCoverages: any = false) {
+        return this.props.actions.filter((action: any) => (!config || isDisplayed(action.id, config)) &&
           (!action.when || action.when(this.props.state, item, includeCoverages)));
     }
 
@@ -208,12 +213,12 @@ export default class BaseApp extends React.Component {
         this.disposeTooltips();
     }
 
-    getSnapshotBeforeUpdate() {
+    getSnapshotBeforeUpdate(prevProps: any) {
         this.disposeTooltips();
         return null;
     }
 
-    componentDidUpdate(nextProps) {
+    componentDidUpdate(nextProps: any) {
         if ((nextProps.activeQuery || this.props.activeQuery) && (nextProps.activeQuery !== this.props.activeQuery) && this.dom.list != null) {
             this.dom.list.scrollTop = 0;
         }
diff --git a/assets/local-store.js b/assets/local-store.ts
similarity index 84%
rename from assets/local-store.js
rename to assets/local-store.ts
index 9da6d8b79..d1f91ea06 100644
--- a/assets/local-store.js
+++ b/assets/local-store.ts
@@ -16,7 +16,7 @@ const FILTER_PANEL_OPEN = 'filter_open';
 const ACTIVE_DATE = 'active_date';
 const DROPDOWN_FILTERS = 'dropdown_filters';
 
-const store = Store.createStore([localStorage], [operationsPlugin, expirePlugin]);
+const store: any = Store.createStore([localStorage] as any, [operationsPlugin, expirePlugin] as any);
 
 /**
  * Get read items
@@ -33,7 +33,7 @@ export function getReadItems() {
  * @param {Object} item
  * @param {Object} state
  */
-export function markItemAsRead(item, state) {
+export function markItemAsRead(item: any, state: any) {
     if (item && item._id) {
         const readItems = get(state, 'readItems', getReadItems()) || {};
 
@@ -94,14 +94,14 @@ export function toggleFeaturedOnlyParam() {
     store.assign(FEATURED_ONLY_STORE, {value: !getFeaturedOnlyParam()});
 }
 
-export function getFilterPanelOpenState(context) {
+export function getFilterPanelOpenState(context: any) {
     const defaultValue = get(getConfig('filter_panel_defaults') || {}, `open.${context}`, false);
 
     return get(store.get(FILTER_PANEL_OPEN), context, defaultValue);
 }
 
-export function setFilterPanelOpenState(open, context) {
-    const filterTabs = {...store.get(FILTER_PANEL_OPEN) || {}};
+export function setFilterPanelOpenState(open: any, context: any) {
+    const filterTabs: any = {...store.get(FILTER_PANEL_OPEN) || {}};
 
     filterTabs[context] = open;
     store.assign(FILTER_PANEL_OPEN, filterTabs);
@@ -112,7 +112,7 @@ export function setFilterPanelOpenState(open, context) {
  *
  * @returns {boolean}
  */
-export function getActiveFilterTab(context) {
+export function getActiveFilterTab(context: any) {
     const defaultValue = get(getConfig('filter_panel_defaults') || {}, `tab.${context}`, 'nav');
 
     return get(store.get(FILTER_TAB), context, defaultValue);
@@ -122,8 +122,8 @@ export function getActiveFilterTab(context) {
  * Set active filter tab
  *
  */
-export function setActiveFilterTab(tab, context) {
-    let filterTabs = {...store.get(FILTER_TAB) || {}};
+export function setActiveFilterTab(tab: any, context: any) {
+    const filterTabs: any = {...store.get(FILTER_TAB) || {}};
     filterTabs[context] = tab;
     store.assign(FILTER_TAB, filterTabs);
 }
@@ -136,7 +136,7 @@ export function setActiveFilterTab(tab, context) {
  * @param versionB
  * @returns {number}
  */
-export function getMaxVersion(versionA, versionB) {
+export function getMaxVersion(versionA: any, versionB: any) {
     return Math.max(parseInt(versionA, 10) || 0, parseInt(versionB, 10) || 0);
 }
 
@@ -155,7 +155,7 @@ function getExpiryDate() {
  *
  * @param activeDate
  */
-export function setActiveDate(activeDate) {
+export function setActiveDate(activeDate: any) {
     store.set(ACTIVE_DATE, activeDate, getExpiryDate());
 }
 
@@ -176,7 +176,7 @@ export function getActiveDate() {
  * @param filter
  * @param value
  */
-export function setAgendaDropdownFilter(filter, value) {
+export function setAgendaDropdownFilter(filter: any, value: any) {
     const filters = store.get(DROPDOWN_FILTERS) || {};
     filters[filter] = value;
     store.set(DROPDOWN_FILTERS, filters, getExpiryDate());
diff --git a/assets/maps/components/map.jsx b/assets/maps/components/map.tsx
similarity index 75%
rename from assets/maps/components/map.jsx
rename to assets/maps/components/map.tsx
index 1462ae2c4..65848e281 100644
--- a/assets/maps/components/map.jsx
+++ b/assets/maps/components/map.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {getBounds, getLatLng, mapsLoaded} from '../utils';
 
-let _map;
+let _map: any;
 
-const getMapElement = () => document.getElementById('google-map');
+const getMapElement: any = () => document.getElementById('google-map');
 
 const getMap = () => {
     if (!_map) {
@@ -14,8 +14,11 @@ const getMap = () => {
     return _map;
 };
 
-export default class Map extends React.PureComponent {
-    constructor(props) {
+export default class Map extends React.PureComponent<any, any> {
+    static propTypes: any;
+    markers: never[];
+    elem: any;
+    constructor(props: any) {
         super(props);
 
         this.markers = [];
@@ -32,7 +35,7 @@ export default class Map extends React.PureComponent {
         getMapElement().style.height = '100%';
 
         // add markers
-        this.markers = this.props.locations.map((location) => {
+        this.markers = this.props.locations.map((location: any) => {
             const bounds = getBounds(location);
             const position = getLatLng(location);
 
@@ -52,7 +55,7 @@ export default class Map extends React.PureComponent {
         document.body.appendChild(getMapElement());
 
         // remove markers
-        this.markers.forEach((marker) => marker.setMap(null));
+        this.markers.forEach((marker: any) => marker.setMap(null));
         this.markers = [];
     }
 
@@ -62,7 +65,7 @@ export default class Map extends React.PureComponent {
         }
 
         return (
-            <div ref={(elem) => this.elem = elem} style={{height: 300}} />
+            <div ref={(elem: any) => this.elem = elem} style={{height: 300}} />
         );
     }
 }
diff --git a/assets/maps/components/static.jsx b/assets/maps/components/static.tsx
similarity index 90%
rename from assets/maps/components/static.jsx
rename to assets/maps/components/static.tsx
index b574bb6a5..2dc0d8fed 100644
--- a/assets/maps/components/static.jsx
+++ b/assets/maps/components/static.tsx
@@ -4,8 +4,9 @@ import {getMapSource} from '../utils';
 import {gettext} from '../../utils';
 
 
-class StaticMap extends React.Component{
-    constructor(props) {
+class StaticMap extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.state = {
             mapLoaded: false
diff --git a/assets/maps/utils.js b/assets/maps/utils.ts
similarity index 70%
rename from assets/maps/utils.js
rename to assets/maps/utils.ts
index b1fe2b19a..e28b2d1e7 100644
--- a/assets/maps/utils.js
+++ b/assets/maps/utils.ts
@@ -7,44 +7,44 @@ const MAPS_URL = 'https://maps.googleapis.com/maps/api/staticmap';
  * Get item locations
  * @param {Object} item
  */
-export function getLocations(item) {
+export function getLocations(item: any) {
     return (get(item, 'location')) || [];
 }
 
 /**
  * Get locations with geo coordinates
- * @param {Object} item 
+ * @param {Object} item
  * @return {Array}
  */
-export function getGeoLocations(locations) {
-    return locations.filter((loc) => get(loc, 'location.lat'));
+export function getGeoLocations(locations: any) {
+    return locations.filter((loc: any) => get(loc, 'location.lat'));
 }
 
 /**
  * Get location address for item
  *
- * @param {Object} item 
+ * @param {Object} item
  * @return {Object}
  */
-export function getAddress(item) {
+export function getAddress(item: any) {
     return get(item, 'location.0.address');
 }
 
 /**
  * Get location bounding box
- * @param {Object} location 
+ * @param {Object} location
  * @return {Array}
  */
-export function getBoundingBox(location) {
+export function getBoundingBox(location: any) {
     return get(location, 'address.boundingbox');
 }
 
 /**
  * Get location address line
- * @param {Object} location 
+ * @param {Object} location
  * @return {String}
  */
-export function getAddressLine(location) {
+export function getAddressLine(location: any) {
     return get(location, 'address.line.0');
 }
 
@@ -53,7 +53,7 @@ export function getAddressLine(location) {
  *
  * @param {Object} location
  */
-export function getAddressState(location) {
+export function getAddressState(location: any) {
     return get(location, 'address.state') || get(location, 'address.locality');
 }
 
@@ -62,16 +62,16 @@ export function getAddressState(location) {
  *
  * @param {Object} location
  */
-export function getAddressCountry(location) {
+export function getAddressCountry(location: any) {
     return get(location, 'address.country');
 }
 
 /**
  * Get bounds for location
- * @param {Object} location 
+ * @param {Object} location
  * @return {LatLngBoundsLiteral}
  */
-export function getBounds(location) {
+export function getBounds(location: any) {
     const bbox = getBoundingBox(location);
 
     if (bbox) {
@@ -86,10 +86,10 @@ export function getBounds(location) {
 
 /**
  * Get position for location
- * @param {Object} location 
+ * @param {Object} location
  * @return {LatLngLiteral}
  */
-export function getLatLng(location) {
+export function getLatLng(location: any) {
     return {
         lat: get(location, 'location.lat'),
         lng: get(location, 'location.lon'),
@@ -108,7 +108,7 @@ export function mapsKey() {
  * Get zoom param based on location
  * @param {Object} location
  */
-function getZoom(location) {
+function getZoom(location: any) {
     const box = getBoundingBox(location);
     const line = getAddressLine(location);
 
@@ -116,22 +116,22 @@ function getZoom(location) {
         return [
             {lat: box[0], lon: box[2]},
             {lat: box[1], lon: box[3]},
-        ].map((point) => 'visible=' + encodeURIComponent(point.lat + ',' + point.lon)).join('&');
+        ].map((point: any) => 'visible=' + encodeURIComponent(point.lat + ',' + point.lon)).join('&');
     }
 
     // fallback to zoom, use 15 if we are on street level, 8 otherwise
     return !isEmpty(line) ? 'zoom=15' : 'zoom=8';
 }
 
-function getLocationDetails(location) {
+function getLocationDetails(location: any) {
     return [location.name,
         getAddressLine(location),
         getAddressState(location),
         getAddressCountry(location),
-    ].filter((x) => !!x).join(', ');
+    ].filter((x: any) => !!x).join(', ');
 }
 
-export function getMapSource(locations, scale = 1) {
+export function getMapSource(locations: any, scale: any = 1) {
     if (isEmpty(locations)) {
         return '';
     }
@@ -145,17 +145,17 @@ export function getMapSource(locations, scale = 1) {
     const google_maps_styles = getConfig('google_maps_styles');
 
     if (google_maps_styles) {
-        const styles = google_maps_styles.split('&').filter((s) => s).map((s) => `style=${s}`);
+        const styles = google_maps_styles.split('&').filter((s: any) => s).map((s: any) => `style=${s}`);
         if (get(styles, 'length', 0) > 0) {
             params = params.concat(styles);
         }
     }
 
     const geoLocations = getGeoLocations(locations);
-    let src;
+    let src: any;
 
     if (!isEmpty(geoLocations)) {
-        const markers = geoLocations.map((loc) => 'markers=' + encodeURIComponent(loc.location.lat + ',' + loc.location.lon));
+        const markers = geoLocations.map((loc: any) => 'markers=' + encodeURIComponent(loc.location.lat + ',' + loc.location.lon));
         params.push(getZoom(geoLocations[0]));
         src = MAPS_URL + '?' + markers.concat(params).join('&');
     } else {
@@ -168,6 +168,6 @@ export function getMapSource(locations, scale = 1) {
     return src;
 }
 
-export function shouldRenderLocation(item) {
+export function shouldRenderLocation(item: any) {
     return !isEmpty(mapsKey()) && !isEmpty(getLocations(item));
 }
diff --git a/assets/market-place/actions.js b/assets/market-place/actions.ts
similarity index 67%
rename from assets/market-place/actions.js
rename to assets/market-place/actions.ts
index 5d8760371..4236c86e3 100644
--- a/assets/market-place/actions.js
+++ b/assets/market-place/actions.ts
@@ -1,6 +1,6 @@
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(data) {
+export function initData(data: any) {
     return {type: INIT_DATA, data};
 }
 
diff --git a/assets/market-place/components/MarketPlaceApp.jsx b/assets/market-place/components/MarketPlaceApp.tsx
similarity index 81%
rename from assets/market-place/components/MarketPlaceApp.jsx
rename to assets/market-place/components/MarketPlaceApp.tsx
index b23f2d2b7..584374337 100644
--- a/assets/market-place/components/MarketPlaceApp.jsx
+++ b/assets/market-place/components/MarketPlaceApp.tsx
@@ -16,7 +16,7 @@ import NavigationSixPerRow from 'components/cards/render/NavigationSixPerRow';
 
 
 class MarketPlaceApp extends BaseApp {
-    constructor(props) {
+    constructor(props: any) {
         super(props);
     }
 
@@ -28,7 +28,7 @@ class MarketPlaceApp extends BaseApp {
                 <section className="content-main d-block py-4 px-2 p-md-3 p-lg-4">
                     <div className="container-fluid">
                         {get(cards,  'length', 0) > 0 && cards.map(
-                            (card) => <NavigationSixPerRow key={card._id} card={card}/>
+                            (card: any) => <NavigationSixPerRow key={card._id} card={card}/>
                         )}
                         {get(cards,  'length', 0) === 0 && <div className="alert alert-warning" role="alert">
                             <strong>{gettext('Warning')}!</strong> {gettext('There\'s no navigations defined!')}
@@ -51,7 +51,7 @@ MarketPlaceApp.propTypes = {
     savedItemsCount: PropTypes.number,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     user: state.user,
     company: state.company,
     navigations: get(state, 'navigations', []),
@@ -59,11 +59,13 @@ const mapStateToProps = (state) => ({
     savedItemsCount: state.savedItemsCount
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    fetchItems: (navigation) => {
+const mapDispatchToProps = (dispatch: any) => ({
+    fetchItems: (navigation: any) => {
         dispatch(toggleNavigation(navigation));
         return dispatch(fetchItems());
     }
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(MarketPlaceApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(MarketPlaceApp);
+
+export default component;
diff --git a/assets/market-place/index.js b/assets/market-place/index.ts
similarity index 90%
rename from assets/market-place/index.js
rename to assets/market-place/index.ts
index 9bd654216..3f54d1c00 100644
--- a/assets/market-place/index.js
+++ b/assets/market-place/index.ts
@@ -1,4 +1,5 @@
-import {createStore, render, initWebSocket, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {createStore, render, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {initWebSocket} from 'websocket';
 
 import {getReadItems} from 'local-store';
 import  MarketPlaceApp from './components/MarketPlaceApp';
@@ -27,7 +28,7 @@ import {
 
 const handleHistory = () => {
     // handle history
-    window.onpopstate = function(event) {
+    window.onpopstate = function(event: any) {
         if (event.state) {
             closeItemOnMobile(store.dispatch, event.state, openItemDetails, previewItem);
             if (!isMobilePhone()) {
@@ -37,7 +38,7 @@ const handleHistory = () => {
     };
 };
 
-let store;
+let store: any;
 
 if (window.marketPlaceData.home_page) {
     store = createStore(marketPlaceHomeReducer, 'aapX');
diff --git a/assets/market-place/reducers.js b/assets/market-place/reducers.ts
similarity index 84%
rename from assets/market-place/reducers.js
rename to assets/market-place/reducers.ts
index 9356f97d5..104ca36d6 100644
--- a/assets/market-place/reducers.js
+++ b/assets/market-place/reducers.ts
@@ -3,19 +3,19 @@ import {get, keyBy} from 'lodash';
 import {INIT_DATA} from './actions';
 import {getNavigationUrlParam} from 'search/utils';
 
-const initialState = {
+const initialState: any = {
     cards: [],
     navigations: []
 };
 
 
-export default function marketPlaceHomeReducer(state = initialState, action) {
+export default function marketPlaceHomeReducer(state: any = initialState, action: any) {
     if (action.type === INIT_DATA) {
         // map the navigation id to navigation object
         const navigationById = keyBy(action.data.navigations|| [], '_id');
-        (action.data.cards || []).forEach((card) => {
+        (action.data.cards || []).forEach((card: any) => {
             card.config.navigations = (get(card, 'config.navigations') || [])
-                .map((nav) => {
+                .map((nav: any) => {
                     const navigation = get(navigationById, nav);
                     if (!navigation) {
                         // company does not have permission for navigation
@@ -27,7 +27,7 @@ export default function marketPlaceHomeReducer(state = initialState, action) {
                     navigation.href = `/${action.data.context}/?${params.toString()}`;
 
                     return navigation;
-                }).filter((nav) => nav);
+                }).filter((nav: any) => nav);
         });
         return {
             ...state,
diff --git a/assets/media-releases/index.js b/assets/media-releases/index.ts
similarity index 88%
rename from assets/media-releases/index.js
rename to assets/media-releases/index.ts
index d864a4120..c42a7047b 100644
--- a/assets/media-releases/index.js
+++ b/assets/media-releases/index.ts
@@ -1,4 +1,5 @@
-import {createStore, render, initWebSocket, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {createStore, render, getInitData, closeItemOnMobile, isMobilePhone} from '../utils';
+import {initWebSocket} from 'websocket';
 
 import {getReadItems} from 'local-store';
 import WireApp from '../wire/components/WireApp';
@@ -28,7 +29,7 @@ const params = new URLSearchParams(window.location.search);
 store.dispatch(initParams(params));
 
 // handle history
-window.onpopstate = function(event) {
+window.onpopstate = function(event: any) {
     if (event.state) {
         closeItemOnMobile(store.dispatch, event.state, openItemDetails, previewItem);
         if (!isMobilePhone()) {
diff --git a/assets/missing-translations.js b/assets/missing-translations.ts
similarity index 100%
rename from assets/missing-translations.js
rename to assets/missing-translations.ts
diff --git a/assets/monitoring/actions.js b/assets/monitoring/actions.ts
similarity index 71%
rename from assets/monitoring/actions.js
rename to assets/monitoring/actions.ts
index 8ce5180a1..799606a18 100644
--- a/assets/monitoring/actions.js
+++ b/assets/monitoring/actions.ts
@@ -5,17 +5,17 @@ import {get} from 'lodash';
 
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(data) {
+export function initData(data: any) {
     return {type: INIT_DATA, data};
 }
 
 export const SET_COMPANIES = 'SET_COMPANIES';
-export function setCompanies(data) {
+export function setCompanies(data: any) {
     return {type: SET_COMPANIES, data};
 }
 
-export function initViewData(data) {
-    return function (dispatch) {
+export function initViewData(data: any) {
+    return function (dispatch: any) {
         dispatch(setCompanies(data.companies));
     };
 }
@@ -31,7 +31,7 @@ export function cancelEdit() {
 }
 
 export const UPDATE_MONITORING_PROFILE = 'UPDATE_MONITORING_PROFILE';
-export function updateMonitoringProfile(event) {
+export function updateMonitoringProfile(event: any) {
     const target = event.target;
     const field = target.name;
     return {
@@ -41,22 +41,22 @@ export function updateMonitoringProfile(event) {
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
 export const SET_COMPANY = 'SET_COMPANY';
-export function setCompany(company) {
+export function setCompany(company: any) {
     return {type: SET_COMPANY, company};
 }
 
 export const SET_MONITORING_LIST = 'SET_MONITORING_LIST';
-export function setMonitoringList(data) {
+export function setMonitoringList(data: any) {
     return {type: SET_MONITORING_LIST, data};
 }
 
 export const SET_USER_COMPANY_MONITORING_LIST = 'SET_USER_COMPANY_MONITORING_LIST';
-export function setUserCompanyMonitoringList(data) {
+export function setUserCompanyMonitoringList(data: any) {
     return {type: SET_USER_COMPANY_MONITORING_LIST, data};
 }
 
@@ -66,12 +66,12 @@ export function queryMonitoring() {
 }
 
 export const SELECT_MONITORING_PROFILE = 'SELECT_MONITORING_PROFILE';
-export function selectMonitoringProfile(id) {
+export function selectMonitoringProfile(id: any) {
     return {type: SELECT_MONITORING_PROFILE, id};
 }
 
 export const SET_MONITORING_COMPANIES = 'SET_MONITORING_COMPANIES';
-export function setMonitoringCompanies(data) {
+export function setMonitoringCompanies(data: any) {
     return {type: SET_MONITORING_COMPANIES, data};
 }
 
@@ -80,18 +80,18 @@ export function toggleScheduleMode() {
     return {type: SET_SCHEDULE_MODE};
 }
 
-export function postMonitoringProfile(userProfile, notifyMsg) {
-    return function (dispatch, getState) {
+export function postMonitoringProfile(userProfile?: any, notifyMsg?: any): any {
+    return function (dispatch: any, getState: any) {
 
         const p = userProfile || monitoringProfileToEdit(getState());
         const url = `/monitoring/${p._id ? p._id : 'new'}`;
 
         return server.post(url, p)
-            .then(function(item) {
+            .then(function(item: any) {
                 if (p._id) {
-                    notify.success(notifyMsg || gettext('{{monitoring}} Profile updated successfully', sectionNames));
+                    notify.success(notifyMsg || gettext('{{monitoring}} Profile updated successfully', window.sectionNames));
                 } else {
-                    notify.success(gettext('{{monitoring}} Profile created successfully', sectionNames));
+                    notify.success(gettext('{{monitoring}} Profile created successfully', window.sectionNames));
                     if (!userProfile) {
                         dispatch(updateMonitoringProfile({
                             target: {
@@ -113,19 +113,19 @@ export function postMonitoringProfile(userProfile, notifyMsg) {
                 dispatch(cancelEdit());
                 dispatch(fetchMonitoring(get(userProfile, 'company')));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
 
-export function fetchMonitoring(userCompany) {
-    return function (dispatch, getState) {
+export function fetchMonitoring(userCompany?: any) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryMonitoring());
         const companyFilter = userCompany || company(getState());
         const filter = get(companyFilter, 'length', 0) > 0 ? '&where={"company":"' + companyFilter + '"}' : '';
 
         return server.get(`/monitoring/all?q=${filter}`)
-            .then((data) => {
+            .then((data: any) => {
                 if (!userCompany) {
                     dispatch(setMonitoringList(data));
                 } else {
@@ -138,62 +138,62 @@ export function fetchMonitoring(userCompany) {
 
                 return dispatch(fetchMonitoringCompanies());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 export function fetchMonitoringCompanies() {
-    return function (dispatch) {
+    return function (dispatch: any) {
         return server.get('/monitoring/schedule_companies')
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(setMonitoringCompanies(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
-export function saveMonitoringProfileUsers(users) {
-    return function (dispatch, getState) {
+export function saveMonitoringProfileUsers(users: any) {
+    return function (dispatch: any, getState: any) {
         const p = monitoringProfileToEdit(getState());
         return server.post(`/monitoring/${p._id}/users`, {users})
             .then(() => {
-                notify.success(gettext('{{monitoring}} Profile users updated successfully', sectionNames));
+                notify.success(gettext('{{monitoring}} Profile users updated successfully', window.sectionNames));
                 dispatch(fetchMonitoring());
                 dispatch(cancelEdit());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 export function saveMonitoringProfileSchedule() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         const p = monitoringProfileToEdit(getState());
         if (!p._id) {
-            notify.error(gettext('Please create {{monitoring}} profile first.', sectionNames));
+            notify.error(gettext('Please create {{monitoring}} profile first.', window.sectionNames));
         }
 
         return server.post(`/monitoring/${p._id}/schedule`, {schedule: p.schedule})
             .then(() => {
-                notify.success(gettext('{{monitoring}} Profile schedule updated successfully', sectionNames));
+                notify.success(gettext('{{monitoring}} Profile schedule updated successfully', window.sectionNames));
                 dispatch(fetchMonitoring());
                 dispatch(cancelEdit());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
-export function deleteMonitoringProfile() {
-    return function (dispatch, getState) {
+export function deleteMonitoringProfile(): any {
+    return function (dispatch: any, getState: any) {
 
         const p = monitoringProfileToEdit(getState());
         const url = `/monitoring/${p._id}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
-                notify.success(gettext('{{monitoring}} Profile deleted successfully', sectionNames));
+                notify.success(gettext('{{monitoring}} Profile deleted successfully', window.sectionNames));
                 dispatch(fetchMonitoring());
                 dispatch(cancelEdit());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
diff --git a/assets/monitoring/components/EditMonitoringProfile.jsx b/assets/monitoring/components/EditMonitoringProfile.tsx
similarity index 92%
rename from assets/monitoring/components/EditMonitoringProfile.jsx
rename to assets/monitoring/components/EditMonitoringProfile.tsx
index 6bd9bf1dc..bf7cb7779 100644
--- a/assets/monitoring/components/EditMonitoringProfile.jsx
+++ b/assets/monitoring/components/EditMonitoringProfile.tsx
@@ -14,10 +14,12 @@ import MonitoringSchedule from './MonitoringSchedule';
 
 import {gettext} from 'utils';
 
-const getCompanyOptions = (companies) => companies.map(company => ({value: company._id, text: company.name}));
+const getCompanyOptions = (companies: any) => companies.map((company: any) => ({value: company._id, text: company.name}));
 
-class EditMonitoringProfile extends React.Component {
-    constructor(props) {
+class EditMonitoringProfile extends React.Component<any, any> {
+    static propTypes: any;
+    tabs: any;
+    constructor(props: any) {
         super(props);
         this.handleTabClick = this.handleTabClick.bind(this);
         this.getUsers = this.getUsers.bind(this);
@@ -29,7 +31,7 @@ class EditMonitoringProfile extends React.Component {
         ];
     }
 
-    handleTabClick(event) {
+    handleTabClick(event: any) {
         this.setState({activeTab: event.target.name});
         if (event.target.name === 'users' && get(this.props, 'item.company')) {
             this.props.fetchCompanyUsers(this.props.item.company);
@@ -40,19 +42,19 @@ class EditMonitoringProfile extends React.Component {
         if (isEmpty(this.props.users)) {
             return (
                 <tr>
-                    <td colSpan="2">{gettext('There are no users for this monitoring profile.')}</td>
+                    <td colSpan={2}>{gettext('There are no users for this monitoring profile.')}</td>
                 </tr>
             );
         }
 
-        return this.props.users.map((user) => (
+        return this.props.users.map((user: any) => (
             <tr key={user._id}>
                 <td>{user.first_name} {user.last_name}</td>
             </tr>
         ));
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         if (this.props.item._id !== prevProps.item._id) {
             this.setState({activeTab: this.props.scheduleMode ? 'schedule' : 'profile'});
             return;
@@ -72,12 +74,12 @@ class EditMonitoringProfile extends React.Component {
 
     render() {
         const {item, onChange, errors, companies, onSave, onClose, onDelete} = this.props;
-        const getError = (field) => errors ? errors[field] : null;
+        const getError = (field: any) => errors ? errors[field] : null;
 
         return (
-            <div className='list-item__preview' role={gettext('dialog')} aria-label={gettext('Edit {{monitoring}}', sectionNames)}>
+            <div className='list-item__preview' role={gettext('dialog')} aria-label={gettext('Edit {{monitoring}}', window.sectionNames)}>
                 <div className='list-item__preview-header'>
-                    <h3>{ gettext('Add/Edit {{monitoring}} Profile', sectionNames) }</h3>
+                    <h3>{ gettext('Add/Edit {{monitoring}} Profile', window.sectionNames) }</h3>
                     <button
                         id='hide-sidebar'
                         type='button'
@@ -90,10 +92,10 @@ class EditMonitoringProfile extends React.Component {
                 </div>
                 <AuditInformation item={item} />
                 <ul className='nav nav-tabs'>
-                    {this.tabs.filter((tab, index) => index === 0 || this.props.item._id).map((tab) => (
+                    {this.tabs.filter((tab: any, index: any) => index === 0 || this.props.item._id).map((tab: any) => (
                         <li key={tab.name} className='nav-item'>
                             <a
-                                name={tab.name}
+                                title={tab.name}
                                 className={`nav-link ${this.state.activeTab === tab.name && 'active'}`}
                                 href='#'
                                 onClick={this.handleTabClick}>{tab.label}
@@ -151,7 +153,7 @@ class EditMonitoringProfile extends React.Component {
                                         error={getError('query')}>
                                         {item.query &&
                                                 <a target="_blank" href={`/${'wire'}?q=${item.query}`}
-                                                    className='nh-button nh-button--secondary float-end mt-3'>{gettext('Test {{monitoring}} Profile query', sectionNames)}
+                                                    className='nh-button nh-button--secondary float-end mt-3'>{gettext('Test {{monitoring}} Profile query', window.sectionNames)}
                                                 </a>}
                                     </TextAreaInput>
 
@@ -216,7 +218,7 @@ class EditMonitoringProfile extends React.Component {
                     {this.state.activeTab === 'users' &&
                         <EditPanel
                             parent={this.props.item}
-                            items={this.props.users.map((u) => ({
+                            items={this.props.users.map((u: any) => ({
                                 ...u,
                                 name: `${u.first_name} ${u.last_name}`
                             }))}
diff --git a/assets/monitoring/components/MonitoringApp.jsx b/assets/monitoring/components/MonitoringApp.tsx
similarity index 85%
rename from assets/monitoring/components/MonitoringApp.jsx
rename to assets/monitoring/components/MonitoringApp.tsx
index b00b5adaa..2c7100b9b 100644
--- a/assets/monitoring/components/MonitoringApp.jsx
+++ b/assets/monitoring/components/MonitoringApp.tsx
@@ -5,7 +5,6 @@ import {connect} from 'react-redux';
 import {gettext} from 'utils';
 import {
     newMonitoringProfile,
-    setQuery,
     fetchMonitoring,
     setCompany,
     toggleScheduleMode
@@ -15,8 +14,11 @@ import ListBar from 'components/ListBar';
 import DropdownFilter from 'components/DropdownFilter';
 
 
-class MonitoringApp extends React.Component {
-    constructor(props, context) {
+class MonitoringApp extends React.Component<any, any> {
+    static propTypes: any;
+    sections: Array<{name: string}>;
+
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.onChange = this.onChange.bind(this);
@@ -24,7 +26,7 @@ class MonitoringApp extends React.Component {
         this.onSectionChange = this.onSectionChange.bind(this);
 
         this.sections = [
-            {name: gettext('{{monitoring}} Profiles', sectionNames)},
+            {name: gettext('{{monitoring}} Profiles', window.sectionNames)},
             {name: gettext('Schedules')},
         ];
 
@@ -37,11 +39,11 @@ class MonitoringApp extends React.Component {
         };
     }
 
-    isScheduleMode(sectionName = this.state.activeSection) {
+    isScheduleMode(sectionName: any = this.state.activeSection) {
         return sectionName === 'Schedules';
     }
 
-    onSectionChange(sectionName) {
+    onSectionChange(sectionName: any) {
         if (sectionName !== this.state.activeSection) {
             this.setState({
                 activeSection: sectionName,
@@ -57,9 +59,9 @@ class MonitoringApp extends React.Component {
         }
     }
 
-    getDropdownItems(filter) {
+    getDropdownItems(filter: any) {
         const companies = this.isScheduleMode() ? this.props.monitoringListCompanies : this.props.companies;
-        return (companies).map((item, i) => (<button
+        return (companies).map((item: any, i: number) => (<button
             key={i}
             className='dropdown-item'
             onClick={() => {this.onChange(filter.field, item._id);}}
@@ -68,7 +70,7 @@ class MonitoringApp extends React.Component {
 
     getActiveQuery() {
         return {
-            company: this.props.company ? [get(this.props.companies.find((c) => c._id === this.props.company), 'name')] :
+            company: this.props.company ? [get(this.props.companies.find((c: any) => c._id === this.props.company), 'name')] :
                 null,
         };
     }
@@ -79,10 +81,10 @@ class MonitoringApp extends React.Component {
             <Fragment>
                 <ListBar
                     onNewItem={this.isScheduleMode() ? null : this.props.newMonitoringProfile}
-                    buttonText={gettext('New {{monitoring}} Profile', sectionNames)}
+                    buttonText={gettext('New {{monitoring}} Profile', window.sectionNames)}
                     noSearch>
                     <div className="toggle-button__group toggle-button__group--navbar ms-0 me-3">
-                        {this.sections.map((section) => (
+                        {this.sections.map((section: any) => (
                             <button key={section.name}
                                 className={'toggle-button' + (section.name === this.state.activeSection ? ' toggle-button--active' :
                                     '')}
@@ -105,17 +107,17 @@ class MonitoringApp extends React.Component {
         );
     }
 
-    onChange(field, value)
+    onChange(field: any, value: any)
     {
         if (field === 'company') {
             this.props.setCompany(value);
         }
-        
+
         this.props.fetchMonitoring();
     }
 }
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     companies: state.companies,
     company: state.company,
     monitoringListCompanies: state.monitoringListCompanies,
@@ -125,7 +127,6 @@ MonitoringApp.propTypes = {
     users: PropTypes.arrayOf(PropTypes.object),
     activeQuery: PropTypes.string,
     companies: PropTypes.arrayOf(PropTypes.object),
-    setQuery: PropTypes.func,
     errors: PropTypes.object,
     dispatch: PropTypes.func,
     fetchCompanies: PropTypes.func,
@@ -137,9 +138,8 @@ MonitoringApp.propTypes = {
     fetchMonitoring: PropTypes.func,
 };
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     newMonitoringProfile,
-    setQuery,
     fetchMonitoring,
     setCompany,
     toggleScheduleMode,
diff --git a/assets/monitoring/components/MonitoringItem.jsx b/assets/monitoring/components/MonitoringItem.tsx
similarity index 93%
rename from assets/monitoring/components/MonitoringItem.jsx
rename to assets/monitoring/components/MonitoringItem.tsx
index a9201b9b9..25cd48ee2 100644
--- a/assets/monitoring/components/MonitoringItem.jsx
+++ b/assets/monitoring/components/MonitoringItem.tsx
@@ -4,12 +4,12 @@ import {gettext} from 'utils';
 import {get} from 'lodash';
 
 
-function MonitoringItem({item, isActive, onClick, companiesById}) {
+function MonitoringItem({item, isActive, onClick, companiesById}: any) {
     return (
         <tr key={item._id}
             className={`${isActive?'table--selected':''}
             ${(item.company && companiesById[item.company] && !get(companiesById[item.company],'is_enabled')) || !item.is_enabled?'table-secondary':null}`}
-            onClick={() => onClick(item._id)} tabIndex='0'>
+            onClick={() => onClick(item._id)} tabIndex={0}>
             <td className="name">{item.name}</td>
             <td>{item.subject}</td>
             <td>{item.description}</td>
diff --git a/assets/monitoring/components/MonitoringList.jsx b/assets/monitoring/components/MonitoringList.tsx
similarity index 90%
rename from assets/monitoring/components/MonitoringList.jsx
rename to assets/monitoring/components/MonitoringList.tsx
index 53b2330f2..0d2d2038c 100644
--- a/assets/monitoring/components/MonitoringList.jsx
+++ b/assets/monitoring/components/MonitoringList.tsx
@@ -4,8 +4,8 @@ import MonitoringItem from './MonitoringItem';
 import {gettext} from 'utils';
 
 
-function MonitoringList({list, onClick, activeMonitoringProfileId, companiesById}) {
-    const listElement = list.map((m) =>
+function MonitoringList({list, onClick, activeMonitoringProfileId, companiesById}: any) {
+    const listElement = list.map((m: any) =>
         <MonitoringItem
             key={m._id}
             item={m}
@@ -17,7 +17,7 @@ function MonitoringList({list, onClick, activeMonitoringProfileId, companiesById
     return (
         <section className="content-main">
             <div className="list-items-container">
-                <table className="table table-hover" tabIndex='-1'>
+                <table className="table table-hover" tabIndex={-1}>
                     <thead>
                         <tr>
                             <th>{ gettext('Name') }</th>
diff --git a/assets/monitoring/components/MonitoringPanel.jsx b/assets/monitoring/components/MonitoringPanel.tsx
similarity index 81%
rename from assets/monitoring/components/MonitoringPanel.jsx
rename to assets/monitoring/components/MonitoringPanel.tsx
index e97ee6f24..73fd29fd4 100644
--- a/assets/monitoring/components/MonitoringPanel.jsx
+++ b/assets/monitoring/components/MonitoringPanel.tsx
@@ -18,8 +18,9 @@ import {connect} from 'react-redux';
 import {fetchCompanyUsers} from '../../companies/actions';
 
 
-class MonitoringPanel extends React.Component {
-    constructor(props, context) {
+class MonitoringPanel extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.isFormValid = this.isFormValid.bind(this);
@@ -29,7 +30,7 @@ class MonitoringPanel extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
         const wl = this.props.monitoringProfileToEdit;
 
         if (!wl.name) {
@@ -51,7 +52,7 @@ class MonitoringPanel extends React.Component {
         return valid;
     }
 
-    save(event) {
+    save(event: any) {
         event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -61,11 +62,11 @@ class MonitoringPanel extends React.Component {
         this.props.postMonitoringProfile();
     }
 
-    deleteMonitoringProfile(event) {
+    deleteMonitoringProfile(event: any) {
         event.preventDefault();
 
         confirm(gettext('Would you like to delete the {{monitoring}} Profile: {{name}}?',
-            {name: this.props.monitoringProfileToEdit.name, sectionNames})) &&
+            {name: this.props.monitoringProfileToEdit.name, sectionNames: window.sectionNames})) &&
             this.props.deleteMonitoringProfile();
     }
 
@@ -120,7 +121,7 @@ MonitoringPanel.propTypes = {
     saveMonitoringProfileSchedule: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     monitoringList: monitoringList(state),
     monitoringProfileToEdit: state.monitoringProfileToEdit,
     companies: state.companies,
@@ -130,16 +131,18 @@ const mapStateToProps = (state) => ({
     scheduleMode: state.scheduleMode,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectMonitoringProfile: (_id) => dispatch(selectMonitoringProfile(_id)),
-    updateMonitoringProfile: (event) => dispatch(updateMonitoringProfile(event)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectMonitoringProfile: (_id: any) => dispatch(selectMonitoringProfile(_id)),
+    updateMonitoringProfile: (event: any) => dispatch(updateMonitoringProfile(event)),
     postMonitoringProfile: () => dispatch(postMonitoringProfile()),
-    deleteMonitoringProfile: (type) => dispatch(deleteMonitoringProfile(type)),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
-    fetchCompanyUsers: (companyId) => dispatch(fetchCompanyUsers(companyId, true)),
-    saveMonitoringProfileUsers: (users) => dispatch(saveMonitoringProfileUsers(users)),
+    deleteMonitoringProfile: (type: any) => dispatch(deleteMonitoringProfile()),
+    cancelEdit: (event: any) => dispatch(cancelEdit()),
+    fetchCompanyUsers: (companyId: any) => dispatch(fetchCompanyUsers(companyId, true)),
+    saveMonitoringProfileUsers: (users: any) => dispatch(saveMonitoringProfileUsers(users)),
     saveMonitoringProfileSchedule: () => dispatch(saveMonitoringProfileSchedule()),
     dispatch: dispatch,
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(MonitoringPanel);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(MonitoringPanel);
+
+export default component;
diff --git a/assets/monitoring/components/MonitoringSchedule.jsx b/assets/monitoring/components/MonitoringSchedule.tsx
similarity index 95%
rename from assets/monitoring/components/MonitoringSchedule.jsx
rename to assets/monitoring/components/MonitoringSchedule.tsx
index 39a9b9dd3..8fad29120 100644
--- a/assets/monitoring/components/MonitoringSchedule.jsx
+++ b/assets/monitoring/components/MonitoringSchedule.tsx
@@ -8,8 +8,11 @@ import DatePicker from 'react-datepicker';
 
 import SelectInput from 'components/SelectInput';
 
-class MonitoringSchedule extends React.Component {
-    constructor(props) {
+class MonitoringSchedule extends React.Component<any, any> {
+    static propTypes: any;
+    options: Array<any>;
+    days: Array<any>;
+    constructor(props: any) {
         super(props);
 
         this.options = [
@@ -77,17 +80,17 @@ class MonitoringSchedule extends React.Component {
         this.state = {needTime: this.getNeedTime(get(this.props, 'item.schedule.interval'))};
     }
 
-    componentDidUpdate(prevPops) {
+    componentDidUpdate(prevPops: any) {
         if (get(this.props, 'item._id') !== get(prevPops, 'item._id')) {
             this.setState({needTime: this.getNeedTime(get(this.props, 'item.schedule.interval'))});
         }
     }
 
-    getNeedTime(option) {
+    getNeedTime(option: any) {
         return ([this.options[3].value, this.options[4].value].includes(option));
     }
 
-    onChangeSchedule(event) {
+    onChangeSchedule(event: any) {
         const needTime = this.getNeedTime(event.target.value);
         if (needTime) {
             this.setState({needTime: true});
@@ -111,7 +114,7 @@ class MonitoringSchedule extends React.Component {
         });
     }
 
-    onTimeChange(date, schedule) {
+    onTimeChange(date: any, schedule: any) {
         this.props.onChange({
             target: {
                 name: 'schedule',
@@ -124,7 +127,7 @@ class MonitoringSchedule extends React.Component {
         });
     }
 
-    onChangeDay(event) {
+    onChangeDay(event: any) {
         this.props.onChange({
             target: {
                 name: 'schedule',
diff --git a/assets/monitoring/index.js b/assets/monitoring/index.ts
similarity index 92%
rename from assets/monitoring/index.js
rename to assets/monitoring/index.ts
index d973e0109..2a252b247 100644
--- a/assets/monitoring/index.js
+++ b/assets/monitoring/index.ts
@@ -1,6 +1,7 @@
 import {get, startsWith} from 'lodash';
 
-import {createStore, render, getInitData, initWebSocket, closeItemOnMobile, isMobilePhone} from 'utils';
+import {createStore, render, getInitData, closeItemOnMobile, isMobilePhone} from 'utils';
+import {initWebSocket} from 'websocket';
 import {getReadItems} from 'local-store';
 import monitoringReducer from './reducers';
 import WireApp from 'wire/components/WireApp';
@@ -23,7 +24,7 @@ import {
 } from 'search/actions';
 
 
-let store;
+let store: any;
 
 if (get(window.viewData, 'context', '') === 'monitoring') {
     store = createStore(wireReducer, 'Monitoring');
@@ -33,7 +34,7 @@ if (get(window.viewData, 'context', '') === 'monitoring') {
     // init query
     const params = new URLSearchParams(window.location.search);
     store.dispatch(initParams(params));
-    window.onpopstate = function(event) {
+    window.onpopstate = function(event: any) {
         if (event.state) {
             closeItemOnMobile(store.dispatch, event.state, openItemDetails, previewItem);
             if (!isMobilePhone()) {
diff --git a/assets/monitoring/reducers.js b/assets/monitoring/reducers.ts
similarity index 86%
rename from assets/monitoring/reducers.js
rename to assets/monitoring/reducers.ts
index 2e7c282b3..d57e1da46 100644
--- a/assets/monitoring/reducers.js
+++ b/assets/monitoring/reducers.ts
@@ -17,7 +17,7 @@ import {
 import {GET_COMPANY_USERS} from 'companies/actions';
 import {ADD_EDIT_USERS} from 'actions';
 
-const initialState = {
+const initialState: any = {
     companies: [],
     monitoringList: [],
     monitoringListById: null,
@@ -25,7 +25,7 @@ const initialState = {
     monitoringListCompanies: [],
 };
 
-export default function monitoringReducer(state = initialState, action) {
+export default function monitoringReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case SELECT_MONITORING_PROFILE:
@@ -37,8 +37,8 @@ export default function monitoringReducer(state = initialState, action) {
         };
 
     case SET_COMPANIES: {
-        const companiesById = {};
-        action.data.map((company) => companiesById[company._id] = company);
+        const companiesById: any = {};
+        action.data.map((company: any) => companiesById[company._id] = company);
         return {...state, companies: action.data, companiesById};
 
     }
@@ -84,8 +84,8 @@ export default function monitoringReducer(state = initialState, action) {
     }
 
     case SET_MONITORING_LIST: {
-        let monitoringListById = Object.assign({}, state.monitoringListById);
-        const profiles = action.data.map((p) => {
+        const monitoringListById = Object.assign({}, state.monitoringListById);
+        const profiles = action.data.map((p: any) => {
             monitoringListById[p._id] = p;
             return p._id;
         });
@@ -123,8 +123,8 @@ export default function monitoringReducer(state = initialState, action) {
             scheduleMode: !state.scheduleMode,
         };
 
-    case SET_USER_COMPANY_MONITORING_LIST: 
-        return {...state, monitoringList: action.data};     
+    case SET_USER_COMPANY_MONITORING_LIST:
+        return {...state, monitoringList: action.data};
 
     case ADD_EDIT_USERS: {
         return {
diff --git a/assets/monitoring/selectors.js b/assets/monitoring/selectors.js
deleted file mode 100644
index c9913cbf1..000000000
--- a/assets/monitoring/selectors.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import {get} from 'lodash';
-import {createSelector} from 'reselect';
-
-export const monitoringProfileToEdit = (state) => get(state, 'monitoringProfileToEdit') || null;
-export const company = (state) => get(state, 'company') || null;
-export const scheduleMode = (state) => get(state, 'scheduleMode') || false;
-export const monitoringListById = (state) => get(state, 'monitoringListById') || null;
-export const monitoringProfileList = (state) => get(state, 'monitoringList') || null;
-
-export const monitoringList = createSelector([monitoringListById, monitoringProfileList, scheduleMode],
-    (pById, ps, sched) => {
-        const allProfiles = ps.map((id) => pById[id]);
-        if (!sched) {
-            return allProfiles;
-        }
-
-        return allProfiles.filter((p) => get(p, 'schedule.interval'));
-    });
diff --git a/assets/monitoring/selectors.ts b/assets/monitoring/selectors.ts
new file mode 100644
index 000000000..8c7fb7d50
--- /dev/null
+++ b/assets/monitoring/selectors.ts
@@ -0,0 +1,18 @@
+import {get} from 'lodash';
+import {createSelector} from 'reselect';
+
+export const monitoringProfileToEdit = (state: any) => get(state, 'monitoringProfileToEdit') || null;
+export const company = (state: any) => get(state, 'company') || null;
+export const scheduleMode = (state: any) => get(state, 'scheduleMode') || false;
+export const monitoringListById = (state: any) => get(state, 'monitoringListById') || null;
+export const monitoringProfileList = (state: any) => get(state, 'monitoringList') || null;
+
+export const monitoringList = createSelector([monitoringListById, monitoringProfileList, scheduleMode],
+    (pById: any, ps: any, sched: any) => {
+        const allProfiles = ps.map((id: any) => pById[id]);
+        if (!sched) {
+            return allProfiles;
+        }
+
+        return allProfiles.filter((p: any) => get(p, 'schedule.interval'));
+    });
diff --git a/assets/monitoring/utils.js b/assets/monitoring/utils.ts
similarity index 89%
rename from assets/monitoring/utils.js
rename to assets/monitoring/utils.ts
index c77ab8d03..32be4682b 100644
--- a/assets/monitoring/utils.js
+++ b/assets/monitoring/utils.ts
@@ -7,6 +7,6 @@ export const userTypes = [
     {value: 'account_management', text: gettext('Account Management')},
 ];
 
-export function getUserLabel(code) {
+export function getUserLabel(code: any) {
     return (userTypes.find(c => c.value === code) || {}).text;
 }
diff --git a/assets/navigations/actions.jsx b/assets/navigations/actions.tsx
similarity index 73%
rename from assets/navigations/actions.jsx
rename to assets/navigations/actions.tsx
index f05d6f8cc..6ed95d4ef 100644
--- a/assets/navigations/actions.jsx
+++ b/assets/navigations/actions.tsx
@@ -8,12 +8,12 @@ import {searchQuerySelector} from 'search/selectors';
 export const MAX_TILE_IMAGES = 4;
 
 export const SELECT_NAVIGATION = 'SELECT_NAVIGATION';
-export function selectNavigation(id) {
+export function selectNavigation(id: any) {
     return {type: SELECT_NAVIGATION, id};
 }
 
 export const EDIT_NAVIGATION = 'EDIT_NAVIGATION';
-export function editNavigation(event) {
+export function editNavigation(event: any) {
     return {type: EDIT_NAVIGATION, event};
 }
 
@@ -23,7 +23,7 @@ export function newNavigation() {
 }
 
 export const CANCEL_EDIT = 'CANCEL_EDIT';
-export function cancelEdit(event) {
+export function cancelEdit(event: any) {
     return {type: CANCEL_EDIT, event};
 }
 
@@ -33,17 +33,17 @@ export function queryNavigations() {
 }
 
 export const GET_NAVIGATIONS = 'GET_NAVIGATIONS';
-export function getNavigations(data) {
+export function getNavigations(data: any) {
     return {type: GET_NAVIGATIONS, data};
 }
 
 export const GET_PRODUCTS = 'GET_PRODUCTS';
-export function getProducts(data) {
+export function getProducts(data: any) {
     return {type: GET_PRODUCTS, data};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
@@ -53,13 +53,13 @@ export function setError(errors) {
  *
  */
 export function fetchNavigations() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryNavigations());
         const query = searchQuerySelector(getState()) || '';
 
         return server.get(`/navigations/search?q=${query}`)
-            .then((data) => dispatch(getNavigations(data)))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .then((data: any) => dispatch(getNavigations(data)))
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -69,7 +69,7 @@ export function fetchNavigations() {
  *
  */
 export function postNavigation() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const navigation = getState().navigationToEdit;
         if (!navigation._id) {
@@ -78,11 +78,11 @@ export function postNavigation() {
         }
 
         const url = `/navigations/${navigation._id ? navigation._id : 'new'}`;
-        let data = new FormData();
+        const data = new FormData();
 
         data.append('navigation', JSON.stringify(navigation));
         for(let i = 0; i < MAX_TILE_IMAGES; i++) {
-            const fileInput = document.getElementById(`tile_images_file_${i}`);
+            const fileInput: any = document.getElementById(`tile_images_file_${i}`);
             if (fileInput && fileInput.files.length > 0) {
                 data.append(`file${i}`, fileInput.files[0]);
             }
@@ -98,7 +98,7 @@ export function postNavigation() {
                 dispatch(fetchNavigations());
                 dispatch(fetchProducts());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
@@ -109,17 +109,17 @@ export function postNavigation() {
  *
  */
 export function deleteNavigation() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const navigation = getState().navigationToEdit;
         const url = `/navigations/${navigation._id}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Navigation deleted successfully'));
                 dispatch(fetchNavigations());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -129,17 +129,17 @@ export function deleteNavigation() {
  *
  */
 export function fetchProducts() {
-    return function (dispatch) {
+    return function (dispatch: any) {
         return server.get('/products/search')
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getProducts(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
-export function initViewData(data) {
-    return function (dispatch) {
+export function initViewData(data: any): any {
+    return function (dispatch: any) {
         dispatch(getNavigations(data.navigations));
         dispatch(getProducts(data.products));
         dispatch(initSections(data.sections));
diff --git a/assets/navigations/components/EditNavigation.jsx b/assets/navigations/components/EditNavigation.tsx
similarity index 90%
rename from assets/navigations/components/EditNavigation.jsx
rename to assets/navigations/components/EditNavigation.tsx
index 82f4d7ca1..af41041b9 100644
--- a/assets/navigations/components/EditNavigation.jsx
+++ b/assets/navigations/components/EditNavigation.tsx
@@ -12,8 +12,11 @@ import {MAX_TILE_IMAGES} from '../actions';
 import AuditInformation from 'components/AuditInformation';
 
 
-class EditNavigation extends React.Component {
-    constructor(props) {
+class EditNavigation extends React.Component<any, any> {
+    static propTypes: any;
+    tabs: any;
+    sectionIds: any;
+    constructor(props: any) {
         super(props);
         this.handleTabClick = this.handleTabClick.bind(this);
         this.state = {activeTab: 'navigation-details'};
@@ -23,12 +26,12 @@ class EditNavigation extends React.Component {
             {label: gettext('Products'), name: 'products'}
         ];
 
-        this.sectionIds = this.props.sections.map((section) => section._id);
+        this.sectionIds = this.props.sections.map((section: any) => section._id);
     }
 
-    handleTabClick(event) {
-        this.setState({activeTab: event.target.name});
-        if(event.target.name === 'products' && this.props.navigation._id) {
+    handleTabClick(event: any) {
+        this.setState({activeTab: event.target.title});
+        if(event.target.title === 'products' && this.props.navigation._id) {
             this.props.fetchProducts();
         }
     }
@@ -36,7 +39,7 @@ class EditNavigation extends React.Component {
     render() {
         const tile_images = get(this.props, 'navigation.tile_images') || [];
         const getActiveSection = () => this.props.sections.filter(
-            s => s._id === get(this.props.navigation, 'product_type')
+            (s: any) => s._id === get(this.props.navigation, 'product_type')
         );
 
         return (
@@ -56,13 +59,15 @@ class EditNavigation extends React.Component {
                 <AuditInformation item={this.props.navigation} />
 
                 <ul className='nav nav-tabs'>
-                    {this.tabs.map((tab) => (
+                    {this.tabs.map((tab: any) => (
                         <li key={tab.name} className='nav-item'>
                             <a
-                                name={tab.name}
+                                title={tab.name}
                                 className={`nav-link ${this.state.activeTab === tab.name && 'active'}`}
                                 href='#'
-                                onClick={this.handleTabClick}>{tab.label}
+                                onClick={this.handleTabClick}
+                            >
+                                {tab.label}
                             </a>
                         </li>
                     ))}
@@ -97,7 +102,7 @@ class EditNavigation extends React.Component {
                                         <div className="card mt-3 d-block">
                                             <div className="card-header">{'Tile Images (Marketplace)'}</div>
                                             <div className="card-body">
-                                                {[...Array(MAX_TILE_IMAGES)].map((_, index) => (
+                                                {[...Array(MAX_TILE_IMAGES)].map((_: any, index: any) => (
                                                     <FileInput key={index}
                                                         name={`tile_images_file_${index}`}
                                                         label={get(tile_images, `[${index}.file]`) ||
diff --git a/assets/navigations/components/NavigationList.jsx b/assets/navigations/components/NavigationList.tsx
similarity index 89%
rename from assets/navigations/components/NavigationList.jsx
rename to assets/navigations/components/NavigationList.tsx
index 88ad5ad50..f8d6fafec 100644
--- a/assets/navigations/components/NavigationList.jsx
+++ b/assets/navigations/components/NavigationList.tsx
@@ -4,8 +4,8 @@ import NavigationListItem from './NavigationListItem';
 import {gettext} from 'utils';
 
 
-function NavigationList({navigations, onClick, activeNavigationId}) {
-    const list = navigations.map((navigation) =>
+function NavigationList({navigations, onClick, activeNavigationId}: any) {
+    const list = navigations.map((navigation: any) =>
         <NavigationListItem
             key={navigation._id}
             navigation={navigation}
@@ -16,7 +16,7 @@ function NavigationList({navigations, onClick, activeNavigationId}) {
     return (
         <section className="content-main">
             <div className="list-items-container">
-                <table className="table table-hover" tabIndex='-1'>
+                <table className="table table-hover" tabIndex={-1}>
                     <thead>
                         <tr>
                             <th>{ gettext('Name') }</th>
diff --git a/assets/navigations/components/NavigationListItem.jsx b/assets/navigations/components/NavigationListItem.tsx
similarity index 82%
rename from assets/navigations/components/NavigationListItem.jsx
rename to assets/navigations/components/NavigationListItem.tsx
index a9b5f69b3..b3646bcf8 100644
--- a/assets/navigations/components/NavigationListItem.jsx
+++ b/assets/navigations/components/NavigationListItem.tsx
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import {gettext, shortDate} from 'utils';
 
 
-function NavigationListItem({navigation, isActive, onClick}) {
+function NavigationListItem({navigation, isActive, onClick}: any) {
     return (
         <tr key={navigation._id}
-            className={isActive?'table--selected':null}
+            className={isActive ? 'table--selected' : undefined}
             onClick={() => onClick(navigation._id)}>
             <td className="name">{navigation.name}</td>
             <td>{navigation.description}</td>
diff --git a/assets/navigations/components/Navigations.jsx b/assets/navigations/components/Navigations.tsx
similarity index 80%
rename from assets/navigations/components/Navigations.jsx
rename to assets/navigations/components/Navigations.tsx
index 7d9b87594..3f8de21ca 100644
--- a/assets/navigations/components/Navigations.jsx
+++ b/assets/navigations/components/Navigations.tsx
@@ -24,8 +24,9 @@ import NavigationList from './NavigationList';
 import SearchResults from 'search/components/SearchResults';
 
 
-class Navigations extends React.Component {
-    constructor(props, context) {
+class Navigations extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.isFormValid = this.isFormValid.bind(this);
@@ -35,7 +36,7 @@ class Navigations extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.navigationToEdit.name) {
             errors.name = [gettext('Please provide navigation name')];
@@ -46,7 +47,7 @@ class Navigations extends React.Component {
         return valid;
     }
 
-    save(event) {
+    save(event: any) {
         event.preventDefault && event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -56,7 +57,7 @@ class Navigations extends React.Component {
         this.props.saveNavigation();
     }
 
-    deleteNavigation(event) {
+    deleteNavigation(event: any) {
         event.preventDefault();
 
         if (confirm(gettext('Would you like to delete navigation: {{name}}', {name: this.props.navigationToEdit.name}))) {
@@ -65,8 +66,8 @@ class Navigations extends React.Component {
     }
 
     render() {
-        const progressStyle = {width: '25%'};
-        const sectionFilter = (navigation) => !this.props.activeSection || get(navigation, 'product_type', 'wire') === this.props.activeSection;
+        const progressStyle: any = {width: '25%'};
+        const sectionFilter = (navigation: any) => !this.props.activeSection || get(navigation, 'product_type', 'wire') === this.props.activeSection;
 
         return (
             <div className="flex-row">
@@ -129,8 +130,8 @@ Navigations.propTypes = {
     fetchProducts: PropTypes.func.isRequired,
 };
 
-const mapStateToProps = (state) => ({
-    navigations: state.navigations.map((id) => state.navigationsById[id]),
+const mapStateToProps = (state: any) => ({
+    navigations: state.navigations.map((id: any) => state.navigationsById[id]),
     navigationToEdit: state.navigationToEdit,
     activeNavigationId: state.activeNavigationId,
     isLoading: state.isLoading,
@@ -141,15 +142,17 @@ const mapStateToProps = (state) => ({
     sections: uiSectionsSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectNavigation: (_id) => dispatch(selectNavigation(_id)),
-    editNavigation: (event) => dispatch(editNavigation(event)),
-    saveNavigation: (type) => dispatch(postNavigation(type)),
-    deleteNavigation: (type) => dispatch(deleteNavigation(type)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectNavigation: (_id: any) => dispatch(selectNavigation(_id)),
+    editNavigation: (event: any) => dispatch(editNavigation(event)),
+    saveNavigation: (type: any) => dispatch(postNavigation()),
+    deleteNavigation: (type: any) => dispatch(deleteNavigation()),
     newNavigation: () => dispatch(newNavigation()),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
+    cancelEdit: (event: any) => dispatch(cancelEdit(event)),
     fetchProducts: () => dispatch(fetchProducts()),
     dispatch: dispatch,
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(Navigations);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(Navigations);
+
+export default component;
diff --git a/assets/navigations/components/NavigationsApp.jsx b/assets/navigations/components/NavigationsApp.tsx
similarity index 83%
rename from assets/navigations/components/NavigationsApp.jsx
rename to assets/navigations/components/NavigationsApp.tsx
index cb574f416..7c03cd349 100644
--- a/assets/navigations/components/NavigationsApp.jsx
+++ b/assets/navigations/components/NavigationsApp.tsx
@@ -14,8 +14,9 @@ import {sectionsPropType} from '../../features/sections/types';
 import {uiSectionsSelector, activeSectionSelector} from '../../features/sections/selectors';
 
 
-class NavigationsApp extends React.Component {
-    constructor(props, context) {
+class NavigationsApp extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
     }
 
@@ -50,15 +51,17 @@ NavigationsApp.propTypes = {
     activeSection: PropTypes.string.isRequired,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     sections: uiSectionsSelector(state),
     activeSection: activeSectionSelector(state),
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     newNavigation,
     fetchNavigations,
     setQuery: setSearchQuery,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(NavigationsApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(NavigationsApp);
+
+export default component;
diff --git a/assets/navigations/index.js b/assets/navigations/index.ts
similarity index 100%
rename from assets/navigations/index.js
rename to assets/navigations/index.ts
diff --git a/assets/navigations/reducers.jsx b/assets/navigations/reducers.tsx
similarity index 87%
rename from assets/navigations/reducers.jsx
rename to assets/navigations/reducers.tsx
index ff7603feb..c0d42cb44 100644
--- a/assets/navigations/reducers.jsx
+++ b/assets/navigations/reducers.tsx
@@ -19,7 +19,7 @@ import {sectionsReducer} from 'features/sections/reducers';
 import {searchReducer} from 'search/reducers';
 import {ADD_EDIT_USERS} from 'actions';
 
-const initialState = {
+const initialState: any = {
     query: null,
     navigations: [],
     navigationsById: {},
@@ -32,11 +32,11 @@ const initialState = {
     search: searchReducer(),
 };
 
-export default function navigationReducer(state = initialState, action) {
+export default function navigationReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case SELECT_NAVIGATION: {
-        const defaultNavigation = {
+        const defaultNavigation: any = {
             is_enabled: true,
             name: '',
             description: '',
@@ -45,8 +45,8 @@ export default function navigationReducer(state = initialState, action) {
 
         if (navigationToEdit != null) {
             navigationToEdit.products = state.products
-                .filter((product) => (product.navigations && product.navigations.includes(action.id)))
-                .map((product) => product._id);
+                .filter((product: any) => (product.navigations && product.navigations.includes(action.id)))
+                .map((product: any) => product._id);
         }
 
         return {
@@ -60,7 +60,7 @@ export default function navigationReducer(state = initialState, action) {
     case EDIT_NAVIGATION: {
         const target = action.event.target;
         const field = target.name;
-        let navigation = state.navigationToEdit;
+        const navigation = state.navigationToEdit;
         if (startsWith(field, 'tile_images_file')) {
             const fileData = field.split('_');
             const fileIndex = parseInt(fileData[3], 10);
@@ -73,7 +73,7 @@ export default function navigationReducer(state = initialState, action) {
     }
 
     case NEW_NAVIGATION: {
-        const navigationToEdit = {
+        const navigationToEdit: any = {
             is_enabled: true,
             name: '',
             description: '',
@@ -99,7 +99,7 @@ export default function navigationReducer(state = initialState, action) {
 
     case GET_NAVIGATIONS: {
         const navigationsById = Object.assign({}, state.navigationsById);
-        const navigations = action.data.map((navigation) => {
+        const navigations = action.data.map((navigation: any) => {
             navigationsById[navigation._id] = navigation;
             return navigation._id;
         });
diff --git a/assets/navigations/utils.js b/assets/navigations/utils.ts
similarity index 62%
rename from assets/navigations/utils.js
rename to assets/navigations/utils.ts
index aaa6e2bf5..0519403a7 100644
--- a/assets/navigations/utils.js
+++ b/assets/navigations/utils.ts
@@ -4,13 +4,13 @@
  * @param products
  * @returns {string}
  */
-export function  getProductTypes(navigation, products) {
+export function getProductTypes(navigation: any, products: any): any {
     if (!navigation || !products) {
         return '';
     }
 
-    const productTypes = {};
-    products.filter((product) => (product.navigations || []).includes(navigation._id)).forEach((p) =>
+    const productTypes: any = {};
+    products.filter((product: any) => (product.navigations || []).includes(navigation._id)).forEach((p: any) =>
         p.product_type ? productTypes[p.product_type] = 1 : productTypes['wire'] = 1
     );
 
diff --git a/assets/news-api/actions.js b/assets/news-api/actions.ts
similarity index 73%
rename from assets/news-api/actions.js
rename to assets/news-api/actions.ts
index e25aec30d..e606c229b 100644
--- a/assets/news-api/actions.js
+++ b/assets/news-api/actions.ts
@@ -3,30 +3,30 @@ import {cloneDeep} from 'lodash';
 
 import {notify, gettext} from '../utils';
 
-export function getTokenForCompany(companyId) {
+export function getTokenForCompany(companyId: any) {
     return server.get(`/news_api_tokens?company=${companyId}`);
 }
 
-export function generateTokenForCompany(token) {
+export function generateTokenForCompany(token: any) {
     const newToken = cloneDeep(token);
 
     newToken.expiry = !token.expiry ? null : token.expiry;
 
     return server.post('/news_api_tokens', newToken)
-        .then((data) => {
+        .then((data: any) => {
             notify.success(gettext('API Token generated successfully'));
             return data.token;
         });
 }
 
-export function deleteTokenForCompany(companyId) {
-    return server.del(`/news_api_tokens?company=${companyId}`)
+export function deleteTokenForCompany(companyId: any) {
+    return (server as any).del(`/news_api_tokens?company=${companyId}`)
         .then(() => {
             notify.success(gettext('API Token deleted successfully'));
         });
 }
 
-export function updateTokenForCompany(token) {
+export function updateTokenForCompany(token: any) {
     const tokenId = encodeURIComponent(token.token);
 
     return server.patch(`/news_api_tokens?token=${tokenId}`, {
diff --git a/assets/news-api/components/EditAPIToken.jsx b/assets/news-api/components/EditAPIToken.tsx
similarity index 94%
rename from assets/news-api/components/EditAPIToken.jsx
rename to assets/news-api/components/EditAPIToken.tsx
index 5e831dd97..688df1b35 100644
--- a/assets/news-api/components/EditAPIToken.jsx
+++ b/assets/news-api/components/EditAPIToken.tsx
@@ -19,8 +19,9 @@ import {
 } from '../../utils';
 import {getTokenForCompany, generateTokenForCompany, deleteTokenForCompany, updateTokenForCompany} from '../actions';
 
-export default class EditAPIToken extends React.Component {
-    constructor(props) {
+export default class EditAPIToken extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -55,13 +56,13 @@ export default class EditAPIToken extends React.Component {
                 // Retrieve the API Token from the server
                 // Then update this component's state with the token
                 getTokenForCompany(this.props.companyId)
-                    .then((token) => {
+                    .then((token: any) => {
                         this.setState({
                             token: token,
                             loaded: true,
                             creating: false,
                         });
-                    }, (error) => {
+                    }, (error: any) => {
                         if (error.response.status === 404) {
                             this.setState({
                                 loaded: true,
@@ -79,14 +80,14 @@ export default class EditAPIToken extends React.Component {
         });
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         // reset tabs when new company is created
         if (this.props.companyId !== prevProps.companyId) {
             this.loadToken();
         }
     }
 
-    onExpiryChange(value) {
+    onExpiryChange(value: any) {
         const newState = cloneDeep(this.state);
 
         if (!value) {
@@ -111,7 +112,7 @@ export default class EditAPIToken extends React.Component {
             .format('YYYY-MM-DD') : this.state.token.expiry;
     }
 
-    saveToken(event) {
+    saveToken(event: any) {
         if (event) {
             event.preventDefault();
         }
@@ -124,7 +125,7 @@ export default class EditAPIToken extends React.Component {
 
         if (this.state.creating) {
             generateTokenForCompany(this.state.token)
-                .then((token) => {
+                .then((token: any) => {
                     this.setState({
                         token: {
                             ...this.state.token,
@@ -141,11 +142,11 @@ export default class EditAPIToken extends React.Component {
         }
     }
 
-    editToken(event) {
+    editToken(event: any) {
         if (event) {
             event.preventDefault();
         }
-        
+
         this.setState({creating: false,});
 
         if (this.props.onCardEdit) {
@@ -153,7 +154,7 @@ export default class EditAPIToken extends React.Component {
         }
     }
 
-    deleteToken(event) {
+    deleteToken(event: any) {
         if (event) {
             event.preventDefault();
         }
@@ -174,11 +175,11 @@ export default class EditAPIToken extends React.Component {
             });
     }
 
-    onEnabledChange(event) {
+    onEnabledChange(event: any) {
         if (event) {
             event.preventDefault();
         }
-        
+
         this.setState({
             token: {
                 ...this.state.token,
diff --git a/assets/news-api/index.js b/assets/news-api/index.ts
similarity index 100%
rename from assets/news-api/index.js
rename to assets/news-api/index.ts
diff --git a/assets/notifications/actions.js b/assets/notifications/actions.ts
similarity index 72%
rename from assets/notifications/actions.js
rename to assets/notifications/actions.ts
index 47fa84a4e..8fc1a9417 100644
--- a/assets/notifications/actions.js
+++ b/assets/notifications/actions.ts
@@ -3,12 +3,12 @@ import {gettext, notify, errorHandler} from 'utils';
 import server from 'server';
 
 export const UPDATE_NOTIFICATION_COUNT = 'UPDATE_NOTIFICATION_COUNT';
-export function updateNotificationCount(count) {
+export function updateNotificationCount(count: any) {
     return {type: UPDATE_NOTIFICATION_COUNT, count};
 }
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(data) {
+export function initData(data: any) {
     return {type: INIT_DATA, data};
 }
 
@@ -20,12 +20,12 @@ export function clearAllNotifications() {
 
 
 export const CLEAR_NOTIFICATION = 'CLEAR_NOTIFICATION';
-export function clearNotification(id) {
+export function clearNotification(id: any) {
     return {type: CLEAR_NOTIFICATION, id};
 }
 
 export const SET_NOTIFICATIONS = 'SET_NOTIFICATIONS';
-export function setNotifications(items, notifications) {
+export function setNotifications(items: any, notifications: any) {
     return {
         type: SET_NOTIFICATIONS,
         items: items,
@@ -34,20 +34,20 @@ export function setNotifications(items, notifications) {
 }
 
 export const SET_NOTIFICATIONS_LOADING = 'SET_NOTIFICATIONS_LOADING';
-export function setNotificationsLoading(loading) {
+export function setNotificationsLoading(loading: any) {
     return {type: SET_NOTIFICATIONS_LOADING, loading};
 }
 
 export function loadNotifications() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(setNotificationsLoading(true));
         const user = getState().user;
 
         return server.get(`/users/${user}/notifications`)
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(setNotifications(data.items, data.notifications));
             })
-            .catch((error) => errorHandler(error, dispatch))
+            .catch((error: any) => errorHandler(error, dispatch))
             .finally(() => {
                 dispatch(setNotificationsLoading(false));
             });
@@ -59,16 +59,16 @@ export function loadNotifications() {
  * Deletes the given notification of the user
  *
  */
-export function deleteNotification(id) {
-    return function (dispatch, getState) {
+export function deleteNotification(id: any) {
+    return function (dispatch: any, getState: any) {
         const user = getState().user;
         const url = `/users/${user}/notifications/${user}_${id}`;
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Notification cleared successfully'));
                 dispatch(clearNotification(id));
             })
-            .catch((error) => errorHandler(error, dispatch));
+            .catch((error: any) => errorHandler(error, dispatch));
     };
 }
 
@@ -78,15 +78,15 @@ export function deleteNotification(id) {
  *
  */
 export function deleteAllNotifications() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         const user = getState().user;
         const url = `/users/${user}/notifications`;
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Notifications cleared successfully'));
                 dispatch(clearAllNotifications());
             })
-            .catch((error) => errorHandler(error, dispatch));
+            .catch((error: any) => errorHandler(error, dispatch));
     };
 }
 
@@ -96,8 +96,8 @@ export function deleteAllNotifications() {
  *
  * @param {Object} push
  */
-export function pushNotification(push) {
-    return (dispatch, getState) => {
+export function pushNotification(push: any): any {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         switch (push.event) {
         case 'new_notifications':
diff --git a/assets/notifications/components/BasicNotificationItem.jsx b/assets/notifications/components/BasicNotificationItem.tsx
similarity index 98%
rename from assets/notifications/components/BasicNotificationItem.jsx
rename to assets/notifications/components/BasicNotificationItem.tsx
index 81529555b..2a2d705f7 100644
--- a/assets/notifications/components/BasicNotificationItem.jsx
+++ b/assets/notifications/components/BasicNotificationItem.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 
-export function BasicNotificationItem({header, body, url, footer}) {
+export function BasicNotificationItem({header, body, url, footer}: any) {
     return (
         <React.Fragment>
             {header == null ? null : (
diff --git a/assets/notifications/components/NotificationsApp.jsx b/assets/notifications/components/NotificationsApp.tsx
similarity index 83%
rename from assets/notifications/components/NotificationsApp.jsx
rename to assets/notifications/components/NotificationsApp.tsx
index 08fa958e2..f478dccb2 100644
--- a/assets/notifications/components/NotificationsApp.jsx
+++ b/assets/notifications/components/NotificationsApp.tsx
@@ -9,8 +9,9 @@ import {
 
 import NotificationList from 'components/NotificationList';
 
-class NotificationsApp extends React.Component {
-    constructor(props, context) {
+class NotificationsApp extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
     }
 
@@ -41,7 +42,7 @@ NotificationsApp.propTypes = {
     loading: PropTypes.bool,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     user: state.user,
     items: state.items,
     notifications: state.notifications,
@@ -49,8 +50,8 @@ const mapStateToProps = (state) => ({
     loading: state.loading,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    clearNotification: (id) => dispatch(deleteNotification(id)),
+const mapDispatchToProps = (dispatch: any) => ({
+    clearNotification: (id: any) => dispatch(deleteNotification(id)),
     clearAll: () => dispatch(deleteAllNotifications()),
     loadNotifications: () => dispatch(loadNotifications()),
 });
diff --git a/assets/notifications/components/notificationItems.jsx b/assets/notifications/components/notificationItems.tsx
similarity index 82%
rename from assets/notifications/components/notificationItems.jsx
rename to assets/notifications/components/notificationItems.tsx
index 670d225f2..bc1631a81 100644
--- a/assets/notifications/components/notificationItems.jsx
+++ b/assets/notifications/components/notificationItems.tsx
@@ -4,15 +4,15 @@ import {get} from 'lodash';
 import {gettext, formatTime, formatDate, isToday} from 'utils';
 import {BasicNotificationItem} from './BasicNotificationItem';
 
-export const registeredNotifications = [];
+export const registeredNotifications: Array<any> = [];
 
-export function registerNotification(condition, component) {
+export function registerNotification(condition: any, component: any) {
     registeredNotifications.unshift({condition, component});
 }
 
-export function renderNotificationComponent(notification, item) {
-    let notificationEntry = registeredNotifications.find(
-        (entry) => entry.condition(notification, item)
+export function renderNotificationComponent(notification: any, item: any) {
+    const notificationEntry = registeredNotifications.find(
+        (entry: any) => entry.condition(notification, item)
     );
 
     if (notificationEntry == null || notificationEntry.component == null) {
@@ -24,7 +24,7 @@ export function renderNotificationComponent(notification, item) {
     return notificationEntry.component(notification, item);
 }
 
-function getNotificationFooterText(notification) {
+function getNotificationFooterText(notification: any) {
     switch (notification.action) {
     case 'share':
         return (
@@ -56,7 +56,7 @@ function getNotificationFooterText(notification) {
     }
 }
 
-function getNotificationUrl(notification, item) {
+function getNotificationUrl(notification: any, item: any) {
     if (get(notification, 'data.url')) {
         return notification.data.url;
     }
@@ -66,18 +66,18 @@ function getNotificationUrl(notification, item) {
         `/wire?item=${item._id}`;
 }
 
-function getNotificationName(item) {
+function getNotificationName(item: any) {
     return item.label || item.name || item.headline || item.slugline;
 }
 
 // New Wire item that matches action history (such as item Downloaded)
 registerNotification(
-    (notification, item) => (
+    (notification: any, item: any) => (
         (get(notification, 'action') === 'history_match' && get(notification, 'resource') === 'text') ||
         // Fallback Wire notification (legacy functionality)
         get(notification, 'resource') === 'text' || item.type === 'text'
     ),
-    (notification, item) => (
+    (notification: any, item: any) => (
         <BasicNotificationItem
             header={gettext('A story you downloaded has been updated')}
             body={getNotificationName(item)}
@@ -89,13 +89,13 @@ registerNotification(
 
 // New Agenda item that matches action history (such as item Downloaded)
 registerNotification(
-    (notification, item) => (
+    (notification: any, item: any) => (
         (get(notification, 'action') === 'history_match' && get(notification, 'resource') === 'agenda') ||
         (get(notification, 'action') === 'watched_agenda_updated') ||
         // Fallback Agenda notification (legacy functionality)
         get(notification, 'resource') === 'agenda' || item.type === 'agenda'
     ),
-    (notification, item) => (
+    (notification: any, item: any) => (
         <BasicNotificationItem
             header={gettext('An event you are watching has been updated')}
             body={getNotificationName(item)}
@@ -107,14 +107,14 @@ registerNotification(
 
 // New Wire/Agenda item matches a subscribed topic
 registerNotification(
-    (notification) => (
+    (notification: any) => (
         get(notification, 'action') === 'topic_matches' &&
         ['text', 'wire', 'items', 'agenda'].includes(get(notification, 'resource'))
     ),
-    (notification, item) => (
+    (notification: any, item: any) => (
         <BasicNotificationItem
             header={notification.resource === 'agenda' ?
-                gettext('{{ agenda }} item has arrived that matches a subscribed topic', sectionNames) :
+                gettext('{{ agenda }} item has arrived that matches a subscribed topic', window.sectionNames) :
                 gettext('A story has arrived that matches a subscribed topic')
             }
             body={getNotificationName(item)}
@@ -126,15 +126,15 @@ registerNotification(
 
 // A Topic was shared with this User
 registerNotification(
-    (notification) => (
+    (notification: any) => (
         notification &&
         notification.action === 'share' &&
         notification.resource === 'topic'
     ),
-    (notification, item) => (
+    (notification: any, item: any) => (
         <BasicNotificationItem
             header={gettext('{{ section }} Topic has been shared with you', {
-                section: item.topic_type === 'agenda' ? sectionNames.agenda : sectionNames.wire,
+                section: item.topic_type === 'agenda' ? window.sectionNames.agenda : window.sectionNames.wire,
             })}
             body={getNotificationName(item)}
             url={getNotificationUrl(notification, item)}
@@ -145,14 +145,14 @@ registerNotification(
 
 // A Wire/Agenda item was shared with this user
 registerNotification(
-    (notification) => (
+    (notification: any) => (
         get(notification, 'action') === 'share' &&
         ['text', 'wire', 'items', 'agenda'].includes(get(notification, 'resource'))
     ),
-    (notification, item) => (
+    (notification: any, item: any) => (
         <BasicNotificationItem
             header={gettext('{{ section }} item was shared with you', {
-                section: notification.resource === 'agenda' ? sectionNames.agenda : sectionNames.wire,
+                section: notification.resource === 'agenda' ? window.sectionNames.agenda : window.sectionNames.wire,
             })}
             body={getNotificationName(item)}
             url={getNotificationUrl(notification, item)}
diff --git a/assets/notifications/index.js b/assets/notifications/index.ts
similarity index 84%
rename from assets/notifications/index.js
rename to assets/notifications/index.ts
index fe84ad3ff..e1830576e 100644
--- a/assets/notifications/index.js
+++ b/assets/notifications/index.ts
@@ -1,4 +1,5 @@
-import {createStore, render, initWebSocket} from 'utils';
+import {createStore, render} from 'utils';
+import {initWebSocket} from 'websocket';
 import notificationReducer from './reducers';
 import NotificationApp from './components/NotificationsApp';
 import {initData, pushNotification} from './actions';
diff --git a/assets/notifications/reducers.js b/assets/notifications/reducers.ts
similarity index 84%
rename from assets/notifications/reducers.js
rename to assets/notifications/reducers.ts
index 2315ea690..547c75b48 100644
--- a/assets/notifications/reducers.js
+++ b/assets/notifications/reducers.ts
@@ -7,7 +7,7 @@ import {
     CLEAR_ALL_NOTIFICATIONS,
 } from './actions';
 
-const initialState = {
+const initialState: any = {
     user: null,
     items: {},
     notifications: [],
@@ -15,14 +15,14 @@ const initialState = {
     loading: false,
 };
 
-export default function notificationReducer(state = initialState, action) {
+export default function notificationReducer(state: any = initialState, action: any) {
     switch (action.type) {
     case SET_NOTIFICATIONS:
         return {
             ...state,
             notifications: action.notifications,
             notificationCount: action.notifications.length,
-            items: action.items.reduce((itemMap, item) => {
+            items: action.items.reduce((itemMap: any, item: any) => {
                 itemMap[item._id] = item;
 
                 return itemMap;
@@ -51,7 +51,7 @@ export default function notificationReducer(state = initialState, action) {
 
 
     case CLEAR_NOTIFICATION:{
-        const notifications = state.notifications.filter((n) => n.item !== action.id);
+        const notifications = state.notifications.filter((n: any) => n.item !== action.id);
         return {
             ...state,
             notifications: notifications,
diff --git a/assets/oauth_clients/actions.js b/assets/oauth_clients/actions.ts
similarity index 71%
rename from assets/oauth_clients/actions.js
rename to assets/oauth_clients/actions.ts
index 1cc9cbdd5..f48f71070 100644
--- a/assets/oauth_clients/actions.js
+++ b/assets/oauth_clients/actions.ts
@@ -4,28 +4,28 @@ import {searchQuerySelector} from 'search/selectors';
 
 
 export const SELECT_CLIENT = 'SELECT_CLIENT';
-export function selectClient(id) {
-    return function (dispatch) {
+export function selectClient(id: any) {
+    return function (dispatch: any) {
         dispatch(select(id));
     };
 }
 
-function select(id) {
+function select(id: any) {
     return {type: SELECT_CLIENT, id};
 }
 
 export const EDIT_CLIENT = 'EDIT_CLIENT';
-export function editClient(event) {
+export function editClient(event: any) {
     return {type: EDIT_CLIENT, event};
 }
 
 export const NEW_CLIENT = 'NEW_CLIENT';
-export function newClient(data) {
+export function newClient(data: any) {
     return {type: NEW_CLIENT, data};
 }
 
 export const CANCEL_EDIT = 'CANCEL_EDIT';
-export function cancelEdit(event) {
+export function cancelEdit(event: any) {
     return {type: CANCEL_EDIT, event};
 }
 
@@ -35,18 +35,18 @@ export function queryClients() {
 }
 
 export const GET_CLIENTS = 'GET_CLIENTS';
-export function getClients(data) {
+export function getClients(data: any) {
     return {type: GET_CLIENTS, data};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
 
 export const GET_CLIENT_PASSWORD = 'GET_CLIENT_PASSWORD';
-export function getClientPassword(data) {
+export function getClientPassword(data: any) {
     return {type: GET_CLIENT_PASSWORD, data};
 }
 
@@ -56,15 +56,15 @@ export function getClientPassword(data) {
  *
  */
 export function fetchClients() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryClients());
         const query = searchQuerySelector(getState()) || '';
 
         return server.get(`/oauth_clients/search?q=${query}`)
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getClients(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -74,12 +74,12 @@ export function fetchClients() {
  *
  */
 export function postClient() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         const client = getState().clientToEdit;
         const url = `/oauth_clients/${client._id ? client._id : 'new'}`;
 
         return server.post(url, client)
-            .then((data) => {
+            .then((data: any) => {
                 if (client._id) {
                     notify.success(gettext('Client updated successfully'));
                 } else {
@@ -88,7 +88,7 @@ export function postClient() {
                 }
                 dispatch(fetchClients());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
@@ -99,21 +99,21 @@ export function postClient() {
  *
  */
 export function deleteClient() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const client = getState().clientToEdit;
         const url = `/oauth_clients/${client._id}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Client deleted successfully'));
                 dispatch(fetchClients());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 export const INIT_VIEW_DATA = 'INIT_VIEW_DATA';
-export function initViewData(data) {
+export function initViewData(data: any) {
     return {type: INIT_VIEW_DATA, data};
 }
diff --git a/assets/oauth_clients/components/ClientList.jsx b/assets/oauth_clients/components/ClientList.tsx
similarity index 91%
rename from assets/oauth_clients/components/ClientList.jsx
rename to assets/oauth_clients/components/ClientList.tsx
index 4114bb71f..a7ca693e2 100644
--- a/assets/oauth_clients/components/ClientList.jsx
+++ b/assets/oauth_clients/components/ClientList.tsx
@@ -4,8 +4,8 @@ import ClientListItem from './ClientListItem';
 import {gettext} from 'utils';
 
 
-function ClientList({clients, onClick}) {
-    const list = clients.map((client) =>
+function ClientList({clients, onClick}: any) {
+    const list = clients.map((client: any) =>
         <ClientListItem
             key={client._id}
             client={client}
diff --git a/assets/oauth_clients/components/ClientListItem.jsx b/assets/oauth_clients/components/ClientListItem.tsx
similarity index 93%
rename from assets/oauth_clients/components/ClientListItem.jsx
rename to assets/oauth_clients/components/ClientListItem.tsx
index ffae9adb1..7c9f7ffbf 100644
--- a/assets/oauth_clients/components/ClientListItem.jsx
+++ b/assets/oauth_clients/components/ClientListItem.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {shortDate} from 'utils';
 
-function ClientListItem({client, onClick}) {
+function ClientListItem({client, onClick}: any) {
     return (
         <tr key={client._id}
             className={classNames({'table-secondary': false})}
diff --git a/assets/oauth_clients/components/Clients.jsx b/assets/oauth_clients/components/Clients.tsx
similarity index 83%
rename from assets/oauth_clients/components/Clients.jsx
rename to assets/oauth_clients/components/Clients.tsx
index 5b1ecb68c..e52ffa37e 100644
--- a/assets/oauth_clients/components/Clients.jsx
+++ b/assets/oauth_clients/components/Clients.tsx
@@ -18,8 +18,9 @@ import {
 import {searchQuerySelector} from 'search/selectors';
 import {gettext} from 'utils';
 
-class Clients extends React.Component {
-    constructor(props, context) {
+class Clients extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.isFormValid = this.isFormValid.bind(this);
@@ -29,7 +30,7 @@ class Clients extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.clientToEdit.name) {
             errors.name = [gettext('Please provide client name')];
@@ -40,7 +41,7 @@ class Clients extends React.Component {
         return valid;
     }
 
-    save(externalEvent) {
+    save(externalEvent: any) {
         if (externalEvent) {
             externalEvent.preventDefault();
 
@@ -52,7 +53,7 @@ class Clients extends React.Component {
         this.props.saveClient('clients');
     }
 
-    deleteClient(event) {
+    deleteClient(event: any) {
         event.preventDefault();
 
         if (confirm(gettext('Would you like to delete client: {{name}}', {name: this.props.clientToEdit.name}))) {
@@ -61,7 +62,7 @@ class Clients extends React.Component {
     }
 
     render() {
-        const progressStyle = {width: '25%'};
+        const progressStyle: any = {width: '25%'};
         const originalClientEdited = !get(this.props, 'clientToEdit._id') ? this.props.clientToEdit :
             this.props.clientsById[this.props.clientToEdit._id];
         return (
@@ -118,8 +119,8 @@ Clients.propTypes = {
 };
 
 
-const mapStateToProps = (state) => ({
-    clients: state.clients.map((id) => state.clientsById[id]),
+const mapStateToProps = (state: any) => ({
+    clients: state.clients.map((id: any) => state.clientsById[id]),
     clientToEdit: state.clientToEdit,
     activeQuery: searchQuerySelector(state),
     totalClients: state.totalClients,
@@ -127,14 +128,15 @@ const mapStateToProps = (state) => ({
 });
 
 
-const mapDispatchToProps = (dispatch) => ({
-    selectClient: (id) => dispatch(selectClient(id)),
-    editClient: (event) => dispatch(editClient(event)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectClient: (id: any) => dispatch(selectClient(id)),
+    editClient: (event: any) => dispatch(editClient(event)),
     saveClient: () => dispatch(postClient()),
     deleteClient: () => dispatch(deleteClient()),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
+    cancelEdit: (event: any) => dispatch(cancelEdit(event)),
     dispatch: dispatch,
 });
 
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(Clients);
 
-export default connect(mapStateToProps, mapDispatchToProps)(Clients);
+export default component;
diff --git a/assets/oauth_clients/components/ClientsApp.jsx b/assets/oauth_clients/components/ClientsApp.tsx
similarity index 90%
rename from assets/oauth_clients/components/ClientsApp.jsx
rename to assets/oauth_clients/components/ClientsApp.tsx
index 7599bd644..182decf2a 100644
--- a/assets/oauth_clients/components/ClientsApp.jsx
+++ b/assets/oauth_clients/components/ClientsApp.tsx
@@ -10,8 +10,9 @@ import {setSearchQuery} from 'search/actions';
 import Clients from './Clients';
 import ListBar from 'components/ListBar';
 
-class ClientsApp extends React.Component {
-    constructor(props, context) {
+class ClientsApp extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
     }
 
@@ -50,7 +51,7 @@ ClientsApp.propTypes = {
 };
 
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     newClient,
     fetchClients,
     setQuery: setSearchQuery,
diff --git a/assets/oauth_clients/components/EditClient.jsx b/assets/oauth_clients/components/EditClient.tsx
similarity index 97%
rename from assets/oauth_clients/components/EditClient.jsx
rename to assets/oauth_clients/components/EditClient.tsx
index 558251bb5..f78b8289e 100644
--- a/assets/oauth_clients/components/EditClient.jsx
+++ b/assets/oauth_clients/components/EditClient.tsx
@@ -5,8 +5,9 @@ import classNames from 'classnames';
 import TextInput from 'components/TextInput';
 import {gettext} from 'utils';
 
-class EditClient extends React.Component {
-    constructor(props) {
+class EditClient extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
     }
 
diff --git a/assets/oauth_clients/index.js b/assets/oauth_clients/index.ts
similarity index 100%
rename from assets/oauth_clients/index.js
rename to assets/oauth_clients/index.ts
diff --git a/assets/oauth_clients/reducers.js b/assets/oauth_clients/reducers.ts
similarity index 84%
rename from assets/oauth_clients/reducers.js
rename to assets/oauth_clients/reducers.ts
index 59d559ef2..d82a1a04b 100644
--- a/assets/oauth_clients/reducers.js
+++ b/assets/oauth_clients/reducers.ts
@@ -11,7 +11,7 @@ import {
 
 import {searchReducer} from 'search/reducers';
 
-const initialState = {
+const initialState: any = {
     query: null,
     clients: [],
     clientsById: {},
@@ -20,9 +20,9 @@ const initialState = {
     search: searchReducer(undefined, undefined, 'settings'),
 };
 
-function setupClients(clientList, state) {
-    const clientsById = {};
-    const clients = clientList.map((client) => {
+function setupClients(clientList: any, state: any) {
+    const clientsById: any = {};
+    const clients = clientList.map((client: any) => {
         clientsById[client._id] = client;
         return client._id;
     });
@@ -34,11 +34,11 @@ function setupClients(clientList, state) {
     };
 }
 
-export default function clientReducer(state = initialState, action) {
+export default function clientReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case SELECT_CLIENT: {
-        const defaultClient = {
+        const defaultClient: any = {
             name: '',
         };
 
@@ -53,7 +53,7 @@ export default function clientReducer(state = initialState, action) {
     case EDIT_CLIENT: {
         const target = action.event.target;
         const field = target.name;
-        let client = state.clientToEdit;
+        const client = state.clientToEdit;
         client[field] = target.value;
         return {...state, clientToEdit: client, errors: null};
     }
@@ -80,14 +80,14 @@ export default function clientReducer(state = initialState, action) {
         return setupClients(action.data, state);
 
     case GET_CLIENT_PASSWORD:{
-        let newClient = state.clientToEdit;
+        const newClient = state.clientToEdit;
         newClient['secret_key'] = action.data.password;
         newClient['_id'] = action.data._id;
         return {...state, clientToEdit: newClient, errors: null};
     }
 
     case INIT_VIEW_DATA: {
-        const nextState = {
+        const nextState: any = {
             ...state,
             products: action.data.products,
             sections: action.data.sections,
@@ -107,5 +107,5 @@ export default function clientReducer(state = initialState, action) {
 
         return state;
     }
-    }    
+    }
 }
diff --git a/assets/products/actions.js b/assets/products/actions.ts
similarity index 68%
rename from assets/products/actions.js
rename to assets/products/actions.ts
index 3791668d7..6d30f0783 100644
--- a/assets/products/actions.js
+++ b/assets/products/actions.ts
@@ -5,12 +5,12 @@ import {searchQuerySelector} from 'search/selectors';
 
 
 export const SELECT_PRODUCT = 'SELECT_PRODUCT';
-export function selectProduct(id) {
+export function selectProduct(id: any) {
     return {type: SELECT_PRODUCT, id};
 }
 
 export const EDIT_PRODUCT = 'EDIT_PRODUCT';
-export function editProduct(event) {
+export function editProduct(event: any) {
     return {type: EDIT_PRODUCT, event};
 }
 
@@ -20,7 +20,7 @@ export function newProduct() {
 }
 
 export const CANCEL_EDIT = 'CANCEL_EDIT';
-export function cancelEdit(event) {
+export function cancelEdit(event: any) {
     return {type: CANCEL_EDIT, event};
 }
 
@@ -30,27 +30,27 @@ export function queryProducts() {
 }
 
 export const GET_PRODUCTS = 'GET_PRODUCTS';
-export function getProducts(data) {
+export function getProducts(data: any) {
     return {type: GET_PRODUCTS, data};
 }
 
 export const GET_COMPANIES = 'GET_COMPANIES';
-export function getCompanies(data) {
+export function getCompanies(data: any) {
     return {type: GET_COMPANIES, data};
 }
 
 export const GET_NAVIGATIONS = 'GET_NAVIGATIONS';
-export function getNavigations(data) {
+export function getNavigations(data: any) {
     return {type: GET_NAVIGATIONS, data};
 }
 
 export const UPDATE_PRODUCT_NAVIGATIONS = 'UPDATE_PRODUCT_NAVIGATIONS';
-export function updateProductNavigations(product, navigations) {
+export function updateProductNavigations(product: any, navigations: any) {
     return {type: UPDATE_PRODUCT_NAVIGATIONS, product, navigations};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
@@ -60,13 +60,13 @@ export function setError(errors) {
  *
  */
 export function fetchProducts() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryProducts());
         const query = searchQuerySelector(getState()) || '';
 
         return server.get(`/products/search?q=${query}`)
-            .then((data) => dispatch(getProducts(data)))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .then((data: any) => dispatch(getProducts(data)))
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -75,8 +75,8 @@ export function fetchProducts() {
  * Creates new products
  *
  */
-export function postProduct() {
-    return function (dispatch, getState) {
+export function postProduct(): any {
+    return function (dispatch: any, getState: any) {
 
         const product = getState().productToEdit;
         const url = `/products/${product._id ? product._id : 'new'}`;
@@ -90,7 +90,7 @@ export function postProduct() {
                 }
                 dispatch(fetchProducts());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
@@ -101,17 +101,17 @@ export function postProduct() {
  *
  */
 export function deleteProduct() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const product = getState().productToEdit;
         const url = `/products/${product._id}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Product deleted successfully'));
                 dispatch(fetchProducts());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -121,12 +121,12 @@ export function deleteProduct() {
  *
  */
 export function fetchCompanies() {
-    return function (dispatch) {
+    return function (dispatch: any) {
         return server.get('/companies/search')
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getCompanies(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -134,15 +134,15 @@ export function fetchCompanies() {
  * Saves companies for a product
  *
  */
-export function saveCompanies(companies) {
-    return function (dispatch, getState) {
+export function saveCompanies(companies: any) {
+    return function (dispatch: any, getState: any) {
         const product = getState().productToEdit;
         return server.post(`/products/${product._id}/companies`, {companies})
             .then(() => {
                 notify.success(gettext('Product updated successfully'));
                 dispatch(fetchCompanies());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -151,12 +151,12 @@ export function saveCompanies(companies) {
  *
  */
 export function fetchNavigations() {
-    return function (dispatch) {
+    return function (dispatch: any) {
         return server.get('/navigations/search')
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getNavigations(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -164,20 +164,20 @@ export function fetchNavigations() {
  * Saves navigations for a product
  *
  */
-export function saveNavigations(navigations) {
-    return function (dispatch, getState) {
+export function saveNavigations(navigations: any) {
+    return function (dispatch: any, getState: any) {
         const product = getState().productToEdit;
         return server.post(`/products/${product._id}/navigations`, {navigations})
             .then(() => {
                 notify.success(gettext('Product updated successfully'));
                 dispatch(updateProductNavigations(product, navigations));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
-export function initViewData(data) {
-    return function (dispatch) {
+export function initViewData(data: any): any {
+    return function (dispatch: any) {
         dispatch(getProducts(data.products));
         dispatch(getCompanies(data.companies));
         dispatch(getNavigations(data.navigations));
diff --git a/assets/products/components/EditProduct.jsx b/assets/products/components/EditProduct.tsx
similarity index 90%
rename from assets/products/components/EditProduct.jsx
rename to assets/products/components/EditProduct.tsx
index 45d51529d..e8bb7762c 100644
--- a/assets/products/components/EditProduct.jsx
+++ b/assets/products/components/EditProduct.tsx
@@ -10,15 +10,17 @@ import EditPanel from '../../components/EditPanel';
 import AuditInformation from 'components/AuditInformation';
 import {sectionsPropType} from '../../features/sections/types';
 
-const getProductCompanies = (product, companies) => ({
-    companies: companies.filter((company) => {
+const getProductCompanies = (product: any, companies: any) => ({
+    companies: companies.filter((company: any) => {
         const companyProducts = company.products || [];
-        return companyProducts.some((_product) => _product._id === product._id);
-    }).map((company) => company._id),
+        return companyProducts.some((_product: any) => _product._id === product._id);
+    }).map((company: any) => company._id),
 });
 
-class EditProduct extends React.Component {
-    constructor(props) {
+class EditProduct extends React.Component<any, any> {
+    static propTypes: any;
+    tabs: any;
+    constructor(props: any) {
         super(props);
         this.handleTabClick = this.handleTabClick.bind(this);
         this.getPoductTestButton = this.getPoductTestButton.bind(this);
@@ -37,18 +39,18 @@ class EditProduct extends React.Component {
         }
     }
 
-    handleTabClick(event) {
-        this.setState({activeTab: event.target.name});
-        if(event.target.name === 'companies') {
+    handleTabClick(event: any) {
+        this.setState({activeTab: event.target.title});
+        if(event.target.title === 'companies') {
             this.props.fetchCompanies();
         }
-        if(event.target.name === 'navigations') {
+        if(event.target.title === 'navigations') {
             this.props.fetchNavigations();
         }
     }
 
-    getPoductTestButton(product) {
-        let q;
+    getPoductTestButton(product: any) {
+        let q: any;
 
         if (product.product_type === 'agenda') {
             q = JSON.stringify({
@@ -68,7 +70,7 @@ class EditProduct extends React.Component {
         }
     }
 
-    getQueryString(product, field) {
+    getQueryString(product: any, field: any) {
         if (get(product, field) && product.product_type === 'agenda') {
             return JSON.stringify({[field]: get(product, field)});
         }
@@ -92,13 +94,18 @@ class EditProduct extends React.Component {
                 </div>
                 <AuditInformation item={this.props.product} />
                 <ul className='nav nav-tabs'>
-                    {this.tabs.map((tab) => (
-                        <li key={tab.name} className='nav-item'>
+                    {this.tabs.map((tab: any) => (
+                        <li
+                            key={tab.name}
+                            className='nav-item'
+                        >
                             <a
-                                name={tab.name}
+                                title={tab.name}
                                 className={`nav-link ${this.state.activeTab === tab.name && 'active'}`}
                                 href='#'
-                                onClick={this.handleTabClick}>{tab.label}
+                                onClick={this.handleTabClick}
+                            >
+                                {tab.label}
                             </a>
                         </li>
                     ))}
diff --git a/assets/products/components/ProductList.jsx b/assets/products/components/ProductList.tsx
similarity index 91%
rename from assets/products/components/ProductList.jsx
rename to assets/products/components/ProductList.tsx
index b5d655494..e75e3eefe 100644
--- a/assets/products/components/ProductList.jsx
+++ b/assets/products/components/ProductList.tsx
@@ -4,8 +4,8 @@ import ProductListItem from './ProductListItem';
 import {gettext} from 'utils';
 
 
-function ProductList({products, onClick, activeProductId, activeSection}) {
-    const list = products.map((product) =>
+function ProductList({products, onClick, activeProductId, activeSection}: any) {
+    const list = products.map((product: any) =>
         <ProductListItem
             key={product._id}
             product={product}
@@ -16,7 +16,7 @@ function ProductList({products, onClick, activeProductId, activeSection}) {
     return (
         <section className="content-main">
             <div className="list-items-container">
-                <table className="table table-hover" tabIndex='-1'>
+                <table className="table table-hover" tabIndex={-1}>
                     <thead>
                         <tr>
                             <th>{ gettext('Name') }</th>
diff --git a/assets/products/components/ProductListItem.jsx b/assets/products/components/ProductListItem.tsx
similarity index 85%
rename from assets/products/components/ProductListItem.jsx
rename to assets/products/components/ProductListItem.tsx
index bcbd1d296..0ecf81e71 100644
--- a/assets/products/components/ProductListItem.jsx
+++ b/assets/products/components/ProductListItem.tsx
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import {gettext, shortDate} from 'utils';
 
 
-function ProductListItem({product, isActive, onClick}) {
+function ProductListItem({product, isActive, onClick}: any) {
     return (
         <tr key={product._id}
-            className={isActive?'table--selected':null}
+            className={isActive ? 'table--selected' : undefined}
             onClick={() => onClick(product._id)}>
             <td className="name">{product.name}</td>
             <td>{(product.is_enabled ? gettext('Enabled') : gettext('Disabled'))}</td>
diff --git a/assets/products/components/Products.jsx b/assets/products/components/Products.tsx
similarity index 80%
rename from assets/products/components/Products.jsx
rename to assets/products/components/Products.tsx
index ff5127183..72800c363 100644
--- a/assets/products/components/Products.jsx
+++ b/assets/products/components/Products.tsx
@@ -28,8 +28,9 @@ import ProductList from './ProductList';
 
 import SearchResults from 'search/components/SearchResults';
 
-class Products extends React.Component {
-    constructor(props, context) {
+class Products extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.isFormValid = this.isFormValid.bind(this);
@@ -39,7 +40,7 @@ class Products extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.productToEdit.name) {
             errors.name = [gettext('Please provide product name')];
@@ -50,7 +51,7 @@ class Products extends React.Component {
         return valid;
     }
 
-    save(event) {
+    save(event: any) {
         event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -60,7 +61,7 @@ class Products extends React.Component {
         this.props.saveProduct();
     }
 
-    deleteProduct(event) {
+    deleteProduct(event: any) {
         event.preventDefault();
 
         if (confirm(gettext('Would you like to delete product: {{name}}', {name: this.props.productToEdit.name}))) {
@@ -69,9 +70,9 @@ class Products extends React.Component {
     }
 
     render() {
-        const progressStyle = {width: '25%'};
-        const sectionFilter = (product) => !this.props.activeSection || get(product, 'product_type', 'wire') === this.props.activeSection;
-        const getActiveSection = () => this.props.sections.filter(s => s._id === this.props.activeSection);
+        const progressStyle: any = {width: '25%'};
+        const sectionFilter = (product: any) => !this.props.activeSection || get(product, 'product_type', 'wire') === this.props.activeSection;
+        const getActiveSection = () => this.props.sections.filter((s: any) => s._id === this.props.activeSection);
 
         return (
             <div className="flex-row">
@@ -144,8 +145,8 @@ Products.propTypes = {
     saveNavigations: PropTypes.func.isRequired,
 };
 
-const mapStateToProps = (state) => ({
-    products: state.products.map((id) => state.productsById[id]),
+const mapStateToProps = (state: any) => ({
+    products: state.products.map((id: any) => state.productsById[id]),
     productToEdit: state.productToEdit,
     activeProductId: state.activeProductId,
     isLoading: state.isLoading,
@@ -158,18 +159,20 @@ const mapStateToProps = (state) => ({
     sections: sectionsSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectProduct: (_id) => dispatch(selectProduct(_id)),
-    editProduct: (event) => dispatch(editProduct(event)),
-    saveProduct: (type) => dispatch(postProduct(type)),
-    deleteProduct: (type) => dispatch(deleteProduct(type)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectProduct: (_id: any) => dispatch(selectProduct(_id)),
+    editProduct: (event: any) => dispatch(editProduct(event)),
+    saveProduct: (type: any) => dispatch(postProduct()),
+    deleteProduct: (type: any) => dispatch(deleteProduct()),
     newProduct: () => dispatch(newProduct()),
-    saveCompanies: (companies) => dispatch(saveCompanies(companies)),
+    saveCompanies: (companies: any) => dispatch(saveCompanies(companies)),
     fetchCompanies: () => dispatch(fetchCompanies()),
-    saveNavigations: (navigations) => dispatch(saveNavigations(navigations)),
+    saveNavigations: (navigations: any) => dispatch(saveNavigations(navigations)),
     fetchNavigations: () => dispatch(fetchNavigations()),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
+    cancelEdit: (event: any) => dispatch(cancelEdit(event)),
     dispatch: dispatch,
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(Products);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(Products);
+
+export default component;
diff --git a/assets/products/components/ProductsApp.jsx b/assets/products/components/ProductsApp.tsx
similarity index 88%
rename from assets/products/components/ProductsApp.jsx
rename to assets/products/components/ProductsApp.tsx
index 442dc5920..aa10648f3 100644
--- a/assets/products/components/ProductsApp.jsx
+++ b/assets/products/components/ProductsApp.tsx
@@ -17,8 +17,9 @@ import {sectionsSelector, activeSectionSelector} from 'features/sections/selecto
 import Products from './Products';
 import ListBar from 'components/ListBar';
 
-class ProductsApp extends React.Component {
-    constructor(props, context) {
+class ProductsApp extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
     }
 
@@ -49,12 +50,12 @@ ProductsApp.propTypes = {
     newProduct: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     sections: sectionsSelector(state),
     activeSection: activeSectionSelector(state),
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     fetchProducts,
     setQuery: setSearchQuery,
     newProduct,
diff --git a/assets/products/index.js b/assets/products/index.ts
similarity index 100%
rename from assets/products/index.js
rename to assets/products/index.ts
diff --git a/assets/products/reducers.js b/assets/products/reducers.ts
similarity index 86%
rename from assets/products/reducers.js
rename to assets/products/reducers.ts
index 97629c723..8ae5e3196 100644
--- a/assets/products/reducers.js
+++ b/assets/products/reducers.ts
@@ -16,7 +16,7 @@ import {INIT_SECTIONS, SELECT_SECTION} from 'features/sections/actions';
 import {sectionsReducer} from 'features/sections/reducers';
 import {searchReducer} from 'search/reducers';
 
-const initialState = {
+const initialState: any = {
     query: null,
     products: [],
     productsById: {},
@@ -30,11 +30,11 @@ const initialState = {
     search: searchReducer(undefined, undefined, 'settings'),
 };
 
-export default function productReducer(state = initialState, action) {
+export default function productReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case SELECT_PRODUCT: {
-        const defaultProduct = {
+        const defaultProduct: any = {
             is_enabled: true,
             name: '',
             description: '',
@@ -51,13 +51,13 @@ export default function productReducer(state = initialState, action) {
     case EDIT_PRODUCT: {
         const target = action.event.target;
         const field = target.name;
-        let product = state.productToEdit;
+        const product = state.productToEdit;
         product[field] = target.type === 'checkbox' ? target.checked : target.value;
         return {...state, productToEdit: product, errors: null};
     }
 
     case NEW_PRODUCT: {
-        const productToEdit = {
+        const productToEdit: any = {
             is_enabled: true,
             name: '',
             description: '',
@@ -83,7 +83,7 @@ export default function productReducer(state = initialState, action) {
 
     case GET_PRODUCTS: {
         const productsById = Object.assign({}, state.productsById);
-        const products = action.data.map((product) => {
+        const products = action.data.map((product: any) => {
             productsById[product._id] = product;
             return product._id;
         });
@@ -98,15 +98,15 @@ export default function productReducer(state = initialState, action) {
     }
 
     case GET_COMPANIES: {
-        const companiesById = {};
-        action.data.map((company) => companiesById[company._id] = company);
+        const companiesById: any = {};
+        action.data.map((company: any) => companiesById[company._id] = company);
 
         return {...state, companies: action.data, companiesById};
     }
 
     case GET_NAVIGATIONS: {
-        const navigationsById = {};
-        action.data.map((navigation) => navigationsById[navigation._id] = navigation);
+        const navigationsById: any = {};
+        action.data.map((navigation: any) => navigationsById[navigation._id] = navigation);
 
         return {...state, navigations: action.data, navigationsById};
     }
diff --git a/assets/reducers.js b/assets/reducers.ts
similarity index 90%
rename from assets/reducers.js
rename to assets/reducers.ts
index 06c77c5fa..66a40ebcd 100644
--- a/assets/reducers.js
+++ b/assets/reducers.ts
@@ -39,7 +39,7 @@ import {REMOVE_NEW_ITEMS, SET_NEW_ITEM} from './agenda/actions';
 import {toggleValue} from 'utils';
 import {topicsReducer} from './topics/reducer';
 
-export function modalReducer(state, action) {
+export function modalReducer(state?: any, action?: any): any {
     if (!action) {
         return state;
     }
@@ -73,7 +73,7 @@ export function modalReducer(state, action) {
 }
 
 
-function getReadItems(state, item) {
+function getReadItems(state: any, item: any) {
     const readItems = Object.assign({}, state.readItems);
 
     if (item) {
@@ -84,10 +84,10 @@ function getReadItems(state, item) {
 }
 
 
-function updateItemActions(state, items, action) {
+function updateItemActions(state: any, items: any, action: any) {
     const itemsById = Object.assign({}, state.itemsById);
 
-    items.map((item) => {
+    items.map((item: any) => {
         itemsById[item] = Object.assign({}, itemsById[item]);
         itemsById[item][action] = (itemsById[item][action] || []).concat([state.user]);
     });
@@ -97,7 +97,7 @@ function updateItemActions(state, items, action) {
 
 
 
-export function defaultReducer(state={}, action) {
+export function defaultReducer(state: any = {}, action: any) {
     if (!action) {
         return state;
     }
@@ -105,10 +105,10 @@ export function defaultReducer(state={}, action) {
     switch (action.type) {
 
     case SET_ITEMS: {
-        const itemsById = {};
-        const items = [];
+        const itemsById: any = {};
+        const items: any = [];
 
-        action.items.forEach((item) => {
+        action.items.forEach((item: any) => {
             if (!itemsById[item._id]) {
                 itemsById[item._id] = item;
                 items.push(item._id);
@@ -130,7 +130,7 @@ export function defaultReducer(state={}, action) {
         };
 
     case PREVIEW_ITEM: {
-        const readItems = getReadItems(state, action.item, action.group);
+        const readItems = getReadItems(state, action.item);
 
         return {
             ...state,
@@ -186,7 +186,7 @@ export function defaultReducer(state={}, action) {
 
     case RECIEVE_NEXT_ITEMS: {
         const itemsById = Object.assign({}, state.itemsById);
-        const newItems = action.data._items.map((item) => {
+        const newItems = action.data._items.map((item: any) => {
             if (!itemsById[item._id]) {
                 itemsById[item._id] = item;
             }
@@ -277,7 +277,7 @@ export function defaultReducer(state={}, action) {
         const itemsById = Object.assign({}, state.itemsById);
         const bookmarkedItems = state.bookmarkedItems || [];
 
-        const missing = action.items.filter((item) => {
+        const missing = action.items.filter((item: any) => {
             itemsById[item] = Object.assign({}, itemsById[item]);
             itemsById[item].bookmarks = (itemsById[item].bookmarks || []).concat([state.user]);
             return bookmarkedItems.indexOf(item) === -1;
@@ -294,9 +294,9 @@ export function defaultReducer(state={}, action) {
         const itemsById = Object.assign({}, state.itemsById);
         const bookmarkedItems = state.bookmarkedItems || [];
 
-        const bookmarks = action.items.filter((item) => {
+        const bookmarks = action.items.filter((item: any) => {
             itemsById[item] = Object.assign({}, itemsById[item]);
-            itemsById[item].bookmarks = (itemsById[item].bookmarks || []).filter((val) => val !== state.user);
+            itemsById[item].bookmarks = (itemsById[item].bookmarks || []).filter((val: any) => val !== state.user);
             return bookmarkedItems.indexOf(item) === -1;
         });
 
@@ -309,7 +309,7 @@ export function defaultReducer(state={}, action) {
 
     case SET_NEW_ITEM_BY_TOPIC: {
         const newItemsByTopic = Object.assign({}, state.newItemsByTopic);
-        action.data.topics.map((topic) => {
+        action.data.topics.map((topic: any) => {
             const previous = newItemsByTopic[topic] || [];
             newItemsByTopic[topic] = previous.concat([action.data.item]);
         });
@@ -341,8 +341,8 @@ export function defaultReducer(state={}, action) {
             ...state,
             newItems: uniq([
                 ...state.newItems,
-                ...(action.data._items.filter((item) => (!item.nextversion && !state.itemsById[item._id]
-                ) || get(state.itemsById, `${item._id}.versioncreated`) !== item.versioncreated).map((item) => item._id))
+                ...(action.data._items.filter((item: any) => (!item.nextversion && !state.itemsById[item._id]
+                ) || get(state.itemsById, `${item._id}.versioncreated`) !== item.versioncreated).map((item: any) => item._id))
             ]),
         };
     }
diff --git a/assets/search/actions.js b/assets/search/actions.ts
similarity index 79%
rename from assets/search/actions.js
rename to assets/search/actions.ts
index eb00ba350..fa3483160 100644
--- a/assets/search/actions.js
+++ b/assets/search/actions.ts
@@ -24,8 +24,8 @@ import {
 import {context} from 'selectors';
 
 export const SET_QUERY = 'SET_QUERY';
-export function setQuery(query) {
-    return function(dispatch, getState) {
+export function setQuery(query: any) {
+    return function(dispatch: any, getState: any) {
         query && analytics.event('search', query);
         dispatch(setSearchQuery(query));
         updateRouteParams(
@@ -36,17 +36,17 @@ export function setQuery(query) {
 }
 
 export const TOGGLE_TOPIC = 'TOGGLE_TOPIC';
-export function toggleTopic(topic) {
+export function toggleTopic(topic: any) {
     return {type: TOGGLE_TOPIC, topic};
 }
 
 export const ADD_TOPIC = 'ADD_TOPIC';
-export function addTopic(topic) {
+export function addTopic(topic: any) {
     return {type: ADD_TOPIC, topic};
 }
 
 export const SET_NEW_ITEM_BY_TOPIC = 'SET_NEW_ITEM_BY_TOPIC';
-export function setNewItemByTopic(data) {
+export function setNewItemByTopic(data: any) {
     return {type: SET_NEW_ITEM_BY_TOPIC, data};
 }
 
@@ -55,13 +55,13 @@ export function loadMyTopics() {
 }
 
 export const SET_TOPICS = 'SET_TOPICS';
-export function setTopics(topics) {
+export function setTopics(topics: any) {
     return {type: SET_TOPICS, topics};
 }
 
 export const TOGGLE_NAVIGATION = 'TOGGLE_NAVIGATION';
-export function toggleNavigation(navigation, disableSameNavigationDeselect) {
-    return (dispatch, getState) => {
+export function toggleNavigation(navigation?: any, disableSameNavigationDeselect?: any): any {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const currentNavigation = searchNavigationSelector(state);
         let newNavigation = [...currentNavigation];
@@ -75,7 +75,7 @@ export function toggleNavigation(navigation, disableSameNavigationDeselect) {
             if (currentNavigation.includes(navigationId)) {
                 // The navigation is already selected, so deselect it
                 newNavigation = newNavigation.filter(
-                    (navId) => navId !== navigationId
+                    (navId: any) => navId !== navigationId
                 );
             } else {
                 // The navigation is not selected, so select it now
@@ -109,21 +109,21 @@ export function toggleNavigation(navigation, disableSameNavigationDeselect) {
 }
 
 export const TOGGLE_FILTER = 'TOGGLE_FILTER';
-export function toggleFilter(key, value, single) {
-    return function (dispatch, getState) {
+export function toggleFilter(key: any, value: any, single?: any) {
+    return function (dispatch: any, getState: any) {
         const state = getState();
         const currentFilters = cloneDeep(searchFilterSelector(state));
 
         // the `value` can be an Array
-        let values = Array.isArray(value) ? value : [value];
+        const values = Array.isArray(value) ? value : [value];
 
-        for (let _value of values) {
+        for (const _value of values) {
             currentFilters[key] = toggleValue(currentFilters[key], _value);
             if (!_value || !currentFilters[key] || currentFilters[key].length === 0) {
                 delete currentFilters[key];
             } else if (single) {
                 currentFilters[key] = currentFilters[key].filter(
-                    (val) => val === _value
+                    (val: any) => val === _value
                 );
             }
         }
@@ -138,8 +138,8 @@ export function toggleFilter(key, value, single) {
 }
 
 export const SET_CREATED_FILTER = 'SET_CREATED_FILTER';
-export function setCreatedFilter(filter) {
-    return function(dispatch, getState) {
+export function setCreatedFilter(filter: any) {
+    return function(dispatch: any, getState: any) {
         const state = getState();
 
         // Combine the current created filter with the one provided
@@ -161,8 +161,8 @@ export function setCreatedFilter(filter) {
 }
 
 export const RESET_FILTER = 'RESET_FILTER';
-export function resetFilter(filter) {
-    return function(dispatch, getState) {
+export function resetFilter(filter?: any) {
+    return function(dispatch: any, getState: any) {
         updateRouteParams({
             filter: null,
             created: null,
@@ -172,7 +172,7 @@ export function resetFilter(filter) {
 }
 
 export const SET_VIEW = 'SET_VIEW';
-export function setView(view) {
+export function setView(view: any) {
     localStorage.setItem('view', view);
     return {type: SET_VIEW, view};
 }
@@ -182,7 +182,7 @@ export function setView(view) {
  *
  * @param {Object} searchParams
  */
-export function saveMyTopic(searchParams) {
+export function saveMyTopic(searchParams: any) {
     const type = get(searchParams, 'topic_type') || 'wire';
 
     const menu = type === 'agenda' ?
@@ -198,7 +198,7 @@ export function saveMyTopic(searchParams) {
     createOrUpdateTopic(menu, searchParams, true);
 }
 
-export function followStory(item, type) {
+export function followStory(item: any, type: any) {
     const slugline = get(item, 'slugline');
 
     saveMyTopic({
@@ -213,9 +213,9 @@ export function followStory(item, type) {
  *
  * @param {String} navigationId
  */
-export function toggleNavigationById(navigationId) {
-    return (dispatch, getState) => {
-        const navigation = (get(getState().search, 'navigations') || []).find((nav) => navigationId === nav._id);
+export function toggleNavigationById(navigationId: any): any {
+    return (dispatch: any, getState: any) => {
+        const navigation = (get(getState().search, 'navigations') || []).find((nav: any) => navigationId === nav._id);
         if (navigation) {
             dispatch(toggleNavigation(navigation));
         }
@@ -227,26 +227,26 @@ export function toggleNavigationById(navigationId) {
  *
  * @param {Array<String>} navigationIds
  */
-export function toggleNavigationByIds(navigationIds) {
-    return (dispatch, getState) => {
+export function toggleNavigationByIds(navigationIds: any) {
+    return (dispatch: any, getState: any) => {
         const navigations = (get(getState().search, 'navigations') || []);
 
         toggleNavigation();
         navigations
-            .filter((nav) => navigationIds.includes(nav._id))
-            .forEach((nav) => dispatch(toggleNavigation(nav)));
+            .filter((nav: any) => navigationIds.includes(nav._id))
+            .forEach((nav: any) => dispatch(toggleNavigation(nav)));
     };
 }
 
-export function submitFollowTopic(data) {
-    return (dispatch, getState) => {
+export function submitFollowTopic(data: any) {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         const userId = get(user, '_id') || user;
 
         const url = `/users/${userId}/topics`;
         data.timezone_offset = getTimezoneOffset();
         return server.post(url, data)
-            .then((updates) => {
+            .then((updates: any) => {
                 const topic = Object.assign(data, updates);
 
                 dispatch(addTopic(topic));
@@ -262,8 +262,8 @@ export function submitFollowTopic(data) {
  *
  * @param {Object} data
  */
-export function submitShareItem(data) {
-    return (dispatch, getState) => {
+export function submitShareItem(data: any) {
+    return (dispatch: any, getState: any) => {
         const userContext = context(getState());
         const type = userContext || data.items[0].topic_type;
         data.maps = [];
@@ -274,7 +274,7 @@ export function submitShareItem(data) {
         }
 
         if (type === 'agenda') {
-            data.items.map((_id) => data.maps.push(getMapSource(getLocations(getState().itemsById[_id]), 2)));
+            data.items.map((_id: any) => data.maps.push(getMapSource(getLocations(getState().itemsById[_id]), 2)));
         }
         return server.post(`/${url}?type=${type}`, data)
             .then(() => {
@@ -286,13 +286,13 @@ export function submitShareItem(data) {
                     notify.success(gettext('Item was shared successfully.'));
                 }
             })
-            .then(() => analytics.multiItemEvent('share', data.items.map((_id) => getState().itemsById[_id])))
+            .then(() => analytics.multiItemEvent('share', data.items.map((_id: any) => getState().itemsById[_id])))
             .catch(errorHandler);
     };
 }
 
 export function deselectMyTopic() {
-    return function(dispatch, getState) {
+    return function(dispatch: any, getState: any) {
         const state = getState();
         const currentParams = searchParamsSelector(state);
 
@@ -310,8 +310,8 @@ export function deselectMyTopic() {
     };
 }
 
-export function loadMyTopic(topicId) {
-    return (dispatch, getState) => {
+export function loadMyTopic(topicId: any): any {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const currentTopicId = searchTopicIdSelector(state);
         const nextTopicId = topicId === currentTopicId ? null : topicId;
@@ -332,15 +332,15 @@ export function loadMyTopic(topicId) {
 }
 
 export function updateSearchParams() {
-    return function(dispatch, getState) {
+    return function(dispatch: any, getState: any) {
         dispatch(setParams(
             activeTopicSelector(getState())
         ));
     };
 }
 
-export function updateFilterStateAndURL(activeFilter, createdFilter) {
-    return function(dispatch, getState) {
+export function updateFilterStateAndURL(activeFilter: any, createdFilter: any) {
+    return function(dispatch: any, getState: any) {
         const state = getState();
         dispatch(setSearchFilters(activeFilter));
         dispatch(setSearchCreated(createdFilter));
@@ -353,17 +353,17 @@ export function updateFilterStateAndURL(activeFilter, createdFilter) {
 }
 
 export const SET_SEARCH_TOPIC_ID = 'SET_SEARCH_TOPIC_ID';
-export function setSearchTopicId(topicId) {
+export function setSearchTopicId(topicId: any) {
     return {type: SET_SEARCH_TOPIC_ID, payload: topicId};
 }
 
 export const SET_SEARCH_NAVIGATION_IDS = 'SET_SEARCH_NAVIGATION_IDS';
-export function setSearchNavigationIds(navIds) {
+export function setSearchNavigationIds(navIds: any) {
     return {type: SET_SEARCH_NAVIGATION_IDS, payload: navIds};
 }
 
 export const SET_SEARCH_QUERY = 'SET_SEARCH_QUERY';
-export function setSearchQuery(query) {
+export function setSearchQuery(query: any) {
     if (query) {
         analytics.event('search', query);
     }
@@ -372,17 +372,17 @@ export function setSearchQuery(query) {
 }
 
 export const SET_SEARCH_FILTERS = 'SET_SEARCH_FILTERS';
-export function setSearchFilters(filters) {
+export function setSearchFilters(filters: any) {
     return {type: SET_SEARCH_FILTERS, payload: filters};
 }
 
 export const SET_SEARCH_CREATED = 'SET_SEARCH_CREATED';
-export function setSearchCreated(created) {
+export function setSearchCreated(created: any) {
     return {type: SET_SEARCH_CREATED, payload: created};
 }
 
 export const SET_SEARCH_PRODUCT = 'SET_SEARCH_PRODUCT';
-export function setSearchProduct(productId) {
+export function setSearchProduct(productId: any) {
     return {type: SET_SEARCH_PRODUCT, payload: productId};
 }
 
@@ -392,7 +392,7 @@ export function resetSearchParams() {
 }
 
 export function resetSearchParamsAndUpdateURL() {
-    return function(dispatch, getState) {
+    return function(dispatch: any, getState: any) {
         dispatch(resetSearchParams());
         updateRouteParams(
             {
@@ -410,8 +410,8 @@ export function resetSearchParamsAndUpdateURL() {
 }
 
 export const TOGGLE_ADVANCED_SEARCH_FIELD = 'TOGGLE_ADVANCED_SEARCH_FIELD';
-export function toggleAdvancedSearchField(field) {
-    return function(dispatch, getState) {
+export function toggleAdvancedSearchField(field: any) {
+    return function(dispatch: any, getState: any) {
         const selected = getState().search.advanced.fields;
 
         if (selected.length === 1 && selected.includes(field)) {
@@ -433,8 +433,8 @@ export function toggleAdvancedSearchField(field) {
 }
 
 export const SET_ADVANCED_SEARCH_KEYWORDS = 'SET_ADVANCED_SEARCH_KEYWORDS';
-export function setAdvancedSearchKeywords(field, keywords) {
-    return function(dispatch, getState) {
+export function setAdvancedSearchKeywords(field: any, keywords: any) {
+    return function(dispatch: any, getState: any) {
         dispatch({
             type: SET_ADVANCED_SEARCH_KEYWORDS,
             payload: {
@@ -453,7 +453,7 @@ export function setAdvancedSearchKeywords(field, keywords) {
 
 export const CLEAR_ADVANCED_SEARCH_PARAMS = 'CLEAR_ADVANCED_SEARCH_PARAMS';
 export function clearAdvancedSearchParams() {
-    return function(dispatch, getState) {
+    return function(dispatch: any, getState: any) {
         dispatch({type: CLEAR_ADVANCED_SEARCH_PARAMS});
         updateRouteParams(
             {advanced: null},
@@ -463,14 +463,14 @@ export function clearAdvancedSearchParams() {
 }
 
 export const SET_ADVANCED_SEARCH_PARAMS = 'SET_ADVANCED_SEARCH_PARAMS';
-function setAdvancedSearchParams(params) {
+function setAdvancedSearchParams(params: any) {
     return {
         type: SET_ADVANCED_SEARCH_PARAMS,
         payload: params,
     };
 }
-export function setParams(params) {
-    return function(dispatch) {
+export function setParams(params: any) {
+    return function(dispatch: any) {
         if (get(params, 'created')) {
             dispatch(setSearchCreated(params.created));
         }
@@ -502,9 +502,9 @@ export function setParams(params) {
  *
  * @param {URLSearchParams} params
  */
-export function initParams(params) {
-    return (dispatch, getState) => {
-        const custom = {
+export function initParams(params: any) {
+    return (dispatch: any, getState: any) => {
+        const custom: any = {
             query: params.get('q'),
             created: params.get('created') ? JSON.parse(params.get('created')) : null,
             navigation: params.get('navigation') ? JSON.parse(params.get('navigation')) : null,
@@ -512,7 +512,7 @@ export function initParams(params) {
             product: params.get('product'),
             advanced: params.get('advanced') ? JSON.parse(params.get('advanced')) : null,
         };
-        let topic = {};
+        let topic: any = {};
 
         if (params.get('topic')) {
             dispatch(setSearchTopicId(params.get('topic')));
@@ -527,16 +527,16 @@ export function initParams(params) {
     };
 }
 
-export function subscribeToTopic(topic) {
-    server.post(`/topics/${topic._id}/subscribe`)
+export function subscribeToTopic(topic: any) {
+    (server as any).post(`/topics/${topic._id}/subscribe`)
         .then(() => {
             notify.success(gettext('Topic subscribed successfully'));
         })
         .catch(errorHandler);
 }
 
-export function unsubscribeToTopic(topic) {
-    server.del(`/topics/${topic._id}/subscribe`)
+export function unsubscribeToTopic(topic: any) {
+    (server as any).del(`/topics/${topic._id}/subscribe`)
         .then(() => {
             notify.success(gettext('Topic unsubscribed successfully'));
         })
diff --git a/assets/search/components/AdvancedSearchPanel.jsx b/assets/search/components/AdvancedSearchPanel.tsx
similarity index 91%
rename from assets/search/components/AdvancedSearchPanel.jsx
rename to assets/search/components/AdvancedSearchPanel.tsx
index aa9d45e36..ffb374f6d 100644
--- a/assets/search/components/AdvancedSearchPanel.jsx
+++ b/assets/search/components/AdvancedSearchPanel.tsx
@@ -19,7 +19,7 @@ function AdvancedSearchPanelComponent({
     setKeywords,
     clearParams,
     availableFields,
-}) {
+}: any) {
     return (
         <div className="advanced-search__wrapper" data-test-id="advanced-search-panel">
             <div className="advanced-search__header">
@@ -60,10 +60,10 @@ function AdvancedSearchPanelComponent({
                         <textarea
                             name="all"
                             placeholder={gettext('keyword1 keyword2...')}
-                            rows="2"
+                            rows={2}
                             className="form-control"
                             value={params.all || ''}
-                            onChange={(event) => setKeywords('all', event.target.value)}
+                            onChange={(event: any) => setKeywords('all', event.target.value)}
                             autoFocus={true}
                         />
                         <p className="advanced-search__content-description-text">
@@ -80,10 +80,10 @@ function AdvancedSearchPanelComponent({
                         <textarea
                             name="any"
                             placeholder={gettext('keyword1 keyword2...')}
-                            rows="2"
+                            rows={2}
                             className="form-control"
                             value={params.any || ''}
-                            onChange={(event) => setKeywords('any', event.target.value)}
+                            onChange={(event: any) => setKeywords('any', event.target.value)}
                         />
                         <p className="advanced-search__content-description-text">
                             {gettext('And every item contain keyword1 OR keyword 2 etc.')}
@@ -99,10 +99,10 @@ function AdvancedSearchPanelComponent({
                         <textarea
                             name="exclude"
                             placeholder={gettext('keyword1 keyword2...')}
-                            rows="2"
+                            rows={2}
                             className="form-control"
                             value={params.exclude || ''}
-                            onChange={(event) => setKeywords('exclude', event.target.value)}
+                            onChange={(event: any) => setKeywords('exclude', event.target.value)}
                         />
                         <p className="advanced-search__content-description-text">
                             {gettext('And every item will NOT contain keyword1 nor keyword2 etc.')}
@@ -197,16 +197,16 @@ AdvancedSearchPanelComponent.propTypes = {
     availableFields: PropTypes.arrayOf(PropTypes.string),
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     params: advancedSearchParamsSelector(state),
     availableFields: getAdvancedSearchFields(state.context),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    toggleField: (field) => dispatch(toggleAdvancedSearchField(field)),
-    setKeywords: (field, keywords) => dispatch(setAdvancedSearchKeywords(field, keywords)),
+const mapDispatchToProps = (dispatch: any) => ({
+    toggleField: (field: any) => dispatch(toggleAdvancedSearchField(field)),
+    setKeywords: (field: any, keywords: any) => dispatch(setAdvancedSearchKeywords(field, keywords)),
     clearParams: () => dispatch(clearAdvancedSearchParams()),
 });
 
 
-export const AdvancedSearchPanel = connect(mapStateToProps, mapDispatchToProps)(AdvancedSearchPanelComponent);
+export const AdvancedSearchPanel: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(AdvancedSearchPanelComponent);
diff --git a/assets/search/components/FollowedTopics.jsx b/assets/search/components/FollowedTopics.tsx
similarity index 88%
rename from assets/search/components/FollowedTopics.jsx
rename to assets/search/components/FollowedTopics.tsx
index 5e86af969..b4feb74b5 100644
--- a/assets/search/components/FollowedTopics.jsx
+++ b/assets/search/components/FollowedTopics.tsx
@@ -34,8 +34,10 @@ import TopicEditor from 'search/components/TopicEditor';
 import TopicList from 'search/components/TopicList';
 import {TopicFolderEditor} from './TopicFolderEditor';
 
-class FollowedTopics extends React.Component {
-    constructor(props, context) {
+class FollowedTopics extends React.Component<any, any> {
+    static propTypes: any;
+    actions: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.editTopic = this.editTopic.bind(this);
@@ -57,7 +59,7 @@ class FollowedTopics extends React.Component {
                 name: gettext('Remove from folder'),
                 icon: 'folder-remove-from',
                 action: this.removeTopicFolder,
-                if: (topic) => topic.folder != null,
+                if: (topic: any) => topic.folder != null,
             },
             {
                 id: 'edit',
@@ -79,7 +81,7 @@ class FollowedTopics extends React.Component {
                     name: gettext('Delete'),
                     icon: 'trash',
                     action: this.deleteTopic,
-                    when: (topic) => canUserEditTopic(topic, this.props.user),
+                    when: (topic: any) => canUserEditTopic(topic, this.props.user),
                 }
             ].filter(isActionEnabled('topic_actions'));
         }
@@ -96,7 +98,7 @@ class FollowedTopics extends React.Component {
         }
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         if (get(prevProps, 'selectedMenu') !== get(this.props, 'selectedMenu')) {
             this.closeEditor();
         }
@@ -106,11 +108,11 @@ class FollowedTopics extends React.Component {
         this.closeEditor();
     }
 
-    editTopic(topic) {
+    editTopic(topic: any) {
         this.props.selectMenuItem(topic);
     }
 
-    deleteTopic(topic) {
+    deleteTopic(topic: any) {
         confirm(
             gettext('Would you like to delete topic {{name}}?', {
                 name: topic.label,
@@ -128,7 +130,7 @@ class FollowedTopics extends React.Component {
         }
 
         return this.props.topics.filter(
-            (topic) => (
+            (topic: any) => (
                 topic.topic_type === this.props.topicType &&
                 (topic.is_global || false) === this.state.showGlobal
             )
@@ -144,7 +146,7 @@ class FollowedTopics extends React.Component {
     }
 
     toggleGlobal() {
-        this.setState((previousState) => ({showGlobal: !previousState.showGlobal}));
+        this.setState((previousState: any) => ({showGlobal: !previousState.showGlobal}));
         this.props.fetchFolders(!this.state.showGlobal); // state change will only happen later
     }
 
@@ -152,23 +154,23 @@ class FollowedTopics extends React.Component {
         this.setState({newFolder: {}, folderPopover: null});
     }
 
-    saveFolder(folder, changes) {
+    saveFolder(folder: any, changes: any) {
         this.props.saveFolder(folder, changes, this.state.showGlobal).then(() => {
             this.setState({newFolder: null, folderPopover: null});
-        }, (reason) => {
+        }, (reason: any) => {
             this.setState({newFolder: {error: reason}});
         });
     }
 
-    deleteFolder(folder) {
+    deleteFolder(folder: any) {
         this.props.deleteFolder(folder, this.state.showGlobal);
     }
 
-    toggleFolderPopover(folder) {
+    toggleFolderPopover(folder: any) {
         this.setState({folderPopover: !this.state.folderPopover || this.state.folderPopover !== folder._id ? folder._id : null});
     }
 
-    removeTopicFolder(topic) {
+    removeTopicFolder(topic: any) {
         this.props.moveTopic(topic._id);
     }
 
@@ -292,7 +294,7 @@ FollowedTopics.propTypes = {
     })),
 };
 
-const mapStateToProps = (state, ownProps) => ({
+const mapStateToProps = (state: any, ownProps: any) => ({
     topics: state.topics,
     monitoringList: state.monitoringList,
     monitoringAdministrator: state.monitoringAdministrator,
@@ -305,16 +307,18 @@ const mapStateToProps = (state, ownProps) => ({
     folders: foldersSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch: any) => ({
     fetchTopics: () => dispatch(fetchTopics()),
-    shareTopic: (topic) => dispatch(shareTopic(topic)),
-    deleteTopic: (topic) => dispatch(deleteTopic(topic)),
-    selectMenuItem: (item) => dispatch(selectMenuItem(item)),
-    fetchCompanyUsers: (companyId) => dispatch(fetchCompanyUsers(companyId, true)),
-    saveFolder: (folder, data, global) => dispatch(saveFolder(folder, data, global)),
-    fetchFolders: (global) => dispatch(fetchFolders(global)),
-    moveTopic: (topicId, folder) => dispatch(moveTopic(topicId, folder)),
-    deleteFolder: (folder, global) => dispatch(deleteFolder(folder, global)),
+    shareTopic: (topic: any) => dispatch(shareTopic(topic)),
+    deleteTopic: (topic: any) => dispatch(deleteTopic(topic)),
+    selectMenuItem: (item: any) => dispatch(selectMenuItem(item)),
+    fetchCompanyUsers: (companyId: any) => dispatch(fetchCompanyUsers(companyId, true)),
+    saveFolder: (folder: any, data: any, global: any) => dispatch(saveFolder(folder, data, global)),
+    fetchFolders: (global: any) => dispatch(fetchFolders(global)),
+    moveTopic: (topicId: any, folder: any) => dispatch(moveTopic(topicId, folder)),
+    deleteFolder: (folder: any, global: boolean) => dispatch(deleteFolder(folder, global)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(FollowedTopics);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(FollowedTopics);
+
+export default component;
diff --git a/assets/search/components/MonitoringEditor.jsx b/assets/search/components/MonitoringEditor.tsx
similarity index 87%
rename from assets/search/components/MonitoringEditor.jsx
rename to assets/search/components/MonitoringEditor.tsx
index b7faa6f87..828e8c03d 100644
--- a/assets/search/components/MonitoringEditor.jsx
+++ b/assets/search/components/MonitoringEditor.tsx
@@ -12,8 +12,11 @@ import MonitoringSchedule from '../../monitoring/components/MonitoringSchedule';
 import {fetchCompanyUsers} from 'companies/actions';
 import {postMonitoringProfile} from 'monitoring/actions';
 
-class MonitoringEditor extends React.Component {
-    constructor(props) {
+class MonitoringEditor extends React.Component<any, any> {
+    static propTypes: any;
+    tabs: any;
+    saveprofile: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -24,7 +27,7 @@ class MonitoringEditor extends React.Component {
         };
 
         this.tabs = [
-            {label: gettext('{{monitoring}} Profile', sectionNames), name: 'profile'}
+            {label: gettext('{{monitoring}} Profile', window.sectionNames), name: 'profile'}
         ];
 
         if (this.props.isAdmin) {
@@ -36,7 +39,7 @@ class MonitoringEditor extends React.Component {
         this.saveMonitoringProfile = this.saveMonitoringProfile.bind(this);
     }
 
-    handleTabClick(event) {
+    handleTabClick(event: any) {
         this.setState({activeTab: event.target.name});
         if (event.target.name === 'users' && get(this.props, 'item.company')) {
             this.props.fetchCompanyUsers(this.props.item.company);
@@ -49,14 +52,14 @@ class MonitoringEditor extends React.Component {
         }
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         if (get(prevProps, 'item._id') !== get(this.props, 'item._id') ||
             get(prevProps, 'item._updated') !== get(this.props, 'item._updated')) {
             this.changeMonitoringProfile(this.props.item);
         }
     }
 
-    changeMonitoringProfile(item) {
+    changeMonitoringProfile(item: any) {
         this.setState({
             profile: cloneDeep(item),
             saving: false,
@@ -64,8 +67,8 @@ class MonitoringEditor extends React.Component {
         });
     }
 
-    onChange(event) {
-        let wl = cloneDeep(this.state.profile);
+    onChange(event: any) {
+        const wl = cloneDeep(this.state.profile);
         let field = event.target.name;
         let value = event.target.value;
         let autoSave, msg;
@@ -74,7 +77,7 @@ class MonitoringEditor extends React.Component {
             field = 'users';
             value = get(this.state, 'profile.users') || [];
             if (value.includes(this.props.user)) {
-                value = value.filter((u) => u !== this.props.user);
+                value = value.filter((u: any) => u !== this.props.user);
                 msg = gettext('Unsubscribed');
             } else {
                 value.push(this.props.user);
@@ -84,7 +87,7 @@ class MonitoringEditor extends React.Component {
         } else if (field === 'is_enabled') {
             value = !get(this.state, 'profile.is_enabled');
         }
-        
+
         set(wl, field, value);
 
         this.setState({
@@ -97,7 +100,7 @@ class MonitoringEditor extends React.Component {
         }
     }
 
-    saveMonitoringProfile(event) {
+    saveMonitoringProfile(event: any) {
         if (event && 'preventDefault' in event) {
             event.preventDefault();
         }
@@ -111,15 +114,15 @@ class MonitoringEditor extends React.Component {
         if (!profile) {
             return null;
         }
-        
-        const propsToFields = {
+
+        const propsToFields: any = {
             'onChange': this.onChange,
             'readOnly': !isAdmin,
         };
         const subscribed = (get(this.state, 'profile.users') || []).includes(user);
 
         return (
-            <div className='list-item__preview' role={gettext('dialog')} aria-label={gettext('Edit {{monitoring}}', sectionNames)}>
+            <div className='list-item__preview' role={gettext('dialog')} aria-label={gettext('Edit {{monitoring}}', window.sectionNames)}>
                 <div className="list-item__preview-header">
                     <h3>{get(item, 'name')}</h3>
                     <button
@@ -134,10 +137,10 @@ class MonitoringEditor extends React.Component {
                     </button>
                 </div>
                 <ul className='nav nav-tabs'>
-                    {this.tabs.filter((tab, index) => index === 0 || this.props.item._id).map((tab) => (
+                    {this.tabs.filter((tab: any, index: any) => index === 0 || this.props.item._id).map((tab: any) => (
                         <li key={tab.name} className='nav-item'>
                             <a
-                                name={tab.name}
+                                title={tab.name}
                                 className={`nav-link ${this.state.activeTab === tab.name && 'active'}`}
                                 href='#'
                                 onClick={this.handleTabClick}>{tab.label}
@@ -172,7 +175,7 @@ class MonitoringEditor extends React.Component {
                                         name='description'
                                         label={gettext('Description')}
                                         value={profile.description}
-                                        {...propsToFields} /> 
+                                        {...propsToFields} />
 
                                     <SelectInput
                                         name='alert_type'
@@ -184,7 +187,7 @@ class MonitoringEditor extends React.Component {
                                         ]}
                                         {...propsToFields} />
 
-                                    <MonitoringSchedule 
+                                    <MonitoringSchedule
                                         item={profile}
                                         onsaveMonitoringProfileSchedule={this.onChange}
                                         {...propsToFields}
@@ -217,7 +220,7 @@ class MonitoringEditor extends React.Component {
                         {this.state.activeTab === 'users' &&
                             <EditPanel
                                 parent={profile}
-                                items={this.props.monitoringProfileUsers.map((u) => ({
+                                items={this.props.monitoringProfileUsers.map((u: any) => ({
                                     ...u,
                                     name: `${u.first_name} ${u.last_name}`
                                 }))}
@@ -250,14 +253,16 @@ MonitoringEditor.propTypes = {
     monitoringProfileUsers: PropTypes.array,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     monitoringProfileUsers: state.monitoringProfileUsers || [],
     user: get(state, 'editedUser._id'),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    saveMonitoringProfile: (item, notifyMsg) => dispatch(postMonitoringProfile(item, notifyMsg)),
-    fetchCompanyUsers: (companyId) => dispatch(fetchCompanyUsers(companyId, true)),
+const mapDispatchToProps = (dispatch: any) => ({
+    saveMonitoringProfile: (item: any, notifyMsg: any) => dispatch(postMonitoringProfile(item, notifyMsg)),
+    fetchCompanyUsers: (companyId: any) => dispatch(fetchCompanyUsers(companyId, true)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(MonitoringEditor);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(MonitoringEditor);
+
+export default component;
diff --git a/assets/search/components/NewItemsIcon.jsx b/assets/search/components/NewItemsIcon.tsx
similarity index 89%
rename from assets/search/components/NewItemsIcon.jsx
rename to assets/search/components/NewItemsIcon.tsx
index 4403ee311..93263d9fb 100644
--- a/assets/search/components/NewItemsIcon.jsx
+++ b/assets/search/components/NewItemsIcon.tsx
@@ -6,8 +6,11 @@ import {Tooltip} from 'bootstrap';
 
 import {gettext, isTouchDevice, isWireContext} from 'utils';
 
-class NewItemsIcon extends React.Component {
-    constructor(props) {
+class NewItemsIcon extends React.Component<any, any> {
+    static propTypes: any;
+    dom: any;
+    tooltip: any;
+    constructor(props: any) {
         super(props);
 
         this.dom = {tooltip: null};
@@ -46,7 +49,7 @@ class NewItemsIcon extends React.Component {
         return (
             <button
                 type="button"
-                ref={(elem) => this.dom.tooltip = elem}
+                ref={(elem: any) => this.dom.tooltip = elem}
                 title={newItemsTooltip}
                 className="button__reset-styles d-flex align-items-center ms-3"
                 onClick={this.props.refresh}
diff --git a/assets/search/components/SearchBar.jsx b/assets/search/components/SearchBar.tsx
similarity index 92%
rename from assets/search/components/SearchBar.jsx
rename to assets/search/components/SearchBar.tsx
index 82af6dca0..e1609cc2a 100644
--- a/assets/search/components/SearchBar.jsx
+++ b/assets/search/components/SearchBar.tsx
@@ -7,21 +7,23 @@ import {gettext} from 'utils';
 
 import {searchQuerySelector} from 'search/selectors';
 
-class SearchBar extends React.Component {
-    constructor(props) {
+class SearchBar extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+
+    constructor(props: any) {
         super(props);
         this.onChange = this.onChange.bind(this);
         this.onSubmit = this.onSubmit.bind(this);
         this.onClear = this.onClear.bind(this);
-        this.onFocus = this.onFocus.bind(this);
         this.state = {query: props.query || ''};
     }
 
-    onChange(event) {
+    onChange(event: any) {
         this.setState({query: event.target.value});
     }
 
-    onSubmit(event) {
+    onSubmit(event: any) {
         event.preventDefault();
         this.setAndFetch(this.state.query);
     }
@@ -31,10 +33,6 @@ class SearchBar extends React.Component {
         this.setState({query: ''});
     }
 
-    onFocus() {
-
-    }
-
     setAndFetch(q = '') {
         if (this.props.enableQueryAction) {
             this.props.setQuery(q);
@@ -44,7 +42,7 @@ class SearchBar extends React.Component {
         }
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         this.setState({query: nextProps.query});
     }
 
@@ -68,7 +66,6 @@ class SearchBar extends React.Component {
                             aria-label={gettext('Search for...')}
                             value={this.state.query || ''}
                             onChange={this.onChange}
-                            onFocus={this.onFocus}
                         />
                         <div className='search__form-buttons'>
                             <button
@@ -122,10 +119,12 @@ SearchBar.propTypes = {
     toggleSearchTipsPanel: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps: any = (state: any) => ({
     query: searchQuerySelector(state),
 });
 
 SearchBar.defaultProps = {enableQueryAction: true};
 
-export default connect(mapStateToProps, null)(SearchBar);
+const component: React.ComponentType<any> = connect(mapStateToProps)(SearchBar);
+
+export default component;
diff --git a/assets/search/components/SearchResults.jsx b/assets/search/components/SearchResults.tsx
similarity index 94%
rename from assets/search/components/SearchResults.jsx
rename to assets/search/components/SearchResults.tsx
index 90fa852c9..21e69b6ac 100644
--- a/assets/search/components/SearchResults.jsx
+++ b/assets/search/components/SearchResults.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import {gettext} from 'utils';
 
-const SearchResults = ({totalItems, totalItemsLabel}) => (
+const SearchResults = ({totalItems, totalItemsLabel}: any) => (
     <div className="search-results__main-header d-flex mt-0 px-3 align-items-center">
         <div className="d-flex flex-column flex-md-row h-100">
             <div className="navbar-text search-results-info">
diff --git a/assets/search/components/SearchResultsBar/SearchResultTagList.jsx b/assets/search/components/SearchResultsBar/SearchResultTagList.jsx
index 6448e2154..ca6c91420 100644
--- a/assets/search/components/SearchResultsBar/SearchResultTagList.jsx
+++ b/assets/search/components/SearchResultsBar/SearchResultTagList.jsx
@@ -1,11 +1,15 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 
-export function SearchResultTagList({testId, title, tags, children}) {
+export function SearchResultTagList({testId, title, tags, children, secondary}) {
     return (
         <li
             data-test-id={testId}
-            className="search-result__tags-list-row"
+            className={classNames(
+                'search-result__tags-list-row',
+                {'search-result__tags-list-row--secondary': secondary}
+            )}
         >
             {!title ? null : (
                 <span className="search-result__tags-list-row-label">
@@ -23,6 +27,7 @@ export function SearchResultTagList({testId, title, tags, children}) {
 }
 
 SearchResultTagList.propTypes = {
+    secondary: PropTypes.bool,
     testId: PropTypes.string,
     title: PropTypes.string,
     tags: PropTypes.arrayOf(PropTypes.node),
diff --git a/assets/search/components/SearchResultsBar/SearchResultTagsList.jsx b/assets/search/components/SearchResultsBar/SearchResultTagsList.jsx
index 808dcd1e2..e0edd382a 100644
--- a/assets/search/components/SearchResultsBar/SearchResultTagsList.jsx
+++ b/assets/search/components/SearchResultsBar/SearchResultTagsList.jsx
@@ -31,7 +31,7 @@ export function SearchResultTagsList({
     return (
         <ul
             data-test-id="search-result-tags"
-            className="search-result__tags-list"
+            className="search-result__tags-list line-shadow-end--light"
         >
             <SearchResultsTopicRow
                 user={user}
diff --git a/assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx b/assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx
index 15878b71b..4b94db148 100644
--- a/assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx
+++ b/assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx
@@ -184,7 +184,8 @@ export function SearchResultsAdvancedSearchRow({
             />
             <SearchResultTagList
                 testId="search-results--advanced-fields"
-                title={gettext('Fields searched')}
+                secondary={true}
+                title={gettext('inside')}
             >
                 <div className="toggle-button__group toggle-button__group--spaced toggle-button__group--loose">
                     {Object.keys(fieldNameToLabel)
diff --git a/assets/search/components/SearchResultsBar/SearchResultsQueryRow.jsx b/assets/search/components/SearchResultsBar/SearchResultsQueryRow.jsx
index d3531b9ee..9979837d0 100644
--- a/assets/search/components/SearchResultsBar/SearchResultsQueryRow.jsx
+++ b/assets/search/components/SearchResultsBar/SearchResultsQueryRow.jsx
@@ -18,15 +18,17 @@ export function SearchResultsQueryRow({searchParams, setQuery}) {
             testId="search-results--query"
             title={gettext('Search For')}
             tags={[
-                <Tag
-                    key="tags-query"
-                    testId="query-value"
-                    text={searchParams.query}
-                    onClick={(event) => {
-                        event.preventDefault();
-                        setQuery('');
-                    }}
-                />
+                <div className="d-contents" key="tags-query">
+                    <Tag
+                        testId="query-value"
+                        text={searchParams.query}
+                        onClick={(event) => {
+                            event.preventDefault();
+                            setQuery('');
+                        }}
+                    />
+                    <span className="search-result__tags-list-row-helper-text">{gettext('in all fields')}</span>
+                </div>
             ]}
         />
     );
diff --git a/assets/search/components/SearchResultsBar/index.jsx b/assets/search/components/SearchResultsBar/index.tsx
similarity index 92%
rename from assets/search/components/SearchResultsBar/index.jsx
rename to assets/search/components/SearchResultsBar/index.tsx
index 6ec14c14c..5385c456d 100644
--- a/assets/search/components/SearchResultsBar/index.jsx
+++ b/assets/search/components/SearchResultsBar/index.tsx
@@ -22,8 +22,10 @@ import {SearchResultTagsList} from './SearchResultTagsList';
 import NewItemsIcon from '../NewItemsIcon';
 
 
-class SearchResultsBarComponent extends React.Component {
-    constructor(props) {
+class SearchResultsBarComponent extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {isTagSectionShown: false};
@@ -39,25 +41,25 @@ class SearchResultsBarComponent extends React.Component {
     }
 
     toggleTagSection() {
-        this.setState((prevState) => ({isTagSectionShown: !prevState.isTagSectionShown}));
+        this.setState((prevState: any) => ({isTagSectionShown: !prevState.isTagSectionShown}));
     }
 
-    toggleNavigation(navigation) {
+    toggleNavigation(navigation: any) {
         this.props.toggleNavigation(navigation);
         this.props.refresh();
     }
 
-    setQuery(query) {
+    setQuery(query: any) {
         this.props.setQuery(query);
         this.props.refresh();
     }
 
-    setAdvancedSearchKeywords(field, keywords) {
+    setAdvancedSearchKeywords(field: any, keywords: any) {
         this.props.setAdvancedSearchKeywords(field, keywords);
         this.props.refresh();
     }
 
-    toggleAdvancedSearchField(field) {
+    toggleAdvancedSearchField(field: any) {
         this.props.toggleAdvancedSearchField(field);
         this.props.refresh();
     }
@@ -67,12 +69,12 @@ class SearchResultsBarComponent extends React.Component {
         this.props.refresh();
     }
 
-    setCreatedFilter(filter) {
+    setCreatedFilter(filter: any) {
         this.props.setCreatedFilter(filter);
         this.props.refresh();
     }
 
-    toggleFilter(key, value, single) {
+    toggleFilter(key: any, value: any, single: any) {
         this.props.toggleFilter(key, value, single);
         this.props.refresh();
     }
@@ -216,7 +218,7 @@ SearchResultsBarComponent.defaultProps = {
     showSaveTopic: false,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     user: state.userObject,
     searchParams: searchParamsSelector(state),
     navigations: navigationsByIdSelector(state),
@@ -236,4 +238,4 @@ const mapDispatchToProps = {
     resetFilter,
 };
 
-export const SearchResultsBar = connect(mapStateToProps, mapDispatchToProps)(SearchResultsBarComponent);
+export const SearchResultsBar: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(SearchResultsBarComponent);
diff --git a/assets/search/components/TopicEditor.jsx b/assets/search/components/TopicEditor.tsx
similarity index 88%
rename from assets/search/components/TopicEditor.jsx
rename to assets/search/components/TopicEditor.tsx
index 6ed12a706..5c98f1166 100644
--- a/assets/search/components/TopicEditor.jsx
+++ b/assets/search/components/TopicEditor.tsx
@@ -23,8 +23,9 @@ import EditPanel from 'components/EditPanel';
 import AuditInformation from 'components/AuditInformation';
 import {ToolTip} from 'ui/components/ToolTip';
 
-class TopicEditor extends React.Component {
-    constructor(props) {
+class TopicEditor extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
@@ -61,17 +62,17 @@ class TopicEditor extends React.Component {
         }
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         if (get(prevProps, 'topic._id') !== get(this.props, 'topic._id')) {
             this.changeTopic(this.props.topic);
         }
     }
 
-    handleTabClick(event) {
-        this.setState({activeTab: event.target.name});
+    handleTabClick(tabName: string) {
+        this.setState({activeTab: tabName});
     }
 
-    changeTopic(topic) {
+    changeTopic(topic: any) {
         topic.notifications = (topic.subscribers || []).includes(this.props.userId);
 
         this.setState({
@@ -85,7 +86,7 @@ class TopicEditor extends React.Component {
         });
     }
 
-    getTabsForTopic(topic) {
+    getTabsForTopic(topic: any) {
         return (!topic._id || !topic.is_global || !this.props.isAdmin) ?
             [] :
             [
@@ -94,7 +95,7 @@ class TopicEditor extends React.Component {
             ];
     }
 
-    updateFormValidity(topic) {
+    updateFormValidity(topic: any) {
         const original = get(this.props, 'topic') || {};
         const isDirty = [
             'label',
@@ -122,8 +123,8 @@ class TopicEditor extends React.Component {
         }
     }
 
-    onChangeHandler(field) {
-        return (event) => {
+    onChangeHandler(field: any) {
+        return (event: any) => {
             const topic = cloneDeep(this.state.topic);
             const value = ['notifications', 'is_global'].includes(field) ?
                 !get(topic, field) :
@@ -146,7 +147,7 @@ class TopicEditor extends React.Component {
         if (this.state.topic.notifications) {
             unsubscribeToTopic(this.state.topic);
             topic.notifications = false;
-            topic.subscribers = (topic.subscribers || []).filter((userId) => userId !== this.props.userId);
+            topic.subscribers = (topic.subscribers || []).filter((userId: any) => userId !== this.props.userId);
         } else {
             subscribeToTopic(this.state.topic);
             topic.notifications = true;
@@ -160,7 +161,7 @@ class TopicEditor extends React.Component {
         this.props.onTopicChanged();
     }
 
-    onFolderChange(folder) {
+    onFolderChange(folder: any) {
         const topic = {...this.state.topic};
 
         topic.folder = folder ? folder._id : null;
@@ -169,7 +170,7 @@ class TopicEditor extends React.Component {
         this.updateFormValidity(topic);
     }
 
-    saveTopic(event) {
+    saveTopic(event: any) {
         const original = this.props.topic;
         const topic = cloneDeep(this.state.topic);
         const isExisting = !this.isNewTopic();
@@ -183,7 +184,7 @@ class TopicEditor extends React.Component {
                 subscribers.push(this.props.userId);
             } else if (!topic.notifications && alreadySubscribed) {
                 subscribers = subscribers.filter(
-                    (userId) => userId !== this.props.userId
+                    (userId: any) => userId !== this.props.userId
                 );
             }
 
@@ -197,7 +198,7 @@ class TopicEditor extends React.Component {
             isExisting,
             topic
         )
-            .then((savedTopic) => {
+            .then((savedTopic: any) => {
                 this.setState({saving: false});
                 this.props.onTopicChanged();
                 this.props.closeEditor();
@@ -233,11 +234,11 @@ class TopicEditor extends React.Component {
         }
     }
 
-    toggleNavigation(navigation) {
-        this.setState((prevState) => ({
+    toggleNavigation(navigation: any) {
+        this.setState((prevState: any) => ({
             topic: {
                 ...prevState.topic,
-                navigation: prevState.topic.navigation.filter((navId) => navId !== navigation._id)
+                navigation: prevState.topic.navigation.filter((navId: any) => navId !== navigation._id)
             },
         }), () => {
             this.updateFormValidity(this.state.topic);
@@ -245,7 +246,7 @@ class TopicEditor extends React.Component {
     }
 
     clearSearchQuery() {
-        this.setState((prevState) => ({
+        this.setState((prevState: any) => ({
             topic: {
                 ...prevState.topic,
                 query: '',
@@ -255,12 +256,12 @@ class TopicEditor extends React.Component {
         });
     }
 
-    toggleAdvancedSearchField(field) {
-        this.setState((prevState) => {
+    toggleAdvancedSearchField(field: any) {
+        this.setState((prevState: any) => {
             const topic = cloneDeep(prevState.topic);
 
             topic.advanced.fields = (topic.advanced.fields || []).includes(field) ?
-                topic.advanced.fields.filter((fieldName) => fieldName !== field) :
+                topic.advanced.fields.filter((fieldName: any) => fieldName !== field) :
                 [...topic.advanced.fields, field];
 
             if (!topic.advanced.fields.length) {
@@ -274,8 +275,8 @@ class TopicEditor extends React.Component {
         });
     }
 
-    setAdvancedSearchKeywords(field, keywords) {
-        this.setState((prevState) => ({
+    setAdvancedSearchKeywords(field: any, keywords: any) {
+        this.setState((prevState: any) => ({
             topic: {
                 ...prevState.topic,
                 advanced: {
@@ -289,7 +290,7 @@ class TopicEditor extends React.Component {
     }
 
     clearAdvancedSearchParams() {
-        this.setState((prevState) => ({
+        this.setState((prevState: any) => ({
             topic: {
                 ...prevState.topic,
                 advanced: {
@@ -304,13 +305,13 @@ class TopicEditor extends React.Component {
         });
     }
 
-    toggleFilter(key, value) {
-        this.setState((prevState) => ({
+    toggleFilter(key: any, value: any) {
+        this.setState((prevState: any) => ({
             topic: {
                 ...prevState.topic,
                 filter: {
                     ...prevState.topic.filter,
-                    [key]: prevState.topic.filter[key].filter((filterValue) => filterValue !== value),
+                    [key]: prevState.topic.filter[key].filter((filterValue: any) => filterValue !== value),
                 },
             },
         }), () => {
@@ -318,8 +319,8 @@ class TopicEditor extends React.Component {
         });
     }
 
-    setCreatedFilter(createdFilter) {
-        this.setState((prevState) => ({
+    setCreatedFilter(createdFilter: any) {
+        this.setState((prevState: any) => ({
             topic: {
                 ...prevState.topic,
                 created: createdFilter,
@@ -330,7 +331,7 @@ class TopicEditor extends React.Component {
     }
 
     resetFilter() {
-        this.setState((prevState) => ({
+        this.setState((prevState: any) => ({
             topic: {
                 ...prevState.topic,
                 filter: null,
@@ -341,9 +342,9 @@ class TopicEditor extends React.Component {
         });
     }
 
-    reloadFolders(global) {
-        this.props.fetchFolders(global).then((folders) => {
-            this.setState({folders: folders.filter((folder) => folder.section === this.props.section)});
+    reloadFolders(global: any) {
+        this.props.fetchFolders(global).then((folders: any) => {
+            this.setState({folders: folders.filter((folder: any) => folder.section === this.props.section)});
         });
     }
 
@@ -394,18 +395,19 @@ class TopicEditor extends React.Component {
                 )}
                 {!showTabs ? null : (
                     <ul className='nav nav-tabs'>
-                        {this.state.tabs.map((tab) => (
+                        {this.state.tabs.map((tab: any) => (
                             <li
                                 key={tab.name}
                                 className='nav-item'
                             >
                                 <ToolTip placement="bottom">
                                     <a
-                                        name={tab.name}
                                         className={`nav-link ${this.state.activeTab === tab.name && 'active'}`}
                                         href='#'
                                         title={tab.tooltip}
-                                        onClick={this.handleTabClick}>{tab.label}
+                                        onClick={() => this.handleTabClick(tab.name)}
+                                    >
+                                        {tab.label}
                                     </a>
                                 </ToolTip>
                             </li>
@@ -445,7 +447,7 @@ class TopicEditor extends React.Component {
                     {this.state.activeTab === 'subscribers' && updatedTopic && (
                         <EditPanel
                             parent={updatedTopic}
-                            items={this.props.companyUsers.map((user) => ({
+                            items={this.props.companyUsers.map((user: any) => ({
                                 ...user,
                                 name: `${user.first_name} ${user.last_name}`,
                             }))}
@@ -511,7 +513,7 @@ TopicEditor.propTypes = {
     availableFields: PropTypes.arrayOf(PropTypes.string).isRequired,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     userId: get(state, 'editedUser._id'),
     isLoading: state.isLoading,
     navigations: state.navigations || [],
@@ -524,17 +526,19 @@ const mapStateToProps = (state) => ({
     section: sectionSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch: any) => ({
     fetchNavigations: () => dispatch(fetchNavigations()),
     hideModal: () => dispatch(hideModal()),
-    saveTopic: (isExisting, topic) => isExisting ?
+    saveTopic: (isExisting: any, topic: any) => isExisting ?
         dispatch(submitProfileFollowTopic(topic)) :
         dispatch(submitWireFollowTopic(topic)),
-    loadMyTopic: (topic) => topic.topic_type === 'agenda' ?
+    loadMyTopic: (topic: any) => topic.topic_type === 'agenda' ?
         dispatch(loadMyAgendaTopic(topic._id)) :
         dispatch(loadMyWireTopic(topic._id)),
-    setTopicEditorFullscreen: (fullscreen) => dispatch(setTopicEditorFullscreen(fullscreen)),
-    fetchFolders: (global) => dispatch(fetchFolders(global, true)),
+    setTopicEditorFullscreen: (fullscreen: any) => dispatch(setTopicEditorFullscreen(fullscreen)),
+    fetchFolders: (global: boolean) => dispatch(fetchFolders(global, true)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(TopicEditor);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(TopicEditor);
+
+export default component;
diff --git a/assets/search/components/TopicForm.jsx b/assets/search/components/TopicForm.tsx
similarity index 97%
rename from assets/search/components/TopicForm.jsx
rename to assets/search/components/TopicForm.tsx
index 63c4c6de7..a32011634 100644
--- a/assets/search/components/TopicForm.jsx
+++ b/assets/search/components/TopicForm.tsx
@@ -15,8 +15,8 @@ import {SearchResultTagsList} from './SearchResultsBar/SearchResultTagsList';
 
 const TOPIC_NAME_MAXLENGTH = 30;
 
-const getFolderName = (topic, folders) => {
-    const folder = topic.folder ? folders.find((folder) => folder._id === topic.folder) : null;
+const getFolderName = (topic: any, folders: any) => {
+    const folder = topic.folder ? folders.find((folder: any) => folder._id === topic.folder) : null;
 
     return folder ? folder.name : gettext('Add to folder');
 };
@@ -43,7 +43,7 @@ const TopicForm = ({
     setCreatedFilter,
     resetFilter,
     availableFields,
-}) => (
+}: any) => (
     <form onSubmit={save}>
         <div className="nh-flex-container list-item__preview-form pt-0">
             <div className="nh-flex__row">
@@ -124,7 +124,7 @@ const TopicForm = ({
                                     onClick={() => onFolderChange(null)}
                                 >{gettext('Remove from folder')}</button>
                             )}
-                            {folders.map((folder) => (
+                            {folders.map((folder: any) => (
                                 <button
                                     key={folder._id}
                                     type="button"
diff --git a/assets/search/components/TopicItem.jsx b/assets/search/components/TopicItem.tsx
similarity index 91%
rename from assets/search/components/TopicItem.jsx
rename to assets/search/components/TopicItem.tsx
index 8f1947bcb..113ea5eb9 100644
--- a/assets/search/components/TopicItem.jsx
+++ b/assets/search/components/TopicItem.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 
-export function TopicItem({topic, isActive, onClick, newItems}) {
+export function TopicItem({topic, isActive, onClick, newItems}: any) {
     return (
         <li className="topic-list__item">
             <a className={`topic-list__item-link ${isActive ? 'topic-list__item-link--active' : ''}`}
diff --git a/assets/search/components/TopicList.jsx b/assets/search/components/TopicList.tsx
similarity index 75%
rename from assets/search/components/TopicList.jsx
rename to assets/search/components/TopicList.tsx
index 2e3dbc299..1e401447b 100644
--- a/assets/search/components/TopicList.jsx
+++ b/assets/search/components/TopicList.tsx
@@ -6,18 +6,29 @@ import {get} from 'lodash';
 import {Topic} from './Topic';
 import {TopicFolder} from './TopicFolder';
 
-const TopicList = ({topics, selectedTopicId, actions, users, folders, folderPopover, toggleFolderPopover, moveTopic, saveFolder, deleteFolder}) => {
+const TopicList = ({
+    topics,
+    selectedTopicId,
+    actions,
+    users,
+    folders,
+    folderPopover,
+    toggleFolderPopover,
+    moveTopic,
+    saveFolder,
+    deleteFolder,
+}: any): any => {
 
     if (get(topics, 'length', 0) < 0 && get(folders, 'length', 0) < 0) {
         return null;
     }
 
-    const renderTopic = (topic) => (
+    const renderTopic = (topic: any) => (
         <Topic key={topic._id} topic={topic} actions={actions} users={users} selected={selectedTopicId === topic._id} />
     );
 
-    const renderedFolders = folders.map((folder) => {
-        const filteredTopics = topics.filter((topic) => topic.folder === folder._id);
+    const renderedFolders = folders.map((folder: any) => {
+        const filteredTopics = topics.filter((topic: any) => topic.folder === folder._id);
         return (
             <TopicFolder key={folder._id}
                 folder={folder}
@@ -33,7 +44,7 @@ const TopicList = ({topics, selectedTopicId, actions, users, folders, folderPopo
         );
     });
 
-    const renderedTopics = topics.filter((topic) => topic.folder == null).map(renderTopic);
+    const renderedTopics = topics.filter((topic: any) => topic.folder == null).map(renderTopic);
 
     return Array.prototype.concat(renderedFolders, renderedTopics);
 };
diff --git a/assets/search/components/TopicsTab.jsx b/assets/search/components/TopicsTab.tsx
similarity index 76%
rename from assets/search/components/TopicsTab.jsx
rename to assets/search/components/TopicsTab.tsx
index 9d3a550e2..03356b121 100644
--- a/assets/search/components/TopicsTab.jsx
+++ b/assets/search/components/TopicsTab.tsx
@@ -13,29 +13,29 @@ import {SidebarFolder} from '../../components/SidebarFolder';
 
 const manageTopics = () => document.dispatchEvent(new Event('manage_topics'));
 
-function TopicsTab({topics, loadMyTopic, newItemsByTopic, activeTopic, removeNewItems, userFolders, companyFolders}) {
-    const clickTopic = (event, topic) => {
+function TopicsTab({topics, loadMyTopic, newItemsByTopic, activeTopic, removeNewItems, userFolders, companyFolders}: any) {
+    const clickTopic = (event: any, topic: any) => {
         event.preventDefault();
         removeNewItems(topic._id);
         loadMyTopic(topic);
     };
 
-    const clickManage = (event) => {
+    const clickManage = (event: any) => {
         event.preventDefault();
         manageTopics();
     };
 
     const activeTopicId = activeTopic ? activeTopic._id : null;
     const personalTopics = (topics || []).filter(
-        (topic) => !topic.is_global
+        (topic: any) => !topic.is_global
     );
     const globalTopics = (topics || []).filter(
-        (topic) => topic.is_global
+        (topic: any) => topic.is_global
     );
 
-    const tabName = gettext('{{ section }} Topics', {section: isWireContext() ? sectionNames.wire : sectionNames.agenda});
+    const tabName = gettext('{{ section }} Topics', {section: isWireContext() ? window.sectionNames.wire : window.sectionNames.agenda});
 
-    const renderTopic = (topic) => (
+    const renderTopic = (topic: any) => (
         <TopicItem key={topic._id}
             topic={topic}
             isActive={topic._id === activeTopicId}
@@ -44,7 +44,7 @@ function TopicsTab({topics, loadMyTopic, newItemsByTopic, activeTopic, removeNew
         />
     );
 
-    const renderTopicsSection = (folders, topics) => {
+    const renderTopicsSection = (folders: any, topics: any) => {
         if (topics.length === 0) {
             return (
                 <div className='wire-column__info mb-4'>
@@ -62,8 +62,8 @@ function TopicsTab({topics, loadMyTopic, newItemsByTopic, activeTopic, removeNew
 
     };
 
-    const renderFolders = (folders, topics) => folders.map((folder) => {
-        const folderTopics = topics.filter((topic) => topic.folder === folder._id);
+    const renderFolders = (folders: any, topics: any) => folders.map((folder: any) => {
+        const folderTopics = topics.filter((topic: any) => topic.folder === folder._id);
 
         if (folderTopics.length === 0) {
             return null;
@@ -76,8 +76,8 @@ function TopicsTab({topics, loadMyTopic, newItemsByTopic, activeTopic, removeNew
         );
     });
 
-    const renderFreeTopics = (topics) => {
-        const filtered = topics.filter((topic) => !topic.folder);
+    const renderFreeTopics = (topics: any) => {
+        const filtered = topics.filter((topic: any) => !topic.folder);
 
         if (filtered.length === 0) {
             return null;
@@ -124,18 +124,20 @@ TopicsTab.propTypes = {
     loadMyTopic: PropTypes.func.isRequired,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     topics: state.topics || [],
     userFolders: state.userFolders || [],
     companyFolders: state.companyFolders || [],
     newItemsByTopic: state.newItemsByTopic,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    removeNewItems: (topicId) => dispatch(removeNewItems(topicId)),
-    loadMyTopic: (topic) => topic.topic_type === 'agenda' ?
+const mapDispatchToProps = (dispatch: any) => ({
+    removeNewItems: (topicId: any) => dispatch(removeNewItems(topicId)),
+    loadMyTopic: (topic: any) => topic.topic_type === 'agenda' ?
         dispatch(loadMyAgendaTopic(topic._id)) :
         dispatch(loadMyWireTopic(topic._id)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(TopicsTab);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(TopicsTab);
+
+export default component;
diff --git a/assets/search/reducers.js b/assets/search/reducers.ts
similarity index 87%
rename from assets/search/reducers.js
rename to assets/search/reducers.ts
index 0afe55944..5a2ed7252 100644
--- a/assets/search/reducers.js
+++ b/assets/search/reducers.ts
@@ -26,7 +26,25 @@ import {
 
 import {EXTENDED_VIEW} from 'wire/defaults';
 
-const INITIAL_STATE = {
+interface IInitialState {
+    activeTopic: any;
+    activeNavigation: any;
+    activeQuery: any;
+    activeFilter: any;
+    createdFilter: any;
+    productId: any;
+    navigations: any;
+    products: any;
+    activeView: typeof EXTENDED_VIEW;
+    advanced: {
+        all: any;
+        any: any;
+        exclude: any;
+        fields: any;
+    };
+}
+
+const INITIAL_STATE: IInitialState = {
     activeTopic: null,
     activeNavigation: [],
     activeQuery: '',
@@ -47,7 +65,7 @@ const INITIAL_STATE = {
     },
 };
 
-export function searchReducer(state=INITIAL_STATE, action, context) {
+export function searchReducer(state=INITIAL_STATE, action?: any, context?: any) : IInitialState {
     if (!action) {
         state.advanced.fields = getAdvancedSearchFields(context);
 
@@ -77,13 +95,13 @@ export function searchReducer(state=INITIAL_STATE, action, context) {
     }
 
     case TOGGLE_FILTER: {
-        const activeFilter = Object.assign({}, state.activeFilter);
+        const activeFilter: any = Object.assign({}, state.activeFilter);
         activeFilter[action.key] = toggleValue(activeFilter[action.key], action.val);
         if (!action.val || !activeFilter[action.key] || activeFilter[action.key].length === 0) {
             delete activeFilter[action.key];
         }
         else if (action.single) {
-            activeFilter[action.key] = activeFilter[action.key].filter((val) => val === action.val);
+            activeFilter[action.key] = activeFilter[action.key].filter((val: any) => val === action.val);
         }
         return {
             ...state,
@@ -171,7 +189,7 @@ export function searchReducer(state=INITIAL_STATE, action, context) {
             advanced: {
                 ...state.advanced,
                 fields: state.advanced.fields.includes(action.payload) ?
-                    state.advanced.fields.filter((field) => field !== action.payload) :
+                    state.advanced.fields.filter((field: any) => field !== action.payload) :
                     [...state.advanced.fields, action.payload],
             },
         };
diff --git a/assets/search/selectors.js b/assets/search/selectors.ts
similarity index 66%
rename from assets/search/selectors.js
rename to assets/search/selectors.ts
index 336c71a10..d72353723 100644
--- a/assets/search/selectors.js
+++ b/assets/search/selectors.ts
@@ -1,12 +1,12 @@
 import {createSelector} from 'reselect';
 import {get, find, filter as removeNulls, isEqual, isEmpty} from 'lodash';
 
-export const searchQuerySelector = (state) => get(state, 'search.activeQuery') || null;
-export const searchFilterSelector = (state) => get(state, 'search.activeFilter');
-export const searchCreatedSelector = (state) => get(state, 'search.createdFilter');
-export const searchNavigationSelector = (state) => get(state, 'search.activeNavigation') || [];
-export const searchTopicIdSelector = (state) => get(state, 'search.activeTopic') || null;
-export const searchProductSelector = (state) => get(state, 'search.productId') || null;
+export const searchQuerySelector = (state: any) => get(state, 'search.activeQuery') || null;
+export const searchFilterSelector = (state: any) => get(state, 'search.activeFilter');
+export const searchCreatedSelector = (state: any) => get(state, 'search.createdFilter');
+export const searchNavigationSelector = (state: any) => get(state, 'search.activeNavigation') || [];
+export const searchTopicIdSelector = (state: any) => get(state, 'search.activeTopic') || null;
+export const searchProductSelector = (state: any) => get(state, 'search.productId') || null;
 
 const DEFAULT_ADVANCED_SEARCH_PARAMS = {
     all: '',
@@ -14,27 +14,27 @@ const DEFAULT_ADVANCED_SEARCH_PARAMS = {
     exclude: '',
     fields: [],
 };
-export const advancedSearchParamsSelector = (state) => get(state, 'search.advanced') || DEFAULT_ADVANCED_SEARCH_PARAMS;
+export const advancedSearchParamsSelector = (state: any) => get(state, 'search.advanced') || DEFAULT_ADVANCED_SEARCH_PARAMS;
 
-export const activeViewSelector = (state) => get(state, 'search.activeView');
-export const navigationsSelector = (state) => get(state, 'search.navigations') || get(state, 'navigations') || [];
+export const activeViewSelector = (state: any) => get(state, 'search.activeView');
+export const navigationsSelector = (state: any) => get(state, 'search.navigations') || get(state, 'navigations') || [];
 
 export const navigationsByIdSelector = createSelector(
     [navigationsSelector],
-    (navigations) => navigations.reduce((navs, nav) => {
+    (navigations) => navigations.reduce((navs: any, nav: any) => {
         navs[nav._id] = nav;
 
         return navs;
     }, {})
 );
 
-export const topicsSelector = (state) => get(state, 'topics') || [];
-export const productsSelector = (state) => get(state, 'search.products') || [];
+export const topicsSelector = (state: any) => get(state, 'topics') || [];
+export const productsSelector = (state: any) => get(state, 'search.products') || [];
 
-export const filterGroups = (state) => get(state, 'groups') || [];
+export const filterGroups = (state: any) => get(state, 'groups') || [];
 export const filterGroupsByIdSelector = createSelector(
     [filterGroups],
-    (listOfGroups) => listOfGroups.reduce((groups, group) => {
+    (listOfGroups) => listOfGroups.reduce((groups: any, group: any) => {
         groups[group.field] = group;
 
         return groups;
@@ -43,20 +43,20 @@ export const filterGroupsByIdSelector = createSelector(
 
 export const activeTopicSelector = createSelector(
     [searchTopicIdSelector, topicsSelector],
-    (topicId, topics) => find(topics, {'_id': topicId})
+    (topicId: any, topics: any) => find(topics, {'_id': topicId})
 );
 
 export const activeProductSelector = createSelector(
     [searchProductSelector, productsSelector],
-    (productId, products) => find(products, {'_id': productId})
+    (productId: any, products: any) => find(products, {'_id': productId})
 );
 
-export const resultsFilteredSelector = (state) => state.resultsFiltered;
+export const resultsFilteredSelector = (state: any) => state.resultsFiltered;
 
 export const searchParamsSelector = createSelector(
     [searchQuerySelector, searchCreatedSelector, searchNavigationSelector, searchFilterSelector, searchProductSelector, advancedSearchParamsSelector],
-    (query, created, navigation, filter, product, advancedSearchParams) => {
-        const params = {};
+    (query: any, created: any, navigation: any, filter: any, product: any, advancedSearchParams: any) => {
+        const params: any = {};
 
         if (!isEmpty(query)) {
             params.query = query;
@@ -90,7 +90,7 @@ export const searchParamsSelector = createSelector(
 
         if (filter && Object.keys(filter).length > 0) {
             params.filter = {};
-            Object.keys(filter).forEach((key) => {
+            Object.keys(filter).forEach((key: any) => {
                 if (key === 'location') {
                     params.filter[key] = filter[key];
                     return;
@@ -114,8 +114,8 @@ export const searchParamsSelector = createSelector(
 
 export const showSaveTopicSelector = createSelector(
     [searchParamsSelector, activeTopicSelector],
-    (current, topic) => {
-        const areTopicFieldsSame = (field1, filed2) => {
+    (current: any, topic: any) => {
+        const areTopicFieldsSame = (field1: any, filed2: any) => {
             if (field1 && filed2) {
                 return isEqual(field1, filed2);
             }
@@ -156,18 +156,18 @@ export const showSaveTopicSelector = createSelector(
 
 export const isSearchFiltered = createSelector(
     [searchParamsSelector],
-    (params) => {
+    (params: any) => {
         return get(params, 'query', '').length > 0 ||
-            Object.keys(get(params, 'created', {})).filter((key) => get(params.created, key)).length > 0 ||
-            Object.keys(get(params, 'filter', {})).filter((key) => get(params.filter, key)).length > 0;
+            Object.keys(get(params, 'created', {})).filter((key: any) => get(params.created, key)).length > 0 ||
+            Object.keys(get(params, 'filter', {})).filter((key: any) => get(params.filter, key)).length > 0;
     }
 );
 
 export const filterGroupsToLabelMap = createSelector(
     [filterGroups],
-    (groups) => (
+    (groups: any) => (
         groups.reduce(
-            (groupMap, group) => {
+            (groupMap: any, group: any) => {
                 groupMap[group.field] = group.label;
 
                 return groupMap;
diff --git a/assets/search/tests/actions.spec.js b/assets/search/tests/actions.spec.ts
similarity index 98%
rename from assets/search/tests/actions.spec.js
rename to assets/search/tests/actions.spec.ts
index ae420fe76..847400975 100644
--- a/assets/search/tests/actions.spec.js
+++ b/assets/search/tests/actions.spec.ts
@@ -7,10 +7,10 @@ import * as actions from '../actions';
 import * as selectors from '../selectors';
 
 describe('search actions', () => {
-    let store;
-    let params;
+    let store: any;
+    let params: any;
 
-    const updateParams = (search) => {
+    const updateParams = (search?: any) => {
         params = {
             state: store.getState(),
             url: new URLSearchParams(search != null ? search : window.location.search),
@@ -18,7 +18,7 @@ describe('search actions', () => {
     };
 
     beforeEach(() => {
-        history.pushState({}, null, ''); // reset window.location.search
+        (history as any).pushState({}, null, ''); // reset window.location.search
         store = createStore(wireReducer, applyMiddleware(thunk));
         updateParams('');
     });
diff --git a/assets/search/utils.js b/assets/search/utils.ts
similarity index 73%
rename from assets/search/utils.js
rename to assets/search/utils.ts
index 208b90adb..2bc129107 100644
--- a/assets/search/utils.js
+++ b/assets/search/utils.ts
@@ -1,11 +1,11 @@
 import {get} from 'lodash';
 import {getConfig} from 'utils';
 
-export const noNavigationSelected = (activeNavigation) => (
+export const noNavigationSelected = (activeNavigation: any) => (
     get(activeNavigation, 'length', 0) < 1
 );
 
-export const getNavigationUrlParam = (activeNavigation, ignoreEmpty = true, useJSON = true) => {
+export const getNavigationUrlParam = (activeNavigation: any, ignoreEmpty: any = true, useJSON: any = true) => {
     if (!ignoreEmpty && noNavigationSelected(activeNavigation)) {
         return null;
     }
@@ -15,11 +15,11 @@ export const getNavigationUrlParam = (activeNavigation, ignoreEmpty = true, useJ
         (activeNavigation || []).join(',');
 };
 
-export const getSearchParams = (custom, topic) => {
-    const params = {};
+export const getSearchParams = (custom: any, topic: any) => {
+    const params: any = {};
 
     ['query', 'created', 'navigation', 'filter', 'product', 'advanced'].forEach(
-        (field) => {
+        (field: any) => {
             if (get(custom, field)) {
                 params[field] = custom[field];
             } else if (get(topic, field)) {
@@ -31,7 +31,7 @@ export const getSearchParams = (custom, topic) => {
     return params;
 };
 
-export const getSingleFilterValue = (activeFilter, fields) => {
+export const getSingleFilterValue = (activeFilter: any, fields: any) => {
     const filterKeys = Object.keys(activeFilter || {});
 
     if (filterKeys.length !== 1 || !fields.includes(filterKeys[0])) {
@@ -43,7 +43,7 @@ export const getSingleFilterValue = (activeFilter, fields) => {
     return null;
 };
 
-export function getAdvancedSearchFields(context) {
+export function getAdvancedSearchFields(context: any) {
     const config = getConfig('advanced_search', {
         fields: {
             wire: ['headline', 'slugline', 'body_html'],
diff --git a/assets/section-filters/actions.js b/assets/section-filters/actions.ts
similarity index 74%
rename from assets/section-filters/actions.js
rename to assets/section-filters/actions.ts
index 8b478cce2..48ab3b7c3 100644
--- a/assets/section-filters/actions.js
+++ b/assets/section-filters/actions.ts
@@ -5,12 +5,12 @@ import {searchQuerySelector} from 'search/selectors';
 
 
 export const SELECT_SECTION_FILTER = 'SELECT_SECTION_FILTER';
-export function selectSectionFilter(id) {
+export function selectSectionFilter(id: any) {
     return {type: SELECT_SECTION_FILTER, id};
 }
 
 export const EDIT_SECTION_FILTER = 'EDIT_SECTION_FILTER';
-export function editSectionFilter(event) {
+export function editSectionFilter(event: any) {
     return {type: EDIT_SECTION_FILTER, event};
 }
 
@@ -20,7 +20,7 @@ export function newSectionFilter() {
 }
 
 export const CANCEL_EDIT = 'CANCEL_EDIT';
-export function cancelEdit(event) {
+export function cancelEdit(event: any) {
     return {type: CANCEL_EDIT, event};
 }
 
@@ -30,12 +30,12 @@ export function querySectionFilters() {
 }
 
 export const GET_SECTION_FILTERS = 'GET_SECTION_FILTERS';
-export function getSectionFilters(data) {
+export function getSectionFilters(data: any) {
     return {type: GET_SECTION_FILTERS, data};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
@@ -45,13 +45,13 @@ export function setError(errors) {
  *
  */
 export function fetchSectionFilters() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(querySectionFilters());
         const query = searchQuerySelector(getState()) || '';
 
         return server.get(`/section_filters/search?q=${query}`)
-            .then((data) => dispatch(getSectionFilters(data)))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .then((data: any) => dispatch(getSectionFilters(data)))
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -61,7 +61,7 @@ export function fetchSectionFilters() {
  *
  */
 export function postSectionFilter() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const sectionFilter = getState().sectionFilterToEdit;
         const url = `/section_filters/${sectionFilter._id ? sectionFilter._id : 'new'}`;
@@ -75,7 +75,7 @@ export function postSectionFilter() {
                 }
                 dispatch(fetchSectionFilters());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
@@ -86,25 +86,25 @@ export function postSectionFilter() {
  *
  */
 export function deleteSectionFilter() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const sectionFilter = getState().sectionFilterToEdit;
         const url = `/section_filters/${sectionFilter._id}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Section Filter deleted successfully'));
                 dispatch(fetchSectionFilters());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 
 
 
-export function initViewData(data) {
-    return function (dispatch) {
+export function initViewData(data: any): any {
+    return function (dispatch: any) {
         dispatch(getSectionFilters(data.section_filters));
         dispatch(initSections(data.sections));
     };
diff --git a/assets/section-filters/components/EditSectionFilter.jsx b/assets/section-filters/components/EditSectionFilter.tsx
similarity index 97%
rename from assets/section-filters/components/EditSectionFilter.jsx
rename to assets/section-filters/components/EditSectionFilter.tsx
index d87e7fbbd..dbfb0f0ee 100644
--- a/assets/section-filters/components/EditSectionFilter.jsx
+++ b/assets/section-filters/components/EditSectionFilter.tsx
@@ -8,8 +8,9 @@ import AuditInformation from 'components/AuditInformation';
 import {gettext} from 'utils';
 import {sectionsPropType} from '../../features/sections/types';
 
-class EditSectionFilter extends React.Component {
-    constructor(props) {
+class EditSectionFilter extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
     }
 
diff --git a/assets/section-filters/components/SectionFilterList.jsx b/assets/section-filters/components/SectionFilterList.tsx
similarity index 94%
rename from assets/section-filters/components/SectionFilterList.jsx
rename to assets/section-filters/components/SectionFilterList.tsx
index c29260e43..9e9551b1b 100644
--- a/assets/section-filters/components/SectionFilterList.jsx
+++ b/assets/section-filters/components/SectionFilterList.tsx
@@ -4,8 +4,8 @@ import SectionFilterListItem from './SectionFilterListItem';
 import {gettext} from 'utils';
 
 
-function SectionFilterList({sectionFilters, onClick, activeSectionFilterId}) {
-    const list = sectionFilters.map((sectionFilter) =>
+function SectionFilterList({sectionFilters, onClick, activeSectionFilterId}: any) {
+    const list = sectionFilters.map((sectionFilter: any) =>
         <SectionFilterListItem
             key={sectionFilter._id}
             sectionFilter={sectionFilter}
diff --git a/assets/section-filters/components/SectionFilterListItem.jsx b/assets/section-filters/components/SectionFilterListItem.tsx
similarity index 91%
rename from assets/section-filters/components/SectionFilterListItem.jsx
rename to assets/section-filters/components/SectionFilterListItem.tsx
index 4efde0c77..8d1dce3d7 100644
--- a/assets/section-filters/components/SectionFilterListItem.jsx
+++ b/assets/section-filters/components/SectionFilterListItem.tsx
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import {gettext, shortDate} from 'utils';
 
 
-function SectionFilterListItem({sectionFilter, isActive, onClick}) {
+function SectionFilterListItem({sectionFilter, isActive, onClick}: any) {
     return (
         <tr key={sectionFilter._id}
-            className={isActive?'table--selected':null}
+            className={isActive ? 'table--selected' : undefined}
             onClick={() => onClick(sectionFilter._id)}>
             <td className="name">{sectionFilter.name}</td>
             <td>{(sectionFilter.is_enabled ? gettext('Enabled') : gettext('Disabled'))}</td>
diff --git a/assets/section-filters/components/SectionFilters.jsx b/assets/section-filters/components/SectionFilters.tsx
similarity index 78%
rename from assets/section-filters/components/SectionFilters.jsx
rename to assets/section-filters/components/SectionFilters.tsx
index c98b7a3c3..99b5224a6 100644
--- a/assets/section-filters/components/SectionFilters.jsx
+++ b/assets/section-filters/components/SectionFilters.tsx
@@ -23,8 +23,9 @@ import EditSectionFilter from './EditSectionFilter';
 import SectionFilterList from './SectionFilterList';
 import SearchResults from 'search/components/SearchResults';
 
-class SectionFilters extends React.Component {
-    constructor(props, context) {
+class SectionFilters extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.isFormValid = this.isFormValid.bind(this);
@@ -34,7 +35,7 @@ class SectionFilters extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.sectionFilterToEdit.name) {
             errors.name = [gettext('Please provide Section Filter name')];
@@ -45,7 +46,7 @@ class SectionFilters extends React.Component {
         return valid;
     }
 
-    save(event) {
+    save(event: any) {
         event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -55,7 +56,7 @@ class SectionFilters extends React.Component {
         this.props.saveSectionFilter();
     }
 
-    deleteSectionFilter(event) {
+    deleteSectionFilter(event: any) {
         event.preventDefault();
 
         if (confirm(gettext('Would you like to delete Section Filter: {{name}}', {name: this.props.sectionFilterToEdit.name}))) {
@@ -64,9 +65,9 @@ class SectionFilters extends React.Component {
     }
 
     render() {
-        const progressStyle = {width: '25%'};
-        const sectionFilter = (sectionFilter) => !this.props.activeSection || get(sectionFilter, 'filter_type', 'wire') === this.props.activeSection;
-        const getActiveSection = () => this.props.sections.filter(s => s._id === this.props.activeSection);
+        const progressStyle: any = {width: '25%'};
+        const sectionFilter = (sectionFilter: any) => !this.props.activeSection || get(sectionFilter, 'filter_type', 'wire') === this.props.activeSection;
+        const getActiveSection = () => this.props.sections.filter((s: any) => s._id === this.props.activeSection);
 
         return (
             <div className="flex-row">
@@ -125,8 +126,8 @@ SectionFilters.propTypes = {
     sections: sectionsPropType,
 };
 
-const mapStateToProps = (state) => ({
-    sectionFilters: state.sectionFilters.map((id) => state.sectionFiltersById[id]),
+const mapStateToProps = (state: any) => ({
+    sectionFilters: state.sectionFilters.map((id: any) => state.sectionFiltersById[id]),
     sectionFilterToEdit: state.sectionFilterToEdit,
     activeSectionFilterId: state.activeSectionFilterId,
     isLoading: state.isLoading,
@@ -136,14 +137,16 @@ const mapStateToProps = (state) => ({
     sections: sectionsSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectSectionFilter: (_id) => dispatch(selectSectionFilter(_id)),
-    editSectionFilter: (event) => dispatch(editSectionFilter(event)),
-    saveSectionFilter: (type) => dispatch(postSectionFilter(type)),
-    deleteSectionFilter: (type) => dispatch(deleteSectionFilter(type)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectSectionFilter: (_id: any) => dispatch(selectSectionFilter(_id)),
+    editSectionFilter: (event: any) => dispatch(editSectionFilter(event)),
+    saveSectionFilter: (type: any) => dispatch(postSectionFilter()),
+    deleteSectionFilter: (type: any) => dispatch(deleteSectionFilter()),
     newSectionFilter: () => dispatch(newSectionFilter()),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
+    cancelEdit: (event: any) => dispatch(cancelEdit(event)),
     dispatch: dispatch,
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(SectionFilters);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(SectionFilters);
+
+export default component;
diff --git a/assets/section-filters/components/SectionFiltersApp.jsx b/assets/section-filters/components/SectionFiltersApp.tsx
similarity index 83%
rename from assets/section-filters/components/SectionFiltersApp.jsx
rename to assets/section-filters/components/SectionFiltersApp.tsx
index 2a6e289d5..ee019cf3d 100644
--- a/assets/section-filters/components/SectionFiltersApp.jsx
+++ b/assets/section-filters/components/SectionFiltersApp.tsx
@@ -17,8 +17,9 @@ import {sectionsSelector, activeSectionSelector} from 'features/sections/selecto
 import SectionFilters from './SectionFilters';
 import ListBar from 'components/ListBar';
 
-class SectionFiltersApp extends React.Component {
-    constructor(props, context) {
+class SectionFiltersApp extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
     }
 
@@ -53,15 +54,17 @@ SectionFiltersApp.propTypes = {
     fetchSectionFilters: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     sections: sectionsSelector(state),
     activeSection: activeSectionSelector(state),
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     fetchSectionFilters,
     setQuery: setSearchQuery,
     newSectionFilter,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(SectionFiltersApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(SectionFiltersApp);
+
+export default component;
diff --git a/assets/section-filters/index.js b/assets/section-filters/index.ts
similarity index 100%
rename from assets/section-filters/index.js
rename to assets/section-filters/index.ts
diff --git a/assets/section-filters/reducers.js b/assets/section-filters/reducers.ts
similarity index 89%
rename from assets/section-filters/reducers.js
rename to assets/section-filters/reducers.ts
index 3f7503a68..74f512736 100644
--- a/assets/section-filters/reducers.js
+++ b/assets/section-filters/reducers.ts
@@ -13,7 +13,7 @@ import {INIT_SECTIONS, SELECT_SECTION} from 'features/sections/actions';
 import {sectionsReducer} from 'features/sections/reducers';
 import {searchReducer} from 'search/reducers';
 
-const initialState = {
+const initialState: any = {
     query: null,
     sectionFilters: [],
     sectionFiltersById: {},
@@ -25,11 +25,11 @@ const initialState = {
     search: searchReducer,
 };
 
-export default function sectionFiltersReducer(state = initialState, action) {
+export default function sectionFiltersReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case SELECT_SECTION_FILTER: {
-        const defaultSectionFilter = {
+        const defaultSectionFilter: any = {
             is_enabled: true,
             name: '',
             description: '',
@@ -46,13 +46,13 @@ export default function sectionFiltersReducer(state = initialState, action) {
     case EDIT_SECTION_FILTER: {
         const target = action.event.target;
         const field = target.name;
-        let sectionFilter = state.sectionFilterToEdit;
+        const sectionFilter = state.sectionFilterToEdit;
         sectionFilter[field] = target.type === 'checkbox' ? target.checked : target.value;
         return {...state, sectionFilterToEdit: sectionFilter, errors: null};
     }
 
     case NEW_SECTION_FILTER: {
-        const sectionFilterToEdit = {
+        const sectionFilterToEdit: any = {
             is_enabled: true,
             name: '',
             description: '',
@@ -78,7 +78,7 @@ export default function sectionFiltersReducer(state = initialState, action) {
 
     case GET_SECTION_FILTERS: {
         const sectionFiltersById = Object.assign({}, state.sectionFiltersById);
-        const sectionFilters = action.data.map((sectionFilter) => {
+        const sectionFilters = action.data.map((sectionFilter: any) => {
             sectionFiltersById[sectionFilter._id] = sectionFilter;
             return sectionFilter._id;
         });
diff --git a/assets/selectors.js b/assets/selectors.js
deleted file mode 100644
index d53dd348d..000000000
--- a/assets/selectors.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import {get} from 'lodash';
-import {createSelector} from 'reselect';
-import {getPicture} from './wire/utils';
-
-export const formats = (state) => get(state, 'formats') || [];
-export const secondaryFormats = (state) => get(state, 'secondaryFormats') || [];
-export const context = (state) => get(state, 'context') || null;
-export const allItemsById = (state) => get(state, 'itemsById') || null;
-export const itemToOpen = (state) => get(state, 'itemToOpen') || null;
-export const userSectionsSelector = (state) => get(state, 'userSections');
-export const modalItems = (state) => get(state, 'modal.data.items') || [];
-
-export const getFormats = createSelector([formats],(f) => (f.map((format) =>
-    ({value: format.format, text: format.name}))));
-
-export const getContextName = createSelector(
-    [context, userSectionsSelector],
-    (currentSection, sections) => get(sections, `${currentSection}.name`)
-);
-
-export const modalOptions = createSelector(
-    [modalItems, formats, context, allItemsById, itemToOpen],
-    (items, fmts, cntxt, itemsById, openItem) => {
-        let options = fmts;
-        if (items && items.length) {
-            const itemType = cntxt === 'agenda' ? 'agenda' : 'wire';
-            const hasPicture = items.every((itemId) => getPicture(itemsById && itemsById[itemId] || openItem));
-            options = options.filter((opt) => get(opt, 'types', ['wire', 'agenda']).includes(itemType));
-            if (!hasPicture) {
-                options = options.filter((opt) => get(opt, 'assets', ['text']).includes('text'));
-            }
-        }
-
-        return options.map((format) => ({value: format.format, text: format.name}));
-    }
-);
-
-export const modalSecondaryFormatOptions = createSelector(
-    [secondaryFormats], (fmts) => ( fmts.map((format) => ({value: format.format, text: format.name})) )
-);
diff --git a/assets/selectors.ts b/assets/selectors.ts
new file mode 100644
index 000000000..658adca35
--- /dev/null
+++ b/assets/selectors.ts
@@ -0,0 +1,40 @@
+import {get} from 'lodash';
+import {createSelector} from 'reselect';
+import {getPicture} from './wire/utils';
+
+export const formats = (state: any) => get(state, 'formats') || [];
+export const secondaryFormats = (state: any) => get(state, 'secondaryFormats') || [];
+export const context = (state: any) => get(state, 'context') || null;
+export const allItemsById = (state: any) => get(state, 'itemsById') || null;
+export const itemToOpen = (state: any) => get(state, 'itemToOpen') || null;
+export const userSectionsSelector = (state: any) => get(state, 'userSections');
+export const modalItems = (state: any) => get(state, 'modal.data.items') || [];
+
+export const getFormats = createSelector([formats],(f) => (f.map((format: any) =>
+    ({value: format.format, text: format.name}))));
+
+export const getContextName = createSelector(
+    [context, userSectionsSelector],
+    (currentSection: any, sections: any) => get(sections, `${currentSection}.name`)
+);
+
+export const modalOptions: any = createSelector(
+    [modalItems, formats, context, allItemsById, itemToOpen],
+    (items: any, fmts: any, cntxt: any, itemsById: any, openItem: any) => {
+        let options = fmts;
+        if (items && items.length) {
+            const itemType = cntxt === 'agenda' ? 'agenda' : 'wire';
+            const hasPicture = items.every((itemId: any) => getPicture(itemsById && itemsById[itemId] || openItem));
+            options = options.filter((opt: any) => get(opt, 'types', ['wire', 'agenda']).includes(itemType));
+            if (!hasPicture) {
+                options = options.filter((opt: any) => get(opt, 'assets', ['text']).includes('text'));
+            }
+        }
+
+        return options.map((format: any) => ({value: format.format, text: format.name}));
+    }
+);
+
+export const modalSecondaryFormatOptions = createSelector(
+    [secondaryFormats], (fmts) => ( fmts.map((format: any) => ({value: format.format, text: format.name})) )
+);
diff --git a/assets/server.js b/assets/server.ts
similarity index 76%
rename from assets/server.js
rename to assets/server.ts
index db112e170..1f265aa67 100644
--- a/assets/server.js
+++ b/assets/server.ts
@@ -3,17 +3,17 @@ const defaultOptions = {
     redirect: 'manual',
 };
 
-function options(custom={}) {
+function options(custom: any = {}) {
     return Object.assign({}, defaultOptions, custom);
 }
 
-function checkStatus(response) {
+function checkStatus(response: any) {
     if (response.status === 204) {
         return {};
     } else if (response.status >= 200 && response.status < 300) {
         return response.json();
     } else if (response.status >= 400 && response.status < 500) {
-        return response.json().then((data) => Promise.reject(data));
+        return response.json().then((data: any) => Promise.reject(data));
     } else {
         if (response.type === 'opaqueredirect') {
             window.location.reload();
@@ -24,8 +24,8 @@ function checkStatus(response) {
     }
 }
 
-function getHeaders(etag) {
-    const headers = {'Content-Type': 'application/json'};
+function getHeaders(etag: any) {
+    const headers: any = {'Content-Type': 'application/json'};
 
     if (etag != null) {
         headers['If-Match'] = etag;
@@ -42,7 +42,7 @@ class Server {
      * @param {String} url
      * @return {Promise}
      */
-    get(url) {
+    get(url: any) {
         return fetch(url, options({}))
             .then(checkStatus);
     }
@@ -53,7 +53,7 @@ class Server {
      * @param {String} url
      * @return {Promise}
      */
-    getJson(url) {
+    getJson(url: any) {
         return fetch(url, options({
             headers: {
                 Accept: 'application/json',
@@ -68,7 +68,7 @@ class Server {
      * @param {Object} data
      * @return {Promise}
      */
-    post(url, data) {
+    post(url: any, data: any) {
         return fetch(url, options({
             method: 'POST',
             headers: {'Content-Type': 'application/json'},
@@ -83,7 +83,7 @@ class Server {
      * @param {Object} data
      * @return {Promise}
      */
-    postFiles(url, data) {
+    postFiles(url: any, data: any) {
         return fetch(url, options({
             method: 'POST',
             body: data,
@@ -96,7 +96,7 @@ class Server {
      * @param {String} url
      * @return {Promise}
      */
-    del(url, data, etag) {
+    del(url: any, data: any, etag?: any) {
         return fetch(url, options({
             method: 'DELETE',
             headers: getHeaders(etag),
@@ -111,13 +111,24 @@ class Server {
      * @param {Object} data
      * @return {Promise}
      */
-    patch(url, data, etag) {
+    patch(url: any, data: any, etag?: any) {
         return fetch(url, options({
             method: 'PATCH',
             headers: getHeaders(etag),
             body: JSON.stringify(data),
         })).then(checkStatus);
     }
+
+    patchEntity(url: string, data: any, _etag: string) {
+        return fetch(
+            url,
+            options({
+                method: 'PATCH',
+                headers: {'Content-Type': 'application/json', 'If-Match': _etag},
+                body: JSON.stringify(data),
+            })
+        ).then(checkStatus);
+    }
 }
 
 export default new Server();
diff --git a/assets/style.js b/assets/style.ts
similarity index 100%
rename from assets/style.js
rename to assets/style.ts
diff --git a/assets/styles/breakpoints.scss b/assets/styles/breakpoints.scss
index 3f3274d64..755dc9f1b 100644
--- a/assets/styles/breakpoints.scss
+++ b/assets/styles/breakpoints.scss
@@ -50,13 +50,13 @@
 }
 
 @mixin small_phone {
-    @media only screen and (orientation: portrait) and (max-width: 374px), (orientation: landscape) and (max-width: 575px) {
+    @media only screen and (max-width: 374px) {
         @content;
     }
 }
 
 @mixin phone {
-    @media only screen and (orientation: portrait) and (max-width: 575px), (orientation: landscape) and (max-width: 991px) {
+    @media only screen and (max-width: 575px) {
         @content;
     }
 }
diff --git a/assets/styles/custom-breadcrumb.scss b/assets/styles/custom-breadcrumb.scss
index e4f989d53..139994c54 100644
--- a/assets/styles/custom-breadcrumb.scss
+++ b/assets/styles/custom-breadcrumb.scss
@@ -3,7 +3,7 @@
 .navbar-brand {
   span.breadcrumb-item {
     font-size: var(--text-size--medium); // 14px
-    line-height: 1.1;
+    line-height: 1;
     color: var(--top-bar-color-fg);
 
     @include sm {
diff --git a/assets/styles/custom-forms.scss b/assets/styles/custom-forms.scss
index ef26cbd6c..8b822fb37 100644
--- a/assets/styles/custom-forms.scss
+++ b/assets/styles/custom-forms.scss
@@ -132,6 +132,10 @@ select.form-control {
         color: var(--color-text--muted);
         margin-block-end: 0;
         word-break: break-word;
+        &.form-check-label--strong {
+            font-weight: 500;
+            color: var(--color-text);
+        }
 
 
     }
@@ -155,6 +159,17 @@ select.form-control {
             }
         }
     }
+    &.form-check--flex {
+        display: flex;
+        align-items: center;
+        padding: 0;
+        margin: 0;
+        gap: var(--space--1);
+        .form-check-input {
+            margin: 0 !important;
+            padding: 0;
+        }
+    }
 }
 
 .form-row {
diff --git a/assets/styles/custom-helpers.scss b/assets/styles/custom-helpers.scss
index 0fa37e232..6633765f5 100644
--- a/assets/styles/custom-helpers.scss
+++ b/assets/styles/custom-helpers.scss
@@ -1,4 +1,3 @@
-
 // TEXT
 // Font sizes
 .font-size--small {
@@ -66,4 +65,4 @@
 }
 .border--dashed {
     border-style: dashed !important;
-}
\ No newline at end of file
+}
diff --git a/assets/styles/custom-modal.scss b/assets/styles/custom-modal.scss
index 25256f553..611c35ef0 100644
--- a/assets/styles/custom-modal.scss
+++ b/assets/styles/custom-modal.scss
@@ -1,56 +1,140 @@
 // Modal header
 // Top section of the modal w/ title and dismiss
+.modal {
+    inset: 0;
+    z-index: 1055;
+    // overflow-x: hidden;
+    // overflow-y: auto;
+}
+.modal-content {
+    display: grid;
+    grid-template-rows: auto 1fr auto;
+    grid-template-columns: 1fr;
+    .modal-header {
+        grid-row: 1 / 2;
+        z-index: 1;
+    }
+    .modal-body {
+        grid-row: 2 / 3;
+        overflow-y: auto;
+    }
+    .modal-footer {
+        grid-row: 3 / 4;
+        z-index: 2;
+    }
+    @include phone {
+        bottom: 0;
+        top: 0;
+    }
+}
 .modal-header {
-  .close {
-    i {
-      color: $black;
-      opacity: .5;
+    .close {
+        i {
+            //color: $black;
+            opacity: .5;
+        }
+    }
+    @include phone {
+        padding-block: var(--space--1);
     }
-  }
-
-  @include phone {
-    padding: 0.5rem 1rem 0 1rem;
-  }
 }
 
 // Title text within header
 .modal-title {
-  font-weight: 700;
+    font-weight: 700;
 }
 
 // Shell div to position the modal with bottom padding
 .modal-dialog {
-  // When fading in the modal, animate it to slide down
-  .modal.fade & {
-    transform: translate(0, 0);
-  }
+    position: absolute;
+    inset: 0;
+    margin-block: 40px;
+    margin-inline: auto;
+    max-height: 100%;
+// When fading in the modal, animate it to slide down
+    .modal.fade & {
+        transform: translate(0, 0);
+    }
+    @include phone {
+        margin: 0 !important;
+    }
+}
+
+.modal-body {
+  overflow: auto;
 }
 
 // Footer (for actions)
 .modal-footer {
-  // Easily place margin between footer elements
-  > :not(:first-child) { margin-inline-start: 10px; }
-  > :not(:last-child) { margin-inline-end: 10px; }
-
-  @include phone {
-    padding: 0.5rem 1rem;
-  }
+    gap: var(--space--1);
+    @include phone {
+        padding: 0.5rem 1rem;
+    }
 }
 
 .modal--full-width {
-  .modal-dialog {
-    max-width: 100%;
-    height: 100%;
-    margin: 1.5rem 1rem;
+    .modal-dialog {
+        max-width: 100%;
+        height: calc(100% - 1.5rem - 1.5rem);
+        margin: 1.5rem 1rem;
 
-    iframe {
-      width: 100%;
-      height: 100%;
-      border: none;
+        iframe {
+            width: 100%;
+            height: 100%;
+            border: none;
+        }
     }
-  }
-  .modal-content {
+    .modal-content {
+        height: 100%;
+        padding-block-end: 2rem;
+    }
+}
+.modal-body {
+    overflow-y: auto;
+}
+.modal-content {
+    position: absolute;
+    inset-inline: 0;
+    max-height: 100%;
+}
+
+.modal-body__inner {
+    display: grid;
+    grid-template-rows: auto 1fr auto;
+    grid-template-columns: 1fr;
     height: 100%;
-    padding-block-end: 2rem;
-  }
+    padding: 0;
+    .modal-body__inner-header {
+        grid-row: 1 / 2;
+    }
+    .modal-body__inner-content {
+        grid-row: 2 / 3;
+        overflow-y: auto;
+        overflow-x: hidden;
+    }
+    .inner-content-grid {
+        display: grid;
+        grid-template-rows: 1fr auto ;
+        grid-template-columns: 1fr;
+        height: 100%;
+        padding: 0;
+        .inner-content-grid__main {
+            grid-row: 1 / 2;
+            overflow-y: auto;
+            margin: 0;
+        }
+        .inner-content-grid__footer {
+            grid-row: 2 / 3;
+            margin: 0;
+        }
+    }
+    .modal-body__inner-footer {
+        grid-row: 3 / 4;
+    }
 }
+
+.form-group.user-msg {
+    textarea.form-control {
+        min-height: 64px;
+    }
+}
\ No newline at end of file
diff --git a/assets/styles/custom-variables.scss b/assets/styles/custom-variables.scss
index a7986b802..ff5051f48 100644
--- a/assets/styles/custom-variables.scss
+++ b/assets/styles/custom-variables.scss
@@ -220,16 +220,30 @@ $container-max-widths: (
 
     // CORE: MISC 
     --transition-base: 0.2s ease;
-    --table-selected-shadow: inset 0 0 0 3px var(--color-interactive-focus--translucent);
+    
 
     // CORE: TOP BAR HEIGHT (NavBar, Search, Mobile navigation) 
     --navbar-height: 56px;
     --navbar-height--mobile: 48px;
+    --navbar-height--small: 40px;
+
+    // LOGIN PAGE
+    --login-page-color-bg: var(--color-background--muted);
     
 
     // --------------------------------------------------------------------
     //     C O M P O N E N T S
     // --------------------------------------------------------------------
+
+    // COMPONENT: TABLE
+    --table-cell-line-color: var(--color-line--x-light);
+    --table-cell-padding-inline: var(--space--1-5);
+    --table-cell-padding-inline--small: var(--space--1);
+    --table-cell-padding-block: var(--space--2);
+    --table-cell-padding-block--small: var(--space--1-5);
+
+    --table-selected-shadow: inset 0 0 0 3px var(--color-interactive-focus--translucent);
+
     
     // COMPONENT: SEARCHBAR
     --searchbar-size-height: 40px;
@@ -258,6 +272,28 @@ $container-max-widths: (
     --top-bar-color-bg-badge: hsl(321, 100%, 42%);
     --top-bar-color-fg-badge: hsl(0, 0%, 100%);
     --top-bar-badge-size: 1.25rem;
+    // Logo main
+    --top-bar-logo-main-max-width: 196px;
+    --top-bar-logo-main-max-width--mobile: 160px;
+    --top-bar-logo-main-padding-y: 12px;
+    --top-bar-logo-main-padding-x: 16px;
+    --top-bar-logo-main-margin-top: 0;
+    --top-bar-logo-main-margin-top--mobile: 0;
+    // Logo additional
+    --top-bar-logo-additional-display: none;
+    --top-bar-logo-additional-max-width: 89px;
+    --top-bar-logo-additional-min-width--mobile: 0px;
+    --top-bar-logo-additional-padding-y: 12px;
+    --top-bar-logo-additional-padding-start: 0;
+    --top-bar-logo-additional-padding-end: var(--space--1);
+    --top-bar-logo-additiona-margin-top: 0;
+    // Navbar Brand
+    --top-bar-nav-brand-margin-x: 0;
+    --top-bar-nav-brand-margin-y: 16px;
+    --top-bar-nav-brand-padding-x: 16px;
+    --top-bar-nav-brand-border-color: var(--color-text--muted-2);
+    --top-bar-nav-brand-border-type: dashed;
+
 
     // COMPONENT: INPUT FIELD
     --input-color-bg: hsl(0, 0%, 96%);
@@ -289,6 +325,8 @@ $container-max-widths: (
     --icon-button-color-border--tertiary-hover: var(--icon-button-color-fg);
 
     --icon-button-color-border: var(--color-line--light);
+    --icon-button-shadow--active: var(--button-color-shadow--secondary-hover);
+    --icon-button-shadow-primary--active: var(--color-interactive-focus--translucent);
 
     --icon-button-size: 40px;
     --icon-button-size--small: 32px;
@@ -311,7 +349,6 @@ $container-max-widths: (
     --simplecard-item-padding--compact: var(--space--1) var(--space--1) var(--space--1) var(--space--3);
 
     // COMPONENT: SIDENAV
-    
     --sidenav-color-bg:                 var(--color-primary);
     --sidenav-color-item-bg:            transparent;
     --sidenav-color-item-fg:            hsla(0, 0%, 100%, 1);
@@ -322,6 +359,7 @@ $container-max-widths: (
     --sidenav-item-badge-size:          1.25rem;
     --sidenav-item-badge-font-size:     0.6875rem;
     --sidenav-item-helper-icon-size:    1.125rem;
+    --sidenav-item-helper-icon-fg:      var(--sidenav-color-bg);
     --sidenav-item-border-radius:       var(--border-radius--s);
     --separator-dot-size:               3px;
     --separator-dot-color-bg:           var(--sidenav-color-item-fg);
@@ -447,6 +485,7 @@ $container-max-widths: (
     --collapsible-box-padding-inlinestart--hover: var(--space--3);
 
     // COMPONENT: TOPIC LIST (Side panel)
+    --topic-list-density: var(--space--0-5);
     --topic-list-item-font-size: var(--text-size--medium);
     --topic-list-item-color-fg: var(--color-text--muted);
     --topic-list-item-color-fg--hover: var(--color-text);
@@ -455,6 +494,7 @@ $container-max-widths: (
     --topic-list-item-color-bg--hover: hsla(0, 0%, 96%, 1);
     --topic-list-item-color-bg--active: hsla(0, 0%, 96%, 1);
     --topic-list-item-min-height: 40px;
+    --topic-list-item-inline-margin: var(--space--1);
 
     // COMPONENT: MAIN FOOTER
     --footer-size--height: 32px;
@@ -602,6 +642,7 @@ $container-max-widths: (
     }
     &:hover {
         text-decoration: none;
+        cursor: pointer;
         [class^="icon--"],
         [class*=" icon--"] {
             color: var(--color-text);
diff --git a/assets/styles/full-page-layout.scss b/assets/styles/full-page-layout.scss
index 7ab18ca8b..dec7340ae 100644
--- a/assets/styles/full-page-layout.scss
+++ b/assets/styles/full-page-layout.scss
@@ -130,6 +130,7 @@
 .empty-state__container {
     display: flex;
     flex-direction: column;
+    align-items: center;
     &.empty-state__container--full-height {
         flex-grow: 1;
         align-items: center;
@@ -149,6 +150,9 @@
     text-align: center;
     padding: 0;
     margin: 0 0 var(--space--1) 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
     img {
         max-width: 100%;
         height: auto;
@@ -183,4 +187,4 @@
     align-items: center;
     gap: var(--space--2);
     font-size: var(--text-size--medium);
-}
\ No newline at end of file
+}
diff --git a/assets/styles/icon-button.scss b/assets/styles/icon-button.scss
index e3bf8860d..f5546b3b5 100644
--- a/assets/styles/icon-button.scss
+++ b/assets/styles/icon-button.scss
@@ -39,7 +39,7 @@
         box-shadow: 0 0 0 1px var(--color-interactive-focus), 0 0 0 3px var(--color-interactive-focus--translucent);
     }
     &:active {
-        box-shadow: inset 0 0 0 3px var(--color-interactive-focus--translucent);
+        box-shadow: inset 0 0 0 3px var(--icon-button-shadow--active);
         border-color: var(--icon-button-color-fg);
     }
 }
@@ -52,6 +52,9 @@
     &.icon-button--primary {
         --icon-button-color-fg: var(--icon-button-color-icon--primary);
         --icon-button-color-border-hover: var(--icon-button-color-border--primary-hover);
+        &:active {
+            box-shadow: inset 0 0 0 3px var(--icon-button-shadow-primary--active);
+        }
     }
     &.icon-button--secondary {
         --icon-button-color-fg: var(--icon-button-color-icon--secondary);
diff --git a/assets/styles/index.scss b/assets/styles/index.scss
index 5beb92608..71b37b9ce 100644
--- a/assets/styles/index.scss
+++ b/assets/styles/index.scss
@@ -104,33 +104,36 @@ label {
             font-weight: 400;
             vertical-align: top;
             color: var(--color-text--muted);
+            padding-inline: var(--table-cell-padding-inline);
+            padding-block: var(--table-cell-padding-block--small);
         }
     }
     tr {
         outline: 1px solid transparent;
-        border-block-end: 1px solid #e9ecef;
+        border-block-end: 1px solid var(--table-cell-line-color);
 
         &:focus-visible {
             box-shadow: 0 0 0 1px var(--color-interactive-focus), 0 0 0 4px var(--color-interactive-focus--translucent);
         }
     }
     td {
-        padding: 1rem .75rem;
+        padding-inline: var(--table-cell-padding-inline);
+        padding-block: var(--table-cell-padding-block);
         border-block-end: none;
         &.name {
             font-size: 14px;
             font-weight: 700;
-            line-height: 120%;
+            line-height: 1.2;
         }
     }
     &.table-hover > tbody > tr:hover {
-        outline: 1px solid #999;
+        outline: 1px solid hsl(0, 0%, 60%);
     }
     &.table-hover > tbody > tr:hover > * {
         --bs-table-accent-bg: white;
         background-color: white;
     }
-    &--extended {
+    &.table--extended {
         border-collapse:separate;
         border-spacing:0 4px;
         background-color: transparent;
@@ -190,7 +193,7 @@ label {
             margin-inline-start: 4px;
         }
     }
-    &--hollow {
+    &.table--hollow {
         background-color: transparent;
         margin-block-start: 30px;
         & > :not(:first-child) {
@@ -231,7 +234,6 @@ label {
                 font-size: 16px;
                 font-weight: 800;
                 color: $gray-900;
-                padding: 1rem 0.5rem;
 
                 &.font-light {
                     font-size: 14px;
@@ -247,8 +249,25 @@ label {
             outline: none;
         }
     }
+    &.table--small {
+        table-layout: auto !important;
+        thead {
+            th {
+                padding-block: var(--space--1);
+            }
+        }
+        td {
+            --table-cell-padding-block: var(--space--1);
+        }
+    }
 
 }
+// .table > tbody {
+//     border-block-start: 2px solid var(--color-line--medium);
+// }
+.table > :not(:first-child) {
+    border-top-color: var(--color-line--medium);
+}
 .table.table-hover tbody tr {
     border-radius: var(--border-radius--xs);
     &:hover {
@@ -366,7 +385,7 @@ body.print {
 
         }
         a, span {
-            border-radius: var(--sidenav-item-border-radius);              
+            border-radius: var(--sidenav-item-border-radius);
             text-decoration: none;
             width: var(--sidenav-item-width);
             min-height: var(--navbar-height);
@@ -379,7 +398,7 @@ body.print {
                 height: calc(var(--navbar-height--mobile) - var(--space--1));
                 line-height: var(--navbar-height--mobile);
                 min-height: auto;
-            }     
+            }
             &:focus {
                 outline: none;
             }
@@ -456,27 +475,32 @@ body.print {
             background-color: var(--sidenav-color-badge-bg);
             color: var(--sidenav-color-badge-fg);
             padding: 0.35em 0.6em;
+            &:empty {
+                display: none;
+            }
         }
 
         .sidenav-icons__helper-icon {
             height: var(--sidenav-item-helper-icon-size);
             width: var(--sidenav-item-helper-icon-size);
             background-color: var(--sidenav-color-item-fg);
-            color: var(--sidenav-color-item-fg--active);
+            color: var(--sidenav-item-helper-icon-fg);
             inset-block-start: -1px;
             inset-inline-end: 6px;
             padding: 0;
             [class^="icon-small--"],
             [class^="icon-small--"] {
-                color: var(--sidenav-color-item-fg--active) !important;
+                color: var(--sidenav-item-helper-icon-fg) !important;
             }
         }
 
         &.active {
-            
+
 
             a {
                 background-color: var(--sidenav-color-item-bg--active);
+                border-radius: 4px;
+                text-decoration: none;
             }
             i, .sidenav-icons__item-title {
                 color: var(--sidenav-color-item-fg--active);
@@ -691,6 +715,12 @@ article.list {
     &:focus-visible {
         box-shadow: inset 0 0 0 1px var(--color-interactive-focus), inset 0 0 3px 4px var(--color-interactive-focus--translucent);
     }
+    .navbar--small & {
+        @include phone {
+            width: var(--navbar-height--small);
+            height: var(--navbar-height--small);
+        }
+    }
 }
 
 .show .content-bar__menu {
@@ -969,7 +999,7 @@ article.list {
     display: flex;
     align-items: center;
     position: relative;
-    
+
     .list-item__preview-collapsible-header {
         display: flex;
         align-items: center;
@@ -1034,7 +1064,7 @@ article.list {
     flex-direction: column;
     align-items: stretch;
     position: relative;
-    
+
     .nh-collapsible-panel__header {
         display: flex;
         flex-grow: 1;
@@ -1084,7 +1114,7 @@ article.list {
         transition: all 0.3s ease;
     }
 
-    .nh-collapsible-panel__content {  
+    .nh-collapsible-panel__content {
         animation: fadeIn 0.3s ease-in 0s 1;
         display: flex;
         flex-direction: column;
@@ -1141,7 +1171,7 @@ article.list {
         .nh-collapsible-panel__caret {
             transform: rotate(90deg);
         }
-        .nh-collapsible-panel__content {  
+        .nh-collapsible-panel__content {
             animation: fadeIn 0.3s ease-in 0s 1;
             opacity: 1;
         }
@@ -1158,7 +1188,7 @@ article.list {
             transition: all ease-out .2s;
             overflow: hidden;
             padding-block-start: 0;
-            .nh-collapsible-panel__content {  
+            .nh-collapsible-panel__content {
                 animation: fadeIn 0.3s ease-in 0s 1;
                 opacity: 0;
             }
@@ -1223,7 +1253,7 @@ article.list {
     border-color: var(--searchbar-color-border--normal);
     border-radius: var(--searchbar-border-radius);
     transition: all 0.2s ease;
-    margin-inline-end: var(--space--1);
+    //margin-inline-end: var(--space--1);
     .input-group {
         width: 100%;
         @include sm {
@@ -1262,8 +1292,8 @@ article.list {
             box-shadow: inset 0 0 0 2px var(--searchbar-color-shadow--focus);
         }
     }
-
 }
+
 .content-bar__menu + .search {
     margin-inline-start: var(--space--1);
 }
@@ -1381,8 +1411,7 @@ article.list {
     padding: 0 0 0 var(--space--2);
     font-size: 16px;
     line-height: 1;
-    padding-block-end: 2px;
-    &::placeholder { 
+    &::placeholder {
         color: var(--color-text--muted);
         font-weight: 400;
         font-size: 14px;
@@ -3026,6 +3055,7 @@ article.list {
 .simple-card__list {
     display: flex;
     flex-direction: column;
+    width: 100%;
     gap: var(--space--2);
 }
 
@@ -3094,6 +3124,7 @@ article.list {
 
     }
 }
+
 .simple-card__content {
     display: flex;
     flex-direction: column;
@@ -3102,13 +3133,13 @@ article.list {
         margin: 0;
     }
 }
+
 .simple-card__actions {
     display: flex;
     align-items: center;
     justify-content: center;
 }
 
-
 .simple-card__group {
     display: flex;
     flex-direction: column;
@@ -3128,7 +3159,7 @@ article.list {
     outline: 1px solid var(--simplecard-item-outline-color);
     transition: all .2s ease-out;
     min-height: 56px;
-    
+
     &.simple-card__group-header--selected {
         border-color: var(--color-interactive-focus--translucent) !important;
         outline-color: var(--color-interactive-focus) !important;
@@ -3139,7 +3170,7 @@ article.list {
         outline-color: var(--color-interactive-focus) !important;
         background-color: var(--color-interactive-focus--light-bg);
     }
-    
+
     .simple-card__group-header-title {
         display: flex;
         flex-grow: 1;
@@ -3394,7 +3425,7 @@ article.list {
     &:focus-within {
         .react-toggle-thumb {
             box-shadow: 0 0 0 5px var(--color-interactive-focus--translucent) !important;
-            outline: 1px solid var(--color-interactive-focus); 
+            outline: 1px solid var(--color-interactive-focus);
         }
     }
 }
@@ -3754,7 +3785,7 @@ article.list {
 .topic-list {
     display: flex;
     flex-direction: column;
-    gap: 2px;
+    gap: var(--topic-list-density);
     list-style-type: none;
     margin: 0;
     padding: 0;
@@ -3774,6 +3805,9 @@ article.list {
     padding-inline: var(--collapsible-box-padding-inline);
     min-height: var(--topic-list-item-min-height);
     transition: all var(--transition-base);
+    background-color: var(--topic-list-item-color-bg);
+    border-radius: var(--border-radius--s);
+    margin-inline: var(--topic-list-item-inline-margin);
     &:hover {
         text-decoration: none;
         color: var(--topic-list-item-color-fg--hover);
@@ -3793,8 +3827,7 @@ article.list {
 }
 .topic-list--unsorted {
     .topic-list__item-link {
-        border-radius: var(--border-radius--s);
-
+        margin-inline: 0;
     }
 }
 
@@ -3915,7 +3948,7 @@ article.list {
         transition: all var(--transition-base);
         &:hover {
             color: var(--color-text);
-            background-color: hsl(0, 0%, 92%);  
+            background-color: hsl(0, 0%, 92%);
         }
     }
 }
@@ -4020,7 +4053,7 @@ article.list {
     max-width: 70px;
     flex-grow: 0;
     flex-shrink: 0;
-} 
+}
 .nh-flex-container {
     --flex-container-gap: 16px;
     display: flex;
@@ -4175,3 +4208,6 @@ article.list {
 
 }
 
+.nh-login-page__content { // login page background color
+    background-color: var(--login-page-color-bg);
+}
diff --git a/assets/styles/navbar.scss b/assets/styles/navbar.scss
index 1cd8921b2..697719025 100644
--- a/assets/styles/navbar.scss
+++ b/assets/styles/navbar.scss
@@ -228,7 +228,7 @@
         padding-block: 0;
     }
     &.navbar--small {
-        height: 40px;
+        height: var(--navbar-height--small);
     }
     .navbar__inner {
         display: flex;
@@ -326,29 +326,29 @@
 
 .navbar__logo {
     display: flex;
+    width: auto;
     align-items: center;
     justify-content: center;
     flex-shrink: 0;
     flex-grow: 0;
-    padding: 0 0.5rem 0 0.5rem;
-    max-width: 160px;
-
-    @include sm {
-        max-width: 224px;
-        padding: 0 0.5rem 0.5rem 1rem;
-    }
-
-    @include md {
-        padding-block-end: 0;
-    }
-
+    padding-block: var(--top-bar-logo-main-padding-y);
+    padding-inline: var(--top-bar-logo-main-padding-x);
     img {
-        max-width: 100%;
+        width: 100%;
+        max-width: var(--top-bar-logo-main-max-width);
+        margin-block-start: var(--top-bar-logo-main-margin-top);
+        @include phone {
+            max-width: var(--top-bar-logo-main-max-width--mobile);
+            margin-block-start: var(--top-bar-logo-main-margin-top--mobile);
+        }
     }
-
     a {
-        line-height: 1.1;
-        padding: 2px;
+        line-height: 1;
+        padding: 0;
+        display: flex;
+        width: 100%;
+        align-items: center;
+        align-self: stretch;
         &:focus {
             outline: none;
         }
@@ -361,34 +361,47 @@
         max-width: 75px;
     }
 }
+.navbar__additional-logo {
+    width: auto;
+    height: auto;
+    position: relative;
+    display: var(--top-bar-logo-additional-display);
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    flex-grow: 0;
+    padding-block: var(--top-bar-logo-additional-padding-y);
+    padding-inline-start: var(--top-bar-logo-additional-padding-start);
+    padding-inline-end: var(--top-bar-logo-additional-padding-end);
+    @include phone {
+        display: none !important;
+    }
+    img {
+        height: auto;
+        position: relative;
+        display: var(--top-bar-logo-additional-display);
+        max-width: var(--top-bar-logo-additional-max-width);
+        width: 100%;
+        height: auto;
+        margin-block-start: var(--top-bar-logo-additiona-margin-top);
+    }
+}
 .navbar-brand {
     display: flex;
     align-items: center;
-    margin-block-start: 3.5px;
-    margin-inline-start: 0;
-    margin-inline-end: 0;
-    opacity: 1;
-    line-height: 1.2rem;
-    font-size: 1.125rem;
-    font-weight: 400;
-    @include sm {
-        line-height: inherit;
-        font-size: 1.75rem;
-        margin-inline-start: 0.25rem;
-        margin-inline-end: 1.5rem;
-    }
-    @include md {
-        margin-block-start: 0;
-        margin-inline-start: 0.5rem;
+    margin-block: var(--top-bar-nav-brand-margin-y);
+    margin-inline: var(--top-bar-nav-brand-margin-x);
+    padding-inline-start: var(--top-bar-nav-brand-padding-x);
+    border-inline-start: 1px var(--top-bar-nav-brand-border-type) var(--top-bar-nav-brand-border-color);
+    @include phone {
+        padding-inline: 0;
+        border-inline-start: none;
+        opacity: 0.8;
     }
     nav {
         display: flex;
         width: 100%;
-
-        @include sm {
-            flex-direction: row;
-            align-items: center;
-        }
+        align-items: center;
     }
 }
 .navbar__right {
diff --git a/assets/styles/sd-ui-tag-labels.scss b/assets/styles/sd-ui-tag-labels.scss
index b43f25629..d4137e43f 100644
--- a/assets/styles/sd-ui-tag-labels.scss
+++ b/assets/styles/sd-ui-tag-labels.scss
@@ -199,6 +199,9 @@ $tag-x-palette: $tag-x-colors !default;
     align-items: center;
     flex-wrap: wrap;
     gap: var(--space--1);
+    &:empty {
+        display: none;
+    }
 }
 
 .tag-list__separator {
diff --git a/assets/styles/search-results.scss b/assets/styles/search-results.scss
index f57e07437..4f6534c18 100644
--- a/assets/styles/search-results.scss
+++ b/assets/styles/search-results.scss
@@ -57,7 +57,7 @@
     flex-direction: column;
     margin: 0;
     padding: 0;
-    padding-inline: var(--space--1);
+    padding-inline: var(--space--2);
     list-style-type: none;
     width: 100%;
     container-type: inline-size;
@@ -70,8 +70,8 @@
     padding-block: 12px;
     gap: var(--space--2);
     min-height: 56px;
-    border-block-end: 1px dashed hsla(0, 0%, 20%, 0.2);
-    &:last-child {
+    border-block-start: 1px dashed hsla(0, 0%, 20%, 0.2);
+    &:first-child {
         border: none;
     }
     .tags-list {
@@ -92,6 +92,26 @@
         flex-grow: 0;
         flex-shrink: 0;
     }
+    &.search-result__tags-list-row--secondary {
+        border-block-start: none;
+        .search-result__tags-list-row-label {
+            color: var(--color-text--muted);
+            font-weight: 400;
+        }
+    }
+    .search-result__tags-list-row-helper-text {
+        display: inline-flex;
+        align-items: center;
+        min-height: 32px;
+        padding-inline-start: var(--space--0-5);
+        color: var(--color-text--muted);
+        font-size: 14px;
+        font-weight: 400;
+        line-height: 1.2;
+        word-wrap: normal;
+        flex-grow: 0;
+        flex-shrink: 0;
+    }
 }
 .tags-list-row__button-group {
     display: flex;
@@ -106,7 +126,7 @@
 }
 
 // Container Query test
-@container tags-list (max-width: 1000px) {
+@container tags-list (max-width: 900px) {
     .search-result__tags-list-row {
         flex-direction: column;
         gap: var(--space--1);
@@ -121,7 +141,8 @@
         .tags-list-row__button-group {
             order: 1;
         }
-        .tags-list {
+        .tags-list,
+        .toggle-button__group {
             order: 3;
         }
     }
diff --git a/assets/tests.js b/assets/tests.ts
similarity index 86%
rename from assets/tests.js
rename to assets/tests.ts
index 13eee04f5..b66b8f3c5 100644
--- a/assets/tests.js
+++ b/assets/tests.ts
@@ -13,6 +13,6 @@ window.sectionNames = {
     saved: 'Saved / Watched',
 };
 
-var testsContext = require.context('.', true, /[Ss]pec.(js|jsx)$/);
+const testsContext = require.context('.', true, /[Ss]pec.(ts|tsx)$/);
 
 testsContext.keys().forEach(testsContext);
diff --git a/assets/tests/TextInput.spec.js b/assets/tests/TextInput.spec.tsx
similarity index 95%
rename from assets/tests/TextInput.spec.js
rename to assets/tests/TextInput.spec.tsx
index 689bf0e7d..62b7d1864 100644
--- a/assets/tests/TextInput.spec.js
+++ b/assets/tests/TextInput.spec.tsx
@@ -6,10 +6,10 @@ import {spy} from 'sinon';
 
 import 'tests/setup';
 
-function setup(errorStrings) {
+function setup(errorStrings: any) {
     const handleChange = spy();
 
-    const props = {
+    const props: any = {
         name: 'test-ctr',
         label: 'test label',
         onChange: handleChange,
diff --git a/assets/tests/reducers.spec.js b/assets/tests/reducers.spec.ts
similarity index 99%
rename from assets/tests/reducers.spec.js
rename to assets/tests/reducers.spec.ts
index 90c35ea58..fdc7bfbbc 100644
--- a/assets/tests/reducers.spec.js
+++ b/assets/tests/reducers.spec.ts
@@ -1,7 +1,7 @@
 import {defaultReducer} from 'reducers';
 
 describe('default reducer', () => {
-    let initialState;
+    let initialState: any;
 
     beforeEach(() => {
         initialState = {
diff --git a/assets/tests/setup.js b/assets/tests/setup.ts
similarity index 100%
rename from assets/tests/setup.js
rename to assets/tests/setup.ts
diff --git a/assets/tests/utils.spec.js b/assets/tests/utils.spec.ts
similarity index 100%
rename from assets/tests/utils.spec.js
rename to assets/tests/utils.spec.ts
diff --git a/assets/topics/actions.js b/assets/topics/actions.ts
similarity index 66%
rename from assets/topics/actions.js
rename to assets/topics/actions.ts
index 63d4c38a7..46be6c0bd 100644
--- a/assets/topics/actions.js
+++ b/assets/topics/actions.ts
@@ -1,5 +1,5 @@
 
 export const SET_TOPICS = 'SET_TOPICS';
-export function setTopics(topics) {
+export function setTopics(topics: any) {
     return {type: SET_TOPICS, topics};
 }
diff --git a/assets/topics/reducer.js b/assets/topics/reducer.ts
similarity index 61%
rename from assets/topics/reducer.js
rename to assets/topics/reducer.ts
index 15fdec065..cfc402112 100644
--- a/assets/topics/reducer.js
+++ b/assets/topics/reducer.ts
@@ -3,9 +3,9 @@ import {
     SET_TOPICS
 } from './actions';
 
-const initialState = [];
+const initialState: Array<any> = [];
 
-export function topicsReducer(state=initialState, action) {
+export function topicsReducer(state = initialState, action: any) {
     switch (action.type) {
     case SET_TOPICS:
         return action.topics;
diff --git a/assets/topics/utils.js b/assets/topics/utils.ts
similarity index 75%
rename from assets/topics/utils.js
rename to assets/topics/utils.ts
index ad6ce6643..df0d60c32 100644
--- a/assets/topics/utils.js
+++ b/assets/topics/utils.ts
@@ -1,6 +1,6 @@
 import {canUserManageTopics} from 'users/utils';
 
-export function canUserEditTopic(topic, user) {
+export function canUserEditTopic(topic: any, user: any) {
     return !(
         topic.is_global &&
             !canUserManageTopics(user) &&
diff --git a/assets/ui/components/Article.jsx b/assets/ui/components/Article.tsx
similarity index 96%
rename from assets/ui/components/Article.jsx
rename to assets/ui/components/Article.tsx
index 7bab1705d..f4b9b90a9 100644
--- a/assets/ui/components/Article.jsx
+++ b/assets/ui/components/Article.tsx
@@ -9,7 +9,7 @@ import AgendaMap from '../../agenda/components/AgendaMap';
 import AgendaTime from '../../agenda/components/AgendaTime';
 import AgendaListItemLabels from '../../agenda/components/AgendaListItemLabels';
 
-export default function Article({image, item, children, disableTextSelection}) {
+export default function Article({image, item, children, disableTextSelection}: any) {
     return (
         <article
             id='preview-article'
@@ -37,6 +37,7 @@ export default function Article({image, item, children, disableTextSelection}) {
 Article.propTypes = {
     image: PropTypes.element,
     item: PropTypes.object,
+    group: PropTypes.any,
     children: PropTypes.node,
     disableTextSelection: PropTypes.bool,
 };
diff --git a/assets/ui/components/ArticleAbstract.jsx b/assets/ui/components/ArticleAbstract.tsx
similarity index 65%
rename from assets/ui/components/ArticleAbstract.jsx
rename to assets/ui/components/ArticleAbstract.tsx
index 959c631e8..55bd428c1 100644
--- a/assets/ui/components/ArticleAbstract.jsx
+++ b/assets/ui/components/ArticleAbstract.tsx
@@ -1,7 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleAbstract({item, displayAbstract}) {
+interface IProps {
+    item: {
+        description_text?: string;
+    };
+    displayAbstract?: boolean;
+}
+
+export default function ArticleAbstract({item, displayAbstract}: IProps) {
     return (
         (item.description_text && displayAbstract) &&
             <p className='wire-column__preview__lead'>{item.description_text}</p> || null
diff --git a/assets/ui/components/ArticleAuthor.jsx b/assets/ui/components/ArticleAuthor.tsx
similarity index 92%
rename from assets/ui/components/ArticleAuthor.jsx
rename to assets/ui/components/ArticleAuthor.tsx
index 8c17f377f..f97087701 100644
--- a/assets/ui/components/ArticleAuthor.jsx
+++ b/assets/ui/components/ArticleAuthor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext, isDisplayed} from 'utils';
 
-export default function ArticleAuthor({item, displayConfig}) {
+export default function ArticleAuthor({item, displayConfig}: any) {
     return (
         (item.byline || item.located || item.versioncreated) && (
             <p className='wire-column__preview__author'>
diff --git a/assets/ui/components/ArticleBody.jsx b/assets/ui/components/ArticleBody.tsx
similarity index 88%
rename from assets/ui/components/ArticleBody.jsx
rename to assets/ui/components/ArticleBody.tsx
index 6756139ec..731ae42e6 100644
--- a/assets/ui/components/ArticleBody.jsx
+++ b/assets/ui/components/ArticleBody.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleText(props) {
+export default function ArticleText(props: any) {
     return (
         <div className={`wire-column__preview__content--item-detail-item-${props.itemType}`}>
             {props.children}
diff --git a/assets/ui/components/ArticleBodyHtml.jsx b/assets/ui/components/ArticleBodyHtml.tsx
similarity index 84%
rename from assets/ui/components/ArticleBodyHtml.jsx
rename to assets/ui/components/ArticleBodyHtml.tsx
index 274eaf048..388160580 100644
--- a/assets/ui/components/ArticleBodyHtml.jsx
+++ b/assets/ui/components/ArticleBodyHtml.tsx
@@ -9,8 +9,12 @@ import {selectCopy} from '../../wire/actions';
  * using component to fix iframely loading
  * https://iframely.com/docs/reactjs
  */
-class ArticleBodyHtml extends React.PureComponent {
-    constructor(props) {
+class ArticleBodyHtml extends React.PureComponent<any, any> {
+    static propTypes: any;
+    getBodyHTML: any;
+    bodyRef: any;
+
+    constructor(props: any) {
         super(props);
         this.copyClicked = this.copyClicked.bind(this);
         this.clickClicked = this.clickClicked.bind(this);
@@ -28,7 +32,7 @@ class ArticleBodyHtml extends React.PureComponent {
         document.addEventListener('click', this.clickClicked);
     }
 
-    clickClicked(event) {
+    clickClicked(event: any) {
         if (event != null) {
             const target = event.target;
 
@@ -37,7 +41,7 @@ class ArticleBodyHtml extends React.PureComponent {
                 event.stopPropagation();
 
                 // security https://mathiasbynens.github.io/rel-noopener/
-                var nextWindow = window.open();
+                const nextWindow: any = window.open();
 
                 nextWindow.opener = null;
                 nextWindow.location.href = target.href;
@@ -45,7 +49,7 @@ class ArticleBodyHtml extends React.PureComponent {
         }
     }
 
-    isLinkExternal(href) {
+    isLinkExternal(href: any) {
         try {
             const url = new URL(href);
 
@@ -71,14 +75,14 @@ class ArticleBodyHtml extends React.PureComponent {
     }
 
     executeScripts() {
-        const tree = this.bodyRef.current;
-        const loaded = [];
+        const tree: any = this.bodyRef.current;
+        const loaded: Array<any> = [];
 
         if (tree == null) {
             return;
         }
 
-        tree.querySelectorAll('script').forEach((s) => {
+        tree.querySelectorAll('script').forEach((s: any) => {
             if (s.hasAttribute('src') && !loaded.includes(s.getAttribute('src'))) {
                 let url = s.getAttribute('src');
 
@@ -87,7 +91,7 @@ class ArticleBodyHtml extends React.PureComponent {
                 if (url.includes('twitter.com/') && window.twttr != null) {
                     window.twttr.widgets.load();
                     return;
-                } 
+                }
 
                 if (url.includes('instagram.com/') && window.instgrm != null) {
                     window.instgrm.Embeds.process();
@@ -99,7 +103,7 @@ class ArticleBodyHtml extends React.PureComponent {
                     url = url.substring(url.indexOf(':') + 1);
                 }
 
-                const script = document.createElement('script');
+                const script: any = document.createElement('script');
 
                 script.src = url;
                 script.async = true;
@@ -108,7 +112,7 @@ class ArticleBodyHtml extends React.PureComponent {
                     document.body.removeChild(script);
                 };
 
-                script.onerrror = (error) => {
+                script.onerrror = (error: any) => {
                     throw new URIError('The script ' + error.target.src + 'didn\'t load.');
                 };
 
@@ -126,7 +130,7 @@ class ArticleBodyHtml extends React.PureComponent {
         document.removeEventListener('click', this.clickClicked);
     }
 
-    _getBodyHTML(bodyHtml) {
+    _getBodyHTML(bodyHtml: any) {
         return !bodyHtml ?
             null :
             this._updateImageEmbedSources(formatHTML(bodyHtml));
@@ -139,15 +143,15 @@ class ArticleBodyHtml extends React.PureComponent {
      * @returns {string}
      * @private
      */
-    _updateImageEmbedSources(html) {
+    _updateImageEmbedSources(html: any) {
         const item = this.props.item;
 
         // Get the list of Original Rendition IDs for all Image Associations
         const imageEmbedOriginalIds = Object
             .keys(item.associations || {})
-            .filter((key) => key.startsWith('editor_'))
-            .map((key) => get(item.associations[key], 'renditions.original.media'))
-            .filter((value) => value);
+            .filter((key: any) => key.startsWith('editor_'))
+            .map((key: any) => get(item.associations[key], 'renditions.original.media'))
+            .filter((value: any) => value);
 
         if (!imageEmbedOriginalIds.length) {
             // This item has no Image Embeds
@@ -163,9 +167,9 @@ class ArticleBodyHtml extends React.PureComponent {
         container.innerHTML = html;
         container
             .querySelectorAll('img')
-            .forEach((imageTag) => {
+            .forEach((imageTag: any) => {
                 // Using the tag's `src` attribute, find the Original Rendition's ID
-                const originalMediaId = imageEmbedOriginalIds.find((mediaId) => (
+                const originalMediaId = imageEmbedOriginalIds.find((mediaId: any) => (
                     !imageTag.src.startsWith('/assets/') &&
                     imageTag.src.includes(mediaId))
                 );
@@ -218,8 +222,10 @@ ArticleBodyHtml.propTypes = {
     reportCopy: PropTypes.func,
 };
 
-const mapDispatchToProps = (dispatch) => ({
-    reportCopy: (item) => dispatch(selectCopy(item))
+const mapDispatchToProps = (dispatch: any) => ({
+    reportCopy: (item: any) => dispatch(selectCopy(item))
 });
 
-export default connect(null, mapDispatchToProps)(ArticleBodyHtml);
+const component: React.ComponentType<any> = connect(null, mapDispatchToProps)(ArticleBodyHtml);
+
+export default component;
diff --git a/assets/ui/components/ArticleContent.jsx b/assets/ui/components/ArticleContent.tsx
similarity index 82%
rename from assets/ui/components/ArticleContent.jsx
rename to assets/ui/components/ArticleContent.tsx
index fbab7fc99..3d8619add 100644
--- a/assets/ui/components/ArticleContent.jsx
+++ b/assets/ui/components/ArticleContent.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleContent(props) {
+export default function ArticleContent(props: any) {
     return (
         <div className="wire-column__preview__content">
             {props.children}
diff --git a/assets/ui/components/ArticleContentInfoWrapper.jsx b/assets/ui/components/ArticleContentInfoWrapper.tsx
similarity index 81%
rename from assets/ui/components/ArticleContentInfoWrapper.jsx
rename to assets/ui/components/ArticleContentInfoWrapper.tsx
index 8a42693cd..068bc4931 100644
--- a/assets/ui/components/ArticleContentInfoWrapper.jsx
+++ b/assets/ui/components/ArticleContentInfoWrapper.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleContentInfoWrapper(props) {
+export default function ArticleContentInfoWrapper(props: any) {
     return (
         <div className="wire-column__preview__content--item-detail-info-wrap">
             {props.children}
diff --git a/assets/ui/components/ArticleContentWrapper.jsx b/assets/ui/components/ArticleContentWrapper.tsx
similarity index 86%
rename from assets/ui/components/ArticleContentWrapper.jsx
rename to assets/ui/components/ArticleContentWrapper.tsx
index 7e1031935..bd6207b73 100644
--- a/assets/ui/components/ArticleContentWrapper.jsx
+++ b/assets/ui/components/ArticleContentWrapper.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleContentWrapper(props) {
+export default function ArticleContentWrapper(props: any) {
     const itemWrapperClassName = `wire-column__preview__content--item-detail-${props.itemType}-wrap`;
     return (
         <div className={itemWrapperClassName}>
diff --git a/assets/ui/components/ArticleEmbargoed.jsx b/assets/ui/components/ArticleEmbargoed.tsx
similarity index 89%
rename from assets/ui/components/ArticleEmbargoed.jsx
rename to assets/ui/components/ArticleEmbargoed.tsx
index 4418d551e..ce7e01474 100644
--- a/assets/ui/components/ArticleEmbargoed.jsx
+++ b/assets/ui/components/ArticleEmbargoed.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {getEmbargo, gettext, fullDate} from '../../utils';
 
-export default function ArticleEmbargoed({item}) {
+export default function ArticleEmbargoed({item}: any) {
     const embargo = getEmbargo(item);
 
     if (!embargo) {
diff --git a/assets/ui/components/ArticleHeadline.jsx b/assets/ui/components/ArticleHeadline.tsx
similarity index 88%
rename from assets/ui/components/ArticleHeadline.jsx
rename to assets/ui/components/ArticleHeadline.tsx
index 18937045e..e006d8e6a 100644
--- a/assets/ui/components/ArticleHeadline.jsx
+++ b/assets/ui/components/ArticleHeadline.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleHeadline({item}) {
+export default function ArticleHeadline({item}: any) {
     return item.headline ? (
         <h2 className="wire-column__preview__headline">
             {item.es_highlight && item.es_highlight.headline ? (
diff --git a/assets/ui/components/ArticleItemDetails.jsx b/assets/ui/components/ArticleItemDetails.tsx
similarity index 91%
rename from assets/ui/components/ArticleItemDetails.jsx
rename to assets/ui/components/ArticleItemDetails.tsx
index 6c5c9fed1..f3693e3e6 100644
--- a/assets/ui/components/ArticleItemDetails.jsx
+++ b/assets/ui/components/ArticleItemDetails.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-export default function ArticleItemDetails(props) {
+export default function ArticleItemDetails(props: any) {
     return (
         <article
             id='preview-article'
diff --git a/assets/ui/components/ArticleMedia.jsx b/assets/ui/components/ArticleMedia.tsx
similarity index 99%
rename from assets/ui/components/ArticleMedia.jsx
rename to assets/ui/components/ArticleMedia.tsx
index fb79d26e0..ace29a4ff 100644
--- a/assets/ui/components/ArticleMedia.jsx
+++ b/assets/ui/components/ArticleMedia.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 import {getOriginalRendition} from 'wire/utils';
 
-export default function ArticleMedia({isKilled, media, download}) {
+export default function ArticleMedia({isKilled, media, download}: any) {
     const rendition = getOriginalRendition(media);
     const filename = media.slugline || rendition.media;
 
diff --git a/assets/ui/components/ArticlePicture.jsx b/assets/ui/components/ArticlePicture.tsx
similarity index 96%
rename from assets/ui/components/ArticlePicture.jsx
rename to assets/ui/components/ArticlePicture.tsx
index fac98b699..0be1d3c3c 100644
--- a/assets/ui/components/ArticlePicture.jsx
+++ b/assets/ui/components/ArticlePicture.tsx
@@ -7,7 +7,7 @@ import {getConfig, gettext} from 'utils';
 import {getDetailRendition, getPreviewRendition, getCaption} from 'wire/utils';
 
 
-function formatCredits(picture) {
+function formatCredits(picture: any) {
     const copyrightholder = get(picture, 'copyrightholder', '');
     const copyrightnotice = get(picture, 'copyrightnotice', '');
 
@@ -23,7 +23,7 @@ function formatCredits(picture) {
 }
 
 
-export default function ArticlePicture({isKilled, picture, isItemDetails, isCustomRendition}) {
+export default function ArticlePicture({isKilled, picture, isItemDetails, isCustomRendition}: any) {
     const getRenditions = isItemDetails ? getDetailRendition : getPreviewRendition;
     const renditions = getRenditions(picture, isCustomRendition);
 
diff --git a/assets/ui/components/ArticleSidebar.jsx b/assets/ui/components/ArticleSidebar.tsx
similarity index 87%
rename from assets/ui/components/ArticleSidebar.jsx
rename to assets/ui/components/ArticleSidebar.tsx
index c8ffb6308..283f959d3 100644
--- a/assets/ui/components/ArticleSidebar.jsx
+++ b/assets/ui/components/ArticleSidebar.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleSidebar(props) {
+export default function ArticleSidebar(props: any) {
     return (
         <div className="wire-column__preview__content--event-detail-info-wrap">
             <div className="wire-column__preview__tags mt-3">
diff --git a/assets/ui/components/ArticleSidebarBox.jsx b/assets/ui/components/ArticleSidebarBox.tsx
similarity index 89%
rename from assets/ui/components/ArticleSidebarBox.jsx
rename to assets/ui/components/ArticleSidebarBox.tsx
index e88de2b82..59fac5ea6 100644
--- a/assets/ui/components/ArticleSidebarBox.jsx
+++ b/assets/ui/components/ArticleSidebarBox.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ArticleSidebarBox(props) {
+export default function ArticleSidebarBox(props: any) {
     return (
         <div>
             <span className="column__preview__tags__box-headline">
diff --git a/assets/ui/components/ArticleSlugline.jsx b/assets/ui/components/ArticleSlugline.tsx
similarity index 90%
rename from assets/ui/components/ArticleSlugline.jsx
rename to assets/ui/components/ArticleSlugline.tsx
index 3732ba615..5549399c2 100644
--- a/assets/ui/components/ArticleSlugline.jsx
+++ b/assets/ui/components/ArticleSlugline.tsx
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 
 import {getSlugline} from 'utils';
 
-export default function ArticleSlugline({item}) {
+export default function ArticleSlugline({item}: any) {
     const slugline = getSlugline(item, true);
-  
+
     return slugline ? (
         <div className="wire-column__preview__slugline">
             {item.es_highlight && item.es_highlight.slugline ? (
diff --git a/assets/ui/components/Collapse.jsx b/assets/ui/components/Collapse.tsx
similarity index 93%
rename from assets/ui/components/Collapse.jsx
rename to assets/ui/components/Collapse.tsx
index 35031f2e0..a1c009f84 100644
--- a/assets/ui/components/Collapse.jsx
+++ b/assets/ui/components/Collapse.tsx
@@ -3,8 +3,11 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {gettext} from 'utils';
 
-export class CollapseBoxWithButton extends React.Component {
-    constructor(props) {
+export class CollapseBoxWithButton extends React.Component<any, any> {
+    static propTypes: any;
+    dom: any;
+    collapse: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {open: this.props.initiallyOpen};
diff --git a/assets/ui/components/Content.jsx b/assets/ui/components/Content.tsx
similarity index 90%
rename from assets/ui/components/Content.jsx
rename to assets/ui/components/Content.tsx
index 5b4fe852a..45a79440b 100644
--- a/assets/ui/components/Content.jsx
+++ b/assets/ui/components/Content.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-export default function Content(props) {
+export default function Content(props: any) {
     return (
         <div className={'content--' + props.type} role={gettext('dialog')} aria-label={gettext('Item Detail')}>
             <h3 className="a11y-only">{gettext('Item Detail')}</h3>
diff --git a/assets/ui/components/ContentBar.jsx b/assets/ui/components/ContentBar.tsx
similarity index 92%
rename from assets/ui/components/ContentBar.jsx
rename to assets/ui/components/ContentBar.tsx
index 1c7f4d624..b6ef7fedf 100644
--- a/assets/ui/components/ContentBar.jsx
+++ b/assets/ui/components/ContentBar.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-export default function ContentBar(props) {
+export default function ContentBar(props: any) {
     return (
         <div className='content-bar navbar justify-content-between'>
             <button className='content-bar__menu' onClick={props.onClose} aria-label={gettext('Close')} role='button'>
diff --git a/assets/ui/components/ContentHeader.jsx b/assets/ui/components/ContentHeader.tsx
similarity index 82%
rename from assets/ui/components/ContentHeader.jsx
rename to assets/ui/components/ContentHeader.tsx
index 1c6821a0c..b1bf4a640 100644
--- a/assets/ui/components/ContentHeader.jsx
+++ b/assets/ui/components/ContentHeader.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function ContentHeader(props) {
+export default function ContentHeader(props: any) {
     return (
         <section className='content-header'>
             {props.children}
diff --git a/assets/ui/components/FormToggle.jsx b/assets/ui/components/FormToggle.tsx
similarity index 92%
rename from assets/ui/components/FormToggle.jsx
rename to assets/ui/components/FormToggle.tsx
index 89e1d1260..1af9084f8 100644
--- a/assets/ui/components/FormToggle.jsx
+++ b/assets/ui/components/FormToggle.tsx
@@ -2,8 +2,9 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-export class FormToggle extends React.Component {
-    constructor(props) {
+export class FormToggle extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {
diff --git a/assets/ui/components/MetaTime.jsx b/assets/ui/components/MetaTime.tsx
similarity index 97%
rename from assets/ui/components/MetaTime.jsx
rename to assets/ui/components/MetaTime.tsx
index b06d3a39a..163dfc004 100644
--- a/assets/ui/components/MetaTime.jsx
+++ b/assets/ui/components/MetaTime.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import {bem} from 'ui/utils';
 import {formatTime} from 'utils';
 
-export default function MetaTime({date, borderRight, isRecurring, cssClass}) {
+export default function MetaTime({date, borderRight, isRecurring, cssClass}: any) {
     const metaTimeClass = classNames('time-label', cssClass);
 
     return (
diff --git a/assets/ui/components/PlainText.jsx b/assets/ui/components/PlainText.tsx
similarity index 73%
rename from assets/ui/components/PlainText.jsx
rename to assets/ui/components/PlainText.tsx
index f7c904876..8b55fb0c8 100644
--- a/assets/ui/components/PlainText.jsx
+++ b/assets/ui/components/PlainText.tsx
@@ -2,7 +2,8 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import {getPlainTextMemoized} from 'utils';
 
-export class PlainText extends React.PureComponent {
+export class PlainText extends React.PureComponent<any, any> {
+    static propTypes: any;
     render() {
         return getPlainTextMemoized(this.props.text) || null;
     }
diff --git a/assets/ui/components/Preview.jsx b/assets/ui/components/Preview.tsx
similarity index 96%
rename from assets/ui/components/Preview.jsx
rename to assets/ui/components/Preview.tsx
index a0d6e1de5..3decd95d2 100644
--- a/assets/ui/components/Preview.jsx
+++ b/assets/ui/components/Preview.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import {gettext, formatDate, formatTime} from 'utils';
 
-export default function Preview(props) {
+export default function Preview(props: any) {
     return (
         <div className='wire-column__preview__items' role={gettext('dialog')} aria-label={gettext('Article Preview')}>
             <h3 className="a11y-only">{gettext('Article preview')}</h3>
diff --git a/assets/ui/components/PreviewBox.jsx b/assets/ui/components/PreviewBox.tsx
similarity index 89%
rename from assets/ui/components/PreviewBox.jsx
rename to assets/ui/components/PreviewBox.tsx
index 27f23af21..a7d1ce976 100644
--- a/assets/ui/components/PreviewBox.jsx
+++ b/assets/ui/components/PreviewBox.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function PreviewBox(props) {
+export default function PreviewBox(props: any) {
     return (
         <div className='wire-column__preview__coverage'>
             <div className={props.labelClass || 'wire-column__preview__coverage__headline'}>{props.label}</div>
diff --git a/assets/ui/components/PreviewText.jsx b/assets/ui/components/PreviewText.tsx
similarity index 83%
rename from assets/ui/components/PreviewText.jsx
rename to assets/ui/components/PreviewText.tsx
index c0a426a96..48f2b0bdb 100644
--- a/assets/ui/components/PreviewText.jsx
+++ b/assets/ui/components/PreviewText.tsx
@@ -1,8 +1,11 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 
+interface IProps {
+    text: string;
+}
 
-export function PreviewText({text}) {
+export function PreviewText({text}: IProps) {
     if (text == null || !text.length) {
         return null;
     }
diff --git a/assets/ui/components/ToolTip.jsx b/assets/ui/components/ToolTip.tsx
similarity index 86%
rename from assets/ui/components/ToolTip.jsx
rename to assets/ui/components/ToolTip.tsx
index a7c6b6d94..653e64610 100644
--- a/assets/ui/components/ToolTip.jsx
+++ b/assets/ui/components/ToolTip.tsx
@@ -4,8 +4,11 @@ import {Tooltip} from 'bootstrap';
 
 import {isTouchDevice} from 'utils';
 
-export class ToolTip extends React.PureComponent {
-    constructor(props) {
+export class ToolTip extends React.PureComponent<any, any> {
+    static propTypes: any;
+    tooltip: any;
+    elem: any;
+    constructor(props: any) {
         super(props);
 
         this.tooltip = null;
@@ -43,7 +46,7 @@ export class ToolTip extends React.PureComponent {
     render() {
         return (
             <div
-                ref={(elem) => this.elem = elem}
+                ref={(elem: any) => this.elem = elem}
                 style={{display: 'contents'}}
             >
                 {this.props.children}
diff --git a/assets/ui/selectors.js b/assets/ui/selectors.js
deleted file mode 100644
index b500cb63a..000000000
--- a/assets/ui/selectors.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import {get} from 'lodash';
-import {DEFAULT_ENABLE_GLOBAL_TOPICS} from 'defaults';
-
-const EMPTY_OBJECT = {};
-
-export const uiConfigSelector = (state) => get(state, 'uiConfig') || EMPTY_OBJECT;
-export const previewConfigSelector = (state) => uiConfigSelector(state).preview || EMPTY_OBJECT;
-export const detailsConfigSelector = (state) => uiConfigSelector(state).details || EMPTY_OBJECT;
-export const listConfigSelector = (state) => uiConfigSelector(state).list || EMPTY_OBJECT;
-export const advancedSearchTabsConfigSelector = (state) => uiConfigSelector(state).advanced_search_tabs || EMPTY_OBJECT;
-export const multiSelectTopicsConfigSelector = (state) => uiConfigSelector(state).multi_select_topics || false;
-export const companiesSubscriberIdEnabled = (state) => get(state, 'ui_config.list.sd_subscriber_id.enabled', false);
-export const isSearchEnabled = (state) => uiConfigSelector(state).search || false;
-export const agendaContentLinkTarget = (state) => uiConfigSelector(state).open_coverage_content_in_same_page === true ?
-    '_self' :
-    '_blank';
-
-export const globalTopicsEnabledSelector = (state) => get(
-    uiConfigSelector(state),
-    'enable_global_topics',
-    DEFAULT_ENABLE_GLOBAL_TOPICS
-) === true;
diff --git a/assets/ui/selectors.ts b/assets/ui/selectors.ts
new file mode 100644
index 000000000..9654b497a
--- /dev/null
+++ b/assets/ui/selectors.ts
@@ -0,0 +1,22 @@
+import {get} from 'lodash';
+import {DEFAULT_ENABLE_GLOBAL_TOPICS} from 'defaults';
+
+const EMPTY_OBJECT = {};
+
+export const uiConfigSelector = (state: any) => get(state, 'uiConfig') || EMPTY_OBJECT;
+export const previewConfigSelector = (state: any) => uiConfigSelector(state).preview || EMPTY_OBJECT;
+export const detailsConfigSelector = (state: any) => uiConfigSelector(state).details || EMPTY_OBJECT;
+export const listConfigSelector = (state: any) => uiConfigSelector(state).list || EMPTY_OBJECT;
+export const advancedSearchTabsConfigSelector = (state: any) => uiConfigSelector(state).advanced_search_tabs || EMPTY_OBJECT;
+export const multiSelectTopicsConfigSelector = (state: any) => uiConfigSelector(state).multi_select_topics || false;
+export const companiesSubscriberIdEnabled = (state: any) => get(state, 'ui_config.list.sd_subscriber_id.enabled', false);
+export const isSearchEnabled = (state: any) => uiConfigSelector(state).search || false;
+export const agendaContentLinkTarget = (state: any) => uiConfigSelector(state).open_coverage_content_in_same_page === true ?
+    '_self' :
+    '_blank';
+
+export const globalTopicsEnabledSelector = (state: any) => get(
+    uiConfigSelector(state),
+    'enable_global_topics',
+    DEFAULT_ENABLE_GLOBAL_TOPICS
+) === true;
diff --git a/assets/ui/utils.spec.js b/assets/ui/utils.spec.ts
similarity index 100%
rename from assets/ui/utils.spec.js
rename to assets/ui/utils.spec.ts
diff --git a/assets/ui/utils.js b/assets/ui/utils.ts
similarity index 76%
rename from assets/ui/utils.js
rename to assets/ui/utils.ts
index aea76de02..85664f784 100644
--- a/assets/ui/utils.js
+++ b/assets/ui/utils.ts
@@ -1,7 +1,7 @@
 import {isEmpty} from 'lodash';
 import classNames from 'classnames';
 
-const isNotEmpty = (x) => !isEmpty(x);
+const isNotEmpty = (x: any) => !isEmpty(x);
 
 /**
  * Get bem classes
@@ -11,14 +11,14 @@ const isNotEmpty = (x) => !isEmpty(x);
  * @param {Object} modifier 
  * @return {String}
  */
-export function bem(block, element, modifier) {
+export function bem(block: any, element: any, modifier: any) {
     const main = [block, element].filter(isNotEmpty).join('__');
     const classes = [main];
 
     if (!isEmpty(modifier)) {
         const modifiers = classNames(modifier).split(' ');
 
-        modifiers.forEach((suffix) => {
+        modifiers.forEach((suffix: any) => {
             classes.push(main + '--' + suffix);
         });
     }
diff --git a/assets/user-profile/actions.js b/assets/user-profile/actions.ts
similarity index 74%
rename from assets/user-profile/actions.js
rename to assets/user-profile/actions.ts
index c369eb1e5..9b3328e67 100644
--- a/assets/user-profile/actions.js
+++ b/assets/user-profile/actions.ts
@@ -7,56 +7,56 @@ import {reloadMyTopics as reloadMyAgendaTopics} from '../agenda/actions';
 import {reloadMyTopics as reloadMyWireTopics} from '../wire/actions';
 
 export const GET_TOPICS = 'GET_TOPICS';
-export function getTopics(topics) {
+export function getTopics(topics: any) {
     return {type: GET_TOPICS, topics};
 }
 
 export const GET_USER = 'GET_USER';
-export function getUser(user) {
+export function getUser(user: any) {
     return {type: GET_USER, user};
 }
 
 export const EDIT_USER = 'EDIT_USER';
-export function editUser(event) {
+export function editUser(event: any) {
     return {type: EDIT_USER, event};
 }
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(data) {
+export function initData(data: any) {
     return {type: INIT_DATA, data};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
 export const SELECT_MENU = 'SELECT_MENU';
-export function selectMenu(data) {
-    return function(dispatch) {
+export function selectMenu(data: any): any {
+    return function(dispatch: any) {
         dispatch({type: SELECT_MENU, data});
         dispatch(reloadMyTopics());
     };
 }
 
 export const SET_TOPIC_EDITOR_FULLSCREEN = 'SET_TOPIC_EDITOR_FULLSCREEN';
-export function setTopicEditorFullscreen(fullscreen) {
+export function setTopicEditorFullscreen(fullscreen: any) {
     return {type: SET_TOPIC_EDITOR_FULLSCREEN, payload: fullscreen};
 }
 
 export const SELECT_MENU_ITEM = 'SELECT_MENU_ITEM';
-export function selectMenuItem(item) {
+export function selectMenuItem(item: any) {
     return {type: SELECT_MENU_ITEM, item};
 }
 
-export function createOrUpdateTopic(menu, item, fullscreen) {
+export function createOrUpdateTopic(menu: any, item: any, fullscreen: any) {
     userProfileStore.dispatch(selectMenuItem(item));
     userProfileStore.dispatch(selectMenu(menu));
     userProfileStore.dispatch(setTopicEditorFullscreen(fullscreen));
 }
 
 export const SELECT_PROFILE_MENU = 'SELECT_PROFILE_MENU';
-export function selectProfileMenu({menu, item}) {
+export function selectProfileMenu({menu, item}: any) {
     userProfileStore.dispatch({
         type: SELECT_PROFILE_MENU,
         menu: menu,
@@ -78,13 +78,13 @@ export function hideModal() {
 /**
  * Fetches user details
  */
-export function fetchUser(id) {
-    return function (dispatch) {
+export function fetchUser(id: any) {
+    return function (dispatch: any) {
         return server.get(`/users/${id}`)
-            .then((data) => {
+            .then((data: any) => {
                 dispatch(getUser(data));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -93,9 +93,9 @@ export function fetchUser(id) {
  *
  */
 export function saveUser() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
-        const editedUser = {...getState().editedUser};
+        const editedUser: any = {...getState().editedUser};
         const url = `/users/${editedUser._id}/profile`;
 
         // Remove ``sections`` and ``products`` as these aren't managed in the ``UserProfile`` app
@@ -114,7 +114,7 @@ export function saveUser() {
                     );
                 }
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
@@ -124,12 +124,12 @@ export function saveUser() {
  *
  */
 export function fetchTopics() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         return server.get(`/users/${getState().user._id}/topics`)
-            .then((data) => {
+            .then((data: any) => {
                 return dispatch(getTopics(data._items));
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -137,15 +137,15 @@ export function fetchTopics() {
  * Deletes the given followed topic
  *
  */
-export function deleteTopic(topic) {
-    return function (dispatch) {
+export function deleteTopic(topic: any) {
+    return function (dispatch: any) {
         const url = `/topics/${topic._id}`;
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('Topic deleted successfully'));
                 dispatch(fetchTopics());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
@@ -154,13 +154,13 @@ export function deleteTopic(topic) {
  *
  * @return {function}
  */
-export function shareTopic(items) {
-    return (dispatch, getState) => {
+export function shareTopic(items: any) {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         const company = getState().company;
         return server.get(`/companies/${company}/users`)
-            .then((users) => users.filter((u) => u._id !== user._id))
-            .then((users) => dispatch(renderModal('shareItem', {items, users})))
+            .then((users: any) => users.filter((u: any) => u._id !== user._id))
+            .then((users: any) => dispatch(renderModal('shareItem', {items, users})))
             .catch(errorHandler);
     };
 }
@@ -170,8 +170,8 @@ export function shareTopic(items) {
  *
  * @param {Object} data
  */
-export function submitShareTopic(data) {
-    return (dispatch) => {
+export function submitShareTopic(data: any) {
+    return (dispatch: any) => {
         return server.post('/topic_share', data)
             .then(() => {
                 notify.success(gettext('Topic was shared successfully.'));
@@ -186,8 +186,8 @@ export function submitShareTopic(data) {
  * Updates a followed topic
  *
  */
-export function submitFollowTopic(topic) {
-    return (dispatch) => {
+export function submitFollowTopic(topic: any) {
+    return (dispatch: any) => {
         const url = `/topics/${topic._id}`;
         return server.post(url, topic)
             .then(() => dispatch(fetchTopics()))
@@ -197,15 +197,15 @@ export function submitFollowTopic(topic) {
 }
 
 function reloadMyTopics() {
-    return function(dispatch, getState) {
+    return function(dispatch: any, getState: any) {
         const reloadMyTopicsFunction = getState().selectedMenu === 'events' ? reloadMyAgendaTopics : reloadMyWireTopics;
 
         return dispatch(reloadMyTopicsFunction());
     };
 }
 
-export function pushNotification(push) {
-    return (dispatch, getState) => {
+export function pushNotification(push: any): any {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         const company = getState().company;
         const shouldReloadTopics = [
@@ -221,7 +221,7 @@ export function pushNotification(push) {
     };
 }
 
-function getFoldersUrl(state, global, id) {
+function getFoldersUrl(state: any, global: any, id?: any) {
     const baseUrl = global ?
         `/api/companies/${state.company}/topic_folders` :
         `/api/users/${state.user._id}/topic_folders`;
@@ -229,7 +229,7 @@ function getFoldersUrl(state, global, id) {
     return id != null ? `${baseUrl}/${id}` : baseUrl;
 }
 
-function mergeUpdates(updates, response) {
+function mergeUpdates(updates: any, response: any) {
     updates._id = response._id;
     updates._etag = response._etag;
     updates._status = response._status;
@@ -237,8 +237,8 @@ function mergeUpdates(updates, response) {
 }
 
 export const FOLDER_UPDATED = 'FOLDER_UPDATED';
-export function saveFolder(folder, data, global) {
-    return (dispatch, getState) => {
+export function saveFolder(folder: any, data: any, global: any) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const url = getFoldersUrl(state, global, folder._id);
 
@@ -261,8 +261,8 @@ export function saveFolder(folder, data, global) {
 }
 
 export const FOLDER_DELETED = 'FOLDER_DELETED';
-export function deleteFolder(folder, global, deleteTopics) {
-    return (dispatch, getState) => {
+export function deleteFolder(folder: any, global: boolean, deleteTopics?: boolean) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const url = getFoldersUrl(state, global, folder._id);
 
@@ -281,8 +281,8 @@ export const RECIEVE_FOLDERS = 'RECIEVE_FOLDERS';
  * @param {bool} global - fetch company or user folders
  * @param {bool} skipDispatch - if true it won't replace folders in store
  */
-export function fetchFolders(global, skipDispatch) {
-    return (dispatch, getState) => {
+export function fetchFolders(global: boolean, skipDispatch?: boolean) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const url = getFoldersUrl(state, global);
 
@@ -300,14 +300,14 @@ export function fetchFolders(global, skipDispatch) {
 }
 
 export const TOPIC_UPDATED = 'TOPIC_UPDATED';
-export function moveTopic(topicId, folder) {
-    return (dispatch, getState) => {
+export function moveTopic(topicId: any, folder: any) {
+    return (dispatch: any, getState: any) => {
         const updates = {
             folder: folder != null ? folder._id : null,
         };
 
         const state = getState();
-        const topic = state.topics.find((topic) => topic._id === topicId);
+        const topic = state.topics.find((topic: any) => topic._id === topicId);
         const url = `/api/users/${topic.user}/topics/${topicId}`;
 
         return server.patch(url, updates, topic._etag).then((response) => {
diff --git a/assets/user-profile/components/ProfileToggle.jsx b/assets/user-profile/components/ProfileToggle.tsx
similarity index 81%
rename from assets/user-profile/components/ProfileToggle.jsx
rename to assets/user-profile/components/ProfileToggle.tsx
index 404bc3372..b6869ae07 100644
--- a/assets/user-profile/components/ProfileToggle.jsx
+++ b/assets/user-profile/components/ProfileToggle.tsx
@@ -4,8 +4,11 @@ import {Tooltip} from 'bootstrap';
 
 import {isTouchDevice} from '../../utils';
 
-class ProfileToggle extends React.Component {
-    constructor(props) {
+class ProfileToggle extends React.Component<any, any> {
+    static propTypes: any;
+    tooltip: any;
+    elem: any;
+    constructor(props: any) {
         super(props);
 
         this.tooltip = null;
@@ -27,13 +30,13 @@ class ProfileToggle extends React.Component {
         const initials = this.props.user.first_name[0].toLocaleUpperCase() + this.props.user.last_name[0].toLocaleUpperCase();
 
         return (
-            <div className="header-profile" onClick={(event) => {
+            <div className="header-profile" onClick={(event: any) => {
                 event.preventDefault();
                 this.props.onClick();
             }}>
                 <figure className="header-profile__avatar">
                     <span className="header-profile__characters"
-                        ref={(elem) => this.elem = elem}
+                        ref={(elem: any) => this.elem = elem}
                         title={`${this.props.user.first_name} ${this.props.user.last_name}`}
                     >{initials}</span>
                 </figure>
diff --git a/assets/user-profile/components/UserProfileApp.jsx b/assets/user-profile/components/UserProfileApp.tsx
similarity index 81%
rename from assets/user-profile/components/UserProfileApp.jsx
rename to assets/user-profile/components/UserProfileApp.tsx
index 499781668..71cd32ec3 100644
--- a/assets/user-profile/components/UserProfileApp.jsx
+++ b/assets/user-profile/components/UserProfileApp.tsx
@@ -28,10 +28,12 @@ import ProfileToggle from './ProfileToggle';
 import '../style';
 import {isUserAdmin} from '../../users/utils';
 
-const modals = {shareItem: ShareItemModal};
+const modals: any = {shareItem: ShareItemModal};
 
-class UserProfileApp extends React.Component {
-    constructor(props, context) {
+class UserProfileApp extends React.Component<any, any> {
+    static propTypes: any;
+    links: any;
+    constructor(props: any, context: any) {
         super(props, context);
         this.links = [
             {
@@ -44,7 +46,7 @@ class UserProfileApp extends React.Component {
         if (this.isSectionEnabled('wire')) {
             this.links.push({
                 name: 'topics',
-                label: gettext('My {{ section }} Topics', {section: sectionNames.wire}),
+                label: gettext('My {{ section }} Topics', {section: window.sectionNames.wire}),
                 content: FollowedTopics,
                 type: 'wire',
             });
@@ -53,7 +55,7 @@ class UserProfileApp extends React.Component {
         if (this.isSectionEnabled('agenda')) {
             this.links.push({
                 name: 'events',
-                label: gettext('My {{ section }} Topics', {section: sectionNames.agenda}),
+                label: gettext('My {{ section }} Topics', {section: window.sectionNames.agenda}),
                 content: FollowedTopics,
                 type: 'agenda',
             });
@@ -62,23 +64,23 @@ class UserProfileApp extends React.Component {
         if (this.isSectionEnabled('monitoring')) {
             this.links.push({
                 name: 'monitoring',
-                label: gettext('My {{ monitoring }}', sectionNames),
+                label: gettext('My {{ monitoring }}', window.sectionNames),
                 content: FollowedTopics,
                 type: 'monitoring',
             });
         }
     }
 
-    isSectionEnabled(name) {
-        return isUserAdmin(this.props.user) || !!get(this.props, 'userSections', []).find((s) => s._id === name);
+    isSectionEnabled(name: any) {
+        return isUserAdmin(this.props.user) || !!get(this.props, 'userSections', []).find((s: any) => s._id === name);
     }
 
-    renderModal(specs) {
+    renderModal(specs: any) {
         if (specs) {
             const Modal = modals[specs.modal];
             return ReactDOM.createPortal(
                 <Modal data={{...specs.data, isTopic: true}} />,
-                document.getElementById('modal-container')
+                document.getElementById('modal-container') as any
             );
         }
     }
@@ -91,21 +93,21 @@ class UserProfileApp extends React.Component {
     }
 
     renderProfile() {
-        const links = this.links.map((link) => {
+        const links = this.links.map((link: any) => {
             link.active = link.name === this.props.selectedMenu;
             return link;
         });
 
         const modal = this.renderModal(this.props.modal);
-        const ActiveContent = links.find((link) => link.active).content;
-        const topicType = links.find((link) => link.active).type;
+        const ActiveContent = links.find((link: any) => link.active).content;
+        const topicType = links.find((link: any) => link.active).type;
 
         return (
             <div
                 data-test-id="profile-container"
                 className="profile-container"
                 role={gettext('dialog')}
-                aria-label={links.find((link) => link.active).label}
+                aria-label={links.find((link: any) => link.active).label}
             >
                 <div className="profileWrap">
                     <div className="profile__mobile-close d-md-none">
@@ -125,7 +127,7 @@ class UserProfileApp extends React.Component {
                     <div className="profile__profile-content">
                         <section className="profile__profile-content-header">
                             <h5 className="profile__profile-content-title">
-                                {links.find((link) => link.active).label}
+                                {links.find((link: any) => link.active).label}
                             </h5>
                             <button className="profile__profile-content-close" aria-label={gettext('Close')} role="button" onClick={this.hideModal}>
                                 <i className="icon--close-thin" />
@@ -144,7 +146,7 @@ class UserProfileApp extends React.Component {
     render() {
         const profile = ReactDOM.createPortal(
             this.props.displayModal ? this.renderProfile() : null,
-            document.getElementById('user-profile-app')
+            document.getElementById('user-profile-app') as any
         );
 
         const overlay = this.props.dropdown && (
@@ -162,9 +164,9 @@ class UserProfileApp extends React.Component {
                         {`${this.props.user.first_name} ${this.props.user.last_name}`}
                     </div>
                     <ul className="list-group list-group-flush">
-                        {this.links.map((link) => (
+                        {this.links.map((link: any) => (
                             <li key={link.name} className="list-group-item list-group-item--link">
-                                <a href="" onClick={(e) => this.props.selectMenu(e, link.name)}>{link.label}
+                                <a href="" onClick={(e: any) => this.props.selectMenu(e, link.name)}>{link.label}
                                     <i className="svg-icon--arrow-right" /></a>
                             </li>
                         ))}
@@ -176,7 +178,7 @@ class UserProfileApp extends React.Component {
             </div>
         );
 
-        const toggle = document.getElementById('header-profile-toggle');
+        const toggle: any = document.getElementById('header-profile-toggle');
 
         if (this.props.dropdown) {
             toggle.classList.add('show');
@@ -208,7 +210,7 @@ UserProfileApp.propTypes = {
     hideModal: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     user: userSelector(state),
     modal: state.modal,
     dropdown: state.dropdown,
@@ -217,10 +219,12 @@ const mapStateToProps = (state) => ({
     userSections: userSectionsSelector(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectMenu: (event, name) => {event.preventDefault(); dispatch(selectMenu(name));},
+const mapDispatchToProps = (dispatch: any) => ({
+    selectMenu: (event: any, name: any) => {event.preventDefault(); dispatch(selectMenu(name));},
     toggleDropdown: () => dispatch(toggleDropdown()),
     hideModal: () => dispatch(hideModal()),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(UserProfileApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(UserProfileApp);
+
+export default component;
diff --git a/assets/user-profile/components/UserProfileAvatar.jsx b/assets/user-profile/components/UserProfileAvatar.tsx
similarity index 89%
rename from assets/user-profile/components/UserProfileAvatar.jsx
rename to assets/user-profile/components/UserProfileAvatar.tsx
index be8c7d4f4..4d2f7bdba 100644
--- a/assets/user-profile/components/UserProfileAvatar.jsx
+++ b/assets/user-profile/components/UserProfileAvatar.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-function UserProfileAvatar({user}) {
+function UserProfileAvatar({user}: any) {
     const initials = [user.first_name, user.last_name]
-        .map((name) => name[0].toLocaleUpperCase())
+        .map((name: any) => name[0].toLocaleUpperCase())
         .join('');
     return (
         <div className="profile__group profile__group--dark-bck">
diff --git a/assets/user-profile/components/UserProfileMenu.jsx b/assets/user-profile/components/UserProfileMenu.tsx
similarity index 81%
rename from assets/user-profile/components/UserProfileMenu.jsx
rename to assets/user-profile/components/UserProfileMenu.tsx
index c0daf1909..396062ad9 100644
--- a/assets/user-profile/components/UserProfileMenu.jsx
+++ b/assets/user-profile/components/UserProfileMenu.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-function UserProfileMenu({links, onClick}) {
+function UserProfileMenu({links, onClick}: any) {
     return (
         <div className="profile__side-navigation__items">
-            {links.map((link) => (
+            {links.map((link: any) => (
                 <a key={link.name}
                     href="#"
                     className={`nh-button w-100 nh-button--${link.active ? 'primary' : 'secondary'}`}
-                    name={link.name}
+                    title={link.name}
                     onClick={(event) => onClick(event, link.name)}
                 >{link.label}</a>
             ))}
diff --git a/assets/user-profile/components/profile/UserProfile.jsx b/assets/user-profile/components/profile/UserProfile.tsx
similarity index 94%
rename from assets/user-profile/components/profile/UserProfile.jsx
rename to assets/user-profile/components/profile/UserProfile.tsx
index 205da94ca..c1fbe08b3 100644
--- a/assets/user-profile/components/profile/UserProfile.jsx
+++ b/assets/user-profile/components/profile/UserProfile.tsx
@@ -15,15 +15,16 @@ import {
     setError,
 } from '../../actions';
 
-class UserProfile extends React.Component {
-    constructor(props) {
+class UserProfile extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.save = this.save.bind(this);
     }
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.user.first_name) {
             errors.first_name = [gettext('Please provide first name')];
@@ -39,7 +40,7 @@ class UserProfile extends React.Component {
         return valid;
     }
 
-    save(event) {
+    save(event: any) {
         event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -172,16 +173,16 @@ UserProfile.propTypes = {
     fetchUser: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     user: state.editedUser,
     errors: state.errors,
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch: any) => ({
     saveUser: () => dispatch(saveUser()),
-    fetchUser: (id) => dispatch(fetchUser(id)),
-    onChange: (event) => dispatch(editUser(event)),
-    setError: (errors) => dispatch(setError(errors)),
+    fetchUser: (id: any) => dispatch(fetchUser(id)),
+    onChange: (event: any) => dispatch(editUser(event)),
+    setError: (errors: any) => dispatch(setError(errors)),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(UserProfile);
diff --git a/assets/user-profile/index.js b/assets/user-profile/index.ts
similarity index 86%
rename from assets/user-profile/index.js
rename to assets/user-profile/index.ts
index de49d99c3..ab8954614 100644
--- a/assets/user-profile/index.js
+++ b/assets/user-profile/index.ts
@@ -1,4 +1,5 @@
-import {render, isWireContext, initWebSocket} from 'utils';
+import {render, isWireContext} from 'utils';
+import {initWebSocket} from 'websocket';
 import UserProfileApp from './components/UserProfileApp';
 import {initData, selectMenu, pushNotification} from './actions';
 import {store} from './store';
diff --git a/assets/user-profile/reducers.js b/assets/user-profile/reducers.ts
similarity index 92%
rename from assets/user-profile/reducers.js
rename to assets/user-profile/reducers.ts
index fa9f4f428..f3ce9f88a 100644
--- a/assets/user-profile/reducers.js
+++ b/assets/user-profile/reducers.ts
@@ -22,7 +22,7 @@ import {modalReducer} from 'reducers';
 import {GET_NAVIGATIONS, QUERY_NAVIGATIONS} from 'navigations/actions';
 import {SET_TOPICS} from '../search/actions';
 
-const initialState = {
+const initialState: any = {
     user: null,
     editedUser: null,
     company: null,
@@ -40,13 +40,13 @@ const initialState = {
     folders: [],
 };
 
-export default function itemReducer(state = initialState, action) {
+export default function itemReducer(state: any = initialState, action: any) {
     let newSelected, newState;
     switch (action.type) {
 
     case GET_TOPICS: {
         const topicsById = Object.assign({}, state.topicsById);
-        const topics = action.topics.map((topic) => {
+        const topics = action.topics.map((topic: any) => {
             topicsById[topic._id] = topic;
             return topic;
         });
@@ -172,7 +172,7 @@ export default function itemReducer(state = initialState, action) {
         return {...state, monitoringProfileUsers: action.data};
 
     case SET_USER_COMPANY_MONITORING_LIST:
-        newSelected = state.selectedItem && (action.data || []).find((w) => w._id === state.selectedItem._id);
+        newSelected = state.selectedItem && (action.data || []).find((w: any) => w._id === state.selectedItem._id);
         newState = {
             ...state,
             monitoringList: action.data,
@@ -200,11 +200,11 @@ export default function itemReducer(state = initialState, action) {
             ...state,
             folders: action.payload,
         };
- 
+
     case TOPIC_UPDATED:
         return {
             ...state,
-            topics: state.topics.map((topic) => {
+            topics: state.topics.map((topic: any) => {
                 if (topic._id !== action.payload.topic._id) {
                     return topic;
                 }
@@ -212,11 +212,11 @@ export default function itemReducer(state = initialState, action) {
                 return {...topic, ...action.payload.updates};
             }),
         };
-    
+
     case FOLDER_UPDATED:
         return {
             ...state,
-            folders: state.folders.map((folder) => {
+            folders: state.folders.map((folder: any) => {
                 if (folder._id !== action.payload.folder._id) {
                     return folder;
                 }
@@ -224,11 +224,11 @@ export default function itemReducer(state = initialState, action) {
                 return {...folder, ...action.payload.updates};
             }),
         };
-    
+
     case FOLDER_DELETED:
         return {
             ...state,
-            folders: state.folders.filter((folder) => folder._id !== action.payload.folder._id),
+            folders: state.folders.filter((folder: any) => folder._id !== action.payload.folder._id),
         };
 
     default:
diff --git a/assets/user-profile/selectors.js b/assets/user-profile/selectors.js
deleted file mode 100644
index 1c03b8b5c..000000000
--- a/assets/user-profile/selectors.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import {get} from 'lodash';
-import {DEFAULT_ENABLE_GLOBAL_TOPICS} from 'defaults';
-
-const MENU_SECTION_MAPPING = {
-    topics: 'wire',
-    events: 'agenda',
-    monitoring: 'monitoring',
-};
-
-export const userSelector = (state) => get(state, 'user');
-export const selectedMenuSelector = (state) => get(state, 'selectedMenu');
-export const selectedItemSelector = (state) => get(state, 'selectedItem');
-export const displayModelSelector = (state) => get(state, 'displayModal');
-export const userSectionsSelector = (state) => get(state, 'userSections');
-export const topicEditorFullscreenSelector = (state) => get(state, 'editorFullscreen') || false;
-export const sectionSelector = (state) => MENU_SECTION_MAPPING[state.selectedMenu];
-export const foldersSelector = (state) => {
-    const activeSection = sectionSelector(state);
-
-    return state.folders.filter((folder) => folder.section === activeSection); 
-};
-
-export const uiContextConfigSelector = (state, context) => get(state, `uiConfigs.${context}`) || {};
-export const globalTopicsEnabledSelector = (state, context) => context === 'monitoring' ? false : get(
-    state,
-    `uiConfigs.${context}.enable_global_topics`,
-    DEFAULT_ENABLE_GLOBAL_TOPICS
-) === true && get(state, 'user.company.length') > 0;
diff --git a/assets/user-profile/selectors.ts b/assets/user-profile/selectors.ts
new file mode 100644
index 000000000..b22715940
--- /dev/null
+++ b/assets/user-profile/selectors.ts
@@ -0,0 +1,28 @@
+import {get} from 'lodash';
+import {DEFAULT_ENABLE_GLOBAL_TOPICS} from 'defaults';
+
+const MENU_SECTION_MAPPING: any = {
+    topics: 'wire',
+    events: 'agenda',
+    monitoring: 'monitoring',
+};
+
+export const userSelector = (state: any) => get(state, 'user');
+export const selectedMenuSelector = (state: any) => get(state, 'selectedMenu');
+export const selectedItemSelector = (state: any) => get(state, 'selectedItem');
+export const displayModelSelector = (state: any) => get(state, 'displayModal');
+export const userSectionsSelector = (state: any) => get(state, 'userSections');
+export const topicEditorFullscreenSelector = (state: any) => get(state, 'editorFullscreen') || false;
+export const sectionSelector = (state: any) => MENU_SECTION_MAPPING[state.selectedMenu];
+export const foldersSelector = (state: any) => {
+    const activeSection = sectionSelector(state);
+
+    return state.folders.filter((folder: any) => folder.section === activeSection);
+};
+
+export const uiContextConfigSelector = (state: any, context: any) => get(state, `uiConfigs.${context}`) || {};
+export const globalTopicsEnabledSelector = (state: any, context: any) => context === 'monitoring' ? false : get(
+    state,
+    `uiConfigs.${context}.enable_global_topics`,
+    DEFAULT_ENABLE_GLOBAL_TOPICS
+) === true && get(state, 'user.company.length') > 0;
diff --git a/assets/user-profile/store.js b/assets/user-profile/store.ts
similarity index 100%
rename from assets/user-profile/store.js
rename to assets/user-profile/store.ts
diff --git a/assets/user-profile/style.js b/assets/user-profile/style.ts
similarity index 100%
rename from assets/user-profile/style.js
rename to assets/user-profile/style.ts
diff --git a/assets/users/actions.js b/assets/users/actions.ts
similarity index 65%
rename from assets/users/actions.js
rename to assets/users/actions.ts
index 3356092f4..65c97e994 100644
--- a/assets/users/actions.js
+++ b/assets/users/actions.ts
@@ -2,35 +2,37 @@ import {gettext, notify, errorHandler} from 'utils';
 import server from 'server';
 import {searchQuerySelector} from 'search/selectors';
 import {get, cloneDeep} from 'lodash';
+import {cleanUserEntityBeforePatch} from './utils';
+import {IUser} from 'interfaces/user';
 
 export const SELECT_USER = 'SELECT_USER';
-export function selectUser(id) {
-    return function (dispatch) {
+export function selectUser(id: any) {
+    return function (dispatch: any) {
         dispatch(select(id));
     };
 }
 
-function select(id) {
+function select(id: any) {
     return {type: SELECT_USER, id};
 }
 
 export const GET_USER = 'GET_USER';
-export function getUser(user) {
+export function getUser(user: any) {
     return {type: GET_USER, user};
 }
 
 export const EDIT_USER = 'EDIT_USER';
-export function editUser(event) {
+export function editUser(event: any) {
     return {type: EDIT_USER, event};
 }
 
 export const NEW_USER = 'NEW_USER';
-export function newUser(data) {
+export function newUser(data?: any) {
     return {type: NEW_USER, data};
 }
 
 export const CANCEL_EDIT = 'CANCEL_EDIT';
-export function cancelEdit(event) {
+export function cancelEdit(event?: any) {
     return {type: CANCEL_EDIT, event};
 }
 
@@ -40,32 +42,32 @@ export function queryUsers() {
 }
 
 export const GET_USERS = 'GET_USERS';
-export function getUsers(data) {
+export function getUsers(data: any) {
     return {type: GET_USERS, data};
 }
 
 export const REMOVE_USER = 'REMOVE_USER';
-function removeUser(userId) {
+function removeUser(userId: any) {
     return {type: REMOVE_USER, userId: userId};
 }
 
 export const GET_COMPANIES = 'GET_COMPANIES';
-export function getCompanies(data) {
+export function getCompanies(data: any) {
     return {type: GET_COMPANIES, data};
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
 export const SET_COMPANY = 'SET_COMPANY';
-export function setCompany(company) {
+export function setCompany(company: any) {
     return {type: SET_COMPANY, company};
 }
 
 export const SET_SORT = 'SET_SORT';
-export function setSort(param) {
+export function setSort(param: any) {
     return {type: SET_SORT, param};
 }
 
@@ -79,11 +81,11 @@ export function toggleSortDirection() {
  *
  */
 export function fetchUsers() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
         dispatch(queryUsers());
         const state = getState();
         const query = searchQuerySelector(state) || '';
-        const filterQuery = {};
+        const filterQuery: any = {};
 
         if (state.company && state.company !== '') {
             filterQuery.company = state.company;
@@ -103,30 +105,47 @@ export function fetchUsers() {
             `&sort=[("${sortField}", ${getState().sortDirection}), ("first_name", 1)]`;
 
         return server.get(`/users/search?q=${query}${filter}${sort}`)
-            .then((data) => dispatch(getUsers(data)))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .then((data: any) => dispatch(getUsers(data)))
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
+export function updateUser(updates: Partial<IUser>) {
+    return function (dispatch: any, getState: any) {
+
+        const user = cloneDeep(getState().currentUser);
+        const url = `api/_users/${user._id}`;
+
+        const _etag = user._etag;
+
+        return server.patchEntity(url, cleanUserEntityBeforePatch(updates), _etag)
+            .then((updated) => {
+                notify.success(gettext('Personalized dashboard saved!'));
+                window.location.reload(); // reload the page to show the updated dashboard
+            })
+            .catch((error: any) => errorHandler(error, dispatch, setError));
+
+    };
+}
 
 /**
  * Creates new users
  *
  */
 export function postUser() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const user = cloneDeep(getState().userToEdit);
         const url = `/users/${user._id ? user._id : 'new'}`;
 
         if (user.sections != null) {
             user.sections = Object.keys(user.sections)
-                .filter((sectionId) => user.sections[sectionId] === true)
+                .filter((sectionId: any) => user.sections[sectionId] === true)
                 .join(',');
         }
         if (user.products != null) {
             user.products = user.products
-                .map((product) => product._id)
+                .map((product: any) => product._id)
                 .join(',');
         }
 
@@ -139,21 +158,21 @@ export function postUser() {
                 }
                 dispatch(fetchUsers());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
 
 
 export function resetPassword() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const user = getState().userToEdit;
         const url = `/users/${user._id}/reset_password`;
 
         return server.post(url, {})
             .then(() => notify.success(gettext('Reset password token is sent successfully')))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
 
     };
 }
@@ -163,36 +182,36 @@ export function resetPassword() {
  *
  */
 export function deleteUser() {
-    return function (dispatch, getState) {
+    return function (dispatch: any, getState: any) {
 
         const user = getState().userToEdit;
         const userId = user._id;
         const url = `/users/${userId}`;
 
-        return server.del(url)
+        return (server as any).del(url)
             .then(() => {
                 notify.success(gettext('User deleted successfully'));
                 dispatch(removeUser(userId));
                 dispatch(fetchUsers());
             })
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 export function resendUserInvite() {
-    return function(dispatch, getState) {
+    return function(dispatch: any, getState: any) {
         const user = getState().userToEdit;
         const url = `/users/${user._id}/resend_invite`;
 
         return server.post(url, {})
             .then(() => notify.success(gettext('Invitation as been resent')))
-            .catch((error) => errorHandler(error, dispatch, setError));
+            .catch((error: any) => errorHandler(error, dispatch, setError));
     };
 }
 
 export const INIT_VIEW_DATA = 'INIT_VIEW_DATA';
-export function initViewData(data) {
-    return function (dispatch) {
+export function initViewData(data: any): any {
+    return function (dispatch: any) {
         dispatch({type: INIT_VIEW_DATA, data});
         dispatch(getUsers(data.users));
         dispatch(getCompanies(data.companies));
diff --git a/assets/users/components/EditUser.jsx b/assets/users/components/EditUser.tsx
similarity index 84%
rename from assets/users/components/EditUser.jsx
rename to assets/users/components/EditUser.tsx
index 30f508ca0..c15d31006 100644
--- a/assets/users/components/EditUser.jsx
+++ b/assets/users/components/EditUser.tsx
@@ -17,7 +17,7 @@ import {getUserStateLabelDetails} from 'company-admin/components/CompanyUserList
 
 import {companyProductSeatsSelector, companySectionListSelector, sectionListSelector} from 'company-admin/selectors';
 
-const getCompanyOptions = (companies) => companies.map(company => ({value: company._id, text: company.name}));
+const getCompanyOptions = (companies: any) => companies.map((company: any) => ({value: company._id, text: company.name}));
 
 function EditUserComponent({
     original,
@@ -37,22 +37,22 @@ function EditUserComponent({
     companySections,
     seats,
     resendUserInvite,
-}) {
+}: any) {
     const companyId = user.company;
     const localeOptions = getLocaleInputOptions();
     const stateLabelDetails = getUserStateLabelDetails(user);
     const companyProductIds = companyId != null ?
         Object.keys(seats[companyId] || {}) :
-        products.map((product) => product._id);
+        products.map((product: any) => product._id);
     const sections = companyId != null ?
         companySections[companyId] || [] :
         allSections;
-    const companySectionIds = sections.map((section) => section._id);
+    const companySectionIds = sections.map((section: any) => section._id);
     const currentUserIsAdmin = isUserAdmin(currentUser);
     const isCompanyAdmin = isUserCompanyAdmin(currentUser);
     const userIsAdmin = isUserAdmin(user);
 
-    let company = companies.map((value)=> value.name);
+    const company = companies.map((value: any)=> value.name);
 
     return (
         <div
@@ -76,7 +76,7 @@ function EditUserComponent({
             <div className="list-item__preview-content">
                 {toolbar ? toolbar : (
                     <div className="list-item__preview-toolbar">
-                        <div>
+                        <div className="list-item__preview-toolbar-left">
                             <label className={`label label--${stateLabelDetails.colour} label--big label--rounded`}>
                                 {stateLabelDetails.text}
                             </label>
@@ -85,22 +85,38 @@ function EditUserComponent({
                                     {gettext('admin')}
                                 </label>
                             )}
-                        </div>
-                        {(user._id == null || user.is_validated === true) ? null : (
-                            <button
-                                type="button"
-                                className="nh-button nh-button--tertiary nh-button--small"
-                                aria-label={gettext('Resend Invite')}
-                                onClick={(event) => {
-                                    event.preventDefault();
+                            {(user._id == null || user.is_validated === true) ? null : (
+                                <button
+                                    type="button"
+                                    className="icon-button icon-button--small icon-button--secondary"
+                                    aria-label={gettext('Resend Invite')}
+                                    title={gettext('Resend Invite')}
+                                    onClick={(event: any) => {
+                                        event.preventDefault();
 
-                                    if (confirm(gettext('Would you like to resend the invitation for {{ email }}?', {email: user.email}))) {
-                                        resendUserInvite();
-                                    }
-                                }}
-                            >
-                                {gettext('Resend Invite')}
-                            </button>
+                                        if (confirm(gettext('Would you like to resend the invitation for {{ email }}?', {email: user.email}))) {
+                                            resendUserInvite();
+                                        }
+                                    }}
+                                >
+                                    <i className="icon--refresh" role="presentation"></i>
+                                </button>
+                            )}
+                        </div>
+                        {(currentUserIsAdmin && user._id != null && user._id !== currentUser._id) && (
+                            <div className="list-item__preview-toolbar-right">
+                                <form method="POST" action={'/auth/impersonate'}>
+                                    <input type="hidden" name="user" value={user._id} />
+                                    <button
+                                        type="submit"
+                                        className="nh-button nh-button--tertiary nh-button--small"
+                                        aria-label={gettext('Impersonate User')}
+                                        data-test-id="impersonate-user-btn"
+                                    >
+                                        {gettext('Impersonate User')}
+                                    </button>
+                                </form>
+                            </div>
                         )}
                     </div>
                 )}
@@ -194,7 +210,7 @@ function EditUserComponent({
                                 title={gettext('Sections')}
                                 testId="toggle--sections"
                             >
-                                {sections.filter((section) => companySectionIds.includes(section._id)).map((section) => (
+                                {sections.filter((section: any) => companySectionIds.includes(section._id)).map((section: any) => (
                                     <div className="list-item__preview-row" key={section._id}>
                                         <div className="form-group">
                                             <CheckboxInput
@@ -219,18 +235,18 @@ function EditUserComponent({
                                         {gettext('Select All')}
                                     </button>
                                 </div> : null}
-                                {sections.filter((section) => (
+                                {sections.filter((section: any) => (
                                     companySectionIds.includes(section._id) &&
                                     get(user, `sections.${section._id}`) === true
-                                )).map((section) => (
+                                )).map((section: any) => (
                                     <React.Fragment key={section._id}>
                                         <div className="list-item__preview-subheading">
                                             {section.name}
                                         </div>
                                         {products.filter(
-                                            (product) => product.product_type === section._id &&
+                                            (product: any) => product.product_type === section._id &&
                                                 companyProductIds.includes(product._id)
-                                        ).map((product) => (
+                                        ).map((product: any) => (
                                             <EditUserProductPermission
                                                 key={product._id}
                                                 original={original}
@@ -344,12 +360,12 @@ EditUserComponent.defaultProps = {
     hideFields: [],
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     allSections: sectionListSelector(state),
     companySections: companySectionListSelector(state),
     seats: companyProductSeatsSelector(state),
 });
 
-const EditUser = connect(mapStateToProps)(EditUserComponent);
+const EditUser: React.ComponentType<any> = connect(mapStateToProps)(EditUserComponent);
 
 export default EditUser;
diff --git a/assets/users/components/EditUserProductPermission.jsx b/assets/users/components/EditUserProductPermission.tsx
similarity index 97%
rename from assets/users/components/EditUserProductPermission.jsx
rename to assets/users/components/EditUserProductPermission.tsx
index 930318310..d1632567e 100644
--- a/assets/users/components/EditUserProductPermission.jsx
+++ b/assets/users/components/EditUserProductPermission.tsx
@@ -5,7 +5,7 @@ import classNames from 'classnames';
 import {isProductEnabled} from 'companies/utils';
 import CheckboxInput from 'components/CheckboxInput';
 
-export function EditUserProductPermission({original, user, section, product, seats, onChange}) {
+export function EditUserProductPermission({original, user, section, product, seats, onChange}: any): any {
     const maxSeats = user.company != null ?
         seats[user.company][product._id].max_seats :
         null;
diff --git a/assets/users/components/UserListItem.jsx b/assets/users/components/UserListItem.tsx
similarity index 93%
rename from assets/users/components/UserListItem.jsx
rename to assets/users/components/UserListItem.tsx
index a829c24d8..ac744850d 100644
--- a/assets/users/components/UserListItem.jsx
+++ b/assets/users/components/UserListItem.tsx
@@ -5,14 +5,14 @@ import {getUserLabel} from '../utils';
 import {get} from 'lodash';
 
 
-function UserListItem({user, isActive, onClick, companiesById}) {
+function UserListItem({user, isActive, onClick, companiesById}: any) {
     return (
         <tr key={user._id}
             className={`${isActive?'table--selected':''}
             ${(user.company && companiesById[user.company] && !get(companiesById[user.company],'is_enabled')) ||
             !user.is_enabled?'table-secondary':null}`}
             onClick={() => onClick(user._id)}
-            tabIndex="0"
+            tabIndex={0}
             data-test-id={`user-list-item--${user._id}`}
         >
             <td className="name">{user.first_name} {user.last_name}</td>
diff --git a/assets/users/components/Users.jsx b/assets/users/components/Users.tsx
similarity index 84%
rename from assets/users/components/Users.jsx
rename to assets/users/components/Users.tsx
index 50a90cb34..2fc4b6f19 100644
--- a/assets/users/components/Users.jsx
+++ b/assets/users/components/Users.tsx
@@ -23,8 +23,9 @@ import UsersList from './UsersList';
 import SearchResults from 'search/components/SearchResults';
 
 
-class Users extends React.Component {
-    constructor(props, context) {
+class Users extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any, context: any) {
         super(props, context);
 
         this.isFormValid = this.isFormValid.bind(this);
@@ -34,7 +35,7 @@ class Users extends React.Component {
 
     isFormValid() {
         let valid = true;
-        let errors = {};
+        const errors: any = {};
 
         if (!this.props.userToEdit.email) {
             errors.email = [gettext('Please provide email')];
@@ -45,7 +46,7 @@ class Users extends React.Component {
         return valid;
     }
 
-    save(event) {
+    save(event: any) {
         event.preventDefault();
 
         if (!this.isFormValid()) {
@@ -55,7 +56,7 @@ class Users extends React.Component {
         this.props.saveUser('users');
     }
 
-    deleteUser(event) {
+    deleteUser(event: any) {
         event.preventDefault();
 
         confirm(gettext('Would you like to delete user: {{name}}?', {name: this.props.userToEdit.first_name})) &&
@@ -63,7 +64,7 @@ class Users extends React.Component {
     }
 
     render() {
-        const progressStyle = {width: '25%'};
+        const progressStyle: any = {width: '25%'};
 
         return (
             <div className="flex-row">
@@ -133,8 +134,8 @@ Users.propTypes = {
     products: PropTypes.arrayOf(PropTypes.object),
 };
 
-const mapStateToProps = (state) => ({
-    users: state.users.map((id) => state.usersById[id]),
+const mapStateToProps = (state: any) => ({
+    users: state.users.map((id: any) => state.usersById[id]),
     usersById: state.usersById,
     userToEdit: state.userToEdit,
     activeUserId: state.activeUserId,
@@ -148,16 +149,18 @@ const mapStateToProps = (state) => ({
     products: state.products,
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    selectUser: (_id) => dispatch(selectUser(_id)),
-    editUser: (event) => dispatch(editUser(event)),
-    saveUser: (type) => dispatch(postUser(type)),
-    deleteUser: (type) => dispatch(deleteUser(type)),
+const mapDispatchToProps = (dispatch: any) => ({
+    selectUser: (_id: any) => dispatch(selectUser(_id)),
+    editUser: (event: any) => dispatch(editUser(event)),
+    saveUser: (type: any) => dispatch(postUser()),
+    deleteUser: (type: any) => dispatch(deleteUser()),
     resendUserInvite: () => dispatch(resendUserInvite()),
-    newUser: (data) => dispatch(newUser(data)),
+    newUser: (data: any) => dispatch(newUser(data)),
     resetPassword: () => dispatch(resetPassword()),
-    cancelEdit: (event) => dispatch(cancelEdit(event)),
+    cancelEdit: (event: any) => dispatch(cancelEdit(event)),
     dispatch: dispatch,
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(Users);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(Users);
+
+export default component;
diff --git a/assets/users/components/UsersApp.jsx b/assets/users/components/UsersApp.tsx
similarity index 93%
rename from assets/users/components/UsersApp.jsx
rename to assets/users/components/UsersApp.tsx
index 477508cc8..450e5c014 100644
--- a/assets/users/components/UsersApp.jsx
+++ b/assets/users/components/UsersApp.tsx
@@ -19,14 +19,15 @@ import {UserListSortFilter} from './filters/UserListSortFilter';
 import {UserListCompanyFilter} from './filters/UserListCompanyFilter';
 
 
-function UsersApp(props) {
+function UsersApp(props: any): any {
     return ([
         <ListBar
+            buttonText={gettext('New User')}
             key="UserBar"
+            disabled={props.userToEdit != null}
             onNewItem={props.newUser}
             setQuery={props.setQuery}
             fetch={props.fetchUsers}
-            buttonText={gettext('New User')}
         >
             <UserListCompanyFilter
                 companies={props.companies}
@@ -48,11 +49,12 @@ function UsersApp(props) {
     ]);
 }
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     companies: state.companies,
     company: state.company,
     sort: state.sort,
     sortDirection: state.sortDirection,
+    userToEdit: state.userToEdit,
 });
 
 UsersApp.propTypes = {
@@ -85,7 +87,7 @@ UsersApp.propTypes = {
 
 };
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     newUser,
     fetchUsers,
     setQuery: setSearchQuery,
diff --git a/assets/users/components/UsersList.jsx b/assets/users/components/UsersList.tsx
similarity index 97%
rename from assets/users/components/UsersList.jsx
rename to assets/users/components/UsersList.tsx
index 85ccaa111..e7b3e182a 100644
--- a/assets/users/components/UsersList.jsx
+++ b/assets/users/components/UsersList.tsx
@@ -4,8 +4,8 @@ import UserListItem from './UserListItem';
 import {gettext} from 'utils';
 
 
-function UsersList({users, onClick, activeUserId, companiesById}) {
-    const list = users.map((user) =>
+function UsersList({users, onClick, activeUserId, companiesById}: any) {
+    const list = users.map((user: any) =>
         <UserListItem
             key={user._id}
             user={user}
diff --git a/assets/users/components/filters/UserListCompanyFilter.jsx b/assets/users/components/filters/UserListCompanyFilter.tsx
similarity index 79%
rename from assets/users/components/filters/UserListCompanyFilter.jsx
rename to assets/users/components/filters/UserListCompanyFilter.tsx
index c8b076802..7443650fe 100644
--- a/assets/users/components/filters/UserListCompanyFilter.jsx
+++ b/assets/users/components/filters/UserListCompanyFilter.tsx
@@ -5,8 +5,11 @@ import {get} from 'lodash';
 import {gettext} from 'utils';
 import DropdownFilter from 'components/DropdownFilter';
 
-export class UserListCompanyFilter extends React.PureComponent {
-    constructor(props) {
+export class UserListCompanyFilter extends React.PureComponent<any, any> {
+    static propTypes: any;
+    filter: {label: any; field: string;};
+
+    constructor(props: any) {
         super(props);
 
         this.filter = {
@@ -18,13 +21,13 @@ export class UserListCompanyFilter extends React.PureComponent {
         this.getDropdownItems = this.getDropdownItems.bind(this);
     }
 
-    onChange(field, value) {
+    onChange(field: any, value: any) {
         this.props.setCompany(value);
         this.props.fetchUsers();
     }
 
-    getDropdownItems(filter) {
-        return this.props.companies.map((item, i) => (<button
+    getDropdownItems(filter: any) {
+        return this.props.companies.map((item: any, i: number) => (<button
             key={i}
             className='dropdown-item'
             onClick={() => {this.onChange(filter.field, item._id);}}
@@ -34,7 +37,7 @@ export class UserListCompanyFilter extends React.PureComponent {
 
     getActiveQuery() {
         return {
-            company: this.props.company ? [get(this.props.companies.find((c) => c._id === this.props.company), 'name')] :
+            company: this.props.company ? [get(this.props.companies.find((c: any) => c._id === this.props.company), 'name')] :
                 null,
         };
     }
diff --git a/assets/users/components/filters/UserListSortFilter.jsx b/assets/users/components/filters/UserListSortFilter.tsx
similarity index 87%
rename from assets/users/components/filters/UserListSortFilter.jsx
rename to assets/users/components/filters/UserListSortFilter.tsx
index 2bf2a1e62..30c3fd7fe 100644
--- a/assets/users/components/filters/UserListSortFilter.jsx
+++ b/assets/users/components/filters/UserListSortFilter.tsx
@@ -7,8 +7,11 @@ import {gettext} from 'utils';
 
 import DropdownFilter from 'components/DropdownFilter';
 
-export class UserListSortFilter extends React.PureComponent {
-    constructor(props) {
+export class UserListSortFilter extends React.PureComponent<any, any> {
+    static propTypes: any;
+    filter: any;
+    sortFields: any;
+    constructor(props: any) {
         super(props);
 
         this.filter = {
@@ -41,7 +44,7 @@ export class UserListSortFilter extends React.PureComponent {
         this.getFilterLabel = this.getFilterLabel.bind(this);
     }
 
-    onChange(field, value) {
+    onChange(field: any, value: any) {
         this.props.setSort(value);
         this.props.fetchUsers();
     }
@@ -51,8 +54,8 @@ export class UserListSortFilter extends React.PureComponent {
         this.props.fetchUsers();
     }
 
-    getDropdownItems(filter) {
-        return this.sortFields.map((item, i) => (
+    getDropdownItems(filter: any) {
+        return this.sortFields.map((item: any, i: any) => (
             <button
                 key={i}
                 className='dropdown-item'
@@ -67,12 +70,12 @@ export class UserListSortFilter extends React.PureComponent {
     getActiveQuery() {
         return {
             sort: !this.props.sort ? null : [
-                get(this.sortFields.find((s) => s._id === this.props.sort), 'name')
+                get(this.sortFields.find((s: any) => s._id === this.props.sort), 'name')
             ],
         };
     }
 
-    getFilterLabel(filter, activeFilter, isActive) {
+    getFilterLabel(filter: any, activeFilter: any, isActive: any) {
         const label = !isActive ? this.sortFields[0].name : activeFilter[filter.field][0];
 
         return (
diff --git a/assets/users/index.js b/assets/users/index.ts
similarity index 100%
rename from assets/users/index.js
rename to assets/users/index.ts
diff --git a/assets/users/reducers.js b/assets/users/reducers.ts
similarity index 88%
rename from assets/users/reducers.js
rename to assets/users/reducers.ts
index 93534492e..6ee38e40f 100644
--- a/assets/users/reducers.js
+++ b/assets/users/reducers.ts
@@ -19,7 +19,7 @@ import {ADD_EDIT_USERS} from 'actions';
 
 import {searchReducer} from 'search/reducers';
 
-const initialState = {
+const initialState: any = {
     user: null,
     query: null,
     users: [],
@@ -37,7 +37,7 @@ const initialState = {
     products: [],
 };
 
-export default function userReducer(state = initialState, action) {
+export default function userReducer(state: any = initialState, action: any) {
     switch (action.type) {
     case INIT_VIEW_DATA:
         return {
@@ -46,7 +46,7 @@ export default function userReducer(state = initialState, action) {
             products: action.data.products,
         };
     case SELECT_USER: {
-        const defaultUser = {
+        const defaultUser: any = {
             user_type: 'public',
             is_approved: true,
             is_enabled: true,
@@ -78,7 +78,7 @@ export default function userReducer(state = initialState, action) {
     case EDIT_USER: {
         const target = action.event.target;
         const field = target.name;
-        let user = {...state.userToEdit};
+        const user: any = {...state.userToEdit};
         const value = target.type === 'checkbox' ? target.checked : target.value;
 
         if (field.startsWith('sections.')) {
@@ -100,12 +100,12 @@ export default function userReducer(state = initialState, action) {
                     },
                 ];
             } else {
-                user.products = (user.products || []).filter((product) => product._id !== productId);
+                user.products = (user.products || []).filter((product: any) => product._id !== productId);
             }
         } else if (field.includes('selectAllBtn')) {
             user.products = state.products
-                .filter((product) => user.sections[product.product_type])
-                .map((product) => ({_id : product._id , section: product.product_type}));
+                .filter((product: any) => user.sections[product.product_type])
+                .map((product: any) => ({_id : product._id , section: product.product_type}));
         }
         else {
             user[field] = value;
@@ -145,7 +145,7 @@ export default function userReducer(state = initialState, action) {
 
     case GET_USERS: {
         const usersById = Object.assign({}, state.usersById);
-        const users = action.data.map((user) => {
+        const users = action.data.map((user: any) => {
             usersById[user._id] = user;
             return user._id;
         });
@@ -164,7 +164,7 @@ export default function userReducer(state = initialState, action) {
         const userToEdit = state.userToEdit && state.userToEdit._id === action.userId ?
             null :
             state.userToEdit;
-        const users = state.users.filter((userId) => userId !== action.userId);
+        const users = state.users.filter((userId: any) => userId !== action.userId);
 
         delete usersById[action.userId];
 
@@ -178,8 +178,8 @@ export default function userReducer(state = initialState, action) {
     }
 
     case GET_COMPANIES: {
-        const companiesById = {};
-        action.data.map((company) => companiesById[company._id] = company);
+        const companiesById: any = {};
+        action.data.map((company: any) => companiesById[company._id] = company);
 
         return {...state, companies: action.data, companiesById};
 
diff --git a/assets/users/selectors.js b/assets/users/selectors.js
deleted file mode 100644
index af23739b6..000000000
--- a/assets/users/selectors.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import {get} from 'lodash';
-
-export const userSelector = (state) => get(state, 'user');
\ No newline at end of file
diff --git a/assets/users/selectors.ts b/assets/users/selectors.ts
new file mode 100644
index 000000000..30af83f98
--- /dev/null
+++ b/assets/users/selectors.ts
@@ -0,0 +1,3 @@
+import {get} from 'lodash';
+
+export const userSelector = (state: any) => get(state, 'user');
\ No newline at end of file
diff --git a/assets/users/tests/actions.spec.js b/assets/users/tests/actions.spec.ts
similarity index 98%
rename from assets/users/tests/actions.spec.js
rename to assets/users/tests/actions.spec.ts
index 9ef35d67d..587604691 100644
--- a/assets/users/tests/actions.spec.js
+++ b/assets/users/tests/actions.spec.ts
@@ -8,7 +8,7 @@ import wireApp from 'users/reducers';
 import * as actions from 'users/actions';
 
 describe('fetch actions', () => {
-    let store;
+    let store: any;
     const response = [{_id: 'foo'}];
 
     beforeEach(() => {
diff --git a/assets/users/utils.js b/assets/users/utils.ts
similarity index 57%
rename from assets/users/utils.js
rename to assets/users/utils.ts
index 16092c0e8..875a5c694 100644
--- a/assets/users/utils.js
+++ b/assets/users/utils.ts
@@ -9,46 +9,56 @@ export const userTypes = [
     {value: 'company_admin', text: gettext('Company Admin'), show_acc_mgr: true},
 ];
 
-export function getUserLabel(code) {
+export function getUserLabel(code: any) {
     return (userTypes.find(c => c.value === code) || {}).text;
 }
 
-export function userTypeReadOnly(user, currentUser) {
+export function userTypeReadOnly(user: any, currentUser: any) {
     if (get(currentUser, 'user_type') === 'account_management' &&
             (userTypes.find(c => c.value === get(user, 'user_type')) || {}).show_acc_mgr === false)
         return true;
     return false;
 }
 
-export function getUserTypes(user) {
+export function getUserTypes(user: any) {
     if (isUserAdmin(user) || isUserCompanyAdmin(user)) {
         return userTypes;
     }
-    return userTypes.filter((opt) => (get(opt, 'show_acc_mgr') === true));
+    return userTypes.filter((opt: any) => (get(opt, 'show_acc_mgr') === true));
 }
 
-export function isUserAdmin(user) {
+export function isUserAdmin(user: any) {
     return get(user, 'user_type') === 'administrator';
 }
 
-export function isUserCompanyAdmin(user) {
+export function isUserCompanyAdmin(user: any) {
     return get(user, 'user_type') === 'company_admin';
 }
 
-export function canUserManageTopics(user) {
+export function canUserManageTopics(user: any) {
     return isUserAdmin(user) || get(user, 'manage_company_topics') === true;
 }
 
 export function getLocaleInputOptions() {
     return (window.locales || [])
-        .filter((locale) => locale.locale !== window.locale) // this will be default value
-        .map((locale) => ({value: locale.locale, text: locale.name}));
+        .filter((locale: any) => locale.locale !== window.locale) // this will be default value
+        .map((locale: any) => ({value: locale.locale, text: locale.name}));
 }
 
 export function getDefaultLocale() {
-    return window.locales.find((locale) => locale.locale === window.locale).name;
+    return window.locales.find((locale: any) => locale.locale === window.locale).name;
 }
 
-export function canUserUpdateTopic(user, topic) {
+export function canUserUpdateTopic(user: any, topic: any) {
     return !topic.is_global || (topic.is_global && user.manage_company_topics === true);
 }
+
+export function cleanUserEntityBeforePatch(data: Dictionary<any>) {
+    const fieldsToRemove = ['products', 'sections', 'signup_details', '_created', '_updated', '_etag'];
+
+    fieldsToRemove.forEach((x) => {
+        delete data[x];
+    });
+
+    return data;
+}
diff --git a/assets/utils.js b/assets/utils.tsx
similarity index 67%
rename from assets/utils.js
rename to assets/utils.tsx
index d97a5c653..4a63be809 100644
--- a/assets/utils.js
+++ b/assets/utils.tsx
@@ -9,13 +9,6 @@ import thunk from 'redux-thunk';
 import {render as _render} from 'react-dom';
 import alertify from 'alertifyjs';
 import moment from 'moment-timezone';
-import {
-    hasCoverages,
-    isCoverageForExtraDay,
-    SCHEDULE_TYPE,
-    isItemTBC,
-} from './agenda/utils';
-export {initWebSocket} from './websocket';
 
 /*
  * Import and load all locales that will be used in moment.js
@@ -33,14 +26,14 @@ window.moment = moment;
 // CP don't want 2e 3e etc., only 1er
 if (getLocale() === 'fr_CA') {
     moment.updateLocale('fr-ca', {
-        ordinal: (number) => number + (number === 1 ? 'er' : ''),
+        ordinal: (number: any) => number + (number === 1 ? 'er' : ''),
         weekdays: 'Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi'.split('_'),
     });
 }
 
 export const now = moment(); // to enable mocking in tests
 
-function getLocaleFormat(formatType, defaultFormat) {
+function getLocaleFormat(formatType: any, defaultFormat?: any) {
     const formats = getConfig('locale_formats', {});
     const locale = getLocale();
 
@@ -91,7 +84,7 @@ export const KEYCODES = {
  * @param {String} name
  * @return {Store}
  */
-export function createStore(reducer, name = 'default') {
+export function createStore(reducer: any, name: any = 'default') {
     // https://redux.js.org/api-reference/compose
     let _compose = compose;
     const middlewares = [
@@ -106,7 +99,7 @@ export function createStore(reducer, name = 'default') {
                 duration: true,
                 collapsed: true,
                 timestamp: false,
-                titleFormatter: (action, time, took) => (
+                titleFormatter: (action: any, time: any, took: any) => (
                     // Adds the name of the store to the console logs
                     // derived based on the defaultTitleFormatter from redux-logger
                     // https://github.com/LogRocket/redux-logger/blob/master/src/core.js#L25
@@ -134,7 +127,7 @@ export function createStore(reducer, name = 'default') {
  * @param {Component} App
  * @param {Element} element
  */
-export function render(store, App, element, props) {
+export function render(store: any, App: any, element?: any, props?: any) {
     return _render(
         <Provider store={store}>
             <App {...props}/>
@@ -154,11 +147,11 @@ export function render(store, App, element, props) {
  * @param {Object} params
  * @return {String}
  */
-export function gettext(text, params) {
+export function gettext(text: any, params?: any) {
     let translated = get(window.translations, text, text);
 
     if (params) {
-        Object.keys(params).forEach((param) => {
+        Object.keys(params).forEach((param: any) => {
             const paramRegexp = new RegExp('{{ ?' + param + ' ?}}', 'g');
             translated = translated.replace(paramRegexp, params[param] || '');
         });
@@ -173,7 +166,7 @@ export function gettext(text, params) {
  * @param {Object} product
  * @return {string}
  */
-export function getProductQuery(product) {
+export function getProductQuery(product: any) {
     let q = product.sd_product_id ? `products.code:${product.sd_product_id}` : '';
     q += product.query ? product.sd_product_id ? ` OR (${product.query})` : product.query : '';
     return q;
@@ -186,7 +179,7 @@ export function getProductQuery(product) {
  * @param {Boolean} ignoreTimezone - avoid converting time to different timezone, will output the date as it is
  * @return {Date}
  */
-export function parseDate(dateString, ignoreTimezone = false) {
+export function parseDate(dateString: any, ignoreTimezone: any = false) {
     const parsed = ignoreTimezone ? moment.utc(dateString) : moment(dateString);
 
     parsed.locale(getLocale());
@@ -201,7 +194,7 @@ export function parseDate(dateString, ignoreTimezone = false) {
  * @param {String} timezone - The name of the timezone region, i.e. Australia/Sydney
  * @returns {moment}
  */
-export function parseDateInTimezone(dateString, timezone = null) {
+export function parseDateInTimezone(dateString: any, timezone: any = null) {
     return moment.tz(dateString, timezone || moment.tz.guess());
 }
 
@@ -212,7 +205,7 @@ export function parseDateInTimezone(dateString, timezone = null) {
  * @param {String} timeForToday - if true show only time if date is today
  * @return {String}
  */
-export function shortDate(dateString, timeForToday = true) {
+export function shortDate(dateString: any, timeForToday: any = true) {
     const parsed = parseDate(dateString);
     return parsed.format(timeForToday === true && isToday(parsed) ? TIME_FORMAT : DATE_FORMAT);
 }
@@ -223,7 +216,7 @@ export function shortDate(dateString, timeForToday = true) {
  * @param {String} dateString
  * @return {String}
  */
-export function getDateInputDate(dateString) {
+export function getDateInputDate(dateString: any) {
     if (dateString) {
         const parsed = parseDate(dateString.substring(0, 10));
         return parsed.format('YYYY-MM-DD');
@@ -238,7 +231,7 @@ export function getDateInputDate(dateString) {
  * @param {String} dateString
  * @return {String}
  */
-export function getLocaleDate(dateString) {
+export function getLocaleDate(dateString: any) {
     return parseDate(dateString).format(DATETIME_FORMAT);
 }
 
@@ -248,7 +241,7 @@ export function getLocaleDate(dateString) {
  * @param {Date} date
  * @return {Boolean}
  */
-export function isToday(date) {
+export function isToday(date: any) {
     const parsed = typeof date === 'string' ? parseDate(date) : date;
     return parsed.format('YYYY-MM-DD') === now.format('YYYY-MM-DD');
 }
@@ -262,7 +255,7 @@ export function isToday(date) {
  * @param {String} timezone - The name of the timezone region, i.e. Australia/Sydney
  * @return {Boolean}
  */
-export function isInPast(dateString, timezone) {
+export function isInPast(dateString: any, timezone?: any) {
     if(!dateString) {
         return false;
     }
@@ -279,7 +272,7 @@ export function isInPast(dateString, timezone) {
  * @param {String} dateString
  * @return {String}
  */
-export function fullDate(dateString) {
+export function fullDate(dateString: any) {
     return parseDate(dateString).format(DATETIME_FORMAT);
 }
 
@@ -289,7 +282,7 @@ export function fullDate(dateString) {
  * @param {String} dateString
  * @return {String}
  */
-export function formatTime(dateString) {
+export function formatTime(dateString: any) {
     return parseDate(dateString).format(TIME_FORMAT);
 }
 
@@ -299,7 +292,7 @@ export function formatTime(dateString) {
  * @param {String} dateString
  * @return {String}
  */
-export function formatDate(dateString) {
+export function formatDate(dateString: any) {
     return parseDate(dateString).format(DATE_FORMAT);
 }
 
@@ -309,7 +302,7 @@ export function formatDate(dateString) {
  * @param {String} dateString
  * @return {String}
  */
-export function formatDatetime(dateString) {
+export function formatDatetime(dateString: any) {
     return fullDate(dateString);
 }
 
@@ -321,7 +314,7 @@ export function formatDatetime(dateString) {
  * @param {String} timezone - The name of the timezone region, i.e. Australia/Sydney
  * @returns {moment}
  */
-export function getEndOfDayFromDate(dateString, timezone = null) {
+export function getEndOfDayFromDate(dateString: any, timezone: any = null) {
     return parseDateInTimezone(dateString + 'T23:59:59', timezone);
 }
 
@@ -332,168 +325,18 @@ export function getEndOfDayFromDate(dateString, timezone = null) {
  * @param {String} timezone - The name of the timezone region, i.e. Australia/Sydney
  * @returns {moment}
  */
-export function convertUtcToTimezone(datetime, timezone) {
+export function convertUtcToTimezone(datetime: any, timezone: any) {
     return parseDateInTimezone(datetime, 'utc')
         .tz(timezone);
 }
 
-function getScheduleType(item) {
-    const start = moment(item.dates.start);
-    const end = moment(item.dates.end);
-    const duration = end.diff(start, 'minutes');
-
-    if (item.dates.all_day) {
-        return duration === 0 ? SCHEDULE_TYPE.ALL_DAY : SCHEDULE_TYPE.MULTI_DAY;
-    }
-
-    if (item.dates.no_end_time) {
-        return SCHEDULE_TYPE.NO_DURATION;
-    }
-
-    if (duration > DAY_IN_MINUTES || !start.isSame(end, 'day')) {
-        return SCHEDULE_TYPE.MULTI_DAY;
-    }
-
-    if (duration === DAY_IN_MINUTES && start.isSame(end, 'day')) {
-        return SCHEDULE_TYPE.ALL_DAY;
-    }
-
-    if (duration === 0) {
-        return SCHEDULE_TYPE.NO_DURATION;
-    }
-
-    return SCHEDULE_TYPE.REGULAR;
-}
-
-/**
- * Format agenda item start and end dates
- *
- * @param {String} dateString
- * @param {String} group: date of the selected event group
- * @param {Object} options
- * @return {Array} [time string, date string]
- */
-export function formatAgendaDate(item, group, {localTimeZone = true, onlyDates = false} = {}) {
-    const getFormattedTimezone = (date) => {
-        let tzStr = date.format('z');
-        if (tzStr.indexOf('+0') >= 0) {
-            return tzStr.replace('+0', 'GMT+');
-        }
-
-        if (tzStr.indexOf('+') >= 0) {
-            return tzStr.replace('+', 'GMT+');
-        }
-
-        return tzStr;
-    };
-
-    const isTBCItem = isItemTBC(item);
-    let start = parseDate(item.dates.start, item.dates.all_day);
-    let end = parseDate(item.dates.end, item.dates.all_day || item.dates.no_end_time);
-    let dateGroup = group ? moment(group, DATE_FORMAT) : null;
-
-    let isGroupBetweenEventDates = dateGroup ?
-        start.isSameOrBefore(dateGroup, 'day') && end.isSameOrAfter(dateGroup, 'day') : true;
-
-    if (!isGroupBetweenEventDates && hasCoverages(item)) {
-        // we rendering for extra days
-        const scheduleDates = item.coverages
-            .map((coverage) => {
-                if (isCoverageForExtraDay(coverage, group)) {
-                    return coverage.scheduled;
-                }
-                return null;
-            })
-            .filter((d) => d)
-            .sort((a, b) => {
-                if (a < b) return -1;
-                if (a > b) return 1;
-                return 0;
-            });
-        if (scheduleDates.length > 0) {
-            start = moment(scheduleDates[0]);
-        }
-    }
-
-    const scheduleType = getScheduleType(item);
-    const startDate = formatDate(start);
-    const startTime = formatTime(start);
-    const endDate = formatDate(end);
-    const endTime = formatTime(end);
-    const timezone = localTimeZone ? '' : getFormattedTimezone(start);
-
-    switch (true) {
-    case isTBCItem && startDate !== endDate:
-        return gettext('{{startDate}} to {{endDate}} (Time to be confirmed)', {
-            startDate,
-            endDate,
-        });
-
-    case isTBCItem:
-        return gettext('{{startDate}} (Time to be confirmed)', {
-            startDate,
-        });
-
-    case startDate !== endDate && (item.dates.all_day || onlyDates || (startTime === '00:00' && endTime === '23:59')):
-        return gettext('{{startDate}} to {{endDate}}', {
-            startDate,
-            endDate,
-        });
-
-    case startDate === endDate && (item.dates.all_day || onlyDates || scheduleType === SCHEDULE_TYPE.ALL_DAY):
-        return startDate;
-
-    case item.dates.no_end_time && startDate !== endDate:
-        return gettext('{{startTime}} {{startDate}} - {{endDate}} {{timezone}}', {
-            startTime,
-            startDate,
-            endDate,
-            timezone,
-        });
-
-    case item.dates.no_end_time || scheduleType === SCHEDULE_TYPE.NO_DURATION:
-        return gettext('{{startTime}} {{startDate}} {{timezone}}', {
-            startTime,
-            startDate,
-            timezone,
-        });
-
-    case scheduleType === SCHEDULE_TYPE.REGULAR:
-        return gettext('{{startTime}} - {{endTime}} {{startDate}} {{timezone}}', {
-            startTime,
-            startDate,
-            endTime,
-            timezone,
-        });
-
-    case scheduleType === SCHEDULE_TYPE.MULTI_DAY:
-        return gettext('{{startTime}} {{startDate}} to {{endTime}} {{endDate}} {{timezone}}', {
-            startTime,
-            startDate,
-            endTime,
-            endDate,
-            timezone,
-        });
-
-    default:
-        console.warn('not sure about the datetime format', item, scheduleType);
-        return gettext('{{startTime}} {{startDate}} to {{endTime}} {{endDate}} {{timezone}}', {
-            startTime,
-            startDate,
-            endTime,
-            endDate,
-            timezone
-        });
-    }
-}
-
 /**
  * Format week of a date (without time)
  *
  * @param {String} dateString
  * @return {String}
  */
-export function formatWeek(dateString) {
+export function formatWeek(dateString: any) {
     const startDate = parseDate(dateString).isoWeekday(1);
     const endDate = parseDate(dateString).isoWeekday(7);
     return `${startDate.format(DATE_FORMAT)} - ${endDate.format(DATE_FORMAT)}`;
@@ -505,7 +348,7 @@ export function formatWeek(dateString) {
  * @param {String} dateString
  * @return {String}
  */
-export function formatMonth(dateString) {
+export function formatMonth(dateString: any) {
     return parseDate(dateString).format('MMMM');
 }
 
@@ -513,9 +356,9 @@ export function formatMonth(dateString) {
  * Wrapper for alertifyjs
  */
 export const notify = {
-    success: (message) => alertify.success(message),
-    error: (message) => alertify.error(message),
-    warning: (message) => alertify.warning(message),
+    success: (message: any) => alertify.success(message),
+    error: (message: any) => alertify.error(message),
+    warning: (message: any) => alertify.warning(message),
 };
 
 /**
@@ -524,8 +367,8 @@ export const notify = {
  * @param {string} html
  * @return {string}
  */
-export function getTextFromHtml(html) {
-    let raw_html = (html || '').trim();
+export function getTextFromHtml(html: any) {
+    const raw_html = (html || '').trim();
 
     if (raw_html.length === 0) {
         return '';
@@ -536,8 +379,8 @@ export function getTextFromHtml(html) {
 
     const div = document.createElement('div');
     div.innerHTML = formatHTML(raw_html);
-    const tree = document.createTreeWalker(div, NodeFilter.SHOW_TEXT, null, false); // ie requires all params
-    const text = [];
+    const tree = (document as any).createTreeWalker(div, NodeFilter.SHOW_TEXT, null, false); // ie requires all params
+    const text: Array<any> = [];
     while (tree.nextNode()) {
         text.push(tree.currentNode.textContent);
         if (tree.currentNode.nextSibling) {
@@ -574,7 +417,7 @@ export function getTextFromHtml(html) {
  * @param {Object} item
  * @return {number}
  */
-export function wordCount(item) {
+export function wordCount(item: any) {
     if (isInteger(item.wordcount)) {
         return item.wordcount;
     }
@@ -584,7 +427,7 @@ export function wordCount(item) {
     }
 
     const text = getTextFromHtml(item.body_html);
-    return text.split(' ').filter(x => x.trim()).length || 0;
+    return text.split(' ').filter((x: any) => x.trim()).length || 0;
 }
 
 /**
@@ -593,7 +436,7 @@ export function wordCount(item) {
  * @param {Object} item
  * @return {number}
  */
-export function characterCount(item) {
+export function characterCount(item: any) {
 
     if (isInteger(item.charcount)) {
         return item.charcount;
@@ -618,20 +461,20 @@ export function characterCount(item) {
  * @param {mixed} value
  * @return {Array}
  */
-export function toggleValue(items, value) {
+export function toggleValue(items: any, value: any) {
     if (!items) {
         return [value];
     }
 
-    const without = items.filter((x) => value !== x);
+    const without = items.filter((x: any) => value !== x);
     return without.length === items.length ? without.concat([value]) : without;
 }
 
 
-export function updateRouteParams(updates, state, deleteEmpty = true) {
+export function updateRouteParams(updates: any, state: any, deleteEmpty: any = true) {
     const params = new URLSearchParams(window.location.search);
 
-    Object.keys(updates).forEach((key) => {
+    Object.keys(updates).forEach((key: any) => {
         let updatedValue = updates[key];
         if (!deleteEmpty || !isEmpty(updatedValue) || typeof updatedValue === 'boolean') {
             if (typeof updatedValue === 'object') {
@@ -646,7 +489,7 @@ export function updateRouteParams(updates, state, deleteEmpty = true) {
     const stateClone = cloneDeep(state);
     stateClone.items = [];
     stateClone.itemsById = {};
-    history.pushState(stateClone, null, `?${params.toString()}`);
+    (history as any).pushState(stateClone, null, `?${params.toString()}`);
 }
 
 const SHIFT_OUT_REGEXP = new RegExp(String.fromCharCode(14), 'g');
@@ -657,7 +500,7 @@ const SHIFT_OUT_REGEXP = new RegExp(String.fromCharCode(14), 'g');
  * @param {String} html
  * @return {String}
  */
-export function formatHTML(html) {
+export function formatHTML(html: any) {
     return html.replace(SHIFT_OUT_REGEXP, html.indexOf('<pre>') === -1 ? '<br>' : '\n');
 }
 
@@ -667,7 +510,7 @@ export function formatHTML(html) {
  * @param dispatch
  * @param setError
  */
-export function errorHandler(error, dispatch, setError) {
+export function errorHandler(error: any, dispatch?: any, setError?: any) {
     console.error('error', error);
 
     if (error.response.status !== 400) {
@@ -675,7 +518,7 @@ export function errorHandler(error, dispatch, setError) {
         return;
     }
     if (setError) {
-        error.response.json().then(function(data) {
+        error.response.json().then(function(data: any) {
             dispatch(setError(data));
         });
     }
@@ -688,7 +531,7 @@ export function errorHandler(error, dispatch, setError) {
  * @param {Mixed} defaultValue
  * @return {Mixed}
  */
-export function getConfig(key, defaultValue) {
+export function getConfig(key: any, defaultValue?: any) {
     const clientConfig = window && window.newsroom && window.newsroom.client_config || {};
 
     if (Object.keys(clientConfig).length === 0) {
@@ -726,15 +569,15 @@ export function isWireContext() {
     return window.location.pathname.includes('/wire');
 }
 
-export const getInitData = (data) => {
-    let initData = data || {};
+export const getInitData = (data: any) => {
+    const initData = data || {};
     return {
         ...initData,
         userSections: keyBy(get(window.profileData, 'userSections', {}), '_id')
     };
 };
 
-export const isDisplayed = (field, config) => get(config, `${field}.displayed`, true);
+export const isDisplayed = (field: any, config: any) => get(config, `${field}.displayed`, true);
 
 const getNow = throttle(moment, 500);
 
@@ -743,7 +586,7 @@ const getNow = throttle(moment, 500);
  * @param {String} embargoed
  * @return {Moment}
  */
-export function getEmbargo(item) {
+export function getEmbargo(item: any) {
     if (!item.embargoed) {
         return null;
     }
@@ -754,23 +597,23 @@ export function getEmbargo(item) {
     return parsed.isAfter(now) ? parsed : null;
 }
 
-export function getItemFromArray(value, items = [], field = '_id') {
-    return items.find((i) => i[field] === value);
+export function getItemFromArray(value: any, items: Array<any> = [], field: any = '_id') {
+    return items.find((i: any) => i[field] === value);
 }
 
-export function upperCaseFirstCharacter(text) {
-    return (text && text.toLowerCase().replace(/\b\w/g, (l) => l.toUpperCase()));
+export function upperCaseFirstCharacter(text: any) {
+    return (text && text.toLowerCase().replace(/\b\w/g, (l: any) => l.toUpperCase()));
 }
 
-export function postHistoryAction(item, action, section='wire') {
+export function postHistoryAction(item: any, action: any, section: any = 'wire') {
     server.post('/history/new', {
         item: item,
         action: action,
         section: section
-    }).catch((error) => errorHandler(error));
+    }).catch((error: any) => errorHandler(error));
 }
 
-export function recordAction(item, action = 'open', section = 'wire', state = null) {
+export function recordAction(item: any, action: any = 'open', section: any = 'wire', state: any = null) {
     if (item) {
         analytics.itemEvent(action, item);
         analytics.itemView(item, section);
@@ -785,7 +628,7 @@ export function recordAction(item, action = 'open', section = 'wire', state = nu
     }
 }
 
-export function closeItemOnMobile(dispatch, state, openItemDetails, previewItem) {
+export function closeItemOnMobile(dispatch: any, state: any, openItemDetails: any, previewItem: any) {
     if (isMobilePhone()) {
         dispatch(openItemDetails(null));
         dispatch(previewItem(null));
@@ -798,7 +641,7 @@ export function closeItemOnMobile(dispatch, state, openItemDetails, previewItem)
  * @param {boolean} withTakeKey - If true, appends the takekey to the response
  * @returns {String}
  */
-export function getSlugline(item, withTakeKey = false) {
+export function getSlugline(item: any, withTakeKey: any = false) {
     if (!item || !item.slugline) {
         return '';
     }
@@ -816,14 +659,14 @@ export function getSlugline(item, withTakeKey = false) {
 /**
  * Factory for filter function to check if action is enabled
  */
-export function isActionEnabled(configKey) {
+export function isActionEnabled(configKey: any) {
     const config = getConfig(configKey, {});
-    return (action) => config[action.id] == null || config[action.id];
+    return (action: any) => config[action.id] == null || config[action.id];
 }
 
-export const getPlainTextMemoized = memoize((html) => getTextFromHtml(html));
+export const getPlainTextMemoized = memoize((html: any) => getTextFromHtml(html));
 
-export function shouldShowListShortcutActionIcons(listConfig, isExtended) {
+export function shouldShowListShortcutActionIcons(listConfig: any, isExtended: any) {
     const showActionIconsConfig = listConfig.show_list_action_icons || {
         large: true,
         compact: true,
@@ -838,7 +681,7 @@ export function shouldShowListShortcutActionIcons(listConfig, isExtended) {
         );
 }
 
-export function getCreatedSearchParamLabel(created) {
+export function getCreatedSearchParamLabel(created: any) {
     if (created.to) {
         if (created.from) {
             return {
@@ -865,7 +708,7 @@ export function getCreatedSearchParamLabel(created) {
     return {};
 }
 
-export function copyTextToClipboard(text, item) {
+export function copyTextToClipboard(text: any, item: any) {
     navigator.clipboard.writeText(text).then(
         () => {
             notify.success(gettext('Item copied successfully.'));
diff --git a/assets/websocket.js b/assets/websocket.ts
similarity index 90%
rename from assets/websocket.js
rename to assets/websocket.ts
index 4840d2859..1640054ee 100644
--- a/assets/websocket.js
+++ b/assets/websocket.ts
@@ -5,9 +5,9 @@ const DEFAULT_WS_URL = 'ws://localhost:5150';
 const RECONNECT_INTERVAL = 5000;
 
 let firstConnection = true;
-let wsConnection;
-let connectInterval;
-const listeners = [];
+let wsConnection: any;
+let connectInterval: any;
+const listeners: any = [];
 
 function connectToNotificationServer() {
     if (wsConnection == null || wsConnection.readyState === WebSocket.CLOSED) {
@@ -35,12 +35,12 @@ window.addEventListener('beforeunload', () => {
     wsConnection = null;
 });
 
-export function initWebSocket(store, action) {
+export function initWebSocket(store: any, action: any) {
     connectToNotificationServer();
     listeners.push({store, action});
 }
 
-function onWebsocketError(event) {
+function onWebsocketError(event: any) {
     console.error(event);
 }
 
@@ -73,7 +73,7 @@ function onWebsocketClose() {
     }, RECONNECT_INTERVAL);
 }
 
-function onWebsocketMessage(message) {
+function onWebsocketMessage(message: any) {
     if (!message || !message.data) {
         console.error('Invalid websocket message', message);
         return;
@@ -86,7 +86,7 @@ function onWebsocketMessage(message) {
         return;
     }
 
-    listeners.forEach(({store, action}) => {
+    listeners.forEach(({store, action}: any) => {
         store.dispatch(action(data));
     });
 }
diff --git a/assets/wire/actions.js b/assets/wire/actions.ts
similarity index 77%
rename from assets/wire/actions.js
rename to assets/wire/actions.ts
index 073958748..babdeae8d 100644
--- a/assets/wire/actions.js
+++ b/assets/wire/actions.ts
@@ -29,34 +29,34 @@ import {
 } from 'search/actions';
 
 export const SET_STATE = 'SET_STATE';
-export function setState(state) {
+export function setState(state: any) {
     return {type: SET_STATE, state};
 }
 
 export const SET_ITEMS = 'SET_ITEMS';
-export function setItems(items) {
+export function setItems(items: any) {
     return {type: SET_ITEMS, items};
 }
 
 export const SET_ACTIVE = 'SET_ACTIVE';
-export function setActive(item) {
+export function setActive(item: any) {
     return {type: SET_ACTIVE, item};
 }
 
 export const PREVIEW_ITEM = 'PREVIEW_ITEM';
-export function preview(item) {
+export function preview(item: any) {
     return {type: PREVIEW_ITEM, item};
 }
 
-export function previewAndCopy(item) {
-    return (dispatch) => {
+export function previewAndCopy(item: any) {
+    return (dispatch: any) => {
         dispatch(previewItem(item));
         dispatch(copyPreviewContents(item));
     };
 }
 
-export function previewItem(item) {
-    return (dispatch, getState) => {
+export function previewItem(item: any) {
+    return (dispatch: any, getState: any) => {
         markItemAsRead(item, getState());
         dispatch(preview(item));
         recordAction(item, 'preview', getState().context, getState());
@@ -64,12 +64,12 @@ export function previewItem(item) {
 }
 
 export const OPEN_ITEM = 'OPEN_ITEM';
-export function openItemDetails(item) {
+export function openItemDetails(item: any) {
     return {type: OPEN_ITEM, item};
 }
 
-export function openItem(item) {
-    return (dispatch, getState) => {
+export function openItem(item: any) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         markItemAsRead(item, state);
         dispatch(openItemDetails(item));
@@ -83,7 +83,7 @@ export function openItem(item) {
     };
 }
 
-export function selectCopy(item) {
+export function selectCopy(item: any) {
     return () => {
         recordAction(item, 'clipboard');
     };
@@ -100,22 +100,22 @@ function loadingAggregations() {
 }
 
 export const RECIEVE_ITEMS = 'RECIEVE_ITEMS';
-export function recieveItems(data) {
+export function recieveItems(data: any) {
     return {type: RECIEVE_ITEMS, data};
 }
 
 export const RECIEVE_AGGS = 'RECIEVE_AGGS';
-function recieveAggs(data) {
+function recieveAggs(data: any) {
     return {type: RECIEVE_AGGS, data};
 }
 
 export const RECIEVE_ITEM = 'RECIEVE_ITEM';
-export function recieveItem(data) {
+export function recieveItem(data: any) {
     return {type: RECIEVE_ITEM, data};
 }
 
 export const INIT_DATA = 'INIT_DATA';
-export function initData(wireData, newsOnlyFilterText,readData, newsOnly, searchAllVersions) {
+export function initData(wireData: any, newsOnlyFilterText?: any, readData?: any, newsOnly?: any, searchAllVersions?: any) {
     return {type: INIT_DATA, wireData, newsOnlyFilterText, readData, newsOnly, searchAllVersions};
 }
 
@@ -131,7 +131,7 @@ export function toggleSearchAllVersions() {
     return {type: TOGGLE_SEARCH_ALL_VERSIONS};
 }
 
-export function removeItems(items) {
+export function removeItems(items: any) {
     if (confirm(gettext('Are you sure you want to permanently remove these item(s)?'))) {
         return server.del('/wire', {items})
             .then(() => {
@@ -152,7 +152,7 @@ export const WIRE_ITEM_REMOVED = 'WIRE_ITEM_REMOVED';
  * Marks the items as deleted when they're removed from the system
  * @param {Array<String>} ids - List of ids of items that were removed
  */
-export function onItemsDeleted(ids) {
+export function onItemsDeleted(ids: any) {
     return {type: WIRE_ITEM_REMOVED, ids: ids};
 }
 
@@ -161,16 +161,16 @@ export function onItemsDeleted(ids) {
  *
  * This is an initial version, should be updated with preview markup changes.
  */
-export function copyPreviewContents(item) {
-    return (dispatch, getState) => {
+export function copyPreviewContents(item: any) {
+    return (dispatch: any, getState: any) => {
         const state = getState();
 
         if (!state.user) {
             return;
         }
 
-        server.post(`/wire/${item._id}/copy?type=${state.context}`)
-            .then((response) => {
+        (server as any).post(`/wire/${item._id}/copy?type=${state.context}`)
+            .then((response: any) => {
                 dispatch(setCopyItem(item._id));
                 copyTextToClipboard(response.data, item);
             })
@@ -178,8 +178,8 @@ export function copyPreviewContents(item) {
     };
 }
 
-export function printItem(item) {
-    return (dispatch, getState) => {
+export function printItem(item: any) {
+    return (dispatch: any, getState: any) => {
         const userContext = context(getState());
         let uri = `/${userContext}/${item._id}?print`;
         if (userContext === 'monitoring') {
@@ -202,7 +202,7 @@ export function printItem(item) {
  * @param {bool} aggs
  * @return {Promise}
  */
-export function search(state, next, aggs) {
+export function search(state: any, next?: any, aggs?: any) {
     const searchParams = searchParamsSelector(state);
     const createdFilter = get(searchParams, 'created') || {};
     let created_to = createdFilter.to;
@@ -215,7 +215,7 @@ export function search(state, next, aggs) {
     const searchAllVersions = !!get(state, 'wire.searchAllVersions');
     const context = get(state, 'context', 'wire');
 
-    const params = {
+    const params: any = {
         q: !searchParams.query ? null : encodeURIComponent(searchParams.query),
         bookmarks: state.bookmarks ? state.user : null,
         navigation: getNavigationUrlParam(searchParams.navigation, true, false),
@@ -237,8 +237,8 @@ export function search(state, next, aggs) {
 
 
     const queryString = Object.keys(params)
-        .filter((key) => params[key] != null && params[key].toString() !== '')
-        .map((key) => `${key}=${params[key]}`)
+        .filter((key: any) => params[key] != null && params[key].toString() !== '')
+        .map((key: any) => `${key}=${params[key]}`)
         .join('&');
 
     return server.get(`/${context}/search?${queryString}`);
@@ -247,8 +247,8 @@ export function search(state, next, aggs) {
 /**
  * Fetch items for current query
  */
-export function fetchItems() {
-    return (dispatch, getState) => {
+export function fetchItems(): any {
+    return (dispatch: any, getState: any) => {
         const start = Date.now();
         dispatch(queryItems());
         dispatch(loadingAggregations());
@@ -256,7 +256,7 @@ export function fetchItems() {
         const state = getState();
         return Promise.all([
             search(state, false, false)
-                .then((data) => dispatch(recieveItems(data)))
+                .then((data: any) => dispatch(recieveItems(data)))
                 .then(() => {
                     analytics.timingComplete('search', Date.now() - start);
                 })
@@ -269,10 +269,10 @@ export function fetchItems() {
 }
 
 
-export function fetchItem(id) {
-    return (dispatch, getState) => {
+export function fetchItem(id: any) {
+    return (dispatch: any, getState: any) => {
         return server.get(`/${context(getState())}/${id}?format=json&context=wire`)
-            .then((data) => dispatch(recieveItem(data)))
+            .then((data: any) => dispatch(recieveItem(data)))
             .catch(errorHandler);
     };
 }
@@ -282,19 +282,19 @@ export function fetchItem(id) {
  *
  * @return {function}
  */
-export function shareItems(items) {
-    return (dispatch, getState) => {
+export function shareItems(items: any) {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         const company = getState().company;
         return server.get(`/companies/${company}/users`)
-            .then((users) => users.filter((u) => u._id !== user))
-            .then((users) => dispatch(renderModal('shareItem', {items, users})))
+            .then((users: any) => users.filter((u: any) => u._id !== user))
+            .then((users: any) => dispatch(renderModal('shareItem', {items, users})))
             .catch(errorHandler);
     };
 }
 
 export const TOGGLE_SELECTED = 'TOGGLE_SELECTED';
-export function toggleSelected(item) {
+export function toggleSelected(item: any) {
     return {type: TOGGLE_SELECTED, item};
 }
 
@@ -309,42 +309,42 @@ export function selectNone() {
 }
 
 export const SHARE_ITEMS = 'SHARE_ITEMS';
-export function setShareItems(items) {
+export function setShareItems(items: any) {
     return {type: SHARE_ITEMS, items};
 }
 
 export const DOWNLOAD_ITEMS = 'DOWNLOAD_ITEMS';
-export function setDownloadItems(items) {
+export function setDownloadItems(items: any) {
     return {type: DOWNLOAD_ITEMS, items};
 }
 
 export const EXPORT_ITEMS = 'EXPORT_ITEMS';
-export function setExportItems(items) {
+export function setExportItems(items: any) {
     return {type: EXPORT_ITEMS, items};
 }
 
 export const COPY_ITEMS = 'COPY_ITEMS';
-export function setCopyItem(item) {
+export function setCopyItem(item: any) {
     return {type: COPY_ITEMS, items: [item]};
 }
 
 export const PRINT_ITEMS = 'PRINT_ITEMS';
-export function setPrintItem(item) {
+export function setPrintItem(item: any) {
     return {type: PRINT_ITEMS, items: [item]};
 }
 
 export const BOOKMARK_ITEMS = 'BOOKMARK_ITEMS';
-export function setBookmarkItems(items) {
+export function setBookmarkItems(items: any) {
     return {type: BOOKMARK_ITEMS, items};
 }
 
 export const REMOVE_BOOKMARK = 'REMOVE_BOOKMARK';
-export function removeBookmarkItems(items) {
+export function removeBookmarkItems(items: any) {
     return {type: REMOVE_BOOKMARK, items};
 }
 
 export const SET_ERROR_MESSAGE = 'SET_ERROR_MESSAGE';
-export function setErrorMessage(message) {
+export function setErrorMessage(message: any) {
     return {
         type: SET_ERROR_MESSAGE,
         message
@@ -352,12 +352,12 @@ export function setErrorMessage(message) {
 }
 
 export const SET_ERROR = 'SET_ERROR';
-export function setError(errors) {
+export function setError(errors: any) {
     return {type: SET_ERROR, errors};
 }
 
-export function bookmarkItems(items) {
-    return (dispatch, getState) =>
+export function bookmarkItems(items: any) {
+    return (dispatch: any, getState: any) =>
         server.post(`/${getState().context}_bookmark`, {items})
             .then(() => {
                 if (items.length > 1) {
@@ -367,14 +367,14 @@ export function bookmarkItems(items) {
                 }
             })
             .then(() => {
-                analytics.multiItemEvent('bookmark', items.map((_id) => getState().itemsById[_id]));
+                analytics.multiItemEvent('bookmark', items.map((_id: any) => getState().itemsById[_id]));
             })
             .then(() => dispatch(setBookmarkItems(items)))
             .catch(errorHandler);
 }
 
-export function removeBookmarks(items) {
-    return (dispatch, getState) =>
+export function removeBookmarks(items: any) {
+    return (dispatch: any, getState: any) =>
         server.del(`/${getState().context}_bookmark`, {items})
             .then(() => {
                 if (items.length > 1) {
@@ -388,14 +388,14 @@ export function removeBookmarks(items) {
             .catch(errorHandler);
 }
 
-export function errorHandler(error, dispatch, setError) {
+export function errorHandler(error?: any, dispatch?: any, setError?: any) {
     console.error('error', error);
     if (setError) {
         if (error.response && error.response.status === 403) {
             dispatch(setErrorMessage(gettext(
                 'There is no product associated with your user. Please reach out to your Company Admin')));
         } else {
-            error.response.json().then(function(data) {
+            error.response.json().then(function(data: any) {
                 dispatch(setError(data));
             });
         }
@@ -408,9 +408,9 @@ export function errorHandler(error, dispatch, setError) {
  * @param {Object} item
  * @return {Promise}
  */
-export function fetchVersions(item) {
+export function fetchVersions(item: any) {
     return () => server.get(`/wire/${item._id}/versions`)
-        .then((data) => {
+        .then((data: any) => {
             return data._items;
         });
 }
@@ -421,7 +421,7 @@ export function fetchVersions(item) {
  * @param {string} id
  * @param {string} filename
  */
-export function downloadMedia(id, filename) {
+export function downloadMedia(id: any, filename: any) {
     return () => {
         window.open(`/assets/${id}?filename=${filename}`, '_blank');
         analytics.event('download-media', filename || id);
@@ -433,7 +433,7 @@ export function downloadMedia(id, filename) {
  *
  * @param {Array} items
  */
-export function downloadItems(items) {
+export function downloadItems(items: any) {
     return renderModal('downloadItems', {items});
 }
 
@@ -443,8 +443,8 @@ export function downloadItems(items) {
  * @param {Array} items
  * @param {String} params
  */
-export function submitDownloadItems(items, params) {
-    return (dispatch, getState) => {
+export function submitDownloadItems(items: any, params: any) {
+    return (dispatch: any, getState: any) => {
         const {format, secondaryFormat} = params;
         const userContext = context(getState());
         let uri = `/download/${items.join(',')}?format=${format}&type=${userContext}`;
@@ -456,11 +456,11 @@ export function submitDownloadItems(items, params) {
         browserDownload(uri);
         dispatch(setDownloadItems(items));
         dispatch(closeModal());
-        analytics.multiItemEvent('download', items.map((_id) => getState().itemsById[_id]));
+        analytics.multiItemEvent('download', items.map((_id: any) => getState().itemsById[_id]));
     };
 }
 
-function browserDownload(url) {
+function browserDownload(url: any) {
     const link = document.createElement('a');
     link.download = '';
     link.href = url;
@@ -468,7 +468,7 @@ function browserDownload(url) {
 }
 
 export const REMOVE_NEW_ITEMS = 'REMOVE_NEW_ITEMS';
-export function removeNewItems(data) {
+export function removeNewItems(data: any) {
     return {type: REMOVE_NEW_ITEMS, data};
 }
 
@@ -477,8 +477,8 @@ export function removeNewItems(data) {
  *
  * @param {Object} push
  */
-export function pushNotification(push) {
-    return (dispatch, getState) => {
+export function pushNotification(push: any): any {
+    return (dispatch: any, getState: any) => {
         const user = getState().user;
         const company = getState().company;
 
@@ -510,11 +510,11 @@ export function pushNotification(push) {
     };
 }
 
-export function reloadMyTopics(reloadTopic = false) {
-    return function(dispatch) {
+export function reloadMyTopics(reloadTopic: any = false) {
+    return function(dispatch: any) {
         return loadMyTopics()
-            .then((data) => {
-                const wireTopics = data.filter((topic) => !topic.topic_type || topic.topic_type === 'wire');
+            .then((data: any) => {
+                const wireTopics = data.filter((topic: any) => !topic.topic_type || topic.topic_type === 'wire');
                 dispatch(setTopics(wireTopics));
 
                 if (reloadTopic) {
@@ -529,8 +529,8 @@ export function reloadMyTopics(reloadTopic = false) {
 }
 
 export const SET_NEW_ITEMS = 'SET_NEW_ITEMS';
-export function setNewItems(data) {
-    return function (dispatch) {
+export function setNewItems(data: any) {
+    return function (dispatch: any) {
         if (get(data, '_items.length') <= 0 || get(data, '_items[0].type') !== 'text') {
             return Promise.resolve();
         }
@@ -541,11 +541,11 @@ export function setNewItems(data) {
 }
 
 export function fetchNewItems() {
-    return (dispatch, getState) => search(getState())
-        .then((response) => dispatch(setNewItems(response)));
+    return (dispatch: any, getState: any) => search(getState())
+        .then((response: any) => dispatch(setNewItems(response)));
 }
 
-export function fetchNext(item) {
+export function fetchNext(item: any) {
     return () => {
         if (!item.nextversion) {
             return Promise.reject();
@@ -556,8 +556,8 @@ export function fetchNext(item) {
 }
 
 export const TOGGLE_FILTER = 'TOGGLE_FILTER';
-export function toggleFilter(key, val, single) {
-    return (dispatch) => {
+export function toggleFilter(key: any, val: any, single: any) {
+    return (dispatch: any) => {
         setTimeout(() => dispatch({type: TOGGLE_FILTER, key, val, single}));
     };
 }
@@ -568,13 +568,13 @@ export function startLoading() {
 }
 
 export const RECIEVE_NEXT_ITEMS = 'RECIEVE_NEXT_ITEMS';
-export function recieveNextItems(data) {
+export function recieveNextItems(data: any) {
     return {type: RECIEVE_NEXT_ITEMS, data};
 }
 
 const MAX_ITEMS = 1000; // server limit
 export function fetchMoreItems() {
-    return (dispatch, getState) => {
+    return (dispatch: any, getState: any) => {
         const state = getState();
         const limit = Math.min(MAX_ITEMS, state.totalItems);
 
@@ -584,13 +584,13 @@ export function fetchMoreItems() {
 
         dispatch(startLoading());
         return search(getState(), true)
-            .then((data) => dispatch(recieveNextItems(data)))
+            .then((data: any) => dispatch(recieveNextItems(data)))
             .catch(errorHandler);
     };
 }
 
-export function loadMyWireTopic(topicId) {
-    return (dispatch) => {
+export function loadMyWireTopic(topicId: any) {
+    return (dispatch: any) => {
         dispatch(loadMyTopic(topicId));
         return dispatch(fetchItems());
     };
@@ -601,8 +601,8 @@ export function loadMyWireTopic(topicId) {
  *
  * @param {URLSearchParams} params
  */
-export function initParams(params) {
-    return (dispatch, getState) => {
+export function initParams(params: any): any {
+    return (dispatch: any, getState: any) => {
         dispatch(initSearchParams(params));
         if (params.get('item')) {
             dispatch(fetchItem(params.get('item')))
diff --git a/assets/wire/components/AgendaLinks.jsx b/assets/wire/components/AgendaLinks.tsx
similarity index 90%
rename from assets/wire/components/AgendaLinks.jsx
rename to assets/wire/components/AgendaLinks.tsx
index bf5c09fad..14e695c3e 100644
--- a/assets/wire/components/AgendaLinks.jsx
+++ b/assets/wire/components/AgendaLinks.tsx
@@ -10,8 +10,9 @@ import PreviewBox from 'ui/components/PreviewBox';
 import AgendaCoverages from 'agenda/components/AgendaCoverages';
 import AgendaEventInfo from 'agenda/components/AgendaEventInfo';
 
-export default class AgendaLinks extends React.PureComponent {
-    constructor(props) {
+export default class AgendaLinks extends React.PureComponent<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.openAgenda = this.openAgenda.bind(this);
@@ -23,7 +24,7 @@ export default class AgendaLinks extends React.PureComponent {
         this.fetchAgendaData();
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: any) {
         if (get(prevProps, 'item._id') !== get(this.props, 'item._id')) {
             this.setState({
                 agenda: null,
@@ -35,7 +36,7 @@ export default class AgendaLinks extends React.PureComponent {
 
     fetchAgendaData() {
         if (get(this.props, 'item._id')) {
-            server.getJson(`agenda/wire_items/${this.props.item._id}`).then((data) => {
+            server.getJson(`agenda/wire_items/${this.props.item._id}`).then((data: any) => {
                 this.setState({
                     'agenda': get(data, 'agenda_item'),
                     'agendaWireItems': get(data, 'wire_items'),
@@ -61,7 +62,7 @@ export default class AgendaLinks extends React.PureComponent {
             return [];
         }
 
-        return (get(this.state.agenda, 'coverages') || []).filter((c) => c.coverage_id !== this.props.item.coverage_id);
+        return (get(this.state.agenda, 'coverages') || []).filter((c: any) => c.coverage_id !== this.props.item.coverage_id);
     }
 
     render() {
@@ -79,7 +80,7 @@ export default class AgendaLinks extends React.PureComponent {
 
         return (
             <Fragment>
-                <InfoBox label={sectionNames.agenda}>
+                <InfoBox label={window.sectionNames.agenda}>
                     {get(agenda, 'event', null) &&
                         <PreviewTagsBlock label={gettext('Related Event')}>
                             <AgendaEventInfo item={agenda} onClick={this.openAgenda}/>
diff --git a/assets/wire/components/DownloadItemsModal.jsx b/assets/wire/components/DownloadItemsModal.tsx
similarity index 84%
rename from assets/wire/components/DownloadItemsModal.jsx
rename to assets/wire/components/DownloadItemsModal.tsx
index 6458ab137..615280357 100644
--- a/assets/wire/components/DownloadItemsModal.jsx
+++ b/assets/wire/components/DownloadItemsModal.tsx
@@ -10,8 +10,9 @@ import {get} from 'lodash';
 import Modal from 'components/Modal';
 import SelectInput from 'components/SelectInput';
 
-class DownloadItemsModal extends React.Component {
-    constructor(props) {
+class DownloadItemsModal extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.state = {
             items: props.data.items,
@@ -30,7 +31,7 @@ class DownloadItemsModal extends React.Component {
         this.props.modalFormValid();
     }
 
-    onChange(field, event) {
+    onChange(field: any, event: any) {
         this.setState({
             ...this.state,
             params: {
@@ -40,7 +41,7 @@ class DownloadItemsModal extends React.Component {
         });
     }
 
-    onSubmit(event) {
+    onSubmit(event: any) {
         event.preventDefault();
         this.props.onSubmit(this.state);
     }
@@ -56,7 +57,6 @@ class DownloadItemsModal extends React.Component {
                     <SelectInput
                         name='format'
                         label={gettext('Format')}
-                        required={true}
                         value={this.state.params.format}
                         onChange={this.onChange.bind(null, 'format')}
                         options={this.props.options}
@@ -85,15 +85,17 @@ DownloadItemsModal.propTypes = {
     secondaryOptions: PropTypes.array,
 };
 
-const mapStateToProps = (state, props) => ({
+const mapStateToProps = (state: any, props: any) => ({
     options: modalOptions(state, props),
     context: context(state),
     secondaryOptions: modalSecondaryFormatOptions(state),
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    onSubmit: ({items, params}) => dispatch(submitDownloadItems(items, params)),
+const mapDispatchToProps = (dispatch: any) => ({
+    onSubmit: ({items, params}: any) => dispatch(submitDownloadItems(items, params)),
     modalFormValid: () => dispatch(modalFormValid()),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(DownloadItemsModal);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(DownloadItemsModal);
+
+export default component;
diff --git a/assets/wire/components/FollowStory.jsx b/assets/wire/components/FollowStory.tsx
similarity index 87%
rename from assets/wire/components/FollowStory.jsx
rename to assets/wire/components/FollowStory.tsx
index 883d6487d..b33a7ade5 100644
--- a/assets/wire/components/FollowStory.jsx
+++ b/assets/wire/components/FollowStory.tsx
@@ -4,12 +4,12 @@ import {get} from 'lodash';
 import {gettext} from 'utils';
 import types from 'wire/types';
 
-const isFollowing = (item, topics) => 
+const isFollowing = (item: any, topics: any) =>
     item && item.slugline && topics && topics.find(
-        (topic) => topic.query === `slugline:"${item.slugline}"`
+        (topic: any) => topic.query === `slugline:"${item.slugline}"`
     );
 
-export default function FollowStory({item, user, topics, followStory}) {
+export default function FollowStory({item, user, topics, followStory}: any) {
     const canFollowStory = followStory && user && (get(item, 'slugline') || '').trim();
     const disabled = isFollowing(item, topics);
 
diff --git a/assets/wire/components/InfoBox.jsx b/assets/wire/components/InfoBox.tsx
similarity index 91%
rename from assets/wire/components/InfoBox.jsx
rename to assets/wire/components/InfoBox.tsx
index d415fc4ef..159dac0e6 100644
--- a/assets/wire/components/InfoBox.jsx
+++ b/assets/wire/components/InfoBox.tsx
@@ -4,12 +4,12 @@ import {bem} from 'ui/utils';
 import {gettext} from 'utils';
 import InfoBoxContent from './InfoBoxContent';
 
-export default function InfoBox(props) {
+export default function InfoBox(props: any) {
     const className = bem('info-box', null, {
         'top': props.top,
     });
     const renderChildren = (props.children ? (Array.isArray(props.children) ? props.children : [props.children]) : [])
-        .filter((c) => c);
+        .filter((c: any) => c);
 
     return (
         <div className={className} id={props.id || null}>
diff --git a/assets/wire/components/InfoBoxContent.jsx b/assets/wire/components/InfoBoxContent.tsx
similarity index 80%
rename from assets/wire/components/InfoBoxContent.jsx
rename to assets/wire/components/InfoBoxContent.tsx
index f0d9b6274..32f0c6ba5 100644
--- a/assets/wire/components/InfoBoxContent.jsx
+++ b/assets/wire/components/InfoBoxContent.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function InfoBoxContent({element}) {
+export default function InfoBoxContent({element}: any) {
     return (
         <div className="info-box__content">
             {element}
diff --git a/assets/wire/components/ItemDetails.jsx b/assets/wire/components/ItemDetails.tsx
similarity index 98%
rename from assets/wire/components/ItemDetails.jsx
rename to assets/wire/components/ItemDetails.tsx
index cb971c3b7..443e6fcb0 100644
--- a/assets/wire/components/ItemDetails.jsx
+++ b/assets/wire/components/ItemDetails.tsx
@@ -47,7 +47,7 @@ function ItemDetails({
     followStory,
     listConfig,
     filterGroupLabels,
-}) {
+}: any) {
     const pictures = getPictureList(item);
     const media = getItemMedia(item);
     const itemType = isPreformatted(item) ? 'preformatted' : 'text';
@@ -67,7 +67,7 @@ function ItemDetails({
             </ContentHeader>
             <ArticleItemDetails disableTextSelection={detailsConfig.disable_text_selection}>
                 <ArticleContent>
-                    {pictures && pictures.map((pic) => (
+                    {pictures && pictures.map((pic: any) => (
                         <ArticlePicture
                             key={pic._id}
                             picture={pic}
@@ -89,7 +89,7 @@ function ItemDetails({
                             {isDisplayed('abstract', detailsConfig) &&
                             <ArticleAbstract item={item} displayAbstract={DISPLAY_ABSTRACT}/>}
                             {isDisplayed('body_html', detailsConfig) && <ArticleBodyHtml item={item}/>}
-                            {!isEmpty(media) && media.map((media) => <ArticleMedia
+                            {!isEmpty(media) && media.map((media: any) => <ArticleMedia
                                 key={media.guid}
                                 media={media}
                                 isKilled={isKilled(item)}
diff --git a/assets/wire/components/ItemStatisticsModal.jsx b/assets/wire/components/ItemStatisticsModal.tsx
similarity index 90%
rename from assets/wire/components/ItemStatisticsModal.jsx
rename to assets/wire/components/ItemStatisticsModal.tsx
index 56800cd3f..220c4befb 100644
--- a/assets/wire/components/ItemStatisticsModal.jsx
+++ b/assets/wire/components/ItemStatisticsModal.tsx
@@ -3,8 +3,9 @@ import Modal from 'components/Modal';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-export default class ItemStatisticsModal extends React.Component {
-    constructor(props) {
+export default class ItemStatisticsModal extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {loading: true, iframe: null};
@@ -24,13 +25,13 @@ export default class ItemStatisticsModal extends React.Component {
 
         const pieces = guid.split(':');
         const id = pieces[pieces.length - 1];
-        
+
         fetch('https://56dtrivaof.execute-api.eu-north-1.amazonaws.com/production/api/v1/embed?organization=stt&versionId=' + id)
-            .then((res) => res.json())
-            .then((data) => {
+            .then((res: any) => res.json())
+            .then((data: any) => {
                 this.setState({iframe: data.iframeSrc});
             })
-            .catch((err) => {
+            .catch((err: any) => {
                 console.error(err);
             })
             .finally(() => {
diff --git a/assets/wire/components/ItemVersion.jsx b/assets/wire/components/ItemVersion.tsx
similarity index 94%
rename from assets/wire/components/ItemVersion.jsx
rename to assets/wire/components/ItemVersion.tsx
index 6089deeda..da5316bdf 100644
--- a/assets/wire/components/ItemVersion.jsx
+++ b/assets/wire/components/ItemVersion.tsx
@@ -4,9 +4,9 @@ import {MatchLabel} from './fields/MatchLabel';
 
 import {formatTime, formatDate, wordCount, characterCount, gettext, isDisplayed, getSlugline} from 'utils';
 
-export default function ItemVersion({version, baseClass, showDivider, onClick, displayConfig, matchedIds}) {
+export default function ItemVersion({version, baseClass, showDivider, onClick, displayConfig, matchedIds}: any) {
     return (
-        <div className={`${baseClass}__versions__item`} onClick={(event) => onClick(version, event)}>
+        <div className={`${baseClass}__versions__item`} onClick={(event: any) => onClick(version, event)}>
             <div className={`${baseClass}__versions__wrap`}>
                 {!matchedIds.includes(version._id) ? null : (
                     <MatchLabel />
@@ -47,6 +47,7 @@ ItemVersion.propTypes = {
     onClick: PropTypes.func.isRequired,
     displayConfig: PropTypes.object,
     matchedIds: PropTypes.array,
+    withDivider: PropTypes.any,
 };
 
 ItemVersion.defaultProps = {
diff --git a/assets/wire/components/ItemsList.jsx b/assets/wire/components/ItemsList.tsx
similarity index 91%
rename from assets/wire/components/ItemsList.jsx
rename to assets/wire/components/ItemsList.tsx
index 5e454b576..68f95df61 100644
--- a/assets/wire/components/ItemsList.jsx
+++ b/assets/wire/components/ItemsList.tsx
@@ -17,8 +17,12 @@ import {getContextName} from 'selectors';
 const PREVIEW_TIMEOUT = 500; // time to preview an item after selecting using kb
 const CLICK_TIMEOUT = 200; // time when we wait for double click after click
 
-class ItemsList extends React.Component {
-    constructor(props) {
+class ItemsList extends React.Component<any, any> {
+    static propTypes: any;
+    previewTimeout: any;
+    clickTimeout: any;
+    elem: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {actioningItem: null};
@@ -30,7 +34,7 @@ class ItemsList extends React.Component {
         this.filterActions = this.filterActions.bind(this);
     }
 
-    onKeyDown(event) {
+    onKeyDown(event: any) {
         let diff = 0;
         switch (event.key) {
         case 'ArrowDown':
@@ -90,7 +94,7 @@ class ItemsList extends React.Component {
         }
     }
 
-    onItemClick(item) {
+    onItemClick(item: any) {
         const itemId = item._id;
         this.setState({actioningItem: null});
         this.cancelPreviewTimeout();
@@ -107,13 +111,13 @@ class ItemsList extends React.Component {
         }, CLICK_TIMEOUT);
     }
 
-    onItemDoubleClick(item) {
+    onItemDoubleClick(item: any) {
         this.cancelClickTimeout();
         this.props.dispatch(setActive(item._id));
         this.props.dispatch(openItem(item));
     }
 
-    onActionList(event, item) {
+    onActionList(event: any, item: any) {
         event.stopPropagation();
         if (this.state.actioningItem && this.state.actioningItem._id === item._id) {
             this.setState({actioningItem: null});
@@ -122,12 +126,12 @@ class ItemsList extends React.Component {
         }
     }
 
-    filterActions(item, config) {
-        return this.props.actions.filter((action) =>  (!config || isDisplayed(action.id, config)) &&
+    filterActions(item: any, config: any) {
+        return this.props.actions.filter((action: any) =>  (!config || isDisplayed(action.id, config)) &&
           (!action.when || action.when(this.props, item)));
     }
 
-    componentDidUpdate(nextProps) {
+    componentDidUpdate(nextProps: any) {
         if (!isEqual(nextProps.activeNavigation, this.props.activeNavigation) ||
             (!nextProps.searchInitiated && this.props.searchInitiated)) {
             this.elem.scrollTop = 0;
@@ -139,7 +143,7 @@ class ItemsList extends React.Component {
         const isExtended = activeView === EXTENDED_VIEW;
         const showShortcutActionIcons = shouldShowListShortcutActionIcons(this.props.listConfig, isExtended);
 
-        const articles = items.map((_id) =>
+        const articles = items.map((_id: any) =>
             <WireListItem
                 key={_id}
                 item={itemsById[_id]}
@@ -169,7 +173,7 @@ class ItemsList extends React.Component {
         });
 
         return (
-            <div className={listClassName} onKeyDown={this.onKeyDown} onScroll={this.props.onScroll} ref={(elem) => this.elem = elem}>
+            <div className={listClassName} onKeyDown={this.onKeyDown} onScroll={this.props.onScroll} ref={(elem: any) => this.elem = elem}>
                 {articles}
                 {!articles.length &&
                     <div className="wire-articles__item-wrap col-12">
@@ -212,7 +216,7 @@ ItemsList.propTypes = {
     onScroll: PropTypes.func,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     items: state.items,
     itemsById: state.itemsById,
     matchedIds: state.matchedIds,
@@ -236,4 +240,6 @@ const mapStateToProps = (state) => ({
     filterGroupLabels: filterGroupsToLabelMap(state),
 });
 
-export default connect(mapStateToProps)(ItemsList);
+const component: React.ComponentType<any> = connect(mapStateToProps)(ItemsList);
+
+export default component;
diff --git a/assets/wire/components/ListItemNextVersion.jsx b/assets/wire/components/ListItemNextVersion.tsx
similarity index 79%
rename from assets/wire/components/ListItemNextVersion.jsx
rename to assets/wire/components/ListItemNextVersion.tsx
index 5a5eecc0f..b4e3906be 100644
--- a/assets/wire/components/ListItemNextVersion.jsx
+++ b/assets/wire/components/ListItemNextVersion.tsx
@@ -6,27 +6,28 @@ import {gettext} from 'utils';
 import ItemVersion from './ItemVersion';
 import {fetchNext, openItem} from '../actions';
 
-class ListItemNextVersion extends React.Component {
-    constructor(props) {
+class ListItemNextVersion extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.state = {next: null};
         this.open = this.open.bind(this);
         this.fetch(props);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (nextProps.item.nextversion !== this.props.item.nextversion) {
             this.fetch(nextProps);
         }
     }
 
-    fetch(props) {
+    fetch(props: any) {
         props.dispatch(fetchNext(props.item))
-            .then((next) => this.setState({next}))
+            .then((next: any) => this.setState({next}))
             .catch(() => this.setState({next: null}));
     }
 
-    open(version, event) {
+    open(version: any, event: any) {
         event.stopPropagation();
         this.props.dispatch(openItem(this.state.next));
     }
@@ -61,4 +62,6 @@ ListItemNextVersion.propTypes = {
     displayConfig: PropTypes.object,
 };
 
-export default connect()(ListItemNextVersion);
+const component: React.ComponentType<any> = connect()(ListItemNextVersion);
+
+export default component;
diff --git a/assets/wire/components/ListItemPreviousVersions.jsx b/assets/wire/components/ListItemPreviousVersions.tsx
similarity index 80%
rename from assets/wire/components/ListItemPreviousVersions.jsx
rename to assets/wire/components/ListItemPreviousVersions.tsx
index da7cbaeb6..55799e1f0 100644
--- a/assets/wire/components/ListItemPreviousVersions.jsx
+++ b/assets/wire/components/ListItemPreviousVersions.tsx
@@ -8,8 +8,12 @@ import {fetchVersions, openItem} from '../actions';
 import ItemVersion from './ItemVersion';
 
 
-class ListItemPreviousVersions extends React.Component {
-    constructor(props) {
+class ListItemPreviousVersions extends React.Component<any, any> {
+    baseClass: string;
+    static propTypes: any;
+    static defaultProps: any;
+
+    constructor(props: any) {
         super(props);
         this.state = {versions: [], loading: true, error: false};
         this.baseClass = this.props.isPreview ? 'wire-column__preview' : 'wire-articles';
@@ -17,20 +21,20 @@ class ListItemPreviousVersions extends React.Component {
         this.fetch(props);
     }
 
-    componentWillReceiveProps(nextProps) {
+    componentWillReceiveProps(nextProps: any) {
         if (nextProps.item._id !== this.props.item._id) {
             this.fetch(nextProps);
         }
     }
 
-    open(version, event) {
+    open(version: any, event: any) {
         event.stopPropagation();
         this.props.dispatch(openItem(version));
     }
 
-    fetch(props) {
+    fetch(props: any) {
         props.dispatch(fetchVersions(props.item))
-            .then((versions) => this.setState({versions, loading: false}))
+            .then((versions: any) => this.setState({versions, loading: false}))
             .catch(() => this.setState({error: true}));
     }
 
@@ -43,7 +47,7 @@ class ListItemPreviousVersions extends React.Component {
             );
         }
 
-        const versions = this.state.versions.map((version) => (
+        const versions = this.state.versions.map((version: any) => (
             <ItemVersion
                 key={version._id}
                 version={version}
@@ -83,4 +87,6 @@ ListItemPreviousVersions.defaultProps = {
     matchedIds: [],
 };
 
-export default connect()(ListItemPreviousVersions);
+const component: React.ComponentType<any> = connect()(ListItemPreviousVersions);
+
+export default component;
diff --git a/assets/wire/components/ListSearchOptions.jsx b/assets/wire/components/ListSearchOptions.tsx
similarity index 94%
rename from assets/wire/components/ListSearchOptions.jsx
rename to assets/wire/components/ListSearchOptions.tsx
index 42ddbf6ba..717159e52 100644
--- a/assets/wire/components/ListSearchOptions.jsx
+++ b/assets/wire/components/ListSearchOptions.tsx
@@ -4,8 +4,10 @@ import Toggle from 'react-toggle';
 
 import {gettext} from 'utils';
 
-export class ListSearchOptions extends React.PureComponent {
-    constructor(props) {
+export class ListSearchOptions extends React.PureComponent<any, any> {
+    static propTypes: any;
+    btnGroup: any;
+    constructor(props: any) {
         super(props);
 
         this.state = {isOpen: false};
@@ -27,12 +29,11 @@ export class ListSearchOptions extends React.PureComponent {
         return (
             <div
                 className="btn-group"
-                ref={(elem) => this.btnGroup = elem}
+                ref={(elem: any) => this.btnGroup = elem}
             >
                 <button
                     id="listSearchOptionsButton"
                     className="content-bar__menu"
-                    onClick={this.toggleOpen}
                     data-bs-toggle="dropdown"
                     aria-haspopup="menu"
                     aria-expanded={this.state.isOpen}
diff --git a/assets/wire/components/ListViewControls.jsx b/assets/wire/components/ListViewControls.tsx
similarity index 99%
rename from assets/wire/components/ListViewControls.jsx
rename to assets/wire/components/ListViewControls.tsx
index 087967479..0779061b6 100644
--- a/assets/wire/components/ListViewControls.jsx
+++ b/assets/wire/components/ListViewControls.tsx
@@ -18,7 +18,7 @@ function ListViewControls({
     hideSearchAllVersions,
     searchAllVersions,
     toggleSearchAllVersions,
-}) {
+}: any) {
     return(
         <div className="navbar navbar--flex navbar--small">
             <div className="navbar__inner navbar__inner--end">
diff --git a/assets/wire/components/NewsOnlyControl.jsx b/assets/wire/components/NewsOnlyControl.tsx
similarity index 98%
rename from assets/wire/components/NewsOnlyControl.jsx
rename to assets/wire/components/NewsOnlyControl.tsx
index d5f1a1d6a..192395d9d 100644
--- a/assets/wire/components/NewsOnlyControl.jsx
+++ b/assets/wire/components/NewsOnlyControl.tsx
@@ -4,7 +4,7 @@ import Toggle from 'react-toggle';
 import {gettext} from 'utils';
 import {noNavigationSelected} from 'search/utils';
 
-function NewsOnlyControl ({newsOnly, toggleNews, activeNavigation}) {
+function NewsOnlyControl ({newsOnly, toggleNews, activeNavigation}: any) {
     return !noNavigationSelected(activeNavigation) ? null : (
         <div className="react-toggle__wrapper ms-2">
             <label htmlFor="news-only" className="me-2">{gettext('News only')}</label>
diff --git a/assets/wire/components/PreviewEdnote.jsx b/assets/wire/components/PreviewEdnote.tsx
similarity index 90%
rename from assets/wire/components/PreviewEdnote.jsx
rename to assets/wire/components/PreviewEdnote.tsx
index d4efb5ce5..4f9c8ef5f 100644
--- a/assets/wire/components/PreviewEdnote.jsx
+++ b/assets/wire/components/PreviewEdnote.tsx
@@ -4,7 +4,7 @@ import {gettext} from 'utils';
 import InfoBox from './InfoBox';
 
 
-function PreviewEdnote({item}) {
+function PreviewEdnote({item}: any) {
     return (
         item.ednote ? <InfoBox label={gettext('Note')}>
             <div>{item.ednote}</div>
diff --git a/assets/wire/components/PreviewMeta.jsx b/assets/wire/components/PreviewMeta.tsx
similarity index 91%
rename from assets/wire/components/PreviewMeta.jsx
rename to assets/wire/components/PreviewMeta.tsx
index 52b04b964..782196c36 100644
--- a/assets/wire/components/PreviewMeta.jsx
+++ b/assets/wire/components/PreviewMeta.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {getPicture, getVideos} from 'wire/utils';
+import {getPicture} from 'wire/utils';
 import {FieldComponents} from './fields';
 import WireListItemIcons from './WireListItemIcons';
 
@@ -18,15 +18,14 @@ function PreviewMeta({
     displayConfig,
     listConfig,
     filterGroupLabels,
-}) {
+}: any) {
     const picture = getPicture(item);
     const fields = displayConfig.metadata_fields || DEFAULT_META_FIELDS;
 
     return (
         <div className="wire-articles__item__meta">
-            <WireListItemIcons 
+            <WireListItemIcons
                 item={item}
-                videos={getVideos(item)}
                 picture={picture}
             />
             <div className="wire-articles__item__meta-info">
diff --git a/assets/wire/components/PreviewTags.jsx b/assets/wire/components/PreviewTags.tsx
similarity index 93%
rename from assets/wire/components/PreviewTags.jsx
rename to assets/wire/components/PreviewTags.tsx
index 185acdc7a..1c78b59ce 100644
--- a/assets/wire/components/PreviewTags.jsx
+++ b/assets/wire/components/PreviewTags.tsx
@@ -13,7 +13,7 @@ import {PreviewTagsLinkList} from './PreviewTagsLinkList';
 import ArticleSlugline from 'ui/components/ArticleSlugline';
 
 
-function PreviewTagsComponent({item, isItemDetail, displayConfig, filterGroupLabels}) {
+function PreviewTagsComponent({item, isItemDetail, displayConfig, filterGroupLabels}: any) {
     const services = !isDisplayed('services', displayConfig) ? null : (
         <PreviewTagsLinkList
             urlPrefix="/wire?filter="
@@ -65,10 +65,10 @@ PreviewTagsComponent.propTypes = {
     filterGroupLabels: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     filterGroupLabels: filterGroupsToLabelMap(state),
 });
 
-const PreviewTags = connect(mapStateToProps)(PreviewTagsComponent);
+const PreviewTags: React.ComponentType<any> = connect(mapStateToProps)(PreviewTagsComponent);
 
 export default PreviewTags;
diff --git a/assets/wire/components/PreviewTagsBlock.jsx b/assets/wire/components/PreviewTagsBlock.tsx
similarity index 87%
rename from assets/wire/components/PreviewTagsBlock.jsx
rename to assets/wire/components/PreviewTagsBlock.tsx
index 19eda5c07..f68852a26 100644
--- a/assets/wire/components/PreviewTagsBlock.jsx
+++ b/assets/wire/components/PreviewTagsBlock.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function PreviewTagsBlock(props) {
+export default function PreviewTagsBlock(props: any) {
     return (
         <div className='column__preview__tags__column'>
             <span className='wire-column__preview__tags__headline'>
diff --git a/assets/wire/components/PreviewTagsLink.jsx b/assets/wire/components/PreviewTagsLink.tsx
similarity index 84%
rename from assets/wire/components/PreviewTagsLink.jsx
rename to assets/wire/components/PreviewTagsLink.tsx
index 148bd6cc2..cd7296486 100644
--- a/assets/wire/components/PreviewTagsLink.jsx
+++ b/assets/wire/components/PreviewTagsLink.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function PreviewTagsLink(props) {
+export default function PreviewTagsLink(props: any) {
     return (
         <a className="wire-column__preview__tag"
             href={props.href}
diff --git a/assets/wire/components/PreviewTagsLinkList.jsx b/assets/wire/components/PreviewTagsLinkList.tsx
similarity index 81%
rename from assets/wire/components/PreviewTagsLinkList.jsx
rename to assets/wire/components/PreviewTagsLinkList.tsx
index e62e212a8..2343a9e64 100644
--- a/assets/wire/components/PreviewTagsLinkList.jsx
+++ b/assets/wire/components/PreviewTagsLinkList.tsx
@@ -5,9 +5,9 @@ import {uniqBy} from 'lodash';
 import PreviewTagsLink from './PreviewTagsLink';
 
 
-export function PreviewTagsLinkList({urlPrefix, items, field}) {
+export function PreviewTagsLinkList({urlPrefix, items, field}: any): any {
     return items == null || (items.length || 0) === 0 ? null : (
-        uniqBy(items, 'code').map((item) => (
+        uniqBy(items, 'code').map((item: any) => (
             <PreviewTagsLink
                 key={item.code}
                 href={urlPrefix + encodeURIComponent(JSON.stringify({[field]: [item.name]}))}
diff --git a/assets/wire/components/PreviewTagsSubjects.jsx b/assets/wire/components/PreviewTagsSubjects.tsx
similarity index 83%
rename from assets/wire/components/PreviewTagsSubjects.jsx
rename to assets/wire/components/PreviewTagsSubjects.tsx
index 4df244837..51b33cb10 100644
--- a/assets/wire/components/PreviewTagsSubjects.jsx
+++ b/assets/wire/components/PreviewTagsSubjects.tsx
@@ -10,15 +10,15 @@ import PreviewTagsBlock from './PreviewTagsBlock';
 import {PreviewTagsLinkList} from './PreviewTagsLinkList';
 
 
-function PreviewTagsSubjectsComponent({subjects, displayConfig, urlPrefix, filterGroupLabels}) {
+function PreviewTagsSubjectsComponent({subjects, displayConfig, urlPrefix, filterGroupLabels}: any): any {
     if (!subjects.length) {
         return null;
     }
 
-    const subjectsByScheme = {subject: []};
+    const subjectsByScheme: any = {subject: []};
     const filterGroupSchemes = Object.keys(filterGroupLabels);
 
-    subjects.forEach((subject) => {
+    subjects.forEach((subject: any) => {
         if (subject.scheme && filterGroupSchemes.includes(subject.scheme)) {
             if (subjectsByScheme[subject.scheme] == null) {
                 subjectsByScheme[subject.scheme] = [];
@@ -31,12 +31,12 @@ function PreviewTagsSubjectsComponent({subjects, displayConfig, urlPrefix, filte
     });
 
     const schemesToDisplay = Object.keys(subjectsByScheme)
-        .filter((scheme) => (
+        .filter((scheme: any) => (
             subjectsByScheme[scheme].length > 0 &&
             isDisplayed(scheme === 'subject' ? 'subjects' : scheme, displayConfig))
         );
 
-    return !schemesToDisplay.length ? null : schemesToDisplay.map((scheme) => (
+    return !schemesToDisplay.length ? null : schemesToDisplay.map((scheme: any) => (
         <PreviewTagsBlock
             key={scheme}
             label={get(filterGroupLabels, scheme, gettext('Subject'))}
@@ -57,8 +57,8 @@ PreviewTagsSubjectsComponent.propTypes = {
     filterGroupLabels: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     filterGroupLabels: filterGroupsToLabelMap(state),
 });
 
-export const PreviewTagsSubjects = connect(mapStateToProps)(PreviewTagsSubjectsComponent);
+export const PreviewTagsSubjects: React.ComponentType<any> = connect(mapStateToProps)(PreviewTagsSubjectsComponent);
diff --git a/assets/wire/components/SearchAllVersionsControl.jsx b/assets/wire/components/SearchAllVersionsControl.tsx
similarity index 95%
rename from assets/wire/components/SearchAllVersionsControl.jsx
rename to assets/wire/components/SearchAllVersionsControl.tsx
index 766437fa1..78de55fb9 100644
--- a/assets/wire/components/SearchAllVersionsControl.jsx
+++ b/assets/wire/components/SearchAllVersionsControl.tsx
@@ -4,7 +4,7 @@ import Toggle from 'react-toggle';
 import {gettext} from 'utils';
 import {noNavigationSelected} from 'search/utils';
 
-function SearchAllVersionsControl({searchAllVersions, toggleSearchAllVersions, activeNavigation}) {
+function SearchAllVersionsControl({searchAllVersions, toggleSearchAllVersions, activeNavigation}: any) {
     return !noNavigationSelected(activeNavigation) ? null : (
         <div className="react-toggle__wrapper">
             <label htmlFor='all-versions' className="me-2">{gettext('All Versions')}</label>
diff --git a/assets/wire/components/SearchResultsInfo.tsx b/assets/wire/components/SearchResultsInfo.tsx
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/wire/components/SearchSidebar.jsx b/assets/wire/components/SearchSidebar.tsx
similarity index 86%
rename from assets/wire/components/SearchSidebar.jsx
rename to assets/wire/components/SearchSidebar.tsx
index 1ba485a83..4b15476e4 100644
--- a/assets/wire/components/SearchSidebar.jsx
+++ b/assets/wire/components/SearchSidebar.tsx
@@ -3,13 +3,14 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {setActiveFilterTab, getActiveFilterTab} from 'local-store';
 
-class SearchSidebar extends React.Component {
-    constructor(props) {
+class SearchSidebar extends React.Component<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         const activeTabId = getActiveFilterTab(props.props.context);
 
         this.state = {
-            active: props.tabs.findIndex((tab) => tab.id === activeTabId) >= 0 ?
+            active: props.tabs.findIndex((tab: any) => tab.id === activeTabId) >= 0 ?
                 activeTabId :
                 props.tabs[0].id
         };
@@ -19,7 +20,7 @@ class SearchSidebar extends React.Component {
         return (
             <div className='wire-column__nav__items'>
                 <ul className='nav' id='pills-tab' role='tablist'>
-                    {this.props.tabs.map((tab) => (
+                    {this.props.tabs.map((tab: any) => (
                         <li
                             className='wire-column__nav__tab nav-item'
                             key={tab.id}
@@ -30,7 +31,7 @@ class SearchSidebar extends React.Component {
                                 aria-selected={`${this.state.active === tab.id ? 'true' : 'false'}`}
                                 aria-label={tab.label}
                                 href=''
-                                onClick={(event) => {
+                                onClick={(event: any) => {
                                     event.preventDefault();
                                     setActiveFilterTab(tab.id, this.props.props.context);
                                     this.setState({active: tab.id});
@@ -38,7 +39,7 @@ class SearchSidebar extends React.Component {
                         </li>
                     ))}
                 </ul>
-                {this.props.tabs.map((tab) => (
+                {this.props.tabs.map((tab: any) => (
                     <div
                         className="tab-content"
                         key={tab.id}
diff --git a/assets/wire/components/SelectedItemsBar.jsx b/assets/wire/components/SelectedItemsBar.tsx
similarity index 75%
rename from assets/wire/components/SelectedItemsBar.jsx
rename to assets/wire/components/SelectedItemsBar.tsx
index a7ea73c61..93ad5d522 100644
--- a/assets/wire/components/SelectedItemsBar.jsx
+++ b/assets/wire/components/SelectedItemsBar.tsx
@@ -7,13 +7,14 @@ import {gettext} from 'utils';
 
 import {selectAll, selectNone} from 'wire/actions';
 
-class SelectedItemsBar extends React.PureComponent {
-    constructor(props) {
+class SelectedItemsBar extends React.PureComponent<any, any> {
+    static propTypes: any;
+    constructor(props: any) {
         super(props);
         this.onAction = this.onAction.bind(this);
     }
 
-    onAction(event, action) {
+    onAction(event: any, action: any) {
         event.preventDefault();
         action.action(this.props.selectedItems) && this.props.selectNone();
     }
@@ -23,14 +24,14 @@ class SelectedItemsBar extends React.PureComponent {
             return null;
         }
 
-        const multiActionFilter = (action) => action.multi &&
-            this.props.selectedItems.every((item) => !action.when || action.when(this.props.state, this.props.itemsById[item]));
+        const multiActionFilter = (action: any) => action.multi &&
+            this.props.selectedItems.every((item: any) => !action.when || action.when(this.props.state, this.props.itemsById[item]));
 
-        const actions = this.props.actions.filter(multiActionFilter).map((action) => (
+        const actions = this.props.actions.filter(multiActionFilter).map((action: any) => (
             <button className='icon-button icon-button--primary'
                 key={action.name}
                 title={action.name}
-                onClick={(e) => this.onAction(e, action)}
+                onClick={(e: any) => this.onAction(e, action)}
                 aria-label={gettext(action.name)}
             >
                 <i className={`icon--${action.icon}`}></i>
@@ -68,15 +69,17 @@ SelectedItemsBar.propTypes = {
     selectNone: PropTypes.func.isRequired,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     state: state,
     itemsById: state.itemsById,
     selectedItems: state.selectedItems,
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     selectAll,
     selectNone,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(SelectedItemsBar);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(SelectedItemsBar);
+
+export default component;
diff --git a/assets/wire/components/WireActionButtons.jsx b/assets/wire/components/WireActionButtons.tsx
similarity index 95%
rename from assets/wire/components/WireActionButtons.jsx
rename to assets/wire/components/WireActionButtons.tsx
index 3e13d2842..a2aabb737 100644
--- a/assets/wire/components/WireActionButtons.jsx
+++ b/assets/wire/components/WireActionButtons.tsx
@@ -6,7 +6,7 @@ import {isDisplayed} from 'utils';
 import FollowStory from './FollowStory';
 import PreviewActionButtons from 'components/PreviewActionButtons';
 
-export default function WireActionButtons(props) {
+export default function WireActionButtons(props: any) {
     const {previewConfig} = props;
     const displayFollowStory = previewConfig == null || isDisplayed('follow_story', previewConfig);
     
diff --git a/assets/wire/components/WireApp.jsx b/assets/wire/components/WireApp.tsx
similarity index 93%
rename from assets/wire/components/WireApp.jsx
rename to assets/wire/components/WireApp.tsx
index 8aa5879e0..652e695bd 100644
--- a/assets/wire/components/WireApp.jsx
+++ b/assets/wire/components/WireApp.tsx
@@ -60,22 +60,22 @@ import {
     advancedSearchTabsConfigSelector,
 } from 'ui/selectors';
 
-const modals = {
+const modals: any = {
     shareItem: ShareItemModal,
     downloadItems: DownloadItemsModal,
     itemStatistics: ItemStatisticsModal,
 };
 
 class WireApp extends BaseApp {
-    constructor(props) {
+    constructor(props: any) {
         super(props);
         this.modals = modals;
 
         // Show my-topics tab only if WireApp is in 'wire' context (not 'aapX', etc.)
-        this.tabs = this.tabs.filter((t) => get(this.props.advancedSearchTabConfig, t.id, true));
+        this.tabs = this.tabs.filter((t: any) => get(this.props.advancedSearchTabConfig, t.id, true));
         if (this.props.context === 'monitoring') {
-            let navTab = this.tabs.find((t) => t.id === 'nav');
-            navTab.label = gettext('{{monitoring}} Profiles', sectionNames);
+            const navTab = this.tabs.find((t: any) => t.id === 'nav');
+            navTab.label = gettext('{{monitoring}} Profiles', window.sectionNames);
         }
     }
 
@@ -93,19 +93,19 @@ class WireApp extends BaseApp {
         const newsOnlyFilterText = this.props.newsOnlyFilterText;
         const modal = this.renderModal(this.props.modal);
 
-        const panesCount = [this.state.withSidebar, this.props.itemToPreview].filter((x) => x).length;
+        const panesCount = [this.state.withSidebar, this.props.itemToPreview].filter((x: any) => x).length;
         const mainClassName = classNames('wire-column__main', {
             'wire-articles__one-side-pane': panesCount === 1,
             'wire-articles__two-side-panes': panesCount === 2,
         });
 
         const numNavigations = get(this.props, 'searchParams.navigation.length', 0);
-        let showSaveTopic = this.props.context === 'wire' &&
+        const showSaveTopic = this.props.context === 'wire' &&
             this.props.showSaveTopic &&
             !this.props.bookmarks;
         let showTotalItems = false;
         let showTotalLabel = false;
-        let totalItemsLabel;
+        let totalItemsLabel: any;
         const filterValue = getSingleFilterValue(this.props.activeFilter, ['genre', 'subject']);
 
         if (get(this.props, 'context') === 'wire') {
@@ -154,11 +154,11 @@ class WireApp extends BaseApp {
                 listConfig={this.props.listConfig}
                 downloadMedia={this.props.downloadMedia}
                 followStory={this.props.followStory}
-                onClose={() => this.props.actions.filter(a => a.id === 'open')[0].action(null)}
+                onClose={() => this.props.actions.filter((a: any) => a.id === 'open')[0].action(null)}
                 filterGroupLabels={this.props.filterGroupLabels}
             />] : [
                 <section key="contentHeader" className='content-header'>
-                    <h3 className="a11y-only">{gettext('{{wire}} Content', sectionNames)}</h3>
+                    <h3 className="a11y-only">{gettext('{{wire}} Content', window.sectionNames)}</h3>
                     <SelectedItemsBar
                         actions={this.props.actions}
                     />
@@ -270,7 +270,7 @@ class WireApp extends BaseApp {
                         </div>
                     </div>
                 </section>
-            ]).concat([
+            ] as any).concat([
                 modal,
                 this.renderNavBreadcrumb(
                     this.props.navigations,
@@ -334,7 +334,7 @@ WireApp.propTypes = {
     filterGroupLabels: PropTypes.object,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     state: state,
     isLoading: state.isLoading,
     newsOnlyFilterText: state.newsOnlyFilterText,
@@ -371,8 +371,8 @@ const mapStateToProps = (state) => ({
     errorMessage: state.errorMessage
 });
 
-const mapDispatchToProps = (dispatch) => ({
-    followStory: (item) => followStory(item, 'wire'),
+const mapDispatchToProps = (dispatch: any) => ({
+    followStory: (item: any) => followStory(item, 'wire'),
     fetchItems: () => dispatch(fetchItems()),
     toggleNews: () => {
         dispatch(toggleNews());
@@ -382,12 +382,14 @@ const mapDispatchToProps = (dispatch) => ({
         dispatch(toggleSearchAllVersions());
         dispatch(fetchItems());
     },
-    setQuery: (query) => dispatch(setQuery(query)),
+    setQuery: (query: any) => dispatch(setQuery(query)),
     actions: getItemActions(dispatch),
     fetchMoreItems: () => dispatch(fetchMoreItems()),
-    setView: (view) => dispatch(setView(view)),
+    setView: (view: any) => dispatch(setView(view)),
     closePreview: () => dispatch(previewItem(null)),
-    downloadMedia: (href, id, mimeType) => dispatch(downloadMedia(href, id, mimeType)),
+    downloadMedia: (href: any, id: any, mimeType: any) => dispatch(downloadMedia(href, id)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(WireApp);
+const component: React.ComponentType<any> = connect(mapStateToProps, mapDispatchToProps)(WireApp);
+
+export default component;
diff --git a/assets/wire/components/WireListItem.jsx b/assets/wire/components/WireListItem.tsx
similarity index 95%
rename from assets/wire/components/WireListItem.jsx
rename to assets/wire/components/WireListItem.tsx
index b0f570a03..e75b9bda7 100644
--- a/assets/wire/components/WireListItem.jsx
+++ b/assets/wire/components/WireListItem.tsx
@@ -38,7 +38,7 @@ export const DISPLAY_CHAR_COUNT = getConfig('display_char_count');
 const DEFAULT_META_FIELDS = ['source', 'charcount', 'versioncreated'];
 const DEFAULT_COMPACT_META_FIELDS = ['versioncreated'];
 
-function getShowVersionText(isExpanded, itemCount, matchCount, isExtended) {
+function getShowVersionText(isExpanded: any, itemCount: any, matchCount: any, isExtended: any) {
     if (isExpanded) {
         return (isExtended && matchCount) ?
             gettext(
@@ -68,8 +68,13 @@ function getShowVersionText(isExpanded, itemCount, matchCount, isExtended) {
     }
 }
 
-class WireListItem extends React.Component {
-    constructor(props) {
+class WireListItem extends React.Component<any, any> {
+    static propTypes: any;
+    static defaultProps: any;
+    wordCount: any;
+    characterCount: any;
+    dom: any;
+    constructor(props: any) {
         super(props);
         this.wordCount = wordCount(props.item);
         this.characterCount = characterCount(props.item);
@@ -80,7 +85,7 @@ class WireListItem extends React.Component {
         this.dom = {article: null};
     }
 
-    onKeyDown(event) {
+    onKeyDown(event: any) {
         switch (event.key) {
         case ' ': // on space toggle selected item
             this.props.toggleSelected();
@@ -93,7 +98,7 @@ class WireListItem extends React.Component {
         event.preventDefault();
     }
 
-    togglePreviousVersions(event) {
+    togglePreviousVersions(event: any) {
         event.stopPropagation();
         this.setState({previousVersions: !this.state.previousVersions});
     }
@@ -104,7 +109,7 @@ class WireListItem extends React.Component {
         }
     }
 
-    stopPropagation(event) {
+    stopPropagation(event: any) {
         event.stopPropagation();
     }
 
@@ -147,19 +152,19 @@ class WireListItem extends React.Component {
         const fields = listConfig.metadata_fields || DEFAULT_META_FIELDS;
         const compactFields = listConfig.compact_metadata_fields || DEFAULT_COMPACT_META_FIELDS;
         const matchedIds = this.props.isSearchFiltered ? this.props.matchedIds : [];
-        const matchedAncestors = matchedIds.filter((id) => (item.ancestors || []).includes(id));
+        const matchedAncestors = matchedIds.filter((id: any) => (item.ancestors || []).includes(id));
 
         return (
             <article
                 key={item._id}
                 className={cardClassName}
-                ref={(elem) => this.dom.article = elem}
+                ref={(elem: any) => this.dom.article = elem}
                 onClick={() => onClick(item)}
                 onDoubleClick={() => onDoubleClick(item)}
                 onKeyDown={this.onKeyDown}
             >
                 <UrgencyItemBorder item={item} listConfig={listConfig} />
-                <div className={wrapClassName} tabIndex='0'>
+                <div className={wrapClassName} tabIndex={0}>
                     <div className="wire-articles__item-text-block">
                         <h4 className="wire-articles__item-headline">
                             <div
@@ -181,7 +186,6 @@ class WireListItem extends React.Component {
                                     <WireListItemIcons
                                         item={item}
                                         picture={picture}
-                                        videos={videos}
                                         divider={false}
                                     />
                                 )}
@@ -198,7 +202,6 @@ class WireListItem extends React.Component {
                                 <WireListItemIcons
                                     item={item}
                                     picture={picture}
-                                    videos={videos}
                                 />
                                 <div className="wire-articles__item__meta-info">
                                     <span className="bold">
@@ -238,7 +241,6 @@ class WireListItem extends React.Component {
                                 <WireListItemIcons
                                     item={item}
                                     picture={picture}
-                                    videos={videos}
                                 />
                                 <div className="wire-articles__item__meta-info">
                                     <span>
@@ -326,7 +328,7 @@ class WireListItem extends React.Component {
                         />
 
                         {!this.props.showShortcutActionIcons ? null : this.props.actions.map(
-                            (action) => (
+                            (action: any) => (
                                 action.shortcut && (
                                     <ActionButton
                                         key={action.name}
diff --git a/assets/wire/components/WireListItemDeleted.jsx b/assets/wire/components/WireListItemDeleted.tsx
similarity index 93%
rename from assets/wire/components/WireListItemDeleted.jsx
rename to assets/wire/components/WireListItemDeleted.tsx
index 4e22ce0e1..a9deb8609 100644
--- a/assets/wire/components/WireListItemDeleted.jsx
+++ b/assets/wire/components/WireListItemDeleted.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 
 import {gettext, LIST_ANIMATIONS} from 'utils';
 
-export default function WireListItemDeleted({item, contextName}) {
+export default function WireListItemDeleted({item, contextName}: any) {
     const selectClassName = classNames('no-bindable-select', {
         'wire-articles__item-select--visible': !LIST_ANIMATIONS,
         'wire-articles__item-select': LIST_ANIMATIONS,
@@ -13,7 +13,7 @@ export default function WireListItemDeleted({item, contextName}) {
     return (
         <article key={item._id}
             className="wire-articles__item-wrap col-12 wire-item item--deleted"
-            tabIndex='0'
+            tabIndex={0}
         >
             <div className="wire-articles__item wire-articles__item--list wire-articles__item--visited">
                 <div className='wire-articles__item-text-block'>
diff --git a/assets/wire/components/WireListItemIcons.jsx b/assets/wire/components/WireListItemIcons.tsx
similarity index 95%
rename from assets/wire/components/WireListItemIcons.jsx
rename to assets/wire/components/WireListItemIcons.tsx
index b68ef0bb3..5da617cee 100644
--- a/assets/wire/components/WireListItemIcons.jsx
+++ b/assets/wire/components/WireListItemIcons.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {hasAudio, hasVideo} from 'wire/utils';
 
-function WireListItemIcons({item, picture, divider}) {
+function WireListItemIcons({item, picture, divider}: any) {
     return (
         <div className='wire-articles__item__icons'>
             {item.type === 'text' &&
diff --git a/assets/wire/components/WirePreview.jsx b/assets/wire/components/WirePreview.tsx
similarity index 93%
rename from assets/wire/components/WirePreview.jsx
rename to assets/wire/components/WirePreview.tsx
index 757b59aa8..c2fa60be3 100644
--- a/assets/wire/components/WirePreview.jsx
+++ b/assets/wire/components/WirePreview.tsx
@@ -35,12 +35,14 @@ import WireActionButtons from './WireActionButtons';
 import {Authors} from './fields/Authors';
 
 
-class WirePreview extends React.PureComponent {
-    constructor(props) {
+class WirePreview extends React.PureComponent<any, any> {
+    static propTypes: any;
+    preview: any;
+    constructor(props: any) {
         super(props);
     }
 
-    componentDidUpdate(nextProps) {
+    componentDidUpdate(nextProps: any) {
         if (!isEqualItem(nextProps.item, this.props.item)) {
             this.preview.scrollTop = 0; // reset scroll on change
         }
@@ -66,7 +68,7 @@ class WirePreview extends React.PureComponent {
                 </div>
                 <div
                     id='preview-article'
-                    ref={(preview) => this.preview = preview}
+                    ref={(preview: any) => this.preview = preview}
                     className={classNames(
                         'wire-column__preview__content',
                         {noselect: this.props.previewConfig.disable_text_selection}
@@ -77,7 +79,7 @@ class WirePreview extends React.PureComponent {
                     {isDisplayed('headline', previewConfig) && <ArticleHeadline item={item}/>}
                     {(isDisplayed('byline', previewConfig) || isDisplayed('located', previewConfig)) &&
                         <ArticleAuthor item={item} displayConfig={previewConfig} />}
-                    {pictures && pictures.map((pic)=> (
+                    {pictures && pictures.map((pic: any)=> (
                         <ArticlePicture
                             key={pic._id}
                             picture={pic}
@@ -92,7 +94,7 @@ class WirePreview extends React.PureComponent {
                     <ArticleAbstract item={item} displayAbstract={DISPLAY_ABSTRACT}/>}
                     {isDisplayed('body_html', previewConfig) && <ArticleBodyHtml item={item}/>}
 
-                    {!isEmpty(media) && media.map((media) => <ArticleMedia
+                    {!isEmpty(media) && media.map((media: any) => <ArticleMedia
                         key={media.guid}
                         media={media}
                         isKilled={isKilled(item)}
diff --git a/assets/wire/components/fields/Authors.jsx b/assets/wire/components/fields/Authors.tsx
similarity index 90%
rename from assets/wire/components/fields/Authors.jsx
rename to assets/wire/components/fields/Authors.tsx
index 7bd684ae9..c65b14019 100644
--- a/assets/wire/components/fields/Authors.jsx
+++ b/assets/wire/components/fields/Authors.tsx
@@ -5,19 +5,19 @@ import {gettext} from 'utils';
 
 import InfoBox from '../InfoBox';
 
-export function Authors({item}) {
+export function Authors({item}: any) {
     if (!item || !item.authors || !item.authors.length) {
         return null;
     }
 
     return (
         <InfoBox label={gettext('Authors')}>
-            {item.authors.map((author) => (
+            {item.authors.map((author: any) => (
                 <div key={author.code + '/' + author.role} className="wire-column__preview__item__author">
                     <h5>{author.role}</h5>
                     <h6>{author.name}</h6>
                     {(!author.biography || !author.biography.length) ? null : (
-                        <p>{author.biography.split('\n').map((item, key) => (
+                        <p>{author.biography.split('\n').map((item: any, key: any) => (
                             <span key={key}>{item}<br/></span>
                         ))}</p>
                     )}
diff --git a/assets/wire/components/fields/CharCount.jsx b/assets/wire/components/fields/CharCount.tsx
similarity index 85%
rename from assets/wire/components/fields/CharCount.jsx
rename to assets/wire/components/fields/CharCount.tsx
index dbd676427..0dcfabceb 100644
--- a/assets/wire/components/fields/CharCount.jsx
+++ b/assets/wire/components/fields/CharCount.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {characterCount, gettext} from 'utils';
 
-export function CharCount ({item}) {
+export function CharCount ({item}: any) {
     return <span>{characterCount(item)} {gettext('characters')}</span>;
 }
 
diff --git a/assets/wire/components/fields/Embargo.jsx b/assets/wire/components/fields/Embargo.tsx
similarity index 90%
rename from assets/wire/components/fields/Embargo.jsx
rename to assets/wire/components/fields/Embargo.tsx
index 5c44a8412..ff8e38608 100644
--- a/assets/wire/components/fields/Embargo.jsx
+++ b/assets/wire/components/fields/Embargo.tsx
@@ -6,8 +6,13 @@ import {Tooltip} from 'bootstrap';
 
 import {gettext, fullDate, getEmbargo} from 'utils';
 
-export class Embargo extends React.Component {
-    constructor(props) {
+export class Embargo extends React.Component<any, any> {
+    static propTypes: any;
+    timeout: any;
+    tooltip: any;
+    elem: any;
+
+    constructor(props: any) {
         super(props);
         this.state = {
             embargo: getEmbargo(props.item),
@@ -60,7 +65,7 @@ export class Embargo extends React.Component {
 
         return (
             <span
-                ref={(elem) => this.elem = elem}
+                ref={(elem: any) => this.elem = elem}
                 className={classNames('label', {
                     'me-2': !this.props.isCard,
                     'label--red': !this.state.forceRender,
diff --git a/assets/wire/components/fields/MatchLabel.jsx b/assets/wire/components/fields/MatchLabel.tsx
similarity index 100%
rename from assets/wire/components/fields/MatchLabel.jsx
rename to assets/wire/components/fields/MatchLabel.tsx
diff --git a/assets/wire/components/fields/PreviousVersions.jsx b/assets/wire/components/fields/PreviousVersions.tsx
similarity index 98%
rename from assets/wire/components/fields/PreviousVersions.jsx
rename to assets/wire/components/fields/PreviousVersions.tsx
index 6993dff03..f281fa9a9 100644
--- a/assets/wire/components/fields/PreviousVersions.jsx
+++ b/assets/wire/components/fields/PreviousVersions.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-export function PreviousVersions ({item, isItemDetail, inputRef}) {
+export function PreviousVersions ({item, isItemDetail, inputRef}: any) {
     if (isItemDetail) {
         return null;
     }
diff --git a/assets/wire/components/fields/Source.jsx b/assets/wire/components/fields/Source.tsx
similarity index 80%
rename from assets/wire/components/fields/Source.jsx
rename to assets/wire/components/fields/Source.tsx
index 7e2493b36..0ed77b9fb 100644
--- a/assets/wire/components/fields/Source.jsx
+++ b/assets/wire/components/fields/Source.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export function Source ({item}) {
+export function Source ({item}: any) {
     return <span>{item.source}</span>;
 }
 
diff --git a/assets/wire/components/fields/UrgencyLabel.jsx b/assets/wire/components/fields/UrgencyLabel.tsx
similarity index 92%
rename from assets/wire/components/fields/UrgencyLabel.jsx
rename to assets/wire/components/fields/UrgencyLabel.tsx
index f2a0ab541..f2df5e8aa 100644
--- a/assets/wire/components/fields/UrgencyLabel.jsx
+++ b/assets/wire/components/fields/UrgencyLabel.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 import {get} from 'lodash';
 
-function getHighlightColorForUrgency(item, listConfig) {
+function getHighlightColorForUrgency(item: any, listConfig: any) {
     return item.urgency > 0 &&
         listConfig &&
         listConfig.highlights &&
@@ -13,7 +13,7 @@ function getHighlightColorForUrgency(item, listConfig) {
         : null;
 }
 
-export function UrgencyItemBorder({item, listConfig}) {
+export function UrgencyItemBorder({item, listConfig}: any) {
     const urgencyHighlightColor = getHighlightColorForUrgency(item, listConfig);
 
     if (!urgencyHighlightColor) {
@@ -38,7 +38,7 @@ UrgencyItemBorder.propTypes = {
 
 const DEFAULT_URGENCY = 4;
 
-export function UrgencyLabel ({item, listConfig, filterGroupLabels, alwaysShow = false}) {
+export function UrgencyLabel ({item, listConfig, filterGroupLabels, alwaysShow = false}: any) {
     const urgencyHighlightColor = getHighlightColorForUrgency(item, listConfig);
     const label = get(filterGroupLabels, 'urgency', gettext('News Value'));
     const value = item.urgency || DEFAULT_URGENCY;
diff --git a/assets/wire/components/fields/VersionCreated.jsx b/assets/wire/components/fields/VersionCreated.tsx
similarity index 88%
rename from assets/wire/components/fields/VersionCreated.jsx
rename to assets/wire/components/fields/VersionCreated.tsx
index f5d2fc346..83189eadf 100644
--- a/assets/wire/components/fields/VersionCreated.jsx
+++ b/assets/wire/components/fields/VersionCreated.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {fullDate} from 'utils';
 
-export function VersionCreated ({item}) {
+export function VersionCreated ({item}: any) {
     return (
         <time
             dateTime={fullDate(
diff --git a/assets/wire/components/fields/VersionType.jsx b/assets/wire/components/fields/VersionType.tsx
similarity index 85%
rename from assets/wire/components/fields/VersionType.jsx
rename to assets/wire/components/fields/VersionType.tsx
index 15f2ec597..e539b175c 100644
--- a/assets/wire/components/fields/VersionType.jsx
+++ b/assets/wire/components/fields/VersionType.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-export function VersionType({value}) {
+export function VersionType({value}: any) {
     return (
         <span>{gettext('Version type: {{version}}', {version: value})}</span>
     );
diff --git a/assets/wire/components/fields/WordCount.jsx b/assets/wire/components/fields/WordCount.tsx
similarity index 84%
rename from assets/wire/components/fields/WordCount.jsx
rename to assets/wire/components/fields/WordCount.tsx
index 9d25dd837..5b903ddcd 100644
--- a/assets/wire/components/fields/WordCount.jsx
+++ b/assets/wire/components/fields/WordCount.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {wordCount, gettext} from 'utils';
 
-export function WordCount ({item}) {
+export function WordCount ({item}: any) {
     return <span>{wordCount(item)} {gettext('words')}</span>;
 }
 
diff --git a/assets/wire/components/fields/index.jsx b/assets/wire/components/fields/index.tsx
similarity index 88%
rename from assets/wire/components/fields/index.jsx
rename to assets/wire/components/fields/index.tsx
index 9305214f3..898cf7acb 100644
--- a/assets/wire/components/fields/index.jsx
+++ b/assets/wire/components/fields/index.tsx
@@ -11,7 +11,7 @@ import {VersionType} from './VersionType';
 const ALLOWED_SEPARATORS = ['/', '//', '-'];
 const SEPARATOR_KEY = 'separator';
 
-const MAP_FIELD_TO_COMPONENT = {
+const MAP_FIELD_TO_COMPONENT: any = {
     urgency: UrgencyLabel,
     source: Source,
     charcount: CharCount,
@@ -27,15 +27,15 @@ const MAP_FIELD_TO_COMPONENT = {
 //   ["charcount", "/", "wordcount"] // multiple fields on the same line
 //   ["source", "//", {field: "department", styles: {fontWeight: "bold"}}] // custom styles
 // ]
-export function FieldComponents({config, item, fieldProps = {}}) {
+export function FieldComponents({config, item, fieldProps = {}}: any) {
     if (!Array.isArray(config)) {
         return [];
     }
 
     const fields = config
-        .map((field) => getComponentForField(item, field))
+        .map((field: any) => getComponentForField(item, field))
         .filter(Boolean)
-        .reduce((acc, curr) => {
+        .reduce((acc: any, curr: any) => {
             if (acc.length > 0 && acc[acc.length - 1].key === curr.key) {
                 // remove adjacent separators
                 return acc;
@@ -45,7 +45,7 @@ export function FieldComponents({config, item, fieldProps = {}}) {
 
     let separator = 0;
 
-    return fields.map(({key, Component}) => {
+    return fields.map(({key, Component}: any) => {
         const _key =
             key === SEPARATOR_KEY ? `${SEPARATOR_KEY}${++separator}` : key;
 
@@ -57,7 +57,7 @@ export function FieldComponents({config, item, fieldProps = {}}) {
     });
 }
 
-function getComponentForField(item, field) {
+function getComponentForField(item: any, field: any): any {
     if (typeof field === 'object' && typeof field.field === 'string') {
         if (
             typeof field.component === 'string' &&
@@ -84,7 +84,7 @@ function getComponentForField(item, field) {
             return result
                 ? {
                     key: field.field,
-                    Component: (props) => (
+                    Component: (props: any) => (
                         <span style={field.styles || {}}>
                             <result.Component {...props} />
                         </span>
@@ -97,7 +97,7 @@ function getComponentForField(item, field) {
     } else if (Array.isArray(field) && field.length > 0) {
         // example: ["source", "//", "department"]
         const components = field
-            .map((f) => getComponentForField(item, f))
+            .map((f: any) => getComponentForField(item, f))
             .filter(Boolean);
 
         // remove orphan separators. For example in ['source', '//', 'department']
@@ -108,7 +108,7 @@ function getComponentForField(item, field) {
 
         return {
             key: components.map(({key}) => key).join('-'),
-            Component: (props) => (
+            Component: (props: any) => (
                 <span>
                     {components.map(({Component}, i) => (
                         <Component key={i} {...props} />
@@ -128,6 +128,7 @@ function getComponentForField(item, field) {
         let Component = null;
 
         // example: "source"
+        // eslint-disable-next-line no-prototype-builtins
         if (MAP_FIELD_TO_COMPONENT.hasOwnProperty(field)) {
             // predefined component
             Component = MAP_FIELD_TO_COMPONENT[field];
diff --git a/assets/wire/components/filters/FilterButton.jsx b/assets/wire/components/filters/FilterButton.tsx
similarity index 77%
rename from assets/wire/components/filters/FilterButton.jsx
rename to assets/wire/components/filters/FilterButton.tsx
index dd2b1a464..26dc30a98 100644
--- a/assets/wire/components/filters/FilterButton.jsx
+++ b/assets/wire/components/filters/FilterButton.tsx
@@ -5,7 +5,7 @@ import classnames from 'classnames';
 import {gettext} from 'utils';
 import NavLink from './NavLink';
 
-export default function FilterButton({label, onClick, className, primary}) {
+function FilterButton({label, onClick, className, primary}: any): any {
     return (
         <div className={classnames('filter-button', className)}>
             <NavLink isActive={primary} onClick={onClick} label={gettext(label)} />
@@ -19,3 +19,7 @@ FilterButton.propTypes = {
     className: PropTypes.string.isRequired,
     primary: PropTypes.bool,
 };
+
+const component: React.ComponentType<any> = FilterButton;
+
+export default component;
\ No newline at end of file
diff --git a/assets/wire/components/filters/FilterGroup.jsx b/assets/wire/components/filters/FilterGroup.tsx
similarity index 82%
rename from assets/wire/components/filters/FilterGroup.jsx
rename to assets/wire/components/filters/FilterGroup.tsx
index 93d8599fc..030ffe742 100644
--- a/assets/wire/components/filters/FilterGroup.jsx
+++ b/assets/wire/components/filters/FilterGroup.tsx
@@ -9,7 +9,7 @@ import FilterItem from './FilterItem';
 
 const LIMIT = 5;
 
-const getVisibleBuckets = (buckets, group, toggleGroup) => {
+const getVisibleBuckets = (buckets: any, group: any, toggleGroup: any) => {
     if (!buckets.length) {
         return;
     }
@@ -17,7 +17,7 @@ const getVisibleBuckets = (buckets, group, toggleGroup) => {
     let visibleBuckets = buckets;
     if (buckets.length > LIMIT && !group.isOpen) {
         visibleBuckets = buckets.slice(0, LIMIT).concat([
-            <a key={'more'} onClick={(event) => toggleGroup(event, group)} className="small" href="">
+            <a key={'more'} onClick={(event: any) => toggleGroup(event, group)} className="small" href="">
                 {gettext('Show more')}
             </a>
         ]);
@@ -25,7 +25,7 @@ const getVisibleBuckets = (buckets, group, toggleGroup) => {
 
     if (buckets.length > LIMIT && group.isOpen) {
         visibleBuckets = buckets.concat([
-            <a key={'less'} onClick={(event) => toggleGroup(event, group)} className="small" href="">
+            <a key={'less'} onClick={(event: any) => toggleGroup(event, group)} className="small" href="">
                 {gettext('Show less')}
             </a>
         ]);
@@ -35,7 +35,7 @@ const getVisibleBuckets = (buckets, group, toggleGroup) => {
 };
 
 
-export default function FilterGroup({group, activeFilter, aggregations, toggleFilter, toggleGroup, isLoading}) {
+export default function FilterGroup({group, activeFilter, aggregations, toggleFilter, toggleGroup, isLoading}: any) {
     if (isLoading === true) {
         return (
             <NavGroup key={group.field} label={group.label}>
@@ -55,11 +55,11 @@ export default function FilterGroup({group, activeFilter, aggregations, toggleFi
         );
     }
 
-    const compareFunction = (a, b) => group.sorted ? -1 : String(a.key).localeCompare(String(b.key));
+    const compareFunction = (a: any, b: any) => group.sorted ? -1 : String(a.key).localeCompare(String(b.key));
 
     const groupFilter = get(activeFilter, group.field, []);
     const activeBuckets = (get(activeFilter, group.field) || [])
-        .map((filter) => ({key: filter}));
+        .map((filter: any) => ({key: filter}));
     const bucketPath = get(group, 'agg_path') || `${group.field}.buckets`;
     const buckets = uniqBy(
         cloneDeep(get(aggregations, bucketPath) || group.buckets || [])
@@ -67,7 +67,7 @@ export default function FilterGroup({group, activeFilter, aggregations, toggleFi
         'key'
     )
         .sort(compareFunction)
-        .map((bucket) => (
+        .map((bucket: any) => (
             <FilterItem
                 key={bucket.key}
                 bucket={bucket}
diff --git a/assets/wire/components/filters/FilterItem.jsx b/assets/wire/components/filters/FilterItem.tsx
similarity index 97%
rename from assets/wire/components/filters/FilterItem.jsx
rename to assets/wire/components/filters/FilterItem.tsx
index e2ce4d55c..4d4310851 100644
--- a/assets/wire/components/filters/FilterItem.jsx
+++ b/assets/wire/components/filters/FilterItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export default function FilterItem({bucket, group, toggleFilter, groupFilter}) {
+export default function FilterItem({bucket, group, toggleFilter, groupFilter}: any) {
     const isActive = groupFilter.indexOf(bucket.key) !== -1;
 
     return (
diff --git a/assets/wire/components/filters/FiltersTab.jsx b/assets/wire/components/filters/FiltersTab.tsx
similarity index 84%
rename from assets/wire/components/filters/FiltersTab.jsx
rename to assets/wire/components/filters/FiltersTab.tsx
index 4c2815f69..742291ef6 100644
--- a/assets/wire/components/filters/FiltersTab.jsx
+++ b/assets/wire/components/filters/FiltersTab.tsx
@@ -23,8 +23,10 @@ import {
 
 import {resultsFilteredSelector} from 'search/selectors';
 
-class FiltersTab extends React.Component {
-    constructor(props) {
+class FiltersTab extends React.Component<any, any> {
+    static propTypes: any;
+
+    constructor(props: any) {
         super(props);
 
         this.toggleGroup = this.toggleGroup.bind(this);
@@ -40,8 +42,8 @@ class FiltersTab extends React.Component {
         };
     }
 
-    componentDidUpdate(prevProps) {
-        const newState = {};
+    componentDidUpdate(prevProps: any) {
+        const newState: any = {};
         if (!isEqual(this.props.activeFilter, prevProps.activeFilter)) {
             newState.activeFilter = cloneDeep(this.props.activeFilter);
         }
@@ -54,26 +56,26 @@ class FiltersTab extends React.Component {
         }
     }
 
-    toggleGroup(event, group) {
+    toggleGroup(event: any, group: any) {
         event.preventDefault();
-        this.setState({groups: this.props.groups.map((_group) =>
+        this.setState({groups: this.props.groups.map((_group: any) =>
             _group === group ? Object.assign({}, _group, {isOpen: !_group.isOpen}) : _group
         )});
     }
 
-    updateFilter(field, key, single) {
+    updateFilter(field: any, key: any, single: any) {
         // The `value` can be an Array
-        let values = Array.isArray(key) ? key : [key];
+        const values = Array.isArray(key) ? key : [key];
         const currentFilters = cloneDeep(this.state.activeFilter);
 
-        for (let _value of values) {
+        for (const _value of values) {
             currentFilters[field] = toggleValue(currentFilters[field], _value);
 
             if (!_value || !currentFilters[field] || currentFilters[field].length === 0) {
                 delete currentFilters[field];
             } else if (single) {
                 currentFilters[field] = currentFilters[field].filter(
-                    (val) => val === _value
+                    (val: any) => val === _value
                 );
             }
         }
@@ -81,7 +83,7 @@ class FiltersTab extends React.Component {
         this.setState({activeFilter: currentFilters});
     }
 
-    setCreatedFilterAndSearch(createdFilter) {
+    setCreatedFilterAndSearch(createdFilter: any) {
         const created = pickBy(
             assign(
                 cloneDeep(this.state.createdFilter),
@@ -93,7 +95,7 @@ class FiltersTab extends React.Component {
     }
 
     getFilterGroups() {
-        return this.state.groups.map((group) => <FilterGroup
+        return this.state.groups.map((group: any) => <FilterGroup
             key={group.label}
             group={group}
             activeFilter={this.state.activeFilter}
@@ -104,13 +106,13 @@ class FiltersTab extends React.Component {
         />);
     }
 
-    search(event) {
+    search(event: any) {
         event.preventDefault();
         this.props.updateFilterStateAndURL(this.state.activeFilter, this.state.createdFilter);
         this.props.fetchItems();
     }
 
-    reset(event) {
+    reset(event: any) {
         event.preventDefault();
         this.setState({activeFilter: {}, createdFilter: {}});
         this.props.resetFilter();
@@ -119,13 +121,13 @@ class FiltersTab extends React.Component {
 
     render() {
         const {activeFilter, createdFilter} = this.state;
-        const isResetActive = Object.keys(activeFilter).find((key) => !isEmpty(activeFilter[key]))
-            || Object.keys(createdFilter).find((key) => !isEmpty(createdFilter[key]));
+        const isResetActive = Object.keys(activeFilter).find((key: any) => !isEmpty(activeFilter[key]))
+            || Object.keys(createdFilter).find((key: any) => !isEmpty(createdFilter[key]));
 
         return (
             <div className="d-contents">
                 <div className='tab-pane__inner'>
-                    {this.getFilterGroups().filter((group) => !!group).concat([
+                    {this.getFilterGroups().filter((group: any) => !!group).concat([
                         (<NavCreatedPicker
                             key="created"
                             createdFilter={createdFilter}
@@ -169,7 +171,7 @@ FiltersTab.propTypes = {
     context: PropTypes.string,
 };
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: any) => ({
     aggregations: state.aggregations,
     activeFilter: searchFilterSelector(state),
     createdFilter: searchCreatedSelector(state),
@@ -178,7 +180,7 @@ const mapStateToProps = (state) => ({
     context: state.context
 });
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     resetFilter,
     updateFilterStateAndURL,
     selectDate,
diff --git a/assets/wire/components/filters/NavCreatedPicker.jsx b/assets/wire/components/filters/NavCreatedPicker.tsx
similarity index 90%
rename from assets/wire/components/filters/NavCreatedPicker.jsx
rename to assets/wire/components/filters/NavCreatedPicker.tsx
index b42e34ff5..d95ea8c7b 100644
--- a/assets/wire/components/filters/NavCreatedPicker.jsx
+++ b/assets/wire/components/filters/NavCreatedPicker.tsx
@@ -11,17 +11,17 @@ const shortcuts = [
     {label: gettext('This month'), value: 'now/M'},
 ];
 
-function NavCreatedPicker({setCreatedFilter, createdFilter, context}) {
-    const onClickFactory = (value) => (event) => {
+function NavCreatedPicker({setCreatedFilter, createdFilter, context}: any) {
+    const onClickFactory = (value: any) => (event: any) => {
         event.preventDefault();
         setCreatedFilter({from: createdFilter.from === value ? null : value, to: null});
     };
 
-    const onInputChange = (event) => {
+    const onInputChange = (event: any) => {
         setCreatedFilter({[event.target.name]: event.target.value});
     };
 
-    const activeShortcut = shortcuts.find((shortcut) => shortcut.value === createdFilter.from);
+    const activeShortcut = shortcuts.find((shortcut: any) => shortcut.value === createdFilter.from);
 
     return (
         <NavGroup label={context === 'agenda' ? (gettext('Event Date')) : (gettext('Published'))}>
diff --git a/assets/wire/components/filters/NavGroup.jsx b/assets/wire/components/filters/NavGroup.tsx
similarity index 91%
rename from assets/wire/components/filters/NavGroup.jsx
rename to assets/wire/components/filters/NavGroup.tsx
index 05849841b..31ad413ba 100644
--- a/assets/wire/components/filters/NavGroup.jsx
+++ b/assets/wire/components/filters/NavGroup.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
-function NavGroup({label, children}) {
+function NavGroup({label, children}: any) {
     return (
         <div className='wire-column__nav__group' data-test-id={`nav-group--${label.toLowerCase()}`}>
             <h6>{gettext(label)}</h6>
diff --git a/assets/wire/components/filters/NavLink.jsx b/assets/wire/components/filters/NavLink.tsx
similarity index 92%
rename from assets/wire/components/filters/NavLink.jsx
rename to assets/wire/components/filters/NavLink.tsx
index 82ea6795e..bf3499c5f 100644
--- a/assets/wire/components/filters/NavLink.jsx
+++ b/assets/wire/components/filters/NavLink.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-function NavLink({isActive, onClick, label}) {
+function NavLink({isActive, onClick, label}: any) {
     return (
         <a
             href=''
diff --git a/assets/wire/components/filters/NavigationTab.jsx b/assets/wire/components/filters/NavigationTab.tsx
similarity index 84%
rename from assets/wire/components/filters/NavigationTab.jsx
rename to assets/wire/components/filters/NavigationTab.tsx
index fe3b1c70b..d4a14db77 100644
--- a/assets/wire/components/filters/NavigationTab.jsx
+++ b/assets/wire/components/filters/NavigationTab.tsx
@@ -15,11 +15,11 @@ function NavigationTab({
     fetchItems,
     addAllOption,
     disableSameNavigationDeselect,
-}) {
-    const navLinks = navigations.map((navigation) => (
+}: any) {
+    const navLinks = navigations.map((navigation: any) => (
         <NavLink key={navigation.name}
             isActive={activeNavigation.includes(navigation._id) || navigations.length === 1}
-            onClick={(event) => {
+            onClick={(event: any) => {
                 event.preventDefault();
                 toggleNavigation(navigation, disableSameNavigationDeselect);
                 fetchItems();
@@ -31,7 +31,7 @@ function NavigationTab({
     const all = (
         <NavLink key="all"
             isActive={noNavigationSelected(activeNavigation)}
-            onClick={(event) => {
+            onClick={(event: any) => {
                 event.preventDefault();
                 toggleNavigation();
                 fetchItems();
@@ -58,8 +58,10 @@ NavigationTab.propTypes = {
 
 NavigationTab.defaultProps = {addAllOption: true};
 
-const mapDispatchToProps = {
+const mapDispatchToProps: any = {
     toggleNavigation,
 };
 
-export default connect(null, mapDispatchToProps)(NavigationTab);
+const component: React.ComponentType<any> = connect(null, mapDispatchToProps)(NavigationTab);
+
+export default component;
diff --git a/assets/wire/defaults.js b/assets/wire/defaults.ts
similarity index 100%
rename from assets/wire/defaults.js
rename to assets/wire/defaults.ts
diff --git a/assets/wire/index.js b/assets/wire/index.ts
similarity index 88%
rename from assets/wire/index.js
rename to assets/wire/index.ts
index c1b258f01..480c1c09d 100644
--- a/assets/wire/index.js
+++ b/assets/wire/index.ts
@@ -1,4 +1,5 @@
-import {createStore, render, initWebSocket, getInitData, closeItemOnMobile, isMobilePhone} from 'utils';
+import {createStore, render, getInitData, closeItemOnMobile, isMobilePhone} from 'utils';
+import {initWebSocket} from 'websocket';
 
 import wireReducer from './reducers';
 import {getNewsOnlyParam, getSearchAllVersionsParam, getReadItems} from 'local-store';
@@ -25,7 +26,7 @@ if (localStorage.getItem('view')) {
 }
 
 // handle history
-window.onpopstate = function(event) {
+window.onpopstate = function(event: any) {
     if (event.state) {
         closeItemOnMobile(store.dispatch, event.state, openItemDetails, previewItem);
         if (!isMobilePhone()) {
diff --git a/assets/wire/item-actions.js b/assets/wire/item-actions.ts
similarity index 55%
rename from assets/wire/item-actions.js
rename to assets/wire/item-actions.ts
index 141e26697..619238bb5 100644
--- a/assets/wire/item-actions.js
+++ b/assets/wire/item-actions.ts
@@ -1,4 +1,4 @@
 import {getItemActions} from '../item-actions';
 import * as wireActions from './actions';
 
-export default (dispatch) => getItemActions(dispatch, wireActions);
+export default (dispatch: any) => getItemActions(dispatch, wireActions);
diff --git a/assets/wire/reducers.js b/assets/wire/reducers.ts
similarity index 93%
rename from assets/wire/reducers.js
rename to assets/wire/reducers.ts
index a163a4a29..642eed1ab 100644
--- a/assets/wire/reducers.js
+++ b/assets/wire/reducers.ts
@@ -15,7 +15,7 @@ import {get, cloneDeep} from 'lodash';
 import {defaultReducer} from '../reducers';
 import {searchReducer} from 'search/reducers';
 
-const initialState = {
+const initialState: any = {
     items: [],
     itemsById: {},
     matchedIds: [],
@@ -51,9 +51,9 @@ const initialState = {
     errorMessage : null,
 };
 
-function recieveItems(state, data) {
+function recieveItems(state: any, data: any) {
     const itemsById = Object.assign({}, state.itemsById);
-    const items = data._items.map((item) => {
+    const items = data._items.map((item: any) => {
         itemsById[item._id] = item;
         item.deleted = false;
         return item._id;
@@ -75,7 +75,7 @@ function recieveItems(state, data) {
     };
 }
 
-function recieveAggs(state, data) {
+function recieveAggs(state: any, data: any) {
     return {
         ...state,
         aggregations: data._aggregations || null,
@@ -83,14 +83,14 @@ function recieveAggs(state, data) {
     };
 }
 
-function markItemsRemoved(state, ids) {
+function markItemsRemoved(state: any, ids: any) {
     const itemsById = cloneDeep(state.itemsById || {});
     let activeItem = state.activeItem;
     let previewItem = state.previewItem;
     let openItem = state.openItem;
 
     (ids || []).forEach(
-        (itemId) => {
+        (itemId: any) => {
             if (get(itemsById, itemId)) {
                 itemsById[itemId].deleted = true;
             }
@@ -119,7 +119,7 @@ function markItemsRemoved(state, ids) {
 }
 
 
-function _wireReducer(state, action) {
+function _wireReducer(state: any, action: any) {
     switch (action.type) {
 
     case TOGGLE_NEWS: {
@@ -141,7 +141,7 @@ function _wireReducer(state, action) {
     }
 }
 
-export default function wireReducer(state = initialState, action) {
+export default function wireReducer(state: any = initialState, action: any) {
     switch (action.type) {
 
     case RECIEVE_ITEMS:
diff --git a/assets/wire/tests/WireApp.spec.js b/assets/wire/tests/WireApp.spec.tsx
similarity index 96%
rename from assets/wire/tests/WireApp.spec.js
rename to assets/wire/tests/WireApp.spec.tsx
index 48cfb616d..0231068e0 100644
--- a/assets/wire/tests/WireApp.spec.js
+++ b/assets/wire/tests/WireApp.spec.tsx
@@ -10,27 +10,27 @@ import WireApp from '../components/WireApp';
 import {shortHighlightedtext} from '../utils';
 
 
-function setup(state) {
+function setup(state: any) {
     const store = createStore(() => state, applyMiddleware(thunk));
     const enzymeWrapper = mount(<Provider store={store}><WireApp /></Provider>);
     return enzymeWrapper;
 }
 
-function getActions(enzymeWrapper) {
+function getActions(enzymeWrapper: any) {
     return enzymeWrapper.find('WirePreview').props().actions;
 }
 
-function getMultiActions(enzymeWrapper) {
+function getMultiActions(enzymeWrapper: any) {
     return enzymeWrapper.find('SelectedItemsBar')
         .find('.multi-action-bar__icons').children();
 }
 
-function getNames(actions) {
-    return actions.map((action) => action.name);
+function getNames(actions: any) {
+    return actions.map((action: any) => action.name);
 }
 
 describe('WireApp', () => {
-    const state = {
+    const state: any = {
         items: [],
         itemsById: {'foo': {}},
         previewItem: 'foo',
diff --git a/assets/wire/tests/actions.spec.js b/assets/wire/tests/actions.spec.ts
similarity index 94%
rename from assets/wire/tests/actions.spec.js
rename to assets/wire/tests/actions.spec.ts
index 324431d67..cc53f975b 100644
--- a/assets/wire/tests/actions.spec.js
+++ b/assets/wire/tests/actions.spec.ts
@@ -17,14 +17,14 @@ import {
 import {initData} from '../actions';
 
 describe('wire actions', () => {
-    let store;
-    const response = {
+    let store: any;
+    const response: any = {
         _meta: {total: 2},
         _items: [{_id: 'foo'}],
     };
 
     beforeEach(() => {
-        spyOn(utils.now, 'utcOffset').and.returnValue('');
+        (spyOn(utils.now, 'utcOffset') as any).and.returnValue('');
         fetchMock.get('/wire/search', response, {
             name: 'wire_search:from_0',
             query: {from: 0}
@@ -122,7 +122,7 @@ describe('wire actions', () => {
 
     it('open item records history actions', () => {
         fetchMock.post('/history/new', {});
-        spyOn(utils, 'postHistoryAction').and.callFake(function(item, action, section) {
+        spyOn(utils, 'postHistoryAction').and.callFake(function(item: any, action: any, section: any) {
             expect(item).toEqual({_id: 'foo'});
             expect(action).toEqual('open');
             expect(section).toEqual('wire');
@@ -134,7 +134,7 @@ describe('wire actions', () => {
 
     it('preview item records history actions', () => {
         fetchMock.post('/history/new', {});
-        spyOn(utils, 'postHistoryAction').and.callFake(function(item, action, section) {
+        spyOn(utils, 'postHistoryAction').and.callFake(function(item: any, action: any, section: any) {
             expect(item).toEqual({_id: 'foo'});
             expect(action).toEqual('preview');
             expect(section).toEqual('wire');
@@ -144,23 +144,23 @@ describe('wire actions', () => {
     });
 
     it('can fetch item previous versions', () => {
-        const item = {_id: 'foo'};
+        const item: any = {_id: 'foo'};
         fetchMock.get(`/wire/${item._id}/versions`, {_items: [{_id: 'bar'}, {_id: 'baz'}]});
 
         return store.dispatch(actions.fetchVersions(item))
-            .then((versions) => {
+            .then((versions: any) => {
                 expect(versions.length).toBe(2);
                 expect(versions[0]._id).toBe('bar');
             });
     });
 
     it('can fetch next item version', () => {
-        const item = {nextversion: 'bar'};
-        const next = {};
+        const item: any = {nextversion: 'bar'};
+        const next: any = {};
         fetchMock.get('/wire/bar?format=json', next);
 
         return store.dispatch(actions.fetchNext(item))
-            .then((_next) => {
+            .then((_next: any) => {
                 expect(_next).toEqual(next);
             });
     });
@@ -222,7 +222,7 @@ describe('wire actions', () => {
             store.dispatch(setCreatedFilter({from: 'now/M'}));
 
             actions.search(store.getState());
-            const url = server.get.calls.argsFor(0)[0];
+            const url = (server.get as any).calls.argsFor(0)[0];
 
             expect(url).toContain('q=search%20something');
             expect(url).toContain('navigation=nav1,nav2');
@@ -244,7 +244,7 @@ describe('wire actions', () => {
             store.dispatch(loadMyTopic('topic1'));
 
             actions.search(store.getState());
-            const url = server.get.calls.argsFor(0)[0];
+            const url = (server.get as any).calls.argsFor(0)[0];
 
             expect(url).toContain('q=search%20something');
             expect(url).toContain('navigation=nav1,nav2');
diff --git a/assets/wire/tests/utils.spec.js b/assets/wire/tests/utils.spec.ts
similarity index 89%
rename from assets/wire/tests/utils.spec.js
rename to assets/wire/tests/utils.spec.ts
index 698623915..af2b274ff 100644
--- a/assets/wire/tests/utils.spec.js
+++ b/assets/wire/tests/utils.spec.ts
@@ -14,12 +14,12 @@ describe('utils', () => {
     });
 
     it('can get picture from body if featured is not set', () => {
-        const embed = {guid: 'embed', type: 'picture'};
-        const item = {
+        const embed: any = {guid: 'embed', type: 'picture'};
+        const item: any = {
             associations: {
                 embed123: embed,
             },
         };
         expect(utils.getPicture(item)).toBe(embed);
-    }); 
+    });
 });
diff --git a/assets/wire/types.js b/assets/wire/types.ts
similarity index 97%
rename from assets/wire/types.js
rename to assets/wire/types.ts
index dbca14322..955ec7b3c 100644
--- a/assets/wire/types.js
+++ b/assets/wire/types.ts
@@ -30,7 +30,7 @@ const previewConfig = PropTypes.shape({
 
 });
 
-const types = {
+const types: any = {
     user,
     item,
     topic,
diff --git a/assets/wire/utils.js b/assets/wire/utils.ts
similarity index 72%
rename from assets/wire/utils.js
rename to assets/wire/utils.ts
index 13fe3bf3e..7658e5e10 100644
--- a/assets/wire/utils.js
+++ b/assets/wire/utils.ts
@@ -13,7 +13,7 @@ const STATUS_KILLED = 'canceled';
  * @param {Object} item
  * @returns {number}
  */
-export function getIntVersion(item) {
+export function getIntVersion(item: any) {
     if (item) {
         return parseInt(item.version, 10) || 0;
     }
@@ -27,26 +27,26 @@ export function getIntVersion(item) {
  * @param {Object} item
  * @return {Array}
  */
-export function getVideos(item) {
+export function getVideos(item: any) {
     return getRelatedItemsByType(item, 'video');
 }
 
-const isMedia = (item) => item.type === 'audio' || item.type === 'video';
+const isMedia = (item: any) => item.type === 'audio' || item.type === 'video';
 
 /**
- * 
- * @param {*} item 
+ *
+ * @param {*} item
  */
-export function getItemMedia(item) {
+export function getItemMedia(item: any) {
     if (isMedia(item)) {
         return [item];
     }
 
-    return Object.values(get(item, 'associations', {}) || {}).filter((assoc) => assoc != null && isMedia(assoc));
+    return Object.values(get(item, 'associations', {}) || {}).filter((assoc: any) => assoc != null && isMedia(assoc));
 }
 
-function getRelatedItemsByType(item, type) {
-    return item.type === type ? [item] : Object.values(get(item, 'associations', {}) || {}).filter((assoc) => get(assoc, 'type') === type);
+function getRelatedItemsByType(item: any, type: any) {
+    return item.type === type ? [item] : Object.values(get(item, 'associations', {}) || {}).filter((assoc: any) => get(assoc, 'type') === type);
 }
 
 /**
@@ -57,7 +57,7 @@ function getRelatedItemsByType(item, type) {
  * @param {Object} item
  * @return {Object}
  */
-export function getPicture(item) {
+export function getPicture(item: any) {
     if (item.type === 'picture') {
         return item;
     }
@@ -71,13 +71,13 @@ export function getPicture(item) {
     return getBodyPicture(item);
 }
 
-function getBodyPicture(item) {
-    const pictures = Object.values(get(item, 'associations', {}) || {}).filter((assoc) => get(assoc, 'type') === 'picture');
+function getBodyPicture(item: any) {
+    const pictures = Object.values(get(item, 'associations', {}) || {}).filter((assoc: any) => get(assoc, 'type') === 'picture');
     return pictures.length ? pictures[0] : null;
 }
 
-export function getPictureList(item) {
-    const pictures = Object.values(get(item, 'associations', {}) || {}).filter((assoc) => get(assoc, 'type') === 'picture');
+export function getPictureList(item: any) {
+    const pictures = Object.values(get(item, 'associations', {}) || {}).filter((assoc: any) => get(assoc, 'type') === 'picture');
     return pictures.length ? pictures : [];
 }
 
@@ -88,7 +88,7 @@ export function getPictureList(item) {
  * @param {Boolean} large
  * @return {Object}
  */
-export function getThumbnailRendition(picture, large) {
+export function getThumbnailRendition(picture: any, large?: any) {
     const rendition = large ? 'renditions._newsroom_thumbnail_large' : 'renditions._newsroom_thumbnail';
     return get(picture, rendition, get(picture, 'renditions.thumbnail'));
 }
@@ -99,7 +99,7 @@ export function getThumbnailRendition(picture, large) {
  * @param {Object} picture
  * @return {Object}
  */
-export function getPreviewRendition(picture, isCustom = false) {
+export function getPreviewRendition(picture: any, isCustom: any = false) {
     return get(
         picture,
         isCustom ? 'renditions._newsroom_custom' : 'renditions._newsroom_base',
@@ -113,7 +113,7 @@ export function getPreviewRendition(picture, isCustom = false) {
  * @param {Object} picture
  * @return {Object}
  */
-export function getDetailRendition(picture, isCustom = false) {
+export function getDetailRendition(picture: any, isCustom: any = false) {
     return get(
         picture,
         isCustom ? 'renditions._newsroom_custom' : 'renditions._newsroom_base',
@@ -127,7 +127,7 @@ export function getDetailRendition(picture, isCustom = false) {
  * @param {Object} picture
  * @return {Object}
  */
-export function isCustomRendition(picture) {
+export function isCustomRendition(picture: any) {
     return !!get(picture, 'renditions._newsroom_custom');
 }
 
@@ -137,7 +137,7 @@ export function isCustomRendition(picture) {
  * @param {Object} video
  * @return {Object}
  */
-export function getOriginalRendition(video) {
+export function getOriginalRendition(video: any) {
     return get(video, 'renditions.original');
 }
 
@@ -147,7 +147,7 @@ export function getOriginalRendition(video) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function isKilled(item) {
+export function isKilled(item: any) {
     return item.pubstatus === STATUS_KILLED;
 }
 
@@ -157,7 +157,7 @@ export function isKilled(item) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function isPreformatted(item) {
+export function isPreformatted(item: any) {
     return (item.body_html || '').includes('<pre>');
 }
 
@@ -168,7 +168,7 @@ export function isPreformatted(item) {
  * @param {bool} next toggle if checking for next or previous versions
  * @return {Boolean}
  */
-export function showItemVersions(item, next) {
+export function showItemVersions(item: any, next?: any) {
     return !isKilled(item) && (next || item.ancestors && item.ancestors.length);
 }
 
@@ -178,20 +178,20 @@ export function showItemVersions(item, next) {
  * @param {Item} item
  * @return {Node}
  */
-export function shortText(item, length=40, config) {
+export function shortText(item: any, length: any = 40, config?: any) {
     const useBody = (config === true || config === false) ? config : isDisplayed('abstract', config) === false;
     const html = (useBody ? item.body_html : item.description_html || item.body_html) || '<p></p>';
     const text = useBody ?  getTextFromHtml(html) : item.description_text || getTextFromHtml(html);
-    const words = text.split(/\s/).filter((w) => w);
+    const words = text.split(/\s/).filter((w: any) => w);
     return words.slice(0, length).join(' ') + (words.length > length ? '...' : '');
 }
 
-export function shortHighlightedtext(html, maxLength = 40) {
+export function shortHighlightedtext(html: any, maxLength = 40) {
     const parser = new DOMParser();
-    const doc = parser.parseFromString(html, 'text/html');
+    const doc: any = parser.parseFromString(html, 'text/html');
     const span = doc.querySelector('span.es-highlight');
     const parentElement = span.parentElement;
-    const treeWalker = document.createTreeWalker(parentElement, NodeFilter.SHOW_TEXT, null, false);
+    const treeWalker = (document as any).createTreeWalker(parentElement, NodeFilter.SHOW_TEXT, null, false);
     let node = treeWalker.firstChild();
     let text = '';
     let count = 0;
@@ -199,9 +199,9 @@ export function shortHighlightedtext(html, maxLength = 40) {
 
     while (node && count < maxLength) {
         const content = node.textContent.trim();
-        const words = content.split(/(?= [A-Z])/).filter(w => w);
+        const words = content.split(/(?= [A-Z])/).filter((w: any) => w);
         const remainingCount = maxLength - count;
-  
+
         if (words.length <= remainingCount) {
             text += content + ' ';
             count += words.length;
@@ -209,7 +209,7 @@ export function shortHighlightedtext(html, maxLength = 40) {
             text += words.slice(0, remainingCount).join(' ');
             count += remainingCount;
         }
-  
+
         node = treeWalker.nextSibling();
     }
     const truncatedText = text.trim();
@@ -218,7 +218,7 @@ export function shortHighlightedtext(html, maxLength = 40) {
     let highlightedText = '';
     let lastIndex = 0;
 
-    highlightedSpans.forEach(span => {
+    highlightedSpans.forEach((span: any) => {
         const spanText = span.textContent.trim();
         const spanIndex = truncatedText.indexOf(spanText, lastIndex);
 
@@ -241,12 +241,12 @@ export function shortHighlightedtext(html, maxLength = 40) {
  * @param {Object} picture
  * @return {String}
  */
-export function getCaption(picture) {
+export function getCaption(picture: any) {
     return getTextFromHtml(picture.description_text || picture.body_text || '').trim();
 }
 
-export function getActiveQuery(query, activeFilter, createdFilter) {
-    const queryParams = {
+export function getActiveQuery(query: any, activeFilter: any, createdFilter: any) {
+    const queryParams: any = {
         query: query || null,
         filter: pickBy(activeFilter),
         created: pickBy(createdFilter),
@@ -255,7 +255,7 @@ export function getActiveQuery(query, activeFilter, createdFilter) {
     return pickBy(queryParams, (val) => !isEmpty(val));
 }
 
-export function isTopicActive(topic, activeQuery) {
+export function isTopicActive(topic: any, activeQuery: any) {
     const topicQuery = getActiveQuery(topic.query, topic.filter, topic.created);
     return !isEmpty(activeQuery) && isEqual(topicQuery, activeQuery);
 }
@@ -267,13 +267,13 @@ export function isTopicActive(topic, activeQuery) {
  * @param {Object} b
  * @return {Boolean}
  */
-export function isEqualItem(a, b) {
+export function isEqualItem(a: any, b: any) {
     return a && b && a._id === b._id && a.version === b.version;
 }
 
-function hasMedia(item, type) {
-    return item != null && getItemMedia(item).some((_item) => _item.type === type);
+function hasMedia(item: any, type: any) {
+    return item != null && getItemMedia(item).some((_item: any) => _item.type === type);
 }
 
-export const hasAudio = (item) => hasMedia(item, 'audio');
-export const hasVideo = (item) => hasMedia(item, 'video');
\ No newline at end of file
+export const hasAudio = (item: any) => hasMedia(item, 'audio');
+export const hasVideo = (item: any) => hasMedia(item, 'video');
\ No newline at end of file
diff --git a/design_app/src/assets/img/logo-fr.svg b/design_app/src/assets/img/logo-fr.svg
new file mode 100644
index 000000000..b1e22acdd
--- /dev/null
+++ b/design_app/src/assets/img/logo-fr.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 2588 159" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.16667,0,0,4.16667,0,0)">
+        <path d="M0,0.875L7.355,0.875L7.355,31.198L25.219,31.198L25.219,37.5L0,37.5L0,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M46.334,10.531C46.334,10.531 40.979,24.941 40.93,24.941L51.688,24.941L46.334,10.531ZM36.276,37.5L28.92,37.5L43.131,0.621L49.886,0.621L64.096,37.5L56.34,37.5L53.889,30.897L38.729,30.897L36.276,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M96.843,20.39C100.146,20.39 102.999,19.887 102.999,13.629C102.999,7.378 100.045,6.927 96.744,6.927L89.038,6.927L89.038,20.39L96.843,20.39ZM81.731,0.875L96.843,0.875C105.901,0.875 110.354,3.277 110.354,13.533C110.354,23.843 105.75,26.345 96.744,26.345L89.038,26.345L89.038,37.5L81.731,37.5L81.731,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M130.718,19.887C134.672,19.887 136.874,18.984 136.874,13.385C136.874,7.728 134.421,6.927 130.618,6.927L123.413,6.927L123.413,19.887L130.718,19.887ZM146.631,37.5L138.224,37.5L130.368,25.844L123.413,25.844L123.413,37.5L116.108,37.5L116.108,0.875L130.718,0.875C139.775,0.875 144.229,3.027 144.229,13.282C144.229,20.438 141.977,23.19 137.725,24.241L146.631,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M152.034,0.875L176.401,0.875L176.401,7.326L159.389,7.326L159.389,15.488L172.8,15.488L172.8,21.941L159.389,21.941L159.389,31.198L176.401,31.198L176.401,37.5L152.034,37.5L152.034,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M182.456,36.45L183.607,30.297C185.108,30.647 191.762,31.645 195.265,31.645C200.469,31.645 202.07,30.944 202.07,27.143C202.07,23.742 201.02,23.388 195.015,22.19C185.007,20.187 182.557,18.638 182.557,10.68C182.557,3.027 187.459,0.424 195.814,0.424C200.269,0.424 206.424,1.176 208.025,1.677L206.873,7.881C204.572,7.526 199.968,6.828 195.766,6.828C191.512,6.828 190.011,7.781 190.011,10.782C190.011,14.235 191.162,14.634 196.916,15.784C206.524,17.687 209.626,18.888 209.626,27.194C209.626,35.401 205.022,37.903 195.215,37.903C189.661,37.903 184.157,36.952 182.456,36.45Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M213.728,36.45L214.88,30.297C216.381,30.647 223.034,31.645 226.538,31.645C231.742,31.645 233.343,30.944 233.343,27.143C233.343,23.742 232.293,23.388 226.287,22.19C216.281,20.187 213.829,18.638 213.829,10.68C213.829,3.027 218.731,0.424 227.089,0.424C231.542,0.424 237.696,1.176 239.297,1.677L238.146,7.881C235.846,7.526 231.241,6.828 227.039,6.828C222.786,6.828 221.284,7.781 221.284,10.782C221.284,14.235 222.436,14.634 228.19,15.784C237.797,17.687 240.898,18.888 240.898,27.194C240.898,35.401 236.295,37.903 226.488,37.903C220.935,37.903 215.429,36.952 213.728,36.45Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M247.153,0.875L271.521,0.875L271.521,7.326L254.509,7.326L254.509,15.488L267.917,15.488L267.917,21.941L254.509,21.941L254.509,31.198L271.521,31.198L271.521,37.5L247.153,37.5L247.153,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M290.784,19.184C290.784,3.324 297.189,0.328 307.197,0.328C313.202,0.328 315.953,1.072 317.654,1.423L316.403,7.681C313.701,7.229 310.999,6.778 307.096,6.778C300.691,6.778 298.49,9.381 298.49,17.739L298.49,20.438C298.49,28.593 300.743,31.698 307.197,31.698C312,31.698 315.352,30.844 316.453,30.647L317.654,36.799C315.703,37.352 312.95,38 307.096,38C296.988,38 290.784,35.049 290.784,19.184Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M338.561,10.531C338.561,10.531 333.208,24.941 333.159,24.941L343.917,24.941L338.561,10.531ZM328.504,37.5L321.149,37.5L335.36,0.621L342.114,0.621L356.326,37.5L348.568,37.5L346.116,30.897L330.957,30.897L328.504,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M360.277,0.875L367.582,0.875L383.696,24.189L383.696,0.875L390.75,0.875L390.75,37.5L384.445,37.5L367.333,12.635L367.333,37.5L360.277,37.5L360.277,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M412.118,10.531C412.118,10.531 406.762,24.941 406.712,24.941L417.469,24.941L412.118,10.531ZM402.059,37.5L394.703,37.5L408.914,0.621L415.668,0.621L429.879,37.5L422.123,37.5L419.67,30.897L404.511,30.897L402.059,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M447.492,31.645C453.895,31.645 456.347,28.793 456.347,20.39L456.347,17.99C456.347,9.529 453.895,6.878 447.492,6.878L441.188,6.878L441.188,31.645L447.492,31.645ZM433.832,0.875L447.542,0.875C458.399,0.875 464.105,3.426 464.105,19.184C464.105,34.95 458.399,37.5 447.542,37.5L433.832,37.5L433.832,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <rect x="470.958" y="0.875" width="7.404" height="36.625" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M487.167,0.875L511.539,0.875L511.539,7.326L494.524,7.326L494.524,15.488L507.933,15.488L507.933,21.941L494.524,21.941L494.524,31.198L511.539,31.198L511.539,37.5L487.167,37.5L487.167,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M517.742,0.875L525.045,0.875L541.156,24.189L541.156,0.875L548.213,0.875L548.213,37.5L541.91,37.5L524.795,12.635L524.795,37.5L517.742,37.5L517.742,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M556.72,0.875L564.023,0.875L580.138,24.189L580.138,0.875L587.191,0.875L587.191,37.5L580.887,37.5L563.776,12.635L563.776,37.5L556.72,37.5L556.72,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M595.7,0.875L620.067,0.875L620.067,7.326L603.052,7.326L603.052,15.488L616.461,15.488L616.461,21.941L603.052,21.941L603.052,31.198L620.067,31.198L620.067,37.5L595.7,37.5L595.7,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/design_app/src/assets/img/logo-newspro-fr.svg b/design_app/src/assets/img/logo-newspro-fr.svg
new file mode 100644
index 000000000..c3ecb42cb
--- /dev/null
+++ b/design_app/src/assets/img/logo-newspro-fr.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 499.31 51.62"><defs><style>.cls-1{fill:#fff;}</style></defs><path class="cls-1" d="M0,50.76V1.8H16.78l11.8,40.32h.72V1.8h9.94v49H22.9L10.66,10.44H9.94V50.76Z"/><path class="cls-1" d="M83.77,45.54Q79.19,51.63,68,51.62T52.31,45.54q-4.58-6.09-4.57-19T52.31,7.24Q56.87.94,68,.94t15.73,6.3q4.58,6.3,4.57,19.26T83.77,45.54ZM60.08,39.2Q62.21,43,68,43t8-3.78q2.11-3.78,2.12-12.67T76,13.61q-2.16-4-7.92-4t-7.92,4Q58,17.65,58,26.53T60.08,39.2Z"/><path class="cls-1" d="M106.34,34.42q0,8.56,8.71,8.56t8.72-8.56V1.8h9.93V34.2q0,9-4.64,13.21t-14,4.21q-9.36,0-14-4.21T96.41,34.2V1.8h9.93Z"/><path class="cls-1" d="M170.42,1.8h10.44l-11.37,49H151.13l-11.38-49h10.44l8.5,40.32h3.24Z"/><path class="cls-1" d="M187.34,50.76V1.8H219v8.64H197.28V21.89H214.7v8.49H197.28V42.12H219v8.64Z"/><path class="cls-1" d="M255.09,50.76H227.23V1.8h9.93V42h17.93Z"/><path class="cls-1" d="M289.08,50.76H261.21V1.8h9.94V42h17.93Z"/><path class="cls-1" d="M295.19,50.76V1.8h31.68v8.64H305.13V21.89h17.43v8.49H305.13V42.12h21.74v8.64Z"/><path class="cls-1" d="M350.13,9.58q-7.85,0-7.85,5.18a3.93,3.93,0,0,0,2,3.53q1.93,1.22,9.1,3.53T363.38,27q2.88,2.91,2.88,9,0,7.71-4.68,11.66t-12.24,4a68.07,68.07,0,0,1-13.75-1.72l-2.6-.51,1-7.7A120.35,120.35,0,0,0,348.76,43q7.64,0,7.63-6.33a4.19,4.19,0,0,0-1.76-3.6c-1.18-.87-3.52-1.8-7-2.81q-8.36-2.37-11.77-5.65t-3.42-9.11q0-7.35,4.46-10.94T349.12.94a81.37,81.37,0,0,1,13.54,1.44l2.59.5-.79,7.85Q354.31,9.58,350.13,9.58Z"/><path class="cls-1" d="M393.47,33.34H379.65V50.76h-4.46V.72h18.28q8,0,11.78,3.89t3.77,12Q409,33.33,393.47,33.34Zm-13.82-4h13.82q10.95,0,10.95-12.82c0-4.08-.87-7.08-2.59-9s-4.52-2.88-8.36-2.88H379.65Z"/><path class="cls-1" d="M422.34,31V50.76h-4.46V.72h18.36q7.85,0,11.7,3.56t3.85,11.27q0,12-9.64,14.62l10.29,20.59h-5L437.61,31Zm24.85-15.41q0-5.61-2.67-8.28t-8.28-2.66h-13.9V27.07h13.9Q447.19,27.07,447.19,15.62Z"/><path class="cls-1" d="M499.31,26.13q0,13.4-4.21,19.37t-15.34,6q-11.11,0-15.33-6.12T460.22,26q0-13.22,4.24-19.62T479.73,0q11,0,15.3,6.37T499.31,26.13ZM467.85,42.44c2,3.34,6,5,11.91,5s9.9-1.63,11.92-4.9,3-8.72,3-16.38-1.05-13.26-3.16-16.81S485.49,4,479.73,4q-8.93,0-12,5.76a20.24,20.24,0,0,0-2.26,6.77,60.59,60.59,0,0,0-.62,9.43Q464.82,37.43,467.85,42.44Z"/></svg>
\ No newline at end of file
diff --git a/design_app/src/assets/img/logo-newspro.svg b/design_app/src/assets/img/logo-newspro.svg
new file mode 100644
index 000000000..5f0020517
--- /dev/null
+++ b/design_app/src/assets/img/logo-newspro.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320.97 51.62"><defs><style>.cls-1{fill:#fff;}</style></defs><path class="cls-1" d="M0,50.76V1.8H16.78l11.8,40.32h.72V1.8h9.94v49H22.9L10.66,10.44H9.94V50.76Z"/><path class="cls-1" d="M49.9,50.76V1.8H81.58v8.64H59.83V21.89H77.26v8.49H59.83V42.12H81.58v8.64Z"/><path class="cls-1" d="M85.82,1.8H96.26l6,40.46h1.08L112.17,1.8h11.52l8.79,40.46h1.08L139.61,1.8h10.44l-9.36,49h-15l-7.7-37.22-7.71,37.22h-15Z"/><path class="cls-1" d="M171.79,9.58q-7.84,0-7.85,5.18a3.93,3.93,0,0,0,1.95,3.53q1.94,1.22,9.1,3.53T185,27q2.88,2.91,2.88,9,0,7.71-4.68,11.66t-12.24,4a68.07,68.07,0,0,1-13.75-1.72l-2.6-.51,1-7.7A120.35,120.35,0,0,0,170.42,43q7.64,0,7.63-6.33a4.19,4.19,0,0,0-1.76-3.6c-1.18-.87-3.52-1.8-7-2.81q-8.36-2.37-11.77-5.65t-3.42-9.11q0-7.35,4.46-10.94T170.78.94a81.37,81.37,0,0,1,13.54,1.44l2.59.5-.79,7.85Q176,9.58,171.79,9.58Z"/><path class="cls-1" d="M215.13,33.34H201.31V50.76h-4.46V.72h18.28q8,0,11.78,3.89t3.78,12Q230.69,33.33,215.13,33.34Zm-13.82-4h13.82q11,0,11-12.82c0-4.08-.87-7.08-2.59-9S219,4.68,215.13,4.68H201.31Z"/><path class="cls-1" d="M244,31V50.76h-4.46V.72H257.9q7.85,0,11.7,3.56t3.85,11.27q0,12-9.65,14.62l10.3,20.59h-5L259.27,31Zm24.84-15.41c0-3.74-.88-6.5-2.66-8.28s-4.54-2.66-8.28-2.66H244V27.07h13.9Q268.85,27.07,268.84,15.62Z"/><path class="cls-1" d="M321,26.14q0,13.38-4.21,19.36t-15.34,6q-11.12,0-15.33-6.12T281.88,26q0-13.22,4.24-19.62T301.39,0q11,0,15.3,6.37T321,26.14Zm-31.46,16.3q3,5,11.91,5t11.92-4.9q3-4.89,3-16.38T313.19,9.36Q310,4,301.39,4q-8.92,0-12,5.76a20.24,20.24,0,0,0-2.26,6.77,60.59,60.59,0,0,0-.62,9.43Q286.48,37.43,289.51,42.44Z"/></svg>
\ No newline at end of file
diff --git a/design_app/src/assets/img/logo.svg b/design_app/src/assets/img/logo.svg
new file mode 100644
index 000000000..05d0626d2
--- /dev/null
+++ b/design_app/src/assets/img/logo.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="380px" height="37px" viewBox="0 0 380 37" style="enable-background:new 0 0 380 37;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<polygon class="st0" points="7.3,19.8 0.7,19.8 0.7,16.2 17.9,16.2 17.9,19.8 11.4,19.8 11.4,36.5 7.3,36.5 	"/>
+	<polygon class="st0" points="21.5,16.2 25.5,16.2 25.5,24.1 34.6,24.1 34.6,16.2 38.7,16.2 38.7,36.5 34.6,36.5 34.6,27.8 
+		25.5,27.8 25.5,36.5 21.5,36.5 	"/>
+	<polygon class="st0" points="43.5,16.2 57,16.2 57,19.8 47.6,19.8 47.6,24.3 55,24.3 55,27.9 47.6,27.9 47.6,33 57,33 57,36.5 
+		43.5,36.5 	"/>
+	<path class="st0" d="M67.6,26.4c0-8.8,3.5-10.4,9.1-10.4c3.3,0,4.8,0.4,5.8,0.6L81.8,20c-1.5-0.3-3-0.5-5.2-0.5
+		c-3.5,0-4.8,1.4-4.8,6.1V27c0,4.5,1.2,6.2,4.8,6.2c2.7,0,4.5-0.5,5.1-0.6l0.7,3.4c-1.1,0.3-2.6,0.7-5.8,0.7
+		C71.1,36.8,67.6,35.1,67.6,26.4"/>
+	<path class="st0" d="M89.1,36.5h-4.1l7.9-20.4h3.7l7.9,20.4h-4.3l-1.4-3.7h-8.4L89.1,36.5z M94.7,21.6c0,0-3,8-3,8h5.9L94.7,21.6z"
+		/>
+	<polygon class="st0" points="107.4,16.2 111.4,16.2 120.3,29.1 120.3,16.2 124.2,16.2 124.2,36.5 120.7,36.5 111.3,22.7 
+		111.3,36.5 107.4,36.5 	"/>
+	<path class="st0" d="M131.1,36.5H127l7.9-20.4h3.7l7.9,20.4h-4.3l-1.4-3.7h-8.4L131.1,36.5z M136.7,21.6c0,0-3,8-3,8h5.9
+		L136.7,21.6z"/>
+	<path class="st0" d="M149.3,16.2h7.6c6,0,9.2,1.4,9.2,10.1s-3.2,10.1-9.2,10.1h-7.6V16.2z M156.9,33.3c3.5,0,4.9-1.6,4.9-6.2v-1.3
+		c0-4.7-1.4-6.1-4.9-6.1h-3.5v13.7L156.9,33.3L156.9,33.3z"/>
+	<rect x="169.8" y="16.2" class="st0" width="4.1" height="20.3"/>
+	<path class="st0" d="M180.9,36.5h-4.1l7.9-20.4h3.7l7.9,20.4H192l-1.4-3.7h-8.4L180.9,36.5z M186.4,21.6c0,0-3,8-3,8h5.9
+		L186.4,21.6z"/>
+	<polygon class="st0" points="199,16.2 203,16.2 212,29.1 212,16.2 215.9,16.2 215.9,36.5 212.4,36.5 202.9,22.7 202.9,36.5 
+		199,36.5 	"/>
+	<path class="st0" d="M228,16.2h8.4c5,0,7.5,1.3,7.5,7c0,5.7-2.6,7.1-7.5,7.1h-4.3v6.2h-4L228,16.2L228,16.2z M236.4,27
+		c1.8,0,3.4-0.3,3.4-3.7s-1.6-3.7-3.5-3.7h-4.3V27H236.4z"/>
+	<path class="st0" d="M264.6,36.5h-4.6l-4.4-6.5h-3.9v6.5h-4V16.2h8.1c5,0,7.5,1.2,7.5,6.9c0,4-1.3,5.5-3.6,6.1L264.6,36.5z
+		 M255.8,26.8c2.2,0,3.4-0.5,3.4-3.6c0-3.1-1.4-3.6-3.5-3.6h-4v7.2H255.8z"/>
+	<polygon class="st0" points="268.2,16.2 281.7,16.2 281.7,19.8 272.3,19.8 272.3,24.3 279.7,24.3 279.7,27.9 272.3,27.9 272.3,33 
+		281.7,33 281.7,36.5 268.2,36.5 	"/>
+	<path class="st0" d="M285.5,35.9l0.6-3.4c0.8,0.2,4.5,0.8,6.5,0.8c2.9,0,3.8-0.4,3.8-2.5c0-1.9-0.6-2.1-3.9-2.7
+		c-5.5-1.1-6.9-2-6.9-6.4c0-4.2,2.7-5.7,7.3-5.7c2.5,0,5.9,0.4,6.8,0.7l-0.6,3.4c-1.3-0.2-3.8-0.6-6.1-0.6c-2.4,0-3.2,0.5-3.2,2.2
+		c0,1.9,0.6,2.1,3.8,2.8c5.3,1,7,1.7,7,6.3c0,4.5-2.5,5.9-8,5.9C289.5,36.7,286.4,36.2,285.5,35.9"/>
+	<path class="st0" d="M303.7,35.9l0.6-3.4c0.8,0.2,4.5,0.8,6.5,0.8c2.9,0,3.8-0.4,3.8-2.5c0-1.9-0.6-2.1-3.9-2.7
+		c-5.5-1.1-6.9-2-6.9-6.4c0-4.2,2.7-5.7,7.3-5.7c2.5,0,5.9,0.4,6.8,0.7l-0.6,3.4c-1.3-0.2-3.8-0.6-6.1-0.6c-2.3,0-3.2,0.5-3.2,2.2
+		c0,1.9,0.6,2.1,3.8,2.8c5.3,1,7,1.7,7,6.3c0,4.5-2.5,5.9-8,5.9C307.7,36.7,304.6,36.2,303.7,35.9"/>
+	<path class="st0" d="M329.5,15.1V0.2h10.4v16H334c0.8,4,5.9,5.5,5.9,5.5V24C339.9,23.9,330.7,22.2,329.5,15.1"/>
+	<path class="st0" d="M379.3,15.1V0.2h-10.4v16h5.9c-0.8,4-5.9,5.5-5.9,5.5V24C368.9,23.9,378.1,22.2,379.3,15.1"/>
+	<g>
+		<g>
+			<g>
+				<path class="st0" d="M358.8,16.4c0,0,0-0.1,0-0.1c0,0,0,0,0.1-0.1l5.4-3.9l-1.2-1c0,0,0,0,0-0.1c0,0,0-0.1,0-0.1l0,0l1-2.7
+					L361.2,9c0,0-0.1,0-0.1,0c0,0,0,0-0.1-0.1l0,0l-0.9-1.4l-2.7,2.6c0,0-0.1,0.1-0.2,0s-0.1-0.1-0.1-0.1l1.2-5.8l-1.8,1.2
+					c0,0-0.1,0-0.1,0c0,0-0.1,0-0.1-0.1l0,0l-2-4.2l-2,4.2c0,0,0,0.1-0.1,0.1s-0.1,0-0.1,0l-1.8-1.2l1.2,5.8c0,0.1,0,0.1-0.1,0.1
+					s-0.1,0-0.1,0l-2.7-2.6l-0.9,1.4l0,0c0,0,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0L345,8.4l1,2.7l0,0c0,0,0,0,0,0.1s0,0.1,0,0.1l-1.2,1
+					l5.4,3.9c0,0,0,0,0.1,0.1c0,0,0,0.1,0,0.1l0,0l-1.2,1.9l4.7-0.7c0.1,0,0.2,0,0.2,0.1v4h1.1v-4c0-0.1,0.1-0.1,0.2-0.1l4.7,0.7
+					L358.8,16.4L358.8,16.4z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/design_app/src/assets/styles/theme_Command-News.scss b/design_app/src/assets/styles/theme_Command-News.scss
new file mode 100644
index 000000000..45542ee21
--- /dev/null
+++ b/design_app/src/assets/styles/theme_Command-News.scss
@@ -0,0 +1,99 @@
+:root {
+    /* CORE: TYPOGRAPHY */
+    --font-family-core--sans: "Lato", sans-serif;
+    --font-family-core--serif: "Titilium Web", sans-serif;
+
+    --color-background:     hsl(0, 0%, 97%);
+    --badge-bg-highlight1:  hsl(356, 72%, 46%);
+    --color-primary:        hsl(356, 72%, 46%);
+
+    --color-home-section-heading: var(--color-text);
+
+    --color-interactive-focus-base: 356, 72%;
+    --color-interactive-focus-l: 46%;
+
+    // LOGIN PAGE
+    --login-page-color-bg: hsl(0, 3%, 15%);
+
+    // COMPONENT: NAVBAR MAIN
+    --top-bar-color-bg: var(--color-primary);
+    --top-bar-color-bg-notifications: hsla(216, 45%, 4%, 0.3);
+    --top-bar-color-bg-notifications--hover: hsla(216, 45%, 0%, 0.5);
+    --top-bar-color-bg-avatar-block: hsla(216, 45%, 4%, 0);
+    --top-bar-color-bg-avatar: hsla(216, 45%, 4%, 0.3);
+    --top-bar-color-bg-avatar--hover: hsla(216, 45%, 4%, 0.5);
+    --top-bar-color-bg-badge: hsl(0, 0%, 100%);
+    --top-bar-color-fg-badge: hsl(0, 3%, 15%);
+    // Logo main
+    --top-bar-logo-main-max-width: 224px;
+    --top-bar-logo-main-max-width--mobile: 200px;
+    --top-bar-logo-main-margin-top: -9px;
+    --top-bar-logo-main-margin-top--mobile: -6px;
+    // Logo additional
+    --top-bar-logo-additional-display: flex;
+    --top-bar-logo-additional-max-width: 78px;
+    --top-bar-logo-additional-min-width--mobile: 0px;
+    --top-bar-logo-additional-padding-y: 12px;
+    --top-bar-logo-additional-padding-x: 0;
+    // Navbar Brand
+    --top-bar-nav-brand-margin-x: 0;
+    --top-bar-nav-brand-margin-y: 16px;
+    --top-bar-nav-brand-padding-x: 16px;
+    --top-bar-nav-brand-border-color: hsla(0, 0%, 100%, 0.4);
+    --top-bar-nav-brand-border-type: solid;
+
+    // COMPONENT: SIDENAV
+    --sidenav-color-bg:                 hsl(0, 3%, 15%);
+    --sidenav-color-item-bg--active:    hsl(356, 72%, 46%);
+    --sidenav-color-item-fg--active:    hsla(0, 0%, 100%, 1);
+    --sidenav-color-badge-bg:           hsla(0, 0%, 98%, 1);
+    --sidenav-color-badge-fg:           hsl(356, 72%, 46%);
+
+    // COMPONENT: BUTTONS
+    // Primary
+    --button-color-bg--primary-base: 0, 3%;
+    --button-color-bg--primary-l: 25%;
+
+    // COMPONENT: ICON BUTTON
+    // Primary
+    --icon-button-color-icon--primary: hsl(0, 3%, 15%);
+    --icon-button-color-border--primary-hover: var(--icon-button-color-fg);
+    --icon-button-shadow-primary--active: var(--icon-button-shadow--active);
+
+    // COMPONENT: PROFILE SIDEBAR
+    --profile-sidebar-color-bg:                hsl(0, 0%, 88%);
+    --profile-sidebar-color-fg:                var(--color-text);
+    --profile-sidebar-button-color-fg--secondary:            hsla(0, 0%, 10%, 0.75);
+    --profile-sidebar-button-color-border--secondary:        hsla(0, 0%, 10%, 0.45);
+    --profile-sidebar-button-color-fg--secondary-hover:      hsla(0, 0%, 10%, 0.98);
+    --profile-sidebar-button-color-border--secondary-hover:  hsla(0, 0%, 10%, 0.65);
+    // sidebar avatar
+    --profile-sidebar-avatar-color-bg:         hsl(0, 0%, 14%);
+    --profile-sidebar-avatar-color-fg:         hsl(0, 0%, 99%);
+    --profile-sidebar-avatar-color-border:     hsl(0, 0%, 60%);
+
+    // COMPONENT: MAIN FOOTER
+    --footer-size--height: 48px;
+}
+
+.navbar__logo {
+    img.navbar__logo-img--fr {
+        max-width: 200px;
+        margin-block-start: 0;
+    }
+}
+
+.navbar__additional-logo {
+    .navbar__additional-logo-img--fr {
+        max-width: 120px;
+    }
+}
+
+@media only screen and (max-width: 575px) {
+    .navbar__logo {
+        img.navbar__logo-img--fr {
+            margin-block-start: 0;
+            max-width: 160px;
+        }
+    }
+}
diff --git a/design_app/src/assets/styles/theme.scss b/design_app/src/assets/styles/theme_News-Pro.scss
similarity index 100%
rename from design_app/src/assets/styles/theme.scss
rename to design_app/src/assets/styles/theme_News-Pro.scss
diff --git a/design_app/src/components/MainNavbar.jsx b/design_app/src/components/MainNavbar.jsx
index 3db37d264..cfb574996 100644
--- a/design_app/src/components/MainNavbar.jsx
+++ b/design_app/src/components/MainNavbar.jsx
@@ -6,14 +6,39 @@ function MainNavbar() {
         <nav className="main navbar">
             <h3 className="a11y-only">main nav bar</h3>
             <div className="navbar__logo">
+                {/* Default */}
+                {/* <a href="#">
+                    <h1 className="a11y-only">Newsroom</h1>
+                    <img className="navbar__logo-img navbar__logo-img--en" src="static/logo.svg" alt="Newsroom" aria-hidden="true" />
+                </a> */}
+                
+                {/* Canadian Press */}
                 <a href="#">
-                    <h1 className="a11y-only">Newshub</h1>
-                    <img src="static/logo.svg" alt="newshub" aria-hidden="true" />
+                    <h1 className="a11y-only">The Canadian Press</h1>
+                    <img className="navbar__logo-img navbar__logo-img--en" src="static/temp_logos/logo.svg" alt="The Canadian Press" aria-hidden="true" />
                 </a>
+
+                {/* Canadian Press - French */}
+                {/* <a href="#">
+                    <h1 className="a11y-only">La Presse Canadienne</h1>
+                    <img className="navbar__logo-img navbar__logo-img--fr" src="static/temp_logos/logo-fr.svg" alt="La Presse Canadienne" aria-hidden="true" />
+                </a> */}
+            </div>
+
+            {/* NewsPro */}
+            <div className="navbar__additional-logo">
+                <h1 className="a11y-only">NewsPro</h1>
+                <img className="navbar__additional-logo-img navbar__additional-logo-img--en" src="static/temp_logos/logo-newspro.svg" alt="Newspro" aria-hidden="true" />
             </div>
+
+            {/* NewsPro French */}
+            {/* <div className="navbar__additional-logo">
+                <h1 className="a11y-only">NouvellesPro</h1>
+                <img className="navbar__additional-logo-img navbar__additional-logo-img--fr" src="static/temp_logos/logo-newspro-fr.svg" alt="NouvellesPro" aria-hidden="true" />
+            </div> */}
             <div className="navbar-brand">
                 <nav>
-                <span className="breadcrumb-item active">Home</span>
+                    <span className="breadcrumb-item active">Home</span>
                 </nav>
                  <DesignNav />
             </div>
diff --git a/design_app/src/index.js b/design_app/src/index.js
index 4d7c2351d..17dce73c3 100644
--- a/design_app/src/index.js
+++ b/design_app/src/index.js
@@ -6,7 +6,8 @@ import App from './components/App';
 import '../../assets/styles/app.scss'; // Newshub - import of everything
 import './assets/styles/_design_external-style.scss'; // Static file
 //import './assets/styles/theme.css'; // CP Theme
-import './assets/styles/theme.scss'; // CP Theme - test SCSS import
+//import './assets/styles/theme_News-Pro.scss'; // CP News Pro Theme - test SCSS import
+import './assets/styles/theme_Command-News.scss'; // CP News Pro Theme - test SCSS import
 
 ReactDOM.render(
   React.createElement(App),
diff --git a/dev-requirements.txt b/dev-requirements.txt
index b451728e3..6492ba74d 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,5 +1,6 @@
 -r requirements.txt
 
+black>=23,<24
 flake8
 sphinx
 sphinx-autobuild
@@ -10,4 +11,4 @@ responses>=0.10.6,<0.11
 httmock
 wooper
 mypy
-typing_extensions>=3.7.4
\ No newline at end of file
+typing_extensions>=3.7.4
diff --git a/e2e/.npmrc b/e2e/.npmrc
new file mode 100644
index 000000000..43c97e719
--- /dev/null
+++ b/e2e/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/e2e/cypress/e2e/settings/users.cy.js b/e2e/cypress/e2e/settings/users.cy.js
new file mode 100644
index 000000000..9eda0b3d0
--- /dev/null
+++ b/e2e/cypress/e2e/settings/users.cy.js
@@ -0,0 +1,57 @@
+import {setup, addDefaultResources} from '../../support/e2e';
+import {NewshubLayout} from '../../support/pages/layout';
+import {SettingsNav} from '../../support/containers/settingsNav';
+import {UserSettingsPage} from '../../support/pages/settings_users';
+import {USERS} from '../../fixtures/users';
+
+describe('Settings - Users', function () {
+    beforeEach(() => {
+        setup();
+        addDefaultResources();
+        NewshubLayout.login('admin@example.com', 'admin');
+        NewshubLayout.getSidebarLink('settings').click();
+        SettingsNav.getNavLink('users').click();
+    });
+
+    it('can impersonate a user', () => {
+        UserSettingsPage
+            .getUserListItem(USERS.foobar.monkey._id)
+            .click();
+
+        NewshubLayout
+            .getAvatar()
+            .should('contain.text', 'AN');
+
+        UserSettingsPage
+            .getPreview()
+            .should('contain.text', 'Impersonate User');
+
+        cy.get('[data-test-id="impersonate-user-btn"]').click();
+
+        cy.url().should('eq', 'http://localhost:5050/');
+
+        NewshubLayout
+            .getAvatar()
+            .should('contain.text', 'MM');
+
+        cy.get('[data-test-id="impersonate-user-info"]')
+            .should('include.text', 'Impersonating')
+            .should('include.text', 'Monkey Mania');
+
+        cy.get('[data-test-id="impersonate-stop-btn"]')
+            .click();
+
+        cy.url().should('eq', 'http://localhost:5050/settings/users');
+
+        cy.get('[data-test-id="impersonate-user-info"]')
+            .should('not.exist');
+
+        UserSettingsPage
+            .getUserListItem(USERS.none.admin._id)
+            .click();
+
+        UserSettingsPage
+            .getPreview()
+            .should('not.contain', 'Impersonate User');
+    });
+});
\ No newline at end of file
diff --git a/e2e/cypress/support/pages/layout.js b/e2e/cypress/support/pages/layout.js
index 3abd1c572..607c28bad 100644
--- a/e2e/cypress/support/pages/layout.js
+++ b/e2e/cypress/support/pages/layout.js
@@ -9,6 +9,10 @@ class NewshubLayoutWrapper {
     getSidebarLink(name) {
         return cy.get(`[data-test-id="sidenav-link-${name}"]`);
     }
+
+    getAvatar() {
+        return cy.get('[data-test-id="header-avatar"]');
+    }
 }
 
 export const NewshubLayout = new NewshubLayoutWrapper();
diff --git a/e2e/cypress/support/pages/settings_users.js b/e2e/cypress/support/pages/settings_users.js
index 4457a828e..3e1e5337d 100644
--- a/e2e/cypress/support/pages/settings_users.js
+++ b/e2e/cypress/support/pages/settings_users.js
@@ -17,6 +17,10 @@ class UserSettingsPageWrapper {
     getNewUserButton() {
         return cy.get('[data-test-id="new-item-btn"]');
     }
+
+    getPreview() {
+        return cy.get('[data-test-id="edit-user-form"]');
+    }
 }
 
 export const UserSettingsPage = new UserSettingsPageWrapper();
diff --git a/karma.conf.js b/karma.conf.js
index d17325f2e..717d53c02 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -6,11 +6,11 @@ const webpackConfig = require('./webpack.config.js');
 module.exports = function(config) {
     config.set({
         files: [
-            'assets/tests.js',
+            'assets/tests.ts',
         ],
 
         preprocessors: {
-            'assets/tests.js': ['webpack', 'sourcemap'],
+            'assets/tests.ts': ['webpack', 'sourcemap'],
         },
 
         webpack: {
@@ -27,5 +27,10 @@ module.exports = function(config) {
         reporters: ['dots'],
         frameworks: ['jasmine'],
         browsers: ['ChromeHeadless'],
+
+        // Allow typescript files
+        mime: {
+            'text/x-typescript': ['ts', 'tsx'],
+        },
     });
 };
diff --git a/mapping.cfg b/mapping.cfg
index b497d133c..4bd3999d4 100644
--- a/mapping.cfg
+++ b/mapping.cfg
@@ -8,10 +8,10 @@ encoding = utf-8
 [jinja2: **.txt]
 encoding = utf-8
 
-[javascript: **.js]
+[javascript: **.ts]
 input_paths = assets
 extract_messages = gettext
 
-[javascript: **.jsx]
+[javascript: **.tsx]
 input_paths = assets
 extract_messages = gettext
diff --git a/messages.pot b/messages.pot
index 970989247..1d24d3d09 100644
--- a/messages.pot
+++ b/messages.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Newsroom-Core 2.5.0.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-06-26 16:59+0200\n"
+"POT-Creation-Date: 2023-08-07 13:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -112,7 +112,7 @@ msgid ""
 "users"
 msgstr ""
 
-#: assets/missing-translations.js:3 newsroom/agenda/utils.py:41
+#: assets/missing-translations.ts:3 newsroom/agenda/utils.py:41
 #: newsroom/utils.py:198
 msgid "ALL DAY"
 msgstr ""
@@ -129,11 +129,11 @@ msgstr ""
 msgid "Insufficient Permissions. Access denied."
 msgstr ""
 
-#: newsroom/auth/views.py:126 newsroom/utils.py:389
+#: newsroom/auth/views.py:127 newsroom/utils.py:389
 msgid "Company account has been disabled."
 msgstr ""
 
-#: newsroom/auth/views.py:129 newsroom/utils.py:393
+#: newsroom/auth/views.py:130 newsroom/utils.py:393
 msgid "Company account has expired."
 msgstr ""
 
@@ -149,30 +149,29 @@ msgid ""
 "for more details"
 msgstr ""
 
-#: assets/agenda/components/AgendaTags.jsx:44
-#: assets/company-reports/components/ContentActivity.jsx:110
-#: assets/wire/components/PreviewTags.jsx:40 newsroom/agenda/__init__.py:61
+#: assets/agenda/components/AgendaTags.tsx:44
+#: assets/company-reports/components/ContentActivity.tsx:111
+#: assets/wire/components/PreviewTags.tsx:40 newsroom/agenda/__init__.py:61
 #: newsroom/reports/content_activity.py:190
 #: newsroom/templates/wire_item.html:76
 #: newsroom/templates/wire_item_print.html:24 newsroom/wire/__init__.py:132
 msgid "Category"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:111
-#: assets/monitoring/components/MonitoringList.jsx:24
-#: assets/wire/components/PreviewTagsSubjects.jsx:42
+#: assets/company-reports/components/ContentActivity.tsx:112
+#: assets/monitoring/components/MonitoringList.tsx:24
+#: assets/wire/components/PreviewTagsSubjects.tsx:42
 #: newsroom/agenda/__init__.py:65 newsroom/monitoring/forms.py:22
 #: newsroom/reports/content_activity.py:191 newsroom/wire/__init__.py:136
 msgid "Subject"
 msgstr ""
 
-#: assets/wire/components/fields/UrgencyLabel.jsx:43
+#: assets/wire/components/fields/UrgencyLabel.tsx:43
 #: newsroom/agenda/__init__.py:69 newsroom/wire/__init__.py:144
 msgid "News Value"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:109
-#: assets/search/components/TopicParameters.jsx:63
+#: assets/company-reports/components/ContentActivity.tsx:110
 #: newsroom/agenda/__init__.py:73 newsroom/reports/content_activity.py:189
 #: newsroom/wire/__init__.py:148
 msgid "Place"
@@ -218,19 +217,19 @@ msgstr ""
 msgid "Coverage added"
 msgstr ""
 
-#: newsroom/agenda/views.py:214
+#: newsroom/agenda/views.py:216
 msgid "Cannot edit coverage watch when watching parent item"
 msgstr ""
 
-#: newsroom/agenda/views.py:221
+#: newsroom/agenda/views.py:223
 msgid "Coverage not found"
 msgstr ""
 
-#: newsroom/agenda/views.py:233
+#: newsroom/agenda/views.py:235
 msgid "Error removing watch."
 msgstr ""
 
-#: newsroom/agenda/views.py:272
+#: newsroom/agenda/views.py:274
 #, python-format
 msgid "%(section)s item not found"
 msgstr ""
@@ -255,7 +254,7 @@ msgstr ""
 msgid "CEO"
 msgstr ""
 
-#: assets/companies/utils.js:7 newsroom/auth/forms.py:15
+#: newsroom/auth/forms.py:15
 msgid "Other"
 msgstr ""
 
@@ -295,10 +294,10 @@ msgstr ""
 msgid "I agree to"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUsers.jsx:25
-#: assets/user-profile/components/profile/UserProfile.jsx:82
-#: assets/users/components/EditUser.jsx:129
-#: assets/users/components/UsersList.jsx:27 newsroom/auth/forms.py:35
+#: assets/company-admin/components/CompanyUsers.tsx:25
+#: assets/user-profile/components/profile/UserProfile.tsx:83
+#: assets/users/components/EditUser.tsx:146
+#: assets/users/components/UsersList.tsx:27 newsroom/auth/forms.py:35
 #: newsroom/auth/forms.py:41 newsroom/users/forms.py:44
 msgid "Email"
 msgstr ""
@@ -327,8 +326,8 @@ msgstr ""
 msgid "Confirm new password"
 msgstr ""
 
-#: newsroom/auth/oauth.py:59 newsroom/auth/views.py:140
-#: newsroom/auth/views.py:144 newsroom/news_api/news/assets/assets.py:24
+#: newsroom/auth/oauth.py:59 newsroom/auth/views.py:141
+#: newsroom/auth/views.py:145 newsroom/news_api/news/assets/assets.py:24
 #: newsroom/news_api/news/item/item.py:23
 msgid "Invalid token"
 msgstr ""
@@ -359,31 +358,31 @@ msgstr ""
 msgid "There was an error when using SSO"
 msgstr ""
 
-#: newsroom/auth/views.py:46 newsroom/auth/views.py:134
+#: newsroom/auth/views.py:47 newsroom/auth/views.py:135
 msgid "Invalid username or password."
 msgstr ""
 
-#: newsroom/auth/views.py:117
+#: newsroom/auth/views.py:118
 msgid "Exceeded number of allowed login attempts"
 msgstr ""
 
-#: newsroom/auth/views.py:174
+#: newsroom/auth/views.py:175
 msgid "Account already exists."
 msgstr ""
 
-#: newsroom/auth/views.py:199
+#: newsroom/auth/views.py:200
 msgid "Your account has been validated."
 msgstr ""
 
-#: newsroom/auth/views.py:202
+#: newsroom/auth/views.py:203
 msgid "Token has expired. Please create a new token"
 msgstr ""
 
-#: newsroom/auth/views.py:221
+#: newsroom/auth/views.py:222
 msgid "Your password has been changed. Please login again."
 msgstr ""
 
-#: newsroom/auth/views.py:238
+#: newsroom/auth/views.py:239
 msgid "A reset password token has been sent to your email address."
 msgstr ""
 
@@ -403,24 +402,24 @@ msgstr ""
 msgid "Dashboard type not found"
 msgstr ""
 
-#: newsroom/companies/__init__.py:40
+#: newsroom/companies/__init__.py:54
 msgid "Company Management"
 msgstr ""
 
-#: newsroom/companies/views.py:67
+#: newsroom/companies/views.py:68
 msgid "Company already exists"
 msgstr ""
 
-#: newsroom/companies/views.py:77 newsroom/navigations/views.py:64
+#: newsroom/companies/views.py:78 newsroom/navigations/views.py:64
 #: newsroom/products/views.py:64 newsroom/section_filters/views.py:55
 msgid "Name not found"
 msgstr ""
 
-#: newsroom/companies/views.py:85
+#: newsroom/companies/views.py:86
 msgid "{0}: {1}"
 msgstr ""
 
-#: newsroom/companies/views.py:133 newsroom/company_admin/views.py:46
+#: newsroom/companies/views.py:134 newsroom/company_admin/views.py:46
 msgid "Company not found"
 msgstr ""
 
@@ -475,32 +474,34 @@ msgstr ""
 msgid "Linked extract(s)"
 msgstr ""
 
-#: assets/companies/components/CompanyList.jsx:34
-#: assets/companies/components/EditCompanyDetails.jsx:20
-#: assets/company-admin/components/CompanyUsers.jsx:24
-#: assets/monitoring/components/EditMonitoringProfile.jsx:112
-#: assets/monitoring/components/MonitoringList.jsx:23
-#: assets/navigations/components/EditNavigation.jsx:78
-#: assets/navigations/components/NavigationList.jsx:22
-#: assets/oauth_clients/components/ClientList.jsx:22
-#: assets/oauth_clients/components/EditClient.jsx:38
-#: assets/products/components/EditProduct.jsx:114
-#: assets/products/components/ProductList.jsx:22
-#: assets/search/components/TopicForm.jsx:42
-#: assets/section-filters/components/EditSectionFilter.jsx:36
-#: assets/section-filters/components/SectionFilterList.jsx:22
-#: assets/users/components/UsersList.jsx:26 newsroom/monitoring/forms.py:21
+#: assets/companies/components/CompanyList.tsx:35
+#: assets/companies/components/EditCompanyDetails.tsx:18
+#: assets/company-admin/components/CompanyUsers.tsx:24
+#: assets/monitoring/components/EditMonitoringProfile.tsx:114
+#: assets/monitoring/components/MonitoringList.tsx:23
+#: assets/navigations/components/EditNavigation.tsx:83
+#: assets/navigations/components/NavigationList.tsx:22
+#: assets/oauth_clients/components/ClientList.tsx:22
+#: assets/oauth_clients/components/EditClient.tsx:39
+#: assets/products/components/EditProduct.tsx:121
+#: assets/products/components/ProductList.tsx:22
+#: assets/search/components/AdvancedSearchPanel.tsx:118
+#: assets/search/components/TopicForm.tsx:53
+#: assets/section-filters/components/EditSectionFilter.tsx:37
+#: assets/section-filters/components/SectionFilterList.tsx:22
+#: assets/users/components/UsersList.tsx:26 newsroom/monitoring/forms.py:21
 msgid "Name"
 msgstr ""
 
-#: assets/company-admin/components/CompanyDetails.jsx:24
-#: assets/monitoring/components/EditMonitoringProfile.jsx:132
-#: assets/monitoring/components/MonitoringList.jsx:25
-#: assets/navigations/components/EditNavigation.jsx:85
-#: assets/navigations/components/NavigationList.jsx:23
-#: assets/products/components/EditProduct.jsx:121
-#: assets/search/components/MonitoringEditor.jsx:173
-#: assets/section-filters/components/EditSectionFilter.jsx:43
+#: assets/company-admin/components/CompanyDetails.tsx:24
+#: assets/monitoring/components/EditMonitoringProfile.tsx:134
+#: assets/monitoring/components/MonitoringList.tsx:25
+#: assets/navigations/components/EditNavigation.tsx:90
+#: assets/navigations/components/NavigationList.tsx:23
+#: assets/products/components/EditProduct.tsx:128
+#: assets/search/components/AdvancedSearchPanel.tsx:142
+#: assets/search/components/MonitoringEditor.tsx:176
+#: assets/section-filters/components/EditSectionFilter.tsx:44
 #: newsroom/monitoring/forms.py:23
 msgid "Description"
 msgstr ""
@@ -513,63 +514,63 @@ msgstr ""
 msgid "Format Type"
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:37
-#: assets/company-reports/components/ComapnyNewsApiUsage.jsx:77
-#: assets/company-reports/components/Company.jsx:86
-#: assets/company-reports/components/CompanyProducts.jsx:32
-#: assets/company-reports/components/CompanyReportsApp.jsx:20
-#: assets/company-reports/components/CompanySavedSearches.jsx:17
-#: assets/company-reports/components/ExpiredCompanies.jsx:17
-#: assets/company-reports/components/SubscriberActivity.jsx:141
-#: assets/company-reports/components/UserSavedSearches.jsx:21
-#: assets/monitoring/components/EditMonitoringProfile.jsx:139
-#: assets/monitoring/components/MonitoringList.jsx:27
-#: assets/users/components/EditUser.jsx:165
-#: assets/users/components/EditUser.jsx:171
-#: assets/users/components/UsersList.jsx:32 newsroom/monitoring/forms.py:26
+#: assets/companies/components/EditCompany.tsx:40
+#: assets/company-reports/components/ComapnyNewsApiUsage.tsx:79
+#: assets/company-reports/components/Company.tsx:86
+#: assets/company-reports/components/CompanyProducts.tsx:32
+#: assets/company-reports/components/CompanyReportsApp.tsx:20
+#: assets/company-reports/components/CompanySavedSearches.tsx:17
+#: assets/company-reports/components/ExpiredCompanies.tsx:17
+#: assets/company-reports/components/SubscriberActivity.tsx:145
+#: assets/company-reports/components/UserSavedSearches.tsx:21
+#: assets/monitoring/components/EditMonitoringProfile.tsx:141
+#: assets/monitoring/components/MonitoringList.tsx:27
+#: assets/users/components/EditUser.tsx:182
+#: assets/users/components/EditUser.tsx:188
+#: assets/users/components/UsersList.tsx:32 newsroom/monitoring/forms.py:26
 #: newsroom/reports/reports.py:172 newsroom/users/forms.py:49
 msgid "Company"
 msgstr ""
 
-#: assets/companies/components/CompanyListItem.jsx:20
-#: assets/companies/components/EditCompanyDetails.jsx:125
-#: assets/monitoring/components/EditMonitoringProfile.jsx:189
-#: assets/monitoring/components/MonitoringItem.jsx:18
-#: assets/navigations/components/EditNavigation.jsx:92
-#: assets/navigations/components/NavigationListItem.jsx:13
-#: assets/news-api/components/EditAPIToken.jsx:228
-#: assets/products/components/EditProduct.jsx:170
-#: assets/products/components/ProductListItem.jsx:12
-#: assets/search/components/MonitoringEditor.jsx:195
-#: assets/section-filters/components/EditSectionFilter.jsx:78
-#: assets/section-filters/components/SectionFilterListItem.jsx:12
-#: assets/users/components/EditUser.jsx:261
-#: assets/users/components/UserListItem.jsx:26 newsroom/monitoring/forms.py:27
+#: assets/companies/components/CompanyListItem.tsx:20
+#: assets/companies/components/EditCompanyDetails.tsx:123
+#: assets/monitoring/components/EditMonitoringProfile.tsx:191
+#: assets/monitoring/components/MonitoringItem.tsx:18
+#: assets/navigations/components/EditNavigation.tsx:97
+#: assets/navigations/components/NavigationListItem.tsx:13
+#: assets/news-api/components/EditAPIToken.tsx:229
+#: assets/products/components/EditProduct.tsx:177
+#: assets/products/components/ProductListItem.tsx:12
+#: assets/search/components/MonitoringEditor.tsx:198
+#: assets/section-filters/components/EditSectionFilter.tsx:79
+#: assets/section-filters/components/SectionFilterListItem.tsx:12
+#: assets/users/components/EditUser.tsx:283
+#: assets/users/components/UserListItem.tsx:26 newsroom/monitoring/forms.py:27
 msgid "Enabled"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:196
+#: assets/monitoring/components/EditMonitoringProfile.tsx:198
 #: newsroom/monitoring/forms.py:28
 msgid "Always Send"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:126
+#: assets/monitoring/components/EditMonitoringProfile.tsx:128
 #: newsroom/monitoring/forms.py:30
 msgid "Use Headline as Subject of emails containing a single item"
 msgstr ""
 
-#: assets/company-reports/components/CompanyProducts.jsx:12
-#: assets/monitoring/components/EditMonitoringProfile.jsx:148
-#: assets/monitoring/components/MonitoringList.jsx:26
-#: assets/products/components/EditProduct.jsx:141
-#: assets/products/components/ProductList.jsx:25
-#: assets/section-filters/components/EditSectionFilter.jsx:63
-#: assets/section-filters/components/SectionFilterList.jsx:25
+#: assets/company-reports/components/CompanyProducts.tsx:12
+#: assets/monitoring/components/EditMonitoringProfile.tsx:150
+#: assets/monitoring/components/MonitoringList.tsx:26
+#: assets/products/components/EditProduct.tsx:148
+#: assets/products/components/ProductList.tsx:25
+#: assets/section-filters/components/EditSectionFilter.tsx:64
+#: assets/section-filters/components/SectionFilterList.tsx:25
 #: newsroom/monitoring/forms.py:34
 msgid "Query"
 msgstr ""
 
-#: newsroom/monitoring/search.py:67 newsroom/search/service.py:560
+#: newsroom/monitoring/search.py:67 newsroom/search/service.py:601
 msgid "Invalid product parameter"
 msgstr ""
 
@@ -581,7 +582,7 @@ msgstr ""
 msgid "monitoring Profile not found"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:36
+#: assets/products/components/EditProduct.tsx:38
 #: newsroom/navigations/__init__.py:16
 msgid "Global Topics"
 msgstr ""
@@ -602,11 +603,11 @@ msgstr ""
 msgid "Client not found"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:100
-#: assets/company-admin/components/CompanyDetails.jsx:20
-#: assets/company-reports/components/Company.jsx:24
-#: assets/navigations/components/EditNavigation.jsx:23
-#: assets/users/components/EditUser.jsx:213 newsroom/products/__init__.py:14
+#: assets/companies/components/CompanyPermissions.tsx:100
+#: assets/company-admin/components/CompanyDetails.tsx:20
+#: assets/company-reports/components/Company.tsx:24
+#: assets/navigations/components/EditNavigation.tsx:26
+#: assets/users/components/EditUser.tsx:230 newsroom/products/__init__.py:14
 #: newsroom/users/forms.py:61
 msgid "Products"
 msgstr ""
@@ -616,113 +617,112 @@ msgstr ""
 msgid "Must provide a section for this report"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:106
-#: assets/wire/components/filters/NavCreatedPicker.jsx:27
+#: assets/company-reports/components/ContentActivity.tsx:107
+#: assets/wire/components/filters/NavCreatedPicker.tsx:27
 #: newsroom/reports/content_activity.py:186
 msgid "Published"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:107
-#: assets/components/cards/edit/ConfigEvent.jsx:26
-#: assets/search/components/AdvancedSearchPanel.jsx:115
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:184
+#: assets/company-reports/components/ContentActivity.tsx:108
+#: assets/components/cards/edit/ConfigEvent.tsx:26
+#: assets/search/components/AdvancedSearchPanel.tsx:126
 #: newsroom/reports/content_activity.py:187
 msgid "Headline"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:108
+#: assets/company-reports/components/ContentActivity.tsx:109
 #: newsroom/reports/content_activity.py:188
 msgid "Take Key"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:51
-#: assets/company-reports/components/ContentActivity.jsx:112
-#: assets/products/components/EditProduct.jsx:35
+#: assets/company-reports/components/ContentActivity.tsx:52
+#: assets/company-reports/components/ContentActivity.tsx:113
+#: assets/products/components/EditProduct.tsx:37
 #: newsroom/reports/content_activity.py:192
 msgid "Companies"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:60
-#: assets/company-reports/components/ContentActivity.jsx:113
+#: assets/company-reports/components/ContentActivity.tsx:61
+#: assets/company-reports/components/ContentActivity.tsx:114
 #: newsroom/reports/content_activity.py:193
 msgid "Actions"
 msgstr ""
 
-#: assets/agenda/components/AgendaAttachments.jsx:43
-#: assets/company-reports/components/ContentActivity.jsx:62
-#: assets/company-reports/components/ContentActivity.jsx:117
-#: assets/item-actions.js:49 assets/ui/components/ArticleMedia.jsx:29
-#: assets/wire/components/DownloadItemsModal.jsx:53
+#: assets/agenda/components/AgendaAttachments.tsx:43
+#: assets/company-reports/components/ContentActivity.tsx:63
+#: assets/company-reports/components/ContentActivity.tsx:118
+#: assets/item-actions.ts:49 assets/ui/components/ArticleMedia.tsx:29
+#: assets/wire/components/DownloadItemsModal.tsx:54
 #: newsroom/reports/content_activity.py:209
 msgid "Download"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:63
-#: assets/company-reports/components/ContentActivity.jsx:118
-#: assets/components/TextInput.jsx:35 assets/item-actions.js:42
+#: assets/company-reports/components/ContentActivity.tsx:64
+#: assets/company-reports/components/ContentActivity.tsx:119
+#: assets/components/TextInput.tsx:35 assets/item-actions.ts:42
 #: newsroom/reports/content_activity.py:212
 msgid "Copy"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:64
-#: assets/company-reports/components/ContentActivity.jsx:119
-#: assets/components/ShareItemModal.jsx:95 assets/item-actions.js:25
-#: assets/search/components/FollowedTopics.jsx:55
+#: assets/company-reports/components/ContentActivity.tsx:65
+#: assets/company-reports/components/ContentActivity.tsx:120
+#: assets/components/ShareItemModal.tsx:102 assets/item-actions.ts:25
+#: assets/search/components/FollowedTopics.tsx:76
 #: newsroom/reports/content_activity.py:215
 msgid "Share"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:65
-#: assets/company-reports/components/ContentActivity.jsx:120
-#: assets/item-actions.js:35 newsroom/reports/content_activity.py:218
+#: assets/company-reports/components/ContentActivity.tsx:66
+#: assets/company-reports/components/ContentActivity.tsx:121
+#: assets/item-actions.ts:35 newsroom/reports/content_activity.py:218
 msgid "Print"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:66
-#: assets/company-reports/components/ContentActivity.jsx:121
-#: assets/item-actions.js:18 newsroom/reports/content_activity.py:221
+#: assets/company-reports/components/ContentActivity.tsx:67
+#: assets/company-reports/components/ContentActivity.tsx:122
+#: assets/item-actions.ts:18 newsroom/reports/content_activity.py:221
 msgid "Open"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:67
-#: assets/company-reports/components/ContentActivity.jsx:122
+#: assets/company-reports/components/ContentActivity.tsx:68
+#: assets/company-reports/components/ContentActivity.tsx:123
 #: newsroom/reports/content_activity.py:224
 msgid "Preview"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:68
-#: assets/company-reports/components/ContentActivity.jsx:123
+#: assets/company-reports/components/ContentActivity.tsx:69
+#: assets/company-reports/components/ContentActivity.tsx:124
 #: newsroom/reports/content_activity.py:227
 msgid "Clipboard"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:69
-#: assets/company-reports/components/ContentActivity.jsx:124
+#: assets/company-reports/components/ContentActivity.tsx:70
+#: assets/company-reports/components/ContentActivity.tsx:125
 #: newsroom/reports/content_activity.py:230
 msgid "API retrieval"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:22
+#: assets/company-reports/components/CompanyReportsApp.tsx:22
 #: newsroom/reports/content_activity.py:301
 msgid "Content activity"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:16
+#: assets/company-reports/components/CompanyReportsApp.tsx:16
 #: newsroom/reports/reports.py:53
 msgid "Saved searches per company"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:17
+#: assets/company-reports/components/CompanyReportsApp.tsx:17
 #: newsroom/reports/reports.py:84
 msgid "Saved searches per user"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:18
+#: assets/company-reports/components/CompanyReportsApp.tsx:18
 #: newsroom/reports/reports.py:114
 msgid "Products per company"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:19
+#: assets/company-reports/components/CompanyReportsApp.tsx:19
 #: newsroom/reports/reports.py:137
 msgid "Stories per product"
 msgstr ""
@@ -731,7 +731,7 @@ msgstr ""
 msgid "SubscriberActivity"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:44
+#: assets/company-reports/components/CompanyReportsApp.tsx:45
 #: newsroom/reports/reports.py:338
 msgid "Company News API Usage"
 msgstr ""
@@ -740,7 +740,7 @@ msgstr ""
 msgid "Companies permissioned per product"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:24
+#: assets/company-reports/components/CompanyReportsApp.tsx:24
 #: newsroom/reports/reports.py:389
 msgid "Expired companies"
 msgstr ""
@@ -750,19 +750,19 @@ msgstr ""
 msgid "Unknown report {}"
 msgstr ""
 
-#: newsroom/search/service.py:280
+#: newsroom/search/service.py:300
 msgid "Page limit exceeded"
 msgstr ""
 
-#: newsroom/search/service.py:551
+#: newsroom/search/service.py:592
 msgid "User does not belong to a company."
 msgstr ""
 
-#: newsroom/search/service.py:553
+#: newsroom/search/service.py:594
 msgid "Your company doesn't have any products defined."
 msgstr ""
 
-#: newsroom/search/service.py:555
+#: newsroom/search/service.py:596
 msgid "Your product is not assigned to you or your company."
 msgstr ""
 
@@ -803,8 +803,8 @@ msgstr ""
 msgid "Where"
 msgstr ""
 
-#: assets/companies/components/CompanyList.jsx:39
-#: assets/company-reports/components/Company.jsx:37
+#: assets/companies/components/CompanyList.tsx:40
+#: assets/company-reports/components/Company.tsx:37
 #: newsroom/templates/agenda_item_print.html:30
 msgid "Contact"
 msgstr ""
@@ -813,59 +813,59 @@ msgstr ""
 msgid "Web"
 msgstr ""
 
-#: assets/agenda/components/AgendaEdNote.jsx:19
+#: assets/agenda/components/AgendaEdNote.tsx:19
 #: newsroom/templates/agenda_item_print.html:59
 msgid "Editorial Note"
 msgstr ""
 
-#: assets/agenda/components/AgendaPreviewCoverages.jsx:40
-#: assets/agenda/components/AgendaPreviewCoverages.jsx:116
+#: assets/agenda/components/AgendaPreviewCoverages.tsx:41
+#: assets/agenda/components/AgendaPreviewCoverages.tsx:117
 #: newsroom/templates/agenda_item_print.html:64
 msgid "Coverages:"
 msgstr ""
 
-#: assets/company-reports/components/Company.jsx:12
+#: assets/company-reports/components/Company.tsx:12
 #: newsroom/templates/am_news_index.html:3
 #: newsroom/templates/am_news_index.html:10
 msgid "AM"
 msgstr ""
 
-#: newsroom/templates/base_layout.html:27
+#: newsroom/templates/base_layout.html:31
 msgid "Main Navigation Bar"
 msgstr ""
 
-#: newsroom/templates/base_layout.html:44 newsroom/templates/login.html:13
+#: newsroom/templates/base_layout.html:53 newsroom/templates/login.html:13
 #: newsroom/templates/login_client.html:4 newsroom/templates/login_form.html:20
 msgid "Login"
 msgstr ""
 
-#: newsroom/templates/base_layout.html:47 newsroom/templates/footer.html:4
+#: newsroom/templates/base_layout.html:56 newsroom/templates/footer.html:4
 msgid "Contact Us"
 msgstr ""
 
-#: newsroom/templates/base_layout.html:56
+#: newsroom/templates/base_layout.html:65
 msgid "Side Navigation"
 msgstr ""
 
-#: assets/users/utils.js:9 newsroom/templates/base_layout.html:75
-#: newsroom/templates/base_layout.html:76
-#: newsroom/templates/base_layout.html:83
+#: assets/users/utils.ts:9 newsroom/templates/base_layout.html:91
+#: newsroom/templates/base_layout.html:92
+#: newsroom/templates/base_layout.html:99
 #: newsroom/templates/company_admin_index.html:3
 #: newsroom/templates/company_admin_index.html:6 newsroom/users/forms.py:38
 msgid "Company Admin"
 msgstr ""
 
-#: newsroom/templates/base_layout.html:92
-#: newsroom/templates/base_layout.html:93
-#: newsroom/templates/base_layout.html:100
+#: newsroom/templates/base_layout.html:108
+#: newsroom/templates/base_layout.html:109
+#: newsroom/templates/base_layout.html:116
 #: newsroom/templates/company_reports.html:3
 #: newsroom/templates/company_reports.html:6
 msgid "Reports"
 msgstr ""
 
-#: newsroom/templates/base_layout.html:108
-#: newsroom/templates/base_layout.html:109
-#: newsroom/templates/base_layout.html:116 newsroom/templates/settings.html:3
+#: newsroom/templates/base_layout.html:124
+#: newsroom/templates/base_layout.html:125
+#: newsroom/templates/base_layout.html:132 newsroom/templates/settings.html:3
 #: newsroom/templates/settings.html:6
 msgid "Settings"
 msgstr ""
@@ -887,6 +887,14 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: newsroom/templates/impersonate_user.html:11
+msgid "Impersonating"
+msgstr ""
+
+#: newsroom/templates/impersonate_user.html:17
+msgid "Stop impersonation"
+msgstr ""
+
 #: newsroom/templates/login.html:21 newsroom/templates/login_client.html:9
 msgid "Login using Single Sign On"
 msgstr ""
@@ -908,8 +916,8 @@ msgstr ""
 msgid "click here to register."
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:136
-#: assets/users/components/EditUser.jsx:181 newsroom/templates/login.html:35
+#: assets/user-profile/components/profile/UserProfile.tsx:137
+#: assets/users/components/EditUser.tsx:198 newsroom/templates/login.html:35
 #: newsroom/templates/login_locale_dropdown.html:5
 msgid "Language"
 msgstr ""
@@ -961,7 +969,7 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:295
+#: assets/users/components/EditUser.tsx:317
 #: newsroom/templates/request_token.html:29
 msgid "Reset Password"
 msgstr ""
@@ -978,19 +986,19 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageRequest.jsx:56
-#: assets/components/CardEditor.jsx:72 assets/components/CardEditor.jsx:74
-#: assets/components/EditPanel.jsx:132 assets/components/Modal.jsx:168
-#: assets/search/components/MonitoringEditor.jsx:203
-#: assets/search/components/TopicEditor.jsx:305
-#: assets/search/components/TopicEditor.jsx:308
-#: assets/user-profile/components/profile/UserProfile.jsx:152
-#: assets/wire/components/SelectedItemsBar.jsx:47
+#: assets/agenda/components/AgendaCoverageRequest.tsx:57
+#: assets/components/CardEditor.tsx:73 assets/components/CardEditor.tsx:75
+#: assets/components/EditPanel.tsx:133 assets/components/Modal.tsx:173
+#: assets/search/components/MonitoringEditor.tsx:206
+#: assets/search/components/TopicEditor.tsx:470
+#: assets/search/components/TopicEditor.tsx:473
+#: assets/user-profile/components/profile/UserProfile.tsx:153
+#: assets/wire/components/SelectedItemsBar.tsx:48
 #: newsroom/templates/reset_password.html:38
 msgid "Cancel"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminSideNav.jsx:8
+#: assets/company-admin/components/CompanyAdminSideNav.tsx:8
 #: newsroom/templates/settings.html:17
 msgid "Settings Menu"
 msgstr ""
@@ -1023,22 +1031,21 @@ msgstr ""
 msgid "User Profile"
 msgstr ""
 
-#: assets/agenda/components/AgendaApp.jsx:171
-#: assets/cards/components/EditCard.jsx:52
-#: assets/companies/components/EditCompany.jsx:124
-#: assets/components/CloseButton.jsx:9 assets/components/SortItems.jsx:46
-#: assets/monitoring/components/EditMonitoringProfile.jsx:86
-#: assets/navigations/components/EditNavigation.jsx:51
-#: assets/oauth_clients/components/EditClient.jsx:26
-#: assets/products/components/EditProduct.jsx:88
-#: assets/search/components/AdvancedSearchPanel.jsx:40
-#: assets/search/components/MonitoringEditor.jsx:131
-#: assets/search/components/TopicEditor.jsx:230
-#: assets/section-filters/components/EditSectionFilter.jsx:26
-#: assets/ui/components/ContentBar.jsx:8 assets/ui/components/Preview.jsx:16
-#: assets/user-profile/components/UserProfileApp.jsx:100
-#: assets/user-profile/components/UserProfileApp.jsx:120
-#: assets/users/components/EditUser.jsx:69 newsroom/templates/wire_item.html:11
+#: assets/cards/components/EditCard.tsx:53
+#: assets/companies/components/EditCompany.tsx:127
+#: assets/components/CloseButton.tsx:9 assets/components/SortItems.tsx:48
+#: assets/monitoring/components/EditMonitoringProfile.tsx:88
+#: assets/navigations/components/EditNavigation.tsx:54
+#: assets/oauth_clients/components/EditClient.tsx:27
+#: assets/products/components/EditProduct.tsx:90
+#: assets/search/components/AdvancedSearchPanel.tsx:42
+#: assets/search/components/MonitoringEditor.tsx:134
+#: assets/search/components/TopicEditor.tsx:385
+#: assets/section-filters/components/EditSectionFilter.tsx:27
+#: assets/ui/components/ContentBar.tsx:8 assets/ui/components/Preview.tsx:16
+#: assets/user-profile/components/UserProfileApp.tsx:114
+#: assets/user-profile/components/UserProfileApp.tsx:132
+#: assets/users/components/EditUser.tsx:70 newsroom/templates/wire_item.html:11
 msgid "Close"
 msgstr ""
 
@@ -1047,17 +1054,17 @@ msgstr ""
 msgid "By:"
 msgstr ""
 
-#: assets/components/cards/render/CardMeta.jsx:15
-#: assets/wire/components/ItemVersion.jsx:24
-#: assets/wire/components/WireListItem.jsx:245
-#: assets/wire/components/fields/WordCount.jsx:6
+#: assets/components/cards/render/CardMeta.tsx:15
+#: assets/wire/components/ItemVersion.tsx:24
+#: assets/wire/components/WireListItem.tsx:247
+#: assets/wire/components/fields/WordCount.tsx:6
 #: newsroom/templates/wire_item.html:62 newsroom/templates/wire_item.html:108
 msgid "words"
 msgstr ""
 
-#: assets/components/cards/render/CardMeta.jsx:17
-#: assets/wire/components/ItemVersion.jsx:29
-#: assets/wire/components/fields/CharCount.jsx:6
+#: assets/components/cards/render/CardMeta.tsx:17
+#: assets/wire/components/ItemVersion.tsx:29
+#: assets/wire/components/fields/CharCount.tsx:6
 #: newsroom/templates/wire_item.html:64 newsroom/templates/wire_item.html:110
 msgid "characters"
 msgstr ""
@@ -1066,20 +1073,20 @@ msgstr ""
 msgid "Source:"
 msgstr ""
 
-#: assets/agenda/components/AgendaTags.jsx:40
-#: assets/wire/components/PreviewTags.jsx:33
+#: assets/agenda/components/AgendaTags.tsx:40
+#: assets/wire/components/PreviewTags.tsx:33
 #: newsroom/templates/wire_item.html:73
 #: newsroom/templates/wire_item_print.html:21
 msgid "Metadata"
 msgstr ""
 
-#: assets/wire/components/PreviewTags.jsx:53
+#: assets/wire/components/PreviewTags.tsx:53
 #: newsroom/templates/wire_item.html:86
 #: newsroom/templates/wire_item_print.html:28 newsroom/wire/__init__.py:140
 msgid "Content Type"
 msgstr ""
 
-#: assets/wire/components/ListItemPreviousVersions.jsx:62
+#: assets/wire/components/ListItemPreviousVersions.tsx:66
 #: newsroom/templates/wire_item.html:98
 msgid "Previous versions"
 msgstr ""
@@ -1098,61 +1105,61 @@ msgstr ""
 msgid "User Management"
 msgstr ""
 
-#: assets/monitoring/utils.js:4 assets/users/utils.js:5
+#: assets/monitoring/utils.ts:4 assets/users/utils.ts:5
 #: newsroom/users/forms.py:34
 msgid "Administrator"
 msgstr ""
 
-#: assets/monitoring/utils.js:6 assets/users/utils.js:7
+#: assets/monitoring/utils.ts:6 assets/users/utils.ts:7
 #: newsroom/users/forms.py:35
 msgid "Public"
 msgstr ""
 
-#: assets/monitoring/utils.js:5 assets/users/utils.js:6
+#: assets/monitoring/utils.ts:5 assets/users/utils.ts:6
 #: newsroom/users/forms.py:36
 msgid "Internal"
 msgstr ""
 
-#: assets/monitoring/utils.js:7 assets/users/utils.js:8
+#: assets/monitoring/utils.ts:7 assets/users/utils.ts:8
 #: newsroom/users/forms.py:37
 msgid "Account Management"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:64
-#: assets/users/components/EditUser.jsx:115
-#: assets/users/components/filters/UserListSortFilter.jsx:20
+#: assets/user-profile/components/profile/UserProfile.tsx:65
+#: assets/users/components/EditUser.tsx:132
+#: assets/users/components/filters/UserListSortFilter.tsx:23
 #: newsroom/users/forms.py:42
 msgid "First Name"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:73
-#: assets/users/components/EditUser.jsx:122
-#: assets/users/components/filters/UserListSortFilter.jsx:23
+#: assets/user-profile/components/profile/UserProfile.tsx:74
+#: assets/users/components/EditUser.tsx:139
+#: assets/users/components/filters/UserListSortFilter.tsx:26
 #: newsroom/users/forms.py:43
 msgid "Last Name"
 msgstr ""
 
-#: assets/companies/components/CompanyList.jsx:40
-#: assets/companies/components/EditCompanyDetails.jsx:62
+#: assets/companies/components/CompanyList.tsx:41
+#: assets/companies/components/EditCompanyDetails.tsx:60
 #: newsroom/users/forms.py:45
 msgid "Telephone"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:100
-#: assets/users/components/EditUser.jsx:143
-#: assets/users/components/UsersList.jsx:29 newsroom/users/forms.py:46
+#: assets/user-profile/components/profile/UserProfile.tsx:101
+#: assets/users/components/EditUser.tsx:160
+#: assets/users/components/UsersList.tsx:29 newsroom/users/forms.py:46
 msgid "Mobile"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:109
-#: assets/users/components/EditUser.jsx:150
-#: assets/users/components/UsersList.jsx:30 newsroom/users/forms.py:47
+#: assets/user-profile/components/profile/UserProfile.tsx:110
+#: assets/users/components/EditUser.tsx:167
+#: assets/users/components/UsersList.tsx:30 newsroom/users/forms.py:47
 msgid "Role"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:156
-#: assets/users/components/UsersList.jsx:31
-#: assets/users/components/filters/UserListSortFilter.jsx:32
+#: assets/users/components/EditUser.tsx:173
+#: assets/users/components/UsersList.tsx:31
+#: assets/users/components/filters/UserListSortFilter.tsx:35
 #: newsroom/users/forms.py:48
 msgid "User Type"
 msgstr ""
@@ -1173,7 +1180,7 @@ msgstr ""
 msgid "Account Approved"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:271 newsroom/users/forms.py:54
+#: assets/users/components/EditUser.tsx:293 newsroom/users/forms.py:54
 msgid "Company Expiry Alert"
 msgstr ""
 
@@ -1189,16 +1196,16 @@ msgstr ""
 msgid "Locale"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:281 newsroom/users/forms.py:58
+#: assets/users/components/EditUser.tsx:303 newsroom/users/forms.py:58
 msgid "Manage Company Topics"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:74
-#: assets/users/components/EditUser.jsx:193 newsroom/users/forms.py:60
+#: assets/companies/components/CompanyPermissions.tsx:74
+#: assets/users/components/EditUser.tsx:210 newsroom/users/forms.py:60
 msgid "Sections"
 msgstr ""
 
-#: newsroom/users/users.py:231
+#: newsroom/users/users.py:246
 msgid "Can not delete current user"
 msgstr ""
 
@@ -1218,67 +1225,67 @@ msgstr ""
 msgid "User id not provided"
 msgstr ""
 
-#: assets/am-news/utils.js:37 newsroom/web/default_settings.py:283
+#: assets/am-news/utils.ts:37 newsroom/web/default_settings.py:284
 msgid "Text"
 msgstr ""
 
-#: newsroom/web/default_settings.py:284
+#: newsroom/web/default_settings.py:285
 msgid "Photo"
 msgstr ""
 
-#: newsroom/web/default_settings.py:285
+#: newsroom/web/default_settings.py:286
 msgid "Picture"
 msgstr ""
 
-#: newsroom/web/default_settings.py:286
+#: newsroom/web/default_settings.py:287
 msgid "Audio"
 msgstr ""
 
-#: newsroom/web/default_settings.py:287
+#: newsroom/web/default_settings.py:288
 msgid "Video"
 msgstr ""
 
-#: newsroom/web/default_settings.py:288
+#: newsroom/web/default_settings.py:289
 msgid "Explainer"
 msgstr ""
 
-#: newsroom/web/default_settings.py:289
+#: newsroom/web/default_settings.py:290
 msgid "Infographics"
 msgstr ""
 
-#: newsroom/web/default_settings.py:290
+#: newsroom/web/default_settings.py:291
 msgid "Graphic"
 msgstr ""
 
-#: newsroom/web/default_settings.py:291
+#: newsroom/web/default_settings.py:292
 msgid "Live Video"
 msgstr ""
 
-#: newsroom/web/default_settings.py:292
+#: newsroom/web/default_settings.py:293
 msgid "Live Blog"
 msgstr ""
 
-#: newsroom/web/default_settings.py:293
+#: newsroom/web/default_settings.py:294
 msgid "Video Explainer"
 msgstr ""
 
-#: newsroom/web/default_settings.py:551
+#: newsroom/web/default_settings.py:558
 msgid "Home"
 msgstr ""
 
-#: newsroom/web/default_settings.py:556
+#: newsroom/web/default_settings.py:563
 msgid "Wire"
 msgstr ""
 
-#: newsroom/web/default_settings.py:561
+#: newsroom/web/default_settings.py:568
 msgid "Agenda"
 msgstr ""
 
-#: newsroom/web/default_settings.py:566
+#: newsroom/web/default_settings.py:573
 msgid "Monitoring"
 msgstr ""
 
-#: newsroom/web/default_settings.py:571
+#: newsroom/web/default_settings.py:578
 msgid "Saved / Watched"
 msgstr ""
 
@@ -1294,7 +1301,7 @@ msgstr ""
 msgid "Story Image"
 msgstr ""
 
-#: assets/missing-translations.js:11 newsroom/wire/__init__.py:97
+#: assets/missing-translations.ts:11 newsroom/wire/__init__.py:97
 msgid "News only filter"
 msgstr ""
 
@@ -1310,2551 +1317,2464 @@ msgstr ""
 msgid "Time limit for %(section)s products (in days)"
 msgstr ""
 
-#: newsroom/wire/views.py:364
+#: newsroom/wire/views.py:401
 msgid "Not found"
 msgstr ""
 
-#: assets/cards/components/EditCard.jsx:94
-#: assets/companies/components/CompanyPermissions.jsx:167
-#: assets/companies/components/EditCompanyAPI.jsx:85
-#: assets/companies/components/EditCompanyDetails.jsx:142
-#: assets/components/CardEditor.jsx:64 assets/components/EditPanel.jsx:140
-#: assets/components/Modal.jsx:167
-#: assets/general-settings/components/GeneralSettingsApp.jsx:110
-#: assets/item-actions.js:58
-#: assets/monitoring/components/EditMonitoringProfile.jsx:210
-#: assets/monitoring/components/MonitoringSchedule.jsx:196
-#: assets/navigations/components/EditNavigation.jsx:121
-#: assets/oauth_clients/components/EditClient.jsx:68
-#: assets/products/components/EditProduct.jsx:185
-#: assets/search/components/MonitoringEditor.jsx:210
-#: assets/search/components/TopicEditor.jsx:314
-#: assets/search/components/TopicEditor.jsx:317
-#: assets/section-filters/components/EditSectionFilter.jsx:92
-#: assets/users/components/EditUser.jsx:308
+#: assets/cards/components/EditCard.tsx:95
+#: assets/companies/components/CompanyPermissions.tsx:167
+#: assets/companies/components/EditCompanyAPI.tsx:86
+#: assets/companies/components/EditCompanyDetails.tsx:140
+#: assets/components/CardEditor.tsx:65 assets/components/EditPanel.tsx:141
+#: assets/components/Modal.tsx:172
+#: assets/general-settings/components/GeneralSettingsApp.tsx:112
+#: assets/item-actions.ts:58
+#: assets/monitoring/components/EditMonitoringProfile.tsx:212
+#: assets/monitoring/components/MonitoringSchedule.tsx:199
+#: assets/navigations/components/EditNavigation.tsx:126
+#: assets/oauth_clients/components/EditClient.tsx:69
+#: assets/products/components/EditProduct.tsx:192
+#: assets/search/components/MonitoringEditor.tsx:213
+#: assets/search/components/TopicEditor.tsx:479
+#: assets/search/components/TopicEditor.tsx:482
+#: assets/section-filters/components/EditSectionFilter.tsx:93
+#: assets/users/components/EditUser.tsx:330
 msgid "Save"
 msgstr ""
 
-#: assets/item-actions.js:67
+#: assets/item-actions.ts:67
 msgid "Unsave"
 msgstr ""
 
-#: assets/item-actions.js:76
+#: assets/item-actions.ts:76
 msgid "Remove"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageRequest.jsx:39
-#: assets/missing-translations.js:4
+#: assets/agenda/components/AgendaCoverageRequest.tsx:40
+#: assets/missing-translations.ts:4
 msgid "Coverage inquiries"
 msgstr ""
 
-#: assets/missing-translations.js:5
+#: assets/missing-translations.ts:5
 msgid "Department"
 msgstr ""
 
-#: assets/missing-translations.js:6
+#: assets/missing-translations.ts:6
 msgid "Genre"
 msgstr ""
 
-#: assets/missing-translations.js:7
+#: assets/missing-translations.ts:7
 msgid "Version"
 msgstr ""
 
-#: assets/missing-translations.js:8
+#: assets/missing-translations.ts:8
 msgid "Premium"
 msgstr ""
 
-#: assets/missing-translations.js:9
+#: assets/missing-translations.ts:9
 msgid "Non-premium"
 msgstr ""
 
-#: assets/missing-translations.js:10
+#: assets/missing-translations.ts:10
 msgid "Non-media"
 msgstr ""
 
-#: assets/missing-translations.js:12
+#: assets/missing-translations.ts:12
 msgid "Time limit for Wire products (in days)"
 msgstr ""
 
-#: assets/missing-translations.js:13
+#: assets/missing-translations.ts:13
 msgid "New company"
 msgstr ""
 
-#: assets/missing-translations.js:14
+#: assets/missing-translations.ts:14
 msgid "New user"
 msgstr ""
 
-#: assets/missing-translations.js:15
+#: assets/missing-translations.ts:15
 msgid "New navigation"
 msgstr ""
 
-#: assets/missing-translations.js:16
+#: assets/missing-translations.ts:16
 msgid "New section filter"
 msgstr ""
 
-#: assets/missing-translations.js:17
+#: assets/missing-translations.ts:17
 msgid "New card"
 msgstr ""
 
-#: assets/utils.js:427
-msgid "{{startDate}} to {{endDate}} (Time to be confirmed)"
-msgstr ""
-
-#: assets/utils.js:433
-msgid "{{startDate}} (Time to be confirmed)"
-msgstr ""
-
-#: assets/utils.js:438
-msgid "{{startDate}} to {{endDate}}"
-msgstr ""
-
-#: assets/utils.js:447
-msgid "{{startTime}} {{startDate}} - {{endDate}} {{timezone}}"
-msgstr ""
-
-#: assets/utils.js:455
-msgid "{{startTime}} {{startDate}} {{timezone}}"
-msgstr ""
-
-#: assets/utils.js:462
-msgid "{{startTime}} - {{endTime}} {{startDate}} {{timezone}}"
-msgstr ""
-
-#: assets/utils.js:470 assets/utils.js:480
-msgid "{{startTime}} {{startDate}} to {{endTime}} {{endDate}} {{timezone}}"
-msgstr ""
-
-#: assets/utils.js:674
+#: assets/utils.tsx:517
 msgid "Failed to process request!"
 msgstr ""
 
-#: assets/agenda/components/AgendaDateButtons.jsx:15
-#: assets/agenda/components/AgendaList.jsx:210
-#: assets/company-reports/components/ProductStories.jsx:26
-#: assets/components/CalendarButton.jsx:31
-#: assets/components/ExpiryDateInput.jsx:89 assets/utils.js:855
-#: assets/wire/components/filters/NavCreatedPicker.jsx:9
+#: assets/agenda/components/AgendaDateButtons.tsx:15
+#: assets/agenda/components/AgendaList.tsx:217
+#: assets/company-reports/components/ProductStories.tsx:26
+#: assets/components/CalendarButton.tsx:32
+#: assets/components/ExpiryDateInput.tsx:93 assets/utils.tsx:698
+#: assets/wire/components/filters/NavCreatedPicker.tsx:9
 msgid "Today"
 msgstr ""
 
-#: assets/company-reports/components/ProductStories.jsx:28 assets/utils.js:857
-#: assets/wire/components/filters/NavCreatedPicker.jsx:10
+#: assets/company-reports/components/ProductStories.tsx:28 assets/utils.tsx:700
+#: assets/wire/components/filters/NavCreatedPicker.tsx:10
 msgid "This week"
 msgstr ""
 
-#: assets/company-reports/components/ProductStories.jsx:30 assets/utils.js:859
-#: assets/wire/components/filters/NavCreatedPicker.jsx:11
+#: assets/company-reports/components/ProductStories.tsx:30 assets/utils.tsx:702
+#: assets/wire/components/filters/NavCreatedPicker.tsx:11
 msgid "This month"
 msgstr ""
 
-#: assets/utils.js:871
+#: assets/utils.tsx:714
 msgid "Item copied successfully."
 msgstr ""
 
-#: assets/utils.js:875
+#: assets/utils.tsx:718
 msgid "Sorry, Copy is not supported."
 msgstr ""
 
-#: assets/websocket.js:51
+#: assets/websocket.ts:51
 msgid "Connected to Notification Server!"
 msgstr ""
 
-#: assets/websocket.js:68
+#: assets/websocket.ts:68
 msgid "Disconnected from Notification Server!"
 msgstr ""
 
-#: assets/agenda/actions.js:111
+#: assets/agenda/actions.ts:111
 msgid "Your inquiry has been sent successfully"
 msgstr ""
 
-#: assets/agenda/actions.js:299
+#: assets/agenda/actions.ts:303
 msgid "Started watching items successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:310
+#: assets/agenda/actions.ts:314
 msgid "Stopped watching items successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:355 assets/wire/actions.js:364
+#: assets/agenda/actions.ts:359 assets/wire/actions.ts:364
 msgid "Items were bookmarked successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:357 assets/wire/actions.js:366
+#: assets/agenda/actions.ts:361 assets/wire/actions.ts:366
 msgid "Item was bookmarked successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:372 assets/wire/actions.js:381
+#: assets/agenda/actions.ts:376 assets/wire/actions.ts:381
 msgid "Items were removed from bookmarks successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:374 assets/wire/actions.js:383
+#: assets/agenda/actions.ts:378 assets/wire/actions.ts:383
 msgid "Item was removed from bookmarks successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:663
+#: assets/agenda/actions.ts:667
 msgid "Started watching coverage successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:676
+#: assets/agenda/actions.ts:680
 msgid "Stopped watching coverage successfully."
 msgstr ""
 
-#: assets/agenda/actions.js:694 assets/wire/actions.js:395
+#: assets/agenda/actions.ts:698 assets/wire/actions.ts:395
 msgid ""
 "There is no product associated with your user. Please reach out to your "
 "Company Admin"
 msgstr ""
 
-#: assets/agenda/item-actions.js:21 assets/agenda/item-actions.js:41
+#: assets/agenda/item-actions.ts:21 assets/agenda/item-actions.ts:41
 msgid "Watch"
 msgstr ""
 
-#: assets/agenda/item-actions.js:28 assets/agenda/item-actions.js:48
+#: assets/agenda/item-actions.ts:28 assets/agenda/item-actions.ts:48
 msgid "Stop watching"
 msgstr ""
 
-#: assets/agenda/item-actions.js:45
+#: assets/agenda/item-actions.ts:45
 msgid "Watch this coverage"
 msgstr ""
 
-#: assets/agenda/utils.js:55
+#: assets/agenda/utils.ts:56
 msgid "coverage updated {{ at }}"
 msgstr ""
 
-#: assets/agenda/utils.js:65
+#: assets/agenda/utils.ts:66
 msgid "Time to be confirmed"
 msgstr ""
 
-#: assets/agenda/utils.js:75 assets/agenda/utils.js:76
+#: assets/agenda/utils.ts:76 assets/agenda/utils.ts:77
 msgid "coverage not planned"
 msgstr ""
 
-#: assets/agenda/utils.js:77 assets/agenda/utils.js:84
+#: assets/agenda/utils.ts:78 assets/agenda/utils.ts:85
 msgid "coverage planned"
 msgstr ""
 
-#: assets/agenda/utils.js:78 assets/agenda/utils.js:79
+#: assets/agenda/utils.ts:79 assets/agenda/utils.ts:80
 msgid "coverage on merit"
 msgstr ""
 
-#: assets/agenda/utils.js:80
+#: assets/agenda/utils.ts:81
 msgid "coverage on request"
 msgstr ""
 
-#: assets/agenda/utils.js:85
+#: assets/agenda/utils.ts:86
 msgid "coverage in progress"
 msgstr ""
 
-#: assets/agenda/utils.js:86
+#: assets/agenda/utils.ts:87
 msgid "coverage available"
 msgstr ""
 
-#: assets/agenda/utils.js:87
+#: assets/agenda/utils.ts:88
 msgid "coverage cancelled"
 msgstr ""
 
-#: assets/agenda/utils.js:484
+#: assets/agenda/utils.ts:485
 msgid "Update expected @ ${dateString}"
 msgstr ""
 
-#: assets/agenda/utils.js:869
+#: assets/agenda/utils.ts:908
 msgid "{{ type }} coverage {{ slugline }} {{ status_text }}"
 msgstr ""
 
-#: assets/agenda/utils.js:876
+#: assets/agenda/utils.ts:915
 msgid "Planned {{ type }} coverage {{ slugline }}, expected {{date}} at {{time}}"
 msgstr ""
 
-#: assets/agenda/utils.js:883
+#: assets/agenda/utils.ts:922
 msgid ""
 "{{ type }} coverage {{ slugline }} in progress, expected {{date}} at "
 "{{time}}"
 msgstr ""
 
-#: assets/agenda/utils.js:886
+#: assets/agenda/utils.ts:925
 msgid "{{ type }} coverage {{slugline}} cancelled"
 msgstr ""
 
-#: assets/agenda/utils.js:893
+#: assets/agenda/utils.ts:932
 msgid "(update to come)"
 msgstr ""
 
-#: assets/agenda/utils.js:893
+#: assets/agenda/utils.ts:932
 msgid "(updated)"
 msgstr ""
 
-#: assets/agenda/utils.js:896
+#: assets/agenda/utils.ts:935
 msgid "{{ type }} coverage {{ slugline }} available {{deliveryState}}"
 msgstr ""
 
-#: assets/agenda/utils.js:903
+#: assets/agenda/utils.ts:942
 msgid "{{ type }} coverage"
 msgstr ""
 
-#: assets/agenda/components/AgendaApp.jsx:136
-#: assets/layout/components/BaseApp.jsx:91
-#: assets/wire/components/WireApp.jsx:173
+#: assets/agenda/utils.ts:1032
+msgid "{{startDate}} to {{endDate}} (Time to be confirmed)"
+msgstr ""
+
+#: assets/agenda/utils.ts:1038
+msgid "{{startDate}} (Time to be confirmed)"
+msgstr ""
+
+#: assets/agenda/utils.ts:1043
+msgid "{{startDate}} to {{endDate}}"
+msgstr ""
+
+#: assets/agenda/utils.ts:1052
+msgid "{{startTime}} {{startDate}} - {{endDate}} {{timezone}}"
+msgstr ""
+
+#: assets/agenda/utils.ts:1060
+msgid "{{startTime}} {{startDate}} {{timezone}}"
+msgstr ""
+
+#: assets/agenda/utils.ts:1067
+msgid "{{startTime}} - {{endTime}} {{startDate}} {{timezone}}"
+msgstr ""
+
+#: assets/agenda/utils.ts:1075 assets/agenda/utils.ts:1085
+msgid "{{startTime}} {{startDate}} to {{endTime}} {{endDate}} {{timezone}}"
+msgstr ""
+
+#: assets/agenda/components/AgendaApp.tsx:138
+#: assets/layout/components/BaseApp.tsx:117
+#: assets/wire/components/WireApp.tsx:128
 msgid "Custom View"
 msgstr ""
 
-#: assets/agenda/components/AgendaApp.jsx:161
+#: assets/agenda/components/AgendaApp.tsx:163
 msgid "{{agenda}} Content"
 msgstr ""
 
-#: assets/agenda/components/AgendaApp.jsx:170
-#: assets/am-news/components/AmNewsApp.jsx:122
-#: assets/am-news/components/AmNewsApp.jsx:123
-#: assets/wire/components/WireApp.jsx:214
-#: assets/wire/components/WireApp.jsx:215
+#: assets/agenda/components/AgendaApp.tsx:172
+#: assets/agenda/components/AgendaApp.tsx:173
+#: assets/am-news/components/AmNewsApp.tsx:127
+#: assets/am-news/components/AmNewsApp.tsx:128
+#: assets/wire/components/WireApp.tsx:170
+#: assets/wire/components/WireApp.tsx:171
 msgid "Close filter panel"
 msgstr ""
 
-#: assets/agenda/components/AgendaApp.jsx:181
-#: assets/agenda/components/AgendaApp.jsx:182
-#: assets/am-news/components/AmNewsApp.jsx:130
-#: assets/am-news/components/AmNewsApp.jsx:131
-#: assets/wire/components/WireApp.jsx:227
-#: assets/wire/components/WireApp.jsx:228
+#: assets/agenda/components/AgendaApp.tsx:184
+#: assets/agenda/components/AgendaApp.tsx:185
+#: assets/am-news/components/AmNewsApp.tsx:135
+#: assets/am-news/components/AmNewsApp.tsx:136
+#: assets/wire/components/WireApp.tsx:187
+#: assets/wire/components/WireApp.tsx:188
 msgid "Open filter panel"
 msgstr ""
 
-#: assets/agenda/components/AgendaApp.jsx:211
-#: assets/am-news/components/AmNewsApp.jsx:149
-#: assets/wire/components/WireApp.jsx:244
+#: assets/agenda/components/AgendaApp.tsx:217
+#: assets/am-news/components/AmNewsApp.tsx:154
+#: assets/wire/components/WireApp.tsx:207
 msgid "Side filter panel"
 msgstr ""
 
-#: assets/agenda/components/AgendaAttachments.jsx:36
+#: assets/agenda/components/AgendaAttachments.tsx:36
 msgid "Size:"
 msgstr ""
 
-#: assets/agenda/components/AgendaAttachments.jsx:38
+#: assets/agenda/components/AgendaAttachments.tsx:38
 msgid "MIME type:"
 msgstr ""
 
-#: assets/agenda/components/AgendaCalendarAgendaFilter.jsx:14
+#: assets/agenda/components/AgendaCalendarAgendaFilter.tsx:15
 msgid "Any calendar"
 msgstr ""
 
-#: assets/agenda/components/AgendaCalendarAgendaFilter.jsx:23
+#: assets/agenda/components/AgendaCalendarAgendaFilter.tsx:24
 msgid "Any agenda"
 msgstr ""
 
-#: assets/agenda/components/AgendaCalendarAgendaFilter.jsx:51
+#: assets/agenda/components/AgendaCalendarAgendaFilter.tsx:52
 msgid "Calendars"
 msgstr ""
 
-#: assets/agenda/components/AgendaCalendarAgendaFilter.jsx:61
+#: assets/agenda/components/AgendaCalendarAgendaFilter.tsx:62
 msgid "All Calendars"
 msgstr ""
 
-#: assets/agenda/components/AgendaCalendarAgendaFilter.jsx:66
+#: assets/agenda/components/AgendaCalendarAgendaFilter.tsx:67
 msgid "Events"
 msgstr ""
 
-#: assets/agenda/components/AgendaCalendarAgendaFilter.jsx:73
+#: assets/agenda/components/AgendaCalendarAgendaFilter.tsx:74
 msgid "Planning"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageExistsFilter.jsx:9
+#: assets/agenda/components/AgendaCoverageExistsFilter.tsx:9
 msgid "Any coverage status"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageExistsFilter.jsx:25
+#: assets/agenda/components/AgendaCoverageExistsFilter.tsx:25
 msgid "Planned"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageExistsFilter.jsx:27
+#: assets/agenda/components/AgendaCoverageExistsFilter.tsx:27
 msgid "Not Planned"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageExistsFilter.jsx:45
+#: assets/agenda/components/AgendaCoverageExistsFilter.tsx:45
 msgid "Coverage is planned"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageExistsFilter.jsx:51
+#: assets/agenda/components/AgendaCoverageExistsFilter.tsx:51
 msgid "Coverage not planned"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageRequest.jsx:46
+#: assets/agenda/components/AgendaCoverageRequest.tsx:47
 msgid "your inquiry"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverageRequest.jsx:62
+#: assets/agenda/components/AgendaCoverageRequest.tsx:63
 msgid "Submit inquiry"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverages.jsx:56
+#: assets/agenda/components/AgendaCoverages.tsx:56
 msgid "Open {{agenda}} in a new tab"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverages.jsx:69
+#: assets/agenda/components/AgendaCoverages.tsx:69
 msgid "expected"
 msgstr ""
 
-#: assets/agenda/components/AgendaCoverages.jsx:76
+#: assets/agenda/components/AgendaCoverages.tsx:76
 msgid "Source"
 msgstr ""
 
-#: assets/agenda/components/AgendaDateButtons.jsx:21
+#: assets/agenda/components/AgendaDateButtons.tsx:21
 msgid "Left"
 msgstr ""
 
-#: assets/agenda/components/AgendaDateButtons.jsx:29
+#: assets/agenda/components/AgendaDateButtons.tsx:29
 msgid "Right"
 msgstr ""
 
-#: assets/agenda/components/AgendaDateButtons.jsx:38
+#: assets/agenda/components/AgendaDateButtons.tsx:38
 msgid "D"
 msgstr ""
 
-#: assets/agenda/components/AgendaDateButtons.jsx:45
+#: assets/agenda/components/AgendaDateButtons.tsx:45
 msgid "W"
 msgstr ""
 
-#: assets/agenda/components/AgendaDateButtons.jsx:52
+#: assets/agenda/components/AgendaDateButtons.tsx:52
 msgid "M"
 msgstr ""
 
-#: assets/agenda/components/AgendaDetailCoverages.jsx:15
+#: assets/agenda/components/AgendaDetailCoverages.tsx:15
 msgid "Coverages"
 msgstr ""
 
-#: assets/agenda/components/AgendaEdNote.jsx:19
+#: assets/agenda/components/AgendaEdNote.tsx:19
 msgid "Reason"
 msgstr ""
 
-#: assets/agenda/components/AgendaEdNote.jsx:39
-#: assets/agenda/components/AgendaEdNote.jsx:51
+#: assets/agenda/components/AgendaEdNote.tsx:39
+#: assets/agenda/components/AgendaEdNote.tsx:51
 msgid "Event Postponed: {{reason}}"
 msgstr ""
 
-#: assets/agenda/components/AgendaEdNote.jsx:41
-#: assets/agenda/components/AgendaEdNote.jsx:53
+#: assets/agenda/components/AgendaEdNote.tsx:41
+#: assets/agenda/components/AgendaEdNote.tsx:53
 msgid "Event Rescheduled: {{reason}}"
 msgstr ""
 
-#: assets/agenda/components/AgendaEdNote.jsx:43
-#: assets/agenda/components/AgendaEdNote.jsx:55
+#: assets/agenda/components/AgendaEdNote.tsx:43
+#: assets/agenda/components/AgendaEdNote.tsx:55
 msgid "Event Cancelled: {{reason}}"
 msgstr ""
 
-#: assets/agenda/components/AgendaEventInfo.jsx:19
+#: assets/agenda/components/AgendaEventInfo.tsx:19
 msgid "Open {{agenda}} in new tab"
 msgstr ""
 
-#: assets/agenda/components/AgendaFeaturedStoriesToogle.jsx:9
+#: assets/agenda/components/AgendaFeaturedStoriesToogle.tsx:9
 msgid "Top/Featured Stories"
 msgstr ""
 
-#: assets/agenda/components/AgendaFeaturedStoriesToogle.jsx:10
+#: assets/agenda/components/AgendaFeaturedStoriesToogle.tsx:10
 msgid "Top Stories"
 msgstr ""
 
-#: assets/agenda/components/AgendaFilters.jsx:75
+#: assets/agenda/components/AgendaFilters.tsx:74
 msgid "Any region"
 msgstr ""
 
-#: assets/agenda/components/AgendaFilters.jsx:95
+#: assets/agenda/components/AgendaFilters.tsx:94
 msgid "Any coverage type"
 msgstr ""
 
-#: assets/agenda/components/AgendaInternalNote.jsx:13
+#: assets/agenda/components/AgendaInternalNote.tsx:13
 msgid "Internal Note"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemDetails.jsx:98
-#: assets/agenda/components/AgendaPreviewAttachments.jsx:16
+#: assets/agenda/components/AgendaItemDetails.tsx:97
+#: assets/agenda/components/AgendaPreviewAttachments.tsx:16
 msgid "Attachments"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemTimeUpdater.jsx:75
+#: assets/agenda/components/AgendaItemTimeUpdater.tsx:81
 msgid "Posted"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemTimeUpdater.jsx:79
+#: assets/agenda/components/AgendaItemTimeUpdater.tsx:85
 msgid "Updated"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemTimeUpdater.jsx:84
+#: assets/agenda/components/AgendaItemTimeUpdater.tsx:90
 msgid "{{ action }} just now"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemTimeUpdater.jsx:86
+#: assets/agenda/components/AgendaItemTimeUpdater.tsx:92
 msgid "{{ action }} {{ minutes }} minute(s) ago"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemTypeFilter.jsx:14
-#: assets/agenda/components/AgendaItemTypeFilter.jsx:36
+#: assets/agenda/components/AgendaItemTypeFilter.tsx:14
+#: assets/agenda/components/AgendaItemTypeFilter.tsx:36
 msgid "Events Only"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemTypeFilter.jsx:15
-#: assets/agenda/components/AgendaItemTypeFilter.jsx:44
+#: assets/agenda/components/AgendaItemTypeFilter.tsx:15
+#: assets/agenda/components/AgendaItemTypeFilter.tsx:44
 msgid "Planning Only"
 msgstr ""
 
-#: assets/agenda/components/AgendaItemTypeFilter.jsx:20
+#: assets/agenda/components/AgendaItemTypeFilter.tsx:20
 msgid "Events & Coverages"
 msgstr ""
 
-#: assets/agenda/components/AgendaList.jsx:214
+#: assets/agenda/components/AgendaList.tsx:221
 msgid "Tomorrow"
 msgstr ""
 
-#: assets/agenda/components/AgendaList.jsx:319
-#: assets/am-news/components/AmNewsList.jsx:192
-#: assets/wire/components/ItemsList.jsx:176
+#: assets/agenda/components/AgendaList.tsx:328
+#: assets/am-news/components/AmNewsList.tsx:196
+#: assets/wire/components/ItemsList.tsx:180
 msgid "No items found."
 msgstr ""
 
-#: assets/agenda/components/AgendaListCoverageItem.jsx:40
+#: assets/agenda/components/AgendaListCoverageItem.tsx:41
 msgid "(Watching)"
 msgstr ""
 
-#: assets/agenda/components/AgendaListItemIcons.jsx:93
+#: assets/agenda/components/AgendaListItemIcons.tsx:125
 msgid "{{ attachments }} file(s) attached"
 msgstr ""
 
-#: assets/agenda/components/AgendaListItemLabels.jsx:14
+#: assets/agenda/components/AgendaListItemLabels.tsx:14
 msgid "postponed"
 msgstr ""
 
-#: assets/agenda/components/AgendaListItemLabels.jsx:19
+#: assets/agenda/components/AgendaListItemLabels.tsx:19
 msgid "cancelled"
 msgstr ""
 
-#: assets/agenda/components/AgendaListItemLabels.jsx:24
+#: assets/agenda/components/AgendaListItemLabels.tsx:24
 msgid "rescheduled"
 msgstr ""
 
-#: assets/agenda/components/AgendaListItemLabels.jsx:29
+#: assets/agenda/components/AgendaListItemLabels.tsx:29
 msgid "event completed"
 msgstr ""
 
-#: assets/agenda/components/AgendaPreviewCoverages.jsx:52
-#: assets/agenda/components/AgendaPreviewCoverages.jsx:128
+#: assets/agenda/components/AgendaPreviewCoverages.tsx:53
+#: assets/agenda/components/AgendaPreviewCoverages.tsx:129
 msgid "Previous Coverages:"
 msgstr ""
 
-#: assets/agenda/components/AgendaPreviewEvent.jsx:66
+#: assets/agenda/components/AgendaPreviewEvent.tsx:67
 msgid "Associated Event"
 msgstr ""
 
-#: assets/agenda/components/AgendaPreviewImage.jsx:24
+#: assets/agenda/components/AgendaPreviewImage.tsx:24
 msgid "Show Map"
 msgstr ""
 
-#: assets/agenda/components/AgendaPreviewImage.jsx:25
+#: assets/agenda/components/AgendaPreviewImage.tsx:25
 msgid "Hide Map"
 msgstr ""
 
-#: assets/agenda/components/AgendaPreviewPlanning.jsx:46
+#: assets/agenda/components/AgendaPreviewPlanning.tsx:47
 msgid "Planning Item"
 msgstr ""
 
-#: assets/agenda/components/AgendaPreviewPlanning.jsx:64
+#: assets/agenda/components/AgendaPreviewPlanning.tsx:65
 msgid "Other Planning Items"
 msgstr ""
 
-#: assets/agenda/components/AgendaRegistrationInvitationDetails.jsx:19
+#: assets/agenda/components/AgendaRegistrationInvitationDetails.tsx:19
 msgid "Registration Details"
 msgstr ""
 
-#: assets/agenda/components/AgendaRegistrationInvitationDetails.jsx:24
+#: assets/agenda/components/AgendaRegistrationInvitationDetails.tsx:24
 msgid "Invitation Details"
 msgstr ""
 
-#: assets/agenda/components/CoverageItemStatus.jsx:79
-#: assets/companies/components/CompanyList.jsx:38
-#: assets/company-admin/components/CompanyUsers.jsx:27
-#: assets/monitoring/components/MonitoringList.jsx:28
-#: assets/navigations/components/NavigationList.jsx:24
-#: assets/products/components/ProductList.jsx:23
-#: assets/section-filters/components/SectionFilterList.jsx:23
-#: assets/users/components/UsersList.jsx:33
+#: assets/agenda/components/CoverageItemStatus.tsx:81
+#: assets/companies/components/CompanyList.tsx:39
+#: assets/company-admin/components/CompanyUsers.tsx:27
+#: assets/monitoring/components/MonitoringList.tsx:28
+#: assets/navigations/components/NavigationList.tsx:24
+#: assets/products/components/ProductList.tsx:23
+#: assets/section-filters/components/SectionFilterList.tsx:23
+#: assets/users/components/UsersList.tsx:33
 msgid "Status"
 msgstr ""
 
-#: assets/agenda/components/CoverageItemStatus.jsx:93
-#: assets/agenda/components/CoverageItemStatus.jsx:110
+#: assets/agenda/components/CoverageItemStatus.tsx:95
+#: assets/agenda/components/CoverageItemStatus.tsx:112
 msgid "Open in new tab"
 msgstr ""
 
-#: assets/agenda/components/CoverageItemStatus.jsx:94
-#: assets/agenda/components/CoverageItemStatus.jsx:111
-#: assets/agenda/components/CoverageItemStatus.jsx:117
+#: assets/agenda/components/CoverageItemStatus.tsx:96
+#: assets/agenda/components/CoverageItemStatus.tsx:113
+#: assets/agenda/components/CoverageItemStatus.tsx:119
 msgid "View Content"
 msgstr ""
 
-#: assets/agenda/components/CoverageItemStatus.jsx:139
+#: assets/agenda/components/CoverageItemStatus.tsx:141
 msgid "All coverages cancelled: {{ reason }}"
 msgstr ""
 
-#: assets/agenda/components/CoverageItemStatus.jsx:142
+#: assets/agenda/components/CoverageItemStatus.tsx:144
 msgid "Planning cancelled: {{ reason }}"
 msgstr ""
 
-#: assets/agenda/components/CoverageItemStatus.jsx:165
+#: assets/agenda/components/CoverageItemStatus.tsx:167
 msgid "Update coming"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:327
+#: assets/agenda/components/LocationFilter.tsx:332
 msgid "{{ name }} (City, {{ state }}, {{ country }})"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:347
+#: assets/agenda/components/LocationFilter.tsx:352
 msgid "{{ name }} (State, {{ country }})"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:366
+#: assets/agenda/components/LocationFilter.tsx:371
 msgid "{{ name }} (Country)"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:400
+#: assets/agenda/components/LocationFilter.tsx:405
 msgid "City: {{ name }}"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:402
+#: assets/agenda/components/LocationFilter.tsx:407
 msgid "State: {{ name }}"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:404
+#: assets/agenda/components/LocationFilter.tsx:409
 msgid "Country: {{ name }}"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:408
-#: assets/agenda/components/LocationFilter.jsx:468
+#: assets/agenda/components/LocationFilter.tsx:413
+#: assets/agenda/components/LocationFilter.tsx:473
 msgid "Any location"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:442
+#: assets/agenda/components/LocationFilter.tsx:447
 msgid "Search for a region or place"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:478
+#: assets/agenda/components/LocationFilter.tsx:483
 msgid "Searching locations..."
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:483
+#: assets/agenda/components/LocationFilter.tsx:488
 msgid "Regions"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:492
+#: assets/agenda/components/LocationFilter.tsx:497
 msgid "No regions found"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:497
+#: assets/agenda/components/LocationFilter.tsx:502
 msgid "Places"
 msgstr ""
 
-#: assets/agenda/components/LocationFilter.jsx:506
+#: assets/agenda/components/LocationFilter.tsx:511
 msgid "No places found"
 msgstr ""
 
-#: assets/am-news/utils.js:41
+#: assets/am-news/utils.ts:41
 msgid "Fuel"
 msgstr ""
 
-#: assets/am-news/utils.js:43
+#: assets/am-news/utils.ts:43
 msgid "Weather"
 msgstr ""
 
-#: assets/am-news/utils.js:48
+#: assets/am-news/utils.ts:48
 msgid "Alert"
 msgstr ""
 
-#: assets/am-news/utils.js:50
+#: assets/am-news/utils.ts:50
 msgid "Headlines"
 msgstr ""
 
-#: assets/am-news/utils.js:52
+#: assets/am-news/utils.ts:52
 msgid "Quote"
 msgstr ""
 
-#: assets/cards/actions.js:89
+#: assets/cards/actions.ts:89
 msgid "Invalid Url."
 msgstr ""
 
-#: assets/cards/actions.js:94
+#: assets/cards/actions.ts:94
 msgid "Invalid count of media."
 msgstr ""
 
-#: assets/cards/actions.js:101
+#: assets/cards/actions.ts:101
 msgid "Count of media should be greater than zero."
 msgstr ""
 
-#: assets/cards/actions.js:107
-#: assets/components/cards/edit/ConfigExternalMedia.jsx:28
+#: assets/cards/actions.ts:107
+#: assets/components/cards/edit/ConfigExternalMedia.tsx:28
 msgid "Total media count across all media config should be between 1 and 4."
 msgstr ""
 
-#: assets/cards/actions.js:112
+#: assets/cards/actions.ts:112
 msgid "Failed to update Card."
 msgstr ""
 
-#: assets/cards/actions.js:132
+#: assets/cards/actions.ts:132
 msgid "Card updated successfully"
 msgstr ""
 
-#: assets/cards/actions.js:134
+#: assets/cards/actions.ts:134
 msgid "Card created successfully"
 msgstr ""
 
-#: assets/cards/actions.js:156
+#: assets/cards/actions.ts:156
 msgid "Card deleted successfully"
 msgstr ""
 
-#: assets/cards/components/CardList.jsx:23
-#: assets/cards/components/EditCard.jsx:62
+#: assets/cards/components/CardList.tsx:23
+#: assets/cards/components/EditCard.tsx:63
 msgid "Label"
 msgstr ""
 
-#: assets/cards/components/CardList.jsx:24
-#: assets/cards/components/EditCard.jsx:69
-#: assets/companies/components/CompanyList.jsx:35
+#: assets/cards/components/CardList.tsx:24
+#: assets/cards/components/EditCard.tsx:70
+#: assets/companies/components/CompanyList.tsx:36
 msgid "Type"
 msgstr ""
 
-#: assets/cards/components/CardList.jsx:25
-#: assets/companies/components/CompanyPermissions.jsx:105
-#: assets/company-reports/components/ProductCompanies.jsx:53
-#: assets/company-reports/components/ProductStories.jsx:24
-#: assets/components/cards/edit/ConfigProduct.jsx:28
-#: assets/products/components/EditProduct.jsx:32
+#: assets/cards/components/CardList.tsx:25
+#: assets/companies/components/CompanyPermissions.tsx:105
+#: assets/company-reports/components/ProductCompanies.tsx:57
+#: assets/company-reports/components/ProductStories.tsx:24
+#: assets/components/cards/edit/ConfigProduct.tsx:29
+#: assets/products/components/EditProduct.tsx:34
 msgid "Product"
 msgstr ""
 
-#: assets/cards/components/CardList.jsx:26
-#: assets/cards/components/EditCard.jsx:78
+#: assets/cards/components/CardList.tsx:26
+#: assets/cards/components/EditCard.tsx:79
 msgid "Order"
 msgstr ""
 
-#: assets/cards/components/CardList.jsx:27
-#: assets/companies/components/CompanyList.jsx:42
-#: assets/navigations/components/NavigationList.jsx:25
-#: assets/oauth_clients/components/ClientList.jsx:23
-#: assets/products/components/ProductList.jsx:27
-#: assets/section-filters/components/SectionFilterList.jsx:26
-#: assets/users/components/UsersList.jsx:34
+#: assets/cards/components/CardList.tsx:27
+#: assets/companies/components/CompanyList.tsx:43
+#: assets/navigations/components/NavigationList.tsx:25
+#: assets/oauth_clients/components/ClientList.tsx:23
+#: assets/products/components/ProductList.tsx:27
+#: assets/section-filters/components/SectionFilterList.tsx:26
+#: assets/users/components/UsersList.tsx:34
 msgid "Created On"
 msgstr ""
 
-#: assets/cards/components/Cards.jsx:37
+#: assets/cards/components/Cards.tsx:38
 msgid "Please provide card label"
 msgstr ""
 
-#: assets/cards/components/Cards.jsx:43
+#: assets/cards/components/Cards.tsx:44
 msgid "Please provide start date"
 msgstr ""
 
-#: assets/cards/components/Cards.jsx:64
+#: assets/cards/components/Cards.tsx:65
 msgid "Would you like to delete card: {{label}}"
 msgstr ""
 
-#: assets/cards/components/CardsApp.jsx:28
+#: assets/cards/components/CardsApp.tsx:29
 msgid "New Card"
 msgstr ""
 
-#: assets/cards/components/EditCard.jsx:44
-#: assets/companies/components/EditCompany.jsx:114
-#: assets/components/Modal.jsx:121
-#: assets/monitoring/components/EditMonitoringProfile.jsx:78
-#: assets/navigations/components/EditNavigation.jsx:43
-#: assets/oauth_clients/components/EditClient.jsx:17
-#: assets/products/components/EditProduct.jsx:80
-#: assets/search/components/MonitoringEditor.jsx:122
-#: assets/section-filters/components/EditSectionFilter.jsx:18
-#: assets/ui/components/Content.jsx:7 assets/ui/components/Preview.jsx:8
-#: assets/user-profile/components/UserProfileApp.jsx:97
-#: assets/users/components/EditUser.jsx:59
+#: assets/cards/components/EditCard.tsx:45
+#: assets/companies/components/EditCompany.tsx:118
+#: assets/components/Modal.tsx:126
+#: assets/monitoring/components/EditMonitoringProfile.tsx:80
+#: assets/navigations/components/EditNavigation.tsx:46
+#: assets/oauth_clients/components/EditClient.tsx:18
+#: assets/products/components/EditProduct.tsx:82
+#: assets/search/components/MonitoringEditor.tsx:125
+#: assets/section-filters/components/EditSectionFilter.tsx:19
+#: assets/ui/components/Content.tsx:7 assets/ui/components/Preview.tsx:8
+#: assets/user-profile/components/UserProfileApp.tsx:109
+#: assets/users/components/EditUser.tsx:60
 msgid "dialog"
 msgstr ""
 
-#: assets/cards/components/EditCard.jsx:44
+#: assets/cards/components/EditCard.tsx:45
 msgid "Edit Cards"
 msgstr ""
 
-#: assets/cards/components/EditCard.jsx:89
-#: assets/companies/components/EditCompanyDetails.jsx:135
-#: assets/components/CardEditor.jsx:105
-#: assets/monitoring/components/EditMonitoringProfile.jsx:205
-#: assets/navigations/components/EditNavigation.jsx:116
-#: assets/oauth_clients/components/EditClient.jsx:63
-#: assets/products/components/EditProduct.jsx:180
-#: assets/search/components/FollowedTopics.jsx:60
-#: assets/section-filters/components/EditSectionFilter.jsx:87
-#: assets/users/components/EditUser.jsx:302
+#: assets/cards/components/EditCard.tsx:90
+#: assets/companies/components/EditCompanyDetails.tsx:133
+#: assets/components/CardEditor.tsx:106
+#: assets/monitoring/components/EditMonitoringProfile.tsx:207
+#: assets/navigations/components/EditNavigation.tsx:121
+#: assets/oauth_clients/components/EditClient.tsx:64
+#: assets/products/components/EditProduct.tsx:187
+#: assets/search/components/FollowedTopics.tsx:81
+#: assets/section-filters/components/EditSectionFilter.tsx:88
+#: assets/users/components/EditUser.tsx:324
 msgid "Delete"
 msgstr ""
 
-#: assets/companies/actions.js:130
+#: assets/companies/actions.ts:130
 msgid "Company updated successfully"
 msgstr ""
 
-#: assets/companies/actions.js:132
+#: assets/companies/actions.ts:132
 msgid "Company created successfully"
 msgstr ""
 
-#: assets/companies/actions.js:170
+#: assets/companies/actions.ts:170
 msgid "Company deleted successfully"
 msgstr ""
 
-#: assets/companies/utils.js:4
-msgid "Australia"
-msgstr ""
-
-#: assets/companies/utils.js:5
-msgid "New Zealand"
-msgstr ""
-
-#: assets/companies/utils.js:6
-msgid "Finland"
-msgstr ""
-
-#: assets/companies/components/CompaniesApp.jsx:30
+#: assets/companies/components/CompaniesApp.tsx:31
 msgid "New Company"
 msgstr ""
 
-#: assets/companies/components/CompanyList.jsx:36
-#: assets/companies/components/EditCompanyDetails.jsx:46
+#: assets/companies/components/CompanyList.tsx:37
+#: assets/companies/components/EditCompanyDetails.tsx:44
 msgid "Superdesk Subscriber Id"
 msgstr ""
 
-#: assets/companies/components/CompanyList.jsx:37
-#: assets/companies/components/EditCompanyDetails.jsx:54
-#: assets/company-reports/components/Company.jsx:69
+#: assets/companies/components/CompanyList.tsx:38
+#: assets/companies/components/EditCompanyDetails.tsx:52
+#: assets/company-reports/components/Company.tsx:69
 msgid "Account Manager"
 msgstr ""
 
-#: assets/companies/components/CompanyList.jsx:41
-#: assets/companies/components/EditCompanyDetails.jsx:96
+#: assets/companies/components/CompanyList.tsx:42
+#: assets/companies/components/EditCompanyDetails.tsx:94
 msgid "Country"
 msgstr ""
 
-#: assets/companies/components/CompanyList.jsx:43
+#: assets/companies/components/CompanyList.tsx:44
 msgid "Expires On"
 msgstr ""
 
-#: assets/companies/components/CompanyListItem.jsx:20
-#: assets/company-reports/components/Company.jsx:57
-#: assets/company-reports/components/ExpiredCompanies.jsx:12
-#: assets/monitoring/components/MonitoringItem.jsx:18
-#: assets/navigations/components/NavigationListItem.jsx:13
-#: assets/products/components/ProductListItem.jsx:12
-#: assets/section-filters/components/SectionFilterListItem.jsx:12
-#: assets/users/components/UserListItem.jsx:26
+#: assets/companies/components/CompanyListItem.tsx:20
+#: assets/company-reports/components/Company.tsx:57
+#: assets/company-reports/components/ExpiredCompanies.tsx:12
+#: assets/monitoring/components/MonitoringItem.tsx:18
+#: assets/navigations/components/NavigationListItem.tsx:13
+#: assets/products/components/ProductListItem.tsx:12
+#: assets/section-filters/components/SectionFilterListItem.tsx:12
+#: assets/users/components/UserListItem.tsx:26
 msgid "Disabled"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:35
-#: assets/users/components/EditUser.jsx:110
+#: assets/companies/components/CompanyPermissions.tsx:35
+#: assets/users/components/EditUser.tsx:127
 msgid "General"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:42
+#: assets/companies/components/CompanyPermissions.tsx:42
 msgid "Grant Access To Archived {{wire}}"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:50
+#: assets/companies/components/CompanyPermissions.tsx:50
 msgid "Events Only Access"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:58
+#: assets/companies/components/CompanyPermissions.tsx:58
 msgid "Restrict Coverage Info"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:106
+#: assets/companies/components/CompanyPermissions.tsx:106
 msgid "Number of seats"
 msgstr ""
 
-#: assets/companies/components/CompanyPermissions.jsx:133
+#: assets/companies/components/CompanyPermissions.tsx:133
 msgid "Seats:"
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:38
-#: assets/company-admin/components/CompanyAdminApp.jsx:151
-#: assets/company-admin/components/CompanyDetails.jsx:22
-#: assets/monitoring/components/EditMonitoringProfile.jsx:27
-#: assets/search/components/MonitoringEditor.jsx:31
+#: assets/companies/components/EditCompany.tsx:41
+#: assets/company-admin/components/CompanyAdminApp.tsx:153
+#: assets/company-admin/components/CompanyDetails.tsx:22
+#: assets/monitoring/components/EditMonitoringProfile.tsx:29
+#: assets/search/components/MonitoringEditor.tsx:34
 msgid "Users"
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:39
+#: assets/companies/components/EditCompany.tsx:42
 msgid "Permissions"
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:43
+#: assets/companies/components/EditCompany.tsx:46
 msgid "API"
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:58
+#: assets/companies/components/EditCompany.tsx:62
 msgid "There are no users in the company."
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:76
+#: assets/companies/components/EditCompany.tsx:80
 msgid "Please provide company name"
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:100
+#: assets/companies/components/EditCompany.tsx:104
 msgid "Would you like to delete company: {{name}}"
 msgstr ""
 
-#: assets/companies/components/EditCompany.jsx:115
+#: assets/companies/components/EditCompany.tsx:119
 msgid "Edit Company"
 msgstr ""
 
-#: assets/companies/components/EditCompanyAPI.jsx:76
+#: assets/companies/components/EditCompanyAPI.tsx:77
 msgid "Allowed IP Addresses"
 msgstr ""
 
-#: assets/companies/components/EditCompanyDetails.jsx:28
+#: assets/companies/components/EditCompanyDetails.tsx:26
 msgid "Company Type"
 msgstr ""
 
-#: assets/companies/components/EditCompanyDetails.jsx:38
+#: assets/companies/components/EditCompanyDetails.tsx:36
 msgid "Company Url"
 msgstr ""
 
-#: assets/companies/components/EditCompanyDetails.jsx:70
+#: assets/companies/components/EditCompanyDetails.tsx:68
 msgid "Contact Name"
 msgstr ""
 
-#: assets/companies/components/EditCompanyDetails.jsx:78
+#: assets/companies/components/EditCompanyDetails.tsx:76
 msgid "Contact Email"
 msgstr ""
 
-#: assets/companies/components/EditCompanyDetails.jsx:87
+#: assets/companies/components/EditCompanyDetails.tsx:85
 msgid "SSO domain"
 msgstr ""
 
-#: assets/companies/components/EditCompanyDetails.jsx:105
-#: assets/company-reports/components/Company.jsx:86
-#: assets/company-reports/components/ExpiredCompanies.jsx:17
+#: assets/companies/components/EditCompanyDetails.tsx:103
+#: assets/company-reports/components/Company.tsx:86
+#: assets/company-reports/components/ExpiredCompanies.tsx:17
 msgid "Expiry Date"
 msgstr ""
 
-#: assets/companies/components/EditCompanyDetails.jsx:113
+#: assets/companies/components/EditCompanyDetails.tsx:111
 msgid "{{monitoring}} Administrator"
 msgstr ""
 
-#: assets/company-admin/actions.js:29
+#: assets/company-admin/actions.ts:29
 msgid "Product Seat request sent"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminApp.jsx:63
-#: assets/users/components/Users.jsx:40
+#: assets/company-admin/components/CompanyAdminApp.tsx:65
+#: assets/users/components/Users.tsx:41
 msgid "Please provide email"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminApp.jsx:84
+#: assets/company-admin/components/CompanyAdminApp.tsx:86
 msgid "Would you like to delete user: {{ name }}"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminApp.jsx:115
-#: assets/users/components/UsersApp.jsx:29
+#: assets/company-admin/components/CompanyAdminApp.tsx:117
+#: assets/users/components/UsersApp.tsx:29
 msgid "New User"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminApp.jsx:141
+#: assets/company-admin/components/CompanyAdminApp.tsx:143
 msgid "My Company"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminApp.jsx:156
+#: assets/company-admin/components/CompanyAdminApp.tsx:158
 msgid "Users : {{total}}"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.jsx:97
-#: assets/company-admin/components/CompanyDetailsProductRow.jsx:38
+#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.tsx:98
+#: assets/company-admin/components/CompanyDetailsProductRow.tsx:38
 msgid "Request more seats"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.jsx:98
+#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.tsx:99
 msgid "Send Request"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.jsx:153
+#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.tsx:154
 msgid "Number of additional seats"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.jsx:162
-#: assets/wire/components/PreviewEdnote.jsx:9
+#: assets/company-admin/components/CompanyAdminProductSeatRequestModal.tsx:163
+#: assets/wire/components/PreviewEdnote.tsx:9
 msgid "Note"
 msgstr ""
 
-#: assets/company-admin/components/CompanyAdminSideNav.jsx:12
+#: assets/company-admin/components/CompanyAdminSideNav.tsx:12
 msgid "Company User Management"
 msgstr ""
 
-#: assets/company-admin/components/CompanyDetailsProductFilter.jsx:16
-#: assets/company-reports/components/ProductCompanies.jsx:19
+#: assets/company-admin/components/CompanyDetailsProductFilter.tsx:18
+#: assets/company-reports/components/ProductCompanies.tsx:23
 msgid "All Products"
 msgstr ""
 
-#: assets/company-admin/components/CompanyDetailsProductRow.jsx:25
+#: assets/company-admin/components/CompanyDetailsProductRow.tsx:25
 msgid "Unlimited"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUserListItem.jsx:11
+#: assets/company-admin/components/CompanyUserListItem.tsx:11
 msgid "active"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUserListItem.jsx:16
+#: assets/company-admin/components/CompanyUserListItem.tsx:16
 msgid "pending"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUserListItem.jsx:21
+#: assets/company-admin/components/CompanyUserListItem.tsx:21
 msgid "disabled"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUserListItem.jsx:48
+#: assets/company-admin/components/CompanyUserListItem.tsx:48
 msgid "company admin"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUserListItem.jsx:52
-#: assets/users/components/EditUser.jsx:84
+#: assets/company-admin/components/CompanyUserListItem.tsx:52
+#: assets/users/components/EditUser.tsx:85
 msgid "admin"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUsers.jsx:30
+#: assets/company-admin/components/CompanyUsers.tsx:30
 msgid "{{ section }} Products"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUsers.jsx:34
+#: assets/company-admin/components/CompanyUsers.tsx:34
 msgid "Created on"
 msgstr ""
 
-#: assets/company-admin/components/CompanyUsers.jsx:35
+#: assets/company-admin/components/CompanyUsers.tsx:35
 msgid "Last active"
 msgstr ""
 
-#: assets/company-reports/actions.js:40
+#: assets/company-reports/actions.ts:40
 msgid "To date is after From date"
 msgstr ""
 
-#: assets/company-reports/actions.js:151
+#: assets/company-reports/actions.ts:151
 msgid "No data to export."
 msgstr ""
 
-#: assets/company-reports/components/ComapnyNewsApiUsage.jsx:72
-#: assets/company-reports/components/ContentActivity.jsx:252
-#: assets/company-reports/components/SubscriberActivity.jsx:158
+#: assets/company-reports/components/ComapnyNewsApiUsage.tsx:74
+#: assets/company-reports/components/ContentActivity.tsx:253
+#: assets/company-reports/components/SubscriberActivity.tsx:162
 msgid "No Data"
 msgstr ""
 
-#: assets/company-reports/components/ComapnyNewsApiUsage.jsx:82
-#: assets/company-reports/components/SubscriberActivity.jsx:179
+#: assets/company-reports/components/ComapnyNewsApiUsage.tsx:84
+#: assets/company-reports/components/SubscriberActivity.tsx:183
 msgid "FROM:"
 msgstr ""
 
-#: assets/company-reports/components/ComapnyNewsApiUsage.jsx:88
-#: assets/company-reports/components/SubscriberActivity.jsx:185
+#: assets/company-reports/components/ComapnyNewsApiUsage.tsx:90
+#: assets/company-reports/components/SubscriberActivity.tsx:189
 msgid "TO:"
 msgstr ""
 
-#: assets/company-reports/components/Company.jsx:38
+#: assets/company-reports/components/Company.tsx:38
 msgid "Tel"
 msgstr ""
 
-#: assets/company-reports/components/Company.jsx:48
+#: assets/company-reports/components/Company.tsx:48
 msgid "User Accounts"
 msgstr ""
 
-#: assets/company-reports/components/Company.jsx:57
-#: assets/company-reports/components/ExpiredCompanies.jsx:12
+#: assets/company-reports/components/Company.tsx:57
+#: assets/company-reports/components/ExpiredCompanies.tsx:12
 msgid "Active"
 msgstr ""
 
-#: assets/company-reports/components/Company.jsx:59
-#: assets/company-reports/components/ExpiredCompanies.jsx:14
+#: assets/company-reports/components/Company.tsx:59
+#: assets/company-reports/components/ExpiredCompanies.tsx:14
 msgid "Unspecified"
 msgstr ""
 
-#: assets/company-reports/components/Company.jsx:86
-#: assets/company-reports/components/ExpiredCompanies.jsx:17
+#: assets/company-reports/components/Company.tsx:86
+#: assets/company-reports/components/ExpiredCompanies.tsx:17
 msgid "Is Active"
 msgstr ""
 
-#: assets/company-reports/components/Company.jsx:86
-#: assets/company-reports/components/ExpiredCompanies.jsx:17
+#: assets/company-reports/components/Company.tsx:86
+#: assets/company-reports/components/ExpiredCompanies.tsx:17
 msgid "Created"
 msgstr ""
 
-#: assets/company-reports/components/CompanyProducts.jsx:10
+#: assets/company-reports/components/CompanyProducts.tsx:10
 msgid "Product name"
 msgstr ""
 
-#: assets/company-reports/components/CompanyProducts.jsx:11
+#: assets/company-reports/components/CompanyProducts.tsx:11
 msgid "Is enabled"
 msgstr ""
 
-#: assets/company-reports/components/CompanyProducts.jsx:13
+#: assets/company-reports/components/CompanyProducts.tsx:13
 msgid "sd_product_id"
 msgstr ""
 
-#: assets/company-reports/components/CompanyProducts.jsx:32
-#: assets/company-reports/components/CompanySavedSearches.jsx:17
-#: assets/company-reports/components/ProductStories.jsx:25
-#: assets/company-reports/components/UserSavedSearches.jsx:20
+#: assets/company-reports/components/CompanyProducts.tsx:32
+#: assets/company-reports/components/CompanySavedSearches.tsx:17
+#: assets/company-reports/components/ProductStories.tsx:25
+#: assets/company-reports/components/UserSavedSearches.tsx:20
 msgid "Is Enabled"
 msgstr ""
 
-#: assets/company-reports/components/CompanyProducts.jsx:32
+#: assets/company-reports/components/CompanyProducts.tsx:32
 msgid "Number Of Products"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:21
+#: assets/company-reports/components/CompanyReportsApp.tsx:21
 msgid "Subscriber activity"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:23
+#: assets/company-reports/components/CompanyReportsApp.tsx:23
 msgid "Companies per Product"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:66
+#: assets/company-reports/components/CompanyReportsApp.tsx:67
 msgid "Run report"
 msgstr ""
 
-#: assets/company-reports/components/CompanyReportsApp.jsx:72
+#: assets/company-reports/components/CompanyReportsApp.tsx:73
 msgid "Print report"
 msgstr ""
 
-#: assets/company-reports/components/CompanySavedSearches.jsx:17
-#: assets/company-reports/components/UserSavedSearches.jsx:22
+#: assets/company-reports/components/CompanySavedSearches.tsx:17
+#: assets/company-reports/components/UserSavedSearches.tsx:22
 msgid "Number Of Saved Searches"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:27
-#: assets/company-reports/components/SubscriberActivity.jsx:141
+#: assets/company-reports/components/ContentActivity.tsx:28
+#: assets/company-reports/components/SubscriberActivity.tsx:145
 msgid "Section"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:42
+#: assets/company-reports/components/ContentActivity.tsx:43
 msgid "Genres"
 msgstr ""
 
-#: assets/company-reports/components/ContentActivity.jsx:289
+#: assets/company-reports/components/ContentActivity.tsx:290
 msgid "Export to CSV"
 msgstr ""
 
-#: assets/company-reports/components/ProductCompanies.jsx:53
+#: assets/company-reports/components/ProductCompanies.tsx:57
 msgid "Active Companies"
 msgstr ""
 
-#: assets/company-reports/components/ProductCompanies.jsx:53
+#: assets/company-reports/components/ProductCompanies.tsx:57
 msgid "Disabled Companies"
 msgstr ""
 
-#: assets/company-reports/components/ProductStories.jsx:27
+#: assets/company-reports/components/ProductStories.tsx:27
 msgid "Last 24 hours"
 msgstr ""
 
-#: assets/company-reports/components/ProductStories.jsx:29
+#: assets/company-reports/components/ProductStories.tsx:29
 msgid "Last 7 days"
 msgstr ""
 
-#: assets/company-reports/components/ProductStories.jsx:31
+#: assets/company-reports/components/ProductStories.tsx:31
 msgid "Previous month"
 msgstr ""
 
-#: assets/company-reports/components/ProductStories.jsx:32
+#: assets/company-reports/components/ProductStories.tsx:32
 msgid "Last 6 months"
 msgstr ""
 
-#: assets/company-reports/components/SubscriberActivity.jsx:20
-#: assets/monitoring/components/MonitoringApp.jsx:34
-#: assets/monitoring/components/MonitoringApp.jsx:50
-#: assets/users/components/filters/UserListCompanyFilter.jsx:13
+#: assets/company-reports/components/SubscriberActivity.tsx:24
+#: assets/monitoring/components/MonitoringApp.tsx:36
+#: assets/monitoring/components/MonitoringApp.tsx:52
+#: assets/users/components/filters/UserListCompanyFilter.tsx:16
 msgid "All Companies"
 msgstr ""
 
-#: assets/company-reports/components/SubscriberActivity.jsx:24
+#: assets/company-reports/components/SubscriberActivity.tsx:28
 msgid "All Actions"
 msgstr ""
 
-#: assets/company-reports/components/SubscriberActivity.jsx:28
+#: assets/company-reports/components/SubscriberActivity.tsx:32
 msgid "All Sections"
 msgstr ""
 
-#: assets/company-reports/components/SubscriberActivity.jsx:141
+#: assets/company-reports/components/SubscriberActivity.tsx:145
 msgid "Item"
 msgstr ""
 
-#: assets/company-reports/components/SubscriberActivity.jsx:141
+#: assets/company-reports/components/SubscriberActivity.tsx:145
 msgid "Action"
 msgstr ""
 
-#: assets/company-reports/components/SubscriberActivity.jsx:141
-#: assets/company-reports/components/UserSavedSearches.jsx:19
+#: assets/company-reports/components/SubscriberActivity.tsx:145
+#: assets/company-reports/components/UserSavedSearches.tsx:19
 msgid "User"
 msgstr ""
 
-#: assets/company-reports/components/SubscriberActivity.jsx:141
-#: assets/monitoring/components/MonitoringSchedule.jsx:171
+#: assets/company-reports/components/SubscriberActivity.tsx:145
+#: assets/monitoring/components/MonitoringSchedule.tsx:174
 msgid "Time"
 msgstr ""
 
-#: assets/components/ActionMenu.jsx:28
+#: assets/components/ActionMenu.tsx:30
 msgid "More Actions"
 msgstr ""
 
-#: assets/components/AuditInformation.jsx:29
+#: assets/components/AuditInformation.tsx:30
 msgid "System"
 msgstr ""
 
-#: assets/components/AuditInformation.jsx:39
+#: assets/components/AuditInformation.tsx:40
 msgid "Created by {{author}} at {{date}}"
 msgstr ""
 
-#: assets/components/AuditInformation.jsx:53
+#: assets/components/AuditInformation.tsx:54
 msgid "Updated by {{author}} at {{date}}"
 msgstr ""
 
-#: assets/components/CardEditor.jsx:102
-#: assets/search/components/FollowedTopics.jsx:45
+#: assets/components/CardEditor.tsx:103
+#: assets/search/components/FollowedTopics.tsx:66
+#: assets/ui/components/Collapse.tsx:44
 msgid "Edit"
 msgstr ""
 
-#: assets/components/EditPanel.jsx:92 assets/components/ShareItemModal.jsx:76
+#: assets/components/EditPanel.tsx:93 assets/components/ShareItemModal.tsx:77
 msgid "Deselect All"
 msgstr ""
 
-#: assets/components/EditPanel.jsx:92 assets/components/ShareItemModal.jsx:77
-#: assets/wire/components/SelectedItemsBar.jsx:43
+#: assets/components/EditPanel.tsx:93 assets/components/ShareItemModal.tsx:78
+#: assets/users/components/EditUser.tsx:235
+#: assets/wire/components/SelectedItemsBar.tsx:44
 msgid "Select All"
 msgstr ""
 
-#: assets/components/ExpiryDateInput.jsx:18
+#: assets/components/ExpiryDateInput.tsx:22
 msgid "on"
 msgstr ""
 
-#: assets/components/ExpiryDateInput.jsx:19
+#: assets/components/ExpiryDateInput.tsx:23
 msgid "in 1 week"
 msgstr ""
 
-#: assets/components/ExpiryDateInput.jsx:20
+#: assets/components/ExpiryDateInput.tsx:24
 msgid "in 2 weeks"
 msgstr ""
 
-#: assets/components/ExpiryDateInput.jsx:21
+#: assets/components/ExpiryDateInput.tsx:25
 msgid "in 1 month"
 msgstr ""
 
-#: assets/components/ExpiryDateInput.jsx:22
+#: assets/components/ExpiryDateInput.tsx:26
 msgid "in 6 months"
 msgstr ""
 
-#: assets/components/ExpiryDateInput.jsx:23
+#: assets/components/ExpiryDateInput.tsx:27
 msgid "in 1 year"
 msgstr ""
 
-#: assets/components/ExpiryDateInput.jsx:24
-#: assets/news-api/components/EditAPIToken.jsx:194
+#: assets/components/ExpiryDateInput.tsx:28
+#: assets/news-api/components/EditAPIToken.tsx:195
 msgid "Never"
 msgstr ""
 
-#: assets/components/ListViewOptions.jsx:15
+#: assets/components/ListViewOptions.tsx:20
 msgid "Large list"
 msgstr ""
 
-#: assets/components/ListViewOptions.jsx:16
+#: assets/components/ListViewOptions.tsx:21
 msgid "Compact list"
 msgstr ""
 
-#: assets/components/ListViewOptions.jsx:64
-#: assets/components/ListViewOptions.jsx:69
+#: assets/components/ListViewOptions.tsx:68
+#: assets/components/ListViewOptions.tsx:73
 msgid "Change view"
 msgstr ""
 
-#: assets/components/MultiSelectDropdown.jsx:31
+#: assets/components/MultiSelectDropdown.tsx:31
 msgid "All {{label}}"
 msgstr ""
 
-#: assets/components/NotificationList.jsx:84
-#: assets/components/NotificationList.jsx:92
-#: assets/components/NotificationList.jsx:101
+#: assets/components/NotificationList.tsx:88
+#: assets/components/NotificationList.tsx:96
+#: assets/components/NotificationList.tsx:105
 msgid "Notifications"
 msgstr ""
 
-#: assets/components/NotificationList.jsx:95
+#: assets/components/NotificationList.tsx:99
 msgid "No new notifications!"
 msgstr ""
 
-#: assets/components/NotificationList.jsx:105
+#: assets/components/NotificationList.tsx:109
 msgid "Clear All"
 msgstr ""
 
-#: assets/components/NotificationList.jsx:110
+#: assets/components/NotificationList.tsx:114
 msgid "Loading..."
 msgstr ""
 
-#: assets/components/ShareItemModal.jsx:94
+#: assets/components/ShareItemModal.tsx:101
 msgid "Share Item"
 msgstr ""
 
-#: assets/components/ShareItemModal.jsx:103
-msgid "People"
-msgstr ""
-
-#: assets/components/ShareItemModal.jsx:124
+#: assets/components/ShareItemModal.tsx:145
+#: assets/components/ShareItemModal.tsx:148
 msgid "Message"
 msgstr ""
 
-#: assets/components/cards/utils.js:23
+#: assets/components/cards/utils.ts:23
 msgid "6-text-only"
 msgstr ""
 
-#: assets/components/cards/utils.js:30
+#: assets/components/cards/utils.ts:30
 msgid "4-picture-text"
 msgstr ""
 
-#: assets/components/cards/utils.js:37
+#: assets/components/cards/utils.ts:37
 msgid "4-media-gallery"
 msgstr ""
 
-#: assets/components/cards/utils.js:44
+#: assets/components/cards/utils.ts:44
 msgid "4-photo-gallery"
 msgstr ""
 
-#: assets/components/cards/utils.js:51
+#: assets/components/cards/utils.ts:51
 msgid "1x1-top-news"
 msgstr ""
 
-#: assets/components/cards/utils.js:58
+#: assets/components/cards/utils.ts:58
 msgid "2x2-top-news"
 msgstr ""
 
-#: assets/components/cards/utils.js:65
+#: assets/components/cards/utils.ts:65
 msgid "3-text-only"
 msgstr ""
 
-#: assets/components/cards/utils.js:72
+#: assets/components/cards/utils.ts:72
 msgid "3-picture-text"
 msgstr ""
 
-#: assets/components/cards/utils.js:79
+#: assets/components/cards/utils.ts:79
 msgid "4-text-only"
 msgstr ""
 
-#: assets/components/cards/utils.js:86
+#: assets/components/cards/utils.ts:86
 msgid "2x2-events"
 msgstr ""
 
-#: assets/components/cards/utils.js:93
+#: assets/components/cards/utils.ts:93
 msgid "6 Navigation Tiles Per Row"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigEvent.jsx:33
+#: assets/components/cards/edit/ConfigEvent.tsx:33
 msgid "Abstract"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigEvent.jsx:40
+#: assets/components/cards/edit/ConfigEvent.tsx:40
 msgid "Start Date"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigEvent.jsx:48
+#: assets/components/cards/edit/ConfigEvent.tsx:48
 msgid "End Date"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigEvent.jsx:56
-#: assets/search/components/TopicParameters.jsx:76
+#: assets/components/cards/edit/ConfigEvent.tsx:56
 msgid "Location"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigExternalMedia.jsx:16
+#: assets/components/cards/edit/ConfigExternalMedia.tsx:16
 msgid "More button label"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigExternalMedia.jsx:23
+#: assets/components/cards/edit/ConfigExternalMedia.tsx:23
 msgid "More button url"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigExternalMedia.jsx:40
+#: assets/components/cards/edit/ConfigExternalMedia.tsx:40
 msgid "External url to fetch media"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigExternalMedia.jsx:48
+#: assets/components/cards/edit/ConfigExternalMedia.tsx:48
 msgid "Media Count"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigNavigation.jsx:55
+#: assets/components/cards/edit/ConfigNavigation.tsx:57
 msgid "Select a navigation."
 msgstr ""
 
-#: assets/components/cards/edit/ConfigNavigation.jsx:60
+#: assets/components/cards/edit/ConfigNavigation.tsx:62
 msgid "Navigation is already added."
 msgstr ""
 
-#: assets/components/cards/edit/ConfigNavigation.jsx:91
+#: assets/components/cards/edit/ConfigNavigation.tsx:93
 msgid "Select Navigation"
 msgstr ""
 
-#: assets/components/cards/edit/ConfigNavigation.jsx:99
+#: assets/components/cards/edit/ConfigNavigation.tsx:101
 msgid "Add"
 msgstr ""
 
-#: assets/components/cards/render/EventsTwoByTwoCard.jsx:26
+#: assets/components/cards/render/EventsTwoByTwoCard.tsx:26
 msgid "all"
 msgstr ""
 
-#: assets/components/cards/render/EventsTwoByTwoCard.jsx:33
+#: assets/components/cards/render/EventsTwoByTwoCard.tsx:33
 msgid "to"
 msgstr ""
 
-#: assets/components/cards/render/MoreNewsButton.jsx:12
+#: assets/components/cards/render/MoreNewsButton.tsx:12
 msgid "More news"
 msgstr ""
 
-#: assets/components/cards/render/NavigationCard.jsx:34
+#: assets/components/cards/render/NavigationCard.tsx:34
 msgid "Stories"
 msgstr ""
 
-#: assets/general-settings/actions.js:14
+#: assets/general-settings/actions.ts:14
 msgid "Settings were updated successfully."
 msgstr ""
 
-#: assets/home/components/HomeApp.jsx:88
+#: assets/home/components/HomeApp.tsx:92
 msgid "Loading Card Items"
 msgstr ""
 
-#: assets/home/components/HomeApp.jsx:150
-#: assets/market-place/components/MarketPlaceApp.jsx:34
+#: assets/home/components/HomeApp.tsx:154
+#: assets/market-place/components/MarketPlaceApp.tsx:34
 msgid "Warning"
 msgstr ""
 
-#: assets/home/components/HomeApp.jsx:150
+#: assets/home/components/HomeApp.tsx:154
 msgid "There's no card defined for {{home}} page!"
 msgstr ""
 
-#: assets/home/components/search-bar.jsx:20
-#: assets/search/components/SearchBar.jsx:58
+#: assets/home/components/search-bar.tsx:20
+#: assets/search/components/SearchBar.tsx:59
 msgid "search"
 msgstr ""
 
-#: assets/home/components/search-bar.jsx:24
-#: assets/home/components/search-bar.jsx:25
-#: assets/search/components/SearchBar.jsx:64
-#: assets/search/components/SearchBar.jsx:65
+#: assets/home/components/search-bar.tsx:24
+#: assets/home/components/search-bar.tsx:25
+#: assets/search/components/SearchBar.tsx:65
+#: assets/search/components/SearchBar.tsx:66
 msgid "Search for..."
 msgstr ""
 
-#: assets/home/components/search-bar.jsx:33
-#: assets/search/components/SearchBar.jsx:73
+#: assets/home/components/search-bar.tsx:33
+#: assets/search/components/SearchBar.tsx:73
 msgid "Clear search"
 msgstr ""
 
-#: assets/home/components/search-bar.jsx:39
-#: assets/search/components/AdvancedSearchPanel.jsx:150
-#: assets/search/components/SearchBar.jsx:81
-#: assets/search/components/TopicParameters.jsx:68
-#: assets/wire/components/filters/FiltersTab.jsx:141
+#: assets/home/components/search-bar.tsx:39
+#: assets/search/components/AdvancedSearchPanel.tsx:178
+#: assets/search/components/SearchBar.tsx:81
+#: assets/wire/components/filters/FiltersTab.tsx:146
 msgid "Search"
 msgstr ""
 
-#: assets/layout/components/BaseApp.jsx:43
-#: assets/search/components/TopicParameters.jsx:70
+#: assets/layout/components/BaseApp.tsx:54
 msgid "Topics"
 msgstr ""
 
-#: assets/layout/components/BaseApp.jsx:44
-#: assets/search/components/FollowedTopics.jsx:149
-#: assets/search/components/TopicsTab.jsx:74
+#: assets/layout/components/BaseApp.tsx:55
+#: assets/search/components/FollowedTopics.tsx:199
+#: assets/search/components/TopicsTab.tsx:98
 msgid "My Topics"
 msgstr ""
 
-#: assets/layout/components/BaseApp.jsx:45
+#: assets/layout/components/BaseApp.tsx:56
 msgid "Filters"
 msgstr ""
 
-#: assets/maps/components/static.jsx:36
+#: assets/maps/components/static.tsx:37
 msgid "Map"
 msgstr ""
 
-#: assets/market-place/components/MarketPlaceApp.jsx:34
+#: assets/market-place/components/MarketPlaceApp.tsx:34
 msgid "There's no navigations defined!"
 msgstr ""
 
-#: assets/monitoring/actions.js:92
+#: assets/monitoring/actions.ts:92
 msgid "{{monitoring}} Profile updated successfully"
 msgstr ""
 
-#: assets/monitoring/actions.js:94
+#: assets/monitoring/actions.ts:94
 msgid "{{monitoring}} Profile created successfully"
 msgstr ""
 
-#: assets/monitoring/actions.js:160
+#: assets/monitoring/actions.ts:160
 msgid "{{monitoring}} Profile users updated successfully"
 msgstr ""
 
-#: assets/monitoring/actions.js:172
+#: assets/monitoring/actions.ts:172
 msgid "Please create {{monitoring}} profile first."
 msgstr ""
 
-#: assets/monitoring/actions.js:177
+#: assets/monitoring/actions.ts:177
 msgid "{{monitoring}} Profile schedule updated successfully"
 msgstr ""
 
-#: assets/monitoring/actions.js:193
+#: assets/monitoring/actions.ts:193
 msgid "{{monitoring}} Profile deleted successfully"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:26
+#: assets/monitoring/components/EditMonitoringProfile.tsx:28
 msgid "Profile"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:28
+#: assets/monitoring/components/EditMonitoringProfile.tsx:30
 msgid "Schedule"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:43
+#: assets/monitoring/components/EditMonitoringProfile.tsx:45
 msgid "There are no users for this monitoring profile."
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:78
-#: assets/search/components/MonitoringEditor.jsx:122
+#: assets/monitoring/components/EditMonitoringProfile.tsx:80
+#: assets/search/components/MonitoringEditor.tsx:125
 msgid "Edit {{monitoring}}"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:80
+#: assets/monitoring/components/EditMonitoringProfile.tsx:82
 msgid "Add/Edit {{monitoring}} Profile"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:119
-#: assets/search/components/MonitoringEditor.jsx:167
+#: assets/monitoring/components/EditMonitoringProfile.tsx:121
+#: assets/search/components/MonitoringEditor.tsx:170
 msgid "Subject line"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:154
+#: assets/monitoring/components/EditMonitoringProfile.tsx:156
 msgid "Test {{monitoring}} Profile query"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:159
+#: assets/monitoring/components/EditMonitoringProfile.tsx:161
 msgid "Keywords"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:167
-#: assets/search/components/MonitoringEditor.jsx:179
+#: assets/monitoring/components/EditMonitoringProfile.tsx:169
+#: assets/search/components/MonitoringEditor.tsx:182
 msgid "Alert type"
 msgstr ""
 
-#: assets/monitoring/components/EditMonitoringProfile.jsx:178
+#: assets/monitoring/components/EditMonitoringProfile.tsx:180
 msgid "Format type"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringApp.jsx:27
-#: assets/wire/components/WireApp.jsx:80
+#: assets/monitoring/components/MonitoringApp.tsx:29
+#: assets/wire/components/WireApp.tsx:78
 msgid "{{monitoring}} Profiles"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringApp.jsx:28
+#: assets/monitoring/components/MonitoringApp.tsx:30
 msgid "Schedules"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringApp.jsx:49
+#: assets/monitoring/components/MonitoringApp.tsx:51
 msgid "Companies with schedules"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringApp.jsx:82
+#: assets/monitoring/components/MonitoringApp.tsx:84
 msgid "New {{monitoring}} Profile"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringPanel.jsx:36
+#: assets/monitoring/components/MonitoringPanel.tsx:37
 msgid "Please provide a name"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringPanel.jsx:41
+#: assets/monitoring/components/MonitoringPanel.tsx:42
 msgid "Please provide a company"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringPanel.jsx:46
+#: assets/monitoring/components/MonitoringPanel.tsx:47
 msgid "Please provide a query"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringPanel.jsx:67
+#: assets/monitoring/components/MonitoringPanel.tsx:68
 msgid "Would you like to delete the {{monitoring}} Profile: {{name}}?"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:18
+#: assets/monitoring/components/MonitoringSchedule.tsx:21
 msgid "Immediate"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:22
+#: assets/monitoring/components/MonitoringSchedule.tsx:25
 msgid "Hourly"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:26
+#: assets/monitoring/components/MonitoringSchedule.tsx:29
 msgid "Every Two Hours"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:30
+#: assets/monitoring/components/MonitoringSchedule.tsx:33
 msgid "Every Four Hours"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:34
+#: assets/monitoring/components/MonitoringSchedule.tsx:37
 msgid "Every day at"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:38
+#: assets/monitoring/components/MonitoringSchedule.tsx:41
 msgid "Every week at"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:45
+#: assets/monitoring/components/MonitoringSchedule.tsx:48
 msgid "Monday"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:49
+#: assets/monitoring/components/MonitoringSchedule.tsx:52
 msgid "Tuesday"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:53
+#: assets/monitoring/components/MonitoringSchedule.tsx:56
 msgid "Wednesday"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:57
+#: assets/monitoring/components/MonitoringSchedule.tsx:60
 msgid "Thursday"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:61
+#: assets/monitoring/components/MonitoringSchedule.tsx:64
 msgid "Friday"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:65
+#: assets/monitoring/components/MonitoringSchedule.tsx:68
 msgid "Saturday"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:69
+#: assets/monitoring/components/MonitoringSchedule.tsx:72
 msgid "Sunday"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:156
+#: assets/monitoring/components/MonitoringSchedule.tsx:159
 msgid "Schedule type"
 msgstr ""
 
-#: assets/monitoring/components/MonitoringSchedule.jsx:164
+#: assets/monitoring/components/MonitoringSchedule.tsx:167
 msgid "Day of week"
 msgstr ""
 
-#: assets/navigations/actions.jsx:94
+#: assets/navigations/actions.tsx:94
 msgid "Navigation updated successfully"
 msgstr ""
 
-#: assets/navigations/actions.jsx:96
+#: assets/navigations/actions.tsx:96
 msgid "Navigation created successfully"
 msgstr ""
 
-#: assets/navigations/actions.jsx:119
+#: assets/navigations/actions.tsx:119
 msgid "Navigation deleted successfully"
 msgstr ""
 
-#: assets/navigations/components/EditNavigation.jsx:22
+#: assets/navigations/components/EditNavigation.tsx:25
 msgid "Global Topic"
 msgstr ""
 
-#: assets/navigations/components/EditNavigation.jsx:43
+#: assets/navigations/components/EditNavigation.tsx:46
 msgid "Edit Navigation"
 msgstr ""
 
-#: assets/navigations/components/Navigations.jsx:41
+#: assets/navigations/components/Navigations.tsx:42
 msgid "Please provide navigation name"
 msgstr ""
 
-#: assets/navigations/components/Navigations.jsx:62
+#: assets/navigations/components/Navigations.tsx:63
 msgid "Would you like to delete navigation: {{name}}"
 msgstr ""
 
-#: assets/navigations/components/NavigationsApp.jsx:29
+#: assets/navigations/components/NavigationsApp.tsx:30
 msgid "New Global Topic"
 msgstr ""
 
-#: assets/news-api/actions.js:17
+#: assets/news-api/actions.ts:17
 msgid "API Token generated successfully"
 msgstr ""
 
-#: assets/news-api/actions.js:25
+#: assets/news-api/actions.ts:25
 msgid "API Token deleted successfully"
 msgstr ""
 
-#: assets/news-api/actions.js:37
+#: assets/news-api/actions.ts:37
 msgid "API Token updated successfully"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:100
+#: assets/news-api/components/EditAPIToken.tsx:101
 msgid "Cannot be in the past"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:161
+#: assets/news-api/components/EditAPIToken.tsx:162
 msgid "Are you sure you want to delete this Company's API Token?"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:197
+#: assets/news-api/components/EditAPIToken.tsx:198
 msgid "Expired On:"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:198
+#: assets/news-api/components/EditAPIToken.tsx:199
 msgid "Expires On:"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:209
+#: assets/news-api/components/EditAPIToken.tsx:210
 msgid "Token:"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:221
+#: assets/news-api/components/EditAPIToken.tsx:222
 msgid "Expires:"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:243
+#: assets/news-api/components/EditAPIToken.tsx:244
 msgid "Edit API Token"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:244
+#: assets/news-api/components/EditAPIToken.tsx:245
 msgid "Create New API Token"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:245
+#: assets/news-api/components/EditAPIToken.tsx:246
 msgid "API Token - Disabled"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:246
+#: assets/news-api/components/EditAPIToken.tsx:247
 msgid "API Token"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:247
+#: assets/news-api/components/EditAPIToken.tsx:248
 msgid "Save Token"
 msgstr ""
 
-#: assets/news-api/components/EditAPIToken.jsx:247
+#: assets/news-api/components/EditAPIToken.tsx:248
 msgid "Generate Token"
 msgstr ""
 
-#: assets/notifications/actions.js:68
+#: assets/notifications/actions.ts:68
 msgid "Notification cleared successfully"
 msgstr ""
 
-#: assets/notifications/actions.js:86
+#: assets/notifications/actions.ts:86
 msgid "Notifications cleared successfully"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:35
+#: assets/notifications/components/notificationItems.tsx:35
 msgid "Shared by {{ first_name }} {{ last_name }} at {{ time }}"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:40
+#: assets/notifications/components/notificationItems.tsx:40
 msgid "Shared by {{ first_name }} {{ last_name }} on {{ date }}"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:46
+#: assets/notifications/components/notificationItems.tsx:46
 msgid "Created at {{ time }}"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:47
+#: assets/notifications/components/notificationItems.tsx:47
 msgid "Created on {{ date }}"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:53
+#: assets/notifications/components/notificationItems.tsx:53
 msgid "Updated at {{ time }}"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:54
+#: assets/notifications/components/notificationItems.tsx:54
 msgid "Updated on {{ date }}"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:82
+#: assets/notifications/components/notificationItems.tsx:82
 msgid "A story you downloaded has been updated"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:100
+#: assets/notifications/components/notificationItems.tsx:100
 msgid "An event you are watching has been updated"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:117
+#: assets/notifications/components/notificationItems.tsx:117
 msgid "{{ agenda }} item has arrived that matches a subscribed topic"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:118
+#: assets/notifications/components/notificationItems.tsx:118
 msgid "A story has arrived that matches a subscribed topic"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:136
+#: assets/notifications/components/notificationItems.tsx:136
 msgid "{{ section }} Topic has been shared with you"
 msgstr ""
 
-#: assets/notifications/components/notificationItems.jsx:154
+#: assets/notifications/components/notificationItems.tsx:154
 msgid "{{ section }} item was shared with you"
 msgstr ""
 
-#: assets/oauth_clients/actions.js:84
+#: assets/oauth_clients/actions.ts:84
 msgid "Client updated successfully"
 msgstr ""
 
-#: assets/oauth_clients/actions.js:87
+#: assets/oauth_clients/actions.ts:87
 msgid "Client created successfully"
 msgstr ""
 
-#: assets/oauth_clients/actions.js:109
+#: assets/oauth_clients/actions.ts:109
 msgid "Client deleted successfully"
 msgstr ""
 
-#: assets/oauth_clients/components/ClientList.jsx:24
+#: assets/oauth_clients/components/ClientList.tsx:24
 msgid "Last Login"
 msgstr ""
 
-#: assets/oauth_clients/components/Clients.jsx:35
+#: assets/oauth_clients/components/Clients.tsx:36
 msgid "Please provide client name"
 msgstr ""
 
-#: assets/oauth_clients/components/Clients.jsx:58
+#: assets/oauth_clients/components/Clients.tsx:59
 msgid "Would you like to delete client: {{name}}"
 msgstr ""
 
-#: assets/oauth_clients/components/ClientsApp.jsx:25
+#: assets/oauth_clients/components/ClientsApp.tsx:26
 msgid "New Client"
 msgstr ""
 
-#: assets/oauth_clients/components/EditClient.jsx:18
+#: assets/oauth_clients/components/EditClient.tsx:19
 msgid "Edit Client"
 msgstr ""
 
-#: assets/oauth_clients/components/EditClient.jsx:20
+#: assets/oauth_clients/components/EditClient.tsx:21
 msgid "Add/Edit Client"
 msgstr ""
 
-#: assets/oauth_clients/components/EditClient.jsx:45
+#: assets/oauth_clients/components/EditClient.tsx:46
 msgid "Client Id"
 msgstr ""
 
-#: assets/oauth_clients/components/EditClient.jsx:52
+#: assets/oauth_clients/components/EditClient.tsx:53
 msgid "Client Secret"
 msgstr ""
 
-#: assets/oauth_clients/components/EditClient.jsx:55
+#: assets/oauth_clients/components/EditClient.tsx:56
 msgid ""
 "Make sure to copy your new client secret now. You won`t be able to see it"
 " again."
 msgstr ""
 
-#: assets/products/actions.js:87 assets/products/actions.js:142
-#: assets/products/actions.js:172
+#: assets/products/actions.ts:87 assets/products/actions.ts:142
+#: assets/products/actions.ts:172
 msgid "Product updated successfully"
 msgstr ""
 
-#: assets/products/actions.js:89
+#: assets/products/actions.ts:89
 msgid "Product created successfully"
 msgstr ""
 
-#: assets/products/actions.js:111
+#: assets/products/actions.ts:111
 msgid "Product deleted successfully"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:65
+#: assets/products/components/EditProduct.tsx:67
 msgid "Test product"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:80
+#: assets/products/components/EditProduct.tsx:82
 msgid "Edit Product"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:127
-#: assets/products/components/ProductList.jsx:24
-#: assets/section-filters/components/EditSectionFilter.jsx:49
-#: assets/section-filters/components/SectionFilterList.jsx:24
+#: assets/products/components/EditProduct.tsx:134
+#: assets/products/components/ProductList.tsx:24
+#: assets/section-filters/components/EditSectionFilter.tsx:50
+#: assets/section-filters/components/SectionFilterList.tsx:24
 msgid "Superdesk Product Id"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:136
+#: assets/products/components/EditProduct.tsx:143
 msgid "Test product id"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:150
-#: assets/section-filters/components/EditSectionFilter.jsx:72
+#: assets/products/components/EditProduct.tsx:157
+#: assets/section-filters/components/EditSectionFilter.tsx:73
 msgid "Test query"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:155
-#: assets/products/components/ProductList.jsx:26
+#: assets/products/components/EditProduct.tsx:162
+#: assets/products/components/ProductList.tsx:26
 msgid "Planning Item Query"
 msgstr ""
 
-#: assets/products/components/EditProduct.jsx:164
+#: assets/products/components/EditProduct.tsx:171
 msgid "Test Planning Item query"
 msgstr ""
 
-#: assets/products/components/Products.jsx:45
+#: assets/products/components/Products.tsx:46
 msgid "Please provide product name"
 msgstr ""
 
-#: assets/products/components/Products.jsx:66
+#: assets/products/components/Products.tsx:67
 msgid "Would you like to delete product: {{name}}"
 msgstr ""
 
-#: assets/products/components/ProductsApp.jsx:31
+#: assets/products/components/ProductsApp.tsx:32
 msgid "New Product"
 msgstr ""
 
-#: assets/search/actions.js:284
+#: assets/search/actions.ts:284
 msgid "Items were shared successfully."
 msgstr ""
 
-#: assets/search/actions.js:286
+#: assets/search/actions.ts:286
 msgid "Item was shared successfully."
 msgstr ""
 
-#: assets/search/actions.js:533
+#: assets/search/actions.ts:533
 msgid "Topic subscribed successfully"
 msgstr ""
 
-#: assets/search/actions.js:541
+#: assets/search/actions.ts:541
 msgid "Topic unsubscribed successfully"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:24
+#: assets/search/components/AdvancedSearchPanel.tsx:26
 msgid "Advanced Search dialog"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:26
-#: assets/search/components/SearchBar.jsx:94
+#: assets/search/components/AdvancedSearchPanel.tsx:28
+#: assets/search/components/SearchBar.tsx:94
 msgid "Advanced Search"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:31
+#: assets/search/components/AdvancedSearchPanel.tsx:33
 msgid "Show Search Tips"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:56
+#: assets/search/components/AdvancedSearchPanel.tsx:58
 msgid "All of these:"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:60
-#: assets/search/components/AdvancedSearchPanel.jsx:80
-#: assets/search/components/AdvancedSearchPanel.jsx:99
+#: assets/search/components/AdvancedSearchPanel.tsx:62
+#: assets/search/components/AdvancedSearchPanel.tsx:82
+#: assets/search/components/AdvancedSearchPanel.tsx:101
 msgid "keyword1 keyword2..."
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:68
+#: assets/search/components/AdvancedSearchPanel.tsx:70
 msgid "Finds every item that contains keyword1 AND keyword2 etc."
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:76
+#: assets/search/components/AdvancedSearchPanel.tsx:78
 msgid "Any of these:"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:87
+#: assets/search/components/AdvancedSearchPanel.tsx:89
 msgid "And every item contain keyword1 OR keyword 2 etc."
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:95
+#: assets/search/components/AdvancedSearchPanel.tsx:97
 msgid "None of these:"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:106
+#: assets/search/components/AdvancedSearchPanel.tsx:108
 msgid "And every item will NOT contain keyword1 nor keyword2 etc."
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:111
+#: assets/search/components/AdvancedSearchPanel.tsx:113
 msgid "Apply these keyword rules to at least one of these search fields:"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:121
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:197
-#: assets/wire/components/PreviewTags.jsx:35
+#: assets/search/components/AdvancedSearchPanel.tsx:134
+#: assets/wire/components/PreviewTags.tsx:35
 msgid "Slugline"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:127
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:210
+#: assets/search/components/AdvancedSearchPanel.tsx:150
 msgid "Body"
 msgstr ""
 
-#: assets/search/components/AdvancedSearchPanel.jsx:140
-#: assets/search/components/SearchResultsBar/index.jsx:67
+#: assets/search/components/AdvancedSearchPanel.tsx:168
+#: assets/search/components/SearchResultsBar/index.tsx:118
 msgid "Clear all"
 msgstr ""
 
-#: assets/search/components/FollowedTopics.jsx:92
+#: assets/search/components/FollowedTopics.tsx:59
+#: assets/search/components/TopicForm.tsx:125
+msgid "Remove from folder"
+msgstr ""
+
+#: assets/search/components/FollowedTopics.tsx:117
 msgid "Would you like to delete topic {{name}}?"
 msgstr ""
 
-#: assets/search/components/FollowedTopics.jsx:158
-#: assets/search/components/TopicsTab.jsx:97
+#: assets/search/components/FollowedTopics.tsx:208
+#: assets/search/components/TopicsTab.tsx:106
 msgid "Company Topics"
 msgstr ""
 
-#: assets/search/components/MonitoringEditor.jsx:27
+#: assets/search/components/FollowedTopics.tsx:216
+msgid "Create new folder"
+msgstr ""
+
+#: assets/search/components/FollowedTopics.tsx:220
+msgid "New folder"
+msgstr ""
+
+#: assets/search/components/MonitoringEditor.tsx:30
 msgid "{{monitoring}} Profile"
 msgstr ""
 
-#: assets/search/components/MonitoringEditor.jsx:78
+#: assets/search/components/MonitoringEditor.tsx:81
 msgid "Unsubscribed"
 msgstr ""
 
-#: assets/search/components/MonitoringEditor.jsx:81
+#: assets/search/components/MonitoringEditor.tsx:84
 msgid "Subscribed"
 msgstr ""
 
-#: assets/search/components/MonitoringEditor.jsx:96
+#: assets/search/components/MonitoringEditor.tsx:99
 msgid "{{ msg }} successfully"
 msgstr ""
 
-#: assets/search/components/MonitoringEditor.jsx:160
-#: assets/search/components/TopicForm.jsx:34
+#: assets/search/components/MonitoringEditor.tsx:163
+#: assets/search/components/TopicForm.tsx:103
 msgid "Unsubscribe"
 msgstr ""
 
-#: assets/search/components/MonitoringEditor.jsx:160
-#: assets/search/components/TopicForm.jsx:34
+#: assets/search/components/MonitoringEditor.tsx:163
+#: assets/search/components/TopicForm.tsx:103
 msgid "Subscribe"
 msgstr ""
 
-#: assets/search/components/NewItemsIcon.jsx:43
+#: assets/search/components/NewItemsIcon.tsx:46
 msgid "New events to load"
 msgstr ""
 
-#: assets/search/components/NewItemsIcon.jsx:44
+#: assets/search/components/NewItemsIcon.tsx:47
 msgid "New stories available to load"
 msgstr ""
 
-#: assets/search/components/NewItemsIcon.jsx:53
+#: assets/search/components/NewItemsIcon.tsx:56
 msgid "Refresh"
 msgstr ""
 
-#: assets/search/components/SearchBar.jsx:100
+#: assets/search/components/SearchBar.tsx:101
 msgid "Show Search tips"
 msgstr ""
 
-#: assets/search/components/SearchResults.jsx:15
+#: assets/search/components/SearchResults.tsx:15
 msgid "search results found"
 msgstr ""
 
-#: assets/search/components/SearchResults.jsx:18
+#: assets/search/components/SearchResults.tsx:18
 msgid "search results for:"
 msgstr ""
 
-#: assets/search/components/SearchTipsPanel.jsx:31
-msgid "Advanced Search Tips dialog"
-msgstr ""
-
-#: assets/search/components/SearchTipsPanel.jsx:33
-msgid "Tips"
-msgstr ""
-
-#: assets/search/components/SearchTipsPanel.jsx:39
-msgid "Close Search Tips"
-msgstr ""
-
-#: assets/search/components/SearchTipsPanel.jsx:62
-msgid "Regular search"
-msgstr ""
-
-#: assets/search/components/SearchTipsPanel.jsx:78
-msgid "Advanced search"
-msgstr ""
-
-#: assets/search/components/TopicEditor.jsx:77
+#: assets/search/components/TopicEditor.tsx:93
 msgid "Company Topic"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:77
+#: assets/search/components/TopicEditor.tsx:93
 msgid "Edit Metadata"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:78
+#: assets/search/components/TopicEditor.tsx:94
 msgid "Subscribers"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:78
+#: assets/search/components/TopicEditor.tsx:94
 msgid "Email Notifications"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:168
+#: assets/search/components/TopicEditor.tsx:207
 msgid "Topic updated successfully"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:170
+#: assets/search/components/TopicEditor.tsx:209
 msgid "Topic created successfully"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:192
+#: assets/search/components/TopicEditor.tsx:231
 msgid "Create new Topic"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:194
+#: assets/search/components/TopicEditor.tsx:233
 msgid "Save Topic"
 msgstr ""
 
-#: assets/search/components/TopicEditor.jsx:296
+#: assets/search/components/TopicEditor.tsx:461
 msgid "Send notifications to:"
 msgstr ""
 
-#: assets/search/components/TopicForm.jsx:18
-msgid "Email Notifications:"
+#: assets/search/components/TopicForm.tsx:21
+msgid "Add to folder"
 msgstr ""
 
-#: assets/search/components/TopicForm.jsx:30
-msgid "Toggle email notifications"
-msgstr ""
-
-#: assets/search/components/TopicForm.jsx:53
+#: assets/search/components/TopicForm.tsx:64
 msgid "Send me notifications"
 msgstr ""
 
-#: assets/search/components/TopicForm.jsx:62
+#: assets/search/components/TopicForm.tsx:73
 msgid "Share with my Company"
 msgstr ""
 
-#: assets/search/components/TopicForm.jsx:69
+#: assets/search/components/TopicForm.tsx:80
 msgid "Created Externally"
 msgstr ""
 
-#: assets/search/components/TopicList.jsx:63
-msgid "Created on {{ date }} at {{ time }}"
-msgstr ""
-
-#: assets/search/components/TopicParameters.jsx:22
-msgid "From: {{date}}"
-msgstr ""
-
-#: assets/search/components/TopicParameters.jsx:25
-msgid "To: {{date}}"
-msgstr ""
-
-#: assets/search/components/TopicParameters.jsx:69
-#: assets/users/components/filters/UserListSortFilter.jsx:29
-msgid "Date Created"
+#: assets/search/components/TopicForm.tsx:86
+msgid "Email Notifications:"
 msgstr ""
 
-#: assets/search/components/TopicParameters.jsx:73
-msgid "Calendar"
+#: assets/search/components/TopicForm.tsx:99
+msgid "Toggle email notifications"
 msgstr ""
 
-#: assets/search/components/TopicParameters.jsx:74
-msgid "Coverage Type"
+#: assets/search/components/TopicForm.tsx:110
+msgid "Organize your Topic"
 msgstr ""
 
-#: assets/search/components/TopicParameters.jsx:75
-msgid "Coverage Status"
+#: assets/search/components/TopicForm.tsx:143
+msgid "Topic details"
 msgstr ""
 
-#: assets/search/components/TopicsTab.jsx:41
+#: assets/search/components/TopicsTab.tsx:36
 msgid "{{ section }} Topics"
 msgstr ""
 
-#: assets/search/components/TopicsTab.jsx:47
-#: assets/search/components/TopicsTab.jsx:79
-#: assets/search/components/TopicsTab.jsx:102
+#: assets/search/components/TopicsTab.tsx:51
 msgid "No {{name}} created."
 msgstr ""
 
-#: assets/search/components/TopicsTab.jsx:63
-#: assets/search/components/TopicsTab.jsx:120
-msgid "Manage my {{name}}"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:47
-msgid "and"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:82
-msgid "or"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:116
-msgid "not"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:157
-msgid "Clear"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:165
-msgid "Search for"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsAdvancedSearchRow.jsx:170
-msgid "Fields searched"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsFiltersRow.jsx:19
-#: assets/search/components/SearchResultsBar/SearchResultsFiltersRow.jsx:36
-#: assets/wire/components/filters/NavCreatedPicker.jsx:36
-msgid "From"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsFiltersRow.jsx:52
-#: assets/wire/components/filters/NavCreatedPicker.jsx:44
-msgid "To"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsFiltersRow.jsx:113
-#: assets/wire/components/filters/FiltersTab.jsx:148
-msgid "Clear filters"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsFiltersRow.jsx:119
-msgid "Filters applied"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsQueryRow.jsx:18
-msgid "Search For"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsTopicRow.jsx:66
-msgid "Topic"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsTopicRow.jsx:86
-msgid "Update topic"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsTopicRow.jsx:102
-msgid "Save as new topic"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/SearchResultsTopicRow.jsx:103
-msgid "Save new topic"
-msgstr ""
-
-#: assets/search/components/SearchResultsBar/index.jsx:51
+#: assets/search/components/SearchResultsBar/index.tsx:102
 msgid "1 result"
 msgstr ""
 
-#: assets/search/components/SearchResultsBar/index.jsx:53
+#: assets/search/components/SearchResultsBar/index.tsx:104
 msgid "{{ count }} results"
 msgstr ""
 
-#: assets/section-filters/actions.js:72
+#: assets/section-filters/actions.ts:72
 msgid "Section Filter updated successfully"
 msgstr ""
 
-#: assets/section-filters/actions.js:74
+#: assets/section-filters/actions.ts:74
 msgid "Section Filter created successfully"
 msgstr ""
 
-#: assets/section-filters/actions.js:96
+#: assets/section-filters/actions.ts:96
 msgid "Section Filter deleted successfully"
 msgstr ""
 
-#: assets/section-filters/components/EditSectionFilter.jsx:18
+#: assets/section-filters/components/EditSectionFilter.tsx:19
 msgid "Edit Section Filters"
 msgstr ""
 
-#: assets/section-filters/components/EditSectionFilter.jsx:20
+#: assets/section-filters/components/EditSectionFilter.tsx:21
 msgid "New Filter"
 msgstr ""
 
-#: assets/section-filters/components/EditSectionFilter.jsx:58
+#: assets/section-filters/components/EditSectionFilter.tsx:59
 msgid "Test Superdesk Product id"
 msgstr ""
 
-#: assets/section-filters/components/SectionFilters.jsx:40
+#: assets/section-filters/components/SectionFilters.tsx:41
 msgid "Please provide Section Filter name"
 msgstr ""
 
-#: assets/section-filters/components/SectionFilters.jsx:61
+#: assets/section-filters/components/SectionFilters.tsx:62
 msgid "Would you like to delete Section Filter: {{name}}"
 msgstr ""
 
-#: assets/section-filters/components/SectionFiltersApp.jsx:31
+#: assets/section-filters/components/SectionFiltersApp.tsx:32
 msgid "New Section Filter"
 msgstr ""
 
-#: assets/ui/components/ArticleAuthor.jsx:10
+#: assets/ui/components/ArticleAuthor.tsx:10
 msgid "By"
 msgstr ""
 
-#: assets/ui/components/ArticleAuthor.jsx:15
+#: assets/ui/components/ArticleAuthor.tsx:15
 msgid "in {{located}}"
 msgstr ""
 
-#: assets/ui/components/ArticleEmbargoed.jsx:14
+#: assets/ui/components/ArticleEmbargoed.tsx:14
 msgid "Embargo: {{ date }}"
 msgstr ""
 
-#: assets/ui/components/ArticleMedia.jsx:17
+#: assets/ui/components/ArticleMedia.tsx:17
 msgid "Your browser does not support playing video"
 msgstr ""
 
-#: assets/ui/components/ArticleMedia.jsx:23
+#: assets/ui/components/ArticleMedia.tsx:23
 msgid "Your browser does not support playing audio"
 msgstr ""
 
-#: assets/ui/components/Content.jsx:7 assets/ui/components/Content.jsx:8
+#: assets/ui/components/Content.tsx:7 assets/ui/components/Content.tsx:8
 msgid "Item Detail"
 msgstr ""
 
-#: assets/ui/components/Preview.jsx:8
+#: assets/ui/components/Preview.tsx:8
 msgid "Article Preview"
 msgstr ""
 
-#: assets/ui/components/Preview.jsx:9
+#: assets/ui/components/Preview.tsx:9
 msgid "Article preview"
 msgstr ""
 
-#: assets/ui/components/Preview.jsx:13
-#: assets/wire/components/ItemDetails.jsx:84
+#: assets/ui/components/Preview.tsx:13
+#: assets/wire/components/ItemDetails.tsx:84
 msgid "Published on {{ date }} at {{ time }}"
 msgstr ""
 
-#: assets/user-profile/actions.js:107 assets/users/actions.js:136
+#: assets/user-profile/actions.ts:107 assets/users/actions.ts:136
 msgid "User updated successfully"
 msgstr ""
 
-#: assets/user-profile/actions.js:111
+#: assets/user-profile/actions.ts:111
 msgid "Please reload the page in order to change language."
 msgstr ""
 
-#: assets/user-profile/actions.js:145
+#: assets/user-profile/actions.ts:145
 msgid "Topic deleted successfully"
 msgstr ""
 
-#: assets/user-profile/actions.js:177
+#: assets/user-profile/actions.ts:177
 msgid "Topic was shared successfully."
 msgstr ""
 
-#: assets/user-profile/components/UserProfileApp.jsx:39
+#: assets/user-profile/actions.ts:269
+msgid "Are you sure you want to delete folder?"
+msgstr ""
+
+#: assets/user-profile/components/UserProfileApp.tsx:41
 msgid "My Profile"
 msgstr ""
 
-#: assets/user-profile/components/UserProfileApp.jsx:47
-#: assets/user-profile/components/UserProfileApp.jsx:56
+#: assets/user-profile/components/UserProfileApp.tsx:49
+#: assets/user-profile/components/UserProfileApp.tsx:58
 msgid "My {{ section }} Topics"
 msgstr ""
 
-#: assets/user-profile/components/UserProfileApp.jsx:65
+#: assets/user-profile/components/UserProfileApp.tsx:67
 msgid "My {{ monitoring }}"
 msgstr ""
 
-#: assets/user-profile/components/UserProfileApp.jsx:165
+#: assets/user-profile/components/UserProfileApp.tsx:175
 msgid "Logout"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:29
+#: assets/user-profile/components/profile/UserProfile.tsx:30
 msgid "Please provide first name"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:34
+#: assets/user-profile/components/profile/UserProfile.tsx:35
 msgid "Please provide last name"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:91
-#: assets/users/components/EditUser.jsx:136
-#: assets/users/components/UsersList.jsx:28
+#: assets/user-profile/components/profile/UserProfile.tsx:92
+#: assets/users/components/EditUser.tsx:153
+#: assets/users/components/UsersList.tsx:28
 msgid "Phone"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:118
+#: assets/user-profile/components/profile/UserProfile.tsx:119
 msgid "Receive inApp notifications"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:127
+#: assets/user-profile/components/profile/UserProfile.tsx:128
 msgid "Receive email notifications"
 msgstr ""
 
-#: assets/user-profile/components/profile/UserProfile.jsx:158
+#: assets/user-profile/components/profile/UserProfile.tsx:159
 msgid "Save Changes"
 msgstr ""
 
-#: assets/users/actions.js:138
+#: assets/users/actions.ts:138
 msgid "User created successfully"
 msgstr ""
 
-#: assets/users/actions.js:155
+#: assets/users/actions.ts:155
 msgid "Reset password token is sent successfully"
 msgstr ""
 
-#: assets/users/actions.js:174
+#: assets/users/actions.ts:174
 msgid "User deleted successfully"
 msgstr ""
 
-#: assets/users/actions.js:188
+#: assets/users/actions.ts:188
 msgid "Invitation as been resent"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:60
+#: assets/users/components/EditUser.tsx:61
 msgid "Edit User"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:63
+#: assets/users/components/EditUser.tsx:64
 msgid "Add/Edit User"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:92
-#: assets/users/components/EditUser.jsx:101
+#: assets/users/components/EditUser.tsx:92
+#: assets/users/components/EditUser.tsx:93
 msgid "Resend Invite"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:96
+#: assets/users/components/EditUser.tsx:97
 msgid "Would you like to resend the invitation for {{ email }}?"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:244
+#: assets/users/components/EditUser.tsx:113
+#: assets/users/components/EditUser.tsx:116
+msgid "Impersonate User"
+msgstr ""
+
+#: assets/users/components/EditUser.tsx:266
 msgid "User Settings"
 msgstr ""
 
-#: assets/users/components/EditUser.jsx:251
-#: assets/users/components/UserListItem.jsx:25
+#: assets/users/components/EditUser.tsx:273
+#: assets/users/components/UserListItem.tsx:25
 msgid "Approved"
 msgstr ""
 
-#: assets/users/components/UserListItem.jsx:25
+#: assets/users/components/UserListItem.tsx:25
 msgid "Needs Approval"
 msgstr ""
 
-#: assets/users/components/Users.jsx:61
+#: assets/users/components/Users.tsx:62
 msgid "Would you like to delete user: {{name}}?"
 msgstr ""
 
-#: assets/users/components/UsersList.jsx:35
-#: assets/users/components/filters/UserListSortFilter.jsx:26
+#: assets/users/components/UsersList.tsx:35
+#: assets/users/components/filters/UserListSortFilter.tsx:29
 msgid "Last Active"
 msgstr ""
 
-#: assets/users/components/filters/UserListSortFilter.jsx:16
+#: assets/users/components/filters/UserListSortFilter.tsx:19
 msgid "Sort By"
 msgstr ""
 
-#: assets/users/components/filters/UserListSortFilter.jsx:35
+#: assets/users/components/filters/UserListSortFilter.tsx:32
+msgid "Date Created"
+msgstr ""
+
+#: assets/users/components/filters/UserListSortFilter.tsx:38
 msgid "User Status"
 msgstr ""
 
-#: assets/users/components/filters/UserListSortFilter.jsx:80
+#: assets/users/components/filters/UserListSortFilter.tsx:83
 msgid "Sort by:"
 msgstr ""
 
-#: assets/users/components/filters/UserListSortFilter.jsx:103
+#: assets/users/components/filters/UserListSortFilter.tsx:106
 msgid "Sort"
 msgstr ""
 
-#: assets/wire/actions.js:135
+#: assets/wire/actions.ts:135
 msgid "Are you sure you want to permanently remove these item(s)?"
 msgstr ""
 
-#: assets/wire/actions.js:139
+#: assets/wire/actions.ts:139
 msgid "Items were removed successfully"
 msgstr ""
 
-#: assets/wire/actions.js:141
+#: assets/wire/actions.ts:141
 msgid "Item was removed successfully"
 msgstr ""
 
-#: assets/wire/components/AgendaLinks.jsx:84
+#: assets/wire/components/AgendaLinks.tsx:85
 msgid "Related Event"
 msgstr ""
 
-#: assets/wire/components/AgendaLinks.jsx:90
+#: assets/wire/components/AgendaLinks.tsx:91
 msgid "Related Coverage"
 msgstr ""
 
-#: assets/wire/components/DownloadItemsModal.jsx:52
+#: assets/wire/components/DownloadItemsModal.tsx:53
 msgid "Download Items"
 msgstr ""
 
-#: assets/wire/components/DownloadItemsModal.jsx:58
-#: assets/wire/components/DownloadItemsModal.jsx:66
+#: assets/wire/components/DownloadItemsModal.tsx:59
+#: assets/wire/components/DownloadItemsModal.tsx:66
 msgid "Format"
 msgstr ""
 
-#: assets/wire/components/FollowStory.jsx:22
+#: assets/wire/components/FollowStory.tsx:22
 msgid "Follow story"
 msgstr ""
 
-#: assets/wire/components/InfoBox.jsx:17
+#: assets/wire/components/InfoBox.tsx:17
 msgid "{{name}}"
 msgstr ""
 
-#: assets/wire/components/ItemStatisticsModal.jsx:48
+#: assets/wire/components/ItemStatisticsModal.tsx:49
 msgid "Article Statistics"
 msgstr ""
 
-#: assets/wire/components/ItemStatisticsModal.jsx:52
+#: assets/wire/components/ItemStatisticsModal.tsx:53
 msgid "There are no statistics available for selected item."
 msgstr ""
 
-#: assets/wire/components/ListItemNextVersion.jsx:44
+#: assets/wire/components/ListItemNextVersion.tsx:45
 msgid "Next version"
 msgstr ""
 
-#: assets/wire/components/ListItemPreviousVersions.jsx:41
+#: assets/wire/components/ListItemPreviousVersions.tsx:45
 msgid "Loading"
 msgstr ""
 
-#: assets/wire/components/ListSearchOptions.jsx:39
-#: assets/wire/components/ListSearchOptions.jsx:48
+#: assets/wire/components/ListSearchOptions.tsx:40
+#: assets/wire/components/ListSearchOptions.tsx:49
 msgid "Search Options"
 msgstr ""
 
-#: assets/wire/components/ListSearchOptions.jsx:63
-#: assets/wire/components/SearchAllVersionsControl.jsx:10
+#: assets/wire/components/ListSearchOptions.tsx:64
+#: assets/wire/components/SearchAllVersionsControl.tsx:10
 msgid "All Versions"
 msgstr ""
 
-#: assets/wire/components/ListSearchOptions.jsx:81
+#: assets/wire/components/ListSearchOptions.tsx:82
 msgid "News Only"
 msgstr ""
 
-#: assets/wire/components/NewsOnlyControl.jsx:10
+#: assets/wire/components/NewsOnlyControl.tsx:10
 msgid "News only"
 msgstr ""
 
-#: assets/wire/components/SelectedItemsBar.jsx:51
+#: assets/wire/components/SelectedItemsBar.tsx:52
 msgid "{{ count }} item(s) selected"
 msgstr ""
 
-#: assets/wire/components/WireApp.jsx:206
+#: assets/wire/components/WireApp.tsx:161
 msgid "{{wire}} Content"
 msgstr ""
 
-#: assets/wire/components/WireListItem.jsx:44
+#: assets/wire/components/WireListItem.tsx:44
 msgid "Hide previous versions ({{ count }}) - {{ matches }} matches"
 msgstr ""
 
-#: assets/wire/components/WireListItem.jsx:51
+#: assets/wire/components/WireListItem.tsx:51
 msgid "Hide previous versions ({{ count }})"
 msgstr ""
 
-#: assets/wire/components/WireListItem.jsx:57
+#: assets/wire/components/WireListItem.tsx:57
 msgid "Show previous versions ({{ count }}) - {{ matches }} matches"
 msgstr ""
 
-#: assets/wire/components/WireListItem.jsx:64
+#: assets/wire/components/WireListItem.tsx:64
 msgid "Show previous versions ({{ count }})"
 msgstr ""
 
-#: assets/wire/components/WireListItemDeleted.jsx:30
+#: assets/wire/components/WireListItemDeleted.tsx:30
 msgid "This item has been removed from {{ context_name }}"
 msgstr ""
 
-#: assets/wire/components/fields/Authors.jsx:14
+#: assets/wire/components/fields/Authors.tsx:14
 msgid "Authors"
 msgstr ""
 
-#: assets/wire/components/fields/Embargo.jsx:69
+#: assets/wire/components/fields/Embargo.tsx:74
 msgid "embargo"
 msgstr ""
 
-#: assets/wire/components/fields/MatchLabel.jsx:7
+#: assets/wire/components/fields/MatchLabel.tsx:7
 msgid "MATCH"
 msgstr ""
 
-#: assets/wire/components/fields/PreviousVersions.jsx:18
+#: assets/wire/components/fields/PreviousVersions.tsx:18
 msgid "{{ count }} previous versions"
 msgstr ""
 
-#: assets/wire/components/fields/VersionType.jsx:7
+#: assets/wire/components/fields/VersionType.tsx:7
 msgid "Version type: {{version}}"
 msgstr ""
 
-#: assets/wire/components/filters/FilterGroup.jsx:21
+#: assets/wire/components/filters/FilterGroup.tsx:21
 msgid "Show more"
 msgstr ""
 
-#: assets/wire/components/filters/FilterGroup.jsx:29
+#: assets/wire/components/filters/FilterGroup.tsx:29
 msgid "Show less"
 msgstr ""
 
-#: assets/wire/components/filters/NavCreatedPicker.jsx:27
+#: assets/wire/components/filters/FiltersTab.tsx:150
+msgid "Clear filters"
+msgstr ""
+
+#: assets/wire/components/filters/NavCreatedPicker.tsx:27
 msgid "Event Date"
 msgstr ""
 
-#: assets/wire/components/filters/NavigationTab.jsx:39
+#: assets/wire/components/filters/NavCreatedPicker.tsx:38
+msgid "From"
+msgstr ""
+
+#: assets/wire/components/filters/NavCreatedPicker.tsx:46
+msgid "To"
+msgstr ""
+
+#: assets/wire/components/filters/NavigationTab.tsx:39
 msgid "All"
 msgstr ""
 
diff --git a/newsroom/auth/utils.py b/newsroom/auth/utils.py
index d6789608e..4ecc7eb69 100644
--- a/newsroom/auth/utils.py
+++ b/newsroom/auth/utils.py
@@ -72,6 +72,7 @@ def clear_user_session():
     flask.session["name"] = None
     flask.session["user_type"] = None
     flask.session["auth_ttl"] = None
+    flask.session["auth_user"] = None
 
 
 def is_current_user_admin() -> bool:
diff --git a/newsroom/auth/views.py b/newsroom/auth/views.py
index 9d91bda9e..6dc4a3130 100644
--- a/newsroom/auth/views.py
+++ b/newsroom/auth/views.py
@@ -6,6 +6,7 @@
 from flask_babel import gettext
 from superdesk import get_resource_service
 from superdesk.utc import utcnow
+from newsroom.decorator import admin_only, login_required
 
 from newsroom.auth import blueprint, get_auth_user_by_email, get_user_by_email, get_company_from_user
 from newsroom.auth.forms import SignupForm, LoginForm, TokenForm, ResetPasswordForm
@@ -255,3 +256,26 @@ def set_locale():
     if locale and locale in app.config["LANGUAGES"]:
         flask.session["locale"] = locale
     return flask.redirect(flask.url_for("auth.login"))
+
+
+@blueprint.route("/auth/impersonate", methods=["POST"])
+@admin_only
+def impersonate_user():
+    if not flask.session.get("auth_user"):
+        flask.session["auth_user"] = flask.session["user"]
+    user_id = flask.request.form.get("user")
+    assert user_id
+    user = get_resource_service("users").find_one(req=None, _id=user_id)
+    assert user
+    start_user_session(user)
+    return flask.redirect(flask.url_for("wire.index"))
+
+
+@blueprint.route("/auth/impersonate_stop", methods=["POST"])
+@login_required
+def impersonate_stop():
+    assert flask.session.get("auth_user")
+    user = get_resource_service("users").find_one(req=None, _id=flask.session.get("auth_user"))
+    start_user_session(user)
+    flask.session.pop("auth_user")
+    return flask.redirect(flask.url_for("settings.app", app_id="users"))
diff --git a/newsroom/search/service.py b/newsroom/search/service.py
index e294a9243..18e7f7c52 100644
--- a/newsroom/search/service.py
+++ b/newsroom/search/service.py
@@ -71,6 +71,23 @@ def get_filter_query(
     return {"terms": {aggregation_field: val}}
 
 
+def parse_sort(value):
+    if not value:
+        return None
+
+    if not isinstance(value, str):
+        return value
+
+    def parse_field(field_spec):
+        try:
+            field, direction = field_spec.split(":")
+            return {field: direction}
+        except ValueError:
+            return field_spec
+
+    return list(filter(None, [parse_field(field) for field in value.split(",")]))
+
+
 class AdvancedSearchParams(TypedDict):
     all: str
     any: str
@@ -104,7 +121,7 @@ def __init__(self):
 
         self.aggs = None
         self.source = {}
-        self.query = {"bool": {"filter": [], "must_not": [], "should": []}}
+        self.query = {"bool": {"filter": [], "must": [], "must_not": [], "should": []}}
         self.highlight = None
         self.item_type = None
         self.planning_items_should = []
@@ -274,7 +291,7 @@ def gen_source_from_search(self, search):
         """
 
         search.source["query"] = search.query
-        search.source["sort"] = search.args.get("sort") or self.default_sort
+        search.source["sort"] = parse_sort(search.args.get("sort")) or self.default_sort
         search.source["size"] = int(search.args.get("size", self.default_page_size))
         search.source["from"] = int(search.args.get("from", 0))
 
@@ -556,7 +573,11 @@ def prefill_search_highlights(self, search, req):
             for field in fields_to_highlight:
                 highlight_search.source["highlight"]["fields"][field] = {
                     "number_of_fragments": 0,
-                    "highlight_query": {"bool": {"filter": highlight_search.query["bool"]["filter"]}},
+                    "highlight_query": {
+                        "bool": {
+                            "filter": highlight_search.query["bool"]["must"] or highlight_search.query["bool"]["filter"]
+                        }
+                    },
                 }
 
             highlight_search.source["highlight"]["pre_tags"] = ['<span class="es-highlight">']
@@ -658,30 +679,33 @@ def apply_products_filter(self, search):
             return
 
         product_ids = [p["sd_product_id"] for p in search.products if p.get("sd_product_id")]
-
         if product_ids:
             search.query["bool"]["should"].append({"terms": {"products.code": product_ids}})
 
         for product in search.products:
-            self.apply_product_filter(search, product)
+            product_filter = self.get_product_filter(search, product)
+            if product_filter:
+                search.query["bool"]["should"].append(product_filter)
+
+        if search.query["bool"]["should"]:
+            search.query["bool"]["minimum_should_match"] = 1
 
-    def apply_product_filter(self, search, product):
+    def get_product_filter(self, search, product):
         """Generate the filter for a single product
 
         :param SearchQuery search: The search query instance
         :param dict product: The product to filter
         :return:
         """
-
         if search.args.get("requested_products") and product["_id"] not in search.args["requested_products"]:
             return
 
         if product.get("query"):
-            search.query["bool"]["should"].append(query_string(product["query"]))
+            return query_string(product["query"])
 
     def apply_request_filter(self, search):
         if search.args.get("q"):
-            search.query["bool"]["filter"].append(
+            search.query["bool"].setdefault("must", []).append(
                 query_string(search.args["q"], search.args.get("default_operator") or "AND")
             )
 
@@ -745,9 +769,13 @@ def gen_advanced_query(keywords: str, operator: str, multi_match_type: str):
             }
 
         if search.advanced.get("all"):
-            search.query["bool"]["filter"].append(gen_advanced_query(search.advanced["all"], "AND", "cross_fields"))
+            search.query["bool"].setdefault("must", []).append(
+                gen_advanced_query(search.advanced["all"], "AND", "cross_fields")
+            )
         if search.advanced.get("any"):
-            search.query["bool"]["filter"].append(gen_advanced_query(search.advanced["any"], "OR", "best_fields"))
+            search.query["bool"].setdefault("must", []).append(
+                gen_advanced_query(search.advanced["any"], "OR", "best_fields")
+            )
         if search.advanced.get("exclude"):
             search.query["bool"]["must_not"].append(gen_advanced_query(search.advanced["exclude"], "OR", "best_fields"))
 
@@ -787,58 +815,17 @@ def get_matching_topics_for_item(self, topics, users, companies, query):
         section_filters = get_resource_service("section_filters").get_section_filters_dict()
 
         for topic in topics:
-            search = SearchQuery()
-
             user = users.get(str(topic["user"]))
             if not user:
                 continue
 
-            search.user = user
-            search.is_admin = is_admin(user)
-            search.company = companies.get(str(user.get("company", "")))
-
-            search.query = deepcopy(query)
-            search.section = topic.get("topic_type")
-
-            self.prefill_search_products(search)
+            company = companies.get(str(user.get("company", "")))
 
-            if topic.get("query"):
-                search.query["bool"]["filter"].append(query_string(topic["query"]))
-
-            if topic.get("created"):
-                search.query["bool"]["filter"].append(
-                    self.versioncreated_range(
-                        dict(
-                            created_from=topic["created"].get("from"),
-                            created_to=topic["created"].get("to"),
-                            timezone_offset=topic.get("timezone_offset", "0"),
-                        )
-                    )
-                )
-
-            if topic.get("filter"):
-                self.set_bool_query_from_filters(search.query["bool"], topic["filter"])
-
-            if topic.get("advanced"):
-                search.args["advanced"] = topic["advanced"]
-
-            # for now even if there's no active company matching for the user
-            # continuing with the search
-            try:
-                self.validate_request(search)
-                self.apply_section_filter(search, section_filters)
-                self.apply_company_filter(search)
-                self.apply_time_limit_filter(search)
-                self.apply_products_filter(search)
-                self.apply_request_advanced_search(search)
-            except Forbidden as exc:
-                logger.info(
-                    "Notification for user:{} and topic:{} is skipped".format(user.get("_id"), topic.get("_id")),
-                    exc_info=exc,
-                )
+            topic_query = self.get_topic_query(topic, user, company, section_filters, query)
+            if not topic_query:
                 continue
 
-            aggs["topics"]["filters"]["filters"][str(topic["_id"])] = search.query
+            aggs["topics"]["filters"]["filters"][str(topic["_id"])] = topic_query.query
 
             queried_topics.append(topic)
 
@@ -866,3 +853,57 @@ def get_matching_topics_for_item(self, topics, users, companies, query):
             raise
 
         return topic_matches
+
+    def get_topic_query(self, topic, user, company, section_filters=None, query=None):
+        search = SearchQuery()
+
+        search.user = user
+        search.is_admin = is_admin(user)
+        search.company = company
+
+        if query is not None:
+            search.query = deepcopy(query)
+        search.section = topic.get("topic_type")
+
+        self.prefill_search_products(search)
+
+        if topic.get("query"):
+            search.query["bool"]["filter"].append(query_string(topic["query"]))
+
+        if topic.get("created"):
+            search.query["bool"]["filter"].append(
+                self.versioncreated_range(
+                    dict(
+                        created_from=topic["created"].get("from"),
+                        created_to=topic["created"].get("to"),
+                        timezone_offset=topic.get("timezone_offset", "0"),
+                    )
+                )
+            )
+
+        if topic.get("filter"):
+            self.set_bool_query_from_filters(search.query["bool"], topic["filter"])
+
+        if topic.get("advanced"):
+            search.args["advanced"] = topic["advanced"]
+
+        # for now even if there's no active company matching for the user
+        # continuing with the search
+        try:
+            self.validate_request(search)
+            self.apply_filters(search)
+        except Forbidden as exc:
+            logger.info(
+                "Notification for user:{} and topic:{} is skipped".format(user.get("_id"), topic.get("_id")),
+                exc_info=exc,
+            )
+            return
+
+        return search
+
+    def get_items_by_query(self, search, size=10, aggs=None):
+        search.args["size"] = size
+        search.args["aggs"] = "false"
+        self.gen_source_from_search(search)
+        internal_req = self.get_internal_request(search)
+        return self.internal_get(internal_req, search.lookup)
diff --git a/newsroom/static/temp_logos/logo-fr.svg b/newsroom/static/temp_logos/logo-fr.svg
new file mode 100644
index 000000000..b1e22acdd
--- /dev/null
+++ b/newsroom/static/temp_logos/logo-fr.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 2588 159" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.16667,0,0,4.16667,0,0)">
+        <path d="M0,0.875L7.355,0.875L7.355,31.198L25.219,31.198L25.219,37.5L0,37.5L0,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M46.334,10.531C46.334,10.531 40.979,24.941 40.93,24.941L51.688,24.941L46.334,10.531ZM36.276,37.5L28.92,37.5L43.131,0.621L49.886,0.621L64.096,37.5L56.34,37.5L53.889,30.897L38.729,30.897L36.276,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M96.843,20.39C100.146,20.39 102.999,19.887 102.999,13.629C102.999,7.378 100.045,6.927 96.744,6.927L89.038,6.927L89.038,20.39L96.843,20.39ZM81.731,0.875L96.843,0.875C105.901,0.875 110.354,3.277 110.354,13.533C110.354,23.843 105.75,26.345 96.744,26.345L89.038,26.345L89.038,37.5L81.731,37.5L81.731,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M130.718,19.887C134.672,19.887 136.874,18.984 136.874,13.385C136.874,7.728 134.421,6.927 130.618,6.927L123.413,6.927L123.413,19.887L130.718,19.887ZM146.631,37.5L138.224,37.5L130.368,25.844L123.413,25.844L123.413,37.5L116.108,37.5L116.108,0.875L130.718,0.875C139.775,0.875 144.229,3.027 144.229,13.282C144.229,20.438 141.977,23.19 137.725,24.241L146.631,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M152.034,0.875L176.401,0.875L176.401,7.326L159.389,7.326L159.389,15.488L172.8,15.488L172.8,21.941L159.389,21.941L159.389,31.198L176.401,31.198L176.401,37.5L152.034,37.5L152.034,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M182.456,36.45L183.607,30.297C185.108,30.647 191.762,31.645 195.265,31.645C200.469,31.645 202.07,30.944 202.07,27.143C202.07,23.742 201.02,23.388 195.015,22.19C185.007,20.187 182.557,18.638 182.557,10.68C182.557,3.027 187.459,0.424 195.814,0.424C200.269,0.424 206.424,1.176 208.025,1.677L206.873,7.881C204.572,7.526 199.968,6.828 195.766,6.828C191.512,6.828 190.011,7.781 190.011,10.782C190.011,14.235 191.162,14.634 196.916,15.784C206.524,17.687 209.626,18.888 209.626,27.194C209.626,35.401 205.022,37.903 195.215,37.903C189.661,37.903 184.157,36.952 182.456,36.45Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M213.728,36.45L214.88,30.297C216.381,30.647 223.034,31.645 226.538,31.645C231.742,31.645 233.343,30.944 233.343,27.143C233.343,23.742 232.293,23.388 226.287,22.19C216.281,20.187 213.829,18.638 213.829,10.68C213.829,3.027 218.731,0.424 227.089,0.424C231.542,0.424 237.696,1.176 239.297,1.677L238.146,7.881C235.846,7.526 231.241,6.828 227.039,6.828C222.786,6.828 221.284,7.781 221.284,10.782C221.284,14.235 222.436,14.634 228.19,15.784C237.797,17.687 240.898,18.888 240.898,27.194C240.898,35.401 236.295,37.903 226.488,37.903C220.935,37.903 215.429,36.952 213.728,36.45Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M247.153,0.875L271.521,0.875L271.521,7.326L254.509,7.326L254.509,15.488L267.917,15.488L267.917,21.941L254.509,21.941L254.509,31.198L271.521,31.198L271.521,37.5L247.153,37.5L247.153,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M290.784,19.184C290.784,3.324 297.189,0.328 307.197,0.328C313.202,0.328 315.953,1.072 317.654,1.423L316.403,7.681C313.701,7.229 310.999,6.778 307.096,6.778C300.691,6.778 298.49,9.381 298.49,17.739L298.49,20.438C298.49,28.593 300.743,31.698 307.197,31.698C312,31.698 315.352,30.844 316.453,30.647L317.654,36.799C315.703,37.352 312.95,38 307.096,38C296.988,38 290.784,35.049 290.784,19.184Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M338.561,10.531C338.561,10.531 333.208,24.941 333.159,24.941L343.917,24.941L338.561,10.531ZM328.504,37.5L321.149,37.5L335.36,0.621L342.114,0.621L356.326,37.5L348.568,37.5L346.116,30.897L330.957,30.897L328.504,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M360.277,0.875L367.582,0.875L383.696,24.189L383.696,0.875L390.75,0.875L390.75,37.5L384.445,37.5L367.333,12.635L367.333,37.5L360.277,37.5L360.277,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M412.118,10.531C412.118,10.531 406.762,24.941 406.712,24.941L417.469,24.941L412.118,10.531ZM402.059,37.5L394.703,37.5L408.914,0.621L415.668,0.621L429.879,37.5L422.123,37.5L419.67,30.897L404.511,30.897L402.059,37.5Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M447.492,31.645C453.895,31.645 456.347,28.793 456.347,20.39L456.347,17.99C456.347,9.529 453.895,6.878 447.492,6.878L441.188,6.878L441.188,31.645L447.492,31.645ZM433.832,0.875L447.542,0.875C458.399,0.875 464.105,3.426 464.105,19.184C464.105,34.95 458.399,37.5 447.542,37.5L433.832,37.5L433.832,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <rect x="470.958" y="0.875" width="7.404" height="36.625" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M487.167,0.875L511.539,0.875L511.539,7.326L494.524,7.326L494.524,15.488L507.933,15.488L507.933,21.941L494.524,21.941L494.524,31.198L511.539,31.198L511.539,37.5L487.167,37.5L487.167,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M517.742,0.875L525.045,0.875L541.156,24.189L541.156,0.875L548.213,0.875L548.213,37.5L541.91,37.5L524.795,12.635L524.795,37.5L517.742,37.5L517.742,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M556.72,0.875L564.023,0.875L580.138,24.189L580.138,0.875L587.191,0.875L587.191,37.5L580.887,37.5L563.776,12.635L563.776,37.5L556.72,37.5L556.72,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+        <path d="M595.7,0.875L620.067,0.875L620.067,7.326L603.052,7.326L603.052,15.488L616.461,15.488L616.461,21.941L603.052,21.941L603.052,31.198L620.067,31.198L620.067,37.5L595.7,37.5L595.7,0.875Z" style="fill:white;fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/newsroom/static/temp_logos/logo-newspro-fr.svg b/newsroom/static/temp_logos/logo-newspro-fr.svg
new file mode 100644
index 000000000..c3ecb42cb
--- /dev/null
+++ b/newsroom/static/temp_logos/logo-newspro-fr.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 499.31 51.62"><defs><style>.cls-1{fill:#fff;}</style></defs><path class="cls-1" d="M0,50.76V1.8H16.78l11.8,40.32h.72V1.8h9.94v49H22.9L10.66,10.44H9.94V50.76Z"/><path class="cls-1" d="M83.77,45.54Q79.19,51.63,68,51.62T52.31,45.54q-4.58-6.09-4.57-19T52.31,7.24Q56.87.94,68,.94t15.73,6.3q4.58,6.3,4.57,19.26T83.77,45.54ZM60.08,39.2Q62.21,43,68,43t8-3.78q2.11-3.78,2.12-12.67T76,13.61q-2.16-4-7.92-4t-7.92,4Q58,17.65,58,26.53T60.08,39.2Z"/><path class="cls-1" d="M106.34,34.42q0,8.56,8.71,8.56t8.72-8.56V1.8h9.93V34.2q0,9-4.64,13.21t-14,4.21q-9.36,0-14-4.21T96.41,34.2V1.8h9.93Z"/><path class="cls-1" d="M170.42,1.8h10.44l-11.37,49H151.13l-11.38-49h10.44l8.5,40.32h3.24Z"/><path class="cls-1" d="M187.34,50.76V1.8H219v8.64H197.28V21.89H214.7v8.49H197.28V42.12H219v8.64Z"/><path class="cls-1" d="M255.09,50.76H227.23V1.8h9.93V42h17.93Z"/><path class="cls-1" d="M289.08,50.76H261.21V1.8h9.94V42h17.93Z"/><path class="cls-1" d="M295.19,50.76V1.8h31.68v8.64H305.13V21.89h17.43v8.49H305.13V42.12h21.74v8.64Z"/><path class="cls-1" d="M350.13,9.58q-7.85,0-7.85,5.18a3.93,3.93,0,0,0,2,3.53q1.93,1.22,9.1,3.53T363.38,27q2.88,2.91,2.88,9,0,7.71-4.68,11.66t-12.24,4a68.07,68.07,0,0,1-13.75-1.72l-2.6-.51,1-7.7A120.35,120.35,0,0,0,348.76,43q7.64,0,7.63-6.33a4.19,4.19,0,0,0-1.76-3.6c-1.18-.87-3.52-1.8-7-2.81q-8.36-2.37-11.77-5.65t-3.42-9.11q0-7.35,4.46-10.94T349.12.94a81.37,81.37,0,0,1,13.54,1.44l2.59.5-.79,7.85Q354.31,9.58,350.13,9.58Z"/><path class="cls-1" d="M393.47,33.34H379.65V50.76h-4.46V.72h18.28q8,0,11.78,3.89t3.77,12Q409,33.33,393.47,33.34Zm-13.82-4h13.82q10.95,0,10.95-12.82c0-4.08-.87-7.08-2.59-9s-4.52-2.88-8.36-2.88H379.65Z"/><path class="cls-1" d="M422.34,31V50.76h-4.46V.72h18.36q7.85,0,11.7,3.56t3.85,11.27q0,12-9.64,14.62l10.29,20.59h-5L437.61,31Zm24.85-15.41q0-5.61-2.67-8.28t-8.28-2.66h-13.9V27.07h13.9Q447.19,27.07,447.19,15.62Z"/><path class="cls-1" d="M499.31,26.13q0,13.4-4.21,19.37t-15.34,6q-11.11,0-15.33-6.12T460.22,26q0-13.22,4.24-19.62T479.73,0q11,0,15.3,6.37T499.31,26.13ZM467.85,42.44c2,3.34,6,5,11.91,5s9.9-1.63,11.92-4.9,3-8.72,3-16.38-1.05-13.26-3.16-16.81S485.49,4,479.73,4q-8.93,0-12,5.76a20.24,20.24,0,0,0-2.26,6.77,60.59,60.59,0,0,0-.62,9.43Q464.82,37.43,467.85,42.44Z"/></svg>
\ No newline at end of file
diff --git a/newsroom/static/temp_logos/logo-newspro.svg b/newsroom/static/temp_logos/logo-newspro.svg
new file mode 100644
index 000000000..5f0020517
--- /dev/null
+++ b/newsroom/static/temp_logos/logo-newspro.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320.97 51.62"><defs><style>.cls-1{fill:#fff;}</style></defs><path class="cls-1" d="M0,50.76V1.8H16.78l11.8,40.32h.72V1.8h9.94v49H22.9L10.66,10.44H9.94V50.76Z"/><path class="cls-1" d="M49.9,50.76V1.8H81.58v8.64H59.83V21.89H77.26v8.49H59.83V42.12H81.58v8.64Z"/><path class="cls-1" d="M85.82,1.8H96.26l6,40.46h1.08L112.17,1.8h11.52l8.79,40.46h1.08L139.61,1.8h10.44l-9.36,49h-15l-7.7-37.22-7.71,37.22h-15Z"/><path class="cls-1" d="M171.79,9.58q-7.84,0-7.85,5.18a3.93,3.93,0,0,0,1.95,3.53q1.94,1.22,9.1,3.53T185,27q2.88,2.91,2.88,9,0,7.71-4.68,11.66t-12.24,4a68.07,68.07,0,0,1-13.75-1.72l-2.6-.51,1-7.7A120.35,120.35,0,0,0,170.42,43q7.64,0,7.63-6.33a4.19,4.19,0,0,0-1.76-3.6c-1.18-.87-3.52-1.8-7-2.81q-8.36-2.37-11.77-5.65t-3.42-9.11q0-7.35,4.46-10.94T170.78.94a81.37,81.37,0,0,1,13.54,1.44l2.59.5-.79,7.85Q176,9.58,171.79,9.58Z"/><path class="cls-1" d="M215.13,33.34H201.31V50.76h-4.46V.72h18.28q8,0,11.78,3.89t3.78,12Q230.69,33.33,215.13,33.34Zm-13.82-4h13.82q11,0,11-12.82c0-4.08-.87-7.08-2.59-9S219,4.68,215.13,4.68H201.31Z"/><path class="cls-1" d="M244,31V50.76h-4.46V.72H257.9q7.85,0,11.7,3.56t3.85,11.27q0,12-9.65,14.62l10.3,20.59h-5L259.27,31Zm24.84-15.41c0-3.74-.88-6.5-2.66-8.28s-4.54-2.66-8.28-2.66H244V27.07h13.9Q268.85,27.07,268.84,15.62Z"/><path class="cls-1" d="M321,26.14q0,13.38-4.21,19.36t-15.34,6q-11.12,0-15.33-6.12T281.88,26q0-13.22,4.24-19.62T301.39,0q11,0,15.3,6.37T321,26.14Zm-31.46,16.3q3,5,11.91,5t11.92-4.9q3-4.89,3-16.38T313.19,9.36Q310,4,301.39,4q-8.92,0-12,5.76a20.24,20.24,0,0,0-2.26,6.77,60.59,60.59,0,0,0-.62,9.43Q286.48,37.43,289.51,42.44Z"/></svg>
\ No newline at end of file
diff --git a/newsroom/static/temp_logos/logo.svg b/newsroom/static/temp_logos/logo.svg
new file mode 100644
index 000000000..05d0626d2
--- /dev/null
+++ b/newsroom/static/temp_logos/logo.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="380px" height="37px" viewBox="0 0 380 37" style="enable-background:new 0 0 380 37;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<polygon class="st0" points="7.3,19.8 0.7,19.8 0.7,16.2 17.9,16.2 17.9,19.8 11.4,19.8 11.4,36.5 7.3,36.5 	"/>
+	<polygon class="st0" points="21.5,16.2 25.5,16.2 25.5,24.1 34.6,24.1 34.6,16.2 38.7,16.2 38.7,36.5 34.6,36.5 34.6,27.8 
+		25.5,27.8 25.5,36.5 21.5,36.5 	"/>
+	<polygon class="st0" points="43.5,16.2 57,16.2 57,19.8 47.6,19.8 47.6,24.3 55,24.3 55,27.9 47.6,27.9 47.6,33 57,33 57,36.5 
+		43.5,36.5 	"/>
+	<path class="st0" d="M67.6,26.4c0-8.8,3.5-10.4,9.1-10.4c3.3,0,4.8,0.4,5.8,0.6L81.8,20c-1.5-0.3-3-0.5-5.2-0.5
+		c-3.5,0-4.8,1.4-4.8,6.1V27c0,4.5,1.2,6.2,4.8,6.2c2.7,0,4.5-0.5,5.1-0.6l0.7,3.4c-1.1,0.3-2.6,0.7-5.8,0.7
+		C71.1,36.8,67.6,35.1,67.6,26.4"/>
+	<path class="st0" d="M89.1,36.5h-4.1l7.9-20.4h3.7l7.9,20.4h-4.3l-1.4-3.7h-8.4L89.1,36.5z M94.7,21.6c0,0-3,8-3,8h5.9L94.7,21.6z"
+		/>
+	<polygon class="st0" points="107.4,16.2 111.4,16.2 120.3,29.1 120.3,16.2 124.2,16.2 124.2,36.5 120.7,36.5 111.3,22.7 
+		111.3,36.5 107.4,36.5 	"/>
+	<path class="st0" d="M131.1,36.5H127l7.9-20.4h3.7l7.9,20.4h-4.3l-1.4-3.7h-8.4L131.1,36.5z M136.7,21.6c0,0-3,8-3,8h5.9
+		L136.7,21.6z"/>
+	<path class="st0" d="M149.3,16.2h7.6c6,0,9.2,1.4,9.2,10.1s-3.2,10.1-9.2,10.1h-7.6V16.2z M156.9,33.3c3.5,0,4.9-1.6,4.9-6.2v-1.3
+		c0-4.7-1.4-6.1-4.9-6.1h-3.5v13.7L156.9,33.3L156.9,33.3z"/>
+	<rect x="169.8" y="16.2" class="st0" width="4.1" height="20.3"/>
+	<path class="st0" d="M180.9,36.5h-4.1l7.9-20.4h3.7l7.9,20.4H192l-1.4-3.7h-8.4L180.9,36.5z M186.4,21.6c0,0-3,8-3,8h5.9
+		L186.4,21.6z"/>
+	<polygon class="st0" points="199,16.2 203,16.2 212,29.1 212,16.2 215.9,16.2 215.9,36.5 212.4,36.5 202.9,22.7 202.9,36.5 
+		199,36.5 	"/>
+	<path class="st0" d="M228,16.2h8.4c5,0,7.5,1.3,7.5,7c0,5.7-2.6,7.1-7.5,7.1h-4.3v6.2h-4L228,16.2L228,16.2z M236.4,27
+		c1.8,0,3.4-0.3,3.4-3.7s-1.6-3.7-3.5-3.7h-4.3V27H236.4z"/>
+	<path class="st0" d="M264.6,36.5h-4.6l-4.4-6.5h-3.9v6.5h-4V16.2h8.1c5,0,7.5,1.2,7.5,6.9c0,4-1.3,5.5-3.6,6.1L264.6,36.5z
+		 M255.8,26.8c2.2,0,3.4-0.5,3.4-3.6c0-3.1-1.4-3.6-3.5-3.6h-4v7.2H255.8z"/>
+	<polygon class="st0" points="268.2,16.2 281.7,16.2 281.7,19.8 272.3,19.8 272.3,24.3 279.7,24.3 279.7,27.9 272.3,27.9 272.3,33 
+		281.7,33 281.7,36.5 268.2,36.5 	"/>
+	<path class="st0" d="M285.5,35.9l0.6-3.4c0.8,0.2,4.5,0.8,6.5,0.8c2.9,0,3.8-0.4,3.8-2.5c0-1.9-0.6-2.1-3.9-2.7
+		c-5.5-1.1-6.9-2-6.9-6.4c0-4.2,2.7-5.7,7.3-5.7c2.5,0,5.9,0.4,6.8,0.7l-0.6,3.4c-1.3-0.2-3.8-0.6-6.1-0.6c-2.4,0-3.2,0.5-3.2,2.2
+		c0,1.9,0.6,2.1,3.8,2.8c5.3,1,7,1.7,7,6.3c0,4.5-2.5,5.9-8,5.9C289.5,36.7,286.4,36.2,285.5,35.9"/>
+	<path class="st0" d="M303.7,35.9l0.6-3.4c0.8,0.2,4.5,0.8,6.5,0.8c2.9,0,3.8-0.4,3.8-2.5c0-1.9-0.6-2.1-3.9-2.7
+		c-5.5-1.1-6.9-2-6.9-6.4c0-4.2,2.7-5.7,7.3-5.7c2.5,0,5.9,0.4,6.8,0.7l-0.6,3.4c-1.3-0.2-3.8-0.6-6.1-0.6c-2.3,0-3.2,0.5-3.2,2.2
+		c0,1.9,0.6,2.1,3.8,2.8c5.3,1,7,1.7,7,6.3c0,4.5-2.5,5.9-8,5.9C307.7,36.7,304.6,36.2,303.7,35.9"/>
+	<path class="st0" d="M329.5,15.1V0.2h10.4v16H334c0.8,4,5.9,5.5,5.9,5.5V24C339.9,23.9,330.7,22.2,329.5,15.1"/>
+	<path class="st0" d="M379.3,15.1V0.2h-10.4v16h5.9c-0.8,4-5.9,5.5-5.9,5.5V24C368.9,23.9,378.1,22.2,379.3,15.1"/>
+	<g>
+		<g>
+			<g>
+				<path class="st0" d="M358.8,16.4c0,0,0-0.1,0-0.1c0,0,0,0,0.1-0.1l5.4-3.9l-1.2-1c0,0,0,0,0-0.1c0,0,0-0.1,0-0.1l0,0l1-2.7
+					L361.2,9c0,0-0.1,0-0.1,0c0,0,0,0-0.1-0.1l0,0l-0.9-1.4l-2.7,2.6c0,0-0.1,0.1-0.2,0s-0.1-0.1-0.1-0.1l1.2-5.8l-1.8,1.2
+					c0,0-0.1,0-0.1,0c0,0-0.1,0-0.1-0.1l0,0l-2-4.2l-2,4.2c0,0,0,0.1-0.1,0.1s-0.1,0-0.1,0l-1.8-1.2l1.2,5.8c0,0.1,0,0.1-0.1,0.1
+					s-0.1,0-0.1,0l-2.7-2.6l-0.9,1.4l0,0c0,0,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0L345,8.4l1,2.7l0,0c0,0,0,0,0,0.1s0,0.1,0,0.1l-1.2,1
+					l5.4,3.9c0,0,0,0,0.1,0.1c0,0,0,0.1,0,0.1l0,0l-1.2,1.9l4.7-0.7c0.1,0,0.2,0,0.2,0.1v4h1.1v-4c0-0.1,0.1-0.1,0.2-0.1l4.7,0.7
+					L358.8,16.4L358.8,16.4z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/newsroom/template_filters.py b/newsroom/template_filters.py
index e1386fca4..61eb9a101 100644
--- a/newsroom/template_filters.py
+++ b/newsroom/template_filters.py
@@ -231,3 +231,7 @@ def get_slugline(item, with_take_key: bool = False):
         slugline += take_key_suffix
 
     return slugline
+
+
+def initials(name):
+    return "".join([piece[0].upper() for piece in name.split(" ") if piece])
diff --git a/newsroom/templates/base_layout.html b/newsroom/templates/base_layout.html
index a16050a1c..78bac03cc 100644
--- a/newsroom/templates/base_layout.html
+++ b/newsroom/templates/base_layout.html
@@ -4,10 +4,14 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
+    {% block title_wrapper %}
     <title>{{ config.SITE_NAME }} - {% block title %}{% endblock %}</title>
+    {% endblock %}
 
+    {% block fonts %}
     <link href="https://fonts.googleapis.com/css?family=Merriweather:300,400,700,900" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,900" rel="stylesheet">
+    {% endblock %}
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/alertifyjs@1.11.0/build/css/alertify.min.css"/>
     <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/alertifyjs@1.11.0/build/css/themes/bootstrap.min.css"/>
 
@@ -25,18 +29,23 @@
     {% block topnav %}
         <nav class="main navbar">
             <h3 class="a11y-only">{{ gettext('Main Navigation Bar') }}</h3>
+            {% block logo %}
             {% include 'logo.html' %}
+            {% endblock %}
+
             <div class="navbar-brand">
                 <nav>
                     {% block breadcrumb %}{% endblock %}
                 </nav>
             </div>
 
+            {% include "impersonate_user.html" %}
+
             {% if session.get('name') %}
             <div class="navbar__right">
                 <div class="navbar__date">{{ get_date() | date_header }}</div>
                 <div class="navbar-notifications" id="header-notification"></div>
-                <div id="header-profile-toggle"></div>
+                <div id="header-profile-toggle" data-test-id="header-avatar"></div>
             </div>
             {% else %}
             <div class="navbar__right navbar__right--login">
@@ -61,10 +70,10 @@ <h3 class="a11y-only">{{ gettext('Side Navigation') }}</h3>
                         {% for nav in sidenavs(request.blueprint)|selectattr("group", "equalto", group) %}
                         {% if group > 0 and loop.first and loop.length %}
                         <li class="sidenav-icons__separator">
-                            <span className="separator__dot" aria-hidden="true"></span>
-                            <span className="separator__dot" aria-hidden="true"></span>
-                            <span className="separator__dot" aria-hidden="true"></span>
-                            <span className="separator__dot" aria-hidden="true"></span>
+                            <span class="separator__dot" aria-hidden="true"></span>
+                            <span class="separator__dot" aria-hidden="true"></span>
+                            <span class="separator__dot" aria-hidden="true"></span>
+                            <span class="separator__dot" aria-hidden="true"></span>
                         </li>
                         {% endif %}
 
diff --git a/newsroom/templates/impersonate_user.html b/newsroom/templates/impersonate_user.html
new file mode 100644
index 000000000..d0bdf6d6a
--- /dev/null
+++ b/newsroom/templates/impersonate_user.html
@@ -0,0 +1,24 @@
+{% if session.get("auth_user") %}
+<div class="impersonate-user__wrapper">
+    <div class="impersonate-user">
+        <div class="impersonate-user__inner">
+            <div class="impersonate-user__avatar">
+                <span class="impersonate-user__avatar-characters">
+                    {{ session.get("name")|initials|upper }}
+                </span>
+            </div>
+            <div class="impersonate-user__inner-text" data-test-id="impersonate-user-info">
+                <span class="impersonate-user__inner-text-label">{{ gettext("Impersonating") }}</span>
+                <span class="impersonate-user__inner-text-name">{{ session.get("name") }}</span>
+            </div>
+        </div>
+        <div class="impersonate-user__button-group">
+            <form method="POST" action="{{ url_for('auth.impersonate_stop') }}">
+                <button class="impersonate-user__button" aria-label="{{ gettext('Stop impersonation') }}" type="submit" data-test-id="impersonate-stop-btn">
+                    <i class="icon--close-thin" role="presentation"></i>
+                </button>
+            </form>
+        </div>
+    </div>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/newsroom/templates/layout_login.html b/newsroom/templates/layout_login.html
index 404b3e902..8ac4a0831 100644
--- a/newsroom/templates/layout_login.html
+++ b/newsroom/templates/layout_login.html
@@ -1,7 +1,7 @@
 {% extends "layout_wire.html" %}
 
 {% block contentMain %}
-<div class="container-fluid py-5 overflow-auto">
+<div class="container-fluid py-5 overflow-auto nh-login-page__content">
     <div class="row">
         <div class="col-12 col-md-8 col-lg-6 col-xxl-4 mx-auto">
             <div class="card border-0 bg-white box-shadow--z1">
diff --git a/newsroom/templates/login.html b/newsroom/templates/login.html
index 0afbb3f1e..ffc5deb92 100644
--- a/newsroom/templates/login.html
+++ b/newsroom/templates/login.html
@@ -2,7 +2,7 @@
 
 {% block contentMain %}
 
-<div class="container-fluid py-5 overflow-auto">
+<div class="container-fluid py-5 overflow-auto nh-login-page__content">
     <div class="row">
         <div class="col-12 col-md-8 col-lg-6 col-xxl-4 mx-auto">
             <div class="card border-0 bg-white box-shadow--z1">
diff --git a/newsroom/templates/signup.html b/newsroom/templates/signup.html
index 7a13ac564..ab02d7caf 100644
--- a/newsroom/templates/signup.html
+++ b/newsroom/templates/signup.html
@@ -2,7 +2,7 @@
 
 {% block contentMain %}
 
-<div class="container-fluid py-5 overflow-auto">
+<div class="container-fluid py-5 overflow-auto nh-login-page__content">
     <div class="row">
         <div class="col-12 col-md-8 col-lg-6 col-xxl-4 mx-auto">
             <div class="card border-0 bg-white box-shadow--z1">
diff --git a/newsroom/tests/fixtures.py b/newsroom/tests/fixtures.py
index 68464865e..3e42f27f0 100644
--- a/newsroom/tests/fixtures.py
+++ b/newsroom/tests/fixtures.py
@@ -36,7 +36,7 @@
         "body_html": "<p>Weather report</p>",
         "ancestors": ["tag:weather", "tag:weather:old"],
         "firstcreated": datetime.now() - timedelta(days=5),
-        "versioncreated": datetime.now().replace(hour=23, minute=55) - timedelta(days=5),
+        "versioncreated": datetime.now().replace(hour=23, minute=55, second=10) - timedelta(days=5),
         "service": [{"code": "b", "name": "Service B"}],
         "products": [{"code": 2, "name": "product-2"}],
     },
@@ -48,7 +48,7 @@
         "slugline": "Disaster",
         "body_html": "<p>Water levels keep rising</p>",
         "firstcreated": datetime.now() - timedelta(days=5),
-        "versioncreated": datetime.now().replace(hour=23, minute=55) - timedelta(days=5),
+        "versioncreated": datetime.now().replace(hour=23, minute=55, second=20) - timedelta(days=5),
         "service": [{"code": "c", "name": "Service C"}],
         "products": [{"code": 7, "name": "product-7"}],
     },
@@ -223,6 +223,7 @@ def setup_user_company(app):
         [
             {
                 "_id": PUBLIC_USER_ID,
+                "user_type": "public",
                 "email": "foo@bar.com",
                 "first_name": PUBLIC_USER_FIRSTNAME,
                 "last_name": PUBLIC_USER_LASTNAME,
@@ -233,9 +234,11 @@ def setup_user_company(app):
                 "receive_email": True,
                 "receive_app_notifications": True,
                 "password": "$2b$12$HGyWCf9VNfnVAwc2wQxQW.Op3Ejk7KIGE6urUXugpI0KQuuK6RWIG",
+                "manage_company_topics": False,
             },
             {
                 "_id": TEST_USER_ID,
+                "user_type": "public",
                 "email": "test@bar.com",
                 "first_name": "Test",
                 "last_name": "Bar",
@@ -246,6 +249,7 @@ def setup_user_company(app):
                 "receive_email": True,
                 "receive_app_notifications": True,
                 "password": "$2b$12$HGyWCf9VNfnVAwc2wQxQW.Op3Ejk7KIGE6urUXugpI0KQuuK6RWIG",
+                "manage_company_topics": False,
             },
         ],
     )
@@ -270,3 +274,36 @@ def public_user(app, init_company):
 def anonymous_user(client):
     with client.session_transaction() as session:
         session.clear()
+
+
+@fixture
+def company_products(app):
+    app.data.insert(
+        "products",
+        [
+            {
+                "_id": 12,
+                "name": "product test",
+                "query": "headline:more",
+                "companies": [COMPANY_1_ID],
+                "is_enabled": True,
+                "product_type": "wire",
+            },
+            {
+                "_id": 13,
+                "name": "product test 2",
+                "query": "headline:Weather",
+                "companies": [COMPANY_1_ID],
+                "is_enabled": True,
+                "product_type": "wire",
+            },
+            {
+                "_id": 15,
+                "name": "all content",
+                "query": "*:*",
+                "companies": [COMPANY_1_ID],
+                "is_enabled": True,
+                "product_type": "wire",
+            },
+        ],
+    )
diff --git a/newsroom/topics/topics.py b/newsroom/topics/topics.py
index e0df360c0..214056607 100644
--- a/newsroom/topics/topics.py
+++ b/newsroom/topics/topics.py
@@ -65,6 +65,16 @@ def on_update(self, updates, original):
     def get_items(self, item_ids):
         return self.get(req=None, lookup={"_id": {"$in": item_ids}})
 
+    def on_delete(self, doc):
+        super().on_delete(doc)
+        # remove topic from users personal dashboards
+        users = superdesk.get_resource_service("users").get(req=None, lookup={"dashboards.topic_ids": doc["_id"]})
+        for user in users:
+            updates = {"dashboards": user["dashboards"].copy()}
+            for dashboard in updates["dashboards"]:
+                dashboard["topic_ids"] = [topic_id for topic_id in dashboard["topic_ids"] if topic_id != doc["_id"]]
+            superdesk.get_resource_service("users").system_update(user["_id"], updates, user)
+
 
 def get_user_topics(user_id):
     user = superdesk.get_resource_service("users").find_one(req=None, _id=ObjectId(user_id))
diff --git a/newsroom/users/users.py b/newsroom/users/users.py
index d34cbeb5e..d9d7f2c45 100644
--- a/newsroom/users/users.py
+++ b/newsroom/users/users.py
@@ -79,6 +79,20 @@ class UsersResource(newsroom.Resource):
             "type": "dict",
             "nullable": True,
         },
+        "dashboards": {
+            "type": "list",
+            "schema": {
+                "type": "dict",
+                "schema": {
+                    "name": {"type": "string"},
+                    "type": {"type": "string"},
+                    "topic_ids": {
+                        "type": "list",
+                        "schema": newsroom.Resource.rel("topics"),
+                    },
+                },
+            },
+        },
     }
 
     item_methods = ["GET", "PATCH", "PUT", "DELETE"]
@@ -106,6 +120,9 @@ class UsersResource(newsroom.Resource):
     "receive_email",
     "receive_app_notifications",
     "role",
+    "dashboards",
+    "expiry_alert",
+    "_updated",
 }
 
 
@@ -267,7 +284,9 @@ def check_permissions(self, doc, updates=None):
         if request and request.url_rule and request.url_rule.rule:
             if request.url_rule.rule in ["/reset_password/<token>", "/token/<token_type>"]:
                 return
-            elif request.url_rule.rule in ["/users/<_id>", "/users/<_id>/profile"]:
+            elif request.url_rule.rule in ["/users/<_id>", "/users/<_id>/profile"] or (
+                request.endpoint and "|item" in request.endpoint and request.method == "PATCH"
+            ):
                 if not updated_fields or all([key in USER_PROFILE_UPDATES for key in updated_fields]):
                     return
         abort(403)
diff --git a/newsroom/web/default_settings.py b/newsroom/web/default_settings.py
index a0bd608ce..edc2035e4 100644
--- a/newsroom/web/default_settings.py
+++ b/newsroom/web/default_settings.py
@@ -70,7 +70,6 @@
 CONTENTAPI_ELASTICSEARCH_SETTINGS["settings"]["analysis"]["analyzer"]["html_field_analyzer"]["filter"] = [
     "lowercase",
     "asciifolding",
-    "stop",
 ]
 
 XML = False
diff --git a/newsroom/web/factory.py b/newsroom/web/factory.py
index e1a8e60ef..54eb18fe6 100644
--- a/newsroom/web/factory.py
+++ b/newsroom/web/factory.py
@@ -26,6 +26,7 @@
     theme_url,
     to_json,
     get_slugline,
+    initials,
 )
 from newsroom.notifications.notifications import get_initial_notifications
 from newsroom.limiter import limiter
@@ -107,6 +108,7 @@ def _setup_jinja(self):
         self.add_template_filter(date_short)
         self.add_template_filter(word_count)
         self.add_template_filter(char_count)
+        self.add_template_filter(initials)
         self.add_template_global(get_company_sidenavs, "sidenavs")
         self.add_template_global(sidenavs_by_names)
         self.add_template_global(sidenavs_by_group)
diff --git a/newsroom/wire/search.py b/newsroom/wire/search.py
index 67264b061..56ccccad7 100644
--- a/newsroom/wire/search.py
+++ b/newsroom/wire/search.py
@@ -250,6 +250,7 @@ def get_matching_topics(self, item_id, topics, users, companies):
                     ],
                     "filter": [{"term": {"_id": item_id}}],
                     "should": [],
+                    "must": [],
                 }
             },
         )
diff --git a/newsroom/wire/views.py b/newsroom/wire/views.py
index 964183bf8..08b50eae5 100644
--- a/newsroom/wire/views.py
+++ b/newsroom/wire/views.py
@@ -134,6 +134,36 @@ def delete_dashboard_caches():
         app.cache.delete(f"{HOME_ITEMS_CACHE_KEY}{company['_id']}")
 
 
+def get_personal_dashboards_data(user, company, topics):
+    def get_topic_items(topic):
+        query = superdesk.get_resource_service("wire_search").get_topic_query(topic, user, company)
+        return list(superdesk.get_resource_service("wire_search").get_items_by_query(query, size=4))
+
+    def _get_topic_data(topic_id):
+        for topic in topics:
+            if topic["_id"] == topic_id:
+                items = get_topic_items(topic)
+                if items:
+                    return {
+                        "_id": topic["_id"],
+                        "items": items,
+                    }
+                break
+        return None
+
+    def _get_dashboard_data(dashboard, index):
+        return {
+            "dashboard_id": f"d{index}",
+            "dashboard_name": dashboard.get("name", ""),
+            "topic_items": list(
+                filter(None, [_get_topic_data(topic_id) for topic_id in dashboard.get("topic_ids") or []])
+            ),
+        }
+
+    dashboards = user.get("dashboards") or []
+    return [_get_dashboard_data(dashboard, i) for i, dashboard in enumerate(dashboards)]
+
+
 def get_home_data():
     user = get_user()
     company = get_company(user)
@@ -161,6 +191,7 @@ def get_home_data():
         "topics": topics,
         "ui_config": get_resource_service("ui_config").get_section_config("home"),
         "groups": app.config.get("WIRE_GROUPS", []),
+        "personalizedDashboards": get_personal_dashboards_data(user, company, topics),
     }
 
 
diff --git a/package-lock.json b/package-lock.json
index 4bfd8bd53..d10f89985 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,11 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA=="
+    },
     "@ampproject/remapping": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
@@ -14,66 +19,58 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.5"
       }
     },
     "@babel/compat-data": {
-      "version": "7.21.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.9.tgz",
-      "integrity": "sha512-FUGed8kfhyWvbYug/Un/VPJD41rDIgoVVcR+FuzhzOYyRz5uED+Gd3SLZml0Uw2l2aHFb7ZgdW5mGA3G2cCCnQ=="
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
     },
     "@babel/core": {
-      "version": "7.21.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz",
-      "integrity": "sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
+      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-compilation-targets": "^7.21.5",
-        "@babel/helper-module-transforms": "^7.21.5",
-        "@babel/helpers": "^7.21.5",
-        "@babel/parser": "^7.21.8",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helpers": "^7.22.6",
+        "@babel/parser": "^7.22.7",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.8",
+        "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.2.2",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "json5": {
           "version": "2.2.3",
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
           "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
         }
       }
     },
     "@babel/generator": {
-      "version": "7.21.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.9.tgz",
-      "integrity": "sha512-F3fZga2uv09wFdEjEQIJxXALXfz0+JaOb7SabvVMmjHxeVTuGW8wgE8Vp1Hd7O+zMTYtcfEISGRzPkeiaPPsvg==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
+      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
       "requires": {
-        "@babel/types": "^7.21.5",
+        "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -87,122 +84,137 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz",
-      "integrity": "sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
+      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
       "requires": {
-        "@babel/compat-data": "^7.21.5",
-        "@babel/helper-validator-option": "^7.21.0",
-        "browserslist": "^4.21.3",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.5",
+        "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
+        "semver": "^6.3.1"
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.21.5",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-          "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+          "version": "4.21.10",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+          "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
           "requires": {
-            "caniuse-lite": "^1.0.30001449",
-            "electron-to-chromium": "^1.4.284",
-            "node-releases": "^2.0.8",
-            "update-browserslist-db": "^1.0.10"
+            "caniuse-lite": "^1.0.30001517",
+            "electron-to-chromium": "^1.4.477",
+            "node-releases": "^2.0.13",
+            "update-browserslist-db": "^1.0.11"
           }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
-      "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
     },
     "@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
-      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "requires": {
-        "@babel/types": "^7.21.4"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz",
-      "integrity": "sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.21.5",
-        "@babel/helper-module-imports": "^7.21.4",
-        "@babel/helper-simple-access": "^7.21.5",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz",
-      "integrity": "sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "requires": {
-        "@babel/types": "^7.21.5"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
-      "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
     },
     "@babel/helpers": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz",
-      "integrity": "sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
+      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.5",
-        "@babel/types": "^7.21.5"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.6",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -230,11 +242,6 @@
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
           "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -246,79 +253,59 @@
       }
     },
     "@babel/parser": {
-      "version": "7.21.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.9.tgz",
-      "integrity": "sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g=="
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
     },
     "@babel/runtime": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz",
-      "integrity": "sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
       "requires": {
         "regenerator-runtime": "^0.13.11"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.11",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-          "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-        }
       }
     },
     "@babel/template": {
-      "version": "7.21.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.21.9.tgz",
-      "integrity": "sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "requires": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/parser": "^7.21.9",
-        "@babel/types": "^7.21.5"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/traverse": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
-      "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
-      "requires": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.5",
-        "@babel/helper-environment-visitor": "^7.21.5",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.5",
-        "@babel/types": "^7.21.5",
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
+      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "requires": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.7",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.7",
+        "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "globals": {
           "version": "11.12.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
           "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
     "@babel/types": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
-      "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
       "requires": {
-        "@babel/helper-string-parser": "^7.21.5",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       },
       "dependencies": {
@@ -329,6 +316,83 @@
         }
       }
     },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw=="
+    },
+    "@eslint/eslintrc": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        },
+        "globals": {
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
+      }
+    },
+    "@eslint/js": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA=="
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -370,22 +434,43 @@
         }
       }
     },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
     "@popperjs/core": {
-      "version": "2.11.7",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
-      "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw=="
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
     },
     "@remix-run/router": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.6.2.tgz",
-      "integrity": "sha512-LzqpSrMK/3JBAVBI9u3NWtOhWNw5AMQfrUFYB0+bDHTSw17z++WJLsPsxAuK+oSddsxk4d7F/JcdDPM1M5YAhA==",
-      "dev": true
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
+      "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A=="
     },
     "@sinonjs/commons": {
       "version": "1.8.6",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
       "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
-      "dev": true,
       "requires": {
         "type-detect": "4.0.8"
       }
@@ -394,7 +479,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
       "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
-      "dev": true,
       "requires": {
         "samsam": "1.3.0"
       }
@@ -403,7 +487,6 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz",
       "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==",
-      "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.3.0",
         "array-from": "^2.1.1",
@@ -413,13 +496,90 @@
     "@sinonjs/text-encoding": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
-      "dev": true
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ=="
+    },
+    "@types/bootstrap": {
+      "version": "5.2.6",
+      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.6.tgz",
+      "integrity": "sha512-BlAc3YATdasbHoxMoBWODrSF6qwQO/E9X8wVxCCSa6rWjnaZfpkr2N6pUMCY6jj2+wf0muUtLySbvU9etX6YqA==",
+      "requires": {
+        "@popperjs/core": "^2.9.2"
+      }
+    },
+    "@types/cheerio": {
+      "version": "0.22.31",
+      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.31.tgz",
+      "integrity": "sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/enzyme": {
+      "version": "3.10.13",
+      "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.10.13.tgz",
+      "integrity": "sha512-FCtoUhmFsud0Yx9fmZk179GkdZ4U9B0GFte64/Md+W/agx0L5SxsIIbhLBOxIb9y2UfBA4WQnaG1Od/UsUQs9Q==",
+      "requires": {
+        "@types/cheerio": "*",
+        "@types/react": "^16"
+      },
+      "dependencies": {
+        "@types/react": {
+          "version": "16.14.43",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.43.tgz",
+          "integrity": "sha512-7zdjv7jvoLLQg1tTvpQsm+hyNUMT2mPlNV1+d0I8fbGhkJl82spopMyBlu4wb1dviZAxpGdk5eHu/muacknnfw==",
+          "requires": {
+            "@types/prop-types": "*",
+            "@types/scheduler": "*",
+            "csstype": "^3.0.2"
+          }
+        }
+      }
+    },
+    "@types/jasmine": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.5.tgz",
+      "integrity": "sha512-9YHUdvuNDDRJYXZwHqSsO72Ok0vmqoJbNn73ttyITQp/VA60SarnZ+MPLD37rJAhVoKp+9BWOvJP5tHIRfZylQ=="
     },
     "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
+    },
+    "@types/karma": {
+      "version": "6.3.4",
+      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-6.3.4.tgz",
+      "integrity": "sha512-aefuFcs4e4NAOi1Ue4AP9fR2TQv45NFpdaLXdg+3FxDDndk/4T6LoHRTmKtRVqkwtQPh5Ntc3CxsoOgzldAAfg==",
+      "requires": {
+        "@types/node": "*",
+        "log4js": "^6.4.1"
+      }
+    },
+    "@types/karma-chrome-launcher": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
+      "integrity": "sha512-Yh4CuoVjpcXh+p+TPKZC6AlodS4w9217Y+uWy1jNkhX/9+wuvSiyE0uD8SaZCkpWVoJUisuhC8eS4QpZ6EKCtQ==",
+      "requires": {
+        "@types/karma": "*"
+      }
+    },
+    "@types/karma-jasmine": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/karma-jasmine/-/karma-jasmine-4.0.2.tgz",
+      "integrity": "sha512-eI7nm/IOPMMMYv9E0iVJVb90sp+mYSVCeWAEToyji37jOGEJKf8nfQZ7OwG9gMbymYuiaViEHY3l+fU7cmlI6w==",
+      "requires": {
+        "@types/jasmine": "*",
+        "@types/karma": "*"
+      }
+    },
+    "@types/lodash": {
+      "version": "4.14.196",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.196.tgz",
+      "integrity": "sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ=="
+    },
+    "@types/node": {
+      "version": "20.4.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.8.tgz",
+      "integrity": "sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg=="
     },
     "@types/prop-types": {
       "version": "15.7.5",
@@ -427,15 +587,51 @@
       "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
     },
     "@types/react": {
-      "version": "18.2.6",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.6.tgz",
-      "integrity": "sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==",
+      "version": "17.0.62",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz",
+      "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
+    "@types/react-datepicker": {
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.15.0.tgz",
+      "integrity": "sha512-kr10s8ex4+MmCJmzdhA9kfmoMQBmsW5uDYDlH+8f/PgStrp7rRaz23Y/cvTiMgvESVq8ujDh4SOo6jlSwEw13g==",
+      "requires": {
+        "@popperjs/core": "^2.9.2",
+        "@types/react": "*",
+        "date-fns": "^2.0.1",
+        "react-popper": "^2.2.5"
+      }
+    },
+    "@types/react-dom": {
+      "version": "17.0.20",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz",
+      "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==",
+      "requires": {
+        "@types/react": "^17"
+      }
+    },
+    "@types/react-redux": {
+      "version": "5.0.24",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-5.0.24.tgz",
+      "integrity": "sha512-EJfdjLtxceQmrVZrcwSZR6V97e6qyG/gaJ2MQrsVzGYiXO2cN+oHBSizB1/SnReTkorpEgQulhVdYcFee8abqQ==",
+      "requires": {
+        "@types/react": "*",
+        "redux": "^3.6.0"
+      }
+    },
+    "@types/react-toggle": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/react-toggle/-/react-toggle-4.0.3.tgz",
+      "integrity": "sha512-57QdMWeeQdRjM2/p+udgYerxUbSkmeUIW18kwUttcci6GHkgxoqCsDZfRtsCsAHcvvM5VBQdtDUEgLWo2e87mA==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "@types/react-transition-group": {
       "version": "4.4.6",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
@@ -444,16 +640,152 @@
         "@types/react": "*"
       }
     },
+    "@types/redux-logger": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/redux-logger/-/redux-logger-3.0.9.tgz",
+      "integrity": "sha512-cwYhVbYNgH01aepeMwhd0ABX6fhVB2rcQ9m80u8Fl50ZODhsZ8RhQArnLTkE7/Zrfq4Sz/taNoF7DQy9pCZSKg==",
+      "requires": {
+        "redux": "^4.0.0"
+      },
+      "dependencies": {
+        "redux": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+          "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+          "requires": {
+            "@babel/runtime": "^7.9.2"
+          }
+        }
+      }
+    },
     "@types/scheduler": {
       "version": "0.16.3",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
       "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
     },
+    "@types/semver": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="
+    },
+    "@types/sinon": {
+      "version": "10.0.16",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.16.tgz",
+      "integrity": "sha512-j2Du5SYpXZjJVJtXBokASpPRj+e2z+VUhCPHmM6WMfe3dpHu6iVKJMU6AiBcMp/XTAYnEj6Wc1trJUWwZ0QaAQ==",
+      "requires": {
+        "@types/sinonjs__fake-timers": "*"
+      }
+    },
+    "@types/sinonjs__fake-timers": {
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz",
+      "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA=="
+    },
+    "@types/store": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/store/-/store-2.0.2.tgz",
+      "integrity": "sha512-ZPHnXkzmGMfk+pHqAGzTSpA9CbsHmJLgkvOl5w52LZ0XTxB1ZIHWZzQ7lEtjTNWScBbsQekg8TjApMXkMe4nkw=="
+    },
+    "@types/webpack-env": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.1.tgz",
+      "integrity": "sha512-D0HJET2/UY6k9L6y3f5BL+IDxZmPkYmPT4+qBrRdmRLYRuV0qNKizMgTvYxXZYn+36zjPeoDZAEYBCM6XB+gww=="
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "requires": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "requires": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      }
+    },
+    "@typescript-eslint/type-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "requires": {
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ=="
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "requires": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "requires": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
     "@wojtekmaj/enzyme-adapter-react-17": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.8.0.tgz",
       "integrity": "sha512-zeUGfQRziXW7R7skzNuJyi01ZwuKCH8WiBNnTgUJwdS/CURrJwAhWsfW7nG7E30ak8Pu3ZwD9PlK9skBfAoOBw==",
-      "dev": true,
       "requires": {
         "@wojtekmaj/enzyme-adapter-utils": "^0.2.0",
         "enzyme-shallow-equal": "^1.0.0",
@@ -463,17 +795,10 @@
         "react-test-renderer": "^17.0.0"
       },
       "dependencies": {
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-          "dev": true
-        },
         "react-test-renderer": {
           "version": "17.0.2",
           "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz",
           "integrity": "sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==",
-          "dev": true,
           "requires": {
             "object-assign": "^4.1.1",
             "react-is": "^17.0.2",
@@ -487,7 +812,6 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.2.0.tgz",
       "integrity": "sha512-ZvZm9kZxZEKAbw+M1/Q3iDuqQndVoN8uLnxZ8bzxm7KgGTBejrGRoJAp8f1EN8eoO3iAjBNEQnTDW/H4Ekb0FQ==",
-      "dev": true,
       "requires": {
         "function.prototype.name": "^1.1.0",
         "has": "^1.0.0",
@@ -501,23 +825,23 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
+      "integrity": "sha512-AOPopplFOUlmUugwiZUCDpOwmqvSgdCyE8iJVLWI4NcB7qfMKQN34dn5xYtlUU03XGG5egRWW4NW5gIxpa5hEA==",
       "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
+        "mime-types": "~2.1.11",
+        "negotiator": "0.6.1"
       }
     },
     "acorn": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
     },
     "acorn-dynamic-import": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "integrity": "sha512-GKp5tQ8h0KMPWIYGRHHXI1s5tUpZixZ3IHF2jAu42wSCf6In/G873s6/y4DdKdhWvzhu1T6mE1JgvnhAKqyYYQ==",
       "requires": {
         "acorn": "^4.0.3"
       },
@@ -525,42 +849,29 @@
         "acorn": {
           "version": "4.0.13",
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+          "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug=="
         }
       }
     },
     "acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-      "dev": true,
-      "requires": {
-        "acorn": "^3.0.4"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
     },
     "after": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-      "dev": true
+      "integrity": "sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA=="
     },
     "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
     "ajv-errors": {
@@ -581,62 +892,90 @@
     "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
       "requires": {
         "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
+      "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ=="
     },
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
-    },
-    "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "dev": true
+      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="
     },
     "ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
+      "integrity": "sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA=="
     },
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="
     },
     "anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "optional": true,
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
+          "requires": {
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
+          }
+        }
       }
     },
     "aproba": {
@@ -662,9 +1001,12 @@
       }
     },
     "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
+      "requires": {
+        "arr-flatten": "^1.0.1"
+      }
     },
     "arr-flatten": {
       "version": "1.1.0",
@@ -674,7 +1016,7 @@
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="
     },
     "array-buffer-byte-length": {
       "version": "1.0.0",
@@ -688,7 +1030,7 @@
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
+      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="
     },
     "array-flatten": {
       "version": "2.1.2",
@@ -698,8 +1040,7 @@
     "array-from": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
-      "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
-      "dev": true
+      "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg=="
     },
     "array-includes": {
       "version": "3.1.6",
@@ -716,32 +1057,27 @@
     "array-slice": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-      "dev": true
+      "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q=="
     },
     "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
     },
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q=="
     },
     "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg=="
     },
     "array.prototype.filter": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.2.tgz",
       "integrity": "sha512-us+UrmGOilqttSOgoWZTpOvHu68vZT2YCjc/H4vhu56vzZpaDFBhB+Se2UwqWzMKbDv7Myq5M5pcZLAtUvTQdQ==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -754,7 +1090,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
       "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -766,7 +1101,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
       "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -778,7 +1112,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
       "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -791,7 +1124,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
       "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -800,11 +1132,23 @@
         "get-intrinsic": "^1.1.3"
       }
     },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
     "arraybuffer.slice": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
-      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
-      "dev": true
+      "integrity": "sha512-6ZjfQaBSy6CuIH0+B0NrxMfDE5VIOCP/5gOqSpEIsaAZx9/giszzrXg6PZ7G51U/n88UmlAgYLNQ9wAnII7PJA=="
     },
     "asn1": {
       "version": "0.2.6",
@@ -844,12 +1188,12 @@
         "inherits": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="
         },
         "util": {
           "version": "0.10.3",
           "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
           "requires": {
             "inherits": "2.0.1"
           }
@@ -859,12 +1203,12 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
     },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
     },
     "async": {
       "version": "2.6.4",
@@ -882,12 +1226,12 @@
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
+      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA=="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "atob": {
       "version": "2.1.2",
@@ -897,7 +1241,7 @@
     "autoprefixer": {
       "version": "6.7.7",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+      "integrity": "sha512-WKExI/eSGgGAkWAO+wMVdFObZV7hQen54UpD1kCCTN3tvlL3W1jL4+lPP/M7MwoP7Q4RHzKtO3JQ4HxYEcd+xQ==",
       "requires": {
         "browserslist": "^1.7.6",
         "caniuse-db": "^1.0.30000634",
@@ -915,7 +1259,7 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
     },
     "aws4": {
       "version": "1.12.0",
@@ -925,11 +1269,18 @@
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg=="
+        }
       }
     },
     "babel-core": {
@@ -956,6 +1307,26 @@
         "private": "^0.1.8",
         "slash": "^1.0.0",
         "source-map": "^0.5.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg=="
+        }
       }
     },
     "babel-generator": {
@@ -976,7 +1347,7 @@
     "babel-helper-builder-react-jsx": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
-      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+      "integrity": "sha512-02I9jDjnVEuGy2BR3LRm9nPRb/+Ja0pvZVLr1eI5TYAA/dB0Xoc+WBo50+aDfhGDLhlBY1+QURjn9uvcFd8gzg==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -986,7 +1357,7 @@
     "babel-helper-call-delegate": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "integrity": "sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ==",
       "requires": {
         "babel-helper-hoist-variables": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -997,7 +1368,7 @@
     "babel-helper-define-map": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "integrity": "sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA==",
       "requires": {
         "babel-helper-function-name": "^6.24.1",
         "babel-runtime": "^6.26.0",
@@ -1008,7 +1379,7 @@
     "babel-helper-function-name": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "integrity": "sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q==",
       "requires": {
         "babel-helper-get-function-arity": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1020,7 +1391,7 @@
     "babel-helper-get-function-arity": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "integrity": "sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-types": "^6.24.1"
@@ -1029,7 +1400,7 @@
     "babel-helper-hoist-variables": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "integrity": "sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-types": "^6.24.1"
@@ -1038,7 +1409,7 @@
     "babel-helper-optimise-call-expression": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "integrity": "sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-types": "^6.24.1"
@@ -1047,7 +1418,7 @@
     "babel-helper-regex": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "integrity": "sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -1057,7 +1428,7 @@
     "babel-helper-replace-supers": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "integrity": "sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw==",
       "requires": {
         "babel-helper-optimise-call-expression": "^6.24.1",
         "babel-messages": "^6.23.0",
@@ -1070,7 +1441,7 @@
     "babel-helpers": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-template": "^6.24.1"
@@ -1089,7 +1460,7 @@
     "babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1097,7 +1468,7 @@
     "babel-plugin-check-es2015-constants": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "integrity": "sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1105,22 +1476,22 @@
     "babel-plugin-syntax-flow": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0="
+      "integrity": "sha512-HbTDIoG1A1op7Tl/wIFQPULIBA61tsJ8Ntq2FAhLwuijrzosM/92kAfgU1Q3Kc7DH/cprJg5vDfuTY4QUL4rDA=="
     },
     "babel-plugin-syntax-jsx": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
+      "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw=="
     },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+      "integrity": "sha512-C4Aq+GaAj83pRQ0EFgTvw5YO6T3Qz2KGrNRwIj9mSoNHVvdZY4KO2uA6HNtNXCw993iSZnckY1aLW8nOi8i4+w=="
     },
     "babel-plugin-transform-es2015-arrow-functions": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "integrity": "sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1128,7 +1499,7 @@
     "babel-plugin-transform-es2015-block-scoped-functions": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "integrity": "sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1136,7 +1507,7 @@
     "babel-plugin-transform-es2015-block-scoping": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "integrity": "sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "babel-template": "^6.26.0",
@@ -1148,7 +1519,7 @@
     "babel-plugin-transform-es2015-classes": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "integrity": "sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag==",
       "requires": {
         "babel-helper-define-map": "^6.24.1",
         "babel-helper-function-name": "^6.24.1",
@@ -1164,7 +1535,7 @@
     "babel-plugin-transform-es2015-computed-properties": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "integrity": "sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-template": "^6.24.1"
@@ -1173,7 +1544,7 @@
     "babel-plugin-transform-es2015-destructuring": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "integrity": "sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1181,7 +1552,7 @@
     "babel-plugin-transform-es2015-duplicate-keys": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "integrity": "sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-types": "^6.24.1"
@@ -1190,7 +1561,7 @@
     "babel-plugin-transform-es2015-for-of": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "integrity": "sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1198,7 +1569,7 @@
     "babel-plugin-transform-es2015-function-name": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "integrity": "sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg==",
       "requires": {
         "babel-helper-function-name": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1208,7 +1579,7 @@
     "babel-plugin-transform-es2015-literals": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "integrity": "sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1216,7 +1587,7 @@
     "babel-plugin-transform-es2015-modules-amd": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "integrity": "sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA==",
       "requires": {
         "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1237,7 +1608,7 @@
     "babel-plugin-transform-es2015-modules-systemjs": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "integrity": "sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg==",
       "requires": {
         "babel-helper-hoist-variables": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1247,7 +1618,7 @@
     "babel-plugin-transform-es2015-modules-umd": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "integrity": "sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw==",
       "requires": {
         "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1257,7 +1628,7 @@
     "babel-plugin-transform-es2015-object-super": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "integrity": "sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA==",
       "requires": {
         "babel-helper-replace-supers": "^6.24.1",
         "babel-runtime": "^6.22.0"
@@ -1266,7 +1637,7 @@
     "babel-plugin-transform-es2015-parameters": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "integrity": "sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ==",
       "requires": {
         "babel-helper-call-delegate": "^6.24.1",
         "babel-helper-get-function-arity": "^6.24.1",
@@ -1279,7 +1650,7 @@
     "babel-plugin-transform-es2015-shorthand-properties": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "integrity": "sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-types": "^6.24.1"
@@ -1288,7 +1659,7 @@
     "babel-plugin-transform-es2015-spread": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "integrity": "sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1296,7 +1667,7 @@
     "babel-plugin-transform-es2015-sticky-regex": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "integrity": "sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ==",
       "requires": {
         "babel-helper-regex": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1306,7 +1677,7 @@
     "babel-plugin-transform-es2015-template-literals": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "integrity": "sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1314,7 +1685,7 @@
     "babel-plugin-transform-es2015-typeof-symbol": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "integrity": "sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1322,7 +1693,7 @@
     "babel-plugin-transform-es2015-unicode-regex": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "integrity": "sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ==",
       "requires": {
         "babel-helper-regex": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1332,7 +1703,7 @@
     "babel-plugin-transform-flow-strip-types": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
-      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+      "integrity": "sha512-TxIM0ZWNw9oYsoTthL3lvAK3+eTujzktoXJg4ubGvICGbVuXVYv5hHv0XXpz8fbqlJaGYY4q5SVzaSmsg3t4Fg==",
       "requires": {
         "babel-plugin-syntax-flow": "^6.18.0",
         "babel-runtime": "^6.22.0"
@@ -1341,7 +1712,7 @@
     "babel-plugin-transform-object-rest-spread": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
-      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "integrity": "sha512-ocgA9VJvyxwt+qJB0ncxV8kb/CjfTcECUY4tQ5VT7nP6Aohzobm8CDFaQ5FHdvZQzLmf0sgDxB8iRXZXxwZcyA==",
       "requires": {
         "babel-plugin-syntax-object-rest-spread": "^6.8.0",
         "babel-runtime": "^6.26.0"
@@ -1350,7 +1721,7 @@
     "babel-plugin-transform-react-display-name": {
       "version": "6.25.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
-      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+      "integrity": "sha512-QLYkLiZeeED2PKd4LuXGg5y9fCgPB5ohF8olWUuETE2ryHNRqqnXlEVP7RPuef89+HTfd3syptMGVHeoAu0Wig==",
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1358,7 +1729,7 @@
     "babel-plugin-transform-react-jsx": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
-      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+      "integrity": "sha512-s+q/Y2u2OgDPHRuod3t6zyLoV8pUHc64i/O7ZNgIOEdYTq+ChPeybcKBi/xk9VI60VriILzFPW+dUxAEbTxh2w==",
       "requires": {
         "babel-helper-builder-react-jsx": "^6.24.1",
         "babel-plugin-syntax-jsx": "^6.8.0",
@@ -1368,7 +1739,7 @@
     "babel-plugin-transform-react-jsx-self": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
-      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+      "integrity": "sha512-Y3ZHP1nunv0U1+ysTNwLK39pabHj6cPVsfN4TRC7BDBfbgbyF4RifP5kd6LnbuMV9wcfedQMe7hn1fyKc7IzTQ==",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.8.0",
         "babel-runtime": "^6.22.0"
@@ -1377,7 +1748,7 @@
     "babel-plugin-transform-react-jsx-source": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
-      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+      "integrity": "sha512-pcDNDsZ9q/6LJmujQ/OhjeoIlp5Nl546HJ2yiFIJK3mYpgNXhI5/S9mXfVxu5yqWAi7HdI7e/q6a9xtzwL69Vw==",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.8.0",
         "babel-runtime": "^6.22.0"
@@ -1386,7 +1757,7 @@
     "babel-plugin-transform-regenerator": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "integrity": "sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg==",
       "requires": {
         "regenerator-transform": "^0.10.0"
       }
@@ -1394,7 +1765,7 @@
     "babel-plugin-transform-strict-mode": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "integrity": "sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw==",
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-types": "^6.24.1"
@@ -1403,7 +1774,7 @@
     "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
@@ -1413,14 +1784,14 @@
         "regenerator-runtime": {
           "version": "0.10.5",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+          "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w=="
         }
       }
     },
     "babel-preset-es2015": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
-      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "integrity": "sha512-XfwUqG1Ry6R43m4Wfob+vHbIVBIqTg/TJY4Snku1iIzeH7mUnwHA8Vagmv+ZQbPwhS8HgsdQvy28Py3k5zpoFQ==",
       "requires": {
         "babel-plugin-check-es2015-constants": "^6.22.0",
         "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
@@ -1451,7 +1822,7 @@
     "babel-preset-flow": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
-      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+      "integrity": "sha512-PQZFJXnM3d80Vq4O67OE6EMVKIw2Vmzy8UXovqulNogCtblWU8rzP7Sm5YgHiCg4uejUxzCkHfNXQ4Z6GI+Dhw==",
       "requires": {
         "babel-plugin-transform-flow-strip-types": "^6.22.0"
       }
@@ -1459,7 +1830,7 @@
     "babel-preset-react": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
-      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+      "integrity": "sha512-phQe3bElbgF887UM0Dhz55d22ob8czTL1kbhZFwpCE6+R/X9kHktfwmx9JZb+bBSVRGphP5tZ9oWhVhlgjrX3Q==",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.3.13",
         "babel-plugin-transform-react-display-name": "^6.23.0",
@@ -1472,7 +1843,7 @@
     "babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
       "requires": {
         "babel-core": "^6.26.0",
         "babel-runtime": "^6.26.0",
@@ -1486,16 +1857,23 @@
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
-      }
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+        }
+      }
     },
     "babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
@@ -1507,7 +1885,7 @@
     "babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
@@ -1518,12 +1896,27 @@
         "globals": "^9.18.0",
         "invariant": "^2.2.2",
         "lodash": "^4.17.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
       }
     },
     "babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "requires": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
@@ -1539,8 +1932,7 @@
     "backo2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "dev": true
+      "integrity": "sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA=="
     },
     "balanced-match": {
       "version": "1.0.2",
@@ -1564,7 +1956,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -1594,14 +1986,23 @@
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
     "base64-arraybuffer": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-      "dev": true
+      "integrity": "sha512-437oANT9tP582zZMwSvZGy2nmSeAb8DW2me3y+Uv1Wp2Rulr8Mqlyrv3E7MLxmsiaPSMMDmiDVzgE+e8zlMx9g=="
     },
     "base64-js": {
       "version": "1.5.1",
@@ -1611,18 +2012,17 @@
     "base64id": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
-      "dev": true
+      "integrity": "sha512-rz8L+d/xByiB/vLVftPkyY215fqNrmasrcJsYkVcm4TgJNz+YXKrFaFAWibSaHkiKoSgMDCb+lipOIRQNGYesw=="
     },
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -1630,8 +2030,7 @@
     "better-assert": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-      "dev": true,
+      "integrity": "sha512-bYeph2DFlpK1XmGs6fvlLRUN29QISM3GBuUwSFsMY2XRx4AvC0WNCS57j4c/xGrK2RS24C1w3YoBOsw9fT46tQ==",
       "requires": {
         "callsite": "1.0.0"
       }
@@ -1642,10 +2041,9 @@
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
     "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "optional": true
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
     },
     "bindings": {
       "version": "1.5.0",
@@ -1659,13 +2057,12 @@
     "blob": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
-      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
-      "dev": true
+      "integrity": "sha512-YRc9zvVz4wNaxcXmiSgb9LAg7YYwqQ2xd0Sj6osfA7k/PKmIGVlnOYs3wOFdkRC9/JpQu8sGt/zHgJV7xzerfg=="
     },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==",
       "requires": {
         "inherits": "~2.0.0"
       }
@@ -1681,12 +2078,12 @@
       "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
     },
     "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "requires": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -1694,15 +2091,18 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
         },
         "iconv-lite": {
           "version": "0.4.24",
@@ -1712,20 +2112,17 @@
             "safer-buffer": ">= 2.1.2 < 3"
           }
         },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
     "bonjour": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==",
       "requires": {
         "array-flatten": "^2.1.0",
         "deep-equal": "^1.0.1",
@@ -1738,8 +2135,7 @@
     "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
     "bootstrap": {
       "version": "5.1.3",
@@ -1759,7 +2155,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "optional": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
@@ -1767,7 +2162,7 @@
     "brorand": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
     },
     "browserify-aes": {
       "version": "1.2.0",
@@ -1856,7 +2251,7 @@
     "browserslist": {
       "version": "1.7.7",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+      "integrity": "sha512-qHJblDE2bXVRYzuDetv/wAeHOJyO97+9wxC1cdCtyzgNuSozOyRCiiLaCR1f71AN66lQdVVBipWm63V+a7bPOw==",
       "requires": {
         "caniuse-db": "^1.0.30000639",
         "electron-to-chromium": "^1.2.7"
@@ -1870,13 +2265,19 @@
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4",
         "isarray": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+        }
       }
     },
     "buffer-alloc": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "dev": true,
       "requires": {
         "buffer-alloc-unsafe": "^1.1.0",
         "buffer-fill": "^1.0.0"
@@ -1885,14 +2286,12 @@
     "buffer-alloc-unsafe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-      "dev": true
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
     },
     "buffer-fill": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true
+      "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="
     },
     "buffer-from": {
       "version": "1.1.2",
@@ -1907,37 +2306,52 @@
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
     },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
     },
     "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
     "cacache": {
-      "version": "11.3.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
-      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
-      "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "requires": {
+        "bluebird": "^3.5.1",
+        "chownr": "^1.0.1",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.1.11",
+        "lru-cache": "^4.1.1",
+        "mississippi": "^2.0.0",
         "mkdirp": "^0.5.1",
         "move-concurrently": "^1.0.1",
         "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^5.2.4",
+        "unique-filename": "^1.1.0",
         "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+        }
       }
     },
     "cache-base": {
@@ -1954,6 +2368,13 @@
         "to-object-path": "^0.3.0",
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        }
       }
     },
     "call-bind": {
@@ -1965,32 +2386,20 @@
         "get-intrinsic": "^1.0.2"
       }
     },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "^0.2.0"
-      }
-    },
     "callsite": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-      "dev": true
+      "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ=="
     },
     "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-      "dev": true
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
-      "dev": true,
       "requires": {
         "no-case": "^2.2.0",
         "upper-case": "^1.1.1"
@@ -1999,12 +2408,12 @@
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+      "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw=="
     },
     "camelcase-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
       "requires": {
         "camelcase": "^2.0.0",
         "map-obj": "^1.0.0"
@@ -2013,7 +2422,7 @@
     "caniuse-api": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
+      "integrity": "sha512-SBTl70K0PkDUIebbkXrxWqZlHNs0wRgRD6QZ8guctShjbh63gEPfF+Wj0Yw+75f5Y8tSzqAI/NcisYv/cCah2Q==",
       "requires": {
         "browserslist": "^1.3.6",
         "caniuse-db": "^1.0.30000529",
@@ -2022,24 +2431,24 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001489",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001489.tgz",
-      "integrity": "sha512-y4hMxaQf5j0Sw+u9F9fTV0M8ybQJa4zoNw1MpeJhsSs23845oaNChzqJL4Z34DSIO5nwqTLa4vAGez4JNCPv9A=="
+      "version": "1.0.30001519",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001519.tgz",
+      "integrity": "sha512-nY0JTY0Po8r8bNBred32hc3QMr2+I/CsJCGmH6tZaVEFUzLSfv64i1E8VwTqP3Of6yyzu4MDKus2eoR0pHCZ2A=="
     },
     "caniuse-lite": {
-      "version": "1.0.30001489",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001489.tgz",
-      "integrity": "sha512-x1mgZEXK8jHIfAxm+xgdpHpk50IN3z3q3zP261/WS+uvePxW8izXuCu6AHz0lkuYTlATDehiZ/tNyYBdSQsOUQ=="
+      "version": "1.0.30001519",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
+      "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg=="
     },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
     },
     "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
       "requires": {
         "align-text": "^0.1.3",
         "lazy-cache": "^1.0.3"
@@ -2048,7 +2457,7 @@
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "requires": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
@@ -2057,17 +2466,10 @@
         "supports-color": "^2.0.0"
       }
     },
-    "chardet": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
-      "dev": true
-    },
     "cheerio": {
       "version": "1.0.0-rc.12",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
       "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
-      "dev": true,
       "requires": {
         "cheerio-select": "^2.1.0",
         "dom-serializer": "^2.0.0",
@@ -2082,7 +2484,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
       "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-      "dev": true,
       "requires": {
         "boolbase": "^1.0.0",
         "css-select": "^5.1.0",
@@ -2093,19 +2494,42 @@
       }
     },
     "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "optional": true,
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "fsevents": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
       }
     },
     "chownr": {
@@ -2122,12 +2546,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
     "clap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
@@ -2150,10 +2568,15 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "requires": {
             "is-descriptor": "^0.1.0"
           }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
         }
       }
     },
@@ -2166,7 +2589,6 @@
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
       "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
-      "dev": true,
       "requires": {
         "source-map": "~0.6.0"
       },
@@ -2174,26 +2596,10 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^2.0.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-      "dev": true
-    },
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -2212,7 +2618,7 @@
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
         },
         "string-width": {
           "version": "3.1.0",
@@ -2237,7 +2643,7 @@
     "clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="
     },
     "clone-deep": {
       "version": "2.0.2",
@@ -2248,17 +2654,32 @@
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.0",
         "shallow-clone": "^1.0.0"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+          "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+          "requires": {
+            "for-in": "^1.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+        }
       }
     },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
     },
     "coa": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
-      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
+      "integrity": "sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==",
       "requires": {
         "q": "^1.1.2"
       }
@@ -2266,12 +2687,12 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="
     },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
@@ -2280,7 +2701,7 @@
     "color": {
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+      "integrity": "sha512-Ajpjd8asqZ6EdxQeqGzU5WBhhTfJ/0cA4Wlbre7e5vXfmDSmda7Ov6jeKoru+b0vHcb1CqvuroTHp5zIWzhVMA==",
       "requires": {
         "clone": "^1.0.2",
         "color-convert": "^1.3.0",
@@ -2298,12 +2719,12 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "color-string": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+      "integrity": "sha512-sz29j1bmSDfoAxKIEU6zwoIZXN6BrFbAMIhfYCNyiZXBDuU/aiHlN84lp/xDzL2ubyFhLDobHIlU1X70XRrMDA==",
       "requires": {
         "color-name": "^1.0.0"
       }
@@ -2311,7 +2732,7 @@
     "colormin": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
-      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
+      "integrity": "sha512-XSEQUUQUR/lXqGyddiNH3XYFUPYlYr1vXy9rTFMsSOw+J7Q6EQkdlQIrTlYn4TccpsOaUE1PYQNjBn20gwCdgQ==",
       "requires": {
         "color": "^0.11.0",
         "css-color-names": "0.0.4",
@@ -2321,13 +2742,12 @@
     "colors": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
+      "integrity": "sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w=="
     },
     "combine-lists": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-      "dev": true,
+      "integrity": "sha512-4Mi0V7N48B9KzC8Zl/U7wiWuxMFEHf44N3/PSoAvWDu8IOPrddNo1y1tC/kXbP7IvVMhgCFMMNzgKb0pWoin9w==",
       "requires": {
         "lodash": "^4.5.0"
       }
@@ -2348,13 +2768,12 @@
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
     },
     "component-bind": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
-      "dev": true
+      "integrity": "sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw=="
     },
     "component-emitter": {
       "version": "1.3.0",
@@ -2364,8 +2783,7 @@
     "component-inherit": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
-      "dev": true
+      "integrity": "sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA=="
     },
     "compressible": {
       "version": "2.0.18",
@@ -2387,12 +2805,46 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+        }
       }
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -2409,7 +2861,6 @@
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
@@ -2417,35 +2868,18 @@
         "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "finalhandler": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "on-finished": "~2.3.0",
-            "parseurl": "~1.3.3",
-            "statuses": "~1.5.0",
-            "unpipe": "~1.0.0"
-          }
-        },
-        "on-finished": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-          "dev": true,
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
-            "ee-first": "1.1.1"
+            "ms": "2.0.0"
           }
         },
-        "statuses": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-          "dev": true
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -2462,12 +2896,12 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
     },
     "content-disposition": {
       "version": "0.5.4",
@@ -2495,14 +2929,14 @@
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "copy-concurrently": {
       "version": "1.0.5",
@@ -2520,13 +2954,12 @@
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="
     },
     "copy-webpack-plugin": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
       "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
-      "dev": true,
       "requires": {
         "cacache": "^10.0.4",
         "find-cache-dir": "^1.0.0",
@@ -2538,32 +2971,26 @@
         "serialize-javascript": "^1.4.0"
       },
       "dependencies": {
-        "cacache": {
-          "version": "10.0.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-          "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
-          "dev": true,
+        "array-union": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
           "requires": {
-            "bluebird": "^3.5.1",
-            "chownr": "^1.0.1",
-            "glob": "^7.1.2",
-            "graceful-fs": "^4.1.11",
-            "lru-cache": "^4.1.1",
-            "mississippi": "^2.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^5.2.4",
-            "unique-filename": "^1.1.0",
-            "y18n": "^4.0.0"
+            "array-uniq": "^1.0.1"
+          }
+        },
+        "dir-glob": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+          "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+          "requires": {
+            "path-type": "^3.0.0"
           }
         },
         "globby": {
           "version": "7.1.1",
           "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
           "integrity": "sha512-yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g==",
-          "dev": true,
           "requires": {
             "array-union": "^1.0.1",
             "dir-glob": "^2.0.0",
@@ -2573,64 +3000,23 @@
             "slash": "^1.0.0"
           }
         },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "mississippi": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
-          "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^2.0.1",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "serialize-javascript": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
-          "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
-          "dev": true
+        "ignore": {
+          "version": "3.3.10",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
         },
-        "ssri": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
-          "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
-          "dev": true,
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "requires": {
-            "safe-buffer": "^5.1.1"
+            "pify": "^3.0.0"
           }
         },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg=="
         }
       }
     },
@@ -2686,28 +3072,13 @@
       }
     },
     "cross-spawn": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
-        }
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
     "crypto-browserify": {
@@ -2731,7 +3102,7 @@
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
+      "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q=="
     },
     "css-loader": {
       "version": "0.28.11",
@@ -2758,7 +3129,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
       "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-      "dev": true,
       "requires": {
         "boolbase": "^1.0.0",
         "css-what": "^6.1.0",
@@ -2779,8 +3149,7 @@
     "css-what": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
     },
     "cssesc": {
       "version": "3.0.0",
@@ -2790,7 +3159,7 @@
     "cssnano": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
-      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
+      "integrity": "sha512-0o0IMQE0Ezo4b41Yrm8U6Rp9/Ag81vNXY1gZMnT1XhO4DpjEf2utKERqWJbOoz3g1Wdc1d3QSta/cIuJ1wSTEg==",
       "requires": {
         "autoprefixer": "^6.3.1",
         "decamelize": "^1.1.2",
@@ -2829,7 +3198,7 @@
     "csso": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
-      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
+      "integrity": "sha512-FmCI/hmqDeHHLaIQckMhMZneS84yzUZdrWDAvJVVxOwcKE1P1LF9FGmzr1ktIQSxOw6fl3PaQsmfg+GN+VvR3w==",
       "requires": {
         "clap": "^1.0.9",
         "source-map": "^0.5.3"
@@ -2843,7 +3212,7 @@
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
       "requires": {
         "array-find-index": "^1.0.1"
       }
@@ -2851,13 +3220,12 @@
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-      "dev": true
+      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg=="
     },
     "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz",
+      "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="
     },
     "d": {
       "version": "1.0.1",
@@ -2871,7 +3239,7 @@
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -2884,18 +3252,23 @@
         "@babel/runtime": "^7.21.0"
       }
     },
+    "date-format": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="
+    },
     "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
-        "ms": "2.0.0"
+        "ms": "2.1.2"
       }
     },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
     },
     "decode-uri-component": {
       "version": "0.2.2",
@@ -2905,7 +3278,7 @@
     "deep-diff": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz",
-      "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ="
+      "integrity": "sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug=="
     },
     "deep-equal": {
       "version": "1.1.1",
@@ -2923,8 +3296,7 @@
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "define-properties": {
       "version": "1.2.0",
@@ -2969,6 +3341,16 @@
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -2980,7 +3362,7 @@
     "del": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "integrity": "sha512-7yjqSoVSlJzA4t/VUwazuEagGeANEKB3f/aNI//06pfKgwoCb7f6Q1gETN1sZzYaj6chTQ0AhIwDiPdfOjko4A==",
       "requires": {
         "globby": "^6.1.0",
         "is-path-cwd": "^1.0.0",
@@ -2988,17 +3370,46 @@
         "p-map": "^1.1.1",
         "pify": "^3.0.0",
         "rimraf": "^2.2.8"
+      },
+      "dependencies": {
+        "array-union": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+          "requires": {
+            "array-uniq": "^1.0.1"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+          "requires": {
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
+            }
+          }
+        }
       }
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
     },
     "depd": {
       "version": "2.0.0",
@@ -3006,9 +3417,9 @@
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
       "requires": {
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
@@ -3022,7 +3433,7 @@
     "detect-indent": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -3035,14 +3446,12 @@
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
+      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA=="
     },
     "diff": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
     },
     "diffie-hellman": {
       "version": "5.0.3",
@@ -3062,35 +3471,22 @@
       }
     },
     "dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-      "dev": true,
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "requires": {
-        "path-type": "^3.0.0"
-      },
-      "dependencies": {
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        }
+        "path-type": "^4.0.0"
       }
     },
     "discontinuous-range": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-      "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
-      "dev": true
+      "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="
     },
     "dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
     },
     "dns-packet": {
       "version": "1.3.4",
@@ -3104,16 +3500,15 @@
     "dns-txt": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==",
       "requires": {
         "buffer-indexof": "^1.0.0"
       }
     },
     "doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "requires": {
         "esutils": "^2.0.2"
       }
@@ -3122,7 +3517,6 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
       "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
       "requires": {
         "utila": "~0.4"
       }
@@ -3139,8 +3533,7 @@
     "dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
+      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
       "requires": {
         "custom-event": "~1.0.0",
         "ent": "~2.2.0",
@@ -3152,7 +3545,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
       "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "dev": true,
       "requires": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.2",
@@ -3167,28 +3559,25 @@
     "domelementtype": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
     },
     "domhandler": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
       "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "dev": true,
       "requires": {
         "domelementtype": "^2.3.0"
       }
     },
     "dompurify": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.3.tgz",
-      "integrity": "sha512-axQ9zieHLnAnHh0sfAamKYiqXMJAVwu+LM/alQ7WDagoWessyWvMSFyW65CqF3owufNu8HBcE4cM2Vflu7YWcQ=="
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.5.tgz",
+      "integrity": "sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A=="
     },
     "domutils": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
       "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-      "dev": true,
       "requires": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
@@ -3209,7 +3598,7 @@
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -3218,12 +3607,12 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.405",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.405.tgz",
-      "integrity": "sha512-JdDgnwU69FMZURoesf9gNOej2Cms1XJFfLk24y1IBtnAdhTcJY/mXnokmpmxHN59PcykBP4bgUU98vLY44Lhuw=="
+      "version": "1.4.485",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.485.tgz",
+      "integrity": "sha512-1ndQ5IBNEnFirPwvyud69GHL+31FkE09gH/CJ6m3KCbkx3i0EVOrjwz4UNxRmN9H8OVHbC6vMRZGN1yCvjSs9w=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -3259,7 +3648,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "encoding": {
       "version": "0.1.13",
@@ -3280,8 +3669,7 @@
     "engine.io": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
-      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
-      "dev": true,
+      "integrity": "sha512-VNQ79eqoDiapJ2tDMu+N7SPDm11btXpO7b2gsxBVd1XbxBCx6xLyTESIuFlWUspsbuif6Rq88pYNrQce5G7bqw==",
       "requires": {
         "accepts": "1.3.3",
         "base64id": "1.0.0",
@@ -3291,27 +3679,10 @@
         "ws": "1.1.2"
       },
       "dependencies": {
-        "accepts": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-          "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
-          "dev": true,
-          "requires": {
-            "mime-types": "~2.1.11",
-            "negotiator": "0.6.1"
-          }
-        },
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-          "dev": true
-        },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
+          "integrity": "sha512-dCHp4G+F11zb+RtEu7BE2U8R32AYmM/4bljQfut8LipH3PdwsVBVGh083MXvtKkB7HSQUzSwiXz53c4mzJvYfw==",
           "requires": {
             "ms": "0.7.2"
           }
@@ -3319,22 +3690,14 @@
         "ms": {
           "version": "0.7.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        },
-        "negotiator": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-          "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-          "dev": true
+          "integrity": "sha512-5NnE67nQSQDJHVahPJna1PQ/zCXMnQop3yUCxjKPNzCxuyPSKWTQ/5Gu5CZmjetwGLWRA+PzeF5thlbOdbQldA=="
         }
       }
     },
     "engine.io-client": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
-      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
-      "dev": true,
+      "integrity": "sha512-260nnbHkYPTPnA9cjH2oCvWmqNwYofsNBkDfViI9iS487oMcl3kUeSgXJCwMxASgOL5DVlQF4hb0NzRNFkUaFg==",
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
@@ -3353,14 +3716,12 @@
         "component-emitter": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
+          "integrity": "sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA=="
         },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
+          "integrity": "sha512-dCHp4G+F11zb+RtEu7BE2U8R32AYmM/4bljQfut8LipH3PdwsVBVGh083MXvtKkB7HSQUzSwiXz53c4mzJvYfw==",
           "requires": {
             "ms": "0.7.2"
           }
@@ -3368,16 +3729,14 @@
         "ms": {
           "version": "0.7.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
+          "integrity": "sha512-5NnE67nQSQDJHVahPJna1PQ/zCXMnQop3yUCxjKPNzCxuyPSKWTQ/5Gu5CZmjetwGLWRA+PzeF5thlbOdbQldA=="
         }
       }
     },
     "engine.io-parser": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
-      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
-      "dev": true,
+      "integrity": "sha512-3UyTJo+5Jbmr7rd3MosTAApK7BOIo4sjx8dJYSHa3Em5R3A9Y2s9GWu4JFJe6Px0VieJC0hKUA5NBytC+O7k2A==",
       "requires": {
         "after": "0.8.2",
         "arraybuffer.slice": "0.0.6",
@@ -3390,31 +3749,35 @@
     "enhanced-resolve": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "integrity": "sha512-ZaAux1rigq1e2nQrztHn4h2ugvpzZxs64qneNah+8Mh/K0CRqJFJc+UoXnUsq+1yX+DmQFPPdVqboKAJ89e0Iw==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "memory-fs": "^0.4.0",
         "object-assign": "^4.0.1",
         "tapable": "^0.2.7"
+      },
+      "dependencies": {
+        "tapable": {
+          "version": "0.2.9",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+          "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A=="
+        }
       }
     },
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="
     },
     "entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
     },
     "enzyme": {
       "version": "3.11.0",
       "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
       "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
-      "dev": true,
       "requires": {
         "array.prototype.flat": "^1.2.3",
         "cheerio": "^1.0.0-rc.3",
@@ -3444,7 +3807,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.5.tgz",
       "integrity": "sha512-i6cwm7hN630JXenxxJFBKzgLC3hMTafFQXflvzHgPmDhOBhxUWDe8AeRv1qp2/uWJ2Y8z5yLWMzmAfkTOiOCZg==",
-      "dev": true,
       "requires": {
         "has": "^1.0.3",
         "object-is": "^1.1.5"
@@ -3467,17 +3829,18 @@
       }
     },
     "es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "requires": {
         "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
         "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -3497,21 +3860,24 @@
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
         "safe-regex-test": "^1.0.0",
         "string.prototype.trim": "^1.2.7",
         "string.prototype.trimend": "^1.0.6",
         "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.10"
       }
     },
     "es-array-method-boxes-properly": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
     },
     "es-set-tostringtag": {
       "version": "2.0.1",
@@ -3527,7 +3893,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
       "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
       "requires": {
         "has": "^1.0.3"
       }
@@ -3555,7 +3920,7 @@
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
       "requires": {
         "d": "1",
         "es5-ext": "^0.10.35",
@@ -3565,7 +3930,7 @@
     "es6-map": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==",
       "requires": {
         "d": "1",
         "es5-ext": "~0.10.14",
@@ -3623,17 +3988,17 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
     },
     "escope": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "integrity": "sha512-75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ==",
       "requires": {
         "es6-map": "^0.1.3",
         "es6-weak-map": "^2.0.1",
@@ -3642,178 +4007,197 @@
       }
     },
     "eslint": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
-      "dev": true,
-      "requires": {
-        "ajv": "^5.3.0",
-        "babel-code-frame": "^6.22.0",
-        "chalk": "^2.1.0",
-        "concat-stream": "^1.6.0",
-        "cross-spawn": "^5.1.0",
-        "debug": "^3.1.0",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^3.7.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.4",
-        "esquery": "^1.0.0",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
-        "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.0.1",
-        "ignore": "^3.3.3",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^3.0.6",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.9.1",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.2",
-        "mkdirp": "^0.5.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
-        "progress": "^2.0.0",
-        "regexpp": "^1.0.1",
-        "require-uncached": "^1.0.3",
-        "semver": "^5.3.0",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "~2.0.1",
-        "table": "4.0.2",
-        "text-table": "~0.2.0"
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
         "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,
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "^2.0.1"
           }
         },
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        },
         "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,
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "color-name": "~1.1.4"
           }
         },
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
+        "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=="
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+        },
+        "eslint-scope": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+          "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
           "requires": {
-            "ms": "^2.1.1"
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
           }
         },
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-          "dev": true
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "glob-parent": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+          "requires": {
+            "is-glob": "^4.0.3"
+          }
         },
         "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
         },
         "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "js-yaml": {
-          "version": "3.14.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-          "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-          "dev": true,
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
           "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
+            "argparse": "^2.0.1"
           }
         },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
+            "p-locate": "^5.0.0"
           }
         },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
         },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
         },
-        "strip-ansi": {
+        "path-exists": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^5.0.1"
           }
         },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
         }
       }
     },
     "eslint-plugin-react": {
-      "version": "7.32.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
-      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
-      "dev": true,
+      "version": "7.33.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
+      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
       "requires": {
         "array-includes": "^3.1.6",
         "array.prototype.flatmap": "^1.3.1",
@@ -3828,65 +4212,63 @@
         "object.values": "^1.1.6",
         "prop-types": "^15.8.1",
         "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.0",
+        "semver": "^6.3.1",
         "string.prototype.matchall": "^4.0.8"
       },
       "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         },
-        "resolve": {
-          "version": "2.0.0-next.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
         }
       }
     },
     "eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
-      "dev": true,
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "requires": {
-        "esrecurse": "^4.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw=="
     },
     "espree": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-      "dev": true,
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "requires": {
-        "acorn": "^5.5.0",
-        "acorn-jsx": "^3.0.0"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       }
     },
     "esprima": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+      "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A=="
     },
     "esquery": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
       "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
       },
@@ -3894,8 +4276,7 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
@@ -3927,12 +4308,12 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "event-emitter": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
       "requires": {
         "d": "1",
         "es5-ext": "~0.10.14"
@@ -3951,7 +4332,7 @@
     "eventsource": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
-      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "integrity": "sha512-bbB5tEuvC+SuRUG64X8ghvjgiRniuA4WlehWbFnoN4z6TxDXpyX+BMHF7rMgZAqoe+EbyNRUbHN0uuP9phy5jQ==",
       "requires": {
         "original": ">=0.0.5"
       }
@@ -3968,7 +4349,7 @@
     "execa": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
       "requires": {
         "cross-spawn": "^5.0.1",
         "get-stream": "^3.0.0",
@@ -3982,7 +4363,7 @@
         "cross-spawn": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
           "requires": {
             "lru-cache": "^4.0.1",
             "shebang-command": "^1.2.0",
@@ -3998,6 +4379,27 @@
             "yallist": "^2.1.2"
           }
         },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
         "yallist": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
@@ -4008,25 +4410,17 @@
     "expand-braces": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-      "dev": true,
+      "integrity": "sha512-zOOsEnAhvIxxd0esCNbYG2xerGf46niZ1egS43eV7Fu4t7VIScgPXMcMabCLaPrqkzwvwo6zZipDiX3t0ILF2w==",
       "requires": {
         "array-slice": "^0.2.3",
         "array-unique": "^0.2.1",
         "braces": "^0.1.2"
       },
       "dependencies": {
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
         "braces": {
           "version": "0.1.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-          "dev": true,
+          "integrity": "sha512-EIMHIv2UXHWFY2xubUGKz+hq9hNkENj4Pjvr7h58cmJgpkK2yMlKA8I484f7MSttkzVAy/lL7X9xDaILd6avzA==",
           "requires": {
             "expand-range": "^0.1.0"
           }
@@ -4034,8 +4428,7 @@
         "expand-range": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-          "dev": true,
+          "integrity": "sha512-busOHJ0t7t5UcutcyNDqmaDX+1cb0XlqsAUgTlmplVv0rIqBaMcBSZRLlkDm0nxtl8O3o/EvRRrdQ/WnyPERLQ==",
           "requires": {
             "is-number": "^0.1.1",
             "repeat-string": "^0.2.2"
@@ -4044,53 +4437,27 @@
         "is-number": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-          "dev": true
+          "integrity": "sha512-la5kPULwIgkSSaZj9w7/A1uHqOBAgOhDUKQ5CkfL8LZ4Si6r4+2D0hI6b4o60MW4Uj2yNJARWIZUDPxlvOYQcw=="
         },
         "repeat-string": {
           "version": "0.2.2",
           "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-          "dev": true
+          "integrity": "sha512-yHeI3F9v20MY+8/5WAUgIWseMZwpLD+l9h5hGyzh6fQjhle2AwjjRDao1m5IozSDuVvMw09/mvE8AU1oDmZKpQ=="
         }
       }
     },
     "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "is-posix-bracket": "^0.1.0"
       }
     },
     "expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "requires": {
         "fill-range": "^2.1.0"
       },
@@ -4110,26 +4477,10 @@
         "is-number": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+          "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
           "requires": {
             "kind-of": "^3.0.2"
           }
-        },
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
         }
       }
     },
@@ -4137,7 +4488,6 @@
       "version": "21.2.1",
       "resolved": "https://registry.npmjs.org/expect/-/expect-21.2.1.tgz",
       "integrity": "sha512-orfQQqFRTX0jH7znRIGi8ZMR8kTNpXklTTz8+HGTpmTKZo3Occ6JNB5FXMb8cRuiiC/GyDqsr30zUa66ACYlYw==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^3.2.0",
         "jest-diff": "^21.2.1",
@@ -4151,7 +4501,6 @@
           "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"
           }
@@ -4196,22 +4545,98 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
         "array-flatten": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
           "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
         },
+        "body-parser": {
+          "version": "1.20.1",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.11.0",
+            "raw-body": "2.5.1",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
+        "cookie": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "finalhandler": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "statuses": "2.0.1",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+        },
         "path-to-regexp": {
           "version": "0.1.7",
           "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
           "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
         },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+        "raw-body": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
           "requires": {
-            "side-channel": "^1.0.4"
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
           }
         },
         "safe-buffer": {
@@ -4244,7 +4669,7 @@
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -4260,91 +4685,25 @@
         }
       }
     },
-    "external-editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
-      "dev": true,
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "requires": {
-        "chardet": "^0.4.0",
-        "iconv-lite": "^0.4.17",
-        "tmp": "^0.0.33"
+        "is-extglob": "^1.0.0"
       },
       "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
         }
       }
     },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "extract-text-webpack-plugin": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
-      "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
+    "extract-text-webpack-plugin": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
+      "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
       "requires": {
         "async": "^2.4.1",
         "loader-utils": "^1.1.0",
@@ -4355,12 +4714,24 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
     },
     "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "fast-glob": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      }
     },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
@@ -4370,18 +4741,25 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "fastparse": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
       "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="
     },
+    "fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
       "requires": {
         "websocket-driver": ">=0.5.1"
       }
@@ -4404,22 +4782,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.30.2",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz",
-          "integrity": "sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg=="
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "version": "3.32.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz",
+          "integrity": "sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww=="
         }
       }
     },
@@ -4428,23 +4793,12 @@
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
       "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
     },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
     "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "^3.0.4"
       }
     },
     "file-loader": {
@@ -4456,27 +4810,6 @@
         "schema-utils": "^3.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
         "json5": {
           "version": "2.2.3",
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -4493,9 +4826,9 @@
           }
         },
         "schema-utils": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
-          "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "requires": {
             "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
@@ -4513,35 +4846,62 @@
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
+      "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ=="
     },
     "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==",
-      "optional": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
     },
     "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
+        "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
+        "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
+        }
       }
     },
     "find-cache-dir": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
-      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "integrity": "sha512-46TFiBOzX7xq/PcSWfFwkyjpemdRnMe31UQF+os0y+1W3k95f6R4SEt02Hj4p3X0Mir9gfrkmOtshFidS0VPUg==",
       "requires": {
         "commondir": "^1.0.1",
         "make-dir": "^1.0.0",
@@ -4551,34 +4911,35 @@
     "find-up": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
       "requires": {
         "locate-path": "^2.0.0"
       }
     },
     "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
-      "dev": true,
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       },
       "dependencies": {
         "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
           "requires": {
             "glob": "^7.1.3"
           }
         }
       }
     },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
+    },
     "flatten": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
@@ -4609,12 +4970,12 @@
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
     },
     "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "requires": {
         "for-in": "^1.0.1"
       }
@@ -4622,7 +4983,7 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
     },
     "form-data": {
       "version": "2.3.3",
@@ -4642,7 +5003,7 @@
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "requires": {
         "map-cache": "^0.2.2"
       }
@@ -4650,7 +5011,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "from2": {
       "version": "2.3.0",
@@ -4664,22 +5025,19 @@
     "fs-access": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
-      "dev": true,
+      "integrity": "sha512-05cXDIwNbFaoFWaz5gNHlUTbH5whiss/hr/ibzPd4MH3cR4w0ZKeIPiVdbyJurg3O5r/Bjpvn9KOb1/rPMf3nA==",
       "requires": {
         "null-check": "^1.0.0"
       }
     },
     "fs-extra": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
-      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^2.1.0",
-        "klaw": "^1.0.0",
-        "path-is-absolute": "^1.0.0",
-        "rimraf": "^2.2.8"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs-write-stream-atomic": {
@@ -4696,13 +5054,17 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "optional": true,
+      "requires": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      }
     },
     "fstream": {
       "version": "1.0.12",
@@ -4731,12 +5093,6 @@
         "functions-have-names": "^1.2.2"
       }
     },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
     "functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -4745,7 +5101,7 @@
     "gauge": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -4789,12 +5145,12 @@
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="
     },
     "get-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="
     },
     "get-symbol-description": {
       "version": "1.0.0",
@@ -4808,12 +5164,12 @@
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="
     },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -4834,7 +5190,7 @@
     "glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "requires": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
@@ -4843,7 +5199,7 @@
         "glob-parent": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
           "requires": {
             "is-glob": "^2.0.0"
           }
@@ -4851,12 +5207,12 @@
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -4867,7 +5223,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "optional": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -4891,22 +5246,16 @@
       }
     },
     "globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "requires": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        }
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
       }
     },
     "globule": {
@@ -4955,15 +5304,20 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+    },
     "handle-thing": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
-      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ="
+      "integrity": "sha512-Ld9EYcBflMUF6SsJLGDADVH50jSzLNIUUrOFlFGK/zwqimATg9+wY4jsLWCR7DZSxt2BfK0+liHUMdoR11bjLg=="
     },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
     },
     "har-validator": {
       "version": "5.1.5",
@@ -4972,29 +5326,6 @@
       "requires": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        }
       }
     },
     "has": {
@@ -5008,7 +5339,7 @@
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -5021,8 +5352,7 @@
     "has-binary": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
-      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=",
-      "dev": true,
+      "integrity": "sha512-k1Umb4/jrBWZbtL+QKSji8qWeoZ7ZTkXdnDXt1wxwBKAFM0//u96wDj43mBIqCIas8rDQMYyrBEvcS8hdGd4Sg==",
       "requires": {
         "isarray": "0.0.1"
       },
@@ -5030,21 +5360,19 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
         }
       }
     },
     "has-cors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
-      "dev": true
+      "integrity": "sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="
     },
     "has-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA=="
     },
     "has-property-descriptors": {
       "version": "1.0.0",
@@ -5075,22 +5403,29 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
     },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        }
       }
     },
     "has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
@@ -5099,7 +5434,7 @@
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
           "requires": {
             "kind-of": "^3.0.2"
           },
@@ -5107,7 +5442,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "requires": {
                 "is-buffer": "^1.1.5"
               }
@@ -5117,7 +5452,7 @@
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -5163,13 +5498,12 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
     },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
       "requires": {
         "hash.js": "^1.0.3",
         "minimalistic-assert": "^1.0.0",
@@ -5184,7 +5518,7 @@
     "home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.1"
@@ -5198,7 +5532,7 @@
     "hpack.js": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "requires": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -5215,7 +5549,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
       "integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
-      "dev": true,
       "requires": {
         "array.prototype.filter": "^1.0.0",
         "call-bind": "^1.0.2"
@@ -5230,7 +5563,6 @@
       "version": "3.5.21",
       "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
       "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "dev": true,
       "requires": {
         "camel-case": "3.0.x",
         "clean-css": "4.2.x",
@@ -5244,32 +5576,7 @@
         "commander": {
           "version": "2.17.1",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "3.4.10",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-          "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-          "dev": true,
-          "requires": {
-            "commander": "~2.19.0",
-            "source-map": "~0.6.1"
-          },
-          "dependencies": {
-            "commander": {
-              "version": "2.19.0",
-              "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-              "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-              "dev": true
-            }
-          }
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
         }
       }
     },
@@ -5277,7 +5584,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
       "integrity": "sha512-Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg==",
-      "dev": true,
       "requires": {
         "html-minifier": "^3.2.3",
         "loader-utils": "^0.2.16",
@@ -5291,32 +5597,23 @@
         "big.js": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-          "dev": true
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
         },
         "emojis-list": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
-          "dev": true
+          "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng=="
         },
         "loader-utils": {
           "version": "0.2.17",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
           "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
-          "dev": true,
           "requires": {
             "big.js": "^3.1.3",
             "emojis-list": "^2.0.0",
             "json5": "^0.5.0",
             "object-assign": "^4.0.1"
           }
-        },
-        "tapable": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-          "dev": true
         }
       }
     },
@@ -5324,7 +5621,6 @@
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
       "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-      "dev": true,
       "requires": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.3",
@@ -5335,7 +5631,7 @@
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
     },
     "http-errors": {
       "version": "2.0.0",
@@ -5367,7 +5663,7 @@
     "http-proxy-middleware": {
       "version": "0.17.4",
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
-      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+      "integrity": "sha512-JtH3UZju4oXDdca28/kknbm/CFmt35vy0YV0PNOMWWWpn3rT9WV95IXN451xwBGSjy9L0Cah1O9TCMytboLdfw==",
       "requires": {
         "http-proxy": "^1.16.2",
         "is-glob": "^3.1.0",
@@ -5375,72 +5671,28 @@
         "micromatch": "^2.3.11"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "requires": {
-            "arr-flatten": "^1.0.1"
-          }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
-        },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+          "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
             "repeat-element": "^1.1.2"
           }
         },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "requires": {
-            "is-posix-bracket": "^0.1.0"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "requires": {
-            "is-extglob": "^1.0.0"
-          },
-          "dependencies": {
-            "is-extglob": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-              "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-            }
-          }
-        },
         "is-glob": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
           "requires": {
             "is-extglob": "^2.1.0"
           }
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
         "micromatch": {
           "version": "2.3.11",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+          "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -5460,32 +5712,24 @@
             "is-extglob": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-              "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+              "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
             },
             "is-glob": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-              "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+              "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
               "requires": {
                 "is-extglob": "^1.0.0"
               }
             }
           }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
         }
       }
     },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -5495,7 +5739,7 @@
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
+      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="
     },
     "iconv-lite": {
       "version": "0.6.3",
@@ -5508,12 +5752,12 @@
     "icss-replace-symbols": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
+      "integrity": "sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg=="
     },
     "icss-utils": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
-      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
+      "integrity": "sha512-bsVoyn/1V4R1kYYjLcWLedozAM4FClZUdjE9nIr8uWY7xs78y9DATgwz2wGU7M+7z55KenmmTkN2DVJ7bqzjAA==",
       "requires": {
         "postcss": "^6.0.1"
       },
@@ -5539,7 +5783,7 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "postcss": {
           "version": "6.0.23",
@@ -5577,10 +5821,18 @@
       "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA=="
     },
     "ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-      "dev": true
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
     },
     "import-local": {
       "version": "1.0.0",
@@ -5594,7 +5846,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
     },
     "in-publish": {
       "version": "2.0.1",
@@ -5604,7 +5856,7 @@
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -5612,18 +5864,17 @@
     "indexes-of": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
+      "integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA=="
     },
     "indexof": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
+      "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -5634,100 +5885,10 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "inquirer": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^2.0.4",
-        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rx-lite": "^4.0.8",
-        "rx-lite-aggregates": "^4.0.8",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "internal-ip": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
-      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
+      "integrity": "sha512-DzGfTasXPmwizQP4XV2rR6r2vp8TjlOpMnJqG9Iy2i1pl1lkZdZj5rSpIc7YFGX2nS46PPgAGEyT+Q5hE2FB2g==",
       "requires": {
         "meow": "^3.3.0"
       }
@@ -5758,7 +5919,7 @@
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+      "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="
     },
     "ip": {
       "version": "1.1.8",
@@ -5773,24 +5934,14 @@
     "is-absolute-url": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
+      "integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg=="
     },
     "is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "requires": {
         "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "is-arguments": {
@@ -5815,7 +5966,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
     },
     "is-bigint": {
       "version": "1.0.4",
@@ -5826,12 +5977,11 @@
       }
     },
     "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==",
-      "optional": true,
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "requires": {
-        "binary-extensions": "^2.0.0"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-boolean-object": {
@@ -5854,9 +6004,9 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -5864,19 +6014,9 @@
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
       "requires": {
         "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "is-date-object": {
@@ -5907,12 +6047,12 @@
     "is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
+      "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg=="
     },
     "is-equal-shallow": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "requires": {
         "is-primitive": "^2.0.0"
       }
@@ -5920,12 +6060,12 @@
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
     },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
     },
     "is-finite": {
       "version": "1.1.0",
@@ -5935,7 +6075,7 @@
     "is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -5956,8 +6096,7 @@
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "optional": true
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-number-object": {
       "version": "1.0.7",
@@ -5970,7 +6109,7 @@
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
+      "integrity": "sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw=="
     },
     "is-path-in-cwd": {
       "version": "1.0.1",
@@ -5978,20 +6117,27 @@
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "requires": {
         "is-path-inside": "^1.0.0"
+      },
+      "dependencies": {
+        "is-path-inside": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+          "integrity": "sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==",
+          "requires": {
+            "path-is-inside": "^1.0.1"
+          }
+        }
       }
     },
     "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
     },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -5999,17 +6145,24 @@
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "requires": {
         "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        }
       }
     },
     "is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
+      "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ=="
     },
     "is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+      "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q=="
     },
     "is-regex": {
       "version": "1.1.4",
@@ -6020,12 +6173,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
     "is-shared-array-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
@@ -6037,7 +6184,7 @@
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="
     },
     "is-string": {
       "version": "1.0.7",
@@ -6050,12 +6197,12 @@
     "is-subset": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
+      "integrity": "sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw=="
     },
     "is-svg": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
-      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
+      "integrity": "sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==",
       "requires": {
         "html-comment-regex": "^1.1.0"
       }
@@ -6069,26 +6216,22 @@
       }
     },
     "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       }
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
     },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
     },
     "is-weakref": {
       "version": "1.0.2",
@@ -6106,18 +6249,17 @@
     "is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
+      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw=="
     },
     "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
     },
     "isbinaryfile": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-      "dev": true,
       "requires": {
         "buffer-alloc": "^1.2.0"
       }
@@ -6125,17 +6267,27 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "requires": {
+        "isarray": "1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+        }
+      }
     },
     "isomorphic-fetch": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==",
       "requires": {
         "node-fetch": "^1.0.1",
         "whatwg-fetch": ">=0.10.0"
@@ -6144,7 +6296,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
     },
     "jasmine-core": {
       "version": "3.3.0",
@@ -6155,7 +6307,6 @@
       "version": "21.2.1",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-21.2.1.tgz",
       "integrity": "sha512-E5fu6r7PvvPr5qAWE1RaUwIh/k6Zx/3OOkZ4rk5dBJkEWRrUuSgbMt2EO8IUTPTd6DOqU3LW6uTIwX5FRvXoFA==",
-      "dev": true,
       "requires": {
         "chalk": "^2.0.1",
         "diff": "^3.2.0",
@@ -6167,7 +6318,6 @@
           "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"
           }
@@ -6176,7 +6326,6 @@
           "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",
@@ -6186,14 +6335,12 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "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"
           }
@@ -6203,14 +6350,12 @@
     "jest-get-type": {
       "version": "21.2.0",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-21.2.0.tgz",
-      "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q==",
-      "dev": true
+      "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q=="
     },
     "jest-matcher-utils": {
       "version": "21.2.1",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-21.2.1.tgz",
       "integrity": "sha512-kn56My+sekD43dwQPrXBl9Zn9tAqwoy25xxe7/iY4u+mG8P3ALj5IK7MLHZ4Mi3xW7uWVCjGY8cm4PqgbsqMCg==",
-      "dev": true,
       "requires": {
         "chalk": "^2.0.1",
         "jest-get-type": "^21.2.0",
@@ -6221,7 +6366,6 @@
           "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"
           }
@@ -6230,7 +6374,6 @@
           "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",
@@ -6240,14 +6383,12 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "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"
           }
@@ -6258,7 +6399,6 @@
       "version": "21.2.1",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-21.2.1.tgz",
       "integrity": "sha512-EbC1X2n0t9IdeMECJn2BOg7buOGivCvVNjqKMXTzQOu7uIfLml+keUfCALDh8o4rbtndIeyGU8/BKfoTr/LVDQ==",
-      "dev": true,
       "requires": {
         "chalk": "^2.0.1",
         "micromatch": "^2.3.11",
@@ -6269,31 +6409,14 @@
           "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"
           }
         },
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1"
-          }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-          "dev": true,
+          "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
           "requires": {
             "expand-range": "^1.8.1",
             "preserve": "^0.2.0",
@@ -6304,66 +6427,34 @@
           "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"
           }
         },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "dev": true,
-          "requires": {
-            "is-posix-bracket": "^0.1.0"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
           "requires": {
             "is-extglob": "^1.0.0"
           }
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
         "micromatch": {
           "version": "2.3.11",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-          "dev": true,
+          "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
           "requires": {
             "arr-diff": "^2.0.0",
             "array-unique": "^0.2.1",
@@ -6380,20 +6471,15 @@
             "regex-cache": "^0.4.2"
           }
         },
-        "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"
-          }
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg=="
         },
         "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"
           }
@@ -6403,8 +6489,7 @@
     "jest-regex-util": {
       "version": "21.2.0",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-21.2.0.tgz",
-      "integrity": "sha512-BKQ1F83EQy0d9Jen/mcVX7D+lUt2tthhK/2gDWRgLDJRNOdRgSp1iVqFxP8EN1ARuypvDflRfPzYT8fQnoBQFQ==",
-      "dev": true
+      "integrity": "sha512-BKQ1F83EQy0d9Jen/mcVX7D+lUt2tthhK/2gDWRgLDJRNOdRgSp1iVqFxP8EN1ARuypvDflRfPzYT8fQnoBQFQ=="
     },
     "js-base64": {
       "version": "2.6.4",
@@ -6412,14 +6497,14 @@
       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
     },
     "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+      "integrity": "sha512-eIlkGty7HGmntbV6P/ZlAsoncFLGsNoM27lkTzS+oneY/EiNhj+geqD9ezg/ip+SW6Var0BJU2JtV0vEUZpWVQ==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^2.6.0"
@@ -6428,12 +6513,12 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
     },
     "jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
+      "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA=="
     },
     "json-loader": {
       "version": "0.5.7",
@@ -6446,35 +6531,34 @@
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
     },
     "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
     },
     "json3": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha512-I5YLeauH3rIaE99EE++UeH2M2gSYo8/2TqDac7oZEH6D/DSQ4Woa628Qrfj1X9/OY5Mk5VvIDQaKCDchXaKrmA=="
     },
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+      "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw=="
     },
     "jsonfile": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "requires": {
         "graceful-fs": "^4.1.6"
       }
@@ -6491,26 +6575,25 @@
       }
     },
     "jsx-ast-utils": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
-      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
-      "dev": true,
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
       "requires": {
-        "array-includes": "^3.1.5",
-        "object.assign": "^4.1.3"
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
       }
     },
     "just-extend": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
-      "dev": true
+      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg=="
     },
     "karma": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
       "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
-      "dev": true,
       "requires": {
         "bluebird": "^3.3.0",
         "body-parser": "^1.16.1",
@@ -6541,607 +6624,176 @@
         "useragent": "^2.1.12"
       },
       "dependencies": {
-        "anymatch": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^2.1.5",
-            "normalize-path": "^2.0.0"
-          }
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
         },
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "dev": true,
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ=="
+        },
+        "log4js": {
+          "version": "0.6.38",
+          "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+          "integrity": "sha512-Cd+klbx7lkiaamEId9/0odHxv/PFHDz2E12kEfd6/CzIOZD084DzysASR/Dot4i1dYPBQKC3r2XIER+dfbLOmw==",
           "requires": {
-            "arr-flatten": "^1.0.1"
+            "readable-stream": "~1.0.2",
+            "semver": "~4.3.3"
           }
         },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-          "dev": true,
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
           "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
           }
         },
-        "chokidar": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-          "dev": true,
-          "requires": {
-            "anymatch": "^1.3.0",
-            "async-each": "^1.0.0",
-            "fsevents": "^1.0.0",
-            "glob-parent": "^2.0.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^2.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0"
-          }
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ=="
         },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "dev": true,
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
+      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
+      "requires": {
+        "fs-access": "^1.0.0",
+        "which": "^1.2.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "requires": {
-            "is-posix-bracket": "^0.1.0"
+            "isexe": "^2.0.0"
           }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "dev": true,
+        }
+      }
+    },
+    "karma-jasmine": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
+      "integrity": "sha512-SENGE9DhlIIFTSZWiNq4eGeXL8G6z9cqHIOdkx9jh1qhhQqwEy3tAoLRyER0vOcHqdOlKmGpOuXk+HOipIy7sg=="
+    },
+    "karma-sourcemap-loader": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz",
+      "integrity": "sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==",
+      "requires": {
+        "graceful-fs": "^4.1.2"
+      }
+    },
+    "karma-webpack": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.13.tgz",
+      "integrity": "sha512-2cyII34jfrAabbI2+4Rk4j95Nazl98FvZQhgSiqKUDarT317rxfv/EdzZ60CyATN4PQxJdO5ucR5bOOXkEVrXw==",
+      "requires": {
+        "async": "^2.0.0",
+        "babel-runtime": "^6.0.0",
+        "loader-utils": "^1.0.0",
+        "lodash": "^4.0.0",
+        "source-map": "^0.5.6",
+        "webpack-dev-middleware": "^1.12.0"
+      }
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "requires": {
+        "is-buffer": "^1.1.5"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ=="
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
+    },
+    "loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
           "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^2.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
-          }
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "2.3.11",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
-          }
-        },
-        "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"
-          }
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          },
-          "dependencies": {
-            "arr-diff": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-              "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-              "dev": true
-            },
-            "array-unique": {
-              "version": "0.3.2",
-              "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-              "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-              "dev": true
-            },
-            "braces": {
-              "version": "2.3.2",
-              "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-              "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-              "dev": true,
-              "requires": {
-                "arr-flatten": "^1.1.0",
-                "array-unique": "^0.3.2",
-                "extend-shallow": "^2.0.1",
-                "fill-range": "^4.0.0",
-                "isobject": "^3.0.1",
-                "repeat-element": "^1.1.2",
-                "snapdragon": "^0.8.1",
-                "snapdragon-node": "^2.0.1",
-                "split-string": "^3.0.2",
-                "to-regex": "^3.0.1"
-              },
-              "dependencies": {
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                }
-              }
-            },
-            "expand-brackets": {
-              "version": "2.1.4",
-              "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-              "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-              "dev": true,
-              "requires": {
-                "debug": "^2.3.3",
-                "define-property": "^0.2.5",
-                "extend-shallow": "^2.0.1",
-                "posix-character-classes": "^0.1.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.1"
-              },
-              "dependencies": {
-                "define-property": {
-                  "version": "0.2.5",
-                  "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                  "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                  "dev": true,
-                  "requires": {
-                    "is-descriptor": "^0.1.0"
-                  }
-                },
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                },
-                "is-descriptor": {
-                  "version": "0.1.6",
-                  "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                  "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                  "dev": true,
-                  "requires": {
-                    "is-accessor-descriptor": "^0.1.6",
-                    "is-data-descriptor": "^0.1.4",
-                    "kind-of": "^5.0.0"
-                  }
-                },
-                "kind-of": {
-                  "version": "5.1.0",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                  "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                  "dev": true
-                }
-              }
-            },
-            "extglob": {
-              "version": "2.0.4",
-              "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-              "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-              "dev": true,
-              "requires": {
-                "array-unique": "^0.3.2",
-                "define-property": "^1.0.0",
-                "expand-brackets": "^2.1.4",
-                "extend-shallow": "^2.0.1",
-                "fragment-cache": "^0.2.1",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.1"
-              },
-              "dependencies": {
-                "define-property": {
-                  "version": "1.0.0",
-                  "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                  "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                  "dev": true,
-                  "requires": {
-                    "is-descriptor": "^1.0.0"
-                  }
-                },
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                }
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            },
-            "micromatch": {
-              "version": "3.1.10",
-              "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-              "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-              "dev": true,
-              "requires": {
-                "arr-diff": "^4.0.0",
-                "array-unique": "^0.3.2",
-                "braces": "^2.3.1",
-                "define-property": "^2.0.2",
-                "extend-shallow": "^3.0.2",
-                "extglob": "^2.0.4",
-                "fragment-cache": "^0.2.1",
-                "kind-of": "^6.0.2",
-                "nanomatch": "^1.2.9",
-                "object.pick": "^1.3.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.2"
-              }
-            }
-          }
-        },
-        "tmp": {
-          "version": "0.0.31",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-          "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "~1.0.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
-    "karma-chrome-launcher": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
-      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
-      "dev": true,
-      "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
-      }
-    },
-    "karma-jasmine": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
-      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
-      "dev": true
-    },
-    "karma-sourcemap-loader": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz",
-      "integrity": "sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "karma-webpack": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.13.tgz",
-      "integrity": "sha512-2cyII34jfrAabbI2+4Rk4j95Nazl98FvZQhgSiqKUDarT317rxfv/EdzZ60CyATN4PQxJdO5ucR5bOOXkEVrXw==",
-      "dev": true,
-      "requires": {
-        "async": "^2.0.0",
-        "babel-runtime": "^6.0.0",
-        "loader-utils": "^1.0.0",
-        "lodash": "^4.0.0",
-        "source-map": "^0.5.6",
-        "webpack-dev-middleware": "^1.12.0"
-      }
-    },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
-    },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-    },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        }
-      }
-    },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
-    },
-    "loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "requires": {
-            "minimist": "^1.2.0"
+            "minimist": "^1.2.0"
           }
         }
       }
@@ -7149,7 +6801,7 @@
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
       "requires": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -7168,91 +6820,63 @@
     "lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
     },
     "lodash.escape": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
-      "dev": true
+      "integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="
     },
     "lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="
     },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
     },
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
     },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
     },
     "lodash.tail": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
-      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ="
+      "integrity": "sha512-+7y6zfkH4TqgS5DYKIqJuxmL5xT3WUUumVMZVRpDUo0UqJREwZqKmGo9wluj12FbPGl1UjRf2TnAImbw/bKtdw=="
     },
     "lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
     },
     "log4js": {
-      "version": "0.6.38",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
-      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
-      "dev": true,
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
+      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
       "requires": {
-        "readable-stream": "~1.0.2",
-        "semver": "~4.3.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.1.5"
       }
     },
     "loglevel": {
@@ -7263,13 +6887,12 @@
     "lolex": {
       "version": "2.7.5",
       "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
-      "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
-      "dev": true
+      "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q=="
     },
     "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
+      "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg=="
     },
     "loose-envify": {
       "version": "1.4.0",
@@ -7282,7 +6905,7 @@
     "loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
       "requires": {
         "currently-unhandled": "^0.4.1",
         "signal-exit": "^3.0.0"
@@ -7291,15 +6914,14 @@
     "lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
-      "dev": true
+      "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA=="
     },
     "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "requires": {
-        "yallist": "^3.0.2"
+        "yallist": "^4.0.0"
       }
     },
     "make-dir": {
@@ -7313,17 +6935,17 @@
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="
     },
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="
     },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "requires": {
         "object-visit": "^1.0.0"
       }
@@ -7351,12 +6973,12 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "mem": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "integrity": "sha512-nOBDrc/wgpkd3X/JOhMqYR+/eLqlfLP4oQfoBA6QExIxEl+GU01oyEkwWyueyO8110pUKijtiHGhEmYoOn88oQ==",
       "requires": {
         "mimic-fn": "^1.0.0"
       }
@@ -7364,7 +6986,7 @@
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
       "requires": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
@@ -7373,7 +6995,7 @@
     "meow": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
       "requires": {
         "camelcase-keys": "^2.0.0",
         "decamelize": "^1.1.2",
@@ -7390,108 +7012,25 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
     "miller-rabin": {
@@ -7541,7 +7080,7 @@
     "minimalistic-crypto-utils": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
     },
     "minimatch": {
       "version": "3.1.2",
@@ -7557,9 +7096,9 @@
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
     },
     "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
       "requires": {
         "concat-stream": "^1.5.0",
         "duplexify": "^3.4.2",
@@ -7567,7 +7106,7 @@
         "flush-write-stream": "^1.0.0",
         "from2": "^2.1.0",
         "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
+        "pump": "^2.0.1",
         "pumpify": "^1.3.3",
         "stream-each": "^1.1.0",
         "through2": "^2.0.0"
@@ -7595,7 +7134,7 @@
     "mixin-object": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
       "requires": {
         "for-in": "^0.1.3",
         "is-extendable": "^0.1.1"
@@ -7604,7 +7143,7 @@
         "for-in": {
           "version": "0.1.8",
           "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE="
+          "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g=="
         }
       }
     },
@@ -7632,8 +7171,7 @@
     "moo": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
-      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
-      "dev": true
+      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -7649,9 +7187,9 @@
       }
     },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -7665,13 +7203,7 @@
     "multicast-dns-service-types": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
+      "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ=="
     },
     "nan": {
       "version": "2.17.0",
@@ -7694,19 +7226,39 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+        }
       }
     },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
     },
     "nearley": {
       "version": "2.20.1",
       "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
       "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
-      "dev": true,
       "requires": {
         "commander": "^2.19.0",
         "moo": "^0.5.0",
@@ -7715,9 +7267,9 @@
       }
     },
     "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha512-qTxkr1RoLw5Pz+1+PTJ/66hWuyi2LEOeOuIDJDlx6JF8x75bmD5C7qXTg2UlX5W9rLfkqKP+r8q6Vy6NWdWrbw=="
     },
     "neo-async": {
       "version": "2.6.2",
@@ -7733,7 +7285,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz",
       "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==",
-      "dev": true,
       "requires": {
         "@sinonjs/formatio": "^3.2.1",
         "@sinonjs/text-encoding": "^0.7.1",
@@ -7746,7 +7297,6 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz",
           "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==",
-          "dev": true,
           "requires": {
             "@sinonjs/commons": "^1",
             "@sinonjs/samsam": "^3.1.0"
@@ -7755,14 +7305,12 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
         },
         "lolex": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
           "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
-          "dev": true,
           "requires": {
             "@sinonjs/commons": "^1.7.0"
           }
@@ -7771,7 +7319,6 @@
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
           "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-          "dev": true,
           "requires": {
             "isarray": "0.0.1"
           }
@@ -7782,7 +7329,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dev": true,
       "requires": {
         "lower-case": "^1.1.1"
       }
@@ -7823,7 +7369,15 @@
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+          "integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
         }
       }
     },
@@ -7860,14 +7414,14 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
         }
       }
     },
     "node-releases": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
     },
     "node-sass": {
       "version": "4.14.1",
@@ -7891,12 +7445,45 @@
         "sass-graph": "2.2.5",
         "stdout-stream": "^1.4.0",
         "true-case-path": "^1.0.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha512-eZ+m1WNhSZutOa/uRblAc9Ut5MQfukFrFMtPSm3bZCA888NmMd5AWXWdgRZ80zd+pTk1P2JrGjg9pUPTvl2PWQ==",
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
+        }
       }
     },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
       "requires": {
         "abbrev": "1"
       }
@@ -7912,27 +7499,40 @@
         "validate-npm-package-license": "^3.0.1"
       },
       "dependencies": {
+        "resolve": {
+          "version": "1.22.4",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+          "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+          "requires": {
+            "is-core-module": "^2.13.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        },
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
         }
       }
     },
     "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
     },
     "normalize-range": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
     },
     "normalize-url": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "integrity": "sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==",
       "requires": {
         "object-assign": "^4.0.1",
         "prepend-http": "^1.0.0",
@@ -7943,9 +7543,16 @@
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "requires": {
         "path-key": "^2.0.0"
+      },
+      "dependencies": {
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
+        }
       }
     },
     "npmlog": {
@@ -7963,7 +7570,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
       "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
       "requires": {
         "boolbase": "^1.0.0"
       }
@@ -7971,18 +7577,17 @@
     "null-check": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
-      "dev": true
+      "integrity": "sha512-j8ZNHg19TyIQOWCGeeQJBuu6xZYIEurf8M1Qsfd8mFrGEfIZytbw18YjKWg+LcO25NowXGZXZpKAx+Ui3TFfDw=="
     },
     "num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
+      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="
     },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="
     },
     "oauth-sign": {
       "version": "0.9.0",
@@ -7992,18 +7597,17 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "object-component": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
-      "dev": true
+      "integrity": "sha512-S0sN3agnVh2SZNEIGc0N1X4Z5K0JeFbGBrnuZpsxuUh5XLF0BnvWkMjRXo/zGKLd/eghvNIKcx1pQkmUjXIyrA=="
     },
     "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
@@ -8013,18 +7617,10 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
         }
       }
     },
@@ -8050,9 +7646,16 @@
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "requires": {
         "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        }
       }
     },
     "object.assign": {
@@ -8070,7 +7673,6 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
       "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -8081,7 +7683,6 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
       "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -8092,7 +7693,6 @@
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
       "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
-      "dev": true,
       "requires": {
         "array.prototype.reduce": "^1.0.5",
         "call-bind": "^1.0.2",
@@ -8105,7 +7705,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
       "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
-      "dev": true,
       "requires": {
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4"
@@ -8114,35 +7713,31 @@
     "object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "requires": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-own": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-          "requires": {
-            "for-in": "^1.0.1"
-          }
-        }
       }
     },
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "requires": {
         "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        }
       }
     },
     "object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
       "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -8168,20 +7763,11 @@
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
     },
     "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "wrappy": "1"
       }
     },
     "opn": {
@@ -8195,8 +7781,7 @@
     "optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
+      "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
       "requires": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
@@ -8205,30 +7790,27 @@
         "minimist": {
           "version": "0.0.10",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-          "dev": true
+          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw=="
         }
       }
     },
     "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
       }
     },
     "options": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
-      "dev": true
+      "integrity": "sha512-bOj3L1ypm++N+n7CEbbe473A414AB7z+amKYshRb//iuL3MpdDCLhPnw6aVTdKB9g5ZRVHIEp8eUln6L2NUStg=="
     },
     "original": {
       "version": "1.0.2",
@@ -8241,12 +7823,12 @@
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="
     },
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="
     },
     "os-locale": {
       "version": "2.1.0",
@@ -8261,7 +7843,7 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="
     },
     "osenv": {
       "version": "0.1.5",
@@ -8275,7 +7857,7 @@
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
     },
     "p-limit": {
       "version": "1.3.0",
@@ -8288,7 +7870,7 @@
     "p-locate": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
       "requires": {
         "p-limit": "^1.1.0"
       }
@@ -8301,7 +7883,7 @@
     "p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="
     },
     "pako": {
       "version": "1.0.11",
@@ -8322,11 +7904,18 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
       "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
-      "dev": true,
       "requires": {
         "no-case": "^2.2.0"
       }
     },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
     "parse-asn1": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
@@ -8342,7 +7931,7 @@
     "parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "requires": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
@@ -8353,12 +7942,12 @@
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
         },
         "is-glob": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
           "requires": {
             "is-extglob": "^1.0.0"
           }
@@ -8368,7 +7957,7 @@
     "parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
       "requires": {
         "error-ex": "^1.2.0"
       }
@@ -8377,7 +7966,6 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
       "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "dev": true,
       "requires": {
         "entities": "^4.4.0"
       }
@@ -8386,7 +7974,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
       "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
-      "dev": true,
       "requires": {
         "domhandler": "^5.0.2",
         "parse5": "^7.0.0"
@@ -8395,8 +7982,7 @@
     "parsejson": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
-      "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
-      "dev": true,
+      "integrity": "sha512-v38ZjVbinlZ2r1Rz06WUZEnGoSRcEGX+roMsiWjHeAe23s2qlQUyfmsPQZvh7d8l0E8AZzTIO/RkUr00LfkSiA==",
       "requires": {
         "better-assert": "~1.0.0"
       }
@@ -8404,8 +7990,7 @@
     "parseqs": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "dev": true,
+      "integrity": "sha512-B3Nrjw2aL7aI4TDujOzfA4NsEc4u1lVcIRE0xesutH8kjeWF70uk+W5cBlIQx04zUH9NTBvuN36Y9xLRPK6Jjw==",
       "requires": {
         "better-assert": "~1.0.0"
       }
@@ -8413,8 +7998,7 @@
     "parseuri": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "dev": true,
+      "integrity": "sha512-ijhdxJu6l5Ru12jF0JvzXVPvsC+VibqeaExlNoMhWN6VQ79PGjkmc7oA4W1lp00sFkNyj0fx6ivPLdV51/UMog==",
       "requires": {
         "better-assert": "~1.0.0"
       }
@@ -8427,7 +8011,7 @@
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="
     },
     "path-browserify": {
       "version": "0.0.1",
@@ -8437,27 +8021,27 @@
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="
     },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
     },
     "path-is-inside": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="
     },
     "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
       "version": "1.0.7",
@@ -8470,21 +8054,9 @@
       "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
     },
     "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        }
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
     "pbkdf2": {
       "version": "3.1.2",
@@ -8501,7 +8073,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
     },
     "picocolors": {
       "version": "1.0.0",
@@ -8511,23 +8083,22 @@
     "picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "optional": true
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "requires": {
         "pinkie": "^2.0.0"
       }
@@ -8535,21 +8106,15 @@
     "pkg-dir": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "integrity": "sha512-ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw==",
       "requires": {
         "find-up": "^2.1.0"
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
-    },
     "popper.js": {
       "version": "1.14.4",
       "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz",
-      "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY="
+      "integrity": "sha512-VKAPR2KCx8Uw0oVn0Rt4iggzat+MJ1wu1uJiDnfnMiQcGQRBIopZLfXMKsK/K8NPEerY5kefaYtYjTLb3F6ncw=="
     },
     "portfinder": {
       "version": "1.0.32",
@@ -8568,18 +8133,13 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
     },
     "postcss": {
       "version": "5.2.18",
@@ -8595,7 +8155,7 @@
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
           "requires": {
             "has-flag": "^1.0.0"
           }
@@ -8605,7 +8165,7 @@
     "postcss-calc": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
+      "integrity": "sha512-iBcptYFq+QUh9gzP7ta2btw50o40s4uLI4UDVgd5yRAZtUDWc5APdl5yQDd2h/TyiZNbJrv0HiYhT102CMgN7Q==",
       "requires": {
         "postcss": "^5.0.2",
         "postcss-message-helpers": "^2.0.0",
@@ -8615,7 +8175,7 @@
     "postcss-colormin": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
-      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
+      "integrity": "sha512-XXitQe+jNNPf+vxvQXIQ1+pvdQKWKgkx8zlJNltcMEmLma1ypDRDQwlLt+6cP26fBreihNhZxohh1rcgCH2W5w==",
       "requires": {
         "colormin": "^1.0.5",
         "postcss": "^5.0.13",
@@ -8625,7 +8185,7 @@
     "postcss-convert-values": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
-      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
+      "integrity": "sha512-SE7mf25D3ORUEXpu3WUqQqy0nCbMuM5BEny+ULE/FXdS/0UMA58OdzwvzuHJRpIFlk1uojt16JhaEogtP6W2oA==",
       "requires": {
         "postcss": "^5.0.11",
         "postcss-value-parser": "^3.1.2"
@@ -8634,7 +8194,7 @@
     "postcss-discard-comments": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
-      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
+      "integrity": "sha512-yGbyBDo5FxsImE90LD8C87vgnNlweQkODMkUZlDVM/CBgLr9C5RasLGJxxh9GjVOBeG8NcCMatoqI1pXg8JNXg==",
       "requires": {
         "postcss": "^5.0.14"
       }
@@ -8642,7 +8202,7 @@
     "postcss-discard-duplicates": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
-      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
+      "integrity": "sha512-+lk5W1uqO8qIUTET+UETgj9GWykLC3LOldr7EehmymV0Wu36kyoHimC4cILrAAYpHQ+fr4ypKcWcVNaGzm0reA==",
       "requires": {
         "postcss": "^5.0.4"
       }
@@ -8650,7 +8210,7 @@
     "postcss-discard-empty": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
-      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
+      "integrity": "sha512-IBFoyrwk52dhF+5z/ZAbzq5Jy7Wq0aLUsOn69JNS+7YeuyHaNzJwBIYE0QlUH/p5d3L+OON72Fsexyb7OK/3og==",
       "requires": {
         "postcss": "^5.0.14"
       }
@@ -8658,7 +8218,7 @@
     "postcss-discard-overridden": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
-      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
+      "integrity": "sha512-IyKoDL8QNObOiUc6eBw8kMxBHCfxUaERYTUe2QF8k7j/xiirayDzzkmlR6lMQjrAM1p1DDRTvWrS7Aa8lp6/uA==",
       "requires": {
         "postcss": "^5.0.16"
       }
@@ -8666,7 +8226,7 @@
     "postcss-discard-unused": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
-      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
+      "integrity": "sha512-nCbFNfqYAbKCw9J6PSJubpN9asnrwVLkRDFc4KCwyUEdOtM5XDE/eTW3OpqHrYY1L4fZxgan7LLRAAYYBzwzrg==",
       "requires": {
         "postcss": "^5.0.14",
         "uniqs": "^2.0.0"
@@ -8683,7 +8243,7 @@
     "postcss-merge-idents": {
       "version": "2.1.7",
       "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
-      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
+      "integrity": "sha512-9DHmfCZ7/hNHhIKnNkz4CU0ejtGen5BbTRJc13Z2uHfCedeCUsK2WEQoAJRBL+phs68iWK6Qf8Jze71anuysWA==",
       "requires": {
         "has": "^1.0.1",
         "postcss": "^5.0.10",
@@ -8693,7 +8253,7 @@
     "postcss-merge-longhand": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
-      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
+      "integrity": "sha512-ma7YvxjdLQdifnc1HFsW/AW6fVfubGyR+X4bE3FOSdBVMY9bZjKVdklHT+odknKBB7FSCfKIHC3yHK7RUAqRPg==",
       "requires": {
         "postcss": "^5.0.4"
       }
@@ -8701,7 +8261,7 @@
     "postcss-merge-rules": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
-      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
+      "integrity": "sha512-Wgg2FS6W3AYBl+5L9poL6ZUISi5YzL+sDCJfM7zNw/Q1qsyVQXXZ2cbVui6mu2cYJpt1hOKCGj1xA4mq/obz/Q==",
       "requires": {
         "browserslist": "^1.5.2",
         "caniuse-api": "^1.5.2",
@@ -8713,12 +8273,12 @@
     "postcss-message-helpers": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4="
+      "integrity": "sha512-tPLZzVAiIJp46TBbpXtrUAKqedXSyW5xDEo1sikrfEfnTs+49SBZR/xDdqCiJvSSbtr615xDsaMF3RrxS2jZlA=="
     },
     "postcss-minify-font-values": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
-      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
+      "integrity": "sha512-vFSPzrJhNe6/8McOLU13XIsERohBJiIFFuC1PolgajOZdRWqRgKITP/A4Z/n4GQhEmtbxmO9NDw3QLaFfE1dFQ==",
       "requires": {
         "object-assign": "^4.0.1",
         "postcss": "^5.0.4",
@@ -8728,7 +8288,7 @@
     "postcss-minify-gradients": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
-      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
+      "integrity": "sha512-DZhT0OE+RbVqVyGsTIKx84rU/5cury1jmwPa19bViqYPQu499ZU831yMzzsyC8EhiZVd73+h5Z9xb/DdaBpw7Q==",
       "requires": {
         "postcss": "^5.0.12",
         "postcss-value-parser": "^3.3.0"
@@ -8737,7 +8297,7 @@
     "postcss-minify-params": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
-      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
+      "integrity": "sha512-hhJdMVgP8vasrHbkKAk+ab28vEmPYgyuDzRl31V3BEB3QOR3L5TTIVEWLDNnZZ3+fiTi9d6Ker8GM8S1h8p2Ow==",
       "requires": {
         "alphanum-sort": "^1.0.1",
         "postcss": "^5.0.2",
@@ -8748,7 +8308,7 @@
     "postcss-minify-selectors": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
-      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
+      "integrity": "sha512-e13vxPBSo3ZaPne43KVgM+UETkx3Bs4/Qvm6yXI9HQpQp4nyb7HZ0gKpkF+Wn2x+/dbQ+swNpCdZSbMOT7+TIA==",
       "requires": {
         "alphanum-sort": "^1.0.2",
         "has": "^1.0.1",
@@ -8785,7 +8345,7 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "postcss": {
           "version": "6.0.23",
@@ -8815,7 +8375,7 @@
     "postcss-modules-local-by-default": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "integrity": "sha512-X4cquUPIaAd86raVrBwO8fwRfkIdbwFu7CTfEOjiZQHVQwlHRSkTgH5NLDmMm5+1hQO8u6dZ+TOOJDbay1hYpA==",
       "requires": {
         "css-selector-tokenizer": "^0.7.0",
         "postcss": "^6.0.1"
@@ -8842,7 +8402,7 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "postcss": {
           "version": "6.0.23",
@@ -8872,7 +8432,7 @@
     "postcss-modules-scope": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "integrity": "sha512-LTYwnA4C1He1BKZXIx1CYiHixdSe9LWYVKadq9lK5aCCMkoOkFyZ7aigt+srfjlRplJY3gIol6KUNefdMQJdlw==",
       "requires": {
         "css-selector-tokenizer": "^0.7.0",
         "postcss": "^6.0.1"
@@ -8899,7 +8459,7 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "postcss": {
           "version": "6.0.23",
@@ -8929,7 +8489,7 @@
     "postcss-modules-values": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "integrity": "sha512-i7IFaR9hlQ6/0UgFuqM6YWaCfA1Ej8WMg8A5DggnH1UGKJvTV/ugqq/KaULixzzOi3T/tF6ClBXcHGCzdd5unA==",
       "requires": {
         "icss-replace-symbols": "^1.1.0",
         "postcss": "^6.0.1"
@@ -8956,7 +8516,7 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "postcss": {
           "version": "6.0.23",
@@ -8986,7 +8546,7 @@
     "postcss-normalize-charset": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
-      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
+      "integrity": "sha512-RKgjEks83l8w4yEhztOwNZ+nLSrJ+NvPNhpS+mVDzoaiRHZQVoG7NF2TP5qjwnaN9YswUhj6m1E0S0Z+WDCgEQ==",
       "requires": {
         "postcss": "^5.0.5"
       }
@@ -8994,7 +8554,7 @@
     "postcss-normalize-url": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
-      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
+      "integrity": "sha512-WqtWG6GV2nELsQEFES0RzfL2ebVwmGl/M8VmMbshKto/UClBo+mznX8Zi4/hkThdqx7ijwv+O8HWPdpK7nH/Ig==",
       "requires": {
         "is-absolute-url": "^2.0.0",
         "normalize-url": "^1.4.0",
@@ -9005,7 +8565,7 @@
     "postcss-ordered-values": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
-      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
+      "integrity": "sha512-5RB1IUZhkxDCfa5fx/ogp/A82mtq+r7USqS+7zt0e428HJ7+BHCxyeY39ClmkkUtxdOd3mk8gD6d9bjH2BECMg==",
       "requires": {
         "postcss": "^5.0.4",
         "postcss-value-parser": "^3.0.1"
@@ -9014,7 +8574,7 @@
     "postcss-reduce-idents": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
-      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
+      "integrity": "sha512-0+Ow9e8JLtffjumJJFPqvN4qAvokVbdQPnijUDSOX8tfTwrILLP4ETvrZcXZxAtpFLh/U0c+q8oRMJLr1Kiu4w==",
       "requires": {
         "postcss": "^5.0.4",
         "postcss-value-parser": "^3.0.2"
@@ -9023,7 +8583,7 @@
     "postcss-reduce-initial": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
-      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
+      "integrity": "sha512-jJFrV1vWOPCQsIVitawGesRgMgunbclERQ/IRGW7r93uHrVzNQQmHQ7znsOIjJPZ4yWMzs5A8NFhp3AkPHPbDA==",
       "requires": {
         "postcss": "^5.0.4"
       }
@@ -9031,7 +8591,7 @@
     "postcss-reduce-transforms": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
-      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
+      "integrity": "sha512-lGgRqnSuAR5i5uUg1TA33r9UngfTadWxOyL2qx1KuPoCQzfmtaHjp9PuwX7yVyRxG3BWBzeFUaS5uV9eVgnEgQ==",
       "requires": {
         "has": "^1.0.1",
         "postcss": "^5.0.8",
@@ -9041,7 +8601,7 @@
     "postcss-selector-parser": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "integrity": "sha512-3pqyakeGhrO0BQ5+/tGTfvi5IAUAhHRayGK8WFSu06aEv2BmHoXw/Mhb+w7VY5HERIuC+QoUI7wgrCcq2hqCVA==",
       "requires": {
         "flatten": "^1.0.2",
         "indexes-of": "^1.0.1",
@@ -9051,7 +8611,7 @@
     "postcss-svgo": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
-      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
+      "integrity": "sha512-y5AdQdgBoF4rbpdbeWAJuxE953g/ylRfVNp6mvAi61VCN/Y25Tu9p5mh3CyI42WbTRIiwR9a1GdFtmDnNPeskQ==",
       "requires": {
         "is-svg": "^2.0.0",
         "postcss": "^5.0.14",
@@ -9062,7 +8622,7 @@
     "postcss-unique-selectors": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
-      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
+      "integrity": "sha512-WZX8r1M0+IyljoJOJleg3kYm10hxNYF9scqAT7v/xeSX1IdehutOM85SNO0gP9K+bgs86XERr7Ud5u3ch4+D8g==",
       "requires": {
         "alphanum-sort": "^1.0.1",
         "postcss": "^5.0.4",
@@ -9077,7 +8637,7 @@
     "postcss-zindex": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
-      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
+      "integrity": "sha512-uhRZ2hRgj0lorxm9cr62B01YzpUe63h0RXMXQ4gWW3oa2rpJh+FJAiEAytaFCPU/VgaBS+uW2SJ1XKyDNz1h4w==",
       "requires": {
         "has": "^1.0.1",
         "postcss": "^5.0.4",
@@ -9085,26 +8645,24 @@
       }
     },
     "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
     },
     "prepend-http": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+      "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="
     },
     "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
+      "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ=="
     },
     "pretty-error": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
       "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
-      "dev": true,
       "requires": {
         "lodash": "^4.17.20",
         "renderkid": "^2.0.4"
@@ -9114,7 +8672,6 @@
       "version": "21.2.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-21.2.1.tgz",
       "integrity": "sha512-ZdWPGYAnYfcVP8yKA3zFjCn8s4/17TeYH28MXuC8vTp0o21eXjbFGcOAXZEaDaOFJjc3h2qa7HQNHNshhvoh2A==",
-      "dev": true,
       "requires": {
         "ansi-regex": "^3.0.0",
         "ansi-styles": "^3.2.0"
@@ -9123,14 +8680,12 @@
         "ansi-regex": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
         },
         "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"
           }
@@ -9159,19 +8714,13 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
     },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
@@ -9185,6 +8734,13 @@
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
         "react-is": "^16.13.1"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
       }
     },
     "proxy-addr": {
@@ -9199,12 +8755,12 @@
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
     },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
     },
     "psl": {
       "version": "1.9.0",
@@ -9232,9 +8788,9 @@
       }
     },
     "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -9248,17 +8804,6 @@
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
         "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
       }
     },
     "punycode": {
@@ -9269,23 +8814,25 @@
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
     },
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg=="
     },
     "qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "query-string": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
       "requires": {
         "object-assign": "^4.1.0",
         "strict-uri-encode": "^1.0.0"
@@ -9299,18 +8846,22 @@
     "querystring-es3": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="
     },
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
     },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+    },
     "raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-      "dev": true,
       "requires": {
         "performance-now": "^2.1.0"
       }
@@ -9318,14 +8869,12 @@
     "railroad-diagrams": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-      "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
-      "dev": true
+      "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="
     },
     "randexp": {
       "version": "0.4.6",
       "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
       "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
-      "dev": true,
       "requires": {
         "discontinuous-range": "1.0.0",
         "ret": "~0.1.10"
@@ -9345,6 +8894,11 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
           "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -9371,9 +8925,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "requires": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -9381,11 +8935,6 @@
         "unpipe": "1.0.0"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
         "iconv-lite": {
           "version": "0.4.24",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -9434,9 +8983,9 @@
       "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
     },
     "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
     "react-onclickoutside": {
       "version": "6.13.0",
@@ -9466,29 +9015,26 @@
       }
     },
     "react-router": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.11.2.tgz",
-      "integrity": "sha512-74z9xUSaSX07t3LM+pS6Un0T55ibUE/79CzfZpy5wsPDZaea1F8QkrsiyRnA2YQ7LwE/umaydzXZV80iDCPkMg==",
-      "dev": true,
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz",
+      "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==",
       "requires": {
-        "@remix-run/router": "1.6.2"
+        "@remix-run/router": "1.7.2"
       }
     },
     "react-router-dom": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.11.2.tgz",
-      "integrity": "sha512-JNbKtAeh1VSJQnH6RvBDNhxNwemRj7KxCzc5jb7zvDSKRnPWIFj9pO+eXqjM69gQJ0r46hSz1x4l9y0651DKWw==",
-      "dev": true,
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz",
+      "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==",
       "requires": {
-        "@remix-run/router": "1.6.2",
-        "react-router": "6.11.2"
+        "@remix-run/router": "1.7.2",
+        "react-router": "6.14.2"
       }
     },
     "react-shallow-renderer": {
       "version": "16.15.0",
       "resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz",
       "integrity": "sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==",
-      "dev": true,
       "requires": {
         "object-assign": "^4.1.1",
         "react-is": "^16.12.0 || ^17.0.0 || ^18.0.0"
@@ -9508,7 +9054,6 @@
       "version": "16.14.0",
       "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
       "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
-      "dev": true,
       "requires": {
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
@@ -9516,115 +9061,416 @@
         "scheduler": "^0.19.1"
       },
       "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        },
         "scheduler": {
           "version": "0.19.1",
           "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
           "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
-          "dev": true,
           "requires": {
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.1"
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.1"
+          }
+        }
+      }
+    },
+    "react-toggle": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.0.2.tgz",
+      "integrity": "sha512-EPTWnN7gQHgEAUEmjheanZXNzY5TPnQeyyHfEs3YshaiWZf5WNjfYDrglO5F1Hl/dNveX18i4l0grTEsYH2Ccw==",
+      "requires": {
+        "classnames": "^2.2.5"
+      }
+    },
+    "react-transition-group": {
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      }
+    },
+    "reactstrap": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.0.1.tgz",
+      "integrity": "sha512-89VOv7SRlAlpS7RwXhzOQkSWkuhBR8LBsPGfNHifNL3WhtNP9y1sBdTcTYyH1ee2QtI8zRdwD0T5I/blHiwemg==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@popperjs/core": "^2.6.0",
+        "classnames": "^2.2.3",
+        "prop-types": "^15.5.8",
+        "react-popper": "^2.2.4",
+        "react-transition-group": "^4.4.2"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "requires": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+        }
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
-        }
-      }
-    },
-    "react-toggle": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.0.2.tgz",
-      "integrity": "sha512-EPTWnN7gQHgEAUEmjheanZXNzY5TPnQeyyHfEs3YshaiWZf5WNjfYDrglO5F1Hl/dNveX18i4l0grTEsYH2Ccw==",
-      "requires": {
-        "classnames": "^2.2.5"
-      }
-    },
-    "react-transition-group": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
-      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "reactstrap": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.0.1.tgz",
-      "integrity": "sha512-89VOv7SRlAlpS7RwXhzOQkSWkuhBR8LBsPGfNHifNL3WhtNP9y1sBdTcTYyH1ee2QtI8zRdwD0T5I/blHiwemg==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@popperjs/core": "^2.6.0",
-        "classnames": "^2.2.3",
-        "prop-types": "^15.5.8",
-        "react-popper": "^2.2.4",
-        "react-transition-group": "^4.4.2"
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
           }
         }
       }
     },
-    "readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "optional": true,
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
     "redent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
       "requires": {
         "indent-string": "^2.1.0",
         "strip-indent": "^1.0.1"
@@ -9633,7 +9479,7 @@
     "reduce-css-calc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+      "integrity": "sha512-0dVfwYVOlf/LBA2ec4OwQ6p3X9mYxn/wOl2xTcLwjnPYrkgEfPx3VI4eGCH3rQLlPISG5v9I9bkZosKsNRTRKA==",
       "requires": {
         "balanced-match": "^0.4.2",
         "math-expression-evaluator": "^1.2.14",
@@ -9643,7 +9489,7 @@
         "balanced-match": {
           "version": "0.4.2",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+          "integrity": "sha512-STw03mQKnGUYtoNjmowo4F2cRmIIxYEGiMsjjwla/u5P1lxadj/05WkNaFjNiKTgJkj8KiXbgAiRTmcQRwQNtg=="
         }
       }
     },
@@ -9669,7 +9515,7 @@
     "redux-logger": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/redux-logger/-/redux-logger-3.0.6.tgz",
-      "integrity": "sha1-91VZZvMJjzyIYExEnPC69XeCdL8=",
+      "integrity": "sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg==",
       "requires": {
         "deep-diff": "^0.3.5"
       }
@@ -9685,9 +9531,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "regenerator-transform": {
       "version": "0.10.1",
@@ -9726,16 +9572,10 @@
         "functions-have-names": "^1.2.3"
       }
     },
-    "regexpp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
-      "dev": true
-    },
     "regexpu-core": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "integrity": "sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ==",
       "requires": {
         "regenerate": "^1.2.1",
         "regjsgen": "^0.2.0",
@@ -9745,12 +9585,12 @@
     "regjsgen": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
+      "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g=="
     },
     "regjsparser": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "integrity": "sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw==",
       "requires": {
         "jsesc": "~0.5.0"
       },
@@ -9758,26 +9598,24 @@
         "jsesc": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
         }
       }
     },
     "relateurl": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "dev": true
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
     },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
     },
     "renderkid": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz",
       "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==",
-      "dev": true,
       "requires": {
         "css-select": "^4.1.3",
         "dom-converter": "^0.2.0",
@@ -9790,7 +9628,6 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
           "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-          "dev": true,
           "requires": {
             "boolbase": "^1.0.0",
             "css-what": "^6.0.1",
@@ -9803,7 +9640,6 @@
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
           "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-          "dev": true,
           "requires": {
             "domelementtype": "^2.0.1",
             "domhandler": "^4.2.0",
@@ -9814,7 +9650,6 @@
           "version": "4.3.1",
           "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
           "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-          "dev": true,
           "requires": {
             "domelementtype": "^2.2.0"
           }
@@ -9823,7 +9658,6 @@
           "version": "2.8.0",
           "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
           "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-          "dev": true,
           "requires": {
             "dom-serializer": "^1.0.1",
             "domelementtype": "^2.2.0",
@@ -9833,14 +9667,12 @@
         "entities": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
         },
         "htmlparser2": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
           "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-          "dev": true,
           "requires": {
             "domelementtype": "^2.0.1",
             "domhandler": "^4.0.0",
@@ -9858,12 +9690,12 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
     },
     "repeating": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -9893,52 +9725,41 @@
         "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
+        }
       }
     },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
     },
     "require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-          "dev": true
-        }
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
     "reselect": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
+      "integrity": "sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA=="
     },
     "resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "version": "2.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
       "requires": {
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -9946,40 +9767,47 @@
     "resolve-cwd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "integrity": "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==",
       "requires": {
         "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="
+        }
       }
     },
     "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
     },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
     },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+    },
+    "rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
+    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "requires": {
         "align-text": "^0.1.1"
       }
@@ -10004,18 +9832,19 @@
     "rst-selector-parser": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
-      "dev": true,
+      "integrity": "sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==",
       "requires": {
         "lodash.flattendeep": "^4.4.0",
         "nearley": "^2.7.10"
       }
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
     },
     "run-queue": {
       "version": "1.0.3",
@@ -10025,39 +9854,15 @@
         "aproba": "^1.1.1"
       }
     },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "dev": true,
-      "requires": {
-        "rx-lite": "*"
-      }
-    },
     "safe-array-concat": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
       "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.0",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
       }
     },
     "safe-buffer": {
@@ -10068,7 +9873,7 @@
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "requires": {
         "ret": "~0.1.10"
       }
@@ -10091,8 +9896,7 @@
     "samsam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
-      "dev": true
+      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg=="
     },
     "sass-graph": {
       "version": "2.2.5",
@@ -10134,15 +9938,38 @@
     "schema-utils": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+      "integrity": "sha512-QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q==",
       "requires": {
         "ajv": "^5.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw=="
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA=="
+        }
       }
     },
     "scss-tokenizer": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
       "requires": {
         "js-base64": "^2.1.8",
         "source-map": "^0.4.2"
@@ -10151,7 +9978,7 @@
         "source-map": {
           "version": "0.4.4",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
           "requires": {
             "amdefine": ">=0.0.4"
           }
@@ -10161,7 +9988,7 @@
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
     },
     "selfsigned": {
       "version": "1.10.14",
@@ -10172,9 +9999,12 @@
       }
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
     "send": {
       "version": "0.18.0",
@@ -10196,6 +10026,21 @@
         "statuses": "2.0.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            }
+          }
+        },
         "ms": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -10204,17 +10049,14 @@
       }
     },
     "serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+      "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="
     },
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "requires": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -10225,6 +10067,23 @@
         "parseurl": "~1.3.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "depd": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -10233,7 +10092,7 @@
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
           "requires": {
             "depd": "~1.1.2",
             "inherits": "2.0.3",
@@ -10244,7 +10103,17 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
         },
         "setprototypeof": {
           "version": "1.1.0",
@@ -10272,7 +10141,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
     "set-value": {
       "version": "2.0.1",
@@ -10288,7 +10157,7 @@
         "extend-shallow": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -10298,7 +10167,7 @@
     "setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
     },
     "setprototypeof": {
       "version": "1.2.0",
@@ -10332,17 +10201,17 @@
       }
     },
     "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       }
     },
     "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "side-channel": {
       "version": "1.0.4",
@@ -10363,7 +10232,6 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
       "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
-      "dev": true,
       "requires": {
         "@sinonjs/formatio": "^2.0.0",
         "diff": "^3.1.0",
@@ -10377,14 +10245,12 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "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"
           }
@@ -10392,26 +10258,9 @@
       }
     },
     "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
-    },
-    "slice-ansi": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        }
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -10428,10 +10277,18 @@
         "use": "^3.1.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -10439,10 +10296,15 @@
         "extend-shallow": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -10459,7 +10321,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -10489,6 +10351,16 @@
             "is-data-descriptor": "^1.0.0",
             "kind-of": "^6.0.2"
           }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -10498,23 +10370,12 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "requires": {
         "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
       }
     },
     "socket.io": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
-      "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=",
-      "dev": true,
+      "integrity": "sha512-CmZLQTyj5nKKVBoguhisLP5Yl6oEfEWbQQQQ0MdXAazCZdRpGR4FG6rd13ryovTa75S36PgXsAGtzwllCWrgbQ==",
       "requires": {
         "debug": "2.3.3",
         "engine.io": "1.8.3",
@@ -10528,8 +10389,7 @@
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
+          "integrity": "sha512-dCHp4G+F11zb+RtEu7BE2U8R32AYmM/4bljQfut8LipH3PdwsVBVGh083MXvtKkB7HSQUzSwiXz53c4mzJvYfw==",
           "requires": {
             "ms": "0.7.2"
           }
@@ -10537,929 +10397,1239 @@
         "ms": {
           "version": "0.7.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
+          "integrity": "sha512-5NnE67nQSQDJHVahPJna1PQ/zCXMnQop3yUCxjKPNzCxuyPSKWTQ/5Gu5CZmjetwGLWRA+PzeF5thlbOdbQldA=="
         },
         "object-assign": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
-          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
-          "dev": true
+          "integrity": "sha512-Lbc7GfN7XFaK30bzUN3cDYLOkT0dH05S0ax1QikylHUD9+Z9PRF3G1iYwX3kcz+6AlzTFGkUgMxz6l3aUwbwTA=="
         }
       }
     },
     "socket.io-adapter": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz",
-      "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=",
-      "dev": true,
+      "integrity": "sha512-zmYvlFJay9skt4yk1MffE9p93HKvQtyy0BLZ5dRM73bOXFJXNZWq8qZVdY456sLaxdK6fHGiZ7glxzqvzwGzkw==",
+      "requires": {
+        "debug": "2.3.3",
+        "socket.io-parser": "2.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha512-dCHp4G+F11zb+RtEu7BE2U8R32AYmM/4bljQfut8LipH3PdwsVBVGh083MXvtKkB7HSQUzSwiXz53c4mzJvYfw==",
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha512-5NnE67nQSQDJHVahPJna1PQ/zCXMnQop3yUCxjKPNzCxuyPSKWTQ/5Gu5CZmjetwGLWRA+PzeF5thlbOdbQldA=="
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz",
+      "integrity": "sha512-ZEPOqFboJuuVau/3sMF4PgzJM/X+TDhssgufCnGtPtSL2Nmt4dL3i9JheCT1B45hiYM5cgO+wTO8EYmxbpwHSw==",
+      "requires": {
+        "backo2": "1.0.2",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "2.3.3",
+        "engine.io-client": "1.8.3",
+        "has-binary": "0.1.7",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "2.3.1",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA=="
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha512-dCHp4G+F11zb+RtEu7BE2U8R32AYmM/4bljQfut8LipH3PdwsVBVGh083MXvtKkB7HSQUzSwiXz53c4mzJvYfw==",
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha512-5NnE67nQSQDJHVahPJna1PQ/zCXMnQop3yUCxjKPNzCxuyPSKWTQ/5Gu5CZmjetwGLWRA+PzeF5thlbOdbQldA=="
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
+      "integrity": "sha512-j6l4g/+yWQjmy1yByzg1DPFL4vxQw+NwCJatIxni/AE1wfm17FBtIKSWU4Ay+onrJwDxmC4eK4QS/04ZsqYwZQ==",
+      "requires": {
+        "component-emitter": "1.1.2",
+        "debug": "2.2.0",
+        "isarray": "0.0.1",
+        "json3": "3.3.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+          "integrity": "sha512-YhIbp3PJiznERfjlIkK0ue4obZxt2S60+0W8z24ZymOHT8sHloOqWOqZRU2eN5OlY8U08VFsP02letcu26FilA=="
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha512-X0rGvJcskG1c3TgSCPqHJ0XJgwlcvOC7elJ5Y0hYuKBZoVqWpAMfLOeIh2UI/DCQ5ruodIjvsugZtjUYUw2pUw==",
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg=="
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+      "integrity": "sha512-hkDiI0wOmGmoUG3TSIrbDt8AhyzhePuNT3nogc5+c0amyUHu091y+jRK2h/e36olKRG+tSbhlQYHWqdsuW0CtQ==",
+      "requires": {
+        "debug": "^2.6.6",
+        "eventsource": "0.1.6",
+        "faye-websocket": "~0.11.0",
+        "inherits": "^2.0.1",
+        "json3": "^3.3.2",
+        "url-parse": "^1.1.8"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.11.4",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+          "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+    },
+    "source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "requires": {
+        "source-map": "^0.5.6"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
+    },
+    "spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+    },
+    "spdy": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
+      "integrity": "sha512-jEvgkLRpMza5GON0oDzvLTLMAVfB5BxeOPbsWyisEyE8IbxL6cCiKbr8xrJdScs6XoOUp7pQy4PI+GVczHbO4w==",
       "requires": {
-        "debug": "2.3.3",
-        "socket.io-parser": "2.3.1"
+        "debug": "^2.6.8",
+        "handle-thing": "^1.2.5",
+        "http-deceiver": "^1.2.7",
+        "safe-buffer": "^5.0.1",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^2.0.18"
       },
       "dependencies": {
         "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
-            "ms": "0.7.2"
+            "ms": "2.0.0"
           }
         },
         "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
-    "socket.io-client": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz",
-      "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=",
-      "dev": true,
+    "spdy-transport": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.1.tgz",
+      "integrity": "sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==",
       "requires": {
-        "backo2": "1.0.2",
-        "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "2.3.3",
-        "engine.io-client": "1.8.3",
-        "has-binary": "0.1.7",
-        "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseuri": "0.0.5",
-        "socket.io-parser": "2.3.1",
-        "to-array": "0.1.4"
+        "debug": "^2.6.8",
+        "detect-node": "^2.0.3",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.1",
+        "readable-stream": "^2.2.9",
+        "safe-buffer": "^5.0.1",
+        "wbuf": "^1.7.2"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
         "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
-            "ms": "0.7.2"
+            "ms": "2.0.0"
           }
         },
         "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
-    "socket.io-parser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
-      "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
-      "dev": true,
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "requires": {
-        "component-emitter": "1.1.2",
-        "debug": "2.2.0",
-        "isarray": "0.0.1",
-        "json3": "3.3.2"
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "sshpk": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
+      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "ssri": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "requires": {
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-          "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "requires": {
-            "ms": "0.7.1"
+            "is-descriptor": "^0.1.0"
           }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "json3": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-          "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-          "dev": true
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
         }
       }
     },
-    "sockjs": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+    "statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+    },
+    "stdout-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
+        "readable-stream": "^2.0.1"
       }
     },
-    "sockjs-client": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
-      "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+    "store": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz",
+      "integrity": "sha512-eO9xlzDpXLiMr9W1nQ3Nfp9EzZieIQc10zPPMP5jsVV7bLOziSFFBP0XoDXACEIFtdI+rIz0NwWVA/QVJ8zJtw=="
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "requires": {
-        "debug": "^2.6.6",
-        "eventsource": "0.1.6",
-        "faye-websocket": "~0.11.0",
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
         "inherits": "^2.0.1",
-        "json3": "^3.3.2",
-        "url-parse": "^1.1.8"
-      },
-      "dependencies": {
-        "faye-websocket": {
-          "version": "0.11.4",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-          "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        }
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
       }
     },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
+    },
+    "streamroller": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
+      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
+      "requires": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "fs-extra": "^8.1.0"
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
+    "string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
-        "is-plain-obj": "^1.0.0"
+        "safe-buffer": "~5.1.0"
       }
     },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-    },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "ansi-regex": "^2.0.0"
       }
     },
-    "source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
       "requires": {
-        "source-map": "^0.5.6"
+        "is-utf8": "^0.2.0"
       }
     },
-    "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="
     },
-    "spdx-correct": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
-      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
       "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
+        "get-stdin": "^4.0.1"
       }
     },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+    "style-loader": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
+      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
       "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^0.3.0"
       }
     },
-    "spdx-license-ids": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="
     },
-    "spdy": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
-      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
-      "requires": {
-        "debug": "^2.6.8",
-        "handle-thing": "^1.2.5",
-        "http-deceiver": "^1.2.7",
-        "safe-buffer": "^5.0.1",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^2.0.18"
-      }
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
     },
-    "spdy-transport": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.1.tgz",
-      "integrity": "sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==",
+    "svgo": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
+      "integrity": "sha512-jT/g9FFMoe9lu2IT6HtAxTA7RR2XOrmcrmCtGnyB/+GQnV6ZjNn+KOHZbZ35yL81+1F/aB6OeEsJztzBQ2EEwA==",
       "requires": {
-        "debug": "^2.6.8",
-        "detect-node": "^2.0.3",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.1",
-        "readable-stream": "^2.2.9",
-        "safe-buffer": "^5.0.1",
-        "wbuf": "^1.7.2"
+        "coa": "~1.0.1",
+        "colors": "~1.1.2",
+        "csso": "~2.3.1",
+        "js-yaml": "~3.7.0",
+        "mkdirp": "~0.5.1",
+        "sax": "~1.2.1",
+        "whet.extend": "~0.9.9"
       }
     },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
     },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
-    "sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+    "tar": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
       }
     },
-    "ssri": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+    "terser": {
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
       "requires": {
-        "figgy-pudding": "^3.5.1"
+        "commander": "^2.19.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.10"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "source-map-support": {
+          "version": "0.5.21",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        }
       }
     },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+    "terser-webpack-plugin-legacy": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin-legacy/-/terser-webpack-plugin-legacy-1.2.5.tgz",
+      "integrity": "sha512-hAoKjlQaUM21gUH9cwpzA67dbYInKwD6ovKa6qO5c3Fh3iV4Rij8NrD/pRub8EmxoY/0xTJQ5kWjC3hSs7bvwQ==",
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "cacache": "^11.0.2",
+        "core-js": "^2.6.11",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^4.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^3.16.1",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
       },
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+        "cacache": {
+          "version": "11.3.3",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
+          "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+        },
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "ssri": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+          "requires": {
+            "figgy-pudding": "^3.5.1"
           }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
-    "stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "store": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz",
-      "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM="
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
+    "time-stamp": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.2.0.tgz",
+      "integrity": "sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA=="
     },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+    "timers-browserify": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "setimmediate": "^1.0.4"
       }
     },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+    "tmp": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
+      "integrity": "sha512-lfyEfOppKvWNeId5CArFLwgwef+iCnbEIy0JWYf1httIEXnx4ndL4Dr1adw7hPgeQfSlTbc/gqn6iaKcROpw5Q==",
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "os-tmpdir": "~1.0.1"
       }
     },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
-    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A=="
     },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      }
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
     },
-    "string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
-      }
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og=="
     },
-    "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "kind-of": "^3.0.2"
       }
     },
-    "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
-    "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+    "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==",
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "is-number": "^7.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
+    "toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg=="
     },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "requires": {
-        "is-utf8": "^0.2.0"
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "strip-indent": {
+    "tr46": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "style-loader": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
-      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
       "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^0.3.0"
+        "punycode": "^2.1.0"
       }
     },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-    },
-    "supports-preserve-symlinks-flag": {
+    "trim-newlines": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw=="
     },
-    "svgo": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
-      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw=="
+    },
+    "true-case-path": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
       "requires": {
-        "coa": "~1.0.1",
-        "colors": "~1.1.2",
-        "csso": "~2.3.1",
-        "js-yaml": "~3.7.0",
-        "mkdirp": "~0.5.1",
-        "sax": "~1.2.1",
-        "whet.extend": "~0.9.9"
+        "glob": "^7.1.2"
       }
     },
-    "symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
-    },
-    "table": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
-      "dev": true,
+    "ts-loader": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-3.5.0.tgz",
+      "integrity": "sha512-JTia3kObhTk36wPFgy0RnkZReiusYx7Le9IhcUWRrCTcFcr6Dy1zGsFd3x8DG4gevlbN65knI8W50FfoykXcng==",
       "requires": {
-        "ajv": "^5.2.3",
-        "ajv-keywords": "^2.1.0",
-        "chalk": "^2.1.0",
-        "lodash": "^4.17.4",
-        "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "chalk": "^2.3.0",
+        "enhanced-resolve": "^3.0.0",
+        "loader-utils": "^1.0.2",
+        "micromatch": "^3.1.4",
+        "semver": "^5.0.1"
       },
       "dependencies": {
-        "ajv-keywords": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "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"
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
           "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
           "requires": {
             "ansi-styles": "^3.2.1",
             "escape-string-regexp": "^1.0.5",
             "supports-color": "^5.3.0"
           }
         },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
-            "has-flag": "^3.0.0"
+            "ms": "2.0.0"
           }
-        }
-      }
-    },
-    "tapable": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
-      "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A=="
-    },
-    "tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-      "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
-      }
-    },
-    "terser": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
-      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
-      "requires": {
-        "commander": "^2.19.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.10"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
-        "source-map-support": {
-          "version": "0.5.21",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        }
-      }
-    },
-    "terser-webpack-plugin-legacy": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin-legacy/-/terser-webpack-plugin-legacy-1.2.5.tgz",
-      "integrity": "sha512-hAoKjlQaUM21gUH9cwpzA67dbYInKwD6ovKa6qO5c3Fh3iV4Rij8NrD/pRub8EmxoY/0xTJQ5kWjC3hSs7bvwQ==",
-      "requires": {
-        "cacache": "^11.0.2",
-        "core-js": "^2.6.11",
-        "find-cache-dir": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+            }
           }
         },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-        },
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
           "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
           "requires": {
-            "locate-path": "^3.0.0"
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "locate-path": {
+        "has-flag": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "kind-of": "^6.0.0"
           }
         },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
+            "kind-of": "^6.0.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "p-try": "^2.0.0"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         },
-        "p-locate": {
+        "is-number": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
           "requires": {
-            "p-limit": "^2.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
         },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "requires": {
-            "find-up": "^3.0.0"
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
           }
         },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "time-stamp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.2.0.tgz",
-      "integrity": "sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA=="
-    },
-    "timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
-      "dev": true
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "has-flag": "^3.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
           }
         }
       }
     },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "optional": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-    },
-    "toposort": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
-      "integrity": "sha512-FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg==",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
-    "true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+    "tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "requires": {
-        "glob": "^7.1.2"
+        "tslib": "^1.8.1"
       }
     },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="
     },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -11467,7 +11637,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
     },
     "type": {
       "version": "1.2.0",
@@ -11475,27 +11645,63 @@
       "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
     },
     "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
       }
     },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
       "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
       }
     },
     "typed-array-length": {
@@ -11511,37 +11717,84 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+    },
+    "typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="
     },
     "uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "requires": {
+        "commander": "~2.19.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
+      "optional": true
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+      "integrity": "sha512-TNM20HMW67kxHRNCZdvLyiwE1ST6WyY5Ae+TG55V81NpvNwJ9+V4/po4LHA1R9afV/WrqzfedG2UJCk2+swirw==",
       "requires": {
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
+        "source-map": "^0.5.6",
+        "uglify-js": "^2.8.29",
+        "webpack-sources": "^1.0.1"
       },
       "dependencies": {
         "camelcase": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+          "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g=="
         },
         "cliui": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
           "requires": {
             "center-align": "^0.1.1",
             "right-align": "^0.1.1",
             "wordwrap": "0.0.2"
           }
         },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha512-qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w==",
+          "requires": {
+            "source-map": "~0.5.1",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.10.0"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q=="
+        },
         "yargs": {
           "version": "3.10.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
           "requires": {
             "camelcase": "^1.0.2",
             "cliui": "^2.1.0",
@@ -11551,27 +11804,10 @@
         }
       }
     },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "optional": true
-    },
-    "uglifyjs-webpack-plugin": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-      "requires": {
-        "source-map": "^0.5.6",
-        "uglify-js": "^2.8.29",
-        "webpack-sources": "^1.0.1"
-      }
-    },
     "ultron": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
-      "dev": true
+      "integrity": "sha512-QMpnpVtYaWEeY+MwKDN/UdKlE/LsFZXM5lO1u7GaZzNgmIbGixHEmVMIKT+vqYOALu3m5GYQy9kz4Xu4IVn7Ow=="
     },
     "unbox-primitive": {
       "version": "1.0.2",
@@ -11598,12 +11834,12 @@
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
+      "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA=="
     },
     "uniqs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
+      "integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ=="
     },
     "unique-filename": {
       "version": "1.1.1",
@@ -11621,15 +11857,20 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
@@ -11638,7 +11879,7 @@
         "has-value": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
           "requires": {
             "get-value": "^2.0.3",
             "has-values": "^0.1.4",
@@ -11648,7 +11889,7 @@
             "isobject": {
               "version": "2.1.0",
               "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
               "requires": {
                 "isarray": "1.0.0"
               }
@@ -11658,7 +11899,17 @@
         "has-values": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
         }
       }
     },
@@ -11679,8 +11930,7 @@
     "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
-      "dev": true
+      "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA=="
     },
     "uri-js": {
       "version": "4.4.1",
@@ -11693,26 +11943,21 @@
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="
     },
     "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
+      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
       "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
+        "punycode": "^1.4.1",
+        "qs": "^6.11.0"
       },
       "dependencies": {
         "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-        },
-        "querystring": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-          "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
         }
       }
     },
@@ -11739,7 +11984,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
       "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
-      "dev": true,
       "requires": {
         "lru-cache": "4.1.x",
         "tmp": "0.0.x"
@@ -11749,7 +11993,6 @@
           "version": "4.1.5",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
           "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
           "requires": {
             "pseudomap": "^1.0.2",
             "yallist": "^2.1.2"
@@ -11758,8 +12001,7 @@
         "yallist": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
+          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
         }
       }
     },
@@ -11774,20 +12016,19 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
         }
       }
     },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "util.promisify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
       "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
       "requires": {
         "define-properties": "^1.1.2",
         "object.getownpropertydescriptors": "^2.0.3"
@@ -11796,13 +12037,12 @@
     "utila": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
     },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
       "version": "3.4.0",
@@ -11821,7 +12061,7 @@
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "vendors": {
       "version": "1.0.4",
@@ -11831,7 +12071,7 @@
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -11853,8 +12093,7 @@
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
+      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung=="
     },
     "warning": {
       "version": "4.0.3",
@@ -11873,6 +12112,70 @@
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0",
         "watchpack-chokidar2": "^2.0.1"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+          "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+          "optional": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+          "optional": true
+        },
+        "chokidar": {
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+          "optional": true,
+          "requires": {
+            "anymatch": "~3.1.2",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.6.0"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "optional": true
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "optional": true
+        },
+        "readdirp": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+          "optional": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        }
       }
     },
     "watchpack-chokidar2": {
@@ -11905,10 +12208,16 @@
             }
           }
         },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "optional": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
           "optional": true
         },
         "braces": {
@@ -11927,6 +12236,17 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "chokidar": {
@@ -11949,13 +12269,141 @@
             "upath": "^1.1.1"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "optional": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "ms": "2.0.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "optional": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "optional": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+              "optional": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "optional": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+              "optional": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "optional": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "optional": true,
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "optional": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "optional": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "optional": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "fill-range": {
@@ -11968,16 +12416,17 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "glob-parent": {
@@ -12001,13 +12450,33 @@
             }
           }
         },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "optional": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "optional": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "optional": true,
           "requires": {
-            "binary-extensions": "^1.0.0"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         },
         "is-number": {
@@ -12017,28 +12486,64 @@
           "optional": true,
           "requires": {
             "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "optional": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "optional": true
+        },
         "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-          "optional": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "optional": true
         },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "optional": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "optional": true
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "optional": true
+        },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -12093,16 +12598,10 @@
         "yargs": "^8.0.2"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
+        "acorn": {
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
         },
         "ansi-regex": {
           "version": "3.0.1",
@@ -12112,12 +12611,12 @@
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+          "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw=="
         },
         "cliui": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
           "requires": {
             "string-width": "^1.0.1",
             "strip-ansi": "^3.0.1",
@@ -12127,7 +12626,7 @@
             "string-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -12136,11 +12635,6 @@
             }
           }
         },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-        },
         "get-caller-file": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -12149,17 +12643,12 @@
         "has-flag": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+          "integrity": "sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng=="
         },
         "load-json-file": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "integrity": "sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==",
           "requires": {
             "graceful-fs": "^4.1.2",
             "parse-json": "^2.2.0",
@@ -12170,7 +12659,7 @@
         "path-type": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "integrity": "sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==",
           "requires": {
             "pify": "^2.0.0"
           }
@@ -12178,12 +12667,12 @@
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
         },
         "read-pkg": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "integrity": "sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==",
           "requires": {
             "load-json-file": "^2.0.0",
             "normalize-package-data": "^2.3.2",
@@ -12193,7 +12682,7 @@
         "read-pkg-up": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "integrity": "sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==",
           "requires": {
             "find-up": "^2.0.0",
             "read-pkg": "^2.0.0"
@@ -12202,7 +12691,7 @@
         "require-main-filename": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+          "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="
         },
         "string-width": {
           "version": "2.1.1",
@@ -12216,12 +12705,12 @@
             "is-fullwidth-code-point": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+              "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
             },
             "strip-ansi": {
               "version": "4.0.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
               "requires": {
                 "ansi-regex": "^3.0.0"
               }
@@ -12231,20 +12720,25 @@
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
         },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "integrity": "sha512-ycQR/UbvI9xIlEdQT1TQqwoXtEldExbCEAJgRo5YXlmSKjv6ThHnP9/vwGa1gr19Gfw+LkFd7KqYMhzrRC5JYw==",
           "requires": {
             "has-flag": "^2.0.0"
           }
         },
+        "tapable": {
+          "version": "0.2.9",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+          "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A=="
+        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
           "requires": {
             "string-width": "^1.0.1",
             "strip-ansi": "^3.0.1"
@@ -12253,7 +12747,7 @@
             "string-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -12270,7 +12764,7 @@
         "yargs": {
           "version": "8.0.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "integrity": "sha512-3RiZrpLpjrzIAKgGdPktBcMP/eG5bDFlkI+PHle1qwzyVXyDQL+pD/eZaMoOOO0Y7LLBfjpucObuUm/icvbpKQ==",
           "requires": {
             "camelcase": "^4.1.0",
             "cliui": "^3.2.0",
@@ -12290,7 +12784,7 @@
         "yargs-parser": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "integrity": "sha512-WhzC+xgstid9MbVUktco/bf+KJG+Uu6vMX0LN1sLJvwmbCQVxb4D8LzogobonKycNasCZLdOzTAk1SK7+K7swg==",
           "requires": {
             "camelcase": "^4.1.0"
           }
@@ -12355,17 +12849,22 @@
             "normalize-path": {
               "version": "2.1.1",
               "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
               "requires": {
                 "remove-trailing-separator": "^1.0.1"
               }
             }
           }
         },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
         },
         "braces": {
           "version": "2.3.2",
@@ -12382,12 +12881,22 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
+          "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg=="
         },
         "chokidar": {
           "version": "2.1.8",
@@ -12411,7 +12920,7 @@
         "cliui": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
           "requires": {
             "string-width": "^1.0.1",
             "strip-ansi": "^3.0.1",
@@ -12426,33 +12935,154 @@
             "ms": "^2.1.1"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
           "requires": {
             "extend-shallow": "^2.0.1",
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "get-caller-file": {
@@ -12463,7 +13093,7 @@
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
           "requires": {
             "is-glob": "^3.1.0",
             "path-dirname": "^1.0.0"
@@ -12472,7 +13102,7 @@
             "is-glob": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
               "requires": {
                 "is-extglob": "^2.1.0"
               }
@@ -12482,59 +13112,99 @@
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "binary-extensions": "^1.0.0"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
           "requires": {
             "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+        },
         "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
           }
         },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
         },
         "os-locale": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+          "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
           "requires": {
             "lcid": "^1.0.0"
           }
         },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
         "require-main-filename": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+          "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="
         },
         "supports-color": {
           "version": "5.5.0",
@@ -12547,7 +13217,7 @@
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
           "requires": {
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1"
@@ -12556,12 +13226,12 @@
         "which-module": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+          "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ=="
         },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
           "requires": {
             "string-width": "^1.0.1",
             "strip-ansi": "^3.0.1"
@@ -12575,7 +13245,7 @@
         "yargs": {
           "version": "6.6.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
-          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "integrity": "sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA==",
           "requires": {
             "camelcase": "^3.0.0",
             "cliui": "^3.2.0",
@@ -12595,7 +13265,7 @@
         "yargs-parser": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
-          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "integrity": "sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg==",
           "requires": {
             "camelcase": "^3.0.0"
           }
@@ -12609,6 +13279,28 @@
       "requires": {
         "fs-extra": "^0.30.0",
         "lodash": ">=3.5 <5"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha512-UvSPKyhMn6LEd/WpUaV9C9t3zATuqoqfWc3QdPhPLb58prN9tqYPlPWi8Krxi44loBoUzlobqZ3+8tGpxxSzwA==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        }
       }
     },
     "webpack-sources": {
@@ -12660,12 +13352,12 @@
     "whet.extend": {
       "version": "0.9.9",
       "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
-      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE="
+      "integrity": "sha512-mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA=="
     },
     "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -12688,16 +13380,15 @@
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
     },
     "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "wide-align": {
@@ -12711,18 +13402,12 @@
     "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
+      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg=="
     },
     "wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw=="
     },
     "worker-farm": {
       "version": "1.7.0",
@@ -12758,7 +13443,7 @@
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
         },
         "string-width": {
           "version": "3.1.0",
@@ -12783,22 +13468,12 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "ws": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz",
-      "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
-      "dev": true,
+      "integrity": "sha512-lobrh3Dhp6tD1hv7NAIMx+oX/rsH/yd6/4krpBmJ/6ulsMZgQMuttlWTuYVWLV6ZjlpWIOjz55KbQbcKSQywEQ==",
       "requires": {
         "options": ">=0.0.5",
         "ultron": "1.0.x"
@@ -12807,14 +13482,12 @@
     "wtf-8": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz",
-      "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=",
-      "dev": true
+      "integrity": "sha512-qfR6ovmRRMxNHgUNYI9LRdVofApe/eYrv4ggNOvvCP+pPdEo9Ym93QN4jUceGD6PignBbp2zAzgoE7GibAdq2A=="
     },
     "xmlhttprequest-ssl": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
-      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
-      "dev": true
+      "integrity": "sha512-kauAa/1btT613pYX92WXR6kx5trYeckB5YMd3pPvtkMo2Twdfhwl683M8NiSqWHHo97xAC6bnvK1DWFKxfmejg=="
     },
     "xtend": {
       "version": "4.0.2",
@@ -12827,9 +13500,9 @@
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
     },
     "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "yargs": {
       "version": "13.3.2",
@@ -12864,7 +13537,7 @@
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
         },
         "locate-path": {
           "version": "3.0.0",
@@ -12935,8 +13608,12 @@
     "yeast": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
-      "dev": true
+      "integrity": "sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
 }
diff --git a/package.json b/package.json
index fdbe9e40c..86a96394f 100644
--- a/package.json
+++ b/package.json
@@ -9,30 +9,59 @@
   "scripts": {
     "start": "webpack-dev-server --progress --colors --content-base dist --host 0.0.0.0",
     "build": "export NODE_ENV=production && webpack --config webpack.config.js --progress --profile --colors",
-    "lint": "eslint *.js assets --ext .js --ext .jsx",
-    "fix": "eslint *.js assets --ext .js --ext .jsx --fix",
+    "lint": "tsc --noEmit && eslint assets --ext .js --ext .jsx --ext .ts --ext .tsx",
+    "fix": "eslint assets --ext .js --ext .jsx --ext .ts --ext .tsx --fix",
     "test": "karma start --single-run",
     "karma": "karma start",
     "design-app": "webpack-dev-server --config=webpack.design.js"
   },
   "dependencies": {
     "@popperjs/core": "^2.11.4",
+    "@types/bootstrap": "^5.2.6",
+    "@types/enzyme": "^3.10.13",
+    "@types/karma": "^6.3.4",
+    "@types/karma-chrome-launcher": "^3.1.1",
+    "@types/karma-jasmine": "^4.0.2",
+    "@types/lodash": "^4.14.117",
+    "@types/react": "^17.0.2",
+    "@types/react-datepicker": "^4.11.2",
+    "@types/react-dom": "^17.0.1",
+    "@types/react-redux": "^5.0.7",
+    "@types/react-toggle": "^4.0.3",
+    "@types/redux-logger": "^3.0.9",
+    "@types/sinon": "^10.0.16",
+    "@types/store": "^2.0.2",
+    "@types/webpack-env": "^1.18.1",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
+    "@typescript-eslint/parser": "^5.60.0",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "alertifyjs": "1.11.2",
-    "babel-core": "6.26.3",
-    "babel-loader": "7.1.5",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "bootstrap": "5.1.3",
     "classnames": "^2.3.1",
+    "copy-webpack-plugin": "^4.6.0",
     "css-loader": "^0.28.5",
     "dompurify": "^3.0.3",
+    "enzyme": "^3.0.0",
+    "eslint": "^8.46.0",
+    "eslint-plugin-react": "^7.33.1",
+    "expect": "^21.1.0",
     "extract-text-webpack-plugin": "3.0.2",
     "fetch-mock": "^9.11.0",
     "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^3.2.0",
     "isomorphic-fetch": "^2.2.1",
     "jasmine-core": "3.3.0",
+    "karma": "^1.7.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-sourcemap-loader": "^0.3.8",
+    "karma-webpack": "^2.0.4",
     "mime-types": "^2.1.34",
     "moment": "2.29.4",
     "moment-timezone": "0.5.41",
@@ -44,7 +73,9 @@
     "react-datepicker": "4.7.0",
     "react-dom": "^17.0.2",
     "react-redux": "5.0.7",
+    "react-router-dom": "^6.3.0",
     "react-sortable-hoc": "0.8.3",
+    "react-test-renderer": "^16.14.0",
     "react-toggle": "4.0.2",
     "reactstrap": "9.0.1",
     "redux": "3.7.2",
@@ -52,30 +83,16 @@
     "redux-thunk": "2.3.0",
     "reselect": "3.0.1",
     "sass-loader": "^6.0.6",
+    "sinon": "^4.0.0",
     "store": "2.0.12",
     "style-loader": "^0.19.0",
     "terser-webpack-plugin-legacy": "^1.2.5",
+    "ts-loader": "^3.5.0",
+    "typescript": "^4.9.5",
     "url-search-params-polyfill": "2.0.3",
     "webpack": "3.11.0",
     "webpack-dev-server": "2.11.1",
     "webpack-manifest-plugin": "^1.3.1",
     "whatwg-fetch": "2.0.4"
-  },
-  "devDependencies": {
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
-    "copy-webpack-plugin": "^4.6.0",
-    "enzyme": "^3.0.0",
-    "eslint": "^4.8.0",
-    "eslint-plugin-react": "^7.27.1",
-    "expect": "^21.1.0",
-    "html-webpack-plugin": "^3.2.0",
-    "karma": "^1.7.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-jasmine": "^1.1.0",
-    "karma-sourcemap-loader": "^0.3.8",
-    "karma-webpack": "^2.0.4",
-    "react-router-dom": "^6.3.0",
-    "react-test-renderer": "^16.14.0",
-    "sinon": "^4.0.0"
   }
 }
diff --git a/tests/core/test_home.py b/tests/core/test_home.py
new file mode 100644
index 000000000..aeeb49b04
--- /dev/null
+++ b/tests/core/test_home.py
@@ -0,0 +1,42 @@
+from flask import session as server_session
+
+from newsroom.wire.views import get_home_data
+from newsroom.tests.fixtures import PUBLIC_USER_ID
+
+
+def test_personal_dashboard_data(client, app, company_products):
+    with app.test_request_context():
+        server_session["user"] = str(PUBLIC_USER_ID)
+        server_session["user_type"] = "public"
+
+        user = app.data.find_one("users", req=None, _id=PUBLIC_USER_ID)
+        assert user
+
+        topics = [
+            {"name": "label", "query": "weather", "user": PUBLIC_USER_ID, "topic_type": "wire"},
+        ]
+
+        app.data.insert("topics", topics)
+
+        app.data.update(
+            "users",
+            PUBLIC_USER_ID,
+            {
+                "dashboards": [
+                    {"name": "test d", "type": "4x4", "topic_ids": [topic["_id"] for topic in topics]},
+                ]
+            },
+            user,
+        )
+
+        data = get_home_data()
+
+    assert "personalizedDashboards" in data
+    dashboard_data = data["personalizedDashboards"][0]
+    assert dashboard_data["dashboard_name"] == "test d"
+    assert dashboard_data["dashboard_id"] == "d0"
+    topic_items = dashboard_data["topic_items"]
+    assert 1 == len(topic_items)
+    assert topic_items[0]["_id"] == topics[0]["_id"]
+    assert 1 == len(topic_items[0]["items"])
+    assert "Weather" == topic_items[0]["items"][0]["headline"]
diff --git a/tests/core/test_push.py b/tests/core/test_push.py
index 585048529..3a44dd66d 100644
--- a/tests/core/test_push.py
+++ b/tests/core/test_push.py
@@ -828,7 +828,7 @@ def test_matching_topics_for_user_with_inactive_company(client, app):
 def test_push_parsed_item(client, app):
     client.post("/push", data=json.dumps(item), content_type="application/json")
     parsed = get_entity_or_404(item["guid"], "wire_search")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 2 == parsed["wordcount"]
     assert 7 == parsed["charcount"]
 
@@ -838,9 +838,9 @@ def test_push_parsed_dates(client, app):
     payload["embargoed"] = "2019-01-31T00:01:00+00:00"
     client.post("/push", data=json.dumps(payload), content_type="application/json")
     parsed = get_entity_or_404(item["guid"], "items")
-    assert type(parsed["firstcreated"]) == datetime
-    assert type(parsed["versioncreated"]) == datetime
-    assert type(parsed["embargoed"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
+    assert isinstance(parsed["versioncreated"], datetime)
+    assert isinstance(parsed["embargoed"], datetime)
 
 
 def test_push_event_coverage_info(client, app):
diff --git a/tests/core/test_push_events.py b/tests/core/test_push_events.py
index 44665de26..4f873e3f4 100644
--- a/tests/core/test_push_events.py
+++ b/tests/core/test_push_events.py
@@ -180,7 +180,7 @@ def test_push_parsed_event(client, app):
     event = deepcopy(test_event)
     client.post("/push", data=json.dumps(event), content_type="application/json")
     parsed = get_entity_or_404(event["guid"], "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert parsed["dates"]["tz"] == "Australia/Sydney"
     assert parsed["dates"]["end"] == datetime.strptime("2018-05-28T05:00:00+0000", "%Y-%m-%dT%H:%M:%S+0000").replace(
         tzinfo=pytz.UTC
@@ -214,7 +214,7 @@ def test_push_cancelled_event(client, app):
     resp = client.post("/push", data=json.dumps(event), content_type="application/json")
     assert resp.status_code == 200
     parsed = get_entity_or_404(event["guid"], "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 1 == len(parsed["event"]["event_contact_info"])
     assert 1 == len(parsed["location"])
     assert parsed["event"]["pubstatus"] == "cancelled"
@@ -235,7 +235,7 @@ def test_push_updated_event(client, app):
     }
     client.post("/push", data=json.dumps(event), content_type="application/json")
     parsed = get_entity_or_404(event["guid"], "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 1 == len(parsed["event"]["event_contact_info"])
     assert 1 == len(parsed["location"])
     assert parsed["dates"]["end"].day == 30
@@ -266,7 +266,7 @@ def test_push_parsed_planning_for_an_existing_event(client, app):
     event["guid"] = "foo4"
     client.post("/push", data=json.dumps(event), content_type="application/json")
     parsed = get_entity_or_404(event["guid"], "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 1 == len(parsed["event"]["event_contact_info"])
     assert 1 == len(parsed["location"])
 
@@ -308,7 +308,7 @@ def test_push_coverages_with_different_dates_for_an_existing_event(client, app):
     event["guid"] = "foo4"
     client.post("/push", data=json.dumps(event), content_type="application/json")
     parsed = get_entity_or_404(event["guid"], "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 1 == len(parsed["event"]["event_contact_info"])
     assert 1 == len(parsed["location"])
 
@@ -345,7 +345,7 @@ def test_push_planning_with_different_dates_for_an_existing_event(client, app):
     event["guid"] = "foo4"
     client.post("/push", data=json.dumps(event), content_type="application/json")
     parsed = get_entity_or_404(event["guid"], "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 1 == len(parsed["event"]["event_contact_info"])
     assert 1 == len(parsed["location"])
 
@@ -376,7 +376,7 @@ def test_push_cancelled_planning_for_an_existing_event(client, app):
     event["guid"] = "foo5"
     client.post("/push", data=json.dumps(event), content_type="application/json")
     parsed = get_entity_or_404(event["guid"], "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 1 == len(parsed["event"]["event_contact_info"])
     assert 1 == len(parsed["location"])
 
@@ -413,7 +413,7 @@ def test_push_parsed_adhoc_planning_for_an_non_existing_event(client, app):
 
     client.post("/push", data=json.dumps(planning), content_type="application/json")
     parsed = get_entity_or_404("bar3", "agenda")
-    assert type(parsed["firstcreated"]) == datetime
+    assert isinstance(parsed["firstcreated"], datetime)
     assert 2 == len(parsed["coverages"])
     assert 1 == len(parsed["planning_items"])
     assert parsed["headline"] == "Planning headline"
diff --git a/tests/core/test_user_dashboards.py b/tests/core/test_user_dashboards.py
new file mode 100644
index 000000000..4fd70b959
--- /dev/null
+++ b/tests/core/test_user_dashboards.py
@@ -0,0 +1,72 @@
+import tests.utils as utils
+from newsroom.wire.views import get_personal_dashboards_data
+
+
+def test_user_dashboards(app, client, public_user, public_company, company_products):
+    topics = [{"label": "test", "user": public_user["_id"], "query": "bar"}]
+    app.data.insert("topics", topics)
+
+    app.data.remove("products")
+    products = [{"name": "test", "query": "foo", "is_enabled": True, "product_type": "wire"}]
+    app.data.insert("products", products)
+
+    assert app.data.update(
+        "companies",
+        public_company["_id"],
+        {
+            "products": [{"_id": p["_id"], "section": p["product_type"], "seats": 0} for p in products],
+            "sections": {"wire": True},
+        },
+        public_company,
+    )
+    public_company = app.data.find_one("companies", req=None, _id=public_company["_id"])
+    assert 1 == len(public_company["products"])
+
+    app.data.insert(
+        "items",
+        [
+            {"guid": "test1", "headline": "foo"},
+            {"guid": "test2", "headline": "bar"},
+            {"guid": "test3", "headline": "baz"},
+            {"guid": "test4", "headline": "foo bar"},
+        ],
+    )
+
+    utils.login(client, public_user)
+
+    utils.patch_json(
+        client,
+        f"/api/_users/{public_user['_id']}",
+        {
+            "dashboards": [{"name": "test", "type": "test", "topic_ids": [t["_id"] for t in topics]}],
+        },
+    )
+
+    data = utils.get_json(
+        client,
+        f"/api/_users/{public_user['_id']}",
+    )
+
+    assert data["dashboards"]
+
+    # reload user with dashboards
+    public_user = app.data.find_one("users", req=None, _id=public_user["_id"])
+
+    dashboards = get_personal_dashboards_data(public_user, public_company, topics)
+    assert 1 == len(dashboards)
+    topic_items = dashboards[0]["topic_items"][0]["items"]
+    assert 1 == len(topic_items)
+    assert "test4" == topic_items[0]["guid"]
+
+    utils.delete_json(
+        client,
+        f"/topics/{topics[0]['_id']}",
+    )
+
+    data = utils.get_json(
+        client,
+        f"/api/_users/{public_user['_id']}",
+    )
+
+    assert "dashboards" in data
+    assert data["dashboards"][0]["topic_ids"] == []
diff --git a/tests/core/test_wire.py b/tests/core/test_wire.py
index f9ea5dd81..80103464d 100644
--- a/tests/core/test_wire.py
+++ b/tests/core/test_wire.py
@@ -239,6 +239,20 @@ def test_filter_by_product_anonymous_user_gets_all(client, app):
     assert "_aggregations" in data
 
 
+def test_search_sort(client, app):
+    resp = client.get("/wire/search?sort=versioncreated:asc")
+    data = json.loads(resp.get_data())
+    assert "urn:localhost:weather" == data["_items"][0]["_id"]
+
+    resp = client.get("/wire/search?sort=versioncreated:desc")
+    data = json.loads(resp.get_data())
+    assert "urn:localhost:weather" == data["_items"][2]["_id"]
+
+    resp = client.get("/wire/search?q=weather+OR+flood+OR+waters&sort=_score")
+    data = json.loads(resp.get_data())
+    assert "urn:localhost:flood" == data["_items"][0]["_id"]
+
+
 def test_logged_in_user_no_product_gets_no_results(client, app):
     with client.session_transaction() as session:
         session["user"] = str(PUBLIC_USER_ID)
diff --git a/tests/search/fixtures.py b/tests/search/fixtures.py
index 6e259ba76..0846e2682 100644
--- a/tests/search/fixtures.py
+++ b/tests/search/fixtures.py
@@ -48,6 +48,7 @@
     {
         "_id": PUBLIC_USER_ID,
         "company": COMPANY_2,
+        "user_type": "public",
         "email": "public@sourcefabric.org",
         "password": "$2b$12$HGyWCf9VNfnVAwc2wQxQW.Op3Ejk7KIGE6urUXugpI0KQuuK6RWIG",
         "is_validated": True,
@@ -62,6 +63,7 @@
             {"_id": PROD_2, "section": "wire"},
             {"_id": PROD_4, "section": "agenda"},
         ],
+        "manage_company_topics": False,
     },
     {
         "_id": TEST_USER_ID,
diff --git a/tests/search/test_search_filters.py b/tests/search/test_search_filters.py
index d604a5d2e..9d3df92ab 100644
--- a/tests/search/test_search_filters.py
+++ b/tests/search/test_search_filters.py
@@ -178,7 +178,7 @@ def test_apply_request_filter__query_string(client, app):
                 "analyze_wildcard": query_string_settings["analyze_wildcard"],
                 "lenient": True,
             }
-        } in search.query["bool"]["filter"]
+        } in search.query["bool"]["must"]
 
         search.args = {"q": "Sport AND Tennis", "default_operator": "OR"}
         service.apply_request_filter(search)
@@ -189,7 +189,7 @@ def test_apply_request_filter__query_string(client, app):
                 "analyze_wildcard": query_string_settings["analyze_wildcard"],
                 "lenient": True,
             }
-        } in search.query["bool"]["filter"]
+        } in search.query["bool"]["must"]
 
 
 def test_apply_request_filter__filters(client, app):
diff --git a/tests/search/test_user_products.py b/tests/search/test_user_products.py
index 424d6a396..6770423a8 100644
--- a/tests/search/test_user_products.py
+++ b/tests/search/test_user_products.py
@@ -8,6 +8,7 @@
     USERS,
     COMPANIES,
     PRODUCTS,
+    PUBLIC_USER_ID,
 )
 
 
@@ -72,10 +73,16 @@ def test_user_products(app, client, manager, product):
     data = utils.get_json(client, "/wire/search")
     assert 0 == len(data["_items"])
 
+    data = utils.get_json(client, "/wire/search?q=weather")
+    assert 0 == len(data["_items"])
+
     app.data.update("products", product["_id"], {"query": "headline:WEATHER"}, product)
 
     data = utils.get_json(client, "/wire/search")
-    assert 1 >= len(data["_items"])
+    assert 1 == len(data["_items"])
+
+    data = utils.get_json(client, "/wire/search?q=amazon")
+    assert 0 == len(data["_items"])
 
 
 def test_user_sections(app, client, manager, product):
@@ -150,3 +157,9 @@ def test_other_company_user_changes_blocked(client, manager):
     with pytest.raises(AssertionError) as err:
         utils.patch_json(client, f"/api/_users/{USERS[1]['_id']}", {"company": COMPANIES[0]["_id"]})
     assert "403" in str(err)
+
+
+def test_public_user_can_edit_his_dashboard(client, manager):
+    public_user = next((user for user in USERS if user["_id"] == PUBLIC_USER_ID))
+    utils.login(client, public_user)
+    utils.patch_json(client, f"/api/_users/{PUBLIC_USER_ID}", {"dashboards": []})
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 000000000..4e6413529
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "include": [
+    "assets"
+  ],
+  "compilerOptions": {
+    "allowJs": true,
+    "baseUrl": "./assets",
+    "esModuleInterop": true,
+    "target": "es5",
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "jsx": "react",
+  }
+}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 1a1de18eb..1df2d62f6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,32 +7,32 @@ const TerserPlugin = require('terser-webpack-plugin-legacy');
 
 const config = {
     entry: {
-        newsroom_js: path.resolve(__dirname, 'assets/index.js'),
-        companies_js: path.resolve(__dirname, 'assets/companies/index.js'),
-        oauth_clients_js: path.resolve(__dirname, 'assets/oauth_clients/index.js'),
-        users_js: path.resolve(__dirname, 'assets/users/index.js'),
-        products_js: path.resolve(__dirname, 'assets/products/index.js'),
-        'section-filters_js': path.resolve(__dirname, 'assets/section-filters/index.js'),
-        navigations_js: path.resolve(__dirname, 'assets/navigations/index.js'),
-        cards_js: path.resolve(__dirname, 'assets/cards/index.js'),
-        user_profile_js: path.resolve(__dirname, 'assets/user-profile/index.js'),
-        newsroom_css: path.resolve(__dirname, 'assets/style.js'),
-        wire_js: path.resolve(__dirname, 'assets/wire/index.js'),
-        home_js: path.resolve(__dirname, 'assets/home/index.js'),
-        agenda_js: path.resolve(__dirname, 'assets/agenda/index.js'),
-        notifications_js: path.resolve(__dirname, 'assets/notifications/index.js'),
-        company_reports_js: path.resolve(__dirname, 'assets/company-reports/index.js'),
-        print_reports_js: path.resolve(__dirname, 'assets/company-reports/components/index.js'),
-        am_news_js: path.resolve(__dirname, 'assets/am-news/index.js'),
-        am_news_css: path.resolve(__dirname, 'assets/am-news/style.js'),
-        'general-settings_js': path.resolve(__dirname, 'assets/general-settings/index.js'),
-        market_place_js: path.resolve(__dirname, 'assets/market-place/index.js'),
-        media_releases_js: path.resolve(__dirname, 'assets/media-releases/index.js'),
-        monitoring_js: path.resolve(__dirname, 'assets/monitoring/index.js'),
-        factcheck_js: path.resolve(__dirname, 'assets/factcheck/index.js'),
-        common: path.resolve(__dirname, 'assets/common.js'),
-        design_js: path.resolve(__dirname, 'assets/design_pages.js'),
-        company_admin_js: path.resolve(__dirname, 'assets/company-admin/index.js'),
+        newsroom_js: path.resolve(__dirname, 'assets/index.ts'),
+        companies_js: path.resolve(__dirname, 'assets/companies/index.ts'),
+        oauth_clients_js: path.resolve(__dirname, 'assets/oauth_clients/index.ts'),
+        users_js: path.resolve(__dirname, 'assets/users/index.ts'),
+        products_js: path.resolve(__dirname, 'assets/products/index.ts'),
+        'section-filters_js': path.resolve(__dirname, 'assets/section-filters/index.ts'),
+        navigations_js: path.resolve(__dirname, 'assets/navigations/index.ts'),
+        cards_js: path.resolve(__dirname, 'assets/cards/index.ts'),
+        user_profile_js: path.resolve(__dirname, 'assets/user-profile/index.ts'),
+        newsroom_css: path.resolve(__dirname, 'assets/style.ts'),
+        wire_js: path.resolve(__dirname, 'assets/wire/index.ts'),
+        home_js: path.resolve(__dirname, 'assets/home/index.ts'),
+        agenda_js: path.resolve(__dirname, 'assets/agenda/index.ts'),
+        notifications_js: path.resolve(__dirname, 'assets/notifications/index.ts'),
+        company_reports_js: path.resolve(__dirname, 'assets/company-reports/index.ts'),
+        print_reports_js: path.resolve(__dirname, 'assets/company-reports/components/index.ts'),
+        am_news_js: path.resolve(__dirname, 'assets/am-news/index.ts'),
+        am_news_css: path.resolve(__dirname, 'assets/am-news/style.ts'),
+        'general-settings_js': path.resolve(__dirname, 'assets/general-settings/index.ts'),
+        market_place_js: path.resolve(__dirname, 'assets/market-place/index.ts'),
+        media_releases_js: path.resolve(__dirname, 'assets/media-releases/index.ts'),
+        monitoring_js: path.resolve(__dirname, 'assets/monitoring/index.ts'),
+        factcheck_js: path.resolve(__dirname, 'assets/factcheck/index.ts'),
+        common: path.resolve(__dirname, 'assets/common.ts'),
+        design_js: path.resolve(__dirname, 'assets/design_pages.ts'),
+        company_admin_js: path.resolve(__dirname, 'assets/company-admin/index.ts'),
     },
     output: {
         path: path.resolve(process.cwd(), 'dist'),
@@ -43,17 +43,16 @@ const config = {
     module: {
         rules: [
             {
-                test: /\.jsx?$/,
+                test: /\.(ts|tsx|js|jsx)$/,
                 include: [
                     path.resolve(__dirname, 'assets'),
                     path.resolve(__dirname, 'node_modules/bootstrap'),
                     path.resolve(process.cwd(), 'node_modules/bootstrap'),
                 ],
-                loader: 'babel-loader',
+                loader: 'ts-loader',
                 options: {
-                    presets: ['es2015', 'react'],
-                    plugins: ['transform-object-rest-spread'],
-                }
+                    transpileOnly: true,
+                },
             },
             {
                 test: /\.css$/,
@@ -79,7 +78,7 @@ const config = {
         ]
     },
     resolve: {
-        extensions: ['.js', '.jsx'],
+        extensions: [ '.ts', '.tsx', '.js', '.jsx'],
         modules: [
             path.resolve(__dirname, 'assets'),
             'node_modules',