diff --git a/gatsby-config.js b/gatsby-config.js
index 939fa1c..1d03e00 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -25,6 +25,7 @@ if (!spaceId || !accessToken) {
 }
 
 module.exports = {
+  jsxRuntime: "automatic",
   trailingSlash: "never",
   siteMetadata: {
     title: `Friends Of Foxley`,
diff --git a/src/components/bio.js b/src/components/bio.js
index 2d23619..5953054 100644
--- a/src/components/bio.js
+++ b/src/components/bio.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { useStaticQuery, graphql } from "gatsby";
 
 const Bio = () => {
diff --git a/src/components/deprecated-seo-component.js b/src/components/deprecated-seo-component.js
index 49cf6fb..25c8c8a 100644
--- a/src/components/deprecated-seo-component.js
+++ b/src/components/deprecated-seo-component.js
@@ -5,7 +5,7 @@
  * See: https://www.gatsbyjs.com/docs/use-static-query/
  */
 
-import * as React from "react";
+import { memo } from "react";
 import PropTypes from "prop-types";
 import { Helmet } from "react-helmet";
 import { useStaticQuery, graphql } from "gatsby";
@@ -68,4 +68,4 @@ DeprecatedSeoComponent.propTypes = {
   title: PropTypes.string.isRequired,
 };
 
-export default React.memo(DeprecatedSeoComponent);
+export default memo(DeprecatedSeoComponent);
diff --git a/src/components/external-link.js b/src/components/external-link.js
index c12ec26..5d446b6 100644
--- a/src/components/external-link.js
+++ b/src/components/external-link.js
@@ -1,4 +1,4 @@
-import * as React from "react";
+import { memo } from "react";
 
 const ExternalLink = ({ href, children, ...rest }) => {
   return (
@@ -8,4 +8,4 @@ const ExternalLink = ({ href, children, ...rest }) => {
   );
 };
 
-export default React.memo(ExternalLink);
+export default memo(ExternalLink);
diff --git a/src/components/find-us-on-facebook.js b/src/components/find-us-on-facebook.js
index 91774f6..9473fdf 100644
--- a/src/components/find-us-on-facebook.js
+++ b/src/components/find-us-on-facebook.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { useStaticQuery, graphql } from "gatsby";
 import * as style from "./find-us-on-facebook.module.css";
 import ExternalLink from "./external-link";
diff --git a/src/components/hero-section.js b/src/components/hero-section.js
index 89d6cbd..c4b0de5 100644
--- a/src/components/hero-section.js
+++ b/src/components/hero-section.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { StaticImage } from "gatsby-plugin-image";
 import * as style from "./hero-section.module.css";
 
diff --git a/src/components/layout.js b/src/components/layout.js
index 64062c8..2bb4515 100644
--- a/src/components/layout.js
+++ b/src/components/layout.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { useStaticQuery, graphql } from "gatsby";
 import * as style from "./layout.module.css";
 import SiteHeader from "./site-header";
diff --git a/src/components/site-footer.js b/src/components/site-footer.js
index 86f3b3a..3709818 100644
--- a/src/components/site-footer.js
+++ b/src/components/site-footer.js
@@ -1,4 +1,4 @@
-import React from "react";
+import { memo } from "react";
 import * as style from "./site-footer.module.css";
 import ExternalLink from "./external-link";
 
@@ -27,4 +27,4 @@ const SiteFooter = () => (
   </footer>
 );
 
-export default React.memo(SiteFooter);
+export default memo(SiteFooter);
diff --git a/src/components/site-header.js b/src/components/site-header.js
index fc06686..3ac7351 100644
--- a/src/components/site-header.js
+++ b/src/components/site-header.js
@@ -1,4 +1,4 @@
-import React from "react";
+import { memo } from "react";
 import { Link } from "gatsby";
 import PropTypes from "prop-types";
 import * as style from "./site-header.module.css";
@@ -34,4 +34,4 @@ SiteHeader.defaultProps = {
   siteTitle: ``,
 };
 
-export default React.memo(SiteHeader);
+export default memo(SiteHeader);
diff --git a/src/helpers/contentful-rendering-options.js b/src/helpers/contentful-rendering-options.js
index 54a7145..e89a799 100644
--- a/src/helpers/contentful-rendering-options.js
+++ b/src/helpers/contentful-rendering-options.js
@@ -1,5 +1,4 @@
 import { GatsbyImage } from "gatsby-plugin-image";
-import * as React from "react";
 
 export const contentfulRenderingOptions = (className = null) => {
   return {
diff --git a/src/pages/404.js b/src/pages/404.js
index c7c6d02..ff2b5b5 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql } from "gatsby";
 
 import Layout from "../components/layout";
diff --git a/src/pages/contact.js b/src/pages/contact.js
index 4bff47b..04e2c1d 100644
--- a/src/pages/contact.js
+++ b/src/pages/contact.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql } from "gatsby";
 import Layout from "../components/layout";
 import DeprecatedSeoComponent from "../components/deprecated-seo-component";
diff --git a/src/pages/history.js b/src/pages/history.js
index 7a87309..15a3e8f 100644
--- a/src/pages/history.js
+++ b/src/pages/history.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql } from "gatsby";
 import Layout from "../components/layout";
 import DeprecatedSeoComponent from "../components/deprecated-seo-component";
diff --git a/src/pages/index.js b/src/pages/index.js
index 3977667..b239335 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql, Link } from "gatsby";
 import Layout from "../components/layout";
 import DeprecatedSeoComponent from "../components/deprecated-seo-component";
diff --git a/src/pages/news.js b/src/pages/news.js
index 073996f..63329d2 100644
--- a/src/pages/news.js
+++ b/src/pages/news.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { Link, graphql } from "gatsby";
 
 import Bio from "../components/bio";
diff --git a/src/pages/resources.js b/src/pages/resources.js
index 232b45c..cdc65f3 100644
--- a/src/pages/resources.js
+++ b/src/pages/resources.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql } from "gatsby";
 import Layout from "../components/layout";
 import DeprecatedSeoComponent from "../components/deprecated-seo-component";
diff --git a/src/pages/trees.js b/src/pages/trees.js
index 8411337..1f1aa42 100644
--- a/src/pages/trees.js
+++ b/src/pages/trees.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql, Link } from "gatsby";
 import Layout from "../components/layout";
 import DeprecatedSeoComponent from "../components/deprecated-seo-component";
