From 2e9099e285ba0088c9d119d821e587f1b8199b77 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Wed, 1 May 2019 16:33:40 +0200
Subject: [PATCH 01/41] Prevent form creation attempts if WPForms Lite version
 is < 1.5.2

Creating a working form via the WPForms API requires 1.5.2 or higher.

If the site already has WPForms Lite installed but it's an older
version, form creation will fail, breaking the onboarding process.
---
 lib/wpforms.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/wpforms.php b/lib/wpforms.php
index e0bb3d12..68df1260 100644
--- a/lib/wpforms.php
+++ b/lib/wpforms.php
@@ -24,6 +24,18 @@ function studiopress_maybe_create_wpforms_form() { // phpcs:ignore -- studiopres
 		return;
 	}
 
+	// Form creation requires WPForms 1.5.2 or higher.
+	// If the site already as an earlier version of the plugin installed, don't create a form.
+	// Plugins do not get upgraded during one-click theme setup.
+	if ( function_exists( 'get_plugins' ) ) {
+		$plugin_data          = get_plugins();
+		$wpforms_lite_version = isset( $plugin_data['wpforms-lite/wpforms.php']['Version'] ) ? $plugin_data['wpforms-lite/wpforms.php']['Version'] : '';
+
+		if ( version_compare( $wpforms_lite_version, '1.5.2', '<' ) ) {
+			return;
+		}
+	}
+
 	$existing_form_id = get_option( 'genesis_onboarding_wpforms_id' );
 
 	if ( $existing_form_id ) {

From 972580c7be678604cc361fbc037af906b0f2330c Mon Sep 17 00:00:00 2001
From: Jen Baumann <baumann@dreamwhisperdesigns.com>
Date: Fri, 3 May 2019 08:37:02 -0400
Subject: [PATCH 02/41] Switch to sticky positioning

---
 style.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/style.css b/style.css
index 2527bcde..88b941c0 100755
--- a/style.css
+++ b/style.css
@@ -1461,11 +1461,15 @@ p.entry-meta {
 	--------------------------------------------- */
 
 	.site-header {
-		position: fixed;
-		width: 100%;
+		position: sticky;
+		top: 0;
 		z-index: 9999;
 	}
 
+	.admin-bar .site-header {
+		top: 32px;
+	}
+
 	/* Genesis Menu
 	--------------------------------------------- */
 
@@ -1553,7 +1557,6 @@ p.entry-meta {
 	--------------------------------------------- */
 
 	.site-inner {
-		margin-top: 70px;
 		max-width: 1140px;
 	}
 

From a102bf16d3b272b8a38c0e23ba47306af1b61486 Mon Sep 17 00:00:00 2001
From: Jen Baumann <baumann@dreamwhisperdesigns.com>
Date: Fri, 3 May 2019 08:37:36 -0400
Subject: [PATCH 03/41] Remove margin script

---
 functions.php        |  8 ------
 js/genesis-sample.js | 59 --------------------------------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 js/genesis-sample.js

diff --git a/functions.php b/functions.php
index f022adfa..44786345 100755
--- a/functions.php
+++ b/functions.php
@@ -92,14 +92,6 @@ function genesis_sample_enqueue_scripts_styles() {
 		genesis_sample_responsive_menu_settings()
 	);
 
-	wp_enqueue_script(
-		'genesis-sample',
-		get_stylesheet_directory_uri() . '/js/genesis-sample.js',
-		array( 'jquery' ),
-		CHILD_THEME_VERSION,
-		true
-	);
-
 }
 
 /**
diff --git a/js/genesis-sample.js b/js/genesis-sample.js
deleted file mode 100644
index 8d600de9..00000000
--- a/js/genesis-sample.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Genesis Sample entry point.
- *
- * @package GenesisSample\JS
- * @author  StudioPress
- * @license GPL-2.0-or-later
- */
-
-var genesisSample = ( function( $ ) {
-	'use strict';
-
-	/**
-	 * Adjust site inner margin top to compensate for sticky header height.
-	 *
-	 * @since 2.6.0
-	 */
-	var moveContentBelowFixedHeader = function() {
-		var siteInnerMarginTop = 0;
-
-		if ( 'fixed' === $( '.site-header' ).css( 'position' ) ) {
-			siteInnerMarginTop = $( '.site-header' ).outerHeight();
-		}
-
-		$( '.site-inner' ).css( 'margin-top', siteInnerMarginTop );
-	},
-
-	/**
-	 * Initialize Genesis Sample.
-	 *
-	 * Internal functions to execute on full page load.
-	 *
-	 * @since 2.6.0
-	 */
-	load = function() {
-		moveContentBelowFixedHeader();
-
-		$( window ).resize( function() {
-			moveContentBelowFixedHeader();
-		});
-
-		// Run after the Customizer updates.
-		// 1.5s delay is to allow logo area reflow.
-		if ( 'undefined' != typeof wp && 'undefined' != typeof wp.customize ) {
-			wp.customize.bind( 'change', function( setting ) {
-				setTimeout( function() {
-					moveContentBelowFixedHeader();
-				}, 1500 );
-			});
-		}
-	};
-
-	// Expose the load and ready functions.
-	return {
-		load: load
-	};
-
-}( jQuery ) );
-
-jQuery( window ).on( 'load', genesisSample.load );

From 299214ee91b6b3aa909bb665ba0ce04967cae8a4 Mon Sep 17 00:00:00 2001
From: Jen Baumann <baumann@dreamwhisperdesigns.com>
Date: Fri, 3 May 2019 08:39:45 -0400
Subject: [PATCH 04/41] Autoprefix sticky positioning

---
 style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style.css b/style.css
index 88b941c0..f3c47e37 100755
--- a/style.css
+++ b/style.css
@@ -1461,6 +1461,7 @@ p.entry-meta {
 	--------------------------------------------- */
 
 	.site-header {
+		position: -webkit-sticky;
 		position: sticky;
 		top: 0;
 		z-index: 9999;

From 66c03e60cbbb063d1f37182fd6dd2a47d7c7f357 Mon Sep 17 00:00:00 2001
From: Jen Baumann <baumann@dreamwhisperdesigns.com>
Date: Wed, 8 May 2019 09:41:38 -0400
Subject: [PATCH 05/41] Update CSS for WordPress 5.2 column fixes

---
 lib/gutenberg/front-end.css | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/lib/gutenberg/front-end.css b/lib/gutenberg/front-end.css
index 85999b79..6f5ad3c3 100644
--- a/lib/gutenberg/front-end.css
+++ b/lib/gutenberg/front-end.css
@@ -388,35 +388,18 @@ hr.wp-block-separator {
 /* Media Queries
 ---------------------------------------------------------------------------- */
 
-@media only screen and (min-width: 600px) {
 
-	.site-container .wp-block-columns {
-		flex-wrap: nowrap;
-	}
+@media only screen and (max-width: 781px) {
 
-	.site-container .wp-block-columns[class*="has-"] > * {
-		margin-right: 36px;
+	.has-3-columns .wp-block-column,
+	.has-5-columns .wp-block-column {
+		flex-basis: 100%;
 		margin-left: 0;
-	}
-
-	.site-container .wp-block-columns[class*="has-"] > *:last-child {
 		margin-right: 0;
 	}
 
 }
 
-@media only screen and (min-width: 768px) {
-
-	.site-container .wp-block-columns .wp-block-column > *:first-child {
-		margin-top: 0;
-	}
-
-	.site-container .wp-block-columns .wp-block-column > *:last-child {
-		margin-bottom: 0;
-	}
-
-}
-
 @media only screen and (min-width: 960px) {
 
 	.full-width-content .site-container .alignwide {

From 0fb48ee6abf2f05f5ff346291fa0c5b6b621be74 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 20 May 2019 16:51:24 +0200
Subject: [PATCH 06/41] Remove 404 page support from accessibility config

This is no longer used in Genesis, so has no effect.
---
 config/accessibility.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/accessibility.php b/config/accessibility.php
index 9b4ba59d..d2949d8c 100644
--- a/config/accessibility.php
+++ b/config/accessibility.php
@@ -12,7 +12,6 @@
  * Genesis Accessibility features to support.
  */
 return array(
-	'404-page',
 	'drop-down-menu',
 	'headings',
 	'search-form',

From 8bba7d23abc09b452f60fa94be323d34ec2e76c8 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 6 May 2019 14:34:08 +0200
Subject: [PATCH 07/41] Replace responsive menu scripts with
 genesis_register_responsive_menus function

---
 functions.php | 55 +++++++++++++++------------------------------------
 1 file changed, 16 insertions(+), 39 deletions(-)

diff --git a/functions.php b/functions.php
index 44786345..ed8e7e05 100755
--- a/functions.php
+++ b/functions.php
@@ -60,6 +60,22 @@ function genesis_child_gutenberg_support() { // phpcs:ignore WordPress.NamingCon
 	require_once get_stylesheet_directory() . '/lib/gutenberg/init.php';
 }
 
+// Registers the responsive menus.
+if ( function_exists( 'genesis_register_responsive_menus' ) ) {
+	genesis_register_responsive_menus(
+		array(
+			'script' => array(
+				'menuClasses' => array(
+					'others' => array( '.nav-primary' ),
+				),
+			),
+			'extras' => array(
+				'media_query_width' => '960px',
+			),
+		)
+	);
+}
+
 add_action( 'wp_enqueue_scripts', 'genesis_sample_enqueue_scripts_styles' );
 /**
  * Enqueues scripts and styles.
@@ -77,45 +93,6 @@ function genesis_sample_enqueue_scripts_styles() {
 
 	wp_enqueue_style( 'dashicons' );
 
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
-	wp_enqueue_script(
-		'genesis-sample-responsive-menu',
-		get_stylesheet_directory_uri() . "/js/responsive-menus{$suffix}.js",
-		array( 'jquery' ),
-		CHILD_THEME_VERSION,
-		true
-	);
-
-	wp_localize_script(
-		'genesis-sample-responsive-menu',
-		'genesis_responsive_menu',
-		genesis_sample_responsive_menu_settings()
-	);
-
-}
-
-/**
- * Defines responsive menu settings.
- *
- * @since 2.3.0
- */
-function genesis_sample_responsive_menu_settings() {
-
-	$settings = array(
-		'mainMenu'         => __( 'Menu', 'genesis-sample' ),
-		'menuIconClass'    => 'dashicons-before dashicons-menu',
-		'subMenu'          => __( 'Submenu', 'genesis-sample' ),
-		'subMenuIconClass' => 'dashicons-before dashicons-arrow-down-alt2',
-		'menuClasses'      => array(
-			'combine' => array(
-				'.nav-primary',
-			),
-			'others'  => array(),
-		),
-	);
-
-	return $settings;
-
 }
 
 // Adds support for HTML5 markup structure.

From d16bbaf91b7b8d755d82aed7007c59a10fdc3b7a Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 9 May 2019 10:49:43 +0200
Subject: [PATCH 08/41] Extract responsive menu config

---
 config/responsive-menus.php | 23 +++++++++++++++++++++++
 functions.php               | 13 +------------
 2 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 config/responsive-menus.php

diff --git a/config/responsive-menus.php b/config/responsive-menus.php
new file mode 100644
index 00000000..401b35c7
--- /dev/null
+++ b/config/responsive-menus.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Genesis Sample child theme.
+ *
+ * @package Genesis Sample
+ * @author  StudioPress
+ * @license GPL-2.0-or-later
+ * @link    https://my.studiopress.com/themes/genesis-sample/
+ */
+
+/**
+ * Genesis responsive menus settings. (Requires Genesis 3.0+.)
+ */
+return array(
+	'script' => array(
+		'menuClasses' => array(
+			'others' => array( '.nav-primary' ),
+		),
+	),
+	'extras' => array(
+		'media_query_width' => '960px',
+	),
+);
diff --git a/functions.php b/functions.php
index ed8e7e05..37fc22c5 100755
--- a/functions.php
+++ b/functions.php
@@ -62,18 +62,7 @@ function genesis_child_gutenberg_support() { // phpcs:ignore WordPress.NamingCon
 
 // Registers the responsive menus.
 if ( function_exists( 'genesis_register_responsive_menus' ) ) {
-	genesis_register_responsive_menus(
-		array(
-			'script' => array(
-				'menuClasses' => array(
-					'others' => array( '.nav-primary' ),
-				),
-			),
-			'extras' => array(
-				'media_query_width' => '960px',
-			),
-		)
-	);
+	genesis_register_responsive_menus( genesis_get_config( 'responsive-menus' ) );
 }
 
 add_action( 'wp_enqueue_scripts', 'genesis_sample_enqueue_scripts_styles' );

From b939531733ee96fd66781846b66ab7f8f87842b8 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 9 May 2019 12:17:43 +0200
Subject: [PATCH 09/41] Conditionally load AMP CSS fixes if AMP is active

Loads these files from the Genesis AMP plugin (relocated to the theme):

- theme-fixer/genesis-amp-animated.css
- theme-fixer/themes/genesis-sample/stylesheet.css (omits .woocommerce)

This allows the menu to function on AMP and regular versions when
used with this version of the Genesis AMP plugin that omits all
'theme fixer' functionality:

https://github.com/nickcernis/genesis-amp/tree/suppress-theme-fixer

Still need to:

- Discuss if genesis-amp-animated.css belongs in Genesis or the theme.
- Look into not loading a separate stylesheet conditionally for AMP. It
would be easier to maintain if the AMP menu CSS was part of the theme's
main style.css.
---
 functions.php   |  9 +++++
 lib/amp/amp.css | 89 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 lib/amp/amp.css

diff --git a/functions.php b/functions.php
index 37fc22c5..36847f6f 100755
--- a/functions.php
+++ b/functions.php
@@ -82,6 +82,15 @@ function genesis_sample_enqueue_scripts_styles() {
 
 	wp_enqueue_style( 'dashicons' );
 
+	if ( genesis_is_amp() ) {
+		wp_enqueue_style(
+			'genesis-sample-amp',
+			get_stylesheet_directory_uri() . '/lib/amp/amp.css',
+			array( CHILD_THEME_HANDLE ),
+			CHILD_THEME_VERSION
+		);
+	}
+
 }
 
 // Adds support for HTML5 markup structure.
diff --git a/lib/amp/amp.css b/lib/amp/amp.css
new file mode 100644
index 00000000..8c889395
--- /dev/null
+++ b/lib/amp/amp.css
@@ -0,0 +1,89 @@
+/*
+Genesis AMP styling.
+This currently loads only on AMP pages.
+*/
+
+/* Reveals the submenu upon parent hover.
+--------------------------------------------- */
+.genesis-nav-menu .menu-item .sub-menu {
+	display: block;
+	-webkit-transform: scaleY(0);
+	-moz-transform: scaleY(0);
+	-ms-transform: scaleY(0);
+	-o-transform: scaleY(0);
+	transform: scaleY(0);
+	transform-origin: top;
+	-webkit-transition: transform 0.5s ease 0.2s;
+	-moz-transition: transform 0.5s ease 0.2s;
+	transition: transform 0.5s ease 0.2s;
+}
+
+.genesis-nav-menu .menu-item:hover > .sub-menu {
+	-webkit-transform: scaleY(1);
+	-moz-transform: scaleY(1);
+	-ms-transform: scaleY(1);
+	-o-transform: scaleY(1);
+	transform: scaleY(1);
+}
+
+/* Reveals the submenu upon tabbing with keyboard.
+--------------------------------------------- */
+
+/*
+ * :focus-within needs it own selector.
+ * Why? If the event a browser does not recognize this pseudo-class, only this selector and its declarations
+ * are ignored.  Isolating it ensures the submenu animation works on :hover.
+ */
+.menu .menu-item:focus-within > .sub-menu {
+	-webkit-transform: scaleY(1);
+	-moz-transform: scaleY(1);
+	-ms-transform: scaleY(1);
+	-o-transform: scaleY(1);
+	transform: scaleY(1);
+	left: auto;
+	opacity: 1;
+}
+
+/* Overrides for different breakpoint to follow non-AMP implementation. */
+@media only screen and (max-width: 959px) {
+
+	.genesis-responsive-menu {
+		display: block;
+		position: absolute;
+		left: -9999px;
+		opacity: 0;
+		-webkit-transform: scaleY(0);
+		-moz-transform: scaleY(0);
+		-ms-transform: scaleY(0);
+		-o-transform: scaleY(0);
+		transform: scaleY(0);
+		transform-origin: top;
+		-webkit-transition: transform .2s ease;
+		-moz-transition: transform .2s ease;
+		transition: transform .2s ease;
+	}
+
+	.genesis-responsive-menu.toggled-on {
+		opacity: 1;
+		position: relative;
+		left: auto;
+		-webkit-transform: scaleY(1);
+		-moz-transform: scaleY(1);
+		-ms-transform: scaleY(1);
+		-o-transform: scaleY(1);
+		transform: scaleY(1);
+	}
+
+	.genesis-responsive-menu.toggled-on .menu-item .sub-menu,
+	.genesis-responsive-menu.toggled-on .menu-item:hover > .sub-menu {
+		display: none;
+	}
+
+	.genesis-responsive-menu.toggled-on .sub-menu-toggle.toggled-on + .sub-menu {
+		display: block;
+		-moz-transform: scaleY(1);
+		-ms-transform: scaleY(1);
+		-o-transform: scaleY(1);
+		transform: scaleY(1);
+	}
+}

From 05ad8b8f8a4f3e5f8edcb28568620caa616fd465 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 9 May 2019 12:20:20 +0200
Subject: [PATCH 10/41] Remove unneeded prefixes

These are not needed for modern AMP-ready browsers.
---
 lib/amp/amp.css | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/lib/amp/amp.css b/lib/amp/amp.css
index 8c889395..dcf72b70 100644
--- a/lib/amp/amp.css
+++ b/lib/amp/amp.css
@@ -7,22 +7,12 @@ This currently loads only on AMP pages.
 --------------------------------------------- */
 .genesis-nav-menu .menu-item .sub-menu {
 	display: block;
-	-webkit-transform: scaleY(0);
-	-moz-transform: scaleY(0);
-	-ms-transform: scaleY(0);
-	-o-transform: scaleY(0);
 	transform: scaleY(0);
 	transform-origin: top;
-	-webkit-transition: transform 0.5s ease 0.2s;
-	-moz-transition: transform 0.5s ease 0.2s;
 	transition: transform 0.5s ease 0.2s;
 }
 
 .genesis-nav-menu .menu-item:hover > .sub-menu {
-	-webkit-transform: scaleY(1);
-	-moz-transform: scaleY(1);
-	-ms-transform: scaleY(1);
-	-o-transform: scaleY(1);
 	transform: scaleY(1);
 }
 
@@ -35,10 +25,6 @@ This currently loads only on AMP pages.
  * are ignored.  Isolating it ensures the submenu animation works on :hover.
  */
 .menu .menu-item:focus-within > .sub-menu {
-	-webkit-transform: scaleY(1);
-	-moz-transform: scaleY(1);
-	-ms-transform: scaleY(1);
-	-o-transform: scaleY(1);
 	transform: scaleY(1);
 	left: auto;
 	opacity: 1;
@@ -52,14 +38,8 @@ This currently loads only on AMP pages.
 		position: absolute;
 		left: -9999px;
 		opacity: 0;
-		-webkit-transform: scaleY(0);
-		-moz-transform: scaleY(0);
-		-ms-transform: scaleY(0);
-		-o-transform: scaleY(0);
 		transform: scaleY(0);
 		transform-origin: top;
-		-webkit-transition: transform .2s ease;
-		-moz-transition: transform .2s ease;
 		transition: transform .2s ease;
 	}
 
@@ -67,10 +47,6 @@ This currently loads only on AMP pages.
 		opacity: 1;
 		position: relative;
 		left: auto;
-		-webkit-transform: scaleY(1);
-		-moz-transform: scaleY(1);
-		-ms-transform: scaleY(1);
-		-o-transform: scaleY(1);
 		transform: scaleY(1);
 	}
 
@@ -81,9 +57,6 @@ This currently loads only on AMP pages.
 
 	.genesis-responsive-menu.toggled-on .sub-menu-toggle.toggled-on + .sub-menu {
 		display: block;
-		-moz-transform: scaleY(1);
-		-ms-transform: scaleY(1);
-		-o-transform: scaleY(1);
 		transform: scaleY(1);
 	}
 }

From 1fae08ecf548c59c2f61ab05e9cb971102cc4cdf Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 9 May 2019 12:21:24 +0200
Subject: [PATCH 11/41] CSS standards

---
 lib/amp/amp.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/amp/amp.css b/lib/amp/amp.css
index dcf72b70..b31874db 100644
--- a/lib/amp/amp.css
+++ b/lib/amp/amp.css
@@ -40,7 +40,7 @@ This currently loads only on AMP pages.
 		opacity: 0;
 		transform: scaleY(0);
 		transform-origin: top;
-		transition: transform .2s ease;
+		transition: transform 0.2s ease;
 	}
 
 	.genesis-responsive-menu.toggled-on {

From de7ae3bea0ce518ee84359cedc2ea215d4206060 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 13 May 2019 12:49:19 +0200
Subject: [PATCH 12/41] Fix submenu hover on AMP version

Ensures submenus appear on hover instead of only on focus.

Props @dreamwhisper.
---
 lib/amp/amp.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/amp/amp.css b/lib/amp/amp.css
index b31874db..6a87798f 100644
--- a/lib/amp/amp.css
+++ b/lib/amp/amp.css
@@ -12,7 +12,8 @@ This currently loads only on AMP pages.
 	transition: transform 0.5s ease 0.2s;
 }
 
-.genesis-nav-menu .menu-item:hover > .sub-menu {
+.genesis-responsive-menu .genesis-nav-menu .menu-item:hover > .sub-menu {
+	display: block;
 	transform: scaleY(1);
 }
 

From 3777f22f640665557c41a4442283dd87692ee50e Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Wed, 15 May 2019 11:09:55 +0200
Subject: [PATCH 13/41] Remove responsive menus script

This will be served from Genesis itself from
Genesis 3.0.0+ and enqueued automatically when using
the `genesis_register_responsive_menus` function.
---
 .eslintignore              |   1 -
 js/responsive-menus.js     | 452 -------------------------------------
 js/responsive-menus.min.js |  11 -
 3 files changed, 464 deletions(-)
 delete mode 100644 js/responsive-menus.js
 delete mode 100644 js/responsive-menus.min.js

diff --git a/.eslintignore b/.eslintignore
index c47488d7..5d8b60d8 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,3 @@
 node_modules
 vendor
 *.min.js
-js/responsive-menus.js
diff --git a/js/responsive-menus.js b/js/responsive-menus.js
deleted file mode 100644
index cdd226a8..00000000
--- a/js/responsive-menus.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/**
- * Add the accessible responsive menu.
- *
- * @version 1.1.3
- *
- * @author StudioPress
- * @link https://github.com/copyblogger/responsive-menus/
- * @license GPL-2.0-or-later
- * @package GenesisSample
- */
-
-( function ( document, $, undefined ) {
-
-	'use strict';
-
-	var genesisMenuParams     = typeof genesis_responsive_menu === 'undefined' ? '' : genesis_responsive_menu,
-		genesisMenusUnchecked = genesisMenuParams.menuClasses,
-		genesisMenus          = {},
-		menusToCombine        = [];
-
-	/**
-	 * Validate the menus passed by the theme with what's being loaded on the page,
-	 * and pass the new and accurate information to our new data.
-	 *
-	 * @param {genesisMenusUnchecked} Raw data from the localized script in the theme.
-	 * @return {array} genesisMenus array gets populated with updated data.
-	 * @return {array} menusToCombine array gets populated with relevant data.
-	 */
-	$.each(
-		genesisMenusUnchecked, function( group ) {
-
-			// Mirror our group object to populate.
-			genesisMenus[group] = [];
-
-			// Loop through each instance of the specified menu on the page.
-			$.each(
-				this, function( key, value ) {
-
-					var menuString = value,
-					$menu          = $( value );
-
-					// If there is more than one instance, append the index and update array.
-					if ( $menu.length > 1 ) {
-
-						$.each(
-							$menu, function( key, value ) {
-
-								var newString = menuString + '-' + key;
-
-								$( this ).addClass( newString.replace( '.','' ) );
-
-								genesisMenus[group].push( newString );
-
-								if ( 'combine' === group ) {
-									menusToCombine.push( newString );
-								}
-
-							}
-						);
-
-					} else if ( $menu.length == 1 ) {
-
-						genesisMenus[group].push( menuString );
-
-						if ( 'combine' === group ) {
-							menusToCombine.push( menuString );
-						}
-
-					}
-
-				}
-			);
-
-		}
-	);
-
-	// Make sure there is something to use for the 'others' array.
-	if ( typeof genesisMenus.others == 'undefined' ) {
-		genesisMenus.others = [];
-	}
-
-	// If there's only one menu on the page for combining, push it to the 'others' array and nullify our 'combine' variable.
-	if ( menusToCombine.length == 1 ) {
-		genesisMenus.others.push( menusToCombine[0] );
-		genesisMenus.combine = null;
-		menusToCombine       = null;
-	}
-
-	var genesisMenu         = {},
-		mainMenuButtonClass = 'menu-toggle',
-		subMenuButtonClass  = 'sub-menu-toggle',
-		responsiveMenuClass = 'genesis-responsive-menu';
-
-	// Initialize.
-	genesisMenu.init = function() {
-
-		// Exit early if there are no menus to do anything.
-		if ( $( _getAllMenusArray() ).length == 0 ) {
-			return;
-		}
-
-		var menuIconClass    = typeof genesisMenuParams.menuIconClass !== 'undefined' ? genesisMenuParams.menuIconClass : 'dashicons-before dashicons-menu';
-		var	subMenuIconClass = typeof genesisMenuParams.subMenuIconClass !== 'undefined' ? genesisMenuParams.subMenuIconClass : 'dashicons-before dashicons-arrow-down-alt2';
-		var	toggleButtons    = {
-			menu : $( '<button />', {
-					'class' : mainMenuButtonClass,
-					'aria-expanded' : false,
-					'aria-pressed' : false
-				}
-			)
-			.append( genesisMenuParams.mainMenu ),
-				submenu : $(
-					'<button />', {
-					'class' : subMenuButtonClass,
-					'aria-expanded' : false,
-					'aria-pressed' : false
-				}
-			)
-			.append( $('<span />', {
-					'class' : 'screen-reader-text',
-					'text' : genesisMenuParams.subMenu
-				} )
-			)
-		};
-
-		// Add the responsive menu class to the active menus.
-		_addResponsiveMenuClass();
-
-		// Add the main nav button to the primary menu, or exit the plugin.
-		_addMenuButtons( toggleButtons );
-
-		// Setup additional classes.
-		$( '.' + mainMenuButtonClass ).addClass( menuIconClass );
-		$( '.' + subMenuButtonClass ).addClass( subMenuIconClass );
-		$( '.' + mainMenuButtonClass ).on( 'click.genesisMenu-mainbutton', _mainmenuToggle ).each( _addClassID );
-		$( '.' + subMenuButtonClass ).on( 'click.genesisMenu-subbutton', _submenuToggle );
-		$( window ).on( 'resize.genesisMenu', _doResize ).triggerHandler( 'resize.genesisMenu' );
-	};
-
-	/**
-	 * Add menu toggle button to appropriate menus.
-	 *
-	 * @param {toggleButtons} Object of menu buttons to use for toggles.
-	 */
-	function _addMenuButtons( toggleButtons ) {
-
-		// Apply sub menu toggle to each sub-menu found in the menuList.
-		$( _getMenuSelectorString( genesisMenus ) ).find( '.sub-menu' ).before( toggleButtons.submenu );
-
-		if ( menusToCombine !== null ) {
-
-			var menusToToggle = genesisMenus.others.concat( menusToCombine[0] );
-
-			// Only add menu button the primary menu and navs NOT in the combine variable.
-			$( _getMenuSelectorString( menusToToggle ) ).before( toggleButtons.menu );
-
-		} else {
-
-			// Apply the main menu toggle to all menus in the list.
-			$( _getMenuSelectorString( genesisMenus.others ) ).before( toggleButtons.menu );
-
-		}
-
-	}
-
-	/**
-	 * Add the responsive menu class.
-	 */
-	function _addResponsiveMenuClass() {
-		$( _getMenuSelectorString( genesisMenus ) ).addClass( responsiveMenuClass );
-	}
-
-	/**
-	 * Execute our responsive menu functions on window resizing.
-	 */
-	function _doResize() {
-		var buttons = $( 'button[id^="genesis-mobile-"]' ).attr( 'id' );
-		if ( typeof buttons === 'undefined' ) {
-			return;
-		}
-		_maybeClose( buttons );
-		_superfishToggle( buttons );
-		_changeSkipLink( buttons );
-		_combineMenus( buttons );
-	}
-
-	/**
-	 * Add the nav- class of the related navigation menu as
-	 * an ID to associated button (helps target specific buttons outside of context).
-	 */
-	function _addClassID() {
-		var $this = $( this ),
-			nav   = $this.next( 'nav' ),
-			id    = 'class';
-
-		$this.attr( 'id', 'genesis-mobile-' + $( nav ).attr( id ).match( /nav-\w*\b/ ) );
-	}
-
-	/**
-	 * Combine our menus if the mobile menu is visible.
-	 *
-	 * @params buttons
-	 */
-	function _combineMenus( buttons ){
-
-		// Exit early if there are no menus to combine.
-		if ( menusToCombine == null ) {
-			return;
-		}
-
-		// Split up the menus to combine based on order of appearance in the array.
-		var primaryMenu   = menusToCombine[0],
-			combinedMenus = $( menusToCombine ).filter(
-				function(index) { if ( index > 0 ) {
-							return index; } }
-			);
-
-		// If the responsive menu is active, append items in 'combinedMenus' object to the 'primaryMenu' object.
-		if ( 'none' !== _getDisplayValue( buttons ) ) {
-
-			$.each(
-				combinedMenus, function( key, value ) {
-					$( value ).find( '.menu > li' ).addClass( 'moved-item-' + value.replace( '.','' ) ).appendTo( primaryMenu + ' ul.genesis-nav-menu' );
-				}
-			);
-			$( _getMenuSelectorString( combinedMenus ) ).hide();
-
-		} else {
-
-			$( _getMenuSelectorString( combinedMenus ) ).show();
-			$.each(
-				combinedMenus, function( key, value ) {
-					$( '.moved-item-' + value.replace( '.','' ) ).appendTo( value + ' ul.genesis-nav-menu' ).removeClass( 'moved-item-' + value.replace( '.','' ) );
-				}
-			);
-
-		}
-
-	}
-
-	/**
-	 * Action to happen when the main menu button is clicked.
-	 */
-	function _mainmenuToggle() {
-		var $this = $( this );
-		_toggleAria( $this, 'aria-pressed' );
-		_toggleAria( $this, 'aria-expanded' );
-		$this.toggleClass( 'activated' );
-		$this.next( 'nav' ).slideToggle( 'fast' );
-	}
-
-	/**
-	 * Action for submenu toggles.
-	 */
-	function _submenuToggle() {
-
-		var $this  = $( this ),
-			others = $this.closest( '.menu-item' ).siblings();
-		_toggleAria( $this, 'aria-pressed' );
-		_toggleAria( $this, 'aria-expanded' );
-		$this.toggleClass( 'activated' );
-		$this.next( '.sub-menu' ).slideToggle( 'fast' );
-
-		others.find( '.' + subMenuButtonClass ).removeClass( 'activated' ).attr( 'aria-pressed', 'false' );
-		others.find( '.sub-menu' ).slideUp( 'fast' );
-
-	}
-
-	/**
-	 * Activate/deactivate superfish.
-	 *
-	 * @params buttons
-	 */
-	function _superfishToggle( buttons ) {
-		var _superfish = $( '.' + responsiveMenuClass + ' .js-superfish' ),
-			$args      = 'destroy';
-		if ( typeof _superfish.superfish !== 'function' ) {
-			return;
-		}
-		if ( 'none' === _getDisplayValue( buttons ) ) {
-			$args = {
-				'delay': 100,
-				'animation': {'opacity': 'show', 'height': 'show'},
-				'dropShadows': false,
-				'speed': 'fast'
-			};
-		}
-		_superfish.superfish( $args );
-	}
-
-	/**
-	 * Modify skip link to match mobile buttons.
-	 *
-	 * @param buttons
-	 */
-	function _changeSkipLink( buttons ) {
-
-		// Start with an empty array.
-		var menuToggleList = _getAllMenusArray();
-
-		// Exit out if there are no menu items to update.
-		if ( ! $( menuToggleList ).length > 0 ) {
-			return;
-		}
-
-		$.each(
-			menuToggleList, function ( key, value ) {
-
-				var newValue = value.replace( '.', '' ),
-				startLink    = 'genesis-' + newValue,
-				endLink      = 'genesis-mobile-' + newValue;
-
-				if ( 'none' == _getDisplayValue( buttons ) ) {
-					startLink = 'genesis-mobile-' + newValue;
-					endLink   = 'genesis-' + newValue;
-				}
-
-				var $item = $( '.genesis-skip-link a[href="#' + startLink + '"]' );
-
-				if ( menusToCombine !== null && value !== menusToCombine[0] ) {
-					$item.toggleClass( 'skip-link-hidden' );
-				}
-
-				if ( $item.length > 0 ) {
-					var link = $item.attr( 'href' );
-					link     = link.replace( startLink, endLink );
-
-					$item.attr( 'href', link );
-				} else {
-					return;
-				}
-
-			}
-		);
-
-	}
-
-	/**
-	 * Close all the menu toggles if buttons are hidden.
-	 *
-	 * @param buttons
-	 */
-	function _maybeClose( buttons ) {
-		if ( 'none' !== _getDisplayValue( buttons ) ) {
-			return true;
-		}
-
-		$( '.' + mainMenuButtonClass + ', .' + responsiveMenuClass + ' .sub-menu-toggle' )
-			.removeClass( 'activated' )
-			.attr( 'aria-expanded', false )
-			.attr( 'aria-pressed', false );
-
-		$( '.' + responsiveMenuClass + ', .' + responsiveMenuClass + ' .sub-menu' )
-			.attr( 'style', '' );
-	}
-
-	/**
-	 * Generic function to get the display value of an element.
-	 *
-	 * @param  {id} $id ID to check
-	 * @return {string}     CSS value of display property
-	 */
-	function _getDisplayValue( $id ) {
-		var element = document.getElementById( $id ),
-			style   = window.getComputedStyle( element );
-		return style.getPropertyValue( 'display' );
-	}
-
-	/**
-	 * Toggle aria attributes.
-	 *
-	 * @param  {button} $this     passed through
-	 * @param  {aria-xx} attribute aria attribute to toggle
-	 * @return {bool}           from _ariaReturn
-	 */
-	function _toggleAria( $this, attribute ) {
-		$this.attr(
-			attribute, function( index, value ) {
-				return 'false' === value;
-			}
-		);
-	}
-
-	/**
-	 * Helper function to return a comma separated string of menu selectors.
-	 *
-	 * @param {itemArray} Array of menu items to loop through.
-	 * @param {ignoreSecondary} boolean of whether to ignore the 'secondary' menu item.
-	 * @return {string} Comma-separated string.
-	 */
-	function _getMenuSelectorString( itemArray ) {
-
-		var itemString = $.map(
-			itemArray, function( value, key ) {
-				return value;
-			}
-		);
-
-		return itemString.join( ',' );
-
-	}
-
-	/**
-	 * Helper function to return a group array of all the menus in
-	 * both the 'others' and 'combine' arrays.
-	 *
-	 * @return {array} Array of all menu items as class selectors.
-	 */
-	function _getAllMenusArray() {
-
-		// Start with an empty array.
-		var menuList = [];
-
-		// If there are menus in the 'menusToCombine' array, add them to 'menuList'.
-		if ( menusToCombine !== null ) {
-
-			$.each(
-				menusToCombine, function( key, value ) {
-					menuList.push( value.valueOf() );
-				}
-			);
-
-		}
-
-		// Add menus in the 'others' array to 'menuList'.
-		$.each(
-			genesisMenus.others, function( key, value ) {
-				menuList.push( value.valueOf() );
-			}
-		);
-
-		if ( menuList.length > 0 ) {
-			return menuList;
-		} else {
-			return null;
-		}
-
-	}
-
-	$( document ).ready(
-		function () {
-
-			if ( _getAllMenusArray() !== null ) {
-
-				genesisMenu.init();
-
-			}
-
-		}
-	);
-
-})( document, jQuery );
diff --git a/js/responsive-menus.min.js b/js/responsive-menus.min.js
deleted file mode 100644
index d1620595..00000000
--- a/js/responsive-menus.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- GPL-2.0-or-later
-*/
-(function(p,b,y){function q(){var a=b('button[id^\x3d"genesis-mobile-"]').attr("id");if("undefined"!==typeof a){"none"===l(a)&&(b(".menu-toggle, .genesis-responsive-menu .sub-menu-toggle").removeClass("activated").attr("aria-expanded",!1).attr("aria-pressed",!1),b(".genesis-responsive-menu, .genesis-responsive-menu .sub-menu").attr("style",""));var c=b(".genesis-responsive-menu .js-superfish"),d="destroy";"function"===typeof c.superfish&&("none"===l(a)&&(d={delay:100,animation:{opacity:"show",height:"show"},
-dropShadows:!1,speed:"fast"}),c.superfish(d));r(a);t(a)}}function u(){var a=b(this),c=a.next("nav");a.attr("id","genesis-mobile-"+b(c).attr("class").match(/nav-\w*\b/))}function t(a){if(null!=f){var c=f[0],d=b(f).filter(function(a){if(0<a)return a});"none"!==l(a)?(b.each(d,function(a,d){b(d).find(".menu \x3e li").addClass("moved-item-"+d.replace(".","")).appendTo(c+" ul.genesis-nav-menu")}),b(k(d)).hide()):(b(k(d)).show(),b.each(d,function(a,d){b(".moved-item-"+d.replace(".","")).appendTo(d+" ul.genesis-nav-menu").removeClass("moved-item-"+
-d.replace(".",""))}))}}function v(){var a=b(this);m(a,"aria-pressed");m(a,"aria-expanded");a.toggleClass("activated");a.next("nav").slideToggle("fast")}function w(){var a=b(this),c=a.closest(".menu-item").siblings();m(a,"aria-pressed");m(a,"aria-expanded");a.toggleClass("activated");a.next(".sub-menu").slideToggle("fast");c.find(".sub-menu-toggle").removeClass("activated").attr("aria-pressed","false");c.find(".sub-menu").slideUp("fast")}function r(a){var c=n();0< !b(c).length||b.each(c,function(d,
-c){var e=c.replace(".","");d="genesis-"+e;var h="genesis-mobile-"+e;"none"==l(a)&&(d="genesis-mobile-"+e,h="genesis-"+e);e=b('.genesis-skip-link a[href\x3d"#'+d+'"]');null!==f&&c!==f[0]&&e.toggleClass("skip-link-hidden");0<e.length&&(c=e.attr("href"),c=c.replace(d,h),e.attr("href",c))})}function l(a){a=p.getElementById(a);return window.getComputedStyle(a).getPropertyValue("display")}function m(a,b){a.attr(b,function(a,b){return"false"===b})}function k(a){return b.map(a,function(a,b){return a}).join(",")}
-function n(){var a=[];null!==f&&b.each(f,function(b,d){a.push(d.valueOf())});b.each(e.others,function(b,d){a.push(d.valueOf())});return 0<a.length?a:null}var g="undefined"===typeof genesis_responsive_menu?"":genesis_responsive_menu,e={},f=[];b.each(g.menuClasses,function(a){e[a]=[];b.each(this,function(c,d){c=b(d);1<c.length?b.each(c,function(c,g){c=d+"-"+c;b(this).addClass(c.replace(".",""));e[a].push(c);"combine"===a&&f.push(c)}):1==c.length&&(e[a].push(d),"combine"===a&&f.push(d))})});"undefined"==
-typeof e.others&&(e.others=[]);1==f.length&&(e.others.push(f[0]),f=e.combine=null);var x={init:function(){if(0!=b(n()).length){var a="undefined"!==typeof g.menuIconClass?g.menuIconClass:"dashicons-before dashicons-menu",c="undefined"!==typeof g.subMenuIconClass?g.subMenuIconClass:"dashicons-before dashicons-arrow-down-alt2",d=b("\x3cbutton /\x3e",{"class":"menu-toggle","aria-expanded":!1,"aria-pressed":!1}).append(g.mainMenu),h=b("\x3cbutton /\x3e",{"class":"sub-menu-toggle","aria-expanded":!1,"aria-pressed":!1}).append(b("\x3cspan /\x3e",
-{"class":"screen-reader-text",text:g.subMenu}));b(k(e)).addClass("genesis-responsive-menu");b(k(e)).find(".sub-menu").before(h);null!==f?(h=e.others.concat(f[0]),b(k(h)).before(d)):b(k(e.others)).before(d);b(".menu-toggle").addClass(a);b(".sub-menu-toggle").addClass(c);b(".menu-toggle").on("click.genesisMenu-mainbutton",v).each(u);b(".sub-menu-toggle").on("click.genesisMenu-subbutton",w);b(window).on("resize.genesisMenu",q).triggerHandler("resize.genesisMenu")}}};b(p).ready(function(){null!==n()&&
-x.init()})})(document,jQuery);
\ No newline at end of file

From 8584131f68f922f1c02e4cf29672c40fe617747c Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Wed, 15 May 2019 11:26:34 +0200
Subject: [PATCH 14/41] Use child theme handle constant in place of hard-coded
 theme handle

---
 functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index 36847f6f..5e09cc71 100755
--- a/functions.php
+++ b/functions.php
@@ -74,7 +74,7 @@ function genesis_child_gutenberg_support() { // phpcs:ignore WordPress.NamingCon
 function genesis_sample_enqueue_scripts_styles() {
 
 	wp_enqueue_style(
-		'genesis-sample-fonts',
+		CHILD_THEME_HANDLE . '-fonts',
 		'//fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700',
 		array(),
 		CHILD_THEME_VERSION
@@ -84,7 +84,7 @@ function genesis_sample_enqueue_scripts_styles() {
 
 	if ( genesis_is_amp() ) {
 		wp_enqueue_style(
-			'genesis-sample-amp',
+			CHILD_THEME_HANDLE . '-amp',
 			get_stylesheet_directory_uri() . '/lib/amp/amp.css',
 			array( CHILD_THEME_HANDLE ),
 			CHILD_THEME_VERSION

From 8898be194ee91fd7299cb5e5adc81b9040dded0b Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Wed, 15 May 2019 11:48:08 +0200
Subject: [PATCH 15/41] Add AMP CSS to lint:css script

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bed648c9..2eaf6280 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
 	"scripts": {
 		"autoprefixer": "postcss style.css lib/**/*.css --use autoprefixer --replace --no-map --verbose",
 		"makepot": "node .scripts/makepot.js",
-		"lint:css": "stylelint \"style.css\" \"lib/gutenberg/*.css\" \"lib/woocommerce/*.css\"",
+		"lint:css": "stylelint \"style.css\" \"lib/gutenberg/*.css\" \"lib/woocommerce/*.css\" \"lib/amp/*.css\"",
 		"lint:js": "eslint .",
 		"fix:js": "eslint . --fix",
 		"zip": "node .scripts/makezip.js"

From 6041d2f0320fb4e847f672aa8f4548419c8ab0a4 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Wed, 15 May 2019 11:48:15 +0200
Subject: [PATCH 16/41] Lint AMP CSS

---
 lib/amp/amp.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/amp/amp.css b/lib/amp/amp.css
index 6a87798f..e0d274f8 100644
--- a/lib/amp/amp.css
+++ b/lib/amp/amp.css
@@ -21,9 +21,10 @@ This currently loads only on AMP pages.
 --------------------------------------------- */
 
 /*
- * :focus-within needs it own selector.
- * Why? If the event a browser does not recognize this pseudo-class, only this selector and its declarations
- * are ignored.  Isolating it ensures the submenu animation works on :hover.
+ * :focus-within needs its own selector.
+ * Why? If the event a browser does not recognize this pseudo-class, only this
+ * selector and its declarations are ignored. Isolating it ensures the submenu
+ * animation works on :hover.
  */
 .menu .menu-item:focus-within > .sub-menu {
 	transform: scaleY(1);

From efc13d1d303398c86b80faa71a172580b1d37bb3 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Tue, 28 May 2019 17:17:20 +0200
Subject: [PATCH 17/41] Update package versions

---
 package-lock.json | 1626 ++++++++++++++++++++++-----------------------
 package.json      |   14 +-
 2 files changed, 804 insertions(+), 836 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5b4d86f8..34209eee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,42 +13,27 @@
 			}
 		},
 		"@babel/core": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.0.tgz",
-			"integrity": "sha512-7pvAdC4B+iKjFFp9Ztj0QgBndJ++qaMeonT185wAqUnhipw8idm9Rv1UMyBuKtYjfl6ORNkgEgcsYLfHX/GpLw==",
+			"version": "7.4.5",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz",
+			"integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0",
-				"@babel/generator": "^7.2.0",
-				"@babel/helpers": "^7.2.0",
-				"@babel/parser": "^7.2.0",
-				"@babel/template": "^7.1.2",
-				"@babel/traverse": "^7.1.6",
-				"@babel/types": "^7.2.0",
+				"@babel/generator": "^7.4.4",
+				"@babel/helpers": "^7.4.4",
+				"@babel/parser": "^7.4.5",
+				"@babel/template": "^7.4.4",
+				"@babel/traverse": "^7.4.5",
+				"@babel/types": "^7.4.4",
 				"convert-source-map": "^1.1.0",
 				"debug": "^4.1.0",
 				"json5": "^2.1.0",
-				"lodash": "^4.17.10",
+				"lodash": "^4.17.11",
 				"resolve": "^1.3.2",
 				"semver": "^5.4.1",
 				"source-map": "^0.5.0"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
-					"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -58,14 +43,14 @@
 			}
 		},
 		"@babel/generator": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz",
-			"integrity": "sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==",
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
+			"integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.2.0",
+				"@babel/types": "^7.4.4",
 				"jsesc": "^2.5.1",
-				"lodash": "^4.17.10",
+				"lodash": "^4.17.11",
 				"source-map": "^0.5.0",
 				"trim-right": "^1.0.1"
 			},
@@ -99,23 +84,23 @@
 			}
 		},
 		"@babel/helper-split-export-declaration": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
-			"integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+			"integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.0.0"
+				"@babel/types": "^7.4.4"
 			}
 		},
 		"@babel/helpers": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.2.0.tgz",
-			"integrity": "sha512-Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A==",
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz",
+			"integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
 			"dev": true,
 			"requires": {
-				"@babel/template": "^7.1.2",
-				"@babel/traverse": "^7.1.5",
-				"@babel/types": "^7.2.0"
+				"@babel/template": "^7.4.4",
+				"@babel/traverse": "^7.4.4",
+				"@babel/types": "^7.4.4"
 			}
 		},
 		"@babel/highlight": {
@@ -130,64 +115,47 @@
 			}
 		},
 		"@babel/parser": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz",
-			"integrity": "sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg==",
+			"version": "7.4.5",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
+			"integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
 			"dev": true
 		},
 		"@babel/template": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz",
-			"integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==",
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
+			"integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.1.2",
-				"@babel/types": "^7.1.2"
+				"@babel/parser": "^7.4.4",
+				"@babel/types": "^7.4.4"
 			}
 		},
 		"@babel/traverse": {
-			"version": "7.1.6",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz",
-			"integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==",
+			"version": "7.4.5",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
+			"integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0",
-				"@babel/generator": "^7.1.6",
+				"@babel/generator": "^7.4.4",
 				"@babel/helper-function-name": "^7.1.0",
-				"@babel/helper-split-export-declaration": "^7.0.0",
-				"@babel/parser": "^7.1.6",
-				"@babel/types": "^7.1.6",
+				"@babel/helper-split-export-declaration": "^7.4.4",
+				"@babel/parser": "^7.4.5",
+				"@babel/types": "^7.4.4",
 				"debug": "^4.1.0",
 				"globals": "^11.1.0",
-				"lodash": "^4.17.10"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
-					"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
+				"lodash": "^4.17.11"
 			}
 		},
 		"@babel/types": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.0.tgz",
-			"integrity": "sha512-b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A==",
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+			"integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
 			"dev": true,
 			"requires": {
 				"esutils": "^2.0.2",
-				"lodash": "^4.17.10",
+				"lodash": "^4.17.11",
 				"to-fast-properties": "^2.0.0"
 			}
 		},
@@ -202,11 +170,67 @@
 			}
 		},
 		"@nodelib/fs.stat": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz",
