diff --git a/components/core/Layout/Layout.tsx b/components/core/Layout/Layout.tsx
index 0660e6cc2..e3d0e02b8 100644
--- a/components/core/Layout/Layout.tsx
+++ b/components/core/Layout/Layout.tsx
@@ -6,7 +6,8 @@ import { Container, Sidebar } from '@components/ui'
 import { CartSidebarView } from '@components/cart'
 import { UIProvider, useUI } from '@components/ui/context'
 import { CommerceProvider } from '@lib/bigcommerce'
-
+import { ThemeProvider } from 'next-themes'
+import { SSRProvider, OverlayProvider } from 'react-aria'
 interface Props {
   className?: string
   children?: any
@@ -35,11 +36,15 @@ const CoreLayout: FC<Props> = ({ className, children }) => {
 }
 
 const Layout: FC<Props> = (props) => (
-  <CommerceProvider locale="en-us">
-    <UIProvider>
-      <CoreLayout {...props} />
-    </UIProvider>
-  </CommerceProvider>
+  <ThemeProvider>
+    <SSRProvider>
+      <OverlayProvider>
+        <UIProvider>
+          <CoreLayout {...props} />
+        </UIProvider>
+      </OverlayProvider>
+    </SSRProvider>
+  </ThemeProvider>
 )
 
 export default Layout
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 1ce069d66..0339d477f 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -5,8 +5,7 @@ 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'
@@ -24,15 +23,9 @@ export default function MyApp({ Component, pageProps }: AppProps) {
       </Head>
       <DefaultSeo {...config.seo} />
       <CommerceProvider locale="en-us">
-        <ThemeProvider>
-          <SSRProvider>
-            <OverlayProvider>
-              <Layout>
-                <Component {...pageProps} />
-              </Layout>
-            </OverlayProvider>
-          </SSRProvider>
-        </ThemeProvider>
+        <Layout>
+          <Component {...pageProps} />
+        </Layout>
       </CommerceProvider>
     </>
   )