diff --git a/src/pages/trees/ancient-beech-tree-diversion.js b/src/pages/trees/ancient-beech-tree-diversion.js
index 81618f9..96dd418 100644
--- a/src/pages/trees/ancient-beech-tree-diversion.js
+++ b/src/pages/trees/ancient-beech-tree-diversion.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql } from "gatsby";
 import Layout from "../../components/layout";
 import DeprecatedSeoComponent from "../../components/deprecated-seo-component";
diff --git a/src/pages/trees/english-oak.js b/src/pages/trees/english-oak.js
index 11f9de0..30b209b 100644
--- a/src/pages/trees/english-oak.js
+++ b/src/pages/trees/english-oak.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql } from "gatsby";
 import Layout from "../../components/layout";
 import DeprecatedSeoComponent from "../../components/deprecated-seo-component";
diff --git a/src/pages/trees/wych-elm.js b/src/pages/trees/wych-elm.js
index 27dbdfc..2a6546a 100644
--- a/src/pages/trees/wych-elm.js
+++ b/src/pages/trees/wych-elm.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql } from "gatsby";
 import Layout from "../../components/layout";
 import DeprecatedSeoComponent from "../../components/deprecated-seo-component";
diff --git a/src/pages/wood-products.js b/src/pages/wood-products.js
index cce2f74..3c5efae 100644
--- a/src/pages/wood-products.js
+++ b/src/pages/wood-products.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { graphql, Link } from "gatsby";
 import { StaticImage } from "gatsby-plugin-image";
 import Layout from "../components/layout";
diff --git a/src/pages/work-days.js b/src/pages/work-days.js
index c0eb376..dba61e1 100644
--- a/src/pages/work-days.js
+++ b/src/pages/work-days.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { Link, graphql } from "gatsby";
 
 import Layout from "../components/layout";
diff --git a/src/templates/blog-post.js b/src/templates/blog-post.js
index 7ef4835..81e8896 100644
--- a/src/templates/blog-post.js
+++ b/src/templates/blog-post.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { Link, graphql } from "gatsby";
 
 import Bio from "../components/bio";
diff --git a/src/templates/work-day-information.js b/src/templates/work-day-information.js
index 642b73d..bda3cfe 100644
--- a/src/templates/work-day-information.js
+++ b/src/templates/work-day-information.js
@@ -1,4 +1,3 @@
-import * as React from "react";
 import { Link, graphql } from "gatsby";
 
 import Bio from "../components/bio";