diff --git a/app/[locale]/[...uriSegments]/page.tsx b/app/[locale]/[...uriSegments]/page.tsx
new file mode 100644
index 00000000..8cd55db8
--- /dev/null
+++ b/app/[locale]/[...uriSegments]/page.tsx
@@ -0,0 +1,176 @@
+import { FunctionComponent } from "react";
+import { Metadata, ResolvingMetadata } from "next";
+import { draftMode } from "next/headers";
+import { notFound, redirect } from "next/navigation";
+import { OpenGraph } from "next/dist/lib/metadata/types/opengraph-types";
+import striptags from "striptags";
+import { getBreadcrumbsById, getEntryMetadataByUri } from "@/lib/api/metadata";
+import {
+  getEntriesByLocale,
+  getEntrySectionByUri,
+} from "@/lib/api/entries/index";
+import { getEntryDataByUri } from "@/lib/api/entry";
+import { getReleaseOpenGraph } from "@/lib/api/noirlab";
+import { resizeCantoImage } from "@/lib/api/canto/resize";
+import PageTemplate from "@/components/templates/Page";
+import NewsPageTemplate from "@/components/templates/NewsPage";
+import GlossaryPageTemplate from "@/components/templates/GlossaryPage";
+import SearchPageTemplate from "@/components/templates/SearchPage";
+import SlideshowPageTemplate from "@/components/templates/SlideshowPage";
+import StaffPageTemplate from "@/components/templates/StaffPage";
+import EventPageTemplate from "@/components/templates/EventPage";
+
+const pickFeaturedImage = async (
+  locale: string,
+  image?: any,
+  cantoAsset?: any,
+  pressReleaseId?: string
+): Promise<OpenGraph["images"] | undefined> => {
+  if (pressReleaseId) {
+    const releaseOpenGraphImage = await getReleaseOpenGraph(
+      locale,
+      pressReleaseId
+    );
+
+    return releaseOpenGraphImage;
+  }
+
+  if (cantoAsset) {
+    const {
+      width,
+      height,
+      url: { directUrlPreview },
+    } = cantoAsset;
+    const url = resizeCantoImage(directUrlPreview, 800);
+
+    return { url, width, height };
+  }
+
+  if (image) {
+    const { url, width, height, altText: alt } = image;
+
+    return { url, width, height, alt };
+  }
+};
+
+export async function generateMetadata(
+  { params: { locale, uriSegments }, searchParams = {} }: UriSegmentProps,
+  parent: ResolvingMetadata
+): Promise<Metadata> {
+  const uri = uriSegments.join("/");
+  let previewToken: string | undefined;
+
+  if (draftMode().isEnabled) {
+    previewToken = Array.isArray(searchParams.preview)
+      ? searchParams.preview[0]
+      : searchParams?.preview;
+  }
+
+  const { entry } = await getEntryMetadataByUri(uri, locale, previewToken);
+
+  if (!entry) {
+    notFound();
+  }
+
+  const {
+    title,
+    description,
+    image = [],
+    cantoAssetSingle = [],
+    pressReleaseId,
+  } = entry;
+
+  const featuredImage = await pickFeaturedImage(
+    locale,
+    image[0],
+    cantoAssetSingle[0],
+    pressReleaseId
+  );
+  const previousImages = (await parent).openGraph?.images || [];
+
+  return {
+    title,
+    description: striptags(description),
+    openGraph: {
+      images: featuredImage || previousImages,
+    },
+  };
+}
+
+export async function generateStaticParams({
+  params: { locale },
+}: LocaleProps) {
+  const data = await getEntriesByLocale(locale);
+
+  return data.entries.map(({ uri }) => {
+    return {
+      locale,
+      uriSegments: uri.split("/"),
+    };
+  });
+}
+
+const sectionMap = {
+  events: EventPageTemplate,
+  // galleryItems: GalleryPageTemplate,
+  glossaryTerms: GlossaryPageTemplate,
+  news: NewsPageTemplate,
+  searchResults: SearchPageTemplate,
+  slideshows: SlideshowPageTemplate,
+  staffProfiles: StaffPageTemplate,
+  // userProfilePage: UserProfilePageTemplate,
+};
+
+const UriSegmentsPage: FunctionComponent<UriSegmentProps> = async ({
+  params: { locale, uriSegments },
+  searchParams,
+}) => {
+  const uri = uriSegments.join("/");
+  let previewToken: string | undefined;
+
+  if (draftMode().isEnabled) {
+    previewToken = Array.isArray(searchParams.preview)
+      ? searchParams.preview[0]
+      : searchParams?.preview;
+  }
+
+  const entrySectionType = await getEntrySectionByUri(
+    uri,
+    locale,
+    previewToken
+  );
+
+  // Handle 404 if there is no data
+  if (!entrySectionType) {
+    notFound();
+  }
+
+  const { sectionHandle: section, typeHandle: type } = entrySectionType;
+  const data = await getEntryDataByUri(
+    uri,
+    section,
+    type,
+    locale,
+    previewToken
+  );
+
+  // Handle redirect if the entry has one
+  if (data?.typeHandle === "redirectPage" && data?.linkTo?.url) {
+    redirect(data.linkTo.url, "replace");
+  }
+
+  const currentId = data?.id || data?.entry?.id;
+
+  // Handle 404 if there is no data
+  if (!currentId) {
+    notFound();
+  }
+
+  const breadcrumbs = await getBreadcrumbsById(parseInt(currentId), locale);
+
+  const Template = sectionMap[section] || PageTemplate;
+
+  return <Template {...{ section, breadcrumbs, data, previewToken, locale }} />;
+};
+
+export default UriSegmentsPage;
diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx
index ea09fb79..d4a236a1 100644
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -49,8 +49,6 @@ export const generateStaticParams = () => {
   });
 };
 
