diff --git a/.about.yml b/.about.yml
deleted file mode 100644
index 30a439acd..000000000
--- a/.about.yml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-# .about.yml project metadata
-#
-# Short name that acts as the project identifier (required)
-name: 18f-site
-
-# Full proper name of the project (required)
-full_name: "18f.gsa.gov"
-
-# The type of content in the repo
-# values: app, docs, policy
-type: app
-
-# Describes whether a project team, working group/guild, etc. owns the repo (required)
-# values: guild, working-group, project
-owner_type: project
-
-# Name of the main project repo if this is a sub-repo; name of the working group/guild repo if this is a working group/guild subproject
-#parent:
-
-# Maturity stage of the project (required)
-# values: discovery, alpha, beta, live
-stage: live
-
-# Whether or not the project is actively maintained (required)
-# values: active, deprecated
-status: active
-
-# Description of the project
-description: |
-  The official website of 18F.
-
-# Should be 'true' if the project has a continuous build (required)
-# values: true, false
-testable: true
-
-# Team members contributing to the project (required)
-# Items:
-# - github: GitHub user name
-#   id: Internal team identifier/user name
-#   role: Team member's role; leads should be designated as 'lead'
-team:
-- id: boone
-  role: lead
-- id: elaine
-  role: lead
-- id: andre
-  role: editor
-# Partners for whom the project is developed
-#partners:
-#-
-
-# Brief descriptions of significant project developments
-#milestones:
-#-
-
-# Technologies used to build the project
-stack:
-- Ruby
-- Jekyll
-- NodeJS
-
-# Brief description of the project's outcomes
-#impact:
-
-# Services used to supply project status information
-# Items:
-# - name: Name of the service
-#   category: Type of the service
-#   url: URL for detailed information
-#   badge: URL for the status badge
-#services:
-#-
-
-# Licenses that apply to the project and/or its components (required)
-# Items by property name pattern:
-#   .*:
-#     name: Name of the license from the Software Package Data Exchange (SPDX): https://spdx.org/licenses/
-#     url: URL for the text of the license
-licenses:
-  18f-site:
-    name: CC0-1.0
-    url: https://github.com/18F/18f.gsa.gov/blob/staging/LICENSE.md
-
-# Blogs or websites associated with project development
-#blog:
-#-
-
-# Links to project artifacts
-# Items:
-# - url: URL for the link
-#   text: Anchor text for the link
-links:
-- url: https://18f.gsa.gov/
-  text: The official website of 18F
-
-# Email addresses of points-of-contact
-contact:
-- gregory.boone@gsa.gov
diff --git a/.eleventy.js b/.eleventy.js
index e5eb13398..3c600675a 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -18,13 +18,12 @@ const { readableDate
       , embed
       , teamPhoto
       , teamLink
-      , findCollection
       , markdownify
       , weightedSort
-      , inGroups
       , oembed
       , asRelativeUrl
       , matchPosts } = require('./config/filters');
+const { postsCollection, servicesCollection, tagsCollection } = require('./config/collections');
 const { headingLinks } = require('./config/headingLinks');
 const { contrastRatio, humanReadableContrastRatio } = require('./config/wcagColorContrast');
 const privateLinks = require ('./config/privateLinksList');
@@ -33,7 +32,7 @@ const { imageShortcode, imageWithClassShortcode } = require('./config');
 
 const siteData = yaml.load(fs.readFileSync('./_data/site.yaml', 'utf8'));
 