-			"integrity": "sha512-yprFYuno9FtNsSHVlSWd+nRlmGoAbqbeCwOryP6sC/zoCjhpArcRMYp19EvpSUSizJAlsXEwJv+wcWS9XaXdMw==",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+			"dev": true
+		},
+		"@types/events": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+			"integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+			"dev": true
+		},
+		"@types/glob": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+			"integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+			"dev": true,
+			"requires": {
+				"@types/events": "*",
+				"@types/minimatch": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/minimatch": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+			"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+			"dev": true
+		},
+		"@types/node": {
+			"version": "12.0.2",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.2.tgz",
+			"integrity": "sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==",
+			"dev": true
+		},
+		"@types/unist": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
+			"integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
 			"dev": true
 		},
+		"@types/vfile": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/vfile/-/vfile-3.0.2.tgz",
+			"integrity": "sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/unist": "*",
+				"@types/vfile-message": "*"
+			}
+		},
+		"@types/vfile-message": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-1.0.1.tgz",
+			"integrity": "sha512-mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/unist": "*"
+			}
+		},
 		"acorn": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
@@ -220,9 +244,9 @@
 			"dev": true
 		},
 		"ajv": {
-			"version": "6.6.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz",
-			"integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
+			"version": "6.10.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+			"integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
 			"dev": true,
 			"requires": {
 				"fast-deep-equal": "^2.0.1",
@@ -405,9 +429,9 @@
 			}
 		},
 		"async-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-			"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
 			"dev": true
 		},
 		"atob": {
@@ -417,36 +441,23 @@
 			"dev": true
 		},
 		"autoprefixer": {
-			"version": "9.4.2",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.2.tgz",
-			"integrity": "sha512-tYQYJvZvqlJCzF+BLC//uAcdT/Yy4ik9bwZRXr/EehUJ/bjjpTthsWTy8dpowdoIE1sLCDf1ch4Eb2cOSzZC9w==",
+			"version": "9.5.1",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz",
+			"integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.3.5",
-				"caniuse-lite": "^1.0.30000914",
+				"browserslist": "^4.5.4",
+				"caniuse-lite": "^1.0.30000957",
 				"normalize-range": "^0.1.2",
 				"num2fraction": "^1.2.2",
-				"postcss": "^7.0.6",
+				"postcss": "^7.0.14",
 				"postcss-value-parser": "^3.3.1"
-			},
-			"dependencies": {
-				"postcss": {
-					"version": "7.0.6",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz",
-					"integrity": "sha512-Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.5.0"
-					}
-				}
 			}
 		},
 		"bail": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz",
