diff --git a/src/base/BlankBaseLayout/index.js b/src/base/BlankBaseLayout/index.js
index 3b665165..5c6f5abb 100644
--- a/src/base/BlankBaseLayout/index.js
+++ b/src/base/BlankBaseLayout/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Head from 'next/head';
 import classNames from 'classnames';
 
diff --git a/src/base/DefaultBaseLayout/index.js b/src/base/DefaultBaseLayout/index.js
index 29b5bd59..ce9d58e6 100644
--- a/src/base/DefaultBaseLayout/index.js
+++ b/src/base/DefaultBaseLayout/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Head from 'next/head';
 import classNames from 'classnames';
 import NavBar from '../../components/NavBar';
diff --git a/src/components/Badge/index.js b/src/components/Badge/index.js
index 67f936e5..df9e0ce9 100644
--- a/src/components/Badge/index.js
+++ b/src/components/Badge/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function Badge(props) {
diff --git a/src/components/CheckboxFormControl/index.js b/src/components/CheckboxFormControl/index.js
index ae05ee9e..efe932bb 100644
--- a/src/components/CheckboxFormControl/index.js
+++ b/src/components/CheckboxFormControl/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function CheckboxFormControl(props) {
diff --git a/src/components/ContactSection/index.js b/src/components/ContactSection/index.js
index 260af33e..70dab4e0 100644
--- a/src/components/ContactSection/index.js
+++ b/src/components/ContactSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 import classNames from 'classnames';
 import { getDynamicComponent } from '../../components-registry';
@@ -15,7 +15,7 @@ export default function ContactSection(props) {
     const contentWidth = props.contentWidth || 'large';
     const contentAlignHoriz = props.contentAlignHoriz || 'left';
     const contentAlignVert = props.contentAlignVert || 'middle';
-    
+
     return (
         <div
             id={props.elementId}
diff --git a/src/components/CtaSection/index.js b/src/components/CtaSection/index.js
index f3ee0224..bb9e0f0b 100644
--- a/src/components/CtaSection/index.js
+++ b/src/components/CtaSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 import classNames from 'classnames';
 import Badge from '../Badge';
diff --git a/src/components/EmailFormControl/index.js b/src/components/EmailFormControl/index.js
index f7aa1b9c..3e615a16 100644
--- a/src/components/EmailFormControl/index.js
+++ b/src/components/EmailFormControl/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function EmailFormControl(props) {
diff --git a/src/components/FeaturedPeopleSection/index.js b/src/components/FeaturedPeopleSection/index.js
index 60d72b14..da6bd234 100644
--- a/src/components/FeaturedPeopleSection/index.js
+++ b/src/components/FeaturedPeopleSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 import Markdown from 'markdown-to-jsx';
 import Badge from '../Badge';
diff --git a/src/components/FeaturedPostsSection/index.js b/src/components/FeaturedPostsSection/index.js
index dac1c730..4152030d 100644
--- a/src/components/FeaturedPostsSection/index.js
+++ b/src/components/FeaturedPostsSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 import dayjs from 'dayjs';
 import Badge from '../Badge';
diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
index 9d0f3c65..198f97c0 100644
--- a/src/components/Footer/index.js
+++ b/src/components/Footer/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 import classNames from 'classnames';
 import Action from '../Action';
diff --git a/src/components/HeroSection/index.js b/src/components/HeroSection/index.js
index 80c3462c..a0ccfff2 100644
--- a/src/components/HeroSection/index.js
+++ b/src/components/HeroSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 import classNames from 'classnames';
 import { getDynamicComponent } from '../../components-registry';
diff --git a/src/components/ImageBlock/index.js b/src/components/ImageBlock/index.js
index 6763714f..98cc5447 100644
--- a/src/components/ImageBlock/index.js
+++ b/src/components/ImageBlock/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function ImageBlock(props) {
diff --git a/src/components/InlineMarkdown/index.js b/src/components/InlineMarkdown/index.js
index aa49634d..f6259308 100644
--- a/src/components/InlineMarkdown/index.js
+++ b/src/components/InlineMarkdown/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 
 export default function InlineMarkdown(props) {
diff --git a/src/components/NavBar/index.js b/src/components/NavBar/index.js
index 4b0990af..8bf4e0bc 100644
--- a/src/components/NavBar/index.js
+++ b/src/components/NavBar/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { useState } from 'react';
 import classNames from 'classnames';
 import Action from '../Action';
diff --git a/src/components/QuoteSection/index.js b/src/components/QuoteSection/index.js
index 3398577d..6e35f1ca 100644
--- a/src/components/QuoteSection/index.js
+++ b/src/components/QuoteSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 import classNames from 'classnames';
 
diff --git a/src/components/SelectFormControl/index.js b/src/components/SelectFormControl/index.js
index cae36d9a..8af0a74a 100644
--- a/src/components/SelectFormControl/index.js
+++ b/src/components/SelectFormControl/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function SelectFormControl(props) {
diff --git a/src/components/Social/index.js b/src/components/Social/index.js
index 6142c974..bdb9477b 100644
--- a/src/components/Social/index.js
+++ b/src/components/Social/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 import Link from '../../utils/link';
 import Facebook from '../../svgs/facebook';
diff --git a/src/components/TestimonialsSection/index.js b/src/components/TestimonialsSection/index.js
index ea41c442..b6515a01 100644
--- a/src/components/TestimonialsSection/index.js
+++ b/src/components/TestimonialsSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 import classNames from 'classnames';
 import Badge from '../Badge';
diff --git a/src/components/TextFormControl/index.js b/src/components/TextFormControl/index.js
index 9c53b35a..43f732f8 100644
--- a/src/components/TextFormControl/index.js
+++ b/src/components/TextFormControl/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function TextFormControl(props) {
diff --git a/src/components/TextSection/index.js b/src/components/TextSection/index.js
index 4a753500..2c9a3fd2 100644
--- a/src/components/TextSection/index.js
+++ b/src/components/TextSection/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import Markdown from 'markdown-to-jsx';
 import classNames from 'classnames';
 import Badge from '../Badge';
diff --git a/src/components/TextareaFormControl/index.js b/src/components/TextareaFormControl/index.js
index 6652aa3d..28e679e9 100644
--- a/src/components/TextareaFormControl/index.js
+++ b/src/components/TextareaFormControl/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function TextareaFormControl(props) {
diff --git a/src/components/VideoBlock/index.js b/src/components/VideoBlock/index.js
index beaf86ef..a375580d 100644
--- a/src/components/VideoBlock/index.js
+++ b/src/components/VideoBlock/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import classNames from 'classnames';
 
 export default function VideoBlock(props) {
diff --git a/src/layouts/PageLayout/index.js b/src/layouts/PageLayout/index.js
index 2280c1c0..482501ea 100644
--- a/src/layouts/PageLayout/index.js
+++ b/src/layouts/PageLayout/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import { getDynamicComponent } from '../../components-registry';
 import { getBaseLayoutComponent } from '../../utils/base-layout';
 
diff --git a/src/layouts/PostLayout/index.js b/src/layouts/PostLayout/index.js
index 43867c13..2e6fb679 100644
--- a/src/layouts/PostLayout/index.js
+++ b/src/layouts/PostLayout/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import dayjs from 'dayjs';
 import Markdown from 'markdown-to-jsx';
 import ImageBlock from '../../components/ImageBlock';
diff --git a/src/utils/link.js b/src/utils/link.js
index 13cf2d3d..d6c45c73 100644
--- a/src/utils/link.js
+++ b/src/utils/link.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import NextLink from 'next/link';
 
 export default function Link({ children, href, ...other }) {
diff --git a/src/utils/next-link.js b/src/utils/next-link.js
index e8658ba7..e82c6bb4 100644
--- a/src/utils/next-link.js
+++ b/src/utils/next-link.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 
 // Simulate next/link behavior
 export default function Link(props) {