From 844ba848aed27576ecc83bd07015893cd7d0fcc6 Mon Sep 17 00:00:00 2001
From: Akira Sudoh <asudoh@gmail.com>
Date: Tue, 13 Feb 2018 17:01:10 +0900
Subject: [PATCH] chore(devenv): introduced parameterized demo HTML

---
 .eslintignore                                 |    3 +
 demo/.babelrc                                 |    2 +-
 demo/js/components/CodePage/CodePage.js       |   34 +-
 .../ComponentExample/ComponentExample.js      |    3 +-
 demo/js/components/RootPage.js                |   95 +-
 demo/views/demo-live.dust                     |   44 -
 demo/views/demo-nav-data.hbs                  |   15 +
 .../{demo-nav.dust => layouts/demo-nav.hbs}   |   16 +-
 demo/views/layouts/preview.hbs                |   42 +
 gulpfile.js                                   |   29 +-
 package.json                                  |    6 +-
 server.js                                     |  151 +-
 ...cyaccordion.html => accordion--legacy.hbs} |    0
 .../{accordion.html => accordion.hbs}         |    0
 .../{breadcrumb.html => breadcrumb.hbs}       |    0
 src/components/button/button.config.js        |  111 +
 src/components/button/button.hbs              |    8 +
 src/components/button/danger-button.html      |    6 -
 src/components/button/ghost-button.html       |   18 -
 src/components/button/primary-button.html     |   15 -
 src/components/button/secondary-button.html   |   15 -
 src/components/button/tertiary-button.html    |    2 -
 src/components/card/card--with-status.html    |   65 -
 src/components/card/card.config.js            |   22 +
 src/components/card/{card.html => card.hbs}   |   37 +-
 .../carousel/{carousel.html => carousel.hbs}  |    0
 .../checkbox/{checkbox.html => checkbox.hbs}  |    0
 .../code-snippet/code-snippet--terminal.html  |   12 -
 .../code-snippet/code-snippet.config.js       |   30 +
 .../{code-snippet.html => code-snippet.hbs}   |   14 +-
 .../combo-box/combo-box--disabled.html        |   11 -
 src/components/combo-box/combo-box.config.js  |   17 +
 .../{combo-box.html => combo-box.hbs}         |   12 +-
 .../content-switcher--with-icon.html          |   14 -
 .../content-switcher.config.js                |   16 +
 .../content-switcher/content-switcher.hbs     |   20 +
 .../content-switcher/content-switcher.html    |    6 -
 .../{copy-button.html => copy-button.hbs}     |    0
 ...ble.html => data-table-v2--expandable.hbs} |    0
 ...ion.html => data-table-v2--pagination.hbs} |    0
 ...2--small.html => data-table-v2--small.hbs} |    0
 .../{data-table-v2.html => data-table-v2.hbs} |    0
 ...le--simple.html => data-table--simple.hbs} |    0
 .../{data-table.html => data-table.hbs}       |    0
 ...ker--light.html => date-picker--light.hbs} |    0
 ...ight.html => date-picker--range-light.hbs} |    0
 ...ker--range.html => date-picker--range.hbs} |    0
 ...ght.html => date-picker--single-light.hbs} |    0
 ...r--single.html => date-picker--single.hbs} |    0
 .../{date-picker.html => date-picker.hbs}     |    0
 .../detail-page-header.config.js              |   17 +
 ...-with-tabs.html => detail-page-header.hbs} |    9 +-
 .../detail-page-header.html                   |   55 -
 src/components/dropdown/dropdown--light.html  |   25 -
 src/components/dropdown/dropdown.config.js    |   35 +
 .../{dropdown--up.html => dropdown.hbs}       |    2 +-
 src/components/dropdown/dropdown.html         |   25 -
 src/components/fab/{fab.html => fab.hbs}      |    0
 .../{file-uploader.html => file-uploader.hbs} |    0
 .../footer/{footer.html => footer.hbs}        |    0
 src/components/form/form--light.html          |   31 -
 src/components/form/form.config.js            |   18 +
 src/components/form/{form.html => form.hbs}   |    6 +-
 src/components/grid/{grid.html => grid.hbs}   |    0
 .../interior-left-nav--keep-open.html         |   74 -
 .../interior-left-nav.config.js               |   22 +
 ...or-left-nav.html => interior-left-nav.hbs} |    2 +-
 .../lightbox/{lightbox.html => lightbox.hbs}  |    0
 src/components/link/{link.html => link.hbs}   |    0
 src/components/list-box/list-box.config.js    |   17 +
 .../{list-box--inline.html => list-box.hbs}   |    4 +-
 src/components/list-box/list-box.html         |   27 -
 src/components/list/list--ordered.html        |   10 -
 src/components/list/list.config.js            |   24 +
 src/components/list/list.hbs                  |   10 +
 src/components/list/list.html                 |   10 -
 src/components/loading/loading--small.html    |    6 -
 .../loading/loading--without-overlay.html     |    6 -
 src/components/loading/loading.config.js      |   32 +
 src/components/loading/loading.hbs            |    8 +
 src/components/loading/loading.html           |    8 -
 src/components/modal/modal--nofooter.html     |   43 -
 src/components/modal/modal.config.js          |   48 +
 src/components/modal/modal.hbs                |   27 +
 src/components/modal/modal.html               |   55 -
 .../module/{module.html => module.hbs}        |    0
 .../multi-select/multi-select--inline.html    |   80 -
 .../multi-select/multi-select.config.js       |   17 +
 .../{multi-select.html => multi-select.hbs}   |    4 +-
 ...ification.html => inline-notification.hbs} |    0
 ...tification.html => toast-notification.hbs} |    0
 .../number-input/number-input.config.js       |   20 +
 ...ber-input--light.html => number-input.hbs} |    6 +-
 src/components/number-input/number-input.html |   62 -
 .../order-summary/order-summary-category.html |   90 -
 .../order-summary/order-summary.config.js     |   25 +
 .../order-summary/order-summary.hbs           |  113 +
 .../order-summary/order-summary.html          |   53 -
 .../{overflow-menu.html => overflow-menu.hbs} |    8 +-
 src/components/pagination/pagination-v2.dust  |   55 +
 src/components/pagination/pagination-v2.html  |   51 -
 .../{pagination.html => pagination.hbs}       |    0
 ...-indicator.html => progress-indicator.hbs} |    0
 .../{radio-button.html => radio-button.hbs}   |    0
 src/components/search/search-large-light.html |   29 -
 src/components/search/search-large.html       |   29 -
 src/components/search/search-small-light.html |   13 -
 src/components/search/search-small.html       |   13 -
 src/components/search/search.config.js        |   59 +
 src/components/search/search.hbs              |   34 +
 src/components/select/select--light.html      |   44 -
 src/components/select/select.config.js        |   46 +
 .../{select--inline.html => select.hbs}       |   16 +-
 src/components/select/select.html             |   44 -
 .../slider/{slider.html => slider.hbs}        |    1 -
 ...on.html => structured-list--selection.hbs} |    0
 ...ructured-list.html => structured-list.hbs} |    6 +-
 src/components/tabs/{tabs.html => tabs.hbs}   |    0
 src/components/tag/{tag.html => tag.hbs}      |    0
 src/components/text-area/text-area.config.js  |   21 +
 .../{text-area--light.html => text-area.hbs}  |    6 +-
 src/components/text-area/text-area.html       |   20 -
 .../text-input/text-input--light.html         |   34 -
 .../text-input/text-input.config.js           |   22 +
 .../{text-input.html => text-input.hbs}       |   10 +-
 ...le--clickable.html => tile--clickable.hbs} |    0
 ...--expandable.html => tile--expandable.hbs} |    0
 .../tile/{tile--grid.html => tile--grid.hbs}  |    0
 ...--selectable.html => tile--selectable.hbs} |    0
 src/components/tile/{tile.html => tile.hbs}   |    0
 ...ker--light.html => time-picker--light.hbs} |    0
 .../{time-picker.html => time-picker.hbs}     |    0
 .../{toggle--small.html => toggle--small.hbs} |    0
 .../toggle/{toggle.html => toggle.hbs}        |    0
 .../toolbar/{toolbar.html => toolbar.hbs}     |    0
 ...oltip--simple.html => tooltip--simple.hbs} |    0
 .../tooltip/{tooltip.html => tooltip.hbs}     |    0
 ...unified-header.html => unified-header.hbs} |    0
 tests/spec/accordion_spec.js                  |    4 +-
 tests/spec/carousel_spec.js                   |    2 +-
 tests/spec/checkbox_spec.js                   |    2 +-
 tests/spec/content-switcher_spec.js           |    2 +-
 tests/spec/data-table-v2_spec.js              |    4 +-
 tests/spec/data-table_spec.js                 |    2 +-
 tests/spec/date-picker_spec.js                |    4 +-
 tests/spec/file-uploader_spec.js              |    2 +-
 tests/spec/floating-menu_spec.js              |    2 +-
 tests/spec/interior-left-nav_spec.js          |    4 +-
 tests/spec/lightbox_spec.js                   |    2 +-
 tests/spec/loading_spec.js                    |    2 +-
 tests/spec/modal_spec.js                      |    2 +-
 tests/spec/notification_spec.js               |    2 +-
 tests/spec/number-input_spec.js               |    2 +-
 tests/spec/overflow-menu_spec.js              |    2 +-
 tests/spec/profile-switcher_spec.js           |    2 +-
 tests/spec/progress-indicator_spec.js         |    2 +-
 tests/spec/search_spec.js                     |    2 +-
 tests/spec/slider_spec.js                     |    2 +-
 tests/spec/structured-list_spec.js            |    2 +-
 tests/spec/tile_spec.js                       |    6 +-
 tests/spec/toolbar_spec.js                    |    2 +-
 tests/spec/tooltip_spec.js                    |    2 +-
 tools/ci-check.sh                             |    2 +-
 tools/templates.js                            |  114 +
 yarn.lock                                     | 2300 +++++++++--------
 165 files changed, 2630 insertions(+), 2424 deletions(-)
 delete mode 100644 demo/views/demo-live.dust
 create mode 100644 demo/views/demo-nav-data.hbs
 rename demo/views/{demo-nav.dust => layouts/demo-nav.hbs} (61%)
 create mode 100644 demo/views/layouts/preview.hbs
 rename src/components/accordion/{legacyaccordion.html => accordion--legacy.hbs} (100%)
 rename src/components/accordion/{accordion.html => accordion.hbs} (100%)
 rename src/components/breadcrumb/{breadcrumb.html => breadcrumb.hbs} (100%)
 create mode 100644 src/components/button/button.config.js
 create mode 100644 src/components/button/button.hbs
 delete mode 100644 src/components/button/danger-button.html
 delete mode 100644 src/components/button/ghost-button.html
 delete mode 100644 src/components/button/primary-button.html
 delete mode 100644 src/components/button/secondary-button.html
 delete mode 100644 src/components/button/tertiary-button.html
 delete mode 100644 src/components/card/card--with-status.html
 create mode 100644 src/components/card/card.config.js
 rename src/components/card/{card.html => card.hbs} (53%)
 rename src/components/carousel/{carousel.html => carousel.hbs} (100%)
 rename src/components/checkbox/{checkbox.html => checkbox.hbs} (100%)
 delete mode 100644 src/components/code-snippet/code-snippet--terminal.html
 create mode 100644 src/components/code-snippet/code-snippet.config.js
 rename src/components/code-snippet/{code-snippet.html => code-snippet.hbs} (66%)
 delete mode 100644 src/components/combo-box/combo-box--disabled.html
 create mode 100644 src/components/combo-box/combo-box.config.js
 rename src/components/combo-box/{combo-box.html => combo-box.hbs} (73%)
 delete mode 100644 src/components/content-switcher/content-switcher--with-icon.html
 create mode 100644 src/components/content-switcher/content-switcher.config.js
 create mode 100644 src/components/content-switcher/content-switcher.hbs
 delete mode 100644 src/components/content-switcher/content-switcher.html
 rename src/components/copy-button/{copy-button.html => copy-button.hbs} (100%)
 rename src/components/data-table-v2/{data-table-v2-expandable.html => data-table-v2--expandable.hbs} (100%)
 rename src/components/data-table-v2/{data-table-v2--pagination.html => data-table-v2--pagination.hbs} (100%)
 rename src/components/data-table-v2/{data-table-v2--small.html => data-table-v2--small.hbs} (100%)
 rename src/components/data-table-v2/{data-table-v2.html => data-table-v2.hbs} (100%)
 rename src/components/data-table/{data-table--simple.html => data-table--simple.hbs} (100%)
 rename src/components/data-table/{data-table.html => data-table.hbs} (100%)
 rename src/components/date-picker/{date-picker--light.html => date-picker--light.hbs} (100%)
 rename src/components/date-picker/{date-picker--range-light.html => date-picker--range-light.hbs} (100%)
 rename src/components/date-picker/{date-picker--range.html => date-picker--range.hbs} (100%)
 rename src/components/date-picker/{date-picker--single-light.html => date-picker--single-light.hbs} (100%)
 rename src/components/date-picker/{date-picker--single.html => date-picker--single.hbs} (100%)
 rename src/components/date-picker/{date-picker.html => date-picker.hbs} (100%)
 create mode 100644 src/components/detail-page-header/detail-page-header.config.js
 rename src/components/detail-page-header/{detail-page-header--with-tabs.html => detail-page-header.hbs} (93%)
 delete mode 100644 src/components/detail-page-header/detail-page-header.html
 delete mode 100644 src/components/dropdown/dropdown--light.html
 create mode 100644 src/components/dropdown/dropdown.config.js
 rename src/components/dropdown/{dropdown--up.html => dropdown.hbs} (88%)
 delete mode 100644 src/components/dropdown/dropdown.html
 rename src/components/fab/{fab.html => fab.hbs} (100%)
 rename src/components/file-uploader/{file-uploader.html => file-uploader.hbs} (100%)
 rename src/components/footer/{footer.html => footer.hbs} (100%)
 delete mode 100644 src/components/form/form--light.html
 create mode 100644 src/components/form/form.config.js
 rename src/components/form/{form.html => form.hbs} (78%)
 rename src/components/grid/{grid.html => grid.hbs} (100%)
 delete mode 100644 src/components/interior-left-nav/interior-left-nav--keep-open.html
 create mode 100644 src/components/interior-left-nav/interior-left-nav.config.js
 rename src/components/interior-left-nav/{interior-left-nav.html => interior-left-nav.hbs} (98%)
 rename src/components/lightbox/{lightbox.html => lightbox.hbs} (100%)
 rename src/components/link/{link.html => link.hbs} (100%)
 create mode 100644 src/components/list-box/list-box.config.js
 rename src/components/list-box/{list-box--inline.html => list-box.hbs} (89%)
 delete mode 100644 src/components/list-box/list-box.html
 delete mode 100644 src/components/list/list--ordered.html
 create mode 100644 src/components/list/list.config.js
 create mode 100644 src/components/list/list.hbs
 delete mode 100644 src/components/list/list.html
 delete mode 100644 src/components/loading/loading--small.html
 delete mode 100644 src/components/loading/loading--without-overlay.html
 create mode 100644 src/components/loading/loading.config.js
 create mode 100644 src/components/loading/loading.hbs
 delete mode 100644 src/components/loading/loading.html
 delete mode 100644 src/components/modal/modal--nofooter.html
 create mode 100644 src/components/modal/modal.config.js
 create mode 100644 src/components/modal/modal.hbs
 delete mode 100644 src/components/modal/modal.html
 rename src/components/module/{module.html => module.hbs} (100%)
 delete mode 100644 src/components/multi-select/multi-select--inline.html
 create mode 100644 src/components/multi-select/multi-select.config.js
 rename src/components/multi-select/{multi-select.html => multi-select.hbs} (95%)
 rename src/components/notification/{inline-notification.html => inline-notification.hbs} (100%)
 rename src/components/notification/{toast-notification.html => toast-notification.hbs} (100%)
 create mode 100644 src/components/number-input/number-input.config.js
 rename src/components/number-input/{number-input--light.html => number-input.hbs} (89%)
 delete mode 100644 src/components/number-input/number-input.html
 delete mode 100644 src/components/order-summary/order-summary-category.html
 create mode 100644 src/components/order-summary/order-summary.config.js
 create mode 100644 src/components/order-summary/order-summary.hbs
 delete mode 100644 src/components/order-summary/order-summary.html
 rename src/components/overflow-menu/{overflow-menu.html => overflow-menu.hbs} (96%)
 create mode 100644 src/components/pagination/pagination-v2.dust
 delete mode 100644 src/components/pagination/pagination-v2.html
 rename src/components/pagination/{pagination.html => pagination.hbs} (100%)
 rename src/components/progress-indicator/{progress-indicator.html => progress-indicator.hbs} (100%)
 rename src/components/radio-button/{radio-button.html => radio-button.hbs} (100%)
 delete mode 100644 src/components/search/search-large-light.html
 delete mode 100644 src/components/search/search-large.html
 delete mode 100644 src/components/search/search-small-light.html
 delete mode 100644 src/components/search/search-small.html
 create mode 100644 src/components/search/search.config.js
 create mode 100644 src/components/search/search.hbs
 delete mode 100644 src/components/select/select--light.html
 create mode 100644 src/components/select/select.config.js
 rename src/components/select/{select--inline.html => select.hbs} (63%)
 delete mode 100644 src/components/select/select.html
 rename src/components/slider/{slider.html => slider.hbs} (99%)
 rename src/components/structured-list/{structured-list--selection.html => structured-list--selection.hbs} (100%)
 rename src/components/structured-list/{structured-list.html => structured-list.hbs} (82%)
 rename src/components/tabs/{tabs.html => tabs.hbs} (100%)
 rename src/components/tag/{tag.html => tag.hbs} (100%)
 create mode 100644 src/components/text-area/text-area.config.js
 rename src/components/text-area/{text-area--light.html => text-area.hbs} (66%)
 delete mode 100644 src/components/text-area/text-area.html
 delete mode 100644 src/components/text-input/text-input--light.html
 create mode 100644 src/components/text-input/text-input.config.js
 rename src/components/text-input/{text-input.html => text-input.hbs} (58%)
 rename src/components/tile/{tile--clickable.html => tile--clickable.hbs} (100%)
 rename src/components/tile/{tile--expandable.html => tile--expandable.hbs} (100%)
 rename src/components/tile/{tile--grid.html => tile--grid.hbs} (100%)
 rename src/components/tile/{tile--selectable.html => tile--selectable.hbs} (100%)
 rename src/components/tile/{tile.html => tile.hbs} (100%)
 rename src/components/time-picker/{time-picker--light.html => time-picker--light.hbs} (100%)
 rename src/components/time-picker/{time-picker.html => time-picker.hbs} (100%)
 rename src/components/toggle/{toggle--small.html => toggle--small.hbs} (100%)
 rename src/components/toggle/{toggle.html => toggle.hbs} (100%)
 rename src/components/toolbar/{toolbar.html => toolbar.hbs} (100%)
 rename src/components/tooltip/{tooltip--simple.html => tooltip--simple.hbs} (100%)
 rename src/components/tooltip/{tooltip.html => tooltip.hbs} (100%)
 rename src/components/unified-header/{unified-header.html => unified-header.hbs} (100%)
 create mode 100644 tools/templates.js

diff --git a/.eslintignore b/.eslintignore
index 9cf3facc95c4..455ccfd84808 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -15,3 +15,6 @@ tests/coverage
 /html
 /docs/js
 node_modules
+
+# TODO: Upgrade to ESLint4 so we can apply a specific rule (one for CJS code) for below files
+src/**/*.config.js
diff --git a/demo/.babelrc b/demo/.babelrc
index 0bcbdc77956a..f4f9840193db 100644
--- a/demo/.babelrc
+++ b/demo/.babelrc
@@ -11,5 +11,5 @@
     ],
     "react"
   ],
-  "plugins": ["transform-class-properties", "dev-expression"]
+  "plugins": ["transform-class-properties", "transform-object-rest-spread", "dev-expression"]
 }
diff --git a/demo/js/components/CodePage/CodePage.js b/demo/js/components/CodePage/CodePage.js
index c4ba57eb618a..2400ae35d716 100644
--- a/demo/js/components/CodePage/CodePage.js
+++ b/demo/js/components/CodePage/CodePage.js
@@ -4,60 +4,36 @@ import Markdown from 'markdown-it';
 
 import ComponentExample from '../ComponentExample/ComponentExample';
 