-			"integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.4.tgz",
+			"integrity": "sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww==",
 			"dev": true
 		},
 		"balanced-match": {
@@ -517,9 +528,9 @@
 			"dev": true
 		},
 		"binary-extensions": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
-			"integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+			"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
 			"dev": true
 		},
 		"bl": {
@@ -533,9 +544,9 @@
 			}
 		},
 		"bluebird": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz",
-			"integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==",
+			"version": "3.5.5",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+			"integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
 			"dev": true
 		},
 		"brace-expansion": {
@@ -578,14 +589,14 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.3.5",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.5.tgz",
-			"integrity": "sha512-z9ZhGc3d9e/sJ9dIx5NFXkKoaiQTnrvrMsN3R1fGb1tkWWNSz12UewJn9TNxGo1l7J23h0MRaPmk7jfeTZYs1w==",
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.0.tgz",
+			"integrity": "sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30000912",
-				"electron-to-chromium": "^1.3.86",
-				"node-releases": "^1.0.5"
+				"caniuse-lite": "^1.0.30000967",
+				"electron-to-chromium": "^1.3.133",
+				"node-releases": "^1.1.19"
 			}
 		},
 		"buffer": {
@@ -662,6 +673,14 @@
 			"dev": true,
 			"requires": {
 				"callsites": "^2.0.0"
+			},
+			"dependencies": {
+				"callsites": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+					"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+					"dev": true
+				}
 			}
 		},
 		"caller-path": {
@@ -674,15 +693,15 @@
 			}
 		},
 		"callsites": {
-			"version": "2.0.0",
-			"resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-			"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
 			"dev": true
 		},
 		"camelcase": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-			"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 			"dev": true
 		},
 		"camelcase-keys": {
@@ -694,53 +713,72 @@
 				"camelcase": "^4.1.0",
 				"map-obj": "^2.0.0",
 				"quick-lru": "^1.0.0"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+					"dev": true
+				}
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30000914",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000914.tgz",
-			"integrity": "sha512-qqj0CL1xANgg6iDOybiPTIxtsmAnfIky9mBC35qgWrnK4WwmhqfpmkDYMYgwXJ8LRZ3/2jXlCntulO8mBaAgSg==",
+			"version": "1.0.30000971",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz",
+			"integrity": "sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==",
 			"dev": true
 		},
 		"ccount": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz",
-			"integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.4.tgz",
+			"integrity": "sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w==",
 			"dev": true
 		},
 		"chalk": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-			"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
 			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
 				"supports-color": "^5.3.0"
+			},
+			"dependencies": {
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
 			}
 		},
 		"character-entities": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
-			"integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.3.tgz",
+			"integrity": "sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w==",
 			"dev": true
 		},
 		"character-entities-html4": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz",
-			"integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.3.tgz",
+			"integrity": "sha512-SwnyZ7jQBCRHELk9zf2CN5AnGEc2nA+uKMZLHvcqhpPprjkYhiLn0DywMHgN5ttFZuITMATbh68M6VIVKwJbcg==",
 			"dev": true
 		},
 		"character-entities-legacy": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz",
-			"integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz",
+			"integrity": "sha512-YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww==",
 			"dev": true
 		},
 		"character-reference-invalid": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz",
-			"integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz",
+			"integrity": "sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg==",
 			"dev": true
 		},
 		"chardet": {
@@ -750,32 +788,33 @@
 			"dev": true
 		},
 		"chokidar": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-			"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+			"integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
 			"dev": true,
 			"requires": {
 				"anymatch": "^2.0.0",
-				"async-each": "^1.0.0",
-				"braces": "^2.3.0",
-				"fsevents": "^1.2.2",
+				"async-each": "^1.0.1",
+				"braces": "^2.3.2",
+				"fsevents": "^1.2.7",
 				"glob-parent": "^3.1.0",
-				"inherits": "^2.0.1",
+				"inherits": "^2.0.3",
 				"is-binary-path": "^1.0.0",
 				"is-glob": "^4.0.0",
-				"lodash.debounce": "^4.0.8",
-				"normalize-path": "^2.1.1",
+				"normalize-path": "^3.0.0",
 				"path-is-absolute": "^1.0.0",
-				"readdirp": "^2.0.0",
-				"upath": "^1.0.5"
+				"readdirp": "^2.2.1",
+				"upath": "^1.1.1"
+			},
+			"dependencies": {
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+					"dev": true
+				}
 			}
 		},
-		"circular-json": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-			"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-			"dev": true
-		},
 		"class-utils": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -842,9 +881,9 @@
 			"dev": true
 		},
 		"collapse-white-space": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
-			"integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.5.tgz",
+			"integrity": "sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ==",
 			"dev": true
 		},
 		"collection-visit": {
@@ -873,9 +912,9 @@
 			"dev": true
 		},
 		"component-emitter": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
 			"dev": true
 		},
 		"compress-commons": {
@@ -977,22 +1016,19 @@
 			}
 		},
 		"debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+			"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 			"dev": true,
 			"requires": {
-				"ms": "2.0.0"
+				"ms": "^2.1.1"
 			}
 		},
 		"decamelize": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-			"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-			"dev": true,
-			"requires": {
-				"xregexp": "4.0.0"
-			}
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"dev": true
 		},
 		"decamelize-keys": {
 			"version": "1.1.0",
@@ -1004,12 +1040,6 @@
 				"map-obj": "^1.0.0"
 			},
 			"dependencies": {
-				"decamelize": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-					"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-					"dev": true
-				},
 				"map-obj": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
@@ -1081,18 +1111,17 @@
 			}
 		},
 		"dependency-graph": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
-			"integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.8.0.tgz",
+			"integrity": "sha512-DCvzSq2UiMsuLnj/9AL484ummEgLtZIcRS7YvtO38QnpX3vqh9nJ8P+zhu8Ja+SmLrBHO2iDbva20jq38qvBkQ==",
 			"dev": true
 		},
 		"dir-glob": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-			"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+			"integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
 			"dev": true,
 			"requires": {
-				"arrify": "^1.0.1",
 				"path-type": "^3.0.0"
 			}
 		},
@@ -1106,27 +1135,19 @@
 			}
 		},
 		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+			"integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "~1.1.1",
-				"entities": "~1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
+				"domelementtype": "^1.3.0",
+				"entities": "^1.1.1"
 			}
 		},
 		"domelementtype": {
-			"version": "1.3.0",
-			"resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
 			"dev": true
 		},
 		"domhandler": {
@@ -1158,9 +1179,9 @@
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.3.88",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.88.tgz",
-			"integrity": "sha512-UPV4NuQMKeUh1S0OWRvwg0PI8ASHN9kBC8yDTk1ROXLC85W5GnhTRu/MZu3Teqx3JjlQYuckuHYXSUSgtb3J+A==",
+			"version": "1.3.137",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz",
+			"integrity": "sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==",
 			"dev": true
 		},
 		"emoji-regex": {
@@ -1234,9 +1255,9 @@
 			"dev": true
 		},
 		"eslint": {
-			"version": "5.15.2",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.2.tgz",
-			"integrity": "sha512-I8VM4SILpMwUvsRt83bQVwIRQAJ2iPMXun1FVZ/lV1OHklH2tJaXqoDnNzdiFc6bnCtGKXvQIQNP3kj1eMskSw==",
+			"version": "5.16.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+			"integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0",
@@ -1259,7 +1280,7 @@
 				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"inquirer": "^6.2.2",
-				"js-yaml": "^3.12.0",
+				"js-yaml": "^3.13.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
 				"levn": "^0.3.0",
 				"lodash": "^4.17.11",
@@ -1275,146 +1296,6 @@
 				"strip-json-comments": "^2.0.1",
 				"table": "^5.2.3",
 				"text-table": "^0.2.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.10.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
-					"integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^2.0.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"file-entry-cache": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-					"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-					"dev": true,
-					"requires": {
-						"flat-cache": "^2.0.1"
-					}
-				},
-				"flat-cache": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-					"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-					"dev": true,
-					"requires": {
-						"flatted": "^2.0.0",
-						"rimraf": "2.6.3",
-						"write": "1.0.3"
-					}
-				},
-				"ignore": {
-					"version": "4.0.6",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-					"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-					"dev": true
-				},
-				"import-fresh": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
-					"integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
-					"dev": true,
-					"requires": {
-						"parent-module": "^1.0.0",
-						"resolve-from": "^4.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"resolve-from": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-					"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"slice-ansi": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-					"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"astral-regex": "^1.0.0",
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					},
-					"dependencies": {
-						"strip-ansi": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-							"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"table": {
-					"version": "5.2.3",
-					"resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz",
-					"integrity": "sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.9.1",
-						"lodash": "^4.17.11",
-						"slice-ansi": "^2.1.0",
-						"string-width": "^3.0.0"
-					}
-				},
-				"write": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-					"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-					"dev": true,
-					"requires": {
-						"mkdirp": "^0.5.1"
-					}
-				}
 			}
 		},
 		"eslint-config-wordpress": {
@@ -1493,13 +1374,13 @@
 			"dev": true
 		},
 		"execa": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-			"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
 			"dev": true,
 			"requires": {
 				"cross-spawn": "^6.0.0",
-				"get-stream": "^3.0.0",
+				"get-stream": "^4.0.0",
 				"is-stream": "^1.1.0",
 				"npm-run-path": "^2.0.0",
 				"p-finally": "^1.0.0",
@@ -1531,6 +1412,15 @@
 				"to-regex": "^3.0.1"
 			},
 			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
 				"define-property": {
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -1548,18 +1438,15 @@
 					"requires": {
 						"is-extendable": "^0.1.0"
 					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
 				}
 			}
 		},
-		"expand-tilde": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-			"dev": true,
-			"requires": {
-				"homedir-polyfill": "^1.0.1"
-			}
-		},
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1670,16 +1557,16 @@
 			"dev": true
 		},
 		"fast-glob": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.3.tgz",
-			"integrity": "sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA==",
+			"version": "2.2.7",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+			"integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
 			"dev": true,
 			"requires": {
 				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.0.1",
+				"@nodelib/fs.stat": "^1.1.2",
 				"glob-parent": "^3.1.0",
 				"is-glob": "^4.0.0",
-				"merge2": "^1.2.1",
+				"merge2": "^1.2.3",
 				"micromatch": "^3.1.10"
 			}
 		},
@@ -1705,13 +1592,12 @@
 			}
 		},
 		"file-entry-cache": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-			"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+			"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
 			"dev": true,
 			"requires": {
-				"flat-cache": "^1.2.1",
-				"object-assign": "^4.0.1"
+				"flat-cache": "^2.0.1"
 			}
 		},
 		"fill-range": {
@@ -1747,15 +1633,14 @@
 			}
 		},
 		"flat-cache": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-			"integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+			"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
 			"dev": true,
 			"requires": {
-				"circular-json": "^0.3.1",
-				"graceful-fs": "^4.1.2",
-				"rimraf": "~2.6.2",
-				"write": "^0.2.1"
+				"flatted": "^2.0.0",
+				"rimraf": "2.6.3",
+				"write": "1.0.3"
 			}
 		},
 		"flatted": {
@@ -1786,9 +1671,9 @@
 			"dev": true
 		},
 		"fs-extra": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
-			"integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
 			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
@@ -1803,14 +1688,14 @@
 			"dev": true
 		},
 		"fsevents": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-			"integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+			"version": "1.2.9",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+			"integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
 			"dev": true,
 			"optional": true,
 			"requires": {
-				"nan": "^2.9.2",
-				"node-pre-gyp": "^0.10.0"
+				"nan": "^2.12.1",
+				"node-pre-gyp": "^0.12.0"
 			},
 			"dependencies": {
 				"abbrev": {
@@ -1832,7 +1717,7 @@
 					"optional": true
 				},
 				"are-we-there-yet": {
-					"version": "1.1.4",
+					"version": "1.1.5",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
@@ -1858,7 +1743,7 @@
 					}
 				},
 				"chownr": {
-					"version": "1.0.1",
+					"version": "1.1.1",
 					"bundled": true,
 					"dev": true,
 					"optional": true
@@ -1888,16 +1773,16 @@
 					"optional": true
 				},
 				"debug": {
-					"version": "2.6.9",
+					"version": "4.1.1",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
 				},
 				"deep-extend": {
-					"version": "0.5.1",
+					"version": "0.6.0",
 					"bundled": true,
 					"dev": true,
 					"optional": true
@@ -1946,7 +1831,7 @@
 					}
 				},
 				"glob": {
-					"version": "7.1.2",
+					"version": "7.1.3",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
@@ -1966,12 +1851,12 @@
 					"optional": true
 				},
 				"iconv-lite": {
-					"version": "0.4.21",
+					"version": "0.4.24",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"safer-buffer": "^2.1.0"
+						"safer-buffer": ">= 2.1.2 < 3"
 					}
 				},
 				"ignore-walk": {
@@ -2036,17 +1921,17 @@
 					"optional": true
 				},
 				"minipass": {
-					"version": "2.2.4",
+					"version": "2.3.5",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"safe-buffer": "^5.1.1",
+						"safe-buffer": "^5.1.2",
 						"yallist": "^3.0.0"
 					}
 				},
 				"minizlib": {
-					"version": "1.1.0",
+					"version": "1.2.1",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
@@ -2064,35 +1949,35 @@
 					}
 				},
 				"ms": {
-					"version": "2.0.0",
+					"version": "2.1.1",
 					"bundled": true,
 					"dev": true,
 					"optional": true
 				},
 				"needle": {
-					"version": "2.2.0",
+					"version": "2.3.0",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"debug": "^2.1.2",
+						"debug": "^4.1.0",
 						"iconv-lite": "^0.4.4",
 						"sax": "^1.2.4"
 					}
 				},
 				"node-pre-gyp": {
-					"version": "0.10.0",
+					"version": "0.12.0",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
 						"detect-libc": "^1.0.2",
 						"mkdirp": "^0.5.1",
-						"needle": "^2.2.0",
+						"needle": "^2.2.1",
 						"nopt": "^4.0.1",
 						"npm-packlist": "^1.1.6",
 						"npmlog": "^4.0.2",
-						"rc": "^1.1.7",
+						"rc": "^1.2.7",
 						"rimraf": "^2.6.1",
 						"semver": "^5.3.0",
 						"tar": "^4"
@@ -2109,13 +1994,13 @@
 					}
 				},
 				"npm-bundled": {
-					"version": "1.0.3",
+					"version": "1.0.6",
 					"bundled": true,
 					"dev": true,
 					"optional": true
 				},
 				"npm-packlist": {
-					"version": "1.1.10",
+					"version": "1.4.1",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
@@ -2192,12 +2077,12 @@
 					"optional": true
 				},
 				"rc": {
-					"version": "1.2.7",
+					"version": "1.2.8",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"deep-extend": "^0.5.1",
+						"deep-extend": "^0.6.0",
 						"ini": "~1.3.0",
 						"minimist": "^1.2.0",
 						"strip-json-comments": "~2.0.1"
@@ -2227,16 +2112,16 @@
 					}
 				},
 				"rimraf": {
-					"version": "2.6.2",
+					"version": "2.6.3",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"glob": "^7.0.5"
+						"glob": "^7.1.3"
 					}
 				},
 				"safe-buffer": {
-					"version": "5.1.1",
+					"version": "5.1.2",
 					"bundled": true,
 					"dev": true,
 					"optional": true
@@ -2254,7 +2139,7 @@
 					"optional": true
 				},
 				"semver": {
-					"version": "5.5.0",
+					"version": "5.7.0",
 					"bundled": true,
 					"dev": true,
 					"optional": true
@@ -2307,17 +2192,17 @@
 					"optional": true
 				},
 				"tar": {
-					"version": "4.4.1",
+					"version": "4.4.8",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"chownr": "^1.0.1",
+						"chownr": "^1.1.1",
 						"fs-minipass": "^1.2.5",
-						"minipass": "^2.2.4",
-						"minizlib": "^1.1.0",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
 						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.1",
+						"safe-buffer": "^5.1.2",
 						"yallist": "^3.0.2"
 					}
 				},
