diff --git a/assets/fonts/alliance/alliance-no-1-bold.woff b/assets/fonts/alliance/alliance-no-1-bold.woff
deleted file mode 100644
index 77dd7ad71f..0000000000
Binary files a/assets/fonts/alliance/alliance-no-1-bold.woff and /dev/null differ
diff --git a/assets/fonts/alliance/alliance-no-1-extrabold.woff b/assets/fonts/alliance/alliance-no-1-extrabold.woff
deleted file mode 100644
index 8eb36cd9c4..0000000000
Binary files a/assets/fonts/alliance/alliance-no-1-extrabold.woff and /dev/null differ
diff --git a/assets/fonts/alliance/alliance-no-1-medium.woff b/assets/fonts/alliance/alliance-no-1-medium.woff
deleted file mode 100644
index afc2331f21..0000000000
Binary files a/assets/fonts/alliance/alliance-no-1-medium.woff and /dev/null differ
diff --git a/assets/fonts/alliance/alliance-no-1-regular.woff b/assets/fonts/alliance/alliance-no-1-regular.woff
deleted file mode 100644
index 0b1e4c761f..0000000000
Binary files a/assets/fonts/alliance/alliance-no-1-regular.woff and /dev/null differ
diff --git a/assets/fonts/inter/Inter-Bold.woff b/assets/fonts/inter/Inter-Bold.woff
deleted file mode 100644
index d196122f60..0000000000
Binary files a/assets/fonts/inter/Inter-Bold.woff and /dev/null differ
diff --git a/assets/fonts/inter/Inter-Medium.woff b/assets/fonts/inter/Inter-Medium.woff
deleted file mode 100644
index c16b02fc4e..0000000000
Binary files a/assets/fonts/inter/Inter-Medium.woff and /dev/null differ
diff --git a/assets/fonts/inter/Inter-Regular.woff b/assets/fonts/inter/Inter-Regular.woff
deleted file mode 100644
index e267a73f16..0000000000
Binary files a/assets/fonts/inter/Inter-Regular.woff and /dev/null differ
diff --git a/components/Breadcrumbs.tsx b/components/Breadcrumbs.tsx
index 90a59421c7..421b09a269 100644
--- a/components/Breadcrumbs.tsx
+++ b/components/Breadcrumbs.tsx
@@ -9,10 +9,7 @@ export type BreadcrumbT = {
   href?: string
 }
 