-export const dynamicParams = false;
-
 const LocaleLayout: FunctionComponent<PropsWithChildren<LocaleProps>> = async ({
   params: { locale },
   children,
diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
index 6ca1276b..d4d1c3d3 100644
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -1,10 +1,9 @@
 import { FunctionComponent } from "react";
+import { Metadata } from "next";
 import { notFound } from "next/navigation";
 import { draftMode } from "next/headers";
-import { purgeNextjsStaticFiles } from "@/lib/purgeStaticFiles";
-import HomePageTemplate from "@/templates/HomePage";
-import { Metadata } from "next";
 import { getHomepage, getHomepageMetadata } from "@/lib/api/homepage";
+import HomePageTemplate from "@/templates/HomePage";
 
 export async function generateMetadata({
   params: { locale },
@@ -41,7 +40,6 @@ const RootPage: FunctionComponent<LocaleProps> = async ({
 
   // Handle 404 if there is no data
   if (!data?.id) {
-    await purgeNextjsStaticFiles(locale);
     notFound();
   }
 
diff --git a/app/api/app-revalidate/route.ts b/app/api/app-revalidate/route.ts
index ffb2890f..80033c4a 100644
--- a/app/api/app-revalidate/route.ts
+++ b/app/api/app-revalidate/route.ts
@@ -1,7 +1,10 @@
-import { revalidatePath } from "next/cache";
+import tags from "@/lib/api/client/tags";
+import { fallbackLng, languages } from "@/lib/i18n/settings";
+import { revalidatePath, revalidateTag } from "next/cache";
 import { NextRequest, NextResponse } from "next/server";
 
 const REVALIDATE_SECRET_TOKEN = process.env.CRAFT_REVALIDATE_SECRET_TOKEN;
+const CRAFT_HOMEPAGE_URI = "__home__";
 
 export async function GET(request: NextRequest): Promise<NextResponse> {
   const uri = request.nextUrl.searchParams.get("uri");
@@ -24,7 +27,16 @@ export async function GET(request: NextRequest): Promise<NextResponse> {
   }
 
   if (uri) {
-    revalidatePath(`/[locale]/${uri}`, "page");
+    languages.forEach((locale) => {
+      const parts: Array<string> = uri === CRAFT_HOMEPAGE_URI ? [] : [uri];
+      if (locale !== fallbackLng) {
+        parts.unshift(locale);
+      }
+
+      revalidatePath(`/${parts.join("/")}`);
+    });
+
+    revalidateTag(tags.globals);
 
     return NextResponse.json({ revalidated: true, now: Date.now() });
   }
diff --git a/app/error.tsx b/app/error.tsx
new file mode 100644
index 00000000..86592a65
--- /dev/null
+++ b/app/error.tsx
@@ -0,0 +1,16 @@
+"use client";
+import { FunctionComponent } from "react";
+
+import Error from "@/components/organisms/Error";
+const GlobalError: FunctionComponent<ErrorProps> = ({ error }) => {
+  return (
+    <html lang="en">
+      <head></head>
+      <body>
+        <Error title={"Error"} message={error.message} />
+      </body>
+    </html>
+  );
+};
+
+export default GlobalError;
diff --git a/components/global/Body/index.js b/components/global/Body/index.js
deleted file mode 100644
index c98b0593..00000000
--- a/components/global/Body/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import PropTypes from "prop-types";
-import styled from "styled-components";
-import GlobalDataContext from "@/contexts/GlobalData";
-import HtmlHead from "@/global/HtmlHead";
-import Header from "@/global/Header";
-import Footer from "@/global/Footer";
-import imageShape from "@/shapes/image";
-
-export default function Body({ children, description, openGraphImage, title }) {
-  return (
-    <GlobalDataContext.Consumer>
-      {({
-        siteInfo,
-        headerNavItems,
-        userProfilePage,
-        footerContent,
-        contactForm,
-        localeInfo: { locale },
-      }) => {
-        const {
-          siteTitle,
-          siteDescription,
-          siteImage,
-          contactInfo,
-          handle,
-          language,
-          name,
-          ...socialInfo
-        } = siteInfo;
-
-        return (
-          <>
-            <HtmlHead {...{ title, description, openGraphImage, siteInfo }} />
-            <WideWidthContainer>
-              <Header
-                navItems={headerNavItems}
-                userProfilePage={userProfilePage}
-                locale={locale}
-              />
-              <main id="page-content">{children}</main>
-              <Footer
-                socialInfo={socialInfo}
-                content={footerContent}
-                contactForm={contactForm}
-              />
-            </WideWidthContainer>
-          </>
-        );
-      }}
-    </GlobalDataContext.Consumer>
-  );
-}
-
-const WideWidthContainer = styled.div`
-  max-width: 2000px;
-  width: 100%;
-  margin-left: auto;
-  margin-right: auto;
-`;
-Body.displayName = "Global.Body";
-
-Body.propTypes = {
-  children: PropTypes.node,
-  description: PropTypes.string,
-  openGraphImage: PropTypes.arrayOf(imageShape),
-  title: PropTypes.string.isRequired,
-};
diff --git a/components/global/HtmlHead/index.js b/components/global/HtmlHead/index.js
deleted file mode 100644
index 95123e42..00000000
--- a/components/global/HtmlHead/index.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Fragment } from "react";
-import PropTypes from "prop-types";
-import Head from "next/head";
-import { supportedTypes, titleFromEntryType } from "@/lib/api/feeds";
-import siteInfoShape from "@/shapes/siteInfo";
-import imageShape from "@/shapes/image";
-export default function HtmlHead({
-  title,
-  description,
-  openGraphImage,
-  siteInfo: { siteTitle, siteDescription, siteImage },
-  children,
-}) {
-  const image = openGraphImage?.[0] ? openGraphImage[0] : siteImage?.[0];
-  return (
-    <Head>
-      <title>{`${title} | ${siteTitle}`}</title>
-      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <meta name="description" content={description || siteDescription} />
-      <meta name="og:url" content="" />
-      <meta name="og:type" content="article" />
-      <meta name="og:title" content={title} />
-      <meta name="og:description" content={description || siteDescription} />
-      <meta name="twitter:title" content={title} />
-      <meta name="twitter:card" content="summary" />
-      {image?.url && (
-        <>
-          <meta name="og:image" content={image.url} />
-          {image.altText && (
-            <meta name="og:image:alt" content={image.altText} />
-          )}
-          <meta name="twitter:image" content={image.url} />
-          {image.altText && (
-            <meta name="twitter:image:alt" content={image.altText} />
-          )}
-        </>
-      )}
-      <link
-        rel="apple-touch-icon"
-        sizes="180x180"
-        href="/apple-touch-icon.png"
-      />
-      <link
-        rel="icon"
-        type="image/png"
-        sizes="32x32"
-        href="/favicon-32x32.png"
-      />
-      <link
-        rel="icon"
-        type="image/png"
-        sizes="16x16"
-        href="/favicon-16x16.png"
-      />
-      <link rel="manifest" href="/site.webmanifest" />
-      <link
-        rel="alternate"
-        type="application/rss+xml"
-        title={`${siteTitle} RSS Feed`}
-        href="/feeds/feed.xml"
-      />
-      <link
-        rel="alternate"
-        type="application/atom+xml"
-        title={`${siteTitle} Atom Feed`}
-        href="/feeds/atom.xml"
-      />
-      <link
-        rel="alternate"
-        type="application/json"
-        title={`${siteTitle} JSON Feed`}
-        href="/feeds/feed.json"
-      />
-      {supportedTypes.map((entryType) => (
-        <Fragment key={entryType}>
-          <link
-            rel="alternate"
-            type="application/rss+xml"
-            title={`${siteTitle} RSS Feed — ${titleFromEntryType(entryType)}`}
-            href={`/feeds/${entryType}/feed.xml`}
-          />
-          <link
-            rel="alternate"
-            type="application/atom+xml"
-            title={`${siteTitle} Atom Feed — ${titleFromEntryType(entryType)}`}
-            href={`/feeds/${entryType}/atom.xml`}
-          />
-          <link
-            rel="alternate"
-            type="application/json"
-            title={`${siteTitle} JSON Feed — ${titleFromEntryType(entryType)}`}
-            href={`/feeds/${entryType}/feed.json`}
-          />
-        </Fragment>
-      ))}
-      {children}
-    </Head>
-  );
-}
-
-HtmlHead.displayName = "Global.HtmlHead";
-
-HtmlHead.propTypes = {
-  siteInfo: siteInfoShape,
-  title: PropTypes.string,
-  description: PropTypes.string,
-  openGraphImage: PropTypes.arrayOf(imageShape),
-  children: PropTypes.node,
-};
diff --git a/components/templates/ErrorPage/index.js b/components/templates/ErrorPage/index.js
deleted file mode 100644
index e874d231..00000000
--- a/components/templates/ErrorPage/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import PropTypes from "prop-types";
-import { Container } from "@rubin-epo/epo-react-lib";
-import Body from "@/global/Body";
-
-export default function ErrorPageTemplate({ data: { id, title, text, uri } }) {
-  return (
-    <Body title={title}>
-      <Container>
-        <h1>{title}</h1>
-        <div
-          className="c-content-rte"
-          dangerouslySetInnerHTML={{ __html: text }}
-        />
-      </Container>
-    </Body>
-  );
-}
-
-ErrorPageTemplate.propTypes = {
-  data: PropTypes.object,
-};
diff --git a/components/templates/EventPage/index.js b/components/templates/EventPage/index.js
index 87affcdd..2225e213 100644
--- a/components/templates/EventPage/index.js
+++ b/components/templates/EventPage/index.js
@@ -1,3 +1,4 @@
+"use client";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import {
@@ -5,7 +6,6 @@ import {
   createLocationString,
   useCustomBreadcrumbs,
 } from "@/lib/utils";
-import Body from "@/global/Body";
 import Hero from "@/page/Hero";
 import ContentBlockFactory from "@/factories/ContentBlockFactory";
 import { Share } from "@/content-blocks";
@@ -28,7 +28,6 @@ export default function EventPage({
     endTime,
     description,
     eventType = [],
-    openGraphImage = [],
     hero = [],
     focalPointX,
     focalPointY,
@@ -43,11 +42,7 @@ export default function EventPage({
   const { t } = useTranslation();
   const customBreadcrumbs = useCustomBreadcrumbs("Events");
   const rootHomeLink = customBreadcrumbs.slice(-1)[0];
-  const bodyProps = {
-    description,
-    openGraphImage,
-    title,
-  };
+
   const pageLink = {
     id,
     uri,
@@ -69,7 +64,7 @@ export default function EventPage({
     : "closed";
 
   return (
-    <Body {...bodyProps}>
+    <>
       <Breadcrumbs breadcrumbs={[...customBreadcrumbs, pageLink]} />
       <Hero data={hero} {...{ focalPointX, focalPointY }} />
       <Container paddingSize="medium">
@@ -129,7 +124,7 @@ export default function EventPage({
         isWide
         isRelatedList
       />
-    </Body>
+    </>
   );
 }
 
diff --git a/components/templates/GalleryPage/index.js b/components/templates/GalleryPage/index.js
index c3525042..9b5b9a71 100644
--- a/components/templates/GalleryPage/index.js
+++ b/components/templates/GalleryPage/index.js
@@ -3,14 +3,12 @@ import React from "react";
 import PropTypes from "prop-types";
 import styled from "styled-components";
 import Link from "next/link";
-import striptags from "striptags";
 import { useTranslation } from "react-i18next";
 import {
   createLocationString,
   useCustomBreadcrumbs,
   useDateString,
 } from "@/lib/utils";
-import Body from "@/global/Body";
 import Breadcrumbs from "@/page/Breadcrumbs";
 import {
   Container,
@@ -51,11 +49,6 @@ export default function GalleryPage({
   },
 }) {
   const { t } = useTranslation();
-  const bodyProps = {
-    description: striptags(richTextDescription),
-    openGraphImage,
-    title,
-  };
 
   const customBreadcrumbs = useCustomBreadcrumbs("Gallery");
 
@@ -148,7 +141,7 @@ export default function GalleryPage({
   );
 
   return (
-    <Body {...bodyProps}>
+    <>
       <Breadcrumbs breadcrumbs={[...customBreadcrumbs, pageLink]} />
       <Container width="regular">
         <h1>{title}</h1>
@@ -254,7 +247,7 @@ export default function GalleryPage({
           isBlock={true}
         />
       </Container>
-    </Body>
+    </>
   );
 }
 
diff --git a/components/templates/GlossaryPage/index.js b/components/templates/GlossaryPage/index.js
index 53ee253e..e127e10b 100644
--- a/components/templates/GlossaryPage/index.js
+++ b/components/templates/GlossaryPage/index.js
@@ -1,5 +1,5 @@
+"use client";
 import PropTypes from "prop-types";
-import Body from "@/global/Body";
 import Breadcrumbs from "@/page/Breadcrumbs";
 import { useCustomBreadcrumbs, imageShaper } from "@/lib/utils";
 import {
@@ -13,7 +13,7 @@ import { useTranslation } from "react-i18next";
 export default function GlossaryPage({ data }) {
   const { t } = useTranslation();
 
-  const { id, title, description, uri, text, cantoAssetSingle, caption } = data;
+  const { id, title, uri, text, cantoAssetSingle } = data;
 
   const customBreadcrumbs = useCustomBreadcrumbs("Glossary");
 
@@ -23,12 +23,6 @@ export default function GlossaryPage({ data }) {
 
   const image = imageShaper("EN", cantoAssetSingle[0]);
 
-  const bodyProps = {
-    description,
-    openGraphImage: image,
-    title,
-  };
-
   const pageLink = {
     id,
     uri,
@@ -36,7 +30,7 @@ export default function GlossaryPage({ data }) {
   };
 
   return (
-    <Body {...bodyProps}>
+    <>
       <Breadcrumbs breadcrumbs={[...customBreadcrumbs, pageLink]} />
       <Container width="narrow">
         <h1>{title}</h1>
@@ -56,7 +50,7 @@ export default function GlossaryPage({ data }) {
           />
         )}
       </Container>
-    </Body>
+    </>
   );
 }
 
diff --git a/components/templates/NewsPage/index.js b/components/templates/NewsPage/index.js
index fe298ca9..92021ed2 100644
--- a/components/templates/NewsPage/index.js
+++ b/components/templates/NewsPage/index.js
@@ -1,3 +1,4 @@
+"use client";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import {
@@ -6,7 +7,6 @@ import {
   makeReleaseFeature,
 } from "@/lib/utils";
 import { useRelease } from "@/lib/api/noirlabReleases";
-import Body from "@/global/Body";
 import Breadcrumbs from "@/page/Breadcrumbs";
 import NewsHero from "./NewsHero";
 import NewsArticle from "./NewsArticle";
@@ -21,8 +21,6 @@ export default function NewsPage({ data }) {
   );
   const {
     contentBlocksNews = [],
-    description,
-    headline,
     hero = [],
     focalPointX,
     focalPointY,
@@ -32,7 +30,6 @@ export default function NewsPage({ data }) {
     postTags,
     title,
     uri,
-    openGraphImage,
     images: releaseImages,
     videos: releaseVideos,
   } = entryWithRelease || data;
@@ -41,14 +38,7 @@ export default function NewsPage({ data }) {
     hero?.length > 0 ? hero : makeReleaseFeature(releaseImages, "banner1920");
 
   const { t } = useTranslation();
-  const bodyProps = {
-    description: description || headline,
-    openGraphImage:
-      openGraphImage?.length > 0
-        ? openGraphImage
-        : makeReleaseFeature(releaseImages, "screen640"),
-    title,
-  };
+
   const customBreadcrumbs = useCustomBreadcrumbs("News");
   const rootHomeLink = customBreadcrumbs.slice(-1)[0];
   const pageLink = {
@@ -95,7 +85,7 @@ export default function NewsPage({ data }) {
     postTags?.length > 0;
 
   return (
-    <Body {...bodyProps}>
+    <>
       <Breadcrumbs breadcrumbs={[...customBreadcrumbs, pageLink]} />
       <NewsHero
         caption={heroCaption}
@@ -130,7 +120,7 @@ export default function NewsPage({ data }) {
         gridType="pages"
         isRelatedList
       />
-    </Body>
+    </>
   );
 }
 
diff --git a/components/templates/Page/index.js b/components/templates/Page/index.js
index 74e30345..89570861 100644
--- a/components/templates/Page/index.js
+++ b/components/templates/Page/index.js
@@ -1,8 +1,8 @@
+"use client";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import internalLinkShape from "@/shapes/link";
 import pageShape from "@/shapes/page";
-import Body from "@/global/Body";
 import ContentBlockFactory from "@/factories/ContentBlockFactory";
 import DynamicComponentFactory from "@/factories/DynamicComponentFactory";
 import { Container } from "@rubin-epo/epo-react-lib";
@@ -26,7 +26,6 @@ import useQueryParams from "@/lib/routing/useQueryParams";
 export default function Page({
   data: {
     contentBlocks = [],
-    description,
     dynamicComponent,
     eventFilter = [],
     hero,
@@ -42,7 +41,6 @@ export default function Page({
     subHeroHeader,
     subHeroText,
     subHeroColorScheme,
-    openGraphImage,
     parent,
     showGuideNav,
     showSidebar,
@@ -57,11 +55,7 @@ export default function Page({
   children,
 }) {
   const { t } = useTranslation();
-  const bodyProps = {
-    description,
-    openGraphImage,
-    title,
-  };
+
   const pageLink = {
     id,
     uri,
@@ -113,108 +107,102 @@ export default function Page({
   };
 
   return (
-    <Body {...bodyProps}>
-      <AuthorizePage typeHandle={typeHandle}>
-        {breadcrumbs && (
-          <Breadcrumbs breadcrumbs={[...breadcrumbs, pageLink]} />
-        )}
-        {investigation && <InvestigationHero investigation={investigation} />}
-        {showSiblingNav && (
-          <GuideNavigation
-            title={parent.title}
-            pages={parent.children}
-            currentUri={uri}
-          />
-        )}
-        <ChildNavigation
-          title={childNavigationTitle}
-          description={childNavigationDescription}
-          pages={childNavigation}
+    <AuthorizePage typeHandle={typeHandle}>
+      {breadcrumbs && <Breadcrumbs breadcrumbs={[...breadcrumbs, pageLink]} />}
+      {investigation && <InvestigationHero investigation={investigation} />}
+      {showSiblingNav && (
+        <GuideNavigation
+          title={parent.title}
+          pages={parent.children}
+          currentUri={uri}
+        />
+      )}
+      <ChildNavigation
+        title={childNavigationTitle}
+        description={childNavigationDescription}
+        pages={childNavigation}
+      />
+      {isGalleryHome && (
+        <SlideBlock
+          section="slideshows"
+          header={t(`gallery.curated-slideshows`)}
+          mixedLink={{
+            url: "/gallery/slideshows",
+            text: t(`gallery.see-all`),
+          }}
+          truncate={50}
         />
-        {isGalleryHome && (
-          <SlideBlock
-            section="slideshows"
-            header={t(`gallery.curated-slideshows`)}
-            mixedLink={{
-              url: "/gallery/slideshows",
-              text: t(`gallery.see-all`),
-            }}
-            truncate={50}
+      )}
+      <FilterParamsProvider {...{ serverParams }}>
+        {hasFilterbar && <FilterBar filterType={dynamicComponent} />}
+        <PageContent
+          heroImage={!showSiblingNav && hero}
+          overlapHero={showSiblingNav ? false : shouldOverlapHero}
+          sidebar={
+            showSidebar && (
+              <MediaAside
+                manualAssets={sidebarAssets}
+                contentBlockAssets={contentBlocks}
+              />
+            )
+          }
+          {...{ focalPointX, focalPointY }}
+        >
+          <SubHero
+            type={typeHandle}
+            header={subHeroHeader}
+            text={subHeroText}
+            colorScheme={subHeroColorScheme}
+            nested={shouldOverlapHero}
           />
-        )}
-        <FilterParamsProvider {...{ serverParams }}>
-          {hasFilterbar && <FilterBar filterType={dynamicComponent} />}
-          <PageContent
-            heroImage={!showSiblingNav && hero}
-            overlapHero={showSiblingNav ? false : shouldOverlapHero}
-            sidebar={
-              showSidebar && (
-                <MediaAside
-                  manualAssets={sidebarAssets}
-                  contentBlockAssets={contentBlocks}
-                />
-              )
-            }
-            {...{ focalPointX, focalPointY }}
-          >
-            <SubHero
-              type={typeHandle}
-              header={subHeroHeader}
-              text={subHeroText}
-              colorScheme={subHeroColorScheme}
-              nested={shouldOverlapHero}
-            />
-            <NestedContext.Provider value={shouldOverlapHero}>
-              {!hideTitle && (
-                <Container
-                  bgColor="white"
-                  className="c-page-header"
-                  width={isWideHeader ? "regular" : "narrow"}
-                  paddingSize={isMediumPadding ? "medium" : undefined}
-                >
-                  <h1>{title}</h1>
-                  {isEventsPage && (
-                    <NavButtons
-                      linkLeft="upcoming"
-                      linkRight="past"
-                      textLeft={t(`events.upcoming`)}
-                      textRight={t(`events.past`)}
-                    />
-                  )}
-                </Container>
-              )}
-              {contentBlocks.length > 0 &&
-                [...contentBlocks].map((block) => {
-                  if (!block.id || !block.typeHandle) return null;
-                  return (
-                    <ContentBlockFactory
-                      key={block.id}
-                      type={block.typeHandle}
-                      data={block}
-                      pageId={id}
-                    />
-                  );
-                })}
-              {pageType === "dynamic" && dynamicComponent && (
-                <DynamicComponentFactory
-                  componentType={dynamicComponent}
-                  pageId={id}
-                />
-              )}
-              {children}
-              {showSiblingNav && (
-                <SiblingNavigation
-                  siblings={siblings}
-                  parent={
-                    investigation ? investigation.landingPage?.[0] : parent
-                  }
-                />
-              )}
-            </NestedContext.Provider>
-          </PageContent>
-        </FilterParamsProvider>
-      </AuthorizePage>
-    </Body>
+          <NestedContext.Provider value={shouldOverlapHero}>
+            {!hideTitle && (
+              <Container
+                bgColor="white"
+                className="c-page-header"
+                width={isWideHeader ? "regular" : "narrow"}
+                paddingSize={isMediumPadding ? "medium" : undefined}
+              >
+                <h1>{title}</h1>
+                {isEventsPage && (
+                  <NavButtons
+                    linkLeft="upcoming"
+                    linkRight="past"
+                    textLeft={t(`events.upcoming`)}
+                    textRight={t(`events.past`)}
+                  />
+                )}
+              </Container>
+            )}
+            {contentBlocks.length > 0 &&
+              [...contentBlocks].map((block) => {
+                if (!block.id || !block.typeHandle) return null;
+                return (
+                  <ContentBlockFactory
+                    key={block.id}
+                    type={block.typeHandle}
+                    data={block}
+                    pageId={id}
+                  />
+                );
+              })}
+            {pageType === "dynamic" && dynamicComponent && (
+              <DynamicComponentFactory
+                componentType={dynamicComponent}
+                pageId={id}
+              />
+            )}
+            {children}
+            {showSiblingNav && (
+              <SiblingNavigation
+                siblings={siblings}
+                parent={investigation ? investigation.landingPage?.[0] : parent}
+              />
+            )}
+          </NestedContext.Provider>
+        </PageContent>
+      </FilterParamsProvider>
+    </AuthorizePage>
   );
 }
 
diff --git a/components/templates/SearchPage/index.js b/components/templates/SearchPage/index.js
index 58f74b00..9b806d67 100644
--- a/components/templates/SearchPage/index.js
+++ b/components/templates/SearchPage/index.js
@@ -1,6 +1,6 @@
+"use client";
 import PropTypes from "prop-types";
 import styled from "styled-components";
-import Body from "@/global/Body";
 import Breadcrumbs from "@/components/page/Breadcrumbs";
 import { Container } from "@rubin-epo/epo-react-lib";
 import DynamicComponentFactory from "@/components/factories/DynamicComponentFactory";
@@ -12,10 +12,6 @@ import useQueryParams from "@/lib/routing/useQueryParams";
 export default function SearchPage({
   data: { description, dynamicComponent, id, title, uri },
 }) {
-  const bodyProps = {
-    description,
-    title,
-  };
   const pageLink = {
     id,
     uri,
@@ -28,7 +24,7 @@ export default function SearchPage({
     search.replace("+", " ").replace(/(^|\s)\S/g, (t) => t.toUpperCase());
 
   return (
-    <Body {...bodyProps}>
+    <>
       <Breadcrumbs breadcrumbs={[pageLink]} />
       <FilterParamsProvider>
         <FilterBar filterType={dynamicComponent} />
@@ -46,7 +42,7 @@ export default function SearchPage({
           />
         )}
       </FilterParamsProvider>
-    </Body>
+    </>
   );
 }
 
diff --git a/components/templates/SlideshowPage/index.js b/components/templates/SlideshowPage/client.js
similarity index 94%
rename from components/templates/SlideshowPage/index.js
rename to components/templates/SlideshowPage/client.js
index 7fe5e15d..f0e90f0e 100644
--- a/components/templates/SlideshowPage/index.js
+++ b/components/templates/SlideshowPage/client.js
@@ -1,10 +1,9 @@
+"use client";
 import React from "react";
 import PropTypes from "prop-types";
 import styled from "styled-components";
-import striptags from "striptags";
 import { useTranslation } from "react-i18next";
 import { useCustomBreadcrumbs } from "@/lib/utils";
-import Body from "@/global/Body";
 import Breadcrumbs from "@/page/Breadcrumbs";
 import {
   CarouselLayout as Carousel,
@@ -20,11 +19,6 @@ export default function SlideshowPage({
   },
 }) {
   const { t } = useTranslation();
-  const bodyProps = {
-    description: striptags(description),
-    openGraphImage,
-    title,
-  };
 
   const customBreadcrumbs = useCustomBreadcrumbs("Slideshows");
   const rootHomeLink = customBreadcrumbs.slice(-1)[0];
@@ -46,7 +40,7 @@ export default function SlideshowPage({
   ];
 
   return (
-    <Body {...bodyProps}>
+    <>
       <Breadcrumbs breadcrumbs={[...customBreadcrumbs, pageLink]} />
       <h1 className="a-hidden">{title}</h1>
       <Modalish>
@@ -82,7 +76,7 @@ export default function SlideshowPage({
           isBlock={true}
         />
       </Container>
-    </Body>
+    </>
   );
 }
 
diff --git a/components/templates/SlideshowPage/index.tsx b/components/templates/SlideshowPage/index.tsx
new file mode 100644
index 00000000..a6370439
--- /dev/null
+++ b/components/templates/SlideshowPage/index.tsx
@@ -0,0 +1,16 @@
+import { FunctionComponent } from "react";
+import { getSlideshowDataByUri } from "@/lib/api/slideshows";
+import SlideshowPageClient from "./client";
+
+const SlideshowPage: FunctionComponent<{
+  section: string;
+  data: PageEntry;
+  locale: string;
+  previewToken?: string;
+}> = async ({ data: { uri }, section, locale, previewToken }) => {
+  const data = await getSlideshowDataByUri(uri, locale, previewToken);
+
+  return <SlideshowPageClient {...{ data, section }} />;
+};
+
+export default SlideshowPage;
diff --git a/components/templates/StaffPage/index.js b/components/templates/StaffPage/index.js
index 77940d90..ef897435 100644
--- a/components/templates/StaffPage/index.js
+++ b/components/templates/StaffPage/index.js
@@ -1,7 +1,7 @@
+"use client";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import { useGlobalData } from "@/lib/utils";
-import Body from "@/global/Body";
 import { Share } from "@/content-blocks";
 import StaffList from "@/dynamic/StaffList";
 import ContentBlockFactory from "@/factories/ContentBlockFactory";
@@ -26,7 +26,6 @@ function getParentEntry(rootPages) {
 
 export default function StaffPage({
   data: {
-    openGraphImage = [],
     id,
     uri,
     title,
@@ -42,10 +41,7 @@ export default function StaffPage({
   const rootPages = useGlobalData("rootPages");
   const parentUri = getParentUri(uri);
   const parentEntry = getParentEntry(rootPages);
-  const bodyProps = {
-    openGraphImage,
-    title,
-  };
+
   const pageLink = {
     id,
     uri,
@@ -54,7 +50,7 @@ export default function StaffPage({
   const breadcrumbs = [parentEntry, pageLink].filter(Boolean);
 
   return (
-    <Body {...bodyProps}>
+    <>
       <Breadcrumbs breadcrumbs={breadcrumbs} />
       <PageContent
         overlapHero={!!heroImage?.length}
@@ -119,7 +115,7 @@ export default function StaffPage({
             })}
         </NestedContext.Provider>
       </PageContent>
-    </Body>
+    </>
   );
 }
 
diff --git a/components/templates/UserProfilePage/index.js b/components/templates/UserProfilePage/index.js
index ec511621..07027fb3 100644
--- a/components/templates/UserProfilePage/index.js
+++ b/components/templates/UserProfilePage/index.js
@@ -1,7 +1,7 @@
+"use client";
 import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useTranslation, Trans } from "react-i18next";
-import Body from "@/global/Body";
 import { useIsMounted } from "@/hooks";
 import AuthorizePage from "@/components/auth/AuthorizePage";
 import { useAuthenticationContext } from "@/contexts/Authentication";
@@ -62,7 +62,7 @@ function UserProfilePageTemplate({
   }
 
   return (
-    <Body title={title}>
+    <>
       <AuthorizePage typeHandle={typeHandle}>
         <Container>
           <Styled.Header>
@@ -144,7 +144,7 @@ function UserProfilePageTemplate({
           onClose={() => setShowModal(null)}
         />
       )}
-    </Body>
+    </>
   );
 }
 
diff --git a/hooks/useAuthModal.js b/hooks/useAuthModal.js
index 86fa5afc..2bd554ba 100644
--- a/hooks/useAuthModal.js
+++ b/hooks/useAuthModal.js
@@ -1,10 +1,6 @@
 import { useCallback } from "react";
 import { usePathname, useRouter } from "next/navigation";
 
-// const MODALS = ["signIn", "register", "forgotPassword"];
-
-// const VARS = ["role"];
-
 export default function useAuthModal() {
   const router = useRouter();
   const pathName = usePathname();
@@ -20,7 +16,7 @@ export default function useAuthModal() {
         }),
       };
 
-      return { pathname: pathName, query };
+      return `${pathName}?${new URLSearchParams(query).toString()}`;
     },
     [pathName]
   );
diff --git a/lib/api/canto/index.ts b/lib/api/canto/index.ts
new file mode 100644
index 00000000..8ca9d868
--- /dev/null
+++ b/lib/api/canto/index.ts
@@ -0,0 +1,67 @@
+import { fallbackLng } from "@/lib/i18n/settings";
+import { resizeCantoImage, ValidCantoSizes } from "./resize";
+
+const responsiveCantoSrc = (
+  previewUrl: string,
+  originalUrl: string,
+  width: number
+) => {
+  const eligibleSizes = ValidCantoSizes.filter((size) => size < width);
+  const srcset = eligibleSizes.map(
+    (size) => `${resizeCantoImage(previewUrl, size)} ${size}w`
+  );
+
+  srcset.push(`${originalUrl} ${width}w`);
+
+  const sizes = eligibleSizes.map((size) => {
+    return `(max-width: ${size}px): ${size}px`;
+  }, "");
+
+  sizes.push(`${width}px`);
+
+  return {
+    srcSet: srcset.join(", "),
+    sizes: sizes.join(", "),
+  };
+};
+
+const getAssetMetadata = (
+  metadata: Record<string, string>,
+  locale = fallbackLng
+): { altText?: string; caption?: string; credit?: string } | undefined => {
+  if (!metadata) return undefined;
+
+  const localeKey = locale.toUpperCase();
+
+  const altText = metadata[`AltText${localeKey}`];
+  const caption = metadata[`Caption${localeKey}`];
+  const credit = metadata.Credit;
+
+  return {
+    altText: altText === null ? undefined : altText,
+    caption: caption === null ? undefined : caption,
+    credit: credit === null ? undefined : credit,
+  };
+};
+
+export const damAssetToImage = (locale: string, data: CantoImage) => {
+  if (!data) return undefined;
+
+  const { metadata, url, width, height } = data;
+  const { directUrlPreview, directUrlOriginal } = url;
+  const { altText: alt, ...assetMetadata } =
+    getAssetMetadata(metadata, locale) || {};
+
+  return {
+    src: directUrlPreview,
+    ...responsiveCantoSrc(
+      directUrlPreview,
+      directUrlOriginal,
+      parseFloat(width)
+    ),
+    width: parseFloat(width),
+    height: parseFloat(height),
+    alt,
+    ...assetMetadata,
+  };
+};
diff --git a/lib/api/canto/resize.ts b/lib/api/canto/resize.ts
new file mode 100644
index 00000000..b7162375
--- /dev/null
+++ b/lib/api/canto/resize.ts
@@ -0,0 +1,19 @@
+type ValidCantoSize = 100 | 240 | 320 | 500 | 640 | 800 | 2050;
+
+export const ValidCantoSizes: Array<ValidCantoSize> = [
+  100, 240, 320, 500, 640, 800, 2050,
+];
+
+export const isValidCantoSize = (size: any): size is ValidCantoSize => {
+  return ValidCantoSizes.includes(size);
+};
+
+export const resizeCantoImage = (previewUrl: string, size: number) => {
+  if (isValidCantoSize(size)) {
+    const urlWithoutConstraint = previewUrl.slice(0, -3);
+
+    return urlWithoutConstraint.concat(size.toString());
+  }
+
+  return previewUrl;
+};
diff --git a/lib/api/client/query.ts b/lib/api/client/query.ts
index b9591720..a48e184a 100644
--- a/lib/api/client/query.ts
+++ b/lib/api/client/query.ts
@@ -1,6 +1,8 @@
-import { cacheExchange, createClient, fetchExchange } from "@urql/core";
+import { RequestInit } from "next/dist/server/web/spec-extension/request";
+import { createClient, fetchExchange } from "@urql/core";
 import { registerUrql } from "@urql/next/rsc";
 import type { AnyVariables, DocumentInput, OperationResult } from "@urql/core";
+import merge from "lodash/merge";
 
 let API_URL = process.env.NEXT_PUBLIC_API_URL as string;
 
@@ -18,12 +20,21 @@ if (
 const queryAPI = async <Query, Variables extends AnyVariables = AnyVariables>({
   query,
   variables,
+  fetchOptions: inputFetchOptions,
   previewToken,
 }: {
   query: DocumentInput<Query, Variables>;
   variables: Variables;
+  fetchOptions?: RequestInit;
   previewToken?: string;
 }): Promise<OperationResult<Query, Variables>> => {
+  const defaultFetchOptions = {
+    cache: "force-cache",
+    next: {
+      revalidate: previewToken ? 0 : undefined,
+    },
+  };
+  const fetchOptions = merge({}, defaultFetchOptions, inputFetchOptions);
   const params = new URLSearchParams({});
 
   if (previewToken) {
@@ -34,15 +45,8 @@ const queryAPI = async <Query, Variables extends AnyVariables = AnyVariables>({
     return createClient({
       suspense: true,
       url: `${API_URL}?${params.toString()}`,
-      exchanges: [cacheExchange, fetchExchange],
-      fetchOptions: () => {
-        return {
-          cache: "force-cache",
-          next: {
-            revalidate: previewToken ? 0 : undefined,
-          },
-        };
-      },
+      exchanges: [fetchExchange],
+      fetchOptions,
     });
   };
 
diff --git a/lib/api/client/tags.ts b/lib/api/client/tags.ts
new file mode 100644
index 00000000..6acdb8dd
--- /dev/null
+++ b/lib/api/client/tags.ts
@@ -0,0 +1,4 @@
+const globals = "globals";
+const tags = { globals };
+
+export default tags;
diff --git a/lib/api/entries.js b/lib/api/entries.js
index 02685097..db4aae95 100644
--- a/lib/api/entries.js
+++ b/lib/api/entries.js
@@ -12,7 +12,6 @@ import { glossaryTermFragment } from "@/lib/api/fragments/glossary-term";
 import { studentPageFragment } from "./fragments/student-page";
 import { educatorPageFragment } from "./fragments/educator-page";
 import { investigationLandingPageFragment } from "./fragments/investigation-landing-page";
-import { getLocaleString } from "@/lib/helpers/site";
 
 function dataListQueryify(fragment) {
   return gql`
@@ -56,70 +55,6 @@ function dataListQueryify(fragment) {
   `;
 }
 
-async function getData(ENV) {
-  let data = {};
-  if (ENV === "DEV") {
-    const query = gql`
-      {
-        entries(
-          site: "*"
-          section: ["pages", "searchResults"]
-          type: ["not", "redirectPage"]
-          level: 1
-        ) {
-          uri
-          level
-          siteHandle
-        }
-        search: entries(
-          site: "*"
-          section: ["searchResults"]
-          type: ["not", "redirectPage"]
-        ) {
-          uri
-          siteHandle
-        }
-      }
-    `;
-    const res = await queryAPI(query);
-    data.entries = [...res.entries, ...res.search];
-  } else {
-    const query = gql`
-      {
-        entries(
-          site: "*"
-          section: ["pages", "searchResults"]
-          type: ["not", "redirectPage"]
-        ) {
-          uri
-          siteHandle
-        }
-      }
-    `;
-    data = await queryAPI(query);
-  }
-  return data;
-}
-
-export async function getAllEntries() {
-  const ENV = process.env.CLOUD_ENV;
-  const data = await getData(ENV);
-  return data.entries
-    .filter(({ uri }) => uri != null)
-    .map(({ uri, sectionHandle, siteHandle }) => {
-      const segments = uri.split("/");
-
-      return {
-        params: {
-          locale: getLocaleString(siteHandle),
-          uriSegments: segments,
-          uri,
-          sectionHandle,
-        },
-      };
-    });
-}
-
 export function useDataList({
   excludeId = null,
   inReverse = false,
diff --git a/lib/api/entries/index.ts b/lib/api/entries/index.ts
new file mode 100644
index 00000000..b79c4d25
--- /dev/null
+++ b/lib/api/entries/index.ts
@@ -0,0 +1,70 @@
+import { gql } from "@urql/core";
+import queryAPI from "@/lib/api/client/query";
+import { getSiteFromLocale } from "@/lib/helpers/site";
+
+export async function getEntriesByLocale(locale: string) {
+  const site = getSiteFromLocale(locale);
+  const ENV = process.env.CLOUD_ENV;
+
+  if (ENV === "DEV") {
+    const query = gql`
+      query getEntriesBySite($site: [String]) {
+        entries(
+          site: $site
+          section: ["pages", "searchResults"]
+          type: ["not", "redirectPage"]
+          level: 1
+        ) {
+          uri
+        }
+        search: entries(
+          site: $site
+          section: ["searchResults"]
+          type: ["not", "redirectPage"]
+        ) {
+          uri
+        }
+      }
+    `;
+    const { data } = await queryAPI({ query, variables: { site } });
+
+    return { entries: [...data.entries, ...data.search] };
+  } else {
+    const query = gql`
+      query getEntriesBySite($site: [String]) {
+        entries(
+          site: $site
+          section: ["pages", "searchResults"]
+          type: ["not", "redirectPage"]
+        ) {
+          uri
+        }
+      }
+    `;
+
+    const { data } = await queryAPI({ query, variables: { site } });
+    return data;
+  }
+}
+
+export async function getEntrySectionByUri(
+  uri = "__home__",
+  locale: string,
+  previewToken?: string
+) {
+  const site = getSiteFromLocale(locale);
+  const query = gql`
+    query getEntrySectionByUri($site: [String], $uri: [String]) {
+      entry(uri: $uri, site: $site) {
+        sectionHandle
+        typeHandle
+      }
+    }
+  `;
+  const { data } = await queryAPI({
+    query,
+    variables: { uri: decodeURI(uri), site },
+    previewToken,
+  });
+  return data.entry;
+}
diff --git a/lib/api/entry.js b/lib/api/entry/index.ts
similarity index 63%
rename from lib/api/entry.js
rename to lib/api/entry/index.ts
index d1ae9a5d..c251a671 100644
--- a/lib/api/entry.js
+++ b/lib/api/entry/index.ts
@@ -1,6 +1,5 @@
-import { gql } from "graphql-request";
-import { queryAPI } from "@/lib/fetch";
-// import { getRelease } from "@/lib/api/noirlabReleases";
+import { gql } from "@urql/core";
+import queryAPI from "@/lib/api/client/query";
 import { fullBaseFieldsFragment } from "@/lib/api/fragments/shared";
 import { linkFragment } from "@/lib/api/fragments/link";
 import {
@@ -16,14 +15,15 @@ import {
   redirectFragment,
 } from "@/lib/api/fragments/page";
 import { staffProfileFragmentFull } from "@/lib/api/fragments/staff-profile";
-import { glossaryTermFragmentFull } from "./fragments/glossary-term";
-import { studentPageFragmentFull } from "./fragments/student-page";
-import { educatorPageFragmentFull } from "./fragments/educator-page";
-import { investigationLandingPageFragmentFull } from "./fragments/investigation-landing-page";
-import { addRelatedInvestigation } from "./investigation";
-import { addSiblings } from "./sibling-nav";
+import { glossaryTermFragmentFull } from "@/lib/api/fragments/glossary-term";
+import { studentPageFragmentFull } from "@/lib/api//fragments/student-page";
+import { educatorPageFragmentFull } from "@/lib/api//fragments/educator-page";
+import { investigationLandingPageFragmentFull } from "@/lib/api//fragments/investigation-landing-page";
+import { addRelatedInvestigation } from "@/lib/api//investigation";
+import { addSiblings } from "@/lib/api//sibling-nav";
+import { getSiteFromLocale } from "../../helpers/site";
 
-function entryQueryify(fragment) {
+function entryQueryify(fragment: string) {
   return gql`
     ${fullBaseFieldsFragment}
     query getEntry(
@@ -39,50 +39,43 @@ function entryQueryify(fragment) {
   }`;
 }
 
-function getPageQueryFragmentsByType(uri, section, type, site) {
-  let query = null;
-
+function getPageQueryFragmentsByType(type: string) {
   switch (type) {
     case "pages":
-      query = gql`
+      return gql`
         ${linkFragment}
         ${allPageBlocksFragment}
         ${pageFragmentFull}
         ${entryQueryify(`...pageFragmentFull`)}
       `;
-      break;
     case "educatorPages":
-      query = gql`
+      return gql`
         ${linkFragment}
         ${allPageBlocksFragment}
         ${educatorPageFragmentFull}
         ${entryQueryify(`...educatorPageFragmentFull`)}
       `;
-      break;
     case "studentPages":
-      query = gql`
+      return gql`
         ${linkFragment}
         ${allPageBlocksFragment}
         ${studentPageFragmentFull}
         ${entryQueryify(`...studentPageFragmentFull`)}
       `;
-      break;
     case "investigationLandingPage":
-      query = gql`
+      return gql`
         ${linkFragment}
         ${allPageBlocksFragment}
         ${investigationLandingPageFragmentFull}
         ${entryQueryify(`...investigationLandingPageFragmentFull`)}
       `;
-      break;
     case "redirectPage":
-      query = gql`
+      return gql`
         ${redirectFragment}
         ${entryQueryify(`...redirectFragment`)}
       `;
-      break;
     default:
-      query = gql`
+      return gql`
         ${linkFragment}
         ${allPageBlocksFragment}
         ${pageFragmentFull}
@@ -98,61 +91,54 @@ function getPageQueryFragmentsByType(uri, section, type, site) {
           ...redirectFragment
         `)}
       `;
-      break;
   }
-
-  return query;
 }
 
-function getQueryFragments(uri, section, type, site) {
-  let query = null;
-
+function getQueryFragments(
+  uri: string,
+  section: string,
+  type: string,
+  site: string
+) {
   switch (section) {
     case "pages":
-      query = getPageQueryFragmentsByType(uri, section, type, site);
-      break;
+      return getPageQueryFragmentsByType(type);
     case "news":
-      query = gql`
+      return gql`
         ${allNewsBlocksFragment}
         ${newsPostFragmentFull}
         ${entryQueryify(`...newsPostFragmentFull`)}
       `;
-      break;
     case "events":
-      query = gql`
+      return gql`
         ${linkFragment}
         ${allPageBlocksFragment}
         ${eventFragmentFull}
         ${entryQueryify(`...eventFragmentFull`)}
       `;
-      break;
     case "staffProfiles":
-      query = gql`
+      return gql`
         ${allNewsBlocksFragment}
         ${staffProfileFragmentFull}
         ${entryQueryify(`...staffProfileFragmentFull`)}
       `;
-      break;
     case "glossaryTerms":
-      query = gql`
+      return gql`
         ${glossaryTermFragmentFull}
         ${entryQueryify(`...glossaryTermFragmentFull`)}
       `;
-      break;
     case "userProfilePage":
-      query = gql`
+      return gql`
         ${userProfileFragmentFull}
         ${entryQueryify(`...userProfileFragmentFull`)}
       `;
-      break;
     case "searchResults":
-      query = gql`
+      return gql`
         ${searchFragmentFull}
         ${entryQueryify(`...searchFragmentFull`)}
       `;
-      break;
     default:
-      query = gql`
+      return gql`
         ${linkFragment}
         ${allPageBlocksFragment}
         ${allNewsBlocksFragment}
@@ -181,10 +167,7 @@ function getQueryFragments(uri, section, type, site) {
           ...redirectFragment
         `)}
       `;
-      break;
   }
-
-  return query;
 }
 
 async function includeRelatedEntries(entry, site) {
@@ -199,73 +182,28 @@ async function includeRelatedEntries(entry, site) {
   return withRelatedEntries;
 }
 
-export async function getEntrySectionTypeByUri(
-  uri = "__home__",
-  site = "default",
-  previewToken
-) {
-  const query = gql`
-    {
-      entry (uri: "${uri}", site: "${site}") {
-        sectionHandle
-        typeHandle
-      }
-    }
-  `;
-  const data = await queryAPI(query, null, previewToken);
-  return data.entry;
-}
-
 export async function getEntryDataByUri(
-  uri,
-  section,
-  type,
-  site = "default",
-  previewToken
+  uri: string,
+  section: string,
+  type: string,
+  locale: string,
+  previewToken?: string
 ) {
+  const site = getSiteFromLocale(locale);
   const query = getQueryFragments(uri, section, type, site);
 
-  const data = await queryAPI(query, null, previewToken, {
-    section,
-    type,
-    site,
-    uri,
+  const { data } = await queryAPI({
+    query,
+    variables: {
+      section,
+      type,
+      site,
+      uri: decodeURI(uri),
+    },
+    previewToken,
   });
 
-  // if (section === "news" && data) {
-  //   if (data.entry.pressReleaseId) {
-  //     await getRelease(site, data.entry.pressReleaseId).then((releaseData) => {
-  //       const { description, title } = data.entry;
-  //       const {
-  //         description: releaseDescription,
-  //         title: releaseTitle,
-  //         url,
-  //       } = releaseData;
-  //       data.entry = {
-  //         ...releaseData,
-  //         ...data.entry,
-  //         releaseDescription,
-  //         title: releaseTitle || title,
-  //         releaseUrl: url,
-  //       };
-  //     });
-  //   }
-  // }
-
   // Get the related investigation
   const entryWithRelatedData = await includeRelatedEntries(data.entry, site);
   return entryWithRelatedData;
 }
-
-export async function getEntryDataByUid(uid, site, previewToken) {
-  const query = gql`
-    {
-      entry (uid: "${uid}" site: "${site}") {
-        url
-        uri
-      }
-    }
-  `;
-  const data = await queryAPI(query, null, previewToken);
-  return data.entry;
-}
diff --git a/lib/api/fragments/educator-page.js b/lib/api/fragments/educator-page.js
index 7cdaa10e..5cdd5144 100644
--- a/lib/api/fragments/educator-page.js
+++ b/lib/api/fragments/educator-page.js
@@ -38,11 +38,6 @@ fragment educatorPageFragmentFull on pages_educatorPages_Entry {
         ${getImageFields("crop", 900, 550)}
       }
     }
-    openGraphImage: hero {
-      ...on heroes_Asset {
-        ${getImageFields("crop", 1200, 630)}
-      }
-    }
     ancestors {
       ... on pages_pages_Entry {
         id
diff --git a/lib/api/fragments/event.js b/lib/api/fragments/event.js
index 5d262006..927f7ee5 100644
--- a/lib/api/fragments/event.js
+++ b/lib/api/fragments/event.js
@@ -55,11 +55,6 @@ export const eventFragmentFull = `
       }
       focalPointX
       focalPointY
-      openGraphImage: hero {
-        ...on heroes_Asset {
-          ${getImageFields("crop", 1200, 630)}
-        }
-      }
       eventType {
         id
         title
diff --git a/lib/api/fragments/news-post.js b/lib/api/fragments/news-post.js
index 1d131b5d..6f7d0038 100644
--- a/lib/api/fragments/news-post.js
+++ b/lib/api/fragments/news-post.js
@@ -65,11 +65,6 @@ export const newsPostFragmentFull = `
       focalPointX
       focalPointY
       heroCaption: captionRichText
-      openGraphImage: hero {
-        ...on heroes_Asset {
-          ${getImageFields("crop", 1200, 630)}
-        }
-      }
       newsAssets: sidebarAssets {
         ... on sidebarAssets_header_BlockType {
           assetHeader
diff --git a/lib/api/fragments/page.js b/lib/api/fragments/page.js
index 26ee6d8d..df326057 100644
--- a/lib/api/fragments/page.js
+++ b/lib/api/fragments/page.js
@@ -35,11 +35,6 @@ fragment pageFragmentFull on pages_pages_Entry {
         ${getImageFields("crop", 1920, 1067)}
       }
     }
-    openGraphImage: hero {
-      ...on heroes_Asset {
-        ${getImageFields("crop", 1200, 630)}
-      }
-    }
     focalPointX
     focalPointY
     overlapHero
diff --git a/lib/api/fragments/staff-profile.js b/lib/api/fragments/staff-profile.js
index ce375c66..69444fa9 100644
--- a/lib/api/fragments/staff-profile.js
+++ b/lib/api/fragments/staff-profile.js
@@ -25,11 +25,6 @@ export const staffProfileFragmentFull = `
           ${getImageFields("crop", 1920, 1067)}
         }
       }
-      openGraphImage: staffPortrait {
-        ...on staffProfiles_Asset {
-          ${getImageFields("crop", 800, 600)}
-        }
-      }
       quote: pullQuote
       tags: staffTags {
         ... on staffTags_Tag {
diff --git a/lib/api/fragments/student-page.js b/lib/api/fragments/student-page.js
index 304b11a1..37850566 100644
--- a/lib/api/fragments/student-page.js
+++ b/lib/api/fragments/student-page.js
@@ -26,11 +26,6 @@ fragment studentPageFragmentFull on pages_studentPages_Entry {
         ${getImageFields("crop", 1920, 1067)}
       }
     }
-    openGraphImage: hero {
-      ...on heroes_Asset {
-        ${getImageFields("crop", 1200, 630)}
-      }
-    }
     focalPointX
     focalPointY
     overlapHero
diff --git a/lib/api/global.js b/lib/api/global.js
deleted file mode 100644
index 87f3bd0e..00000000
--- a/lib/api/global.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import useSWR from "swr";
-import { gql } from "graphql-request";
-import { queryAPI } from "@/lib/fetch";
-import { linkFragment } from "@/lib/api/fragments/link";
-import {
-  siteInfoFragment,
-  footerFragment,
-  rootPageInfoFragment,
-  contactFormFragment,
-} from "@/lib/api/fragments/global";
-import { categoriesFragment } from "@/lib/api/fragments/categories";
-import { userProfileFragment } from "@/lib/api/fragments/page";
-
-export async function getGlobalData(site = "default") {
-  const query = gql`
-    ${linkFragment}
-    ${siteInfoFragment}
-    ${footerFragment}
-    ${rootPageInfoFragment}
-    ${contactFormFragment}
-    ${categoriesFragment}
-    ${userProfileFragment}
-    query getGlobalData($site: [String]) {
-      pageTree: entries(
-        section: "pages"
-        site: $site
-        level: 1
-        isVisible: true
-      ) {
-        id
-        title
-        uri
-        children(isVisible: true) {
-          id
-          title
-          uri
-          children(isVisible: true) {
-            id
-            title
-            uri
-          }
-        }
-      }
-      globals: globalSets(site: $site) {
-        ...rootPageInfoFragment
-        ...siteInfoFragment
-        ...footerFragment
-        ...contactFormFragment
-      }
-      allCategories: categories(site: $site) {
-        ...categoriesFragment
-      }
-      userProfilePage: entry(site: $site, type: "userProfilePage") {
-        ...userProfileFragment
-      }
-    }
-  `;
-  const data = await queryAPI(query, undefined, undefined, { site });
-  return data;
-}
-
-export function useGlobalData() {
-  const { data, error } = useSWR(
-    gql`
-      ${linkFragment}
-      ${siteInfoFragment}
-      ${footerFragment}
-      ${userProfileFragment}
-      {
-        pageTree: entries(
-          section: "pages"
-          site: "default"
-          level: 1
-          isVisible: true
-        ) {
-          id
-          title
-          uri
-          children(isVisible: true) {
-            id
-            title
-            uri
-            children(isVisible: true) {
-              id
-              title
-              uri
-            }
-          }
-        }
-        globals: globalSets(site: "default") {
-          ...siteInfoFragment
-          ...footerFragment
-        }
-        userProfilePage: entry(site: "default", type: "userProfilePage") {
-          ...userProfileFragment
-        }
-        pageTree_es: entries(
-          section: "pages"
-          site: "es"
-          level: 1
-          isVisible: true
-        ) {
-          id
-          title
-          uri
-          children(isVisible: true) {
-            id
-            title
-            uri
-            children(isVisible: true) {
-              id
-              title
-              uri
-            }
-          }
-        }
-        globals_es: globalSets(site: "es") {
-          ...siteInfoFragment
-          ...footerFragment
-        }
-        userProfilePage_es: entry(site: "es", type: "userProfilePage") {
-          ...userProfileFragment
-        }
-      }
-    `,
-    queryAPI
-  );
-
-  return {
-    data,
-    isLoading: !error && !data,
-    isError: error,
-  };
-}
diff --git a/lib/api/globals/index.ts b/lib/api/globals/index.ts
index c32279d4..97b69d5d 100644
--- a/lib/api/globals/index.ts
+++ b/lib/api/globals/index.ts
@@ -11,6 +11,7 @@ import {
 import { categoriesFragment } from "@/lib/api/fragments/categories";
 import { userProfileFragment } from "@/lib/api/fragments/page";
 import { getSiteFromLocale } from "@/lib/helpers/site";
+import tags from "../client/tags";
 
 export async function getGlobalData(locale = fallbackLng) {
   const site = getSiteFromLocale(locale);
@@ -57,7 +58,11 @@ export async function getGlobalData(locale = fallbackLng) {
       }
     }
   `;
-  const { data } = await queryAPI({ query, variables: { site } });
+  const { data } = await queryAPI({
+    query,
+    variables: { site },
+    fetchOptions: { next: { tags: [tags.globals] } },
+  });
 
   const globals = data.globals
     ? data.globals.reduce(
diff --git a/lib/api/metadata/index.ts b/lib/api/metadata/index.ts
index 4a51ce2b..decdef08 100644
--- a/lib/api/metadata/index.ts
+++ b/lib/api/metadata/index.ts
@@ -2,6 +2,7 @@ import { gql } from "@urql/core";
 import queryAPI from "@/lib/api/client/query";
 import { getSiteFromLocale } from "@/lib/helpers/site";
 import { fallbackLng } from "@/lib/i18n/settings";
+import { cantoSingleAsset, getImageFields } from "../fragments/image";
 
 export async function getEntryMetadataByUri(
   uri: string,
@@ -20,10 +21,20 @@ export async function getEntryMetadataByUri(
         ... on events_events_Entry {
           title
           description
+          image: hero {
+            ...on heroes_Asset {
+              ${getImageFields("crop", 1200, 630)}
+            }
+          }
         }
         ... on pages_pages_Entry {
           title
           description
+          image: hero {
+            ...on heroes_Asset {
+              ${getImageFields("crop", 1200, 630)}
+            }
+          }
         }
         ... on pages_educatorPages_Entry {
           description
@@ -37,15 +48,75 @@ export async function getEntryMetadataByUri(
           description
           title
         }
+        ... on news_post_Entry {
+          pressReleaseId
+          description: teaser
+          title
+          image: hero {
+            ...on heroes_Asset {
+              ${getImageFields("crop", 1200, 630)}
+            }
+          }
+        }
+        ...on glossaryTerms_glossaryTerm_Entry {
+          title
+          ${cantoSingleAsset}
+        }
+        ...on searchResults_searchResults_Entry {
+          title
+        }
+        ... on slideshows_slideshow_Entry {
+          title
+          description: richTextDescription
+          image: representativeAssetVariant {
+            ... on assetVariants_Asset {
+              ${getImageFields("crop", 600, 400)}
+            }
+          }
+        }
+        ...on staffProfiles_staffProfiles_Entry {
+          title
+          description: pullQuote
+          image: staffPortrait {
+          ...on staffProfiles_Asset {
+          ${getImageFields("crop", 800, 600)}
+            }
+          }
+        }
       }
     }
   `;
 
   const { data } = await queryAPI({
     query,
-    variables: { site, uri },
+    variables: { site, uri: decodeURI(uri) },
     previewToken,
   });
 
   return data;
 }
+
+export async function getBreadcrumbsById(
+  id: number,
+  locale: string,
+  previewToken?: string
+) {
+  if (!id) return null;
+  const site = getSiteFromLocale(locale);
+
+  const query = gql`
+    query EntryBreadcrumbs($site: [String], $id: Int) {
+      entries(section: "pages", site: $site, ancestorOf: $id) {
+        id
+        title
+        uri
+      }
+    }
+  `;
+  const { data } = await queryAPI({
+    query,
+    variables: { site, id },
+    previewToken,
+  });
+  return data.entries;
+}
diff --git a/lib/api/noirlab/index.ts b/lib/api/noirlab/index.ts
new file mode 100644
index 00000000..71b5e0eb
--- /dev/null
+++ b/lib/api/noirlab/index.ts
@@ -0,0 +1,25 @@
+export async function getRelease(locale: string, id: string) {
+  const releaseUrl = `https://noirlab.edu/public/api/v2/releases/${id}/?lang=${locale}&translation_mode=fallback`;
+  const response = await fetch(releaseUrl, {
+    next: { tags: ["pressRelease"] },
+  });
+  const release = await response.json();
+  return release;
+}
+
+export async function getReleaseOpenGraph(locale: string, id: string) {
+  const format = "screen640";
+  const { images } = await getRelease(locale, id);
+  if (!images) return;
+  const feature = images[0];
+  if (!feature) return;
+
+  const { title, height, width, formats } = feature;
+
+  return {
+    alt: title,
+    url: formats[format],
+    height,
+    width,
+  };
+}
diff --git a/lib/api/noirlabReleases.js b/lib/api/noirlabReleases.js
index 2362ee9a..395d8428 100644
--- a/lib/api/noirlabReleases.js
+++ b/lib/api/noirlabReleases.js
@@ -5,14 +5,6 @@ import { makeReleaseFeature } from "@/lib/utils";
 
 // const RELEASE_URL = process.env.NEXT_PUBLIC_RELEASE_URL;
 
-export async function getRelease(site, id) {
-  const locale = getLocaleString(site);
-  const releaseUrl = `https://noirlab.edu/public/api/v2/releases/${id}/?lang=${locale}&translation_mode=fallback`;
-  const response = await fetch(releaseUrl);
-  const release = await response.json();
-  return release;
-}
-
 export function useRelease(site, entry) {
   const locale = getLocaleString(site);
 
diff --git a/lib/api/pages.js b/lib/api/pages.js
deleted file mode 100644
index b9ab40a9..00000000
--- a/lib/api/pages.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { gql } from "graphql-request";
-import { queryAPI } from "@/lib/fetch";
-
-export async function getAllPageUrls(lang = "default") {
-  const query = gql`
-    {
-      entries (section: "pages", site: "${lang}") {
-        id
-        title
-        uri
-      }
-    }
-  `;
-  const data = await queryAPI(query);
-  return data.entries;
-}
-
-export async function getBreadcrumbs(id, site = "default", previewToken) {
-  if (!id) return null;
-  const query = gql`
-    {
-      entries(section: "pages", site: "${site}", ancestorOf: ${id}) {
-        id
-        title
-        uri
-      }
-    }
-  `;
-  const data = await queryAPI(query, null, previewToken);
-  return data.entries;
-}
diff --git a/lib/api/slideshows.js b/lib/api/slideshows/index.ts
similarity index 64%
rename from lib/api/slideshows.js
rename to lib/api/slideshows/index.ts
index 69cb7977..2d4db5dd 100644
--- a/lib/api/slideshows.js
+++ b/lib/api/slideshows/index.ts
@@ -1,17 +1,19 @@
-import { gql } from "graphql-request";
-import { queryAPI } from "@/lib/fetch";
+import { gql } from "@urql/core";
+import queryAPI from "@/lib/api/client/query";
 import { slideshowFragment } from "@/lib/api/fragments/slideshow";
 import { getImageFields } from "@/lib/api/fragments/image";
+import { getSiteFromLocale } from "@/lib/helpers/site";
 
 export async function getSlideshowDataByUri(
-  uri,
-  site = "default",
-  previewToken
+  uri: string,
+  locale: string,
+  previewToken?: string
 ) {
+  const site = getSiteFromLocale(locale);
   const query = gql`
     ${slideshowFragment}
-    {
-      entry (section: "slideshows", site: "${site}", uri: "${uri}") {
+    query getSlideshow($site: [String], $uri: [String]) {
+      entry (section: "slideshows", site: $site, uri: $uri) {
         ...slideshowFragment
 
         ...on slideshows_slideshow_Entry {
@@ -36,6 +38,12 @@ export async function getSlideshowDataByUri(
       }
     }
   `;
-  const data = await queryAPI(query, null, previewToken);
-  return { entry: data.entry };
+
+  const { data } = await queryAPI({
+    query,
+    variables: { uri, site },
+    previewToken,
+  });
+
+  return data;
 }
diff --git a/lib/purgeStaticFiles.js b/lib/purgeStaticFiles.js
deleted file mode 100644
index 546b38c1..00000000
--- a/lib/purgeStaticFiles.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { stat, unlink, readdir, rmdir } from "node:fs/promises";
-
-const purgeNextjsStaticFiles = async (pathSlugs) => {
-  if (!Array.isArray(pathSlugs) || pathSlugs.length < 1) {
-    return false;
-  }
-
-  const fullSlugPath = `${process.env.PWD}/.next/server/pages/${pathSlugs.join(
-    "/"
-  )}`;
-
-  const parentFolder = `${process.env.PWD}/.next/server/pages/${pathSlugs
-    .slice(0, pathSlugs.length - 1)
-    .join("/")}`;
-
-  const htmlPath = `${fullSlugPath}.html`;
-  const jsonPath = `${fullSlugPath}.json`;
-
-  try {
-    const htmlStat = await stat(htmlPath);
-    const jsonStat = await stat(jsonPath);
-    if (htmlStat && jsonStat) {
-      try {
-        await unlink(htmlPath);
-        await unlink(jsonPath);
-
-        if (pathSlugs.length > 1) {
-          const readParent = await readdir(parentFolder);
-
-          if (readParent.length === 0) {
-            // the folder is now empty, let's delete it
-            await rmdir(parentFolder);
-          }
-        }
-      } catch (unlinkError) {
-        console.error(
-          `Error trying to purge nextjs static files with base (ending in .json or .html) ${fullSlugPath}`
-        );
-
-        console.error(unlinkError);
-      }
-    }
-  } catch (e) {
-    // expected in certain scenarios, stating non existant files etc
-  }
-};
-
-export { purgeNextjsStaticFiles };
diff --git a/lib/styles/font.ts b/lib/styles/font.ts
index 41ffd7f4..bfe9b87c 100644
--- a/lib/styles/font.ts
+++ b/lib/styles/font.ts
@@ -6,6 +6,7 @@ const SourceSansPro = Source_Sans_3({
   style: ["normal", "italic"],
   subsets: ["latin"],
   display: "swap",
+  fallback: ["system-ui"],
   variable: "--FONT_STACK_BASE",
 });
 
diff --git a/pages/[locale]/[...uriSegments]/index.js b/pages/[locale]/[...uriSegments]/index.js
deleted file mode 100644
index c6891fd8..00000000
--- a/pages/[locale]/[...uriSegments]/index.js
+++ /dev/null
@@ -1,218 +0,0 @@
-import PropTypes from "prop-types";
-import { GoogleOAuthProvider } from "@react-oauth/google";
-import { getGlobalData } from "@/api/global";
-import { getAllEntries } from "@/api/entries";
-import { getEntryDataByUri, getEntrySectionTypeByUri } from "@/api/entry";
-import { getBreadcrumbs } from "@/api/pages";
-import { getGalleryItemDataByUri } from "@/lib/api/gallery-items";
-import { getSlideshowDataByUri } from "@/api/slideshows";
-import { getSiteFromLocale } from "@/lib/helpers/site";
-import { GlobalDataProvider } from "@/contexts/GlobalData";
-import PageTemplate from "@/templates/Page";
-import EventPageTemplate from "@/templates/EventPage";
-import GalleryPageTemplate from "@/templates/GalleryPage";
-import GlossaryPageTemplate from "@/templates/GlossaryPage";
-import NewsPageTemplate from "@/templates/NewsPage";
-import SearchPageTemplate from "@/templates/SearchPage";
-import SlideshowPageTemplate from "@/templates/SlideshowPage";
-import StaffPageTemplate from "@/templates/StaffPage";
-import UserProfilePageTemplate from "@/templates/UserProfilePage";
-import internalLinkShape, {
-  internalLinkWithChildrenShape,
-} from "@/shapes/link";
-import siteInfoShape from "@/shapes/siteInfo";
-import footerContentShape from "@/shapes/footerContent";
-import rootPagesShape from "@/shapes/rootPages";
-import { setEdcLog } from "@/lib/edc-log";
-import { purgeNextjsStaticFiles } from "@/lib/purgeStaticFiles";
-const glob = require("glob");
-const fs = require("fs");
-
-function getDirectories(src, callback) {
-  glob(src + "/**/*", { dot: true }, callback);
-}
-
-function logNextDir() {
-  let BUILD_ID = "";
-
-  fs.readFile(".next/BUILD_ID", (err, text) => {
-    if (err) {
-      console.error(err);
-    }
-    BUILD_ID = text.toString();
-  });
-  getDirectories(".next/server/pages", (err, res) => {
-    if (err) {
-      console.error("Error:", err);
-    } else {
-      const logInfo = {
-        uptime: process.uptime(),
-        build_id: BUILD_ID,
-        files: res,
-      };
-      console.info("node_next_logging:", JSON.stringify(logInfo));
-    }
-  });
-}
-
-const GOOGLE_APP_ID = process.env.NEXT_PUBLIC_GOOGLE_APP_ID;
-export default function Page({ section, globalData, ...entryProps }) {
-  const sectionMap = {
-    events: EventPageTemplate,
-    galleryItems: GalleryPageTemplate,
-    glossaryTerms: GlossaryPageTemplate,
-    news: NewsPageTemplate,
-    searchResults: SearchPageTemplate,
-    slideshows: SlideshowPageTemplate,
-    staffProfiles: StaffPageTemplate,
-    userProfilePage: UserProfilePageTemplate,
-  };
-
-  const Template = sectionMap[section] || PageTemplate;
-
-  return (
-    <GoogleOAuthProvider clientId={GOOGLE_APP_ID}>
-      <GlobalDataProvider data={globalData}>
-        <Template {...entryProps} />
-      </GlobalDataProvider>
-    </GoogleOAuthProvider>
-  );
-}
-
-async function getEntryData(uri, section, type, site, previewToken) {
-  const dataMap = {
-    galleryItems: getGalleryItemDataByUri,
-    slideshows: getSlideshowDataByUri,
-  };
-
-  if (dataMap[section]) {
-    const getData = dataMap[section];
-    return await dataMap[section](uri, site, previewToken);
-  }
-
-  return await getEntryDataByUri(uri, section, type, site, previewToken);
-}
-
-export async function getStaticPaths() {
-  return {
-    paths: await getAllEntries(),
-    fallback: "blocking",
-  };
-}
-
-/** @type {import("next").GetStaticProps } */
-export async function getStaticProps({
-  params: { uriSegments, locale },
-  previewData,
-  draftMode,
-}) {
-  if (process.env.NEXT_DEBUG_LOGGING === "true") {
-    logNextDir();
-  }
-
-  const runId = Date.now().toString();
-  const site = getSiteFromLocale(locale);
-  const uri = uriSegments.join("/");
-  const previewToken = draftMode ? previewData?.previewToken : undefined;
-
-  setEdcLog(runId, "Starting new client build for " + site, "BUILD_START");
-  const data = await getGlobalData(site);
-
-  const globals = data.globals
-    ? data.globals.reduce(
-        (obj, item) =>
-          Object.assign(
-            obj,
-            Object.keys(item).length && { [item.handle]: item }
-          ),
-        {}
-      )
-    : {};
-
-  const entrySectionType = await getEntrySectionTypeByUri(
-    uri,
-    site,
-    previewToken
-  );
-
-  // Handle 404 if there is no data
-  if (!entrySectionType) {
-    setEdcLog(runId, "404 encountered building for " + uri, "BUILD_ERROR_404");
-    await purgeNextjsStaticFiles(uriSegments);
-    return {
-      notFound: true,
-      revalidate: 10,
-    };
-  }
-
-  const { sectionHandle: section, typeHandle: type } = entrySectionType;
-  const entryData = await getEntryData(uri, section, type, site, previewToken);
-
-  const currentId = entryData?.id || entryData?.entry?.id;
-
-  const breadcrumbs = await getBreadcrumbs(currentId, site);
-  const globalData = {
-    categories: data?.allCategories || [],
-    footerContent: globals?.footer || {},
-    contactForm: globals?.contactForm || {},
-    headerNavItems: data?.pageTree || [],
-    rootPages: globals?.rootPageInformation?.customBreadcrumbs || [],
-    siteInfo: globals?.siteInfo || {},
-    localeInfo: {
-      locale: site,
-      language: entryData?.language || entryData?.entry?.language || "",
-      localized: entryData?.localized || entryData?.entry?.localized || [],
-    },
-    userProfilePage: data?.userProfilePage || {},
-  };
-
-  // Handle redirect if the entry has one
-  if (entryData?.typeHandle === "redirectPage" && entryData?.linkTo?.url) {
-    setEdcLog(runId, "Redirect build done for " + uri, "BUILD_REDIRECT");
-    return {
-      redirect: {
-        destination: entryData.linkTo.url,
-        permanent: false,
-      },
-    };
-  }
-
-  // Handle 404 if there is no data
-  if (!currentId) {
-    setEdcLog(runId, "404 encountered building for " + uri, "BUILD_ERROR_404");
-    await purgeNextjsStaticFiles(uriSegments);
-    return {
-      notFound: true,
-      revalidate: 10,
-    };
-  }
-  setEdcLog(runId, "Done building for " + uri, "BUILD_COMPLETE");
-
-  return {
-    props: {
-      data: entryData,
-      section,
-      globalData,
-      breadcrumbs,
-    },
-    revalidate: 300,
-  };
-}
-
-Page.displayName = "Entry.Page";
-
-Page.propTypes = {
-  data: PropTypes.object,
-  section: PropTypes.string,
-  globalData: PropTypes.exact({
-    categories: PropTypes.array,
-    footerContent: footerContentShape,
-    headerNavItems: PropTypes.arrayOf(internalLinkWithChildrenShape),
-    localeInfo: PropTypes.object,
-    rootPages: rootPagesShape,
-    siteInfo: siteInfoShape,
-    userProfilePage: PropTypes.object,
-    contactForm: PropTypes.object,
-  }),
-  breadcrumbs: PropTypes.arrayOf(internalLinkShape),
-};
diff --git a/pages/_app.js b/pages/_app.js
deleted file mode 100644
index 716cbaff..00000000
--- a/pages/_app.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/* eslint-disable unused-imports/no-unused-imports */
-
-import PropTypes from "prop-types";
-import "focus-visible";
-import Script from "next/script";
-import { AuthenticationContextProvider } from "@/contexts/Authentication";
-import GlobalStyles from "@/styles/globalStyles";
-import "@/styles/styles.scss";
-import useClientTranslation from "@/lib/i18n/client";
-import { I18nextProvider } from "react-i18next";
-import { fallbackLng } from "@/lib/i18n/settings";
-
-const PLAUSIBLE_DOMAIN = process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN;
-const SURVEY_SPARROW = process.env.NEXT_PUBLIC_SURVEY_SPARROW;
-
-function Client({ Component, pageProps, ...props }) {
-  const lang = pageProps?.data?.language || fallbackLng;
-  const { i18n } = useClientTranslation(lang);
-
-  return (
-    <I18nextProvider {...{ i18n }}>
-      <AuthenticationContextProvider>
-        {PLAUSIBLE_DOMAIN && (
-          <Script
-            id="plausible-script"
-            data-domain={PLAUSIBLE_DOMAIN}
-            src="https://plausible.io/js/plausible.js"
-            strategy="afterInteractive"
-          />
-        )}
-        {SURVEY_SPARROW && (
-          <>
-            <div id="ss_survey_widget"></div>
-            <Script
-              id="SS_SCRIPT"
-              dangerouslySetInnerHTML={{
-                __html: `
-              function sparrowLaunch(opts) {
-                // eslint-disable-next-line no-var, one-var
-                var e = "ss-widget",
-                  t = "script",
-                  a = document,
-                  r = window,
-                  l = localStorage;
-                // eslint-disable-next-line no-var, one-var
-                var s,
-                  n,
-                  c,
-                  rm = a.getElementById("SS_SCRIPT");
-                r.SS_WIDGET_TOKEN = "tt-tTTCZh648ZKwCNkh91aodV";
-                r.SS_ACCOUNT = "rockmanetal.surveysparrow.com";
-                r.SS_SURVEY_NAME = "rubin-pop-up---chat-survey";
-                if (
-                  !a.getElementById(e) &&
-                  !l.getItem("removed-ss-widget-tt-tTTCZh648ZKwCNkh91aodV")
-                ) {
-                  // eslint-disable-next-line no-var
-                  var S = function () {
-                    S.update(arguments);
-                  };
-                  S.args = [];
-                  S.update = function (e) {
-                    S.args.push(e);
-                  };
-                  r.SparrowLauncher = S;
-                  s = a.getElementsByTagName(t);
-                  c = s[s.length - 1];
-                  n = a.createElement(t);
-                  n.type = "text/javascript";
-                  n.async = !0;
-                  n.id = e;
-                  n.src = [
-                    "https://",
-                    "rockmanetal.surveysparrow.com/widget/",
-                    r.SS_WIDGET_TOKEN,
-                    "?",
-                    "customParams=",
-                    JSON.stringify(opts),
-                  ].join("");
-                  c.parentNode.insertBefore(n, c);
-                  r.SS_VARIABLES = opts;
-                  rm.parentNode.removeChild(rm);
-                }
-              }
-              sparrowLaunch({sparrowLang: "${lang}"});
-            `,
-              }}
-            />
-          </>
-        )}
-        <GlobalStyles />
-        <Component {...pageProps} />
-      </AuthenticationContextProvider>
-    </I18nextProvider>
-  );
-}
-
-Client.propTypes = {
-  Component: PropTypes.any,
-  pageProps: PropTypes.any,
-};
-
-export default Client;
-
-/* eslint-enable unused-imports/no-unused-imports */
diff --git a/pages/_document.js b/pages/_document.js
deleted file mode 100644
index 6f305256..00000000
--- a/pages/_document.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Document, { Html, Head, Main, NextScript } from "next/document";
-import { ServerStyleSheet } from "styled-components";
-
-class CustomDocument extends Document {
-  static async getInitialProps(ctx) {
-    const sheet = new ServerStyleSheet();
-    const originalRenderPage = ctx.renderPage;
-
-    try {
-      ctx.renderPage = () =>
-        originalRenderPage({
-          enhanceApp: (App) => (props) =>
-            sheet.collectStyles(<App {...props} />),
-        });
-
-      const initialProps = await Document.getInitialProps(ctx);
-      const {
-        query: { locale },
-      } = ctx;
-      return {
-        ...initialProps,
-        lang: locale,
-        styles: (
-          <>
-            {initialProps.styles}
-            {sheet.getStyleElement()}
-          </>
-        ),
-      };
-    } finally {
-      sheet.seal();
-    }
-  }
-
-  render() {
-    return (
-      <Html lang={this.props.lang}>
-        <Head />
-        <body>
-          <Main />
-          <NextScript />
-        </body>
-      </Html>
-    );
-  }
-}
-
-export default CustomDocument;
diff --git a/pages/_error.js b/pages/_error.js
deleted file mode 100644
index e84db6e4..00000000
--- a/pages/_error.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useEffect, useState } from "react";
-import PropTypes from "prop-types";
-import { useGlobalData } from "@/lib/api/global";
-import { GlobalDataProvider } from "@/contexts/GlobalData";
-import ErrorPageTemplate from "@/components/templates/ErrorPage";
-import { useTranslation } from "react-i18next";
-
-export default function Error({ statusCode }) {
-  const { data, isLoading, isError } = useGlobalData();
-  let globalData = {};
-  const [lang, setLang] = useState("en");
-  const [error, setError] = useState("page-not-found");
-  const { t } = useTranslation();
-  const errorData = {
-    title: t(`${error}-title`),
-    text: t(`${error}-text`),
-  };
-
-  useEffect(() => {
-    if (window.location.pathname.startsWith("/es")) {
-      setLang("es");
-    }
-    if (statusCode && statusCode !== 404) {
-      setError("error");
-    }
-  }, [setError, setLang, statusCode]);
-
-  if (data) {
-    const globals = data[`globals${lang === "es" ? "_es" : ""}`].reduce(
-      (obj, item) =>
-        Object.assign(obj, Object.keys(item).length && { [item.handle]: item }),
-      {}
-    );
-    globalData = {
-      footerContent: globals.footer,
-      headerNavItems: data[`pageTree${lang === "es" ? "_es" : ""}`],
-      siteInfo: globals.siteInfo,
-      localeInfo: {
-        locale: lang,
-      },
-      userProfilePage:
-        data?.[`userProfilePage${lang === "es" ? "_es" : ""}`] || {},
-    };
-  }
-
-  if (isLoading || isError) {
-    return null;
-  }
-
-  return (
-    <GlobalDataProvider data={globalData}>
-      <ErrorPageTemplate data={errorData}></ErrorPageTemplate>
-    </GlobalDataProvider>
-  );
-}
-
-Error.getInitialProps = ({ res, err }) => {
-  const statusCode = res ? res.statusCode : err ? err.statusCode : 404;
-  return { statusCode };
-};
-
-Error.propTypes = {
-  statusCode: PropTypes.number,
-};
diff --git a/pages/api/preview.js b/pages/api/preview.js
index 5336a9ca..a9cca3ee 100644
--- a/pages/api/preview.js
+++ b/pages/api/preview.js
@@ -51,8 +51,14 @@ const preview = async (request, response) => {
   // Enable Draft Mode by setting the cookie
   response.setDraftMode({ enable: true });
 
+  const params = new URLSearchParams({});
+
+  if (previewToken) {
+    params.set("preview", previewToken);
+  }
+
   if (res.entry.uri === CRAFT_HOMEPAGE_URI) {
-    const redirect = `/${locale}?preview=${previewToken}`;
+    const redirect = `/${locale}?${params.toString()}`;
     const cookiePath = isDefaultSite ? "/" : redirect;
 
     response.setPreviewData(
@@ -62,7 +68,7 @@ const preview = async (request, response) => {
     response.redirect(redirect);
   } else {
     const redirectUri = `/${res.entry.uri}`;
-    const redirect = `/${locale}${redirectUri}?preview=${previewToken}`;
+    const redirect = `/${locale}${redirectUri}?${params.toString()}`;
     const cookiePath = `${
       site === "default" ? "" : `/${locale}`
     }${redirectUri}`;
diff --git a/pages/api/revalidate.js b/pages/api/revalidate.js
index c8bc2740..9878dcf0 100644
--- a/pages/api/revalidate.js
+++ b/pages/api/revalidate.js
@@ -4,9 +4,6 @@ import { isCraftPreview } from "@/helpers";
 const REVALIDATE_SECRET_TOKEN = process.env.CRAFT_REVALIDATE_SECRET_TOKEN;
 const BASE_URL = process.env.NEXT_PUBLIC_BASE_URL;
 
-const CRAFT_HOMEPAGE_URI = "__home__";
-const APP_ROUTER_REVALIDATE = [CRAFT_HOMEPAGE_URI];
-
 /**
  * @function preview
  * @param {import("next").NextApiRequest} req
@@ -33,17 +30,16 @@ async function handler(req, res) {
     return res.status(500).json({ error: `The parameter "uri" is required.` });
   }
 
-  try {
-    if (APP_ROUTER_REVALIDATE.includes(query.uri)) {
-      const searchParams = new URLSearchParams(query);
-      await fetch(`${BASE_URL}/api/app-revalidate?${searchParams.toString()}`);
-      return res.status(200).json({ revalidated: true });
-    } else {
-      await res.revalidate(`/${query.uri}`);
-      return res.status(200).json({ revalidated: true });
-    }
-  } catch (error) {
-    console.error(error);
+  const searchParams = new URLSearchParams(query);
+  const response = await fetch(
+    `${BASE_URL}/api/app-revalidate?${searchParams.toString()}`
+  );
+
+  if (response.ok) {
+    const body = await response.json();
+
+    return res.status(200).json(body);
+  } else {
     // If there was an error, Next.js will continue
     // to show the last successfully generated page
     return res.status(500).send("Error revalidating");
diff --git a/types/canto.d.ts b/types/canto.d.ts
new file mode 100644
index 00000000..2251459f
--- /dev/null
+++ b/types/canto.d.ts
@@ -0,0 +1,10 @@
+interface CantoImage {
+  url: {
+    directUrlPreview: string;
+    directUrlOriginal: string;
+    preview: string;
+  };
+  width: string;
+  height: string;
+  metadata: Record<string, string>;
+}
diff --git a/types/next.d.ts b/types/next.d.ts
index 0edb4e9c..359d6501 100644
--- a/types/next.d.ts
+++ b/types/next.d.ts
@@ -3,11 +3,20 @@ type LocaleParams = {
   locale: string;
 };
 
+type UriSegmentParams = {
+  uriSegments: Array<string>;
+};
+
 interface LocaleProps {
   params: LocaleParams;
   searchParams?: SearchParams;
 }
 
+interface UriSegmentProps {
+  params: LocaleParams & UriSegmentParams;
+  searchParams: SearchParams;
+}
+
 interface ErrorProps {
   error: Error & { digest?: string };
   reset: () => void;
diff --git a/types/page.d.ts b/types/page.d.ts
new file mode 100644
index 00000000..ea290234
--- /dev/null
+++ b/types/page.d.ts
@@ -0,0 +1,7 @@
+interface PageEntry extends Record<string, any> {
+  id: string;
+  uri: string;
+  title: string;
+  language: string;
+  typeHandle: string;
+}