@@ -2328,12 +2213,12 @@
 					"optional": true
 				},
 				"wide-align": {
-					"version": "1.1.2",
+					"version": "1.1.3",
 					"bundled": true,
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"string-width": "^1.0.2"
+						"string-width": "^1.0.2 || 2"
 					}
 				},
 				"wrappy": {
@@ -2343,7 +2228,7 @@
 					"optional": true
 				},
 				"yallist": {
-					"version": "3.0.2",
+					"version": "3.0.3",
 					"bundled": true,
 					"dev": true,
 					"optional": true
@@ -2375,10 +2260,13 @@
 			"dev": true
 		},
 		"get-stream": {
-			"version": "3.0.0",
-			"resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-			"dev": true
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+			"dev": true,
+			"requires": {
+				"pump": "^3.0.0"
+			}
 		},
 		"get-value": {
 			"version": "2.0.6",
@@ -2387,13 +2275,27 @@
 			"dev": true
 		},
 		"gettext-parser": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-2.0.0.tgz",
-			"integrity": "sha512-FDs/7XjNw58ToQwJFO7avZZbPecSYgw8PBYhd0An+4JtZSrSzKhEvTsVV2uqdO7VziWTOGSgLGD5YRPdsCjF7Q==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-3.1.1.tgz",
+			"integrity": "sha512-vNhWcqXEtZPs5Ft1ReA34g7ByWotpcOIeJvXVy2jF3/G2U9v6W0wG4Z4hXzcU8R//jArqkgHcVCGgGqa4vxVlQ==",
 			"dev": true,
 			"requires": {
 				"encoding": "^0.1.12",
+				"readable-stream": "^3.2.0",
 				"safe-buffer": "^5.1.2"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+					"integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
 			}
 		},
 		"glob": {
@@ -2438,48 +2340,53 @@
 			"dev": true
 		},
 		"global-modules": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
 			"dev": true,
 			"requires": {
-				"global-prefix": "^1.0.1",
-				"is-windows": "^1.0.1",
-				"resolve-dir": "^1.0.0"
+				"global-prefix": "^3.0.0"
 			}
 		},
 		"global-prefix": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
 			"dev": true,
 			"requires": {
-				"expand-tilde": "^2.0.2",
-				"homedir-polyfill": "^1.0.1",
-				"ini": "^1.3.4",
-				"is-windows": "^1.0.1",
-				"which": "^1.2.14"
+				"ini": "^1.3.5",
+				"kind-of": "^6.0.2",
+				"which": "^1.3.1"
 			}
 		},
 		"globals": {
-			"version": "11.9.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
-			"integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
 			"dev": true
 		},
 		"globby": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
-			"integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
-			"dev": true,
-			"requires": {
-				"array-union": "^1.0.1",
-				"dir-glob": "^2.0.0",
-				"fast-glob": "^2.0.2",
-				"glob": "^7.1.2",
-				"ignore": "^3.3.5",
-				"pify": "^3.0.0",
-				"slash": "^1.0.0"
+			"version": "9.2.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
+			"integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+			"dev": true,
+			"requires": {
+				"@types/glob": "^7.1.1",
+				"array-union": "^1.0.2",
+				"dir-glob": "^2.2.2",
+				"fast-glob": "^2.2.6",
+				"glob": "^7.1.3",
+				"ignore": "^4.0.3",
+				"pify": "^4.0.1",
+				"slash": "^2.0.0"
+			},
+			"dependencies": {
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
+				}
 			}
 		},
 		"globjoin": {
@@ -2489,9 +2396,9 @@
 			"dev": true
 		},
 		"gonzales-pe": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
-			"integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
+			"version": "4.2.4",
+			"resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.4.tgz",
+			"integrity": "sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==",
 			"dev": true,
 			"requires": {
 				"minimist": "1.1.x"
@@ -2499,7 +2406,7 @@
 			"dependencies": {
 				"minimist": {
 					"version": "1.1.3",
-					"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
 					"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
 					"dev": true
 				}
@@ -2564,15 +2471,6 @@
 				}
 			}
 		},
-		"homedir-polyfill": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-			"integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
-			"dev": true,
-			"requires": {
-				"parse-passwd": "^1.0.0"
-			}
-		},
 		"hosted-git-info": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
@@ -2586,23 +2484,23 @@
 			"dev": true
 		},
 		"htmlparser2": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
-			"integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "^1.3.0",
+				"domelementtype": "^1.3.1",
 				"domhandler": "^2.3.0",
 				"domutils": "^1.5.1",
 				"entities": "^1.1.1",
 				"inherits": "^2.0.1",
-				"readable-stream": "^3.0.6"
+				"readable-stream": "^3.1.1"
 			},
 			"dependencies": {
 				"readable-stream": {
-					"version": "3.0.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz",
-					"integrity": "sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==",
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+					"integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
 					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
@@ -2628,9 +2526,9 @@
 			"dev": true
 		},
 		"ignore": {
-			"version": "3.3.10",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-			"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
 			"dev": true
 		},
 		"import-cwd": {
@@ -2643,13 +2541,13 @@
 			}
 		},
 		"import-fresh": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-			"integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
+			"integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
 			"dev": true,
 			"requires": {
-				"caller-path": "^2.0.0",
-				"resolve-from": "^3.0.0"
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
 			}
 		},
 		"import-from": {
@@ -2659,6 +2557,14 @@
 			"dev": true,
 			"requires": {
 				"resolve-from": "^3.0.0"
+			},
+			"dependencies": {
+				"resolve-from": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+					"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+					"dev": true
+				}
 			}
 		},
 		"import-lazy": {
@@ -2708,9 +2614,9 @@
 			"dev": true
 		},
 		"inquirer": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz",
-			"integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==",
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
+			"integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
 			"dev": true,
 			"requires": {
 				"ansi-escapes": "^3.2.0",
@@ -2724,7 +2630,7 @@
 				"run-async": "^2.2.0",
 				"rxjs": "^6.4.0",
 				"string-width": "^2.1.0",
-				"strip-ansi": "^5.0.0",
+				"strip-ansi": "^5.1.0",
 				"through": "^2.3.6"
 			},
 			"dependencies": {
@@ -2734,17 +2640,6 @@
 					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
 					"dev": true
 				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
 				"strip-ansi": {
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -2783,9 +2678,9 @@
 			}
 		},
 		"is-alphabetical": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz",
-			"integrity": "sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.3.tgz",
+			"integrity": "sha512-eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA==",
 			"dev": true
 		},
 		"is-alphanumeric": {
@@ -2795,9 +2690,9 @@
 			"dev": true
 		},
 		"is-alphanumerical": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz",
-			"integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz",
+			"integrity": "sha512-A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA==",
 			"dev": true,
 			"requires": {
 				"is-alphabetical": "^1.0.0",
@@ -2867,9 +2762,9 @@
 			"dev": true
 		},
 		"is-decimal": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz",
-			"integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.3.tgz",
+			"integrity": "sha512-bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ==",
 			"dev": true
 		},
 		"is-descriptor": {
@@ -2916,18 +2811,18 @@
 			"dev": true
 		},
 		"is-glob": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-			"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
 			"dev": true,
 			"requires": {
 				"is-extglob": "^2.1.1"
 			}
 		},
 		"is-hexadecimal": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz",
-			"integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz",
+			"integrity": "sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==",
 			"dev": true
 		},
 		"is-number": {
@@ -2952,7 +2847,7 @@
 		},
 		"is-obj": {
 			"version": "1.0.1",
-			"resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
 			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
 			"dev": true
 		},
@@ -3014,9 +2909,9 @@
 			}
 		},
 		"is-whitespace-character": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz",
-			"integrity": "sha512-SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz",
+			"integrity": "sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ==",
 			"dev": true
 		},
 		"is-windows": {
@@ -3026,9 +2921,9 @@
 			"dev": true
 		},
 		"is-word-character": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz",
-			"integrity": "sha512-T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.3.tgz",
+			"integrity": "sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A==",
 			"dev": true
 		},
 		"isarray": {
@@ -3056,9 +2951,9 @@
 			"dev": true
 		},
 		"js-yaml": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
-			"integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
+			"version": "3.13.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+			"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
 			"dev": true,
 			"requires": {
 				"argparse": "^1.0.7",
@@ -3096,6 +2991,14 @@
 			"dev": true,
 			"requires": {
 				"minimist": "^1.2.0"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"dev": true
+				}
 			}
 		},
 		"jsonfile": {
@@ -3120,9 +3023,9 @@
 			"dev": true
 		},
 		"known-css-properties": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.10.0.tgz",
-			"integrity": "sha512-OMPb86bpVbnKN/2VJw1Ggs1Hw/FNGwEL1QYiNIEHaB5FSLybJ4QD7My5Hm9yDhgpRrRnnOgu0oKeuuABzASeBw==",
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.11.0.tgz",
+			"integrity": "sha512-bEZlJzXo5V/ApNNa5z375mJC6Nrz4vG43UgcSCrg2OHC+yuB6j0iDSrY7RQ/+PRofFB03wNIIt9iXIVLr4wc7w==",
 			"dev": true
 		},
 		"lazystream": {
@@ -3193,12 +3096,6 @@
 			"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
 			"dev": true
 		},
-		"lodash.debounce": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-			"dev": true
-		},
 		"lodash.defaults": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -3245,9 +3142,9 @@
 			}
 		},
 		"longest-streak": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
-			"integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.3.tgz",
+			"integrity": "sha512-9lz5IVdpwsKLMzQi0MQ+oD9EA0mIGcWYP7jXMTZVXP8D42PwuAk+M/HBFYQoxt1G5OR8m7aSIgb1UymfWGBWEw==",
 			"dev": true
 		},
 		"loud-rejection": {
@@ -3261,9 +3158,9 @@
 			}
 		},
 		"map-age-cleaner": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz",
-			"integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==",
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+			"integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
 			"dev": true,
 			"requires": {
 				"p-defer": "^1.0.0"
@@ -3291,41 +3188,49 @@
 			}
 		},
 		"markdown-escapes": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz",
-			"integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.3.tgz",
+			"integrity": "sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw==",
 			"dev": true
 		},
 		"markdown-table": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz",
-			"integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz",
+			"integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==",
 			"dev": true
 		},
 		"mathml-tag-names": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz",
-			"integrity": "sha512-3Zs9P/0zzwTob2pdgT0CHZuMbnSUSp8MB1bddfm+HDmnFWHGT4jvEZRf+2RuPoa+cjdn/z25SEt5gFTqdhvJAg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz",
+			"integrity": "sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==",
 			"dev": true
 		},
 		"mdast-util-compact": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz",
-			"integrity": "sha512-d2WS98JSDVbpSsBfVvD9TaDMlqPRz7ohM/11G0rp5jOBb5q96RJ6YLszQ/09AAixyzh23FeIpCGqfaamEADtWg==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz",
+			"integrity": "sha512-nRiU5GpNy62rZppDKbLwhhtw5DXoFMqw9UNZFmlPsNaQCZ//WLjGKUwWMdJrUH+Se7UvtO2gXtAMe0g/N+eI5w==",
 			"dev": true,
 			"requires": {
 				"unist-util-visit": "^1.1.0"
 			}
 		},
 		"mem": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz",
-			"integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+			"integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
 			"dev": true,
 			"requires": {
 				"map-age-cleaner": "^0.1.1",
-				"mimic-fn": "^1.0.0",
-				"p-is-promise": "^1.1.0"
+				"mimic-fn": "^2.0.0",
+				"p-is-promise": "^2.0.0"
+			},
+			"dependencies": {
+				"mimic-fn": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+					"dev": true
+				}
 			}
 		},
 		"memorystream": {
@@ -3349,6 +3254,23 @@
 				"redent": "^2.0.0",
 				"trim-newlines": "^2.0.0",
 				"yargs-parser": "^10.0.0"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+					"dev": true
+				},
+				"yargs-parser": {
+					"version": "10.1.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+					"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+					"dev": true,
+					"requires": {
+						"camelcase": "^4.1.0"
+					}
+				}
 			}
 		},
 		"merge2": {
@@ -3394,9 +3316,9 @@
 			}
 		},
 		"minimist": {
-			"version": "1.2.0",
-			"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-			"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 			"dev": true
 		},
 		"minimist-options": {
@@ -3432,25 +3354,17 @@
 		},
 		"mkdirp": {
 			"version": "0.5.1",
-			"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
 			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 			"dev": true,
 			"requires": {
 				"minimist": "0.0.8"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				}
 			}
 		},
 		"ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 			"dev": true
 		},
 		"mute-stream": {
@@ -3460,9 +3374,9 @@
 			"dev": true
 		},
 		"nan": {
-			"version": "2.11.1",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-			"integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+			"version": "2.14.0",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+			"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
 			"dev": true,
 			"optional": true
 		},
@@ -3498,27 +3412,35 @@
 			"dev": true
 		},
 		"node-releases": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.5.tgz",
-			"integrity": "sha512-Ky7q0BO1BBkG/rQz6PkEZ59rwo+aSfhczHP1wwq8IowoVdN/FpiP7qp0XW0P2+BVCWe5fQUBozdbVd54q1RbCQ==",
+			"version": "1.1.21",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.21.tgz",
+			"integrity": "sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==",
 			"dev": true,
 			"requires": {
 				"semver": "^5.3.0"
 			}
 		},
 		"node-wp-i18n": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/node-wp-i18n/-/node-wp-i18n-1.2.1.tgz",
-			"integrity": "sha512-Wvl98XA/GBnQFe20iAMwlsXvikVOFTVz//cbRsF8OPQf0NIkJdeWToNYww/dZl52lHtS1KUEIVRyWcol5ibHog==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/node-wp-i18n/-/node-wp-i18n-1.2.3.tgz",
+			"integrity": "sha512-YMzMcsjXbGYDB9vHyb289CYXAGmXhcNLbeTlOnWgPNkZd9xrovcbRd7cQyKd9BQHOjS7Nw8WCbJ7nvtR7rc0rg==",
 			"dev": true,
 			"requires": {
 				"bluebird": "^3.4.1",
-				"gettext-parser": "^2.0.0",
+				"gettext-parser": "^3.1.0",
 				"glob": "^7.0.5",
 				"lodash": "^4.14.2",
 				"minimist": "^1.2.0",
 				"mkdirp": "^0.5.1",
 				"tmp": "^0.0.33"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"dev": true
+				}
 			}
 		},
 		"normalize-package-data": {
@@ -3592,12 +3514,6 @@
 			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 			"dev": true
 		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-			"dev": true
-		},
 		"object-copy": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -3686,12 +3602,12 @@
 			}
 		},
 		"os-locale": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz",
-			"integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
 			"dev": true,
 			"requires": {
-				"execa": "^0.10.0",
+				"execa": "^1.0.0",
 				"lcid": "^2.0.0",
 				"mem": "^4.0.0"
 			}
@@ -3715,15 +3631,15 @@
 			"dev": true
 		},
 		"p-is-promise": {
-			"version": "1.1.0",
-			"resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-			"integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+			"integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
 			"dev": true
 		},
 		"p-limit": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
-			"integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+			"integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
 			"dev": true,
 			"requires": {
 				"p-try": "^2.0.0"
@@ -3739,32 +3655,24 @@
 			}
 		},
 		"p-try": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
-			"integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true
 		},
 		"parent-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz",
-			"integrity": "sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
 			"dev": true,
 			"requires": {
 				"callsites": "^3.0.0"
-			},
-			"dependencies": {
-				"callsites": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz",
-					"integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==",
-					"dev": true
-				}
 			}
 		},
 		"parse-entities": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.0.tgz",
-			"integrity": "sha512-XXtDdOPLSB0sHecbEapQi6/58U/ODj/KWfIXmmMCJF/eRn8laX6LZbOyioMoETOOJoWRW8/qTSl5VQkUIfKM5g==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz",
+			"integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==",
 			"dev": true,
 			"requires": {
 				"character-entities": "^1.0.0",
@@ -3785,12 +3693,6 @@
 				"json-parse-better-errors": "^1.0.1"
 			}
 		},
-		"parse-passwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-			"dev": true
-		},
 		"pascalcase": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -3861,28 +3763,28 @@
 			"dev": true
 		},
 		"postcss": {
-			"version": "7.0.5",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz",
-			"integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==",
+			"version": "7.0.16",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz",
+			"integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.4.1",
+				"chalk": "^2.4.2",
 				"source-map": "^0.6.1",
-				"supports-color": "^5.5.0"
+				"supports-color": "^6.1.0"
 			}
 		},
 		"postcss-cli": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-6.0.1.tgz",
-			"integrity": "sha512-M9GiEMzXVMlI4ln8e+mdeHT+qvoHVZdlN06hj5/EhrRZWDr+J1sniPeGJ4nghknl+du3Oj2UoqqhgpKKhiZ9+w==",
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-6.1.2.tgz",
+			"integrity": "sha512-jIWfIkqt8cTThSpH8DBaNxHlBf99OKSem2RseRpfVPqWayxHKQB0IWdS/IF5XSGeFU5QslSDTdVHnw6qggXGkA==",
 			"dev": true,
 			"requires": {
 				"chalk": "^2.1.0",
 				"chokidar": "^2.0.0",
-				"dependency-graph": "^0.7.0",
+				"dependency-graph": "^0.8.0",
 				"fs-extra": "^7.0.0",
 				"get-stdin": "^6.0.0",
-				"globby": "^8.0.0",
+				"globby": "^9.0.0",
 				"postcss": "^7.0.0",
 				"postcss-load-config": "^2.0.0",
 				"postcss-reporter": "^6.0.0",
@@ -3892,31 +3794,30 @@
 			}
 		},
 		"postcss-html": {
-			"version": "0.34.0",
-			"resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.34.0.tgz",
-			"integrity": "sha512-BIW982Kbf9/RikInNhNS3/GA6x/qY/+jhVS9KumqXZtU9ss8Yq15HhPJ6mnaXcU5bFq2ULxpOv96mHPAErpGMQ==",
+			"version": "0.36.0",
+			"resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
+			"integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
 			"dev": true,
 			"requires": {
-				"htmlparser2": "^3.9.2"
+				"htmlparser2": "^3.10.0"
 			}
 		},
 		"postcss-jsx": {
-			"version": "0.35.0",
-			"resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.35.0.tgz",
-			"integrity": "sha512-AU2/9QDmHYJRxTiniMt2bJ9fwCzVF6n00VnR4gdnFGHeXRW2mGwoptpuPgYjfivkdI8LlNIuo+w8TyS6a4JhJw==",
+			"version": "0.36.0",
+			"resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.0.tgz",
+			"integrity": "sha512-/lWOSXSX5jlITCKFkuYU2WLFdrncZmjSVyNpHAunEgirZXLwI8RjU556e3Uz4mv0WVHnJA9d3JWb36lK9Yx99g==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.1.2",
-				"postcss-styled": ">=0.34.0"
+				"@babel/core": ">=7.1.0"
 			}
 		},
 		"postcss-less": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.0.tgz",