-type Props = {
-  variant?: 'default' | 'large'
-}
-export const Breadcrumbs = ({ variant = 'default' }: Props) => {
+export const Breadcrumbs = () => {
   const router = useRouter()
   const pathWithLocale = `/${router.locale}${router.asPath.split('?')[0]}` // remove query string
   const { breadcrumbs } = useMainContext()
@@ -44,7 +41,6 @@ export const Breadcrumbs = ({ variant = 'default' }: Props) => {
               title={title}
               className={cx(
                 'd-inline-block px-2',
-                variant === 'large' && 'text-uppercase text-mono',
                 pathWithLocale === breadcrumb.href && 'color-text-tertiary'
               )}
             >
diff --git a/components/GenericError.tsx b/components/GenericError.tsx
index 48018c49da..2e3d735f6c 100644
--- a/components/GenericError.tsx
+++ b/components/GenericError.tsx
@@ -20,8 +20,8 @@ export function GenericError() {
       <div className="container-xl p-responsive py-9 width-full flex-1">
         <article className="col-md-10 col-lg-7 mx-auto">
           <h1 className="mb-3 pb-3 border-bottom">Ooops!</h1>
-          <p className="lead-mktg">It looks like something went wrong.</p>
-          <p className="lead-mktg">
+          <p className="f2 color-text-secondary">It looks like something went wrong.</p>
+          <p className="f3">
             We track these errors automatically, but if the problem persists please feel free to
             contact us.
           </p>
@@ -65,7 +65,7 @@ export const SimpleHeader = () => {
 
           <Link href={`/${router.locale}`}>
             {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
-            <a className="h4-mktg color-text-primary no-underline no-wrap pl-2">GitHub Docs</a>
+            <a className="h4 color-text-primary no-underline no-wrap pl-2">GitHub Docs</a>
           </Link>
         </div>
       </header>
diff --git a/components/Search.tsx b/components/Search.tsx
index 12e981f49a..392fb18348 100644
--- a/components/Search.tsx
+++ b/components/Search.tsx
@@ -189,7 +189,10 @@ export function Search({
                       dangerouslySetInnerHTML={{ __html: breadcrumbs }}
                     />
                     <div
-                      className={cx(styles.searchResultTitle, 'd-block h4-mktg color-text-primary')}
+                      className={cx(
+                        styles.searchResultTitle,
+                        'd-block f4 font-weight-semibold color-text-primary'
+                      )}
                       dangerouslySetInnerHTML={{
                         __html: heading ? `${title}: ${heading}` : title,
                       }}
diff --git a/components/article/ArticlePage.tsx b/components/article/ArticlePage.tsx
index 92676e7356..310180adc2 100644
--- a/components/article/ArticlePage.tsx
+++ b/components/article/ArticlePage.tsx
@@ -63,7 +63,11 @@ export const ArticlePage = () => {
                 </Callout>
               )}
 
-              {intro && <MarkdownContent className="lead-mktg mb-3">{intro}</MarkdownContent>}
+              {intro && (
+                <MarkdownContent className="f2 color-text-secondary mb-3" data-testid="lead">
+                  {intro}
+                </MarkdownContent>
+              )}
 
               {permissions && (
                 <div
diff --git a/components/article/ArticleVersionPicker.tsx b/components/article/ArticleVersionPicker.tsx
index 2c18025017..f8861d785d 100644
--- a/components/article/ArticleVersionPicker.tsx
+++ b/components/article/ArticleVersionPicker.tsx
@@ -25,7 +25,7 @@ export const ArticleVersionPicker = () => {
       `}
       data-testid="article-version-picker"
     >
-      <summary className="f4 h5-mktg btn-outline-mktg btn-mktg p-2 outline-none">
+      <summary className="btn btn-outline p-2 outline-none">
         <span className="d-md-none d-xl-inline-block">{t('article_version')}</span>{' '}
         {allVersions[currentVersion].versionTitle}
         <Dropdown.Caret />
diff --git a/components/article/LearningTrackNav.tsx b/components/article/LearningTrackNav.tsx
index d206f2e6aa..4ac5987caa 100644
--- a/components/article/LearningTrackNav.tsx
+++ b/components/article/LearningTrackNav.tsx
@@ -10,7 +10,7 @@ export function LearningTrackNav({ track }: Props) {
   return (
     <div
       data-testid="learning-track-nav"
-      className="py-3 px-4 rounded color-bg-primary border-gradient--purple-pink d-flex flex-justify-between"
+      className="py-3 px-4 rounded color-bg-primary border d-flex flex-justify-between"
     >
       <span className="d-flex flex-column">
         {prevGuide && (
diff --git a/components/landing/ArticleList.tsx b/components/landing/ArticleList.tsx
index a8448a4f0c..a540017c38 100644
--- a/components/landing/ArticleList.tsx
+++ b/components/landing/ArticleList.tsx
@@ -28,8 +28,8 @@ export const ArticleList = ({
           <h3
             className={cx(
               titleVariant === 'large'
-                ? 'f4 text-normal text-mono text-uppercase'
-                : 'f5 text-normal text-mono underline-dashed color-text-secondary'
+                ? 'f4 font-weight-semibold'
+                : 'f5 text-normal underline-dashed color-text-secondary'
             )}
           >
             {title}
diff --git a/components/landing/CodeExamples.tsx b/components/landing/CodeExamples.tsx
index dfdb765134..76ee8877fb 100644
--- a/components/landing/CodeExamples.tsx
+++ b/components/landing/CodeExamples.tsx
@@ -65,7 +65,7 @@ export const CodeExamples = () => {
       {isSearching && searchResults.length === 0 && (
         <div
           data-testid="code-examples-no-results"
-          className="py-4 text-center color-text-secondary font-mktg"
+          className="py-4 text-center color-text-secondary"
         >
           <div className="mb-3">
             <SearchIcon size={24} />{' '}
diff --git a/components/landing/LandingHero.tsx b/components/landing/LandingHero.tsx
index 936336caca..0f76fc1df3 100644
--- a/components/landing/LandingHero.tsx
+++ b/components/landing/LandingHero.tsx
@@ -22,16 +22,12 @@ export const LandingHero = () => {
   return (
     <header className="d-lg-flex gutter-lg mb-6">
       <div className={cx(product_video && 'col-12 col-lg-6 mb-3 mb-lg-0')}>
-        <span className="text-mono color-text-secondary">Product</span>
-        <h1 className="mb-3 font-mktg">
+        <h1 className="mb-3">
           {shortTitle}{' '}
           {beta_product && <span className="Label Label--success v-align-middle">Beta</span>}
         </h1>
 
-        <div
-          className="lead-mktg color-text-secondary"
-          dangerouslySetInnerHTML={{ __html: intro }}
-        />
+        <div className="f2 color-text-secondary" dangerouslySetInnerHTML={{ __html: intro }} />
 
         {introLinks &&
           Object.entries(introLinks)
@@ -46,7 +42,7 @@ export const LandingHero = () => {
                 <FullLink
                   key={link}
                   href={link}
-                  className={cx('btn-mktg bt-large f4 mt-3 mr-3', i !== 0 && 'btn-outline-mktg')}
+                  className={cx('btn btn-large f4 mt-3 mr-3 ', i === 0 && 'btn-primary-matte')}
                 >
                   {t(key)}
                 </FullLink>
diff --git a/components/landing/LandingSection.tsx b/components/landing/LandingSection.tsx
index cff3c8a77a..20351a2f86 100644
--- a/components/landing/LandingSection.tsx
+++ b/components/landing/LandingSection.tsx
@@ -11,7 +11,7 @@ export const LandingSection = ({ title, children, className, sectionLink, descri
   return (
     <div className={cx('container-xl px-3 px-md-6', className)} id={sectionLink}>
       {title && (
-        <h2 className={cx('font-mktg h1 color-text-primary', !description ? 'mb-3' : 'mb-4')}>
+        <h2 className={cx('h1 color-text-primary', !description ? 'mb-3' : 'mb-4')}>
           {sectionLink ? (
             <a className="color-unset" href={`#${sectionLink}`}>
               {title}
@@ -23,7 +23,7 @@ export const LandingSection = ({ title, children, className, sectionLink, descri
       )}
       {description && (
         <div
-          className="lead-mktg color-text-secondary f4"
+          className="color-text-secondary f4"
           dangerouslySetInnerHTML={{ __html: description }}
         />
       )}
diff --git a/components/landing/TocLanding.tsx b/components/landing/TocLanding.tsx
index e4f77a8593..d027559301 100644
--- a/components/landing/TocLanding.tsx
+++ b/components/landing/TocLanding.tsx
@@ -22,7 +22,7 @@ export const TocLanding = () => {
         <ArticleGridLayout className="mt-7">
           <ArticleTitle>{title}</ArticleTitle>
 
-          <div className="lead-mktg">
+          <div className="f2 color-text-secondary">
             <p>{introPlainText}</p>
           </div>
 
diff --git a/components/page-header/Header.tsx b/components/page-header/Header.tsx
index 6ed1240e22..bb86c2b3fb 100644
--- a/components/page-header/Header.tsx
+++ b/components/page-header/Header.tsx
@@ -65,7 +65,7 @@ export const Header = () => {
 
               <Link
                 href={`/${router.locale}`}
-                className="h4-mktg color-text-primary no-underline no-wrap pl-2"
+                className="f4 font-weight-semibold color-text-primary no-underline no-wrap pl-2"
               >
                 {t('github_docs')}
               </Link>
@@ -92,9 +92,7 @@ export const Header = () => {
               )}
             >
               <div className="mt-3 mb-2">
-                <h4 className="text-mono f5 text-normal color-text-secondary">
-                  {t('explore_by_product')}
-                </h4>
+                <h4 className="f5 text-normal color-text-secondary">{t('explore_by_product')}</h4>
 
                 <ProductPicker />
               </div>
diff --git a/components/playground/editor/ActionBar.tsx b/components/playground/editor/ActionBar.tsx
index e011ae1c07..bb4a61684f 100644
--- a/components/playground/editor/ActionBar.tsx
+++ b/components/playground/editor/ActionBar.tsx
@@ -1,4 +1,4 @@
-import { ClippyIcon, CheckIcon } from '@primer/octicons-react'
+import { CopyIcon, CheckIcon } from '@primer/octicons-react'
 import { Tooltip } from '@primer/components'
 
 import useClipboard from 'components/hooks/useClipboard'
@@ -32,7 +32,7 @@ export const ActionBar = ({ code }: Props) => {
           aria-label={isCopied ? 'Copied!' : 'Copy to clipboard'}
         >
           <button className="btn-octicon" onClick={() => setCopied()}>
-            {isCopied ? <CheckIcon /> : <ClippyIcon />}
+            {isCopied ? <CheckIcon /> : <CopyIcon />}
           </button>
         </Tooltip>
       </div>
diff --git a/components/release-notes/GHAEReleaseNotes.tsx b/components/release-notes/GHAEReleaseNotes.tsx
index 2d12cc8776..5869dd1b8f 100644
--- a/components/release-notes/GHAEReleaseNotes.tsx
+++ b/components/release-notes/GHAEReleaseNotes.tsx
@@ -84,7 +84,7 @@ const CollapsibleReleaseSection = ({
         <summary className="px-3 py-4 my-0 d-flex flex-items-center flex-justify-between outline-none">
           {release.version}
           <div className="d-flex">
-            <span className="color-text-tertiary text-mono text-small text-normal mr-1">
+            <span className="color-text-tertiary text-small text-normal mr-1">
               {release.patches.length} releases
             </span>
             <ChevronDownIcon className={isOpen ? 'rotate-180' : ''} />
diff --git a/components/release-notes/GHESReleaseNotes.tsx b/components/release-notes/GHESReleaseNotes.tsx
index b87716da06..1f49620ecc 100644
--- a/components/release-notes/GHESReleaseNotes.tsx
+++ b/components/release-notes/GHESReleaseNotes.tsx
@@ -121,7 +121,7 @@ export function GHESReleaseNotes({ context }: Props) {
                       href={releaseLink}
                     >
                       {release.version}
-                      <span className="color-text-tertiary text-mono text-small text-normal mr-1">
+                      <span className="color-text-tertiary text-small text-normal mr-1">
                         {release.patches.length} releases
                       </span>
                     </Link>
@@ -163,7 +163,7 @@ const CollapsibleReleaseSection = ({
         <summary className="px-3 py-4 my-0 d-flex flex-items-center flex-justify-between outline-none">
           {release.version}
           <div className="d-flex">
-            <span className="color-text-tertiary text-mono text-small text-normal mr-1">
+            <span className="color-text-tertiary text-small text-normal mr-1">
               {release.patches.length} releases
             </span>
             <ChevronDownIcon className={isOpen ? 'rotate-180' : ''} />
diff --git a/components/release-notes/PatchNotes.tsx b/components/release-notes/PatchNotes.tsx
index 4a055d9b66..ebb923213c 100644
--- a/components/release-notes/PatchNotes.tsx
+++ b/components/release-notes/PatchNotes.tsx
@@ -48,7 +48,7 @@ export function PatchNotes({ patch, withReleaseNoteLabel }: Props) {
             {withReleaseNoteLabel && (
               <div className="col-12 col-xl-3 mb-5">
                 <span
-                  className="px-3 py-2 text-small text-bold text-uppercase text-mono color-text-inverse"
+                  className="px-3 py-2 text-small text-bold text-uppercase color-text-inverse"
                   style={{ backgroundColor: primaryColor }}
                 >
                   {SectionToLabelMap[key] || 'INVALID SECTION'}
diff --git a/components/sidebar/SidebarNav.tsx b/components/sidebar/SidebarNav.tsx
index 0f6962c9fc..a846843e9a 100644
--- a/components/sidebar/SidebarNav.tsx
+++ b/components/sidebar/SidebarNav.tsx
@@ -33,7 +33,7 @@ export const SidebarNav = () => {
         </Link>
         <Link
           href={`/${router.locale}`}
-          className="h4-mktg color-text-primary no-underline no-wrap pl-2 flex-auto"
+          className="f4 font-weight-semibold color-text-primary no-underline no-wrap pl-2 flex-auto"
         >
           {t('github_docs')}
         </Link>
diff --git a/components/sublanding/ArticleCard.tsx b/components/sublanding/ArticleCard.tsx
index a44d2b0d1f..82b3065e23 100644
--- a/components/sublanding/ArticleCard.tsx
+++ b/components/sublanding/ArticleCard.tsx
@@ -24,7 +24,7 @@ export const ArticleCard = ({ card, typeLabel }: Props) => {
                 <span
                   data-testid="article-card-topic"
                   key={topic}
-                  className="IssueLabel bg-gradient--pink-blue color-text-inverse mr-1"
+                  className="IssueLabel color-bg-info-inverse color-text-inverse mr-1"
                 >
                   {topic}
                 </span>
diff --git a/components/sublanding/LearningTrack.tsx b/components/sublanding/LearningTrack.tsx
index aa4c383e92..1aab42af31 100644
--- a/components/sublanding/LearningTrack.tsx
+++ b/components/sublanding/LearningTrack.tsx
@@ -19,17 +19,17 @@ export const LearningTrack = ({ track }: Props) => {
   return (
     <div data-testid="learning-track" className="my-3 px-4 col-12 col-md-6">
       <div className="Box d-flex flex-column">
-        <div className="Box-header bg-gradient--blue-pink p-4 d-flex flex-1 flex-items-start flex-wrap">
+        <div className="Box-header color-bg-secondary p-4 d-flex flex-1 flex-items-start flex-wrap">
           <div className="d-flex flex-auto flex-items-start col-8 col-md-12 col-xl-8">
             <div className="my-xl-0 mr-xl-3">
-              <h5 className="mb-3 color-text-inverse font-mktg h3-mktg ">{track?.title}</h5>
-              <TruncateLines as="p" maxLines={3} className="color-text-inverse">
+              <h5 className="mb-3 color-text f3 font-weight-semibold">{track?.title}</h5>
+              <TruncateLines as="p" maxLines={3} className="color-text">
                 {track?.description}
               </TruncateLines>
             </div>
           </div>
           <a
-            className="d-inline-flex border color-border-inverse color-text-inverse px-3 py-2 f5 no-underline text-bold no-wrap mt-3 mt-md-0 flex-items-center flex-justify-center"
+            className="d-inline-flex btn no-wrap mt-3 mt-md-0 flex-items-center flex-justify-center"
             role="button"
             href={`${track?.guides && track?.guides[0].href}?learn=${track?.trackName}`}
           >
diff --git a/components/sublanding/SubLandingHero.tsx b/components/sublanding/SubLandingHero.tsx
index ff5e742f86..ae41b8acae 100644
--- a/components/sublanding/SubLandingHero.tsx
+++ b/components/sublanding/SubLandingHero.tsx
@@ -18,7 +18,7 @@ export const SubLandingHero = () => {
       >
         <div className="d-flex flex-justify-between flex-items-center">
           <div
-            className="color-bg-primary color-text-link border-gradient--pink-blue-dark d-inline-flex flex-items-center flex-justify-center circle"
+            className="color-bg-primary color-text-link border d-inline-flex flex-items-center flex-justify-center circle"
             style={{ width: 40, height: 40 }}
           >
             {featuredTrack.guides && (
@@ -31,8 +31,8 @@ export const SubLandingHero = () => {
             {t('guide_types')[guide.page?.type || '']}
           </div>
         </div>
-        <h3 className="font-mktg h3-mktg my-4 color-text-primary">{guide.title}</h3>
-        <TruncateLines maxLines={8} className="lead-mktg color-text-secondary f5 my-4">
+        <h3 className="font-weight-semibold my-4 color-text-primary">{guide.title}</h3>
+        <TruncateLines maxLines={8} className="color-text-secondary f5 my-4">
           <span dangerouslySetInnerHTML={{ __html: guide.intro }} />
         </TruncateLines>
       </Link>
@@ -43,12 +43,9 @@ export const SubLandingHero = () => {
     <div>
       <header className="d-flex gutter mb-6">
         <div className="col-12">
-          <Breadcrumbs variant="large" />
-          <h1 className="my-3 font-mktg">{title} guides</h1>
-          <div
-            className="lead-mktg color-text-secondary f4"
-            dangerouslySetInnerHTML={{ __html: intro }}
-          />
+          <Breadcrumbs />
+          <h1 className="my-3">{title} guides</h1>
+          <div className="color-text-secondary f2" dangerouslySetInnerHTML={{ __html: intro }} />
         </div>
       </header>
       {featuredTrack && (
@@ -58,20 +55,18 @@ export const SubLandingHero = () => {
             className="list-style-none d-flex flex-nowrap overflow-x-scroll px-2"
           >
             <li className="px-2 d-flex flex-shrink-0" style={{ width: cardWidth }}>
-              <div className="d-inline-block Box p-5 bg-gradient--blue-pink color-text-inverse">
+              <div className="d-inline-block Box p-5 color-bg-secondary">
                 <div
-                  className="color-text-inverse d-inline-flex flex-items-center flex-justify-center circle"
+                  className="d-inline-flex flex-items-center flex-justify-center circle border"
                   style={{ width: 40, height: 40, border: '2px white solid' }}
                 >
                   <StarFillIcon size={24} />
                 </div>
-                <h3 className="font-mktg h3-mktg my-4">{featuredTrack.title}</h3>
-                <div className="lead-mktg color-text-inverse f5 my-4">
-                  {featuredTrack.description}
-                </div>
+                <h3 className="font-weight-semibold my-4">{featuredTrack.title}</h3>
+                <div className="f5 my-4">{featuredTrack.description}</div>
                 {featuredTrack.guides && (
                   <Link
-                    className="d-inline-flex flex-items-center flex-justify-center border color-border-inverse color-text-inverse px-4 py-2 f5 no-underline text-bold"
+                    className="d-inline-flex flex-items-center flex-justify-center btn px-4 py-2 f5 no-underline text-bold"
                     role="button"
                     href={`${featuredTrack.guides[0].href}?learn=${featuredTrack.trackName}`}
                   >
diff --git a/components/ui/MarkdownContent/stylesheets/headers.scss b/components/ui/MarkdownContent/stylesheets/headers.scss
index 23f7943cc0..ceed91840c 100644
--- a/components/ui/MarkdownContent/stylesheets/headers.scss
+++ b/components/ui/MarkdownContent/stylesheets/headers.scss
@@ -23,9 +23,4 @@
   h5 {
     font-size: 0.85em;
   }
-
-  // needs specificity to override
-  [class~="lead-mktg"] p {
-    color: var(--color-auto-gray-9);
-  }
 }
diff --git a/components/ui/MarkdownContent/stylesheets/lists.scss b/components/ui/MarkdownContent/stylesheets/lists.scss
index 3730fdd35e..da6f495095 100644
--- a/components/ui/MarkdownContent/stylesheets/lists.scss
+++ b/components/ui/MarkdownContent/stylesheets/lists.scss
@@ -74,3 +74,8 @@
     margin-bottom: 15px;
   }
 }
+
+/* Override primer style */
+.markdownBody div > ol:not([type]) {
+  list-style-type: none;
+}
diff --git a/data/reusables/enterprise/ghec-cta-button.md b/data/reusables/enterprise/ghec-cta-button.md
index 5dc825d9cc..4fe93719f2 100644
--- a/data/reusables/enterprise/ghec-cta-button.md
+++ b/data/reusables/enterprise/ghec-cta-button.md
@@ -1 +1 @@
-<a href="https://github.com/account/organizations/new?plan=business_plus" class="btn-mktg bt-large f4 mt-3 mr-3">Try risk-free for 14 days</a>
+<a href="https://github.com/account/organizations/new?plan=business_plus" class="btn btn-primary-matte btn-large f4 mt-3 mr-3">Try risk-free for 14 days</a>
diff --git a/lib/liquid-tags/octicon.js b/lib/liquid-tags/octicon.js
index e3c72827b4..662edb05a7 100644
--- a/lib/liquid-tags/octicon.js
+++ b/lib/liquid-tags/octicon.js
@@ -24,6 +24,10 @@ export default {
     // Breaking change in octicons 12
     // https://github.com/primer/octicons/releases/tag/v12.0.0
     if (this.icon === 'trashcan') this.icon = 'trash'
+    // https://github.com/primer/octicons/blob/main/CHANGELOG.md#1500
+    if (this.icon === 'duplicate') this.icon = 'copy'
+    if (this.icon === 'clippy') this.icon = 'paste'
+
     this.options = {}
 
     // Memoize any options passed
diff --git a/lib/render-content/plugins/code-header.js b/lib/render-content/plugins/code-header.js
index bcb9b7c83d..419cebde6f 100644
--- a/lib/render-content/plugins/code-header.js
+++ b/lib/render-content/plugins/code-header.js
@@ -93,7 +93,7 @@ export default function addCodeHeader(node) {
   // Display the language using the above map of `{ [shortCode]: language }`
   const language = LANGUAGE_MAP[node.lang] || node.lang || 'Code'
 
-  const btnIconHtml = octicons.clippy.toSVG()
+  const btnIconHtml = octicons.paste.toSVG()
   const btnIconAst = parse5.parse(String(btnIconHtml), { sourceCodeLocationInfo: true })
   const btnIcon = fromParse5(btnIconAst, { file: btnIconHtml })
 
diff --git a/middleware/trigger-error.js b/middleware/trigger-error.js
index 084b5f0c2f..7c136f8b51 100644
--- a/middleware/trigger-error.js
+++ b/middleware/trigger-error.js
@@ -7,7 +7,7 @@ export default async function triggerError(req, res, next) {
   // pattern used on async middleware! This is an intentional omission!
 
   // prevent this from being used in production
-  if (process.env.NODE_ENV === 'production') return next()
+  if (process.env.NODE_ENV === 'production' && process.env.HEROKU_PRODUCTION_APP) return next()
 
   throw new Error('Intentional error')
 }
diff --git a/package-lock.json b/package-lock.json
index 23792af4ad..d6259c3792 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,9 +10,9 @@
         "@alex_neo/jest-expect-message": "^1.0.5",
         "@hapi/accept": "^5.0.2",
         "@primer/components": "^28.4.0",
-        "@primer/css": "^16.2.0",
-        "@primer/octicons": "^14.1.0",
-        "@primer/octicons-react": "^14.1.0",
+        "@primer/css": "^17.5.2",
+        "@primer/octicons": "^15.0.1",
+        "@primer/octicons-react": "^15.0.1",
         "accept-language-parser": "^1.5.0",
         "ajv": "^8.4.0",
         "ajv-formats": "^2.1.0",
@@ -2177,13 +2177,13 @@
       "dev": true
     },
     "node_modules/@graphql-tools/load": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.6.tgz",
-      "integrity": "sha512-zHQr9r5W8KvAdTQTV/q6b6oWsfzBJYVH3yTlZ9QH+eJCvEvEJGTSFL6+pQdkp+nZWk06lKhfOWUVsY7hf9b9gw==",
+      "version": "7.1.8",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.8.tgz",
+      "integrity": "sha512-dVl2jJon9VL0qLTC98hJH4CkQ/oat6j9TouCk69ezzWHFxiPlz6tF78BzLr86Mz+bY6QCGeNIJ75Ovyn7EutCQ==",
       "dev": true,
       "dependencies": {
-        "@graphql-tools/schema": "8.1.1",
-        "@graphql-tools/utils": "8.1.1",
+        "@graphql-tools/schema": "8.1.2",
+        "@graphql-tools/utils": "^8.1.1",
         "p-limit": "3.1.0",
         "tslib": "~2.3.0"
       },
@@ -2213,12 +2213,12 @@
       "dev": true
     },
     "node_modules/@graphql-tools/merge": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.1.tgz",
-      "integrity": "sha512-YAozogbjC2Oun+UcwG0LZFumhlCiHBmqe68OIf7bqtBdp4pbPAiVuK/J9oJqRVJmzvUqugo6RD9zz1qDTKZaiQ==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.2.tgz",
+      "integrity": "sha512-li/bl6RpcZCPA0LrSxMYMcyYk+brer8QYY25jCKLS7gvhJkgzEFpCDaX43V1+X13djEoAbgay2mCr3dtfJQQRQ==",
       "dev": true,
       "dependencies": {
-        "@graphql-tools/utils": "8.1.1",
+        "@graphql-tools/utils": "^8.1.1",
         "tslib": "~2.3.0"
       },
       "peerDependencies": {
@@ -2232,13 +2232,13 @@
       "dev": true
     },
     "node_modules/@graphql-tools/schema": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.1.tgz",
-      "integrity": "sha512-u+0kxPtuP+GcKnGNt459Ob7iIpzesIJeJTmPPailaG7ZhB5hkXIizl4uHrzEIAh2Ja1P/VA8sEBYpu1N0n6Mmg==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.2.tgz",
+      "integrity": "sha512-rX2pg42a0w7JLVYT+f/yeEKpnoZL5PpLq68TxC3iZ8slnNBNjfVfvzzOn8Q8Q6Xw3t17KP9QespmJEDfuQe4Rg==",
       "dev": true,
       "dependencies": {
-        "@graphql-tools/merge": "8.0.1",
-        "@graphql-tools/utils": "8.1.1",
+        "@graphql-tools/merge": "^8.0.2",
+        "@graphql-tools/utils": "^8.1.1",
         "tslib": "~2.3.0",
         "value-or-promise": "1.0.10"
       },
@@ -3638,40 +3638,26 @@
         "react": ">=15"
       }
     },
-    "node_modules/@primer/components/node_modules/@primer/primitives": {
-      "version": "4.6.4",
-      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.6.4.tgz",
-      "integrity": "sha512-KKlP7m+94pbuFl3BYycQrmtNhX5+0gK3ftAh5L4a73Ov4FHbgMyVto3Cr0C5tlpvg0760Nisu+e/4T+/uvx8tA=="
-    },
     "node_modules/@primer/css": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/@primer/css/-/css-16.2.0.tgz",
-      "integrity": "sha512-nELaaTJAuDBfyoHuz9c5P3ALDVavt/BSyAAa7KEpyi9S3BupYSitCwGkcJE+U6LtCUzHoqv31N9R2eJJxTgCyQ==",
+      "version": "17.5.2",
+      "resolved": "https://registry.npmjs.org/@primer/css/-/css-17.5.2.tgz",
+      "integrity": "sha512-l7V/Hgqtumh840BZuiMI0tZNLnLOHCztVL1s9z6ORUjm/g3gTtVZGdDRvQ+NGU85WpVAhcQBNgsPHoxLMq/Mbw==",
       "dependencies": {
-        "@primer/octicons": "12.1.0",
-        "@primer/primitives": "4.2.0"
-      }
-    },
-    "node_modules/@primer/css/node_modules/@primer/octicons": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-12.1.0.tgz",
-      "integrity": "sha512-jayKLMTCx/0zh4fjYmkxdlEgQ8STwevn5S48fkvi/03asITmBkaYAMPrUgO8VNSQkSPHIEuc3oTLXgh+JwH0UQ==",
-      "dependencies": {
-        "object-assign": "^4.1.1"
+        "@primer/primitives": "^4.3.5"
       }
     },
     "node_modules/@primer/octicons": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-14.1.0.tgz",
-      "integrity": "sha512-I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA==",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-15.0.1.tgz",
+      "integrity": "sha512-mp1OkOq0tAknXPLGAUPxiMac3HCj4LPPbAfmj847AWb2Tej33YFjUfGA1S2wXmiyP0MARoIdWtrsXt7UCBdVeQ==",
       "dependencies": {
         "object-assign": "^4.1.1"
       }
     },
     "node_modules/@primer/octicons-react": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@primer/octicons-react/-/octicons-react-14.1.0.tgz",
-      "integrity": "sha512-gf7knl1HjyyCWt+eogE6D/aZHDcIXrQpkXgLYw8Tskdai6lEjbJl7BDDgra42P2ZwqDcBCQcdF25Ktu30y6ilA==",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/@primer/octicons-react/-/octicons-react-15.0.1.tgz",
+      "integrity": "sha512-djNecGG6HAwjn64UCam2mz4o1M2KYUM490uNalH+o2PI4KI3xhs1JtXDP3h3Cn7h777lPS14Ic46TD+/p7ULxA==",
       "engines": {
         "node": ">=8"
       },
@@ -3680,9 +3666,9 @@
       }
     },
     "node_modules/@primer/primitives": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.2.0.tgz",
-      "integrity": "sha512-/2/9ueCWWzqaLRSJ3TNGthMVX8DBn/oa+ZY9eB/TmxUPglXd8AQMxV2wz+pAoy8SpXXwe84JuEgHTAghzAOh0w=="
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.6.4.tgz",
+      "integrity": "sha512-KKlP7m+94pbuFl3BYycQrmtNhX5+0gK3ftAh5L4a73Ov4FHbgMyVto3Cr0C5tlpvg0760Nisu+e/4T+/uvx8tA=="
     },
     "node_modules/@sideway/address": {
       "version": "4.1.2",
@@ -4010,12 +3996,6 @@
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
     "node_modules/@types/keyv": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
@@ -4088,9 +4068,9 @@
       "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
     },
     "node_modules/@types/react": {
-      "version": "17.0.18",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.18.tgz",
-      "integrity": "sha512-YTLgu7oS5zvSqq49X5Iue5oAbVGhgPc5Au29SJC4VeE17V6gASoOxVkUDy9pXFMRFxCWCD9fLeweNFizo3UzOg==",
+      "version": "17.0.19",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.19.tgz",
+      "integrity": "sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -4115,11 +4095,6 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@types/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-vdna8kjLGljgtPnYN6MBD2UwX62QE0EFLj9QlLXvg6dEu66NksXB900BNguBCMZZY2D9SSqncUskM23vT3uvWQ=="
-    },
     "node_modules/@types/responselike": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -4206,13 +4181,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz",
-      "integrity": "sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz",
+      "integrity": "sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.29.2",
-        "@typescript-eslint/scope-manager": "4.29.2",
+        "@typescript-eslint/experimental-utils": "4.29.3",
+        "@typescript-eslint/scope-manager": "4.29.3",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -4260,15 +4235,15 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz",
-      "integrity": "sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz",
+      "integrity": "sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.29.2",
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/typescript-estree": "4.29.2",
+        "@typescript-eslint/scope-manager": "4.29.3",
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/typescript-estree": "4.29.3",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       },
@@ -4311,14 +4286,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz",
-      "integrity": "sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.3.tgz",
+      "integrity": "sha512-jrHOV5g2u8ROghmspKoW7pN8T/qUzk0+DITun0MELptvngtMrwUJ1tv5zMI04CYVEUsSrN4jV7AKSv+I0y0EfQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "4.29.2",
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/typescript-estree": "4.29.2",
+        "@typescript-eslint/scope-manager": "4.29.3",
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/typescript-estree": "4.29.3",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -4361,13 +4336,13 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz",
-      "integrity": "sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz",
+      "integrity": "sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/visitor-keys": "4.29.2"
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/visitor-keys": "4.29.3"
       },
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -4378,9 +4353,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz",
-      "integrity": "sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.3.tgz",
+      "integrity": "sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg==",
       "dev": true,
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -4391,13 +4366,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz",
-      "integrity": "sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz",
+      "integrity": "sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/visitor-keys": "4.29.2",
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/visitor-keys": "4.29.3",
         "debug": "^4.3.1",
         "globby": "^11.0.3",
         "is-glob": "^4.0.1",
@@ -4488,12 +4463,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz",
-      "integrity": "sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz",
+      "integrity": "sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.2",
+        "@typescript-eslint/types": "4.29.3",
         "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
@@ -6609,7 +6584,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/browser-date-formatter/-/browser-date-formatter-3.0.3.tgz",
       "integrity": "sha512-crNsaki/mQRce8SgvRIwpI+lXttxu4HZazMzloziiA57p6LX2d4FPxOg2JTqrW5KIzBQbcSHqfFa485liPvaAw==",
-      "license": "MIT",
       "dependencies": {
         "brfs": "^1.4.3",
         "dateutil": "^0.1.0",
@@ -7887,7 +7861,6 @@
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/connect-datadog/-/connect-datadog-0.0.9.tgz",
       "integrity": "sha512-CThcRgy6AAStdBRsrNdneeJkEuH0/2G1QanYFfl0F+ZkbQaRMMM9/apvZ1R3SMD9iAST/Xa78Q0jC51KCB/4LQ==",
-      "license": "MIT",
       "dependencies": {
         "hot-shots": "^6.3.0"
       },
@@ -7910,7 +7883,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/connect-slashes/-/connect-slashes-1.4.0.tgz",
       "integrity": "sha512-BJRbgSczzlsRwyF64DxGNIizBTxUf7f/tAsDzq2Nq8eLrm2160vVfm/4vQcjrT4qVFu6qDCqPK+vDaEWJsnSzA==",
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -8123,7 +8095,6 @@
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
       "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "license": "MIT",
       "dependencies": {
         "object-assign": "^4",
         "vary": "^1"
@@ -9082,9 +9053,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.811",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.811.tgz",
-      "integrity": "sha512-hv3kgf6YSd+jQ7J+7Kdm44yux/1vxcAwfGV/6M6Nq4E9zJ3Bml/P2+vULCvqLS6Lh9knBCQ7iEMvyeDiGe5EbA=="
+      "version": "1.3.814",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.814.tgz",
+      "integrity": "sha512-0mH03cyjh6OzMlmjauGg0TLd87ErIJqWiYxMcOLKf5w6p0YEOl7DJAj7BDlXEFmCguY5CQaKVOiMjAMODO2XDw=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -9582,26 +9553,26 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz",
-      "integrity": "sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg==",
+      "version": "2.24.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.1.tgz",
+      "integrity": "sha512-KSFWhNxPH8OGJwpRJJs+Z7I0a13E2iFQZJIvSnCu6KUs4qmgAm3xN9GYBCSoiGWmwA7gERZPXqYQjcoCROnYhQ==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.3",
         "array.prototype.flat": "^1.2.4",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.5",
+        "eslint-import-resolver-node": "^0.3.6",
         "eslint-module-utils": "^2.6.2",
         "find-up": "^2.0.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
+        "is-core-module": "^2.6.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
+        "object.values": "^1.1.4",
         "pkg-up": "^2.0.0",
         "read-pkg-up": "^3.0.0",
         "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.9.0"
+        "tsconfig-paths": "^3.10.1"
       },
       "engines": {
         "node": ">=4"
@@ -9687,7 +9658,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
       "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
         "aria-query": "^4.2.2",
@@ -9728,7 +9698,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
       "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eslint-plugin-es": "^3.0.0",
         "eslint-utils": "^2.0.0",
@@ -10147,8 +10116,7 @@
       "resolved": "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.8.0.tgz",
       "integrity": "sha1-S4TxF3K28l93Uvx02XFTGsb1tiY=",
       "deprecated": "Use promise-toolbox/fromEvent instead",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
@@ -11258,7 +11226,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz",
       "integrity": "sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==",
-      "license": "ISC",
       "dependencies": {
         "emoji-regex": ">=6.0.0 <=6.1.1"
       }
@@ -11801,13 +11768,12 @@
       }
     },
     "node_modules/hast-util-raw": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-7.1.1.tgz",
-      "integrity": "sha512-/y2HHAtmJGgYMNdeAkGs97YLrZd3TPqine7OuCwomIoWu0w0WPrQ2nzAxRcgtvSWXlUyW+xeWbK/fSdJhotl9A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-7.2.0.tgz",
+      "integrity": "sha512-K2ofsY59XqrtBNUAkvT2vPdyNPUchjj1Z0FxUOwBadS6R5h9O3LaRZqpukQ+YfgQ/IMy9GGMB/Nlpzpu+cuuMA==",
       "dependencies": {
         "@types/hast": "^2.0.0",
         "@types/parse5": "^6.0.0",
-        "@types/unist": "^2.0.3",
         "hast-util-from-parse5": "^7.0.0",
         "hast-util-to-parse5": "^7.0.0",
         "html-void-elements": "^2.0.0",
@@ -12043,14 +12009,12 @@
       }
     },
     "node_modules/hast-util-to-text": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-3.0.0.tgz",
-      "integrity": "sha512-N+Y06wCTyc9HSzleL+yexRf6h/lgnCSvjD0r7e/v8cgAIXKQYx1SLR9MITbSvDMVVSr+VSFKAYLU9zvAY+VVDA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-3.1.0.tgz",
+      "integrity": "sha512-Od9EL2sV06n5YIsq169krRA3mSOWjFnLZL0qMpCRSWcEoq9iodC2aEMhWge7b3xzXfHRs9UT3r42i8iOVQwvbg==",
       "dependencies": {
         "@types/hast": "^2.0.0",
-        "@types/repeat-string": "^1.0.0",
         "hast-util-is-element": "^2.0.0",
-        "repeat-string": "^1.0.0",
         "unist-util-find-after": "^4.0.0"
       },
       "funding": {
@@ -12109,7 +12073,6 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz",
       "integrity": "sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg==",
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -12138,8 +12101,7 @@
     "node_modules/highlightjs-graphql": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/highlightjs-graphql/-/highlightjs-graphql-1.0.2.tgz",
-      "integrity": "sha512-jShTftpKQDwMXc+7OHOpHXRYSweT08EO2YOIcLbwU00e9yuwJMYXGLF1eiDO0aUPeQU4/5EjAh5HtPt3ly7rvg==",
-      "license": "MIT"
+      "integrity": "sha512-jShTftpKQDwMXc+7OHOpHXRYSweT08EO2YOIcLbwU00e9yuwJMYXGLF1eiDO0aUPeQU4/5EjAh5HtPt3ly7rvg=="
     },
     "node_modules/hmac-drbg": {
       "version": "1.0.1",
@@ -12779,9 +12741,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -13347,8 +13309,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/japanese-characters/-/japanese-characters-1.1.0.tgz",
       "integrity": "sha512-ZlGjhypXEFs5sypwdxYRaDWMVxdS/yuVqlOv20fJCtYtgcvT2F6StcDq5qKj5TdqpvwFNDoYrfvhG/pxPzuB8A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/javascript-stringify": {
       "version": "2.1.0",
@@ -13908,7 +13869,6 @@
       "resolved": "https://registry.npmjs.org/jest-github-actions-reporter/-/jest-github-actions-reporter-1.0.3.tgz",
       "integrity": "sha512-IwLAKLSWLN8ZVfcfEEv6rfeWb78wKDeOhvOmH9KKXayKsKLSCwceopBcB+KUtwxfB5wYnT8Y9s2eZ+WdhA5yng==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@actions/core": "^1.2.0"
       }
@@ -14566,8 +14526,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/jest-slow-test-reporter/-/jest-slow-test-reporter-1.0.0.tgz",
       "integrity": "sha512-5FG8hlaO7Wdgdo6oQxGiFAKwd1HW51+8/KmQJgUV3bsW3cCXx9TukaoGnHhBl+hwLkCYENynWL1PQnG8DwOV6w==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/jest-snapshot": {
       "version": "27.0.6",
@@ -14762,7 +14721,6 @@
       "version": "0.16.1",
       "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.16.1.tgz",
       "integrity": "sha512-+EKVxbR36Td7Hfd23wKGIeEyHbxShZDX6L8uJkgVW3ESA9GiTEPK08tG1XI2r/0w5Ch0HyJF5kPqF9K7EmGjaw==",
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
@@ -15874,8 +15832,7 @@
     "node_modules/lunr": {
       "version": "2.3.9",
       "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
-      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
-      "license": "MIT"
+      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="
     },
     "node_modules/lunr-languages": {
       "version": "1.9.0",
@@ -16238,15 +16195,16 @@
       }
     },
     "node_modules/mdast-util-to-markdown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.1.1.tgz",
-      "integrity": "sha512-4puev/CxuxVdlsx5lVmuzgdqfjkkJJLS1Zm/MnejQ8I7BLeeBlbkwp6WOGJypEcN8g56LbVbhNmn84MvvcAvSQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.1.tgz",
+      "integrity": "sha512-yj0UexEfdH0Zqw9CztzC5+J6OZKgCY6K0ommn56SBlPKIV3NGqk1Wo/zw1Q0e/kHb50wmQ8O9cwbOl7vmaJjxg==",
       "dependencies": {
         "@types/mdast": "^3.0.0",
         "@types/unist": "^2.0.0",
         "longest-streak": "^3.0.0",
         "mdast-util-to-string": "^3.0.0",
         "parse-entities": "^3.0.0",
+        "unist-util-visit": "^4.0.0",
         "zwitch": "^2.0.0"
       },
       "funding": {
@@ -16518,9 +16476,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-strikethrough": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.0.tgz",
-      "integrity": "sha512-5PhVJVK8zRsrc+A715NBPMY5iOQwtkMfL/8XURAPeU5fPC0S5dm4qjpoA6fGy4B9MHm+6WNs3xZDxF1ZGTtGDw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.1.tgz",
+      "integrity": "sha512-fzGYXWz9HPWH1uHqYwdyR8XpEtuoYVHUjTdPQTnl3ETVZOQe1NXMwE3RA7AMqeON52hG+kO9g1/P1+pLONBSMQ==",
       "dependencies": {
         "micromark-util-chunked": "^1.0.0",
         "micromark-util-classify-character": "^1.0.0",
@@ -17293,7 +17251,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
       "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
-      "license": "MIT",
       "dependencies": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
@@ -18320,15 +18277,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz",
-      "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "es-abstract": "^1.18.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -19342,8 +19298,7 @@
     "node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "license": "MIT"
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
@@ -20006,6 +19961,7 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
       "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
       "engines": {
         "node": ">=0.4.x"
       }
@@ -20184,9 +20140,9 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
     "node_modules/react-markdown": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-7.0.0.tgz",
-      "integrity": "sha512-qdWfKxMgdKF3kHAV5pmcB12fAvytPoTpYwKTO6O/I3HujrK7sKIv6j4RnXVNLrNUh+TaBk+KtqpGzIKslX2rDg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-7.0.1.tgz",
+      "integrity": "sha512-pthNPaoiwg0q7hukoE04F2ENwSzijIlWHJ4UMs/96LUe/G/P3FnbP4qHzx3FoNqae+2SqDG8vzniTLnJDeWneg==",
       "dependencies": {
         "@types/hast": "^2.0.0",
         "@types/unist": "^2.0.0",
@@ -20337,7 +20293,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
       "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
-      "license": "MIT",
       "dependencies": {
         "denque": "^1.5.0",
         "redis-commands": "^1.7.0",
@@ -20369,7 +20324,6 @@
       "version": "0.56.3",
       "resolved": "https://registry.npmjs.org/redis-mock/-/redis-mock-0.56.3.tgz",
       "integrity": "sha512-ynaJhqk0Qf3Qajnwvy4aOjS4Mdf9IBkELWtjd+NYhpiqu4QCNq6Vf3Q7c++XRPGiKiwRj9HWr0crcwy7EiPjYQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -20665,14 +20619,15 @@
       }
     },
     "node_modules/rehype-autolink-headings": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-6.0.0.tgz",
-      "integrity": "sha512-fY5HbOTg/S7VD+CQV1cI8t+vZTUNaQuMiswKBqKTPeCiUU/SS+jHPhp9emJ9zEx4J3MjrfymASNgr/UjhPkkig==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-6.1.0.tgz",
+      "integrity": "sha512-v8xnvhDtxc2jTgnhVlR2sG168TyNTK93Myx+uTzQNpNxzkRnQKz3hZQKoh7fxuOzJhCGa/z6qqZSPB2BOi/HRw==",
       "dependencies": {
         "@types/hast": "^2.0.0",
         "extend": "^3.0.0",
         "hast-util-has-property": "^2.0.0",
         "hast-util-heading-rank": "^2.0.0",
+        "hast-util-is-element": "^2.0.0",
         "unified": "^10.0.0",
         "unist-util-visit": "^4.0.0"
       },
@@ -20810,7 +20765,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remark-gemoji-to-emoji/-/remark-gemoji-to-emoji-1.1.0.tgz",
       "integrity": "sha1-Pc0KiBGgyBu2NROsCzbyJYpVMPU=",
-      "license": "MIT",
       "dependencies": {
         "gemoji": "^4.0.0",
         "unist-util-visit": "^1.0.0"
@@ -21260,7 +21214,6 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.3.1.tgz",
       "integrity": "sha1-/yzEz3zHxjhaxxAXgnbm280Ddi8=",
-      "license": "Apache 2.0",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -22805,8 +22758,7 @@
     "node_modules/strip-html-comments": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-html-comments/-/strip-html-comments-1.0.0.tgz",
-      "integrity": "sha1-Cuff8DAKYHWkwpP7YRG0yx0Mt7c=",
-      "license": "MIT"
+      "integrity": "sha1-Cuff8DAKYHWkwpP7YRG0yx0Mt7c="
     },
     "node_modules/strip-indent": {
       "version": "3.0.0",
@@ -23254,7 +23206,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/throng/-/throng-5.0.0.tgz",
       "integrity": "sha512-nrq7+qQhn/DL8yW/wiwImTepfi6ynOCAe7moSwgoYN1F32yQMdBkuFII40oAkb3cDfaL6q5BIoFTDCHdMWQ8Pw==",
-      "license": "MIT",
       "dependencies": {
         "lodash": "^4.17.20"
       },
@@ -23518,29 +23469,16 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
+      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
       "dev": true,
       "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^2.2.0",
         "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       }
     },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -25461,7 +25399,6 @@
       "version": "1.21.0",
       "resolved": "https://registry.npmjs.org/xlsx-populate/-/xlsx-populate-1.21.0.tgz",
       "integrity": "sha512-8v2Gm8BehXo6LU7KT802QoXTPkYY1SKk5V8g/UuYZnNB3JzXqud/P99Pxr2yXeKyt+sKlCatmidz6jQNie1hRw==",
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "cfb": "^1.1.3",
@@ -27014,13 +26951,13 @@
       }
     },
     "@graphql-tools/load": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.6.tgz",
-      "integrity": "sha512-zHQr9r5W8KvAdTQTV/q6b6oWsfzBJYVH3yTlZ9QH+eJCvEvEJGTSFL6+pQdkp+nZWk06lKhfOWUVsY7hf9b9gw==",
+      "version": "7.1.8",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-7.1.8.tgz",
+      "integrity": "sha512-dVl2jJon9VL0qLTC98hJH4CkQ/oat6j9TouCk69ezzWHFxiPlz6tF78BzLr86Mz+bY6QCGeNIJ75Ovyn7EutCQ==",
       "dev": true,
       "requires": {
-        "@graphql-tools/schema": "8.1.1",
-        "@graphql-tools/utils": "8.1.1",
+        "@graphql-tools/schema": "8.1.2",
+        "@graphql-tools/utils": "^8.1.1",
         "p-limit": "3.1.0",
         "tslib": "~2.3.0"
       },
@@ -27043,12 +26980,12 @@
       }
     },
     "@graphql-tools/merge": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.1.tgz",
-      "integrity": "sha512-YAozogbjC2Oun+UcwG0LZFumhlCiHBmqe68OIf7bqtBdp4pbPAiVuK/J9oJqRVJmzvUqugo6RD9zz1qDTKZaiQ==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.2.tgz",
+      "integrity": "sha512-li/bl6RpcZCPA0LrSxMYMcyYk+brer8QYY25jCKLS7gvhJkgzEFpCDaX43V1+X13djEoAbgay2mCr3dtfJQQRQ==",
       "dev": true,
       "requires": {
-        "@graphql-tools/utils": "8.1.1",
+        "@graphql-tools/utils": "^8.1.1",
         "tslib": "~2.3.0"
       },
       "dependencies": {
@@ -27061,13 +26998,13 @@
       }
     },
     "@graphql-tools/schema": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.1.tgz",
-      "integrity": "sha512-u+0kxPtuP+GcKnGNt459Ob7iIpzesIJeJTmPPailaG7ZhB5hkXIizl4uHrzEIAh2Ja1P/VA8sEBYpu1N0n6Mmg==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.1.2.tgz",
+      "integrity": "sha512-rX2pg42a0w7JLVYT+f/yeEKpnoZL5PpLq68TxC3iZ8slnNBNjfVfvzzOn8Q8Q6Xw3t17KP9QespmJEDfuQe4Rg==",
       "dev": true,
       "requires": {
-        "@graphql-tools/merge": "8.0.1",
-        "@graphql-tools/utils": "8.1.1",
+        "@graphql-tools/merge": "^8.0.2",
+        "@graphql-tools/utils": "^8.1.1",
         "tslib": "~2.3.0",
         "value-or-promise": "1.0.10"
       },
@@ -28199,51 +28136,35 @@
           "resolved": "https://registry.npmjs.org/@primer/octicons-react/-/octicons-react-13.0.0.tgz",
           "integrity": "sha512-j5XppNRCvgaMZLPsVvvmp6GSh7P5pq6PUbsfLNBWi2Kz3KYDeoGDWbPr5MjoxFOGUn6Hjnt6qjHPRxahd11vLQ==",
           "requires": {}
-        },
-        "@primer/primitives": {
-          "version": "4.6.4",
-          "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.6.4.tgz",
-          "integrity": "sha512-KKlP7m+94pbuFl3BYycQrmtNhX5+0gK3ftAh5L4a73Ov4FHbgMyVto3Cr0C5tlpvg0760Nisu+e/4T+/uvx8tA=="
         }
       }
     },
     "@primer/css": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/@primer/css/-/css-16.2.0.tgz",
-      "integrity": "sha512-nELaaTJAuDBfyoHuz9c5P3ALDVavt/BSyAAa7KEpyi9S3BupYSitCwGkcJE+U6LtCUzHoqv31N9R2eJJxTgCyQ==",
+      "version": "17.5.2",
+      "resolved": "https://registry.npmjs.org/@primer/css/-/css-17.5.2.tgz",
+      "integrity": "sha512-l7V/Hgqtumh840BZuiMI0tZNLnLOHCztVL1s9z6ORUjm/g3gTtVZGdDRvQ+NGU85WpVAhcQBNgsPHoxLMq/Mbw==",
       "requires": {
-        "@primer/octicons": "12.1.0",
-        "@primer/primitives": "4.2.0"
-      },
-      "dependencies": {
-        "@primer/octicons": {
-          "version": "12.1.0",
-          "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-12.1.0.tgz",
-          "integrity": "sha512-jayKLMTCx/0zh4fjYmkxdlEgQ8STwevn5S48fkvi/03asITmBkaYAMPrUgO8VNSQkSPHIEuc3oTLXgh+JwH0UQ==",
-          "requires": {
-            "object-assign": "^4.1.1"
-          }
-        }
+        "@primer/primitives": "^4.3.5"
       }
     },
     "@primer/octicons": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-14.1.0.tgz",
-      "integrity": "sha512-I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA==",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-15.0.1.tgz",
+      "integrity": "sha512-mp1OkOq0tAknXPLGAUPxiMac3HCj4LPPbAfmj847AWb2Tej33YFjUfGA1S2wXmiyP0MARoIdWtrsXt7UCBdVeQ==",
       "requires": {
         "object-assign": "^4.1.1"
       }
     },
     "@primer/octicons-react": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@primer/octicons-react/-/octicons-react-14.1.0.tgz",
-      "integrity": "sha512-gf7knl1HjyyCWt+eogE6D/aZHDcIXrQpkXgLYw8Tskdai6lEjbJl7BDDgra42P2ZwqDcBCQcdF25Ktu30y6ilA==",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/@primer/octicons-react/-/octicons-react-15.0.1.tgz",
+      "integrity": "sha512-djNecGG6HAwjn64UCam2mz4o1M2KYUM490uNalH+o2PI4KI3xhs1JtXDP3h3Cn7h777lPS14Ic46TD+/p7ULxA==",
       "requires": {}
     },
     "@primer/primitives": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.2.0.tgz",
-      "integrity": "sha512-/2/9ueCWWzqaLRSJ3TNGthMVX8DBn/oa+ZY9eB/TmxUPglXd8AQMxV2wz+pAoy8SpXXwe84JuEgHTAghzAOh0w=="
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.6.4.tgz",
+      "integrity": "sha512-KKlP7m+94pbuFl3BYycQrmtNhX5+0gK3ftAh5L4a73Ov4FHbgMyVto3Cr0C5tlpvg0760Nisu+e/4T+/uvx8tA=="
     },
     "@sideway/address": {
       "version": "4.1.2",
@@ -28559,12 +28480,6 @@
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
     "@types/keyv": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
@@ -28637,9 +28552,9 @@
       "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
     },
     "@types/react": {
-      "version": "17.0.18",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.18.tgz",
-      "integrity": "sha512-YTLgu7oS5zvSqq49X5Iue5oAbVGhgPc5Au29SJC4VeE17V6gASoOxVkUDy9pXFMRFxCWCD9fLeweNFizo3UzOg==",
+      "version": "17.0.19",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.19.tgz",
+      "integrity": "sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -28664,11 +28579,6 @@
         "@types/react": "*"
       }
     },
-    "@types/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@types/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-vdna8kjLGljgtPnYN6MBD2UwX62QE0EFLj9QlLXvg6dEu66NksXB900BNguBCMZZY2D9SSqncUskM23vT3uvWQ=="
-    },
     "@types/responselike": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -28755,13 +28665,13 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz",
-      "integrity": "sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz",
+      "integrity": "sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.29.2",
-        "@typescript-eslint/scope-manager": "4.29.2",
+        "@typescript-eslint/experimental-utils": "4.29.3",
+        "@typescript-eslint/scope-manager": "4.29.3",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -28787,15 +28697,15 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz",
-      "integrity": "sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz",
+      "integrity": "sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.29.2",
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/typescript-estree": "4.29.2",
+        "@typescript-eslint/scope-manager": "4.29.3",
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/typescript-estree": "4.29.3",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       },
@@ -28818,14 +28728,14 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz",
-      "integrity": "sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.3.tgz",
+      "integrity": "sha512-jrHOV5g2u8ROghmspKoW7pN8T/qUzk0+DITun0MELptvngtMrwUJ1tv5zMI04CYVEUsSrN4jV7AKSv+I0y0EfQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.29.2",
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/typescript-estree": "4.29.2",
+        "@typescript-eslint/scope-manager": "4.29.3",
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/typescript-estree": "4.29.3",
         "debug": "^4.3.1"
       },
       "dependencies": {
@@ -28847,29 +28757,29 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz",
-      "integrity": "sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz",
+      "integrity": "sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/visitor-keys": "4.29.2"
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/visitor-keys": "4.29.3"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz",
-      "integrity": "sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.3.tgz",
+      "integrity": "sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz",
-      "integrity": "sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz",
+      "integrity": "sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.2",
-        "@typescript-eslint/visitor-keys": "4.29.2",
+        "@typescript-eslint/types": "4.29.3",
+        "@typescript-eslint/visitor-keys": "4.29.3",
         "debug": "^4.3.1",
         "globby": "^11.0.3",
         "is-glob": "^4.0.1",
@@ -28927,12 +28837,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz",
-      "integrity": "sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz",
+      "integrity": "sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.2",
+        "@typescript-eslint/types": "4.29.3",
         "eslint-visitor-keys": "^2.0.0"
       },
       "dependencies": {
@@ -32736,9 +32646,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.811",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.811.tgz",
-      "integrity": "sha512-hv3kgf6YSd+jQ7J+7Kdm44yux/1vxcAwfGV/6M6Nq4E9zJ3Bml/P2+vULCvqLS6Lh9knBCQ7iEMvyeDiGe5EbA=="
+      "version": "1.3.814",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.814.tgz",
+      "integrity": "sha512-0mH03cyjh6OzMlmjauGg0TLd87ErIJqWiYxMcOLKf5w6p0YEOl7DJAj7BDlXEFmCguY5CQaKVOiMjAMODO2XDw=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -33266,26 +33176,26 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz",
-      "integrity": "sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg==",
+      "version": "2.24.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.1.tgz",
+      "integrity": "sha512-KSFWhNxPH8OGJwpRJJs+Z7I0a13E2iFQZJIvSnCu6KUs4qmgAm3xN9GYBCSoiGWmwA7gERZPXqYQjcoCROnYhQ==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.3",
         "array.prototype.flat": "^1.2.4",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.5",
+        "eslint-import-resolver-node": "^0.3.6",
         "eslint-module-utils": "^2.6.2",
         "find-up": "^2.0.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.4.0",
+        "is-core-module": "^2.6.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.3",
+        "object.values": "^1.1.4",
         "pkg-up": "^2.0.0",
         "read-pkg-up": "^3.0.0",
         "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.9.0"
+        "tsconfig-paths": "^3.10.1"
       },
       "dependencies": {
         "doctrine": {
@@ -34841,13 +34751,12 @@
       }
     },
     "hast-util-raw": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-7.1.1.tgz",
-      "integrity": "sha512-/y2HHAtmJGgYMNdeAkGs97YLrZd3TPqine7OuCwomIoWu0w0WPrQ2nzAxRcgtvSWXlUyW+xeWbK/fSdJhotl9A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-7.2.0.tgz",
+      "integrity": "sha512-K2ofsY59XqrtBNUAkvT2vPdyNPUchjj1Z0FxUOwBadS6R5h9O3LaRZqpukQ+YfgQ/IMy9GGMB/Nlpzpu+cuuMA==",
       "requires": {
         "@types/hast": "^2.0.0",
         "@types/parse5": "^6.0.0",
-        "@types/unist": "^2.0.3",
         "hast-util-from-parse5": "^7.0.0",
         "hast-util-to-parse5": "^7.0.0",
         "html-void-elements": "^2.0.0",
@@ -35014,14 +34923,12 @@
       }
     },
     "hast-util-to-text": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-3.0.0.tgz",
-      "integrity": "sha512-N+Y06wCTyc9HSzleL+yexRf6h/lgnCSvjD0r7e/v8cgAIXKQYx1SLR9MITbSvDMVVSr+VSFKAYLU9zvAY+VVDA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-3.1.0.tgz",
+      "integrity": "sha512-Od9EL2sV06n5YIsq169krRA3mSOWjFnLZL0qMpCRSWcEoq9iodC2aEMhWge7b3xzXfHRs9UT3r42i8iOVQwvbg==",
       "requires": {
         "@types/hast": "^2.0.0",
-        "@types/repeat-string": "^1.0.0",
         "hast-util-is-element": "^2.0.0",
-        "repeat-string": "^1.0.0",
         "unist-util-find-after": "^4.0.0"
       }
     },
@@ -35572,9 +35479,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -38178,15 +38085,16 @@
       }
     },
     "mdast-util-to-markdown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.1.1.tgz",
-      "integrity": "sha512-4puev/CxuxVdlsx5lVmuzgdqfjkkJJLS1Zm/MnejQ8I7BLeeBlbkwp6WOGJypEcN8g56LbVbhNmn84MvvcAvSQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.1.tgz",
+      "integrity": "sha512-yj0UexEfdH0Zqw9CztzC5+J6OZKgCY6K0ommn56SBlPKIV3NGqk1Wo/zw1Q0e/kHb50wmQ8O9cwbOl7vmaJjxg==",
       "requires": {
         "@types/mdast": "^3.0.0",
         "@types/unist": "^2.0.0",
         "longest-streak": "^3.0.0",
         "mdast-util-to-string": "^3.0.0",
         "parse-entities": "^3.0.0",
+        "unist-util-visit": "^4.0.0",
         "zwitch": "^2.0.0"
       },
       "dependencies": {
@@ -38406,9 +38314,9 @@
       }
     },
     "micromark-extension-gfm-strikethrough": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.0.tgz",
-      "integrity": "sha512-5PhVJVK8zRsrc+A715NBPMY5iOQwtkMfL/8XURAPeU5fPC0S5dm4qjpoA6fGy4B9MHm+6WNs3xZDxF1ZGTtGDw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.1.tgz",
+      "integrity": "sha512-fzGYXWz9HPWH1uHqYwdyR8XpEtuoYVHUjTdPQTnl3ETVZOQe1NXMwE3RA7AMqeON52hG+kO9g1/P1+pLONBSMQ==",
       "requires": {
         "micromark-util-chunked": "^1.0.0",
         "micromark-util-classify-character": "^1.0.0",
@@ -39724,15 +39632,14 @@
       }
     },
     "object.values": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz",
-      "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "es-abstract": "^1.18.2"
       }
     },
     "omggif": {
@@ -41220,9 +41127,9 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
     "react-markdown": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-7.0.0.tgz",
-      "integrity": "sha512-qdWfKxMgdKF3kHAV5pmcB12fAvytPoTpYwKTO6O/I3HujrK7sKIv6j4RnXVNLrNUh+TaBk+KtqpGzIKslX2rDg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-7.0.1.tgz",
+      "integrity": "sha512-pthNPaoiwg0q7hukoE04F2ENwSzijIlWHJ4UMs/96LUe/G/P3FnbP4qHzx3FoNqae+2SqDG8vzniTLnJDeWneg==",
       "requires": {
         "@types/hast": "^2.0.0",
         "@types/unist": "^2.0.0",
@@ -41573,14 +41480,15 @@
       }
     },
     "rehype-autolink-headings": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-6.0.0.tgz",
-      "integrity": "sha512-fY5HbOTg/S7VD+CQV1cI8t+vZTUNaQuMiswKBqKTPeCiUU/SS+jHPhp9emJ9zEx4J3MjrfymASNgr/UjhPkkig==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/rehype-autolink-headings/-/rehype-autolink-headings-6.1.0.tgz",
+      "integrity": "sha512-v8xnvhDtxc2jTgnhVlR2sG168TyNTK93Myx+uTzQNpNxzkRnQKz3hZQKoh7fxuOzJhCGa/z6qqZSPB2BOi/HRw==",
       "requires": {
         "@types/hast": "^2.0.0",
         "extend": "^3.0.0",
         "hast-util-has-property": "^2.0.0",
         "hast-util-heading-rank": "^2.0.0",
+        "hast-util-is-element": "^2.0.0",
         "unified": "^10.0.0",
         "unist-util-visit": "^4.0.0"
       }
@@ -43852,26 +43760,16 @@
       "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="
     },
     "tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz",
