diff --git a/.eslintrc.json b/.eslintrc.json
index af2f23539..d69a847ac 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,7 +5,8 @@
     "jsx-a11y/anchor-is-valid": "off",
     "import/no-default-export": "off",
     "react/forbid-dom-props": "warn",
-    "@typescript-eslint/require-await": "warn"
+    "@typescript-eslint/require-await": "warn",
+    "react/react-in-jsx-scope": "off"
   },
   "parserOptions": {
     "project": "tsconfig.json"
diff --git a/components/Footer/index.tsx b/components/Footer/index.tsx
index 38adfee78..9dec349d6 100644
--- a/components/Footer/index.tsx
+++ b/components/Footer/index.tsx
@@ -4,7 +4,7 @@ import LinkedinIcon from 'mdi-react/LinkedinIcon'
 import TwitterIcon from 'mdi-react/TwitterIcon'
 import YouTubeIcon from 'mdi-react/YoutubeIcon'
 import Link from 'next/link'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import {
     StyledFooterWrapper,
@@ -28,7 +28,7 @@ interface Props {
     minimal?: boolean
 }
 
-const Footer: React.FunctionComponent<Props> = ({ minimal }) => (
+const Footer: FunctionComponent<Props> = ({ minimal }) => (
     <StyledFooterWrapper minimal={minimal}>
         <StyledFooterContainer>
             {!minimal && (
diff --git a/components/Header/index.tsx b/components/Header/index.tsx
index 71ca3f308..f815a8a62 100644
--- a/components/Header/index.tsx
+++ b/components/Header/index.tsx
@@ -1,6 +1,6 @@
 import HeaderCta from '@components/atoms/HeaderCta'
 import Row from '@components/atoms/Row'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledHeaderImage, StyledHeaderText } from './HeaderStyles'
 
@@ -14,7 +14,7 @@ interface Props {
     text?: string
 }
 
-const Header: React.FunctionComponent<Props> = props => (
+const Header: FunctionComponent<Props> = props => (
     <>
         <Row>
             {props.showImage && <StyledHeaderImage src={props.headerImage} alt={props.headerImageAlt} />}
diff --git a/components/NavBar/index.tsx b/components/NavBar/index.tsx
index b3559609c..d29d90714 100644
--- a/components/NavBar/index.tsx
+++ b/components/NavBar/index.tsx
@@ -2,7 +2,7 @@ import Button from '@components/atoms/Button'
 import MenuDownIcon from 'mdi-react/MenuDownIcon'
 import MenuIcon from 'mdi-react/MenuIcon'
 import MenuUpIcon from 'mdi-react/MenuUpIcon'
-import React, { useState } from 'react'
+import { FunctionComponent, useState } from 'react'
 
 import {
     StyledNavBarWrapper,
@@ -20,7 +20,7 @@ import {
     StyledNavBarDropDownItem,
 } from './NavBarStyles'
 
-const NavBar: React.FunctionComponent = () => {
+const NavBar: FunctionComponent = () => {
     const [ expandDropdown, setExpandDropdown ] = useState(false)
     const [ expandOnMobile, setExpandOnMobile ] = useState(false)
 
diff --git a/components/atoms/AuthorCard/index.tsx b/components/atoms/AuthorCard/index.tsx
index 44db8136f..10dbda415 100644
--- a/components/atoms/AuthorCard/index.tsx
+++ b/components/atoms/AuthorCard/index.tsx
@@ -1,6 +1,6 @@
 import Card from '@components/atoms/Card'
 import ContentCard from '@components/atoms/ContentCard'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledAuthorImage } from './AuthorCardStyles'
 
@@ -12,7 +12,7 @@ interface Props {
     id: string
 }
 
-const AuthorCard: React.FunctionComponent<Props> = props => (
+const AuthorCard: FunctionComponent<Props> = props => (
     <Card showBorder={true}>
         <StyledAuthorImage src="/authors/unisex-avatar.svg" alt="Author Avatar" />
         <ContentCard
diff --git a/components/atoms/AuthorCardList/index.tsx b/components/atoms/AuthorCardList/index.tsx
index f7bd73bbb..899a334f4 100644
--- a/components/atoms/AuthorCardList/index.tsx
+++ b/components/atoms/AuthorCardList/index.tsx
@@ -1,7 +1,7 @@
 import AuthorCard from '@components/atoms/AuthorCard'
 import Column from '@components/atoms/Column'
 import AuthorCollection from '@interfaces/AuthorCollection'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledAuthorCardList } from './AuthorCardListStyles'
 
@@ -9,7 +9,7 @@ interface Props {
     authors: AuthorCollection[]
 }
 
-const AuthorCardList: React.FunctionComponent<Props> = props => (
+const AuthorCardList: FunctionComponent<Props> = props => (
     <StyledAuthorCardList>
         {props.authors.map(author => (
             <Column className='flex-medium' width='flex-medium' key={author.id}>
diff --git a/components/atoms/Button/index.tsx b/components/atoms/Button/index.tsx
index 0a09e8995..83159117e 100644
--- a/components/atoms/Button/index.tsx
+++ b/components/atoms/Button/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, FunctionComponent } from 'react'
+import { ReactNode, FunctionComponent } from 'react'
 
 import { StyledButton } from './ButtonStyles'
 
diff --git a/components/atoms/Card/index.tsx b/components/atoms/Card/index.tsx
index f47f148f5..983f6454c 100644
--- a/components/atoms/Card/index.tsx
+++ b/components/atoms/Card/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, FunctionComponent } from 'react'
+import { ReactNode, FunctionComponent } from 'react'
 
 import { StyledCard } from './CardStyles'
 
diff --git a/components/atoms/CollectionView/index.tsx b/components/atoms/CollectionView/index.tsx
index d75d054e0..a9796d1a9 100644
--- a/components/atoms/CollectionView/index.tsx
+++ b/components/atoms/CollectionView/index.tsx
@@ -1,7 +1,7 @@
 import Card from '@components/atoms/Card'
 import MarkdownFile from '@interfaces/MarkdownFile'
 import Link from 'next/link'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import {
     StyledCollectionHeader,
@@ -19,7 +19,7 @@ interface Props {
     activeSlug?: string
 }
 
-const CollectionView: React.FunctionComponent<Props> = props => (
+const CollectionView: FunctionComponent<Props> = props => (
     <Card addMargin={true} showBorder={true} leftAlign={true}>
         <StyledCollectionHeader>This article is part of a series:</StyledCollectionHeader>
         <StyledCollectionBody>
diff --git a/components/atoms/Column/index.tsx b/components/atoms/Column/index.tsx
index 99bcce1ef..1ce9be624 100644
--- a/components/atoms/Column/index.tsx
+++ b/components/atoms/Column/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, FunctionComponent } from 'react'
+import { ReactNode, FunctionComponent } from 'react'
 
 import { StyledColumn } from './ColumnStyles'
 
diff --git a/components/atoms/Container/index.tsx b/components/atoms/Container/index.tsx
index 0fb55ee49..3aa747d74 100644
--- a/components/atoms/Container/index.tsx
+++ b/components/atoms/Container/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, FunctionComponent } from 'react'
+import { ReactNode, FunctionComponent } from 'react'
 
 import { StyledContainer } from './ContainerStyles'
 
diff --git a/components/atoms/ContentCard/index.tsx b/components/atoms/ContentCard/index.tsx
index 77a589508..a762d1ced 100644
--- a/components/atoms/ContentCard/index.tsx
+++ b/components/atoms/ContentCard/index.tsx
@@ -1,6 +1,6 @@
 import Card from '@components/atoms/Card'
 import Link from 'next/link'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import {
     StyledCardBody,
@@ -20,7 +20,7 @@ export interface Props {
     contentType?: string | null
 }
 
-const ContentCard: React.FunctionComponent<Props> = props => {
+const ContentCard: FunctionComponent<Props> = props => {
     const isPost = props.contentType === 'post'
 
     return (
diff --git a/components/atoms/ContentCardList/index.tsx b/components/atoms/ContentCardList/index.tsx
index 33f2a46b1..155b54b5f 100644
--- a/components/atoms/ContentCardList/index.tsx
+++ b/components/atoms/ContentCardList/index.tsx
@@ -2,13 +2,13 @@ import Column from '@components/atoms/Column'
 import ContentCard from '@components/atoms/ContentCard'
 import Row from '@components/atoms/Row'
 import MarkdownFileWithUrl from '@interfaces/MarkdownFileWithUrl'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 interface Props {
     records: MarkdownFileWithUrl[]
 }
 
-const ContentCardList: React.FunctionComponent<Props> = props => (
+const ContentCardList: FunctionComponent<Props> = props => (
     <Row>
         {props.records.map(record => (
             <Column className='flex-medium' width='flex-medium' key={record.url}>
diff --git a/components/atoms/CreativeCommonsNotice/index.tsx b/components/atoms/CreativeCommonsNotice/index.tsx
index 4414ffa91..48ee5eb23 100644
--- a/components/atoms/CreativeCommonsNotice/index.tsx
+++ b/components/atoms/CreativeCommonsNotice/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import {
     StyledCreativeCommonsNoticeContainer,
@@ -9,7 +9,7 @@ import {
 
 const creativeCommonsUrl = 'https://creativecommons.org/licenses/by-nc-sa/4.0/'
 
-const CreativeCommonsNotice: React.FunctionComponent = () => (
+const CreativeCommonsNotice: FunctionComponent = () => (
     <StyledCreativeCommonsNoticeContainer>
         <StyledCreativeCommonsNoticeText>
             This work is licensed under a{' '}
diff --git a/components/atoms/EmbeddedYoutubeVideo/index.tsx b/components/atoms/EmbeddedYoutubeVideo/index.tsx
index 4892045ca..80c326503 100644
--- a/components/atoms/EmbeddedYoutubeVideo/index.tsx
+++ b/components/atoms/EmbeddedYoutubeVideo/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledEmbeddedVideoWrapper, StyledEmbeddedVideo } from './EmbeddedYoutubeVideoStyles'
 
@@ -9,7 +9,7 @@ interface Props {
     id: string
 }
 
-const EmbeddedYoutubeVideo: React.FunctionComponent<Props> = props => (
+const EmbeddedYoutubeVideo: FunctionComponent<Props> = props => (
     <StyledEmbeddedVideoWrapper>
         <StyledEmbeddedVideo
             title="Embedded Youtube Video"
diff --git a/components/atoms/GifLikeVideo/index.tsx b/components/atoms/GifLikeVideo/index.tsx
index 72cf01f91..5e883abfe 100644
--- a/components/atoms/GifLikeVideo/index.tsx
+++ b/components/atoms/GifLikeVideo/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledVideo } from './GifLikeVideoStyles'
 
@@ -15,7 +15,7 @@ interface Props {
  * and accessibility advantages (like being pausable). Use cases include
  * screencast demonstrations or animations.
  */
-const GifLikeVideo: React.FunctionComponent<Props> = props => (
+const GifLikeVideo: FunctionComponent<Props> = props => (
     <StyledVideo
         autoPlay={true}
         loop={true}
diff --git a/components/atoms/GoogleTagManager/index.tsx b/components/atoms/GoogleTagManager/index.tsx
index 102162d51..fad86ba2b 100644
--- a/components/atoms/GoogleTagManager/index.tsx
+++ b/components/atoms/GoogleTagManager/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledIframe } from './GoogleTagManagerStyles'
 
@@ -12,7 +12,7 @@ interface Props {
 /**
  * Google Tag Manager script tag. This should be rendered in the <head>.
  */
-export const GoogleTagManagerScriptTag: React.FunctionComponent<Props> = props => (
+export const GoogleTagManagerScriptTag: FunctionComponent<Props> = props => (
     <script
         dangerouslySetInnerHTML={{
             __html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -29,7 +29,7 @@ export const GoogleTagManagerScriptTag: React.FunctionComponent<Props> = props =
  * script. This should be rendered in the <body> element (ideally right after
  * the opening <body> tag).
  */
-export const GoogleTagManagerNoscriptFrame: React.FunctionComponent<Props> = props => (
+export const GoogleTagManagerNoscriptFrame: FunctionComponent<Props> = props => (
     <noscript>
         <StyledIframe
             title="google-tag-manager-noscript-frame"
diff --git a/components/atoms/HeaderCta/index.tsx b/components/atoms/HeaderCta/index.tsx
index b07ef68b2..e48b611b7 100644
--- a/components/atoms/HeaderCta/index.tsx
+++ b/components/atoms/HeaderCta/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import Button from '../Button'
 
@@ -9,7 +9,7 @@ interface Props {
     text?: string
 }
 
-const HeaderCta: React.FunctionComponent<Props> = props => (
+const HeaderCta: FunctionComponent<Props> = props => (
     <StyledHeaderCtaWrapper>
         {props.link && 
             <Button href={props.link} className="header-cta">
diff --git a/components/atoms/Row/index.tsx b/components/atoms/Row/index.tsx
index 982ba62e1..d3f1c9a88 100644
--- a/components/atoms/Row/index.tsx
+++ b/components/atoms/Row/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, FunctionComponent } from 'react'
+import { ReactNode, FunctionComponent } from 'react'
 
 import { StyledRow } from './RowStyles'
 
diff --git a/components/atoms/SourcegraphSearch/index.tsx b/components/atoms/SourcegraphSearch/index.tsx
index 37a408803..a85858f43 100644
--- a/components/atoms/SourcegraphSearch/index.tsx
+++ b/components/atoms/SourcegraphSearch/index.tsx
@@ -1,7 +1,7 @@
 import Button from '@components/atoms/Button'
 import Card from '@components/atoms/Card'
 import Column from '@components/atoms/Column'
-import React, { useState } from 'react'
+import { FunctionComponent, useState } from 'react'
 
 import { StyledSearchBody, StyledSearchInput } from './SourcegraphSearchStyles'
 
@@ -10,7 +10,7 @@ interface Props {
     patternType?: string
 }
 
-const SourcegraphSearch: React.FunctionComponent<Props> = props => {
+const SourcegraphSearch: FunctionComponent<Props> = props => {
     const [query, setQuery] = useState(props.query)
     let modifiedQuery = query
 
diff --git a/components/atoms/TocWrapper/index.tsx b/components/atoms/TocWrapper/index.tsx
index 3aca5d83b..89ee29666 100644
--- a/components/atoms/TocWrapper/index.tsx
+++ b/components/atoms/TocWrapper/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledTocWrapper } from './TocWrapperStyles'
 
@@ -6,7 +6,7 @@ interface Props {
     tocContents: string
 }
 
-const TocWrapper: React.FunctionComponent<Props> = props => (
+const TocWrapper: FunctionComponent<Props> = props => (
     <StyledTocWrapper>
         <h5>Contents</h5>
         {props.tocContents}
diff --git a/components/layouts/Layout.tsx b/components/layouts/Layout.tsx
index 4a71de386..a6d54e7bc 100644
--- a/components/layouts/Layout.tsx
+++ b/components/layouts/Layout.tsx
@@ -3,7 +3,7 @@ import { GoogleTagManagerScriptTag, GoogleTagManagerNoscriptFrame } from '@compo
 import Footer from '@components/Footer'
 import NavBar from '@components/NavBar'
 import Head from 'next/head'
-import * as React from 'react'
+import { FunctionComponent } from 'react'
 
 import { googleTagManagerId } from '../../site-config'
 
@@ -34,7 +34,7 @@ export interface Props {
     metaTags?: MetaTags
 }
 
-const Layout: React.FunctionComponent<Props> = props => {
+const Layout: FunctionComponent<Props> = props => {
     let documentTitle = props.documentTitle
     if (!documentTitle) {
         documentTitle = SITE_TITLE
@@ -61,8 +61,7 @@ const Layout: React.FunctionComponent<Props> = props => {
                 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
                 <link rel="preconnect" href="https://fonts.gstatic.com" />
                 <link
-                    rel="stylesheet preload prefetch"
-                    as="style"
+                    rel="stylesheet"
                     href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&family=PT+Sans:wght@700&display=swap"
                 />
                 {/* Prism theme for syntax highlighting */}
diff --git a/components/layouts/PageLayout.tsx b/components/layouts/PageLayout.tsx
index 4a0a6ad27..8e63a4853 100644
--- a/components/layouts/PageLayout.tsx
+++ b/components/layouts/PageLayout.tsx
@@ -1,14 +1,14 @@
 import Column from '@components/atoms/Column'
 import Row from '@components/atoms/Row'
-import Layout, { Props as LayoutProps, MetaTags } from '@components/layouts/Layout'
-import React from 'react'
+import Layout, { Props as LayoutProps } from '@components/layouts/Layout'
+import { FunctionComponent } from 'react'
 
 interface Props extends LayoutProps {
     leftColumn?: React.ReactNode
     rightColumn?: React.ReactNode
 }
 
-const PageLayout: React.FunctionComponent<Props> = props => (
+const PageLayout: FunctionComponent<Props> = props => (
     <Layout documentTitle={props.documentTitle} appendSiteTitle={props.appendSiteTitle} metaTags={props.metaTags}>
         <Row className='medium'>
             <Column className='flex-small' width='flex-small'>{props.leftColumn}</Column>
diff --git a/components/templates/ArticleTemplate/index.tsx b/components/templates/ArticleTemplate/index.tsx
index 4145cf3e8..1c8bab778 100644
--- a/components/templates/ArticleTemplate/index.tsx
+++ b/components/templates/ArticleTemplate/index.tsx
@@ -9,7 +9,7 @@ import PageLayout from '@components/layouts/PageLayout'
 import RecordCollection from '@interfaces/RecordCollection'
 import RegexIcon from 'mdi-react/RegexIcon'
 import { MDXRemote, MDXRemoteSerializeResult } from 'next-mdx-remote'
-import React from 'react'
+import { FunctionComponent, createElement } from 'react'
 import rehypeReact from 'rehype-react'
 import unified from 'unified'
 import { Node } from 'unist'
@@ -38,7 +38,7 @@ export interface Props {
 
 const components = { SourcegraphSearch, EmbeddedYoutubeVideo, GifLikeVideo, RegexIcon, CollectionView }
 
-const ArticleTemplate: React.FunctionComponent<Props> = props => {
+const ArticleTemplate: FunctionComponent<Props> = props => {
     const metaTags: MetaTags = {
         image: props.socialImage ?? props.image,
         description: props.description,
@@ -54,7 +54,7 @@ const ArticleTemplate: React.FunctionComponent<Props> = props => {
 
     let tocFragment
     if (props.toc) {
-        tocFragment = unified().use(rehypeReact, { createElement: React.createElement }).stringify(props.toc)
+        tocFragment = unified().use(rehypeReact, { createElement }).stringify(props.toc)
         tocFragment = (
             <>
                 <TocWrapper tocContents={tocFragment} />
diff --git a/components/templates/ErrorTemplate/index.tsx b/components/templates/ErrorTemplate/index.tsx
index 8400073e8..8c622762b 100644
--- a/components/templates/ErrorTemplate/index.tsx
+++ b/components/templates/ErrorTemplate/index.tsx
@@ -1,5 +1,5 @@
 import SignDirectionIcon from 'mdi-react/SignDirectionIcon'
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { StyledErrorPageWrapper, StyledErrorPageText } from './ErrorTemplateStyles'
 
diff --git a/next.config.js b/next.config.js
index 2e7280fc6..a232160f3 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,7 +1,11 @@
 // @ts-check
+const withBundleAnalyzer = require("@next/bundle-analyzer")({
+  enabled: process.env.ANALYZE === "true",
+})
 
 /** @type {import("next/dist/next-server/server/config-shared").NextConfig} */
-module.exports = {
+
+module.exports = withBundleAnalyzer({
   pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'md', 'mdx'],
   future: {
     // Enable webpack5
@@ -10,4 +14,4 @@ module.exports = {
   env: {
     NEXT_PUBLIC_URL: process.env.DEPLOY_URL,
   }
-}
+})
diff --git a/package-lock.json b/package-lock.json
index 29c39de91..ad8135878 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,6 +29,7 @@
         "unified": "^9.2.1"
       },
       "devDependencies": {
+        "@next/bundle-analyzer": "^11.1.0",
         "@sourcegraph/eslint-config": "^0.25.1",
         "@sourcegraph/prettierrc": "^3.0.3",
         "@types/js-yaml": "4.0.2",
@@ -332,13 +333,13 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
+      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
       "dependencies": {
         "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -422,9 +423,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.15.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz",
-      "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
+      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -482,9 +483,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
@@ -494,9 +495,9 @@
       }
     },
     "node_modules/@babel/runtime-corejs3": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz",
-      "integrity": "sha512-64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz",
+      "integrity": "sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==",
       "dev": true,
       "dependencies": {
         "core-js-pure": "^3.16.0",
@@ -859,6 +860,15 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/@next/bundle-analyzer": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-11.1.0.tgz",
+      "integrity": "sha512-wB0WB8Ku8cgYR74gC1d2VvDLcuDJxbevkWBDrvWCMozryIlVftkI6T5/guaI6j8RwAaa0itC7tygoqW0pKr8YA==",
+      "dev": true,
+      "dependencies": {
+        "webpack-bundle-analyzer": "4.3.0"
+      }
+    },
     "node_modules/@next/env": {
       "version": "10.2.3",
       "resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.3.tgz",
@@ -994,6 +1004,12 @@
         "typescript": "^3 || ^4"
       }
     },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
+      "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
+      "dev": true
+    },
     "node_modules/@sindresorhus/is": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
@@ -1150,6 +1166,7 @@
       "version": "17.0.16",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.16.tgz",
       "integrity": "sha512-3kCUiOOlQTwUUvjNFkbBTWMTxdTGybz/PfjCw9JmaRGcEDBQh+nGMg7/E9P2rklhJuYVd25IYLNcvqgSPCPksg==",
+      "dev": true,
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -1204,13 +1221,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz",
-      "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz",
+      "integrity": "sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.29.0",
-        "@typescript-eslint/scope-manager": "4.29.0",
+        "@typescript-eslint/experimental-utils": "4.29.1",
+        "@typescript-eslint/scope-manager": "4.29.1",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -1235,15 +1252,15 @@
       }
     },
     "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz",
-      "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz",
+      "integrity": "sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/typescript-estree": "4.29.0",
+        "@typescript-eslint/scope-manager": "4.29.1",
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/typescript-estree": "4.29.1",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       },
@@ -1259,14 +1276,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz",
-      "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz",
+      "integrity": "sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/typescript-estree": "4.29.0",
+        "@typescript-eslint/scope-manager": "4.29.1",
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/typescript-estree": "4.29.1",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -1286,13 +1303,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz",
-      "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz",
+      "integrity": "sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0"
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/visitor-keys": "4.29.1"
       },
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -1303,9 +1320,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz",
+      "integrity": "sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==",
       "dev": true,
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -1316,13 +1333,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
-      "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz",
+      "integrity": "sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0",
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/visitor-keys": "4.29.1",
         "debug": "^4.3.1",
         "globby": "^11.0.3",
         "is-glob": "^4.0.1",
@@ -1343,12 +1360,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz",
-      "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz",
+      "integrity": "sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/types": "4.29.1",
         "eslint-visitor-keys": "^2.0.0"
       },
       "engines": {
@@ -1380,6 +1397,15 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/acorn-walk": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
+      "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@@ -2673,9 +2699,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
     },
     "node_modules/comma-separated-tokens": {
       "version": "1.0.8",
@@ -3276,6 +3302,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
+    },
     "node_modules/duplexer3": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
@@ -3283,9 +3315,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.799",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz",
-      "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw=="
+      "version": "1.3.802",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz",
+      "integrity": "sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -4930,6 +4962,21 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -7107,9 +7154,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="
+      "version": "1.1.74",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.74.tgz",
+      "integrity": "sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw=="
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
@@ -7345,6 +7392,15 @@
         "wrappy": "1"
       }
     },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "dev": true,
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -8828,6 +8884,20 @@
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
+    "node_modules/sirv": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
+      "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
+      "dev": true,
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.15",
+        "mime": "^2.3.1",
+        "totalist": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
@@ -9648,6 +9718,15 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/totalist": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tr46": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
@@ -10202,6 +10281,50 @@
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
+    "node_modules/webpack-bundle-analyzer": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.3.0.tgz",
+      "integrity": "sha512-J3TPm54bPARx6QG8z4cKBszahnUglcv70+N+8gUqv2I5KOFHJbzBiLx+pAp606so0X004fxM7hqRu10MLjJifA==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "chalk": "^4.1.0",
+        "commander": "^6.2.0",
+        "gzip-size": "^6.0.0",
+        "lodash": "^4.17.20",
+        "opener": "^1.5.2",
+        "sirv": "^1.0.7",
+        "ws": "^7.3.1"
+      },
+      "bin": {
+        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
+      "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/whatwg-url": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
@@ -10609,13 +10732,13 @@
       "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
     },
     "@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
+      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
       "requires": {
         "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.0"
       }
     },
     "@babel/highlight": {
@@ -10680,9 +10803,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.15.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz",
-      "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg=="
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
+      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA=="
     },
     "@babel/plugin-proposal-object-rest-spread": {
       "version": "7.12.1",
@@ -10719,18 +10842,18 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz",
-      "integrity": "sha512-64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz",
+      "integrity": "sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==",
       "dev": true,
       "requires": {
         "core-js-pure": "^3.16.0",
@@ -11030,6 +11153,15 @@
       "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz",
       "integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA=="
     },
+    "@next/bundle-analyzer": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-11.1.0.tgz",
+      "integrity": "sha512-wB0WB8Ku8cgYR74gC1d2VvDLcuDJxbevkWBDrvWCMozryIlVftkI6T5/guaI6j8RwAaa0itC7tygoqW0pKr8YA==",
+      "dev": true,
+      "requires": {
+        "webpack-bundle-analyzer": "4.3.0"
+      }
+    },
     "@next/env": {
       "version": "10.2.3",
       "resolved": "https://registry.npmjs.org/@next/env/-/env-10.2.3.tgz",
@@ -11128,6 +11260,12 @@
         "esquery": "^1.0.1"
       }
     },
+    "@polka/url": {
+      "version": "1.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
+      "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
+      "dev": true
+    },
     "@sindresorhus/is": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
@@ -11278,6 +11416,7 @@
       "version": "17.0.16",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.16.tgz",
       "integrity": "sha512-3kCUiOOlQTwUUvjNFkbBTWMTxdTGybz/PfjCw9JmaRGcEDBQh+nGMg7/E9P2rklhJuYVd25IYLNcvqgSPCPksg==",
+      "dev": true,
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -11332,13 +11471,13 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz",
-      "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz",
+      "integrity": "sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "4.29.0",
-        "@typescript-eslint/scope-manager": "4.29.0",
+        "@typescript-eslint/experimental-utils": "4.29.1",
+        "@typescript-eslint/scope-manager": "4.29.1",
         "debug": "^4.3.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.1.0",
@@ -11347,55 +11486,55 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz",
-      "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz",
+      "integrity": "sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/typescript-estree": "4.29.0",
+        "@typescript-eslint/scope-manager": "4.29.1",
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/typescript-estree": "4.29.1",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz",
-      "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.1.tgz",
+      "integrity": "sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.29.0",
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/typescript-estree": "4.29.0",
+        "@typescript-eslint/scope-manager": "4.29.1",
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/typescript-estree": "4.29.1",
         "debug": "^4.3.1"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz",
-      "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz",
+      "integrity": "sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0"
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/visitor-keys": "4.29.1"
       }
     },
     "@typescript-eslint/types": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
-      "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.1.tgz",
+      "integrity": "sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
-      "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz",
+      "integrity": "sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.0",
-        "@typescript-eslint/visitor-keys": "4.29.0",
+        "@typescript-eslint/types": "4.29.1",
+        "@typescript-eslint/visitor-keys": "4.29.1",
         "debug": "^4.3.1",
         "globby": "^11.0.3",
         "is-glob": "^4.0.1",
@@ -11404,12 +11543,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz",
-      "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz",
+      "integrity": "sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "4.29.0",
+        "@typescript-eslint/types": "4.29.1",
         "eslint-visitor-keys": "^2.0.0"
       }
     },
@@ -11426,6 +11565,12 @@
       "dev": true,
       "requires": {}
     },
+    "acorn-walk": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
+      "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+      "dev": true
+    },
     "agent-base": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@@ -12438,9 +12583,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
     },
     "comma-separated-tokens": {
       "version": "1.0.8",
@@ -12929,6 +13074,12 @@
         }
       }
     },
+    "duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
+    },
     "duplexer3": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
@@ -12936,9 +13087,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.799",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz",
-      "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw=="
+      "version": "1.3.802",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz",
+      "integrity": "sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -14223,6 +14374,15 @@
         "strip-bom-string": "^1.0.0"
       }
     },
+    "gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "dev": true,
+      "requires": {
+        "duplexer": "^0.1.2"
+      }
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -15846,9 +16006,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="
+      "version": "1.1.74",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.74.tgz",
+      "integrity": "sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw=="
     },
     "normalize-package-data": {
       "version": "2.5.0",
@@ -16029,6 +16189,12 @@
         "wrappy": "1"
       }
     },
+    "opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "dev": true
+    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -17156,6 +17322,17 @@
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
+    "sirv": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
+      "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
+      "dev": true,
+      "requires": {
+        "@polka/url": "^1.0.0-next.15",
+        "mime": "^2.3.1",
+        "totalist": "^1.0.0"
+      }
+    },
     "sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
@@ -17816,6 +17993,12 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
     },
+    "totalist": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
+      "dev": true
+    },
     "tr46": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
@@ -18232,6 +18415,37 @@
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
+    "webpack-bundle-analyzer": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.3.0.tgz",
+      "integrity": "sha512-J3TPm54bPARx6QG8z4cKBszahnUglcv70+N+8gUqv2I5KOFHJbzBiLx+pAp606so0X004fxM7hqRu10MLjJifA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "chalk": "^4.1.0",
+        "commander": "^6.2.0",
+        "gzip-size": "^6.0.0",
+        "lodash": "^4.17.20",
+        "opener": "^1.5.2",
+        "sirv": "^1.0.7",
+        "ws": "^7.3.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
+          "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+          "dev": true
+        },
+        "commander": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+          "dev": true
+        }
+      }
+    },
     "whatwg-url": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
diff --git a/package.json b/package.json
index 97ee1907b..4fe41b687 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "analyze": "ANALYZE=true next build",
     "dev": "next dev",
     "build": "next build && next export",
     "start": "next start",
@@ -35,6 +36,7 @@
     "unified": "^9.2.1"
   },
   "devDependencies": {
+    "@next/bundle-analyzer": "^11.1.0",
     "@sourcegraph/eslint-config": "^0.25.1",
     "@sourcegraph/prettierrc": "^3.0.3",
     "@types/js-yaml": "4.0.2",
diff --git a/pages/404.tsx b/pages/404.tsx
index 314994fe6..25a003222 100644
--- a/pages/404.tsx
+++ b/pages/404.tsx
@@ -1,8 +1,8 @@
 import Layout from '@components/layouts/Layout'
 import ErrorTemplate from '@components/templates/ErrorTemplate'
-import * as React from 'react'
+import { FunctionComponent } from 'react'
 
-export const NotFoundPage: React.FunctionComponent = () => (
+export const NotFoundPage: FunctionComponent = () => (
     <Layout>
         <ErrorTemplate />
     </Layout>
diff --git a/pages/[slug].tsx b/pages/[slug].tsx
index 0a2b9175a..03d5c6914 100644
--- a/pages/[slug].tsx
+++ b/pages/[slug].tsx
@@ -1,3 +1,4 @@
+import ArticleTemplate, { Props as ArticleTemplateProps } from '@components/templates/ArticleTemplate'
 import loadAllRecords from '@lib/loadAllRecords'
 import loadMarkdownFile from '@lib/loadMarkdownFile'
 import loadRecordCollections from '@lib/loadRecordCollections'
@@ -7,8 +8,6 @@ import omitUndefinedFields from '@util/omitUndefinedFields'
 import slugToTitleCase from '@util/slugToTitleCase'
 import { GetStaticPaths, GetStaticProps } from 'next'
 
-import ArticleTemplate, { Props as ArticleTemplateProps } from '../components/templates/ArticleTemplate'
-
 export const getStaticPaths: GetStaticPaths = async () => {
     const posts = await loadAllRecords('posts', true)
     const paths = posts.map(post => ({ params: { slug: post.slug } }))
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 8090fc4b3..f2843ca14 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,8 +1,8 @@
 import { AppProps } from 'next/app'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 import '@styles/styles.scss'
 
-const App: React.FunctionComponent<AppProps> = ({ Component, pageProps }) => <Component {...pageProps} />
+const App: FunctionComponent<AppProps> = ({ Component, pageProps }) => <Component {...pageProps} />
 
 export default App
diff --git a/pages/_document.tsx b/pages/_document.tsx
index 0e0e5badd..7d796ae09 100644
--- a/pages/_document.tsx
+++ b/pages/_document.tsx
@@ -1,5 +1,4 @@
 import Document, { DocumentContext, DocumentInitialProps } from 'next/document'
-import React from 'react'
 import { ServerStyleSheet } from 'styled-components'
 
 export default class MyDocument extends Document {
diff --git a/pages/authors/index.tsx b/pages/authors/index.tsx
index 46a4bd391..c7078bb46 100644
--- a/pages/authors/index.tsx
+++ b/pages/authors/index.tsx
@@ -5,7 +5,7 @@ import loadAllRecords from '@lib/loadAllRecords'
 import loadAuthorCollections from '@lib/loadAuthorCollections'
 import omitUndefinedFields from '@util/omitUndefinedFields'
 import { GetStaticProps } from 'next'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 interface Props {
     uniqueAuthors: AuthorCollection[]
@@ -26,7 +26,7 @@ export const getStaticProps: GetStaticProps<Props> = async () => {
     }
 }
 
-const AuthorHome: React.FunctionComponent<Props> = props => (
+const AuthorHome: FunctionComponent<Props> = props => (
     <PageLayout>
         <AuthorCardList authors={props.uniqueAuthors} />
     </PageLayout>
diff --git a/pages/index.tsx b/pages/index.tsx
index af41e13ed..98d77c250 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -5,7 +5,7 @@ import MarkdownFileWithUrl from '@interfaces/MarkdownFileWithUrl'
 import loadAllRecords from '@lib/loadAllRecords'
 import omitUndefinedFields from '@util/omitUndefinedFields'
 import { GetStaticProps } from 'next'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 interface Props {
     posts: MarkdownFileWithUrl[]
@@ -21,7 +21,7 @@ export const getStaticProps: GetStaticProps<Props> = async () => {
     }
 }
 
-const Home: React.FunctionComponent<Props> = props => (
+const Home: FunctionComponent<Props> = props => (
     <PageLayout>
         <Header 
             showImage={true}
diff --git a/pages/tags/[tag].tsx b/pages/tags/[tag].tsx
index f9d554cc2..abe67b3f6 100644
--- a/pages/tags/[tag].tsx
+++ b/pages/tags/[tag].tsx
@@ -8,7 +8,7 @@ import getQueryParameter from '@util/getQueryParameters'
 import omitUndefinedFields from '@util/omitUndefinedFields'
 import startCase from 'lodash/startCase'
 import { GetStaticPaths, GetStaticProps } from 'next'
-import React from 'react'
+import { FunctionComponent } from 'react'
 
 interface Props {
     tag: string
@@ -41,7 +41,7 @@ export const getStaticProps: GetStaticProps<Props> = async context => {
     }
 }
 
-const TagPage: React.FunctionComponent<Props> = props => {
+const TagPage: FunctionComponent<Props> = props => {
     const tagName = startCase(props.tag)
     return (
         <PageLayout documentTitle={`Records tagged with ${tagName}`} appendSiteTitle={true}>