-			"integrity": "sha512-+fDH2A9zV8B4gFu3Idhq8ma09/mMBXXc03T2lL9CHjBQqKrfUit+TrQrnojc6Y4k7N4E+tyE1Uj5U1tcoKtXLQ==",
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
+			"integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.3"
+				"postcss": "^7.0.14"
 			}
 		},
 		"postcss-load-config": {
@@ -3930,12 +3831,12 @@
 			}
 		},
 		"postcss-markdown": {
-			"version": "0.34.0",
-			"resolved": "https://registry.npmjs.org/postcss-markdown/-/postcss-markdown-0.34.0.tgz",
-			"integrity": "sha512-cKPggF9OMOKPoqDm5YpYszCqMsImFh78FK6P8p6IsEKZB6IkUJYKz0/QgadYy4jLb60jcFIHJ6v6jsMH7/ZQrA==",
+			"version": "0.36.0",
+			"resolved": "https://registry.npmjs.org/postcss-markdown/-/postcss-markdown-0.36.0.tgz",
+			"integrity": "sha512-rl7fs1r/LNSB2bWRhyZ+lM/0bwKv9fhl38/06gF6mKMo/NPnp55+K1dSTosSVjFZc0e1ppBlu+WT91ba0PMBfQ==",
 			"dev": true,
 			"requires": {
-				"remark": "^9.0.0",
+				"remark": "^10.0.1",
 				"unist-util-find-all-after": "^1.0.2"
 			}
 		},
@@ -3946,15 +3847,15 @@
 			"dev": true
 		},
 		"postcss-reporter": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.0.tgz",
-			"integrity": "sha512-5xQXm1UPWuFObjbtyQzWvQaupru8yFcFi4HUlm6OPo1o2bUszYASuqRJ7bVArb3svGCdbYtqdMBKrqR1Aoy+tw==",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.1.tgz",
+			"integrity": "sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.0.1",
-				"lodash": "^4.17.4",
-				"log-symbols": "^2.0.0",
-				"postcss": "^7.0.2"
+				"chalk": "^2.4.1",
+				"lodash": "^4.17.11",
+				"log-symbols": "^2.2.0",
+				"postcss": "^7.0.7"
 			}
 		},
 		"postcss-resolve-nested-selector": {
@@ -4002,16 +3903,10 @@
 				"uniq": "^1.0.1"
 			}
 		},
-		"postcss-styled": {
-			"version": "0.34.0",
-			"resolved": "https://registry.npmjs.org/postcss-styled/-/postcss-styled-0.34.0.tgz",
-			"integrity": "sha512-Uaeetr/xOiQWGJgzPFOr32/Bwykpfh9TVE26OpmwDb8eEN205TS/gqkt9ri+C6otQzQKXqbMfeZNbKYi7QpeNA==",
-			"dev": true
-		},
 		"postcss-syntax": {
-			"version": "0.34.0",
-			"resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.34.0.tgz",
-			"integrity": "sha512-L36NZwq2UK743US+vl1CRMdBRZCBmFYfThP9n9jCFhX1Wfk6BqnRSgt0Fy8q44IwxPee/GCzlo7T1c1JIeUDlQ==",
+			"version": "0.36.2",
+			"resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
+			"integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
 			"dev": true
 		},
 		"postcss-value-parser": {
@@ -4027,14 +3922,14 @@
 			"dev": true
 		},
 		"pretty-bytes": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.1.0.tgz",
-			"integrity": "sha512-wa5+qGVg9Yt7PB6rYm3kXlKzgzgivYTLRandezh43jjRqgyDyP+9YxfJpJiLs9yKD1WeU8/OvtToWpW7255FtA==",
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.2.0.tgz",
+			"integrity": "sha512-ujANBhiUsl9AhREUDUEY1GPOharMGm8x8juS7qOHybcLi7XsKfrYQ88hSly1l2i0klXHTDYrlL8ihMCG55Dc3w==",
 			"dev": true
 		},
 		"pretty-hrtime": {
 			"version": "1.0.3",
-			"resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
 			"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
 			"dev": true
 		},
@@ -4050,6 +3945,16 @@
 			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
 			"dev": true
 		},
+		"pump": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+			"dev": true,
+			"requires": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
+		},
 		"punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -4207,20 +4112,20 @@
 			"dev": true
 		},
 		"remark": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/remark/-/remark-9.0.0.tgz",
-			"integrity": "sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A==",
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz",
+			"integrity": "sha512-E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ==",
 			"dev": true,
 			"requires": {
-				"remark-parse": "^5.0.0",
-				"remark-stringify": "^5.0.0",
-				"unified": "^6.0.0"
+				"remark-parse": "^6.0.0",
+				"remark-stringify": "^6.0.0",
+				"unified": "^7.0.0"
 			}
 		},
 		"remark-parse": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz",
-			"integrity": "sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==",
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz",
+			"integrity": "sha512-QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==",
 			"dev": true,
 			"requires": {
 				"collapse-white-space": "^1.0.2",
@@ -4241,9 +4146,9 @@
 			}
 		},
 		"remark-stringify": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-5.0.0.tgz",
-			"integrity": "sha512-Ws5MdA69ftqQ/yhRF9XhVV29mhxbfGhbz0Rx5bQH+oJcNhhSM6nCu1EpLod+DjrFGrU0BMPs+czVmJZU7xiS7w==",
+			"version": "6.0.4",
+			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-6.0.4.tgz",
+			"integrity": "sha512-eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg==",
 			"dev": true,
 			"requires": {
 				"ccount": "^1.0.0",
@@ -4305,28 +4210,18 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
-			"integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
-			"dev": true,
-			"requires": {
-				"path-parse": "^1.0.5"
-			}
-		},
-		"resolve-dir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
+			"integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
 			"dev": true,
 			"requires": {
-				"expand-tilde": "^2.0.0",
-				"global-modules": "^1.0.0"
+				"path-parse": "^1.0.6"
 			}
 		},
 		"resolve-from": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-			"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
 			"dev": true
 		},
 		"resolve-url": {
@@ -4352,12 +4247,12 @@
 			"dev": true
 		},
 		"rimraf": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-			"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+			"version": "2.6.3",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+			"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
 			"dev": true,
 			"requires": {
-				"glob": "^7.0.5"
+				"glob": "^7.1.3"
 			}
 		},
 		"run-async": {
@@ -4370,9 +4265,9 @@
 			}
 		},
 		"rxjs": {
-			"version": "6.4.0",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-			"integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+			"version": "6.5.2",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
+			"integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
 			"dev": true,
 			"requires": {
 				"tslib": "^1.9.0"
@@ -4468,15 +4363,15 @@
 			"dev": true
 		},
 		"slash": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-			"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+			"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
 			"dev": true
 		},
 		"slice-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz",
-			"integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+			"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
 			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.0",
@@ -4500,6 +4395,15 @@
 				"use": "^3.1.0"
 			},
 			"dependencies": {
+				"debug": {
+					"version": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
 				"define-property": {
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -4518,6 +4422,12 @@
 						"is-extendable": "^0.1.0"
 					}
 				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+					"dev": true
+				},
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -4676,9 +4586,9 @@
 			"dev": true
 		},
 		"state-toggle": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz",
-			"integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.2.tgz",
+			"integrity": "sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw==",
 			"dev": true
 		},
 		"static-extend": {
@@ -4784,9 +4694,9 @@
 			"dev": true
 		},
 		"stylelint": {
-			"version": "9.9.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-9.9.0.tgz",
-			"integrity": "sha512-kIuX0/9/I2mZeHz6EoFt7UpLt7Mz+ic9/PmFwKMdq4BkQHikg3FkcgAElLdAmaI8Au1JEUOS996ZFE+mwXytmA==",
+			"version": "9.10.1",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-9.10.1.tgz",
+			"integrity": "sha512-9UiHxZhOAHEgeQ7oLGwrwoDR8vclBKlSX7r4fH0iuu0SfPwFaLkb1c7Q2j1cqg9P7IDXeAV2TvQML/fRQzGBBQ==",
 			"dev": true,
 			"requires": {
 				"autoprefixer": "^9.0.0",
@@ -4795,16 +4705,16 @@
 				"cosmiconfig": "^5.0.0",
 				"debug": "^4.0.0",
 				"execall": "^1.0.0",
-				"file-entry-cache": "^2.0.0",
+				"file-entry-cache": "^4.0.0",
 				"get-stdin": "^6.0.0",
-				"global-modules": "^1.0.0",
-				"globby": "^8.0.0",
+				"global-modules": "^2.0.0",
+				"globby": "^9.0.0",
 				"globjoin": "^0.1.4",
 				"html-tags": "^2.0.0",
 				"ignore": "^5.0.4",
 				"import-lazy": "^3.1.0",
 				"imurmurhash": "^0.1.4",
-				"known-css-properties": "^0.10.0",
+				"known-css-properties": "^0.11.0",
 				"leven": "^2.1.0",
 				"lodash": "^4.17.4",
 				"log-symbols": "^2.0.0",
@@ -4813,11 +4723,11 @@
 				"micromatch": "^3.1.10",
 				"normalize-selector": "^0.2.0",
 				"pify": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-html": "^0.34.0",
-				"postcss-jsx": "^0.35.0",
+				"postcss": "^7.0.13",
+				"postcss-html": "^0.36.0",
+				"postcss-jsx": "^0.36.0",
 				"postcss-less": "^3.1.0",
-				"postcss-markdown": "^0.34.0",
+				"postcss-markdown": "^0.36.0",
 				"postcss-media-query-parser": "^0.2.3",
 				"postcss-reporter": "^6.0.0",
 				"postcss-resolve-nested-selector": "^0.1.1",
@@ -4825,52 +4735,69 @@
 				"postcss-sass": "^0.3.5",
 				"postcss-scss": "^2.0.0",
 				"postcss-selector-parser": "^3.1.0",
-				"postcss-styled": "^0.34.0",
-				"postcss-syntax": "^0.34.0",
+				"postcss-syntax": "^0.36.2",
 				"postcss-value-parser": "^3.3.0",
 				"resolve-from": "^4.0.0",
 				"signal-exit": "^3.0.2",
 				"slash": "^2.0.0",
 				"specificity": "^0.4.1",
-				"string-width": "^2.1.0",
+				"string-width": "^3.0.0",
 				"style-search": "^0.1.0",
 				"sugarss": "^2.0.0",
 				"svg-tags": "^1.0.0",
 				"table": "^5.0.0"
 			},
 			"dependencies": {
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
 				"cosmiconfig": {
-					"version": "5.0.7",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-					"integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+					"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
 					"dev": true,
 					"requires": {
 						"import-fresh": "^2.0.0",
 						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
+						"js-yaml": "^3.13.1",
 						"parse-json": "^4.0.0"
 					}
 				},
-				"debug": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
-					"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+				"file-entry-cache": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-4.0.0.tgz",
+					"integrity": "sha512-AVSwsnbV8vH/UVbvgEhf3saVQXORNv0ZzSkvkhQIaia5Tia+JhGTaa/ePUSVoPHQyGayQNmYfkzFi3WZV5zcpA==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"flat-cache": "^2.0.1"
 					}
 				},
 				"ignore": {
-					"version": "5.0.4",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.0.4.tgz",
-					"integrity": "sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g==",
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz",
+					"integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==",
 					"dev": true
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
+				"import-fresh": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+					"integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+					"dev": true,
+					"requires": {
+						"caller-path": "^2.0.0",
+						"resolve-from": "^3.0.0"
+					},
+					"dependencies": {
+						"resolve-from": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+							"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+							"dev": true
+						}
+					}
 				},
 				"pify": {
 					"version": "4.0.1",
@@ -4878,17 +4805,25 @@
 					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
 					"dev": true
 				},
-				"resolve-from": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-					"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-					"dev": true
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
+					"requires": {
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
+					}
 				},
-				"slash": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-					"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-					"dev": true
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^4.1.0"
+					}
 				}
 			}
 		},
@@ -4954,9 +4889,9 @@
 			}
 		},
 		"supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+			"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 			"dev": true,
 			"requires": {
 				"has-flag": "^3.0.0"
@@ -4969,15 +4904,43 @@
 			"dev": true
 		},
 		"table": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/table/-/table-5.1.1.tgz",
-			"integrity": "sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==",
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
+			"integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
 			"dev": true,
 			"requires": {
-				"ajv": "^6.6.1",
+				"ajv": "^6.9.1",
 				"lodash": "^4.17.11",
-				"slice-ansi": "2.0.0",
-				"string-width": "^2.1.1"
+				"slice-ansi": "^2.1.0",
+				"string-width": "^3.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
+					"requires": {
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^4.1.0"
+					}
+				}
 			}
 		},
 		"tar-stream": {
@@ -5089,15 +5052,15 @@
 			"dev": true
 		},
 		"trim-trailing-lines": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz",
-			"integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz",
+			"integrity": "sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q==",
 			"dev": true
 		},
 		"trough": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz",
-			"integrity": "sha512-fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz",
+			"integrity": "sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==",
 			"dev": true
 		},
 		"tslib": {
@@ -5116,9 +5079,9 @@
 			}
 		},
 		"unherit": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz",
-			"integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.2.tgz",
+			"integrity": "sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w==",
 			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
@@ -5126,16 +5089,18 @@
 			}
 		},
 		"unified": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz",
-			"integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz",
+			"integrity": "sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==",
 			"dev": true,
 			"requires": {
+				"@types/unist": "^2.0.0",
+				"@types/vfile": "^3.0.0",
 				"bail": "^1.0.0",
 				"extend": "^3.0.0",
 				"is-plain-obj": "^1.1.0",
 				"trough": "^1.0.0",
-				"vfile": "^2.0.0",
+				"vfile": "^3.0.0",
 				"x-is-string": "^0.1.0"
 			}
 		},
@@ -5181,24 +5146,24 @@
 			"dev": true
 		},
 		"unist-util-find-all-after": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz",
-			"integrity": "sha512-nDl79mKpffXojLpCimVXnxhlH/jjaTnDuScznU9J4jjsaUtBdDbxmlc109XtcqxY4SDO0SwzngsxxW8DIISt1w==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.3.tgz",
+			"integrity": "sha512-FNPM5Q1AViItYvkLngkalxZ879j842VxGzlfI0gLlgDQz/Teh9CUzqpc7kgFOWO3RK5qU/wqG0UnJ6XWiHSWiA==",
 			"dev": true,
 			"requires": {
 				"unist-util-is": "^2.0.0"
 			}
 		},
 		"unist-util-is": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz",
-			"integrity": "sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz",
+			"integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==",
 			"dev": true
 		},
 		"unist-util-remove-position": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz",
-			"integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz",
+			"integrity": "sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA==",
 			"dev": true,
 			"requires": {
 				"unist-util-visit": "^1.1.0"
@@ -5211,18 +5176,18 @@
 			"dev": true
 		},
 		"unist-util-visit": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz",
-			"integrity": "sha512-FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
+			"integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
 			"dev": true,
 			"requires": {
 				"unist-util-visit-parents": "^2.0.0"
 			}
 		},
 		"unist-util-visit-parents": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz",
-			"integrity": "sha512-6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.1.tgz",
+			"integrity": "sha512-/vuqJFrPaWX2QpW3WqOfnvRmqqlPux5BlWMRcUYm8QO5odQJ9XTGoonFYT9hzJXrpT+AmNMKQjK/9xMB5DaLhw==",
 			"dev": true,
 			"requires": {
 				"unist-util-is": "^2.1.2"
@@ -5275,9 +5240,9 @@
 			}
 		},
 		"upath": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+			"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
 			"dev": true
 		},
 		"uri-js": {
@@ -5318,15 +5283,23 @@
 			}
 		},
 		"vfile": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
-			"integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz",
+			"integrity": "sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==",
 			"dev": true,
 			"requires": {
-				"is-buffer": "^1.1.4",
+				"is-buffer": "^2.0.0",
 				"replace-ext": "1.0.0",
 				"unist-util-stringify-position": "^1.0.0",
 				"vfile-message": "^1.0.0"
+			},
+			"dependencies": {
+				"is-buffer": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+					"integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
+					"dev": true
+				}
 			}
 		},
 		"vfile-location": {
@@ -5336,9 +5309,9 @@
 			"dev": true
 		},
 		"vfile-message": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.0.2.tgz",