-module.exports = function (config) {
+module.exports = function (config) { /* eslint-disable-line func-names */
   // Set pathPrefix for site
   let pathPrefix = '/';
 
@@ -49,13 +48,13 @@ module.exports = function (config) {
   config.addPassthroughCopy({'./node_modules/@uswds/uswds/dist/js/uswds-init.js': 'assets/js/uswds-init.js'});
 
   // Specific scripts to guides
-  config.addPassthroughCopy('./assets/_common/js/*');
+  config.addPassthroughCopy('./assets/common/js/*');
   config.addPassthroughCopy('./assets/**/js/*');
 
   // @TODO This is one place where the _site/img folder gets produced
   // Let's find a way to keep everything in assets
-  config.addPassthroughCopy({'./assets/_common/_img/favicons/favicon.ico': './favicon.ico' });
-  config.addPassthroughCopy({'./assets/_common/_img/favicons': './img/favicons' });
+  config.addPassthroughCopy({'./assets/common/img/favicons/favicon.ico': './favicon.ico' });
+  config.addPassthroughCopy({'./assets/common/img/favicons': './img/favicons' });
 
   config.addPassthroughCopy({'content/robots.txt': '/robots.txt' });
   config.addPassthroughCopy('google16a62a069d0c4fa4.html');
@@ -102,9 +101,7 @@ module.exports = function (config) {
   config.addFilter('team_photo', teamPhoto);
   // Add a link to an 18F team member's author page
   config.addFilter('team_link', teamLink);
-  config.addFilter('find_collection', findCollection);
   config.addFilter('weighted_sort', weightedSort);
-  config.addFilter('in_groups', inGroups);
   config.addShortcode('oembed', oembed);
   config.addFilter('relative_url', asRelativeUrl);
   config.addFilter('match_posts', matchPosts);
@@ -143,18 +140,9 @@ module.exports = function (config) {
   // TODO: Not sure this is returning exactly the right string, re: datetimes
   config.addFilter('date_to_xmlschema', (date) => dateObject(date).toISOString());
 
-  // Create an array of all tags
-  config.addCollection('tagList', (collection) => {
-    const tagSet = new Set();
-    collection.getAll().forEach((item) => {
-      (item.data.tags || []).forEach((tag) => tagSet.add(tag));
-    });
-
-    return filterTagList([...tagSet]);
-  });
-
-  config.addCollection('post', (collection) => collection.getFilteredByGlob('content/posts/*.md'));
-  config.addCollection('service', (collection) => collection.getFilteredByGlob('content/pages/projects/services/*.md'));
+  config.addCollection('posts', postsCollection);
+  config.addCollection('services', servicesCollection);
+  config.addCollection('tags', tagsCollection);
 
   // Customize Markdown library and settings
   const markdownLibrary = markdownIt({
@@ -177,7 +165,7 @@ module.exports = function (config) {
   // https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md
   // Token methods:  https://github.com/markdown-it/markdown-it/blob/master/lib/token.js#L125
   const openDefaultRender = markdownLibrary.renderer.rules.link_open ||
-    function(tokens, idx, options, env, self) {
+    function(tokens, idx, options, env, self) { /* eslint-disable-line func-names */
       return self.renderToken(tokens, idx, options);
     };
 
@@ -213,7 +201,7 @@ module.exports = function (config) {
   };
 
   const defaultHtmlBlockRender = markdownLibrary.renderer.rules.html_block ||
-    function(tokens, idx, options, env, self) {
+    function(tokens, idx, options, env, self) { /* eslint-disable-line func-names */
       return self.renderToken(tokens, idx, options);
     };
 
@@ -260,7 +248,7 @@ module.exports = function (config) {
 
   // Also need to add icon links to any html style links
   const inlineHTMLDefaultRender = markdownLibrary.renderer.rules.html_inline ||
-    function(tokens, idx, options, env, self) {
+    function(tokens, idx, options, env, self) { /* eslint-disable-line func-names */
       return self.renderToken(tokens, idx, options);
     };
 
diff --git a/404.html b/404.html
deleted file mode 100644
index b2806ef85..000000000
--- a/404.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-permalink: /404.html
----
-
-<h1>404: Page not found</h1>
-  <p>
-    If you typed the URL directly, check your spelling and capitalization. Our URLs look like this: <strong>https://guides.18f.gov/agile/introduction/.</strong>
-  </p>
-  <p>
-    Visit our homepage for helpful tools and resources, or contact us and we’ll point you in the right direction.
-  </p>
-  <a href="https://18f.gsa.gov/guides" class="usa-button">
-    Visit homepage
-  </a>
-  <a href="https://18f.gsa.gov/contact" class="usa-button usa-button--outline">
-    Contact us
-  </a>
diff --git a/_data/agencies.yml b/_data/agencies.yml
index 10715d156..893e248ae 100644
--- a/_data/agencies.yml
+++ b/_data/agencies.yml
@@ -1,94 +1,144 @@
-- name: U.S. Air Force
-  logo: /assets/img/logos/agencies/usaf.png
-- name: U.S. Army
-  logo: /assets/img/logos/agencies/us-army.png
-- name: U.S. Marine Corps
+-
+  name: U.S. Air Force
+  acronym: USAF
+  logo: usaf.png
+  featured: true
+-
+  name: U.S. Army
+  logo: us-army.png
+-
+  name: U.S. Marine Corps
   acronym: USMC
-  logo: /assets/img/logos/agencies/usmc.png
-- name: U.S. Navy
-  logo: /assets/img/logos/agencies/us-navy.png
-- name: Centers for Medicare and Medicaid Services
-  logo: /assets/img/logos/agencies/centers-for-medicare-and-medicaid.png
-- name: Consumer Financial Protection Bureau
+  logo: usmc.png
+-
+  name: U.S. Navy
+  logo: us-navy.png
+-
+  name: Centers for Medicare and Medicaid Services
+  logo: centers-for-medicare-and-medicaid.png
+-
+  name: Consumer Financial Protection Bureau
   acronym: CFPB
-  logo: /assets/img/logos/agencies/cfpb.png
-- name: Department of Agriculture
+  logo: cfpb.png
+-
+  name: Department of Agriculture
   acronym: USDA
-  logo: /assets/img/logos/agencies/USDA.svg
-- name: Department of Education
-  logo: /assets/img/logos/agencies/USDE.png
-- name: Department of Health and Human Services
-  logo: /assets/img/logos/agencies/USDHHS.png
-- name: Department of the Interior
-  logo: /assets/img/logos/agencies/USDOI.svg
-- name: Department of Justice
-  logo: /assets/img/logos/agencies/USDOJ.png
-- name: Department of State
-  logo: /assets/img/logos/agencies/USDS.png
-- name: Department of the Treasury
-  logo: /assets/img/logos/agencies/USDT.png
-- name: Federal Bureau of Investigation
+  logo: USDA.svg
+-
+  name: Department of Education
+  logo: USDE.png
+-
+  name: Department of Health and Human Services
+  acronym: HHS
+  logo: USDHHS.png
+  featured: true
+-
+  name: Department of the Interior
+  acronym: DOI
+  logo: USDOI.svg
+  featured: true
+-
+  name: Department of Justice
+  acronym: DOJ
+  logo: USDOJ.png
+  featured: true
+-
+  name: Department of State
+  logo: USDS.png
+-
+  name: Department of the Treasury
+  logo: USDT.png
+-
+  name: Federal Bureau of Investigation
   acronym: FBI
-  logo: /assets/img/logos/agencies/fbi.png
-- name: Federal Election Commission
+  logo: fbi.png
+-
+  name: Federal Election Commission
   acronym: FEC
-  logo: /assets/img/logos/agencies/fec.svg
-- name: Federal Emergency Management Agency
+  logo: fec.svg
+-
+  name: Federal Emergency Management Agency
   acronym: FEMA
-  logo: /assets/img/logos/agencies/fema.png
-- name: Federal Retirement Thrift Investment Board
-  logo: /assets/img/logos/agencies/frtib.png
-- name: General Services Administration
+  logo: fema.png
+-
+  name: Federal Retirement Thrift Investment Board
+  logo: frtib.png
+-
+  name: General Services Administration
   acronym: GSA
-  logo: /assets/img/logos/gsa-logo.svg
-- name: National Geospatial-Intelligence Agency
+  logo: gsa-logo.svg
+-
+  name: National Geospatial-Intelligence Agency
   acronym: NGA
-  logo: /assets/img/logos/agencies/nga.png
-- name: National Institute of Standards and Technology
+  logo: nga.png
+-
+  name: National Institute of Standards and Technology
   acronym: NIST
-  logo: /assets/img/logos/agencies/nist.png
-- name: National Oceanic and Atmospheric Administration
+  logo: nist.png
+-
+  name: National Oceanic and Atmospheric Administration
   acronym: NOAA
-  logo: /assets/img/logos/agencies/noaa.png
-- name: National Science Foundation
+  logo: noaa.png
+-
+  name: National Science Foundation
   acronym: NSF
-  logo: /assets/img/logos/agencies/nsf.png
-- name: The Library of Congress
-  logo: /assets/img/logos/agencies/loc.png
-- name: U.S. Tax Court
-  logo: /assets/img/logos/agencies/tax-court.png
-- name: Environmental Protection Agency
+  logo: nsf.png
+-
+  name: The Library of Congress
+  logo: loc.png
+-
+  name: U.S. Tax Court
+  logo: tax-court.png
+-
+  name: Environmental Protection Agency
   acronym: EPA
-  logo: /assets/img/logos/agencies/EPA.png
-- name: National Aeronautics and Space Administration
+  logo: EPA.png
+-
+  name: National Aeronautics and Space Administration
   acronym: NASA
-  logo: /assets/img/logos/agencies/NASA.svg
-- name: National Archives and Records Administration
+  logo: NASA.svg
+-
+  name: National Archives and Records Administration
   acronym: NARA
-  logo: /assets/img/logos/agencies/NARA.png
-- name: Nuclear Regulatory Commission
-  logo: /assets/img/logos/agencies/NRC.svg
-- name: Office of Management and Budget
+  logo: NARA.png
+-
+  name: Nuclear Regulatory Commission
+  logo: NRC.svg
+-
+  name: Office of Management and Budget
   acronym: OMB
-  logo: /assets/img/logos/agencies/OMB.svg
-- name: Office of Personnel Management
+  logo: OMB.svg
+  featured: true
+-
+  name: Office of Personnel Management
   acronym: OPM
-  logo: /assets/img/logos/agencies/OPM.svg
-- name: Alaska Department of Health and Social Services
-  logo: /assets/img/logos/agencies/alaska-dhss.png
-- name: California Child Welfare Digital Services
+  logo: OPM.svg
+-
+  name: Alaska Department of Health and Social Services
+  logo: alaska-dhss.png
+-
+  name: California Child Welfare Digital Services
   acronym: CWDS
-  logo: /assets/img/logos/agencies/cwds.png
-- name: State of Vermont Agency of Human Services
-  logo: /assets/img/logos/agencies/vermont.png
-- name: Securities and Exchange Commission
+  logo: cwds.png
+-
+  name: State of Vermont Agency of Human Services
+  logo: vermont.png
+-
+  name: Securities and Exchange Commission
   acronym: SEC
-  logo: /assets/img/logos/agencies/SEC.svg
-- name: Small Business Administration
+  logo: SEC.svg
+-
+  name: Small Business Administration
   acronym: SBA
-  logo: /assets/img/logos/agencies/SBA.svg
-- name: Social Security Administration
-  logo: /assets/img/logos/agencies/SSA.png
-- name: U.S. Postal Service
+  logo: SBA.svg
+-
+  name: Social Security Administration
+  logo: SSA.png
+-
+  name: State of Wisconsin
+  logo: wisconsin.svg
+  featured: true
+-
+  name: U.S. Postal Service
   acronym: USPS
-  logo: /assets/img/logos/agencies/USPS.svg
+  logo: USPS.svg
diff --git a/_data/anchor.yml b/_data/anchor.yml
new file mode 100644
index 000000000..0b91ab6a7
--- /dev/null
+++ b/_data/anchor.yml
@@ -0,0 +1,30 @@
+site_name: 18f.gsa.gov
+site_email: 18f@gsa.gov
+site_url: https://18f.gsa.gov
+site_about: https://18f.gsa.gov/about
+agency: U.S. General Services Administration
+agency_acronym: GSA
+agency_logo: /assets/img/logos/gsa-logo-w100.png
+agency_url: https://www.gsa.gov
+agency_about_url: https://www.gsa.gov/about
+org_primary: Technology Transformation Services
+org_primary_acronym: TTS
+org_primary_url: https://www.gsa.gov/tts/
+org_primary_email: tts-info@gsa.gov
+org_primary_about: https://www.gsa.gov/tts/
+org_primary_bio: "As part of GSA’s Technology Transformation Services (TTS), we apply modern methodologies and technologies to improve the public’s experience with government. We help agencies make their services more accessible, efficient, and effective with modern applications, platforms, processes, personnel, and software solutions."
+org_secondary: Office of 18F
+org_secondary_b: Office of 18F
+org_secondary_acronym: TTS Solutions
+org_secondary_url: https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/18f
+org_secondary_email: tts-info@gsa.gov
+org_secondary_about: https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/18f
+org_secondary_bio: "TTS Solutions is a portfolio of products and services that help agencies improve delivery of information and services to the public."
+foia_request_url: "https://www.gsa.gov/reference/freedom-of-information-act-foia"
+fraud_waste_abuse_url: "https://www.gsaig.gov/"
+no_fear_act_url: "https://www.gsa.gov/about-us/organization/office-of-civil-rights/notification-and-federal-employee-antidiscrimination-and-retaliation-act-of-2002"
+budget_performance_url: "https://www.gsa.gov/reference/reports/budget-performance"
+accessibility_url: "https://www.gsa.gov/website-information/accessibility-aids"
+usagov_contact_url: "https://www.usa.gov/contact"
+about_gsa_url: "https://www.gsa.gov/about"
+privacy_policy_url: "https://www.gsa.gov/website-information/website-policies#privacy"
diff --git a/_data/favicons.yml b/_data/favicons.yml
deleted file mode 100644
index bc5717040..000000000
--- a/_data/favicons.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# This is the configuration for the site favicons.
-
-- rel: shortcut icon
-  type: image/ico
-  href: /assets/img/favicons/18f-favicon.ico
-- rel: icon
-  type: image/png
-  href: /assets/img/favicons/18f-favicon.png
-- rel: icon
-  type: image/png
-  sizes: 192x192
-  href: /assets/img/favicons/18f-favicon-192.png
-- rel: apple-touch-icon-precomposed
-  href: /assets/img/favicons/18f-favicon-57.png
-- rel: apple-touch-icon-precomposed
-  sizes: 72x72
-  href: /assets/img/favicons/18f-favicon-72.png
-- rel: apple-touch-icon-precomposed
-  sizes: 114x114
-  href: /assets/img/favicons/18f-favicon-114.png
-- rel: apple-touch-icon-precomposed
-  sizes: 144x144
-  href: /assets/img/favicons/18f-favicon-144.png
\ No newline at end of file
diff --git a/_data/featured.yml b/_data/featured.yml
new file mode 100644
index 000000000..4b67c068b
--- /dev/null
+++ b/_data/featured.yml
@@ -0,0 +1,14 @@
+blog:
+  tags:
+    - acquisition-services
+    - agile
+    - culture-change
+    - how-we-work
+    - lessons-learned
+case_studies:
+  - agency: U.S. Forest Service
+  - agency: Alaska Department of Health and Social Services
+  - agency: Department of Justice
+  - agency: U.S. Tax Court
+  - agency: Department of the Treasury
+  - agency: Department of State
diff --git a/_data/featured_agencies.yml b/_data/featured_agencies.yml
deleted file mode 100644
index b8869598a..000000000
--- a/_data/featured_agencies.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- name: U.S. Air Force
-  acronym: USAF
-  logo: /assets/img/logos/agencies/usaf.png
-- name: Department of Justice
-  acronym: DOJ
-  logo: /assets/img/logos/agencies/USDOJ.svg
-- name: Health and Human Services
-  acronym: HHS
-  logo: /assets/img/logos/agencies/USDHHS.png
-- name: Department of the Interior
-  logo: /assets/img/logos/agencies/USDOI.svg
-  acronym: DOI
-- name: State of Wisconsin
-  logo: /assets/img/logos/agencies/wisconsin.svg
-- name: Office of Management and Budget
-  acronym: OMB
-  logo: /assets/img/logos/agencies/OMB.svg
diff --git a/_data/featured_blog_content.yml b/_data/featured_blog_content.yml
deleted file mode 100644
index 3b8cd43c9..000000000
--- a/_data/featured_blog_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-topics:
-  - topic: Acquisition Services
-    tag: acquisition-services
-  - topic: Agile
-    tag: agile
-  - topic: Culture change
-    tag: culture-change
-  - topic: How we work
-    tag: how-we-work
-  - topic: Lessons Learned
-    tag: lessons-learned
-promoted_posts:
-  - title: 18F and TTS Office of Acquisition award first assisted acquisition
-    url: /2020/12/17/18f-and-tts-office-of-acquisition-award-first-assisted-acquisition/
-  - title: A dashboard for privacy offices
-    url: /2020/12/15/a-dashboard-for-privacy-offices/
-  - title: Introducing the U.S. Web Design Standards
-    url: /2015/09/28/web-design-standards/
-  - title: An agile software development solicitation guide
-    url: /2019/08/20/an-agile-software-development-solicitation-guide/
-  - title: 18F’s best practices for making distributed teams work
-    url: /2015/10/15/best-practices-for-distributed-teams/
\ No newline at end of file
diff --git a/_data/featured_services.yml b/_data/featured_services.yml
deleted file mode 100644
index 16a42c00c..000000000
--- a/_data/featured_services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- agency: U.S. Forest Service
-- agency: Alaska Department of Health and Social Services
-- agency: Department of Justice
-- agency: U.S. Tax Court
-- agency: Department of the Treasury
-- agency: Department of State
diff --git a/_data/guides.yml b/_data/guides.yml
index 16b6b8597..5c2c4e2b1 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -1,4 +1,6 @@
-#"promoted" is being used for layout, and per the design, it should only be set to true for two guides at a time
+# "promoted" is being used for layout, and per the design,
+# it should only be set to true for two guides at a time.
+# TODO: Create a validation to make sure it's only two
 
 - name: "Accessibility"
   link: "https://guides.18f.gov/accessibility"
diff --git a/_data/site.yaml b/_data/site.yaml
index 03f8bc7ed..d44ff8192 100644
--- a/_data/site.yaml
+++ b/_data/site.yaml
@@ -4,6 +4,8 @@ description: >- # this means to ignore newlines
   interaction between government and the people and businesses
   it serves.
 
+locale: en-US
+
 host: https://18f.gsa.gov
 
 # Twitter handle. Only the handle, not the URL.
@@ -13,7 +15,7 @@ dap:
   agency: GSA
   subagency: TTS,18F
 
-ga:
+google-analytics:
   ua: 'G-HBYXWFP794'
 
 # Search.gov configuration
diff --git a/_data/social_media.yml b/_data/social_media.yml
index 352487638..038e38cb3 100644
--- a/_data/social_media.yml
+++ b/_data/social_media.yml
@@ -1,20 +1,24 @@
-- platform: "GitHub"
-  link: "https://github.com/18F"
+-
+  platform: GitHub
+  link: https://github.com/18F
   image:
-    light: "/assets/img/social-icons/svg/github-lightest.svg"
-    dark: "/assets/img/social-icons/svg/github-darkest.svg"
-- platform: "Twitter"
-  link: "https://twitter.com/18F" 
+    light: /assets/img/social-icons/svg/github-lightest.svg
+    dark: /assets/img/social-icons/svg/github-darkest.svg
+-
+  platform: Twitter
+  link: https://twitter.com/18F
   image:
-    light: "/assets/img/social-icons/svg/twitter-lightest.svg"
-    dark: "/assets/img/social-icons/svg/twitter-darkest.svg"
-- platform: "LinkedIn"
-  link: "https://www.linkedin.com/company/gsa18f" 
+    light: /assets/img/social-icons/svg/twitter-lightest.svg
+    dark: /assets/img/social-icons/svg/twitter-darkest.svg
+-
+  platform: LinkedIn
+  link: https://www.linkedin.com/company/gsa18f
   image:
-    light: "/assets/img/social-icons/svg/linkedin-lightest.svg"
-    dark: "/assets/img/social-icons/svg/linkedin-darkest.svg"
-- platform: "RSS feed"
-  link: "/feed.xml" 
+    light: /assets/img/social-icons/svg/linkedin-lightest.svg
+    dark: /assets/img/social-icons/svg/linkedin-darkest.svg
+-
+  platform: RSS feed
+  link: /feed/
   image:
-    light: "/assets/img/social-icons/svg/rss-lightest.svg"
-    dark: "/assets/img/social-icons/svg/rss25.svg"
+    light: /assets/img/social-icons/svg/rss-lightest.svg
+    dark: /assets/img/social-icons/svg/rss25.svg
diff --git a/_data/theme.yml b/_data/theme.yml
index 8e2439dbb..223ecb860 100644
--- a/_data/theme.yml
+++ b/_data/theme.yml
@@ -1,10 +1,10 @@
 # Header colors
-colors:  
+colors:
   header:
-    header-bg: 'white'
+    header-bg: white
   top-navigation:
-    top-nav-bg: 'white'
-    top-nav-link: 'base-dark'
-    top-nav-link-hover: 'accent-cool'
-    top-nav-link-hover-bg: 'white'
-    top-nav-link-current: 'accent-cool'
+    top-nav-bg: white
+    top-nav-link: base-dark
+    top-nav-link-hover: accent-cool
+    top-nav-link-hover-bg: white
+    top-nav-link-current: accent-cool
diff --git a/_data/usa_anchor.yml b/_data/usa_anchor.yml
deleted file mode 100644
index d13988125..000000000
--- a/_data/usa_anchor.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-anchor_data:
-    - site_name: 18f.gsa.gov
-      site_email: 18f@gsa.gov
-      site_url: https://18f.gsa.gov
-      site_about: https://https://18f.gsa.gov/about
-      agency: U.S. General Services Administration
-      agency_acronym: GSA
-      agency_logo: /assets/img/logos/gsa-logo-w100.png
-      agency_url: https://www.gsa.gov
-      agency_about_url: https://www.gsa.gov/about
-      org_primary: Technology Transformation Services
-      org_primary_acronym: TTS
-      org_primary_url: https://www.gsa.gov/tts/
-      org_primary_email: tts-info@gsa.gov
-      org_primary_about: https://www.gsa.gov/tts/
-      org_primary_bio: "As part of GSA’s Technology Transformation Services (TTS), we apply modern methodologies and technologies to improve the public’s experience with government. We help agencies make their services more accessible, efficient, and effective with modern applications, platforms, processes, personnel, and software solutions."
-      org_secondary: Office of 18F
-      org_secondary_b: Office of 18F
-      org_secondary_acronym: TTS Solutions
-      org_secondary_url: https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/18f
-      org_secondary_email: tts-info@gsa.gov
-      org_secondary_about: https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/18f
-      org_secondary_bio: "TTS Solutions is a portfolio of products and services that help agencies improve delivery of information and services to the public."
-      foia_request_url: "https://www.gsa.gov/reference/freedom-of-information-act-foia"
-      fraud_waste_abuse_url: "https://www.gsaig.gov/"
-      no_fear_act_url: "https://www.gsa.gov/about-us/organization/office-of-civil-rights/notification-and-federal-employee-antidiscrimination-and-retaliation-act-of-2002"
-      budget_performance_url: "https://www.gsa.gov/reference/reports/budget-performance"
-      accessibility_url: "https://www.gsa.gov/website-information/accessibility-aids"
-      usagov_contact_url: "https://www.usa.gov/contact"
-      about_gsa_url: "https://www.gsa.gov/about"
-      privacy_policy_url: "https://www.gsa.gov/website-information/website-policies#privacy"
diff --git a/_includes/back-to-blog.html b/_includes/back-to-blog.html
new file mode 100644
index 000000000..1053f513a
--- /dev/null
+++ b/_includes/back-to-blog.html
@@ -0,0 +1 @@
+<a href="{{ "/blog/" | url }}" class="display-flex flex-align-center"><span class="usa-sr-only">Back to</span>{%- include "svg/icons/arrow-left.svg" -%}<span class="margin-left-05">18F Blog </span> </a>
diff --git a/_includes/banner-cta.html b/_includes/banner-cta.html
index e7bc15b54..18ee670dc 100644
--- a/_includes/banner-cta.html
+++ b/_includes/banner-cta.html
@@ -2,10 +2,14 @@
   <div class="grid-container">
     <div class="grid-row">
       <div class="grid-col">
-          <p class="font-sans-lg text-white">Work with us to plan successful projects, choose better vendors, build custom software, or learn how to work in new ways.</p>
-          <a class="usa-button an18f-button--accent" href="{{ site.baseurl }}/contact/">Contact us</a>
-        </div>
+        <p class="font-sans-lg text-white">
+          Work with us to plan successful projects, choose better vendors, build custom software, or learn how to work in new ways.
+        </p>
+        <a class="usa-button an18f-button--accent" href="{{ "/contact/" | url }}">
+          Contact us
+        </a>
       </div>
     </div>
   </div>
+</div>
 </section>
diff --git a/_includes/breadcrumb.html b/_includes/breadcrumb.html
deleted file mode 100644
index fa5f1a81d..000000000
--- a/_includes/breadcrumb.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% assign parent_title = include.parent_title | default: page.parent_title %}
-{% assign parent_permalink = include.parent_permalink | default: page.parent_permalink %}
-
-{% assign sub_parent_agency = include.sub_parent_agency | default: page.sub_parent_agency %}
-{% assign sub_parent_permalink = include.sub_parent_permalink | default: page.sub_parent_permalink %}
-
-{% assign page_agency = include.page_agency | default: page.agency %}
-<div class="grid-container">
-<nav class="usa-breadcrumb" aria-label="Breadcrumbs">
-  <ol class="usa-breadcrumb__list">
-    <li class="usa-breadcrumb__list-item">
-      <a href="{{ site.baseurl }}/" class="usa-breadcrumb__link">
-        <span>Home</span>
-      </a>
-    </li>
-    <li class="usa-breadcrumb__list-item">
-      <a href="{{ site.baseurl }}{{ parent_permalink }}" class="usa-breadcrumb__link">
-        <span>{{ parent_title }}</span>
-      </a>
-    </li>
-    {% if sub_parent_title and sub_parent_permalink %}
-    <li class="usa-breadcrumb__list-item">
-      <a href="{{ site.baseurl }}{{ sub_parent_permalink }}" class="usa-breadcrumb__link">
-        <span>{{ sub_parent_agency }}</span>
-      </a>
-    </li>
-    {% endif %}
-    <li class="usa-breadcrumb__list-item">
-      <span>{{ page_agency }}</span>
-    </li>
-  </ol>
-</nav>
-</div>
diff --git a/_includes/card-project.html b/_includes/card-project.html
index 7f16db1f7..c43882001 100644
--- a/_includes/card-project.html
+++ b/_includes/card-project.html
@@ -2,38 +2,37 @@
 This partial outputs a card that displays a project title, the associated agency logo, and an excerpt. The expected argument for this partial is the markdown file name for the project, which is in the "_services_projects" directory.
 {% endcomment %}
 
-{% assign project = site | find_collection: 'services_projects' | where: 'slug', include.project | first %}
-{% assign card_link = project.permalink | prepend: site.baseurl %}
-
+{% assign project = collections.services | where: 'fileSlug', project_id | first %}
 
 <div class="usa-card__container">
   <header class="usa-card__header">
-    {% if project.agency %}
-      <div class="display-flex flex-align-center"> 
-        {% assign agency = site.data.agencies | where: "name", project.agency | first %}
-        {% assign agency_logo = agency.logo %}
-        {% unless agency_logo %}
-          {% if project.agency_logo %}
-            {% assign agency_logo = project.agency_logo %}
-          {% endif %}
-        {% endunless %}
-        {% if agency_logo %} 
-        <img src= "{{ site.baseurl }}{{ agency_logo }}" 
+    {% comment %}
+      code smell: nil checks / timid code
+      This template is uncertain about the presence of project.data.agency, agency.logo, project.url, and project.data.title. If any of those are missing, this template doesn't work or look good.
+
+      A better way to handle would be to enforce some data guarantees in a pre-build stage, or have the
+      template error out.
+    {% endcomment %}
+    {% if project.data.agency %}
+      <div class="display-flex flex-align-center">
+        {% assign agency = agencies | where: "name", project.data.agency | first %}
+        {% if agency.logo %}
+        <img src="/assets/img/logos/agencies/{{ agency.logo }}"
              class="maxw-8 margin-right-2"
              alt=""
         >
         {% endif %}
-        <p class="line-height-sans-2 text-bold margin-top-0">{{ project.agency }}</p>
+        <p class="line-height-sans-2 text-bold margin-top-0">{{ agency.name }}</p>
       </div>
     {% endif %}
-    {% if card_link and project.title %}
-    <a href="{{ card_link }}">
-      <h3 class="margin-top-3 text-bold">{{ project.title }}</h3>
+    {% if project.url and project.data.title %}
+    <a href="{{ project.url }}">
+      <h3 class="margin-top-3 text-bold">{{ project.data.title }}</h3>
     </a>
-    {% endif %}        
+    {% endif %}
   </header>
 
   <div class="usa-card__body">
-    <p class="margin-top-2">{{ project.excerpt }}</p>
+    <p class="margin-top-2">{{ project.data.excerpt }}</p>
   </div>
 </div>
diff --git a/_includes/card-with-image-guides.html b/_includes/card-with-image-guides.html
index ad55c1a65..7a81ff00f 100644
--- a/_includes/card-with-image-guides.html
+++ b/_includes/card-with-image-guides.html
@@ -1,22 +1,45 @@
 {% comment %}
-This partial outputs a card with a heading, icon, descriptive text, a link, and, optionally, a hero image.
-It was spun off from the "card-with-image" partial to accomodate the unique needs of the guides index page.
-The whole card is no longer a clickable link. In the future, these might be condensed back down
-into a single partial and class, but it will probably require some more conditional statements
-because the behaviors are so different.
-
-The expected arguments for this partial are:
-link_url - the url the links on the card will link to (href)
-image_path - the path to the image, note that the partial will prepend the site baseurl
-text_content - the text to be displayed next to the image; the guide name
-text_descrip - the longer description to be displayed under the card heading
-
-Optional arguments:
-card_color - if set to "dark" will make the card background the primary-dark color. Otherwise will default to a white background.
-image_alt_text - will be the alt text for the image. If this argument isn’t provided alt text will be set to “” and the image will be ignored by screen readers.
-image_side - if set to "right" will place the image on the right side of the card. Otherwise the image will default to the left side.
-image_size - if set to "md" will set the max image size to 8 units. Otherwise the image will default to a max size of 6 units.
-hero.url - for guides where "promoted" = true, this will be the hero image for the card.
+This partial outputs a card with a heading, icon, descriptive text, a
+link, and, optionally, a hero image. It was spun off from the
+"card-with-image" partial to accomodate the unique needs of the guides
+index page.
+
+The whole card is no longer a clickable link. In the future, these
+might be condensed back down into a single partial and class, but it
+will probably require some more conditional statements because the
+behaviors are so different.
+
+Required arguments
+------------------
+link_url
+the url the links on the card will link to (href)
+
+image_path
+the path to the image, note that the partial will prepend the site baseurl
+
+text_content
+the text to be displayed next to the image; the guide name
+
+text_descrip
+the longer description to be displayed under the card heading
+
+Optional arguments
+------------------
+card_color
+if set to "dark" will make the card background the primary-dark color. Otherwise will default to a white background.
+
+image_alt_text
+will be the alt text for the image. If this argument isn’t provided alt text will be set to “” and the image will be ignored by screen readers.
+
+image_side
+if set to "right" will place the image on the right side of the card. Otherwise the image will default to the left side.
+
+image_size
+if set to "md" will set the max image size to 8 units. Otherwise the image will default to a max size of 6 units.
+
+hero_url
+for guides where "promoted" = true, this will be the hero image for the card.
+
 {% endcomment %}
 
 <div class="card-with-image-guides display-flex flex-column radius-lg">
diff --git a/_includes/card-with-image.html b/_includes/card-with-image.html
index 0b583e980..a3b87d9b8 100644
--- a/_includes/card-with-image.html
+++ b/_includes/card-with-image.html
@@ -1,16 +1,32 @@
 {% comment %}
 This partial outputs a card with image and text. The whole card is a clickable link.
 
-The expected arguments for this partial are:
-link_url - the url the card will link to (href)
-image_path - the path to the image, note that the partial will prepend the site baseurl
-text_content - the text to be displayed next to the image
-
-Optional arguments:
-card_color - if set to "dark" will make the card background the primary-dark color. Otherwise will default to a white background.
-image_alt_text - will be the alt text for the image. If this argument isn’t provided alt text will be set to “” and the image will be ignored by screen readers.
-image_side - if set to "right" will place the image on the right side of the card. Otherwise the image will default to the left side.
-image_size - if set to "md" will set the max image size to 8 units. Otherwise the image will default to a max size of 6 units.
+Required arguments
+------------------
+link_url
+the url the card will link to (href)
+
+image_path
+the path to the image, note that the partial will prepend the site baseurl
+
+text_content
+the text to be displayed next to the image
+
+
+Optional arguments
+------------------
+card_color
+if set to "dark" will make the card background the primary-dark color. Otherwise will default to a white background.
+
+image_alt_text
+will be the alt text for the image. If this argument isn’t provided alt text will be set to “” and the image will be ignored by screen readers.
+
+image_side
+if set to "right" will place the image on the right side of the card. Otherwise the image will default to the left side.
+
+image_size
+if set to "md" will set the max image size to 8 units. Otherwise the image will default to a max size of 6 units.
+
 {% endcomment %}
 
 <a href="{{ link_url }}"
diff --git a/_includes/feature-image.html b/_includes/feature-image.html
index d8a0e1803..3d5cfa397 100644
--- a/_includes/feature-image.html
+++ b/_includes/feature-image.html
@@ -1,6 +1,6 @@
-{% assign include_image = include.image | default: page.image %}
-{% assign include_image_alt = include.image | default: page.image_alt | default: "" %}
-{% assign include_figcaption = include.image_figcaption | default: page.image_figcaption %}
+{% assign include_image = image | default: page.image %}
+{% assign include_image_alt = image | default: page.image_alt | default: "" %}
+{% assign include_figcaption = image_figcaption | default: page.image_figcaption %}
 
 {% if page.hero %}
 <figure class="post-feature_image" role="img" title="{{ include_image_alt }}" style="background-image: url('{{ site.baseurl }}{{ include_image }}')">
diff --git a/_includes/featured-posts.html b/_includes/featured-posts.html
index d3bbec7ba..6b98a5d10 100644
--- a/_includes/featured-posts.html
+++ b/_includes/featured-posts.html
@@ -1,7 +1,6 @@
-{% assign featured_posts = include.related_posts %}
-
+{% assign featured_posts = related_posts %}
 {% if featured_posts.size > 0 %}
-{% if include.color_mode == "dark"%}
+{% if color_mode == "dark"%}
   {% assign border_color = "border-primary-lightest" %}
   {% assign text_color = "text-white" %}
   {% assign hover_color = "hover-primary-lightest" %}
@@ -10,19 +9,19 @@
   {% assign hover_color = "hover-primary-dark" %}
 {% endif %}
   <ul class="grid-row grid-gap usa-list--unstyled">
-    {% for post in featured_posts %}
-    {% if include.max_num_posts and forloop.index > include.max_num_posts %} 
-      {% break %} 
-    {% endif %}
-    <li class="grid-col-12 tablet:grid-col-6 tablet-lg:grid-col-4 margin-bottom-5 "> 
-      <a href="{{ site.baseurl }}{{ post.url }}" class="text-no-underline">
-        <h3 class="border-top-05 {{border_color}} {{ hover_color }} padding-top-3 margin-bottom-3 text-bold {{ text_color }}">
+    {% comment %}
+      Default behavior is to limit to 9 posts. (As of this writing, site usually uses 3 or 6.)
+    {% endcomment %}
+    {% for post in featured_posts limit: 9 %}
+    <li class="grid-col-12 tablet:grid-col-6 tablet-lg:grid-col-4 margin-bottom-5 ">
+      <a href="{{ post.url | url }}" class="text-no-underline">
+        <h3 class="border-top-05 {{ border_color }} {{ hover_color }} padding-top-3 margin-bottom-3 text-bold {{ text_color }}">
           {{ post.title }}
         </h3>
       </a>
-      {% if include.show_excerpt %} 
+      {% if show_excerpt %}
         {{ post.excerpt }}
-      {% endif %} 
+      {% endif %}
     </li>
     {% endfor %}
   </ul>
diff --git a/_includes/footer.html b/_includes/footer.html
index 3a4dde8d5..79f1bedae 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -3,9 +3,9 @@
     <div class="grid-container">
       <div class="grid-row">
         <div class="grid-col usa-dark-background">
-          <p class="margin-bottom-0 text-white"> This project is maintained by <a class="usa-link text-primary-dark" href="https://18f.gsa.gov/">18F</a></p>
-          <p class="margin-bottom-0 margin-top-05 text-white"> Learn more about our <a class="usa-link text-primary-dark" href="https://18f.gsa.gov/linking-policy/">Linking Policy</a></p>
-          <p class="margin-top-05 text-white"> Have questions or would like to contact us? Email us at <a class="usa-link text-primary-dark" href="mailto:18f@gsa.gov">18F@gsa.gov</a></p>
+          <p class="margin-bottom-0 text-white">This project is maintained by <a class="usa-link text-primary-dark" href="https://18f.gsa.gov/">18F</a></p>
+          <p class="margin-bottom-0 margin-top-05 text-white">Learn more about our <a class="usa-link text-primary-dark" href="https://18f.gsa.gov/linking-policy/">Linking Policy</a></p>
+          <p class="margin-top-05 text-white">Have questions or would like to contact us? Email us at <a class="usa-link text-primary-dark" href="mailto:18f@gsa.gov">18F@gsa.gov</a></p>
         </div>
       </div>
     </div>
diff --git a/_includes/graphic-block.html b/_includes/graphic-block.html
index e227f90a7..c9f172ec5 100644
--- a/_includes/graphic-block.html
+++ b/_includes/graphic-block.html
@@ -1,9 +1,9 @@
 <div class="border-bottom-05 border-primary-lightest">
-  <img src="{{ site.baseurl }}{{include.image_path}}" 
+  <img src="{{ site.baseurl }}{{ image_path }}"
        class="width-full"
-       alt="{{ include.image_alt_text }}"
-  > 
-  <p class=" font-sans-lg line-height-sans-4 padding-bottom-3" > 
-    {{ include.body_text }}
+       alt="{{ image_alt_text }}"
+  >
+  <p class=" font-sans-lg line-height-sans-4 padding-bottom-3" >
+    {{ body_text }}
   </p>
 </div>
diff --git a/_includes/heading-link.html b/_includes/heading-link.html
deleted file mode 100644
index 839b7b5c0..000000000
--- a/_includes/heading-link.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% comment %}
-Use this partial when headings links aren't generated through markdown.
-Add this partial within the heading you want to link.
-Heading id must be the same as the slug passed to this partial.
-{% endcomment %}
-<a href="#{{ slug }}"
-  class="heading-permalink"
-  aria-label="Permalink for this section">
-  <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-    <use xlink:href="#svg-link"></use>
-  </svg>
-</a>
diff --git a/_includes/hero.html b/_includes/hero.html
deleted file mode 100644
index 50e5e385f..000000000
--- a/_includes/hero.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% comment %}
-This will be displayed on the homepage. Ideally, you want to highlight key goals of the website
-{% endcomment %}
-
-<section class="usa-hero">
-  <div class="grid-container">
-    <div class="usa-hero__callout">
-      <h1 class="usa-hero__heading">This is not the Guides home page
-      </h1>
-      <p>On the web, this home page does not appear. The actual guides homepage lives in the 18F.gsa.gov repository. Look into the individual
-      guides below for the actual Guides content.</p>
-      <a class="usa-button" href="https://18f.gsa.gov/guides/">Leave to visit the actual Guides homepage</a>
-    </div>
-  </div>
-</section>
diff --git a/_includes/highlights.html b/_includes/highlights.html
deleted file mode 100644
index fcf123e9d..000000000
--- a/_includes/highlights.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% comment %}
-Use this section to highlight key elements of your site. Some
-sites will only have two while others may have six to eight.
-{% endcomment %}
-
-<section class="usa-graphic-list usa-section usa-section--dark">
-  <div class="grid-container">
-    <div class="usa-graphic-list__row grid-row grid-gap">
-      <div class="usa-media-block tablet:grid-col">
-        {% image_with_class  "./node_modules/@uswds/uswds/dist/img/circle-124.png" "usa-media-block__img" "alt text" %}
-        <div class="usa-media-block__body">
-          <h3 class="usa-graphic-list__heading">Graphic headings can vary.</h3>
-          <p>
-            Graphic headings can be used a few different ways, depending on what
-            your landing page is for. Highlight your values, specific program
-            areas, or results.
-          </p>
-        </div>
-      </div>
-      <div class="usa-media-block tablet:grid-col">
-        {% image_with_class  "./node_modules/@uswds/uswds/dist/img/circle-124.png" "usa-media-block__img" "alt text" %}
-        <div class="usa-media-block__body">
-          <h3 class="usa-graphic-list__heading">Stick to 6 or fewer words.</h3>
-          <p>
-            Keep body text to about 30 words. They can be shorter, but try to be
-            somewhat balanced across all four. It creates a clean appearance
-            with good spacing.
-          </p>
-        </div>
-      </div>
-    </div>
-    <div class="usa-graphic-list__row grid-row grid-gap">
-      <div class="usa-media-block tablet:grid-col">
-        {% image_with_class  "./node_modules/@uswds/uswds/dist/img/circle-124.png" "usa-media-block__img" "alt text" %}
-        <div class="usa-media-block__body">
-          <h3 class="usa-graphic-list__heading">
-            Never highlight anything without a goal.
-          </h3>
-          <p>
-            For anything you want to highlight here, understand what your users
-            know now, and what activity or impression you want from them after
-            they see it.
-          </p>
-        </div>
-      </div>
-      <div class="usa-media-block tablet:grid-col">
-        {% image_with_class  "./node_modules/@uswds/uswds/dist/img/circle-124.png" "usa-media-block__img" "alt text" %}
-        <div class="usa-media-block__body">
-          <h3 class="usa-graphic-list__heading">Could also have 2 or 6.</h3>
-          <p>
-            In addition to your goal, find out your users’ goals. What do they
-            want to know or do that supports your mission? Use these headings to
-            show those.
-          </p>
-        </div>
-      </div>
-    </div>
-  </div>
-</section>
diff --git a/_includes/layouts/author.html b/_includes/layouts/author.html
index 4124aa60f..6a44e974a 100644
--- a/_includes/layouts/author.html
+++ b/_includes/layouts/author.html
@@ -8,8 +8,6 @@
 Layout for author page with their blog posts
 {% endcomment %}
 
-{% assign matching_posts = collections.post | matching: author.id | sort: 'date' | reverse %}
-
 <section class="usa-section section-padding-sm">
   <div class="grid-container">
     <header>
@@ -20,6 +18,7 @@ <h1>Blog posts by {{ display_name }}</h1>
 <section class="padding-sm page-tag-results">
   <div class="grid-container">
     <hr class="hr-1-dark margin-y-0">
-    {% include "post-previews.html", posts: matching_posts, tags: tags %}
+    {% assign matching_posts = collections.posts | matching: author.id | sort: 'date' | reverse %}
+    {% include "post-previews.html", posts: matching_posts %}
   </div>
 </section>
diff --git a/_includes/layouts/base.html b/_includes/layouts/base.html
deleted file mode 100644
index 8ed2c3a8c..000000000
--- a/_includes/layouts/base.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% comment %}
-This is used for just about every page. It provides the border around the content.
-The home page uses wide.html layout, since it extends full width of page
-{% endcomment %}
-<!DOCTYPE html>
-<html lang="en">
-  {% assign was_redirected = false %}
-  {% if env.production %}
-    {% assign is_index = page.url == "/" %}
-    {% if redirect_bases[tags[0]] or is_index %}
-      {% assign was_redirected = true %}
-      {% include "meta_redirect.html", is_index: is_index %}
-    {% endif %}
-  {% endif %}
-
-  {%  unless was_redirected %}
-    {% include "meta.html" %}
-    <body class="display-flex flex-column minh-viewport">
-      {% include "header.html" %}
-      {% if tags %}
-        {% assign primary_navigation = navigation[tags] %}
-      {% else %}
-        {% assign primary_navigation = site.primary_navigation %}
-      {% endif %}
-
-      {% include "menu.html" secondary_navigation: site.secondary_navigation %}
-
-      {{ content }}
-
-      {% include "footer.html" %}
-
-      {% comment %} Hide SVG Sprites {% endcomment %}
-      <div style="display: none;">
-        {% usa_icons_sprite %}
-
-        {% comment %}
-
-        TODO: Remove once this set of icons once we've determined the usa_icons
-        above is enough. Currently, keeping both adds two sets of SVGs with duplicate IDs,
-        which is flagged as by pa11y as an accessibility error.
-
-        {% uswds_icons_sprite %}
-
-        {% endcomment %}
-
-      </div>
-
-      {% include "scripts.html" %}
-    </body>
-  {% endunless %}
-  </html>
diff --git a/_includes/layouts/blog-page.html b/_includes/layouts/blog-page.html
index e41cf7eb1..faee5e70f 100644
--- a/_includes/layouts/blog-page.html
+++ b/_includes/layouts/blog-page.html
@@ -33,15 +33,16 @@
         </div>
       </section>
     </div>
-    {% assign featured_blog_content = site.data.featured_blog_content %}
+
     <aside class="sidebar tablet:grid-offset-1 tablet:grid-col-4 padding-y-6">
       <h2 class="font-sans-md text-bold border-top-05-primary-dark padding-y-2">
       Browse by topic
       </h2>
       <ul class="usa-sidenav margin-bottom-6">
-        {% for item in featured_blog_content.topics %}
+        {% for slug in featured.blog.tags %}
+          {% assign tag = collections.tags | where: "fileSlug", slug | first %}
           <li class="usa-sidenav__item">
-            <a href="/tags/{{ item.tag }}">{{ item.topic }}</a>
+            <a href="{{ tag.url }}">{{ tag.data.name | capitalize }}</a>
           </li>
         {% endfor %}
       </ul>
diff --git a/_includes/layouts/data.html b/_includes/layouts/data.html
deleted file mode 100644
index f8a7d0b41..000000000
--- a/_includes/layouts/data.html
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: default
----
-
-{% comment %}
-This is an example showing how you can load date from the _data/ folder
-{% endcomment %}
-
-
-<div class="usa-layout-docs usa-section">
-  <div class="grid-container">
-    <div class="grid-row grid-gap">
-      <div class="usa-layout-docs__main desktop:grid-col-9 usa-prose">
-        <h1 class="title">{{title}}</h1>
-        {{ content }}
-        <ul>
-          {% for item in site.data[page.datafile] %}
-          <li>
-            <a href="{{ item.url }}"><b>{{ item.name }}</b></a>: {{item.description}}
-          </li>
-          {% endfor %}
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/_includes/layouts/default.html b/_includes/layouts/default.html
index acbb2714c..b15af64a8 100644
--- a/_includes/layouts/default.html
+++ b/_includes/layouts/default.html
@@ -1,15 +1,15 @@
----
-main: foo, bar, qaz
----
-
 <!DOCTYPE html>
-<html lang="{{ page.lang | default: site.lang | default: 'en-US' }}">
+<html lang="{{ page.locale | default: site.locale | default: 'en-US' }}">
   <head>
     {% include "meta.html" %}
     {% include "styles.html" %}
-    {% if site.google_analytics_ua or site.dap_agency %}
-      {% include "analytics.html" %}
-    {% endif %}
+    {% comment %}
+      Removing this include because it conflicts with (duplicates) "scripts.html",
+      included in many places.
+      {% if site.google-analytics.ua or site.dap.agency %}
+        {% include "analytics.html" %}
+      {% endif %}
+    {% endcomment %}
   </head>
   <body class="{{ layout.class }} {{ page.class }} {% if site.site_width %}site-{{ site.site_width }}{% endif %}">
 
diff --git a/_includes/layouts/favicons.yml b/_includes/layouts/favicons.yml
deleted file mode 100644
index b9f40c89d..000000000
--- a/_includes/layouts/favicons.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# This is the configuration for the site favicons.
-
-- rel: shortcut icon
-  type: image/ico
-  href: /assets/img/favicons/favicon.ico
-- rel: icon
-  type: image/png
-  href: /assets/img/favicons/favicon.png
-- rel: icon
-  type: image/png
-  sizes: 192x192
-  href: /assets/img/favicons/favicon-192.png
-- rel: apple-touch-icon-precomposed
-  href: /assets/img/favicons/favicon-57.png
-- rel: apple-touch-icon-precomposed
-  sizes: 72x72
-  href: /assets/img/favicons/favicon-72.png
-- rel: apple-touch-icon-precomposed
-  sizes: 114x114
-  href: /assets/img/favicons/favicon-114.png
-- rel: apple-touch-icon-precomposed
-  sizes: 144x144
-  href: /assets/img/favicons/favicon-144.png
\ No newline at end of file
diff --git a/_includes/layouts/guides.html b/_includes/layouts/guides.html
index af65ccf6c..1d27b4348 100644
--- a/_includes/layouts/guides.html
+++ b/_includes/layouts/guides.html
@@ -6,13 +6,6 @@
 
 {% assign page_title = page.subnav_title | default: page.title %}
 
-{% if page.breadcrumb %}
-{% include "breadcrumb.html"
-  page_title=page_title
-  background_class='bg-base-lightest'
-%}
-{% endif %}
-
 <section class="usa-section section-padding-sm">
   <div class="grid-container">
     <h1> {{ page.title }} </h1>
diff --git a/_includes/layouts/page.html b/_includes/layouts/page.html
deleted file mode 100644
index a6ace0bb9..000000000
--- a/_includes/layouts/page.html
+++ /dev/null
@@ -1,38 +0,0 @@
----
-layout: base
----
-
-{% comment %}
-This template is for a single page that does not have a date associated with it. For example, an about page.
-{% endcomment %}
-
-<div id="main-content" class="usa-layout-docs usa-section flex-1 tablet:padding-bottom-10 {{ layout_class }}">
-  <div class="grid-container">
-    <div class="grid-row grid-gap">
-      {%- if sidenav == true -%}
-        {%- include "sidenav.html" -%}
-      {%- endif -%}
-      <main class="usa-layout-docs__main desktop:grid-col-9
-                  usa-prose measure-5 {{tags[0] -}}"
-      >
-        {%- unless page_title_tag -%}
-          {% assign page_title_tag = "h1" %}
-        {%- endunless -%}
-        {%- if title -%}
-          {%- if hidden_guide_title -%}
-          <h1 class="usa-sr-only">{{ hidden_guide_title }}</h1>
-          {%- endif -%}
-          <{{page_title_tag}} class="page-title {{tags[0]}}">{{ title }}</{{page_title_tag}}>
-        {%- endif -%}
-        {{ content }}
-      </main>
-    </div>
-  </div>
-</div>
-
-{% if tags[0] == 'derisking' %}
-  <script src={{ '/assets/derisking/js/current-link.js' | url }}></script>
-{% endif %}
-{%- if script -%}
-  <script src="{{ script | url }}"></script>
-{%- endif -%}
diff --git a/_includes/layouts/post.html b/_includes/layouts/post.html
index 9a73e263a..f71343e3c 100644
--- a/_includes/layouts/post.html
+++ b/_includes/layouts/post.html
@@ -6,6 +6,7 @@
 {% endcomment %}
 
 {% if page.image %}
+  {% comment %}This include will probably need to pass in data explicitly.{% endcomment %}
   {% include "feature-image.html" %}
 {% endif %}
 
@@ -29,7 +30,7 @@ <h1 itemprop="name headline">{{ title }}</h1>
     <div class="grid-row grid-gap margin-top-8">
       <div class="tablet:grid-col-7">
         <div class="post-content" itemprop="articleBody">
-          {% if page.image and page.image_feature_small == true %}
+          {% if page.image and page.image_feature_small %}
             <img class="image-feature-small" src="{{ site.baseurl }}{{ page.image }}" alt="{{ page.image_accessibility }}">
           {% endif %}
 
@@ -43,34 +44,36 @@ <h1 itemprop="name headline">{{ title }}</h1>
   </div>
 </article>
 
-{% if page.previous or page.next %}
+{% assign previous = collections.posts | getPreviousCollectionItem: page %}
+{% assign next = collections.posts | getNextCollectionItem: page %}
+{% if previous or next %}
 <section class="margin-top-6 post-pagination">
   <div class="grid-container">
     <hr class="hr-1-base-lighter">
     <div class="grid-row grid-gap">
       <div class="grid-col-6">
-        {% if page.previous %}
-        <a href="{{ site.baseurl }}{{ page.previous.url }}"
+        {% if previous %}
+        <a href="{{ previous.url | url }}"
            class="text-no-underline post-pagination__link"
         >
           <h2 class="post-pagination__heading">
-            {% include svg/icons/arrow-left.svg %}
+            {% include "svg/icons/arrow-left.svg" %}
             Previous Post
           </h2>
-          <p class="measure-1 text-bold text-primary-darkest">{{ page.previous.title }}</p>
+          <p class="measure-1 text-bold text-primary-darkest">{{ previous.data.title }}</p>
         </a>
         {% endif %}
       </div>
       <div class="grid-col-6 text-right">
-        {% if page.next %}
-        <a href="{{ site.baseurl }}{{ page.next.url }}"
+        {% if next %}
+        <a href="{{ next.url | url }}"
            class="text-no-underline post-pagination__link"
         >
           <h2 class="post-pagination__heading">
             Next Post
-            {% include svg/icons/arrow-right.svg %}
+            {% include "svg/icons/arrow-right.svg" %}
           </h2>
-          <p class="measure-1 float-right text-bold text-primary-darkest text-right">&ldquo;{{ page.next.title }}&rdquo;</p>
+          <p class="measure-1 float-right text-bold text-primary-darkest text-right">{{ next.data.title }}</p>
         </a>
         {% endif %}
       </div>
@@ -82,8 +85,9 @@ <h2 class="post-pagination__heading">
 
 <section class="margin-top-3 margin-bottom-6">
   <div class="grid-container">
+    {% assign related_posts = page.related_posts | slice: 0, 3 %}
     {% include "featured-posts.html",
-      related_posts: page.related_posts,
+      related_posts: related_posts,
       show_excerpt: true
     %}
     </div>
diff --git a/_includes/layouts/primary.html b/_includes/layouts/primary.html
index 92fb23b9a..e50f0a2f2 100644
--- a/_includes/layouts/primary.html
+++ b/_includes/layouts/primary.html
@@ -6,13 +6,6 @@
 
 {% assign page_title = page.subnav_title | default: page.title %}
 
-{% if page.breadcrumb == true %}
-{% include "breadcrumb.html",
-  page_title: page_title,
-  background_class: 'bg-base-lightest'
-%}
-{% endif %}
-
 <section class="usa-section section-padding-sm">
   <div class="grid-container">
     <h1> {{ page.title }} </h1>
diff --git a/_includes/layouts/project-page.html b/_includes/layouts/project-page.html
deleted file mode 100644
index fd381e992..000000000
--- a/_includes/layouts/project-page.html
+++ /dev/null
@@ -1,148 +0,0 @@
----
-layout: default
----
-
-{% assign matching_posts = page | match_posts | sort:'date' | reverse %}
-<section class="usa-section section-padding-sm project-page">
-<div class="grid-container">
-  <div class="grid-row grid-gap">
-    {% if page.agency %}
-      <div class="grid-col-12">
-        <h1> {{ page.agency }} </h1>
-      </div>
-      <div class="grid-col-12">
-        <h2 class="margin-top-4"> {{ page.title }} </h2>
-      </div>
-    {% else %}
-      <div class="grid-col-12">
-        <h1> {{  page.title }} </h1>
-      </div>
-    {% endif %}
-  {% if page.image %}
-    <img src="{{ site.baseurl }}{{ page.image }}"
-         class="margin-top-6"
-         alt="{{ page.image_accessibility }}"
-    >
-  {% endif %}
-  </div>
-  <div class="grid-row grid-gap margin-top-8">
-  <div class="tablet:grid-col-7 margin-bottom-4 project-page__content">
-    <h2> Project details </h2>
-    {{ content }}
-  </div>
-  {% if page.agency or
-        page.project_url or
-        page.github_repo or
-        page.product_clients.size > 0 or
-        page.start_date or
-        page.expiration_date or
-        page.resources
-  %}
-  <div class="tablet:grid-offset-1 tablet:grid-col-4 project-page__sidebar">
-    <div class="border-top-05-primary-dark padding-y-2 margin-top-1">
-
-      <div>
-        <h3 class="font-sans-md text-bold margin-top-0"> Agency partner </h3>
-        <p> {{ page.agency }} </p>
-        </div>
-
-        {% if page.project_url %}
-        <div class="margin-top-4">
-          <h3 class="font-sans-md text-bold margin-bottom-1">
-            See our work
-          </h3>
-          {{- page.project_url | markdownify -}}
-        </div>
-        {% endif %}
-
-        {% if page.github_repo %}
-        <div class="margin-top-4">
-          <h3 class="font-sans-md text-bold margin-bottom-1">
-            See the code on GitHub
-          </h3>
-            <ul class="usa-list usa-list--unstyled list-item-spacing-1">
-            {% for repo in page.github_repo %}
-              <li>{{ repo | markdownify }}</a></li>
-            {% endfor %}
-            </ul>
-        </div>
-        {% endif %}
-
-        {% comment %}
-        TODO: Revisit, and possibly rephrase or combine with agency partner (singular)
-        {% endcomment %}
-        {% if page.product_clients.size > 0 %}
-        <div class="margin-top-4">
-          <h3 class="font-sans-md text-bold margin-bottom-1"> Agency partners </h3>
-          {% if page.product_client.size == 1 %}
-            {{ page.product_client }}
-          {% else %}
-          <ul class="{% if page.product_clients.size > 1 %}usa-sidenav__sublist{% endif %}">
-          {% for client in page.product_clients %}
-            <li>{{ client }}</li>
-          {% endfor %}
-          </ul>
-          {% endif %}
-        </div>
-        {% endif %}
-
-
-        {% if page.start_date or page.expiration_date %}
-        <div class="margin-top-4">
-          <h3 class="font-sans-md text-bold margin-bottom-1">When</h3>
-          <p>
-          {% if page.start_date and page.expiration_date %}
-          {{ page.start_date }} – {{ page.expiration_date }}
-          {% elsif page.start_date and page.expiration_date == false %}
-          Starts {{ page.start_date }}
-          {% elsif page.start_date == false and page.expiration_date %}
-          Ends {{ page.expiration_date }}
-          {% endif %}
-          </p>
-        </div>
-        {% endif %}
-
-        {% if page.resources.size > 0 %}
-        <div class="margin-top-4">
-          <h3 class="font-sans-md text-bold margin-bottom-1">Resources</h3>
-          {% if page.resources.size > 1 %}
-            <ul class="usa-list usa-list--unstyled list-item-spacing-1">
-              {% for resource in page.resources %}
-                <li >{{ resource | markdownify }}</li>
-              {% endfor %}
-            </ul>
-          {% else %}
-            <p> {{ pages.resources | markdownify }}</p>
-          {% endif %}
-        </div>
-        {% endif %}
-      </div>
-    </div>
-  </div>
-  {% endif %}
-</div>
-
-{% if matching_posts.size > 0 %}
-<section class="usa-section">
-  <div class="grid-container">
-    <div class="grid-row margin-bottom-6">
-      <div class="tablet:grid-col-8">
-        <h2> Related blog posts </h2>
-      </div>
-      {% if matching_posts.size > 3 %}
-      <div class="tablet:grid-col-4 flex-align-self-end margin-top-3 posts__see-all">
-        <a class="link-arrow-right" href="{{ site.baseurl }}/tags/{{ page.tag | slugify }}/">
-          See all posts about this project {% include svg/icons/arrow-right.svg %}
-        </a>
-      </div>
-      {% endif %}
-    </div>
-    {% include "featured-posts.html"
-       related_posts: matching_posts,
-       max_num_posts: 3,
-       show_excerpt: true
-    %}
-  </div>
-</section>
-{% endif %}
-
diff --git a/_includes/layouts/styled-container.html b/_includes/layouts/styled-container.html
index 80bb57432..713fe94aa 100644
--- a/_includes/layouts/styled-container.html
+++ b/_includes/layouts/styled-container.html
@@ -13,7 +13,7 @@
       </div>
       <aside class="tablet:grid-offset-1 tablet:grid-col-4 margin-bottom-2">
         {%- if page.subnav_items %}
-          {% include "subnav.html" subnav_items=page.subnav_items %}
+          {% include "subnav.html" subnav_items: page.subnav_items %}
         {% endif %}
         {%- if page.side_cta -%}
           {% include "side-cta.html" %}
diff --git a/_includes/layouts/styleguide.html b/_includes/layouts/styleguide.html
deleted file mode 100644
index 6ac4c37f1..000000000
--- a/_includes/layouts/styleguide.html
+++ /dev/null
@@ -1,45 +0,0 @@
----
-layout: primary
-title: 18F site styleguide
-sidenav:
-  - text: Overview
-    href: /styleguide/
-  - text: Layouts
-    href: /styleguide/layouts/
-    children:
-      - text: Templates
-        href: /styleguide/layouts/#templates
-      - text: Primary template
-        href: /styleguide/layouts/#primary-template
-      - text: Project page template
-        href: /styleguide/layouts/#project-page-template
-      - text: Blog post template
-        href: /styleguide/layouts/#blog-post-template
-  - text: Blog components
-    href: /styleguide/blog-components/
-    children:
-      - text: Post previews
-        href: /styleguide/blog-components/#post-previews
-      - text: Blog tags
-        href: /styleguide/blog-components/#blog-tags
-      - text: Images
-        href: /styleguide/blog-components/#images
----
-<div class="usa-section style-guide">
-  <div class="grid-container">
-    <div class="grid-row grid-gap flex-align-start">
-      {% assign sidenav = layout.sidenav %}
-      {% if sidenav %}
-        <div class="usa-layout-docs__sidenav desktop:grid-col-3{% if page.sticky_sidenav %} usa-sticky-sidenav{% endif %}">
-          {% include "sidenav.html" links=sidenav %}
-        </div>
-      {% endif %}
-
-      <div class="usa-layout-docs usa-layout-docs__main usa-prose{% if sidenav %} desktop:grid-col-9{% endif %}">
-        {{ content }}
-      </div>
-    </div>
-  </div>
-</div>
-
-
diff --git a/_includes/layouts/tag-index.html b/_includes/layouts/tag-index.html
deleted file mode 100644
index 4e176dcca..000000000
--- a/_includes/layouts/tag-index.html
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: styled-container
----
-  {{ content }}
-
-  {% capture site_tags %}{% for tag in site.tags %}{{ tag | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
-  <!-- {% assign tag_words = site_tags | split:',' | sort %} -->
-
-  {% for tag in tag_words %}
-
-  {% capture count %}
-
-  		{% for tag_number in site.tags %}
-
-  			{% if tag_number[0] == tag %}
-
-  				{{tag_number[1] | size }}
-  				<!-- <p> {{tag | size }} </p> -->
-
-  			{% endif %}
-
-  		{% endfor %}
-
-  {% endcapture %}
-
-	<p>
-    <a href="{{ site.baseurl }}/tags/{{tag | slugify }}/" >{{tag}}</a>
-    — {{count}}
-  </p>
-
-
-		<!-- <p> {{ tag | size }} </p> -->
-
-
-
-	{% endfor %}
-
diff --git a/_includes/layouts/tag-results.html b/_includes/layouts/tag-results.html
index 75bf4f7ac..61429e884 100644
--- a/_includes/layouts/tag-results.html
+++ b/_includes/layouts/tag-results.html
@@ -6,19 +6,14 @@
 {% endcomment %}
 <section class="usa-section section-padding-sm">
   <div class="grid-container">
-    <a href="{{ site.baseurl }}/blog/" class="display-flex flex-align-center"><span class="usa-sr-only">Back to</span>{%- include svg/icons/arrow-left.svg -%}<span class="margin-left-05">18F Blog </span> </a>
-    {% assign numberof = page.posts | size %}
-    <h1 class="margin-top-2">{{ numberof }} {% if numberof == 1 %}post{% else %}posts{% endif %} tagged with "{{ page.title }}" </h1>
+    {% include "back-to-blog.html" %}
+    <h1 class="margin-top-2">{{ tag.data.posts_count }} {% if tag.data.posts_count == 1 %}post{% else %}posts{% endif %} tagged with "{{ tag.data.name }}" </h1>
   </div>
 </section>
 
 <section class="padding-sm page-tag-results">
   <div class="grid-container">
     <hr class="hr-1-dark margin-y-0">
-    {%
-      include "post-previews.html",
-      posts: page.posts,
-      tags: page.tags
-    %}
+    {% include "post-previews.html", posts: tag.data.posts %}
   </div>
 </section>
diff --git a/_includes/logo.html b/_includes/logo.html
index 4d5db4ec7..b6806b162 100644
--- a/_includes/logo.html
+++ b/_includes/logo.html
@@ -1,3 +1,3 @@
 <div class="usa-logo" id="extended-logo">
-  <a class="display-flex flex-align-center" href="/" title="Home" aria-label="Home">{% image_with_class "assets/_common/_img/18f-logo.svg" "maxw-6 margin-right-105" "18f" %}<em class="usa-logo__text">Home</em></a>
+  <a class="display-flex flex-align-center" href="/" title="Home" aria-label="Home">{% image_with_class "assets/common/img/18f-logo.svg" "maxw-6 margin-right-105" "18f" %}<em class="usa-logo__text">Home</em></a>
 </div>
diff --git a/_includes/menu.html b/_includes/menu.html
index 682798f6a..35aa7bab9 100644
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -1,6 +1,8 @@
-{% comment %} To modify the menu system, you are welcome to edit this HTML
+{% comment %}
+To modify the menu system, you are welcome to edit this HTML
 directly or you can look inside _config.yml where we provide an easy way to
-manage your navigation system {% endcomment %}
+manage your navigation system
+{% endcomment %}
 
 <header class="usa-header usa-header--extended" role="banner">
   <div class="usa-navbar">
diff --git a/_includes/meta.html b/_includes/meta.html
index b6a813f35..ffaad60ff 100644
--- a/_includes/meta.html
+++ b/_includes/meta.html
@@ -41,12 +41,12 @@
 
 <!-- Favicon
      ================================================== -->
-<link rel="icon" type="image/png" sizes="16x16" href="{{'/img/favicons/favicon-16x16.png' | url }}">
-<link rel="icon" type="image/png" sizes="32x32" href="{{'/img/favicons/favicon-32x32.png' | url }}">
-<link rel="icon" type="image/png" sizes="192x192" href="{{'/img/favicons/favicon-192x192.png' | url }}">
-<link rel="icon" type="image/svg+xml" href="{{'/img/favicons/favicon.svg' | url }}">
-<link rel="shortcut icon" type="image/x-icon" href="{{'/favicon.ico' | url }}" />
-<link rel="apple-touch-icon" sizes="180x180" href="{{'/img/favicons/favicon-180x180.png' | url }}">
+<link rel="icon" type="image/png" sizes="16x16" href="{{ "/img/favicons/favicon-16x16.png" | url }}">
+<link rel="icon" type="image/png" sizes="32x32" href="{{ "/img/favicons/favicon-32x32.png" | url }}">
+<link rel="icon" type="image/png" sizes="192x192" href="{{ "/img/favicons/favicon-192x192.png" | url }}">
+<link rel="icon" type="image/svg+xml" href="{{ "/img/favicons/favicon.svg" | url }}">
+<link rel="shortcut icon" type="image/x-icon" href="{{ "/favicon.ico" | url }}" />
+<link rel="apple-touch-icon" sizes="180x180" href="{{ "/img/favicons/favicon-180x180.png" | url }}">
 
 <!-- CSS
      ================================================== -->
diff --git a/_includes/meta_redirect.html b/_includes/meta_redirect.html
index 28df477b9..eaff1f7c2 100644
--- a/_includes/meta_redirect.html
+++ b/_includes/meta_redirect.html
@@ -8,7 +8,7 @@
     {% assign guide_name = tags[0] %}
     {% assign redirect_base = redirect_bases[guide_name] %}
     {% assign page_path = page.url | remove: titles_roots[guide_name].root %}
-    <meta http-equiv="refresh" content="0;URL='{{redirect_base | append: page_path}}'" />
+    <meta http-equiv="refresh" content="0;URL='{{ redirect_base | append: page_path }}'" />
   {% endif %}
 </head>
 <!-- END META REDIRECT -->
diff --git a/_includes/pagination-links.html b/_includes/pagination-links.html
deleted file mode 100644
index 47f0b330f..000000000
--- a/_includes/pagination-links.html
+++ /dev/null
@@ -1,161 +0,0 @@
-{% for p in pagination.pages %}
-  {% if page.url == pagination.hrefs[ forloop.index0 ] %}
-    {% assign current_page_number = forloop.index %}
-  {% endif %}
-{% endfor %}
-
-
-{% assign total_pages = pagination.pages | size %}
-{% assign first_page_diff = current_page_number | minus: 1 %}
-{% assign last_page_diff = total_pages | minus: current_page_number %}
-
-{% if total_pages > 1 %}
-<nav aria-label="Pagination" class="usa-pagination padding-top-2">
-  <ul class="usa-pagination__list">
-    {% if pagination.href.previous %}
-    <li class="usa-pagination__item usa-pagination__arrow">
-      <a
-        href="{{ pagination.href.previous | url }}"
-        class="usa-pagination__link usa-pagination__previous-page"
-        aria-label="Previous page"
-      >
-        {% uswds_icon "navigate_before" %}
-        <span class="usa-pagination__link-text"> Previous </span>
-      </a>
-    </li>
-    {% endif %}
-
-    <li class="usa-pagination__item usa-pagination__page-no">
-      <a
-        href="{{ pagination.href.first | url }}"
-        class="usa-pagination__button{% if current_page_number == 1 %} usa-current{% endif %}"
-        aria-label="Page {{pagination.href.first}}"
-      >
-        1
-      </a>
-    </li>
-
-    {% if first_page_diff >= 3 %}
-      <li
-        class="usa-pagination__item usa-pagination__overflow"
-        role="presentation"
-      >
-        <span> … </span>
-      </li>
-    {% endif %}
-
-    {% comment %} Show all five pages button links {% endcomment %}
-    {% if total_pages <= 5 and total_pages > 2 %}
-      {% assign midpages = total_pages | minus: 1 %}
-      {% for pageIndex in (2..midpages) %}
-        {% comment %} Account for the 0 index {% endcomment %}
-        {% assign pageIndex0 = pageIndex | minus: 1 %}
-        <li class="usa-pagination__item usa-pagination__page-no">
-          <a
-            href="{{ pagination.hrefs[pageIndex0] | url }}"
-            class="usa-pagination__button{% if current_page_number == pageIndex %} usa-current{% endif %}"
-            aria-label="Page {{pagination.hrefs[pageIndex0]}}"
-          >
-            {{ pageIndex }}
-          </a>
-        </li>
-      {% endfor %}
-    {% endif %}
-
-    {% comment %} Show three page button links in between the first and last {% endcomment %}
-    {% if first_page_diff >= 3 and last_page_diff >= 3 %}
-      {% assign previous_page_number = current_page_number | minus: 1 %}
-      {% assign next_page_number = current_page_number | plus: 1 %}
-      {% for pageIndex in (previous_page_number..next_page_number) %}
-        {% comment %} Account for the 0 index {% endcomment %}
-        {% assign pageIndex0 = pageIndex | minus: 1 %}
-        <li class="usa-pagination__item usa-pagination__page-no">
-          <a
-            href="{{ pagination.hrefs[pageIndex0] | url }}"
-            class="usa-pagination__button{% if current_page_number == pageIndex %} usa-current{% endif %}"
-            aria-label="Page {{pagination.hrefs[pageIndex0]}}"
-          >
-            {{ pageIndex }}
-          </a>
-        </li>
-      {% endfor %}
-    {% endif %}
-
-    {% comment %} Show the starting page button links and a trail to the last {% endcomment %}
-    {% if first_page_diff < 3 and last_page_diff >= 3 %}
-      {% assign previous_page_number = current_page_number | minus: 1 %}
-      {% assign next_page_number = current_page_number | plus: 1 %}
-      {% for pageIndex in (previous_page_number..next_page_number) %}
-        {% if pageIndex <= 1 %}
-          {% continue %}
-        {% endif %}
-        {% comment %} Account for the 0 index {% endcomment %}
-        {% assign pageIndex0 = pageIndex | minus: 1 %}
-        <li class="usa-pagination__item usa-pagination__page-no">
-          <a
-            href="{{ pagination.hrefs[pageIndex0] | url }}"
-            class="usa-pagination__button{% if current_page_number == pageIndex %} usa-current{% endif %}"
-            aria-label="Page {{pagination.hrefs[pageIndex0]}}"
-          >
-            {{ pageIndex }}
-          </a>
-        </li>
-      {% endfor %}
-    {% endif %}
-
-    {% comment %} Show the starting page button link, a trail to the last page button links {% endcomment %}
-    {% if first_page_diff >= 3 and last_page_diff < 3 %}
-      {% assign previous_page_number = current_page_number | minus: 1 %}
-      {% assign next_page_number = current_page_number | plus: 1 %}
-      {% for pageIndex in (previous_page_number..next_page_number) %}
-        {% comment %} Account for the 0 index {% endcomment %}
-        {% if pageIndex >= total_pages %}
-          {% continue %}
-        {% endif %}
-        {% assign pageIndex0 = pageIndex | minus: 1 %}
-        <li class="usa-pagination__item usa-pagination__page-no">
-          <a
-            href="{{ pagination.hrefs[pageIndex0] | url }}"
-            class="usa-pagination__button{% if current_page_number == pageIndex %} usa-current{% endif %}"
-            aria-label="Page {{pagination.hrefs[pageIndex0]}}"
-          >
-            {{ pageIndex }}
-          </a>
-        </li>
-      {% endfor %}
-    {% endif %}
-
-    {% if last_page_diff >= 3 %}
-      <li
-        class="usa-pagination__item usa-pagination__overflow"
-        role="presentation"
-      >
-        <span> … </span>
-      </li>
-    {% endif %}
-
-    <li class="usa-pagination__item usa-pagination__page-no">
-      <a
-        href="{{ pagination.href.last | url }}"
-        class="usa-pagination__button{% if current_page_number == total_pages %} usa-current{% endif %}"
-        aria-label="Page {{pagination.href.last}}"
-      >
-        {{ total_pages }}
-      </a>
-    </li>
-
-    {% if pagination.href.next %}
-    <li class="usa-pagination__item usa-pagination__arrow">
-      <a
-        href="{{ pagination.href.next | url }}"
-        class="usa-pagination__link usa-pagination__next-page"
-        aria-label="Next page"
-      >
-        <span class="usa-pagination__link-text"> Next </span>
-        {% uswds_icon "navigate_next" %}
-      </a>
-    </li>
-    {% endif %}
-  </ul>
-</nav>
-{% endif %}
diff --git a/_includes/post-debug.html b/_includes/post-debug.html
deleted file mode 100644
index 95a7d1c49..000000000
--- a/_includes/post-debug.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<pre>
-  title data: {{ post.data.title }}
-  authors data: {{ post.data.authors }}
-  authors count: {{ post.data.authors | size }}
-  path: {{ post.url }}
-  excerpt data: {{ post.data.excerpt }}
-</pre>
diff --git a/_includes/post-tags.html b/_includes/post-tags.html
index a4486970e..1a77b7d86 100644
--- a/_includes/post-tags.html
+++ b/_includes/post-tags.html
@@ -1,9 +1,8 @@
 <span class="post-tags display-flex flex-wrap" itemprop="keywords">
-  {% for tag in tags %}
-  <a href="{{ site.baseurl }}/{{ site.tag_dir }}/{{ tag | slugify }}/"
-     class="usa-label post-tag"
-     >
-     {{ tag }}
-  </a>
-    {% endfor %}
+  {% for name in tags %}
+    {% assign tag = collections.tags | where: "data.name", name | first %}
+    <a href="{{ tag.url | url }}" class="usa-label post-tag">
+      {{ tag.data.name }}
+    </a>
+  {% endfor %}
 </span>
diff --git a/_includes/post-title.html b/_includes/post-title.html
index 870a6cfbe..4fd6b3346 100644
--- a/_includes/post-title.html
+++ b/_includes/post-title.html
@@ -1,5 +1,5 @@
 <h2>
-   <a href="{{ url | prepend: site.baseurl }}" class="post-link text-no-underline">
-      {{ title }}
-   </a>
+  <a href="{{ url | url }}" class="post-link text-no-underline">
+    {{ title }}
+  </a>
 </h2>
diff --git a/_includes/scripts.html b/_includes/scripts.html
index 9dd0be1c4..fa75a171c 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -5,25 +5,27 @@
 {% if site.dap.agency %}
 <script
   id="_fed_an_ua_tag"
-  src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency={{site.dap.agency}}{% if site.dap.subagency %}&subagency={{site.dap.subagency}}{% endif %}"
+  src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency={{ site.dap.agency }}{% if site.dap.subagency %}&subagency={{ site.dap.subagency }}{% endif %}"
 ></script>
 {% endif %}
 
-{% if site.ga.ua %}
+{% if site.google-analytics.ua %}
 <!-- Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.ga.ua }}"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google-analytics.ua }}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag() { dataLayer.push(arguments); }
   gtag('js', new Date());
-  gtag('config', '{{ site.ga.ua }}', { 'anonymize_ip': true });
+  gtag('config', '{{ site.google-analytics.ua }}', { 'anonymize_ip': true });
 </script>
 {% endif %}
 
 {% if site.searchgov %}
-  {% if site.searchgov.suggestions == true %}
+  {% if site.searchgov.suggestions %}
     <script>
-          var usasearch_config = { siteHandle: "{{ site.searchgov.affiliate }}" };
+      var usasearch_config = {
+        siteHandle: "{{ site.searchgov.affiliate }}"
+      };
     </script>
     <script async src="https://search.usa.gov/javascripts/remote.loader.js" type="text/javascript"></script>
   {% endif %}
diff --git a/_includes/searchgov/form.html b/_includes/searchgov/form.html
index 21f9510a6..f5920c6e1 100644
--- a/_includes/searchgov/form.html
+++ b/_includes/searchgov/form.html
@@ -3,14 +3,14 @@
 {% endcomment %}
 
 {% if searchgov %}
-  {% if searchgov.inline == true %}
+  {% if searchgov.inline %}
     <form id="search_form" class="usa-search usa-search--small" action="{{ '/search/' | url }}" accept-charset="UTF-8" method="get">
   {% else %}
-    <form id="search_form" class="usa-search usa-search--small" action="{{searchgov.endpoint}}/search" accept-charset="UTF-8" method="get">
+    <form id="search_form" class="usa-search usa-search--small" action="{{ searchgov.endpoint }}/search" accept-charset="UTF-8" method="get">
   {% endif %}
 
     <input name="utf8" type="hidden" value="&#x2713;" />
-    <input name="affiliate" type="hidden" value="{{searchgov.affiliate}}" />
+    <input name="affiliate" type="hidden" value="{{ searchgov.affiliate }}" />
 
     <div role="search">
       <label class="usa-sr-only" for="extended-search-field-small">Search small</label>
diff --git a/_includes/side-cta.html b/_includes/side-cta.html
index 2b4bf9408..70d22b39b 100644
--- a/_includes/side-cta.html
+++ b/_includes/side-cta.html
@@ -3,6 +3,6 @@
     Want to see if 18F can help your agency?
   </p>
   <div>
-    <a href="{{ site.baseurl }}/contact/" class="usa-button an18f-button--accent">Contact us</a>
+    <a href="{{ "/contact/" | url }}" class="usa-button an18f-button--accent">Contact us</a>
   </div>
 </div>
diff --git a/_includes/site-alert.html b/_includes/site-alert.html
index 7009293c8..0ff9a8974 100644
--- a/_includes/site-alert.html
+++ b/_includes/site-alert.html
@@ -1,12 +1,12 @@
 {% comment %}
-This partial was used while migrating the guides, but could be used for other site alerts in the future.
+This partial can be used for any site alerts.
 {% endcomment %}
 
 <section aria-label="Alert">
   <div class="usa-alert usa-alert--warning usa-alert--no-icon">
     <div class="usa-alert__body">
       <p class="usa-alert__text">
-        We are in the process of moving all of the 18F guides to a new url. You can still find all 18F guides at <a href="https://18f.gsa.gov/guides">18f.gsa.gov/guides</a>.
+        {{ message }}
       </p>
     </div>
   </div>
diff --git a/_includes/social-media.html b/_includes/social-media.html
index 87e9374f3..7cf5c0fb7 100644
--- a/_includes/social-media.html
+++ b/_includes/social-media.html
@@ -1,15 +1,15 @@
 <div class="bg-primary-darker padding-3 text-white usa-dark-background">
   <h2 class="font-sans-lg text-bold margin-bottom-2">Follow 18F</h2>
   <ul class="usa-list usa-list--unstyled">
-    {% for item in site.data.social_media %}
+    {% for item in social_media %}
     <li class="margin-bottom-2">
-      <a href="{% if item.platform == "RSS feed" %}{{ site.baseurl }}{% endif %}{{ item.link }}"
+      <a href="{{ item.link | url }}"
          class="usa-link--alt"
          >
          <img src="{{ site.baseurl }}{{ item.image.light }}"
               class="maxw-3 margin-right-2 text-sub"
               alt="">
-         {%- unless item.platform == "RSS feed" -%}18F on {% endunless%}{{ item.platform }}
+         {%- unless item.platform == "RSS feed" -%}18F on {% endunless %}{{ item.platform }}
       </a>
     </li>
     {% endfor %}
diff --git a/_includes/styles.html b/_includes/styles.html
index f58b911ee..c51b464ba 100644
--- a/_includes/styles.html
+++ b/_includes/styles.html
@@ -1,6 +1,4 @@
 {% assign _styles = '' | split: '' %}
-{% assign _default_styles = '' | split: ''
-  | push: '/assets/css/styles.css' %}
 {% assign _styles = _styles
   | push: _default_styles
   | push: site.styles
diff --git a/_includes/subnav.html b/_includes/subnav.html
index cd5d90e3b..4d6253e4c 100644
--- a/_includes/subnav.html
+++ b/_includes/subnav.html
@@ -1,4 +1,4 @@
-{% assign subnav_items = include.subnav_items | default: page.subnav_items %}
+{% assign subnav_items = subnav_items | default: page.subnav_items %}
 
 {% if subnav_items %}
 <nav class="subnav display-none tablet:display-block" aria-label="Secondary navigation">
@@ -6,6 +6,9 @@
   <ul class="usa-sidenav border-top-05-primary-dark margin-top-1">
       {% for item in subnav_items %}
       <li class="usa-sidenav__item text-primary-dark">
+        {% comment %}
+          code smell: nested if-else
+        {% endcomment %}
         {% if item.permalink %}
           {% assign first_chars = item.permalink | slice: 0, 2 %}
 
@@ -20,7 +23,7 @@
         {% endif %}
 
         {% assign is_matching = page.url | matches_url: item.permalink %}
-        <a id="{{ item.text | slugify }}-link" class="font-sans-md subnav-anchor" href="{{ item_link }}" {% if is_matching %}class="usa-current"{% endif %}>{{ item.text }}</a>
+        <a id="{{ item.text | slugify }}-link" class="font-sans-md subnav-anchor" href="{{ item_link }}" {%- if is_matching %} class="usa-current" {% endif %}>{{ item.text }}</a>
       </li>
       {% endfor %}
     </ul>
diff --git a/_includes/tagline.html b/_includes/tagline.html
deleted file mode 100644
index 7769c5c36..000000000
--- a/_includes/tagline.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% comment %} 
-This tagline will appear in your homepage
-{% endcomment %}
-
-<section class="grid-container usa-section usa-prose">
-  <div class="grid-row grid-gap">
-    <div class="tablet:grid-col-4">
-      <h2 class="font-heading-xl margin-top-0 tablet:margin-bottom-0">A tagline highlights your approach</h2>
-    </div>
-    <div class="tablet:grid-col-8 usa-prose">
-      <p>The tagline should inspire confidence and interest, focusing on the value that your overall approach offers to your audience. Use a heading typeface and keep your tagline to just a few words, and don’t confuse or mystify.</p>
-      <p>Use the right side of the grid to explain the tagline a bit more. What are your goals? How do you do your work? Write in the present tense, and stay brief here. People who are interested can find details on internal pages.</p>
-    </div>
-  </div>
-</section>
\ No newline at end of file
diff --git a/_includes/testimonial.html b/_includes/testimonial.html
index bb907b11d..f728f128b 100644
--- a/_includes/testimonial.html
+++ b/_includes/testimonial.html
@@ -1,4 +1,4 @@
-{% if include.size=="md" %}
+{% if size == "md" %}
   {% assign blockquote_class = "font-sans-lg line-height-sans-4 margin-0 padding-0 text-white text-ls-05" %}
   {% assign figcaption_class = "font-sans-md line-height-sans-3 margin-top-3 text-white" %}
   {% assign organization_class = "font-sans-sm" %}
@@ -6,7 +6,7 @@
     <figure>
       <p class="large-quotemark large-quotemark--left margin-bottom-3">&ldquo;</p>
       <blockquote class="{{ blockquote_class }}">
-        {{ include.quote }}
+        {{ quote }}
       </blockquote>
       <figcaption class="{{ figcaption_class }}">
         <strong>&mdash;{{ attribution }}</strong>{%- if position %}, {{ position }}{%- endif %}<br>
diff --git a/_includes/usa-banner.html b/_includes/usa-banner.html
deleted file mode 100644
index 10dd1aa6c..000000000
--- a/_includes/usa-banner.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<section class="usa-banner" aria-label="Official government website">
-  <div class="usa-accordion">
-    <header class="usa-banner__header">
-      <div class="usa-banner__inner">
-        <div class="grid-col-auto">
-          <img class="usa-banner__header-flag" src="{{ site.baseurl }}/assets/uswds/img/us_flag_small.png" alt="U.S. flag">
-        </div>
-        <div class="grid-col-fill tablet:grid-col-auto">
-          <p class="usa-banner__header-text">An official website of the United States government</p>
-          <p class="usa-banner__header-action" aria-hidden="true">Here’s how you know</p>
-        </div>
-        <button class="usa-accordion__button usa-banner__button"
-          aria-expanded="false" aria-controls="gov-banner">
-          <span class="usa-banner__button-text">Here’s how you know</span>
-        </button>
-      </div>
-    </header>
-    <div class="usa-banner__content usa-accordion__content" id="gov-banner">
-      <script type="text/javascript">
-        // Hide the gov banner immediately rather than waiting for external JS
-        // sources to load and execute.
-        document.getElementById("gov-banner").setAttribute("hidden", "");
-      </script>
-      <div class="grid-row grid-gap-lg">
-        <div class="usa-banner__guidance tablet:grid-col-6">
-          <img class="usa-banner__icon usa-media-block__img" src="{{ site.baseurl }}/assets/uswds/img/icon-dot-gov.svg" role="img" alt="Dot gov">
-          <div class="usa-media-block__body">
-            <p>
-              <strong>Official websites use .gov</strong>
-              <br/>
-              A <strong>.gov</strong> website belongs to an official government organization in the United States.
-            </p>
-          </div>
-        </div>
-        <div class="usa-banner__guidance tablet:grid-col-6">
-          <img class="usa-banner__icon usa-media-block__img" src="{{ site.baseurl }}/assets/uswds/img/icon-https.svg" role="img" alt="Https">
-          <div class="usa-media-block__body">
-            <p>
-              <strong>Secure .gov websites use HTTPS</strong>
-              <br/>
-              A <strong>lock</strong> (
-<span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" width="52" height="64" viewBox="0 0 52 64" class="usa-banner__lock-image" role="img" aria-labelledby="banner-lock-title banner-lock-description"><title id="banner-lock-title">Lock</title><desc id="banner-lock-description">A locked padlock</desc><path fill="#000000" fill-rule="evenodd" d="M26 0c10.493 0 19 8.507 19 19v9h3a4 4 0 0 1 4 4v28a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V32a4 4 0 0 1 4-4h3v-9C7 8.507 15.507 0 26 0zm0 8c-5.979 0-10.843 4.77-10.996 10.712L15 19v9h22v-9c0-6.075-4.925-11-11-11z"/></svg></span>
-) or <strong>https://</strong> means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</section>
\ No newline at end of file
diff --git a/_includes/usa-identifier.html b/_includes/usa-identifier.html
deleted file mode 100644
index 8244dc329..000000000
--- a/_includes/usa-identifier.html
+++ /dev/null
@@ -1,105 +0,0 @@
- {% assign anchor = site.data.usa_anchor.anchor_data[0] %}
-  <div class="usa-identifier padding-top-2">
-    <section
-      class="usa-identifier__section usa-identifier__section--masthead"
-      aria-label="Agency identifier"
-    >
-      <div class="usa-identifier__container">
-        <div class="usa-identifier__logos">
-          <a href="https://www.gsa.gov/" class="usa-identifier__logo">
-            <img
-              class="usa-identifier__logo-img"
-              src="{{ site.baseurl }}{{ anchor.agency_logo }}"
-              alt="GSA logo"
-            />
-          </a>
-        </div>
-        <div class="usa-identifier__identity text-base-lightest" aria-label="Agency description">
-          <p class="usa-identifier__identity-domain">18f.gsa.gov</p>
-          <p class="usa-identifier__identity-disclaimer text-base-lightest">An official website of the
-            <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services">
-              GSA’s Technology Transformation Services
-            </a>
-          </p>
-        </div>
-      </div>
-    </section>
-    <nav
-      class="usa-identifier__section usa-identifier__section--required-links"
-      aria-label="Important links"
-    >
-      <div class="usa-identifier__container">
-        <ul class="usa-identifier__required-links-list">
-          <li class="usa-identifier__required-links-item">
-            <a
-              class="usa-identifier__required-link usa-link"
-              href="{{ anchor.about_gsa_url }}"
-              title="About GSA"
-            >
-              About GSA
-            </a>
-          </li>
-          <li class="usa-identifier__required-links-item">
-            <a
-              class="usa-identifier__required-link usa-link"
-              href="{{ anchor.accessibility_url }}"
-              title="Accessibility support"
-            >
-              Accessibility support
-            </a>
-          </li>
-          <li class="usa-identifier__required-links-item">
-            <a
-              class="usa-identifier__required-link usa-link"
-              href="{{ anchor.foia_request_url }}"
-              title="FOIA requests"
-            >
-              FOIA requests
-            </a>
-          </li>
-          <li class="usa-identifier__required-links-item">
-            <a
-              class="usa-identifier__required-link usa-link"
-              href="{{ anchor.no_fear_act_url }}"
-              title="No FEAR Act data"
-            >
-              No FEAR Act data
-            </a>
-          </li>
-          <li class="usa-identifier__required-links-item">
-            <a
-              class="usa-identifier__required-link usa-link"
-              href="{{ anchor.fraud_waste_abuse_url }}"
-              title="Office of the Inspector General"
-            >
-              Office of the Inspector General
-            </a>
-          </li>
-          <li class="usa-identifier__required-links-item">
-            <a
-              class="usa-identifier__required-link usa-link"
-              href="{{ anchor.budget_performance_url }}"
-              title="Performance reports"
-            >
-              Performance reports
-            </a>
-          </li>
-          <li class="usa-identifier__required-links-item">
-            <a
-              class="usa-identifier__required-link usa-link"
-              href="{{ anchor.privacy_policy_url }}"
-              title="Privacy Policy"
-            >
-              Privacy policy
-            </a>
-          </li>
-        </ul>
-      </div>
-    </nav>
-    <section class="usa-identifier__section usa-identifier__section--usagov" aria-label="U.S. government information and services">
-      <div class="usa-identifier__container">
-        <div class="usa-identifier__usagov-description text-base-lightest">Looking for U.S. government information and services?</div>
-        <a href="https://www.usa.gov/" class="usa-link">Visit USA.gov</a>
-      </div>
-    </section>
-  </div>
diff --git a/_includes/usa_identifier.html b/_includes/usa_identifier.html
index 001ce1d44..80e355864 100644
--- a/_includes/usa_identifier.html
+++ b/_includes/usa_identifier.html
@@ -1,4 +1,4 @@
-{% if tags %} 
+{% if tags %}
   {% assign guide = tags %}
 {% else %}
   {% assign guide = 'default' %}
@@ -9,7 +9,7 @@
     <div class="usa-identifier__container">
       <div class="usa-identifier__logos">
         <a href="https://www.gsa.gov/" class="usa-identifier__logo">
-          {% image_with_class "assets/_common/_img/gsa-logo-blue.svg" "usa-identifier__logo-img" "gsa logo" %}
+          {% image_with_class "assets/common/img/gsa-logo-blue.svg" "usa-identifier__logo-img" "gsa logo" %}
         </a>
       </div>
       <div class="usa-identifier__identity text-base-lightest">
diff --git a/assets/blog/README.md b/assets/blog/README.md
deleted file mode 100644
index f5dad1fd9..000000000
--- a/assets/blog/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## No images here
-
-Don't put images or other assets directly in this directory! Always make a new directory per-post, like those above, to store assets.
-
-The directory doesn't have to use the same slug as your post. Just pick something that doesn't exist yet, and use it.
-
-Thank you for doing your part in keeping a Clean Blog For All.
diff --git a/assets/_common/_img/18f-logo.svg b/assets/common/img/18f-logo.svg
similarity index 100%
rename from assets/_common/_img/18f-logo.svg
rename to assets/common/img/18f-logo.svg
diff --git a/assets/_common/_img/favicons/favicon-16x16.png b/assets/common/img/favicons/favicon-16x16.png
similarity index 100%
rename from assets/_common/_img/favicons/favicon-16x16.png
rename to assets/common/img/favicons/favicon-16x16.png
diff --git a/assets/_common/_img/favicons/favicon-180x180.png b/assets/common/img/favicons/favicon-180x180.png
similarity index 100%
rename from assets/_common/_img/favicons/favicon-180x180.png
rename to assets/common/img/favicons/favicon-180x180.png
diff --git a/assets/_common/_img/favicons/favicon-192x192.png b/assets/common/img/favicons/favicon-192x192.png
similarity index 100%
rename from assets/_common/_img/favicons/favicon-192x192.png
rename to assets/common/img/favicons/favicon-192x192.png
diff --git a/assets/_common/_img/favicons/favicon-32x32.png b/assets/common/img/favicons/favicon-32x32.png
similarity index 100%
rename from assets/_common/_img/favicons/favicon-32x32.png
rename to assets/common/img/favicons/favicon-32x32.png
diff --git a/assets/_common/_img/favicons/favicon.ico b/assets/common/img/favicons/favicon.ico
similarity index 100%
rename from assets/_common/_img/favicons/favicon.ico
rename to assets/common/img/favicons/favicon.ico
diff --git a/assets/_common/_img/favicons/favicon.svg b/assets/common/img/favicons/favicon.svg
similarity index 100%
rename from assets/_common/_img/favicons/favicon.svg
rename to assets/common/img/favicons/favicon.svg
diff --git a/assets/_common/_img/gsa-logo-blue.svg b/assets/common/img/gsa-logo-blue.svg
similarity index 100%
rename from assets/_common/_img/gsa-logo-blue.svg
rename to assets/common/img/gsa-logo-blue.svg
diff --git a/assets/_common/_img/guide_icons/accessibility.svg b/assets/common/img/guide_icons/accessibility.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/accessibility.svg
rename to assets/common/img/guide_icons/accessibility.svg
diff --git a/assets/_common/_img/guide_icons/agile.svg b/assets/common/img/guide_icons/agile.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/agile.svg
rename to assets/common/img/guide_icons/agile.svg
diff --git a/assets/_common/_img/guide_icons/brand.svg b/assets/common/img/guide_icons/brand.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/brand.svg
rename to assets/common/img/guide_icons/brand.svg
diff --git a/assets/_common/_img/guide_icons/content.svg b/assets/common/img/guide_icons/content.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/content.svg
rename to assets/common/img/guide_icons/content.svg
diff --git a/assets/_common/_img/guide_icons/derisking.svg b/assets/common/img/guide_icons/derisking.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/derisking.svg
rename to assets/common/img/guide_icons/derisking.svg
diff --git a/assets/_common/_img/guide_icons/engineering.svg b/assets/common/img/guide_icons/engineering.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/engineering.svg
rename to assets/common/img/guide_icons/engineering.svg
diff --git a/assets/_common/_img/guide_icons/product.svg b/assets/common/img/guide_icons/product.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/product.svg
rename to assets/common/img/guide_icons/product.svg
diff --git a/assets/_common/_img/guide_icons/user-interviews-love--c.svg b/assets/common/img/guide_icons/user-interviews-love--c.svg
similarity index 100%
rename from assets/_common/_img/guide_icons/user-interviews-love--c.svg
rename to assets/common/img/guide_icons/user-interviews-love--c.svg
diff --git a/assets/_common/_img/hero.png b/assets/common/img/hero.png
similarity index 100%
rename from assets/_common/_img/hero.png
rename to assets/common/img/hero.png
diff --git a/assets/_common/_img/hire-us.jpg b/assets/common/img/hire-us.jpg
similarity index 100%
rename from assets/_common/_img/hire-us.jpg
rename to assets/common/img/hire-us.jpg
diff --git a/assets/_common/_img/logo-img.png b/assets/common/img/logo-img.png
similarity index 100%
rename from assets/_common/_img/logo-img.png
rename to assets/common/img/logo-img.png
diff --git a/assets/_common/_img/team-lg.svg b/assets/common/img/team-lg.svg
similarity index 100%
rename from assets/_common/_img/team-lg.svg
rename to assets/common/img/team-lg.svg
diff --git a/assets/_common/js/admin.js b/assets/common/js/admin.js
similarity index 100%
rename from assets/_common/js/admin.js
rename to assets/common/js/admin.js
diff --git a/assets/_common/js/app.js b/assets/common/js/app.js
similarity index 100%
rename from assets/_common/js/app.js
rename to assets/common/js/app.js
diff --git a/assets/_common/styles/_uswds-theme-settings.scss b/assets/common/styles/_uswds-theme-settings.scss
similarity index 100%
rename from assets/_common/styles/_uswds-theme-settings.scss
rename to assets/common/styles/_uswds-theme-settings.scss
diff --git a/assets/_common/styles/brand-colors.scss b/assets/common/styles/brand-colors.scss
similarity index 100%
rename from assets/_common/styles/brand-colors.scss
rename to assets/common/styles/brand-colors.scss
diff --git a/assets/_common/styles/custom-styles.scss b/assets/common/styles/custom-styles.scss
similarity index 100%
rename from assets/_common/styles/custom-styles.scss
rename to assets/common/styles/custom-styles.scss
diff --git a/assets/_common/styles/overrides/code_highlight.scss b/assets/common/styles/overrides/code_highlight.scss
similarity index 100%
rename from assets/_common/styles/overrides/code_highlight.scss
rename to assets/common/styles/overrides/code_highlight.scss
diff --git a/assets/_common/styles/overrides/extended-header.scss b/assets/common/styles/overrides/extended-header.scss
similarity index 100%
rename from assets/_common/styles/overrides/extended-header.scss
rename to assets/common/styles/overrides/extended-header.scss
diff --git a/assets/_common/styles/styles.scss b/assets/common/styles/styles.scss
similarity index 100%
rename from assets/_common/styles/styles.scss
rename to assets/common/styles/styles.scss
diff --git a/assets/img/logos/agencies/gsa-logo.svg b/assets/img/logos/agencies/gsa-logo.svg
new file mode 100644
index 000000000..d18b1a64e
--- /dev/null
+++ b/assets/img/logos/agencies/gsa-logo.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="719px" height="720px" viewBox="0 0 129.996 130.238" enable-background="new 0 0 129.996 130.238"
+	 xml:space="preserve">
+<rect fill="#00538E" width="129.996" height="130.238"/>
+<path fill="#FFFFFF" d="M78.611,96.076c0,9.138-7.175,12.953-15.451,12.688c-2.938-0.095-5.799-0.838-8.916-1.855l0.707-6.578
+	c2.638,1.086,6.057,2.263,8.92,2.219c3.74-0.058,7.477-1.794,7.477-6.124c0-3.335-2.67-4.976-5.252-6.283
+	c-5.709-2.896-12.275-4.907-12.275-12.998c0-7.65,6.084-11.64,13.625-11.64c2.741,0,6.014,0.477,9.299,1.641l-0.985,6.478
+	c-3.577-1.403-5.14-1.901-8.078-1.901c-3.253,0-6.597,1.143-6.597,4.896c0,2.933,3.01,4.456,5.248,5.573
+	C72.398,85.218,78.611,87.703,78.611,96.076"/>
+<path fill="#FFFFFF" d="M44.561,106.8c-2.632,0.901-6.662,1.964-13.092,1.964c-13.195,0-22.027-8.529-22.027-21.805
+	c0-12.882,9.375-21.455,22.086-21.455c6.036,0,8.727,0.896,12.541,2.212l-0.574,7.216c-3.51-2.294-6.498-3.211-11.674-3.211
+	c-9.09,0-15.158,6.578-15.115,15.412c0.043,9.506,6.648,15.416,14.822,15.416c2.437,0,4.508-0.178,5.996-0.569V91.15h-7.861v-6.103
+	h14.898V106.8"/>
+<polyline fill="#FFFFFF" points="102.041,64.587 112.063,86.918 105.08,86.918 102.041,79.497 98.996,86.918 92.014,86.918 
+	102.041,64.587 "/>
+<polyline fill="#FFFFFF" points="112.178,87.179 121.507,108.029 114.176,108.029 107.203,91.839 112.178,87.179 "/>
+<polyline fill="#FFFFFF" points="91.9,87.183 96.873,91.841 93.199,100.24 102.027,95.611 107.109,99.525 89.727,108.031 
+	82.57,108.031 91.9,87.183 "/>
+</svg>
diff --git a/config/buildAssets.js b/config/buildAssets.js
index 05b5c8cfb..be2dbb1a3 100644
--- a/config/buildAssets.js
+++ b/config/buildAssets.js
@@ -45,6 +45,9 @@ async function createAssetPaths() {
           file.indexOf(publicDir) + publicDir.length,
         );
         const hashedAt = name.lastIndexOf('-');
+        if (hashedAt === -1) {
+          throw new Error(`hashedAt is -1, which is an error likely caused by a stray file (${file}) being pulled into the assets build path`)
+        }
         const originalName = name.slice(0, hashedAt);
         const key = `${originalName}${ext}`;
         return {
@@ -62,9 +65,9 @@ async function createAssetPaths() {
 esbuild
   .build({
     entryPoints: [
-      'assets/_common/styles/styles.scss',
-      'assets/_common/js/app.js',
-      'assets/_common/js/admin.js',
+      'assets/common/styles/styles.scss',
+      'assets/common/js/app.js',
+      'assets/common/js/admin.js',
     ],
     entryNames: '[dir]/[name]-[hash]',
     outdir: '_site/assets/',
diff --git a/config/collections.js b/config/collections.js
new file mode 100644
index 000000000..e300f9c2d
--- /dev/null
+++ b/config/collections.js
@@ -0,0 +1,56 @@
+// smell: This is not the slugify library used by 11ty
+// However, that library requires ESM and this project is CommonJS.
+// The best thing to do would be to import the slugify filter, but I'm not quite
+// sure how to do that from this separate file — perhaps dependency injection
+// in .eleventy.js?
+const slugify = require('slugify');
+
+slugify.extend({'.': '-'})
+
+const postsCollection = (collection) => collection.getFilteredByGlob('content/posts/*.md');
+const servicesCollection = (collection) => collection.getFilteredByGlob('content/pages/projects/services/*.md');
+
+// Create a collection of all tags across all posts
+// Each tag has a `name` property, as well as a `posts` array with all the posts with that tag
+const tagsCollection = (collection) => {
+  const tagMap = new Map();
+
+  collection.getAll().forEach((post) => {
+    (post.data.tags || []).forEach((tag) => {
+      if (!tagMap.has(tag)) {
+        tagMap.set(tag, [])
+      };
+      tagMap.get(tag).push(post)
+    });
+  });
+
+  // Alpha-sorts by key, so that we don't have to do any sorting to get the tag index
+  // displaying tags in alphabetical order
+  const sortedMap = new Map([...tagMap].sort((a, b) => String(a[0]).localeCompare(b[0])))
+
+  // Creates the data object with the right keys
+  const tags = []
+  sortedMap.forEach((posts, name) => {
+    const slug = slugify(name, { lower: true, strict: true });
+    tags.push({
+      data: {
+        name,
+        posts,
+        posts_count: posts.length
+      },
+      date: null,
+      fileSlug: slug,
+      inputPath: null,
+      url: `/tags/${ slug }/`,
+    })
+  })
+  return tags;
+  // I commented this out — it's not clear what it's doing and it doesn't seem important.
+  // return filterTagList([...tagSet]);
+};
+
+module.exports = {
+  postsCollection,
+  servicesCollection,
+  tagsCollection,
+};
diff --git a/config/filters.js b/config/filters.js
index f1ca32b72..89de2bb8f 100644
--- a/config/filters.js
+++ b/config/filters.js
@@ -43,7 +43,7 @@ const teamData = parse(
 const findPerson = (id) => {
   const maybePerson = teamData.find((person) => person.id === id);
   if (maybePerson === undefined) {
-    console.log(id, 'is undefined')
+    console.warn(id, 'is undefined') /* eslint-disable-line no-console */
   }
   return maybePerson
 }
@@ -92,9 +92,7 @@ const teamLink = (slug) => {
 // TODO These all need implementation, they're just placeholders so the site builds at all
 // TODO remove the eslint-disable directive after implementation
 /* eslint-disable */
-const findCollection = (site, collection) => []
 const weightedSort = (array, weight_name, sort_name) => array
-const inGroups = (array, groups) => array
 const oembed = (url) => `TODO EMBED ${url}`
 const asRelativeUrl = (url) => url
 const matchPosts = (page, property='tags') => []
@@ -112,10 +110,8 @@ module.exports = {
   embed,
   teamPhoto,
   teamLink,
-  findCollection,
   markdownify,
   weightedSort,
-  inGroups,
   oembed,
   asRelativeUrl,
   matchPosts,
diff --git a/content/pages/blog.liquid b/content/pages/blog.liquid
index bf4c4907d..d67d575ec 100644
--- a/content/pages/blog.liquid
+++ b/content/pages/blog.liquid
@@ -1,6 +1,6 @@
 ---
 pagination:
-  data: collections.post
+  data: collections.posts
   size: 5
   alias: posts
   reverse: true
diff --git a/content/pages/guides.html b/content/pages/guides.html
index f451c257d..d841bd899 100644
--- a/content/pages/guides.html
+++ b/content/pages/guides.html
@@ -13,34 +13,32 @@
       </div>
     </div>
     <div class="grid-row grid-gap margin-top-5">
-      {% for guide in site.data.guides %}
-        {% if guide.promoted %}
-          <div class="tablet:grid-col-6 margin-bottom-5">
-            {% include "card-with-image-guides.html"
-              text_content: guide.name
-              text_descrip: guide.description
-              link_url: guide.link
-              image_path: guide.image.dark
-              image_side: "right"
-              hero_url: guide.image.hero
-            %}
-          </div>
-        {% endif %}
+      {% assign featured_guides = guides | where: "promoted", true %}
+      {% assign standard_guides = guides | where: "promoted", false %}
+      {% for guide in featured_guides limit: 2 %}
+        <div class="tablet:grid-col-6 margin-bottom-5">
+          {% include "card-with-image-guides.html"
+            text_content: guide.name
+            text_descrip: guide.description
+            link_url: guide.link
+            image_path: guide.image.dark
+            image_side: "right"
+            hero_url: guide.image.hero
+          %}
+        </div>
       {% endfor %}
     </div>
     <div class="grid-row grid-gap margin-top-2 display-flex flex-row">
-      {% for guide in site.data.guides %}
-        {% unless guide.promoted %}
-          <div class="desktop:grid-col-4 tablet:grid-col-6 margin-bottom-5">
-            {% include "card-with-image-guides.html"
-              text_content: guide.name
-              text_descrip: guide.description
-              link_url: guide.link
-              image_path: guide.image.dark
-              image_side: "right"
-            %}
-          </div>
-        {% endunless %}
+      {% for guide in standard_guides %}
+        <div class="desktop:grid-col-4 tablet:grid-col-6 margin-bottom-5">
+          {% include "card-with-image-guides.html"
+            text_content: guide.name
+            text_descrip: guide.description
+            link_url: guide.link
+            image_path: guide.image.dark
+            image_side: "right"
+          %}
+        </div>
       {% endfor %}
     </div>
     <div class="grid-row">
diff --git a/content/pages/home.html b/content/pages/home.html
index f459ad163..c3dbc44f3 100644
--- a/content/pages/home.html
+++ b/content/pages/home.html
@@ -18,7 +18,7 @@ <h1>
           your mission. Together with our government agency partners, we deliver projects
           that stay within budget and improve their technology.
         </p>
-        <a class="usa-button usa-button--big margin-top-6" href="{{ site.baseurl }}/work-with-us/">
+        <a class="usa-button usa-button--big margin-top-6" href="{{ "/work-with-us/" | url }}">
           Work with us
         </a>
       </div>
@@ -53,28 +53,28 @@ <h1>
 <section class="usa-section usa-section--dark">
   <div class="grid-container">
     <div class="grid-row margin-bottom-6">
-      <h2> What 18F can do</h2>
+      <h2>What 18F can do</h2>
     </div>
 
     <div class="grid-row grid-gap">
       <div class="tablet:grid-col-4 margin-bottom-6 tablet:display-flex">
         {% include "graphic-block.html"
-        image_path="/assets/img/home/cando_illo_1.svg"
-        body_text="Modernize software development processes"
+        image_path: "/assets/img/home/cando_illo_1.svg"
+        body_text: "Modernize software development processes"
         %}
       </div>
 
       <div class="tablet:grid-col-4 margin-bottom-6 tablet:display-flex">
         {% include "graphic-block.html"
-        image_path="/assets/img/home/cando_illo_2.svg"
-        body_text="Improve public-facing services like websites or applications"
+        image_path: "/assets/img/home/cando_illo_2.svg"
+        body_text: "Improve public-facing services like websites or applications"
         %}
       </div>
 
       <div class="tablet:grid-col-4 margin-bottom-6 tablet:display-flex">
         {% include "graphic-block.html"
-        image_path="/assets/img/home/cando_illo_3.svg"
-        body_text="Digitize and streamline internal systems"
+        image_path: "/assets/img/home/cando_illo_3.svg"
+        body_text: "Digitize and streamline internal systems"
         %}
       </div>
     </div>
@@ -90,7 +90,7 @@ <h2> What 18F can do</h2>
       </p>
     </div>
 
-    <a href="{{ site.baseurl }}/work-with-us/" class="usa-button usa-button--big an18f-button--accent margin-top-4"> Work
+    <a href="{{ "/work-with-us/" | url }}" class="usa-button usa-button--big an18f-button--accent margin-top-4"> Work
       with us
     </a>
   </div>
@@ -102,13 +102,13 @@ <h2>Featured projects</h2>
     <div class="grid-row grid-gap-lg margin-top-6">
       <ul class="usa-card-group">
         <li class="usa-card tablet-lg:grid-col-4 margin-bottom-4">
-          {% include "card-project.html" project='fec-gov' %}
+          {% include "card-project.html" project_id: 'fec-gov' %}
         </li>
         <li class="usa-card tablet-lg:grid-col-4 margin-bottom-4">
-          {% include "card-project.html" project='treasury-data-act' %}
+          {% include "card-project.html" project_id: 'treasury-data-act' %}
         </li>
         <li class="usa-card tablet-lg:grid-col-4 margin-bottom-4">
-          {% include "card-project.html" project='calc' %}
+          {% include "card-project.html" project_id: 'calc' %}
         </li>
       </ul>
     </div>
@@ -117,21 +117,20 @@ <h2>Featured projects</h2>
 
 <section class="usa-section usa-section--mobile-no-x">
   <div class="grid-container">
-    {% assign agency_partners = site.data.featured_agencies %}
     <h2 class="margin-bottom-3">Some agencies we’ve worked with</h2>
     <ul class="grid-row grid-gap usa-list--unstyled">
-      {% for partner in agency_partners %}
+      {% for agency in agencies | where: "featured", true %}
       <li class="tablet:grid-col-4 display-flex flex-align-center margin-top-4">
-        <img class="margin-right-105 maxw-7" src="{{ partner.logo | prepend: site.baseurl }}" alt="" />
-        {% if partner.agency_url %}
-        <a class="list-images-text" href="{{ partner.agency_url | prepend: site.baseurl }}">{{ partner.name }}</a>
+        <img class="margin-right-105 maxw-7" src="/assets/img/logos/agencies/{{ agency.logo }}" alt="" />
+        {% if agency.url %}
+        <a class="list-images-text" href="{{ agency.url | url }}">{{ agency.name }}</a>
         {% else %}
-        <span class="list-images-text">{{ partner.name }}</span>
+        <span class="list-images-text">{{ agency.name }}</span>
         {% endif %}
       </li>
       {% endfor %}
     </ul>
-    <a class="usa-button usa-button--big margin-top-4" href="{{ site.baseurl }}/our-work/"> See all agency partners
+    <a class="usa-button usa-button--big margin-top-4" href="{{ "/our-work/" | url }}"> See all agency partners
     </a>
   </div>
 </section>
@@ -139,16 +138,15 @@ <h2 class="margin-bottom-3">Some agencies we’ve worked with</h2>
 <section class="usa-section usa-section--dark bg-primary-dark">
   <div class="grid-container">
     <div class="grid-row margin-bottom-6">
-      <h2> Recent blog posts </h2>
+      <h2>Recent blog posts</h2>
     </div>
 
-    {% assign latest_posts = site.posts | slice:0,6 %}
-    {% include "featured-posts.html"
-    color_mode="dark"
-    related_posts=latest_posts
+    {% include "featured-posts.html",
+       color_mode: "dark",
+       related_posts: collections.posts | slice: 0, 6
     %}
 
-    <a href="{{ site.baseurl }}/blog/" class="usa-button usa-button--big an18f-button--accent margin-top-4"> See all
+    <a href="{{ "/blog/" | url }}" class="usa-button usa-button--big an18f-button--accent margin-top-4"> See all
       blog posts
     </a>
   </div>
diff --git a/content/pages/our-work.html b/content/pages/our-work.html
index 1f29809f8..9f929cb41 100644
--- a/content/pages/our-work.html
+++ b/content/pages/our-work.html
@@ -23,7 +23,7 @@
     </div>
     <div class="grid-col-12">
       <a class="usa-button an18f-button--accent"
-         href="{{ site.baseurl }}/contact/"
+         href="{{ "/contact/" | url }}"
        >Get in touch
        </a>
     </div>
@@ -31,10 +31,6 @@
 </div>
 </section>
 
-
-{% assign featured_services = site.data.featured_services %}
-{% assign projects_list = site | find_collection: 'services_projects' | weighted_sort: 'project_weight', 'title' %}
-
 <section class="usa-section case-section bg-base-lightest">
   <div class="grid-container">
     <div class="grid-row">
@@ -42,10 +38,12 @@ <h2 class="margin-bottom-5">Case studies</h2>
     </div>
     <div class="grid-row grid-gap">
       <ul class="usa-card-group">
-        {% for featured in featured_services %}
-          {% assign featured_project = projects_list | where: "agency", featured.agency | first %}
+        {% for case_study in featured.case_studies %}
+          {% assign project = collections.services |
+              where: "data.agency", case_study.agency |
+              first %}
           <li class="usa-card tablet:grid-col-6 tablet-lg:grid-col-4 margin-bottom-4">
-            {% include "card-project.html" project: featured_project.slug %}
+            {% include "card-project.html" project: project %}
           </li>
         {% endfor %}
       </ul>
@@ -64,24 +62,22 @@ <h2 class="margin-bottom-5">Case studies</h2>
 <div class="usa-section bg-base-lightest">
   <section class="grid-container">
     <h2 class="margin-bottom-3">Some agencies we’ve worked with</h2>
-    {% assign agency_partners = site.data.agencies %}
-    {% assign partner_groups = agency_partners | in_groups: 3 %}
     <ul class="grid-row grid-gap usa-list--unstyled">
-      {% for partner in agency_partners %}
+      {% for agency in agencies %}
       <li class="tablet:grid-col-4 display-flex flex-align-center margin-top-4">
             <img
               class="margin-right-105 maxw-7"
-              src="{{ partner.logo | prepend: site.baseurl }}"
+              src="/assets/img/logos/agencies/{{ agency.logo | url }}"
               alt=""
             />
-            {% if partner.agency_url %}
+            {% if agency.agency_url %}
             <a
               class="list-images-text"
-              href="{{ partner.agency_url | prepend: site.baseurl }}"
-              >{{ partner.name }}</a
+              href="{{ agency.agency_url | url }}"
+              >{{ agency.name }}</a
             >
             {% else %}
-            <span class="list-images-text">{{ partner.name }}</span>
+            <span class="list-images-text">{{ agency.name }}</span>
             {% endif %}
         </li>
       {% endfor %}
diff --git a/content/pages/principles/index.md b/content/pages/principles/index.md
index d25166e86..01eb67eea 100644
--- a/content/pages/principles/index.md
+++ b/content/pages/principles/index.md
@@ -17,18 +17,18 @@ The first thing you may notice when partnering with 18F is that your team will b
 
 ### Methodologies we’ll use together
 
-- [Letting users guide our work]({{site.baseurl}}/partnership-principles/#letting-users-guide-our-work)
-- [Working in an agile way]({{site.baseurl}}/partnership-principles/#working-in-an-agile-way)
-- [Building in the open]({{site.baseurl}}/partnership-principles/#building-in-the-open)
+- [Letting users guide our work]({{ "/partnership-principles/#letting-users-guide-our-work" | url }})
+- [Working in an agile way]({{ "/partnership-principles/#working-in-an-agile-way" | url }})
+- [Building in the open]({{" /partnership-principles/#building-in-the-open" | url }})
 
 ### Tactics we’ll use together
 
-- [Understanding your problem first]({{site.baseurl}}/partnership-principles/#understanding-your-problem-first)
-- [Partnering with an empowered product owner]({{site.baseurl}}/partnership-principles/#partnering-with-an-empowered-product-owner)
+- [Understanding your problem first]({{ "/partnership-principles/#understanding-your-problem-first" | url }})
+- [Partnering with an empowered product owner]({{ "/partnership-principles/#partnering-with-an-empowered-product-owner" | url }})
 
 In this document, we’ll explain each idea and how it will influence our work together. 
 
-[Download a PDF version of the Principles here]({{site.baseurl}}/assets/presentations/18FPartnershipPrinciples.pdf)
+[Download a PDF version of the Principles here]({{ "/assets/presentations/18FPartnershipPrinciples.pdf" | url }})
 
 # Methodologies
 
diff --git a/content/pages/projects/services/hhs-states.md b/content/pages/projects/services/hhs-states.md
index 07d17286f..f47a43ad6 100644
--- a/content/pages/projects/services/hhs-states.md
+++ b/content/pages/projects/services/hhs-states.md
@@ -1,5 +1,5 @@
 ---
-agency: Health and Human Services
+agency: Department of Health and Human Services
 title: Updating critical state and local systems
 subtitle: Extending impact to state and local governments
 permalink: /our-work/hhs-states/
diff --git a/content/pages/tags.html b/content/pages/tags.html
index 4a7663d38..a39a00d5f 100644
--- a/content/pages/tags.html
+++ b/content/pages/tags.html
@@ -1,7 +1,14 @@
 ---
 title: Tags
-layout: tag-index
+layout: styled-container
 permalink: /tags/
 ---
 
 <p>Click through to read our posts about the following topics:</p>
+
+{% for tag in collections.tags %}
+<p>
+  <a href="{{ tag.url | url }}/" >{{ tag.data.name }}</a>
+  — {{ tag.data.posts_count }}
+</p>
+{% endfor %}
diff --git a/content/pages/tags.liquid b/content/pages/tags.liquid
new file mode 100644
index 000000000..4ee3850d7
--- /dev/null
+++ b/content/pages/tags.liquid
@@ -0,0 +1,8 @@
+---
+pagination:
+  data: collections.tags
+  size: 1
+  alias: tag
+permalink: "{{ tag.url }}"
+layout: "tag-results"
+---
diff --git a/content/pages/work-with-us.html b/content/pages/work-with-us.html
index bd8f7e720..d8933ad96 100644
--- a/content/pages/work-with-us.html
+++ b/content/pages/work-with-us.html
@@ -4,6 +4,7 @@
 lead: As federal employees, we share your dedication to serving the American&nbsp;public.
 redirect_from: /how-we-work/
 hide_footer_rule: true
+layout: default
 ---
 
 {% capture intro %}
@@ -113,7 +114,7 @@ <h3 class="text-normal"> Feel empowered to continue with our guides</h3>
          text_content: "Federal Field Guide"
       %}
       </div>
-    </div> <a href="{{ site.baseurl }}/guides/" class="usa-button usa-button--outline margin-top-3">
+    </div> <a href="{{ "/guides/" | url }}" class="usa-button usa-button--outline margin-top-3">
      Browse our guides
    </a>
   </div>
@@ -136,21 +137,21 @@ <h3 class="text-normal">Read related case studies</h3>
     <div class="grid-row grid-gap-md">
     {% assign projects = 'fec-gov, treasury-data-act' | split: ", " %}
     {% for project in projects %}
-      {% assign project_details = collections.service | where: 'fileSlug', project | first %}
+      {% assign project_details = collections.services | where: 'fileSlug', project | first %}
       {% assign project_agency = project_details.data.agencies | where: "name", project_details.data.agency | first %}
-      {% assign project_link = site.baseurl | append: project_details.data.permalink %}
       <div class="grid-col-12 tablet:grid-col-6 margin-top-3 tablet:margin-top-0">
+        {% assign image_path = "/assets/img/logos/agencies/" | append: project_agency.logo %}
         {% include "card-with-image.html",
-           image_path: project_agency.logo,
+           image_path: image_path,
            image_alt_text: project_agency.name,
            image_size: "md",
-           link_url: project_link,
+           link_url: project_details.data.permalink,
            text_content: project_details.data.mini_excerpt
         %}
       </div>
     {% endfor %}
     </div>
-   <a href="{{ site.baseurl }}/our-work/" class="usa-button usa-button--outline margin-top-3">
+   <a href="{{ "/our-work/" | url }}" class="usa-button usa-button--outline margin-top-3">
      Read our case studies
    </a>
   </div>
diff --git a/content/posts/2014-11-26-how-to-use-more-open-source.md b/content/posts/2014-11-26-how-to-use-more-open-source.md
index 017eb0cd2..bcb8ec778 100644
--- a/content/posts/2014-11-26-how-to-use-more-open-source.md
+++ b/content/posts/2014-11-26-how-to-use-more-open-source.md
@@ -201,7 +201,7 @@ Code that you write or contract to have written should be open source from the s
 
 ## 18F Consulting
 
-The key to reuse is simple, but beyond the scope of this article: a modular architecture. In recent years, much of the technical expertise has been outsourced from the federal government procurement process. We created [18F Consulting]({{ site.baseurl }}/consulting/) to provide this much needed technical expertise on a consultative basis at cost to guide federal programs toward a modular architecture using agile methodologies. Please [contact us](mailto:18f@gsa.gov) for more information.
+The key to reuse is simple, but beyond the scope of this article: a modular architecture. In recent years, much of the technical expertise has been outsourced from the federal government procurement process. We created [18F Consulting]({{ "/consulting/" | url }}) to provide this much needed technical expertise on a consultative basis at cost to guide federal programs toward a modular architecture using agile methodologies. Please [contact us](mailto:18f@gsa.gov) for more information.
 
 ## Glossary
 
@@ -219,7 +219,7 @@ The key to reuse is simple, but beyond the scope of this article: a modular arch
     </tr>
     <tr>
       <td>18F Consulting</td>
-      <td>A <a href="{{ site.baseurl }}/consulting/">consultancy</a> within 18F that provides services to federal program managers and other leaders who need assistance with designing and managing software acquisitions that use modern development techniques (e.g., agile, lean, open source).</td>
+      <td>A <a href="{{ "/consulting/" | url }}">consultancy</a> within 18F that provides services to federal program managers and other leaders who need assistance with designing and managing software acquisitions that use modern development techniques (e.g., agile, lean, open source).</td>
     </tr>
     <tr>
       <td>application framework</td>
diff --git a/content/posts/2021-09-16-a_day_in_the_life_-_ingeniero_en_18f.md b/content/posts/2021-09-16-a_day_in_the_life_-_ingeniero_en_18f.md
index 73df3db21..d0254ff24 100644
--- a/content/posts/2021-09-16-a_day_in_the_life_-_ingeniero_en_18f.md
+++ b/content/posts/2021-09-16-a_day_in_the_life_-_ingeniero_en_18f.md
@@ -1,6 +1,7 @@
 ---
 title: A day in the life - Ingeniero en 18F
 date: 2021-09-21
+locale: es-PR
 authors:
   - edwin-torres
 tags:
@@ -67,6 +68,6 @@ Al evaluar la diferencia entre este trabajo y mis experiencias previas en el sec
 En eso enfoco mis esfuerzos dentro de 18F. Además creo que parte de mejorar esa accesibilidad es tener más y mejores servicios digitales en español. Para eso necesitamos personas como tú, con la experiencia técnica y el dominio de los idiomas inglés y español, entre otros, que nos ayuden a crear mejores servicios digitales y más accesibles.
 
 ## Comienza
-¿Interesado en unirse a [nuestro equipo?](https://18f.gsa.gov/2021/05/11/we_asked_our_coworkers_why_did_you_join_18f/) Consulte las posiciones abiertas y cómo postularse en la [página de TTS](https://join.tts.gsa.gov/)(en inglés).
+¿Interesado en unirse a [nuestro equipo?]({{ "/2021/05/11/we_asked_our_coworkers_why_did_you_join_18f/" | url }}) Consulte las posiciones abiertas y cómo postularse en la [página de TTS](https://join.tts.gsa.gov/)(en inglés).
 
-[**English version.**](https://18f.gsa.gov/2021/09/30/a_day_in_the_life_of_an_18f_engineer/)
+[**English version.**]({{ "/2021/09/30/a_day_in_the_life_of_an_18f_engineer/" | url }})
diff --git a/package-lock.json b/package-lock.json
index fcf240c19..22b5f4190 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,42 +1,43 @@
 {
-  "name": "11ty-uswds-template",
+  "name": "18f.gsa.gov",
   "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "11ty-uswds-template",
+      "name": "18f.gsa.gov",
       "version": "0.0.2",
       "license": "CC0-1.0",
       "dependencies": {
+        "@11ty/eleventy": "^2.0.1",
         "@11ty/eleventy-img": "^3.1.8",
+        "@11ty/eleventy-navigation": "^0.3.5",
+        "@11ty/eleventy-plugin-rss": "^1.2.0",
+        "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
         "@uswds/uswds": "3.8.0",
         "autoprefixer": "^10.4.19",
+        "csv-parse": "^5.5.6",
+        "eleventy-plugin-svg-sprite": "^1.3.1",
         "esbuild": "^0.20.2",
         "esbuild-sass-plugin": "^3.2.0",
+        "js-yaml": "^4.1.0",
         "luxon": "^2.3.1",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.6.7",
+        "markdown-it-attrs": "^4.1.6",
         "markdown-it-footnote": "^3.0.3",
-        "netlify-cms": "^2.10.192"
+        "netlify-cms": "^2.10.192",
+        "slugify": "^1.6.6"
       },
       "devDependencies": {
-        "@11ty/eleventy": "^2.0.1",
-        "@11ty/eleventy-navigation": "^0.3.5",
-        "@11ty/eleventy-plugin-rss": "^1.2.0",
-        "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
         "chai": "^4.4.1",
         "check-html-links": "^0.2.4",
         "chokidar-cli": "^3.0.0",
-        "csv-parse": "^5.5.6",
-        "eleventy-plugin-svg-sprite": "^1.3.1",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-import": "^2.29.1",
         "html-validate": "^8.18.2",
-        "js-yaml": "^4.1.0",
         "jsdom": "^22.1.0",
-        "markdown-it": "^12.3.2",
-        "markdown-it-anchor": "^8.6.7",
-        "markdown-it-attrs": "^4.1.6",
         "mocha": "^10.4.0",
         "netlify-cms": "^2.8.0",
         "netlify-cms-proxy-server": "^1.3.23",
@@ -52,14 +53,12 @@
     "node_modules/@11ty/dependency-tree": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@11ty/dependency-tree/-/dependency-tree-2.0.1.tgz",
-      "integrity": "sha512-5R+DsT9LJ9tXiSQ4y+KLFppCkQyXhzAm1AIuBWE/sbU0hSXY5pkhoqQYEcPJQFg/nglL+wD55iv2j+7O96UAvg==",
-      "dev": true
+      "integrity": "sha512-5R+DsT9LJ9tXiSQ4y+KLFppCkQyXhzAm1AIuBWE/sbU0hSXY5pkhoqQYEcPJQFg/nglL+wD55iv2j+7O96UAvg=="
     },
     "node_modules/@11ty/eleventy": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-2.0.1.tgz",
       "integrity": "sha512-t8XVUbCJByhVEa1RzO0zS2QzbL3wPY8ot1yUw9noqiSHxJWUwv6jiwm1/MZDPTYtkZH2ZHvdQIRQ5/SjG9XmLw==",
-      "dev": true,
       "dependencies": {
         "@11ty/dependency-tree": "^2.0.1",
         "@11ty/eleventy-dev-server": "^1.0.4",
@@ -115,7 +114,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@11ty/eleventy-dev-server/-/eleventy-dev-server-1.0.4.tgz",
       "integrity": "sha512-qVBmV2G1KF/0o5B/3fITlrrDHy4bONUI2YuN3/WJ3BNw4NU1d/we8XhKrlgq13nNvHoBx5czYp3LZt8qRG53Fg==",
-      "dev": true,
       "dependencies": {
         "@11ty/eleventy-utils": "^1.0.1",
         "chokidar": "^3.5.3",
@@ -194,7 +192,6 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@11ty/eleventy-navigation/-/eleventy-navigation-0.3.5.tgz",
       "integrity": "sha512-4aKW5aIQDFed8xs1G1pWcEiFPcDSwZtA4IH1eERtoJ+Xy+/fsoe0pzbDmw84bHZ9ACny5jblENhfZhcCxklqQw==",
-      "dev": true,
       "dependencies": {
         "dependency-graph": "^0.11.0"
       },
@@ -207,7 +204,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@11ty/eleventy-plugin-rss/-/eleventy-plugin-rss-1.2.0.tgz",
       "integrity": "sha512-YzFnSH/5pObcFnqZ2sAQ782WmpOZHj1+xB9ydY/0j7BZ2jUNahn53VmwCB/sBRwXA/Fbwwj90q1MLo01Ru0UaQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.3.4",
@@ -223,7 +219,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@11ty/eleventy-plugin-syntaxhighlight/-/eleventy-plugin-syntaxhighlight-5.0.0.tgz",
       "integrity": "sha512-y9BUmP1GofmbJgxM1+ky/UpFCpD8JSOeLeKItUs0WApgnrHk9haHziW7lS86lbArX5SiCVo4zTTw9x53gvRCaA==",
-      "dev": true,
       "dependencies": {
         "prismjs": "^1.29.0"
       },
@@ -236,7 +231,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@11ty/eleventy-utils/-/eleventy-utils-1.0.1.tgz",
       "integrity": "sha512-HPpCTz4PzudcQU+i+x6GSNHVqgnvRhnVYg5dLKaAoRWLN966odAGsBxKSyhF8i1MdlOPtsytYb2AGWP7jISC5w==",
-      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0"
       },
@@ -252,7 +246,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
       "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true,
       "engines": {
         "node": ">=0.12"
       },
@@ -264,7 +257,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
       "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
-      "dev": true,
       "dependencies": {
         "uc.micro": "^1.0.1"
       }
@@ -273,7 +265,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.3.0.tgz",
       "integrity": "sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       }
@@ -282,7 +273,6 @@
       "version": "13.0.1",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz",
       "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
-      "dev": true,
       "dependencies": {
         "argparse": "^2.0.1",
         "entities": "~3.0.1",
@@ -298,7 +288,6 @@
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/@11ty/lodash-custom/-/lodash-custom-4.17.21.tgz",
       "integrity": "sha512-Mqt6im1xpb1Ykn3nbcCovWXK3ggywRJa+IXIdoz4wIIK+cvozADH63lexcuPpGS/gJ6/m2JxyyXDyupkMr5DHw==",
-      "dev": true,
       "engines": {
         "node": ">=14"
       },
@@ -579,7 +568,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
       "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -588,7 +576,6 @@
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
       "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -636,7 +623,6 @@
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
       "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
-      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -712,7 +698,6 @@
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
       "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -732,7 +717,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
       "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-      "dev": true,
       "engines": {
         "node": ">=0.1.90"
       }
@@ -741,7 +725,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
       "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
-      "dev": true,
       "dependencies": {
         "colorspace": "1.1.x",
         "enabled": "2.0.x",
@@ -1632,8 +1615,7 @@
     "node_modules/@iarna/toml": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==",
-      "dev": true
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
     },
     "node_modules/@icons/material": {
       "version": "0.2.4",
@@ -2006,7 +1988,6 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -2019,7 +2000,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
       "engines": {
         "node": ">= 8"
       }
@@ -2028,7 +2008,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -2075,7 +2054,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.2.0.tgz",
       "integrity": "sha512-Btc6Bht2Y8jBlS1RqVYsPWQaL1WgeGZd/TasmQpCsh0s5Ax1Kw0zyr6DCpvlNYG6b3mNnmJ5ib44A5MIQZmrEQ==",
-      "dev": true,
       "engines": {
         "node": ">= 10"
       },
@@ -2101,7 +2079,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -2221,7 +2198,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-1.1.2.tgz",
       "integrity": "sha512-V9nR/W0Xd9TSGXpZ4iFUcFGhuOJtZX82Fzxj1YISlbSgKvIiNa7eLEZrT0vAraPOt++KHauIVNYgGRgjc13dXA==",
-      "dev": true,
       "dependencies": {
         "@sindresorhus/transliterate": "^0.1.1",
         "escape-string-regexp": "^4.0.0"
@@ -2237,7 +2213,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@sindresorhus/transliterate/-/transliterate-0.1.2.tgz",
       "integrity": "sha512-5/kmIOY9FF32nicXH+5yLNTX4NJ4atl7jRgqAJuIn/iyDFXBktOKDxCvyGE/EzmF4ngSUvjXxQUQlQiZ5lfw+w==",
-      "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0",
         "lodash.deburr": "^4.1.0"
@@ -2253,7 +2228,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2271,7 +2245,6 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "dev": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -2305,14 +2278,12 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
       "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
-      "dev": true,
       "peer": true
     },
     "node_modules/@types/markdown-it": {
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
       "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
-      "dev": true,
       "peer": true,
       "dependencies": {
         "@types/linkify-it": "*",
@@ -2332,14 +2303,12 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
       "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
-      "dev": true,
       "peer": true
     },
     "node_modules/@types/minimatch": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="
     },
     "node_modules/@types/node": {
       "version": "17.0.23",
@@ -2493,7 +2462,6 @@
       "version": "0.8.6",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz",
       "integrity": "sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==",
-      "dev": true,
       "engines": {
         "node": ">=10.0.0"
       }
@@ -2501,8 +2469,7 @@
     "node_modules/a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
-      "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
-      "dev": true
+      "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="
     },
     "node_modules/abab": {
       "version": "2.0.6",
@@ -2527,7 +2494,6 @@
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2607,7 +2573,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2627,8 +2592,7 @@
     "node_modules/any-promise": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz",
-      "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=",
-      "dev": true
+      "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic="
     },
     "node_modules/anymatch": {
       "version": "3.1.2",
@@ -2815,8 +2779,7 @@
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/array-back": {
       "version": "3.1.0",
@@ -2844,7 +2807,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
       "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2890,7 +2852,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2899,7 +2860,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
       "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3004,7 +2964,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
       "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -3012,14 +2971,12 @@
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
     "node_modules/assert-never": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz",
-      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==",
-      "dev": true
+      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="
     },
     "node_modules/assertion-error": {
       "version": "1.1.0",
@@ -3033,8 +2990,7 @@
     "node_modules/async": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
-      "dev": true
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
     },
     "node_modules/async-mutex": {
       "version": "0.3.2",
@@ -3181,7 +3137,6 @@
       "version": "3.0.0-canary-5",
       "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz",
       "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.9.6"
       },
@@ -3245,7 +3200,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/bcp-47/-/bcp-47-1.0.8.tgz",
       "integrity": "sha512-Y9y1QNBBtYtv7hcmoX0tR+tUNSFZGZ6OL6vKPObq8BbOhkCoyayF6ogfLTgAli/KuAEbsYHYUNq2AQuY6IuLag==",
-      "dev": true,
       "dependencies": {
         "is-alphabetical": "^1.0.0",
         "is-alphanumerical": "^1.0.0",
@@ -3260,7 +3214,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/bcp-47-match/-/bcp-47-match-1.0.3.tgz",
       "integrity": "sha512-LggQ4YTdjWQSKELZF5JwchnBa1u0pIQSZf5lSdOHEdbVP55h0qICA/FUp3+W99q0xqxYa1ZQizTUH87gecII5w==",
-      "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -3270,7 +3223,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/bcp-47-normalize/-/bcp-47-normalize-1.1.1.tgz",
       "integrity": "sha512-jWZ1Jdu3cs0EZdfCkS0UE9Gg01PtxnChjEBySeB+Zo6nkqtFfnvtoQQgP1qU1Oo4qgJgxhTI6Sf9y/pZIhPs0A==",
-      "dev": true,
       "dependencies": {
         "bcp-47": "^1.0.0",
         "bcp-47-match": "^1.0.0"
@@ -3382,8 +3334,7 @@
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
@@ -3509,7 +3460,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
       "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.1",
@@ -3647,7 +3597,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
       "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
-      "dev": true,
       "dependencies": {
         "is-regex": "^1.0.3"
       }
@@ -4236,7 +4185,6 @@
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -4250,7 +4198,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-      "dev": true,
       "engines": {
         "node": ">=0.8"
       }
@@ -4259,7 +4206,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
       "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
-      "dev": true,
       "engines": {
         "node": ">= 0.10"
       }
@@ -4267,14 +4213,12 @@
     "node_modules/clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
-      "dev": true
+      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag=="
     },
     "node_modules/cloneable-readable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
       "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.1",
         "process-nextick-args": "^2.0.0",
@@ -4284,14 +4228,12 @@
     "node_modules/cloneable-readable/node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
     "node_modules/cloneable-readable/node_modules/readable-stream": {
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -4305,14 +4247,12 @@
     "node_modules/cloneable-readable/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/cloneable-readable/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -4337,7 +4277,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
       "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.3",
         "color-string": "^1.6.0"
@@ -4347,7 +4286,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -4370,7 +4308,6 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
       "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
-      "dev": true,
       "dependencies": {
         "color": "^3.1.3",
         "text-hex": "1.0.x"
@@ -4417,7 +4354,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
       "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true,
       "engines": {
         "node": ">= 6"
       }
@@ -4452,7 +4388,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz",
       "integrity": "sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==",
-      "dev": true,
       "dependencies": {
         "@babel/parser": "^7.6.0",
         "@babel/types": "^7.6.1"
@@ -4524,8 +4459,7 @@
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "node_modules/cors": {
       "version": "2.8.5",
@@ -4570,7 +4504,6 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -4584,7 +4517,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -4599,7 +4531,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
       "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.0.1",
@@ -4614,14 +4545,12 @@
     "node_modules/css-selector-parser": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz",
-      "integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==",
-      "dev": true
+      "integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g=="
     },
     "node_modules/css-tree": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
       "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
       "dependencies": {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
@@ -4634,7 +4563,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
       "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
       "engines": {
         "node": ">= 6"
       },
@@ -4652,7 +4580,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
       "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
       "dependencies": {
         "css-tree": "^1.1.2"
       },
@@ -4663,8 +4590,7 @@
     "node_modules/cssom": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
     },
     "node_modules/cssstyle": {
       "version": "3.0.0",
@@ -4688,7 +4614,6 @@
       "version": "5.5.6",
       "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.6.tgz",
       "integrity": "sha512-uNpm30m/AGSkLxxy7d9yRXpJQFrZzVWLFBkS+6ngPcZkw/5k3L/jjFuj7tVnEpRn+QgmiXr21nDlhCiUK4ij2A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/data-uri-to-buffer": {
@@ -4833,7 +4758,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
       "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
-      "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
@@ -4882,7 +4806,6 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
       "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
-      "dev": true,
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -4922,7 +4845,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
       "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==",
-      "dev": true,
       "bin": {
         "dev-ip": "lib/dev-ip.js"
       },
@@ -4999,8 +4921,7 @@
     "node_modules/doctypes": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
-      "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=",
-      "dev": true
+      "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
     },
     "node_modules/dom-helpers": {
       "version": "3.4.0",
@@ -5015,7 +4936,6 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
       "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-      "dev": true,
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -5035,7 +4955,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
       "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -5068,7 +4987,6 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
       "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
       "dependencies": {
         "domelementtype": "^2.2.0"
       },
@@ -5089,7 +5007,6 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
       "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
       "dependencies": {
         "dom-serializer": "^1.0.1",
         "domelementtype": "^2.2.0",
@@ -5123,14 +5040,12 @@
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
       "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "dev": true,
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -5158,7 +5073,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/eleventy-plugin-svg-sprite/-/eleventy-plugin-svg-sprite-1.3.1.tgz",
       "integrity": "sha512-4AwBtDV8kzoxzCbJdNDam+wfDLn6GsfEVwu1v7s0GLVmZyRihhfwpUbOZMGivqnUOmIDvGW8emdYRa4ysg1ZOw==",
-      "dev": true,
       "dependencies": {
         "svg-sprite": "2.0.0"
       },
@@ -5172,8 +5086,7 @@
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -5187,14 +5100,12 @@
     "node_modules/enabled": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
-      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
-      "dev": true
+      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -5211,7 +5122,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
       "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true,
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -5232,7 +5142,6 @@
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dev": true,
       "dependencies": {
         "prr": "~1.0.1"
       },
@@ -5415,14 +5324,12 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -5827,7 +5734,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -6053,7 +5959,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -6096,7 +6001,6 @@
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
       "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-      "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -6124,7 +6028,6 @@
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
       "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -6141,8 +6044,7 @@
     "node_modules/fecha": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
-      "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==",
-      "dev": true
+      "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="
     },
     "node_modules/fetch-blob": {
       "version": "3.2.0",
@@ -6193,7 +6095,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
       "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dev": true,
       "dependencies": {
         "minimatch": "^5.0.1"
       }
@@ -6202,7 +6103,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -6211,7 +6111,6 @@
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
       "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -6234,7 +6133,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
       "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -6252,7 +6150,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -6260,14 +6157,12 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/finalhandler/node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
       "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -6339,8 +6234,7 @@
     "node_modules/fn.name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
-      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
-      "dev": true
+      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
     },
     "node_modules/focus-group": {
       "version": "0.3.1",
@@ -6567,7 +6461,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -6591,7 +6484,6 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
       "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
@@ -6772,7 +6664,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -6792,8 +6683,7 @@
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
@@ -6830,7 +6720,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz",
       "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==",
-      "dev": true,
       "dependencies": {
         "js-yaml": "^3.13.1",
         "kind-of": "^6.0.2",
@@ -6845,7 +6734,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -6854,7 +6742,6 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -6866,14 +6753,12 @@
     "node_modules/hamljs": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/hamljs/-/hamljs-0.6.2.tgz",
-      "integrity": "sha1-e3EWz22+cnjkKz9u+HJaM+F3yOM=",
-      "dev": true
+      "integrity": "sha1-e3EWz22+cnjkKz9u+HJaM+F3yOM="
     },
     "node_modules/handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
       "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
-      "dev": true,
       "dependencies": {
         "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
@@ -6924,7 +6809,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
       "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.1.1"
       },
@@ -6936,7 +6820,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -6948,7 +6831,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -6960,7 +6842,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
       "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -7340,7 +7221,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
       "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
-      "dev": true,
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
         {
@@ -7359,7 +7239,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
       "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true,
       "engines": {
         "node": ">=0.12"
       },
@@ -7371,7 +7250,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/http-equiv-refresh/-/http-equiv-refresh-1.0.0.tgz",
       "integrity": "sha1-jsU4hmBCvl8/evpzfRmNlL6xsHs=",
-      "dev": true,
       "engines": {
         "node": ">= 0.10"
       }
@@ -7603,7 +7481,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
       "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -7622,7 +7499,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
       "dependencies": {
         "is-alphabetical": "^1.0.0",
         "is-decimal": "^1.0.0"
@@ -7732,7 +7608,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
       "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -7742,7 +7617,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz",
       "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==",
-      "dev": true,
       "dependencies": {
         "acorn": "^7.1.1",
         "object-assign": "^4.1.1"
@@ -7752,7 +7626,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7769,7 +7642,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -7810,8 +7682,7 @@
     "node_modules/is-json": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz",
-      "integrity": "sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA==",
-      "dev": true
+      "integrity": "sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA=="
     },
     "node_modules/is-negative-zero": {
       "version": "2.0.2",
@@ -7888,14 +7759,12 @@
     "node_modules/is-promise": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "dev": true
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
     },
     "node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -7923,7 +7792,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -8035,14 +7903,12 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "node_modules/iso-639-1": {
       "version": "2.1.15",
       "resolved": "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz",
       "integrity": "sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==",
-      "dev": true,
       "engines": {
         "node": ">=6.0"
       }
@@ -8084,7 +7950,6 @@
       "version": "10.8.7",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
       "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
-      "dev": true,
       "dependencies": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
@@ -8102,7 +7967,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8117,7 +7981,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8133,7 +7996,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8144,14 +8006,12 @@
     "node_modules/jake/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jake/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8160,7 +8020,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8202,8 +8061,7 @@
     "node_modules/js-stringify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
-      "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=",
-      "dev": true
+      "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds="
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
@@ -8215,7 +8073,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -8388,7 +8245,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
       "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
-      "dev": true,
       "dependencies": {
         "is-promise": "^2.0.0",
         "promise": "^7.0.1"
@@ -8398,7 +8254,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz",
       "integrity": "sha1-h75jSIZJy9ym9Tqzm+yczSNH9ZI=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8426,7 +8281,6 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8435,7 +8289,6 @@
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
       "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -8443,8 +8296,7 @@
     "node_modules/kuler": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
-      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==",
-      "dev": true
+      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
     },
     "node_modules/lazy-ass": {
       "version": "1.6.0",
@@ -8503,7 +8355,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
       "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-      "dev": true,
       "dependencies": {
         "uc.micro": "^1.0.1"
       }
@@ -8512,7 +8363,6 @@
       "version": "10.8.3",
       "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.8.3.tgz",
       "integrity": "sha512-LqHLYtH3vrkT3LyfOhPU0FJX5KPO4aB6SzGa4HRI29yz8pS0ZxqIe/fWtic8qiust1+qrHI92J67tdt92V4WOA==",
-      "dev": true,
       "dependencies": {
         "commander": "^10.0.0"
       },
@@ -8532,7 +8382,6 @@
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
       "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
-      "dev": true,
       "engines": {
         "node": ">=14"
       }
@@ -8540,8 +8389,7 @@
     "node_modules/list-to-array": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/list-to-array/-/list-to-array-1.1.0.tgz",
-      "integrity": "sha1-yn3/ZAYGQzysdcvoRGrNhksVv28=",
-      "dev": true
+      "integrity": "sha1-yn3/ZAYGQzysdcvoRGrNhksVv28="
     },
     "node_modules/load-json-file": {
       "version": "4.0.0",
@@ -8645,20 +8493,17 @@
     "node_modules/lodash.deburr": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-4.1.0.tgz",
-      "integrity": "sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s=",
-      "dev": true
+      "integrity": "sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s="
     },
     "node_modules/lodash.escape": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==",
-      "dev": true
+      "integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "node_modules/lodash.throttle": {
       "version": "4.1.1",
@@ -8669,14 +8514,12 @@
     "node_modules/lodash.trim": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/lodash.trim/-/lodash.trim-4.5.1.tgz",
-      "integrity": "sha512-nJAlRl/K+eiOehWKDzoBVrSMhK0K3A3YQsUNXHQa5yIrKBAhsZgSu3KoAFoFT+mEgiyBHddZ0pRk1ITpIp90Wg==",
-      "dev": true
+      "integrity": "sha512-nJAlRl/K+eiOehWKDzoBVrSMhK0K3A3YQsUNXHQa5yIrKBAhsZgSu3KoAFoFT+mEgiyBHddZ0pRk1ITpIp90Wg=="
     },
     "node_modules/lodash.trimstart": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/lodash.trimstart/-/lodash.trimstart-4.5.1.tgz",
-      "integrity": "sha512-b/+D6La8tU76L/61/aN0jULWHkT0EeJCmVstPBn/K9MtD2qBW83AsBNrr63dKuWYwVMO7ucv13QNO/Ek/2RKaQ==",
-      "dev": true
+      "integrity": "sha512-b/+D6La8tU76L/61/aN0jULWHkT0EeJCmVstPBn/K9MtD2qBW83AsBNrr63dKuWYwVMO7ucv13QNO/Ek/2RKaQ=="
     },
     "node_modules/log-symbols": {
       "version": "4.1.0",
@@ -8768,7 +8611,6 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz",
       "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==",
-      "dev": true,
       "dependencies": {
         "@colors/colors": "1.5.0",
         "fecha": "^4.2.0",
@@ -8853,7 +8695,6 @@
       "version": "12.3.2",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
       "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-      "dev": true,
       "dependencies": {
         "argparse": "^2.0.1",
         "entities": "~2.1.0",
@@ -8869,7 +8710,6 @@
       "version": "8.6.7",
       "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
       "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
-      "dev": true,
       "peerDependencies": {
         "@types/markdown-it": "*",
         "markdown-it": "*"
@@ -8879,7 +8719,6 @@
       "version": "4.1.6",
       "resolved": "https://registry.npmjs.org/markdown-it-attrs/-/markdown-it-attrs-4.1.6.tgz",
       "integrity": "sha512-O7PDKZlN8RFMyDX13JnctQompwrrILuz2y43pW2GagcwpIIElkAdfeek+erHfxUOlXWPsjFeWmZ8ch1xtRLWpA==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       },
@@ -8920,7 +8759,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz",
       "integrity": "sha1-hs2NawTJ8wfAWmuUGZBtA2D7E6I=",
-      "dev": true,
       "dependencies": {
         "array-differ": "^1.0.0",
         "array-union": "^1.0.1",
@@ -8935,7 +8773,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
       "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8944,7 +8781,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
       "dependencies": {
         "array-uniq": "^1.0.1"
       },
@@ -8956,7 +8792,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9188,14 +9023,12 @@
     "node_modules/mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
     "node_modules/mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-      "dev": true
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
@@ -9237,7 +9070,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
       "engines": {
         "node": ">= 8"
       }
@@ -9361,7 +9193,6 @@
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
       "dependencies": {
         "braces": "^3.0.2",
         "picomatch": "^2.3.1"
@@ -9374,7 +9205,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
       "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
-      "dev": true,
       "bin": {
         "mime": "cli.js"
       },
@@ -9470,7 +9300,6 @@
       "version": "3.3.6",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -9482,7 +9311,6 @@
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
       "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
       "dependencies": {
         "minimist": "^1.2.5"
       },
@@ -9659,8 +9487,7 @@
     "node_modules/moo": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
-      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
-      "dev": true
+      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="
     },
     "node_modules/morgan": {
       "version": "1.10.0",
@@ -9696,8 +9523,7 @@
     "node_modules/morphdom": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.7.0.tgz",
-      "integrity": "sha512-8L8DwbdjjWwM/aNqj7BSoSn4G7SQLNiDcxCnMWbf506jojR6lNQ5YOmQqXEIE8u3C492UlkN4d0hQwz97+M1oQ==",
-      "dev": true
+      "integrity": "sha512-8L8DwbdjjWwM/aNqj7BSoSn4G7SQLNiDcxCnMWbf506jojR6lNQ5YOmQqXEIE8u3C492UlkN4d0hQwz97+M1oQ=="
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -9708,7 +9534,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
       "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
-      "dev": true,
       "dependencies": {
         "@types/minimatch": "^3.0.3",
         "array-differ": "^3.0.0",
@@ -9727,7 +9552,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
       "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
-      "dev": true,
       "bin": {
         "mustache": "bin/mustache"
       }
@@ -9773,8 +9597,7 @@
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "node_modules/netlify-cms": {
       "version": "2.10.192",
@@ -11037,7 +10860,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
       "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -11049,7 +10871,6 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
       "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
-      "dev": true,
       "dependencies": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
@@ -11239,7 +11060,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
       "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
-      "dev": true,
       "dependencies": {
         "fn.name": "1.x.x"
       }
@@ -11566,8 +11386,7 @@
     "node_modules/parse-srcset": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
-      "integrity": "sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=",
-      "dev": true
+      "integrity": "sha1-8r0iH2zJcKk42IVWq8WJyqqiveE="
     },
     "node_modules/parse5": {
       "version": "5.1.1",
@@ -11631,7 +11450,6 @@
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -11657,7 +11475,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11704,8 +11521,7 @@
     "node_modules/path-to-regexp": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-      "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==",
-      "dev": true
+      "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -11785,7 +11601,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11864,7 +11679,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
       "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
-      "dev": true,
       "dependencies": {
         "semver-compare": "^1.0.0"
       }
@@ -12026,7 +11840,6 @@
       "version": "0.16.6",
       "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz",
       "integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==",
-      "dev": true,
       "dependencies": {
         "posthtml-parser": "^0.11.0",
         "posthtml-render": "^3.0.0"
@@ -12039,7 +11852,6 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz",
       "integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==",
-      "dev": true,
       "dependencies": {
         "htmlparser2": "^7.1.1"
       },
@@ -12051,7 +11863,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz",
       "integrity": "sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA==",
-      "dev": true,
       "dependencies": {
         "is-json": "^2.0.1"
       },
@@ -12063,7 +11874,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/posthtml-urls/-/posthtml-urls-1.0.0.tgz",
       "integrity": "sha512-CMJ0L009sGQVUuYM/g6WJdscsq6ooAwhUuF6CDlYPMLxKp2rmCYVebEU+wZGxnQstGJhZPMvXsRhtqekILd5/w==",
-      "dev": true,
       "dependencies": {
         "http-equiv-refresh": "^1.0.0",
         "list-to-array": "^1.1.0",
@@ -12145,14 +11955,12 @@
     "node_modules/prettysize": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/prettysize/-/prettysize-2.0.0.tgz",
-      "integrity": "sha512-VVtxR7sOh0VsG8o06Ttq5TrI1aiZKmC+ClSn4eBPaNf4SHr5lzbYW+kYGX3HocBL/MfpVrRfFZ9V3vCbLaiplg==",
-      "dev": true
+      "integrity": "sha512-VVtxR7sOh0VsG8o06Ttq5TrI1aiZKmC+ClSn4eBPaNf4SHr5lzbYW+kYGX3HocBL/MfpVrRfFZ9V3vCbLaiplg=="
     },
     "node_modules/prismjs": {
       "version": "1.29.0",
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
       "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -12169,8 +11977,7 @@
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "node_modules/progress": {
       "version": "2.0.3",
@@ -12185,7 +11992,6 @@
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dev": true,
       "dependencies": {
         "asap": "~2.0.3"
       }
@@ -12194,7 +12000,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
       "integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=",
-      "dev": true,
       "dependencies": {
         "any-promise": "^0.1.0"
       }
@@ -12286,8 +12091,7 @@
     "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
     },
     "node_modules/ps-tree": {
       "version": "1.2.0",
@@ -12314,7 +12118,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz",
       "integrity": "sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==",
-      "dev": true,
       "dependencies": {
         "pug-code-gen": "^3.0.2",
         "pug-filters": "^4.0.0",
@@ -12330,7 +12133,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz",
       "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==",
-      "dev": true,
       "dependencies": {
         "constantinople": "^4.0.1",
         "js-stringify": "^1.0.2",
@@ -12341,7 +12143,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz",
       "integrity": "sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==",
-      "dev": true,
       "dependencies": {
         "constantinople": "^4.0.1",
         "doctypes": "^1.1.0",
@@ -12356,14 +12157,12 @@
     "node_modules/pug-error": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz",
-      "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==",
-      "dev": true
+      "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ=="
     },
     "node_modules/pug-filters": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz",
       "integrity": "sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==",
-      "dev": true,
       "dependencies": {
         "constantinople": "^4.0.1",
         "jstransformer": "1.0.0",
@@ -12376,7 +12175,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz",
       "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==",
-      "dev": true,
       "dependencies": {
         "character-parser": "^2.2.0",
         "is-expression": "^4.0.0",
@@ -12387,7 +12185,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz",
       "integrity": "sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==",
-      "dev": true,
       "dependencies": {
         "pug-error": "^2.0.0",
         "pug-walk": "^2.0.0"
@@ -12397,7 +12194,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz",
       "integrity": "sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==",
-      "dev": true,
       "dependencies": {
         "object-assign": "^4.1.1",
         "pug-walk": "^2.0.0"
@@ -12407,7 +12203,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz",
       "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==",
-      "dev": true,
       "dependencies": {
         "pug-error": "^2.0.0",
         "token-stream": "1.0.0"
@@ -12416,14 +12211,12 @@
     "node_modules/pug-runtime": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz",
-      "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==",
-      "dev": true
+      "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg=="
     },
     "node_modules/pug-strip-comments": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz",
       "integrity": "sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==",
-      "dev": true,
       "dependencies": {
         "pug-error": "^2.0.0"
       }
@@ -12431,8 +12224,7 @@
     "node_modules/pug-walk": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz",
-      "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==",
-      "dev": true
+      "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="
     },
     "node_modules/pump": {
       "version": "3.0.0",
@@ -12541,7 +12333,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -13361,7 +13152,6 @@
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/recursive-copy/-/recursive-copy-2.0.14.tgz",
       "integrity": "sha512-K8WNY8f8naTpfbA+RaXmkaQuD1IeW9EgNEfyGxSqqTQukpVtoOKros9jUqbpEsSw59YOmpd8nCBgtqJZy5nvog==",
-      "dev": true,
       "dependencies": {
         "errno": "^0.1.2",
         "graceful-fs": "^4.1.4",
@@ -13378,7 +13168,6 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -13662,8 +13451,7 @@
     "node_modules/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==",
-      "dev": true
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
     },
     "node_modules/repeat-string": {
       "version": "1.6.1",
@@ -13678,7 +13466,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
       "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-      "dev": true,
       "engines": {
         "node": ">= 0.10"
       }
@@ -13687,7 +13474,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13762,7 +13548,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -13792,7 +13577,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -13886,7 +13670,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
       "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -14336,7 +14119,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
       "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
-      "dev": true,
       "dependencies": {
         "extend-shallow": "^2.0.1",
         "kind-of": "^6.0.0"
@@ -14377,8 +14159,7 @@
     "node_modules/semver-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
-      "dev": true
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w="
     },
     "node_modules/send": {
       "version": "0.18.0",
@@ -14483,7 +14264,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
       "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
-      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.1",
         "get-intrinsic": "^1.2.1",
@@ -14594,7 +14374,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -14606,7 +14385,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -14713,7 +14491,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14885,7 +14662,7 @@
       "version": "1.6.6",
       "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
       "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==",
-      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
@@ -14925,7 +14702,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14995,14 +14771,12 @@
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "node_modules/ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
       "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dev": true,
       "dependencies": {
         "minipass": "^3.1.1"
       },
@@ -15014,14 +14788,12 @@
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
       "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
-      "dev": true
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
     },
     "node_modules/stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
       "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -15064,7 +14836,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -15099,7 +14870,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -15190,7 +14960,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -15211,7 +14980,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
       "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15279,7 +15047,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/svg-sprite/-/svg-sprite-2.0.0.tgz",
       "integrity": "sha512-Kt9vz7TZVw7g4p2sNIfmSodUJ1bVuOE1VtHzA1gMmUmGfVQQvjzuf+12KzYBxa37efAhmQgU6n+bPIlZT+68dA==",
-      "dev": true,
       "dependencies": {
         "@resvg/resvg-js": "^2.1.0",
         "@xmldom/xmldom": "^0.8.2",
@@ -15312,7 +15079,6 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
       "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-      "dev": true,
       "dependencies": {
         "@trysound/sax": "0.2.0",
         "commander": "^7.2.0",
@@ -15333,7 +15099,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
       "engines": {
         "node": ">= 10"
       }
@@ -15388,8 +15153,7 @@
     "node_modules/text-hex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
-      "dev": true
+      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
     },
     "node_modules/text-table": {
       "version": "0.2.0",
@@ -15435,7 +15199,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -15463,8 +15226,7 @@
     "node_modules/token-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz",
-      "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=",
-      "dev": true
+      "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ="
     },
     "node_modules/tomlify-j0.4": {
       "version": "3.0.0",
@@ -15528,8 +15290,7 @@
     "node_modules/triple-beam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
-      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==",
-      "dev": true
+      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
     },
     "node_modules/trough": {
       "version": "1.0.5",
@@ -15730,14 +15491,12 @@
     "node_modules/uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/uglify-js": {
       "version": "3.15.2",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
       "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A==",
-      "dev": true,
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -15966,7 +15725,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -16261,7 +16019,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
       "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "dev": true,
       "dependencies": {
         "clone": "^2.1.1",
         "clone-buffer": "^1.0.0",
@@ -16278,7 +16035,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
       "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16464,7 +16220,6 @@
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
       "integrity": "sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==",
-      "dev": true,
       "dependencies": {
         "@colors/colors": "1.5.0",
         "@dabh/diagnostics": "^2.0.2",
@@ -16486,7 +16241,6 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz",
       "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==",
-      "dev": true,
       "dependencies": {
         "logform": "^2.3.2",
         "readable-stream": "^3.6.0",
@@ -16500,7 +16254,6 @@
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz",
       "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==",
-      "dev": true,
       "dependencies": {
         "@babel/parser": "^7.9.6",
         "@babel/types": "^7.9.6",
@@ -16514,8 +16267,7 @@
     "node_modules/wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-      "dev": true
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
     },
     "node_modules/workerpool": {
       "version": "6.2.1",
@@ -16527,7 +16279,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -16544,7 +16295,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -16559,7 +16309,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -16570,8 +16319,7 @@
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
@@ -16582,7 +16330,6 @@
       "version": "8.13.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
       "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-      "dev": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -16630,7 +16377,6 @@
       "version": "0.0.32",
       "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
       "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==",
-      "dev": true,
       "engines": {
         "node": ">=0.6.0"
       }
@@ -16668,7 +16414,6 @@
       "version": "17.6.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
       "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
-      "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -16686,7 +16431,6 @@
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       }
@@ -16743,7 +16487,6 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
diff --git a/package.json b/package.json
index 723484a84..c6763f944 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "federalist": "npm run build",
     "lint": "eslint .",
     "pa11y-ci:sitemap": "sleep 10; pa11y-ci --sitemap http://localhost:8080/sitemap.xml --sitemap-exclude \"/*.pdf\"  --sitemap-exclude \"/admin\" --sitemap-find \"^/\" --sitemap-replace \"http://localhost:8080/\"",
+    "precommit": "npm run lint && rm -rf _site && npm run build && npm run test:html-validation && npm run test:links",
     "serve": "npx @11ty/eleventy --serve",
     "start": "npx @11ty/eleventy --serve",
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -52,14 +53,14 @@
   },
   "dependencies": {
     "@11ty/eleventy": "^2.0.1",
+    "@11ty/eleventy-img": "^3.1.8",
     "@11ty/eleventy-navigation": "^0.3.5",
     "@11ty/eleventy-plugin-rss": "^1.2.0",
-    "eleventy-plugin-svg-sprite": "^1.3.1",
     "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
-    "@11ty/eleventy-img": "^3.1.8",
     "@uswds/uswds": "3.8.0",
     "autoprefixer": "^10.4.19",
     "csv-parse": "^5.5.6",
+    "eleventy-plugin-svg-sprite": "^1.3.1",
     "esbuild": "^0.20.2",
     "esbuild-sass-plugin": "^3.2.0",
     "js-yaml": "^4.1.0",
@@ -68,7 +69,8 @@
     "markdown-it-anchor": "^8.6.7",
     "markdown-it-attrs": "^4.1.6",
     "markdown-it-footnote": "^3.0.3",
-    "netlify-cms": "^2.10.192"
+    "netlify-cms": "^2.10.192",
+    "slugify": "^1.6.6"
   },
   "mocha": {
     "timeout": 15000