diff --git a/.nsprc b/.nsprc
index cb91fd58..bfe74cd9 100644
--- a/.nsprc
+++ b/.nsprc
@@ -1,4 +1,5 @@
 {
+  "GHSA-4gmj-3p3h-gm8h": "es5-ext - no risk given our usage - test coverage should catch",
   "GHSA-78xj-cgh5-2h22": "ip - devDependency, no risk given our usage",
   "GHSA-67hx-6x53-jw92": "@babel/traverse - devDependency, no risk given our usage",
   "GHSA-j8xg-fqg3-53r7": "word-wrap - devDependency, no risk given our usage",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20f50e41..e12f28b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [6.3.0] - 2024-02-27
+
+### Changed
+
+- Tudor crown incorporated, and now enabled by default
+- Updated govuk-frontend to v5.2.0
+- Updated npm audit exclusions
+
 ## [6.2.0] - 2024-02-26
 
 ### Changed
@@ -25,6 +33,38 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Updated to work with govuk-frontend v5
 
+## [5.67.0] - 2024-02-19
+
+### Changed
+
+- add useTudorCrown option to account-header layout for prototypes and the design-system
+
+## [5.66.0] - 2024-02-09
+
+### Changed
+
+- version number bumped to trigger release - no other changes
+
+## [5.65.0] - 2024-02-09
+
+### Changed
+
+- updated api for using the tudor crown to match govuk-frontend, and started passing through the value to child
+  components that need it
+
+## [5.64.0] - 2024-02-08
+
+### Changed
+
+- Updated `govuk-frontend` to `v4.8.0`. Updated `header` to use new Tudor Crown logo via feature flag. Update `banner`
+  and `internal-header` to use new HMRC Crest via feature flag.
+
+## [5.63.0] - 2024-02-06
+
+### Changed
+
+- Test release updating `govuk-frontend` to `v4.8.0` and testing new Tudor Crown logo changes. Do not use this release.
+
 ## [5.62.0] - 2024-01-03
 
 ### Changed
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options-with-tudor-crown_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options-with-tudor-crown_example_0_document_0_phone.png
new file mode 100644
index 00000000..6e250732
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options-with-tudor-crown_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options-with-tudor-crown_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options-with-tudor-crown_example_0_document_1_tablet.png
new file mode 100644
index 00000000..6fa5cf1c
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options-with-tudor-crown_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_0_phone.png
index 09be6faf..6e250732 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_1_tablet.png
index f8b0aaef..6fa5cf1c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_all-available-options_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_0_phone.png
index 31190742..ffb86f96 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_1_tablet.png
index 5917a315..a639995a 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_default_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_0_phone.png
index 4665c40d..fd3a838b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_1_tablet.png
index 6054aba3..37a30fa2 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_global-service-name_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_0_document_0_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_0_document_0_tablet.png
index f8b0aaef..6fa5cf1c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_0_document_0_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_0_document_0_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-focused_0_document_0_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-focused_0_document_0_tablet.png
index 4685783c..71f14e19 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-focused_0_document_0_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-focused_0_document_0_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-hovered_0_document_0_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-hovered_0_document_0_tablet.png
index e10d4f04..44d23d56 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-hovered_0_document_0_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-account-home-hovered_0_document_0_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-focused_0_document_0_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-focused_0_document_0_tablet.png
index 17ad2502..eadb479b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-focused_0_document_0_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-focused_0_document_0_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-hovered_0_document_0_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-hovered_0_document_0_tablet.png
index 801d0ab7..775f2132 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-hovered_0_document_0_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_account-menu-messages-hovered_0_document_0_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-alternate-lang-focused-and-current-lang-hovered_0_document_0_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-alternate-lang-focused-and-current-lang-hovered_0_document_0_tablet.png
index 2274a8da..c04b40a2 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-alternate-lang-focused-and-current-lang-hovered_0_document_0_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-alternate-lang-focused-and-current-lang-hovered_0_document_0_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-current-lang-focused-and-alternate-lang-hovered_0_document_0_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-current-lang-focused-and-alternate-lang-hovered_0_document_0_tablet.png
index e92f5058..7ebb1c80 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-current-lang-focused-and-alternate-lang-hovered_0_document_0_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-desktop_example_language-select-current-lang-focused-and-alternate-lang-hovered_0_document_0_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_0_document_0_phone.png
index 4665c40d..fd3a838b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-focused_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-focused_0_document_0_phone.png
index 68384a7f..11ba5a54 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-focused_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-focused_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-hovered_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-hovered_0_document_0_phone.png
index 0c7c8c63..a59343db 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-hovered_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open-active-link-hovered_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open_0_document_0_phone.png
index 0c7c8c63..a59343db 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-dropdown-open_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-with-larger-browser-font_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-with-larger-browser-font_0_document_0_phone.png
index 3f15d83a..ac486d12 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-with-larger-browser-font_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile-with-dropdown-link-active_example_account-menu-with-larger-browser-font_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_0_document_0_phone.png
index 09be6faf..6e250732 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-focused_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-focused_0_document_0_phone.png
index ae15ce6c..b229f91c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-focused_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-focused_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-hovered_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-hovered_0_document_0_phone.png
index e5c2c314..3a54848b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-hovered_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-account-home-hovered_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-focused_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-focused_0_document_0_phone.png
index dcb13183..99ed4896 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-focused_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-focused_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-hovered_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-hovered_0_document_0_phone.png
index 66f36fe1..f7ce6273 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-hovered_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-hovered_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-focused_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-focused_0_document_0_phone.png
index 862b0705..2cbf5a61 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-focused_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-focused_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-hovered_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-hovered_0_document_0_phone.png
index a4d82bc0..908048c5 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-hovered_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open-messages-hovered_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open_0_document_0_phone.png
index a4d82bc0..908048c5 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_link-states-on-mobile_example_account-menu-dropdown-open_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_0_phone.png
index 56d2a111..c70a6aaf 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_1_tablet.png
index 55e6d5a4..b13092b5 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_overridden-global-service-name_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_0_phone.png
index bee086fc..cd86f2aa 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_1_tablet.png
index f898cca3..bff08add 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_welsh-with-service-name_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_0_phone.png
index cdedaa35..f9111dce 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_1_tablet.png
index 487a0eb1..f08d247c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_account-header_with-service-name_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_0_phone.png
index 29fff6a2..a40a0613 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_1_tablet.png
index fa26541a..624e42a1 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_default_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_0_phone.png
index e652a117..8e2b7eff 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_1_tablet.png
index 5f00d357..65d4948d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_empty-list-welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_0_phone.png
index 73ea22cc..c17756f6 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_1_tablet.png
index 86a8c0bf..2117fd86 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-generic-welsh-items_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_0_phone.png
index 847767a7..a6b5201d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_1_tablet.png
index abf4a386..dccdba49 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_multiple-specific-items_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_0_phone.png
index 4bd7b4d6..579c446a 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_1_tablet.png
index 0a564fec..dbdb7a07 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-item_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_0_phone.png
index 0e99b51b..bbf71e9e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_1_tablet.png
index f741120e..0a7591ca 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_add-to-a-list_single-generic-welsh-item_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_0_phone.png
index e802c698..1b5d7443 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_1_tablet.png
index 3c886853..a646e6b8 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_banner_default_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_0_phone.png
index cb850482..c3d5d0b7 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_1_tablet.png
index e48dfc3f..7c424f0d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_banner_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_with-st-edwards-crown_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_banner_with-st-edwards-crown_example_0_document_0_phone.png
new file mode 100644
index 00000000..263203d7
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_banner_with-st-edwards-crown_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_with-st-edwards-crown_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_banner_with-st-edwards-crown_example_0_document_1_tablet.png
new file mode 100644
index 00000000..b722aa7e
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_banner_with-st-edwards-crown_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_with-tudor-crown_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_banner_with-tudor-crown_example_0_document_0_phone.png
new file mode 100644
index 00000000..1b5d7443
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_banner_with-tudor-crown_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_banner_with-tudor-crown_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_banner_with-tudor-crown_example_0_document_1_tablet.png
new file mode 100644
index 00000000..a646e6b8
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_banner_with-tudor-crown_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_0_phone.png
index 89fec40c..2625b74c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_1_tablet.png
index 47bd3690..6474a62d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_0_phone.png
index 5ba8de60..adc673a3 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_1_tablet.png
index 9722a622..faf5fdd9 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_character-count_with_default_value_exceeding_limit_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_footer_with_params_common_to_govuk_footer_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_footer_with_params_common_to_govuk_footer_example_0_document_0_phone.png
new file mode 100644
index 00000000..51003850
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_footer_with_params_common_to_govuk_footer_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_footer_with_params_common_to_govuk_footer_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_footer_with_params_common_to_govuk_footer_example_0_document_1_tablet.png
new file mode 100644
index 00000000..a9beab9a
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_footer_with_params_common_to_govuk_footer_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_0_phone.png
index 95a1d8e1..c68f4d8e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_1_tablet.png
index 568c22c2..f3d83f01 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_default_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_0_phone.png
index b3d73784..52944fea 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_1_tablet.png
index 1decdeb3..e930be4e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_full_width_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_and_menu_open_on_mobile_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_and_menu_open_on_mobile_example_0_document_0_phone.png
index a079e902..60979cdc 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_and_menu_open_on_mobile_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_and_menu_open_on_mobile_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_0_phone.png
index 7aba4372..95a15755 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_1_tablet.png
index 17d3b44a..a23c48a8 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_full_width_with_navigation_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_0_phone.png
index c74a173d..ab97e581 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_1_tablet.png
index 01aba86c..fe15013c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_0_phone.png
index c74a173d..ab97e581 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_1_tablet.png
index f6fcc485..32d446e9 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_html_without_link_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_0_phone.png
index c74a173d..ab97e581 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_1_tablet.png
index f34f657a..94ad998c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_navigation_item_with_text_without_link_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_0_phone.png
index 936bae50..6ed6b97a 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_1_tablet.png
index b7130233..615cc4bb 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_0_phone.png
index 619d1420..b967b00e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_1_tablet.png
index 36a9bceb..38c1a954 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_sign_out_link_in_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_0_phone.png
index 6bac49be..72dff1d3 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_1_tablet.png
index 1b170e7f..f9f59359 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_additional_banner_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_0_phone.png
index af7f16ef..c30fefc9 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_1_tablet.png
index 770f2803..dd5029af 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_english_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_0_phone.png
index 56a1ee1b..5f8ddc07 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_1_tablet.png
index 318eee36..96cff049 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_hmrc_banner_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_0_phone.png
index 94c60a6b..b99fdc47 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_1_tablet.png
index 9a889e6f..911e5ba3 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_english_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_0_phone.png
index dbf80ff8..33267639 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_1_tablet.png
index 4f35bf07..226c552d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_language_toggle_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_0_phone.png
index b83f5fa3..0ee12c16 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_1_tablet.png
index cd5eb5e2..68e01413 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_0_phone.png
index c269eeb6..d83794fd 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_1_tablet.png
index 86bdcc31..f6c3b2e8 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_large_navigation_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_0_phone.png
index b83f5fa3..0ee12c16 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_1_tablet.png
index 6ff902a2..b113a914 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_0_phone.png
index 716eeec5..b8dda296 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_1_tablet.png
index 6ff902a2..b113a914 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_navigation_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_params_common_to_govuk_header_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_params_common_to_govuk_header_example_0_document_0_phone.png
new file mode 100644
index 00000000..6a72ad6e
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_header_with_params_common_to_govuk_header_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_params_common_to_govuk_header_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_params_common_to_govuk_header_example_0_document_1_tablet.png
new file mode 100644
index 00000000..2e447259
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_header_with_params_common_to_govuk_header_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_0_phone.png
index 79d0de3d..b47d3512 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_1_tablet.png
index 77f296a4..996e72da 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_product_name_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_0_phone.png
index c74a173d..ab97e581 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_1_tablet.png
index b64ffedc..d6ac145d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_and_navigation_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_0_phone.png
index cf6f646c..c9132e8e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_1_tablet.png
index 71921393..6670a70b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_but_no_service_link_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_0_phone.png
index cf6f646c..c9132e8e 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_1_tablet.png
index 71921393..6670a70b 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_header_with_service_name_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_st_edwards_crown_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_st_edwards_crown_example_0_document_0_phone.png
new file mode 100644
index 00000000..95a1d8e1
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_header_with_st_edwards_crown_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_st_edwards_crown_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_st_edwards_crown_example_0_document_1_tablet.png
new file mode 100644
index 00000000..568c22c2
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_header_with_st_edwards_crown_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_tudor_crown_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_header_with_tudor_crown_example_0_document_0_phone.png
new file mode 100644
index 00000000..cb6097df
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_header_with_tudor_crown_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_header_with_tudor_crown_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_header_with_tudor_crown_example_0_document_1_tablet.png
new file mode 100644
index 00000000..7183d1bd
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_header_with_tudor_crown_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_0_phone.png
index 04cf3840..b0fc8516 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_1_tablet.png
index 3f755cb1..952e01ce 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_internal-header_default_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_0_phone.png
index 9cff8557..11af4b2d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_1_tablet.png
index 9ae06723..c19b668f 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_internal-header_welsh_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_0_phone.png
index 70736f20..9799bd76 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_0_phone.png and b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_1_tablet.png
index 89f2be1d..2568b0d6 100644
Binary files a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_1_tablet.png and b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-service-name_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-st-edwards-crown_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-st-edwards-crown_example_0_document_0_phone.png
new file mode 100644
index 00000000..8c38b089
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-st-edwards-crown_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-st-edwards-crown_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-st-edwards-crown_example_0_document_1_tablet.png
new file mode 100644
index 00000000..3f755cb1
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-st-edwards-crown_example_0_document_1_tablet.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-tudor-crown_example_0_document_0_phone.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-tudor-crown_example_0_document_0_phone.png
new file mode 100644
index 00000000..b0fc8516
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-tudor-crown_example_0_document_0_phone.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_default_internal-header_with-tudor-crown_example_0_document_1_tablet.png b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-tudor-crown_example_0_document_1_tablet.png
new file mode 100644
index 00000000..952e01ce
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_default_internal-header_with-tudor-crown_example_0_document_1_tablet.png differ
diff --git a/lib/helper-functions.js b/lib/helper-functions.js
index d824939b..d9b0a7aa 100644
--- a/lib/helper-functions.js
+++ b/lib/helper-functions.js
@@ -6,7 +6,13 @@
 // Component names are lowercase, dash-separated strings (button, date-input),
 // whilst macro names have a `govuk` prefix and are camel cased (govukButton,
 // govukDateInput).
-const componentNameToMacroName = (componentName) => {
+const GOVUK_COMPONENTS_PATH = '/components/';
+
+const componentNameToMacroName = (componentPath) => {
+  const [componentName, library = 'hmrc'] = componentPath
+    .split(GOVUK_COMPONENTS_PATH)
+    .reverse();
+
   const macroName = componentName
     .toLowerCase()
     .split('-')
@@ -14,8 +20,9 @@ const componentNameToMacroName = (componentName) => {
     .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
     .join('');
 
-  return `hmrc${macroName}`;
+  return `${library}${macroName}`;
 };
+
 exports.componentNameToMacroName = componentNameToMacroName;
 
 exports.componentNameToComponentDirectory = (componentName) => [componentName].join('-'
diff --git a/package-lock.json b/package-lock.json
index 37146a84..3be815c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "hmrc-frontend",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3046,13 +3046,13 @@
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
     "ansi-cyan": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
       "dev": true,
       "requires": {
         "ansi-wrap": "0.1.0"
@@ -3078,7 +3078,7 @@
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
       "dev": true,
       "requires": {
         "ansi-wrap": "0.1.0"
@@ -3087,7 +3087,7 @@
     "ansi-red": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
       "dev": true,
       "requires": {
         "ansi-wrap": "0.1.0"
@@ -3096,7 +3096,7 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
       "dev": true
     },
     "ansi-styles": {
@@ -3111,7 +3111,7 @@
     "ansi-wrap": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
       "dev": true
     },
     "anymatch": {
@@ -3145,7 +3145,7 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
@@ -3156,7 +3156,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -3177,7 +3177,7 @@
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
             "extend-shallow": "^2.0.1",
@@ -3189,7 +3189,7 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
@@ -3200,7 +3200,7 @@
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -3209,7 +3209,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -3241,7 +3241,7 @@
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
@@ -3250,7 +3250,7 @@
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
           "requires": {
             "is-number": "^3.0.0",
@@ -3262,7 +3262,7 @@
     "append-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
       "dev": true,
       "requires": {
         "buffer-equal": "^1.0.0"
@@ -3277,7 +3277,7 @@
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
       "dev": true
     },
     "are-we-there-yet": {
@@ -3315,13 +3315,13 @@
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true
     },
     "arr-filter": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
       "dev": true,
       "requires": {
         "make-iterator": "^1.0.0"
@@ -3336,7 +3336,7 @@
     "arr-map": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
       "dev": true,
       "requires": {
         "make-iterator": "^1.0.0"
@@ -3345,7 +3345,7 @@
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
     "array-buffer-byte-length": {
@@ -3367,7 +3367,7 @@
     "array-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
       "dev": true
     },
     "array-flatten": {
@@ -3392,7 +3392,7 @@
     "array-initial": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
       "dev": true,
       "requires": {
         "array-slice": "^1.0.0",
@@ -3458,7 +3458,7 @@
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
     "array.prototype.flat": {
@@ -3514,7 +3514,7 @@
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
     "asap": {
@@ -3582,13 +3582,13 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
     "astral-regex": {
@@ -3633,7 +3633,7 @@
     "async-settle": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
       "dev": true,
       "requires": {
         "async-done": "^1.2.2"
@@ -3642,7 +3642,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
     "atob": {
@@ -3654,7 +3654,7 @@
     "autolinker": {
       "version": "0.28.1",
       "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.28.1.tgz",
-      "integrity": "sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==",
+      "integrity": "sha1-BlK0kYgYefB3XazgzcoyM5QqTkc=",
       "dev": true,
       "requires": {
         "gulp-header": "^1.7.1"
@@ -3702,7 +3702,7 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "dev": true
     },
     "aws4": {
@@ -3720,7 +3720,7 @@
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
         "chalk": "^1.1.3",
@@ -3731,13 +3731,13 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -3750,13 +3750,13 @@
         "js-tokens": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
           "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         }
       }
@@ -3780,7 +3780,7 @@
     "babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0"
@@ -3856,7 +3856,7 @@
     "babel-plugin-transform-strict-mode": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw==",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0",
@@ -3896,7 +3896,7 @@
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
         "core-js": "^2.4.0",
@@ -3914,7 +3914,7 @@
     "babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
@@ -3927,7 +3927,7 @@
     "babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
@@ -3959,7 +3959,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
@@ -3967,7 +3967,7 @@
     "babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
@@ -3979,7 +3979,7 @@
         "to-fast-properties": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
+          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
           "dev": true
         }
       }
@@ -3993,7 +3993,7 @@
     "bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
       "dev": true,
       "requires": {
         "arr-filter": "^1.1.1",
@@ -4108,7 +4108,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
@@ -4258,7 +4258,7 @@
     "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
     "brace-expansion": {
@@ -4739,7 +4739,7 @@
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
       "dev": true,
       "requires": {
         "callsites": "^2.0.0"
@@ -4748,7 +4748,7 @@
     "caller-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
       "dev": true,
       "requires": {
         "caller-callsite": "^2.0.0"
@@ -4757,7 +4757,7 @@
     "callsites": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
     "camelcase": {
@@ -4815,7 +4815,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
     "chalk": {
@@ -5075,7 +5075,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -5092,7 +5092,7 @@
     "cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
         "string-width": "^1.0.1",
@@ -5103,7 +5103,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -5112,7 +5112,7 @@
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -5125,13 +5125,13 @@
     "clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
     "clone-buffer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
       "dev": true
     },
     "clone-regexp": {
@@ -5146,7 +5146,7 @@
     "clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
       "dev": true
     },
     "cloneable-readable": {
@@ -5193,7 +5193,7 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
     "coffee-script": {
@@ -5211,7 +5211,7 @@
     "collection-map": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
       "dev": true,
       "requires": {
         "arr-map": "^2.0.2",
@@ -5222,7 +5222,7 @@
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
         "map-visit": "^1.0.0",
@@ -5251,7 +5251,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "color-string": {
@@ -5375,13 +5375,13 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -5394,7 +5394,7 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         }
       }
@@ -5449,7 +5449,7 @@
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
     "copy-props": {
@@ -5506,7 +5506,7 @@
         "parse-json": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
             "error-ex": "^1.3.1",
@@ -5636,7 +5636,7 @@
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true
     },
     "css-declaration-sorter": {
@@ -5797,13 +5797,13 @@
     "cssnano-util-get-arguments": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha512-6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw==",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
       "dev": true
     },
     "cssnano-util-get-match": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha512-JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw==",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
       "dev": true
     },
     "cssnano-util-raw-cache": {
@@ -5968,7 +5968,7 @@
     "dateformat": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
-      "integrity": "sha512-5zcI+Qoul0QgiCcjzsobs9G1c+vHCNaYB2NGa57ZbVnP7bZeKJJgoM/K+I/obaHAmyEL0J8hJafbQ+HFSZnzZA==",
+      "integrity": "sha1-8ny+56ASu/uC6gUVYtOXf2CT27E=",
       "dev": true,
       "requires": {
         "get-stdin": "*",
@@ -6092,7 +6092,7 @@
     "default-resolution": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
       "dev": true
     },
     "define-properties": {
@@ -6205,7 +6205,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
     "delegates": {
@@ -6251,7 +6251,7 @@
     "detect-file": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
       "dev": true
     },
     "detect-newline": {
@@ -6757,7 +6757,7 @@
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
         "d": "1",
@@ -6802,7 +6802,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
     "escodegen": {
@@ -7456,7 +7456,7 @@
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
         "debug": "^2.3.3",
@@ -7480,7 +7480,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -7489,7 +7489,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         }
       }
@@ -7497,7 +7497,7 @@
     "expand-tilde": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
         "homedir-polyfill": "^1.0.1"
@@ -7603,7 +7603,7 @@
     "extend-shallow": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "requires": {
         "is-extendable": "^0.1.0"
@@ -7628,7 +7628,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
@@ -7680,7 +7680,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
     "fancy-log": {
@@ -7723,7 +7723,7 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
     "fast-safe-stringify": {
@@ -7875,7 +7875,7 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
@@ -7886,7 +7886,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -7907,7 +7907,7 @@
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
             "extend-shallow": "^2.0.1",
@@ -7919,7 +7919,7 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
@@ -7930,7 +7930,7 @@
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -7939,7 +7939,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -7971,7 +7971,7 @@
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
           "requires": {
             "is-number": "^3.0.0",
@@ -8062,13 +8062,13 @@
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
     "for-own": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
         "for-in": "^1.0.1"
@@ -8095,7 +8095,7 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
       "dev": true
     },
     "form-data": {
@@ -8127,7 +8127,7 @@
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
         "map-cache": "^0.2.2"
@@ -8185,7 +8185,7 @@
     "fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
@@ -8195,7 +8195,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
     "fsevents": {
@@ -8338,7 +8338,7 @@
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
     "getpass": {
@@ -8395,7 +8395,7 @@
     "glob-stream": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
       "dev": true,
       "requires": {
         "extend": "^3.0.0",
@@ -8427,7 +8427,7 @@
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
           "dev": true,
           "requires": {
             "is-glob": "^3.1.0",
@@ -8437,7 +8437,7 @@
         "is-glob": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
@@ -8474,7 +8474,7 @@
     "global-prefix": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
         "expand-tilde": "^2.0.2",
@@ -8545,7 +8545,7 @@
     "globjoin": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true
     },
     "globule": {
@@ -8612,9 +8612,9 @@
       }
     },
     "govuk-frontend": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0.tgz",
-      "integrity": "sha512-3WSfvQ+3kw/q/m8jrq/t8XnMUA8D2r0uhGyZaDbIh1gWTJBQzJBHbHiKYI9nc9ixIXdCFsc9RozkgEm57a795g=="
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.2.0.tgz",
+      "integrity": "sha512-beD3wztHpkKz6JUpPwnwop1ejb4rTFMPLCutKLCIDmUS4BPpW59ggVUfctsRqHd2Zjw9wxljdRdeIJ8AZFyyTw=="
     },
     "graceful-fs": {
       "version": "4.2.10",
@@ -8631,7 +8631,7 @@
     "gray-matter": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz",
-      "integrity": "sha512-vbmvP1Fe/fxuT2QuLVcqb2BfK7upGhhbLIt9/owWEvPYrZZEkelLcq2HqzxosV+PQ67dUFLaAeNpH7C4hhICAA==",
+      "integrity": "sha1-MELZrewqHe1qdwep7SOA+KF6Qw4=",
       "dev": true,
       "requires": {
         "ansi-red": "^0.1.1",
@@ -8665,19 +8665,19 @@
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
         },
         "decamelize": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "find-up": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
             "path-exists": "^2.0.0",
@@ -8719,7 +8719,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -8740,7 +8740,7 @@
         "path-exists": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
@@ -8749,7 +8749,7 @@
         "path-type": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.2",
@@ -8760,7 +8760,7 @@
         "read-pkg": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
           "dev": true,
           "requires": {
             "load-json-file": "^1.0.0",
@@ -8771,7 +8771,7 @@
         "read-pkg-up": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
           "dev": true,
           "requires": {
             "find-up": "^1.0.0",
@@ -8787,7 +8787,7 @@
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -8853,19 +8853,19 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true
         },
         "object-keys": {
           "version": "0.4.0",
           "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-          "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
+          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
           "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -8877,13 +8877,13 @@
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         },
         "through2": {
           "version": "0.4.2",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-          "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
+          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
           "dev": true,
           "requires": {
             "readable-stream": "~1.0.17",
@@ -8893,7 +8893,7 @@
         "xtend": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-          "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
           "dev": true,
           "requires": {
             "object-keys": "~0.4.0"
@@ -8939,13 +8939,13 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "arr-diff": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
           "dev": true,
           "requires": {
             "arr-flatten": "^1.0.1",
@@ -8955,19 +8955,19 @@
         "arr-union": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
           "dev": true
         },
         "array-slice": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -8980,7 +8980,7 @@
         "extend-shallow": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
           "dev": true,
           "requires": {
             "kind-of": "^1.1.0"
@@ -8989,13 +8989,13 @@
         "kind-of": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
         "plugin-error": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-          "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
           "dev": true,
           "requires": {
             "ansi-cyan": "^0.1.1",
@@ -9008,7 +9008,7 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         }
       }
@@ -9111,7 +9111,7 @@
     "gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
       "requires": {
         "glogg": "^1.0.0"
@@ -9120,7 +9120,7 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
       "dev": true
     },
     "har-validator": {
@@ -9171,7 +9171,7 @@
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
@@ -9186,7 +9186,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
     "has-property-descriptors": {
@@ -9228,7 +9228,7 @@
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
         "get-value": "^2.0.6",
@@ -9239,7 +9239,7 @@
     "has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
         "is-number": "^3.0.0",
@@ -9249,7 +9249,7 @@
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -9258,7 +9258,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -9269,7 +9269,7 @@
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -9363,13 +9363,13 @@
     "hsl-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha512-M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A==",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
       "dev": true
     },
     "hsla-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA==",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
     "html-encoding-sniffer": {
@@ -9450,7 +9450,7 @@
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
@@ -9525,7 +9525,7 @@
     "import-fresh": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
       "dev": true,
       "requires": {
         "caller-path": "^2.0.0",
@@ -9551,7 +9551,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
     "indent-string": {
@@ -9563,7 +9563,7 @@
     "indexes-of": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
       "dev": true
     },
     "infer-owner": {
@@ -9575,7 +9575,7 @@
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
         "once": "^1.3.0",
@@ -9658,7 +9658,7 @@
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
       "dev": true
     },
     "ip": {
@@ -9686,13 +9686,13 @@
     "is-absolute-url": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
       "dev": true
     },
     "is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
@@ -9701,7 +9701,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -9749,7 +9749,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
     "is-bigint": {
@@ -9812,7 +9812,7 @@
     "is-color-stop": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA==",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
       "dev": true,
       "requires": {
         "css-color-names": "^0.0.4",
@@ -9835,7 +9835,7 @@
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
@@ -9844,7 +9844,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -9889,19 +9889,19 @@
     "is-directory": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
       "dev": true
     },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true
     },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
     "is-fullwidth-code-point": {
@@ -9955,7 +9955,7 @@
     "is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
       "dev": true
     },
     "is-negative-zero": {
@@ -10000,7 +10000,7 @@
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true
     },
     "is-plain-object": {
@@ -10113,7 +10113,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
       "dev": true
     },
     "is-unc-path": {
@@ -10134,13 +10134,13 @@
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
     "is-valid-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
       "dev": true
     },
     "is-weakref": {
@@ -10167,25 +10167,25 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
     "istanbul-lib-coverage": {
@@ -11401,13 +11401,13 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
     "json5": {
@@ -11512,7 +11512,7 @@
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
       "dev": true,
       "requires": {
         "default-resolution": "^2.0.0",
@@ -11522,7 +11522,7 @@
     "lazy-cache": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
-      "integrity": "sha512-7vp2Acd2+Kz4XkzxGxaB1FWOi8KjWIWsgdfD5MCb86DWvlLqhRPM+d6Pro3iNEL5VT9mstz5hKAlcd+QR6H3aA==",
+      "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
       "dev": true,
       "requires": {
         "set-getter": "^0.1.0"
@@ -11540,7 +11540,7 @@
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
         "invert-kv": "^1.0.0"
@@ -11549,7 +11549,7 @@
     "lead": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
       "dev": true,
       "requires": {
         "flush-write-stream": "^1.0.2"
@@ -11623,7 +11623,7 @@
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -11636,7 +11636,7 @@
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
             "error-ex": "^1.2.0"
@@ -11645,7 +11645,7 @@
         "strip-bom": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
           "dev": true,
           "requires": {
             "is-utf8": "^0.2.0"
@@ -11671,7 +11671,7 @@
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
       "dev": true
     },
     "lodash.camelcase": {
@@ -11738,7 +11738,7 @@
     "lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
       "dev": true
     },
     "log-symbols": {
@@ -11873,7 +11873,7 @@
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
     "map-obj": {
@@ -11885,7 +11885,7 @@
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
         "object-visit": "^1.0.0"
@@ -11894,7 +11894,7 @@
     "matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
       "dev": true,
       "requires": {
         "findup-sync": "^2.0.0",
@@ -11924,7 +11924,7 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
@@ -11935,7 +11935,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -11956,7 +11956,7 @@
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
             "extend-shallow": "^2.0.1",
@@ -11968,7 +11968,7 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
@@ -11979,7 +11979,7 @@
         "findup-sync": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-          "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
+          "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
           "dev": true,
           "requires": {
             "detect-file": "^1.0.0",
@@ -11991,7 +11991,7 @@
         "is-glob": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
@@ -12000,7 +12000,7 @@
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -12009,7 +12009,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -12041,7 +12041,7 @@
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
           "requires": {
             "is-number": "^3.0.0",
@@ -12582,7 +12582,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -12603,7 +12603,7 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
     "negotiator": {
@@ -13162,13 +13162,13 @@
     "normalize-range": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
     "normalize-selector": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "dev": true
     },
     "normalize-url": {
@@ -13274,13 +13274,13 @@
     "num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
       "dev": true
     },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
     "nunjucks": {
@@ -13323,13 +13323,13 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "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",
-      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
         "copy-descriptor": "^0.1.0",
@@ -13340,7 +13340,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -13349,7 +13349,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -13378,7 +13378,7 @@
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
         "isobject": "^3.0.0"
@@ -13399,7 +13399,7 @@
     "object.defaults": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
       "dev": true,
       "requires": {
         "array-each": "^1.0.1",
@@ -13455,7 +13455,7 @@
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
       "dev": true,
       "requires": {
         "for-own": "^1.0.0",
@@ -13465,7 +13465,7 @@
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
@@ -13474,7 +13474,7 @@
     "object.reduce": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
       "dev": true,
       "requires": {
         "for-own": "^1.0.0",
@@ -13504,7 +13504,7 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
         "wrappy": "1"
@@ -13545,7 +13545,7 @@
     "ordered-read-streams": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
       "dev": true,
       "requires": {
         "readable-stream": "^2.0.1"
@@ -13566,7 +13566,7 @@
     "os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
         "lcid": "^1.0.0"
@@ -13667,7 +13667,7 @@
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
       "dev": true,
       "requires": {
         "is-absolute": "^1.0.0",
@@ -13696,7 +13696,7 @@
     "parse-passwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
     "parse5": {
@@ -13727,13 +13727,13 @@
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
     "path": {
       "version": "0.12.7",
       "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
       "dev": true,
       "requires": {
         "process": "^0.11.1",
@@ -13749,7 +13749,7 @@
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
       "dev": true
     },
     "path-exists": {
@@ -13761,7 +13761,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
     "path-key": {
@@ -13785,7 +13785,7 @@
     "path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
       "dev": true,
       "requires": {
         "path-root-regex": "^0.1.0"
@@ -13794,7 +13794,7 @@
     "path-root-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
       "dev": true
     },
     "path-scurry": {
@@ -13849,7 +13849,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
     "picocolors": {
@@ -13867,19 +13867,19 @@
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
       "dev": true
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
         "pinkie": "^2.0.0"
@@ -14091,7 +14091,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -14149,7 +14149,7 @@
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true
     },
     "postcss": {
@@ -14503,7 +14503,7 @@
     "postcss-media-query-parser": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
       "dev": true
     },
     "postcss-merge-longhand": {
@@ -15174,7 +15174,7 @@
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
       "dev": true
     },
     "postcss-safe-parser": {
@@ -15384,13 +15384,13 @@
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
       "dev": true
     },
     "process-nextick-args": {
@@ -15626,7 +15626,7 @@
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
       "dev": true
     },
     "qs": {
@@ -15959,7 +15959,7 @@
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
         "resolve": "^1.1.6"
@@ -16027,7 +16027,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -16145,7 +16145,7 @@
     "remove-bom-stream": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
       "dev": true,
       "requires": {
         "remove-bom-buffer": "^3.0.0",
@@ -16156,7 +16156,7 @@
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
       "dev": true
     },
     "repeat-element": {
@@ -16168,7 +16168,7 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
     "replace-ext": {
@@ -16180,7 +16180,7 @@
     "replace-homedir": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
       "dev": true,
       "requires": {
         "homedir-polyfill": "^1.0.1",
@@ -16248,7 +16248,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
     "require-from-string": {
@@ -16260,7 +16260,7 @@
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
     "requires-port": {
@@ -16300,7 +16300,7 @@
     "resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
         "expand-tilde": "^2.0.0",
@@ -16310,13 +16310,13 @@
     "resolve-from": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
       "dev": true
     },
     "resolve-options": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
       "dev": true,
       "requires": {
         "value-or-function": "^3.0.0"
@@ -16325,7 +16325,7 @@
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
     "resolve.exports": {
@@ -16355,13 +16355,13 @@
     "rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha512-gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w==",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
       "dev": true
     },
     "rgba-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
       "dev": true
     },
     "rimraf": {
@@ -16471,7 +16471,7 @@
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
         "ret": "~0.1.10"
@@ -16652,7 +16652,7 @@
     "semver-greatest-satisfied-range": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
       "dev": true,
       "requires": {
         "sver-compat": "^1.5.0"
@@ -16719,7 +16719,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true
     },
     "set-getter": {
@@ -16929,7 +16929,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -16938,7 +16938,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
         "source-map": {
@@ -16963,7 +16963,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
@@ -17012,7 +17012,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -17138,7 +17138,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -17159,7 +17159,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
     "sshpk": {
@@ -17214,7 +17214,7 @@
     "stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
       "dev": true
     },
     "stack-utils": {
@@ -17273,7 +17273,7 @@
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
         "define-property": "^0.2.5",
@@ -17283,7 +17283,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -17552,7 +17552,7 @@
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
@@ -17611,7 +17611,7 @@
     "style-search": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
       "dev": true
     },
     "stylehacks": {
@@ -17763,7 +17763,7 @@
         "decamelize": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "find-up": {
@@ -18204,7 +18204,7 @@
     "sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
       "dev": true,
       "requires": {
         "es6-iterator": "^2.0.1",
@@ -18214,7 +18214,7 @@
     "svg-tags": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
       "dev": true
     },
     "svgo": {
@@ -18592,7 +18592,7 @@
     "time-stamp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
       "dev": true
     },
     "timers-browserify": {
@@ -18617,7 +18617,7 @@
     "timsort": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
     "tmpl": {
@@ -18629,7 +18629,7 @@
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
       "dev": true,
       "requires": {
         "is-absolute": "^1.0.0",
@@ -18645,7 +18645,7 @@
     "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
@@ -18654,7 +18654,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -18677,7 +18677,7 @@
         "extend-shallow": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
             "assign-symbols": "^1.0.0",
@@ -18707,7 +18707,7 @@
     "to-through": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
       "dev": true,
       "requires": {
         "through2": "^2.0.3"
@@ -18829,7 +18829,7 @@
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
@@ -18892,7 +18892,7 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
     "typedarray-to-buffer": {
@@ -18935,7 +18935,7 @@
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
       "dev": true
     },
     "undeclared-identifiers": {
@@ -18978,7 +18978,7 @@
         "fast-levenshtein": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-          "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
+          "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
           "dev": true
         }
       }
@@ -18986,7 +18986,7 @@
     "undertaker-registry": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
       "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
@@ -19060,13 +19060,13 @@
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
       "dev": true
     },
     "uniqs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
       "dev": true
     },
     "unique-filename": {
@@ -19136,13 +19136,13 @@
     "unquote": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
       "dev": true
     },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
         "has-value": "^0.3.1",
@@ -19152,7 +19152,7 @@
         "has-value": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
             "get-value": "^2.0.3",
@@ -19163,7 +19163,7 @@
             "isobject": {
               "version": "2.1.0",
               "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
               "dev": true,
               "requires": {
                 "isarray": "1.0.0"
@@ -19174,7 +19174,7 @@
         "has-values": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
           "dev": true
         }
       }
@@ -19207,7 +19207,7 @@
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
     "url": {
@@ -19256,7 +19256,7 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         }
       }
@@ -19264,7 +19264,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
     "util.promisify": {
@@ -19344,7 +19344,7 @@
     "value-or-function": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
       "dev": true
     },
     "vary": {
@@ -19362,7 +19362,7 @@
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
@@ -19373,7 +19373,7 @@
         "core-util-is": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "dev": true
         }
       }
@@ -19450,7 +19450,7 @@
     "vinyl-sourcemap": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
       "dev": true,
       "requires": {
         "append-buffer": "^1.0.2",
@@ -19471,7 +19471,7 @@
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
@@ -19482,7 +19482,7 @@
     "vinyl-sourcemaps-apply": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==",
+      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
       "dev": true,
       "requires": {
         "source-map": "^0.5.1"
@@ -19591,7 +19591,7 @@
     "which-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
       "dev": true
     },
     "which-typed-array": {
@@ -19626,7 +19626,7 @@
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
         "string-width": "^1.0.1",
@@ -19636,7 +19636,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -19645,7 +19645,7 @@
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -19710,7 +19710,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
     "write-file-atomic": {
@@ -19848,7 +19848,7 @@
         "decamelize": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "find-up": {
@@ -19918,7 +19918,7 @@
         "which-module": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
         "wrap-ansi": {
diff --git a/package.json b/package.json
index 2cf76cee..480b9fe7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hmrc-frontend",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "description": "Design patterns for HMRC frontends",
   "scripts": {
     "start": "gulp dev",
@@ -42,7 +42,7 @@
   },
   "homepage": "https://github.com/hmrc/hmrc-frontend#readme",
   "dependencies": {
-    "govuk-frontend": "^5.0.0",
+    "govuk-frontend": "^5.2.0",
     "accessible-autocomplete": "^2.0.4"
   },
   "devDependencies": {
diff --git a/src/components/account-header/account-header.yaml b/src/components/account-header/account-header.yaml
index 000fc187..b8f26f79 100644
--- a/src/components/account-header/account-header.yaml
+++ b/src/components/account-header/account-header.yaml
@@ -216,3 +216,30 @@ examples:
         beforeTakingScreenshot:
           - click: ".hmrc-account-menu__link[aria-expanded='false']"
           - focus: ".hmrc-account-menu__link[href='/messages/href']"
+
+- name: all-available-options-with-tudor-crown
+  data:
+    hmrcAccountHeader:
+      serviceName: 'My Service'
+      displayHmrcBanner: true
+      accountHome:
+        href: '/account/home'
+        active: true
+      messages:
+        href: '/messages/href'
+        messageCount: '30'
+      checkProgress:
+        href: '/checkProgress'
+      signOut:
+        href: '?signOut=true'
+      language: 'en'
+      languageToggle:
+        en:
+          href: '/components/account-header/with-service-name/preview'
+        cy:
+          href: '/components/account-header/welsh-with-service-name/preview'
+      homepageUrl: '/the-homepage'
+      serviceUrl: '/the-service'
+      containerClasses: 'the-header-container-classes govuk-width-container'
+      classes: 'the-header-classes'
+      useTudorCrown: true
diff --git a/src/components/banner/banner.yaml b/src/components/banner/banner.yaml
index ac67c2b9..01f6886b 100644
--- a/src/components/banner/banner.yaml
+++ b/src/components/banner/banner.yaml
@@ -7,6 +7,10 @@ params:
   type: string
   required: false
   description: The public path for the assets folder. If not provided it defaults to /assets
+- name: useTudorCrown
+  type: boolean
+  required: false
+  description: A feature flag to use the new Tudor Crown logo. If unset, defaults to true
 previewLayout: full-width
 
 examples:
@@ -18,3 +22,8 @@ examples:
   description: The standard welsh banner
   data:
     language: cy
+- name: with-st-edwards-crown
+  description: The standard banner with the old HMRC Crest
+  data:
+    language: en
+    useTudorCrown: false
diff --git a/src/components/banner/images/hmrc_tudor_crest_18px.png b/src/components/banner/images/hmrc_tudor_crest_18px.png
new file mode 100644
index 00000000..8bdb0ec9
Binary files /dev/null and b/src/components/banner/images/hmrc_tudor_crest_18px.png differ
diff --git a/src/components/banner/template.njk b/src/components/banner/template.njk
index df08c42c..344a1c28 100644
--- a/src/components/banner/template.njk
+++ b/src/components/banner/template.njk
@@ -1,18 +1,33 @@
 <div class="hmrc-banner">
   <div class="hmrc-organisation-logo">
-    <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="26px" height="26px" viewBox="0 0 134.94 134.94" focusable="false" aria-hidden="true">
-      <path d="M104.32,73.72,101,73.29c.94-2,1.51-3.22,1.51-3.22,0-.38,1.11-2.22,1.53-3.73a19.94,19.94,0,0,0,.61-3.89,15.05,15.05,0,0,0-3.68-10.06,12.21,12.21,0,0,0-9.18-4.18,17.46,17.46,0,0,0-3.68.44c-2.09.52-3.08.81-4.93,1.29a51.13,51.13,0,0,0-8.85,3.61,1.37,1.37,0,0,0-.73.91,2,2,0,0,0-.07.53L73.31,71.6H70.53V53.46a4.05,4.05,0,0,1,.18-1.14,3.37,3.37,0,0,1,1.43-1.71c.6-.39,1.21-.75,1.82-1.08a2.49,2.49,0,1,1,3.87-2.07c0,.12,0,.25,0,.37l.16-.06c.55-.19,1.16-.37,1.75-.55a2.49,2.49,0,1,1,3.71-2.16,2.66,2.66,0,0,1-.3,1.16l2.06-.56.36-.08a2.49,2.49,0,1,1,3.87-2.07A2.42,2.42,0,0,1,89,44.82h.06a16.43,16.43,0,0,1,2.72-.18,2.45,2.45,0,0,1-.48-1.45,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-.89,1.89A16.46,16.46,0,0,1,98.1,46a2.41,2.41,0,0,1-.12-.72,2.5,2.5,0,1,1,3,2.44,16.7,16.7,0,0,1,2.12,1.91v-.08a2.49,2.49,0,1,1,2.49,2.49,2.15,2.15,0,0,1-.68-.11,18.34,18.34,0,0,1,1.25,2.26,2.49,2.49,0,0,1,4.55,1.4,2.5,2.5,0,0,1-2.49,2.5,2.64,2.64,0,0,1-.8-.15,20.9,20.9,0,0,1,.35,2.1,2.52,2.52,0,0,1,1-.19,2.49,2.49,0,1,1,0,5,2.59,2.59,0,0,1-1.07-.25c0,.26-.08.54-.11.82s-.14.55-.21.78a2.49,2.49,0,0,1-.32,5,2.39,2.39,0,0,1-1.39-.43c-.34.8-.78,1.83-1.27,3" />
-      <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
-      <path d="M67.47,66a2.28,2.28,0,1,0,0-4.56h0a2.28,2.28,0,0,0,0,4.56Z" />
-      <path d="M67.45,60.39a2.18,2.18,0,0,1,0-4.35h0a2.18,2.18,0,0,1,0,4.35Z" />
-      <path d="M67.47,50.17a2,2,0,0,0,0-4.09h0a2,2,0,1,0,0,4.09Z" />
-      <path d="M67.45,55.13a2.08,2.08,0,0,1,0-4.15h0a2.08,2.08,0,0,1,0,4.15Z" />
-      <path d="M74.67,22.23a.47.47,0,0,0-.46-.34.49.49,0,0,0-.49.34c-.47,1.83-1.41,3.55-5,3.86A6.43,6.43,0,0,1,70,22.5,5.37,5.37,0,0,1,73,21a.45.45,0,0,0,.3-.13.42.42,0,0,0,.1-.33.44.44,0,0,0-.14-.33.44.44,0,0,0-.29-.1H62a.44.44,0,0,0-.29.1.41.41,0,0,0-.14.33.46.46,0,0,0,.1.33A.47.47,0,0,0,62,21a5.37,5.37,0,0,1,3,1.51,6.43,6.43,0,0,1,1.28,3.59c-3.59-.31-4.53-2-5-3.86a.5.5,0,0,0-.49-.34.47.47,0,0,0-.46.34v10a.45.45,0,0,0,.51.42.46.46,0,0,0,.49-.29l0-.05a6.1,6.1,0,0,1,5-3.77,6.37,6.37,0,0,1-1.31,3.73A5.13,5.13,0,0,1,62,33.78h0a.64.64,0,0,0-.26.13.49.49,0,0,0-.1.35.37.37,0,0,0,.14.31.6.6,0,0,0,.32.12H72.89a.6.6,0,0,0,.32-.12.39.39,0,0,0,.14-.31.44.44,0,0,0-.1-.35.64.64,0,0,0-.26-.13h0A5.1,5.1,0,0,1,70,32.29a6.37,6.37,0,0,1-1.31-3.73,6.1,6.1,0,0,1,5,3.77v.05a.49.49,0,0,0,.5.29.45.45,0,0,0,.51-.42v-10Z" />
-      <path d="M67.47,45.72a5.29,5.29,0,1,0,0-10.57h0a5.29,5.29,0,1,0,0,10.57Z" />
-      <path d="M29.33,70.72a2.39,2.39,0,0,1-1.39.43,2.49,2.49,0,0,1-.32-5c-.07-.23-.13-.49-.21-.78s-.08-.56-.12-.82a2.51,2.51,0,0,1-1.07.25,2.49,2.49,0,0,1,0-5,2.35,2.35,0,0,1,1,.19c.08-.72.2-1.41.34-2.1a2.31,2.31,0,0,1-.79.15,2.5,2.5,0,1,1,2.06-3.9A18.34,18.34,0,0,1,30,51.94a2.15,2.15,0,0,1-.68.11,2.49,2.49,0,1,1,2.49-2.49v.08A16.12,16.12,0,0,1,34,47.73a2.49,2.49,0,1,1,3-2.43,2.23,2.23,0,0,1-.13.72,14.4,14.4,0,0,1,2.7-.94,2.49,2.49,0,1,1,4.09-1.9,2.45,2.45,0,0,1-.48,1.45,16.43,16.43,0,0,1,2.72.18h0a2.53,2.53,0,0,1-.37-1.31,2.49,2.49,0,1,1,3.87,2.07l.36.09,2.06.55a2.53,2.53,0,0,1-.3-1.16,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-1.27,2.15c.59.19,1.2.37,1.76.56l.15.06c0-.12,0-.25,0-.37A2.5,2.5,0,1,1,61,49.53c.61.33,1.22.69,1.82,1.08a3.37,3.37,0,0,1,1.43,1.71,3.66,3.66,0,0,1,.18,1.14V71.6H61.6L61.42,55a1.56,1.56,0,0,0-.07-.53,1.4,1.4,0,0,0-.73-.91,51.17,51.17,0,0,0-8.86-3.61c-1.84-.48-2.84-.77-4.93-1.29a17.33,17.33,0,0,0-3.67-.44A12.21,12.21,0,0,0,34,52.39,15.05,15.05,0,0,0,30.3,62.45a19.75,19.75,0,0,0,.61,3.88c.42,1.52,1.48,3.36,1.53,3.74,0,0,.57,1.18,1.51,3.22l-3.35.43c-.49-1.17-.93-2.2-1.27-3" />
-      <path d="M91.11,94.65A1.45,1.45,0,0,1,89.58,96l-7.89-.42a1.47,1.47,0,0,1-1.39-1.53L80.37,93a1.44,1.44,0,0,1,1.53-1.38l7.89.42a1.45,1.45,0,0,1,1.39,1.52Zm-20.47-1-2.81,2.81a.57.57,0,0,1-.36.16h0a.57.57,0,0,1-.36-.16l-2.82-2.81a.56.56,0,0,1,0-.81L67.09,90a.57.57,0,0,1,.36-.16h0a.57.57,0,0,1,.36.16l2.81,2.81a.55.55,0,0,1,0,.81m-17.41,2L45.34,96a1.45,1.45,0,0,1-1.53-1.37l-.07-1.13A1.46,1.46,0,0,1,45.13,92L53,91.58A1.45,1.45,0,0,1,54.55,93l.07,1.11a1.47,1.47,0,0,1-1.39,1.53m53.32-19.89a1.65,1.65,0,0,0-1.14-.66L100,74.32a.43.43,0,0,0-.43.39.45.45,0,0,0,.28.54h0a7,7,0,0,1,4,6.41c-3.92-.81-4.9-2.82-5.15-5.6,0-.12-.11-.33-.44-.36a.46.46,0,0,0-.49.25v0L96.24,88v0a.48.48,0,0,0,.91.16A7,7,0,0,1,103.5,84a8,8,0,0,1-5.59,5.74h0c-2-.22-4.09-.41-6.18-.59a5.1,5.1,0,0,1-4-4.14,3.86,3.86,0,0,1,.21-1c.51-1.36,1.49-2.25,2.58-1.85s1.26,1.72.76,3.07a3.58,3.58,0,0,1-.89,1.37A3.58,3.58,0,0,0,93.51,85c1.39-2,1.23-5-.94-6.27-1.42-.83-3.38.13-4.87,2,.45-2.93,2.23-5.52,2.43-7.78.29-3.19-.94-6.74-2.69-7.71-1.82.67-3.48,4-3.64,7.13-.1,2.27,1.43,5.26,1.51,8.25-1.23-2.13-3.1-3.4-4.63-2.76-2.32.94-2.91,3.94-1.8,6.09a3.67,3.67,0,0,0,2.85,2,3.45,3.45,0,0,1-.7-1.48c-.31-1.42,0-2.67,1.17-2.94s2,.76,2.3,2.18a3.64,3.64,0,0,1,0,1.31h0C83.65,87.2,82,87.94,80,88.44q-3.09-.14-6.23-.2h0l-.22,0c-2.94-.48-4.43-2.35-4.73-5.87a6.85,6.85,0,0,1,5.53,4.22.56.56,0,0,0,.55.35.48.48,0,0,0,.54-.44V75.35a.51.51,0,0,0-.5-.36.56.56,0,0,0-.51.33h0v0c-.52,2-1.58,4-5.61,4.3.33-3.93,2.12-5.13,4.74-5.7a.43.43,0,0,0,.3-.14.48.48,0,0,0,.13-.32v0a.52.52,0,0,0-.16-.35.5.5,0,0,0-.3-.11H61.41a.5.5,0,0,0-.3.11.57.57,0,0,0-.17.35v0a.48.48,0,0,0,.13.32.46.46,0,0,0,.31.14c2.61.57,4.41,1.77,4.74,5.7-4-.33-5.1-2.26-5.61-4.3v0h0A.56.56,0,0,0,60,75a.5.5,0,0,0-.5.36v11.1a.48.48,0,0,0,.54.44.53.53,0,0,0,.54-.35,6.87,6.87,0,0,1,5.54-4.22c-.3,3.52-1.79,5.39-4.73,5.87l-.23,0h0c-2.08,0-4.16.11-6.22.2-2-.5-3.66-1.24-4.56-3.37h0a3.43,3.43,0,0,1,.05-1.31c.31-1.42,1.16-2.42,2.3-2.18s1.47,1.52,1.17,2.94A3.69,3.69,0,0,1,53.2,86,3.67,3.67,0,0,0,56,84c1.1-2.15.52-5.15-1.8-6.09-1.54-.64-3.41.63-4.63,2.76.08-3,1.61-6,1.51-8.25-.16-3.18-1.82-6.46-3.64-7.13-1.75,1-3,4.52-2.69,7.71.2,2.26,2,4.85,2.43,7.78-1.49-1.86-3.46-2.82-4.87-2C40.18,80,40,83.07,41.41,85a3.58,3.58,0,0,0,3.08,1.63,3.58,3.58,0,0,1-.89-1.37c-.51-1.35-.39-2.64.76-3.07s2.07.49,2.58,1.85a3.86,3.86,0,0,1,.21,1,5.11,5.11,0,0,1-4,4.14c-2.07.18-4.13.37-6.17.59h0A8,8,0,0,1,31.42,84a7,7,0,0,1,6.35,4.12.45.45,0,0,0,.53.27.45.45,0,0,0,.38-.43v0L37.19,76v0a.47.47,0,0,0-.5-.25c-.32,0-.44.24-.44.36C36,78.83,35,80.84,31.1,81.65a7,7,0,0,1,4-6.41h0a.45.45,0,0,0,.28-.54.43.43,0,0,0-.43-.39l-5.46.73a1.65,1.65,0,0,0-1.14.66,1.84,1.84,0,0,0-.26,1.44c.14.81,1.79,12.39,1.94,13.45,0,.1.15,1.18.19,1.5a1.36,1.36,0,0,0,.48.67s2.42,1.64,2.84,2a.74.74,0,0,1,.18.86l-2.15,3.14a2,2,0,0,0-.26.42,1.19,1.19,0,0,0,.39,1.34H103.2a1.19,1.19,0,0,0,.39-1.34,2,2,0,0,0-.26-.42l-2.15-3.14a.75.75,0,0,1,.17-.86c.43-.33,2.85-2,2.85-2a1.36,1.36,0,0,0,.48-.67c0-.32.17-1.4.18-1.5.16-1.06,1.81-12.64,2-13.45a1.84,1.84,0,0,0-.26-1.44" />
-      <path d="M67.47,7.72a59.76,59.76,0,1,0,59.75,59.75A59.75,59.75,0,0,0,67.47,7.72m67.47,59.75A67.47,67.47,0,1,1,67.47,0a67.47,67.47,0,0,1,67.47,67.47" />
-    </svg>
+    {% if params.useTudorCrown | default(true) %}
+      <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="26px" height="26px" viewBox="0 0 45.35 45.35" focusable="false" aria-hidden="true">
+        <path class="cls-1" d="m28.5,16.6c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
+        <path class="cls-1" d="m22.06,19.36c-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9Z"/>
+        <path class="cls-1" d="m32.86,19.2c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
+        <path class="cls-1" d="m33.62,22.63c.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14Z"/>
+        <path class="cls-1" d="m21.81,11.4c.06.08.13.15.21.21l-1.19,3.58s0,0,0,.01h0s0,0,0,0c-.06.18-.09.37-.09.56,0,.97.71,1.77,1.64,1.9.01,0,.03,0,.04,0,.08.01.16.02.24.02h0c.08,0,.16,0,.24-.02.01,0,.03,0,.04,0,.93-.14,1.64-.94,1.64-1.9,0-.2-.03-.39-.08-.56h0s0,0,0,0c0,0,0,0,0-.01l-1.19-3.58c.08-.06.15-.13.21-.21h0s2.06,1.08,2.06,1.08v-3.04l-2.06.65h0c-.06-.08-.12-.15-.2-.21h0s.83-2.62.83-2.62h-1.49s-1.49,0-1.49,0l.83,2.61h0c-.08.06-.14.13-.2.21h0s-2.06-.65-2.06-.65v3.04l2.06-1.08h0Z"/>
+        <path class="cls-1" d="m16.83,16.6c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+        <path class="cls-1" d="m12.46,19.2c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+        <path class="cls-1" d="m9.57,23.51c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+        <path class="cls-1" d="m34.61,25.35c.22,1.12.26,1.65,0,2.37-.37-.36-.71-1.01-.98-2.02l-1.07,3.57c.65-.45,1.16-.74,1.73-.75-1.02,2.2-2.3,2.77-3.12,2.61-1.01-.19-1.47-1.09-1.32-1.85.23-1.08,1.34-1.36,1.86-.11.99-2.02-.69-2.65-1.77-2.05,1.66-1.66,1.85-3.13.51-4.92-1.87,1.43-1.89,2.84-1.05,4.84-1.09-1.25-2.79-.58-2.18,1.44.79-1.22,1.83-.45,1.67.71-.14,1.01-1.47,1.82-3.13,1.68-2.38-.22-2.52-1.86-2.58-3.21.58-.11,1.64.43,2.53,1.69l.33-3.79c-.98,1.02-1.86,1.21-2.85,1.24.33-1.02,1.84-2.7,1.84-2.7h-4.73s1.51,1.68,1.84,2.7c-.99-.03-1.87-.22-2.85-1.24l.33,3.79c.9-1.26,1.95-1.8,2.53-1.69-.06,1.36-.2,3-2.58,3.21-1.66.14-2.99-.67-3.13-1.68-.16-1.16.88-1.92,1.67-.71.61-2.02-1.09-2.69-2.18-1.44.84-1.99.82-3.41-1.05-4.84-1.34,1.78-1.15,3.26.51,4.92-1.08-.6-2.76.03-1.77,2.05.52-1.26,1.63-.98,1.86.11.16.76-.31,1.66-1.32,1.85-.83.15-2.1-.41-3.12-2.61.58.01,1.08.3,1.73.75l-1.07-3.57c-.27,1-.62,1.66-.98,2.02-.25-.72-.21-1.25,0-2.37l-2.21.79c1.18,1.6,2.31,3.86,3.25,7.79,3.29-.47,6.99-.74,10.9-.74s7.61.26,10.9.74c.94-3.93,2.07-6.19,3.25-7.79l-2.21-.79Z"/>
+        <path class="cls-1" d="m22.68.57C10.47.57.57,10.47.57,22.68s9.9,22.11,22.11,22.11,22.11-9.9,22.11-22.11S34.89.57,22.68.57Zm0,41.69c-10.81,0-19.58-8.77-19.58-19.58S11.86,3.1,22.68,3.1s19.58,8.77,19.58,19.58-8.77,19.58-19.58,19.58Z"/>
+      </svg>
+    {% else %}
+      <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="26px" height="26px" viewBox="0 0 134.94 134.94" focusable="false" aria-hidden="true">
+        <path d="M104.32,73.72,101,73.29c.94-2,1.51-3.22,1.51-3.22,0-.38,1.11-2.22,1.53-3.73a19.94,19.94,0,0,0,.61-3.89,15.05,15.05,0,0,0-3.68-10.06,12.21,12.21,0,0,0-9.18-4.18,17.46,17.46,0,0,0-3.68.44c-2.09.52-3.08.81-4.93,1.29a51.13,51.13,0,0,0-8.85,3.61,1.37,1.37,0,0,0-.73.91,2,2,0,0,0-.07.53L73.31,71.6H70.53V53.46a4.05,4.05,0,0,1,.18-1.14,3.37,3.37,0,0,1,1.43-1.71c.6-.39,1.21-.75,1.82-1.08a2.49,2.49,0,1,1,3.87-2.07c0,.12,0,.25,0,.37l.16-.06c.55-.19,1.16-.37,1.75-.55a2.49,2.49,0,1,1,3.71-2.16,2.66,2.66,0,0,1-.3,1.16l2.06-.56.36-.08a2.49,2.49,0,1,1,3.87-2.07A2.42,2.42,0,0,1,89,44.82h.06a16.43,16.43,0,0,1,2.72-.18,2.45,2.45,0,0,1-.48-1.45,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-.89,1.89A16.46,16.46,0,0,1,98.1,46a2.41,2.41,0,0,1-.12-.72,2.5,2.5,0,1,1,3,2.44,16.7,16.7,0,0,1,2.12,1.91v-.08a2.49,2.49,0,1,1,2.49,2.49,2.15,2.15,0,0,1-.68-.11,18.34,18.34,0,0,1,1.25,2.26,2.49,2.49,0,0,1,4.55,1.4,2.5,2.5,0,0,1-2.49,2.5,2.64,2.64,0,0,1-.8-.15,20.9,20.9,0,0,1,.35,2.1,2.52,2.52,0,0,1,1-.19,2.49,2.49,0,1,1,0,5,2.59,2.59,0,0,1-1.07-.25c0,.26-.08.54-.11.82s-.14.55-.21.78a2.49,2.49,0,0,1-.32,5,2.39,2.39,0,0,1-1.39-.43c-.34.8-.78,1.83-1.27,3" />
+        <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
+        <path d="M67.47,66a2.28,2.28,0,1,0,0-4.56h0a2.28,2.28,0,0,0,0,4.56Z" />
+        <path d="M67.45,60.39a2.18,2.18,0,0,1,0-4.35h0a2.18,2.18,0,0,1,0,4.35Z" />
+        <path d="M67.47,50.17a2,2,0,0,0,0-4.09h0a2,2,0,1,0,0,4.09Z" />
+        <path d="M67.45,55.13a2.08,2.08,0,0,1,0-4.15h0a2.08,2.08,0,0,1,0,4.15Z" />
+        <path d="M74.67,22.23a.47.47,0,0,0-.46-.34.49.49,0,0,0-.49.34c-.47,1.83-1.41,3.55-5,3.86A6.43,6.43,0,0,1,70,22.5,5.37,5.37,0,0,1,73,21a.45.45,0,0,0,.3-.13.42.42,0,0,0,.1-.33.44.44,0,0,0-.14-.33.44.44,0,0,0-.29-.1H62a.44.44,0,0,0-.29.1.41.41,0,0,0-.14.33.46.46,0,0,0,.1.33A.47.47,0,0,0,62,21a5.37,5.37,0,0,1,3,1.51,6.43,6.43,0,0,1,1.28,3.59c-3.59-.31-4.53-2-5-3.86a.5.5,0,0,0-.49-.34.47.47,0,0,0-.46.34v10a.45.45,0,0,0,.51.42.46.46,0,0,0,.49-.29l0-.05a6.1,6.1,0,0,1,5-3.77,6.37,6.37,0,0,1-1.31,3.73A5.13,5.13,0,0,1,62,33.78h0a.64.64,0,0,0-.26.13.49.49,0,0,0-.1.35.37.37,0,0,0,.14.31.6.6,0,0,0,.32.12H72.89a.6.6,0,0,0,.32-.12.39.39,0,0,0,.14-.31.44.44,0,0,0-.1-.35.64.64,0,0,0-.26-.13h0A5.1,5.1,0,0,1,70,32.29a6.37,6.37,0,0,1-1.31-3.73,6.1,6.1,0,0,1,5,3.77v.05a.49.49,0,0,0,.5.29.45.45,0,0,0,.51-.42v-10Z" />
+        <path d="M67.47,45.72a5.29,5.29,0,1,0,0-10.57h0a5.29,5.29,0,1,0,0,10.57Z" />
+        <path d="M29.33,70.72a2.39,2.39,0,0,1-1.39.43,2.49,2.49,0,0,1-.32-5c-.07-.23-.13-.49-.21-.78s-.08-.56-.12-.82a2.51,2.51,0,0,1-1.07.25,2.49,2.49,0,0,1,0-5,2.35,2.35,0,0,1,1,.19c.08-.72.2-1.41.34-2.1a2.31,2.31,0,0,1-.79.15,2.5,2.5,0,1,1,2.06-3.9A18.34,18.34,0,0,1,30,51.94a2.15,2.15,0,0,1-.68.11,2.49,2.49,0,1,1,2.49-2.49v.08A16.12,16.12,0,0,1,34,47.73a2.49,2.49,0,1,1,3-2.43,2.23,2.23,0,0,1-.13.72,14.4,14.4,0,0,1,2.7-.94,2.49,2.49,0,1,1,4.09-1.9,2.45,2.45,0,0,1-.48,1.45,16.43,16.43,0,0,1,2.72.18h0a2.53,2.53,0,0,1-.37-1.31,2.49,2.49,0,1,1,3.87,2.07l.36.09,2.06.55a2.53,2.53,0,0,1-.3-1.16,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-1.27,2.15c.59.19,1.2.37,1.76.56l.15.06c0-.12,0-.25,0-.37A2.5,2.5,0,1,1,61,49.53c.61.33,1.22.69,1.82,1.08a3.37,3.37,0,0,1,1.43,1.71,3.66,3.66,0,0,1,.18,1.14V71.6H61.6L61.42,55a1.56,1.56,0,0,0-.07-.53,1.4,1.4,0,0,0-.73-.91,51.17,51.17,0,0,0-8.86-3.61c-1.84-.48-2.84-.77-4.93-1.29a17.33,17.33,0,0,0-3.67-.44A12.21,12.21,0,0,0,34,52.39,15.05,15.05,0,0,0,30.3,62.45a19.75,19.75,0,0,0,.61,3.88c.42,1.52,1.48,3.36,1.53,3.74,0,0,.57,1.18,1.51,3.22l-3.35.43c-.49-1.17-.93-2.2-1.27-3" />
+        <path d="M91.11,94.65A1.45,1.45,0,0,1,89.58,96l-7.89-.42a1.47,1.47,0,0,1-1.39-1.53L80.37,93a1.44,1.44,0,0,1,1.53-1.38l7.89.42a1.45,1.45,0,0,1,1.39,1.52Zm-20.47-1-2.81,2.81a.57.57,0,0,1-.36.16h0a.57.57,0,0,1-.36-.16l-2.82-2.81a.56.56,0,0,1,0-.81L67.09,90a.57.57,0,0,1,.36-.16h0a.57.57,0,0,1,.36.16l2.81,2.81a.55.55,0,0,1,0,.81m-17.41,2L45.34,96a1.45,1.45,0,0,1-1.53-1.37l-.07-1.13A1.46,1.46,0,0,1,45.13,92L53,91.58A1.45,1.45,0,0,1,54.55,93l.07,1.11a1.47,1.47,0,0,1-1.39,1.53m53.32-19.89a1.65,1.65,0,0,0-1.14-.66L100,74.32a.43.43,0,0,0-.43.39.45.45,0,0,0,.28.54h0a7,7,0,0,1,4,6.41c-3.92-.81-4.9-2.82-5.15-5.6,0-.12-.11-.33-.44-.36a.46.46,0,0,0-.49.25v0L96.24,88v0a.48.48,0,0,0,.91.16A7,7,0,0,1,103.5,84a8,8,0,0,1-5.59,5.74h0c-2-.22-4.09-.41-6.18-.59a5.1,5.1,0,0,1-4-4.14,3.86,3.86,0,0,1,.21-1c.51-1.36,1.49-2.25,2.58-1.85s1.26,1.72.76,3.07a3.58,3.58,0,0,1-.89,1.37A3.58,3.58,0,0,0,93.51,85c1.39-2,1.23-5-.94-6.27-1.42-.83-3.38.13-4.87,2,.45-2.93,2.23-5.52,2.43-7.78.29-3.19-.94-6.74-2.69-7.71-1.82.67-3.48,4-3.64,7.13-.1,2.27,1.43,5.26,1.51,8.25-1.23-2.13-3.1-3.4-4.63-2.76-2.32.94-2.91,3.94-1.8,6.09a3.67,3.67,0,0,0,2.85,2,3.45,3.45,0,0,1-.7-1.48c-.31-1.42,0-2.67,1.17-2.94s2,.76,2.3,2.18a3.64,3.64,0,0,1,0,1.31h0C83.65,87.2,82,87.94,80,88.44q-3.09-.14-6.23-.2h0l-.22,0c-2.94-.48-4.43-2.35-4.73-5.87a6.85,6.85,0,0,1,5.53,4.22.56.56,0,0,0,.55.35.48.48,0,0,0,.54-.44V75.35a.51.51,0,0,0-.5-.36.56.56,0,0,0-.51.33h0v0c-.52,2-1.58,4-5.61,4.3.33-3.93,2.12-5.13,4.74-5.7a.43.43,0,0,0,.3-.14.48.48,0,0,0,.13-.32v0a.52.52,0,0,0-.16-.35.5.5,0,0,0-.3-.11H61.41a.5.5,0,0,0-.3.11.57.57,0,0,0-.17.35v0a.48.48,0,0,0,.13.32.46.46,0,0,0,.31.14c2.61.57,4.41,1.77,4.74,5.7-4-.33-5.1-2.26-5.61-4.3v0h0A.56.56,0,0,0,60,75a.5.5,0,0,0-.5.36v11.1a.48.48,0,0,0,.54.44.53.53,0,0,0,.54-.35,6.87,6.87,0,0,1,5.54-4.22c-.3,3.52-1.79,5.39-4.73,5.87l-.23,0h0c-2.08,0-4.16.11-6.22.2-2-.5-3.66-1.24-4.56-3.37h0a3.43,3.43,0,0,1,.05-1.31c.31-1.42,1.16-2.42,2.3-2.18s1.47,1.52,1.17,2.94A3.69,3.69,0,0,1,53.2,86,3.67,3.67,0,0,0,56,84c1.1-2.15.52-5.15-1.8-6.09-1.54-.64-3.41.63-4.63,2.76.08-3,1.61-6,1.51-8.25-.16-3.18-1.82-6.46-3.64-7.13-1.75,1-3,4.52-2.69,7.71.2,2.26,2,4.85,2.43,7.78-1.49-1.86-3.46-2.82-4.87-2C40.18,80,40,83.07,41.41,85a3.58,3.58,0,0,0,3.08,1.63,3.58,3.58,0,0,1-.89-1.37c-.51-1.35-.39-2.64.76-3.07s2.07.49,2.58,1.85a3.86,3.86,0,0,1,.21,1,5.11,5.11,0,0,1-4,4.14c-2.07.18-4.13.37-6.17.59h0A8,8,0,0,1,31.42,84a7,7,0,0,1,6.35,4.12.45.45,0,0,0,.53.27.45.45,0,0,0,.38-.43v0L37.19,76v0a.47.47,0,0,0-.5-.25c-.32,0-.44.24-.44.36C36,78.83,35,80.84,31.1,81.65a7,7,0,0,1,4-6.41h0a.45.45,0,0,0,.28-.54.43.43,0,0,0-.43-.39l-5.46.73a1.65,1.65,0,0,0-1.14.66,1.84,1.84,0,0,0-.26,1.44c.14.81,1.79,12.39,1.94,13.45,0,.1.15,1.18.19,1.5a1.36,1.36,0,0,0,.48.67s2.42,1.64,2.84,2a.74.74,0,0,1,.18.86l-2.15,3.14a2,2,0,0,0-.26.42,1.19,1.19,0,0,0,.39,1.34H103.2a1.19,1.19,0,0,0,.39-1.34,2,2,0,0,0-.26-.42l-2.15-3.14a.75.75,0,0,1,.17-.86c.43-.33,2.85-2,2.85-2a1.36,1.36,0,0,0,.48-.67c0-.32.17-1.4.18-1.5.16-1.06,1.81-12.64,2-13.45a1.84,1.84,0,0,0-.26-1.44" />
+        <path d="M67.47,7.72a59.76,59.76,0,1,0,59.75,59.75A59.75,59.75,0,0,0,67.47,7.72m67.47,59.75A67.47,67.47,0,1,1,67.47,0a67.47,67.47,0,0,1,67.47,67.47" />
+      </svg>
+    {% endif %}
     <p class="govuk-body-s">{% if params.language == 'cy' %}
         Cyllid a Thollau EF
       {% else %}
diff --git a/src/components/banner/template.test.js b/src/components/banner/template.test.js
index 04b3295a..ecbbba2e 100644
--- a/src/components/banner/template.test.js
+++ b/src/components/banner/template.test.js
@@ -27,5 +27,13 @@ describe('Internal Header', () => {
       const $ = render('banner', examples.welsh);
       expect($('.hmrc-banner > .hmrc-organisation-logo > p.govuk-body-s').text().trim()).toEqual('Cyllid a Thollau EF');
     });
+    it('should have Tudor Crown logo by default', () => {
+      const $ = render('banner', examples.default);
+      expect($('.hmrc-banner > .hmrc-organisation-logo > svg').html().trim()).toContain('<path class="cls-1" d="m28.5,16.6c');
+    });
+    it('should have St Edwards Crown logo when specified', () => {
+      const $ = render('banner', examples['with-st-edwards-crown']);
+      expect($('.hmrc-banner > .hmrc-organisation-logo > svg').html().trim()).toContain('<path d="M104.32,73.72,101,73.29c');
+    });
   });
 });
diff --git a/src/components/character-count/character-count.yaml b/src/components/character-count/character-count.yaml
index bb0ef9c8..0e0927ee 100644
--- a/src/components/character-count/character-count.yaml
+++ b/src/components/character-count/character-count.yaml
@@ -51,6 +51,36 @@ params:
       type: string
       required: false
       description: Classes to add to the form group (e.g. to show error state for the whole group)
+    - name: attributes
+      type: object
+      required: false
+      description: HTML attributes (for example data attributes) to add to the form group.
+    - name: beforeInput
+      type: object
+      required: false
+      description: Content to add before the textarea used by the character count component.
+      params:
+        - name: text
+          type: string
+          required: true
+          description: Text to add before the textarea. If `html` is provided, the `text` option will be ignored.
+        - name: html
+          type: string
+          required: true
+          description: HTML to add before the textarea. If `html` is provided, the `text` option will be ignored.
+    - name: afterInput
+      type: object
+      required: false
+      description: Content to add after the textarea used by the character count component.
+      params:
+        - name: text
+          type: string
+          required: true
+          description: Text to add after the textarea. If `html` is provided, the `text` option will be ignored.
+        - name: html
+          type: string
+          required: true
+          description: HTML to add after the textarea. If `html` is provided, the `text` option will be ignored.
   - name: classes
     type: string
     required: false
diff --git a/src/components/footer/footer.yaml b/src/components/footer/footer.yaml
index 120b6349..49dc68a0 100644
--- a/src/components/footer/footer.yaml
+++ b/src/components/footer/footer.yaml
@@ -372,3 +372,25 @@ examples:
 - name: welsh language
   data:
     language: cy
+- name: with params common to govuk footer
+  data:
+    classes: app-footer--custom-modifier
+    containerClasses: app-width-container
+    attributes:
+      data-test-attribute: value
+      data-test-attribute-2: value-2
+    meta:
+      html: GOV.UK Prototype Kit <strong>v7.0.1</strong>
+      items:
+        - href: '#1'
+          text: meta item 1
+          attributes:
+            data-attribute: my-attribute
+            data-attribute-2: my-attribute-2
+    navigation:
+      - items:
+          - href: '#1'
+            text: Navigation item 1
+            attributes:
+              data-attribute: my-attribute
+              data-attribute-2: my-attribute-2
diff --git a/src/components/footer/template.njk b/src/components/footer/template.njk
index 7ed9aea2..c445e66d 100644
--- a/src/components/footer/template.njk
+++ b/src/components/footer/template.njk
@@ -1,89 +1,35 @@
-<footer class="govuk-footer {{ params.classes if params.classes }}" role="contentinfo"
-        {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
-  <div class="govuk-width-container {{ params.containerClasses if params.containerClasses }}">
-    {% if params.navigation | length %}
-      <div class="govuk-footer__navigation">
-        {% for nav in params.navigation %}
-          <div class="govuk-footer__section govuk-grid-column-{{ nav.width | default('full') }}">
-            <h2 class="govuk-footer__heading govuk-heading-m">{{ nav.title }}</h2>
-            {% if nav.items | length %}
-              {% set listClasses %}
-                {% if nav.columns %}
-                  govuk-footer__list--columns-{{ nav.columns }}
-                {% endif %}
-              {% endset %}
-              <ul class="govuk-footer__list {{ listClasses | trim }}">
-                {% for item in nav.items %}
-                  {% if item.href and item.text %}
-                    <li class="govuk-footer__list-item">
-                      <a class="govuk-footer__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
-                        {{ item.text }}
-                      </a>
-                    </li>
-                  {% endif %}
-                {% endfor %}
-              </ul>
-            {% endif %}
-          </div>
-        {% endfor %}
-      </div>
-      <hr class="govuk-footer__section-break">
-    {% endif %}
-    <div class="govuk-footer__meta">
-      <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
-        {% if params.meta %}
-          {% set supportLinksDefaultText %}{% if params.language == "cy" %}Cysylltiadau cymorth{% else %}Support links{% endif %}{% endset %}
-          <h2 class="govuk-visually-hidden">{{ params.meta.visuallyHiddenTitle | default(supportLinksDefaultText) }}</h2>
-          {% if params.meta.items | length %}
-            <ul class="govuk-footer__inline-list">
-              {% for item in params.meta.items %}
-                <li class="govuk-footer__inline-list-item">
-                  <a class="govuk-footer__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
-                    {{ item.text }}
-                  </a>
-                </li>
-              {% endfor %}
-            </ul>
-          {% endif %}
-          {% if params.meta.text or params.meta.html %}
-            <div class="govuk-footer__meta-custom">
-              {{ params.meta.html | safe if params.meta.html else params.meta.text }}
-            </div>
-          {% endif %}
-        {% endif %}
-        {#- The SVG needs `focusable="false"` so that Internet Explorer does not
-        treat it as an interactive element - without this it will be
-        'focusable' when using the keyboard to navigate. #}
-        <svg
-          aria-hidden="true"
-          focusable="false"
-          class="govuk-footer__licence-logo"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 483.2 195.7"
-          height="17"
-          width="41"
-        >
-          <path
-            fill="currentColor"
-            d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145"
-          />
-        </svg>
-        <span class="govuk-footer__licence-description">
-          {% if(params.language == 'cy') %}Mae‘r holl gynnwys ar gael o dan {% else %}All content is available under the {% endif %}
-          <a
-            class="govuk-footer__link"
-            href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
-            rel="license"
-          >          {% if(params.language == 'cy') %}y Drwydded Llywodraeth Agored{% else %}Open Government Licence{% endif %}  v3.0</a>, {% if(params.language == 'cy') %}oni nodir yn wahanol{% else %}except where otherwise stated{% endif %}
+{% from "govuk/components/footer/macro.njk" import govukFooter %}
 
-        </span>
-      </div>
-      <div class="govuk-footer__meta-item">
-        <a
-          class="govuk-footer__link govuk-footer__copyright-logo"
-          href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/"
-        >© {% if(params.language == 'cy') %}Hawlfraint y Goron{% else %}Crown copyright{% endif %}</a>
-      </div>
-    </div>
-  </div>
-</footer>
+{% set contentLicenceHtml -%}
+  {% if(params.language == 'cy') %}Mae‘r holl gynnwys ar gael o dan {% else %}All content is available under the {% endif %}
+  <a
+    class="govuk-footer__link"
+    href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
+    rel="license"
+  >{% if(params.language == 'cy') %}y Drwydded Llywodraeth Agored{% else %}Open Government Licence{% endif %} v3.0</a>, {% if(params.language == 'cy') %}oni nodir yn wahanol{% else %}except where otherwise stated{% endif %}
+{%- endset %}
+
+{% set copyrightHtml -%}
+© {% if(params.language == 'cy') %}Hawlfraint y Goron{% else %}Crown copyright{% endif %}
+{%- endset %}
+
+{% set defaultMetaVisuallyHiddenTitle = "Cysylltiadau cymorth" if params.language == "cy" else "Support links" %}
+
+{{ govukFooter({
+  meta: {
+    visuallyHiddenTitle: params.meta.visuallyHiddenTitle | default(defaultMetaVisuallyHiddenTitle),
+    html: params.meta.html,
+    text: params.meta.text,
+    items: params.meta.items
+  } if params.meta,
+  navigation: params.navigation,
+  contentLicence: {
+    html: contentLicenceHtml
+  },
+  copyright: {
+    html: copyrightHtml
+  },
+  containerClasses: params.containerClasses,
+  classes: params.classes,
+  attributes: params.attributes
+}) }}
diff --git a/src/components/footer/template.test.js b/src/components/footer/template.test.js
index f7e2525c..31653e3b 100644
--- a/src/components/footer/template.test.js
+++ b/src/components/footer/template.test.js
@@ -14,6 +14,13 @@ describe('footer', () => {
     return (text || '').trim().replace(/\s+/g, ' ');
   }
 
+  it('should match the output of govuk footer when displayed in english', async () => {
+    const params = examples['with params common to govuk footer'];
+    const hmrcFooterHtml = render('footer', params)('body').html().trim();
+    const govukFooterHtml = render('govuk/components/footer', params)('body').html().trim();
+    expect(normaliseText(hmrcFooterHtml)).toEqual(normaliseText(govukFooterHtml));
+  });
+
   it('default example passes accessibility tests', async () => {
     const $ = render('footer', examples.default);
 
diff --git a/src/components/header/header.yaml b/src/components/header/header.yaml
index acb0ceed..75a0b07b 100644
--- a/src/components/header/header.yaml
+++ b/src/components/header/header.yaml
@@ -107,6 +107,10 @@ params:
   type: string
   required: false
   description: Additional banners to be appended into header
+- name: useTudorCrown
+  type: boolean
+  required: false
+  description: A feature flag to use the new Tudor Crown logo. If unset, defaults to true
 previewLayout: full-width
 accessibilityCriteria: |
   Text and links in the Header must:
@@ -408,3 +412,41 @@ examples:
     language: en
     displayHmrcBanner: true
     additionalBannersBlock: "<div class=\"custom-banner govuk-body\">for example an attorney banner</div>"
+
+- name: with st edwards crown
+  description: The standard header with the Tudor Crown logo
+  data:
+    userResearchBanner:
+      url: '/sign-up-for-user-research'
+    phaseBanner:
+      tag:
+        text: alpha
+      html: This is a new service – your <a class="govuk-link" href="#">feedback</a> will help us to improve it.
+    displayHmrcBanner: true
+    useTudorCrown: false
+
+- name: with params common to govuk header
+  description: With only the params common to govuk header
+  data:
+    homepageUrl: '#h1'
+    serviceName: Service name
+    serviceUrl: '#s1'
+    productName: Product
+    navigationClasses: nc1
+    containerClasses: cc1
+    classes: c1
+    navigation:
+      - href: '#n1'
+        text: Navigation item 1
+        active: true
+      - href: '#n2'
+        html: <strong>Navigation item 2</strong>
+      - href: '#n3'
+        text: Navigation item 3
+        attributes:
+          data-test-attribute-1: value-1
+          data-test-attribute-2: value-2
+      - href: '#n4'
+        text: Navigation item 4
+    attributes:
+      data-test-attribute-3: value-3
diff --git a/src/components/header/template.njk b/src/components/header/template.njk
index 62e6ebae..e52c9ce3 100644
--- a/src/components/header/template.njk
+++ b/src/components/header/template.njk
@@ -1,105 +1,137 @@
 {% set language = params.language | default('en') %}
 {% from "../banner/macro.njk" import hmrcBanner %}
 {% from "../user-research-banner/macro.njk" import hmrcUserResearchBanner %}
-  {% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
+{% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
+
+{% from "govuk/macros/attributes.njk" import govukAttributes %}
+
+{%- set menuButtonText = 'Dewislen' if language == 'cy' else 'Menu' -%}
+
+{%- set _stEdwardsCrown %}
+<svg
+  focusable="false"
+  role="img"
+  class="govuk-header__logotype"
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 152 30"
+  height="30"
+  width="152"
+  aria-label="GOV.UK"
+>
+  <title>GOV.UK</title>
+  <path d="M6.7 12.2c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m-4.3 2.5c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.5 1 0 2.1 1 2.5m-1.3 4.8c1 .4 2.1-.1 2.5-1 .4-1-.1-2.1-1-2.5-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m10.4-5.8c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1s0 2.1 1 2.5m17.4-1.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m4.3 2.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m1.3 4.8c-1 .4-2.1-.1-2.5-1-.4-1 .1-2.1 1-2.5 1-.4 2.1.1 2.5 1 .4 1 0 2.1-1 2.5m-10.4-5.8c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1s0 2.1-1 2.5m-5.3-4.9 2.4 1.3V6.5l-2.4.8c-.1-.1-.1-.2-.2-.2s1-3 1-3h-3.4l1 3c-.1.1-.2.1-.2.2-.1.1-2.4-.7-2.4-.7v3.5L17 8.8c-.1.1 0 .2.1.3l-1.4 4.2c-.1.2-.1.4-.1.7 0 1.1.8 2.1 1.9 2.2h.6C19.2 16 20 15.1 20 14c0-.2 0-.4-.1-.7l-1.4-4.2c.2-.1.3-.2.3-.3m-1 20.3c4.6 0 8.9.3 12.8.9 1.1-4.6 2.4-7.2 3.8-9.1l-2.6-.9c.3 1.3.3 1.9 0 2.8-.4-.4-.8-1.2-1.1-2.4l-1.2 4.2c.8-.5 1.4-.9 2-.9-1.2 2.6-2.7 3.2-3.6 3-1.2-.2-1.7-1.3-1.5-2.2.3-1.3 1.6-1.6 2.2-.1 1.2-2.4-.8-3.1-2.1-2.4 1.9-1.9 2.2-3.6.6-5.7-2.2 1.7-2.2 3.3-1.2 5.6-1.3-1.5-3.3-.7-2.5 1.7.9-1.4 2.1-.5 2 .8-.2 1.2-1.7 2.1-3.7 2-2.8-.2-3-2.2-3-3.7.7-.1 1.9.5 3 2l.4-4.4c-1.1 1.2-2.2 1.4-3.3 1.4.4-1.2 2.1-3.1 2.1-3.1h-5.5s1.8 2 2.1 3.1c-1.1 0-2.2-.3-3.3-1.4l.4 4.4c1.1-1.5 2.3-2.1 3-2-.1 1.6-.2 3.5-3 3.7-1.9.2-3.5-.8-3.7-2-.2-1.3 1-2.2 1.9-.8.7-2.4-1.3-3.1-2.6-1.7 1-2.3 1-4-1.2-5.6-1.6 2.1-1.3 3.8.6 5.7-1.3-.7-3.2 0-2.1 2.4.6-1.5 1.9-1.1 2.2.1.2.9-.4 1.9-1.5 2.2-1 .2-2.5-.5-3.7-3 .7 0 1.3.4 2 .9L5 20.4c-.3 1.2-.7 1.9-1.2 2.4-.3-.8-.2-1.5 0-2.8l-2.6.9C2.7 22.8 4 25.4 5.1 30c3.8-.5 8.2-.9 12.7-.9m30.5-11.5c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H59v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zm36.4-4.3c-.4-1.3-1.1-2.4-2-3.4-.9-1-1.9-1.7-3.1-2.3-1.2-.6-2.6-.8-4.2-.8s-2.9.3-4.2.8c-1.1.6-2.2 1.4-3 2.3-.9 1-1.5 2.1-2 3.4-.4 1.3-.7 2.7-.7 4.2s.2 2.9.7 4.2c.4 1.3 1.1 2.4 2 3.4.9 1 1.9 1.7 3.1 2.3 1.2.6 2.6.8 4.2.8 1.5 0 2.9-.3 4.2-.8 1.2-.6 2.3-1.3 3.1-2.3.9-1 1.5-2.1 2-3.4.4-1.3.7-2.7.7-4.2-.1-1.5-.3-2.9-.8-4.2zM81 17.6c0 1-.1 1.9-.4 2.7-.2.8-.6 1.6-1.1 2.2-.5.6-1.1 1.1-1.7 1.4-.7.3-1.5.5-2.4.5-.9 0-1.7-.2-2.4-.5s-1.3-.8-1.7-1.4c-.5-.6-.8-1.3-1.1-2.2-.2-.8-.4-1.7-.4-2.7v-.1c0-1 .1-1.9.4-2.7.2-.8.6-1.6 1.1-2.2.5-.6 1.1-1.1 1.7-1.4.7-.3 1.5-.5 2.4-.5.9 0 1.7.2 2.4.5s1.3.8 1.7 1.4c.5.6.8 1.3 1.1 2.2.2.8.4 1.7.4 2.7v.1zM92.9 28 87 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L152 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
+</svg>
+{% endset %}
+
+{%- set _tudorCrown %}
+<svg
+  focusable="false"
+  role="img"
+  class="govuk-header__logotype"
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 148 30"
+  height="30"
+  width="148"
+  aria-label="GOV.UK"
+>
+  <title>GOV.UK</title>
+  <path d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8m28.3-11.6c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H55v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zM71.5 6.8c1.5 0 2.9.3 4.2.8 1.2.6 2.3 1.3 3.1 2.3.9 1 1.5 2.1 2 3.4s.7 2.7.7 4.2-.2 2.9-.7 4.2c-.4 1.3-1.1 2.4-2 3.4-.9 1-1.9 1.7-3.1 2.3-1.2.6-2.6.8-4.2.8s-2.9-.3-4.2-.8c-1.2-.6-2.3-1.3-3.1-2.3-.9-1-1.5-2.1-2-3.4-.4-1.3-.7-2.7-.7-4.2s.2-2.9.7-4.2c.4-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.5 2.6-.8 4.2-.8zm0 17.6c.9 0 1.7-.2 2.4-.5s1.3-.8 1.7-1.4c.5-.6.8-1.3 1.1-2.2.2-.8.4-1.7.4-2.7v-.1c0-1-.1-1.9-.4-2.7-.2-.8-.6-1.6-1.1-2.2-.5-.6-1.1-1.1-1.7-1.4-.7-.3-1.5-.5-2.4-.5s-1.7.2-2.4.5-1.3.8-1.7 1.4c-.5.6-.8 1.3-1.1 2.2-.2.8-.4 1.7-.4 2.7v.1c0 1 .1 1.9.4 2.7.2.8.6 1.6 1.1 2.2.5.6 1.1 1.1 1.7 1.4.6.3 1.4.5 2.4.5zM88.9 28 83 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L148 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
+</svg>
+{% endset -%}
 
 <header role="banner">
-  <div class="govuk-header hmrc-header {{ params.classes if params.classes }} {{ 'hmrc-header--with-additional-navigation' if params.signOutHref or params.languageToggle }}" data-module="govuk-header"
-          {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
-    <div class="govuk-header__container {{ params.containerClasses | default('govuk-width-container') }}">
-      <div class="govuk-header__logo">
-        <a href="{{ params.homepageUrl | default('/') }}" class="govuk-header__link govuk-header__link--homepage">
-          {#- The SVG needs `focusable="false"` so that Internet Explorer does
-          not treat it as an interactive element - without this it will be
-          'focusable' when using the keyboard to navigate.
+<div class="govuk-header hmrc-header {%- if params.classes %} {{ params.classes }}{% endif %}{{ ' hmrc-header--with-additional-navigation' if params.signOutHref or params.languageToggle }}" data-module="govuk-header"
+  {{- govukAttributes(params.attributes) }}>
+  <div class="govuk-header__container {{ params.containerClasses | default("govuk-width-container", true) }}">
+    <div class="govuk-header__logo">
+      <a href="{{ params.homepageUrl | default("/", true) }}" class="govuk-header__link govuk-header__link--homepage">
+        {#- The SVG needs `focusable="false"` so that Internet Explorer does
+        not treat it as an interactive element - without this it will be
+        'focusable' when using the keyboard to navigate.
 
-          We use a single compound path for the logo to prevent subpixel rounding
-          shifting different elements unevenly relative to one another. #}
-          <svg
-            focusable="false"
-            role="img"
-            class="govuk-header__logotype"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 152 30"
-            height="30"
-            width="152"
-            aria-label="GOV.UK"
-          >
-            <title>GOV.UK</title>
-            <path d="M6.7 12.2c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m-4.3 2.5c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.5 1 0 2.1 1 2.5m-1.3 4.8c1 .4 2.1-.1 2.5-1 .4-1-.1-2.1-1-2.5-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m10.4-5.8c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1s0 2.1 1 2.5m17.4-1.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m4.3 2.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m1.3 4.8c-1 .4-2.1-.1-2.5-1-.4-1 .1-2.1 1-2.5 1-.4 2.1.1 2.5 1 .4 1 0 2.1-1 2.5m-10.4-5.8c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1s0 2.1-1 2.5m-5.3-4.9 2.4 1.3V6.5l-2.4.8c-.1-.1-.1-.2-.2-.2s1-3 1-3h-3.4l1 3c-.1.1-.2.1-.2.2-.1.1-2.4-.7-2.4-.7v3.5L17 8.8c-.1.1 0 .2.1.3l-1.4 4.2c-.1.2-.1.4-.1.7 0 1.1.8 2.1 1.9 2.2h.6C19.2 16 20 15.1 20 14c0-.2 0-.4-.1-.7l-1.4-4.2c.2-.1.3-.2.3-.3m-1 20.3c4.6 0 8.9.3 12.8.9 1.1-4.6 2.4-7.2 3.8-9.1l-2.6-.9c.3 1.3.3 1.9 0 2.8-.4-.4-.8-1.2-1.1-2.4l-1.2 4.2c.8-.5 1.4-.9 2-.9-1.2 2.6-2.7 3.2-3.6 3-1.2-.2-1.7-1.3-1.5-2.2.3-1.3 1.6-1.6 2.2-.1 1.2-2.4-.8-3.1-2.1-2.4 1.9-1.9 2.2-3.6.6-5.7-2.2 1.7-2.2 3.3-1.2 5.6-1.3-1.5-3.3-.7-2.5 1.7.9-1.4 2.1-.5 2 .8-.2 1.2-1.7 2.1-3.7 2-2.8-.2-3-2.2-3-3.7.7-.1 1.9.5 3 2l.4-4.4c-1.1 1.2-2.2 1.4-3.3 1.4.4-1.2 2.1-3.1 2.1-3.1h-5.5s1.8 2 2.1 3.1c-1.1 0-2.2-.3-3.3-1.4l.4 4.4c1.1-1.5 2.3-2.1 3-2-.1 1.6-.2 3.5-3 3.7-1.9.2-3.5-.8-3.7-2-.2-1.3 1-2.2 1.9-.8.7-2.4-1.3-3.1-2.6-1.7 1-2.3 1-4-1.2-5.6-1.6 2.1-1.3 3.8.6 5.7-1.3-.7-3.2 0-2.1 2.4.6-1.5 1.9-1.1 2.2.1.2.9-.4 1.9-1.5 2.2-1 .2-2.5-.5-3.7-3 .7 0 1.3.4 2 .9L5 20.4c-.3 1.2-.7 1.9-1.2 2.4-.3-.8-.2-1.5 0-2.8l-2.6.9C2.7 22.8 4 25.4 5.1 30c3.8-.5 8.2-.9 12.7-.9m30.5-11.5c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H59v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zm36.4-4.3c-.4-1.3-1.1-2.4-2-3.4-.9-1-1.9-1.7-3.1-2.3-1.2-.6-2.6-.8-4.2-.8s-2.9.3-4.2.8c-1.1.6-2.2 1.4-3 2.3-.9 1-1.5 2.1-2 3.4-.4 1.3-.7 2.7-.7 4.2s.2 2.9.7 4.2c.4 1.3 1.1 2.4 2 3.4.9 1 1.9 1.7 3.1 2.3 1.2.6 2.6.8 4.2.8 1.5 0 2.9-.3 4.2-.8 1.2-.6 2.3-1.3 3.1-2.3.9-1 1.5-2.1 2-3.4.4-1.3.7-2.7.7-4.2-.1-1.5-.3-2.9-.8-4.2zM81 17.6c0 1-.1 1.9-.4 2.7-.2.8-.6 1.6-1.1 2.2-.5.6-1.1 1.1-1.7 1.4-.7.3-1.5.5-2.4.5-.9 0-1.7-.2-2.4-.5s-1.3-.8-1.7-1.4c-.5-.6-.8-1.3-1.1-2.2-.2-.8-.4-1.7-.4-2.7v-.1c0-1 .1-1.9.4-2.7.2-.8.6-1.6 1.1-2.2.5-.6 1.1-1.1 1.7-1.4.7-.3 1.5-.5 2.4-.5.9 0 1.7.2 2.4.5s1.3.8 1.7 1.4c.5.6.8 1.3 1.1 2.2.2.8.4 1.7.4 2.7v.1zM92.9 28 87 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L152 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
-          </svg>
-          {% if (params.productName) %}
-          <span class="govuk-header__product-name">
-            {{ params.productName }}
-          </span>
-          {% endif %}
-        </a>
-      </div>
-      {% if params.serviceName or params.navigation | length or params.signOutHref or params.languageToggle %}
-      <div class="govuk-header__content">
-      {% if params.serviceName %}
-        {% set serviceNameTag = 'a' if params.serviceUrl else 'span' %}
-        <{{ serviceNameTag }} {% if (serviceNameTag == 'a') %}href="{{ params.serviceUrl }}" {% endif %} class="hmrc-header__service-name {% if (serviceNameTag == 'a') %}hmrc-header__service-name--linked{% endif %}">
-          {{ params.serviceName }}
-        </{{ serviceNameTag }}>
+        We use a single compound path for the logo to prevent subpixel rounding
+        shifting different elements unevenly relative to one another. #}
+        {{ (_stEdwardsCrown if (params.useTudorCrown !== undefined and params.useTudorCrown === false) else _tudorCrown) | safe | trim | indent(8) }}
+        {% if (params.productName) %}
+        <span class="govuk-header__product-name">
+          {{ params.productName }}
+        </span>
+        {% endif %}
+      </a>
+    </div>
+  {% if params.serviceName or params.navigation | length or params.signOutHref or params.languageToggle %}
+    <div class="govuk-header__content">
+    {% if params.serviceName %}
+      {% if params.serviceUrl %}
+      <a href="{{ params.serviceUrl }}" class="govuk-header__link govuk-header__service-name hmrc-header__service-name hmrc-header__service-name--linked">
+        {{ params.serviceName }}
+      </a>
+      {% else %}
+      <span class="govuk-header__service-name hmrc-header__service-name">
+        {{ params.serviceName }}
+      </span>
       {% endif %}
-      {% if params.navigation | length %}
-      <nav class="govuk-header__navigation" aria-label="{% if language == 'cy' %}Dewislen Lefel Uchaf{% else %}Top Level Menu{% endif %}">
-        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="{% if language == 'cy' %}Dangos neu guddio’r Ddewislen Lefel Uchaf{% else %}Show or hide Top Level Menu{% endif %}" hidden>{% if language == 'cy' %}Dewislen{% else %}Menu{% endif %}</button>
-        <ul id="navigation" class="govuk-header__navigation-list{{ (' ' + params.navigationClasses) if params.navigationClasses }}">
-          {% for item in params.navigation %}
-            {% if item.text or item.html %}
-              <li class="govuk-header__navigation-item{{ ' govuk-header__navigation-item--active' if item.active }}">
-              {% if item.href %}
-                <a class="govuk-header__link" href="{{ item.href }}"{% for attribute, value in item.attributes %} {{attribute}}="{{value}}"{% endfor %}>
-              {% endif %}
-                {{ item.html | safe if item.html else item.text }}
-              {% if item.href %}
-                </a>
-              {% endif %}
-              </li>
+    {% endif %}
+    {% if params.navigation | length %}
+      <nav aria-label="{{ params.navigationLabel | default(menuButtonText, true) }}" class="govuk-header__navigation {%- if params.navigationClasses %} {{ params.navigationClasses }}{% endif %}">
+        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" {%- if params.menuButtonLabel and params.menuButtonLabel != menuButtonText %} aria-label="{{ params.menuButtonLabel }}"{% endif %} hidden>
+          {{ menuButtonText }}
+        </button>
+
+        <ul id="navigation" class="govuk-header__navigation-list">
+        {% for item in params.navigation %}
+          {% if item.text or item.html %}
+          <li class="govuk-header__navigation-item {%- if item.active %} govuk-header__navigation-item--active{% endif %}">
+            {% if item.href %}
+            <a class="govuk-header__link" href="{{ item.href }}"
+              {{- govukAttributes(item.attributes) -}}>
+            {% endif %}
+              {{ item.html | safe | trim | indent(14) if item.html else item.text }}
+            {% if item.href %}
+            </a>
             {% endif %}
-          {% endfor %}
+          </li>
+          {% endif %}
+        {% endfor %}
         </ul>
       </nav>
-      {% endif %}
-
-        {% if params.signOutHref %}
-          <nav class="hmrc-sign-out-nav">
-            <a class="govuk-link hmrc-sign-out-nav__link" href="{{ params.signOutHref }}">
-            {% if language == 'cy' %}Allgofnodi{% else %}Sign out{% endif %}
-            </a>
-          </nav>
-        {% elseif params.languageToggle %}
-          <nav class="hmrc-language-select" aria-label="Choose a language">
-            <ul class="govuk-list hmrc-language-select__items">
-              <li class="govuk-header__navigation-item">
-                <a{% if language == 'en' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
-                  lang="en" hreflang="en" href="{{ params.languageToggle.en.href }}">English</a>
-              </li>
-              <li class="govuk-header__navigation-item">
-                <a {% if language == 'cy' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
-                  lang="cy" hreflang="cy" href="{{ params.languageToggle.cy.href }}">Cymraeg</a>
-              </li>
-            </ul>
-          </nav>
-        {% endif %}
-      </div>
-      {% endif %}
-    </div>
-  </div>
-  {% if params.phaseBanner %}
-    <div class="govuk-width-container">
-      {{ govukPhaseBanner(params.phaseBanner) }}
-    </div>
-  {% endif %}
-  {% if params.userResearchBanner %}
-      {{ hmrcUserResearchBanner({language: params.language, url: params.userResearchBanner.url }) }}
-  {% endif %}
-  {% if params.displayHmrcBanner %}
-    <div class="govuk-width-container">
-      {{ hmrcBanner({language: params.language}) }}
+    {% endif %}
+    {% if params.signOutHref %}
+      <nav class="hmrc-sign-out-nav">
+        <a class="govuk-link hmrc-sign-out-nav__link" href="{{ params.signOutHref }}">
+        {% if language == 'cy' %}Allgofnodi{% else %}Sign out{% endif %}
+        </a>
+      </nav>
+    {% elseif params.languageToggle %}{# TODO should this really be elseif? #}
+      <nav class="hmrc-language-select" aria-label="Choose a language">{# TODO we should be translating this #}
+        <ul class="govuk-list hmrc-language-select__items">
+          <li class="govuk-header__navigation-item">
+            <a{% if language == 'en' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
+              lang="en" hreflang="en" href="{{ params.languageToggle.en.href }}">English</a>
+          </li>
+          <li class="govuk-header__navigation-item">
+            <a {% if language == 'cy' %} aria-current="page"{% else %} class="govuk-header__link"{% endif %}
+              lang="cy" hreflang="cy" href="{{ params.languageToggle.cy.href }}">Cymraeg</a>
+          </li>
+        </ul>
+      </nav>
+    {% endif %}
     </div>
   {% endif %}
-  {{ params.additionalBannersBlock | safe }}
+  </div>
+</div>
+{%- if params.phaseBanner %}
+  <div class="govuk-width-container">
+    {{ govukPhaseBanner(params.phaseBanner) }}
+  </div>
+{% endif %}
+{%- if params.userResearchBanner %}
+    {{ hmrcUserResearchBanner({language: params.language, url: params.userResearchBanner.url }) }}
+{% endif %}
+{%- if params.displayHmrcBanner %}
+  <div class="govuk-width-container">
+    {{ hmrcBanner({language: params.language, useTudorCrown: params.useTudorCrown}) }}
+  </div>
+{% endif %}
+{{- params.additionalBannersBlock | safe }}
 </header>
diff --git a/src/components/header/template.test.js b/src/components/header/template.test.js
index a7e7246e..c6b27e01 100644
--- a/src/components/header/template.test.js
+++ b/src/components/header/template.test.js
@@ -10,11 +10,15 @@ import { render, getExamples } from '../../../lib/jest-helpers';
 const examples = getExamples('header');
 
 describe('header', () => {
-  it('passes accessibility tests', async () => {
-    const $ = render('header', examples.default);
-
-    const results = await axe($.html());
-    expect(results).toHaveNoViolations();
+  function withoutHmrcHeaderClasses(text) {
+    return (text || '').trim().replace(/ hmrc-header__[a-z-]+/g, '');
+  }
+
+  it('should match the inner html output of govuk header when none of the hmrc specific params are passed', async () => {
+    const params = examples['with params common to govuk header'];
+    const hmrcHeaderHtml = render('header', params)('.govuk-header').html().trim();
+    const govukHeaderHtml = render('govuk/components/header', params)('.govuk-header').html().trim();
+    expect(withoutHmrcHeaderClasses(hmrcHeaderHtml)).toEqual(govukHeaderHtml);
   });
 
   it('has a role of `banner`', () => {
@@ -24,19 +28,6 @@ describe('header', () => {
     expect($component.attr('role')).toEqual('banner');
   });
 
-  it('renders attributes correctly', () => {
-    const $ = render('header', {
-      attributes: {
-        'data-test-attribute': 'value',
-        'data-test-attribute-2': 'value-2',
-      },
-    });
-
-    const $component = $('.govuk-header');
-    expect($component.attr('data-test-attribute')).toEqual('value');
-    expect($component.attr('data-test-attribute-2')).toEqual('value-2');
-  });
-
   it('renders classes', () => {
     const $ = render('header', {
       classes: 'app-header--custom-modifier',
@@ -46,6 +37,13 @@ describe('header', () => {
     expect($component.hasClass('app-header--custom-modifier')).toBeTruthy();
   });
 
+  it('passes accessibility tests', async () => {
+    const $ = render('header', examples.default);
+
+    const results = await axe($.html());
+    expect(results).toHaveNoViolations();
+  });
+
   it('renders custom container classes', () => {
     const $ = render('header', {
       containerClasses: 'app-width-container',
@@ -192,76 +190,26 @@ describe('header', () => {
       expect(outputs[0]).toEqual(outputs[2]);
     });
 
-    it('renders navigation with aria-label in English if passed no language', () => {
-      const $ = render('header', examples['with navigation']);
-
-      const $navigation = $('.govuk-header__navigation');
-      expect($navigation.attr('aria-label')).toEqual('Top Level Menu');
-    });
-
-    it('renders navigation with aria-label in Welsh when specified', () => {
-      const $ = render('header', examples['with navigation welsh']);
-
-      const $navigation = $('.govuk-header__navigation');
-      expect($navigation.attr('aria-label')).toEqual('Dewislen Lefel Uchaf');
-    });
-
     describe('menu button', () => {
-      it('has an explicit type="button" so it does not act as a submit button', () => {
+      it('should have English text as default', () => {
         const $ = render('header', examples['with navigation']);
 
         const $button = $('.govuk-header__menu-button');
-
-        expect($button.attr('type')).toEqual('button');
+        expect($button.text().trim()).toEqual('Menu');
       });
-    });
-
-    it('should have English text as default', () => {
-      const $ = render('header', examples['with navigation']);
-
-      const $button = $('.govuk-header__menu-button');
-      expect($button.text()).toEqual('Menu');
-    });
-
-    it('should have Welsh text when specified', () => {
-      const $ = render('header', examples['with navigation welsh']);
-
-      const $button = $('.govuk-header__menu-button');
-      expect($button.text()).toEqual('Dewislen');
-    });
-
-    it('should have aria-label in English if passed no language', () => {
-      const $ = render('header', examples['with navigation']);
 
-      const $button = $('.govuk-header__menu-button');
-      expect($button.attr('aria-label')).toEqual('Show or hide Top Level Menu');
-    });
-
-    it('should have aria-label in Welsh when specified', () => {
-      const $ = render('header', examples['with navigation welsh']);
-
-      const $button = $('.govuk-header__menu-button');
-      expect($button.attr('aria-label')).toEqual('Dangos neu guddio’r Ddewislen Lefel Uchaf');
-    });
-  });
-
-  describe('SVG logo', () => {
-    const $ = render('header', {});
-    const $svg = $('.govuk-header__link > svg');
-
-    it('sets focusable="false" so that IE does not treat it as an interactive element', () => {
-      expect($svg.attr('focusable')).toEqual('false');
-    });
+      it('should have Welsh text when specified', () => {
+        const $ = render('header', examples['with navigation welsh']);
 
-    describe('fallback PNG', () => {
-      const $fallbackImage = $('.govuk-header__logotype-crown-fallback-image');
-
-      it('is invisible to modern browsers', () => {
-        expect($fallbackImage.length).toEqual(0);
+        const $button = $('.govuk-header__menu-button');
+        expect($button.text().trim()).toEqual('Dewislen');
       });
     });
   });
 
+  // TODO add tests for sign-out-links
+  // TODO add tests for language-select-links
+
   describe('HMRC banner', () => {
     it('passes accessibility tests when including the banner', async () => {
       const $ = render('header', examples['with hmrc banner english']);
diff --git a/src/components/internal-header/images/hmrc_tudor_crest_18px_x2.png b/src/components/internal-header/images/hmrc_tudor_crest_18px_x2.png
new file mode 100644
index 00000000..db584b2a
Binary files /dev/null and b/src/components/internal-header/images/hmrc_tudor_crest_18px_x2.png differ
diff --git a/src/components/internal-header/internal-header.yaml b/src/components/internal-header/internal-header.yaml
index 2e3f9c4b..088760d3 100644
--- a/src/components/internal-header/internal-header.yaml
+++ b/src/components/internal-header/internal-header.yaml
@@ -20,6 +20,10 @@ params:
   type: string
   required: false
   description: The public path for the assets folder. If not provided it defaults to /assets
+- name: useTudorCrown
+  type: boolean
+  required: false
+  description: A feature flag to use the new Tudor Crown logo. If unset, defaults to the old St Edward’s Crown
 
 accessibilityCriteria:
   Text and links in the Header must:
@@ -53,4 +57,9 @@ examples:
   description: If your service is more than a few pages long, you can help users understand where they are by adding the service name.
   data:
     serviceName: Service Name
-    serviceUrl: '/components/internal-header/with-service-name/preview'
\ No newline at end of file
+    serviceUrl: '/components/internal-header/with-service-name/preview'
+- name: with-st-edwards-crown
+  description: The internal header with the old HMRC Crest
+  data:
+    language: en
+    useTudorCrown: false
diff --git a/src/components/internal-header/template.njk b/src/components/internal-header/template.njk
index cd887d65..5933f0a5 100644
--- a/src/components/internal-header/template.njk
+++ b/src/components/internal-header/template.njk
@@ -2,20 +2,35 @@
     <div class="govuk-width-container">
 			<div class="hmrc-internal-header__logo">
 					<a href="{{ params.homepageUrl | default('/') }}" class="hmrc-internal-header__logo-link">
-                        <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="52px" height="32px" viewBox="0 0 134.94 134.94" focusable="false" aria-hidden="true">
-                                <path d="M104.32,73.72,101,73.29c.94-2,1.51-3.22,1.51-3.22,0-.38,1.11-2.22,1.53-3.73a19.94,19.94,0,0,0,.61-3.89,15.05,15.05,0,0,0-3.68-10.06,12.21,12.21,0,0,0-9.18-4.18,17.46,17.46,0,0,0-3.68.44c-2.09.52-3.08.81-4.93,1.29a51.13,51.13,0,0,0-8.85,3.61,1.37,1.37,0,0,0-.73.91,2,2,0,0,0-.07.53L73.31,71.6H70.53V53.46a4.05,4.05,0,0,1,.18-1.14,3.37,3.37,0,0,1,1.43-1.71c.6-.39,1.21-.75,1.82-1.08a2.49,2.49,0,1,1,3.87-2.07c0,.12,0,.25,0,.37l.16-.06c.55-.19,1.16-.37,1.75-.55a2.49,2.49,0,1,1,3.71-2.16,2.66,2.66,0,0,1-.3,1.16l2.06-.56.36-.08a2.49,2.49,0,1,1,3.87-2.07A2.42,2.42,0,0,1,89,44.82h.06a16.43,16.43,0,0,1,2.72-.18,2.45,2.45,0,0,1-.48-1.45,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-.89,1.89A16.46,16.46,0,0,1,98.1,46a2.41,2.41,0,0,1-.12-.72,2.5,2.5,0,1,1,3,2.44,16.7,16.7,0,0,1,2.12,1.91v-.08a2.49,2.49,0,1,1,2.49,2.49,2.15,2.15,0,0,1-.68-.11,18.34,18.34,0,0,1,1.25,2.26,2.49,2.49,0,0,1,4.55,1.4,2.5,2.5,0,0,1-2.49,2.5,2.64,2.64,0,0,1-.8-.15,20.9,20.9,0,0,1,.35,2.1,2.52,2.52,0,0,1,1-.19,2.49,2.49,0,1,1,0,5,2.59,2.59,0,0,1-1.07-.25c0,.26-.08.54-.11.82s-.14.55-.21.78a2.49,2.49,0,0,1-.32,5,2.39,2.39,0,0,1-1.39-.43c-.34.8-.78,1.83-1.27,3" />
-                                <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
-                                <path d="M67.47,66a2.28,2.28,0,1,0,0-4.56h0a2.28,2.28,0,0,0,0,4.56Z" />
-                                <path d="M67.45,60.39a2.18,2.18,0,0,1,0-4.35h0a2.18,2.18,0,0,1,0,4.35Z" />
-                                <path d="M67.47,50.17a2,2,0,0,0,0-4.09h0a2,2,0,1,0,0,4.09Z" />
-                                <path d="M67.45,55.13a2.08,2.08,0,0,1,0-4.15h0a2.08,2.08,0,0,1,0,4.15Z" />
-                                <path d="M74.67,22.23a.47.47,0,0,0-.46-.34.49.49,0,0,0-.49.34c-.47,1.83-1.41,3.55-5,3.86A6.43,6.43,0,0,1,70,22.5,5.37,5.37,0,0,1,73,21a.45.45,0,0,0,.3-.13.42.42,0,0,0,.1-.33.44.44,0,0,0-.14-.33.44.44,0,0,0-.29-.1H62a.44.44,0,0,0-.29.1.41.41,0,0,0-.14.33.46.46,0,0,0,.1.33A.47.47,0,0,0,62,21a5.37,5.37,0,0,1,3,1.51,6.43,6.43,0,0,1,1.28,3.59c-3.59-.31-4.53-2-5-3.86a.5.5,0,0,0-.49-.34.47.47,0,0,0-.46.34v10a.45.45,0,0,0,.51.42.46.46,0,0,0,.49-.29l0-.05a6.1,6.1,0,0,1,5-3.77,6.37,6.37,0,0,1-1.31,3.73A5.13,5.13,0,0,1,62,33.78h0a.64.64,0,0,0-.26.13.49.49,0,0,0-.1.35.37.37,0,0,0,.14.31.6.6,0,0,0,.32.12H72.89a.6.6,0,0,0,.32-.12.39.39,0,0,0,.14-.31.44.44,0,0,0-.1-.35.64.64,0,0,0-.26-.13h0A5.1,5.1,0,0,1,70,32.29a6.37,6.37,0,0,1-1.31-3.73,6.1,6.1,0,0,1,5,3.77v.05a.49.49,0,0,0,.5.29.45.45,0,0,0,.51-.42v-10Z" />
-                                <path d="M67.47,45.72a5.29,5.29,0,1,0,0-10.57h0a5.29,5.29,0,1,0,0,10.57Z" />
-                                <path d="M29.33,70.72a2.39,2.39,0,0,1-1.39.43,2.49,2.49,0,0,1-.32-5c-.07-.23-.13-.49-.21-.78s-.08-.56-.12-.82a2.51,2.51,0,0,1-1.07.25,2.49,2.49,0,0,1,0-5,2.35,2.35,0,0,1,1,.19c.08-.72.2-1.41.34-2.1a2.31,2.31,0,0,1-.79.15,2.5,2.5,0,1,1,2.06-3.9A18.34,18.34,0,0,1,30,51.94a2.15,2.15,0,0,1-.68.11,2.49,2.49,0,1,1,2.49-2.49v.08A16.12,16.12,0,0,1,34,47.73a2.49,2.49,0,1,1,3-2.43,2.23,2.23,0,0,1-.13.72,14.4,14.4,0,0,1,2.7-.94,2.49,2.49,0,1,1,4.09-1.9,2.45,2.45,0,0,1-.48,1.45,16.43,16.43,0,0,1,2.72.18h0a2.53,2.53,0,0,1-.37-1.31,2.49,2.49,0,1,1,3.87,2.07l.36.09,2.06.55a2.53,2.53,0,0,1-.3-1.16,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-1.27,2.15c.59.19,1.2.37,1.76.56l.15.06c0-.12,0-.25,0-.37A2.5,2.5,0,1,1,61,49.53c.61.33,1.22.69,1.82,1.08a3.37,3.37,0,0,1,1.43,1.71,3.66,3.66,0,0,1,.18,1.14V71.6H61.6L61.42,55a1.56,1.56,0,0,0-.07-.53,1.4,1.4,0,0,0-.73-.91,51.17,51.17,0,0,0-8.86-3.61c-1.84-.48-2.84-.77-4.93-1.29a17.33,17.33,0,0,0-3.67-.44A12.21,12.21,0,0,0,34,52.39,15.05,15.05,0,0,0,30.3,62.45a19.75,19.75,0,0,0,.61,3.88c.42,1.52,1.48,3.36,1.53,3.74,0,0,.57,1.18,1.51,3.22l-3.35.43c-.49-1.17-.93-2.2-1.27-3" />
-                                <path d="M91.11,94.65A1.45,1.45,0,0,1,89.58,96l-7.89-.42a1.47,1.47,0,0,1-1.39-1.53L80.37,93a1.44,1.44,0,0,1,1.53-1.38l7.89.42a1.45,1.45,0,0,1,1.39,1.52Zm-20.47-1-2.81,2.81a.57.57,0,0,1-.36.16h0a.57.57,0,0,1-.36-.16l-2.82-2.81a.56.56,0,0,1,0-.81L67.09,90a.57.57,0,0,1,.36-.16h0a.57.57,0,0,1,.36.16l2.81,2.81a.55.55,0,0,1,0,.81m-17.41,2L45.34,96a1.45,1.45,0,0,1-1.53-1.37l-.07-1.13A1.46,1.46,0,0,1,45.13,92L53,91.58A1.45,1.45,0,0,1,54.55,93l.07,1.11a1.47,1.47,0,0,1-1.39,1.53m53.32-19.89a1.65,1.65,0,0,0-1.14-.66L100,74.32a.43.43,0,0,0-.43.39.45.45,0,0,0,.28.54h0a7,7,0,0,1,4,6.41c-3.92-.81-4.9-2.82-5.15-5.6,0-.12-.11-.33-.44-.36a.46.46,0,0,0-.49.25v0L96.24,88v0a.48.48,0,0,0,.91.16A7,7,0,0,1,103.5,84a8,8,0,0,1-5.59,5.74h0c-2-.22-4.09-.41-6.18-.59a5.1,5.1,0,0,1-4-4.14,3.86,3.86,0,0,1,.21-1c.51-1.36,1.49-2.25,2.58-1.85s1.26,1.72.76,3.07a3.58,3.58,0,0,1-.89,1.37A3.58,3.58,0,0,0,93.51,85c1.39-2,1.23-5-.94-6.27-1.42-.83-3.38.13-4.87,2,.45-2.93,2.23-5.52,2.43-7.78.29-3.19-.94-6.74-2.69-7.71-1.82.67-3.48,4-3.64,7.13-.1,2.27,1.43,5.26,1.51,8.25-1.23-2.13-3.1-3.4-4.63-2.76-2.32.94-2.91,3.94-1.8,6.09a3.67,3.67,0,0,0,2.85,2,3.45,3.45,0,0,1-.7-1.48c-.31-1.42,0-2.67,1.17-2.94s2,.76,2.3,2.18a3.64,3.64,0,0,1,0,1.31h0C83.65,87.2,82,87.94,80,88.44q-3.09-.14-6.23-.2h0l-.22,0c-2.94-.48-4.43-2.35-4.73-5.87a6.85,6.85,0,0,1,5.53,4.22.56.56,0,0,0,.55.35.48.48,0,0,0,.54-.44V75.35a.51.51,0,0,0-.5-.36.56.56,0,0,0-.51.33h0v0c-.52,2-1.58,4-5.61,4.3.33-3.93,2.12-5.13,4.74-5.7a.43.43,0,0,0,.3-.14.48.48,0,0,0,.13-.32v0a.52.52,0,0,0-.16-.35.5.5,0,0,0-.3-.11H61.41a.5.5,0,0,0-.3.11.57.57,0,0,0-.17.35v0a.48.48,0,0,0,.13.32.46.46,0,0,0,.31.14c2.61.57,4.41,1.77,4.74,5.7-4-.33-5.1-2.26-5.61-4.3v0h0A.56.56,0,0,0,60,75a.5.5,0,0,0-.5.36v11.1a.48.48,0,0,0,.54.44.53.53,0,0,0,.54-.35,6.87,6.87,0,0,1,5.54-4.22c-.3,3.52-1.79,5.39-4.73,5.87l-.23,0h0c-2.08,0-4.16.11-6.22.2-2-.5-3.66-1.24-4.56-3.37h0a3.43,3.43,0,0,1,.05-1.31c.31-1.42,1.16-2.42,2.3-2.18s1.47,1.52,1.17,2.94A3.69,3.69,0,0,1,53.2,86,3.67,3.67,0,0,0,56,84c1.1-2.15.52-5.15-1.8-6.09-1.54-.64-3.41.63-4.63,2.76.08-3,1.61-6,1.51-8.25-.16-3.18-1.82-6.46-3.64-7.13-1.75,1-3,4.52-2.69,7.71.2,2.26,2,4.85,2.43,7.78-1.49-1.86-3.46-2.82-4.87-2C40.18,80,40,83.07,41.41,85a3.58,3.58,0,0,0,3.08,1.63,3.58,3.58,0,0,1-.89-1.37c-.51-1.35-.39-2.64.76-3.07s2.07.49,2.58,1.85a3.86,3.86,0,0,1,.21,1,5.11,5.11,0,0,1-4,4.14c-2.07.18-4.13.37-6.17.59h0A8,8,0,0,1,31.42,84a7,7,0,0,1,6.35,4.12.45.45,0,0,0,.53.27.45.45,0,0,0,.38-.43v0L37.19,76v0a.47.47,0,0,0-.5-.25c-.32,0-.44.24-.44.36C36,78.83,35,80.84,31.1,81.65a7,7,0,0,1,4-6.41h0a.45.45,0,0,0,.28-.54.43.43,0,0,0-.43-.39l-5.46.73a1.65,1.65,0,0,0-1.14.66,1.84,1.84,0,0,0-.26,1.44c.14.81,1.79,12.39,1.94,13.45,0,.1.15,1.18.19,1.5a1.36,1.36,0,0,0,.48.67s2.42,1.64,2.84,2a.74.74,0,0,1,.18.86l-2.15,3.14a2,2,0,0,0-.26.42,1.19,1.19,0,0,0,.39,1.34H103.2a1.19,1.19,0,0,0,.39-1.34,2,2,0,0,0-.26-.42l-2.15-3.14a.75.75,0,0,1,.17-.86c.43-.33,2.85-2,2.85-2a1.36,1.36,0,0,0,.48-.67c0-.32.17-1.4.18-1.5.16-1.06,1.81-12.64,2-13.45a1.84,1.84,0,0,0-.26-1.44" />
-                                <path d="M67.47,7.72a59.76,59.76,0,1,0,59.75,59.75A59.75,59.75,0,0,0,67.47,7.72m67.47,59.75A67.47,67.47,0,1,1,67.47,0a67.47,67.47,0,0,1,67.47,67.47" />
-                        </svg>
-                        <span class="hmrc-internal-header__logo-text">{% if params.language == 'cy' %}
+					{% if params.useTudorCrown | default(true) %}
+              <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="52px" height="32px" viewBox="0 0 45.35 45.35" focusable="false" aria-hidden="true">
+                  <path class="cls-1" d="m28.5,16.6c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
+                  <path class="cls-1" d="m22.06,19.36c-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9Z"/>
+                  <path class="cls-1" d="m32.86,19.2c.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14.34.83,1.3,1.23,2.14.88Z"/>
+                  <path class="cls-1" d="m33.62,22.63c.34.83,1.3,1.23,2.14.88.82-.34,1.22-1.29.88-2.12-.34-.83-1.3-1.24-2.12-.9-.84.34-1.23,1.31-.89,2.14Z"/>
+                  <path class="cls-1" d="m21.81,11.4c.06.08.13.15.21.21l-1.19,3.58s0,0,0,.01h0s0,0,0,0c-.06.18-.09.37-.09.56,0,.97.71,1.77,1.64,1.9.01,0,.03,0,.04,0,.08.01.16.02.24.02h0c.08,0,.16,0,.24-.02.01,0,.03,0,.04,0,.93-.14,1.64-.94,1.64-1.9,0-.2-.03-.39-.08-.56h0s0,0,0,0c0,0,0,0,0-.01l-1.19-3.58c.08-.06.15-.13.21-.21h0s2.06,1.08,2.06,1.08v-3.04l-2.06.65h0c-.06-.08-.12-.15-.2-.21h0s.83-2.62.83-2.62h-1.49s-1.49,0-1.49,0l.83,2.61h0c-.08.06-.14.13-.2.21h0s-2.06-.65-2.06-.65v3.04l2.06-1.08h0Z"/>
+                  <path class="cls-1" d="m16.83,16.6c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+                  <path class="cls-1" d="m12.46,19.2c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+                  <path class="cls-1" d="m9.57,23.51c.84.35,1.79-.05,2.14-.88.34-.83-.05-1.79-.89-2.14-.82-.34-1.78.07-2.12.9-.34.83.05,1.78.88,2.12Z"/>
+                  <path class="cls-1" d="m34.61,25.35c.22,1.12.26,1.65,0,2.37-.37-.36-.71-1.01-.98-2.02l-1.07,3.57c.65-.45,1.16-.74,1.73-.75-1.02,2.2-2.3,2.77-3.12,2.61-1.01-.19-1.47-1.09-1.32-1.85.23-1.08,1.34-1.36,1.86-.11.99-2.02-.69-2.65-1.77-2.05,1.66-1.66,1.85-3.13.51-4.92-1.87,1.43-1.89,2.84-1.05,4.84-1.09-1.25-2.79-.58-2.18,1.44.79-1.22,1.83-.45,1.67.71-.14,1.01-1.47,1.82-3.13,1.68-2.38-.22-2.52-1.86-2.58-3.21.58-.11,1.64.43,2.53,1.69l.33-3.79c-.98,1.02-1.86,1.21-2.85,1.24.33-1.02,1.84-2.7,1.84-2.7h-4.73s1.51,1.68,1.84,2.7c-.99-.03-1.87-.22-2.85-1.24l.33,3.79c.9-1.26,1.95-1.8,2.53-1.69-.06,1.36-.2,3-2.58,3.21-1.66.14-2.99-.67-3.13-1.68-.16-1.16.88-1.92,1.67-.71.61-2.02-1.09-2.69-2.18-1.44.84-1.99.82-3.41-1.05-4.84-1.34,1.78-1.15,3.26.51,4.92-1.08-.6-2.76.03-1.77,2.05.52-1.26,1.63-.98,1.86.11.16.76-.31,1.66-1.32,1.85-.83.15-2.1-.41-3.12-2.61.58.01,1.08.3,1.73.75l-1.07-3.57c-.27,1-.62,1.66-.98,2.02-.25-.72-.21-1.25,0-2.37l-2.21.79c1.18,1.6,2.31,3.86,3.25,7.79,3.29-.47,6.99-.74,10.9-.74s7.61.26,10.9.74c.94-3.93,2.07-6.19,3.25-7.79l-2.21-.79Z"/>
+                  <path class="cls-1" d="m22.68.57C10.47.57.57,10.47.57,22.68s9.9,22.11,22.11,22.11,22.11-9.9,22.11-22.11S34.89.57,22.68.57Zm0,41.69c-10.81,0-19.58-8.77-19.58-19.58S11.86,3.1,22.68,3.1s19.58,8.77,19.58,19.58-8.77,19.58-19.58,19.58Z"/>
+              </svg>
+					{% else %}
+              <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="52px" height="32px" viewBox="0 0 134.94 134.94" focusable="false" aria-hidden="true">
+                  <path d="M104.32,73.72,101,73.29c.94-2,1.51-3.22,1.51-3.22,0-.38,1.11-2.22,1.53-3.73a19.94,19.94,0,0,0,.61-3.89,15.05,15.05,0,0,0-3.68-10.06,12.21,12.21,0,0,0-9.18-4.18,17.46,17.46,0,0,0-3.68.44c-2.09.52-3.08.81-4.93,1.29a51.13,51.13,0,0,0-8.85,3.61,1.37,1.37,0,0,0-.73.91,2,2,0,0,0-.07.53L73.31,71.6H70.53V53.46a4.05,4.05,0,0,1,.18-1.14,3.37,3.37,0,0,1,1.43-1.71c.6-.39,1.21-.75,1.82-1.08a2.49,2.49,0,1,1,3.87-2.07c0,.12,0,.25,0,.37l.16-.06c.55-.19,1.16-.37,1.75-.55a2.49,2.49,0,1,1,3.71-2.16,2.66,2.66,0,0,1-.3,1.16l2.06-.56.36-.08a2.49,2.49,0,1,1,3.87-2.07A2.42,2.42,0,0,1,89,44.82h.06a16.43,16.43,0,0,1,2.72-.18,2.45,2.45,0,0,1-.48-1.45,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-.89,1.89A16.46,16.46,0,0,1,98.1,46a2.41,2.41,0,0,1-.12-.72,2.5,2.5,0,1,1,3,2.44,16.7,16.7,0,0,1,2.12,1.91v-.08a2.49,2.49,0,1,1,2.49,2.49,2.15,2.15,0,0,1-.68-.11,18.34,18.34,0,0,1,1.25,2.26,2.49,2.49,0,0,1,4.55,1.4,2.5,2.5,0,0,1-2.49,2.5,2.64,2.64,0,0,1-.8-.15,20.9,20.9,0,0,1,.35,2.1,2.52,2.52,0,0,1,1-.19,2.49,2.49,0,1,1,0,5,2.59,2.59,0,0,1-1.07-.25c0,.26-.08.54-.11.82s-.14.55-.21.78a2.49,2.49,0,0,1-.32,5,2.39,2.39,0,0,1-1.39-.43c-.34.8-.78,1.83-1.27,3" />
+                  <path d="M67.45,71.79a2.39,2.39,0,1,1,0-4.78h0a2.39,2.39,0,0,1,0,4.78Z" />
+                  <path d="M67.47,66a2.28,2.28,0,1,0,0-4.56h0a2.28,2.28,0,0,0,0,4.56Z" />
+                  <path d="M67.45,60.39a2.18,2.18,0,0,1,0-4.35h0a2.18,2.18,0,0,1,0,4.35Z" />
+                  <path d="M67.47,50.17a2,2,0,0,0,0-4.09h0a2,2,0,1,0,0,4.09Z" />
+                  <path d="M67.45,55.13a2.08,2.08,0,0,1,0-4.15h0a2.08,2.08,0,0,1,0,4.15Z" />
+                  <path d="M74.67,22.23a.47.47,0,0,0-.46-.34.49.49,0,0,0-.49.34c-.47,1.83-1.41,3.55-5,3.86A6.43,6.43,0,0,1,70,22.5,5.37,5.37,0,0,1,73,21a.45.45,0,0,0,.3-.13.42.42,0,0,0,.1-.33.44.44,0,0,0-.14-.33.44.44,0,0,0-.29-.1H62a.44.44,0,0,0-.29.1.41.41,0,0,0-.14.33.46.46,0,0,0,.1.33A.47.47,0,0,0,62,21a5.37,5.37,0,0,1,3,1.51,6.43,6.43,0,0,1,1.28,3.59c-3.59-.31-4.53-2-5-3.86a.5.5,0,0,0-.49-.34.47.47,0,0,0-.46.34v10a.45.45,0,0,0,.51.42.46.46,0,0,0,.49-.29l0-.05a6.1,6.1,0,0,1,5-3.77,6.37,6.37,0,0,1-1.31,3.73A5.13,5.13,0,0,1,62,33.78h0a.64.64,0,0,0-.26.13.49.49,0,0,0-.1.35.37.37,0,0,0,.14.31.6.6,0,0,0,.32.12H72.89a.6.6,0,0,0,.32-.12.39.39,0,0,0,.14-.31.44.44,0,0,0-.1-.35.64.64,0,0,0-.26-.13h0A5.1,5.1,0,0,1,70,32.29a6.37,6.37,0,0,1-1.31-3.73,6.1,6.1,0,0,1,5,3.77v.05a.49.49,0,0,0,.5.29.45.45,0,0,0,.51-.42v-10Z" />
+                  <path d="M67.47,45.72a5.29,5.29,0,1,0,0-10.57h0a5.29,5.29,0,1,0,0,10.57Z" />
+                  <path d="M29.33,70.72a2.39,2.39,0,0,1-1.39.43,2.49,2.49,0,0,1-.32-5c-.07-.23-.13-.49-.21-.78s-.08-.56-.12-.82a2.51,2.51,0,0,1-1.07.25,2.49,2.49,0,0,1,0-5,2.35,2.35,0,0,1,1,.19c.08-.72.2-1.41.34-2.1a2.31,2.31,0,0,1-.79.15,2.5,2.5,0,1,1,2.06-3.9A18.34,18.34,0,0,1,30,51.94a2.15,2.15,0,0,1-.68.11,2.49,2.49,0,1,1,2.49-2.49v.08A16.12,16.12,0,0,1,34,47.73a2.49,2.49,0,1,1,3-2.43,2.23,2.23,0,0,1-.13.72,14.4,14.4,0,0,1,2.7-.94,2.49,2.49,0,1,1,4.09-1.9,2.45,2.45,0,0,1-.48,1.45,16.43,16.43,0,0,1,2.72.18h0a2.53,2.53,0,0,1-.37-1.31,2.49,2.49,0,1,1,3.87,2.07l.36.09,2.06.55a2.53,2.53,0,0,1-.3-1.16,2.49,2.49,0,1,1,5,0,2.46,2.46,0,0,1-1.27,2.15c.59.19,1.2.37,1.76.56l.15.06c0-.12,0-.25,0-.37A2.5,2.5,0,1,1,61,49.53c.61.33,1.22.69,1.82,1.08a3.37,3.37,0,0,1,1.43,1.71,3.66,3.66,0,0,1,.18,1.14V71.6H61.6L61.42,55a1.56,1.56,0,0,0-.07-.53,1.4,1.4,0,0,0-.73-.91,51.17,51.17,0,0,0-8.86-3.61c-1.84-.48-2.84-.77-4.93-1.29a17.33,17.33,0,0,0-3.67-.44A12.21,12.21,0,0,0,34,52.39,15.05,15.05,0,0,0,30.3,62.45a19.75,19.75,0,0,0,.61,3.88c.42,1.52,1.48,3.36,1.53,3.74,0,0,.57,1.18,1.51,3.22l-3.35.43c-.49-1.17-.93-2.2-1.27-3" />
+                  <path d="M91.11,94.65A1.45,1.45,0,0,1,89.58,96l-7.89-.42a1.47,1.47,0,0,1-1.39-1.53L80.37,93a1.44,1.44,0,0,1,1.53-1.38l7.89.42a1.45,1.45,0,0,1,1.39,1.52Zm-20.47-1-2.81,2.81a.57.57,0,0,1-.36.16h0a.57.57,0,0,1-.36-.16l-2.82-2.81a.56.56,0,0,1,0-.81L67.09,90a.57.57,0,0,1,.36-.16h0a.57.57,0,0,1,.36.16l2.81,2.81a.55.55,0,0,1,0,.81m-17.41,2L45.34,96a1.45,1.45,0,0,1-1.53-1.37l-.07-1.13A1.46,1.46,0,0,1,45.13,92L53,91.58A1.45,1.45,0,0,1,54.55,93l.07,1.11a1.47,1.47,0,0,1-1.39,1.53m53.32-19.89a1.65,1.65,0,0,0-1.14-.66L100,74.32a.43.43,0,0,0-.43.39.45.45,0,0,0,.28.54h0a7,7,0,0,1,4,6.41c-3.92-.81-4.9-2.82-5.15-5.6,0-.12-.11-.33-.44-.36a.46.46,0,0,0-.49.25v0L96.24,88v0a.48.48,0,0,0,.91.16A7,7,0,0,1,103.5,84a8,8,0,0,1-5.59,5.74h0c-2-.22-4.09-.41-6.18-.59a5.1,5.1,0,0,1-4-4.14,3.86,3.86,0,0,1,.21-1c.51-1.36,1.49-2.25,2.58-1.85s1.26,1.72.76,3.07a3.58,3.58,0,0,1-.89,1.37A3.58,3.58,0,0,0,93.51,85c1.39-2,1.23-5-.94-6.27-1.42-.83-3.38.13-4.87,2,.45-2.93,2.23-5.52,2.43-7.78.29-3.19-.94-6.74-2.69-7.71-1.82.67-3.48,4-3.64,7.13-.1,2.27,1.43,5.26,1.51,8.25-1.23-2.13-3.1-3.4-4.63-2.76-2.32.94-2.91,3.94-1.8,6.09a3.67,3.67,0,0,0,2.85,2,3.45,3.45,0,0,1-.7-1.48c-.31-1.42,0-2.67,1.17-2.94s2,.76,2.3,2.18a3.64,3.64,0,0,1,0,1.31h0C83.65,87.2,82,87.94,80,88.44q-3.09-.14-6.23-.2h0l-.22,0c-2.94-.48-4.43-2.35-4.73-5.87a6.85,6.85,0,0,1,5.53,4.22.56.56,0,0,0,.55.35.48.48,0,0,0,.54-.44V75.35a.51.51,0,0,0-.5-.36.56.56,0,0,0-.51.33h0v0c-.52,2-1.58,4-5.61,4.3.33-3.93,2.12-5.13,4.74-5.7a.43.43,0,0,0,.3-.14.48.48,0,0,0,.13-.32v0a.52.52,0,0,0-.16-.35.5.5,0,0,0-.3-.11H61.41a.5.5,0,0,0-.3.11.57.57,0,0,0-.17.35v0a.48.48,0,0,0,.13.32.46.46,0,0,0,.31.14c2.61.57,4.41,1.77,4.74,5.7-4-.33-5.1-2.26-5.61-4.3v0h0A.56.56,0,0,0,60,75a.5.5,0,0,0-.5.36v11.1a.48.48,0,0,0,.54.44.53.53,0,0,0,.54-.35,6.87,6.87,0,0,1,5.54-4.22c-.3,3.52-1.79,5.39-4.73,5.87l-.23,0h0c-2.08,0-4.16.11-6.22.2-2-.5-3.66-1.24-4.56-3.37h0a3.43,3.43,0,0,1,.05-1.31c.31-1.42,1.16-2.42,2.3-2.18s1.47,1.52,1.17,2.94A3.69,3.69,0,0,1,53.2,86,3.67,3.67,0,0,0,56,84c1.1-2.15.52-5.15-1.8-6.09-1.54-.64-3.41.63-4.63,2.76.08-3,1.61-6,1.51-8.25-.16-3.18-1.82-6.46-3.64-7.13-1.75,1-3,4.52-2.69,7.71.2,2.26,2,4.85,2.43,7.78-1.49-1.86-3.46-2.82-4.87-2C40.18,80,40,83.07,41.41,85a3.58,3.58,0,0,0,3.08,1.63,3.58,3.58,0,0,1-.89-1.37c-.51-1.35-.39-2.64.76-3.07s2.07.49,2.58,1.85a3.86,3.86,0,0,1,.21,1,5.11,5.11,0,0,1-4,4.14c-2.07.18-4.13.37-6.17.59h0A8,8,0,0,1,31.42,84a7,7,0,0,1,6.35,4.12.45.45,0,0,0,.53.27.45.45,0,0,0,.38-.43v0L37.19,76v0a.47.47,0,0,0-.5-.25c-.32,0-.44.24-.44.36C36,78.83,35,80.84,31.1,81.65a7,7,0,0,1,4-6.41h0a.45.45,0,0,0,.28-.54.43.43,0,0,0-.43-.39l-5.46.73a1.65,1.65,0,0,0-1.14.66,1.84,1.84,0,0,0-.26,1.44c.14.81,1.79,12.39,1.94,13.45,0,.1.15,1.18.19,1.5a1.36,1.36,0,0,0,.48.67s2.42,1.64,2.84,2a.74.74,0,0,1,.18.86l-2.15,3.14a2,2,0,0,0-.26.42,1.19,1.19,0,0,0,.39,1.34H103.2a1.19,1.19,0,0,0,.39-1.34,2,2,0,0,0-.26-.42l-2.15-3.14a.75.75,0,0,1,.17-.86c.43-.33,2.85-2,2.85-2a1.36,1.36,0,0,0,.48-.67c0-.32.17-1.4.18-1.5.16-1.06,1.81-12.64,2-13.45a1.84,1.84,0,0,0-.26-1.44" />
+                  <path d="M67.47,7.72a59.76,59.76,0,1,0,59.75,59.75A59.75,59.75,0,0,0,67.47,7.72m67.47,59.75A67.47,67.47,0,1,1,67.47,0a67.47,67.47,0,0,1,67.47,67.47" />
+              </svg>
+          {% endif %}
+					<span class="hmrc-internal-header__logo-text">{% if params.language == 'cy' %}
 									Cyllid a Thollau EF
 							{% else %}
 									HM Revenue &amp; Customs
diff --git a/src/components/internal-header/template.test.js b/src/components/internal-header/template.test.js
index 6ced4de0..c6a0191b 100644
--- a/src/components/internal-header/template.test.js
+++ b/src/components/internal-header/template.test.js
@@ -1,5 +1,7 @@
 /* eslint-env jest */
 
+/* eslint-disable max-len */
+
 import { render, getExamples } from '../../../lib/jest-helpers';
 
 const examples = getExamples('internal-header');
@@ -19,6 +21,12 @@ describe('Internal Header', () => {
 
       expect($logoLink.text().trim()).toEqual('HM Revenue & Customs');
     });
+
+    it('should have Tudor Crown logo ', () => {
+      const $ = render('internal-header', examples.default);
+
+      expect($('.hmrc-internal-header__logo-link > svg').html().trim()).toContain('<path class="cls-1" d="m28.5,16.6c');
+    });
   });
 
   describe('with Welsh language specified', () => {
@@ -30,6 +38,14 @@ describe('Internal Header', () => {
     });
   });
 
+  describe('with St Edwards Crown logo specified', () => {
+    it('should have the correct SVG', () => {
+      const $ = render('internal-header', examples['with-st-edwards-crown']);
+
+      expect($('.hmrc-internal-header__logo-link > svg').html().trim()).toContain('<path d="M104.32,73.72,101,73.29c');
+    });
+  });
+
   describe('With a Service Name', () => {
     it('renders a service name', () => {
       const $ = render('internal-header', examples['with-service-name']);
diff --git a/src/govuk-prototype-kit.config.json b/src/govuk-prototype-kit.config.json
index ca6c2f7b..5b980b3f 100644
--- a/src/govuk-prototype-kit.config.json
+++ b/src/govuk-prototype-kit.config.json
@@ -10,7 +10,7 @@
   "pluginDependencies": [
     {
       "packageName": "govuk-frontend",
-      "minVersion": "5.0.0"
+      "minVersion": "5.2.0"
     }
   ],
   "assets": [
diff --git a/src/layouts/account-header.html b/src/layouts/account-header.html
index 255f6a28..0ec46197 100644
--- a/src/layouts/account-header.html
+++ b/src/layouts/account-header.html
@@ -20,7 +20,8 @@
       cy: {
         href: hmrcAccountHeader.languageToggle.cy.href
       }
-    }
+    },
+    useTudorCrown: hmrcAccountHeader.useTudorCrown
   }) }}
 {% endblock %}