-			"integrity": "sha512-dNdEXHfPCvzyOlEaaQ+DcXpcxEz+pFvdrebKLiAMjobjaBC2bMeWoHOKPwJ+I8A4jQOEUDH7uoVcLWDLF1qhVQ==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
+			"integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
 			"dev": true,
 			"requires": {
 				"unist-util-stringify-position": "^1.1.1"
@@ -5367,7 +5340,7 @@
 		},
 		"wrap-ansi": {
 			"version": "2.1.0",
-			"resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
 			"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
 			"dev": true,
 			"requires": {
@@ -5403,7 +5376,7 @@
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
-					"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"requires": {
@@ -5419,9 +5392,9 @@
 			"dev": true
 		},
 		"write": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-			"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+			"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
 			"dev": true,
 			"requires": {
 				"mkdirp": "^0.5.1"
@@ -5433,12 +5406,6 @@
 			"integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
 			"dev": true
 		},
-		"xregexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-			"integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
-			"dev": true
-		},
 		"xtend": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -5452,13 +5419,13 @@
 			"dev": true
 		},
 		"yargs": {
-			"version": "12.0.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-			"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+			"version": "12.0.5",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+			"integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
 			"dev": true,
 			"requires": {
 				"cliui": "^4.0.0",
-				"decamelize": "^2.0.0",
+				"decamelize": "^1.2.0",
 				"find-up": "^3.0.0",
 				"get-caller-file": "^1.0.1",
 				"os-locale": "^3.0.0",
@@ -5468,16 +5435,17 @@
 				"string-width": "^2.0.0",
 				"which-module": "^2.0.0",
 				"y18n": "^3.2.1 || ^4.0.0",
-				"yargs-parser": "^10.1.0"
+				"yargs-parser": "^11.1.1"
 			}
 		},
 		"yargs-parser": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-			"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+			"version": "11.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+			"integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
 			"dev": true,
 			"requires": {
-				"camelcase": "^4.1.0"
+				"camelcase": "^5.0.0",
+				"decamelize": "^1.2.0"
 			}
 		},
 		"zip-stream": {
diff --git a/package.json b/package.json
index 2eaf6280..5d6e8944 100644
--- a/package.json
+++ b/package.json
@@ -8,16 +8,16 @@
 	"license": "GPL-2.0-or-later",
 	"devDependencies": {
 		"archiver": "^3.0.0",
-		"autoprefixer": "^9.4.2",
-		"chalk": "^2.4.1",
-		"eslint": "^5.15.2",
+		"autoprefixer": "^9.5.1",
+		"chalk": "^2.4.2",
+		"eslint": "^5.16.0",
 		"eslint-config-wordpress": "^2.0.0",
-		"node-wp-i18n": "^1.2.1",
+		"node-wp-i18n": "^1.2.3",
 		"npm-run-all": "^4.1.5",
-		"postcss-cli": "^6.0.1",
-		"pretty-bytes": "^5.1.0",
+		"postcss-cli": "^6.1.2",
+		"pretty-bytes": "^5.2.0",
 		"recursive-readdir": "^2.2.2",
-		"stylelint": "^9.9.0",
+		"stylelint": "^9.10.1",
 		"stylelint-config-wordpress": "^13.1.0"
 	},
 	"scripts": {

From 6e6cfbafe25a2d84902710df749b1ef830b1c95b Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Tue, 28 May 2019 17:17:43 +0200
Subject: [PATCH 18/41] Bump version to 3.0.0-beta

---
 package.json | 2 +-
 style.css    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5d6e8944..ada6bdb1 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"description": "The sample child theme for the Genesis Framework.",
 		"author": "StudioPress",
 		"authoruri": "https://www.studiopress.com/",
-		"version": "2.10.0",
+		"version": "3.0.0-beta",
 		"tags": "one-column, two-columns, left-sidebar, right-sidebar, accessibility-ready, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready",
 		"license": "GPL-2.0-or-later",
 		"licenseuri": "https://www.gnu.org/licenses/gpl-2.0.html",
diff --git a/style.css b/style.css
index f3c47e37..23f738b8 100755
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Description: This is the sample theme created for the Genesis Framework.
 Author: StudioPress
 Author URI: https://www.studiopress.com/
 
-Version: 2.10.0
+Version: 3.0.0-beta
 
 Tags: accessibility-ready, block-styles, custom-colors, custom-logo, custom-menu, editor-style, featured-images, footer-widgets, full-width-template, left-sidebar, one-column, right-sidebar, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, two-columns, wide-blocks
 

From ff393923e7907362bd6ec602b98af25cb2d3febf Mon Sep 17 00:00:00 2001
From: Jen Baumann <baumann@dreamwhisperdesigns.com>
Date: Mon, 3 Jun 2019 13:39:52 -0400
Subject: [PATCH 19/41] Remove viewport theme support

Support for the viewport meta tag is added by default in Genesis 3.0
---
 functions.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/functions.php b/functions.php
index 5e09cc71..3f627f22 100755
--- a/functions.php
+++ b/functions.php
@@ -99,9 +99,6 @@ function genesis_sample_enqueue_scripts_styles() {
 // Adds support for accessibility.
 add_theme_support( 'genesis-accessibility', genesis_get_config( 'accessibility' ) );
 
-// Adds viewport meta tag for mobile browsers.
-add_theme_support( 'genesis-responsive-viewport' );
-
 // Adds custom logo in Customizer > Site Identity.
 add_theme_support( 'custom-logo', genesis_get_config( 'custom-logo' ) );
 

From e0c06f195a84fc0404a948b5d107ec34db49b2f4 Mon Sep 17 00:00:00 2001
From: seothemes <seothemeswp@gmail.com>
Date: Mon, 3 Jun 2019 13:39:22 +0800
Subject: [PATCH 20/41] Combine default color helper functions and add color
 palette config

---
 config/block-editor-settings.php       |  6 +++---
 config/color-palette.php               | 14 ++++++++++++++
 lib/customize.php                      |  4 ++--
 lib/helper-functions.php               | 26 ++++++++------------------
 lib/output.php                         |  8 ++++----
 lib/woocommerce/woocommerce-output.php |  8 ++++----
 6 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 config/color-palette.php

diff --git a/config/block-editor-settings.php b/config/block-editor-settings.php
index aa3b582f..63892add 100644
--- a/config/block-editor-settings.php
+++ b/config/block-editor-settings.php
@@ -8,7 +8,7 @@
  * @link    https://www.studiopress.com/
  */
 
-$genesis_sample_link_color            = get_theme_mod( 'genesis_sample_link_color', genesis_sample_customizer_get_default_link_color() );
+$genesis_sample_link_color            = get_theme_mod( 'genesis_sample_link_color', genesis_sample_get_default_color( 'link' ) );
 $genesis_sample_link_color_contrast   = genesis_sample_color_contrast( $genesis_sample_link_color );
 $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 );
 
@@ -23,12 +23,12 @@
 		array(
 			'name'  => __( 'Custom color', 'genesis-sample' ), // Called “Link Color” in the Customizer options. Renamed because “Link Color” implies it can only be used for links.
 			'slug'  => 'theme-primary',
-			'color' => get_theme_mod( 'genesis_sample_link_color', genesis_sample_customizer_get_default_link_color() ),
+			'color' => $genesis_sample_link_color,
 		),
 		array(
 			'name'  => __( 'Accent color', 'genesis-sample' ),
 			'slug'  => 'theme-secondary',
-			'color' => get_theme_mod( 'genesis_sample_accent_color', genesis_sample_customizer_get_default_accent_color() ),
+			'color' => get_theme_mod( 'genesis_sample_accent_color', genesis_sample_get_default_color( 'accent' ) ),
 		),
 	),
 	'editor-font-sizes'            => array(
diff --git a/config/color-palette.php b/config/color-palette.php
new file mode 100644
index 00000000..c56d3a33
--- /dev/null
+++ b/config/color-palette.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Genesis Sample default color settings.
+ *
+ * @package Genesis Sample
+ * @author  StudioPress
+ * @license GPL-2.0-or-later
+ * @link    https://www.studiopress.com/
+ */
+
+return array(
+	'link'   => '#0073e5',
+	'accent' => '#0073e5',
+);
diff --git a/lib/customize.php b/lib/customize.php
index ad011a39..d60cc923 100644
--- a/lib/customize.php
+++ b/lib/customize.php
@@ -23,7 +23,7 @@ function genesis_sample_customizer_register( $wp_customize ) {
 	$wp_customize->add_setting(
 		'genesis_sample_link_color',
 		array(
-			'default'           => genesis_sample_customizer_get_default_link_color(),
+			'default'           => genesis_sample_get_default_color( 'link' ),
 			'sanitize_callback' => 'sanitize_hex_color',
 		)
 	);
@@ -44,7 +44,7 @@ function genesis_sample_customizer_register( $wp_customize ) {
 	$wp_customize->add_setting(
 		'genesis_sample_accent_color',
 		array(
-			'default'           => genesis_sample_customizer_get_default_accent_color(),
+			'default'           => genesis_sample_get_default_color( 'accent' ),
 			'sanitize_callback' => 'sanitize_hex_color',
 		)
 	);
diff --git a/lib/helper-functions.php b/lib/helper-functions.php
index 9eaf1b3e..d7881ab6 100644
--- a/lib/helper-functions.php
+++ b/lib/helper-functions.php
@@ -11,30 +11,20 @@
  */
 
 /**
- * Gets default link color for Customizer.
+ * Gets default hex code for given color from config.
  * Abstracted here since at least two functions use it.
  *
- * @since 2.2.3
+ * @since 3.0.0
  *
- * @return string Hex color code for link color.
- */
-function genesis_sample_customizer_get_default_link_color() {
-
-	return '#0073e5';
-
-}
-
-/**
- * Gets default accent color for Customizer.
- * Abstracted here since at least two functions use it.
+ * @param string $name Name of color to retrieve.
  *
- * @since 2.2.3
- *
- * @return string Hex color code for accent color.
+ * @return string Hex color code for specified color.
  */
-function genesis_sample_customizer_get_default_accent_color() {
+function genesis_sample_get_default_color( $name ) {
+
+	$colors = genesis_get_config( 'color-palette' );
 
-	return '#0073e5';
+	return $colors[ $name ];
 
 }
 
diff --git a/lib/output.php b/lib/output.php
index ab78bb25..bfc65c64 100644
--- a/lib/output.php
+++ b/lib/output.php
@@ -19,8 +19,8 @@
  */
 function genesis_sample_css() {
 
-	$color_link   = get_theme_mod( 'genesis_sample_link_color', genesis_sample_customizer_get_default_link_color() );
-	$color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_customizer_get_default_accent_color() );
+	$color_link   = get_theme_mod( 'genesis_sample_link_color', genesis_sample_get_default_color( 'link' ) );
+	$color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_get_default_color( 'accent' ) );
 	$logo         = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), 'full' );
 
 	if ( $logo ) {
@@ -34,7 +34,7 @@ function genesis_sample_css() {
 
 	$css = '';
 
-	$css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf(
+	$css .= ( genesis_sample_get_default_color( 'link' ) !== $color_link ) ? sprintf(
 		'
 
 		a,
@@ -56,7 +56,7 @@ function genesis_sample_css() {
 		$color_link
 	) : '';
 
-	$css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf(
+	$css .= ( genesis_sample_get_default_color( 'accent' ) !== $color_accent ) ? sprintf(
 		'
 
 		button:focus,
diff --git a/lib/woocommerce/woocommerce-output.php b/lib/woocommerce/woocommerce-output.php
index 7509df48..2bb5bc66 100644
--- a/lib/woocommerce/woocommerce-output.php
+++ b/lib/woocommerce/woocommerce-output.php
@@ -47,12 +47,12 @@ function genesis_sample_woocommerce_css() {
 		return;
 	}
 
-	$color_link   = get_theme_mod( 'genesis_sample_link_color', genesis_sample_customizer_get_default_link_color() );
-	$color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_customizer_get_default_accent_color() );
+	$color_link   = get_theme_mod( 'genesis_sample_link_color', genesis_sample_get_default_color( 'link' ) );
+	$color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_get_default_color( 'accent' ) );
 
 	$woo_css = '';
 
-	$woo_css .= ( genesis_sample_customizer_get_default_link_color() !== $color_link ) ? sprintf(
+	$woo_css .= ( genesis_sample_get_default_color( 'link' ) !== $color_link ) ? sprintf(
 		'
 
 		.woocommerce div.product p.price,
@@ -73,7 +73,7 @@ function genesis_sample_woocommerce_css() {
 		$color_link
 	) : '';
 
-	$woo_css .= ( genesis_sample_customizer_get_default_accent_color() !== $color_accent ) ? sprintf(
+	$woo_css .= ( genesis_sample_get_default_color( 'accent' ) !== $color_accent ) ? sprintf(
 		'
 		.woocommerce a.button:hover,
 		.woocommerce a.button:focus,

From aa982d0383380d607dcc348f0be65e079140811e Mon Sep 17 00:00:00 2001
From: seothemes <seothemeswp@gmail.com>
Date: Sun, 2 Jun 2019 12:21:37 +0800
Subject: [PATCH 21/41] Remove all constants and replace with new helpers

---
 functions.php                          | 14 +++++---------
 lib/gutenberg/init.php                 |  6 +++---
 lib/gutenberg/inline-styles.php        |  2 +-
 lib/output.php                         |  2 +-
 lib/woocommerce/woocommerce-output.php |  2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/functions.php b/functions.php
index 3f627f22..851dd672 100755
--- a/functions.php
+++ b/functions.php
@@ -13,10 +13,6 @@
 // Starts the engine.
 require_once get_template_directory() . '/lib/init.php';
 
-// Defines constants to help enqueue scripts and styles.
-define( 'CHILD_THEME_HANDLE', sanitize_title_with_dashes( wp_get_theme()->get( 'Name' ) ) );
-define( 'CHILD_THEME_VERSION', wp_get_theme()->get( 'Version' ) );
-
 // Sets up the Theme.
 require_once get_stylesheet_directory() . '/lib/theme-defaults.php';
 
@@ -74,20 +70,20 @@ function genesis_child_gutenberg_support() { // phpcs:ignore WordPress.NamingCon
 function genesis_sample_enqueue_scripts_styles() {
 
 	wp_enqueue_style(
-		CHILD_THEME_HANDLE . '-fonts',
+		genesis_get_theme_handle() . '-fonts',
 		'//fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700',
 		array(),
-		CHILD_THEME_VERSION
+		genesis_get_theme_version()
 	);
 
 	wp_enqueue_style( 'dashicons' );
 
 	if ( genesis_is_amp() ) {
 		wp_enqueue_style(
-			CHILD_THEME_HANDLE . '-amp',
+			genesis_get_theme_handle() . '-amp',
 			get_stylesheet_directory_uri() . '/lib/amp/amp.css',
-			array( CHILD_THEME_HANDLE ),
-			CHILD_THEME_VERSION
+			array( genesis_get_theme_handle() ),
+			genesis_get_theme_version()
 		);
 	}
 
diff --git a/lib/gutenberg/init.php b/lib/gutenberg/init.php
index fb0b6308..bf379414 100644
--- a/lib/gutenberg/init.php
+++ b/lib/gutenberg/init.php
@@ -19,8 +19,8 @@ function genesis_sample_enqueue_gutenberg_frontend_styles() {
 	wp_enqueue_style(
 		'genesis-sample-gutenberg',
 		get_stylesheet_directory_uri() . '/lib/gutenberg/front-end.css',
-		array( CHILD_THEME_HANDLE ),
-		CHILD_THEME_VERSION
+		array( genesis_get_theme_handle() ),
+		genesis_get_theme_version()
 	);
 
 }
@@ -39,7 +39,7 @@ function genesis_sample_block_editor_styles() {
 		'genesis-sample-gutenberg-fonts',
 		$block_editor_settings['admin-fonts-url'],
 		array(),
-		CHILD_THEME_VERSION
+		genesis_get_theme_version()
 	);
 
 }
diff --git a/lib/gutenberg/inline-styles.php b/lib/gutenberg/inline-styles.php
index cafb5e70..8deb383c 100644
--- a/lib/gutenberg/inline-styles.php
+++ b/lib/gutenberg/inline-styles.php
@@ -46,7 +46,7 @@ function genesis_sample_custom_gutenberg_css() {
 	$css .= genesis_sample_inline_font_sizes();
 	$css .= genesis_sample_inline_color_palette();
 
-	wp_add_inline_style( CHILD_THEME_HANDLE . '-gutenberg', $css );
+	wp_add_inline_style( genesis_get_theme_handle() . '-gutenberg', $css );
 
 }
 
diff --git a/lib/output.php b/lib/output.php
index bfc65c64..b772ac5e 100644
--- a/lib/output.php
+++ b/lib/output.php
@@ -147,7 +147,7 @@ function genesis_sample_css() {
 	) : '';
 
 	if ( $css ) {
-		wp_add_inline_style( CHILD_THEME_HANDLE, $css );
+		wp_add_inline_style( genesis_get_theme_handle(), $css );
 	}
 
 }
diff --git a/lib/woocommerce/woocommerce-output.php b/lib/woocommerce/woocommerce-output.php
index 2bb5bc66..3b589542 100644
--- a/lib/woocommerce/woocommerce-output.php
+++ b/lib/woocommerce/woocommerce-output.php
@@ -24,7 +24,7 @@ function genesis_sample_woocommerce_styles( $enqueue_styles ) {
 	$enqueue_styles['genesis-sample-woocommerce-styles'] = array(
 		'src'     => get_stylesheet_directory_uri() . '/lib/woocommerce/genesis-sample-woocommerce.css',
 		'deps'    => '',
-		'version' => CHILD_THEME_VERSION,
+		'version' => genesis_get_theme_version(),
 		'media'   => 'screen',
 	);
 

From e87c06134ae534fc1678a56f7a09ca4bb5f17a1d Mon Sep 17 00:00:00 2001
From: seothemes <seothemeswp@gmail.com>
Date: Sun, 2 Jun 2019 12:23:57 +0800
Subject: [PATCH 22/41] Replace strings where possible

---
 functions.php                          | 2 +-
 lib/woocommerce/woocommerce-output.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/functions.php b/functions.php
index 851dd672..d726ae2b 100755
--- a/functions.php
+++ b/functions.php
@@ -24,7 +24,7 @@
  */
 function genesis_sample_localization_setup() {
 
-	load_child_theme_textdomain( 'genesis-sample', get_stylesheet_directory() . '/languages' );
+	load_child_theme_textdomain( genesis_get_theme_handle(), get_stylesheet_directory() . '/languages' );
 
 }
 
diff --git a/lib/woocommerce/woocommerce-output.php b/lib/woocommerce/woocommerce-output.php
index 3b589542..26fdd7aa 100644
--- a/lib/woocommerce/woocommerce-output.php
+++ b/lib/woocommerce/woocommerce-output.php
@@ -21,7 +21,7 @@
  */
 function genesis_sample_woocommerce_styles( $enqueue_styles ) {
 
-	$enqueue_styles['genesis-sample-woocommerce-styles'] = array(
+	$enqueue_styles[ genesis_get_theme_handle() . '-woocommerce-styles' ] = array(
 		'src'     => get_stylesheet_directory_uri() . '/lib/woocommerce/genesis-sample-woocommerce.css',
 		'deps'    => '',
 		'version' => genesis_get_theme_version(),
@@ -118,7 +118,7 @@ function genesis_sample_woocommerce_css() {
 	) : '';
 
 	if ( $woo_css ) {
-		wp_add_inline_style( 'genesis-sample-woocommerce-styles', $woo_css );
+		wp_add_inline_style( genesis_get_theme_handle() . '-woocommerce-styles', $woo_css );
 	}
 
 }

From d67cf498c37e6999370fe347b3f4584d900f1b30 Mon Sep 17 00:00:00 2001
From: Jen Baumann <baumann@dreamwhisperdesigns.com>
Date: Wed, 5 Jun 2019 10:00:11 -0400
Subject: [PATCH 23/41] Remove settings metabox edits

Since 3.0 removes settings pages and Sample 3.0 requires Genesis 3.0,
remove the edits we had in place to remove specific metaboxes.
---
 functions.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/functions.php b/functions.php
index d726ae2b..5bc2335e 100755
--- a/functions.php
+++ b/functions.php
@@ -149,21 +149,6 @@ function genesis_sample_header_title( $title, $inside, $wrap ) {
 remove_filter( 'genesis_nav_items', 'genesis_nav_right', 10, 2 );
 remove_filter( 'wp_nav_menu_items', 'genesis_nav_right', 10, 2 );
 
-add_action( 'genesis_theme_settings_metaboxes', 'genesis_sample_remove_metaboxes' );
-/**
- * Removes output of unused admin settings metaboxes.
- *
- * @since 2.6.0
- *
- * @param string $_genesis_admin_settings The admin screen to remove meta boxes from.
- */
-function genesis_sample_remove_metaboxes( $_genesis_admin_settings ) {
-
-	remove_meta_box( 'genesis-theme-settings-header', $_genesis_admin_settings, 'main' );
-	remove_meta_box( 'genesis-theme-settings-nav', $_genesis_admin_settings, 'main' );
-
-}
-
 add_filter( 'genesis_customizer_theme_settings_config', 'genesis_sample_remove_customizer_settings' );
 /**
  * Removes output of header and front page breadcrumb settings in the Customizer.

From bdf96384e9e221a7d6da440e0dba4e502c25a0c5 Mon Sep 17 00:00:00 2001
From: seothemes <seothemeswp@gmail.com>
Date: Wed, 5 Jun 2019 14:02:47 +0800
Subject: [PATCH 24/41] Use fonts url from config and add font-display arg.
 Closes #249

---
 config/block-editor-settings.php | 2 +-
 functions.php                    | 4 +++-
 lib/gutenberg/init.php           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/block-editor-settings.php b/config/block-editor-settings.php
index 63892add..555c1412 100644
--- a/config/block-editor-settings.php
+++ b/config/block-editor-settings.php
@@ -13,7 +13,7 @@
 $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 );
 
 return array(
-	'admin-fonts-url'              => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700',
+	'fonts-url'                    => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700&display=swap',
 	'content-width'                => 1062,
 	'default-button-bg'            => $genesis_sample_link_color,
 	'default-button-color'         => $genesis_sample_link_color_contrast,
diff --git a/functions.php b/functions.php
index 5bc2335e..e8d874e1 100755
--- a/functions.php
+++ b/functions.php
@@ -69,9 +69,11 @@ function genesis_child_gutenberg_support() { // phpcs:ignore WordPress.NamingCon
  */
 function genesis_sample_enqueue_scripts_styles() {
 
+	$block_editor_settings = genesis_get_config( 'block-editor-settings' );
+
 	wp_enqueue_style(
 		genesis_get_theme_handle() . '-fonts',
-		'//fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700',
+		$block_editor_settings['fonts-url'],
 		array(),
 		genesis_get_theme_version()
 	);
diff --git a/lib/gutenberg/init.php b/lib/gutenberg/init.php
index bf379414..a013892d 100644
--- a/lib/gutenberg/init.php
+++ b/lib/gutenberg/init.php
@@ -37,7 +37,7 @@ function genesis_sample_block_editor_styles() {
 
 	wp_enqueue_style(
 		'genesis-sample-gutenberg-fonts',
-		$block_editor_settings['admin-fonts-url'],
+		$block_editor_settings['fonts-url'],
 		array(),
 		genesis_get_theme_version()
 	);

From 00f63c0d4bbf066748e4a362112d984ce0543cf7 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Tue, 11 Jun 2019 12:45:38 +0200
Subject: [PATCH 25/41] Remove Genesis-specific theme settings files

Genesis 3.0+ does not have a theme settings admin page or
`genesis_theme_settings_defaults` filter, so I've removed that filter
from theme-defaults.php.

As the Genesis settings are then no longer needed in two places,
I moved settings from `child-theme-settings-genesis.php` to the main
`child-theme-settings.php` file.
---
 config/child-theme-settings-genesis.php | 32 -------------------------
 config/child-theme-settings.php         | 19 ++++++++++++++-
 lib/theme-defaults.php                  | 19 ---------------
 3 files changed, 18 insertions(+), 52 deletions(-)
 delete mode 100644 config/child-theme-settings-genesis.php

diff --git a/config/child-theme-settings-genesis.php b/config/child-theme-settings-genesis.php
deleted file mode 100644
index 2970066d..00000000
--- a/config/child-theme-settings-genesis.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Genesis Sample settings specific to Genesis.
- *
- * Used in `config/child-theme-settings.php` and `lib/theme-defaults.php`.
- *
- * Can be removed when the Genesis Theme Settings page is removed from WP admin.
- *
- * @package Genesis Sample
- * @author  StudioPress
- * @license GPL-2.0-or-later
- * @link    https://www.studiopress.com/
- */
-
-return array(
-	'blog_cat_num'              => 6,
-	'breadcrumb_home'           => 0,
-	'breadcrumb_front_page'     => 0,
-	'breadcrumb_posts_page'     => 0,
-	'breadcrumb_single'         => 0,
-	'breadcrumb_page'           => 0,
-	'breadcrumb_archive'        => 0,
-	'breadcrumb_404'            => 0,
-	'breadcrumb_attachment'     => 0,
-	'content_archive'           => 'full',
-	'content_archive_limit'     => 0,
-	'content_archive_thumbnail' => 0,
-	'image_size'                => '',
-	'image_alignment'           => 'alignleft',
-	'posts_nav'                 => 'numeric',
-	'site_layout'               => 'content-sidebar',
-);
diff --git a/config/child-theme-settings.php b/config/child-theme-settings.php
index e60b9ba6..7b9ae750 100644
--- a/config/child-theme-settings.php
+++ b/config/child-theme-settings.php
@@ -11,6 +11,23 @@
  */
 
 return array(
-	GENESIS_SETTINGS_FIELD => genesis_get_config( 'child-theme-settings-genesis' ),
+	GENESIS_SETTINGS_FIELD => array(
+		'blog_cat_num'              => 6,
+		'breadcrumb_home'           => 0,
+		'breadcrumb_front_page'     => 0,
+		'breadcrumb_posts_page'     => 0,
+		'breadcrumb_single'         => 0,
+		'breadcrumb_page'           => 0,
+		'breadcrumb_archive'        => 0,
+		'breadcrumb_404'            => 0,
+		'breadcrumb_attachment'     => 0,
+		'content_archive'           => 'full',
+		'content_archive_limit'     => 0,
+		'content_archive_thumbnail' => 0,
+		'image_size'                => '',
+		'image_alignment'           => 'alignleft',
+		'posts_nav'                 => 'numeric',
+		'site_layout'               => 'content-sidebar',
+	),
 	'posts_per_page'       => 6,
 );
diff --git a/lib/theme-defaults.php b/lib/theme-defaults.php
index 0c1417b3..aed8d6ed 100644
--- a/lib/theme-defaults.php
+++ b/lib/theme-defaults.php
@@ -10,25 +10,6 @@
  * @link    https://www.studiopress.com/
  */
 
-add_filter( 'genesis_theme_settings_defaults', 'genesis_sample_theme_defaults' );
-/**
- * Updates theme settings when resetting them at Genesis -> Theme Settings.
- *
- * Can be removed when Genesis Theme Settings are removed from WP admin.
- *
- * @since 2.2.3
- *
- * @param array $defaults Original theme settings defaults.
- * @return array Modified defaults.
- */
-function genesis_sample_theme_defaults( $defaults ) {
-
-	$args = genesis_get_config( 'child-theme-settings-genesis' );
-
-	return wp_parse_args( $args, $defaults );
-
-}
-
 add_filter( 'simple_social_default_styles', 'genesis_sample_social_default_styles' );
 /**
  * Set Simple Social Icon defaults.

From 3e452001ea5c14e9d11ad46e6d657553379d11d9 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 13 Jun 2019 18:06:42 +0200
Subject: [PATCH 26/41] Refactor config files

Fixes #260.
---
 config/accessibility.php                      | 19 ---------
 ...ock-editor-settings.php => appearance.php} | 20 ++++++++--
 config/color-palette.php                      | 14 -------
 config/custom-logo.php                        | 19 ---------
 config/html5.php                              | 20 ----------
 config/menus.php                              | 17 --------
 config/theme-supports.php                     | 39 +++++++++++++++++++
 functions.php                                 | 34 ++++++++--------
 lib/gutenberg/init.php                        | 14 +++----
 lib/gutenberg/inline-styles.php               | 34 ++++++++--------
 lib/helper-functions.php                      |  4 +-
 11 files changed, 98 insertions(+), 136 deletions(-)
 delete mode 100644 config/accessibility.php
 rename config/{block-editor-settings.php => appearance.php} (77%)
 delete mode 100644 config/color-palette.php
 delete mode 100644 config/custom-logo.php
 delete mode 100644 config/html5.php
 delete mode 100644 config/menus.php
 create mode 100644 config/theme-supports.php

diff --git a/config/accessibility.php b/config/accessibility.php
deleted file mode 100644
index d2949d8c..00000000
--- a/config/accessibility.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Genesis Sample child theme.
- *
- * @package Genesis Sample
- * @author  StudioPress
- * @license GPL-2.0-or-later
- * @link    https://my.studiopress.com/themes/genesis-sample/
- */
-
-/**
- * Genesis Accessibility features to support.
- */
-return array(
-	'drop-down-menu',
-	'headings',
-	'search-form',
-	'skip-links',
-);
diff --git a/config/block-editor-settings.php b/config/appearance.php
similarity index 77%
rename from config/block-editor-settings.php
rename to config/appearance.php
index 555c1412..900f9c66 100644
--- a/config/block-editor-settings.php
+++ b/config/appearance.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Block Editor settings specific to Genesis Sample.
+ * Genesis Sample appearance settings.
  *
  * @package Genesis Sample
  * @author  StudioPress
@@ -8,16 +8,23 @@
  * @link    https://www.studiopress.com/
  */
 
-$genesis_sample_link_color            = get_theme_mod( 'genesis_sample_link_color', genesis_sample_get_default_color( 'link' ) );
+$genesis_sample_link_color            = get_theme_mod(
+	'genesis_sample_link_color',
+	$genesis_sample_appearance['default-colors']['link']
+);
 $genesis_sample_link_color_contrast   = genesis_sample_color_contrast( $genesis_sample_link_color );
 $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 );
 
-return array(
+$genesis_sample_appearance = array(
 	'fonts-url'                    => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700&display=swap',
 	'content-width'                => 1062,
 	'default-button-bg'            => $genesis_sample_link_color,
 	'default-button-color'         => $genesis_sample_link_color_contrast,
 	'default-button-outline-hover' => $genesis_sample_link_color_brightness,
+	'default-colors'               => array(
+		'link'   => '#0073e5',
+		'accent' => '#0073e5',
+	),
 	'default-link-color'           => $genesis_sample_link_color,
 	'editor-color-palette'         => array(
 		array(
@@ -28,7 +35,10 @@
 		array(
 			'name'  => __( 'Accent color', 'genesis-sample' ),
 			'slug'  => 'theme-secondary',
-			'color' => get_theme_mod( 'genesis_sample_accent_color', genesis_sample_get_default_color( 'accent' ) ),
+			'color' => get_theme_mod(
+				'genesis_sample_accent_color',
+				$genesis_sample_appearance['default-colors']['accent']
+			),
 		),
 	),
 	'editor-font-sizes'            => array(
@@ -54,3 +64,5 @@
 		),
 	),
 );
+
+return $genesis_sample_appearance;
diff --git a/config/color-palette.php b/config/color-palette.php
deleted file mode 100644
index c56d3a33..00000000
--- a/config/color-palette.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Genesis Sample default color settings.
- *
- * @package Genesis Sample
- * @author  StudioPress
- * @license GPL-2.0-or-later
- * @link    https://www.studiopress.com/
- */
-
-return array(
-	'link'   => '#0073e5',
-	'accent' => '#0073e5',
-);
diff --git a/config/custom-logo.php b/config/custom-logo.php
deleted file mode 100644
index 7c19a85d..00000000
--- a/config/custom-logo.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Genesis Sample child theme.
- *
- * @package Genesis Sample
- * @author  StudioPress
- * @license GPL-2.0-or-later
- * @link    https://my.studiopress.com/themes/genesis-sample/
- */
-
-/**
- * Custom Logo configuration.
- */
-return array(
-	'height'      => 120,
-	'width'       => 700,
-	'flex-height' => true,
-	'flex-width'  => true,
-);
diff --git a/config/html5.php b/config/html5.php
deleted file mode 100644
index 44b12ce4..00000000
--- a/config/html5.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Genesis Sample child theme.
- *
- * @package Genesis Sample
- * @author  StudioPress
- * @license GPL-2.0-or-later
- * @link    https://my.studiopress.com/themes/genesis-sample/
- */
-
-/**
- * Elements to output as html5.
- */
-return array(
-	'caption',
-	'comment-form',
-	'comment-list',
-	'gallery',
-	'search-form',
-);
diff --git a/config/menus.php b/config/menus.php
deleted file mode 100644
index 3b05703a..00000000
--- a/config/menus.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Genesis Sample child theme.
- *
- * @package Genesis Sample
- * @author  StudioPress
- * @license GPL-2.0-or-later
- * @link    https://my.studiopress.com/themes/genesis-sample/
- */
-
-/**
- * Supported Genesis navigation menus.
- */
-return array(
-	'primary'   => __( 'Header Menu', 'genesis-sample' ),
-	'secondary' => __( 'Footer Menu', 'genesis-sample' ),
-);
diff --git a/config/theme-supports.php b/config/theme-supports.php
new file mode 100644
index 00000000..756d98d5
--- /dev/null
+++ b/config/theme-supports.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Genesis Sample child theme.
+ *
+ * Theme supports.
+ *
+ * @package Genesis Sample
+ * @author  StudioPress
+ * @license GPL-2.0-or-later
+ * @link    https://my.studiopress.com/themes/genesis-sample/
+ */
+
+return array(
+	'custom-logo'                     => array(
+		'height'      => 120,
+		'width'       => 700,
+		'flex-height' => true,
+		'flex-width'  => true,
+	),
+	'html5'                           => array(
+		'caption',
+		'comment-form',
+		'comment-list',
+		'gallery',
+		'search-form',
+	),
+	'genesis-accessibility'           => array(
+		'drop-down-menu',
+		'headings',
+		'search-form',
+		'skip-links',
+	),
+	'genesis-after-entry-widget-area' => '',
+	'genesis-footer-widgets'          => 3,
+	'genesis-menus'                   => array(
+		'primary'   => __( 'Header Menu', 'genesis-sample' ),
+		'secondary' => __( 'Footer Menu', 'genesis-sample' ),
+	),
+);
diff --git a/functions.php b/functions.php
index e8d874e1..10e87dfe 100755
--- a/functions.php
+++ b/functions.php
@@ -69,11 +69,11 @@ function genesis_child_gutenberg_support() { // phpcs:ignore WordPress.NamingCon
  */
 function genesis_sample_enqueue_scripts_styles() {
 
-	$block_editor_settings = genesis_get_config( 'block-editor-settings' );
+	$appearance = genesis_get_config( 'appearance' );
 
 	wp_enqueue_style(
 		genesis_get_theme_handle() . '-fonts',
-		$block_editor_settings['fonts-url'],
+		$appearance['fonts-url'],
 		array(),
 		genesis_get_theme_version()
 	);
@@ -91,14 +91,23 @@ function genesis_sample_enqueue_scripts_styles() {
 
 }
 
-// Adds support for HTML5 markup structure.
-add_theme_support( 'html5', genesis_get_config( 'html5' ) );
+add_action( 'after_setup_theme', 'genesis_sample_theme_support' );
+/**
+ * Add desired theme supports.
+ *
+ * See config file at `config/theme-supports.php`.
+ *
+ * @since 3.0.0
+ */
+function genesis_sample_theme_support() {
+
+	$theme_supports = genesis_get_config( 'theme-supports' );
 
-// Adds support for accessibility.
-add_theme_support( 'genesis-accessibility', genesis_get_config( 'accessibility' ) );
+	foreach ( $theme_supports as $feature => $args ) {
+		add_theme_support( $feature, $args );
+	}
 
-// Adds custom logo in Customizer > Site Identity.
-add_theme_support( 'custom-logo', genesis_get_config( 'custom-logo' ) );
+}
 
 add_filter( 'genesis_seo_title', 'genesis_sample_header_title', 10, 3 );
 /**
@@ -124,18 +133,9 @@ function genesis_sample_header_title( $title, $inside, $wrap ) {
 
 }
 
-// Renames primary and secondary navigation menus.
-add_theme_support( 'genesis-menus', genesis_get_config( 'menus' ) );
-
 // Adds image sizes.
 add_image_size( 'sidebar-featured', 75, 75, true );
 
-// Adds support for after entry widget.
-add_theme_support( 'genesis-after-entry-widget-area' );
-
-// Adds support for 3-column footer widgets.
-add_theme_support( 'genesis-footer-widgets', 3 );
-
 // Removes header right widget area.
 unregister_sidebar( 'header-right' );
 
diff --git a/lib/gutenberg/init.php b/lib/gutenberg/init.php
index a013892d..4204459f 100644
--- a/lib/gutenberg/init.php
+++ b/lib/gutenberg/init.php
@@ -33,11 +33,11 @@ function genesis_sample_enqueue_gutenberg_frontend_styles() {
  */
 function genesis_sample_block_editor_styles() {
 
-	$block_editor_settings = genesis_get_config( 'block-editor-settings' );
+	$appearance = genesis_get_config( 'appearance' );
 
 	wp_enqueue_style(
 		'genesis-sample-gutenberg-fonts',
-		$block_editor_settings['fonts-url'],
+		$appearance['fonts-url'],
 		array(),
 		genesis_get_theme_version()
 	);
@@ -95,18 +95,18 @@ function genesis_sample_blocks_body_classes( $classes ) {
 // Make media embeds responsive.
 add_theme_support( 'responsive-embeds' );
 
-$genesis_sample_block_editor_settings = genesis_get_config( 'block-editor-settings' );
+$genesis_sample_appearance = genesis_get_config( 'appearance' );
 
 // Adds support for editor font sizes.
 add_theme_support(
 	'editor-font-sizes',
-	$genesis_sample_block_editor_settings['editor-font-sizes']
+	$genesis_sample_appearance['editor-font-sizes']
 );
 
 // Adds support for editor color palette.
 add_theme_support(
 	'editor-color-palette',
-	$genesis_sample_block_editor_settings['editor-color-palette']
+	$genesis_sample_appearance['editor-color-palette']
 );
 
 require_once get_stylesheet_directory() . '/lib/gutenberg/inline-styles.php';
@@ -117,9 +117,9 @@ function genesis_sample_blocks_body_classes( $classes ) {
  */
 function genesis_sample_content_width() {
 
-	$block_editor_settings = genesis_get_config( 'block-editor-settings' );
+	$appearance = genesis_get_config( 'appearance' );
 
 	// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound -- See https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/924
-	$GLOBALS['content_width'] = apply_filters( 'genesis_sample_content_width', $block_editor_settings['content-width'] );
+	$GLOBALS['content_width'] = apply_filters( 'genesis_sample_content_width', $appearance['content-width'] );
 
 }
diff --git a/lib/gutenberg/inline-styles.php b/lib/gutenberg/inline-styles.php
index 8deb383c..45d9dca9 100644
--- a/lib/gutenberg/inline-styles.php
+++ b/lib/gutenberg/inline-styles.php
@@ -10,36 +10,36 @@
 
 add_action( 'wp_enqueue_scripts', 'genesis_sample_custom_gutenberg_css' );
 /**
- * Outputs front-end inline styles based on colors declared in config/block-editor-settings.php.
+ * Outputs front-end inline styles based on colors declared in config/appearance.php.
  *
  * @since 2.9.0
  */
 function genesis_sample_custom_gutenberg_css() {
 
-	$block_editor_settings = genesis_get_config( 'block-editor-settings' );
+	$appearance = genesis_get_config( 'appearance' );
 
 	$css = <<<CSS
 .ab-block-post-grid .ab-post-grid-items h2 a:hover {
-	color: {$block_editor_settings['default-link-color']};
+	color: {$appearance['default-link-color']};
 }
 
 .site-container .wp-block-button .wp-block-button__link {
-	background-color: {$block_editor_settings['default-link-color']};
+	background-color: {$appearance['default-link-color']};
 }
 
 .wp-block-button .wp-block-button__link:not(.has-background),
 .wp-block-button .wp-block-button__link:not(.has-background):focus,
 .wp-block-button .wp-block-button__link:not(.has-background):hover {
-	color: {$block_editor_settings['default-button-color']};
+	color: {$appearance['default-button-color']};
 }
 
 .site-container .wp-block-button.is-style-outline .wp-block-button__link {
-	color: {$block_editor_settings['default-button-bg']};
+	color: {$appearance['default-button-bg']};
 }
 
 .site-container .wp-block-button.is-style-outline .wp-block-button__link:focus,
 .site-container .wp-block-button.is-style-outline .wp-block-button__link:hover {
-	color: {$block_editor_settings['default-button-outline-hover']};
+	color: {$appearance['default-button-outline-hover']};
 }
 CSS;
 
@@ -52,7 +52,7 @@ function genesis_sample_custom_gutenberg_css() {
 
 add_action( 'enqueue_block_editor_assets', 'genesis_sample_custom_gutenberg_admin_css' );
 /**
- * Outputs back-end inline styles based on colors declared in config/block-editor-settings.php.
+ * Outputs back-end inline styles based on colors declared in config/appearance.php.
  *
  * Note this will appear before the style-editor.css injected by JavaScript,
  * so overrides will need to have higher specificity.
@@ -61,27 +61,27 @@ function genesis_sample_custom_gutenberg_css() {
  */
 function genesis_sample_custom_gutenberg_admin_css() {
 
-	$block_editor_settings = genesis_get_config( 'block-editor-settings' );
+	$appearance = genesis_get_config( 'appearance' );
 
 	$css = <<<CSS
 .ab-block-post-grid .ab-post-grid-items h2 a:hover,
 .block-editor__container .editor-block-list__block a {
-	color: {$block_editor_settings['default-link-color']};
+	color: {$appearance['default-link-color']};
 }
 
 .editor-styles-wrapper .editor-rich-text .button,
 .editor-styles-wrapper .wp-block-button .wp-block-button__link:not(.has-background) {
-	background-color: {$block_editor_settings['default-button-bg']};
-	color: {$block_editor_settings['default-button-color']};
+	background-color: {$appearance['default-button-bg']};
+	color: {$appearance['default-button-color']};
 }
 
 .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link {
-	color: {$block_editor_settings['default-button-bg']};
+	color: {$appearance['default-button-bg']};
 }
 
 .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link:focus,
 .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link:hover {
-	color: {$block_editor_settings['default-button-outline-hover']};
+	color: {$appearance['default-button-outline-hover']};
 }
 CSS;
 
@@ -126,9 +126,9 @@ function genesis_sample_inline_font_sizes() {
  */
 function genesis_sample_inline_color_palette() {
 
-	$css                   = '';
-	$block_editor_settings = genesis_get_config( 'block-editor-settings' );
-	$editor_color_palette  = $block_editor_settings['editor-color-palette'];
+	$css                  = '';
+	$appearance           = genesis_get_config( 'appearance' );
+	$editor_color_palette = $appearance['editor-color-palette'];
 
 	foreach ( $editor_color_palette as $color_info ) {
 		$css .= <<<CSS
diff --git a/lib/helper-functions.php b/lib/helper-functions.php
index d7881ab6..607a9c74 100644
--- a/lib/helper-functions.php
+++ b/lib/helper-functions.php
@@ -22,9 +22,9 @@
  */
 function genesis_sample_get_default_color( $name ) {
 
-	$colors = genesis_get_config( 'color-palette' );
+	$appearance = genesis_get_config( 'appearance' );
 
-	return $colors[ $name ];
+	return $appearance['default-colors'][ $name ];
 
 }
 

From 50c81b5736c8a78c5a4d96c065aa9f6109a68f0b Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 13 Jun 2019 18:15:58 +0200
Subject: [PATCH 27/41] Remove `genesis_sample_get_default_color` helper
 function

We can retrieve the default color from the appearance config instead.

We don't have getter functions to retrieve other preferences, so it
seems unnecessary to have one for the colors alone.
---
 lib/customize.php        |  6 ++++--
 lib/helper-functions.php | 18 ------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/lib/customize.php b/lib/customize.php
index d60cc923..aea8ce78 100644
--- a/lib/customize.php
+++ b/lib/customize.php
@@ -20,10 +20,12 @@
  */
 function genesis_sample_customizer_register( $wp_customize ) {
 
+	$appearance = genesis_get_config( 'appearance' );
+
 	$wp_customize->add_setting(
 		'genesis_sample_link_color',
 		array(
-			'default'           => genesis_sample_get_default_color( 'link' ),
+			'default'           => $appearance['default-colors']['link'],
 			'sanitize_callback' => 'sanitize_hex_color',
 		)
 	);
@@ -44,7 +46,7 @@ function genesis_sample_customizer_register( $wp_customize ) {
 	$wp_customize->add_setting(
 		'genesis_sample_accent_color',
 		array(
-			'default'           => genesis_sample_get_default_color( 'accent' ),
+			'default'           => $appearance['default-colors']['accent'],
 			'sanitize_callback' => 'sanitize_hex_color',
 		)
 	);
diff --git a/lib/helper-functions.php b/lib/helper-functions.php
index 607a9c74..0c016996 100644
--- a/lib/helper-functions.php
+++ b/lib/helper-functions.php
@@ -10,24 +10,6 @@
  * @link    https://www.studiopress.com/
  */
 
-/**
- * Gets default hex code for given color from config.
- * Abstracted here since at least two functions use it.
- *
- * @since 3.0.0
- *
- * @param string $name Name of color to retrieve.
- *
- * @return string Hex color code for specified color.
- */
-function genesis_sample_get_default_color( $name ) {
-
-	$appearance = genesis_get_config( 'appearance' );
-
-	return $appearance['default-colors'][ $name ];
-
-}
-
 /**
  * Calculates if white or gray would contrast more with the provided color.
  *

From 6b99e3ce88a54f2dd08bf44e372758ef75f0c416 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 13 Jun 2019 18:52:55 +0200
Subject: [PATCH 28/41] Remove other genesis_sample_get_default_color calls

---
 lib/output.php                         | 10 ++++++----
 lib/woocommerce/woocommerce-output.php | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/output.php b/lib/output.php
index b772ac5e..59ed1391 100644
--- a/lib/output.php
+++ b/lib/output.php
@@ -19,8 +19,10 @@
  */
 function genesis_sample_css() {
 
-	$color_link   = get_theme_mod( 'genesis_sample_link_color', genesis_sample_get_default_color( 'link' ) );
-	$color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_get_default_color( 'accent' ) );
+	$appearance = genesis_get_config( 'appearance' );
+
+	$color_link   = get_theme_mod( 'genesis_sample_link_color', $appearance['default-colors']['link'] );
+	$color_accent = get_theme_mod( 'genesis_sample_accent_color', $appearance['default-colors']['accent'] );
 	$logo         = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), 'full' );
 
 	if ( $logo ) {
@@ -34,7 +36,7 @@ function genesis_sample_css() {
 
 	$css = '';
 
-	$css .= ( genesis_sample_get_default_color( 'link' ) !== $color_link ) ? sprintf(
+	$css .= ( $appearance['default-colors']['link'] !== $color_link ) ? sprintf(
 		'
 
 		a,
@@ -56,7 +58,7 @@ function genesis_sample_css() {
 		$color_link
 	) : '';
 
-	$css .= ( genesis_sample_get_default_color( 'accent' ) !== $color_accent ) ? sprintf(
+	$css .= ( $appearance['default-colors']['accent'] !== $color_accent ) ? sprintf(
 		'
 
 		button:focus,
diff --git a/lib/woocommerce/woocommerce-output.php b/lib/woocommerce/woocommerce-output.php
index 26fdd7aa..a6d9a82b 100644
--- a/lib/woocommerce/woocommerce-output.php
+++ b/lib/woocommerce/woocommerce-output.php
@@ -47,12 +47,14 @@ function genesis_sample_woocommerce_css() {
 		return;
 	}
 
-	$color_link   = get_theme_mod( 'genesis_sample_link_color', genesis_sample_get_default_color( 'link' ) );
-	$color_accent = get_theme_mod( 'genesis_sample_accent_color', genesis_sample_get_default_color( 'accent' ) );
+	$appearance = genesis_get_config( 'appearance' );
+
+	$color_link   = get_theme_mod( 'genesis_sample_link_color', $appearance['default-colors']['link'] );
+	$color_accent = get_theme_mod( 'genesis_sample_accent_color', $appearance['default-colors']['accent'] );
 
 	$woo_css = '';
 
-	$woo_css .= ( genesis_sample_get_default_color( 'link' ) !== $color_link ) ? sprintf(
+	$woo_css .= ( $appearance['default-colors']['link'] !== $color_link ) ? sprintf(
 		'
 
 		.woocommerce div.product p.price,
@@ -73,7 +75,7 @@ function genesis_sample_woocommerce_css() {
 		$color_link
 	) : '';
 
-	$woo_css .= ( genesis_sample_get_default_color( 'accent' ) !== $color_accent ) ? sprintf(
+	$woo_css .= ( $appearance['default-colors']['accent'] !== $color_accent ) ? sprintf(
 		'
 		.woocommerce a.button:hover,
 		.woocommerce a.button:focus,

From a11c2f2108025567a383a4edf35c3ad00406125f Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 13 Jun 2019 18:53:05 +0200
Subject: [PATCH 29/41] Split default colors into separate array

This allows them to be referenced inside the returned array, preventing
a PHP warning.
---
 config/appearance.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/config/appearance.php b/config/appearance.php
index 900f9c66..87d9ba4c 100644
--- a/config/appearance.php
+++ b/config/appearance.php
@@ -8,23 +8,26 @@
  * @link    https://www.studiopress.com/
  */
 
-$genesis_sample_link_color            = get_theme_mod(
+$genesis_sample_default_colors = array(
+	'link'   => '#0073e5',
+	'accent' => '#0073e5',
+);
+
+$genesis_sample_link_color = get_theme_mod(
 	'genesis_sample_link_color',
-	$genesis_sample_appearance['default-colors']['link']
+	$genesis_sample_default_colors['link']
 );
+
 $genesis_sample_link_color_contrast   = genesis_sample_color_contrast( $genesis_sample_link_color );
 $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 );
 
-$genesis_sample_appearance = array(
+return array(
 	'fonts-url'                    => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700&display=swap',
 	'content-width'                => 1062,
 	'default-button-bg'            => $genesis_sample_link_color,
 	'default-button-color'         => $genesis_sample_link_color_contrast,
 	'default-button-outline-hover' => $genesis_sample_link_color_brightness,
-	'default-colors'               => array(
-		'link'   => '#0073e5',
-		'accent' => '#0073e5',
-	),
+	'default-colors'               => $genesis_sample_default_colors,
 	'default-link-color'           => $genesis_sample_link_color,
 	'editor-color-palette'         => array(
 		array(
@@ -37,7 +40,7 @@
 			'slug'  => 'theme-secondary',
 			'color' => get_theme_mod(
 				'genesis_sample_accent_color',
-				$genesis_sample_appearance['default-colors']['accent']
+				$genesis_sample_default_colors['accent']
 			),
 		),
 	),
@@ -64,5 +67,3 @@
 		),
 	),
 );
-
-return $genesis_sample_appearance;

From ac05df9cd17fe5e48ea548dec61d42784208384c Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Thu, 13 Jun 2019 20:55:17 +0200
Subject: [PATCH 30/41] Delete Genesis nav right extra filter removal

These are no longer applied in Genesis 3.0.
---
 functions.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/functions.php b/functions.php
index e8d874e1..d4df0123 100755
--- a/functions.php
+++ b/functions.php
@@ -147,10 +147,6 @@ function genesis_sample_header_title( $title, $inside, $wrap ) {
 genesis_unregister_layout( 'sidebar-content-sidebar' );
 genesis_unregister_layout( 'sidebar-sidebar-content' );
 
-// Removes output of primary navigation right extras.
-remove_filter( 'genesis_nav_items', 'genesis_nav_right', 10, 2 );
-remove_filter( 'wp_nav_menu_items', 'genesis_nav_right', 10, 2 );
-
 add_filter( 'genesis_customizer_theme_settings_config', 'genesis_sample_remove_customizer_settings' );
 /**
  * Removes output of header and front page breadcrumb settings in the Customizer.

From c72be20e976bc4f430b58c0a7340b5a916de4473 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Fri, 14 Jun 2019 09:36:49 +0200
Subject: [PATCH 31/41] Declare accent color at the top for consistency

---
 config/appearance.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/appearance.php b/config/appearance.php
index 87d9ba4c..656a118e 100644
--- a/config/appearance.php
+++ b/config/appearance.php
@@ -18,6 +18,11 @@
 	$genesis_sample_default_colors['link']
 );
 
+$genesis_sample_accent_color = get_theme_mod(
+	'genesis_sample_accent_color',
+	$genesis_sample_default_colors['accent']
+);
+
 $genesis_sample_link_color_contrast   = genesis_sample_color_contrast( $genesis_sample_link_color );
 $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 );
 
@@ -38,10 +43,7 @@
 		array(
 			'name'  => __( 'Accent color', 'genesis-sample' ),
 			'slug'  => 'theme-secondary',
-			'color' => get_theme_mod(
-				'genesis_sample_accent_color',
-				$genesis_sample_default_colors['accent']
-			),
+			'color' => $genesis_sample_accent_color,
 		),
 	),
 	'editor-font-sizes'            => array(

From 7e455ea931bf8b5bf1995b582c5af2e8ef439943 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Fri, 14 Jun 2019 09:43:16 +0200
Subject: [PATCH 32/41] Drop 'default' prefix from appearance keys where not
 needed

---
 config/appearance.php           | 18 +++++++++---------
 lib/gutenberg/inline-styles.php | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/config/appearance.php b/config/appearance.php
index 656a118e..570c9bbe 100644
--- a/config/appearance.php
+++ b/config/appearance.php
@@ -27,14 +27,14 @@
 $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 );
 
 return array(
-	'fonts-url'                    => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700&display=swap',
-	'content-width'                => 1062,
-	'default-button-bg'            => $genesis_sample_link_color,
-	'default-button-color'         => $genesis_sample_link_color_contrast,
-	'default-button-outline-hover' => $genesis_sample_link_color_brightness,
-	'default-colors'               => $genesis_sample_default_colors,
-	'default-link-color'           => $genesis_sample_link_color,
-	'editor-color-palette'         => array(
+	'fonts-url'            => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700&display=swap',
+	'content-width'        => 1062,
+	'button-bg'            => $genesis_sample_link_color,
+	'button-color'         => $genesis_sample_link_color_contrast,
+	'button-outline-hover' => $genesis_sample_link_color_brightness,
+	'link-color'           => $genesis_sample_link_color,
+	'default-colors'       => $genesis_sample_default_colors,
+	'editor-color-palette' => array(
 		array(
 			'name'  => __( 'Custom color', 'genesis-sample' ), // Called “Link Color” in the Customizer options. Renamed because “Link Color” implies it can only be used for links.
 			'slug'  => 'theme-primary',
@@ -46,7 +46,7 @@
 			'color' => $genesis_sample_accent_color,
 		),
 	),
-	'editor-font-sizes'            => array(
+	'editor-font-sizes'    => array(
 		array(
 			'name' => __( 'Small', 'genesis-sample' ),
 			'size' => 12,
diff --git a/lib/gutenberg/inline-styles.php b/lib/gutenberg/inline-styles.php
index 45d9dca9..b73c75f0 100644
--- a/lib/gutenberg/inline-styles.php
+++ b/lib/gutenberg/inline-styles.php
@@ -20,26 +20,26 @@ function genesis_sample_custom_gutenberg_css() {
 
 	$css = <<<CSS
 .ab-block-post-grid .ab-post-grid-items h2 a:hover {
-	color: {$appearance['default-link-color']};
+	color: {$appearance['link-color']};
 }
 
 .site-container .wp-block-button .wp-block-button__link {
-	background-color: {$appearance['default-link-color']};
+	background-color: {$appearance['link-color']};
 }
 
 .wp-block-button .wp-block-button__link:not(.has-background),
 .wp-block-button .wp-block-button__link:not(.has-background):focus,
 .wp-block-button .wp-block-button__link:not(.has-background):hover {
-	color: {$appearance['default-button-color']};
+	color: {$appearance['button-color']};
 }
 
 .site-container .wp-block-button.is-style-outline .wp-block-button__link {
-	color: {$appearance['default-button-bg']};
+	color: {$appearance['button-bg']};
 }
 
 .site-container .wp-block-button.is-style-outline .wp-block-button__link:focus,
 .site-container .wp-block-button.is-style-outline .wp-block-button__link:hover {
-	color: {$appearance['default-button-outline-hover']};
+	color: {$appearance['button-outline-hover']};
 }
 CSS;
 
@@ -66,22 +66,22 @@ function genesis_sample_custom_gutenberg_admin_css() {
 	$css = <<<CSS
 .ab-block-post-grid .ab-post-grid-items h2 a:hover,
 .block-editor__container .editor-block-list__block a {
-	color: {$appearance['default-link-color']};
+	color: {$appearance['link-color']};
 }
 
 .editor-styles-wrapper .editor-rich-text .button,
 .editor-styles-wrapper .wp-block-button .wp-block-button__link:not(.has-background) {
-	background-color: {$appearance['default-button-bg']};
-	color: {$appearance['default-button-color']};
+	background-color: {$appearance['button-bg']};
+	color: {$appearance['button-color']};
 }
 
 .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link {
-	color: {$appearance['default-button-bg']};
+	color: {$appearance['button-bg']};
 }
 
 .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link:focus,
 .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link:hover {
-	color: {$appearance['default-button-outline-hover']};
+	color: {$appearance['button-outline-hover']};
 }
 CSS;
 

From 9fc631d8989af696b96d622097ed963db356bc0a Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Fri, 14 Jun 2019 09:50:31 +0200
Subject: [PATCH 33/41] Add `composer phpcbf` command and document

---
 README.md     | 2 ++
 composer.json | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index adb17029..4505761a 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,8 @@ The version of [Genesis Sample on GitHub](https://github.com/studiopress/genesis
 
 You'll see output highlighting issues with PHP files that do not conform to Genesis Sample coding standards.
 
+Run `composer phpcbf` if you see “phpcbf can fix the x marked sniff violations automatically” in the output of `composer phpcs`.
+
 ### npm scripts
 
 Scripts are also provided to help with CSS linting, CSS autoprefixing, and creation of pot language files. To use them:
diff --git a/composer.json b/composer.json
index 70635c7c..8b4a3dd8 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,8 @@
 	},
 	"scripts": {
 		"install-codestandards": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run",
-		"phpcs": "phpcs"
+		"phpcs": "phpcs",
+		"phpcbf": "phpcbf"
 	},
 	"support": {
 		"issues": "https://github.com/studiopress/genesis-sample/issues",

From 3be4241d1311d5f3a2d86ab7bf69fccdd26f0db5 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Fri, 14 Jun 2019 15:03:31 +0200
Subject: [PATCH 34/41] Fix priority of after_setup_theme action

This ensures widget areas get added.
---
 functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions.php b/functions.php
index 10e87dfe..14da20d3 100755
--- a/functions.php
+++ b/functions.php
@@ -91,7 +91,7 @@ function genesis_sample_enqueue_scripts_styles() {
 
 }
 
-add_action( 'after_setup_theme', 'genesis_sample_theme_support' );
+add_action( 'after_setup_theme', 'genesis_sample_theme_support', 9 );
 /**
  * Add desired theme supports.
  *

From 15727f24384125af10d31ac0c8d9fdc7b3746865 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 17 Jun 2019 15:31:58 +0200
Subject: [PATCH 35/41] Bump version to 3.0.0

---
 package.json | 2 +-
 style.css    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ada6bdb1..579471b8 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"description": "The sample child theme for the Genesis Framework.",
 		"author": "StudioPress",
 		"authoruri": "https://www.studiopress.com/",
-		"version": "3.0.0-beta",
+		"version": "3.0.0",
 		"tags": "one-column, two-columns, left-sidebar, right-sidebar, accessibility-ready, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready",
 		"license": "GPL-2.0-or-later",
 		"licenseuri": "https://www.gnu.org/licenses/gpl-2.0.html",
diff --git a/style.css b/style.css
index 23f738b8..fa94109b 100755
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Description: This is the sample theme created for the Genesis Framework.
 Author: StudioPress
 Author URI: https://www.studiopress.com/
 
-Version: 3.0.0-beta
+Version: 3.0.0
 
 Tags: accessibility-ready, block-styles, custom-colors, custom-logo, custom-menu, editor-style, featured-images, footer-widgets, full-width-template, left-sidebar, one-column, right-sidebar, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, two-columns, wide-blocks
 

From 0c329de2a1145e514c64606aa5ab4b45891211c3 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 17 Jun 2019 15:34:05 +0200
Subject: [PATCH 36/41] Update language file

---
 languages/genesis-sample.pot | 46 +++++++++++++++---------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/languages/genesis-sample.pot b/languages/genesis-sample.pot
index b5c74cc7..9c9719d7 100644
--- a/languages/genesis-sample.pot
+++ b/languages/genesis-sample.pot
@@ -2,9 +2,9 @@
 # This file is distributed under the GPL-2.0-or-later.=!>
 msgid ""
 msgstr ""
-"Project-Id-Version: Genesis Sample 2.10.0\n"
+"Project-Id-Version: Genesis Sample 3.0.0\n"
 "Report-Msgid-Bugs-To: StudioPress <translations@studiopress.com>\n"
-"POT-Creation-Date: 2019-05-01 08:57:02+00:00\n"
+"POT-Creation-Date: 2019-06-17 13:33:45+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,38 +23,30 @@ msgstr ""
 "X-Poedit-Bookmarks: \n"
 "X-Textdomain-Support: yes\n"
 
-#: config/block-editor-settings.php:24
+#: config/appearance.php:39
 msgid "Custom color"
 msgstr ""
 
-#: config/block-editor-settings.php:29
+#: config/appearance.php:44
 msgid "Accent color"
 msgstr ""
 
-#: config/block-editor-settings.php:36
+#: config/appearance.php:51
 msgid "Small"
 msgstr ""
 
-#: config/block-editor-settings.php:41
+#: config/appearance.php:56
 msgid "Normal"
 msgstr ""
 
-#: config/block-editor-settings.php:46
+#: config/appearance.php:61
 msgid "Large"
 msgstr ""
 
-#: config/block-editor-settings.php:51
+#: config/appearance.php:66
 msgid "Larger"
 msgstr ""
 
-#: config/menus.php:15
-msgid "Header Menu"
-msgstr ""
-
-#: config/menus.php:16
-msgid "Footer Menu"
-msgstr ""
-
 #: config/onboarding.php:17
 msgid "Atomic Blocks"
 msgstr ""
@@ -71,39 +63,39 @@ msgstr ""
 msgid "WPForms Lite (Third Party)"
 msgstr ""
 
-#: functions.php:113
-msgid "Menu"
+#: config/theme-supports.php:36
+msgid "Header Menu"
 msgstr ""
 
-#: functions.php:115
-msgid "Submenu"
+#: config/theme-supports.php:37
+msgid "Footer Menu"
 msgstr ""
 
-#: lib/customize.php:36
+#: lib/customize.php:38
 msgid ""
 "Change the color of post info links and button blocks, the hover color of "
 "linked titles and menu items, and more."
 msgstr ""
 
-#: lib/customize.php:37
+#: lib/customize.php:39
 msgid "Link Color"
 msgstr ""
 
-#: lib/customize.php:57
+#: lib/customize.php:59
 msgid ""
 "Change the default hover color for button links, menu buttons, and submit "
 "buttons. The button block uses the Link Color."
 msgstr ""
 
-#: lib/customize.php:58
+#: lib/customize.php:60
 msgid "Accent Color"
 msgstr ""
 
-#: lib/customize.php:77
+#: lib/customize.php:79
 msgid "Logo Width"
 msgstr ""
 
-#: lib/customize.php:78
+#: lib/customize.php:80
 msgid "The maximum width of the logo in pixels."
 msgstr ""
 
@@ -133,7 +125,7 @@ msgstr ""
 msgid "Next Page"
 msgstr ""
 
-#: lib/wpforms.php:43
+#: lib/wpforms.php:55
 msgid "Simple Contact Form"
 msgstr ""
 

From 863de8cbc453d9187886434595afcf60fe1f0d60 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 17 Jun 2019 15:58:37 +0200
Subject: [PATCH 37/41] Add changelog for 3.0.0

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f690b17..40c19b97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Genesis Sample Theme Changelog
 
+## [3.0.0] - 2019-16-06
+Requires Genesis 3.0.0+.
+
+### Added
+* AMP support. (Optional, off by default, requires Genesis 3.0.0 and the [AMP plugin](https://wordpress.org/plugins/amp/).)
+* New `composer run phpcbf` command to fix simple PHP linting violations. ([GitHub version](https://github.com/studiopress/genesis-sample/) only.)
+
+### Changed
+* Use `position: sticky` for the header and remove JavaScript that adjusted header height and content position. This prevents content reflow after page load.
+* Reorganized config folder for easier reading and maintenance.
+* Use new `genesis_get_theme_handle()` and `genesis_get_theme_version()` functions from Genesis 3.0.0 in place of declaring `CHILD_THEME_HANDLE` and `CHILD_THEME_VERSION` constants.
+* Update developer dependencies.
+
+### Fixed
+* Improved block column CSS for WordPress 5.2+.
+
+### Removed
+* Responsive menu scripts have been replaced with `genesis_register_responsive_menus()`, which loads required JavaScript from Genesis 3.0.0.
+* `genesis-responsive-viewport` theme support declaration. This is now added by default in Genesis 3.0.0.
+* Deleted Genesis nav extras filter and metabox removal. These are no longer present in Genesis 3.0.0.
+* `child-theme-settings-genesis.php` file and filter. Genesis 3.0.0 no longer includes a settings admin page or `genesis_theme_settings_defaults` filter. 
+* `404-page` accessibility support, as this no longer has an effect.
+
 ## [2.10.0] - 2019-05-01
 Requires Genesis 2.10.0+.
 

From d3824f4577fdee16e732851d7f7b5dc7699389df Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 17 Jun 2019 16:16:40 +0200
Subject: [PATCH 38/41] Mention makepot command in GitHub issue release
 template

---
 .github/ISSUE_TEMPLATE/release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
index 17a06eaf..97712802 100644
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@@ -10,7 +10,7 @@ assignees: ''
 **Update version**
 - [ ] style.css
 - [ ] package.json
-- [ ] .pot file (regenerate)
+- [ ] .pot file (`npm install` then `npm run makepot`)
 - [ ] Changelog (include changes)
 
 **Check standards**

From 1b4e6c4269c07e2bae61873d8292761209a5f6b2 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 17 Jun 2019 16:25:31 +0200
Subject: [PATCH 39/41] Add link to 2.8.0/3.0.0 diff

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c19b97..18684942 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -139,6 +139,7 @@ Requires Genesis 2.8.0+.
 * Set localization.
 * Update XML file.
 
+[3.0.0]: https://github.com/copyblogger/genesis-sample/compare/2.8.0...3.0.0
 [2.8.0]: https://github.com/copyblogger/genesis-sample/compare/2.7.1...2.8.0
 [2.7.1]: https://github.com/copyblogger/genesis-sample/compare/2.7.0...2.7.1
 [2.7.0]: https://github.com/copyblogger/genesis-sample/compare/2.6.0...2.7.0

From e28ccf2f081fbaf03ab736a19a02c6ed4d91d75c Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 17 Jun 2019 16:28:01 +0200
Subject: [PATCH 40/41] Fix diff links

---
 CHANGELOG.md | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18684942..2466a913 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -139,11 +139,14 @@ Requires Genesis 2.8.0+.
 * Set localization.
 * Update XML file.
 
-[3.0.0]: https://github.com/copyblogger/genesis-sample/compare/2.8.0...3.0.0
-[2.8.0]: https://github.com/copyblogger/genesis-sample/compare/2.7.1...2.8.0
-[2.7.1]: https://github.com/copyblogger/genesis-sample/compare/2.7.0...2.7.1
-[2.7.0]: https://github.com/copyblogger/genesis-sample/compare/2.6.0...2.7.0
-[2.6.0]: https://github.com/copyblogger/genesis-sample/compare/2.3.0...2.6.0
-[2.3.0]: https://github.com/copyblogger/genesis-sample/compare/2.2.4...2.3.0
-[2.2.4]: https://github.com/copyblogger/genesis-sample/compare/2.2.3...2.2.4
-[2.2.3]: https://github.com/copyblogger/genesis-sample/compare/014deb3689323b7bbd4ddbfff4f5f9279a38f741...2.2.3
+[3.0.0]: https://github.com/studiopress/genesis-sample/compare/2.10.0...3.0.0
+[2.10.0]: https://github.com/studiopress/genesis-sample/compare/2.9.1...2.10.0
+[2.9.1]: https://github.com/studiopress/genesis-sample/compare/2.9.0...2.9.1
+[2.9.0]: https://github.com/studiopress/genesis-sample/compare/2.8.0...2.9.0
+[2.8.0]: https://github.com/studiopress/genesis-sample/compare/2.7.1...2.8.0
+[2.7.1]: https://github.com/studiopress/genesis-sample/compare/2.7.0...2.7.1
+[2.7.0]: https://github.com/studiopress/genesis-sample/compare/2.6.0...2.7.0
+[2.6.0]: https://github.com/studiopress/genesis-sample/compare/2.3.0...2.6.0
+[2.3.0]: https://github.com/studiopress/genesis-sample/compare/2.2.4...2.3.0
+[2.2.4]: https://github.com/studiopress/genesis-sample/compare/2.2.3...2.2.4
+[2.2.3]: https://github.com/studiopress/genesis-sample/compare/014deb3689323b7bbd4ddbfff4f5f9279a38f741...2.2.3

From 5ee06b0e62aea9cd2d9f9205ec116d1f3af177b0 Mon Sep 17 00:00:00 2001
From: Nick Cernis <nick@cern.is>
Date: Mon, 17 Jun 2019 16:29:14 +0200
Subject: [PATCH 41/41] Correct 3.0.0 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2466a913..9b423ca7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Genesis Sample Theme Changelog
 
-## [3.0.0] - 2019-16-06
+## [3.0.0] - 2019-06-19
 Requires Genesis 3.0.0+.
 
 ### Added