diff --git a/components/core/Layout/Layout.tsx b/components/core/Layout/Layout.tsx
index a9039b1fd..0660e6cc2 100644
--- a/components/core/Layout/Layout.tsx
+++ b/components/core/Layout/Layout.tsx
@@ -1,13 +1,11 @@
 import cn from 'classnames'
 import { FC } from 'react'
-
+import s from './Layout.module.css'
 import { Navbar, Featurebar, Footer } from '@components/core'
 import { Container, Sidebar } from '@components/ui'
 import { CartSidebarView } from '@components/cart'
 import { UIProvider, useUI } from '@components/ui/context'
-import s from './Layout.module.css'
-import { ThemeProvider } from 'next-themes'
-import { SSRProvider, OverlayProvider } from 'react-aria'
+import { CommerceProvider } from '@lib/bigcommerce'
 
 interface Props {
   className?: string
@@ -37,15 +35,11 @@ const CoreLayout: FC<Props> = ({ className, children }) => {
 }
 
 const Layout: FC<Props> = (props) => (
-  <UIProvider>
-    <ThemeProvider>
-      <SSRProvider>
-        <OverlayProvider>
-          <CoreLayout {...props} />
-        </OverlayProvider>
-      </SSRProvider>
-    </ThemeProvider>
-  </UIProvider>
+  <CommerceProvider locale="en-us">
+    <UIProvider>
+      <CoreLayout {...props} />
+    </UIProvider>
+  </CommerceProvider>
 )
 
 export default Layout
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 0339d477f..1ce069d66 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -5,7 +5,8 @@ import 'animate.css'
 import { FC } from 'react'
 import { DefaultSeo } from 'next-seo'
 import type { AppProps } from 'next/app'
-
+import { ThemeProvider } from 'next-themes'
+import { SSRProvider, OverlayProvider } from 'react-aria'
 import config from '../config.json'
 import Head from 'next/head'
 import { CommerceProvider } from '@lib/bigcommerce'
@@ -23,9 +24,15 @@ export default function MyApp({ Component, pageProps }: AppProps) {
       </Head>
       <DefaultSeo {...config.seo} />
       <CommerceProvider locale="en-us">
-        <Layout>
-          <Component {...pageProps} />
-        </Layout>
+        <ThemeProvider>
+          <SSRProvider>
+            <OverlayProvider>
+              <Layout>
+                <Component {...pageProps} />
+              </Layout>
+            </OverlayProvider>
+          </SSRProvider>
+        </ThemeProvider>
       </CommerceProvider>
     </>
   )