+      "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==",
       "dev": true,
       "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^2.2.0",
         "minimist": "^1.2.0",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
diff --git a/package.json b/package.json
index aba0e34def..cd79f2897b 100644
--- a/package.json
+++ b/package.json
@@ -12,9 +12,9 @@
     "@alex_neo/jest-expect-message": "^1.0.5",
     "@hapi/accept": "^5.0.2",
     "@primer/components": "^28.4.0",
-    "@primer/css": "^16.2.0",
-    "@primer/octicons": "^14.1.0",
-    "@primer/octicons-react": "^14.1.0",
+    "@primer/css": "^17.5.2",
+    "@primer/octicons": "^15.0.1",
+    "@primer/octicons-react": "^15.0.1",
     "accept-language-parser": "^1.5.0",
     "ajv": "^8.4.0",
     "ajv-formats": "^2.1.0",
diff --git a/pages/404.tsx b/pages/404.tsx
index 3b2c30edd4..1e75ac17db 100644
--- a/pages/404.tsx
+++ b/pages/404.tsx
@@ -17,8 +17,8 @@ const Custom404 = () => {
       <div className="container-xl p-responsive py-6 width-full flex-1">
         <article className="col-md-10 col-lg-7 mx-auto">
           <h1 className="mb-3 pb-3 border-bottom">Ooops!</h1>
-          <p className="lead-mktg">It looks like this page doesn't exist.</p>
-          <p className="lead-mktg">
+          <p className="f2 color-text-secondary">It looks like this page doesn't exist.</p>
+          <p className="f3">
             We track these errors automatically, but if the problem persists please feel free to
             contact us.
           </p>
diff --git a/pages/index.tsx b/pages/index.tsx
index 01bd658e77..446188a132 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -61,7 +61,7 @@ function LandingPage(props: LandingPageProps) {
                     <OctocatHeader />
                   </div>
                   <div className="col-lg-5 mt-6">
-                    <h1 className="h1-mktg mb-3">{t('search:need_help')}</h1>
+                    <h1 className="font-weight-semibold mb-3">{t('search:need_help')}</h1>
                     {SearchInput}
                   </div>
                 </div>
@@ -76,7 +76,7 @@ function LandingPage(props: LandingPageProps) {
       {/* <!-- Explore by product --> */}
       <section className="container-xl pb-lg-4 my-8 px-3 px-md-6">
         <div className="">
-          <h2 className="text-mono f5 text-normal color-text-secondary text-md-center mb-4">
+          <h2 className="f5 text-normal color-text-secondary text-md-center mb-4">
             {t('explore_by_product')}
           </h2>
           <div className="d-flex flex-wrap gutter gutter-xl-spacious">
@@ -93,7 +93,7 @@ function LandingPage(props: LandingPageProps) {
               return (
                 <div className="d-flex flex-column col-12 col-sm-6 col-lg-3 pb-4" key={product.id}>
                   <a
-                    className="btn-mktg flex-auto d-flex flex-items-center btn-outline-mktg btn-large-mktg ws-normal "
+                    className="f4 flex-auto d-flex flex-items-center ws-normal btn btn-outline py-3"
                     href={href}
                     target={product.external ? '_blank' : undefined}
                   >
diff --git a/pages/storybook.tsx b/pages/storybook.tsx
index 486b27fc3b..eb951349d7 100644
--- a/pages/storybook.tsx
+++ b/pages/storybook.tsx
@@ -37,7 +37,9 @@ export default function Storybook() {
   return (
     <div className="p-4 mx-auto" style={{ maxWidth: 1200 }}>
       <h1>GitHub Docs Storybook</h1>
-      <p className="f3">This page lists React components unique to the GitHub docs.</p>
+      <p className="f2 color-text-secondary">
+        This page lists React components unique to the GitHub docs.
+      </p>
       <div className="my-4 d-lg-flex flex-items-start">
         <nav className="menu col-12 col-lg-3 mr-4 color-bg-secondary position-lg-sticky top-0">
           {stories.map(({ name }) => (
diff --git a/stylesheets/font-mktg.scss b/stylesheets/font-mktg.scss
deleted file mode 100644
index 3450d9e1e6..0000000000
--- a/stylesheets/font-mktg.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-// stylelint-disable primer/no-unused-vars
-// Typography
-
-@import "@primer/css/support/index.scss";
-
-$marketing-font-path: "/assets/fonts/alliance/";
-$font-family-mktg: "Alliance No.1", -apple-system, BlinkMacSystemFont,
-  "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji",
-  "Segoe UI Emoji", "Segoe UI Symbol" !default;
-$font-weight-extrabold: 800 !default;
-
-.font-mktg {
-  font-family: $font-family-mktg;
-}
-
-// Type
-@font-face {
-  font-family: "Alliance No.1";
-  font-style: normal;
-  font-weight: $font-weight-normal;
-  src: local("Alliance No.1 Regular"), local("alliance-no-1-regular"),
-    url("#{$marketing-font-path}alliance-no-1-regular.woff") format("woff");
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "Alliance No.1";
-  font-style: normal;
-  font-weight: $font-weight-semibold;
-  src: local("Alliance No.1 Medium"), local("alliance-no-1-medium"),
-    url("#{$marketing-font-path}alliance-no-1-medium.woff") format("woff");
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "Alliance No.1";
-  font-style: normal;
-  font-weight: $font-weight-bold;
-  src: local("Alliance No.1 Bold"), local("alliance-no-1-bold"),
-    url("#{$marketing-font-path}alliance-no-1-bold.woff") format("woff");
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "Alliance No.1";
-  font-style: normal;
-  font-weight: $font-weight-extrabold;
-  src: local("Alliance No.1 ExtraBold"), local("alliance-no-1-extrabold"),
-    url("#{$marketing-font-path}alliance-no-1-extrabold.woff") format("woff");
-  font-display: swap;
-}
diff --git a/stylesheets/gradient.scss b/stylesheets/gradient.scss
deleted file mode 100644
index e5e133f72b..0000000000
--- a/stylesheets/gradient.scss
+++ /dev/null
@@ -1,104 +0,0 @@
-$gradients: (
-  "-purple-pink":
-    linear-gradient(
-      135deg,
-      var(--color-auto-purple-5) 0%,
-      var(--color-auto-pink-5) 100%
-    ),
-  /*"-aquamarine-mauve":  linear-gradient(130deg, #3bf0e4 -6.8%, #bca1f7 70%),
-  "-purple-coral":  linear-gradient(87.54deg, #9867f0 -6.8%, #ed4e50 84.14%),
-  "-purple-coral-dark": linear-gradient(92deg, #bca1f7 15%, #e577b4 45%, #ff7170 85%),
-  "-coral-yellow":  linear-gradient(267.91deg, #ffe57f 9.35%, #ff7170 96.48%),
-  "-coral-yellow-dark": linear-gradient(-70deg, #ff7170 0%, #ffe57f 100%),
-  "-dark-mint":  linear-gradient(90deg, #05aa82, #1c8df0),
-  "-mint-blue":  linear-gradient(271.72deg, #a2facf 7.09%, #64acff 96.61%),
-  "-mint-blue-dark": linear-gradient(-70deg, #a2facf 0%, #64acff 100%),
-  "-turq-purple-dark": linear-gradient(-70deg, #3bf0e4 0%, #bca1f7 100%),
-  "-blue-green": linear-gradient(-70deg, #2188ff 0%, #01a49e 100%),
-  "-red-orange": linear-gradient(-70deg, #ed4e50 0%, #f06f00 100%),
-  "-blue-purple": linear-gradient(-70deg, #2188ff 0%, #804eda 100%), */
-    "-pink-blue":
-    linear-gradient(
-      90deg,
-      var(--color-auto-pink-5) -50%,
-      var(--color-auto-blue-5) 150%
-    ),
-  "-pink-blue-dark":
-    linear-gradient(
-      -70deg,
-      var(--color-auto-pink-3) 0%,
-      var(--color-auto-blue-3) 100%
-    ),
-  "-blue-pink":
-    linear-gradient(
-      -70deg,
-      var(--color-auto-blue-5) 0%,
-      var(--color-auto-pink-5) 100%
-    ),
-) !default;
-
-@mixin bg-gradient($parent, $gradient) {
-  #{$parent} {
-    background: $gradient;
-  }
-}
-
-/*
-@mixin text-gradient($parent, $gradient) {
-  #{parent} {
-    background-image: $gradient;
-    -webkit-background-clip: text;
-    background-clip: text;
-    -webkit-text-fill-color: transparent;
-    color: transparent;
-  }
-}
-*/
-
-$border-width: 2px;
-@mixin border-gradient($parent, $gradient) {
-  #{$parent} {
-    position: relative;
-    background-clip: padding-box;
-    &:before {
-      content: "";
-      position: absolute;
-      background: var(--color-bg-primary);
-      border-radius: inherit;
-      z-index: 1;
-      left: 0;
-      right: 0;
-      top: 0;
-      bottom: 0;
-    }
-    &:after {
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      background: $gradient;
-      content: "";
-      z-index: 0;
-      border-radius: inherit;
-      margin: -$border-width;
-    }
-    & > span {
-      z-index: 2;
-    }
-  }
-}
-
-@each $gradient, $value in $gradients {
-  @include bg-gradient(".bg-gradient-#{$gradient}", $value);
-}
-
-/*
-@each $gradient, $value in $gradients {
-  @include text-gradient(".text-gradient-#{gradient}", $value);
-}
-*/
-
-@each $gradient, $value in $gradients {
-  @include border-gradient(".border-gradient-#{$gradient}", $value);
-}
diff --git a/stylesheets/index.scss b/stylesheets/index.scss
index c92f1bc998..a86f962b95 100644
--- a/stylesheets/index.scss
+++ b/stylesheets/index.scss
@@ -5,13 +5,7 @@
 @import "@primer/css/labels/index.scss";
 @import "@primer/css/avatars/avatar.scss";
 
-$marketing-font-path: "/assets/fonts/inter/";
-@import "@primer/css/marketing/index.scss";
-@import "font-mktg.scss";
-
 @import "extended-markdown.scss";
-@import "font-mktg.scss";
-@import "gradient.scss";
 @import "headings.scss";
 @import "images.scss";
 @import "shadows.scss";
diff --git a/stylesheets/utilities.scss b/stylesheets/utilities.scss
index a638dbd84d..902cc219b7 100644
--- a/stylesheets/utilities.scss
+++ b/stylesheets/utilities.scss
@@ -89,15 +89,35 @@
 ------------------------------------------------------------------------------*/
 
 .fade-tertiary-left {
-  background: linear-gradient(to right, var(--color-bg-tertiary), transparent);
+  background: linear-gradient(to right, var(--color-bg-primary), transparent);
 }
 
 .fade-tertiary-right {
-  background: linear-gradient(to left, var(--color-bg-tertiary), transparent);
+  background: linear-gradient(to left, var(--color-bg-primary), transparent);
 }
 
 .fade-tertiary-bottom {
-  background: linear-gradient(to top, var(--color-bg-tertiary), transparent);
+  background: linear-gradient(to top, var(--color-bg-primary), transparent);
+}
+
+/* Blue primary button
+------------------------------------------------------------------------------*/
+.btn-primary-matte {
+  color: var(--color-text-inverse);
+  background-color: var(--color-auto-blue-5);
+  border-color: var(--color-btn-primary-border);
+  box-shadow: var(--color-btn-primary-shadow),
+    var(--color-btn-primary-inset-shadow);
+}
+
+.btn-primary-matte:hover {
+  background-color: var(--color-auto-blue-6);
+}
+
+/* Semibold text
+------------------------------------------------------------------------------*/
+.font-weight-semibold {
+  font-weight: $font-weight-semibold;
 }
 
 .outline-none {
diff --git a/tests/rendering/head.js b/tests/rendering/head.js
index f488daefd0..5e6946a604 100644
--- a/tests/rendering/head.js
+++ b/tests/rendering/head.js
@@ -31,7 +31,7 @@ describe('<head>', () => {
     ).toBe(true)
     // HTML intro
     expect(
-      $('div.lead-mktg')
+      $('[data-testid="lead"]')
         .html()
         .startsWith('<p>You can <a href="/articles/merging-a-pull-request">merge pull requests</a>')
     )
diff --git a/tests/rendering/server.js b/tests/rendering/server.js
index 5014265cb1..341b51e8a5 100644
--- a/tests/rendering/server.js
+++ b/tests/rendering/server.js
@@ -242,7 +242,7 @@ describe('server', () => {
     let $ = await getDOM(
       '/en/github/importing-your-projects-to-github/importing-a-git-repository-using-the-command-line'
     )
-    const articleIntro = $('.lead-mktg').text()
+    const articleIntro = $('[data-testid="lead"]').text()
     $ = await getDOM(
       '/en/enterprise/2.16/user/importing-your-projects-to-github/importing-source-code-to-github'
     )
@@ -291,9 +291,9 @@ describe('server', () => {
 
   test('renders liquid within liquid within liquid in intros', async () => {
     const $ = await getDOM('/en/github/administering-a-repository/about-merge-methods-on-github')
-    expect($('div.lead-mktg').first().text().includes('merge their pull requests on GitHub')).toBe(
-      true
-    )
+    expect(
+      $('[data-testid="lead"]').first().text().includes('merge their pull requests on GitHub')
+    ).toBe(true)
   })
 
   test('renders product frontmatter callouts', async () => {