-/**
- * @param {ComponentCollection|Component} metadata The component data.
- * @returns {string} The HTML snippet for the component.
- */
-const getContent = metadata => {
-  const { variants = {} } = metadata;
-  const { items = [] } = variants;
-  const variant = items[0];
-  return metadata.content || (variant && variant.content) || '';
-};
-
-/**
- * @param {ComponentCollection|Component} metadata The component data.
- * @returns {Component[]|Variant[]} The data of the component variants.
- */
-const getSubItems = metadata => {
-  if (metadata.isCollection) {
-    return metadata.items;
-  }
-  if (!metadata.isCollated) {
-    return metadata.variants.items;
-  }
-  return [];
-};
-
 /**
  * The page to show the component demo, its code as well as its README.
  */
 const CodePage = ({ metadata, hideViewFullRender }) => {
   const md = new Markdown({ html: true });
-  const subItems = getSubItems(metadata).filter(item => !item.isHidden);
+  const subItems = (metadata.items || []).filter(item => !item.isHidden);
+  /* eslint-disable react/no-danger */
   const componentContent =
     !metadata.isCollection && subItems.length <= 1 ? (
       <ComponentExample
         hideViewFullRender={hideViewFullRender}
         component={metadata.name}
-        htmlFile={getContent(metadata)}
+        htmlFile={metadata.renderedContent}
         useIframe={metadata.useIframe}
       />
     ) : (
       subItems.map(item => (
         <div key={item.id} className="component-variation">
           <h2 className="component-variation__name">{item.label}</h2>
+          {item.notes && metadata.notes !== item.notes && <p>{item.notes}</p>}
           <ComponentExample
             variant={item.handle.replace(/--default$/, '')}
             component={metadata.name}
-            htmlFile={getContent(item)}
+            htmlFile={item.renderedContent}
             useIframe={metadata.useIframe}
           />
         </div>
       ))
     );
 
-  /* eslint-disable react/no-danger */
   return (
     <div className="page code-page test">
       {componentContent}
diff --git a/demo/js/components/ComponentExample/ComponentExample.js b/demo/js/components/ComponentExample/ComponentExample.js
index 8838c47d8372..a5e37fbb96e2 100644
--- a/demo/js/components/ComponentExample/ComponentExample.js
+++ b/demo/js/components/ComponentExample/ComponentExample.js
@@ -134,7 +134,8 @@ class ComponentExample extends Component {
     });
 
     const codepenLink = codepenSlug && `https://codepen.io/team/carbon/full/${codepenSlug}/`;
-    const componentLink = variant ? `/component/${component}/${variant}` : `/component/${component}`;
+    const variantSuffix = (component === variant && '--default') || '';
+    const componentLink = variant ? `/component/${variant}${variantSuffix}` : `/component/${component}`;
 
     const viewFullRender = hideViewFullRender ? null : (
       <Link className="component-example__view-full-render" target="_blank" href={codepenLink || componentLink}>
diff --git a/demo/js/components/RootPage.js b/demo/js/components/RootPage.js
index ce47f3d02ed1..76e039e3899e 100644
--- a/demo/js/components/RootPage.js
+++ b/demo/js/components/RootPage.js
@@ -6,6 +6,67 @@ import SideNav from './SideNav';
 import PageHeader from './PageHeader/PageHeader';
 import SideNavToggle from './SideNavToggle/SideNavToggle';
 
+const checkStatus = response => {
+  if (response.status >= 200 && response.status < 400) {
+    return response;
+  }
+
+  const error = new Error(response.statusText);
+  error.response = response;
+  throw error;
+};
+
+const load = (componentItems, selectedNavItemId) => {
+  const metadata = componentItems && componentItems.find(item => item.id === selectedNavItemId);
+  const subItems = metadata.items || [];
+  const hasRenderedContent =
+    !metadata.isCollection && subItems.length <= 1 ? metadata.renderedContent : subItems.every(item => item.renderedContent);
+  if (!hasRenderedContent) {
+    return fetch(`/code/${metadata.name}`)
+      .then(checkStatus)
+      .then(response => {
+        const contentType = response.headers.get('content-type');
+        return contentType && contentType.includes('application/json') ? response.json() : response.text();
+      })
+      .then(responseContent => {
+        if (Object(responseContent) === responseContent) {
+          return componentItems.map(item => {
+            if (item.id !== selectedNavItemId) {
+              return item;
+            }
+            return !item.items
+              ? {
+                  ...item,
+                  renderedContent: responseContent[`${item.handle}--default`],
+                }
+              : {
+                  ...item,
+                  items: item.items.map(
+                    subItem =>
+                      !responseContent[subItem.handle]
+                        ? subItem
+                        : {
+                            ...subItem,
+                            renderedContent: responseContent[subItem.handle],
+                          }
+                  ),
+                };
+          });
+        }
+        return componentItems.map(
+          item =>
+            item.id !== selectedNavItemId
+              ? item
+              : {
+                  ...item,
+                  renderedContent: responseContent,
+                }
+        );
+      });
+  }
+  return Promise.resolve(null);
+};
+
 /**
  * The top-most React component for dev env page.
  */
@@ -22,9 +83,19 @@ class RootPage extends Component {
     docItems: PropTypes.arrayOf(PropTypes.shape()).isRequired, // eslint-disable-line react/no-unused-prop-types
   };
 
-  constructor() {
+  constructor(props) {
     super();
-    this.state = {};
+
+    const { componentItems } = props;
+
+    this.state = {
+      /**
+       * The array of component data.
+       * @type {Object[]}
+       */
+      componentItems,
+    };
+
     window.addEventListener('popstate', evt => {
       this.switchTo(evt.state.name);
     });
@@ -42,6 +113,13 @@ class RootPage extends Component {
     }
   }
 
+  componentWillReceiveProps(props) {
+    const { componentItems } = props;
+    if (this.props.componentItems !== componentItems) {
+      this.setState({ componentItems });
+    }
+  }
+
   /**
    * The handler for changing in the state of side nav's toggle button.
    */
@@ -53,7 +131,7 @@ class RootPage extends Component {
    * The handler for the `click` event on the side nav for changing selection.
    */
   onSideNavItemClick = evt => {
-    const { componentItems } = this.props;
+    const { componentItems } = this.state;
     const selectedNavItem = componentItems && componentItems.find(item => item.id === evt.target.dataset.navId);
     if (selectedNavItem) {
       this.switchTo(selectedNavItem.id);
@@ -64,7 +142,7 @@ class RootPage extends Component {
    * @returns The component data that is currently selected.
    */
   getCurrentComponentItem() {
-    const { componentItems } = this.props;
+    const { componentItems } = this.state;
     return componentItems && componentItems.find(item => item.id === this.state.selectedNavItemId);
   }
 
@@ -74,17 +152,22 @@ class RootPage extends Component {
    */
   switchTo(selectedNavItemId) {
     this.setState({ selectedNavItemId }, () => {
-      const { componentItems } = this.props;
+      const { componentItems } = this.state;
       const selectedNavItem = componentItems && componentItems.find(item => item.id === selectedNavItemId);
       const { name } = selectedNavItem || {};
       if (name) {
         history.pushState({ name }, name, `/demo/${name}`);
       }
+      load(componentItems, selectedNavItemId).then(newComponentItems => {
+        if (newComponentItems) {
+          this.setState({ componentItems: newComponentItems });
+        }
+      });
     });
   }
 
   render() {
-    const { componentItems } = this.props;
+    const { componentItems } = this.state;
     const metadata = this.getCurrentComponentItem();
     const { name, label } = metadata || {};
     const classNames = classnames({
diff --git a/demo/views/demo-live.dust b/demo/views/demo-live.dust
deleted file mode 100644
index 45a176744f7b..000000000000
--- a/demo/views/demo-live.dust
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <base href="/">
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width">
-  <title>Carbon Components</title>
-  <style>
-    .demo--container {
-      display: none;
-    }
-
-    .offleft {
-      position: absolute;
-      top: 0;
-      left: -10000px;
-      width: 1px;
-      height: 1px;
-      overflow: hidden;
-    }
-  </style>
-</head>
-
-<body class="bx--body demo--container" data-floating-menu-container>
-  <div class="demo--container__panel" data-card-list data-demo-name="{name}">
-    {content|s}
-  </div>
-
-  <!-- Pseudo element to demonstrate focus-wrap behavior (focus trap) -->
-  <input aria-label="inpute-text-offleft" type="text" class="offleft" />
-
-  <!-- Scripts -->
-  <!-- <script src="/carbon-components.min.js"></script> -->
-  <script src="/demo/demo.js"></script>
-  <!-- Disable Auto Init with this flag -->
-  <!-- true = JavaScript will not initialize automatically -->
-  <!-- false = JavaScript will initialize automatically -->
-  <script>
-    CarbonComponents.settings.disableAutoInit = false;
-  </script>
-</body>
-
-</html>
diff --git a/demo/views/demo-nav-data.hbs b/demo/views/demo-nav-data.hbs
new file mode 100644
index 000000000000..29c2b10805e7
--- /dev/null
+++ b/demo/views/demo-nav-data.hbs
@@ -0,0 +1,15 @@
+<script>
+  var needIframe = [
+    'detail-page-header',
+    'footer',
+    'grid',
+    'unified-header',
+  ];
+  var componentItems = {{{JSONstringify componentItems}}}.map(function (item) {
+    if (needIframe.indexOf(item.name) >= 0) {
+      item.useIframe = true;
+    }
+    return item;
+  });
+  var docItems = {{{JSONstringify docItems}}};
+</script>
diff --git a/demo/views/demo-nav.dust b/demo/views/layouts/demo-nav.hbs
similarity index 61%
rename from demo/views/demo-nav.dust
rename to demo/views/layouts/demo-nav.hbs
index f1c83565abdb..764c63e77974 100644
--- a/demo/views/demo-nav.dust
+++ b/demo/views/layouts/demo-nav.hbs
@@ -23,21 +23,7 @@
   <body>
     <div data-renderroot></div>
     <input aria-label="inpute-text-offleft" type="text" class="offleft" />
-    <script>
-      var needIframe = [
-        'detail-page-header',
-        'footer',
-        'grid',
-        'unified-header',
-      ];
-      var componentItems = {componentItems|js|s}.map(function (item) {
-        if (needIframe.indexOf(item.name) >= 0) {
-          item.useIframe = true;
-        }
-        return item;
-      });
-      var docItems = {docItems|js|s};
-    </script>
+    {{{body}}}
     <script src="/demo/demo.js"></script>
   </body>
 </html>
diff --git a/demo/views/layouts/preview.hbs b/demo/views/layouts/preview.hbs
new file mode 100644
index 000000000000..8ed6685d3af0
--- /dev/null
+++ b/demo/views/layouts/preview.hbs
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <base href="/">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width">
+    <title>Carbon Components</title>
+    <style>
+      .demo--container {
+        display: none;
+      }
+
+      .offleft {
+        position: absolute;
+        top: 0;
+        left: -10000px;
+        width: 1px;
+        height: 1px;
+        overflow: hidden;
+      }
+    </style>
+  </head>
+
+  <body class="bx--body demo--container" data-floating-menu-container>
+    <div class="demo--container__panel" data-card-list>
+      {{{body}}}
+    </div>
+
+    <!-- Pseudo element to demonstrate focus-wrap behavior (focus trap) -->
+    <input aria-label="inpute-text-offleft" type="text" class="offleft" />
+
+    <!-- Scripts -->
+    <!-- <script src="/carbon-components.min.js"></script> -->
+    <script src="/demo/demo.js"></script>
+    <!-- Disable Auto Init with this flag -->
+    <!-- true = JavaScript will not initialize automatically -->
+    <!-- false = JavaScript will initialize automatically -->
+    <script>
+      CarbonComponents.settings.disableAutoInit = false;
+    </script>
+  </body>
+</html>
diff --git a/gulpfile.js b/gulpfile.js
index 62b5ad0418ba..01f41ca639fe 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // Node
+const fs = require('fs');
 const path = require('path');
 
 // Styles
@@ -41,10 +42,16 @@ const jsdocConfig = require('gulp-jsdoc3/dist/jsdocConfig.json');
 // Generic utility
 const del = require('del');
 
+const writeFile = promisify(fs.writeFile);
+const mkdirp = promisify(require('mkdirp'));
+
 // Test environment
 const Server = require('karma').Server;
 const commander = require('commander');
 
+// Fractal templates
+const templates = require('./tools/templates');
+
 const assign = v => v;
 const cloptions = commander
   .option('-k, --keepalive', 'Keeps browser open after first run of Karma test finishes')
@@ -64,8 +71,8 @@ gulp.task('dev-server', cb => {
   let started;
   const options = {
     script: './server.js',
-    ext: 'dust js',
-    watch: ['demo/**/*.dust', 'server.js'],
+    ext: 'hbs js',
+    watch: ['demo/**/*.hbs', 'src/**/*.hbs', 'src/**/*.config.js', 'server.js'],
     env: {
       PORT: cloptions.port,
     },
@@ -246,11 +253,17 @@ gulp.task('sass:source', () => {
   return gulp.src(srcFiles).pipe(gulp.dest('scss'));
 });
 
-gulp.task('html:source', () => {
-  const srcFiles = './src/components/**/*.html';
-
-  return gulp.src(srcFiles).pipe(gulp.dest('html'));
-});
+gulp.task('html:source', () =>
+  templates.render({ preview: 'NONE' }).then(renderedItems => {
+    const promises = [];
+    renderedItems.forEach((rendered, item) => {
+      const dirname = path.dirname(path.resolve(__dirname, 'html', item.relViewPath));
+      const filename = `${item.handle.replace(/--default$/, '')}.html`;
+      promises.push(mkdirp(dirname).then(() => writeFile(path.resolve(dirname, filename), rendered)));
+    });
+    return Promise.all(promises);
+  })
+);
 
 /**
  * JSDoc
@@ -294,7 +307,7 @@ gulp.task('jsdoc', cb => {
 
 gulp.task('test', ['test:unit', 'test:a11y']);
 
-gulp.task('test:unit', done => {
+gulp.task('test:unit', ['html:source'], done => {
   new Server(
     {
       configFile: path.resolve(__dirname, 'tests/karma.conf.js'),
diff --git a/package.json b/package.json
index 6c68f6f8e1ce..df1ece06ec38 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "eslint-plugin-prettier": "^2.3.1",
     "eslint-plugin-react": "^7.5.0",
     "express": "4.16.2",
+    "express-handlebars": "^3.0.0",
     "globby": "4.0.0",
     "gulp": "~3.9.0",
     "gulp-autoprefixer": "~3.0.1",
@@ -93,6 +94,7 @@
     "gulp-sourcemaps": "~1.6.0",
     "gulp-uglify": "^2.1.2",
     "gulp-util": "~3.0.7",
+    "handlebars-helpers": "^0.10.0",
     "html-loader": "^0.5.0",
     "husky": "^0.12.0",
     "jasmine-core": "^2.9.0",
@@ -112,6 +114,7 @@
     "markdown-it": "^8.4.0",
     "merge-stream": "^1.0.0",
     "minimatch": "^3.0.0",
+    "mkdirp": "^0.5.0",
     "mock-raf": "^1.0.0",
     "nodemon": "1.9.1",
     "postcss-loader": "^2.1.0",
@@ -137,7 +140,8 @@
     "vinyl-named": "^1.1.0",
     "webpack": "^3.10.0",
     "webpack-dev-middleware": "^2.0.0",
-    "webpack-hot-middleware": "^2.21.0"
+    "webpack-hot-middleware": "^2.21.0",
+    "whatwg-fetch": "^2.0.0"
   },
   "resolutions": {
     "freshy": ">= 1.0.3"
diff --git a/server.js b/server.js
index dd3d3562fbd6..7a792940d6b6 100644
--- a/server.js
+++ b/server.js
@@ -1,36 +1,26 @@
 'use strict';
 
-const globby = require('globby');
-const { promisify } = require('bluebird');
-const fs = require('fs');
+/* eslint import/no-extraneous-dependencies: [2, {"devDependencies": true}] */
+
 const path = require('path');
 const express = require('express');
-const Fractal = require('@frctl/fractal');
 
 const webpack = require('webpack');
-const webpackDevConfig = require('./tools/webpack.dev.config');
 const webpackDevMiddleware = require('webpack-dev-middleware');
 const webpackHotMiddleware = require('webpack-hot-middleware');
 
-const compiler = webpack(webpackDevConfig);
-
-const readFile = promisify(fs.readFile);
+const templates = require('./tools/templates');
 
 const app = express();
-const adaro = require('adaro');
-
 const port = process.env.PORT || 8080;
+const config = require('./tools/webpack.dev.config');
 
-app.use(webpackDevMiddleware(compiler, { noInfo: true, publicPath: webpackDevConfig.output.publicPath }));
+const compiler = webpack(config);
+app.use(webpackDevMiddleware(compiler, { noInfo: true, publicPath: config.output.publicPath }));
 app.use(webpackHotMiddleware(compiler));
 
-const fractal = Fractal.create();
-fractal.components.set('path', path.join(__dirname, 'src/components'));
-fractal.components.set('ext', '.html');
-fractal.docs.set('path', path.join(__dirname, 'docs'));
-
-app.engine('dust', adaro.dust());
-app.set('view engine', 'dust');
+app.engine('hbs', templates.handlebars.engine);
+app.set('view engine', 'hbs');
 app.set('views', path.resolve(__dirname, 'demo/views'));
 app.use('/demo', express.static('demo'));
 app.use(express.static('src'));
@@ -38,34 +28,44 @@ app.use(express.static('scripts'));
 app.use('/docs/js', express.static('docs/js'));
 
 /**
- * @param {string} glob The glob.
- * @returns {string} The file contents of files matching the given glob, concatenated.
- */
-const getContent = glob =>
-  globby(glob).then(filePaths => {
-    if (filePaths.length === 0) {
-      return undefined;
-    }
-    return Promise.all(filePaths.map(filePath => readFile(filePath, { encoding: 'utf8' }))).then(contents =>
-      contents.reduce((a, b) => a.concat(b))
-    );
-  });
-
-/**
- * @param {ComponentCollection|Component} item The component data.
+ * @param {ComponentCollection|Component} metadata The component data.
  * @returns {Promise<ComponentCollection|Component>}
- *   The component data, with README.md content assigned to `.notes` property for component with variants (`ComponentCollection`).
+ *   The normalized component data,
+ *   esp. with README.md content assigned to `.notes` property for component with variants (`ComponentCollection`).
  *   Fractal automatically populate `.notes` for component without variants (`Component`).
  */
-const ensureComponentItemNotes = item => {
-  if (!item.isCollection || !item.config.readme) {
-    return item;
+const normalizeMetadata = metadata => {
+  const items = metadata.isCollection ? metadata : !metadata.isCollated && metadata.variants && metadata.variants();
+  const visibleItems = items && items.filter(item => !item.isHidden);
+  const metadataJSON = typeof metadata.toJSON !== 'function' ? metadata : metadata.toJSON();
+  if (!metadata.isCollection && visibleItems && visibleItems.size === 1) {
+    const firstVariant = visibleItems.first();
+    return Object.assign(metadataJSON, {
+      context: firstVariant.context,
+      notes: firstVariant.notes,
+      preview: firstVariant.preview,
+      variants: undefined,
+    });
   }
-  return item.config.readme
-    .getContent()
-    .then(notes => Object.assign(typeof item.toJSON !== 'function' ? item : item.toJSON(), { notes }));
+  return Object.assign(metadataJSON, {
+    items: !items || items.size <= 1 ? undefined : items.map(normalizeMetadata).toJSON().items,
+    variants: undefined,
+  });
 };
 
+/**
+ * The promise resolved with the list of nav items.
+ * @type {Promise<(ComponentCollection|Component)[]>}
+ */
+const promiseNavItems = templates.promiseCache
+  .then(({ componentSource, docSource }) =>
+    Promise.all([Promise.all(componentSource.items().map(normalizeMetadata)), docSource.items()])
+  )
+  .then(([componentItems, docItems]) => ({
+    componentItems,
+    docItems,
+  }));
+
 ['/', '/demo/:component'].forEach(route => {
   app.get(route, (req, res) => {
     const name = req.params.component;
@@ -73,13 +73,9 @@ const ensureComponentItemNotes = item => {
     if (name && path.relative('src/components', `src/components/${name}`).substr(0, 2) === '..') {
       res.status(404).end();
     } else {
-      fractal
-        .load()
-        .then(([componentSource, docSource]) =>
-          Promise.all([Promise.all(componentSource.items().map(ensureComponentItemNotes)), docSource.items()])
-        )
-        .then(([componentItems, docItems]) => {
-          res.render('demo-nav', {
+      promiseNavItems
+        .then(({ componentItems, docItems }) => {
+          res.render('demo-nav-data', {
             componentItems,
             docItems,
           });
@@ -92,29 +88,48 @@ const ensureComponentItemNotes = item => {
   });
 });
 
-['/component/:component', '/component/:component/:variant'].forEach(route => {
-  app.get(route, (req, res) => {
-    const glob = `src/components/${req.params.component}/**/${req.params.variant || '*'}.html`;
+app.get('/component/:component', (req, res) => {
+  const name = req.params.component;
+
+  if (path.relative('src/components', `src/components/${name}`).substr(0, 2) === '..') {
+    res.status(404).end();
+  } else {
+    templates
+      .render({ defaultPreview: 'preview', concat: true }, name)
+      .then(rendered => {
+        // eslint-disable-next-line eqeqeq
+        if (rendered == null) {
+          res.status(404).end();
+        }
+        res.send(rendered);
+      })
+      .catch(error => {
+        console.error(error.stack); // eslint-disable-line no-console
+        res.status(500).end();
+      });
+  }
+});
 
-    if (path.relative('src/components', glob).substr(0, 2) === '..') {
-      res.status(404).end();
-    } else {
-      getContent(glob)
-        .then(html => {
-          if (typeof html === 'undefined') {
-            res.status(404).end();
-          } else {
-            res.render('demo-live', {
-              content: html,
-            });
-          }
-        })
-        .catch(error => {
-          console.error(error.stack); // eslint-disable-line no-console
-          res.status(500).end();
+app.get('/code/:component', (req, res) => {
+  const name = req.params.component;
+
+  if (name && path.relative('src/components', `src/components/${name}`).substr(0, 2) === '..') {
+    res.status(404).end();
+  } else {
+    templates
+      .render({ preview: 'NONE' }, name)
+      .then(renderedItems => {
+        const o = {};
+        renderedItems.forEach((rendered, item) => {
+          o[item.handle] = rendered.trim();
         });
-    }
-  });
+        res.json(o);
+      })
+      .catch(error => {
+        console.error(error.stack); // eslint-disable-line no-console
+        res.status(500).end();
+      });
+  }
 });
 
 app.listen(port, () => {
diff --git a/src/components/accordion/legacyaccordion.html b/src/components/accordion/accordion--legacy.hbs
similarity index 100%
rename from src/components/accordion/legacyaccordion.html
rename to src/components/accordion/accordion--legacy.hbs
diff --git a/src/components/accordion/accordion.html b/src/components/accordion/accordion.hbs
similarity index 100%
rename from src/components/accordion/accordion.html
rename to src/components/accordion/accordion.hbs
diff --git a/src/components/breadcrumb/breadcrumb.html b/src/components/breadcrumb/breadcrumb.hbs
similarity index 100%
rename from src/components/breadcrumb/breadcrumb.html
rename to src/components/breadcrumb/breadcrumb.hbs
diff --git a/src/components/button/button.config.js b/src/components/button/button.config.js
new file mode 100644
index 000000000000..85e5ae277245
--- /dev/null
+++ b/src/components/button/button.config.js
@@ -0,0 +1,111 @@
+'use stirct';
+
+module.exports = {
+  default: 'primary',
+  variants: [
+    {
+      name: 'primary',
+      label: 'Primary Buttons',
+      notes: 'Primary buttons should be used for the principle call to action on the page.',
+      context: {
+        variant: 'primary',
+      },
+    },
+    {
+      name: 'primary--small',
+      label: 'Primary Buttons (Small)',
+      notes: `
+        Small buttons may be used when there is not enough space for a
+        regular sized button. This issue is most found in tables. Small button should have three words
+        or less.
+      `,
+      context: {
+        variant: 'primary',
+        small: true,
+      },
+    },
+    {
+      name: 'secondary',
+      label: 'Secondary Buttons',
+      notes: 'Secondary buttons should be used for secondary actions on each page.',
+      context: {
+        variant: 'secondary',
+      },
+    },
+    {
+      name: 'secondary--small',
+      label: 'Secondary Buttons (Small)',
+      notes: `
+        Small buttons may be used when there is not enough space for a
+        regular sized button. This issue is most found in tables. Small button should have three words
+        or less.
+      `,
+      context: {
+        variant: 'secondary',
+        small: true,
+      },
+    },
+    {
+      name: 'tertiary',
+      label: 'Tertiary Buttons',
+      notes: 'Tertiary buttons should be used for tertiary actions on each page.',
+      context: {
+        variant: 'tertiary',
+      },
+    },
+    {
+      name: 'tertiary--small',
+      label: 'Tertiary Buttons (Small)',
+      notes: `
+        Small buttons may be used when there is not enough space for a
+        regular sized button. This issue is most found in tables. Small button should have three words
+        or less.
+      `,
+      context: {
+        variant: 'tertiary',
+        small: true,
+      },
+    },
+    {
+      name: 'danger',
+      label: 'Danger Buttons',
+      notes: 'Danger buttons should be used for a negative action (such as Delete) on the page.',
+      context: {
+        variant: 'danger',
+      },
+    },
+    {
+      name: 'danger--small',
+      label: 'Danger Buttons (Small)',
+      notes: `
+        Small buttons may be used when there is not enough space for a
+        regular sized button. This issue is most found in tables. Small button should have three words
+        or less.
+      `,
+      context: {
+        variant: 'danger',
+        small: true,
+      },
+    },
+    {
+      name: 'ghost',
+      label: 'Ghost Buttons',
+      context: {
+        variant: 'ghost',
+      },
+    },
+    {
+      name: 'ghost--small',
+      label: 'Ghost Buttons (Small)',
+      notes: `
+        Small buttons may be used when there is not enough space for a
+        regular sized button. This issue is most found in tables. Small button should have three words
+        or less.
+      `,
+      context: {
+        variant: 'ghost',
+        small: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/button/button.hbs b/src/components/button/button.hbs
new file mode 100644
index 000000000000..b26bc5aa728f
--- /dev/null
+++ b/src/components/button/button.hbs
@@ -0,0 +1,8 @@
+<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#is variant "danger"}}aria-label="danger"{{/is}} type="button">Button</button>
+<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#is variant "danger"}}aria-label="danger"{{/is}} type="button" disabled>Button</button>
+<button class="bx--btn bx--btn--{{variant}}{{#if small}} bx--btn--sm{{/if}}" {{#is variant "danger"}}aria-label="danger"{{/is}} type="button">
+  With icon
+  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
+    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
+  </svg>
+</button>
diff --git a/src/components/button/danger-button.html b/src/components/button/danger-button.html
deleted file mode 100644
index 72f9dcf7fb58..000000000000
--- a/src/components/button/danger-button.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<button class="bx--btn bx--btn--danger" type="button" aria-label="danger">Secondary danger button</button>
-<button class="bx--btn bx--btn--danger" type="button" disabled>Secondary danger button</button>
-<button class="bx--btn bx--btn--danger bx--btn--sm" type="button" aria-label="danger">Small secondary danger</button>
-<button class="bx--btn bx--btn--danger--primary" type="button" aria-label="danger">Primary Danger button</button>
-<button class="bx--btn bx--btn--danger--primary" type="button" disabled>Primary Danger button</button>
-<button class="bx--btn bx--btn--danger--primary bx--btn--sm" type="button" aria-label="danger">Small Primary Danger button</button>
diff --git a/src/components/button/ghost-button.html b/src/components/button/ghost-button.html
deleted file mode 100644
index e9ad25e85b8d..000000000000
--- a/src/components/button/ghost-button.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<button class="bx--btn bx--btn--ghost" type="button">
-  Ghost button
-  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
-  </svg>
-</button>
-<button disabled class="bx--btn bx--btn--ghost" type="button">
-  Ghost button
-  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
-  </svg>
-</button>
-<button class="bx--btn bx--btn--ghost bx--btn--sm" type="button">
-  Small Ghost button
-  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
-  </svg>
-</button>
diff --git a/src/components/button/primary-button.html b/src/components/button/primary-button.html
deleted file mode 100644
index db89714ea6ce..000000000000
--- a/src/components/button/primary-button.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<button class="bx--btn bx--btn--primary" type="button">Primary button</button>
-<button class="bx--btn bx--btn--primary" type="button" disabled>Primary button</button>
-<button class="bx--btn bx--btn--primary" type="button">
-  Primary with icon
-  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
-  </svg>
-</button>
-<button class="bx--btn bx--btn--primary bx--btn--sm" type="button">Small Primary button</button>
-<button class="bx--btn bx--btn--primary bx--btn--sm" type="button">
-  Small Primary button
-  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
-  </svg>
-</button>
diff --git a/src/components/button/secondary-button.html b/src/components/button/secondary-button.html
deleted file mode 100644
index 2b30cc9e91f5..000000000000
--- a/src/components/button/secondary-button.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<button class="bx--btn bx--btn--secondary" type="button">Secondary button</button>
-<button class="bx--btn bx--btn--secondary" type="button" disabled>Secondary button</button>
-<button class="bx--btn bx--btn--secondary" type="button">
-  Secondary with icon
-  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
-  </svg>
-</button>
-<button class="bx--btn bx--btn--secondary bx--btn--sm" type="button">Small Secondary button</button>
-<button class="bx--btn bx--btn--secondary bx--btn--sm" type="button">
-  Small Secondary with icon
-  <svg class="bx--btn__icon" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path>
-  </svg>
-</button>
diff --git a/src/components/button/tertiary-button.html b/src/components/button/tertiary-button.html
deleted file mode 100644
index 6f0562786c08..000000000000
--- a/src/components/button/tertiary-button.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<button class="bx--btn bx--btn--tertiary" type="button">Tertiary button</button>
-<button class="bx--btn bx--btn--tertiary" type="button" disabled>Tertiary button</button>
diff --git a/src/components/card/card--with-status.html b/src/components/card/card--with-status.html
deleted file mode 100644
index 02be7e6cb35d..000000000000
--- a/src/components/card/card--with-status.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<article class="bx--card" tabindex="0" aria-labelledby="card-title-1">
-  <div class="bx--card__card-overview">
-    <!-- OverflowMenu -->
-    <div data-overflow-menu class="bx--overflow-menu" tabindex="0" aria-label="List of options">
-      <svg class="bx--overflow-menu__icon" width="4" height="20" viewBox="0 0 4 20" fill-rule="evenodd">
-        <title>list of options</title>
-        <circle cx="2" cy="2" r="2"></circle>
-        <circle cx="2" cy="10" r="2"></circle>
-        <circle cx="2" cy="18" r="2"></circle>
-      </svg>
-      <ul class="bx--overflow-menu-options">
-        <li class="bx--overflow-menu-options__option">
-          <button type="button" class="bx--overflow-menu-options__btn">Stop App</button>
-        </li>
-        <li class="bx--overflow-menu-options__option">
-          <button type="button" class="bx--overflow-menu-options__btn">Restart App</button>
-        </li>
-        <li class="bx--overflow-menu-options__option">
-          <button type="button" class="bx--overflow-menu-options__btn">Restart App</button>
-        </li>
-        <li class="bx--overflow-menu-options__option">
-          <button type="button" class="bx--overflow-menu-options__btn">Edit Routes and Access</button>
-        </li>
-        <li class="bx--overflow-menu-options__option bx--overflow-menu--divider">
-          <button type="button" class="bx--overflow-menu-options__btn">Delete App</button>
-        </li>
-      </ul>
-    </div>
-    <div class="bx--card-overview__about">
-      <figure class="bx--about__icon">
-        <img src="/globals/assets/images/placeholder-icon-32x32.svg" alt="" class="bx--about__icon--img" />
-      </figure>
-      <header class="bx--about__title">
-        <p id="card-title-1" class="bx--about__title--name bx--type-gamma" title="Card Name">Card Name</p>
-        <a href="" class="bx--link bx--about__title--link" title="Secondary Information">Secondary Information</a>
-      </header>
-    </div>
-  </div>
-  <div class="bx--card-footer">
-    <div class="bx--card-footer__app-status">
-      <div class="bx--card-footer__app-status--running active">
-        <div class="bx--running__text">Running</div>
-      </div>
-      <div class="bx--card-footer__app-status--not-running">
-        <div class="bx--not-running__text">Not Running</div>
-      </div>
-      <div class="bx--card-footer__app-status--stopped">
-        <div class="bx--stopped__text">Stopped</div>
-      </div>
-    </div>
-    <div class="bx--card-footer__app-actions">
-      <button class="bx--app-actions__button" id="restart-app" aria-label="restart-app">
-        <svg class="bx--app-actions__button--icon" width="12" height="16" viewBox="0 0 12 16" fill-rule="evenodd">
-          <path d="M6 8l1.3 1.3 1.9-1.9L10.6 6 12 4.7 7.3 0 6 1.2l2.6 2.4H6.1h-.2c-1.7 0-3.3.8-4.4 2C.5 6.7 0 8.1 0 9.6c0 3.3 2.7 6 6 6 1.6 0 3-.6 4-1.6l-1.4-1.4c-.7.6-1.6 1-2.6 1-2.2 0-4-1.8-4-4s1.8-4 4-4H8.8l-.6.6L6 8z"></path>
-        </svg>
-      </button>
-      <button class="bx--app-actions__button" id="load-app" aria-label="load-app">
-        <svg class="bx--app-actions__button--icon" width="16" height="16" viewBox="-3 5 16 16" fill-rule="evenodd">
-          <path d="M7.5 12l3.6-3.6V11H13V5H7.1v2h2.5l-3.5 3.5z"></path>
-          <path d="M11 19H-1V9h5V5h-7v16h16v-7h-2z"></path>
-        </svg>
-      </button>
-    </div>
-  </div>
-</article>
diff --git a/src/components/card/card.config.js b/src/components/card/card.config.js
new file mode 100644
index 000000000000..81145e1d2890
--- /dev/null
+++ b/src/components/card/card.config.js
@@ -0,0 +1,22 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Cards provide an at-a glance preview of the content they link to and frequently contain
+        easily-consumable content.
+      `,
+    },
+    {
+      name: 'with-status',
+      label: 'With status',
+      notes: 'Card Status displays the current status of the application (RUNNING, NOT_RUNNING, STOPPED).',
+      context: {
+        hasStatus: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/card/card.html b/src/components/card/card.hbs
similarity index 53%
rename from src/components/card/card.html
rename to src/components/card/card.hbs
index ec31671899e5..e9c22f815786 100644
--- a/src/components/card/card.html
+++ b/src/components/card/card.hbs
@@ -36,8 +36,37 @@
       </header>
   </div>
   </section>
-  <footer class="bx--card-footer">
-    <button class="bx--btn bx--btn--primary bx--btn--sm" type="button" title="View credentials">View credentials</button>
-    <a href="" class="bx--card-footer__link">Docs</a>
-  </footer>
+  {{#unless hasStatus}}
+    <footer class="bx--card-footer">
+      <button class="bx--btn bx--btn--primary bx--btn--sm" type="button" title="View credentials">View credentials</button>
+      <a href="" class="bx--card-footer__link">Docs</a>
+    </footer>
+  {{else}}
+    <div class="bx--card-footer">
+      <div class="bx--card-footer__app-status">
+        <div class="bx--card-footer__app-status--running active">
+          <div class="bx--running__text">Running</div>
+        </div>
+        <div class="bx--card-footer__app-status--not-running">
+          <div class="bx--not-running__text">Not Running</div>
+        </div>
+        <div class="bx--card-footer__app-status--stopped">
+          <div class="bx--stopped__text">Stopped</div>
+        </div>
+      </div>
+      <div class="bx--card-footer__app-actions">
+        <button class="bx--app-actions__button" id="restart-app" aria-label="restart-app">
+          <svg class="bx--app-actions__button--icon" width="12" height="16" viewBox="0 0 12 16" fill-rule="evenodd">
+            <path d="M6 8l1.3 1.3 1.9-1.9L10.6 6 12 4.7 7.3 0 6 1.2l2.6 2.4H6.1h-.2c-1.7 0-3.3.8-4.4 2C.5 6.7 0 8.1 0 9.6c0 3.3 2.7 6 6 6 1.6 0 3-.6 4-1.6l-1.4-1.4c-.7.6-1.6 1-2.6 1-2.2 0-4-1.8-4-4s1.8-4 4-4H8.8l-.6.6L6 8z"></path>
+          </svg>
+        </button>
+        <button class="bx--app-actions__button" id="load-app" aria-label="load-app">
+          <svg class="bx--app-actions__button--icon" width="16" height="16" viewBox="-3 5 16 16" fill-rule="evenodd">
+            <path d="M7.5 12l3.6-3.6V11H13V5H7.1v2h2.5l-3.5 3.5z"></path>
+            <path d="M11 19H-1V9h5V5h-7v16h16v-7h-2z"></path>
+          </svg>
+        </button>
+      </div>
+    </div>
+  {{/unless}}
 </article>
diff --git a/src/components/carousel/carousel.html b/src/components/carousel/carousel.hbs
similarity index 100%
rename from src/components/carousel/carousel.html
rename to src/components/carousel/carousel.hbs
diff --git a/src/components/checkbox/checkbox.html b/src/components/checkbox/checkbox.hbs
similarity index 100%
rename from src/components/checkbox/checkbox.html
rename to src/components/checkbox/checkbox.hbs
diff --git a/src/components/code-snippet/code-snippet--terminal.html b/src/components/code-snippet/code-snippet--terminal.html
deleted file mode 100644
index 1b01bff0afe2..000000000000
--- a/src/components/code-snippet/code-snippet--terminal.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="bx--snippet bx--snippet--terminal">
-  <div class="bx--snippet-container">
-    <pre><code>node -v Lorem ipsum dolor sit amet, consectetur adipisicing elit. Blanditiis, veritatis voluptate id incidunt molestiae officia possimus, quasi itaque alias, architecto hic, dicta fugit? Debitis delectus quidem explicabo vitae fuga laboriosam!</code></pre>
-  </div>
-  <button data-copy-btn class="bx--snippet-button" aria-label="Copy code" tabindex="0">
-    <svg class="bx--snippet__icon" width="18" height="24" viewBox="0 0 18 24" fill-rule="evenodd">
-      <path d="M13 5V0H0v19h5v5h13V5h-5zM2 17V2h9v3H5v12H2zm14 5H7V7h9v15z"></path>
-      <path d="M9 9h5v2H9zM9 12h5v2H9zM9 15h3v2H9z"></path>
-    </svg>
-    <div class="bx--btn--copy__feedback" data-feedback="Copied!"></div>
-  </button>
-</div>
diff --git a/src/components/code-snippet/code-snippet.config.js b/src/components/code-snippet/code-snippet.config.js
new file mode 100644
index 000000000000..5b6a910d1acd
--- /dev/null
+++ b/src/components/code-snippet/code-snippet.config.js
@@ -0,0 +1,30 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Code',
+      notes: `
+        Code snippets are small blocks of reusable code that can be inserted in a code file.
+
+        The Code style is for larger, multi-line code snippets.
+      `,
+      context: {
+        variant: 'code',
+      },
+    },
+    {
+      name: 'terminal',
+      label: 'Terminal',
+      notes: `
+        Code snippets are small blocks of reusable code that can be inserted in a code file.
+
+        The Terminal style is for single-line .
+      `,
+      context: {
+        variant: 'terminal',
+      },
+    },
+  ],
+};
diff --git a/src/components/code-snippet/code-snippet.html b/src/components/code-snippet/code-snippet.hbs
similarity index 66%
rename from src/components/code-snippet/code-snippet.html
rename to src/components/code-snippet/code-snippet.hbs
index 229335ed9285..b631d12c8ed1 100644
--- a/src/components/code-snippet/code-snippet.html
+++ b/src/components/code-snippet/code-snippet.hbs
@@ -1,7 +1,8 @@
-<div class="bx--snippet bx--snippet--code">
+<div class="bx--snippet bx--snippet--{{variant}}">
   <div class="bx--snippet-container">
-    <code>
-      <pre>
+    {{#is variant "code"}}
+      <code>
+        <pre>
 @mixin bx--snippet($type) {
   @if $type == 'terminal' {
     background-color: red;
@@ -19,8 +20,11 @@
     background-color: white;
   }
 }
-      </pre>
-    </code>
+        </pre>
+      </code>
+    {{else}}
+      <pre><code>node -v Lorem ipsum dolor sit amet, consectetur adipisicing elit. Blanditiis, veritatis voluptate id incidunt molestiae officia possimus, quasi itaque alias, architecto hic, dicta fugit? Debitis delectus quidem explicabo vitae fuga laboriosam!</code></pre>
+    {{/is}}
   </div>
   <button data-copy-btn class="bx--snippet-button" aria-label="Copy code" tabindex="0">
     <svg class="bx--snippet__icon" width="18" height="24" viewBox="0 0 18 24" fill-rule="evenodd">
diff --git a/src/components/combo-box/combo-box--disabled.html b/src/components/combo-box/combo-box--disabled.html
deleted file mode 100644
index 84d49c40f776..000000000000
--- a/src/components/combo-box/combo-box--disabled.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="bx--form-item bx--combo-box bx--list-box bx--list-box--disabled">
-  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true" disabled="">
-    <input class="bx--text-input" role="combobox" aria-autocomplete="list" aria-expanded="false" autocomplete="off" value="" disabled="" id="downshift-input-13" placeholder="Filter...">
-    <div class="bx--list-box__menu-icon">
-      <svg fill-rule="evenodd" height="5" name="caret--down" role="img" viewBox="0 0 10 5" width="10" aria-label="Open menu">
-        <title>Open menu</title>
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-    </div>
-  </div>
-</div>
diff --git a/src/components/combo-box/combo-box.config.js b/src/components/combo-box/combo-box.config.js
new file mode 100644
index 000000000000..ed087691cd71
--- /dev/null
+++ b/src/components/combo-box/combo-box.config.js
@@ -0,0 +1,17 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+    },
+    {
+      name: 'disabled',
+      label: 'Disabled',
+      context: {
+        disabled: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/combo-box/combo-box.html b/src/components/combo-box/combo-box.hbs
similarity index 73%
rename from src/components/combo-box/combo-box.html
rename to src/components/combo-box/combo-box.hbs
index e1282ba87706..9b57d36c919a 100644
--- a/src/components/combo-box/combo-box.html
+++ b/src/components/combo-box/combo-box.hbs
@@ -1,6 +1,6 @@
-<div class="bx--form-item bx--combo-box bx--list-box">
-  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true">
-    <input class="bx--text-input" role="combobox" aria-autocomplete="list" aria-expanded="false" autocomplete="off" value="" id="downshift-input-2" placeholder="Filter...">
+<div class="bx--form-item bx--combo-box bx--list-box{{#if disabled}} bx--list-box--disabled{{/if}}">
+  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true"{{#if disabled}} disabled{{/if}}>
+    <input class="bx--text-input" role="combobox" aria-autocomplete="list" aria-expanded="false" autocomplete="off" value="" id="downshift-input-2" placeholder="Filter..."{{#if disabled}} disabled{{/if}}>
     <div class="bx--list-box__menu-icon">
       <svg fill-rule="evenodd" height="5" name="caret--down" role="img" viewBox="0 0 10 5" width="10" aria-label="Open menu">
         <title>Open menu</title>
@@ -9,9 +9,9 @@
     </div>
   </div>
 </div>
-<div class="bx--form-item bx--combo-box bx--list-box">
-  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="close menu" aria-expanded="true" aria-haspopup="true">
-    <input class="bx--text-input" role="combobox" aria-autocomplete="list" aria-expanded="true" autocomplete="off" value="" id="downshift-input-2" placeholder="Filter..." aria-activedescendant="downshift-1-item-2">
+<div class="bx--form-item bx--combo-box bx--list-box{{#if disabled}} bx--list-box--disabled{{/if}}">
+  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="close menu" aria-expanded="true" aria-haspopup="true"{{#if disabled}} disabled{{/if}}>
+    <input class="bx--text-input" role="combobox" aria-autocomplete="list" aria-expanded="true" autocomplete="off" value="" id="downshift-input-2" placeholder="Filter..." aria-activedescendant="downshift-1-item-2"{{#if disabled}} disabled{{/if}}>
     <div class="bx--list-box__menu-icon bx--list-box__menu-icon--open">
       <svg fill-rule="evenodd" height="5" name="caret--down" role="img" viewBox="0 0 10 5" width="10" aria-label="Close menu">
         <title>Close menu</title>
diff --git a/src/components/content-switcher/content-switcher--with-icon.html b/src/components/content-switcher/content-switcher--with-icon.html
deleted file mode 100644
index 77e0a6ff8042..000000000000
--- a/src/components/content-switcher/content-switcher--with-icon.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div data-content-switcher class="bx--content-switcher">
-  <button class="bx--content-switcher-btn bx--content-switcher--selected" data-target=".demo--panel2--opt-1">
-    <svg class="bx--content-switcher__icon" width="16" height="16" viewBox="0 0 16 16"><path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path></svg>
-    First section
-  </button>
-  <button class="bx--content-switcher-btn" data-target=".demo--panel2--opt-2">
-      <svg class="bx--content-switcher__icon" width='12' height='9' viewBox='0 0 12 9' fill-rule='evenodd'><path d='M4.1 6.1L1.4 3.4 0 4.9 4.1 9l7.6-7.6L10.3 0z'></path></svg>
-      Second section
-  </button>
-  <button class="bx--content-switcher-btn" data-target=".demo--panel2--opt-3">
-    <svg class="bx--content-switcher__icon" width='16' height='15' viewBox='0 0 16 15' fill-rule='evenodd'><path d='M8.11 11.75l-4.5 3.2c-.2.1-.5 0-.4-.3l1.5-5.1-4.6-3.2c-.2-.2-.1-.5.1-.5l5.5-.5 2-5.2c.1-.2.4-.2.5 0l2 5.2 5.5.5c.2 0 .3.3.1.4l-4.5 3.3 1.5 5.1c.1.2-.2.4-.4.3l-4.3-3.2z'></path> </svg>
-    Third section
-  </button>
-</div>
\ No newline at end of file
diff --git a/src/components/content-switcher/content-switcher.config.js b/src/components/content-switcher/content-switcher.config.js
new file mode 100644
index 000000000000..296757ebf585
--- /dev/null
+++ b/src/components/content-switcher/content-switcher.config.js
@@ -0,0 +1,16 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+    },
+    {
+      name: 'with-icon',
+      label: 'With icon',
+      context: {
+        hasIcon: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/content-switcher/content-switcher.hbs b/src/components/content-switcher/content-switcher.hbs
new file mode 100644
index 000000000000..7d5782a37915
--- /dev/null
+++ b/src/components/content-switcher/content-switcher.hbs
@@ -0,0 +1,20 @@
+<div data-content-switcher class="bx--content-switcher">
+  <button class="bx--content-switcher-btn bx--content-switcher--selected" data-target=".demo--panel--opt-1">
+    {{#if hasIcon}}
+      <svg class="bx--content-switcher__icon" width="16" height="16" viewBox="0 0 16 16"><path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 9H9v3H7V9H4V7h3V4h2v3h3v2z"></path></svg>
+    {{/if}}
+    First section
+  </button>
+  <button class="bx--content-switcher-btn" data-target=".demo--panel--opt-2">
+    {{#if hasIcon}}
+      <svg class="bx--content-switcher__icon" width='12' height='9' viewBox='0 0 12 9' fill-rule='evenodd'><path d='M4.1 6.1L1.4 3.4 0 4.9 4.1 9l7.6-7.6L10.3 0z'></path></svg>
+    {{/if}}
+    Second section
+  </button>
+  <button class="bx--content-switcher-btn" data-target=".demo--panel--opt-3">
+    {{#if hasIcon}}
+      <svg class="bx--content-switcher__icon" width='16' height='15' viewBox='0 0 16 15' fill-rule='evenodd'><path d='M8.11 11.75l-4.5 3.2c-.2.1-.5 0-.4-.3l1.5-5.1-4.6-3.2c-.2-.2-.1-.5.1-.5l5.5-.5 2-5.2c.1-.2.4-.2.5 0l2 5.2 5.5.5c.2 0 .3.3.1.4l-4.5 3.3 1.5 5.1c.1.2-.2.4-.4.3l-4.3-3.2z'></path> </svg>
+    {{/if}}
+    Third section
+  </button>
+</div>
diff --git a/src/components/content-switcher/content-switcher.html b/src/components/content-switcher/content-switcher.html
deleted file mode 100644
index 78e2c1629541..000000000000
--- a/src/components/content-switcher/content-switcher.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div data-content-switcher class="bx--content-switcher">
-  <button class="bx--content-switcher-btn bx--content-switcher--selected" data-target=".demo--panel--opt-1">First section</button>
-  <button class="bx--content-switcher-btn" data-target=".demo--panel--opt-2">Second section</button>
-  <button class="bx--content-switcher-btn" data-target=".demo--panel--opt-3">Third section</button>
-</div>
-  
\ No newline at end of file
diff --git a/src/components/copy-button/copy-button.html b/src/components/copy-button/copy-button.hbs
similarity index 100%
rename from src/components/copy-button/copy-button.html
rename to src/components/copy-button/copy-button.hbs
diff --git a/src/components/data-table-v2/data-table-v2-expandable.html b/src/components/data-table-v2/data-table-v2--expandable.hbs
similarity index 100%
rename from src/components/data-table-v2/data-table-v2-expandable.html
rename to src/components/data-table-v2/data-table-v2--expandable.hbs
diff --git a/src/components/data-table-v2/data-table-v2--pagination.html b/src/components/data-table-v2/data-table-v2--pagination.hbs
similarity index 100%
rename from src/components/data-table-v2/data-table-v2--pagination.html
rename to src/components/data-table-v2/data-table-v2--pagination.hbs
diff --git a/src/components/data-table-v2/data-table-v2--small.html b/src/components/data-table-v2/data-table-v2--small.hbs
similarity index 100%
rename from src/components/data-table-v2/data-table-v2--small.html
rename to src/components/data-table-v2/data-table-v2--small.hbs
diff --git a/src/components/data-table-v2/data-table-v2.html b/src/components/data-table-v2/data-table-v2.hbs
similarity index 100%
rename from src/components/data-table-v2/data-table-v2.html
rename to src/components/data-table-v2/data-table-v2.hbs
diff --git a/src/components/data-table/data-table--simple.html b/src/components/data-table/data-table--simple.hbs
similarity index 100%
rename from src/components/data-table/data-table--simple.html
rename to src/components/data-table/data-table--simple.hbs
diff --git a/src/components/data-table/data-table.html b/src/components/data-table/data-table.hbs
similarity index 100%
rename from src/components/data-table/data-table.html
rename to src/components/data-table/data-table.hbs
diff --git a/src/components/date-picker/date-picker--light.html b/src/components/date-picker/date-picker--light.hbs
similarity index 100%
rename from src/components/date-picker/date-picker--light.html
rename to src/components/date-picker/date-picker--light.hbs
diff --git a/src/components/date-picker/date-picker--range-light.html b/src/components/date-picker/date-picker--range-light.hbs
similarity index 100%
rename from src/components/date-picker/date-picker--range-light.html
rename to src/components/date-picker/date-picker--range-light.hbs
diff --git a/src/components/date-picker/date-picker--range.html b/src/components/date-picker/date-picker--range.hbs
similarity index 100%
rename from src/components/date-picker/date-picker--range.html
rename to src/components/date-picker/date-picker--range.hbs
diff --git a/src/components/date-picker/date-picker--single-light.html b/src/components/date-picker/date-picker--single-light.hbs
similarity index 100%
rename from src/components/date-picker/date-picker--single-light.html
rename to src/components/date-picker/date-picker--single-light.hbs
diff --git a/src/components/date-picker/date-picker--single.html b/src/components/date-picker/date-picker--single.hbs
similarity index 100%
rename from src/components/date-picker/date-picker--single.html
rename to src/components/date-picker/date-picker--single.hbs
diff --git a/src/components/date-picker/date-picker.html b/src/components/date-picker/date-picker.hbs
similarity index 100%
rename from src/components/date-picker/date-picker.html
rename to src/components/date-picker/date-picker.hbs
diff --git a/src/components/detail-page-header/detail-page-header.config.js b/src/components/detail-page-header/detail-page-header.config.js
new file mode 100644
index 000000000000..67daad071ca0
--- /dev/null
+++ b/src/components/detail-page-header/detail-page-header.config.js
@@ -0,0 +1,17 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+    },
+    {
+      name: 'with-tabs',
+      label: 'With tabs',
+      context: {
+        hasTabs: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/detail-page-header/detail-page-header--with-tabs.html b/src/components/detail-page-header/detail-page-header.hbs
similarity index 93%
rename from src/components/detail-page-header/detail-page-header--with-tabs.html
rename to src/components/detail-page-header/detail-page-header.hbs
index 49ea00130a6f..9c8a94ae6870 100644
--- a/src/components/detail-page-header/detail-page-header--with-tabs.html
+++ b/src/components/detail-page-header/detail-page-header.hbs
@@ -1,5 +1,8 @@
 <div class="test-header"></div>
-<header data-detail-page-header class="bx--detail-page-header bx--detail-page-header--with-tabs">
+{{#unless hasTabs}}
+<div class="test-nav"></div>
+{{/unless}}
+<header data-detail-page-header class="bx--detail-page-header {{#unless hasTabs}}bx--detail-page-header--no-tabs{{else}}bx--detail-page-header--with-tabs{{/unless}}">
   <div class="bx--detail-page-header-content">
     <div class="bx--breadcrumb">
       <div class="bx--breadcrumb-item">
@@ -24,6 +27,7 @@ <h1 class="bx--detail-page-header-title">Title</h1>
         <span class="bx--detail-page-header-status-text">Running</span>
       </div>
     </div>
+    {{#if hasTabs}}
     <nav data-tabs class="bx--tabs" role="navigation">
       <div class="bx--tabs-trigger">
         <a href="javascript:void(0)" class="bx--tabs-trigger-text"></a>
@@ -49,6 +53,7 @@ <h1 class="bx--detail-page-header-title">Title</h1>
         </li>
       </ul>
     </nav>
+    {{/if}}
   </div>
   <div class="bx--detail-page-header-menu">
     <div data-overflow-menu tabindex="0" aria-label="Overflow menu description" class="bx--overflow-menu">
@@ -68,7 +73,7 @@ <h1 class="bx--detail-page-header-title">Title</h1>
           <button class="bx--overflow-menu-options__btn">Rename app</button>
         </li>
         <li class="bx--overflow-menu-options__option">
-          <button class="bx--overflow-menu-options__btn">Edit routes</button>
+          <button class="bx--overflow-menu-options__btn">Edit routes and access</button>
         </li>
         <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--danger">
           <button class="bx--overflow-menu-options__btn">Delete app</button>
diff --git a/src/components/detail-page-header/detail-page-header.html b/src/components/detail-page-header/detail-page-header.html
deleted file mode 100644
index fbb78835dca5..000000000000
--- a/src/components/detail-page-header/detail-page-header.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class="test-header"></div>
-<div class="test-nav"></div>
-<header data-detail-page-header class="bx--detail-page-header bx--detail-page-header--no-tabs">
-  <div class="bx--detail-page-header-content">
-    <div class="bx--breadcrumb">
-      <div class="bx--breadcrumb-item">
-        <a href="#" class="bx--link">Breadcrumb 1</a>
-      </div>
-      <div class="bx--breadcrumb-item">
-        <a href="#" class="bx--link">Breadcrumb 2</a>
-      </div>
-      <div class="bx--breadcrumb-item">
-        <a href="#" class="bx--link">Breadcrumb 3</a>
-      </div>
-    </div>
-    <div class="bx--detail-page-header-title-container">
-      <div class="bx--detail-page-header-icon-container">
-        <svg width="24" height="24" viewBox="0 0 24 24">
-          <path fill="#D8D8D8" d="M0 0h24v24H0z" fill-rule="evenodd" />
-        </svg>
-      </div>
-      <h1 class="bx--detail-page-header-title">Title</h1>
-      <div class="bx--detail-page-header-status-container">
-        <div class="bx--detail-page-header-status-icon"></div>
-        <span class="bx--detail-page-header-status-text">Running</span>
-      </div>
-    </div>
-  </div>
-  <div class="bx--detail-page-header-menu">
-    <div data-overflow-menu tabindex="0" aria-label="Overflow menu description" class="bx--overflow-menu">
-      <svg class="bx--overflow-menu__icon" width="4" height="20" viewBox="0 0 4 20" fill-rule="evenodd">
-        <circle cx="2" cy="2" r="2"></circle>
-        <circle cx="2" cy="10" r="2"></circle>
-        <circle cx="2" cy="18" r="2"></circle>
-      </svg>
-      <ul class="bx--overflow-menu-options bx--overflow-menu--flip">
-        <li class="bx--overflow-menu-options__option">
-          <button class="bx--overflow-menu-options__btn">Stop app</button>
-        </li>
-        <li class="bx--overflow-menu-options__option">
-          <button class="bx--overflow-menu-options__btn">Restart app</button>
-        </li>
-        <li class="bx--overflow-menu-options__option">
-          <button class="bx--overflow-menu-options__btn">Rename app</button>
-        </li>
-        <li class="bx--overflow-menu-options__option">
-          <button class="bx--overflow-menu-options__btn">Edit routes and access</button>
-        </li>
-        <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--danger">
-          <button class="bx--overflow-menu-options__btn">Delete app</button>
-        </li>
-      </ul>
-    </div>
-  </div>
-</header>
diff --git a/src/components/dropdown/dropdown--light.html b/src/components/dropdown/dropdown--light.html
deleted file mode 100644
index d566db871743..000000000000
--- a/src/components/dropdown/dropdown--light.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<ul data-dropdown data-value class="bx--dropdown bx--dropdown--light" tabindex="0">
-  <li class="bx--dropdown-text">Dropdown label</li>
-  <svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-    <path d="M10 0L5 5 0 0z"></path>
-  </svg>
-  <li>
-    <ul class="bx--dropdown-list">
-      <li data-option data-value="all" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 1</a>
-      </li>
-      <li data-option data-value="cloudFoundry" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 2</a>
-      </li>
-      <li data-option data-value="staging" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 3</a>
-      </li>
-      <li data-option data-value="dea" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 4</a>
-      </li>
-      <li data-option data-value="router" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 5</a>
-      </li>
-    </ul>
-  </li>
-</ul>
diff --git a/src/components/dropdown/dropdown.config.js b/src/components/dropdown/dropdown.config.js
new file mode 100644
index 000000000000..0cdffdf1d1b3
--- /dev/null
+++ b/src/components/dropdown/dropdown.config.js
@@ -0,0 +1,35 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        The Dropdown component is used for navigating or filtering existing content.
+      `,
+    },
+    {
+      name: 'light',
+      label: 'Light',
+      context: {
+        light: true,
+      },
+    },
+    {
+      name: 'up',
+      label: 'Up',
+      context: {
+        up: true,
+      },
+    },
+    {
+      name: 'up-light',
+      label: 'Up light',
+      context: {
+        up: true,
+        light: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/dropdown/dropdown--up.html b/src/components/dropdown/dropdown.hbs
similarity index 88%
rename from src/components/dropdown/dropdown--up.html
rename to src/components/dropdown/dropdown.hbs
index c84d0971227a..3079353f1fbf 100644
--- a/src/components/dropdown/dropdown--up.html
+++ b/src/components/dropdown/dropdown.hbs
@@ -1,4 +1,4 @@
-<ul data-dropdown data-value class="bx--dropdown bx--dropdown--up" tabindex="0">
+<ul data-dropdown data-value class="bx--dropdown{{#if up}} bx--dropdown--up{{/if}}{{#if light}} bx--dropdown--light{{/if}}" tabindex="0">
   <li class="bx--dropdown-text">Dropdown label</li>
   <svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
     <path d="M10 0L5 5 0 0z"></path>
diff --git a/src/components/dropdown/dropdown.html b/src/components/dropdown/dropdown.html
deleted file mode 100644
index e0dff10a7536..000000000000
--- a/src/components/dropdown/dropdown.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<ul data-dropdown data-value class="bx--dropdown" tabindex="0">
-  <li class="bx--dropdown-text">Dropdown label</li>
-  <svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-    <path d="M10 0L5 5 0 0z"></path>
-  </svg>
-  <li>
-    <ul class="bx--dropdown-list">
-      <li data-option data-value="all" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 1</a>
-      </li>
-      <li data-option data-value="cloudFoundry" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 2</a>
-      </li>
-      <li data-option data-value="staging" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 3</a>
-      </li>
-      <li data-option data-value="dea" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 4</a>
-      </li>
-      <li data-option data-value="router" class="bx--dropdown-item">
-        <a class="bx--dropdown-link" href="javascript:void(0)">Option 5</a>
-      </li>
-    </ul>
-  </li>
-</ul>
diff --git a/src/components/fab/fab.html b/src/components/fab/fab.hbs
similarity index 100%
rename from src/components/fab/fab.html
rename to src/components/fab/fab.hbs
diff --git a/src/components/file-uploader/file-uploader.html b/src/components/file-uploader/file-uploader.hbs
similarity index 100%
rename from src/components/file-uploader/file-uploader.html
rename to src/components/file-uploader/file-uploader.hbs
diff --git a/src/components/footer/footer.html b/src/components/footer/footer.hbs
similarity index 100%
rename from src/components/footer/footer.html
rename to src/components/footer/footer.hbs
diff --git a/src/components/form/form--light.html b/src/components/form/form--light.html
deleted file mode 100644
index 1d338c456089..000000000000
--- a/src/components/form/form--light.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="bx--form-item">
-  <input id="text-input-3" type="text" class="bx--text-input bx--text-input--light" placeholder="Optional placeholder text">
-  <label for="text-input-3" class="bx--label">Text Input label</label>
-</div>
-<div class="bx--form-item">
-  <textarea id="text-area-2" class="bx--text-area bx--text-area--light" rows="4" cols="50" placeholder="Placeholder text."></textarea>
-  <label for="text-area-2" class="bx--label">Text Area label</label>
-</div>
-<div class="bx--form-item">
-  <div class="bx--select bx--select--light">
-    <select id="select-id" class="bx--select-input">
-      <option class="bx--select-option" disabled selected hidden>Choose an option</option>
-      <option class="bx--select-option" value="solong">A much longer option that is worth having around to check how text flows</option>
-      <optgroup class="bx--select-optgroup" label="Category 1">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-      <optgroup class="bx--select-optgroup" label="Category 2">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-    </select>
-    <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-      <path d="M10 0L5 5 0 0z"></path>
-    </svg>
-    <label for="select-id" class="bx--label">Select label</label>
-  </div>
-</div>
-<div class="bx--form-item">
-  <button class="bx--btn bx--btn--primary" type="button">Submit</button>
-</div>
diff --git a/src/components/form/form.config.js b/src/components/form/form.config.js
new file mode 100644
index 000000000000..7d2b972a7241
--- /dev/null
+++ b/src/components/form/form.config.js
@@ -0,0 +1,18 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: 'Forms are widely used to collect user input.',
+    },
+    {
+      name: 'light',
+      label: 'Light',
+      context: {
+        light: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/form/form.html b/src/components/form/form.hbs
similarity index 78%
rename from src/components/form/form.html
rename to src/components/form/form.hbs
index d1fff48c4f83..367ef15e33e4 100644
--- a/src/components/form/form.html
+++ b/src/components/form/form.hbs
@@ -1,13 +1,13 @@
 <div class="bx--form-item">
-  <input id="text-input-3" type="text" class="bx--text-input" placeholder="Optional placeholder text">
+  <input id="text-input-3" type="text" class="bx--text-input{{#if light}} bx--text-input--light{{/if}}" placeholder="Optional placeholder text">
   <label for="text-input-3" class="bx--label">Text Input label</label>
 </div>
 <div class="bx--form-item">
-  <textarea id="text-area-2" class="bx--text-area" rows="4" cols="50" placeholder="Placeholder text."></textarea>
+  <textarea id="text-area-2" class="bx--text-area{{#if light}} bx--text-area--light{{/if}}" rows="4" cols="50" placeholder="Placeholder text."></textarea>
   <label for="text-area-2" class="bx--label">Text Area label</label>
 </div>
 <div class="bx--form-item">
-  <div class="bx--select">
+  <div class="bx--select{{#if light}} bx--select--light{{/if}}">
     <select id="select-id" class="bx--select-input">
       <option class="bx--select-option" disabled selected hidden>Choose an option</option>
       <option class="bx--select-option" value="solong">A much longer option that is worth having around to check how text flows</option>
diff --git a/src/components/grid/grid.html b/src/components/grid/grid.hbs
similarity index 100%
rename from src/components/grid/grid.html
rename to src/components/grid/grid.hbs
diff --git a/src/components/interior-left-nav/interior-left-nav--keep-open.html b/src/components/interior-left-nav/interior-left-nav--keep-open.html
deleted file mode 100644
index 8a1d69f6256e..000000000000
--- a/src/components/interior-left-nav/interior-left-nav--keep-open.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<nav role="navigation" aria-label="Interior Left Navigation Open" data-interior-left-nav class="bx--interior-left-nav bx--interior-left-nav--collapseable"
-  data-keep-open="true">
-  <ul role="menubar" aria-label="left nav list" class="left-nav-list" data-interior-left-nav-list aria-hidden="false">
-    <li role="menuitem" tabindex="0" class="left-nav-list__item" data-interior-left-nav-item>
-      <a class="left-nav-list__item-link">
-        Example Item 1
-      </a>
-    </li>
-    <li role="menuitem" tabindex="0" class="left-nav-list__item" data-interior-left-nav-item>
-      <a class="left-nav-list__item-link">
-        Example Item 2
-      </a>
-    </li>
-    <li role="menuitem" tabindex="0" class="left-nav-list__item left-nav-list__item--has-children" data-interior-left-nav-item
-      data-interior-left-nav-with-children>
-      <a class="left-nav-list__item-link">
-        Example Item 3
-        <div class="left-nav-list__item-icon">
-          <svg class="bx--interior-left-nav__icon" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-            <path d="M10 0L5 5 0 0z"></path>
-          </svg>
-        </div>
-      </a>
-      <ul role="menu" aria-hidden="true" aria-label="nested left nav list" class="left-nav-list left-nav-list--nested" data-interior-left-nav-nested-list>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-1A" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 1A</a>
-        </li>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-1B" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 1B</a>
-        </li>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-1C" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 1C</a>
-        </li>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-1D" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 1D</a>
-        </li>
-      </ul>
-    </li>
-    <li role="menuitem" tabindex="0" class="left-nav-list__item left-nav-list__item--has-children" data-interior-left-nav-item
-      data-interior-left-nav-with-children>
-      <a class="left-nav-list__item-link">
-        Example Item 4
-        <div class="left-nav-list__item-icon">
-          <svg class="bx--interior-left-nav__icon" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-            <path d="M10 0L5 5 0 0z"></path>
-          </svg>
-        </div>
-      </a>
-      <ul role="menu" aria-hidden="true" aria-label="nested left nav list" class="left-nav-list left-nav-list--nested" data-interior-left-nav-nested-list>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-2A" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 2A</a>
-        </li>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-2B" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 2B</a>
-        </li>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-2C" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 2C</a>
-        </li>
-        <li class="left-nav-list__item" data-interior-left-nav-nested-item role="menuitem" tabindex="-1">
-          <a href="#example-item-2D" class="left-nav-list__item-link" data-interior-left-nav-item-link tabindex="-1">Example Item 2D</a>
-        </li>
-      </ul>
-    </li>
-  </ul>
-
-  <div class="bx--interior-left-nav-collapse" data-interior-left-nav-collapse>
-    <a class="bx--interior-left-nav-collapse__link" href="#" aria-label="collapse nav pane">
-      <svg class="bx--interior-left-nav-collapse__arrow" width="8" height="12" viewBox="0 0 8 12" fill-rule="evenodd" data-interior-left-nav-arrow>
-        <title>Collapse nav pane</title>
-        <path d="M7.5 10.6L2.8 6l4.7-4.6L6.1 0 0 6l6.1 6z"></path>
-      </svg>
-    </a>
-  </div>
-</nav>
diff --git a/src/components/interior-left-nav/interior-left-nav.config.js b/src/components/interior-left-nav/interior-left-nav.config.js
new file mode 100644
index 000000000000..804f970550fd
--- /dev/null
+++ b/src/components/interior-left-nav/interior-left-nav.config.js
@@ -0,0 +1,22 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Interior left navigation organizes the content structure and provides
+        context to support user orientation. This pattern accommodates the
+        breadth of content and tasks users expect to see.
+      `,
+    },
+    {
+      name: 'keep-open',
+      label: 'Keep open',
+      context: {
+        keepOpen: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/interior-left-nav/interior-left-nav.html b/src/components/interior-left-nav/interior-left-nav.hbs
similarity index 98%
rename from src/components/interior-left-nav/interior-left-nav.html
rename to src/components/interior-left-nav/interior-left-nav.hbs
index b4b3a6ee6385..30ba545d118c 100644
--- a/src/components/interior-left-nav/interior-left-nav.html
+++ b/src/components/interior-left-nav/interior-left-nav.hbs
@@ -1,4 +1,4 @@
-<nav role="navigation" aria-label="Interior Left Navigation" data-interior-left-nav class="bx--interior-left-nav bx--interior-left-nav--collapseable">
+<nav role="navigation" aria-label="Interior Left Navigation" data-interior-left-nav class="bx--interior-left-nav bx--interior-left-nav--collapseable"{{#if keepOpen}} data-keep-open="true"{{/if}}>
   <ul role="menubar" class="left-nav-list" data-interior-left-nav-list aria-label="left nav list" aria-hidden="false">
     <li role="menuitem" tabindex="0" class="left-nav-list__item" data-interior-left-nav-item>
       <a class="left-nav-list__item-link">
diff --git a/src/components/lightbox/lightbox.html b/src/components/lightbox/lightbox.hbs
similarity index 100%
rename from src/components/lightbox/lightbox.html
rename to src/components/lightbox/lightbox.hbs
diff --git a/src/components/link/link.html b/src/components/link/link.hbs
similarity index 100%
rename from src/components/link/link.html
rename to src/components/link/link.hbs
diff --git a/src/components/list-box/list-box.config.js b/src/components/list-box/list-box.config.js
new file mode 100644
index 000000000000..2b787ccdb462
--- /dev/null
+++ b/src/components/list-box/list-box.config.js
@@ -0,0 +1,17 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+    },
+    {
+      name: 'inline',
+      label: 'Inline',
+      context: {
+        inline: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/list-box/list-box--inline.html b/src/components/list-box/list-box.hbs
similarity index 89%
rename from src/components/list-box/list-box--inline.html
rename to src/components/list-box/list-box.hbs
index 9229d6bb5d78..909cb5e68590 100644
--- a/src/components/list-box/list-box--inline.html
+++ b/src/components/list-box/list-box.hbs
@@ -1,4 +1,4 @@
-<div class="bx--form-item bx--list-box bx--list-box--inline">
+<div class="bx--form-item bx--list-box{{#if inline}} bx--list-box--inline{{/if}}">
   <div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true">
     <span class="bx--list-box__label">Label</span>
     <div class="bx--list-box__menu-icon">
@@ -9,7 +9,7 @@
     </div>
   </div>
 </div>
-<div class="bx--form-item bx--list-box bx--list-box--inline">
+<div class="bx--form-item bx--list-box{{#if inline}} bx--list-box--inline{{/if}}">
   <div role="button" class="bx--list-box__field" tabindex="0" aria-label="close menu" aria-expanded="true" aria-haspopup="true">
     <span class="bx--list-box__label">Label</span>
     <div class="bx--list-box__menu-icon bx--list-box__menu-icon--open">
diff --git a/src/components/list-box/list-box.html b/src/components/list-box/list-box.html
deleted file mode 100644
index 143825d2fa70..000000000000
--- a/src/components/list-box/list-box.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="bx--form-item bx--list-box">
-  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true">
-    <span class="bx--list-box__label">Label</span>
-    <div class="bx--list-box__menu-icon">
-      <svg fill-rule="evenodd" height="5" name="caret--down" role="img" viewBox="0 0 10 5" width="10" aria-label="Open menu">
-        <title>Open menu</title>
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-    </div>
-  </div>
-</div>
-<div class="bx--form-item bx--list-box">
-  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="close menu" aria-expanded="true" aria-haspopup="true"><span class="bx--list-box__label">Label</span>
-    <div class="bx--list-box__menu-icon bx--list-box__menu-icon--open">
-      <svg fill-rule="evenodd" height="5" name="caret--down" role="img" viewBox="0 0 10 5" width="10" aria-label="Close menu">
-        <title>Close menu</title>
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-    </div>
-  </div>
-  <div class="bx--list-box__menu">
-    <div class="bx--list-box__menu-item" id="downshift-1-item-0">Option 1</div>
-    <div class="bx--list-box__menu-item" id="downshift-1-item-1">Option 2</div>
-    <div class="bx--list-box__menu-item" id="downshift-1-item-2">Option 3</div>
-    <div class="bx--list-box__menu-item" id="downshift-1-item-3">Option 4</div>
-  </div>
-</div>
diff --git a/src/components/list/list--ordered.html b/src/components/list/list--ordered.html
deleted file mode 100644
index f45e5de75e21..000000000000
--- a/src/components/list/list--ordered.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<ol class="bx--list--ordered">
-  <li class="bx--list__item">Ordered List level 1
-    <ol class="bx--list--nested">
-      <li class="bx--list__item">Ordered List level 2</li>
-      <li class="bx--list__item">Ordered List level 2</li>
-    </ol>
-  </li>
-  <li class="bx--list__item">Ordered List level 1</li>
-  <li class="bx--list__item">Ordered List level 1</li>
-</ol>
diff --git a/src/components/list/list.config.js b/src/components/list/list.config.js
new file mode 100644
index 000000000000..2ddea7186861
--- /dev/null
+++ b/src/components/list/list.config.js
@@ -0,0 +1,24 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Unordered',
+      context: {
+        tag: 'ul',
+        type: 'unordered',
+        displayType: 'Unordered',
+      },
+    },
+    {
+      name: 'ordered',
+      label: 'Ordered',
+      context: {
+        tag: 'ol',
+        type: 'ordered',
+        displayType: 'Ordered',
+      },
+    },
+  ],
+};
diff --git a/src/components/list/list.hbs b/src/components/list/list.hbs
new file mode 100644
index 000000000000..cd71b893a688
--- /dev/null
+++ b/src/components/list/list.hbs
@@ -0,0 +1,10 @@
+<{{tag}} class="bx--list--{type}">
+  <li class="bx--list__item">{{displayType}} List level 1
+    <{{tag}} class="bx--list--nested">
+      <li class="bx--list__item">{{displayType}} List level 2</li>
+      <li class="bx--list__item">{{displayType}} List level 2</li>
+    </{{tag}}>
+  </li>
+  <li class="bx--list__item">{{displayType}} List level 1</li>
+  <li class="bx--list__item">{{displayType}} List level 1</li>
+</{{tag}}>
diff --git a/src/components/list/list.html b/src/components/list/list.html
deleted file mode 100644
index 3cec5a430e18..000000000000
--- a/src/components/list/list.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul class="bx--list--unordered">
-  <li class="bx--list__item">Unordered List level 1
-    <ul class="bx--list--nested">
-      <li class="bx--list__item">Unordered List level 2</li>
-      <li class="bx--list__item">Unordered List level 2</li>
-    </ul>
-  </li>
-  <li class="bx--list__item">Unordered List level 1</li>
-  <li class="bx--list__item">Unordered List level 1</li>
-</ul>
diff --git a/src/components/loading/loading--small.html b/src/components/loading/loading--small.html
deleted file mode 100644
index 50c3d2f4b8dc..000000000000
--- a/src/components/loading/loading--small.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div data-loading class="bx--loading bx--loading--small">
-  <svg class=" bx--loading__svg " viewBox="-75 -75 150 150 ">
-    <title>Loading</title>
-    <circle cx="0 " cy="0 " r="37.5" />
-  </svg>
-</div>
diff --git a/src/components/loading/loading--without-overlay.html b/src/components/loading/loading--without-overlay.html
deleted file mode 100644
index eff146fff89f..000000000000
--- a/src/components/loading/loading--without-overlay.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div data-loading class="bx--loading">
-  <svg class="bx--loading__svg" viewBox="-75 -75 150 150">
-    <title>Loading</title>
-    <circle cx="0" cy="0" r="37.5" />
-  </svg>
-</div>
diff --git a/src/components/loading/loading.config.js b/src/components/loading/loading.config.js
new file mode 100644
index 000000000000..a5ce6828f328
--- /dev/null
+++ b/src/components/loading/loading.config.js
@@ -0,0 +1,32 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Loading spinners are used when retrieving data or performing slow computations,
+        and help to notify users that loading is underway.
+      `,
+      context: {
+        overlay: true,
+      },
+    },
+    {
+      name: 'without-overlay',
+      label: 'Without overlay',
+      context: {
+        overlay: false,
+      },
+    },
+    {
+      name: 'small',
+      label: 'Small',
+      context: {
+        overlay: false,
+        small: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/loading/loading.hbs b/src/components/loading/loading.hbs
new file mode 100644
index 000000000000..d9a28ddc02e4
--- /dev/null
+++ b/src/components/loading/loading.hbs
@@ -0,0 +1,8 @@
+{{#if overlay}}<div class="bx--loading-overlay">{{/if}}
+<div data-loading class="bx--loading{{#if small}} bx--loading--small{{/if}}">
+  <svg class="bx--loading__svg" viewBox="-75 -75 150 150">
+    <title>Loading</title>
+    <circle cx="0" cy="0" r="37.5" />
+  </svg>
+</div>
+{{#if overlay}}</div>{{/if}}
diff --git a/src/components/loading/loading.html b/src/components/loading/loading.html
deleted file mode 100644
index 48626960c484..000000000000
--- a/src/components/loading/loading.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="bx--loading-overlay">
-  <div data-loading class="bx--loading">
-    <svg class="bx--loading__svg" viewBox="-75 -75 150 150">
-      <title>Loading</title>
-      <circle cx="0" cy="0" r="37.5" />
-    </svg>
-  </div>
-</div>
diff --git a/src/components/modal/modal--nofooter.html b/src/components/modal/modal--nofooter.html
deleted file mode 100644
index e65bd2d76859..000000000000
--- a/src/components/modal/modal--nofooter.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<button class="bx--btn bx--btn--secondary" type="button" data-modal-target="#nofooter">Passive</button>
-
-<div data-modal id="nofooter" class="bx--modal" tabindex="-1">
-  <div class="bx--modal-container">
-    <div class="bx--modal-header">
-      <p class="bx--modal-header__label bx--type-delta">Optional label</p>
-      <p class="bx--modal-header__heading bx--type-beta">Modal heading</p>
-      <button class="bx--modal-close" type="button" data-modal-close data-modal-primary-focus aria-label="close modal">
-        <svg class="bx--modal-close__icon" width="10" height="10" viewBox="0 0 10 10" fill-rule="evenodd">
-          <title>Close Modal</title>
-          <path d="M9.8 8.6L8.4 10 5 6.4 1.4 10 0 8.6 3.6 5 .1 1.4 1.5 0 5 3.6 8.6 0 10 1.4 6.4 5z"></path>
-        </svg>
-      </button>
-    </div>
-
-    <div class="bx--modal-content">
-      <p>Passive modal notifications should only appear if there is an action the user needs to address immediately. Passive
-        modal notifications are persistent on the screen.</p>
-    </div>
-  </div>
-</div>
-
-<button class="bx--btn bx--btn--danger" type="button" data-modal-target="#nofooter--danger">Passive Danger</button>
-
-<div data-modal id="nofooter--danger" class="bx--modal bx--modal--danger" tabindex="-1">
-  <div class="bx--modal-container">
-    <div class="bx--modal-header">
-      <p class="bx--modal-header__label bx--type-delta">Optional label</p>
-      <p class="bx--modal-header__heading bx--type-beta">Modal heading</p>
-      <button class="bx--modal-close" type="button" data-modal-close data-modal-primary-focus aria-label="close modal">
-        <svg class="bx--modal-close__icon" width="10" height="10" viewBox="0 0 10 10" fill-rule="evenodd">
-          <title>Close Modal</title>
-          <path d="M9.8 8.6L8.4 10 5 6.4 1.4 10 0 8.6 3.6 5 .1 1.4 1.5 0 5 3.6 8.6 0 10 1.4 6.4 5z"></path>
-        </svg>
-      </button>
-    </div>
-
-    <div class="bx--modal-content">
-      <p>Passive modal notifications should only appear if there is an action the user needs to address immediately. Passive
-        modal notifications are persistent on the screen.</p>
-    </div>
-  </div>
-</div>
diff --git a/src/components/modal/modal.config.js b/src/components/modal/modal.config.js
new file mode 100644
index 000000000000..2742832c2488
--- /dev/null
+++ b/src/components/modal/modal.config.js
@@ -0,0 +1,48 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Modals communicate information via a secondary window and allow the user to maintain the context of a particular task.
+      `,
+      context: {
+        idSuffix: Math.random()
+          .toString(36)
+          .substr(2),
+        hasFooter: true,
+        classPrimaryButton: 'bx--btn--primary',
+        classCloseButton: 'bx--btn--secondary',
+      },
+    },
+    {
+      name: 'nofooter',
+      label: 'Without footer',
+      notes: 'Passive modals are modals without footers.',
+      context: {
+        idSuffix: Math.random()
+          .toString(36)
+          .substr(2),
+        hasFooter: false,
+        classPrimaryButton: 'bx--btn--primary',
+        classCloseButton: 'bx--btn--secondary',
+      },
+    },
+    {
+      name: 'danger',
+      label: 'Danger',
+      context: {
+        idSuffix: Math.random()
+          .toString(36)
+          .substr(2),
+        hasFooter: true,
+        labelPrimaryButton: 'Danger',
+        classModalSupplemental: 'bx--modal--danger',
+        classPrimaryButton: 'bx--btn--danger--primary',
+        classCloseButton: 'bx--btn--tertiary',
+      },
+    },
+  ],
+};
diff --git a/src/components/modal/modal.hbs b/src/components/modal/modal.hbs
new file mode 100644
index 000000000000..ecb6e01a88c9
--- /dev/null
+++ b/src/components/modal/modal.hbs
@@ -0,0 +1,27 @@
+<button class="bx--btn {{classPrimaryButton}}" type="button" data-modal-target="#modal-{{idSuffix}}">Show modal</button>
+
+<div data-modal id="modal-{{idSuffix}}" class="bx--modal {{classModalSupplemental}}" tabindex="-1">
+  <div class="bx--modal-container">
+    <div class="bx--modal-header">
+      <p class="bx--modal-header__label bx--type-delta">Optional label</p>
+      <p class="bx--modal-header__heading bx--type-beta">Modal heading</p>
+      <button class="bx--modal-close" type="button" data-modal-close aria-label="close modal"{{#unless hasFooter}} data-modal-primary-focus{{/unless}}>
+        <svg class="bx--modal-close__icon" width="10" height="10" viewBox="0 0 10 10" fill-rule="evenodd">
+          <title>Close Modal</title>
+          <path d="M9.8 8.6L8.4 10 5 6.4 1.4 10 0 8.6 3.6 5 .1 1.4 1.5 0 5 3.6 8.6 0 10 1.4 6.4 5z"></path>
+        </svg>
+      </button>
+    </div>
+
+    <div class="bx--modal-content">
+      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id accumsan augue. Phasellus consequat augue vitae tellus tincidunt posuere. Curabitur justo urna, consectetur vel elit iaculis, ultrices condimentum risus. Nulla facilisi. Etiam venenatis molestie tellus. Quisque consectetur non risus eu rutrum. </p>
+    </div>
+
+    {{#if hasFooter}}
+      <div class="bx--modal-footer">
+        <button class="bx--btn {{classCloseButton}}" type="button" data-modal-close>Secondary button</button>
+        <button class="bx--btn {{classPrimaryButton}}" type="button" {{#if labelPrimaryButton}}aria-label="{{labelPrimaryButton}}"{{/if}} data-modal-primary-focus>Primary button</button>
+      </div>
+    {{/if}}
+  </div>
+</div>
diff --git a/src/components/modal/modal.html b/src/components/modal/modal.html
deleted file mode 100644
index e0c6d82f5424..000000000000
--- a/src/components/modal/modal.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<button class="bx--btn bx--btn--primary" type="button" data-modal-target="#modal">Transactional</button>
-
-<div data-modal id="modal" class="bx--modal" tabindex="-1">
-  <div class="bx--modal-container">
-    <div class="bx--modal-header">
-      <p class="bx--modal-header__label bx--type-delta">Optional label</p>
-      <p class="bx--modal-header__heading bx--type-beta">Modal heading</p>
-      <button class="bx--modal-close" type="button" data-modal-close aria-label="close modal">
-        <svg class="bx--modal-close__icon" width="10" height="10" viewBox="0 0 10 10" fill-rule="evenodd">
-          <title>Close Modal</title>
-          <path d="M9.8 8.6L8.4 10 5 6.4 1.4 10 0 8.6 3.6 5 .1 1.4 1.5 0 5 3.6 8.6 0 10 1.4 6.4 5z"></path>
-        </svg>
-      </button>
-    </div>
-    <div class="bx--modal-content">
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id accumsan augue. Phasellus consequat augue vitae
-        tellus tincidunt posuere. Curabitur justo urna, consectetur vel elit iaculis, ultrices condimentum risus. Nulla facilisi.
-        Etiam venenatis molestie tellus. Quisque consectetur non risus eu rutrum. </p>
-    </div>
-  </div>
-
-  <div class="bx--modal-footer">
-    <button class="bx--btn bx--btn--secondary" type="button" data-modal-close>Secondary button</button>
-    <button class="bx--btn bx--btn--primary" type="button" data-modal-primary-focus>Primary button</button>
-  </div>
-</div>
-</div>
-
-<button class="bx--btn bx--btn--danger--primary" type="button" data-modal-target="#modal--danger">Transactional Danger</button>
-
-<div data-modal id="modal--danger" class="bx--modal bx--modal--danger" tabindex="-1">
-  <div class="bx--modal-container">
-    <div class="bx--modal-header">
-      <p class="bx--modal-header__label bx--type-delta">Optional label</p>
-      <p class="bx--modal-header__heading bx--type-beta">Modal heading</p>
-      <button class="bx--modal-close" type="button" data-modal-close aria-label="close modal">
-        <svg class="bx--modal-close__icon" width="10" height="10" viewBox="0 0 10 10" fill-rule="evenodd">
-          <title>Close Modal</title>
-          <path d="M9.8 8.6L8.4 10 5 6.4 1.4 10 0 8.6 3.6 5 .1 1.4 1.5 0 5 3.6 8.6 0 10 1.4 6.4 5z"></path>
-        </svg>
-      </button>
-    </div>
-
-    <div class="bx--modal-content">
-      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean id accumsan augue. Phasellus consequat augue vitae
-        tellus tincidunt posuere. Curabitur justo urna, consectetur vel elit iaculis, ultrices condimentum risus. Nulla facilisi.
-        Etiam venenatis molestie tellus. Quisque consectetur non risus eu rutrum. </p>
-    </div>
-
-    <div class="bx--modal-footer">
-      <button class="bx--btn bx--btn--tertiary" type="button" data-modal-close>Tertiary button</button>
-      <button class="bx--btn bx--btn--danger--primary" type="button" aria-label="danger" data-modal-primary-focus>Danger button</button>
-    </div>
-  </div>
-</div>
diff --git a/src/components/module/module.html b/src/components/module/module.hbs
similarity index 100%
rename from src/components/module/module.html
rename to src/components/module/module.hbs
diff --git a/src/components/multi-select/multi-select--inline.html b/src/components/multi-select/multi-select--inline.html
deleted file mode 100644
index 408512ffa71a..000000000000
--- a/src/components/multi-select/multi-select--inline.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class="bx--form-item bx--multi-select bx--list-box bx--list-box--inline">
-  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true">
-    <span class="bx--list-box__label">Label</span>
-    <div class="bx--list-box__menu-icon">
-      <svg fill-rule="evenodd" height="5" name="caret--down" role="img" viewBox="0 0 10 5" width="10" aria-label="Open menu">
-        <title>Open menu</title>
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-    </div>
-  </div>
-</div>
-<div class="bx--form-item bx--multi-select bx--list-box bx--list-box--inline">
-  <div role="button" class="bx--list-box__field" tabindex="0" aria-label="close menu" aria-expanded="true" aria-haspopup="true">
-    <span class="bx--list-box__label">Label</span>
-    <div class="bx--list-box__menu-icon bx--list-box__menu-icon--open">
-      <svg fill-rule="evenodd" height="5" name="caret--down" role="img" viewBox="0 0 10 5" width="10" aria-label="Close menu">
-        <title>Close menu</title>
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-    </div>
-  </div>
-  <div class="bx--list-box__menu">
-    <div class="bx--list-box__menu-item" id="downshift-1-item-0">
-      <div class="bx--form-item bx--checkbox-wrapper">
-        <label for="downshift-1-item-0" class="bx--checkbox-label">
-          <input type="checkbox" name="Option 1" readonly="" tabindex="-1" class="bx--checkbox" id="downshift-1-item-0" value="on">
-          <span class="bx--checkbox-appearance">
-            <svg class="bx--checkbox-checkmark" fill-rule="evenodd" height="9" name="checkmark" role="img" viewBox="0 0 12 9" width="12" aria-label="Select this item">
-              <title>Select this item</title>
-              <path d="M4.1 6.1L1.4 3.4 0 4.9 4.1 9l7.6-7.6L10.3 0z"></path>
-            </svg>
-          </span>
-          <span class="bx--checkbox-label-text">Option 1</span>
-        </label>
-      </div>
-    </div>
-    <div class="bx--list-box__menu-item" id="downshift-1-item-1">
-      <div class="bx--form-item bx--checkbox-wrapper">
-        <label for="downshift-1-item-1" class="bx--checkbox-label">
-          <input type="checkbox" name="Option 2" readonly="" tabindex="-1" class="bx--checkbox" id="downshift-1-item-1" value="on">
-          <span class="bx--checkbox-appearance">
-            <svg class="bx--checkbox-checkmark" fill-rule="evenodd" height="9" name="checkmark" role="img" viewBox="0 0 12 9" width="12" aria-label="Select this item">
-              <title>Select this item</title>
-              <path d="M4.1 6.1L1.4 3.4 0 4.9 4.1 9l7.6-7.6L10.3 0z"></path>
-            </svg>
-          </span>
-          <span class="bx--checkbox-label-text">Option 2</span>
-        </label>
-      </div>
-    </div>
-    <div class="bx--list-box__menu-item" id="downshift-1-item-2">
-      <div class="bx--form-item bx--checkbox-wrapper">
-        <label for="downshift-1-item-2" class="bx--checkbox-label">
-          <input type="checkbox" name="Option 3" readonly="" tabindex="-1" class="bx--checkbox" id="downshift-1-item-2" value="on">
-          <span class="bx--checkbox-appearance">
-            <svg class="bx--checkbox-checkmark" fill-rule="evenodd" height="9" name="checkmark" role="img" viewBox="0 0 12 9" width="12" aria-label="Select this item">
-              <title>Select this item</title>
-              <path d="M4.1 6.1L1.4 3.4 0 4.9 4.1 9l7.6-7.6L10.3 0z"></path>
-            </svg>
-          </span>
-          <span class="bx--checkbox-label-text">Option 3</span>
-        </label>
-      </div>
-    </div>
-    <div class="bx--list-box__menu-item" id="downshift-1-item-3">
-      <div class="bx--form-item bx--checkbox-wrapper">
-        <label for="downshift-1-item-3" class="bx--checkbox-label">
-          <input type="checkbox" name="Option 4" readonly="" tabindex="-1" class="bx--checkbox" id="downshift-1-item-3" value="on">
-          <span class="bx--checkbox-appearance">
-            <svg class="bx--checkbox-checkmark" fill-rule="evenodd" height="9" name="checkmark" role="img" viewBox="0 0 12 9" width="12" aria-label="Select this item">
-              <title>Select this item</title>
-              <path d="M4.1 6.1L1.4 3.4 0 4.9 4.1 9l7.6-7.6L10.3 0z"></path>
-            </svg>
-          </span>
-          <span class="bx--checkbox-label-text">Option 4</span>
-        </label>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/components/multi-select/multi-select.config.js b/src/components/multi-select/multi-select.config.js
new file mode 100644
index 000000000000..2b787ccdb462
--- /dev/null
+++ b/src/components/multi-select/multi-select.config.js
@@ -0,0 +1,17 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+    },
+    {
+      name: 'inline',
+      label: 'Inline',
+      context: {
+        inline: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/multi-select/multi-select.html b/src/components/multi-select/multi-select.hbs
similarity index 95%
rename from src/components/multi-select/multi-select.html
rename to src/components/multi-select/multi-select.hbs
index eaf7bcc213cf..bc1dcd8ce20b 100644
--- a/src/components/multi-select/multi-select.html
+++ b/src/components/multi-select/multi-select.hbs
@@ -1,4 +1,4 @@
-<div class="bx--form-item bx--multi-select bx--list-box">
+<div class="bx--form-item bx--multi-select bx--list-box{{#if inline}} bx--list-box--inline{{/if}}">
   <div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true">
     <span class="bx--list-box__label">Label</span>
     <div class="bx--list-box__menu-icon">
@@ -9,7 +9,7 @@
     </div>
   </div>
 </div>
-<div class="bx--form-item bx--multi-select bx--list-box">
+<div class="bx--form-item bx--multi-select bx--list-box{{#if inline}} bx--list-box--inline{{/if}}">
   <div role="button" class="bx--list-box__field" tabindex="0" aria-label="close menu" aria-expanded="true" aria-haspopup="true">
     <span class="bx--list-box__label">Label</span>
     <div class="bx--list-box__menu-icon bx--list-box__menu-icon--open">
diff --git a/src/components/notification/inline-notification.html b/src/components/notification/inline-notification.hbs
similarity index 100%
rename from src/components/notification/inline-notification.html
rename to src/components/notification/inline-notification.hbs
diff --git a/src/components/notification/toast-notification.html b/src/components/notification/toast-notification.hbs
similarity index 100%
rename from src/components/notification/toast-notification.html
rename to src/components/notification/toast-notification.hbs
diff --git a/src/components/number-input/number-input.config.js b/src/components/number-input/number-input.config.js
new file mode 100644
index 000000000000..49606a2ca77b
--- /dev/null
+++ b/src/components/number-input/number-input.config.js
@@ -0,0 +1,20 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Number inputs are similar to text fields, but contain controls used to increase or decrease an incremental value. The Number Input component can be passed a starting value, a min, a max, and the step.
+      `,
+    },
+    {
+      name: 'light',
+      label: 'Light',
+      context: {
+        light: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/number-input/number-input--light.html b/src/components/number-input/number-input.hbs
similarity index 89%
rename from src/components/number-input/number-input--light.html
rename to src/components/number-input/number-input.hbs
index cb844d6ca719..230794993a22 100644
--- a/src/components/number-input/number-input--light.html
+++ b/src/components/number-input/number-input.hbs
@@ -1,5 +1,5 @@
 <div class="bx--form-item">
-  <div data-numberinput class="bx--number bx--number--light">
+  <div data-numberinput class="bx--number{{#if light}} bx--number--light{{/if}}">
     <div class="bx--number__controls">
       <button class="bx--number__control-btn up-icon">
         <svg viewBox="0 2 10 5" width="10" height="5" fill-rule="evenodd">
@@ -18,7 +18,7 @@
 </div>
 
 <div class="bx--form-item">
-  <div data-invalid data-numberinput class="bx--number bx--number--light">
+  <div data-invalid data-numberinput class="bx--number{{#if light}} bx--number--light{{/if}}">
     <input id="number-input" type="number" min="0" max="100" value="1">
     <div class="bx--number__controls">
       <button class="bx--number__control-btn up-icon">
@@ -40,7 +40,7 @@
 </div>
 
 <div class="bx--form-item">
-  <div data-numberinput class="bx--number bx--number--light">
+  <div data-numberinput class="bx--number{{#if light}} bx--number--light{{/if}}">
     <input id="number-input" type="number" min="0" max="100" value="1">
     <div class="bx--number__controls">
       <button class="bx--number__control-btn up-icon">
diff --git a/src/components/number-input/number-input.html b/src/components/number-input/number-input.html
deleted file mode 100644
index 2e364f27c424..000000000000
--- a/src/components/number-input/number-input.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="bx--form-item">
-  <div data-numberinput class="bx--number">
-    <div class="bx--number__controls">
-      <button class="bx--number__control-btn up-icon">
-        <svg viewBox="0 2 10 5" width="10" height="5" fill-rule="evenodd">
-          <path d="M10 5L5 0 0 5z"></path>
-        </svg>
-      </button>
-      <button class="bx--number__control-btn down-icon">
-        <svg viewBox="0 2 10 5" width="10" height="5" fill-rule="evenodd">
-          <path d="M10 0L5 5 0 0z"></path>
-        </svg>
-      </button>
-    </div>
-    <input id="number-input" type="number" min="0" max="100" value="1">
-    <label for="number-input" class="bx--label">Number Input label</label>
-  </div>
-</div>
-
-<div class="bx--form-item">
-  <div data-invalid data-numberinput class="bx--number">
-    <input id="number-input" type="number" min="0" max="100" value="1">
-    <div class="bx--number__controls">
-      <button class="bx--number__control-btn up-icon">
-        <svg viewBox="0 2 10 5" width="10" height="5" fill-rule="evenodd">
-          <path d="M10 5L5 0 0 5z"></path>
-        </svg>
-      </button>
-      <button class="bx--number__control-btn down-icon">
-        <svg viewBox="0 2 10 5" width="10" height="5" fill-rule="evenodd">
-          <path d="M10 0L5 5 0 0z"></path>
-        </svg>
-      </button>
-    </div>
-    <label for="number-input" class="bx--label">Number Input label</label>
-    <div class="bx--form-requirement">
-      Invalid number
-    </div>
-  </div>
-</div>
-
-<div class="bx--form-item">
-  <div data-numberinput class="bx--number">
-    <input id="number-input" type="number" min="0" max="100" value="1">
-    <div class="bx--number__controls">
-      <button class="bx--number__control-btn up-icon">
-        <svg viewBox="0 2 10 5" width="10" height="5" fill-rule="evenodd">
-          <path d="M10 5L5 0 0 5z"></path>
-        </svg>
-      </button>
-      <button class="bx--number__control-btn down-icon">
-        <svg viewBox="0 2 10 5" width="10" height="5" fill-rule="evenodd">
-          <path d="M10 0L5 5 0 0z"></path>
-        </svg>
-      </button>
-    </div>
-    <label for="number-input" class="bx--label">Number Input label</label>
-    <div class="bx--form__helper-text">
-      Optional helper text here; if message is more than one line text should wrap (~100 character count maximum)
-    </div>
-  </div>
-</div>
diff --git a/src/components/order-summary/order-summary-category.html b/src/components/order-summary/order-summary-category.html
deleted file mode 100644
index 5c4f585d59ee..000000000000
--- a/src/components/order-summary/order-summary-category.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<div class="bx--order-summary">
-  <section class="bx--order-header">
-    <p class="bx--order-header-title">Order Summary</p>
-    <ul data-dropdown data-value class="bx--dropdown" tabindex="0">
-      <li class="bx--dropdown-text">USD</li>
-      <svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-      <li>
-        <ul class="bx--dropdown-list">
-          <li data-option data-value="all" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">USD</a></li>
-          <li data-option data-value="cloudFoundry" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">NOK</a></li>
-          <li data-option data-value="staging" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">GBP</a></li>
-          <li data-option data-value="dea" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">EUR</a></li>
-        </ul>
-      </li>
-    </ul>
-
-  </section>
-  <ul class="bx--order-list">
-    <li class="bx--order-category">
-      <p class="bx--order-category-title">Category Label</p>
-      <ul>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$10.00 /mo</p>
-        </li>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$20.00</p>
-        </li>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$20.00</p>
-        </li>
-      </ul>
-    </li>
-    <li class="bx--order-category">
-      <p class="bx--order-category-title">Category Label</p>
-      <ul>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Extra long detail to show what a long line is like</p>
-          <p class="bx--order-price">$20000.00</p>
-        </li>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$20.00</p>
-        </li>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$20.00</p>
-        </li>
-      </ul>
-    </li>
-    <li class="bx--order-category">
-      <p class="bx--order-category-title">Category Label</p>
-      <ul>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$20.00</p>
-        </li>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$20.00</p>
-        </li>
-        <li class="bx--order-item">
-          <p class="bx--order-detail">Detail one</p>
-          <p class="bx--order-price">$20.00</p>
-        </li>
-      </ul>
-    </li>
-  </ul>
-  <section class="bx--order-total-container">
-    <div class="bx--order-total">
-      <p class="bx--order-total-text">Total due now</p>
-      <p class="bx--order-total-price">
-        $0.00
-        <span>estimated</span>
-      </p>
-    </div>
-    <p class="bx--order-total-subtitle"> * This is an estimated price based on a customer’s average usage, includes monthly and hourly pricing.</p>
-    <button class="bx--btn bx--btn--primary" type="submit">Create Cluster</button>
-    <button class="bx--btn bx--btn--secondary">Cancel</button>
-  </section>
-  <section class="bx--order-footer">
-    <p class="bx--order-footer-text">Need Help?</p>
-    &nbsp;
-    <a href="" class="bx--link">Contact Bluemix Sales</a>
-  </section>
-</div>
diff --git a/src/components/order-summary/order-summary.config.js b/src/components/order-summary/order-summary.config.js
new file mode 100644
index 000000000000..06ab494b8b89
--- /dev/null
+++ b/src/components/order-summary/order-summary.config.js
@@ -0,0 +1,25 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        This component is used to display the items a user will be purchasing.
+        This version does not include OrderSummaryCategory.
+      `,
+    },
+    {
+      name: 'with-category',
+      label: 'With category',
+      notes: `
+        This component is used to display the items a user will be purchasing.
+        The category version of OrderSummary can break the items being purchased into categories.
+      `,
+      context: {
+        hasCategory: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/order-summary/order-summary.hbs b/src/components/order-summary/order-summary.hbs
new file mode 100644
index 000000000000..977ecf98ce72
--- /dev/null
+++ b/src/components/order-summary/order-summary.hbs
@@ -0,0 +1,113 @@
+<div class="bx--order-summary">
+  <section class="bx--order-header">
+    <p class="bx--order-header-title">Order Summary</p>
+    <ul data-dropdown data-value class="bx--dropdown" tabindex="0">
+      <li class="bx--dropdown-text">USD</li>
+      <svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
+        <path d="M10 0L5 5 0 0z"></path>
+      </svg>
+      <li>
+        <ul class="bx--dropdown-list">
+          <li data-option data-value="all" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">USD</a></li>
+          <li data-option data-value="cloudFoundry" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">NOK</a></li>
+          <li data-option data-value="staging" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">GBP</a></li>
+          <li data-option data-value="dea" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">EUR</a></li>
+        </ul>
+      </li>
+    </ul>
+
+  </section>
+  <ul class="bx--order-list">
+    {{#if hasCategory}}
+      <li class="bx--order-category">
+        <p class="bx--order-category-title">Category Label</p>
+        <ul>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$10.00 /mo</p>
+          </li>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$20.00</p>
+          </li>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$20.00</p>
+          </li>
+        </ul>
+      </li>
+      <li class="bx--order-category">
+        <p class="bx--order-category-title">Category Label</p>
+        <ul>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Extra long detail to show what a long line is like</p>
+            <p class="bx--order-price">$20000.00</p>
+          </li>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$20.00</p>
+          </li>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$20.00</p>
+          </li>
+        </ul>
+      </li>
+      <li class="bx--order-category">
+        <p class="bx--order-category-title">Category Label</p>
+        <ul>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$20.00</p>
+          </li>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$20.00</p>
+          </li>
+          <li class="bx--order-item">
+            <p class="bx--order-detail">Detail one</p>
+            <p class="bx--order-price">$20.00</p>
+          </li>
+        </ul>
+      </li>
+    {{else}}
+      <li class="bx--order-item">
+        <p class="bx--order-detail">Detail one</p>
+        <p class="bx--order-price">$20.00</p>
+      </li>
+      <li class="bx--order-item">
+        <p class="bx--order-detail">Detail one</p>
+        <p class="bx--order-price">$20.00</p>
+      </li>
+      <li class="bx--order-item">
+        <p class="bx--order-detail">Detail one</p>
+        <p class="bx--order-price">-</p>
+      </li>
+      <li class="bx--order-item">
+        <p class="bx--order-detail">Detail one</p>
+        <p class="bx--order-price">-</p>
+      </li>
+    {{/if}}
+  </ul>
+  <section class="bx--order-total-container">
+    <div class="bx--order-total">
+      <p class="bx--order-total-text">Total due now</p>
+      <p class="bx--order-total-price">
+        $0.00
+        <span>estimated</span>
+      </p>
+    </div>
+    {{#if hasCategory}}
+      <p class="bx--order-total-subtitle"> * This is an estimated price based on a customer’s average usage, includes monthly and hourly pricing.</p>
+    {{/if}}
+    <button class="bx--btn bx--btn--primary" type="submit">Create Cluster</button>
+    {{#if hasCategory}}
+      <button class="bx--btn bx--btn--secondary">Cancel</button>
+    {{/if}}
+  </section>
+  <section class="bx--order-footer">
+    <p class="bx--order-footer-text">Need Help?</p>
+    &nbsp;
+    <a href="" class="bx--link">Contact Bluemix Sales</a>
+  </section>
+</div>
diff --git a/src/components/order-summary/order-summary.html b/src/components/order-summary/order-summary.html
deleted file mode 100644
index 99d94dc39b9a..000000000000
--- a/src/components/order-summary/order-summary.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="bx--order-summary">
-  <section class="bx--order-header">
-    <p class="bx--order-header-title">Order Summary</p>
-    <ul data-dropdown data-value class="bx--dropdown" tabindex="0">
-      <li class="bx--dropdown-text">USD</li>
-      <svg class="bx--dropdown__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-      <li>
-        <ul class="bx--dropdown-list">
-          <li data-option data-value="all" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">USD</a></li>
-          <li data-option data-value="cloudFoundry" class="bx--dropdown-item"><a class="bx--dropdown-link" title="NOKNOKNOKNOKNOK" ref="javascript:void(0)">NOKNOKNOKNOKNOK</a></li>
-          <li data-option data-value="staging" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">GBP</a></li>
-          <li data-option data-value="dea" class="bx--dropdown-item"><a class="bx--dropdown-link" href="javascript:void(0)">WWW</a></li>
-        </ul>
-      </li>
-    </ul>
-
-  </section>
-  <ul class="bx--order-list">
-    <li class="bx--order-item">
-      <p class="bx--order-detail">Detail one</p>
-      <p class="bx--order-price">$20.00</p>
-    </li>
-    <li class="bx--order-item">
-      <p class="bx--order-detail">Detail one</p>
-      <p class="bx--order-price">$20.00</p>
-    </li>
-    <li class="bx--order-item">
-      <p class="bx--order-detail">Detail one</p>
-      <p class="bx--order-price">-</p>
-    </li>
-    <li class="bx--order-item">
-      <p class="bx--order-detail">Detail one</p>
-      <p class="bx--order-price">-</p>
-    </li>
-  </ul>
-  <section class="bx--order-total-container">
-    <div class="bx--order-total">
-      <p class="bx--order-total-text">Total due now</p>
-      <p class="bx--order-total-price">
-        $0.00
-        <span>estimated</span>
-      </p>
-    </div>
-    <button class="bx--btn bx--btn--primary" type="submit">Create Cluster</button>
-  </section>
-  <section class="bx--order-footer">
-    <p class="bx--order-footer-text">Need Help?</p>
-    &nbsp;
-    <a href="" class="bx--link">Contact Bluemix Sales</a>
-  </section>
-</div>
diff --git a/src/components/overflow-menu/overflow-menu.html b/src/components/overflow-menu/overflow-menu.hbs
similarity index 96%
rename from src/components/overflow-menu/overflow-menu.html
rename to src/components/overflow-menu/overflow-menu.hbs
index 8d7b08880421..a1d7dda7af44 100644
--- a/src/components/overflow-menu/overflow-menu.html
+++ b/src/components/overflow-menu/overflow-menu.hbs
@@ -17,8 +17,8 @@
     <li class="bx--overflow-menu-options__option">
       <button class="bx--overflow-menu-options__btn">Option 4</button>
     </li>
-    <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--disabled"> 
-      <button class="bx--overflow-menu-options__btn" tabindex="-1">Disabled</button> 
+    <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--disabled">
+      <button class="bx--overflow-menu-options__btn" tabindex="-1">Disabled</button>
     </li>
     <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--danger">
       <button class="bx--overflow-menu-options__btn">Danger option</button>
@@ -45,8 +45,8 @@
     <li class="bx--overflow-menu-options__option">
       <button class="bx--overflow-menu-options__btn">Option 4</button>
     </li>
-    <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--disabled"> 
-      <button class="bx--overflow-menu-options__btn" tabindex="-1">Disabled</button> 
+    <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--disabled">
+      <button class="bx--overflow-menu-options__btn" tabindex="-1">Disabled</button>
     </li>
     <li class="bx--overflow-menu-options__option bx--overflow-menu-options__option--danger">
       <button class="bx--overflow-menu-options__btn">Danger option</button>
diff --git a/src/components/pagination/pagination-v2.dust b/src/components/pagination/pagination-v2.dust
new file mode 100644
index 000000000000..d0262f909f44
--- /dev/null
+++ b/src/components/pagination/pagination-v2.dust
@@ -0,0 +1,55 @@
+{>_layout/}
+
+{<content}
+  <div class="bx--pagination" data-pagination>
+    <div class="bx--pagination__left">
+      <span class="bx--pagination__text">Items per page:</span>
+      <div class="bx--select bx--select--inline">
+        <label for="select-id-pagination" class="bx--visually-hidden">Number of items per page</label>
+        <select id="select-id-pagination" class="bx--select-input" data-items-per-page>
+          <option class="bx--select-option" value="10" selected>10</option>
+          <option class="bx--select-option" value="20">20</option>
+          <option class="bx--select-option" value="30">30</option>
+          <option class="bx--select-option" value="40">40</option>
+          <option class="bx--select-option" value="50">50</option>
+        </select>
+        <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
+          <path d="M10 0L5 5 0 0z"></path>
+        </svg>
+      </div>
+      <span class="bx--pagination__text">
+        <span>|&nbsp;</span>
+        <span data-displayed-item-range>1-10</span> of
+        <span data-total-items>40</span> items</span>
+    </div>
+    <div class="bx--pagination__right bx--pagination--inline">
+      <span class="bx--pagination__text">
+        <span data-displayed-page-number>1</span> of
+        <span data-total-pages>4</span> pages</span>
+      <button class="bx--pagination__button bx--pagination__button--backward" data-page-backward aria-label="Backward button">
+        <svg class="bx--pagination__button-icon" width="8" height="12" viewBox="0 0 8 12" fill-rule="evenodd">
+          <path d="M7.5 10.6L2.8 6l4.7-4.6L6.1 0 0 6l6.1 6z"></path>
+        </svg>
+      </button>
+      <label for="page-number-input" class="bx--visually-hidden">Page number input</label>
+      <div class="bx--select bx--select--inline">
+        <label for="select-id-pagination" class="bx--visually-hidden">Number of items per page</label>
+        <select id="select-id-pagination" class="bx--select-input" data-page-number-input>
+          <option class="bx--select-option" value="1" selected>1</option>
+          <option class="bx--select-option" value="2">2</option>
+          <option class="bx--select-option" value="3">3</option>
+          <option class="bx--select-option" value="4">4</option>
+          <option class="bx--select-option" value="5">5</option>
+        </select>
+        <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
+          <path d="M10 0L5 5 0 0z"></path>
+        </svg>
+      </div>
+      <button class="bx--pagination__button bx--pagination__button--forward" data-page-forward aria-label="Forward button">
+        <svg class="bx--pagination__button-icon" width="8" height="12" viewBox="0 0 8 12" fill-rule="evenodd">
+          <path d="M0 10.6L4.7 6 0 1.4 1.4 0l6.1 6-6.1 6z"></path>
+        </svg>
+      </button>
+    </div>
+  </div>
+{/content}
diff --git a/src/components/pagination/pagination-v2.html b/src/components/pagination/pagination-v2.html
deleted file mode 100644
index d0731111dea8..000000000000
--- a/src/components/pagination/pagination-v2.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="bx--pagination" data-pagination>
-  <div class="bx--pagination__left">
-    <span class="bx--pagination__text">Items per page:</span>
-    <div class="bx--select bx--select--inline">
-      <label for="select-id-pagination" class="bx--visually-hidden">Number of items per page</label>
-      <select id="select-id-pagination" class="bx--select-input" data-items-per-page>
-        <option class="bx--select-option" value="10" selected>10</option>
-        <option class="bx--select-option" value="20">20</option>
-        <option class="bx--select-option" value="30">30</option>
-        <option class="bx--select-option" value="40">40</option>
-        <option class="bx--select-option" value="50">50</option>
-      </select>
-      <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-    </div>
-    <span class="bx--pagination__text">
-      <span>|&nbsp;</span>
-      <span data-displayed-item-range>1-10</span> of
-      <span data-total-items>40</span> items</span>
-  </div>
-  <div class="bx--pagination__right bx--pagination--inline">
-    <span class="bx--pagination__text">
-      <span data-displayed-page-number>1</span> of
-      <span data-total-pages>4</span> pages</span>
-    <button class="bx--pagination__button bx--pagination__button--backward" data-page-backward aria-label="Backward button">
-      <svg class="bx--pagination__button-icon" width="8" height="12" viewBox="0 0 8 12" fill-rule="evenodd">
-        <path d="M7.5 10.6L2.8 6l4.7-4.6L6.1 0 0 6l6.1 6z"></path>
-      </svg>
-    </button>
-    <label for="page-number-input" class="bx--visually-hidden">Page number input</label>
-    <div class="bx--select bx--select--inline">
-      <label for="select-id-pagination" class="bx--visually-hidden">Number of items per page</label>
-      <select id="select-id-pagination" class="bx--select-input" data-page-number-input>
-        <option class="bx--select-option" value="1" selected>1</option>
-        <option class="bx--select-option" value="2">2</option>
-        <option class="bx--select-option" value="3">3</option>
-        <option class="bx--select-option" value="4">4</option>
-        <option class="bx--select-option" value="5">5</option>
-      </select>
-      <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-        <path d="M10 0L5 5 0 0z"></path>
-      </svg>
-    </div>
-    <button class="bx--pagination__button bx--pagination__button--forward" data-page-forward aria-label="Forward button">
-      <svg class="bx--pagination__button-icon" width="8" height="12" viewBox="0 0 8 12" fill-rule="evenodd">
-        <path d="M0 10.6L4.7 6 0 1.4 1.4 0l6.1 6-6.1 6z"></path>
-      </svg>
-    </button>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/components/pagination/pagination.html b/src/components/pagination/pagination.hbs
similarity index 100%
rename from src/components/pagination/pagination.html
rename to src/components/pagination/pagination.hbs
diff --git a/src/components/progress-indicator/progress-indicator.html b/src/components/progress-indicator/progress-indicator.hbs
similarity index 100%
rename from src/components/progress-indicator/progress-indicator.html
rename to src/components/progress-indicator/progress-indicator.hbs
diff --git a/src/components/radio-button/radio-button.html b/src/components/radio-button/radio-button.hbs
similarity index 100%
rename from src/components/radio-button/radio-button.html
rename to src/components/radio-button/radio-button.hbs
diff --git a/src/components/search/search-large-light.html b/src/components/search/search-large-light.html
deleted file mode 100644
index 56f5d81a89e9..000000000000
--- a/src/components/search/search-large-light.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div data-search class="bx--search bx--search--lg bx--search--light" role="search">
-  <input class="bx--search-input" type="text" role="search" id="search__input-1" placeholder="Search" aria-labelledby="search-input-label-2">
-  <svg class="bx--search-magnifier" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M6 2c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zm0-2C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-    <path d="M16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-  </svg>
-  <svg class="bx--search-close bx--search-close--hidden" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm3.5 10.1l-1.4 1.4L8 9.4l-2.1 2.1-1.4-1.4L6.6 8 4.5 5.9l1.4-1.4L8 6.6l2.1-2.1 1.4 1.4L9.4 8l2.1 2.1z"></path>
-  </svg>
-  <button class="bx--search-button" type="button" aria-label="Filter button">
-    <svg class="bx--search-filter" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-      <path d="M5 0C3.7 0 2.6.8 2.2 2H0v2h2.2C2.6 5.2 3.7 6 5 6c1.3 0 2.4-.8 2.8-2H16V2H7.8C7.4.8 6.3 0 5 0zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1zM5 10c-1.3 0-2.4.8-2.8 2H0v2h2.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16v-2H7.8c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
-      <path d="M11 5c-1.3 0-2.4.8-2.8 2H0v2h8.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16V7h-2.2c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
-    </svg>
-  </button>
-  <button class="bx--search-button" type="button" data-search-toggle aria-label="Grid and list toggle button">
-    <div data-search-view="grid">
-      <svg class="bx--search-view" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-        <path d="M0 0h7v7H0zM9 0h7v7H9zM0 9h7v7H0zM9 9h7v7H9z"></path>
-      </svg>
-    </div>
-    <div class="bx--search-view--hidden" data-search-view="list">
-      <svg class="bx--search-view" width="16" height="14" viewBox="0 0 16 14" fill-rule="evenodd">
-        <path d="M0 0h16v2H0zM0 4h16v2H0zM0 8h16v2H0zM0 12h16v2H0z"></path>
-      </svg>
-    </div>
-  </button>
-  <label class="bx--label" id="search-input-label-2" for="search__input-1">Search</label>
-</div>
diff --git a/src/components/search/search-large.html b/src/components/search/search-large.html
deleted file mode 100644
index c3933262f44a..000000000000
--- a/src/components/search/search-large.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div data-search class="bx--search bx--search--lg" role="search">
-  <input class="bx--search-input" type="text" role="search" id="search__input-1" placeholder="Search" aria-labelledby="search-input-label-2">
-  <svg class="bx--search-magnifier" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M6 2c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zm0-2C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-    <path d="M16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-  </svg>
-  <svg class="bx--search-close bx--search-close--hidden" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-    <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm3.5 10.1l-1.4 1.4L8 9.4l-2.1 2.1-1.4-1.4L6.6 8 4.5 5.9l1.4-1.4L8 6.6l2.1-2.1 1.4 1.4L9.4 8l2.1 2.1z"></path>
-  </svg>
-  <button class="bx--search-button" type="button" aria-label="Filter button">
-    <svg class="bx--search-filter" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-      <path d="M5 0C3.7 0 2.6.8 2.2 2H0v2h2.2C2.6 5.2 3.7 6 5 6c1.3 0 2.4-.8 2.8-2H16V2H7.8C7.4.8 6.3 0 5 0zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1zM5 10c-1.3 0-2.4.8-2.8 2H0v2h2.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16v-2H7.8c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
-      <path d="M11 5c-1.3 0-2.4.8-2.8 2H0v2h8.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16V7h-2.2c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
-    </svg>
-  </button>
-  <button class="bx--search-button" type="button" data-search-toggle aria-label="Grid and list toggle button">
-    <div data-search-view="grid">
-      <svg class="bx--search-view" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-        <path d="M0 0h7v7H0zM9 0h7v7H9zM0 9h7v7H0zM9 9h7v7H9z"></path>
-      </svg>
-    </div>
-    <div class="bx--search-view--hidden" data-search-view="list">
-      <svg class="bx--search-view" width="16" height="14" viewBox="0 0 16 14" fill-rule="evenodd">
-        <path d="M0 0h16v2H0zM0 4h16v2H0zM0 8h16v2H0zM0 12h16v2H0z"></path>
-      </svg>
-    </div>
-  </button>
-  <label class="bx--label" id="search-input-label-2" for="search__input-1">Search</label>
-</div>
diff --git a/src/components/search/search-small-light.html b/src/components/search/search-small-light.html
deleted file mode 100644
index 6140d0028b7c..000000000000
--- a/src/components/search/search-small-light.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="bx--form-item">
-  <div data-search class="bx--search bx--search--sm bx--search--light" role="search">
-    <label id="search-input-label-1" class="bx--label" for="search__input-2">Search</label>
-    <input class="bx--search-input" type="text" id="search__input-2" role="search" placeholder="Search" aria-labelledby="search-input-label-1">
-    <svg class="bx--search-magnifier" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-      <path d="M6 2c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zm0-2C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-      <path d="M16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-    </svg>
-    <svg class="bx--search-close bx--search-close--hidden" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-      <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm3.5 10.1l-1.4 1.4L8 9.4l-2.1 2.1-1.4-1.4L6.6 8 4.5 5.9l1.4-1.4L8 6.6l2.1-2.1 1.4 1.4L9.4 8l2.1 2.1z"></path>
-    </svg>
-  </div>
-</div>
diff --git a/src/components/search/search-small.html b/src/components/search/search-small.html
deleted file mode 100644
index 8ccb5cd76187..000000000000
--- a/src/components/search/search-small.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="bx--form-item">
-  <div data-search class="bx--search bx--search--sm" role="search">
-    <label id="search-input-label-1" class="bx--label" for="search__input-2">Search</label>
-    <input class="bx--search-input" type="text" id="search__input-2" role="search" placeholder="Search" aria-labelledby="search-input-label-1">
-    <svg class="bx--search-magnifier" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-      <path d="M6 2c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zm0-2C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-      <path d="M16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
-    </svg>
-    <svg class="bx--search-close bx--search-close--hidden" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
-      <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm3.5 10.1l-1.4 1.4L8 9.4l-2.1 2.1-1.4-1.4L6.6 8 4.5 5.9l1.4-1.4L8 6.6l2.1-2.1 1.4 1.4L9.4 8l2.1 2.1z"></path>
-    </svg>
-  </div>
-</div>
diff --git a/src/components/search/search.config.js b/src/components/search/search.config.js
new file mode 100644
index 000000000000..a81ae9d9a9dc
--- /dev/null
+++ b/src/components/search/search.config.js
@@ -0,0 +1,59 @@
+'use stirct';
+
+module.exports = {
+  default: 'large',
+  variants: [
+    {
+      name: 'large',
+      label: 'Normal',
+      notes: `
+        Search enables users to specify a word or a phrase to find particular relevant pieces of content
+        without the use of navigation. Search can be used as the primary means of discovering content,
+        or as a filter to aid the user in finding content.
+      `,
+      context: {
+        suffix: 'lg',
+      },
+    },
+    {
+      name: 'small',
+      label: 'Small',
+      notes: `
+        Search enables users to specify a word or a phrase to find particular relevant pieces of content
+        without the use of navigation. Search can be used as the primary means of discovering content,
+        or as a filter to aid the user in finding content. With the small version, the search field will be
+        more compact.
+      `,
+      context: {
+        suffix: 'sm',
+      },
+    },
+    {
+      name: 'large-light',
+      label: 'Normal Light',
+      notes: `
+        Search enables users to specify a word or a phrase to find particular relevant pieces of content
+        without the use of navigation. Search can be used as the primary means of discovering content,
+        or as a filter to aid the user in finding content.
+      `,
+      context: {
+        suffix: 'lg',
+        light: true,
+      },
+    },
+    {
+      name: 'small-light',
+      label: 'Small Light',
+      notes: `
+        Search enables users to specify a word or a phrase to find particular relevant pieces of content
+        without the use of navigation. Search can be used as the primary means of discovering content,
+        or as a filter to aid the user in finding content. With the small version, the search field will be
+        more compact.
+      `,
+      context: {
+        suffix: 'sm',
+        light: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/search/search.hbs b/src/components/search/search.hbs
new file mode 100644
index 000000000000..858757366e6d
--- /dev/null
+++ b/src/components/search/search.hbs
@@ -0,0 +1,34 @@
+{{#is suffix "sm"}}<div class="bx--form-item">{{/is}}
+  <div data-search class="bx--search bx--search--{{suffix}}{{#if light}} bx--search--light{{/if}}" role="search">
+    {{#is suffix "sm"}}<label id="search-input-label-1" class="bx--label" for="search__input-1">Search</label>{{/is}}
+    <input class="bx--search-input" type="text" role="search" id="search__input-1" placeholder="Search" aria-labelledby="search-input-label-2">
+    <svg class="bx--search-magnifier" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
+      <path d="M6 2c2.2 0 4 1.8 4 4s-1.8 4-4 4-4-1.8-4-4 1.8-4 4-4zm0-2C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
+      <path d="M16 13.8L13.8 16l-3.6-3.6 2.2-2.2z"></path>
+    </svg>
+    <svg class="bx--search-close bx--search-close--hidden" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
+      <path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm3.5 10.1l-1.4 1.4L8 9.4l-2.1 2.1-1.4-1.4L6.6 8 4.5 5.9l1.4-1.4L8 6.6l2.1-2.1 1.4 1.4L9.4 8l2.1 2.1z"></path>
+    </svg>
+    {{#is suffix "lg"}}
+      <button class="bx--search-button" type="button" aria-label="Filter button">
+        <svg class="bx--search-filter" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
+          <path d="M5 0C3.7 0 2.6.8 2.2 2H0v2h2.2C2.6 5.2 3.7 6 5 6c1.3 0 2.4-.8 2.8-2H16V2H7.8C7.4.8 6.3 0 5 0zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1zM5 10c-1.3 0-2.4.8-2.8 2H0v2h2.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16v-2H7.8c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
+          <path d="M11 5c-1.3 0-2.4.8-2.8 2H0v2h8.2c.4 1.2 1.5 2 2.8 2 1.3 0 2.4-.8 2.8-2H16V7h-2.2c-.4-1.2-1.5-2-2.8-2zm0 4c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1z"></path>
+        </svg>
+      </button>
+      <button class="bx--search-button" type="button" data-search-toggle aria-label="Grid and list toggle button">
+        <div data-search-view="grid">
+          <svg class="bx--search-view" width="16" height="16" viewBox="0 0 16 16" fill-rule="evenodd">
+            <path d="M0 0h7v7H0zM9 0h7v7H9zM0 9h7v7H0zM9 9h7v7H9z"></path>
+          </svg>
+        </div>
+        <div class="bx--search-view--hidden" data-search-view="list">
+          <svg class="bx--search-view" width="16" height="14" viewBox="0 0 16 14" fill-rule="evenodd">
+            <path d="M0 0h16v2H0zM0 4h16v2H0zM0 8h16v2H0zM0 12h16v2H0z"></path>
+          </svg>
+        </div>
+      </button>
+      <label class="bx--label" id="search-input-label-1" for="search__input-1">Search</label>
+    {{/is}}
+  </div>
+{{#is suffix "sm"}}</div>{{/is}}
diff --git a/src/components/select/select--light.html b/src/components/select/select--light.html
deleted file mode 100644
index 24cabb7b04e5..000000000000
--- a/src/components/select/select--light.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="bx--form-item">
-  <div class="bx--select bx--select--light">
-    <select id="select-id" class="bx--select-input">
-      <option class="bx--select-option" disabled selected hidden>Choose an option</option>
-      <option class="bx--select-option" value="solong">A much longer option that is worth having around to check how text flows</option>
-      <optgroup class="bx--select-optgroup" label="Category 1">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-      <optgroup class="bx--select-optgroup" label="Category 2">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-    </select>
-    <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-      <path d="M10 0L5 5 0 0z"></path>
-    </svg>
-    <label for="select-id" class="bx--label">Select label</label>
-  </div>
-</div>
-
-<div class="bx--form-item">
-  <div class="bx--select bx--select--light">
-    <select data-invalid id="select-id" class="bx--select-input">
-      <option class="bx--select-option" disabled selected hidden>Choose an option</option>
-      <option class="bx--select-option" value="solong">A much longer option that is worth having around to check how text flows</option>
-      <optgroup class="bx--select-optgroup" label="Category 1">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-      <optgroup class="bx--select-optgroup" label="Category 2">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-    </select>
-    <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-      <path d="M10 0L5 5 0 0z"></path>
-    </svg>
-    <label for="select-id" class="bx--label">Select label</label>
-    <div class="bx--form-requirement">
-      Validation message here
-    </div>
-  </div>
-</div>
diff --git a/src/components/select/select.config.js b/src/components/select/select.config.js
new file mode 100644
index 000000000000..b170a7fe4627
--- /dev/null
+++ b/src/components/select/select.config.js
@@ -0,0 +1,46 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Select displays a list below its title when selected. They are used primarily in forms,
+        where a user chooses one option from a list. Once the user selects an item, the dropdown will
+        dissapear and the field will reflect the user's choice. Create Select Item components for each
+        option in the list.
+      `,
+    },
+    {
+      name: 'inline',
+      label: 'Inline',
+      notes: 'Inline select is for use when there will be multiple elements in a row.',
+      context: {
+        inline: true,
+      },
+    },
+    {
+      name: 'light',
+      label: 'Light',
+      context: {
+        light: true,
+      },
+    },
+    {
+      name: 'invalid',
+      label: 'Invalid',
+      context: {
+        invalid: true,
+      },
+    },
+    {
+      name: 'light-invalid',
+      label: 'Light invalid',
+      context: {
+        light: true,
+        invalid: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/select/select--inline.html b/src/components/select/select.hbs
similarity index 63%
rename from src/components/select/select--inline.html
rename to src/components/select/select.hbs
index acf828fecb66..ec0c58252332 100644
--- a/src/components/select/select--inline.html
+++ b/src/components/select/select.hbs
@@ -1,7 +1,9 @@
 <div class="bx--form-item">
-  <div class="bx--select bx--select--inline">
-    <label for="select-id-inline" class="bx--label">Select label</label>
-    <select id="select-id-inline" class="bx--select-input">
+  <div class="bx--select{{#if inline}} bx--select--inline{{/if}}{{#if light}} bx--select--light{{/if}}">
+    {{#if inline}}
+      <label for="select-id" class="bx--label">Select label</label>
+    {{/if}}
+    <select {{#if invalid}}data-invalid{{/if}} id="select-id" class="bx--select-input">
       <option class="bx--select-option" disabled selected hidden>Choose an option</option>
       <option class="bx--select-option" value="solong">A much longer option that is worth having around to check how text flows</option>
       <optgroup class="bx--select-optgroup" label="Category 1">
@@ -16,5 +18,13 @@
     <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
       <path d="M10 0L5 5 0 0z"></path>
     </svg>
+    {{#unless inline}}
+      <label for="select-id" class="bx--label">Select label</label>
+    {{/unless}}
+    {{#if invalid}}
+      <div class="bx--form-requirement">
+        Validation message here
+      </div>
+    {{/if}}
   </div>
 </div>
diff --git a/src/components/select/select.html b/src/components/select/select.html
deleted file mode 100644
index e2e1348528eb..000000000000
--- a/src/components/select/select.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="bx--form-item">
-  <div class="bx--select">
-    <select id="select-id" class="bx--select-input">
-      <option class="bx--select-option" disabled selected hidden>Choose an option</option>
-      <option class="bx--select-option" value="solong">A much longer option that is worth having around to check how text flows</option>
-      <optgroup class="bx--select-optgroup" label="Category 1">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-      <optgroup class="bx--select-optgroup" label="Category 2">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-    </select>
-    <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-      <path d="M10 0L5 5 0 0z"></path>
-    </svg>
-    <label for="select-id" class="bx--label">Select label</label>
-  </div>
-</div>
-
-<div class="bx--form-item">
-  <div class="bx--select">
-    <select data-invalid id="select-id" class="bx--select-input">
-      <option class="bx--select-option" disabled selected hidden>Choose an option</option>
-      <option class="bx--select-option" value="solong">A much longer option that is worth having around to check how text flows</option>
-      <optgroup class="bx--select-optgroup" label="Category 1">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-      <optgroup class="bx--select-optgroup" label="Category 2">
-        <option class="bx--select-option" value="option1">Option 1</option>
-        <option class="bx--select-option" value="option2">Option 2</option>
-      </optgroup>
-    </select>
-    <svg class="bx--select__arrow" width="10" height="5" viewBox="0 0 10 5" fill-rule="evenodd">
-      <path d="M10 0L5 5 0 0z"></path>
-    </svg>
-    <label for="select-id" class="bx--label">Select label</label>
-    <div class="bx--form-requirement">
-      Validation message here
-    </div>
-  </div>
-</div>
diff --git a/src/components/slider/slider.html b/src/components/slider/slider.hbs
similarity index 99%
rename from src/components/slider/slider.html
rename to src/components/slider/slider.hbs
index d7abc3d0caec..c437affe32d7 100644
--- a/src/components/slider/slider.html
+++ b/src/components/slider/slider.hbs
@@ -13,4 +13,3 @@
     <input id="slider-input-box" type="number" class="bx--text-input bx--slider-text-input" placeholder="0">
   </div>
 </div>
-</div>
diff --git a/src/components/structured-list/structured-list--selection.html b/src/components/structured-list/structured-list--selection.hbs
similarity index 100%
rename from src/components/structured-list/structured-list--selection.html
rename to src/components/structured-list/structured-list--selection.hbs
diff --git a/src/components/structured-list/structured-list.html b/src/components/structured-list/structured-list.hbs
similarity index 82%
rename from src/components/structured-list/structured-list.html
rename to src/components/structured-list/structured-list.hbs
index 809c929b94a9..96cf4c3931ef 100644
--- a/src/components/structured-list/structured-list.html
+++ b/src/components/structured-list/structured-list.hbs
@@ -11,8 +11,7 @@
       <div class="bx--structured-list-td bx--structured-list-content--nowrap">Row 1</div>
       <div class="bx--structured-list-td">Row 1</div>
       <div class="bx--structured-list-td">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc dui magna, finibus id tortor sed, aliquet bibendum augue. Aenean
-        posuere sem vel euismod dignissim. Nulla ut cursus dolor. Pellentesque vulputate nisl a porttitor interdum.
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc dui magna, finibus id tortor sed, aliquet bibendum augue. Aenean posuere sem vel euismod dignissim. Nulla ut cursus dolor. Pellentesque vulputate nisl a porttitor interdum.
       </div>
     </div>
     <div class="bx--structured-list-row">
@@ -21,8 +20,7 @@
         Row 2
       </div>
       <div class="bx--structured-list-td">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc dui magna, finibus id tortor sed, aliquet bibendum augue. Aenean
-        posuere sem vel euismod dignissim. Nulla ut cursus dolor. Pellentesque vulputate nisl a porttitor interdum.
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc dui magna, finibus id tortor sed, aliquet bibendum augue. Aenean posuere sem vel euismod dignissim. Nulla ut cursus dolor. Pellentesque vulputate nisl a porttitor interdum.
       </div>
     </div>
   </div>
diff --git a/src/components/tabs/tabs.html b/src/components/tabs/tabs.hbs
similarity index 100%
rename from src/components/tabs/tabs.html
rename to src/components/tabs/tabs.hbs
diff --git a/src/components/tag/tag.html b/src/components/tag/tag.hbs
similarity index 100%
rename from src/components/tag/tag.html
rename to src/components/tag/tag.hbs
diff --git a/src/components/text-area/text-area.config.js b/src/components/text-area/text-area.config.js
new file mode 100644
index 000000000000..87ea755d89f5
--- /dev/null
+++ b/src/components/text-area/text-area.config.js
@@ -0,0 +1,21 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Text areas enable the user to interact with and input data. A text area is used when you
+        anticipate the user to input more than 1 sentence.
+      `,
+    },
+    {
+      name: 'light',
+      label: 'Light',
+      context: {
+        light: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/text-area/text-area--light.html b/src/components/text-area/text-area.hbs
similarity index 66%
rename from src/components/text-area/text-area--light.html
rename to src/components/text-area/text-area.hbs
index 16d1814537f3..09f3563ec18e 100644
--- a/src/components/text-area/text-area--light.html
+++ b/src/components/text-area/text-area.hbs
@@ -1,10 +1,10 @@
 <div class="bx--form-item">
-  <textarea id="text-area-2" class="bx--text-area bx--text-area--v2 bx--text-area--light" rows="4" cols="50" placeholder="Placeholder text."></textarea>
+  <textarea id="text-area-2" class="bx--text-area bx--text-area--v2{{#if light}} bx--text-area--light{{/if}}" rows="4" cols="50" placeholder="Placeholder text."></textarea>
   <label for="text-area-2" class="bx--label">Text Area label</label>
 </div>
 
 <div class="bx--form-item">
-  <textarea data-invalid id="text-area-3" class="bx--text-area bx--text-area--v2 bx--text-area--light" rows="4" cols="50" placeholder="Placeholder text."></textarea>
+  <textarea data-invalid id="text-area-3" class="bx--text-area bx--text-area--v2{{#if light}} bx--text-area--light{{/if}}" rows="4" cols="50" placeholder="Placeholder text."></textarea>
   <label for="text-area-3" class="bx--label">Text Area label</label>
   <div class="bx--form-requirement">
     Validation message here
@@ -12,7 +12,7 @@
 </div>
 
 <div class="bx--form-item">
-  <textarea id="text-area-4" class="bx--text-area bx--text-area--v2 bx--text-area--light" rows="4" cols="50" placeholder="Placeholder text."></textarea>
+  <textarea id="text-area-4" class="bx--text-area bx--text-area--v2{{#if light}} bx--text-area--light{{/if}}" rows="4" cols="50" placeholder="Placeholder text."></textarea>
   <label for="text-area-4" class="bx--label">Text Area label</label>
   <div class="bx--form__helper-text">
     Optional helper text goes here
diff --git a/src/components/text-area/text-area.html b/src/components/text-area/text-area.html
deleted file mode 100644
index 386452399e96..000000000000
--- a/src/components/text-area/text-area.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="bx--form-item">
-  <textarea id="text-area-2" class="bx--text-area bx--text-area--v2" rows="4" cols="50" placeholder="Placeholder text."></textarea>
-  <label for="text-area-2" class="bx--label">Text Area label</label>
-</div>
-
-<div class="bx--form-item">
-  <textarea data-invalid id="text-area-3" class="bx--text-area bx--text-area--v2" rows="4" cols="50" placeholder="Placeholder text."></textarea>
-  <label for="text-area-3" class="bx--label">Text Area label</label>
-  <div class="bx--form-requirement">
-    Validation message here
-  </div>
-</div>
-
-<div class="bx--form-item">
-  <textarea id="text-area-4" class="bx--text-area bx--text-area--v2" rows="4" cols="50" placeholder="Placeholder text."></textarea>
-  <label for="text-area-4" class="bx--label">Text Area label</label>
-  <div class="bx--form__helper-text">
-    Optional helper text goes here
-  </div>
-</div>
diff --git a/src/components/text-input/text-input--light.html b/src/components/text-input/text-input--light.html
deleted file mode 100644
index c6d5034b942f..000000000000
--- a/src/components/text-input/text-input--light.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="bx--form-item">
-  <input id="text-input-3" type="text" class="bx--text-input bx--text-input--light" placeholder="Optional placeholder text">
-  <label for="text-input-3" class="bx--label">Text Input label</label>
-</div>
-
-<div class="bx--form-item">
-  <input data-invalid id="text-input-4" type="text" class="bx--text-input bx--text-input--light" placeholder="Optional placeholder text">
-  <label for="text-input-4" class="bx--label">Text Input label</label>
-  <div class="bx--form-requirement">
-    Validation message here
-  </div>
-</div>
-
-<div class="bx--form-item">
-  <input id="text-input-5" type="text" class="bx--text-input bx--text-input--light" placeholder="Optional placeholder text">
-  <label for="text-input-5" class="bx--label">Text Input label</label>
-  <div class="bx--form__helper-text">
-    Optional helper text goes here
-  </div>
-</div>
-
-<div class="bx--form-item" style="width: 300px">
-  <input id="text-input-5" type="text" class="bx--text-input bx--text-input--light" placeholder="Optional placeholder text">
-  <label for="text-input-5" class="bx--label">Text Input label</label>
-  <div class="bx--form__helper-text">
-    Optional helper text here; if message is more than one line text should wrap (~100 character count maximum)
-  </div>
-</div>
-
-<div class="bx--form-item">
-  <input id="text-input-6" type="text" class="bx--text-input bx--text-input--light" placeholder="Optional placeholder text"
-    disabled>
-  <label for="text-input-6" class="bx--label bx--label--disabled">Text Input label</label>
-</div>
diff --git a/src/components/text-input/text-input.config.js b/src/components/text-input/text-input.config.js
new file mode 100644
index 000000000000..5546e4041c86
--- /dev/null
+++ b/src/components/text-input/text-input.config.js
@@ -0,0 +1,22 @@
+'use stirct';
+
+module.exports = {
+  variants: [
+    {
+      name: 'default',
+      label: 'Default',
+      notes: `
+        Text fields enable the user to interact with and input data. A single line
+        field is used when the input anticipated by the user is a single line of
+        text as opposed to a paragraph.
+      `,
+    },
+    {
+      name: 'light',
+      label: 'Light',
+      context: {
+        light: true,
+      },
+    },
+  ],
+};
diff --git a/src/components/text-input/text-input.html b/src/components/text-input/text-input.hbs
similarity index 58%
rename from src/components/text-input/text-input.html
rename to src/components/text-input/text-input.hbs
index 37badb6b8ff4..2205a1b9053f 100644
--- a/src/components/text-input/text-input.html
+++ b/src/components/text-input/text-input.hbs
@@ -1,10 +1,10 @@
 <div class="bx--form-item">
-  <input id="text-input-3" type="text" class="bx--text-input" placeholder="Optional placeholder text">
+  <input id="text-input-3" type="text" class="bx--text-input{{#if light}} bx--text-input--light{{/if}}" placeholder="Optional placeholder text">
   <label for="text-input-3" class="bx--label">Text Input label</label>
 </div>
 
 <div class="bx--form-item">
-  <input data-invalid id="text-input-4" type="text" class="bx--text-input" placeholder="Optional placeholder text">
+  <input data-invalid id="text-input-4" type="text" class="bx--text-input{{#if light}} bx--text-input--light{{/if}}" placeholder="Optional placeholder text">
   <label for="text-input-4" class="bx--label">Text Input label</label>
   <div class="bx--form-requirement">
     Validation message here
@@ -12,7 +12,7 @@
 </div>
 
 <div class="bx--form-item">
-  <input id="text-input-5" type="text" class="bx--text-input" placeholder="Optional placeholder text">
+  <input id="text-input-5" type="text" class="bx--text-input{{#if light}} bx--text-input--light{{/if}}" placeholder="Optional placeholder text">
   <label for="text-input-5" class="bx--label">Text Input label</label>
   <div class="bx--form__helper-text">
     Optional helper text goes here
@@ -20,7 +20,7 @@
 </div>
 
 <div class="bx--form-item" style="width: 300px">
-  <input id="text-input-5" type="text" class="bx--text-input" placeholder="Optional placeholder text">
+  <input id="text-input-5" type="text" class="bx--text-input{{#if light}} bx--text-input--light{{/if}}" placeholder="Optional placeholder text">
   <label for="text-input-5" class="bx--label">Text Input label</label>
   <div class="bx--form__helper-text">
     Optional helper text here; if message is more than one line text should wrap (~100 character count maximum)
@@ -28,6 +28,6 @@
 </div>
 
 <div class="bx--form-item">
-  <input id="text-input-6" type="text" class="bx--text-input" placeholder="Optional placeholder text" disabled>
+  <input id="text-input-6" type="text" class="bx--text-input{{#if light}} bx--text-input--light{{/if}}" placeholder="Optional placeholder text" disabled>
   <label for="text-input-6" class="bx--label bx--label--disabled">Text Input label</label>
 </div>
diff --git a/src/components/tile/tile--clickable.html b/src/components/tile/tile--clickable.hbs
similarity index 100%
rename from src/components/tile/tile--clickable.html
rename to src/components/tile/tile--clickable.hbs
diff --git a/src/components/tile/tile--expandable.html b/src/components/tile/tile--expandable.hbs
similarity index 100%
rename from src/components/tile/tile--expandable.html
rename to src/components/tile/tile--expandable.hbs
diff --git a/src/components/tile/tile--grid.html b/src/components/tile/tile--grid.hbs
similarity index 100%
rename from src/components/tile/tile--grid.html
rename to src/components/tile/tile--grid.hbs
diff --git a/src/components/tile/tile--selectable.html b/src/components/tile/tile--selectable.hbs
similarity index 100%
rename from src/components/tile/tile--selectable.html
rename to src/components/tile/tile--selectable.hbs
diff --git a/src/components/tile/tile.html b/src/components/tile/tile.hbs
similarity index 100%
rename from src/components/tile/tile.html
rename to src/components/tile/tile.hbs
diff --git a/src/components/time-picker/time-picker--light.html b/src/components/time-picker/time-picker--light.hbs
similarity index 100%
rename from src/components/time-picker/time-picker--light.html
rename to src/components/time-picker/time-picker--light.hbs
diff --git a/src/components/time-picker/time-picker.html b/src/components/time-picker/time-picker.hbs
similarity index 100%
rename from src/components/time-picker/time-picker.html
rename to src/components/time-picker/time-picker.hbs
diff --git a/src/components/toggle/toggle--small.html b/src/components/toggle/toggle--small.hbs
similarity index 100%
rename from src/components/toggle/toggle--small.html
rename to src/components/toggle/toggle--small.hbs
diff --git a/src/components/toggle/toggle.html b/src/components/toggle/toggle.hbs
similarity index 100%
rename from src/components/toggle/toggle.html
rename to src/components/toggle/toggle.hbs
diff --git a/src/components/toolbar/toolbar.html b/src/components/toolbar/toolbar.hbs
similarity index 100%
rename from src/components/toolbar/toolbar.html
rename to src/components/toolbar/toolbar.hbs
diff --git a/src/components/tooltip/tooltip--simple.html b/src/components/tooltip/tooltip--simple.hbs
similarity index 100%
rename from src/components/tooltip/tooltip--simple.html
rename to src/components/tooltip/tooltip--simple.hbs
diff --git a/src/components/tooltip/tooltip.html b/src/components/tooltip/tooltip.hbs
similarity index 100%
rename from src/components/tooltip/tooltip.html
rename to src/components/tooltip/tooltip.hbs
diff --git a/src/components/unified-header/unified-header.html b/src/components/unified-header/unified-header.hbs
similarity index 100%
rename from src/components/unified-header/unified-header.html
rename to src/components/unified-header/unified-header.hbs
diff --git a/tests/spec/accordion_spec.js b/tests/spec/accordion_spec.js
index 2159348b05f8..90e06ea7cdb7 100644
--- a/tests/spec/accordion_spec.js
+++ b/tests/spec/accordion_spec.js
@@ -1,6 +1,6 @@
 import Accordion from '../../src/components/accordion/accordion';
-import HTML from '../../src/components/accordion/accordion.html';
-import LegacyHTML from '../../src/components/accordion/legacyaccordion.html';
+import HTML from '../../html/accordion/accordion.html';
+import LegacyHTML from '../../html/accordion/accordion--legacy.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test accordion', function() {
diff --git a/tests/spec/carousel_spec.js b/tests/spec/carousel_spec.js
index 3e9afd3c8659..cbf4e362d6a7 100644
--- a/tests/spec/carousel_spec.js
+++ b/tests/spec/carousel_spec.js
@@ -1,5 +1,5 @@
 import Carousel from '../../src/components/carousel/carousel';
-import HTML from '../../src/components/carousel/carousel.html';
+import HTML from '../../html/carousel/carousel.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Carousel', () => {
diff --git a/tests/spec/checkbox_spec.js b/tests/spec/checkbox_spec.js
index 99fcb483a1a1..d019b06ce62e 100644
--- a/tests/spec/checkbox_spec.js
+++ b/tests/spec/checkbox_spec.js
@@ -1,5 +1,5 @@
 import Checkbox from '../../src/components/checkbox/checkbox';
-import HTML from '../../src/components/checkbox/checkbox.html';
+import HTML from '../../html/checkbox/checkbox.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test Checkbox', function() {
diff --git a/tests/spec/content-switcher_spec.js b/tests/spec/content-switcher_spec.js
index f6e50c4b8134..14c5513da705 100644
--- a/tests/spec/content-switcher_spec.js
+++ b/tests/spec/content-switcher_spec.js
@@ -1,7 +1,7 @@
 import Promise, { promisify } from 'bluebird'; // For testing on browsers not supporting Promise
 import EventManager from '../utils/event-manager';
 import ContentSwitcher from '../../src/components/content-switcher/content-switcher';
-import HTML from '../../src/components/content-switcher/content-switcher.html';
+import HTML from '../../html/content-switcher/content-switcher.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test content switcher', function() {
diff --git a/tests/spec/data-table-v2_spec.js b/tests/spec/data-table-v2_spec.js
index eff9918dd2f5..24ec347494bc 100644
--- a/tests/spec/data-table-v2_spec.js
+++ b/tests/spec/data-table-v2_spec.js
@@ -1,7 +1,7 @@
 import EventManager from '../utils/event-manager';
 import DataTableV2 from '../../src/components/data-table-v2/data-table-v2';
-import HTML from '../../src/components/data-table-v2/data-table-v2.html';
-import ExpandableHTML from '../../src/components/data-table-v2/data-table-v2-expandable.html';
+import HTML from '../../html/data-table-v2/data-table-v2.html';
+import ExpandableHTML from '../../html/data-table-v2/data-table-v2--expandable.html';
 
 describe('Dropdown', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/data-table_spec.js b/tests/spec/data-table_spec.js
index 4ec8a66bb1f4..30337c23ab50 100644
--- a/tests/spec/data-table_spec.js
+++ b/tests/spec/data-table_spec.js
@@ -1,6 +1,6 @@
 import EventManager from '../utils/event-manager';
 import ResponsiveTable from '../../src/components/data-table/data-table';
-import HTML from '../../src/components/data-table/data-table.html';
+import HTML from '../../html/data-table/data-table.html';
 
 describe('Test responsive table', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/date-picker_spec.js b/tests/spec/date-picker_spec.js
index ffce17f4d645..e74360d052e0 100644
--- a/tests/spec/date-picker_spec.js
+++ b/tests/spec/date-picker_spec.js
@@ -1,6 +1,6 @@
 import DatePicker from '../../src/components/date-picker/date-picker';
-import singleCalHTML from '../../src/components/date-picker/date-picker--single.html';
-import rangeCalHTML from '../../src/components/date-picker/date-picker--range.html';
+import singleCalHTML from '../../html/date-picker/date-picker--single.html';
+import rangeCalHTML from '../../html/date-picker/date-picker--range.html';
 
 describe('Test date picker', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/file-uploader_spec.js b/tests/spec/file-uploader_spec.js
index 3d988af52641..2054d32da0b9 100644
--- a/tests/spec/file-uploader_spec.js
+++ b/tests/spec/file-uploader_spec.js
@@ -1,5 +1,5 @@
 import FileUploader from '../../src/components/file-uploader/file-uploader';
-import HTML from '../../src/components/file-uploader/file-uploader.html';
+import HTML from '../../html/file-uploader/file-uploader.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('File Uploader', function() {
diff --git a/tests/spec/floating-menu_spec.js b/tests/spec/floating-menu_spec.js
index e51b3360bd6a..731db4b53cb2 100644
--- a/tests/spec/floating-menu_spec.js
+++ b/tests/spec/floating-menu_spec.js
@@ -1,6 +1,6 @@
 import EventManager from '../utils/event-manager';
 import FloatingMenu from '../../src/components/floating-menu/floating-menu';
-import HTML from '../../src/components/overflow-menu/overflow-menu.html'; // Use ul.bx--overflow-menu-options for testing
+import HTML from '../../html/overflow-menu/overflow-menu.html'; // Use ul.bx--overflow-menu-options for testing
 
 describe('Test floating menu', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/interior-left-nav_spec.js b/tests/spec/interior-left-nav_spec.js
index 9d7ee36ea2f9..79d39c186d12 100644
--- a/tests/spec/interior-left-nav_spec.js
+++ b/tests/spec/interior-left-nav_spec.js
@@ -1,6 +1,6 @@
 import InteriorLeftNav from '../../src/components/interior-left-nav/interior-left-nav';
-import InteriorLeftNavHtml from '../../src/components/interior-left-nav/interior-left-nav.html';
-import KeepOpen from '../../src/components/interior-left-nav/interior-left-nav-keep-open.html';
+import InteriorLeftNavHtml from '../../html/interior-left-nav/interior-left-nav.html';
+import KeepOpen from '../../html/interior-left-nav/interior-left-nav--keep-open.html';
 
 describe('Test interior left nav', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/lightbox_spec.js b/tests/spec/lightbox_spec.js
index fff15ebd5987..be5e819f8e4c 100644
--- a/tests/spec/lightbox_spec.js
+++ b/tests/spec/lightbox_spec.js
@@ -1,5 +1,5 @@
 import Lightbox from '../../src/components/lightbox/lightbox';
-import HTML from '../../src/components/lightbox/lightbox.html';
+import HTML from '../../html/lightbox/lightbox.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Lightbox', () => {
diff --git a/tests/spec/loading_spec.js b/tests/spec/loading_spec.js
index 691215a21862..48f3a1a01450 100644
--- a/tests/spec/loading_spec.js
+++ b/tests/spec/loading_spec.js
@@ -1,5 +1,5 @@
 import Loading from '../../src/components/loading/loading';
-import LoadingHTML from '../../src/components/loading/loading.html';
+import LoadingHTML from '../../html/loading/loading.html';
 
 describe('Test Loading', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/modal_spec.js b/tests/spec/modal_spec.js
index 29d507619fb3..cebb1cc21d8f 100644
--- a/tests/spec/modal_spec.js
+++ b/tests/spec/modal_spec.js
@@ -1,5 +1,5 @@
 import Modal from '../../src/components/modal/modal';
-import ModalHtml from '../../src/components/modal/modal.html';
+import ModalHtml from '../../html/modal/modal.html';
 import EventManager from '../utils/event-manager';
 import flattenOptions from '../utils/flatten-options';
 
diff --git a/tests/spec/notification_spec.js b/tests/spec/notification_spec.js
index 9b8954aed187..37bc721dd616 100644
--- a/tests/spec/notification_spec.js
+++ b/tests/spec/notification_spec.js
@@ -1,6 +1,6 @@
 import EventManager from '../utils/event-manager';
 import Notification from '../../src/components/notification/notification';
-import HTML from '../../src/components/notification/toast-notification.html';
+import HTML from '../../html/notification/toast-notification.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('ToastNotification', function() {
diff --git a/tests/spec/number-input_spec.js b/tests/spec/number-input_spec.js
index daab2bed30ff..adbd982f8e4f 100644
--- a/tests/spec/number-input_spec.js
+++ b/tests/spec/number-input_spec.js
@@ -1,7 +1,7 @@
 import Promise from 'bluebird'; // For testing on browsers not supporting Promise
 import EventManager from '../utils/event-manager';
 import NumberInput from '../../src/components/number-input/number-input';
-import HTML from '../../src/components/number-input/number-input.html';
+import HTML from '../../html/number-input/number-input.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test Number Input', function() {
diff --git a/tests/spec/overflow-menu_spec.js b/tests/spec/overflow-menu_spec.js
index b92923ecdcf3..8d37f7ec4fa5 100644
--- a/tests/spec/overflow-menu_spec.js
+++ b/tests/spec/overflow-menu_spec.js
@@ -1,6 +1,6 @@
 import EventManager from '../utils/event-manager';
 import OverflowMenu from '../../src/components/overflow-menu/overflow-menu';
-import HTML from '../../src/components/overflow-menu/overflow-menu.html';
+import HTML from '../../html/overflow-menu/overflow-menu.html';
 
 describe('Test Overflow menu', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/profile-switcher_spec.js b/tests/spec/profile-switcher_spec.js
index d509bfdace1d..c1d98d696a0b 100644
--- a/tests/spec/profile-switcher_spec.js
+++ b/tests/spec/profile-switcher_spec.js
@@ -1,5 +1,5 @@
 import ProfileSwitcher from '../../src/components/unified-header/profile-switcher';
-import unifiedHeaderHtml from '../../src/components/unified-header/unified-header.html';
+import unifiedHeaderHtml from '../../html/unified-header/unified-header.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test profile switcher', function() {
diff --git a/tests/spec/progress-indicator_spec.js b/tests/spec/progress-indicator_spec.js
index 946f85874df6..1c3c67921141 100644
--- a/tests/spec/progress-indicator_spec.js
+++ b/tests/spec/progress-indicator_spec.js
@@ -1,6 +1,6 @@
 import '../../demo/polyfills/custom-event';
 import ProgressIndicator from '../../src/components/progress-indicator/progress-indicator';
-import HTML from '../../src/components/progress-indicator/progress-indicator.html';
+import HTML from '../../html/progress-indicator/progress-indicator.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('ProgressIndicator', function() {
diff --git a/tests/spec/search_spec.js b/tests/spec/search_spec.js
index d0d431f8ff26..6ee8479050db 100644
--- a/tests/spec/search_spec.js
+++ b/tests/spec/search_spec.js
@@ -1,5 +1,5 @@
 import Search from '../../src/components/search/search';
-import searchHTML from '../../src/components/search/search-large.html';
+import searchHTML from '../../html/search/search--large.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test Search', function() {
diff --git a/tests/spec/slider_spec.js b/tests/spec/slider_spec.js
index f12cea8b77de..a336e800f9b2 100644
--- a/tests/spec/slider_spec.js
+++ b/tests/spec/slider_spec.js
@@ -1,6 +1,6 @@
 import createMockRaf from 'mock-raf';
 import Slider from '../../src/components/slider/slider';
-import SliderHTML from '../../src/components/slider/slider.html';
+import SliderHTML from '../../html/slider/slider.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test slider', function() {
diff --git a/tests/spec/structured-list_spec.js b/tests/spec/structured-list_spec.js
index cfbbf0358f98..fab10a4a7f2c 100644
--- a/tests/spec/structured-list_spec.js
+++ b/tests/spec/structured-list_spec.js
@@ -1,5 +1,5 @@
 import StructuredList from '../../src/components/structured-list/structured-list';
-import HTML from '../../src/components/structured-list/structured-list--selection.html';
+import HTML from '../../html/structured-list/structured-list--selection.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('StructuredList', function() {
diff --git a/tests/spec/tile_spec.js b/tests/spec/tile_spec.js
index 5bcc4c8ad1af..2b58c461be42 100644
--- a/tests/spec/tile_spec.js
+++ b/tests/spec/tile_spec.js
@@ -1,7 +1,7 @@
 import Tile from '../../src/components/tile/tile';
-import clickableTile from '../../src/components/tile/tile--clickable.html';
-import expandableTile from '../../src/components/tile/tile--expandable.html';
-import selectableTile from '../../src/components/tile/tile--selectable.html';
+import clickableTile from '../../html/tile/tile--clickable.html';
+import expandableTile from '../../html/tile/tile--expandable.html';
+import selectableTile from '../../html/tile/tile--selectable.html';
 import flattenOptions from '../utils/flatten-options';
 
 describe('Test tile', function() {
diff --git a/tests/spec/toolbar_spec.js b/tests/spec/toolbar_spec.js
index 4ccf108d45f7..4d97e55d24a1 100644
--- a/tests/spec/toolbar_spec.js
+++ b/tests/spec/toolbar_spec.js
@@ -1,6 +1,6 @@
 import '../../demo/polyfills/custom-event';
 import Toolbar from '../../src/components/toolbar/toolbar';
-import ToolbarHTML from '../../src/components/toolbar/toolbar.html';
+import ToolbarHTML from '../../html/toolbar/toolbar.html';
 
 describe('Test toolbar', function() {
   describe('Constructor', function() {
diff --git a/tests/spec/tooltip_spec.js b/tests/spec/tooltip_spec.js
index eed7101b32c1..a69495ac3aa3 100644
--- a/tests/spec/tooltip_spec.js
+++ b/tests/spec/tooltip_spec.js
@@ -1,5 +1,5 @@
 import Tooltip from '../../src/components/tooltip/tooltip';
-import HTML from '../../src/components/tooltip/tooltip.html';
+import HTML from '../../html/tooltip/tooltip.html';
 
 describe('Test tooltip', function() {
   describe('Constructor', function() {
diff --git a/tools/ci-check.sh b/tools/ci-check.sh
index b3e69fface40..0770e1e32fd7 100755
--- a/tools/ci-check.sh
+++ b/tools/ci-check.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-yarn lint
 yarn build
+yarn lint
 yarn test:unit -- -b ChromeHeadless_Travis -b Firefox
 if [[ -n "$RUN_EACH" ]]; then find tests/spec -name "*.js" ! -name left-nav_spec.js -print0 | xargs -0 -n 1 -P 1 yarn test:unit -- -d -f; fi
 if [[ -n "$AAT_TOKEN" ]]; then yarn test:a11y; fi
diff --git a/tools/templates.js b/tools/templates.js
new file mode 100644
index 000000000000..6e7a87d5e53a
--- /dev/null
+++ b/tools/templates.js
@@ -0,0 +1,114 @@
+'use strict';
+
+const globby = require('globby');
+const { promisify } = require('bluebird');
+const fs = require('fs');
+const path = require('path');
+const expressHandlebars = require('express-handlebars');
+const helpers = require('handlebars-helpers');
+const Fractal = require('@frctl/fractal');
+
+const handlebars = expressHandlebars.create({
+  defaultLayout: 'demo-nav',
+  layoutsDir: path.resolve(__dirname, '../demo/views/layouts'),
+  extname: '.hbs',
+});
+
+const Handlebars = handlebars.handlebars;
+helpers();
+
+const readFile = promisify(fs.readFile);
+
+/**
+ * @param {string} glob A glob.
+ * @returns {Set<string, string>} A set of file contents matching the given glob, keyed by the basename of the file.
+ */
+const getContents = glob =>
+  globby(glob).then(filePaths => {
+    if (filePaths.length === 0) {
+      return undefined;
+    }
+    const contents = new Map();
+    return Promise.all(
+      filePaths.map(filePath =>
+        readFile(filePath, { encoding: 'utf8' }).then(content => {
+          contents.set(path.basename(filePath, '.hbs'), content);
+        })
+      )
+    ).then(() => contents);
+  });
+
+/**
+ * Loads Handlebars templates and compiles them.
+ * @param {string} glob A glob.
+ * @returns {Set<string, string>} A set of file contents matching the given glob, keyed by the basename of the file.
+ */
+const loadContents = glob =>
+  getContents(glob).then(contents => {
+    contents.forEach((content, templateName) => {
+      Handlebars.registerPartial(templateName, content);
+      contents.set(templateName, Handlebars.compile(content));
+    });
+    return contents;
+  });
+
+const fractal = Fractal.create();
+fractal.components.set('path', path.join(__dirname, '../src/components'));
+fractal.components.set('ext', '.hbs');
+fractal.docs.set('path', path.join(__dirname, '../docs'));
+
+const promiseCache = Promise.all([fractal.load(), loadContents(path.resolve(__dirname, '../{demo,src}/**/*.hbs'))]).then(
+  ([sources, contents]) => {
+    const [componentSource, docSource] = sources;
+    return {
+      componentSource,
+      docSource,
+      contents,
+    };
+  }
+);
+
+/**
+ * @param {Object} [options] The options.
+ * @param {string} [options.preview] The preview Handlebars template name to force. Useful to force an empty preview.
+ * @param {string} [options.defaultPreview] The preview Handlebars template name working as the default one.
+ * @param {boolean} [options.concat] Setting `true` here returns rendered contents all concatenated, instead of returning a map.
+ * @param {string} [handle]
+ *   The internal component name seen in Fractal.
+ *   Can be of a component or of a variant, or left empty.
+ *   Leaving `handle` empty renders all components.
+ * @returns {string|Map<Variant, string>} The list of rendered template, keyed by Fractal `Variant` object.
+ */
+const renderComponent = ({ preview, defaultPreview, concat } = {}, handle) =>
+  promiseCache.then(({ componentSource, contents }) => {
+    const renderedItems = new Map();
+    componentSource.forEach(metadata => {
+      const items = metadata.isCollection ? metadata : !metadata.isCollated && metadata.variants && metadata.variants();
+      if (items) {
+        const filteredItems = !handle || handle === metadata.handle ? items : items.filter(item => handle === item.handle);
+        filteredItems.forEach(item => {
+          const { handle: itemHandle, baseHandle, context } = item;
+          const template = contents.get(itemHandle) || contents.get(baseHandle);
+          if (template) {
+            const body = template(context);
+            const layoutTemplate = contents.get(preview || item.preview || defaultPreview);
+            renderedItems.set(item, !layoutTemplate ? body : layoutTemplate(Object.assign({ body }, context)));
+          }
+        });
+      }
+    });
+    if (!concat) {
+      return renderedItems;
+    }
+    const accumulated = [];
+    renderedItems.forEach(rendered => {
+      accumulated.push(rendered);
+    });
+    return accumulated.length > 0 ? accumulated.join('\n') : undefined;
+  });
+
+module.exports = {
+  promiseCache,
+  render: renderComponent,
+  handlebars,
+};
diff --git a/yarn.lock b/yarn.lock
index 40c509612f9c..9327c493bad6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -101,13 +101,6 @@
     conventional-changelog "0.0.17"
     github-url-from-git "^1.4.0"
 
-JSONStream@^1.0.3:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -123,11 +116,11 @@ accepts@1.3.3:
     mime-types "~2.1.11"
     negotiator "0.6.1"
 
-accepts@~1.3.3, accepts@~1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+accepts@~1.3.3, accepts@~1.3.4, accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
   dependencies:
-    mime-types "~2.1.16"
+    mime-types "~2.1.18"
     negotiator "0.6.1"
 
 acorn-dynamic-import@^2.0.0:
@@ -142,13 +135,6 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn-node@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b"
-  dependencies:
-    acorn "^5.4.1"
-    xtend "^4.0.1"
-
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -157,9 +143,9 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.2.1, acorn@^5.4.0, acorn@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
+acorn@^5.0.0, acorn@^5.2.1, acorn@^5.5.0:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
 
 adaro@1.0.4:
   version "1.0.4"
@@ -178,10 +164,6 @@ addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
 
-adm-zip@^0.4.7:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"
-
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
@@ -198,10 +180,10 @@ ajv-keywords@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
 ajv-keywords@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.7.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
@@ -218,12 +200,13 @@ ajv@^5.1.0:
     json-schema-traverse "^0.3.0"
 
 ajv@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
+    uri-js "^3.0.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -263,12 +246,122 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
+ansi-bgblack@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bgblack/-/ansi-bgblack-0.1.1.tgz#a68ba5007887701b6aafbe3fa0dadfdfa8ee3ca2"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bgblue@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bgblue/-/ansi-bgblue-0.1.1.tgz#67bdc04edc9b9b5278969da196dea3d75c8c3613"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bgcyan@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bgcyan/-/ansi-bgcyan-0.1.1.tgz#58489425600bde9f5507068dd969ebfdb50fe768"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bggreen@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bggreen/-/ansi-bggreen-0.1.1.tgz#4e3191248529943f4321e96bf131d1c13816af49"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bgmagenta@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bgmagenta/-/ansi-bgmagenta-0.1.1.tgz#9b28432c076eaa999418672a3efbe19391c2c7a1"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bgred@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bgred/-/ansi-bgred-0.1.1.tgz#a76f92838382ba43290a6c1778424f984d6f1041"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bgwhite@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bgwhite/-/ansi-bgwhite-0.1.1.tgz#6504651377a58a6ececd0331994e480258e11ba8"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bgyellow@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bgyellow/-/ansi-bgyellow-0.1.1.tgz#c3fe2eb08cd476648029e6874d15a0b38f61d44f"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-black@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-black/-/ansi-black-0.1.1.tgz#f6185e889360b2545a1ec50c0bf063fc43032453"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-blue@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-blue/-/ansi-blue-0.1.1.tgz#15b804990e92fc9ca8c5476ce8f699777c21edbf"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-bold@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-bold/-/ansi-bold-0.1.1.tgz#3e63950af5acc2ae2e670e6f67deb115d1a5f505"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-colors@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-0.2.0.tgz#72c31de2a0d9a2ccd0cac30cc9823eeb2f6434b5"
+  dependencies:
+    ansi-bgblack "^0.1.1"
+    ansi-bgblue "^0.1.1"
+    ansi-bgcyan "^0.1.1"
+    ansi-bggreen "^0.1.1"
+    ansi-bgmagenta "^0.1.1"
+    ansi-bgred "^0.1.1"
+    ansi-bgwhite "^0.1.1"
+    ansi-bgyellow "^0.1.1"
+    ansi-black "^0.1.1"
+    ansi-blue "^0.1.1"
+    ansi-bold "^0.1.1"
+    ansi-cyan "^0.1.1"
+    ansi-dim "^0.1.1"
+    ansi-gray "^0.1.1"
+    ansi-green "^0.1.1"
+    ansi-grey "^0.1.1"
+    ansi-hidden "^0.1.1"
+    ansi-inverse "^0.1.1"
+    ansi-italic "^0.1.1"
+    ansi-magenta "^0.1.1"
+    ansi-red "^0.1.1"
+    ansi-reset "^0.1.1"
+    ansi-strikethrough "^0.1.1"
+    ansi-underline "^0.1.1"
+    ansi-white "^0.1.1"
+    ansi-yellow "^0.1.1"
+    lazy-cache "^2.0.1"
+
 ansi-colors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.0.1.tgz#e94c6c306005af8b482240241e2f3dea4b855ff3"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
   dependencies:
     ansi-wrap "^0.1.0"
 
+ansi-cyan@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-dim@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-dim/-/ansi-dim-0.1.1.tgz#40de4c603aa8086d8e7a86b8ff998d5c36eefd6c"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
@@ -279,10 +372,46 @@ ansi-gray@^0.1.1:
   dependencies:
     ansi-wrap "0.1.0"
 
+ansi-green@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-green/-/ansi-green-0.1.1.tgz#8a5d9a979e458d57c40e33580b37390b8e10d0f7"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-grey@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-grey/-/ansi-grey-0.1.1.tgz#59d98b6ac2ba19f8a51798e9853fba78339a33c1"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-hidden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-hidden/-/ansi-hidden-0.1.1.tgz#ed6a4c498d2bb7cbb289dbf2a8d1dcc8567fae0f"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
+ansi-inverse@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-inverse/-/ansi-inverse-0.1.1.tgz#b6af45826fe826bfb528a6c79885794355ccd269"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-italic@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-italic/-/ansi-italic-0.1.1.tgz#104743463f625c142a036739cf85eda688986f23"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-magenta@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-magenta/-/ansi-magenta-0.1.1.tgz#063b5ba16fb3f23e1cfda2b07c0a89de11e430ae"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-red@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
@@ -297,26 +426,50 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
+ansi-reset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-reset/-/ansi-reset-0.1.1.tgz#e7e71292c3c7ddcd4d62ef4a6c7c05980911c3b7"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-strikethrough@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-strikethrough/-/ansi-strikethrough-0.1.1.tgz#d84877140b2cff07d1c93ebce69904f68885e568"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
     color-convert "^1.9.0"
 
+ansi-underline@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-underline/-/ansi-underline-0.1.1.tgz#dfc920f4c97b5977ea162df8ffb988308aaa71a4"
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-white@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-white/-/ansi-white-0.1.1.tgz#9c77b7c193c5ee992e6011d36ec4c921b4578944"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
+ansi-yellow@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-yellow/-/ansi-yellow-0.1.1.tgz#cb9356f2f46c732f0e3199e6102955a77da83c1d"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi@^0.3.0, ansi@~0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
@@ -371,6 +524,13 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@~0.1.15:
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-0.1.16.tgz#cfd01e0fbba3d6caed049fbd758d40f65196f57c"
+  dependencies:
+    underscore "~1.7.0"
+    underscore.string "~2.4.0"
+
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -397,10 +557,6 @@ array-each@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
 
-array-filter@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
-
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -416,14 +572,6 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
-array-map@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
-
-array-reduce@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
-
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
@@ -432,6 +580,14 @@ array-slice@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
 
+array-sort@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-0.1.4.tgz#662855eaeb671b4188df4451b2f24a0753992b23"
+  dependencies:
+    default-compare "^1.0.0"
+    get-value "^2.0.6"
+    kind-of "^5.0.2"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -486,7 +642,7 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert@^1.1.1, assert@^1.4.0:
+assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
@@ -501,14 +657,8 @@ ast-types@0.9.6:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
 
 ast-types@0.x.x:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.10.2.tgz#aef76a04fde54634976fc94defaad1a67e2eadb0"
-
-astw@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917"
-  dependencies:
-    acorn "^4.0.3"
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
 
 async-each-series@0.1.1, async-each-series@^0.1.1:
   version "0.1.1"
@@ -534,7 +684,7 @@ async@1.5.2, async@1.x, async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.0.1, async@^2.1.2:
+async@^2.0.0, async@^2.0.1, async@^2.1.2:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -555,8 +705,12 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
 atob@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
+
+autolinker@~0.15.0:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.15.3.tgz#342417d8f2f3461b14cf09088d5edf8791dc9832"
 
 autoprefixer@^6.0.0, autoprefixer@^6.3.1:
   version "6.7.7"
@@ -570,14 +724,14 @@ autoprefixer@^6.0.0, autoprefixer@^6.3.1:
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^8.2.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.3.0.tgz#22ac5151c3c8946bb8f75f337d5c5042c0ec6404"
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.4.1.tgz#c6b30001ea4b3daa6b611e50071f62dd24beb564"
   dependencies:
-    browserslist "^3.2.4"
-    caniuse-lite "^1.0.30000830"
+    browserslist "^3.2.6"
+    caniuse-lite "^1.0.30000832"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.21"
+    postcss "^6.0.22"
     postcss-value-parser "^3.2.3"
 
 aws-sign2@~0.6.0:
@@ -589,8 +743,8 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
 aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
 axe-core@^2.0.7:
   version "2.6.1"
@@ -600,6 +754,13 @@ axe-webdriverjs@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/axe-webdriverjs/-/axe-webdriverjs-0.5.0.tgz#8e314941f0642001d4802d812dc833b580a008ce"
 
+axios@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
+  dependencies:
+    follow-redirects "^1.2.5"
+    is-buffer "^1.1.5"
+
 axios@^0.15.3:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
@@ -615,8 +776,8 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     js-tokens "^3.0.2"
 
 babel-core@^6.22.0, babel-core@^6.23.1, babel-core@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   dependencies:
     babel-code-frame "^6.26.0"
     babel-generator "^6.26.0"
@@ -628,15 +789,15 @@ babel-core@^6.22.0, babel-core@^6.23.1, babel-core@^6.26.0:
     babel-traverse "^6.26.0"
     babel-types "^6.26.0"
     babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
     json5 "^0.5.1"
     lodash "^4.17.4"
     minimatch "^3.0.4"
     path-is-absolute "^1.0.1"
-    private "^0.1.7"
+    private "^0.1.8"
     slash "^1.0.0"
-    source-map "^0.5.6"
+    source-map "^0.5.7"
 
 babel-eslint@^7.0.0:
   version "7.2.3"
@@ -770,8 +931,8 @@ babel-helpers@^6.24.1:
     babel-template "^6.24.1"
 
 babel-loader@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -942,8 +1103,8 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
     babel-template "^6.24.1"
 
 babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
   dependencies:
     babel-plugin-transform-strict-mode "^6.24.1"
     babel-runtime "^6.26.0"
@@ -1166,7 +1327,7 @@ babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
@@ -1231,8 +1392,8 @@ base64-arraybuffer@0.1.5:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
 
 base64-js@^1.0.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
 
 base64id@1.0.0:
   version "1.0.0"
@@ -1400,13 +1561,12 @@ braces@^1.8.1, braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-braces@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.0.tgz#a46941cb5fb492156b3d6a656e06c35364e3e66e"
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
-    define-property "^1.0.0"
     extend-shallow "^2.0.1"
     fill-range "^4.0.0"
     isobject "^3.0.1"
@@ -1420,23 +1580,6 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
-browser-pack@^6.0.1:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.4.tgz#9a73beb3b48f9e36868be007b64400102c04a99f"
-  dependencies:
-    JSONStream "^1.0.3"
-    combine-source-map "~0.8.0"
-    defined "^1.0.0"
-    safe-buffer "^5.1.1"
-    through2 "^2.0.0"
-    umd "^3.0.0"
-
-browser-resolve@^1.11.0, browser-resolve@^1.7.0:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
-  dependencies:
-    resolve "1.1.7"
-
 browser-sync-client@^2.3.3:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.5.1.tgz#ec1ad69a49c2e2d4b645b18b1c06c29b3d9af8eb"
@@ -1466,8 +1609,8 @@ browser-sync-ui@v1.0.1:
     stream-throttle "^0.1.3"
 
 browser-sync@^2.18.13:
-  version "2.23.6"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.23.6.tgz#ed0721c92e5b98c71b7bf839b39092ac9f220650"
+  version "2.24.4"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.24.4.tgz#e6e1544c8a6c088dc76f49f7059bc3df967e0ae0"
   dependencies:
     browser-sync-ui v1.0.1
     bs-recipes "1.3.4"
@@ -1477,24 +1620,24 @@ browser-sync@^2.18.13:
     dev-ip "^1.0.1"
     easy-extender "2.3.2"
     eazy-logger "3.0.2"
-    emitter-steward "^1.0.0"
     etag "^1.8.1"
     fresh "^0.5.2"
     fs-extra "3.0.1"
     http-proxy "1.15.2"
     immutable "3.8.2"
-    localtunnel "1.8.3"
+    localtunnel "1.9.0"
     micromatch "2.3.11"
     opn "4.0.2"
     portscanner "2.1.1"
-    qs "6.2.1"
+    qs "6.2.3"
+    raw-body "^2.3.2"
     resp-modifier "6.0.2"
     rx "4.1.0"
     serve-index "1.8.0"
-    serve-static "1.12.2"
+    serve-static "1.13.2"
     server-destroy "1.0.1"
     socket.io "2.0.4"
-    ua-parser-js "0.7.12"
+    ua-parser-js "0.7.17"
     yargs "6.4.0"
 
 browser-sync@~2.10.0:
@@ -1530,8 +1673,8 @@ browser-sync@~2.10.0:
     ucfirst "^1.0.0"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1541,16 +1684,16 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
     safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
     evp_bytestokey "^1.0.0"
 
 browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1575,64 +1718,12 @@ browserify-sign@^4.0.0:
     inherits "^2.0.1"
     parse-asn1 "^5.0.0"
 
-browserify-zlib@^0.2.0, browserify-zlib@~0.2.0:
+browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   dependencies:
     pako "~1.0.5"
 
-browserify@^14.5.0:
-  version "14.5.0"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
-  dependencies:
-    JSONStream "^1.0.3"
-    assert "^1.4.0"
-    browser-pack "^6.0.1"
-    browser-resolve "^1.11.0"
-    browserify-zlib "~0.2.0"
-    buffer "^5.0.2"
-    cached-path-relative "^1.0.0"
-    concat-stream "~1.5.1"
-    console-browserify "^1.1.0"
-    constants-browserify "~1.0.0"
-    crypto-browserify "^3.0.0"
-    defined "^1.0.0"
-    deps-sort "^2.0.0"
-    domain-browser "~1.1.0"
-    duplexer2 "~0.1.2"
-    events "~1.1.0"
-    glob "^7.1.0"
-    has "^1.0.0"
-    htmlescape "^1.1.0"
-    https-browserify "^1.0.0"
-    inherits "~2.0.1"
-    insert-module-globals "^7.0.0"
-    labeled-stream-splicer "^2.0.0"
-    module-deps "^4.0.8"
-    os-browserify "~0.3.0"
-    parents "^1.0.1"
-    path-browserify "~0.0.0"
-    process "~0.11.0"
-    punycode "^1.3.2"
-    querystring-es3 "~0.2.0"
-    read-only-stream "^2.0.0"
-    readable-stream "^2.0.2"
-    resolve "^1.1.4"
-    shasum "^1.0.0"
-    shell-quote "^1.6.1"
-    stream-browserify "^2.0.0"
-    stream-http "^2.0.0"
-    string_decoder "~1.0.0"
-    subarg "^1.0.0"
-    syntax-error "^1.1.1"
-    through2 "^2.0.0"
-    timers-browserify "^1.0.1"
-    tty-browserify "~0.0.0"
-    url "~0.11.0"
-    util "~0.10.1"
-    vm-browserify "~0.0.1"
-    xtend "^4.0.0"
-
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
@@ -1647,17 +1738,21 @@ browserslist@^2.1.2:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
-browserslist@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.4.tgz#fb9ad70fd09875137ae943a31ab815ed76896031"
+browserslist@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.6.tgz#138a44d04a9af64443679191d041f28ce5b965d5"
   dependencies:
-    caniuse-lite "^1.0.30000821"
-    electron-to-chromium "^1.3.41"
+    caniuse-lite "^1.0.30000830"
+    electron-to-chromium "^1.3.42"
 
 bs-recipes@1.3.4, bs-recipes@^1.0.5:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
 
+buffer-from@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+
 buffer-more-ints@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
@@ -1674,13 +1769,6 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-
 buildmail@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
@@ -1693,10 +1781,14 @@ buildmail@4.0.1:
     nodemailer-shared "1.1.0"
     punycode "1.4.1"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
+builtin-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -1719,10 +1811,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cached-path-relative@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
-
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -1764,7 +1852,7 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
-camelcase@^1.0.1, camelcase@^1.0.2, camelcase@^1.2.1:
+camelcase@^1.0.1, camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
@@ -1789,32 +1877,24 @@ caniuse-api@^1.5.2:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000529:
-  version "1.0.30000830"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000830.tgz#6e45255b345649fd15ff59072da1e12bb3de2f13"
-
-caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000808"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000808.tgz#30dfd83009d5704f02dffb37725068ed12a366bb"
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000833"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000833.tgz#2bd7be72a401658d2cbcb8f4d7600deebeb1c676"
 
-caniuse-lite@^1.0.30000792:
-  version "1.0.30000808"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000808.tgz#7d759b5518529ea08b6705a19e70dbf401628ffc"
-
-caniuse-lite@^1.0.30000821, caniuse-lite@^1.0.30000830:
-  version "1.0.30000830"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328"
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000830, caniuse-lite@^1.0.30000832:
+  version "1.0.30000833"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000833.tgz#98e84fcdb4399c6fa0b0fd41490d3217ac7802b4"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
 
 carbon-addons-cloud@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/carbon-addons-cloud/-/carbon-addons-cloud-1.1.3.tgz#3a7aabb3e6782d041e28357fca5767de783b51bf"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/carbon-addons-cloud/-/carbon-addons-cloud-1.3.0.tgz#dcb2a602e0b0286305057c13d191cd34306e5248"
   dependencies:
-    carbon-components "^8.1.13"
-    carbon-components-react "^5.0.0"
+    carbon-components "^8.11.1"
+    carbon-components-react "^5.19.0"
     carbon-icons "^6.2.0"
     classnames "^2.2.5"
     prop-types "^15.6.0"
@@ -1822,21 +1902,23 @@ carbon-addons-cloud@^1.1.0:
     react-dom "^16.1.0"
     window-or-global "^1.0.1"
 
-carbon-components-react@^5.0.0, carbon-components-react@^5.8.0:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-5.20.0.tgz#2b2d73beb64a7c47d50bd9f0f5a570a45f6d1965"
+carbon-components-react@^5.19.0, carbon-components-react@^5.8.0:
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-5.45.0.tgz#c1370f801040dda6090603afa1a979486f844a72"
   dependencies:
     classnames "2.2.5"
     downshift "^1.23.2"
-    flatpickr "4.3.0"
+    flatpickr "4.4.1"
+    invariant "^2.2.3"
     lodash.debounce "^4.0.8"
     lodash.isequal "^4.5.0"
+    lodash.omit "^4.5.0"
     warning "3.0.0"
     window-or-global "^1.0.1"
 
-carbon-components@^8.1.13:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-8.12.0.tgz#307a49519109a800ea623a6f2b402414e1e4898c"
+carbon-components@^8.11.1:
+  version "8.18.22"
+  resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-8.18.22.tgz#e55ee0872c568aa5b203dc38dd8d1b4bef053af8"
   dependencies:
     carbon-icons "^6.0.4"
     flatpickr "2.6.3"
@@ -1844,8 +1926,8 @@ carbon-components@^8.1.13:
     warning "^3.0.0"
 
 carbon-icons@^6.0.4, carbon-icons@^6.2.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/carbon-icons/-/carbon-icons-6.3.1.tgz#8e2d8f7f5feacdff21b71d439159db2473bc4fa8"
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/carbon-icons/-/carbon-icons-6.3.2.tgz#2cc942225442b0d5c02593e344b50c7ec22edf28"
 
 caseless@~0.11.0:
   version "0.11.0"
@@ -1878,17 +1960,9 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
-  dependencies:
-    ansi-styles "^3.2.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.2.0"
-
-chalk@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52"
+chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -1909,7 +1983,7 @@ chokidar@1.4.1:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chokidar@1.7.0, chokidar@^1.2.0, chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.7.0:
+chokidar@1.7.0, chokidar@^1.2.0, chokidar@^1.4.1, chokidar@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1925,8 +1999,8 @@ chokidar@1.7.0, chokidar@^1.2.0, chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.7
     fsevents "^1.0.0"
 
 chokidar@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -1940,7 +2014,7 @@ chokidar@^2.0.2:
     readdirp "^2.0.0"
     upath "^1.0.0"
   optionalDependencies:
-    fsevents "^1.0.0"
+    fsevents "^1.1.2"
 
 chokidar@~1.5.1:
   version "1.5.2"
@@ -1957,19 +2031,23 @@ chokidar@~1.5.1:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chromedriver@2.25.1:
-  version "2.25.1"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-2.25.1.tgz#04de1a9242ffe3182786410dbefaae147435e67e"
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
+chromedriver@2.38.0:
+  version "2.38.0"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-2.38.0.tgz#76c532c66922337f877522c27c8092ed2db9496e"
   dependencies:
-    adm-zip "^0.4.7"
-    kew "^0.5.0"
-    mkdirp "^0.5.0"
-    npmconf "^2.1.1"
-    rimraf "^2.0.3"
+    del "^3.0.0"
+    extract-zip "^1.6.5"
+    kew "^0.7.0"
+    mkdirp "^0.5.1"
+    request "^2.83.0"
 
 ci-info@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -1983,8 +2061,8 @@ circular-json@^0.3.1:
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
 circular-json@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.1.tgz#b8942a09e535863dc21b04417a91971e1d9cd91f"
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.3.tgz#eb1b783333bb125784647d1a76377caf1499efb1"
 
 clap@^1.0.9:
   version "1.2.3"
@@ -2006,8 +2084,8 @@ classnames@2.2.5, classnames@^2.2.0, classnames@^2.2.5:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
 clean-css@4.1.x:
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.9.tgz#35cee8ae7687a49b98034f70de00c4edd3826301"
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
   dependencies:
     source-map "0.5.x"
 
@@ -2090,8 +2168,8 @@ clone@^0.2.0:
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
 
 clone@^1.0.0, clone@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
 co@^4.6.0:
   version "4.6.0"
@@ -2158,14 +2236,18 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@^1.0.3, colors@^1.1.0, colors@^1.1.2, colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+colors@^1.0.3, colors@^1.1.0, colors@^1.1.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.3.tgz#1b152a9c4f6c9f74bc4bb96233ad0b7983b79744"
 
 colors@~0.6.0-1:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
 
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
 columnify@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
@@ -2179,35 +2261,13 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
-combine-source-map@~0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.7.2.tgz#0870312856b307a87cc4ac486f3a9a62aeccc09e"
-  dependencies:
-    convert-source-map "~1.1.0"
-    inline-source-map "~0.6.0"
-    lodash.memoize "~3.0.3"
-    source-map "~0.5.3"
-
-combine-source-map@~0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b"
-  dependencies:
-    convert-source-map "~1.1.0"
-    inline-source-map "~0.6.0"
-    lodash.memoize "~3.0.3"
-    source-map "~0.5.3"
-
 combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.14.x, commander@^2.13.0, commander@^2.2.0, commander@^2.8.1, commander@^2.9.0, commander@~2.14.1:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
-
-commander@^2.11.0:
+commander@2.15.x, commander@^2.11.0, commander@^2.13.0, commander@^2.2.0, commander@^2.8.1, commander@^2.9.0, commander@~2.15.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
@@ -2245,7 +2305,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.6.0, concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2:
+concat-stream@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -2253,13 +2313,14 @@ concat-stream@1.6.0, concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@~1.5.0, concat-stream@~1.5.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
 
 config-chain@~1.1.5, config-chain@~1.1.8:
   version "1.1.11"
@@ -2296,8 +2357,8 @@ configstore@^2.0.0:
     xdg-basedir "^2.0.0"
 
 configstore@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -2346,7 +2407,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
-constants-browserify@^1.0.0, constants-browserify@~1.0.0:
+constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
@@ -2376,14 +2437,10 @@ conventional-commit-types@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/conventional-commit-types/-/conventional-commit-types-2.2.0.tgz#5db95739d6c212acbe7b6f656a11b940baa68946"
 
-convert-source-map@^1.1.1, convert-source-map@^1.5.0:
+convert-source-map@^1.1.1, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
-convert-source-map@~1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
-
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -2407,8 +2464,8 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
 core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
 
 core-js@~2.3.0:
   version "2.3.0"
@@ -2440,8 +2497,8 @@ cosmiconfig@^4.0.0:
     require-from-string "^2.0.1"
 
 create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.1.tgz#44223dfed533193ba5ba54e0df5709b89acf1f82"
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2452,18 +2509,28 @@ create-error-class@^3.0.0, create-error-class@^3.0.1:
   dependencies:
     capture-stack-trace "^1.0.0"
 
+create-frame@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/create-frame/-/create-frame-1.0.0.tgz#8b95f2691e3249b6080443e33d0bad9f8f6975aa"
+  dependencies:
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    isobject "^3.0.0"
+    lazy-cache "^2.0.2"
+
 create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
-    ripemd160 "^2.0.0"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2499,7 +2566,7 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
-crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
+crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   dependencies:
@@ -2655,6 +2722,12 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
+date.js@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/date.js/-/date.js-0.3.3.tgz#ef1e92332f507a638795dbb985e951882e50bbda"
+  dependencies:
+    debug "~3.1.0"
+
 dateformat@^1.0.11, dateformat@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
@@ -2666,7 +2739,7 @@ dateformat@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
 
-debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
+debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -2684,19 +2757,13 @@ debug@2.3.3:
   dependencies:
     ms "0.7.2"
 
-debug@2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
-  dependencies:
-    ms "0.7.3"
-
 debug@2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
+debug@^3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -2734,14 +2801,20 @@ deep-equal@~0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-0.1.2.tgz#b246c2b80a570a47c11be1d9bd1070ec878b87ce"
 
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+deep-extend@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+default-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  dependencies:
+    kind-of "^5.0.2"
+
 defaults@^1.0.0, defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -2767,6 +2840,13 @@ define-property@^1.0.0:
   dependencies:
     is-descriptor "^1.0.0"
 
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -2795,6 +2875,17 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
 del@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.0.2.tgz#6cdc68db00282b92d8e82a0ed9fff1d333193424"
@@ -2819,7 +2910,7 @@ depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
-depd@~1.1.0, depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
@@ -2827,15 +2918,6 @@ deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
 
-deps-sort@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
-  dependencies:
-    JSONStream "^1.0.3"
-    shasum "^1.0.0"
-    subarg "^1.0.0"
-    through2 "^2.0.0"
-
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -2861,13 +2943,6 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
-detective@^4.0.0:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
-  dependencies:
-    acorn "^5.2.1"
-    defined "^1.0.0"
-
 dev-ip@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
@@ -2884,12 +2959,12 @@ di@^0.0.1:
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
 diff@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
 diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2928,10 +3003,6 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domain-browser@~1.1.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
-
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
@@ -2970,8 +3041,8 @@ double-ended-queue@^2.1.0-0:
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
 
 downshift@^1.23.2:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/downshift/-/downshift-1.28.0.tgz#4d2d153ee6a45fcdba0a7121a7858aff42dd0bf3"
+  version "1.31.14"
+  resolved "https://registry.yarnpkg.com/downshift/-/downshift-1.31.14.tgz#98b04614cad2abc4297d0d02b50ff2c48b2625e7"
 
 duplexer2@0.0.2:
   version "0.0.2"
@@ -2979,7 +3050,7 @@ duplexer2@0.0.2:
   dependencies:
     readable-stream "~1.1.9"
 
-duplexer2@^0.1.2, duplexer2@^0.1.4, duplexer2@~0.1.0, duplexer2@~0.1.2:
+duplexer2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   dependencies:
@@ -2994,8 +3065,8 @@ duplexer@^0.1.1, duplexer@~0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
 duplexify@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3057,13 +3128,9 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
-  version "1.3.33"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545"
-
-electron-to-chromium@^1.3.41:
-  version "1.3.42"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9"
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.42:
+  version "1.3.45"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -3129,12 +3196,12 @@ engine.io-client@~1.8.4:
     yeast "0.1.2"
 
 engine.io-client@~3.1.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.4.tgz#4fcf1370b47163bd2ce9be2733972430350d4ea1"
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
-    debug "~2.6.9"
+    debug "~3.1.0"
     engine.io-parser "~2.1.1"
     has-cors "1.1.0"
     indexof "0.0.1"
@@ -3177,17 +3244,17 @@ engine.io@~1.8.4:
     ws "~1.1.5"
 
 engine.io@~3.1.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.4.tgz#3d0211b70a552ce841ffc7da8627b301a9a4162e"
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
   dependencies:
-    accepts "1.3.3"
+    accepts "~1.3.4"
     base64id "1.0.0"
     cookie "0.3.1"
-    debug "~2.6.9"
+    debug "~3.1.0"
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
   optionalDependencies:
-    uws "~0.14.4"
+    uws "~9.14.0"
 
 enhanced-resolve@^3.4.0:
   version "3.4.1"
@@ -3198,7 +3265,7 @@ enhanced-resolve@^3.4.0:
     object-assign "^4.0.1"
     tapable "^0.2.7"
 
-ent@~2.2.0:
+ent@^2.2.0, ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
 
@@ -3218,9 +3285,13 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+error-symbol@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/error-symbol/-/error-symbol-0.1.0.tgz#0a4dae37d600d15a29ba453d8ef920f1844333f6"
+
 es-abstract@^1.7.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -3237,11 +3308,12 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.38"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3"
+  version "0.10.42"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
+    next-tick "1"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
@@ -3327,15 +3399,15 @@ escodegen@1.8.x:
     source-map "~0.2.0"
 
 escodegen@1.x.x:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.5.6"
+    source-map "~0.6.1"
 
 escope@^3.6.0:
   version "3.6.0"
@@ -3385,33 +3457,34 @@ eslint-import-resolver-node@^0.3.1:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-module-utils@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+eslint-module-utils@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
   dependencies:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
 eslint-plugin-import@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz#15aeea37a67499d848e8e981806d4627b5503816"
   dependencies:
-    builtin-modules "^1.1.1"
     contains-path "^0.1.0"
     debug "^2.6.8"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.1"
-    eslint-module-utils "^2.1.1"
+    eslint-module-utils "^2.2.0"
     has "^1.0.1"
-    lodash.cond "^4.3.0"
+    lodash "^4.17.4"
     minimatch "^3.0.3"
     read-pkg-up "^2.0.0"
+    resolve "^1.6.0"
 
 eslint-plugin-jsdoc@^3.3.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-3.4.1.tgz#aea72244a71dcffa3524615f661478f01bbbd826"
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-3.6.3.tgz#8ac4b962964c2893fb0f58c621904203f07bd462"
   dependencies:
     comment-parser "^0.4.2"
+    jsdoctypeparser "^2.0.0-alpha-8"
     lodash "^4.17.4"
 
 eslint-plugin-jsx-a11y@^2.0.0:
@@ -3430,8 +3503,8 @@ eslint-plugin-prettier@^2.3.1:
     jest-docblock "^21.0.0"
 
 eslint-plugin-react@^7.5.0:
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.6.1.tgz#5d0e908be599f0c02fbf4eef0c7ed6f29dff7633"
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
   dependencies:
     doctrine "^2.0.2"
     has "^1.0.1"
@@ -3521,10 +3594,10 @@ eslint@^3.0.0:
     user-home "^2.0.0"
 
 espree@^3.1.6, espree@^3.4.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.3.tgz#931e0af64e7fbbed26b050a29daad1fc64799fa6"
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
-    acorn "^5.4.0"
+    acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
 esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
@@ -3540,17 +3613,16 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
 esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
   dependencies:
     estraverse "^4.1.0"
-    object-assign "^4.0.1"
 
 estraverse@^1.9.1:
   version "1.9.3"
@@ -3576,7 +3648,7 @@ esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
-etag@^1.7.0, etag@^1.8.1, etag@~1.8.0, etag@~1.8.1:
+etag@^1.7.0, etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
 
@@ -3589,7 +3661,7 @@ event-emitter@~0.3.5:
 
 event-stream@^3.2.1, event-stream@^3.3.0, event-stream@~3.3.0:
   version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
+  resolved "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
   dependencies:
     duplexer "~0.1.1"
     from "~0"
@@ -3603,7 +3675,11 @@ eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
 
-events@^1.0.0, events@~1.1.0:
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+
+events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
@@ -3691,6 +3767,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+express-handlebars@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-3.0.0.tgz#80a070bb819b09e4af2ca6d0780f75ce05e75c2f"
+  dependencies:
+    glob "^6.0.4"
+    graceful-fs "^4.1.2"
+    handlebars "^4.0.5"
+    object.assign "^4.0.3"
+    promise "^7.0.0"
+
 express@2.5.x:
   version "2.5.11"
   resolved "https://registry.yarnpkg.com/express/-/express-2.5.11.tgz#4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"
@@ -3700,7 +3786,7 @@ express@2.5.x:
     mkdirp "0.3.0"
     qs "0.4.x"
 
-express@4.16.2, express@^4.14.0:
+express@4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
   dependencies:
@@ -3735,6 +3821,41 @@ express@4.16.2, express@^4.14.0:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.14.0:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.2"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.3"
+    qs "6.5.1"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.1"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3766,7 +3887,7 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extglob@^2.0.2:
+extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
   dependencies:
@@ -3796,6 +3917,12 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+"falsey@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/falsey/-/falsey-0.3.2.tgz#b21c90c5c34660fc192bf909575db95b6880d597"
+  dependencies:
+    kind-of "^5.0.2"
+
 fancy-log@^1.1.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
@@ -3805,8 +3932,8 @@ fancy-log@^1.1.0:
     time-stamp "^1.0.0"
 
 fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
 
 fast-diff@^1.1.1:
   version "1.1.2"
@@ -3878,8 +4005,8 @@ filename-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 filesize@^3.5.6:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa"
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
 
 fill-range@^2.1.0:
   version "2.2.3"
@@ -3926,6 +4053,18 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -4002,9 +4141,9 @@ flatpickr@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-2.6.3.tgz#457357532deb135f3da64b425bf4435737961564"
 
-flatpickr@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.3.0.tgz#9cc3aa8c9a2bde1ea431be0f4a74f40f9bad79e3"
+flatpickr@4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.4.1.tgz#894255e33c2bed93f48171f8eb5980a79b76ab1d"
 
 flatten@^1.0.2:
   version "1.0.2"
@@ -4023,6 +4162,12 @@ follow-redirects@1.0.0:
   dependencies:
     debug "^2.2.0"
 
+follow-redirects@^1.0.0, follow-redirects@^1.2.5:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa"
+  dependencies:
+    debug "^3.1.0"
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -4113,10 +4258,6 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-fresh@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
-
 fresh@0.5.2, fresh@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -4150,6 +4291,10 @@ fs-access@^1.0.0:
   dependencies:
     null-check "^1.0.0"
 
+fs-exists-sync@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+
 fs-extra@3.0.1, fs-extra@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
@@ -4186,6 +4331,12 @@ fs-extra@^1.0.0:
     jsonfile "^2.1.0"
     klaw "^1.0.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 fs-path@0.0.22:
   version "0.0.22"
   resolved "https://registry.yarnpkg.com/fs-path/-/fs-path-0.0.22.tgz#4d39409447b3623a6f9d3ece1a63520529ff57f5"
@@ -4196,22 +4347,14 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+fsevents@^1.0.0, fsevents@^1.1.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.3.tgz#08292982e7059f6674c93d8b829c1e8604979ac0"
   dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
+    nan "^2.9.2"
+    node-pre-gyp "^0.9.0"
 
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
@@ -4280,6 +4423,13 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
+get-object@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
+  dependencies:
+    is-number "^2.0.2"
+    isobject "^0.2.0"
+
 get-own-enumerable-property-symbols@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b"
@@ -4414,7 +4564,7 @@ glob@^5.0.15, glob@^5.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^6.0.1:
+glob@^6.0.1, glob@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
   dependencies:
@@ -4424,7 +4574,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -4504,7 +4654,7 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^6.0.0:
+globby@^6.0.0, globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
@@ -4628,13 +4778,13 @@ gulp-autoprefixer@~3.0.1:
     vinyl-sourcemaps-apply "^0.1.3"
 
 gulp-axe-webdriver@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-axe-webdriver/-/gulp-axe-webdriver-1.4.0.tgz#69f0e6040cd16f7303ba95084853850db2ee54c5"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/gulp-axe-webdriver/-/gulp-axe-webdriver-1.4.1.tgz#f2ef2fc83367c65909acfe42e894c29a52422eef"
   dependencies:
     axe-core "^2.0.7"
     axe-webdriverjs "^0.5.0"
     chalk "^1.1.3"
-    chromedriver "2.25.1"
+    chromedriver "2.38.0"
     file-url "^1.1.0"
     fs-extra "^0.30.0"
     fs-path "0.0.22"
@@ -4775,7 +4925,54 @@ gzip-size@^3.0.0:
   dependencies:
     duplexer "^0.1.1"
 
-handlebars@^4.0.1, handlebars@^4.0.5:
+handlebars-helper-create-frame@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/handlebars-helper-create-frame/-/handlebars-helper-create-frame-0.1.0.tgz#8aa51d10aeb6408fcc6605d40d77356288487a03"
+  dependencies:
+    create-frame "^1.0.0"
+    isobject "^3.0.0"
+
+handlebars-helpers@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/handlebars-helpers/-/handlebars-helpers-0.10.0.tgz#663d49e718928eafbead1473419ed7bc24bcd45a"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-sort "^0.1.4"
+    create-frame "^1.0.0"
+    define-property "^1.0.0"
+    "falsey" "^0.3.2"
+    for-in "^1.0.2"
+    for-own "^1.0.0"
+    get-object "^0.2.0"
+    get-value "^2.0.6"
+    handlebars "^4.0.11"
+    handlebars-helper-create-frame "^0.1.0"
+    handlebars-utils "^1.0.6"
+    has-value "^1.0.0"
+    helper-date "^1.0.1"
+    helper-markdown "^1.0.0"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    lazy-cache "^2.0.2"
+    logging-helpers "^1.0.0"
+    micromatch "^3.1.4"
+    relative "^3.0.2"
+    striptags "^3.1.0"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
+handlebars-utils@^1.0.2, handlebars-utils@^1.0.4, handlebars-utils@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
+  dependencies:
+    kind-of "^6.0.0"
+    typeof-article "^0.1.1"
+
+handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.5:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
   dependencies:
@@ -4785,10 +4982,6 @@ handlebars@^4.0.1, handlebars@^4.0.5:
   optionalDependencies:
     uglify-js "^2.6"
 
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -4802,13 +4995,6 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
@@ -4856,6 +5042,10 @@ has-gulplog@^0.1.0:
   dependencies:
     sparkles "^1.0.0"
 
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4887,18 +5077,12 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.0, has@^1.0.1:
+has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
     function-bind "^1.0.2"
 
-hash-base@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
-  dependencies:
-    inherits "^2.0.1"
-
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
@@ -4920,7 +5104,7 @@ hasha@^2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
-hawk@3.1.3, hawk@~3.1.3:
+hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
@@ -4942,7 +5126,32 @@ he@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
-highlight.js@^9.5.0:
+helper-date@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/helper-date/-/helper-date-1.0.1.tgz#12fedea3ad8e44a7ca4c4efb0ff4104a5120cffb"
+  dependencies:
+    date.js "^0.3.1"
+    handlebars-utils "^1.0.4"
+    moment "^2.18.1"
+
+helper-markdown@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/helper-markdown/-/helper-markdown-1.0.0.tgz#ee7e9fc554675007d37eb90f7853b13ce74f3e10"
+  dependencies:
+    handlebars-utils "^1.0.2"
+    highlight.js "^9.12.0"
+    remarkable "^1.7.1"
+
+helper-md@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
+  dependencies:
+    ent "^2.2.0"
+    extend-shallow "^2.0.1"
+    fs-exists-sync "^0.1.0"
+    remarkable "^1.6.2"
+
+highlight.js@^9.12.0, highlight.js@^9.5.0:
   version "9.12.0"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
 
@@ -4983,8 +5192,8 @@ homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.1.5:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
@@ -5005,21 +5214,23 @@ html-loader@^0.5.0:
     object-assign "^4.1.1"
 
 html-minifier@^3.5.8:
-  version "3.5.9"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.9.tgz#74424014b872598d4bb0e20ac420926ec61024b6"
+  version "3.5.15"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0"
   dependencies:
     camel-case "3.0.x"
     clean-css "4.1.x"
-    commander "2.14.x"
+    commander "2.15.x"
     he "1.1.x"
-    ncname "1.0.x"
     param-case "2.1.x"
     relateurl "0.2.x"
     uglify-js "3.3.x"
 
-htmlescape@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
+html-tag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
+  dependencies:
+    is-self-closing "^1.0.1"
+    kind-of "^6.0.0"
 
 htmlparser2@^3.9.0:
   version "3.9.2"
@@ -5040,7 +5251,7 @@ http-basic@^2.5.1:
     concat-stream "^1.4.6"
     http-response-object "^1.0.0"
 
-http-errors@1.6.2, http-errors@~1.6.1, http-errors@~1.6.2:
+http-errors@1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
   dependencies:
@@ -5057,6 +5268,15 @@ http-errors@~1.5.0:
     setprototypeof "1.0.2"
     statuses ">= 1.3.1 < 2"
 
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-proxy-agent@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a"
@@ -5073,11 +5293,12 @@ http-proxy@1.15.2:
     requires-port "1.x.x"
 
 http-proxy@^1.13.0, http-proxy@^1.9.0:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
+    eventemitter3 "^3.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
 
 http-response-object@^1.0.0, http-response-object@^1.1.0:
   version "1.1.0"
@@ -5134,10 +5355,16 @@ iconv-lite@0.4.15:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
-iconv-lite@0.4.19, iconv-lite@~0.4.13:
+iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+  version "0.4.21"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
+  dependencies:
+    safer-buffer "^2.1.0"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -5149,16 +5376,22 @@ icss-utils@^2.1.0:
     postcss "^6.0.1"
 
 ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
 
 ignore-by-default@^1.0.0, ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.1.2, ignore@^3.2.0:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b"
 
 immediate@~3.0.5:
   version "3.0.6"
@@ -5225,6 +5458,10 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
+info-symbol@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/info-symbol/-/info-symbol-0.1.0.tgz#27841d72867ddb4242cd612d79c10633881c6a78"
+
 inherits@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
@@ -5248,12 +5485,6 @@ ink-docstrap@^1.1.4:
     moment "^2.14.1"
     sanitize-html "^1.13.0"
 
-inline-source-map@~0.6.0:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
-  dependencies:
-    source-map "~0.5.3"
-
 inquirer@0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.0.tgz#7448bfa924092af311d47173bbab990cae2bb027"
@@ -5308,26 +5539,13 @@ inquirer@^1.1.2:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-insert-module-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.1.tgz#c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"
-  dependencies:
-    JSONStream "^1.0.3"
-    combine-source-map "~0.7.1"
-    concat-stream "~1.5.1"
-    is-buffer "^1.1.0"
-    lexical-scope "^1.2.0"
-    process "~0.11.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
-
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+invariant@^2.2.2, invariant@^2.2.3:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
@@ -5343,9 +5561,9 @@ ip@^1.1.2, ip@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
-ipaddr.js@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
+ipaddr.js@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
@@ -5380,7 +5598,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.0, is-buffer@^1.1.5:
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -5394,7 +5612,7 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
-is-ci@^1.0.9:
+is-ci@^1.0.10, is-ci@^1.0.9:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
   dependencies:
@@ -5424,7 +5642,7 @@ is-descriptor@^0.1.0:
     is-data-descriptor "^0.1.4"
     kind-of "^5.0.0"
 
-is-descriptor@^1.0.0:
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
   dependencies:
@@ -5446,6 +5664,12 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
+is-even@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
+  dependencies:
+    is-odd "^0.1.2"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -5537,7 +5761,7 @@ is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
 
-is-number@^2.1.0:
+is-number@^2.0.2, is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
@@ -5549,6 +5773,10 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -5559,19 +5787,25 @@ is-observable@^0.2.0:
   dependencies:
     symbol-observable "^0.2.2"
 
-is-odd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
+is-odd@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
   dependencies:
     is-number "^3.0.0"
 
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+  dependencies:
+    is-number "^4.0.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
 
 is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
   dependencies:
     is-path-inside "^1.0.0"
 
@@ -5635,6 +5869,12 @@ is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
 
+is-self-closing@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
+  dependencies:
+    self-closing-tags "^1.0.1"
+
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -5663,11 +5903,11 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-is-windows@^1.0.1:
+is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
-isarray@0.0.1, isarray@~0.0.1:
+isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
@@ -5687,6 +5927,10 @@ isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
+isobject@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -5708,20 +5952,20 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-lib-coverage@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14"
+istanbul-lib-coverage@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
 
 istanbul-lib-instrument@^1.4.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz#84905bf47f7e0b401d6b840da7bad67086b4aab6"
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
     babylon "^6.18.0"
-    istanbul-lib-coverage "^1.1.2"
+    istanbul-lib-coverage "^1.2.0"
     semver "^5.3.0"
 
 istanbul@^0.4.0:
@@ -5798,14 +6042,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.x, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.6.1, js-yaml@^3.8.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.4.3, js-yaml@^3.9.0:
+js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.6.1, js-yaml@^3.8.1, js-yaml@^3.9.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
   dependencies:
@@ -5846,6 +6083,10 @@ jsdoc@^3.4.0:
     taffydb "2.6.2"
     underscore "~1.8.3"
 
+jsdoctypeparser@^2.0.0-alpha-8:
+  version "2.0.0-alpha-8"
+  resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-2.0.0-alpha-8.tgz#baf137fb8e2a558810adcf19d2d2a2f680e90a5f"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -5876,12 +6117,6 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stable-stringify@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
-  dependencies:
-    jsonify "~0.0.0"
-
 json-stringify-safe@5.0.x, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -5910,10 +6145,6 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -5955,12 +6186,12 @@ karma-chrome-launcher@^2.2.0:
     which "^1.2.1"
 
 karma-coverage@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/karma-coverage/-/karma-coverage-1.1.1.tgz#5aff8b39cf6994dc22de4c84362c76001b637cf6"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/karma-coverage/-/karma-coverage-1.1.2.tgz#cc09dceb589a83101aca5fe70c287645ef387689"
   dependencies:
     dateformat "^1.0.6"
     istanbul "^0.4.0"
-    lodash "^3.8.0"
+    lodash "^4.17.0"
     minimatch "^3.0.0"
     source-map "^0.5.1"
 
@@ -5979,8 +6210,8 @@ karma-ie-launcher@^1.0.0:
     lodash "^4.6.1"
 
 karma-jasmine@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
 
 karma-safari-launcher@^1.0.0:
   version "1.0.0"
@@ -5999,22 +6230,22 @@ karma-spec-reporter@0.0.32:
     colors "^1.1.2"
 
 karma-webpack@^2.0.0:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.9.tgz#61c88091f7dd910635134c032b266a465affb57f"
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.13.tgz#cf56e3056c15b7747a0bb2140fc9a6be41dd9f02"
   dependencies:
-    async "~0.9.0"
-    loader-utils "^0.2.5"
-    lodash "^3.8.0"
+    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"
 
 karma@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-2.0.0.tgz#a02698dd7f0f05ff5eb66ab8f65582490b512e58"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-2.0.2.tgz#4d2db9402850a66551fa784b0164fb0824ed8c4b"
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
-    browserify "^14.5.0"
     chokidar "^1.4.1"
     colors "^1.1.0"
     combine-lists "^1.0.0"
@@ -6039,11 +6270,7 @@ karma@^2.0.0:
     socket.io "2.0.4"
     source-map "^0.6.1"
     tmp "0.0.33"
-    useragent "^2.1.12"
-
-kew@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/kew/-/kew-0.5.0.tgz#ece11cb5d8d01a81f8ce804c8d0bba06e6b25ca2"
+    useragent "2.2.1"
 
 kew@^0.7.0:
   version "0.7.0"
@@ -6085,14 +6312,6 @@ known-css-properties@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz#a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"
 
-labeled-stream-splicer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
-  dependencies:
-    inherits "^2.0.1"
-    isarray "~0.0.1"
-    stream-splicer "^2.0.0"
-
 latest-version@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-1.0.1.tgz#72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"
@@ -6119,7 +6338,7 @@ lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
-lazy-cache@^2.0.2:
+lazy-cache@^2.0.1, lazy-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
   dependencies:
@@ -6146,12 +6365,6 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lexical-scope@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4"
-  dependencies:
-    astw "^2.0.0"
-
 libbase64@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
@@ -6188,8 +6401,8 @@ liftoff@^2.1.0, liftoff@^2.3.0:
     resolve "^1.1.7"
 
 limiter@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.2.tgz#229d8055891c8b11af9e0ee5200e8e09bb3dcbeb"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.3.tgz#32e2eb55b2324076943e5d04c1185ffb387968ef"
 
 linkify-it@^2.0.0:
   version "2.0.3"
@@ -6293,16 +6506,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.5:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -6310,14 +6514,14 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-localtunnel@1.8.3, localtunnel@^1.7.0:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.8.3.tgz#dcc5922fd85651037d4bde24fd93248d0b24eb05"
+localtunnel@1.9.0, localtunnel@^1.7.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.9.0.tgz#8ffecdcf8c8a14f62df1056cf9d54acbb0bb9a8f"
   dependencies:
+    axios "0.17.1"
     debug "2.6.8"
     openurl "1.1.1"
-    request "2.81.0"
-    yargs "3.29.0"
+    yargs "6.6.0"
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -6427,10 +6631,6 @@ lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
-lodash.cond@^4.3.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -6442,10 +6642,6 @@ lodash.defaults@^3.1.2:
     lodash.assign "^3.0.0"
     lodash.restparam "^3.0.0"
 
-lodash.endswith@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
-
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
@@ -6472,10 +6668,6 @@ lodash.isfinite@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
 
-lodash.isfunction@^3.0.8:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
-
 lodash.isplainobject@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5"
@@ -6523,10 +6715,6 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
-lodash.memoize@~3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
-
 lodash.merge@^3.3.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994"
@@ -6547,6 +6735,10 @@ lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
 
+lodash.omit@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+
 lodash.pad@^4.1.0:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
@@ -6563,10 +6755,6 @@ lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
 
-lodash.startswith@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.startswith/-/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
-
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -6603,13 +6791,13 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^3.10.1, lodash@^3.3.1, lodash@^3.6.0, lodash@^3.8.0, lodash@^3.9.3:
+lodash@^3.10.1, lodash@^3.3.1, lodash@^3.6.0, lodash@^3.9.3:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+lodash@^4.0.0, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
 lodash@~1.0.1:
   version "1.0.2"
@@ -6619,6 +6807,13 @@ lodash@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.3.1.tgz#a4663b53686b895ff074e2ba504dfb76a8e2b770"
 
+log-ok@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/log-ok/-/log-ok-0.1.1.tgz#bea3dd36acd0b8a7240d78736b5b97c65444a334"
+  dependencies:
+    ansi-green "^0.1.1"
+    success-symbol "^0.1.0"
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -6638,6 +6833,18 @@ log-update@^1.0.2:
     ansi-escapes "^1.0.0"
     cli-cursor "^1.0.2"
 
+log-utils@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/log-utils/-/log-utils-0.2.1.tgz#a4c217a0dd9a50515d9b920206091ab3d4e031cf"
+  dependencies:
+    ansi-colors "^0.2.0"
+    error-symbol "^0.1.0"
+    info-symbol "^0.1.0"
+    log-ok "^0.1.1"
+    success-symbol "^0.1.0"
+    time-stamp "^1.0.1"
+    warning-symbol "^0.1.0"
+
 log4js@^2.3.9:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.5.3.tgz#38bb7bde5e9c1c181bd75e8bc128c5cd0409caf1"
@@ -6657,6 +6864,13 @@ log4js@^2.3.9:
     redis "^2.7.1"
     slack-node "~0.2.0"
 
+logging-helpers@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/logging-helpers/-/logging-helpers-1.0.0.tgz#b5a37b32ad53eb0137c58c7898a47b175ddb7c36"
+  dependencies:
+    isobject "^3.0.0"
+    log-utils "^0.2.1"
+
 loggly@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
@@ -6666,8 +6880,11 @@ loggly@^1.1.0:
     timespan "2.3.x"
 
 loglevelnext@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.3.tgz#0f69277e73bbbf2cd61b94d82313216bf87ac66e"
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2"
+  dependencies:
+    es6-symbol "^3.1.1"
+    object.assign "^4.1.0"
 
 lolex@1.4.0:
   version "1.4.0"
@@ -6695,19 +6912,16 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
 lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
 lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
-lru-cache@4.1.x, lru-cache@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+lru-cache@2.2.x:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
 
 lru-cache@^3.2.0:
   version "3.2.0"
@@ -6715,6 +6929,13 @@ lru-cache@^3.2.0:
   dependencies:
     pseudomap "^1.0.1"
 
+lru-cache@^4.0.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
 lru-cache@~2.6.5:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.6.5.tgz#e56d6354148ede8d7707b58d143220fd08df0fd5"
@@ -6724,10 +6945,10 @@ macaddress@^0.2.8:
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
 magic-string@^0.22.4:
-  version "0.22.4"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
+  version "0.22.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
   dependencies:
-    vlq "^0.2.1"
+    vlq "^0.2.2"
 
 mailcomposer@4.0.1:
   version "4.0.1"
@@ -6751,8 +6972,8 @@ mailgun-js@^0.7.0:
     tsscmp "~1.0.0"
 
 make-dir@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
   dependencies:
     pify "^3.0.0"
 
@@ -6767,10 +6988,10 @@ make-error@^1.2.0:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"
 
 make-iterator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.0.tgz#57bef5dc85d23923ba23767324d8e8f8f3d9694b"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
   dependencies:
-    kind-of "^3.1.0"
+    kind-of "^6.0.2"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
@@ -6805,8 +7026,8 @@ markdown-it@^8.4.0:
     uc.micro "^1.0.5"
 
 marked@^0.3.6, marked@~0.3.6:
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.14.tgz#42375c23e206b95fdd497dd1d2f33ae4d1cf3d6c"
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
 
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
@@ -6920,22 +7141,22 @@ micromatch@2.3.5:
     regex-cache "^0.4.2"
 
 micromatch@^3.0.4, micromatch@^3.1.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
-    braces "^2.3.0"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
-    extglob "^2.0.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.0"
-    nanomatch "^1.2.5"
+    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.1"
+    to-regex "^3.0.2"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -6944,31 +7165,27 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
-    mime-db "~1.30.0"
+    mime-db "~1.33.0"
 
 mime@1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.4.tgz#11b5fdaf29c2509255176b80ad520294f5de92b7"
 
-mime@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
-
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
 "mime@>= 0.0.1", mime@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
 
 mime@^1.2.11, mime@^1.3.4, mime@^1.5.0:
   version "1.6.0"
@@ -6979,8 +7196,8 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
 minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
@@ -7021,6 +7238,19 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1, minipass@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
+  dependencies:
+    safe-buffer "^5.1.1"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -7061,29 +7291,9 @@ mock-raf@^1.0.0:
   dependencies:
     object-assign "^3.0.0"
 
-module-deps@^4.0.8:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
-  dependencies:
-    JSONStream "^1.0.3"
-    browser-resolve "^1.7.0"
-    cached-path-relative "^1.0.0"
-    concat-stream "~1.5.0"
-    defined "^1.0.0"
-    detective "^4.0.0"
-    duplexer2 "^0.1.2"
-    inherits "^2.0.1"
-    parents "^1.0.0"
-    readable-stream "^2.0.2"
-    resolve "^1.1.3"
-    stream-combiner2 "^1.1.1"
-    subarg "^1.0.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
-
-moment@^2.14.1:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
+moment@^2.14.1, moment@^2.18.1:
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
 
 ms@0.7.1:
   version "0.7.1"
@@ -7093,14 +7303,6 @@ ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
 
-ms@0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
-ms@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-1.0.0.tgz#59adcd22edc543f7b5381862d31387b1f4bc9473"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -7119,39 +7321,42 @@ mute-stream@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
 
-nan@^2.3.0, nan@^2.3.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+nan@^2.3.2, nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
-nanomatch@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
     fragment-cache "^0.2.1"
-    is-odd "^1.0.0"
-    kind-of "^5.0.2"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
     object.pick "^1.3.0"
     regex-not "^1.0.0"
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
 natives@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.1.tgz#011acce1f7cbd87f7ba6b3093d6cd9392be1c574"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.3.tgz#44a579be64507ea2d6ed1ca04a9415915cf75558"
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
-ncname@1.0.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
+needle@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
   dependencies:
-    xml-char-classes "^1.0.0"
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
 
 negotiator@0.6.1:
   version "0.6.1"
@@ -7179,6 +7384,10 @@ netrc@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
 
+next-tick@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+
 no-case@^2.2.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
@@ -7242,21 +7451,20 @@ node-localstorage@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/node-localstorage/-/node-localstorage-0.6.0.tgz#45a0601c6932dfde6644a23361f1be173c75d3af"
 
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+node-pre-gyp@^0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
   dependencies:
     detect-libc "^1.0.2"
-    hawk "3.1.3"
     mkdirp "^0.5.1"
+    needle "^2.2.0"
     nopt "^4.0.1"
+    npm-packlist "^1.1.6"
     npmlog "^4.0.2"
     rc "^1.1.7"
-    request "2.81.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
+    tar "^4"
 
 node-sass@^3.1.2, node-sass@^3.4.2:
   version "3.13.1"
@@ -7352,17 +7560,18 @@ nodemon@1.9.1:
     update-notifier "0.5.0"
 
 nodemon@^1.10.2:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.15.0.tgz#ddec01eeb9c33d53dfbf7eddb2fa32f723474c1e"
+  version "1.17.3"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.17.3.tgz#3b0bbc2ee05ccb43b1aef15ba05c63c7bc9b8530"
   dependencies:
     chokidar "^2.0.2"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
     pstree.remy "^1.1.0"
-    semver "^5.4.1"
+    semver "^5.5.0"
+    supports-color "^5.2.0"
     touch "^3.1.0"
-    undefsafe "^2.0.1"
+    undefsafe "^2.0.2"
     update-notifier "^2.3.0"
 
 "nopt@2 || 3", nopt@3.0.x, nopt@3.x, nopt@~3.0.1:
@@ -7424,6 +7633,10 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
 "npm-package-arg@^3.0.0 || ^4.0.0":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-4.2.1.tgz#593303fdea85f7c422775f17f9eb7670f680e3ec"
@@ -7431,6 +7644,13 @@ normalize-url@^1.4.0:
     hosted-git-info "^2.1.5"
     semver "^5.1.0"
 
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-path@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
@@ -7467,7 +7687,7 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-npmconf@^2.1.1, npmconf@^2.1.2:
+npmconf@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/npmconf/-/npmconf-2.1.2.tgz#66606a4a736f1e77a059aa071a79c94ab781853a"
   dependencies:
@@ -7546,7 +7766,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.8:
+object-keys@^1.0.11, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
@@ -7560,6 +7780,15 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.assign@^4.0.3, object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -7609,7 +7838,7 @@ once@~1.3.0:
 
 onetime@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
 openurl@1.1.1:
   version "1.1.1"
@@ -7678,7 +7907,7 @@ ordered-read-streams@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
 
-os-browserify@^0.3.0, os-browserify@~0.3.0:
+os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
@@ -7802,17 +8031,11 @@ param-case@2.1.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   dependencies:
-    no-case "^2.2.0"
-
-parents@^1.0.0, parents@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
-  dependencies:
-    path-platform "~0.11.15"
+    no-case "^2.2.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -7884,7 +8107,7 @@ pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
 
-path-browserify@0.0.0, path-browserify@~0.0.0:
+path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
@@ -7925,10 +8148,6 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
-path-platform@~0.11.15:
-  version "0.11.15"
-  resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
-
 path-proxy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
@@ -7976,8 +8195,8 @@ pause-stream@0.0.11:
     through "~2.3"
 
 pbkdf2@^3.0.3:
-  version "3.0.14"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7989,10 +8208,6 @@ pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -8351,21 +8566,13 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.21:
-  version "6.0.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
-  dependencies:
-    chalk "^2.3.2"
-    source-map "^0.6.1"
-    supports-color "^5.3.0"
-
-postcss@^6.0.14:
-  version "6.0.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.18.tgz#370f5f44d47f3a205f0eb2f6262bbf202df2a80e"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.22:
+  version "6.0.22"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
   dependencies:
-    chalk "^2.3.1"
+    chalk "^2.4.1"
     source-map "^0.6.1"
-    supports-color "^5.2.0"
+    supports-color "^5.4.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
@@ -8380,8 +8587,8 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 prettier@^1.7.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
 
 pretty-format@^21.2.1:
   version "21.2.1"
@@ -8394,7 +8601,7 @@ pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-private@^0.1.6, private@^0.1.7, private@~0.1.5:
+private@^0.1.6, private@^0.1.8, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
@@ -8406,7 +8613,7 @@ process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
-process@^0.11.10, process@~0.11.0:
+process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
@@ -8414,7 +8621,7 @@ progress@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
 
-promise@^7.1.1:
+promise@^7.0.0, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   dependencies:
@@ -8427,8 +8634,8 @@ promised-handlebars@^2.0.0:
     deep-aplus "^1.0.2"
 
 prop-types@^15.5.8, prop-types@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.3.1"
@@ -8438,12 +8645,12 @@ proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
 
-proxy-addr@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
+proxy-addr@~2.0.2, proxy-addr@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.5.2"
+    ipaddr.js "1.6.0"
 
 proxy-agent@~2.0.0:
   version "2.0.0"
@@ -8479,8 +8686,8 @@ pstree.remy@^1.1.0:
     ps-tree "^1.1.0"
 
 public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -8499,10 +8706,14 @@ punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@1.4.1, punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
+punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -8512,29 +8723,21 @@ q@~1.4.0:
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
 qjobs@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
 
 qs@0.4.x:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-0.4.2.tgz#3cac4c861e371a8c9c4770ac23cda8de639b8e5f"
 
-qs@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"
+qs@6.2.3, qs@~6.2.0:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
 
 qs@6.5.1, "qs@>= 0.4.0", qs@^6.1.0, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
-qs@~6.2.0:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 query-string@^2.4.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-2.4.2.tgz#7db0666420804baa92ae9f268962855a76143dfb"
@@ -8548,7 +8751,7 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-querystring-es3@^0.2.0, querystring-es3@~0.2.0:
+querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
@@ -8580,7 +8783,7 @@ range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
-raw-body@2, raw-body@2.3.2:
+raw-body@2, raw-body@2.3.2, raw-body@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
   dependencies:
@@ -8590,10 +8793,10 @@ raw-body@2, raw-body@2.3.2:
     unpipe "1.0.0"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
   dependencies:
-    deep-extend "~0.4.0"
+    deep-extend "^0.5.1"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
@@ -8606,8 +8809,8 @@ react-copy-to-clipboard@^5.0.0:
     prop-types "^15.5.8"
 
 react-dom@^16.1.0, react-dom@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -8615,15 +8818,15 @@ react-dom@^16.1.0, react-dom@^16.2.0:
     prop-types "^15.6.0"
 
 react-ga@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-2.4.1.tgz#dfbd5f028ed39a07067f7a8bf57dc0d240000767"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-2.5.0.tgz#fbba2b33d41ce727f7d4cf383d54dbbfbf96c507"
   optionalDependencies:
     prop-types "^15.6.0"
     react "^15.6.2 || ^16.0"
 
 "react@^15.6.2 || ^16.0", react@^16.1.0, react@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -8637,12 +8840,6 @@ read-all-stream@^3.0.0:
     pinkie-promise "^2.0.0"
     readable-stream "^2.0.0"
 
-read-only-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
-  dependencies:
-    readable-stream "^2.0.2"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8683,15 +8880,15 @@ readable-stream@1.1.x, "readable-stream@1.x >=1.1.9", readable-stream@~1.1.9:
     string_decoder "~0.10.x"
 
 readable-stream@2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
     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.0.3"
+    string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
 "readable-stream@>=1.0.33-1 <1.1.0-0":
@@ -8703,7 +8900,7 @@ readable-stream@2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13",
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.0, readable-stream@~2.0.5, readable-stream@~2.0.6:
+readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -8754,8 +8951,8 @@ redent@^1.0.0:
     strip-indent "^1.0.1"
 
 redis-commands@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2"
 
 redis-parser@^2.6.0:
   version "2.6.0"
@@ -8809,11 +9006,12 @@ regex-cache@^0.4.2:
   dependencies:
     is-equal-shallow "^0.1.3"
 
-regex-not@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9"
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   dependencies:
-    extend-shallow "^2.0.1"
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
 
 regexpu-core@^1.0.0:
   version "1.0.0"
@@ -8858,6 +9056,19 @@ relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
+relative@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
+  dependencies:
+    isobject "^2.0.0"
+
+remarkable@^1.6.2, remarkable@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.1.tgz#aaca4972100b66a642a63a1021ca4bac1be3bff6"
+  dependencies:
+    argparse "~0.1.15"
+    autolinker "~0.15.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -8911,9 +9122,9 @@ request-promise@^4.1.1:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2, request@^2.0.0, request@^2.61.0, request@^2.74.0, request@^2.76.0, request@^2.78.0, request@^2.81.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+request@2, request@^2.0.0, request@^2.61.0, request@^2.74.0, request@^2.76.0, request@^2.78.0, request@^2.81.0, request@^2.83.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -8964,33 +9175,6 @@ request@2.75.x:
     tough-cookie "~2.3.0"
     tunnel-agent "~0.4.1"
 
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
 request@~2.74.0:
   version "2.74.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab"
@@ -9057,7 +9241,7 @@ require-uncached@^1.0.2:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
-requires-port@1.x.x:
+requires-port@1.x.x, requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
@@ -9082,13 +9266,13 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@1.1.7, resolve@1.1.x:
+resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0, resolve@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
@@ -9125,6 +9309,10 @@ resumer@~0.0.0:
   dependencies:
     through "~2.3.4"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
@@ -9139,28 +9327,28 @@ right-pad@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
 
-rimraf@2, rimraf@^2.0.3, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
   dependencies:
-    hash-base "^2.0.0"
+    hash-base "^3.0.0"
     inherits "^2.0.1"
 
 rollup-plugin-babel@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.3.tgz#63adedc863130327512a4a9006efc2241c5b7c15"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.4.tgz#41b3e762fe64450dd61da3105a2cf7ad76be4edc"
   dependencies:
     rollup-pluginutils "^1.5.0"
 
 rollup-plugin-commonjs@^8.2.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.3.0.tgz#91b4ba18f340951e39ed7b1901f377a80ab3f9c3"
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.4.1.tgz#5c9cea2b2c3de322f5fbccd147e07ed5e502d7a0"
   dependencies:
     acorn "^5.2.1"
     estree-walker "^0.5.0"
@@ -9179,10 +9367,10 @@ rollup-plugin-filesize@^1.2.1:
     gzip-size "^3.0.0"
 
 rollup-plugin-node-resolve@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.3.tgz#8f57b253edd00e5b0ad0aed7b7e9cf5982e98fa4"
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713"
   dependencies:
-    builtin-modules "^1.1.0"
+    builtin-modules "^2.0.0"
     is-module "^1.0.0"
     resolve "^1.1.6"
 
@@ -9231,14 +9419,14 @@ run-async@^2.2.0:
     is-promise "^2.1.0"
 
 run-auto@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/run-auto/-/run-auto-2.0.0.tgz#5f4353f58adbd6b74926489b4f259e1dad6a78d6"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/run-auto/-/run-auto-2.0.3.tgz#d5caaa61b458dbd08f49b913a1ad64f5b5db4952"
   dependencies:
     dezalgo "^1.0.1"
 
 run-series@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/run-series/-/run-series-1.1.4.tgz#89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/run-series/-/run-series-1.1.8.tgz#2c4558f49221e01cd6371ff4e0a1e203e460fc36"
 
 rx-lite@^3.1.2:
   version "3.1.2"
@@ -9254,18 +9442,34 @@ rxjs@^5.4.2:
   dependencies:
     symbol-observable "1.0.1"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
+safer-buffer@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
 sanitize-html@^1.13.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.17.0.tgz#5c95e57044604d4797367efd9152acaf5b087bb4"
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.18.2.tgz#61877ba5a910327e42880a28803c2fbafa8e4642"
   dependencies:
     chalk "^2.3.0"
     htmlparser2 "^3.9.0"
     lodash.clonedeep "^4.5.0"
     lodash.escaperegexp "^4.1.2"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
     lodash.mergewith "^4.6.0"
     postcss "^6.0.14"
     srcset "^1.0.0"
@@ -9309,7 +9513,7 @@ sass-loader@^6.0.0:
     neo-async "^2.5.0"
     pify "^3.0.0"
 
-sax@>=0.6.0, sax@~1.2.1:
+sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -9344,6 +9548,10 @@ selenium-webdriver@^3.0.0:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
+self-closing-tags@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
+
 semantic-release@^6.3.2:
   version "6.3.6"
   resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-6.3.6.tgz#629d0aec90b38a2957a57a4a9ee1214af51928c7"
@@ -9377,7 +9585,7 @@ semver-regex@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.2.0, semver@^5.3.0, semver@^5.4.1:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.2.0, semver@^5.3.0, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -9393,24 +9601,6 @@ semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-send@0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.15.2.tgz#f91fab4403bcf87e716f70ceb5db2f578bdc17d6"
-  dependencies:
-    debug "2.6.4"
-    depd "~1.1.0"
-    destroy "~1.0.4"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.8.0"
-    fresh "0.5.0"
-    http-errors "~1.6.1"
-    mime "1.3.4"
-    ms "1.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.3.1"
-
 send@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -9475,15 +9665,6 @@ serve-index@^1.7.0:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.12.2:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.2.tgz#e546e2726081b81b4bcec8e90808ebcdd323afba"
-  dependencies:
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    parseurl "~1.3.1"
-    send "0.15.2"
-
 serve-static@1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
@@ -9493,7 +9674,7 @@ serve-static@1.13.1:
     parseurl "~1.3.2"
     send "0.16.1"
 
-serve-static@^1.10.0:
+serve-static@1.13.2, serve-static@^1.10.0:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   dependencies:
@@ -9554,9 +9735,9 @@ setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
-sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
-  version "2.4.10"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -9569,13 +9750,6 @@ shallow-clone@^1.0.0:
     kind-of "^5.0.0"
     mixin-object "^2.0.1"
 
-shasum@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
-  dependencies:
-    json-stable-stringify "~0.0.0"
-    sha.js "~2.4.4"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -9586,15 +9760,6 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shell-quote@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  dependencies:
-    array-filter "~0.0.0"
-    array-map "~0.0.0"
-    array-reduce "~0.0.0"
-    jsonify "~0.0.0"
-
 shelljs@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8"
@@ -9659,8 +9824,8 @@ snapdragon-util@^3.0.1:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370"
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -9669,7 +9834,7 @@ snapdragon@^0.8.1:
     map-cache "^0.2.2"
     source-map "^0.5.6"
     source-map-resolve "^0.5.0"
-    use "^2.0.0"
+    use "^3.1.0"
 
 sntp@1.x.x:
   version "1.0.9"
@@ -9738,11 +9903,11 @@ socket.io-parser@2.3.1:
     json3 "3.3.2"
 
 socket.io-parser@~3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.2.tgz#dbc2282151fc4faebbe40aeedc0772eba619f7f2"
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
   dependencies:
     component-emitter "1.2.1"
-    debug "~2.6.4"
+    debug "~3.1.0"
     has-binary2 "~1.0.2"
     isarray "2.0.1"
 
@@ -9820,7 +9985,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
+source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -9857,19 +10022,27 @@ spawn-sync@^1.0.15:
     concat-stream "^1.4.7"
     os-shim "^0.1.2"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -9895,8 +10068,8 @@ srcset@^1.0.0:
     number-is-nan "^1.0.0"
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -9919,32 +10092,29 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
 
 statuses@~1.3.0, statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
-stream-browserify@^2.0.0, stream-browserify@^2.0.1:
+stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
-stream-combiner2@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
-  dependencies:
-    duplexer2 "~0.1.0"
-    readable-stream "^2.0.2"
-
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -9955,9 +10125,9 @@ stream-consume@^0.1.0, stream-consume@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"
 
-stream-http@^2.0.0, stream-http@^2.7.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
+stream-http@^2.7.2:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -9969,13 +10139,6 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
-stream-splicer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83"
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.2"
-
 stream-throttle@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
@@ -10023,9 +10186,9 @@ string-width@^2.0.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+string_decoder@^1.0.0, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -10092,6 +10255,10 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+striptags@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.1.tgz#c8c3e7fdd6fb4bb3a32a3b752e5b5e3e38093ebd"
+
 style-loader@^0.20.0:
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4"
@@ -10099,11 +10266,9 @@ style-loader@^0.20.0:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
 
-subarg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
-  dependencies:
-    minimist "^1.1.0"
+success-symbol@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/success-symbol/-/success-symbol-0.1.0.tgz#24022e486f3bf1cdca094283b769c472d3b72897"
 
 supports-color@^2.0.0:
   version "2.0.0"
@@ -10121,13 +10286,7 @@ supports-color@^4.2.1:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^5.3.0:
+supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
@@ -10153,12 +10312,6 @@ symbol-observable@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
-syntax-error@^1.1.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
-  dependencies:
-    acorn-node "^1.2.0"
-
 table@^3.7.8:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@@ -10189,20 +10342,7 @@ tape@~2.3.2:
     resumer "~0.0.0"
     through "~2.3.4"
 
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.0.0, tar@^2.2.1:
+tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
@@ -10210,6 +10350,18 @@ tar@^2.0.0, tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^4:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.2.4"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -10274,7 +10426,7 @@ through2@^2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4, through@~2.3.6:
+through@2, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4, through@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -10288,7 +10440,7 @@ tildify@^1.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-time-stamp@^1.0.0:
+time-stamp@^1.0.0, time-stamp@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
 
@@ -10308,15 +10460,9 @@ timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
 
-timers-browserify@^1.0.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
-  dependencies:
-    process "~0.11.0"
-
 timers-browserify@^2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
   dependencies:
     setimmediate "^1.0.4"
 
@@ -10360,6 +10506,10 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-gfm-code-block@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -10373,13 +10523,14 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
-to-regex@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae"
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
   dependencies:
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    regex-not "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
 
 toggle-selection@^1.0.3:
   version "1.0.6"
@@ -10402,8 +10553,8 @@ touch@^3.1.0:
     nopt "~1.0.10"
 
 tough-cookie@>=2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
@@ -10442,10 +10593,6 @@ tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
-tty-browserify@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -10466,22 +10613,24 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.15:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+type-is@~1.6.15, type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.15"
+    mime-types "~2.1.18"
 
-typedarray@^0.0.6, typedarray@~0.0.5:
+typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-ua-parser-js@0.7.12:
-  version "0.7.12"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
+typeof-article@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
+  dependencies:
+    kind-of "^3.1.0"
 
-ua-parser-js@^0.7.9:
+ua-parser-js@0.7.17, ua-parser-js@^0.7.9:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
 
@@ -10494,10 +10643,10 @@ ucfirst@^1.0.0:
   resolved "https://registry.yarnpkg.com/ucfirst/-/ucfirst-1.0.0.tgz#4e105b6448d05e264ecec435e0b919363c5f2f2f"
 
 uglify-js@3.3.x, uglify-js@^3.0.9:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.11.tgz#e9d058b20715138bb4e8e5cae2ea581686bdaae3"
+  version "3.3.23"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.23.tgz#48ea43e638364d18be292a6fdc2b5b7c35f239ab"
   dependencies:
-    commander "~2.14.1"
+    commander "~2.15.0"
     source-map "~0.6.1"
 
 uglify-js@^2.6, uglify-js@^2.8.29, uglify-js@~2.8.10:
@@ -10529,10 +10678,6 @@ uid-number@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.5.tgz#5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"
 
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
 ultron@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
@@ -10541,10 +10686,6 @@ ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
 
-umd@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
-
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -10553,7 +10694,7 @@ undefsafe@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-0.0.3.tgz#ecca3a03e56b9af17385baac812ac83b994a962f"
 
-undefsafe@^2.0.1:
+undefsafe@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76"
   dependencies:
@@ -10569,6 +10710,10 @@ underscore.string@~2.2.0rc:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.2.1.tgz#d7c0fa2af5d5a1a67f4253daee98132e733f0f19"
 
+underscore.string@~2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.4.0.tgz#8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"
+
 underscore@1.6.0, underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
@@ -10638,13 +10783,8 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 upath@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.2.tgz#80aaae5395abc5fd402933ae2f58694f0860204c"
-  dependencies:
-    lodash.endswith "^4.2.1"
-    lodash.isfunction "^3.0.8"
-    lodash.isstring "^4.0.1"
-    lodash.startswith "^4.2.1"
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
 
 update-notifier@0.5.0:
   version "0.5.0"
@@ -10672,13 +10812,14 @@ update-notifier@^1.0.2:
     xdg-basedir "^2.0.0"
 
 update-notifier@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
   dependencies:
     boxen "^1.2.1"
     chalk "^2.0.1"
     configstore "^3.0.0"
     import-lazy "^2.1.0"
+    is-ci "^1.0.10"
     is-installed-globally "^0.1.0"
     is-npm "^1.0.0"
     latest-version "^3.0.0"
@@ -10689,6 +10830,12 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+uri-js@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
+  dependencies:
+    punycode "^2.1.0"
+
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -10703,20 +10850,18 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
-url@^0.11.0, url@~0.11.0:
+url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8"
+use@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
   dependencies:
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    lazy-cache "^2.0.2"
+    kind-of "^6.0.2"
 
 user-home@^1.1.1:
   version "1.1.1"
@@ -10728,18 +10873,18 @@ user-home@^2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-useragent@^2.1.12:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+useragent@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
   dependencies:
-    lru-cache "4.1.x"
+    lru-cache "2.2.x"
     tmp "0.0.x"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3, util@~0.10.1:
+util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -10757,13 +10902,13 @@ uuid@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.0, uuid@^3.1.0:
+uuid@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
-uws@~0.14.4:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/uws/-/uws-0.14.5.tgz#67aaf33c46b2a587a5f6666d00f7691328f149dc"
+uws@~9.14.0:
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
 
 v8flags@^2.0.2:
   version "2.1.1"
@@ -10781,19 +10926,19 @@ validate-commit-msg@^2.8.2:
     semver-regex "1.0.0"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
 vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
 
 verror@1.10.0, verror@^1.6.0:
   version "1.10.0"
@@ -10857,11 +11002,11 @@ vinyl@^1.0.0, vinyl@^1.2.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vlq@^0.2.1:
+vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
 
-vm-browserify@0.0.4, vm-browserify@~0.0.1:
+vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
@@ -10887,11 +11032,15 @@ vorpal@~1.11.2:
     wrap-ansi "^2.0.0"
 
 walk@^2.3.9:
-  version "2.3.9"
-  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.9.tgz#31b4db6678f2ae01c39ea9fb8725a9031e558a7b"
+  version "2.3.13"
+  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.13.tgz#400852ade80df679f54637e4f08654ed6628f6da"
   dependencies:
     foreachasync "^3.0.0"
 
+warning-symbol@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/warning-symbol/-/warning-symbol-0.1.0.tgz#bb31dd11b7a0f9d67ab2ed95f457b65825bbad21"
+
 warning@3.0.0, warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
@@ -10899,12 +11048,12 @@ warning@3.0.0, warning@^3.0.0:
     loose-envify "^1.0.0"
 
 watchpack@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
   dependencies:
-    async "^2.1.2"
-    chokidar "^1.7.0"
+    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
 
 wcwidth@^1.0.0:
   version "1.0.1"
@@ -10923,8 +11072,8 @@ webpack-dev-middleware@^1.12.0:
     time-stamp "^2.0.0"
 
 webpack-dev-middleware@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.5.tgz#2a1d07afb599e1993033d72c2181ec2344c15e31"
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4"
   dependencies:
     loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
@@ -10935,8 +11084,8 @@ webpack-dev-middleware@^2.0.0:
     webpack-log "^1.0.1"
 
 webpack-hot-middleware@^2.21.0:
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.0.tgz#7b3c113a7a4b301c91e0749573c7aab28b414b52"
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.22.1.tgz#2ff865bfebc8e9937bd1619f0f48d6ab601bfea0"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
@@ -10944,8 +11093,8 @@ webpack-hot-middleware@^2.21.0:
     strip-ansi "^3.0.0"
 
 webpack-log@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.1.2.tgz#cdc76016537eed24708dc6aa3d1e52189efee107"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
   dependencies:
     chalk "^2.1.0"
     log-symbols "^2.1.0"
@@ -10994,9 +11143,9 @@ weinre@^2.0.0-pre-I0Z7U9OV:
     nopt "3.0.x"
     underscore "1.7.x"
 
-whatwg-fetch@>=0.10.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
 when@^3.7.7:
   version "3.7.8"
@@ -11046,7 +11195,7 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-window-size@^0.1.2, window-size@^0.1.4:
+window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
 
@@ -11132,10 +11281,6 @@ xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
-xml-char-classes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
-
 xml2js@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
@@ -11163,7 +11308,7 @@ xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -11175,7 +11320,11 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
-yargs-parser@^4.1.0:
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
+yargs-parser@^4.1.0, yargs-parser@^4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
   dependencies:
@@ -11193,17 +11342,6 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@3.29.0:
-  version "3.29.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c"
-  dependencies:
-    camelcase "^1.2.1"
-    cliui "^3.0.3"
-    decamelize "^1.0.0"
-    os-locale "^1.4.0"
-    window-size "^0.1.2"
-    y18n "^3.2.0"
-
 yargs@6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4"
@@ -11223,6 +11361,24 @@ yargs@6.4.0:
     y18n "^3.2.1"
     yargs-parser "^4.1.0"
 
+yargs@6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
 yargs@^3.32.0:
   version "3.32.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
@@ -11286,6 +11442,10 @@ yauzl@2.4.1:
   dependencies:
     fd-slicer "~1.0.1"
 
+year@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
+
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"