diff --git a/app/[lang]/(live)/(protected)/layout.tsx b/app/[lang]/(live)/(protected)/layout.tsx
index e37122790..9273fda74 100644
--- a/app/[lang]/(live)/(protected)/layout.tsx
+++ b/app/[lang]/(live)/(protected)/layout.tsx
@@ -2,7 +2,7 @@ import { headers } from "next/headers"
 import { redirect } from "next/navigation"
 
 import { overview } from "@/constants/routes/myPages"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import { auth } from "@/auth"
 import { getLang } from "@/i18n/serverContext"
@@ -27,7 +27,7 @@ export default async function ProtectedLayout({
     redirect(redirectURL)
   }
 
-  const user = await serverClient().user.get()
+  const user = await getProfile()
 
   if (user && "error" in user) {
     // redirect(redirectURL)
diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
index 41dea7b4a..a5b818f77 100644
--- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
@@ -1,4 +1,4 @@
-import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
+import Breadcrumbs from "@/components/Breadcrumbs"
 import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"
diff --git a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
index 0c55a8469..ac3fec31a 100644
--- a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
@@ -1,6 +1,6 @@
 import { serverClient } from "@/lib/trpc/server"
 
-import Content from "@/components/MyPages/AccountPage/Content"
+import Blocks from "@/components/Blocks"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
@@ -10,7 +10,7 @@ import styles from "./page.module.css"
 
 import type { LangParams, PageArgs } from "@/types/params"
 
-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
 
 export default async function MyPages({
   params,
@@ -30,8 +30,8 @@ export default async function MyPages({
     <>
       <main className={styles.blocks}>
         <Title>{accountPage.heading}</Title>
-        {accountPage.content.length ? (
-          <Content content={accountPage.content} />
+        {accountPage.content?.length ? (
+          <Blocks blocks={accountPage.content} />
         ) : (
           <p>{formatMessage({ id: "No content published" })}</p>
         )}
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx
index 1f40f50ca..d4cee27f1 100644
--- a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx
@@ -1,4 +1,4 @@
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import Form from "@/components/Forms/Edit/Profile"
 import { setLang } from "@/i18n/serverContext"
@@ -10,7 +10,7 @@ export default async function EditProfileSlot({
 }: PageArgs<LangParams>) {
   setLang(params.lang)
 
-  const user = await serverClient().user.get()
+  const user = await getProfile()
   if (!user || "error" in user) {
     return null
   }
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx
index 452444072..d858d5943 100644
--- a/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx
@@ -1,6 +1,6 @@
 import { languages, languageSelect } from "@/constants/languages"
 import { profileEdit } from "@/constants/routes/myPages"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import {
   CalendarIcon,
@@ -16,7 +16,7 @@ import Link from "@/components/TempDesignSystem/Link"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { getIntl } from "@/i18n"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import styles from "./page.module.css"
 
@@ -25,7 +25,7 @@ import { LangParams, PageArgs } from "@/types/params"
 export default async function Profile({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
   const { formatMessage } = await getIntl()
-  const user = await serverClient().user.get()
+  const user = await getProfile()
   if (!user || "error" in user) {
     return null
   }
@@ -44,7 +44,7 @@ export default async function Profile({ params }: PageArgs<LangParams>) {
           </Title>
         </hgroup>
         <Button asChild intent="primary" size="small" theme="base">
-          <Link prefetch={false} color="none" href={profileEdit[getLang()]}>
+          <Link prefetch={false} color="none" href={profileEdit[params.lang]}>
             {formatMessage({ id: "Edit profile" })}
           </Link>
         </Button>
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx
index c2d24fe62..dd8c6eb91 100644
--- a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx
@@ -1,5 +1,5 @@
 import ProfilePage from "../page"
 
-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
 
 export default ProfilePage
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
index 749065fc5..ee8e3ad34 100644
--- a/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx
@@ -7,7 +7,7 @@ import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"
 
-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
 
 export default async function ProfilePage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/page.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/page.tsx
index 49117ee95..4119f48e3 100644
--- a/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/page.tsx
+++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/page.tsx
@@ -1,4 +1,4 @@
-import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
+import Breadcrumbs from "@/components/Breadcrumbs"
 import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"
diff --git a/app/[lang]/(live)/(public)/hotelreservation/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/page.tsx
index 425d8aef2..981b0d765 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/page.tsx
@@ -1,9 +1,8 @@
 import { setLang } from "@/i18n/serverContext"
 
-import { LangParams, PageArgs } from "@/types/params"
+import type { LangParams, PageArgs } from "@/types/params"
 
 export default function HotelReservationPage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
-
   return null
 }
diff --git a/app/[lang]/(live)/@bookingwidget/page.tsx b/app/[lang]/(live)/@bookingwidget/page.tsx
index 35d0dceca..13a414cba 100644
--- a/app/[lang]/(live)/@bookingwidget/page.tsx
+++ b/app/[lang]/(live)/@bookingwidget/page.tsx
@@ -1,17 +1,17 @@
 import { serverClient } from "@/lib/trpc/server"
 
-import BookingWidget from "@/components/BookingWidget"
+import BookingWidget, { preload } from "@/components/BookingWidget"
 
 export default async function BookingWidgetPage() {
+  preload()
+
   // Get the booking widget show/hide status based on page specific settings
   const bookingWidgetToggle =
-    await serverClient().contentstack.bookingwidget.getToggle()
+    await serverClient().contentstack.bookingwidget.toggle.get()
 
-  return (
-    <>
-      {bookingWidgetToggle && bookingWidgetToggle.hideBookingWidget ? null : (
-        <BookingWidget />
-      )}
-    </>
-  )
+  if (bookingWidgetToggle.hideBookingWidget) {
+    return null
+  }
+
+  return <BookingWidget />
 }
diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index 23857acb4..b79c9f9e8 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -17,7 +17,7 @@ import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
 import { preloadUserTracking } from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import type { LangParams, LayoutArgs } from "@/types/params"
 
@@ -37,7 +37,7 @@ export default async function RootLayout({
   const { defaultLocale, locale, messages } = await getIntl()
 
   return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
       <head>
         <AdobeSDKScript />
         <Script data-cookieconsent="ignore" src="/_static/js/cookie-bot.js" />
diff --git a/app/[lang]/(live)/middleware-error/[status]/page.tsx b/app/[lang]/(live)/middleware-error/[status]/page.tsx
index f2cc708ad..177b62af4 100644
--- a/app/[lang]/(live)/middleware-error/[status]/page.tsx
+++ b/app/[lang]/(live)/middleware-error/[status]/page.tsx
@@ -1,4 +1,4 @@
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import styles from "./page.module.css"
 
@@ -11,7 +11,7 @@ export default function MiddlewareError({
 
   return (
     <div className={styles.layout}>
-      Middleware Error {getLang()}: {params.status}
+      Middleware Error {params.lang}: {params.status}
     </div>
   )
 }
diff --git a/app/[lang]/(live-current)/current-content-page/page.tsx b/app/[lang]/(live-current)/current-content-page/page.tsx
index 968a961b7..b0c60f8f5 100644
--- a/app/[lang]/(live-current)/current-content-page/page.tsx
+++ b/app/[lang]/(live-current)/current-content-page/page.tsx
@@ -1,7 +1,7 @@
 import { notFound } from "next/navigation"
 
-import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
-import { GetCurrentBlockPageTrackingData } from "@/lib/graphql/Query/CurrentBlockPageTrackingData.graphql"
+import { GetCurrentBlockPage } from "@/lib/graphql/Query/Current/CurrentBlockPage.graphql"
+import { GetCurrentBlockPageTrackingData } from "@/lib/graphql/Query/Current/CurrentBlockPageTrackingData.graphql"
 import { request } from "@/lib/graphql/request"
 
 import ContentPage from "@/components/Current/ContentPage"
diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx
index cdc9644e4..ec3be8b3c 100644
--- a/app/[lang]/(live-current)/layout.tsx
+++ b/app/[lang]/(live-current)/layout.tsx
@@ -11,7 +11,7 @@ import LangPopup from "@/components/Current/LangPopup"
 import SkipToMainContent from "@/components/SkipToMainContent"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import type { Metadata } from "next"
 
@@ -34,7 +34,7 @@ export default async function RootLayout({
   const { defaultLocale, locale, messages } = await getIntl()
 
   return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
       <head>
         {/* eslint-disable-next-line @next/next/no-css-tags */}
         <link rel="stylesheet" href="/_static/css/core.css" />
@@ -45,7 +45,7 @@ export default async function RootLayout({
           strategy="beforeInteractive"
           data-blockingmode="auto"
           data-cbid="6d539de8-3e67-4f0f-a0df-8cef9070f712"
-          data-culture={getLang()}
+          data-culture={params.lang}
           id="Cookiebot"
           src="https://consent.cookiebot.com/uc.js"
         />
diff --git a/app/[lang]/(preview)/layout.tsx b/app/[lang]/(preview)/layout.tsx
index 387b8f368..25727e7d6 100644
--- a/app/[lang]/(preview)/layout.tsx
+++ b/app/[lang]/(preview)/layout.tsx
@@ -1,5 +1,5 @@
 import InitLivePreview from "@/components/Current/LivePreview"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import type { Metadata } from "next"
 
@@ -17,7 +17,7 @@ export default function RootLayout({
   setLang(params.lang)
 
   return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
       <body>
         <InitLivePreview />
         {children}
diff --git a/app/[lang]/(preview)/preview/[contentType]/[uid]/page.tsx b/app/[lang]/(preview)/preview/[contentType]/[uid]/page.tsx
index 3f6611ffa..fbdfa4893 100644
--- a/app/[lang]/(preview)/preview/[contentType]/[uid]/page.tsx
+++ b/app/[lang]/(preview)/preview/[contentType]/[uid]/page.tsx
@@ -1,4 +1,4 @@
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import {
   ContentTypeParams,
@@ -16,8 +16,8 @@ export default async function PreviewPage({
   return (
     <div>
       <p>
-        Preview for {params.contentType}:{params.uid} in {getLang()} with params{" "}
-        <pre>{JSON.stringify(searchParams, null, 2)}</pre> goes here
+        Preview for {params.contentType}:{params.uid} in {params.lang} with
+        params <pre>{JSON.stringify(searchParams, null, 2)}</pre> goes here
       </p>
     </div>
   )
diff --git a/app/[lang]/(preview-current)/layout.tsx b/app/[lang]/(preview-current)/layout.tsx
index 4f13d5d14..3e98666c8 100644
--- a/app/[lang]/(preview-current)/layout.tsx
+++ b/app/[lang]/(preview-current)/layout.tsx
@@ -1,10 +1,8 @@
-import Script from "next/script"
-
 import Footer from "@/components/Current/Footer"
 import LangPopup from "@/components/Current/LangPopup"
 import InitLivePreview from "@/components/Current/LivePreview"
 import SkipToMainContent from "@/components/SkipToMainContent"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import type { Metadata } from "next"
 
@@ -24,7 +22,7 @@ export default function RootLayout({
   setLang(params.lang)
 
   return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
       <head>
         {/* eslint-disable-next-line @next/next/no-css-tags */}
         <link rel="stylesheet" href="/_static/css/core.css" />
diff --git a/app/[lang]/(preview-current)/preview-current/page.tsx b/app/[lang]/(preview-current)/preview-current/page.tsx
index 396e9925f..f8ca81201 100644
--- a/app/[lang]/(preview-current)/preview-current/page.tsx
+++ b/app/[lang]/(preview-current)/preview-current/page.tsx
@@ -1,11 +1,11 @@
 import ContentstackLivePreview from "@contentstack/live-preview-utils"
 
 import { previewRequest } from "@/lib/graphql/previewRequest"
-import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
+import { GetCurrentBlockPage } from "@/lib/graphql/Query/Current/CurrentBlockPage.graphql"
 
 import ContentPage from "@/components/Current/ContentPage"
 import LoadingSpinner from "@/components/Current/LoadingSpinner"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import type { PageArgs, PreviewParams } from "@/types/params"
 import { LangParams } from "@/types/params"
@@ -26,7 +26,7 @@ export default async function CurrentPreviewPage({
 
     const response = await previewRequest<GetCurrentBlockPageData>(
       GetCurrentBlockPage,
-      { locale: getLang(), url: searchParams.uri }
+      { locale: params.lang, url: searchParams.uri }
     )
 
     if (!response.data?.all_current_blocks_page?.total) {
diff --git a/app/[lang]/webview/[contentType]/[uid]/page.tsx b/app/[lang]/webview/[contentType]/[uid]/page.tsx
index 88bfd57e3..ab64c4916 100644
--- a/app/[lang]/webview/[contentType]/[uid]/page.tsx
+++ b/app/[lang]/webview/[contentType]/[uid]/page.tsx
@@ -1,11 +1,11 @@
 import { headers } from "next/headers"
 import { notFound, redirect } from "next/navigation"
 
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
-import AccountPage from "@/components/ContentType/Webviews/AccountPage"
-import LoyaltyPage from "@/components/ContentType/Webviews/LoyaltyPage"
-import { getLang, setLang } from "@/i18n/serverContext"
+import AccountPage from "@/components/Webviews/AccountPage"
+import LoyaltyPage from "@/components/Webviews/LoyaltyPage"
+import { setLang } from "@/i18n/serverContext"
 
 import {
   ContentTypeWebviewParams,
@@ -18,7 +18,7 @@ export default async function ContentTypePage({
   params,
 }: PageArgs<LangParams & ContentTypeWebviewParams & UIDParams, {}>) {
   setLang(params.lang)
-  const user = await serverClient().user.get()
+  const user = await getProfile()
 
   if (!user) {
     console.log(`[webview:page] unable to load user`)
@@ -31,8 +31,8 @@ export default async function ContentTypePage({
       case "forbidden": // fall through
       case "token_expired":
         const h = headers()
-        const returnURL = `/${getLang()}/webview${h.get("x-pathname")!}`
-        const redirectURL = `/${getLang()}/webview/refresh?returnUrl=${encodeURIComponent(returnURL)}`
+        const returnURL = `/${params.lang}/webview${h.get("x-pathname")!}`
+        const redirectURL = `/${params.lang}/webview/refresh?returnUrl=${encodeURIComponent(returnURL)}`
         console.log(`[webview:page] user error, redirecting to: ${redirectURL}`)
         redirect(redirectURL)
       case "notfound":
diff --git a/app/[lang]/webview/layout.tsx b/app/[lang]/webview/layout.tsx
index de7a7f521..f1d4ee050 100644
--- a/app/[lang]/webview/layout.tsx
+++ b/app/[lang]/webview/layout.tsx
@@ -8,7 +8,7 @@ import TrpcProvider from "@/lib/trpc/Provider"
 import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import styles from "./layout.module.css"
 
@@ -28,7 +28,7 @@ export default async function RootLayout({
   const { defaultLocale, locale, messages } = await getIntl()
 
   return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
       <head>
         <AdobeSDKScript />
         <Script id="ensure-adobeDataLayer">{`
diff --git a/app/api/web/revalidate/manually/route.ts b/app/api/web/revalidate/manually/route.ts
new file mode 100644
index 000000000..ac9ffad50
--- /dev/null
+++ b/app/api/web/revalidate/manually/route.ts
@@ -0,0 +1,60 @@
+import { revalidateTag } from "next/cache"
+import { headers } from "next/headers"
+
+import { Lang } from "@/constants/languages"
+import { env } from "@/env/server"
+import { badRequest, internalServerError } from "@/server/errors/next"
+
+import { generateTag } from "@/utils/generateTag"
+
+// This file is primarily to be used locally to test
+// purging your cache for new (and old) requests
+export async function POST() {
+  try {
+    const headersList = headers()
+    const secret = headersList.get("x-revalidate-secret")
+
+    if (secret !== env.REVALIDATE_SECRET) {
+      console.error(`Invalid Secret`)
+      console.error({ secret })
+      return badRequest({
+        now: Date.now(),
+        revalidated: false,
+      })
+    }
+
+    const affix = headersList.get("x-affix")
+    const identifier = headersList.get("x-identifier")
+    const lang = headersList.get("x-lang")
+    if (lang && identifier) {
+      if (affix) {
+        const tag = generateTag(lang as Lang, identifier, affix)
+        console.info(
+          `Revalidated tag for [lang: ${lang}, identifier: ${identifier}, affix: ${affix}]`
+        )
+        console.info(`Tag: ${tag}`)
+        revalidateTag(tag)
+      } else {
+        const tag = generateTag(lang as Lang, identifier)
+        console.info(
+          `Revalidated tag for [lang: ${lang}, identifier: ${identifier}]`
+        )
+        console.info(`Tag: ${tag}`)
+        revalidateTag(tag)
+      }
+    } else {
+      console.info(`Missing lang and/or identifier`)
+      console.info(`lang: ${lang}, identifier: ${identifier}`)
+      return badRequest({
+        now: Date.now(),
+        revalidated: false,
+      })
+    }
+
+    return Response.json({ revalidated: true, now: Date.now() })
+  } catch (error) {
+    console.error("Failed to revalidate tag(s)")
+    console.error(error)
+    return internalServerError({ revalidated: false, now: Date.now() })
+  }
+}
diff --git a/app/api/web/revalidate/route.ts b/app/api/web/revalidate/route.ts
index e5c35727f..df022b91a 100644
--- a/app/api/web/revalidate/route.ts
+++ b/app/api/web/revalidate/route.ts
@@ -5,7 +5,7 @@ import { z } from "zod"
 
 import { Lang } from "@/constants/languages"
 import { env } from "@/env/server"
-import { internalServerError } from "@/server/errors/next"
+import { badRequest, internalServerError } from "@/server/errors/next"
 import { affix as bookingwidgetAffix } from "@/server/routers/contentstack/bookingwidget/utils"
 import { affix as breadcrumbsAffix } from "@/server/routers/contentstack/breadcrumbs/utils"
 import { languageSwitcherAffix } from "@/server/routers/contentstack/languageSwitcher/utils"
@@ -48,15 +48,10 @@ export async function POST(request: NextRequest) {
     if (secret !== env.REVALIDATE_SECRET) {
       console.error(`Invalid Secret`)
       console.error({ secret })
-      return Response.json(
-        {
-          now: Date.now(),
-          revalidated: false,
-        },
-        {
-          status: 400,
-        }
-      )
+      return badRequest({
+        now: Date.now(),
+        revalidated: false,
+      })
     }
 
     const data = await request.json()
diff --git a/components/Content/Blocks/CardsGrid/index.tsx b/components/Blocks/CardsGrid.tsx
similarity index 82%
rename from components/Content/Blocks/CardsGrid/index.tsx
rename to components/Blocks/CardsGrid.tsx
index a03666bf3..60e654c1a 100644
--- a/components/Content/Blocks/CardsGrid/index.tsx
+++ b/components/Blocks/CardsGrid.tsx
@@ -5,8 +5,8 @@ import ContentCard from "@/components/TempDesignSystem/ContentCard"
 import Grids from "@/components/TempDesignSystem/Grids"
 import LoyaltyCard from "@/components/TempDesignSystem/LoyaltyCard"
 
-import type { CardsGridProps } from "@/types/components/content/blocks"
-import { CardsGridEnum } from "@/types/components/content/enums"
+import type { CardsGridProps } from "@/types/components/blocks/cardsGrid"
+import { CardsGridEnum } from "@/types/enums/cardsGrid"
 
 export default function CardsGrid({
   cards_grid,
@@ -22,36 +22,37 @@ export default function CardsGrid({
       <Grids.Stackable>
         {cards_grid.cards.map((card) => {
           switch (card.__typename) {
-            case CardsGridEnum.Card:
+            case CardsGridEnum.cards.Card: {
               return card.isContentCard ? (
                 <ContentCard
                   key={card.system.uid}
-                  title={card.heading || ""}
-                  description={card.body_text || ""}
+                  description={card.body_text}
+                  backgroundImage={card.backgroundImage}
                   primaryButton={card.primaryButton}
                   secondaryButton={card.secondaryButton}
                   sidePeekButton={card.sidePeekButton}
-                  backgroundImage={card.background_image}
                   style="default"
+                  title={card.heading}
                 />
               ) : (
                 <Card
-                  theme={cards_grid.theme || "one"}
                   key={card.system.uid}
-                  scriptedTopTitle={card.scripted_top_title}
-                  heading={card.heading}
                   bodyText={card.body_text}
-                  secondaryButton={card.secondaryButton}
+                  heading={card.heading}
                   primaryButton={card.primaryButton}
+                  secondaryButton={card.secondaryButton}
+                  scriptedTopTitle={card.scripted_top_title}
+                  theme={cards_grid.theme || "one"}
                 />
               )
-            case CardsGridEnum.LoyaltyCard:
+            }
+            case CardsGridEnum.cards.LoyaltyCard:
               return (
                 <LoyaltyCard
                   key={card.system.uid}
-                  image={card.image}
-                  heading={card.heading}
                   bodyText={card.body_text}
+                  heading={card.heading}
+                  image={card.image}
                   link={card.link}
                 />
               )
diff --git a/components/MyPages/Blocks/Benefits/CurrentLevel/current.module.css b/components/Blocks/DynamicContent/Benefits/CurrentLevel/current.module.css
similarity index 100%
rename from components/MyPages/Blocks/Benefits/CurrentLevel/current.module.css
rename to components/Blocks/DynamicContent/Benefits/CurrentLevel/current.module.css
diff --git a/components/MyPages/Blocks/Benefits/CurrentLevel/index.tsx b/components/Blocks/DynamicContent/Benefits/CurrentLevel/index.tsx
similarity index 82%
rename from components/MyPages/Blocks/Benefits/CurrentLevel/index.tsx
rename to components/Blocks/DynamicContent/Benefits/CurrentLevel/index.tsx
index 71f94fdea..31a920f12 100644
--- a/components/MyPages/Blocks/Benefits/CurrentLevel/index.tsx
+++ b/components/Blocks/DynamicContent/Benefits/CurrentLevel/index.tsx
@@ -1,5 +1,5 @@
 import { MembershipLevelEnum } from "@/constants/membershipLevels"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import SectionContainer from "@/components/Section/Container"
 import SectionHeader from "@/components/Section/Header"
@@ -8,7 +8,6 @@ import Grids from "@/components/TempDesignSystem/Grids"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { getLang } from "@/i18n/serverContext"
 import { getMembershipLevelObject } from "@/utils/membershipLevel"
-import { getMembership } from "@/utils/user"
 
 import styles from "./current.module.css"
 
@@ -19,21 +18,16 @@ export default async function CurrentBenefitsBlock({
   subtitle,
   link,
 }: AccountPageComponentProps) {
-  const user = await serverClient().user.get()
+  const user = await getProfile()
   // TAKE NOTE: we need clarification on how benefits stack from different levels
   // in order to determine if a benefit is specific to a level or if it is a cumulative benefit
   // we might have to add a new boolean property "exclusive" or similar
-  if (!user || "error" in user) {
-    return null
-  }
-  const membership = getMembership(user.memberships)
-  if (!membership) {
-    //  TODO: handle this case?
+  if (!user || "error" in user || !user.membership) {
     return null
   }
 
   const currentLevel = getMembershipLevelObject(
-    user.memberships[0].membershipLevel as MembershipLevelEnum,
+    user.membership.membershipLevel as MembershipLevelEnum,
     getLang()
   )
   if (!currentLevel) {
diff --git a/components/MyPages/Blocks/Benefits/NextLevel/index.tsx b/components/Blocks/DynamicContent/Benefits/NextLevel/index.tsx
similarity index 91%
rename from components/MyPages/Blocks/Benefits/NextLevel/index.tsx
rename to components/Blocks/DynamicContent/Benefits/NextLevel/index.tsx
index 7b82a3dd0..cc2b16793 100644
--- a/components/MyPages/Blocks/Benefits/NextLevel/index.tsx
+++ b/components/Blocks/DynamicContent/Benefits/NextLevel/index.tsx
@@ -1,7 +1,7 @@
 import { Lock } from "react-feather"
 
 import { MembershipLevelEnum } from "@/constants/membershipLevels"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import SectionContainer from "@/components/Section/Container"
 import SectionHeader from "@/components/Section/Header"
@@ -24,12 +24,12 @@ export default async function NextLevelBenefitsBlock({
   link,
 }: AccountPageComponentProps) {
   const intl = await getIntl()
-  const user = await serverClient().user.get()
-  if (!user || "error" in user) {
+  const user = await getProfile()
+  if (!user || "error" in user || !user.membership) {
     return null
   }
   const nextLevel = getMembershipLevelObject(
-    user.memberships[0].nextLevel as MembershipLevelEnum,
+    user.membership.nextLevel as MembershipLevelEnum,
     getLang()
   )
   if (!nextLevel) {
diff --git a/components/MyPages/Blocks/Benefits/NextLevel/next.module.css b/components/Blocks/DynamicContent/Benefits/NextLevel/next.module.css
similarity index 100%
rename from components/MyPages/Blocks/Benefits/NextLevel/next.module.css
rename to components/Blocks/DynamicContent/Benefits/NextLevel/next.module.css
diff --git a/components/Content/Blocks/DynamicContent/HowItWorks/howItWorks.module.css b/components/Blocks/DynamicContent/HowItWorks/howItWorks.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/HowItWorks/howItWorks.module.css
rename to components/Blocks/DynamicContent/HowItWorks/howItWorks.module.css
diff --git a/components/Blocks/DynamicContent/HowItWorks/index.tsx b/components/Blocks/DynamicContent/HowItWorks/index.tsx
new file mode 100644
index 000000000..bd58526e6
--- /dev/null
+++ b/components/Blocks/DynamicContent/HowItWorks/index.tsx
@@ -0,0 +1,27 @@
+import Title from "@/components/TempDesignSystem/Text/Title"
+import { getIntl } from "@/i18n"
+
+import SectionWrapper from "../SectionWrapper"
+
+import styles from "./howItWorks.module.css"
+
+import type { HowItWorksProps } from "@/types/components/blocks/dynamicContent"
+
+export default async function HowItWorks({
+  dynamic_content,
+  firstItem,
+}: HowItWorksProps) {
+  const intl = await getIntl()
+  const displayHeader = !!(
+    dynamic_content.link ||
+    dynamic_content.subtitle ||
+    dynamic_content.title
+  )
+  return (
+    <SectionWrapper dynamic_content={dynamic_content} firstItem={firstItem}>
+      <section className={styles.container}>
+        <Title level="h3">{intl.formatMessage({ id: "How it works" })}</Title>
+      </section>
+    </SectionWrapper>
+  )
+}
diff --git a/components/Content/Blocks/DynamicContent/LoyaltyLevels/index.tsx b/components/Blocks/DynamicContent/LoyaltyLevels/index.tsx
similarity index 79%
rename from components/Content/Blocks/DynamicContent/LoyaltyLevels/index.tsx
rename to components/Blocks/DynamicContent/LoyaltyLevels/index.tsx
index 8a64f8051..1b3c30154 100644
--- a/components/Content/Blocks/DynamicContent/LoyaltyLevels/index.tsx
+++ b/components/Blocks/DynamicContent/LoyaltyLevels/index.tsx
@@ -20,27 +20,35 @@ import Caption from "@/components/TempDesignSystem/Text/Caption"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import levelsData from "@/data/loyaltyLevels"
 
+import SectionWrapper from "../SectionWrapper"
+
 import styles from "./loyaltyLevels.module.css"
 
-import type { Level, LevelCardProps } from "@/types/components/content/blocks"
+import type { LoyaltyLevelsProps } from "@/types/components/blocks/dynamicContent"
+import type { Level, LevelCardProps } from "@/types/components/overviewTable"
 
-export default function LoyaltyLevels() {
+export default function LoyaltyLevels({
+  dynamic_content,
+  firstItem,
+}: LoyaltyLevelsProps) {
   const params = useParams()
   const lang = params.lang as Lang
   const { formatMessage } = useIntl()
 
   const { levels } = levelsData[lang]
   return (
-    <section className={styles.cardContainer}>
-      {levels.map((level: Level) => (
-        <LevelCard
-          key={level.level}
-          formatMessage={formatMessage}
-          lang={lang}
-          level={level}
-        />
-      ))}
-    </section>
+    <SectionWrapper dynamic_content={dynamic_content} firstItem={firstItem}>
+      <section className={styles.cardContainer}>
+        {levels.map((level: Level) => (
+          <LevelCard
+            key={level.level}
+            formatMessage={formatMessage}
+            lang={lang}
+            level={level}
+          />
+        ))}
+      </section>
+    </SectionWrapper>
   )
 }
 
diff --git a/components/Content/Blocks/DynamicContent/LoyaltyLevels/loyaltyLevels.module.css b/components/Blocks/DynamicContent/LoyaltyLevels/loyaltyLevels.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/LoyaltyLevels/loyaltyLevels.module.css
rename to components/Blocks/DynamicContent/LoyaltyLevels/loyaltyLevels.module.css
diff --git a/components/MyPages/Blocks/Overview/Buttons/CopyButton.tsx b/components/Blocks/DynamicContent/Overview/Buttons/CopyButton.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Buttons/CopyButton.tsx
rename to components/Blocks/DynamicContent/Overview/Buttons/CopyButton.tsx
diff --git a/components/MyPages/Blocks/Overview/Buttons/copybutton.module.css b/components/Blocks/DynamicContent/Overview/Buttons/copybutton.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Buttons/copybutton.module.css
rename to components/Blocks/DynamicContent/Overview/Buttons/copybutton.module.css
diff --git a/components/MyPages/Blocks/Overview/Friend/Hero/hero.module.css b/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/Hero/hero.module.css
rename to components/Blocks/DynamicContent/Overview/Friend/Hero/hero.module.css
diff --git a/components/MyPages/Blocks/Overview/Friend/Hero/hero.ts b/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.ts
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/Hero/hero.ts
rename to components/Blocks/DynamicContent/Overview/Friend/Hero/hero.ts
diff --git a/components/MyPages/Blocks/Overview/Friend/Hero/heroVariants.ts b/components/Blocks/DynamicContent/Overview/Friend/Hero/heroVariants.ts
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/Hero/heroVariants.ts
rename to components/Blocks/DynamicContent/Overview/Friend/Hero/heroVariants.ts
diff --git a/components/MyPages/Blocks/Overview/Friend/Hero/index.tsx b/components/Blocks/DynamicContent/Overview/Friend/Hero/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/Hero/index.tsx
rename to components/Blocks/DynamicContent/Overview/Friend/Hero/index.tsx
diff --git a/components/MyPages/Blocks/Overview/Friend/MembershipLevel/index.tsx b/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/MembershipLevel/index.tsx
rename to components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/index.tsx
diff --git a/components/MyPages/Blocks/Overview/Friend/MembershipLevel/membershipLevel.module.css b/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/membershipLevel.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/MembershipLevel/membershipLevel.module.css
rename to components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/membershipLevel.module.css
diff --git a/components/MyPages/Blocks/Overview/Friend/MemershipNumber/index.tsx b/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx
similarity index 85%
rename from components/MyPages/Blocks/Overview/Friend/MemershipNumber/index.tsx
rename to components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx
index afb045656..10114c7ac 100644
--- a/components/MyPages/Blocks/Overview/Friend/MemershipNumber/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx
@@ -2,11 +2,12 @@ import Caption from "@/components/TempDesignSystem/Text/Caption"
 import { getIntl } from "@/i18n"
 
 import CopyButton from "../../Buttons/CopyButton"
-import { MembershipNumberProps } from "./membershipNumber"
 import { membershipNumberVariants } from "./membershipNumberVariants"
 
 import styles from "./membershipNumber.module.css"
 
+import type { MembershipNumberProps } from "@/types/components/myPages/membershipNumber"
+
 export default async function MembershipNumber({
   className,
   color,
@@ -23,7 +24,7 @@ export default async function MembershipNumber({
       </Caption>
       <span className={styles.icon}>
         <Caption className={styles.icon} color="pale" asChild>
-          <code>{membership.membershipNumber ?? "N/A"}</code>
+          <code>{membership?.membershipNumber ?? "N/A"}</code>
         </Caption>
         {membership && (
           <CopyButton membershipNumber={membership.membershipNumber} />
diff --git a/components/MyPages/Blocks/Overview/Friend/MemershipNumber/membershipNumber.module.css b/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumber.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/MemershipNumber/membershipNumber.module.css
rename to components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumber.module.css
diff --git a/components/MyPages/Blocks/Overview/Friend/MemershipNumber/membershipNumberVariants.ts b/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants.ts
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/MemershipNumber/membershipNumberVariants.ts
rename to components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants.ts
diff --git a/components/MyPages/Blocks/Overview/Friend/friend.module.css b/components/Blocks/DynamicContent/Overview/Friend/friend.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Friend/friend.module.css
rename to components/Blocks/DynamicContent/Overview/Friend/friend.module.css
diff --git a/components/MyPages/Blocks/Overview/Friend/index.tsx b/components/Blocks/DynamicContent/Overview/Friend/index.tsx
similarity index 74%
rename from components/MyPages/Blocks/Overview/Friend/index.tsx
rename to components/Blocks/DynamicContent/Overview/Friend/index.tsx
index 304eade1f..c581765b6 100644
--- a/components/MyPages/Blocks/Overview/Friend/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/Friend/index.tsx
@@ -3,22 +3,20 @@ import { membershipLevels } from "@/constants/membershipLevels"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { getIntl } from "@/i18n"
-import { getMembership, isHighestMembership } from "@/utils/user"
+import { isHighestMembership } from "@/utils/user"
 
-import { MembershipNumberProps } from "./MemershipNumber/membershipNumber"
 import MembershipLevel from "./MembershipLevel"
-import MembershipNumber from "./MemershipNumber"
 
 import styles from "./friend.module.css"
 
-import type { UserProps } from "@/types/components/myPages/user"
+import type { FriendProps } from "@/types/components/myPages/friend"
 
 export default async function Friend({
-  user,
-  color,
-}: UserProps & Pick<MembershipNumberProps, "color">) {
+  children,
+  membership,
+  name,
+}: FriendProps) {
   const { formatMessage } = await getIntl()
-  const membership = getMembership(user.memberships)
   if (!membership?.membershipLevel) {
     return null
   }
@@ -45,9 +43,9 @@ export default async function Friend({
       </header>
       <div className={styles.membership}>
         <Title className={styles.name} color="pale" level="h3">
-          {user.name}
+          {name}
         </Title>
-        <MembershipNumber membership={membership} color={color} />
+        {children}
       </div>
     </section>
   )
diff --git a/components/MyPages/Blocks/Overview/Stats/ExpiringPoints/index.tsx b/components/Blocks/DynamicContent/Overview/Stats/ExpiringPoints/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/ExpiringPoints/index.tsx
rename to components/Blocks/DynamicContent/Overview/Stats/ExpiringPoints/index.tsx
diff --git a/components/MyPages/Blocks/Overview/Stats/Points/Container/container.module.css b/components/Blocks/DynamicContent/Overview/Stats/Points/Container/container.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/Points/Container/container.module.css
rename to components/Blocks/DynamicContent/Overview/Stats/Points/Container/container.module.css
diff --git a/components/MyPages/Blocks/Overview/Stats/Points/Container/index.tsx b/components/Blocks/DynamicContent/Overview/Stats/Points/Container/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/Points/Container/index.tsx
rename to components/Blocks/DynamicContent/Overview/Stats/Points/Container/index.tsx
diff --git a/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/index.tsx b/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/index.tsx
rename to components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx
diff --git a/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/pointsColumn.module.css b/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/pointsColumn.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/Points/PointsColumn/pointsColumn.module.css
rename to components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/pointsColumn.module.css
diff --git a/components/MyPages/Blocks/Overview/Stats/Points/index.tsx b/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/Points/index.tsx
rename to components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx
diff --git a/components/MyPages/Blocks/Overview/Stats/index.tsx b/components/Blocks/DynamicContent/Overview/Stats/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/index.tsx
rename to components/Blocks/DynamicContent/Overview/Stats/index.tsx
diff --git a/components/MyPages/Blocks/Overview/Stats/stats.module.css b/components/Blocks/DynamicContent/Overview/Stats/stats.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/Stats/stats.module.css
rename to components/Blocks/DynamicContent/Overview/Stats/stats.module.css
diff --git a/components/MyPages/Blocks/Overview/index.tsx b/components/Blocks/DynamicContent/Overview/index.tsx
similarity index 75%
rename from components/MyPages/Blocks/Overview/index.tsx
rename to components/Blocks/DynamicContent/Overview/index.tsx
index f9b4deab7..bfc6e9692 100644
--- a/components/MyPages/Blocks/Overview/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/index.tsx
@@ -1,12 +1,12 @@
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import SectionContainer from "@/components/Section/Container"
 import SectionHeader from "@/components/Section/Header"
 import SectionLink from "@/components/Section/Link"
 import Divider from "@/components/TempDesignSystem/Divider"
-import { getLang } from "@/i18n/serverContext"
 
 import Hero from "./Friend/Hero"
+import MembershipNumber from "./Friend/MembershipNumber"
 import Friend from "./Friend"
 import Stats from "./Stats"
 
@@ -19,7 +19,7 @@ export default async function Overview({
   subtitle,
   title,
 }: AccountPageComponentProps) {
-  const user = await serverClient().user.get()
+  const user = await getProfile()
   if (!user || "error" in user) {
     return null
   }
@@ -28,7 +28,9 @@ export default async function Overview({
     <SectionContainer>
       <SectionHeader link={link} preamble={subtitle} title={title} topTitle />
       <Hero color="red">
-        <Friend user={user} color="burgundy" />
+        <Friend membership={user.membership} name={user.name}>
+          <MembershipNumber color="burgundy" membership={user.membership} />
+        </Friend>
         <Divider className={styles.divider} color="peach" />
         <Stats user={user} />
       </Hero>
diff --git a/components/MyPages/Blocks/Overview/overview.module.css b/components/Blocks/DynamicContent/Overview/overview.module.css
similarity index 100%
rename from components/MyPages/Blocks/Overview/overview.module.css
rename to components/Blocks/DynamicContent/Overview/overview.module.css
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitCard/benefitCard.module.css b/components/Blocks/DynamicContent/OverviewTable/BenefitCard/benefitCard.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/BenefitCard/benefitCard.module.css
rename to components/Blocks/DynamicContent/OverviewTable/BenefitCard/benefitCard.module.css
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx b/components/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx
similarity index 95%
rename from components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx
index ee02753a7..719f2d2c1 100644
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx
+++ b/components/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx
@@ -6,7 +6,7 @@ import BenefitValue from "../BenefitValue"
 
 import styles from "./benefitCard.module.css"
 
-import type { BenefitCardProps } from "@/types/components/loyalty/blocks"
+import type { BenefitCardProps } from "@/types/components/overviewTable"
 
 export default function BenefitCard({
   comparedValues,
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitList/benefitList.module.css b/components/Blocks/DynamicContent/OverviewTable/BenefitList/benefitList.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/BenefitList/benefitList.module.css
rename to components/Blocks/DynamicContent/OverviewTable/BenefitList/benefitList.module.css
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx b/components/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx
similarity index 92%
rename from components/Content/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx
index b3aaf8784..4756ea7d2 100644
--- a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx
+++ b/components/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx
@@ -4,7 +4,7 @@ import BenefitCard from "../BenefitCard"
 
 import styles from "./benefitList.module.css"
 
-import type { BenefitListProps } from "@/types/components/content/blocks"
+import type { BenefitListProps } from "@/types/components/overviewTable"
 
 export default function BenefitList({ levels }: BenefitListProps) {
   return getUnlockedBenefits(levels).map((benefit) => {
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitValue/benefitValue.module.css b/components/Blocks/DynamicContent/OverviewTable/BenefitValue/benefitValue.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/BenefitValue/benefitValue.module.css
rename to components/Blocks/DynamicContent/OverviewTable/BenefitValue/benefitValue.module.css
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx b/components/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx
similarity index 90%
rename from components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx
index e22b8f70e..22f4313a3 100644
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx
+++ b/components/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx
@@ -4,7 +4,7 @@ import CheckCircle from "@/components/Icons/CheckCircle"
 
 import styles from "./benefitValue.module.css"
 
-import type { BenefitValueProps } from "@/types/components/loyalty/blocks"
+import type { BenefitValueProps } from "@/types/components/overviewTable"
 
 export default function BenefitValue({ benefit }: BenefitValueProps) {
   if (!benefit.unlocked) {
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/index.tsx b/components/Blocks/DynamicContent/OverviewTable/Client.tsx
similarity index 98%
rename from components/Content/Blocks/DynamicContent/OverviewTable/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/Client.tsx
index 044043b08..d21db20df 100644
--- a/components/Content/Blocks/DynamicContent/OverviewTable/index.tsx
+++ b/components/Blocks/DynamicContent/OverviewTable/Client.tsx
@@ -31,9 +31,9 @@ import {
   DesktopSelectColumns,
   type MobileColumnHeaderProps,
   overviewTableActionsEnum,
-  type OverviewTableProps,
+  type OverviewTableClientProps,
   OverviewTableReducerAction,
-} from "@/types/components/loyalty/blocks"
+} from "@/types/components/overviewTable"
 import type { User } from "@/types/user"
 
 const levelsTranslations = {
@@ -126,9 +126,9 @@ function reducer(state: any, action: OverviewTableReducerAction) {
   }
 }
 
-export default function OverviewTable({
+export default function OverviewTableClient({
   activeMembership,
-}: OverviewTableProps) {
+}: OverviewTableClientProps) {
   const intl = useIntl()
   const lang = useLang()
   const levelsData = levelsTranslations[lang]
@@ -241,6 +241,7 @@ export default function OverviewTable({
       />
     )
   }
+
   return (
     <div>
       <div className={styles.mobileColumns}>
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/desktopHeader.module.css b/components/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/desktopHeader.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/desktopHeader.module.css
rename to components/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/desktopHeader.module.css
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx b/components/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx
similarity index 97%
rename from components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx
index edb176eba..154484a79 100644
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx
+++ b/components/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx
@@ -8,7 +8,7 @@ import styles from "./desktopHeader.module.css"
 import type {
   DesktopSelectColumns,
   LargeTableProps,
-} from "@/types/components/loyalty/blocks"
+} from "@/types/components/overviewTable"
 
 export default function DesktopHeader({
   levels,
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx b/components/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx
similarity index 97%
rename from components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx
index 4a534fd5d..1117aa275 100644
--- a/components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx
+++ b/components/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx
@@ -11,7 +11,7 @@ import styles from "./largeTable.module.css"
 import type {
   BenefitTableHeaderProps,
   LargeTableProps,
-} from "@/types/components/content/blocks"
+} from "@/types/components/overviewTable"
 
 export default function LargeTable({
   levels,
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/largeTable.module.css b/components/Blocks/DynamicContent/OverviewTable/LargeTable/largeTable.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/largeTable.module.css
rename to components/Blocks/DynamicContent/OverviewTable/LargeTable/largeTable.module.css
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx b/components/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx
similarity index 84%
rename from components/Content/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx
index d4ee59647..519c62ef1 100644
--- a/components/Content/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx
+++ b/components/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx
@@ -1,6 +1,6 @@
 import styles from "./levelSummary.module.css"
 
-import type { LevelSummaryProps } from "@/types/components/content/blocks"
+import type { LevelSummaryProps } from "@/types/components/overviewTable"
 
 export default function LevelSummary({
   level,
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/LevelSummary/levelSummary.module.css b/components/Blocks/DynamicContent/OverviewTable/LevelSummary/levelSummary.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/LevelSummary/levelSummary.module.css
rename to components/Blocks/DynamicContent/OverviewTable/LevelSummary/levelSummary.module.css
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/YourLevelScript/index.tsx b/components/Blocks/DynamicContent/OverviewTable/YourLevelScript/index.tsx
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/YourLevelScript/index.tsx
rename to components/Blocks/DynamicContent/OverviewTable/YourLevelScript/index.tsx
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/YourLevelScript/yourLevel.module.css b/components/Blocks/DynamicContent/OverviewTable/YourLevelScript/yourLevel.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/YourLevelScript/yourLevel.module.css
rename to components/Blocks/DynamicContent/OverviewTable/YourLevelScript/yourLevel.module.css
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/data/DA.json b/components/Blocks/DynamicContent/OverviewTable/data/DA.json
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/data/DA.json
rename to components/Blocks/DynamicContent/OverviewTable/data/DA.json
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/data/DE.json b/components/Blocks/DynamicContent/OverviewTable/data/DE.json
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/data/DE.json
rename to components/Blocks/DynamicContent/OverviewTable/data/DE.json
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/data/EN.json b/components/Blocks/DynamicContent/OverviewTable/data/EN.json
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/data/EN.json
rename to components/Blocks/DynamicContent/OverviewTable/data/EN.json
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/data/FI.json b/components/Blocks/DynamicContent/OverviewTable/data/FI.json
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/data/FI.json
rename to components/Blocks/DynamicContent/OverviewTable/data/FI.json
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/data/NO.json b/components/Blocks/DynamicContent/OverviewTable/data/NO.json
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/data/NO.json
rename to components/Blocks/DynamicContent/OverviewTable/data/NO.json
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/SV.json b/components/Blocks/DynamicContent/OverviewTable/data/SV.json
similarity index 100%
rename from components/Loyalty/Blocks/DynamicContent/OverviewTable/data/SV.json
rename to components/Blocks/DynamicContent/OverviewTable/data/SV.json
diff --git a/components/Blocks/DynamicContent/OverviewTable/index.tsx b/components/Blocks/DynamicContent/OverviewTable/index.tsx
new file mode 100644
index 000000000..a15135855
--- /dev/null
+++ b/components/Blocks/DynamicContent/OverviewTable/index.tsx
@@ -0,0 +1,18 @@
+import { serverClient } from "@/lib/trpc/server"
+
+import SectionWrapper from "../SectionWrapper"
+import OverviewTableClient from "./Client"
+
+import type { OverviewTableProps } from "@/types/components/blocks/dynamicContent"
+
+export default async function OverviewTable({
+  dynamic_content,
+  firstItem,
+}: OverviewTableProps) {
+  const membershipLevel = await serverClient().user.safeMembershipLevel()
+  return (
+    <SectionWrapper dynamic_content={dynamic_content} firstItem={firstItem}>
+      <OverviewTableClient activeMembership={membershipLevel} />
+    </SectionWrapper>
+  )
+}
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/overviewTable.module.css b/components/Blocks/DynamicContent/OverviewTable/overviewTable.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/OverviewTable/overviewTable.module.css
rename to components/Blocks/DynamicContent/OverviewTable/overviewTable.module.css
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/awardPoints.module.css b/components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPoints.module.css
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/awardPoints.module.css
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPoints.module.css
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/awardPointsVariants.ts b/components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPointsVariants.ts
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/awardPointsVariants.ts
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPointsVariants.ts
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/index.tsx b/components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/index.tsx
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/index.tsx
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Client.tsx b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/Client.tsx
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Client.tsx
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/Client.tsx
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/ClientTable/Row/index.tsx b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/ClientTable/Row/index.tsx
similarity index 81%
rename from components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/ClientTable/Row/index.tsx
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/ClientTable/Row/index.tsx
index 7d73a1f2c..adc072086 100644
--- a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/ClientTable/Row/index.tsx
+++ b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/ClientTable/Row/index.tsx
@@ -6,14 +6,15 @@ import { useIntl } from "react-intl"
 import { webviews } from "@/constants/routes/webviews"
 import { dt } from "@/lib/dt"
 
-import AwardPoints from "@/components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints"
 import Link from "@/components/TempDesignSystem/Link"
 import Table from "@/components/TempDesignSystem/Table"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import useLang from "@/hooks/useLang"
 
+import AwardPoints from "../../../AwardPoints"
+
 import type { RowProps } from "@/types/components/myPages/myPage/earnAndBurn"
-import { RewardTransactionTypes } from "@/types/components/myPages/myPage/enums"
+import { Transactions } from "@/types/enums/transactions"
 
 export default function Row({ transaction }: RowProps) {
   const intl = useIntl()
@@ -29,8 +30,8 @@ export default function Row({ transaction }: RowProps) {
       : `${nightString}`
 
   switch (transaction.type) {
-    case RewardTransactionTypes.stay:
-    case RewardTransactionTypes.stayAdj:
+    case Transactions.rewardType.stay:
+    case Transactions.rewardType.stayAdj:
       if (transaction.hotelId === "ORS") {
         description = intl.formatMessage({ id: "Former Scandic Hotel" })
       }
@@ -40,19 +41,19 @@ export default function Row({ transaction }: RowProps) {
         })
       }
       break
-    case RewardTransactionTypes.ancillary:
+    case Transactions.rewardType.ancillary:
       description = intl.formatMessage({ id: "Extras to your booking" })
       break
-    case RewardTransactionTypes.enrollment:
+    case Transactions.rewardType.enrollment:
       description = intl.formatMessage({ id: "Sign up bonus" })
       break
-    case RewardTransactionTypes.mastercard_points:
+    case Transactions.rewardType.mastercard_points:
       description = intl.formatMessage({ id: "Scandic Friends Mastercard" })
       break
-    case RewardTransactionTypes.tui_points:
+    case Transactions.rewardType.tui_points:
       description = intl.formatMessage({ id: "TUI Points" })
 
-    case RewardTransactionTypes.pointShop:
+    case Transactions.rewardType.pointShop:
       description = intl.formatMessage({ id: "Scandic Friends Point Shop" })
       break
   }
@@ -65,8 +66,8 @@ export default function Row({ transaction }: RowProps) {
     if (
       !isWebview &&
       transaction.bookingUrl &&
-      (transaction.type === RewardTransactionTypes.stay ||
-        transaction.type === RewardTransactionTypes.rewardNight)
+      (transaction.type === Transactions.rewardType.stay ||
+        transaction.type === Transactions.rewardType.rewardNight)
     ) {
       return (
         <Link variant="underscored" href={transaction.bookingUrl}>
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/ClientTable/clientTable.module.css b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/ClientTable/clientTable.module.css
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/ClientTable/clientTable.module.css
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/ClientTable/clientTable.module.css
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/ClientTable/index.tsx b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/ClientTable/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/ClientTable/index.tsx
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/ClientTable/index.tsx
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Pagination/index.tsx b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/Pagination/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Pagination/index.tsx
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/Pagination/index.tsx
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Pagination/pagination.module.css b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/Pagination/pagination.module.css
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Pagination/pagination.module.css
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/Pagination/pagination.module.css
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/index.tsx b/components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/index.tsx
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/JourneyTable/index.tsx
diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/index.tsx b/components/Blocks/DynamicContent/Points/EarnAndBurn/index.tsx
similarity index 92%
rename from components/MyPages/Blocks/Points/EarnAndBurn/index.tsx
rename to components/Blocks/DynamicContent/Points/EarnAndBurn/index.tsx
index 9172bf7fd..28b92f18c 100644
--- a/components/MyPages/Blocks/Points/EarnAndBurn/index.tsx
+++ b/components/Blocks/DynamicContent/Points/EarnAndBurn/index.tsx
@@ -6,7 +6,7 @@ import JourneyTable from "./JourneyTable"
 
 import type { AccountPageComponentProps } from "@/types/components/myPages/myPage/accountPage"
 
-export default async function EarnAndBurn({
+export default function EarnAndBurn({
   link,
   subtitle,
   title,
diff --git a/components/MyPages/Blocks/Points/ExpiringPoints/ExpiringPointsTable/expiringPointsTable.module.css b/components/Blocks/DynamicContent/Points/ExpiringPoints/ExpiringPointsTable/expiringPointsTable.module.css
similarity index 100%
rename from components/MyPages/Blocks/Points/ExpiringPoints/ExpiringPointsTable/expiringPointsTable.module.css
rename to components/Blocks/DynamicContent/Points/ExpiringPoints/ExpiringPointsTable/expiringPointsTable.module.css
diff --git a/components/MyPages/Blocks/Points/ExpiringPoints/ExpiringPointsTable/index.tsx b/components/Blocks/DynamicContent/Points/ExpiringPoints/ExpiringPointsTable/index.tsx
similarity index 93%
rename from components/MyPages/Blocks/Points/ExpiringPoints/ExpiringPointsTable/index.tsx
rename to components/Blocks/DynamicContent/Points/ExpiringPoints/ExpiringPointsTable/index.tsx
index 1113d638d..729af9098 100644
--- a/components/MyPages/Blocks/Points/ExpiringPoints/ExpiringPointsTable/index.tsx
+++ b/components/Blocks/DynamicContent/Points/ExpiringPoints/ExpiringPointsTable/index.tsx
@@ -4,11 +4,12 @@ import { useIntl } from "react-intl"
 
 import { dt } from "@/lib/dt"
 
-import AwardPoints from "@/components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints"
 import Table from "@/components/TempDesignSystem/Table"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import useLang from "@/hooks/useLang"
 
+import AwardPoints from "../../EarnAndBurn/AwardPoints"
+
 const tableHeadings = ["Points", "Expiration Date"]
 
 export default function ExpiringPointsTable({
diff --git a/components/MyPages/Blocks/Points/ExpiringPoints/expiringPoints.module.css b/components/Blocks/DynamicContent/Points/ExpiringPoints/expiringPoints.module.css
similarity index 100%
rename from components/MyPages/Blocks/Points/ExpiringPoints/expiringPoints.module.css
rename to components/Blocks/DynamicContent/Points/ExpiringPoints/expiringPoints.module.css
diff --git a/components/MyPages/Blocks/Points/ExpiringPoints/index.tsx b/components/Blocks/DynamicContent/Points/ExpiringPoints/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Points/ExpiringPoints/index.tsx
rename to components/Blocks/DynamicContent/Points/ExpiringPoints/index.tsx
diff --git a/components/MyPages/Blocks/Points/Overview/Points/index.tsx b/components/Blocks/DynamicContent/Points/Overview/Points/index.tsx
similarity index 86%
rename from components/MyPages/Blocks/Points/Overview/Points/index.tsx
rename to components/Blocks/DynamicContent/Points/Overview/Points/index.tsx
index fceb280bf..f062c5a30 100644
--- a/components/MyPages/Blocks/Points/Overview/Points/index.tsx
+++ b/components/Blocks/DynamicContent/Points/Overview/Points/index.tsx
@@ -1,18 +1,16 @@
-import {
-  MembershipLevelEnum,
-  membershipLevels,
-} from "@/constants/membershipLevels"
+import { MembershipLevelEnum } from "@/constants/membershipLevels"
 
-import PointsContainer from "@/components/MyPages/Blocks/Overview/Stats/Points/Container"
+import { getIntl } from "@/i18n"
+import { getMembershipLevelObject } from "@/utils/membershipLevel"
+import { getMembership } from "@/utils/user"
+
+import PointsContainer from "../../../Overview/Stats/Points/Container"
 import {
   NextLevelNightsColumn,
   NextLevelPointsColumn,
   StayOnLevelColumn,
   YourPointsColumn,
-} from "@/components/MyPages/Blocks/Overview/Stats/Points/PointsColumn"
-import { getIntl } from "@/i18n"
-import { getMembershipLevelObject } from "@/utils/membershipLevel"
-import { getMembership } from "@/utils/user"
+} from "../../../Overview/Stats/Points/PointsColumn"
 
 import { UserProps } from "@/types/components/myPages/user"
 import { LangParams } from "@/types/params"
diff --git a/components/MyPages/Blocks/Points/Overview/index.tsx b/components/Blocks/DynamicContent/Points/Overview/index.tsx
similarity index 76%
rename from components/MyPages/Blocks/Points/Overview/index.tsx
rename to components/Blocks/DynamicContent/Points/Overview/index.tsx
index 047bb6b93..9ff59ccc9 100644
--- a/components/MyPages/Blocks/Points/Overview/index.tsx
+++ b/components/Blocks/DynamicContent/Points/Overview/index.tsx
@@ -1,4 +1,4 @@
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import SectionContainer from "@/components/Section/Container"
 import SectionHeader from "@/components/Section/Header"
@@ -7,6 +7,7 @@ import Divider from "@/components/TempDesignSystem/Divider"
 
 import Friend from "../../Overview/Friend"
 import Hero from "../../Overview/Friend/Hero"
+import MembershipNumber from "../../Overview/Friend/MembershipNumber"
 import Stats from "../../Overview/Stats"
 
 import styles from "./overview.module.css"
@@ -18,7 +19,7 @@ export default async function PointsOverview({
   subtitle,
   title,
 }: AccountPageComponentProps) {
-  const user = await serverClient().user.get()
+  const user = await getProfile()
   if (!user || "error" in user) {
     return null
   }
@@ -27,7 +28,9 @@ export default async function PointsOverview({
     <SectionContainer>
       <SectionHeader link={link} preamble={subtitle} title={title} topTitle />
       <Hero color="burgundy">
-        <Friend user={user} color="red" />
+        <Friend membership={user.membership} name={user.name}>
+          <MembershipNumber color="red" membership={user.membership} />
+        </Friend>
         <Divider className={styles.divider} color="peach" />
         <Stats user={user} />
       </Hero>
diff --git a/components/MyPages/Blocks/Points/Overview/overview.module.css b/components/Blocks/DynamicContent/Points/Overview/overview.module.css
similarity index 100%
rename from components/MyPages/Blocks/Points/Overview/overview.module.css
rename to components/Blocks/DynamicContent/Points/Overview/overview.module.css
diff --git a/components/Blocks/DynamicContent/SectionWrapper/index.tsx b/components/Blocks/DynamicContent/SectionWrapper/index.tsx
new file mode 100644
index 000000000..664486697
--- /dev/null
+++ b/components/Blocks/DynamicContent/SectionWrapper/index.tsx
@@ -0,0 +1,46 @@
+import SectionContainer from "@/components/Section/Container"
+import SectionHeader from "@/components/Section/Header"
+import SectionLink from "@/components/Section/Link"
+import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
+import Title from "@/components/TempDesignSystem/Text/Title"
+
+import styles from "./sectionWrapper.module.css"
+
+import type { DynamicContentProps } from "@/types/components/blocks/dynamicContent"
+import { DynamicContentEnum } from "@/types/enums/dynamicContent"
+
+export default function SectionWrapper({
+  children,
+  dynamic_content,
+  firstItem,
+}: React.PropsWithChildren<DynamicContentProps>) {
+  const displayHeader = !!(
+    dynamic_content.link ||
+    dynamic_content.subtitle ||
+    dynamic_content.title
+  )
+  const isOverviewTable =
+    dynamic_content.component ===
+    DynamicContentEnum.Blocks.components.overview_table
+  return (
+    <SectionContainer className={styles.container}>
+      {isOverviewTable ? (
+        <div className={styles.header}>
+          <Title className={styles.tableTitle}> {dynamic_content.title}</Title>
+          <Subtitle>{dynamic_content.subtitle}</Subtitle>
+        </div>
+      ) : displayHeader ? (
+        <SectionHeader
+          link={dynamic_content.link}
+          preamble={dynamic_content.subtitle}
+          title={dynamic_content.title}
+          topTitle={firstItem}
+        />
+      ) : null}
+      {children}
+      {displayHeader ? (
+        <SectionLink link={dynamic_content.link} variant="mobile" />
+      ) : null}
+    </SectionContainer>
+  )
+}
diff --git a/components/Content/Blocks/DynamicContent/dynamicContent.module.css b/components/Blocks/DynamicContent/SectionWrapper/sectionWrapper.module.css
similarity index 100%
rename from components/Content/Blocks/DynamicContent/dynamicContent.module.css
rename to components/Blocks/DynamicContent/SectionWrapper/sectionWrapper.module.css
diff --git a/components/MyPages/Blocks/Stays/ListContainer/container.module.css b/components/Blocks/DynamicContent/Stays/ListContainer/container.module.css
similarity index 100%
rename from components/MyPages/Blocks/Stays/ListContainer/container.module.css
rename to components/Blocks/DynamicContent/Stays/ListContainer/container.module.css
diff --git a/components/MyPages/Blocks/Stays/ListContainer/index.tsx b/components/Blocks/DynamicContent/Stays/ListContainer/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/ListContainer/index.tsx
rename to components/Blocks/DynamicContent/Stays/ListContainer/index.tsx
diff --git a/components/MyPages/Blocks/Stays/Previous/Client.tsx b/components/Blocks/DynamicContent/Stays/Previous/Client.tsx
similarity index 95%
rename from components/MyPages/Blocks/Stays/Previous/Client.tsx
rename to components/Blocks/DynamicContent/Stays/Previous/Client.tsx
index 08986ae13..e57956f27 100644
--- a/components/MyPages/Blocks/Stays/Previous/Client.tsx
+++ b/components/Blocks/DynamicContent/Stays/Previous/Client.tsx
@@ -42,7 +42,7 @@ export default function ClientPreviousStays({
   // TS having a hard time with the filtered type.
   // This is only temporary as we will not return null
   // later on when we handle errors appropriately.
-  const filteredStays = (data?.pages.filter((page) => page && page.data) ??
+  const filteredStays = (data?.pages.filter((page) => page?.data) ??
     []) as unknown as PreviousStaysNonNullResponseObject[]
   const stays = filteredStays.flatMap((page) => page.data)
 
diff --git a/components/MyPages/Blocks/Stays/Previous/EmptyPreviousStays/emptyPreviousStays.module.css b/components/Blocks/DynamicContent/Stays/Previous/EmptyPreviousStays/emptyPreviousStays.module.css
similarity index 100%
rename from components/MyPages/Blocks/Stays/Previous/EmptyPreviousStays/emptyPreviousStays.module.css
rename to components/Blocks/DynamicContent/Stays/Previous/EmptyPreviousStays/emptyPreviousStays.module.css
diff --git a/components/MyPages/Blocks/Stays/Previous/EmptyPreviousStays/index.tsx b/components/Blocks/DynamicContent/Stays/Previous/EmptyPreviousStays/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/Previous/EmptyPreviousStays/index.tsx
rename to components/Blocks/DynamicContent/Stays/Previous/EmptyPreviousStays/index.tsx
diff --git a/components/MyPages/Blocks/Stays/Previous/index.tsx b/components/Blocks/DynamicContent/Stays/Previous/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/Previous/index.tsx
rename to components/Blocks/DynamicContent/Stays/Previous/index.tsx
diff --git a/components/MyPages/Blocks/Stays/ShowMoreButton/button.module.css b/components/Blocks/DynamicContent/Stays/ShowMoreButton/button.module.css
similarity index 100%
rename from components/MyPages/Blocks/Stays/ShowMoreButton/button.module.css
rename to components/Blocks/DynamicContent/Stays/ShowMoreButton/button.module.css
diff --git a/components/MyPages/Blocks/Stays/ShowMoreButton/index.tsx b/components/Blocks/DynamicContent/Stays/ShowMoreButton/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/ShowMoreButton/index.tsx
rename to components/Blocks/DynamicContent/Stays/ShowMoreButton/index.tsx
diff --git a/components/MyPages/Blocks/Stays/Soonest/EmptyUpcomingStays/emptyUpcomingStays.module.css b/components/Blocks/DynamicContent/Stays/Soonest/EmptyUpcomingStays/emptyUpcomingStays.module.css
similarity index 100%
rename from components/MyPages/Blocks/Stays/Soonest/EmptyUpcomingStays/emptyUpcomingStays.module.css
rename to components/Blocks/DynamicContent/Stays/Soonest/EmptyUpcomingStays/emptyUpcomingStays.module.css
diff --git a/components/MyPages/Blocks/Stays/Soonest/EmptyUpcomingStays/index.tsx b/components/Blocks/DynamicContent/Stays/Soonest/EmptyUpcomingStays/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/Soonest/EmptyUpcomingStays/index.tsx
rename to components/Blocks/DynamicContent/Stays/Soonest/EmptyUpcomingStays/index.tsx
diff --git a/components/MyPages/Blocks/Stays/Soonest/index.tsx b/components/Blocks/DynamicContent/Stays/Soonest/index.tsx
similarity index 83%
rename from components/MyPages/Blocks/Stays/Soonest/index.tsx
rename to components/Blocks/DynamicContent/Stays/Soonest/index.tsx
index 5069d5276..0aaa2316c 100644
--- a/components/MyPages/Blocks/Stays/Soonest/index.tsx
+++ b/components/Blocks/DynamicContent/Stays/Soonest/index.tsx
@@ -15,17 +15,17 @@ export default async function SoonestStays({
   subtitle,
   link,
 }: AccountPageComponentProps) {
-  const response = await serverClient().user.stays.upcoming({ limit: 3 })
-  if (!response?.data) {
+  const upcomingStays = await serverClient().user.stays.upcoming({ limit: 3 })
+  if (!upcomingStays?.data) {
     return null
   }
 
   return (
     <SectionContainer>
       <SectionHeader title={title} preamble={subtitle} link={link} />
-      {response.data.length ? (
+      {upcomingStays.data.length ? (
         <Grids.Stackable>
-          {response.data.map((stay) => (
+          {upcomingStays.data.map((stay) => (
             <StayCard key={stay.attributes.confirmationNumber} stay={stay} />
           ))}
         </Grids.Stackable>
diff --git a/components/MyPages/Blocks/Stays/StayCard/index.tsx b/components/Blocks/DynamicContent/Stays/StayCard/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/StayCard/index.tsx
rename to components/Blocks/DynamicContent/Stays/StayCard/index.tsx
diff --git a/components/MyPages/Blocks/Stays/StayCard/stay.module.css b/components/Blocks/DynamicContent/Stays/StayCard/stay.module.css
similarity index 100%
rename from components/MyPages/Blocks/Stays/StayCard/stay.module.css
rename to components/Blocks/DynamicContent/Stays/StayCard/stay.module.css
diff --git a/components/MyPages/Blocks/Stays/Upcoming/Client.tsx b/components/Blocks/DynamicContent/Stays/Upcoming/Client.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/Upcoming/Client.tsx
rename to components/Blocks/DynamicContent/Stays/Upcoming/Client.tsx
diff --git a/components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css b/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css
similarity index 100%
rename from components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css
rename to components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css
diff --git a/components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/index.tsx b/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/index.tsx
rename to components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/index.tsx
diff --git a/components/MyPages/Blocks/Stays/Upcoming/index.tsx b/components/Blocks/DynamicContent/Stays/Upcoming/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Stays/Upcoming/index.tsx
rename to components/Blocks/DynamicContent/Stays/Upcoming/index.tsx
diff --git a/components/MyPages/Blocks/Stays/Upcoming/upcoming.module.css b/components/Blocks/DynamicContent/Stays/Upcoming/upcoming.module.css
similarity index 100%
rename from components/MyPages/Blocks/Stays/Upcoming/upcoming.module.css
rename to components/Blocks/DynamicContent/Stays/Upcoming/upcoming.module.css
diff --git a/components/Blocks/DynamicContent/index.tsx b/components/Blocks/DynamicContent/index.tsx
new file mode 100644
index 000000000..cb6233139
--- /dev/null
+++ b/components/Blocks/DynamicContent/index.tsx
@@ -0,0 +1,61 @@
+import CurrentBenefitsBlock from "@/components/Blocks/DynamicContent/Benefits/CurrentLevel"
+import NextLevelBenefitsBlock from "@/components/Blocks/DynamicContent/Benefits/NextLevel"
+import HowItWorks from "@/components/Blocks/DynamicContent/HowItWorks"
+import LoyaltyLevels from "@/components/Blocks/DynamicContent/LoyaltyLevels"
+import Overview from "@/components/Blocks/DynamicContent/Overview"
+import OverviewTable from "@/components/Blocks/DynamicContent/OverviewTable"
+import EarnAndBurn from "@/components/Blocks/DynamicContent/Points/EarnAndBurn"
+import ExpiringPoints from "@/components/Blocks/DynamicContent/Points/ExpiringPoints"
+import PointsOverview from "@/components/Blocks/DynamicContent/Points/Overview"
+import PreviousStays from "@/components/Blocks/DynamicContent/Stays/Previous"
+import SoonestStays from "@/components/Blocks/DynamicContent/Stays/Soonest"
+import UpcomingStays from "@/components/Blocks/DynamicContent/Stays/Upcoming"
+
+import type { DynamicContentProps } from "@/types/components/blocks/dynamicContent"
+import { DynamicContentEnum } from "@/types/enums/dynamicContent"
+
+export default async function DynamicContent({
+  dynamic_content,
+  firstItem,
+}: DynamicContentProps) {
+  switch (dynamic_content.component) {
+    case DynamicContentEnum.Blocks.components.current_benefits:
+      return <CurrentBenefitsBlock {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.earn_and_burn:
+      return <EarnAndBurn {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.expiring_points:
+      return <ExpiringPoints {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.how_it_works:
+      return (
+        <HowItWorks dynamic_content={dynamic_content} firstItem={firstItem} />
+      )
+    case DynamicContentEnum.Blocks.components.loyalty_levels:
+      return (
+        <LoyaltyLevels
+          dynamic_content={dynamic_content}
+          firstItem={firstItem}
+        />
+      )
+    case DynamicContentEnum.Blocks.components.membership_overview:
+      return <Overview {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.next_benefits:
+      return <NextLevelBenefitsBlock {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.overview_table:
+      return (
+        <OverviewTable
+          dynamic_content={dynamic_content}
+          firstItem={firstItem}
+        />
+      )
+    case DynamicContentEnum.Blocks.components.points_overview:
+      return <PointsOverview {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.previous_stays:
+      return <PreviousStays {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.soonest_stays:
+      return <SoonestStays {...dynamic_content} />
+    case DynamicContentEnum.Blocks.components.upcoming_stays:
+      return <UpcomingStays {...dynamic_content} />
+    default:
+      return null
+  }
+}
diff --git a/components/MyPages/Blocks/Shortcuts/index.tsx b/components/Blocks/Shortcuts/index.tsx
similarity index 100%
rename from components/MyPages/Blocks/Shortcuts/index.tsx
rename to components/Blocks/Shortcuts/index.tsx
diff --git a/components/MyPages/Blocks/Shortcuts/shortcuts.module.css b/components/Blocks/Shortcuts/shortcuts.module.css
similarity index 100%
rename from components/MyPages/Blocks/Shortcuts/shortcuts.module.css
rename to components/Blocks/Shortcuts/shortcuts.module.css
diff --git a/components/Content/Blocks/TextCols/index.tsx b/components/Blocks/TextCols/index.tsx
similarity index 80%
rename from components/Content/Blocks/TextCols/index.tsx
rename to components/Blocks/TextCols/index.tsx
index afcc6d0cf..d97f78983 100644
--- a/components/Content/Blocks/TextCols/index.tsx
+++ b/components/Blocks/TextCols/index.tsx
@@ -5,12 +5,12 @@ import { renderOptions } from "./renderOptions"
 
 import styles from "./textcols.module.css"
 
-import type { TextColsProps } from "@/types/components/content/blocks"
+import type { TextColProps } from "@/types/components/blocks/textCols"
 
-export default function TextCols({ textCols }: TextColsProps) {
+export default function TextCols({ text_cols }: TextColProps) {
   return (
     <div className={styles.columns}>
-      {textCols.columns.map((col) => {
+      {text_cols.columns.map((col) => {
         return (
           <section key={col.title} className={styles.column}>
             <Subtitle>{col.title}</Subtitle>
diff --git a/components/Content/Blocks/TextCols/renderOptions.tsx b/components/Blocks/TextCols/renderOptions.tsx
similarity index 85%
rename from components/Content/Blocks/TextCols/renderOptions.tsx
rename to components/Blocks/TextCols/renderOptions.tsx
index 55582de95..75d0d05a1 100644
--- a/components/Content/Blocks/TextCols/renderOptions.tsx
+++ b/components/Blocks/TextCols/renderOptions.tsx
@@ -2,15 +2,15 @@ import Link from "@/components/TempDesignSystem/Link"
 
 import styles from "./textcols.module.css"
 
-import type { EmbedByUid } from "@/types/components/jsontohtml"
-import { RTEItemTypeEnum, RTETypeEnum } from "@/types/rte/enums"
+import type { EmbedByUid } from "@/types/transitionTypes/jsontohtml"
+import { RTEItemTypeEnum, RTETypeEnum } from "@/types/transitionTypes/rte/enums"
 import type {
   RTEDefaultNode,
   RTENext,
   RTENode,
   RTERegularNode,
-} from "@/types/rte/node"
-import type { RenderOptions } from "@/types/rte/option"
+} from "@/types/transitionTypes/rte/node"
+import type { RenderOptions } from "@/types/transitionTypes/rte/option"
 
 export const renderOptions: RenderOptions = {
   [RTETypeEnum.p]: (
diff --git a/components/Content/Blocks/TextCols/textcols.module.css b/components/Blocks/TextCols/textcols.module.css
similarity index 100%
rename from components/Content/Blocks/TextCols/textcols.module.css
rename to components/Blocks/TextCols/textcols.module.css
diff --git a/components/Blocks/index.tsx b/components/Blocks/index.tsx
new file mode 100644
index 000000000..9946a6fa0
--- /dev/null
+++ b/components/Blocks/index.tsx
@@ -0,0 +1,64 @@
+import CardsGrid from "@/components/Blocks/CardsGrid"
+import DynamicContent from "@/components/Blocks/DynamicContent"
+import Shortcuts from "@/components/Blocks/Shortcuts"
+import TextCols from "@/components/Blocks/TextCols"
+import JsonToHtml from "@/components/JsonToHtml"
+
+import type { BlocksProps } from "@/types/components/blocks"
+import { BlocksEnums } from "@/types/enums/blocks"
+
+export default function Blocks({ blocks }: BlocksProps) {
+  return blocks.map((block, idx) => {
+    const firstItem = idx === 0
+    switch (block.typename) {
+      case BlocksEnums.block.CardsGrid:
+        return (
+          <CardsGrid
+            cards_grid={block.cards_grid}
+            key={`${block.cards_grid.title}-${idx}`}
+            firstItem={firstItem}
+          />
+        )
+      case BlocksEnums.block.Content:
+        return (
+          <section key={`${block.typename}-${idx}`}>
+            <JsonToHtml
+              nodes={block.content.json.children}
+              embeds={block.content.embedded_itemsConnection.edges}
+            />
+          </section>
+        )
+      case BlocksEnums.block.DynamicContent:
+        return (
+          <DynamicContent
+            dynamic_content={block.dynamic_content}
+            firstItem={firstItem}
+            key={`${block.dynamic_content.title}-${idx}`}
+          />
+        )
+      case BlocksEnums.block.Shortcuts:
+        return (
+          <Shortcuts
+            firstItem={firstItem}
+            key={`${block.shortcuts.title}-${idx}`}
+            shortcuts={block.shortcuts.shortcuts}
+            subtitle={block.shortcuts.subtitle}
+            title={block.shortcuts.title}
+          />
+        )
+      case BlocksEnums.block.TextCols:
+        return <TextCols text_cols={block.text_cols} />
+      case BlocksEnums.block.TextContent:
+        return (
+          <section key={`${block.typename}-${idx}`}>
+            <JsonToHtml
+              embeds={block.text_content.content.embedded_itemsConnection.edges}
+              nodes={block.text_content.content.json.children}
+            />
+          </section>
+        )
+      default:
+        return null
+    }
+  })
+}
diff --git a/components/BookingWidget/bookingWidget.module.css b/components/BookingWidget/bookingWidget.module.css
index 27e9b2279..5664279a2 100644
--- a/components/BookingWidget/bookingWidget.module.css
+++ b/components/BookingWidget/bookingWidget.module.css
@@ -1,6 +1,8 @@
 .container {
+  background-color: var(--Base-Surface-Primary-light-Normal);
   border-top: 1px solid var(--Base-Border-Subtle);
   border-bottom: 1px solid var(--Base-Border-Subtle);
+  padding: var(--Spacing-x2) var(--Spacing-x5);
 }
 
 @media screen and (max-width: 1367px) {
diff --git a/components/BookingWidget/index.tsx b/components/BookingWidget/index.tsx
index 0a8c0dbd9..de5a972ae 100644
--- a/components/BookingWidget/index.tsx
+++ b/components/BookingWidget/index.tsx
@@ -1,11 +1,23 @@
+import { getLocations } from "@/lib/trpc/memoizedRequests"
+
 import Form from "@/components/Forms/BookingWidget"
 
 import styles from "./bookingWidget.module.css"
 
-export default function BookingWidget() {
+export function preload() {
+  void getLocations()
+}
+
+export default async function BookingWidget() {
+  const locations = await getLocations()
+
+  if (!locations || "error" in locations) {
+    return null
+  }
+
   return (
     <section className={styles.container}>
-      <Form />
+      <Form locations={locations.data} />
     </section>
   )
 }
diff --git a/components/MyPages/Breadcrumbs/breadcrumbs.module.css b/components/Breadcrumbs/breadcrumbs.module.css
similarity index 100%
rename from components/MyPages/Breadcrumbs/breadcrumbs.module.css
rename to components/Breadcrumbs/breadcrumbs.module.css
diff --git a/components/MyPages/Breadcrumbs/index.tsx b/components/Breadcrumbs/index.tsx
similarity index 100%
rename from components/MyPages/Breadcrumbs/index.tsx
rename to components/Breadcrumbs/index.tsx
diff --git a/components/Content/Blocks/DynamicContent/HowItWorks/index.tsx b/components/Content/Blocks/DynamicContent/HowItWorks/index.tsx
deleted file mode 100644
index 447a4fb1e..000000000
--- a/components/Content/Blocks/DynamicContent/HowItWorks/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import Title from "@/components/TempDesignSystem/Text/Title"
-import { getIntl } from "@/i18n"
-
-import styles from "./howItWorks.module.css"
-
-export default async function HowItWorks() {
-  const { formatMessage } = await getIntl()
-  return (
-    <section className={styles.container}>
-      <Title level="h3">{formatMessage({ id: "How it works" })}</Title>
-    </section>
-  )
-}
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx b/components/Content/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx
deleted file mode 100644
index fba17ba79..000000000
--- a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitCard/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ChevronDown } from "react-feather"
-
-import Title from "@/components/TempDesignSystem/Text/Title"
-
-import BenefitValue from "../BenefitValue"
-
-import styles from "./benefitCard.module.css"
-
-import type { BenefitCardProps } from "@/types/components/content/blocks"
-
-export default function BenefitCard({
-  comparedValues,
-  title,
-  description,
-}: BenefitCardProps) {
-  return (
-    <div className={styles.benefitCard}>
-      <div className={styles.benefitInfo}>
-        <details className={styles.details}>
-          <summary className={styles.summary}>
-            <hgroup className={styles.benefitCardHeader}>
-              <Title
-                as="h5"
-                level="h2"
-                textTransform={"regular"}
-                className={styles.benefitCardTitle}
-              >
-                {title}
-              </Title>
-              <span className={styles.chevron}>
-                <ChevronDown />
-              </span>
-            </hgroup>
-          </summary>
-          <p
-            className={styles.benefitCardDescription}
-            dangerouslySetInnerHTML={{ __html: description }}
-          />
-        </details>
-      </div>
-      <div className={styles.benefitComparison}>
-        {comparedValues.map((benefit, idx) => (
-          <div
-            key={`${benefit.valueDetails}-${idx}`}
-            className={styles.comparisonItem}
-          >
-            <BenefitValue benefit={benefit} />
-          </div>
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx b/components/Content/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx
deleted file mode 100644
index 546eba5b8..000000000
--- a/components/Content/Blocks/DynamicContent/OverviewTable/BenefitValue/index.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Minus } from "react-feather"
-
-import CheckCircle from "@/components/Icons/CheckCircle"
-
-import styles from "./benefitValue.module.css"
-
-import type { BenefitValueProps } from "@/types/components/content/blocks"
-
-export default function BenefitValue({ benefit }: BenefitValueProps) {
-  if (!benefit.unlocked) {
-    return <Minus color="var(--UI-Grey-40)" />
-  }
-  if (!benefit.value) {
-    return <CheckCircle height={32} width={32} color="green" />
-  }
-  return (
-    <div className={styles.benefitValueContainer}>
-      <span className={styles.benefitValue}>{benefit.value}</span>
-      {benefit.valueDetails && (
-        <span className={styles.benefitValueDetails}>
-          {benefit.valueDetails}
-        </span>
-      )}
-    </div>
-  )
-}
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx b/components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx
deleted file mode 100644
index e519b2529..000000000
--- a/components/Content/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/index.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import Image from "@/components/Image"
-
-import LevelSummary from "../../LevelSummary"
-import YourLevel from "../../YourLevelScript"
-
-import styles from "./desktopHeader.module.css"
-
-import type {
-  DesktopSelectColumns,
-  LargeTableProps,
-} from "@/types/components/content/blocks"
-
-export default function DesktopHeader({
-  levels,
-  activeLevel,
-  Select,
-}: LargeTableProps) {
-  return (
-    <thead>
-      <tr className={styles.iconRow}>
-        <th className={styles.verticalTableHeader} />
-        {levels.map((level, idx) => {
-          return (
-            <th key={"image" + level.level + idx} className={styles.iconTh}>
-              {activeLevel === level.level ? <YourLevel /> : null}
-              <Image
-                height={50}
-                width={100}
-                alt={level.name}
-                src={level.icon}
-              />
-            </th>
-          )
-        })}
-      </tr>
-      <tr>
-        <th />
-        {levels.map((level, idx) => {
-          return (
-            <th
-              key={"summary" + level.level + idx}
-              className={styles.summaryTh}
-            >
-              <LevelSummary level={level} />
-            </th>
-          )
-        })}
-      </tr>
-      {Select && (
-        <tr>
-          <th />
-          {["A", "B", "C"].map((column, idx) => {
-            return (
-              <th key={column + idx} className={styles.select}>
-                <Select column={column as DesktopSelectColumns["column"]} />
-              </th>
-            )
-          })}
-        </tr>
-      )}
-    </thead>
-  )
-}
diff --git a/components/Content/Blocks/DynamicContent/OverviewTable/data/SV.json b/components/Content/Blocks/DynamicContent/OverviewTable/data/SV.json
deleted file mode 100644
index 7e7b10b35..000000000
--- a/components/Content/Blocks/DynamicContent/OverviewTable/data/SV.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
-  "levels": [
-    {
-      "level": 1,
-      "name": "New Friend",
-      "requirement": "0p",
-      "description": "Det är nu den börjar, vår härliga resa tillsammans. Som en New Friend kommer du att upptäcka oss om och om igen under dina äventyr med Scandic.",
-      "icon": "/_static/icons/loyaltylevels/new-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendspriser på rum",
-          "description": "Som vår vän får du alltid det bästa erbjudandet: oavsett tid och plats. Inga hemliga deals eller bokningskoder behövs – det är bara att boka.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Mums! Prova vår välsmakande 10 % rabatt i våra restauranger och hotellshoppar på helgerna, oavsett om du övernattar eller bara tittar förbi på en bit mat. Så passa på att unna dig det lilla extra.",
-          "unlocked": true,
-          "value": "10%"
-        },
-        {
-          "name": "Fri mocktail för barn under vistelse",
-          "description": "Har du barnen med dig på resan? Fantastiskt – hallå där, kompis! Hos oss är barn värdefulla små VIP-gäster, så därför bjuder vi på en läskande och god mocktail vid ankomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utcheckning om möjligt",
-          "description": "Vi fattar, ibland kan man behöva en sovmorgon. Som de vänner vi är låter vi dig checka ut en timme senare utan kostnad. Lite extra tid kan sätta hela känslan för resten av dagen.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurangkupong",
-          "description": "Finns det nåt bättre än en bra rabatt? Som vår vän får du rabatt i våra restauranger och hotellshoppen på helger och utvalda helgdagar, oavsett om du övernattar eller inte. Så, passa att unna dig det lilla extra.",
-          "unlocked": false
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Sweet! Varje gång du tjänar nya friendspoäng bjuder vi dig på 25-50 % extra poäng – som en superboost! Börja samla poäng genom att bo och äta så har du kirrat en bonusnatt på nolltid.",
-          "unlocked": false
-        },
-        {
-          "name": "Tidig incheckning om möjligt",
-          "description": "Vill du ha ditt rum lite i förväg? Inga problem. Checka in en timme tidigare utan kostnad och få en timmes extra avkoppling.",
-          "unlocked": false
-        },
-        {
-          "name": "Kostnadsfri  uppgraderingar om möjligt",
-          "description": "Vi steppar upp saker ett snäpp. Vår vänskap har nått nivån där vi kommer uppgradera ditt rum när det är möjligt, så du kan få en ännu skönare vistelse. Bra, eller hur?",
-          "unlocked": false
-        },
-        {
-          "name": "Frukost 2 för 1",
-          "description": "Okej, nu snackar vi. Oavsett om du bor hos oss eller inte, ta med en frukostkompis eftersom du äter två frukostar till priset av en! Kom bara ihåg att dubbelkolla detaljerna först så att allt är i sin ordning för en maxad frukost.",
-          "unlocked": false
-        },
-        {
-          "name": "48 timmars rumsgaranti",
-          "description": "Schhh – en hemlis för våra närmaste vänner: vi garanterar dig ett rum, även om vi är fullbokade, så länge du gör bokningen minst 48 timmar i förväg. Bra va?",
-          "unlocked": false
-        },
-        {
-          "name": "Alltid fri frukost",
-          "description": "Kickstarta dagen med en kostnadsfri frukost hos oss – och du, det gäller oavsett om du bor hos oss eller inte. Det är bara att komma förbi!",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig spännande present",
-          "description": "Som Best Friend förtjänar du det allra bästa. Därför ska du få en spännande present varje år, men vad det blir är en överraskning. Tjuvkika inte!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost för barn",
-          "description": "Vid det här laget räknar vi även dina barn som våra vänner, vilket betyder att ni får en speciell överraskning när ni bor hos oss. Lite VIP-behandling. För att barn är coola.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 2,
-      "name": "Good Friend",
-      "requirement": "5 000p",
-      "description": "Vi har fått se ganska mycket av varandra senaste tiden! Helt ärligt, det känns som att vi har nåt på gång, men vi tar det i vår takt, en vistelse i taget.",
-      "icon": "/_static/icons/loyaltylevels/good-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendspriser på rum",
-          "description": "Som vår vän får du alltid det bästa erbjudandet: oavsett tid och plats. Inga hemliga deals eller bokningskoder behövs – det är bara att boka.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Mums! Prova vår välsmakande 10-15% rabatt i våra restauranger och hotellshoppar på helgerna, oavsett om du övernattar eller bara tittar förbi på en bit mat. Så passa på att unna dig det lilla extra.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Fri mocktail för barn under vistelse",
-          "description": "Har du barnen med dig på resan? Fantastiskt – hallå där, kompis! Hos oss är barn värdefulla små VIP-gäster, så därför bjuder vi på en läskande och god mocktail vid ankomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utcheckning om möjligt",
-          "description": "Vi fattar, ibland kan man behöva en sovmorgon. Som de vänner vi är låter vi dig checka ut en timme senare utan kostnad. Lite extra tid kan sätta hela känslan för resten av dagen.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurangkupong",
-          "description": "Finns det nåt bättre än en bra rabatt? Som vår vän får du rabatt i våra restauranger och hotellshoppen på helger och utvalda helgdagar, oavsett om du övernattar eller inte. Så, passa att unna dig det lilla extra.",
-          "unlocked": false
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Sweet! Varje gång du tjänar nya friendspoäng bjuder vi dig på 25-50 % extra poäng – som en superboost! Börja samla poäng genom att bo och äta så har du kirrat en bonusnatt på nolltid.",
-          "unlocked": false
-        },
-        {
-          "name": "Tidig incheckning om möjligt",
-          "description": "Vill du ha ditt rum lite i förväg? Inga problem. Checka in en timme tidigare utan kostnad och få en timmes extra avkoppling.",
-          "unlocked": false
-        },
-        {
-          "name": "Fri uppgradering om möjligt",
-          "description": "Vi steppar upp saker ett snäpp. Vår vänskap har nått nivån där vi kommer uppgradera ditt rum när det är möjligt, så du kan få en ännu skönare vistelse. Bra, eller hur?",
-          "unlocked": false
-        },
-        {
-          "name": "Frukost 2 för 1",
-          "description": "Okej, nu snackar vi. Oavsett om du bor hos oss eller inte, ta med en frukostkompis eftersom du äter två frukostar till priset av en! Kom bara ihåg att dubbelkolla detaljerna först så att allt är i sin ordning för en maxad frukost.",
-          "unlocked": false
-        },
-        {
-          "name": "48 timmars rumsgaranti",
-          "description": "Schhh – en hemlis för våra närmaste vänner: vi garanterar dig ett rum, även om vi är fullbokade, så länge du gör bokningen minst 48 timmar i förväg. Bra va?",
-          "unlocked": false
-        },
-        {
-          "name": "Alltid fri frukost",
-          "description": "Kickstarta dagen med en kostnadsfri frukost hos oss – och du, det gäller oavsett om du bor hos oss eller inte. Det är bara att komma förbi!",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig spännande present",
-          "description": "Som Best Friend förtjänar du det allra bästa. Därför ska du få en spännande present varje år, men vad det blir är en överraskning. Tjuvkika inte!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost för barn",
-          "description": "Vid det här laget räknar vi även dina barn som våra vänner, vilket betyder att ni får en speciell överraskning när ni bor hos oss. Lite VIP-behandling. För att barn är coola.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 3,
-      "name": "Close Friend",
-      "requirement": "10 000p",
-      "description": "Det börjar bli seriöst nu: vi har verkligen lärt känna varann. Därför tycker vi att det är dags att din upplevelse hos oss blir ännu mer personlig.",
-      "icon": "/_static/icons/loyaltylevels/close-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendspriser på rum",
-          "description": "Som vår vän får du alltid det bästa erbjudandet: oavsett tid och plats. Inga hemliga deals eller bokningskoder behövs – det är bara att boka.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Mums! Prova vår välsmakande 10-15% rabatt i våra restauranger och hotellshoppar på helgerna, oavsett om du övernattar eller bara tittar förbi på en bit mat. Så passa på att unna dig det lilla extra.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Fri mocktail för barn under vistelse",
-          "description": "Har du barnen med dig på resan? Fantastiskt – hallå där, kompis! Hos oss är barn värdefulla små VIP-gäster, så därför bjuder vi på en läskande och god mocktail vid ankomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utcheckning om möjligt",
-          "description": "Vi fattar, ibland kan man behöva en sovmorgon. Som de vänner vi är låter vi dig checka ut en timme senare utan kostnad. Lite extra tid kan sätta hela känslan för resten av dagen.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurangkupong",
-          "description": "Okej, såhär: för varje natt som ger friendspoäng bjuder vi även på en restaurangkupong värd 50 kr.",
-          "unlocked": true,
-          "value": "50 kr"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Tidig incheckning om möjligt",
-          "description": "Vill du ha ditt rum lite i förväg? Inga problem. Checka in en timme tidigare utan kostnad och få en timmes extra avkoppling.",
-          "unlocked": false
-        },
-        {
-          "name": "Fri uppgradering om möjligt",
-          "description": "Vi steppar upp saker ett snäpp. Vår vänskap har nått nivån där vi kommer uppgradera ditt rum när det är möjligt, så du kan få en ännu skönare vistelse. Bra, eller hur?",
-          "unlocked": false
-        },
-        {
-          "name": "Frukost 2 för 1",
-          "description": "Okej, nu snackar vi. Oavsett om du bor hos oss eller inte, ta med en frukostkompis eftersom du äter två frukostar till priset av en! Kom bara ihåg att dubbelkolla detaljerna först så att allt är i sin ordning för en maxad frukost.",
-          "unlocked": false
-        },
-        {
-          "name": "48 timmars rumsgaranti",
-          "description": "Schhh – en hemlis för våra närmaste vänner: vi garanterar dig ett rum, även om vi är fullbokade, så länge du gör bokningen minst 48 timmar i förväg. Bra va?",
-          "unlocked": false
-        },
-        {
-          "name": "Alltid fri frukost",
-          "description": "Kickstarta dagen med en kostnadsfri frukost hos oss – och du, det gäller oavsett om du bor hos oss eller inte. Det är bara att komma förbi!",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig spännande present",
-          "description": "Som Best Friend förtjänar du det allra bästa. Därför ska du få en spännande present varje år, men vad det blir är en överraskning. Tjuvkika inte!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost för barn",
-          "description": "Vid det här laget räknar vi även dina barn som våra vänner, vilket betyder att ni får en speciell överraskning när ni bor hos oss. Lite VIP-behandling. För att barn är coola.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 4,
-      "name": "Dear Friend",
-      "requirement": "25 000p",
-      "description": "Skål för oss! Vi känner tydliga vänner för livet-vibbar i luften och det öppnar upp för ännu fler Scandicfördelar.",
-      "icon": "/_static/icons/loyaltylevels/dear-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendspriser på rum",
-          "description": "Som vår vän får du alltid det bästa erbjudandet: oavsett tid och plats. Inga hemliga deals eller bokningskoder behövs – det är bara att boka.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Mums! Prova vår välsmakande 10-15% rabatt i våra restauranger och hotellshoppar på helgerna, oavsett om du övernattar eller bara tittar förbi på en bit mat. Så passa på att unna dig det lilla extra.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Fri mocktail för barn under vistelse",
-          "description": "Har du barnen med dig på resan? Fantastiskt – hallå där, kompis! Hos oss är barn värdefulla små VIP-gäster, så därför bjuder vi på en läskande och god mocktail vid ankomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utcheckning om möjligt",
-          "description": "Vi fattar, ibland kan man behöva en sovmorgon. Som de vänner vi är låter vi dig checka ut en timme senare utan kostnad. Lite extra tid kan sätta hela känslan för resten av dagen.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurangkupong",
-          "description": "Vår vänskap har vuxit sig starkare. Njut av en restaurangkupong värd 75 kr för varje natt som ger friendspoäng.",
-          "unlocked": true,
-          "value": "75 kr"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Sweet! Varje gång du tjänar nya friendspoäng bjuder vi dig på 25-50 % extra poäng – som en superboost! Börja samla poäng genom att bo och äta så har du kirrat en bonusnatt på nolltid.",
-          "unlocked": true,
-          "value": "25%"
-        },
-        {
-          "name": "Tidig incheckning om möjligt",
-          "description": "Vill du ha ditt rum lite i förväg? Inga problem. Checka in en timme tidigare utan kostnad och få en timmes extra avkoppling.",
-          "unlocked": true
-        },
-        {
-          "name": "Fri uppgradering om möjligt",
-          "description": "Vi steppar upp saker ett snäpp. Vår vänskap har nått nivån där vi kommer uppgradera ditt rum när det är möjligt, så du kan få en ännu skönare vistelse. Bra, eller hur?",
-          "unlocked": false
-        },
-        {
-          "name": "Frukost 2 för 1",
-          "description": "Okej, nu snackar vi. Oavsett om du bor hos oss eller inte, ta med en frukostkompis eftersom du äter två frukostar till priset av en! Kom bara ihåg att dubbelkolla detaljerna först så att allt är i sin ordning för en maxad frukost.",
-          "unlocked": false
-        },
-        {
-          "name": "48 timmars rumsgaranti",
-          "description": "Schhh – en hemlis för våra närmaste vänner: vi garanterar dig ett rum, även om vi är fullbokade, så länge du gör bokningen minst 48 timmar i förväg. Bra va?",
-          "unlocked": false
-        },
-        {
-          "name": "Alltid fri frukost",
-          "description": "Kickstarta dagen med en kostnadsfri frukost hos oss – och du, det gäller oavsett om du bor hos oss eller inte. Det är bara att komma förbi!",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig spännande present",
-          "description": "Som Best Friend förtjänar du det allra bästa. Därför ska du få en spännande present varje år, men vad det blir är en överraskning. Tjuvkika inte!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost för barn",
-          "description": "Vid det här laget räknar vi även dina barn som våra vänner, vilket betyder att ni får en speciell överraskning när ni bor hos oss. Lite VIP-behandling. För att barn är coola.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 5,
-      "name": "Loyal Friend",
-      "requirement": "100 000p",
-      "description": "Du har bott hos oss otaliga nätter, hängt med oss sena timmar och genom ur och skur. Det är dags att du får några av våra allra bästa förmåner.",
-      "icon": "/_static/icons/loyaltylevels/loyal-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendspriser på rum",
-          "description": "Som vår vän får du alltid det bästa erbjudandet: oavsett tid och plats. Inga hemliga deals eller bokningskoder behövs – det är bara att boka.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Mums! Prova vår välsmakande 10-15% rabatt i våra restauranger och hotellshoppar på helgerna, oavsett om du övernattar eller bara tittar förbi på en bit mat. Så passa på att unna dig det lilla extra.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Fri mocktail för barn under vistelse",
-          "description": "Har du barnen med dig på resan? Fantastiskt – hallå där, kompis! Hos oss är barn värdefulla små VIP-gäster, så därför bjuder vi på en läskande och god mocktail vid ankomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utcheckning om möjligt",
-          "description": "Vi fattar, ibland kan man behöva en sovmorgon. Som de vänner vi är låter vi dig checka ut en timme senare utan kostnad. Lite extra tid kan sätta hela känslan för resten av dagen.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurangkupong",
-          "description": "Vi bjuder dig på en restaurangkupong värd 100 kr för varje natt som ger friendsspoäng. Det motsvarar ett mindre berg av croissanter!",
-          "unlocked": true,
-          "value": "100 kr"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Sweet! Varje gång du tjänar nya friendspoäng bjuder vi dig på 25-50 % extra poäng – som en superboost! Börja samla poäng genom att bo och äta så har du kirrat en bonusnatt på nolltid.",
-          "unlocked": true,
-          "value": "25%"
-        },
-        {
-          "name": "Tidig incheckning om möjligt",
-          "description": "Vill du ha ditt rum lite i förväg? Inga problem. Checka in en timme tidigare utan kostnad och få en timmes extra avkoppling.",
-          "unlocked": true
-        },
-        {
-          "name": "Fri uppgradering om möjligt",
-          "description": "Vi steppar upp saker ett snäpp. Vår vänskap har nått nivån där vi kommer uppgradera ditt rum när det är möjligt, så du kan få en ännu skönare vistelse. Bra, eller hur?",
-          "unlocked": true
-        },
-        {
-          "name": "Frukost 2 för 1",
-          "description": "Okej, nu snackar vi. Oavsett om du bor hos oss eller inte, ta med en frukostkompis eftersom du äter två frukostar till priset av en! Kom bara ihåg att dubbelkolla detaljerna först så att allt är i sin ordning för en maxad frukost.",
-          "unlocked": true
-        },
-        {
-          "name": "48 timmars rumsgaranti",
-          "description": "Schhh – en hemlis för våra närmaste vänner: vi garanterar dig ett rum, även om vi är fullbokade, så länge du gör bokningen minst 48 timmar i förväg. Bra va?",
-          "unlocked": false
-        },
-        {
-          "name": "Alltid fri frukost",
-          "description": "Kickstarta dagen med en kostnadsfri frukost hos oss – och du, det gäller oavsett om du bor hos oss eller inte. Det är bara att komma förbi!",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig spännande present",
-          "description": "Som Best Friend förtjänar du det allra bästa. Därför ska du få en spännande present varje år, men vad det blir är en överraskning. Tjuvkika inte!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost för barn",
-          "description": "Vid det här laget räknar vi även dina barn som våra vänner, vilket betyder att ni får en speciell överraskning när ni bor hos oss. Lite VIP-behandling. För att barn är coola.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 6,
-      "name": "True Friend",
-      "requirement": "250 000p",
-      "description": "Dig kan man lita på, oavsett säsong finns du där för oss. Därför vill vi att du ska få njuta av fler förmåner anpassade efter dig.",
-      "icon": "/_static/icons/loyaltylevels/true-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendspriser på rum",
-          "description": "Som vår vän får du alltid det bästa erbjudandet: oavsett tid och plats. Inga hemliga deals eller bokningskoder behövs – det är bara att boka.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Mums! Prova vår välsmakande 10-15% rabatt i våra restauranger och hotellshoppar på helgerna, oavsett om du övernattar eller bara tittar förbi på en bit mat. Så passa på att unna dig det lilla extra.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Fri mocktail för barn under vistelse",
-          "description": "Har du barnen med dig på resan? Fantastiskt – hallå där, kompis! Hos oss är barn värdefulla små VIP-gäster, så därför bjuder vi på en läskande och god mocktail vid ankomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utcheckning om möjligt",
-          "description": "Vi fattar, ibland kan man behöva en sovmorgon. Som de vänner vi är låter vi dig checka ut en timme senare utan kostnad. Lite extra tid kan sätta hela känslan för resten av dagen.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurangkupong",
-          "description": "Det blir bättre och bättre! Nu får du en restaurangkupong värd 150 kr för varje natt som ge friendsspoäng. Perfekt när du känner för en lyxig frukost eller ska på middagsdate!",
-          "unlocked": true,
-          "value": "150 kr"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Sweet! Varje gång du tjänar nya friendspoäng bjuder vi dig på 25-50 % extra poäng – som en superboost! Börja samla poäng genom att bo och äta så har du kirrat en bonusnatt på nolltid.",
-          "unlocked": true,
-          "value": "50%"
-        },
-        {
-          "name": "Tidig incheckning om möjligt",
-          "description": "Vill du ha ditt rum lite i förväg? Inga problem. Checka in en timme tidigare utan kostnad och få en timmes extra avkoppling.",
-          "unlocked": true
-        },
-        {
-          "name": "Fri uppgradering om möjligt",
-          "description": "Vi steppar upp saker ett snäpp. Vår vänskap har nått nivån där vi kommer uppgradera ditt rum när det är möjligt, så du kan få en ännu skönare vistelse. Bra, eller hur?",
-          "unlocked": true
-        },
-        {
-          "name": "Frukost 2 för 1",
-          "description": "Okej, nu snackar vi. Oavsett om du bor hos oss eller inte, ta med en frukostkompis eftersom du äter två frukostar till priset av en! Kom bara ihåg att dubbelkolla detaljerna först så att allt är i sin ordning för en maxad frukost.",
-          "unlocked": false
-        },
-        {
-          "name": "48 timmars rumsgaranti",
-          "description": "Schhh – en hemlis för våra närmaste vänner: vi garanterar dig ett rum, även om vi är fullbokade, så länge du gör bokningen minst 48 timmar i förväg. Bra va?",
-          "unlocked": true
-        },
-        {
-          "name": "Alltid fri frukost",
-          "description": "Kickstarta dagen med en kostnadsfri frukost hos oss – och du, det gäller oavsett om du bor hos oss eller inte. Det är bara att komma förbi!",
-          "unlocked": true
-        },
-        {
-          "name": "Årlig spännande present",
-          "description": "Som Best Friend förtjänar du det allra bästa. Därför ska du få en spännande present varje år, men vad det blir är en överraskning. Tjuvkika inte!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost för barn",
-          "description": "Vid det här laget räknar vi även dina barn som våra vänner, vilket betyder att ni får en speciell överraskning när ni bor hos oss. Lite VIP-behandling. För att barn är coola.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 7,
-      "name": "Best Friend",
-      "requirement": "400 000p eller 100 nätter",
-      "description": "Det finns inga ord för en vänskap som vår, men vi vill ändå säga: Bättre upplevelser än så här går inte att få, nu vi talar om exklusiva upplevelser!",
-      "icon": "/_static/icons/loyaltylevels/best-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendspriser på rum",
-          "description": "Som vår vän får du alltid det bästa erbjudandet: oavsett tid och plats. Inga hemliga deals eller bokningskoder behövs – det är bara att boka.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Mums! Prova vår välsmakande 10-15 % rabatt i våra restauranger och hotellshoppar på helgerna, oavsett om du övernattar eller bara tittar förbi på en bit mat. Så passa på att unna dig det lilla extra.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Fri mocktail för barn under vistelse",
-          "description": "Har du barnen med dig på resan? Fantastiskt – hallå där, kompis! Hos oss är barn värdefulla små VIP-gäster, så därför bjuder vi på en läskande och god mocktail vid ankomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utcheckning om möjligt",
-          "description": "Vi fattar, ibland kan man behöva en sovmorgon. Som de vänner vi är låter vi dig checka ut en timme senare utan kostnad. Lite extra tid kan sätta hela känslan för resten av dagen.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurangkupong",
-          "description": "Det blir bättre och bättre! Nu får du en restaurangkupong för varje natt som ger friendsspoäng. Perfekt när du känner för en lyxig frukost eller ska på middagsdate!",
-          "unlocked": true,
-          "value": "200 kr"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Sweet! Varje gång du tjänar nya friendspoäng bjuder vi dig på 25-50 % extra poäng – som en superboost! Börja samla poäng genom att bo och äta så har du kirrat en bonusnatt på nolltid.",
-          "unlocked": true,
-          "value": "50%"
-        },
-        {
-          "name": "Tidig incheckning om möjligt",
-          "description": "Vill du ha ditt rum lite i förväg? Inga problem. Checka in en timme tidigare utan kostnad och få en timmes extra avkoppling.",
-          "unlocked": true
-        },
-        {
-          "name": "Fri uppgradering om möjligt",
-          "description": "Vi steppar upp saker ett snäpp. Vår vänskap har nått nivån där vi kommer uppgradera ditt rum när det är möjligt, så du kan få en ännu skönare vistelse. Bra, eller hur?",
-          "unlocked": true
-        },
-        {
-          "name": "Frukost 2 för 1",
-          "description": "Okej, nu snackar vi. Oavsett om du bor hos oss eller inte, ta med en frukostkompis eftersom du äter två frukostar till priset av en! Kom bara ihåg att dubbelkolla detaljerna först så att allt är i sin ordning för en maxad frukost.",
-          "unlocked": false
-        },
-        {
-          "name": "48 timmars rumsgaranti",
-          "description": "Schhh – en hemlis för våra närmaste vänner: vi garanterar dig ett rum, även om vi är fullbokade, så länge du gör bokningen minst 48 timmar i förväg. Bra va?",
-          "unlocked": true
-        },
-        {
-          "name": "Alltid fri frukost",
-          "description": "Kickstarta dagen med en kostnadsfri frukost hos oss – och du, det gäller oavsett om du bor hos oss eller inte. Det är bara att komma förbi!",
-          "unlocked": true
-        },
-        {
-          "name": "Årlig spännande present",
-          "description": "Som Best Friend förtjänar du det allra bästa. Därför ska du få en spännande present varje år, men vad det blir är en överraskning. Tjuvkika inte!",
-          "unlocked": true
-        },
-        {
-          "name": "Boost för barn",
-          "description": "Vid det här laget räknar vi även dina barn som våra vänner, vilket betyder att ni får en speciell överraskning när ni bor hos oss. Lite VIP-behandling. För att barn är coola.",
-          "unlocked": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/components/Content/Blocks/DynamicContent/index.tsx b/components/Content/Blocks/DynamicContent/index.tsx
deleted file mode 100644
index 5c43db5e3..000000000
--- a/components/Content/Blocks/DynamicContent/index.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { serverClient } from "@/lib/trpc/server"
-
-import SectionContainer from "@/components/Section/Container"
-import SectionHeader from "@/components/Section/Header"
-import SectionLink from "@/components/Section/Link"
-import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
-import Title from "@/components/TempDesignSystem/Text/Title"
-
-import HowItWorks from "./HowItWorks"
-import LoyaltyLevels from "./LoyaltyLevels"
-import OverviewTable from "./OverviewTable"
-
-import styles from "./dynamicContent.module.css"
-
-import type {
-  DynamicComponentProps,
-  DynamicContentProps,
-} from "@/types/components/content/blocks"
-import { DynamicContentComponentEnum } from "@/types/components/content/enums"
-
-async function DynamicComponentBlock({ component }: DynamicComponentProps) {
-  const membershipLevel = await serverClient().user.safeMembershipLevel()
-  switch (component) {
-    case DynamicContentComponentEnum.how_it_works:
-      return <HowItWorks />
-    case DynamicContentComponentEnum.loyalty_levels:
-      return <LoyaltyLevels />
-    case DynamicContentComponentEnum.overview_table:
-      return <OverviewTable activeMembership={membershipLevel} />
-    default:
-      return null
-  }
-}
-
-export default function DynamicContent({
-  dynamicContent,
-  firstItem,
-}: DynamicContentProps) {
-  const displayHeader = !!(
-    dynamicContent.link ||
-    dynamicContent.subtitle ||
-    dynamicContent.title
-  )
-  const isOverviewTable =
-    dynamicContent.component === DynamicContentComponentEnum.overview_table
-  return (
-    <SectionContainer className={styles.container}>
-      {isOverviewTable ? (
-        <div className={styles.header}>
-          <Title className={styles.tableTitle}> {dynamicContent.title}</Title>
-          <Subtitle>{dynamicContent.subtitle}</Subtitle>
-        </div>
-      ) : displayHeader ? (
-        <SectionHeader
-          link={dynamicContent.link}
-          preamble={dynamicContent.subtitle}
-          title={dynamicContent.title}
-          topTitle={firstItem}
-        />
-      ) : null}
-      <DynamicComponentBlock component={dynamicContent.component} />
-      {displayHeader && (
-        <SectionLink link={dynamicContent.link} variant="mobile" />
-      )}
-    </SectionContainer>
-  )
-}
diff --git a/components/Content/Blocks/index.tsx b/components/Content/Blocks/index.tsx
deleted file mode 100644
index 77dabdfd1..000000000
--- a/components/Content/Blocks/index.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import JsonToHtml from "@/components/JsonToHtml"
-// import DynamicContentBlock from "@/components/Loyalty/Blocks/DynamicContent"
-import Shortcuts from "@/components/MyPages/Blocks/Shortcuts"
-
-import CardsGrid from "./CardsGrid"
-import TextCols from "./TextCols"
-
-import type { BlocksProps } from "@/types/components/content/blocks"
-import { ContentBlocksTypenameEnum } from "@/types/components/content/enums"
-
-export function Blocks({ blocks }: BlocksProps) {
-  return blocks.map((block, idx) => {
-    const firstItem = idx === 0
-    switch (block.__typename) {
-      case ContentBlocksTypenameEnum.ContentPageBlocksContent:
-        return (
-          <section key={`${block.__typename}-${idx}`}>
-            <JsonToHtml
-              nodes={block.content.content.json.children}
-              embeds={block.content.content.embedded_itemsConnection.edges}
-            />
-          </section>
-        )
-      case ContentBlocksTypenameEnum.ContentPageBlocksShortcuts:
-        return (
-          <Shortcuts
-            firstItem={firstItem}
-            key={`${block.shortcuts.title}-${idx}`}
-            shortcuts={block.shortcuts.shortcuts}
-            subtitle={block.shortcuts.preamble}
-            title={block.shortcuts.title}
-          />
-        )
-      case ContentBlocksTypenameEnum.ContentPageBlocksCardsGrid:
-        return (
-          <CardsGrid
-            cards_grid={block.cards_grid}
-            key={`${block.cards_grid.title}-${idx}`}
-            firstItem={firstItem}
-          />
-        )
-      case ContentBlocksTypenameEnum.ContentPageBlocksTextCols:
-        return <TextCols textCols={block.text_cols} />
-      default:
-        return null
-    }
-  })
-}
diff --git a/components/Content/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx b/components/Content/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
deleted file mode 100644
index 5c8557606..000000000
--- a/components/Content/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { serverClient } from "@/lib/trpc/server"
-
-import { EmailIcon, PhoneIcon } from "@/components/Icons"
-import Link from "@/components/TempDesignSystem/Link"
-import Body from "@/components/TempDesignSystem/Text/Body"
-import Footnote from "@/components/TempDesignSystem/Text/Footnote"
-import { getValueFromContactConfig } from "@/utils/contactConfig"
-
-import styles from "./contactRow.module.css"
-
-import type { ContactRowProps } from "@/types/components/content/sidebar"
-
-export default async function ContactRow({ contact }: ContactRowProps) {
-  const data = await serverClient().contentstack.base.contact()
-  if (!data) {
-    return null
-  }
-
-  const val = getValueFromContactConfig(contact.contact_field, data)
-
-  if (!val) {
-    return null
-  }
-
-  let Icon = null
-  if (contact.contact_field.includes("email")) {
-    Icon = EmailIcon
-  } else if (contact.contact_field.includes("phone")) {
-    Icon = PhoneIcon
-  }
-
-  let openableLink = val
-  if (contact.contact_field.includes("email")) {
-    openableLink = `mailto:${val}`
-  } else if (contact.contact_field.includes("phone")) {
-    openableLink = `tel:${val}`
-  }
-
-  return (
-    <div>
-      <Body color="burgundy" textTransform="bold">
-        {contact.display_text}
-      </Body>
-      <Link
-        className={styles.link}
-        href={openableLink}
-        variant="underscored"
-        color="burgundy"
-        size="small"
-      >
-        {Icon ? <Icon width="20" height="20" color="burgundy" /> : null}
-        {val}
-      </Link>
-      <Footnote color="burgundy">{contact.footnote}</Footnote>
-    </div>
-  )
-}
diff --git a/components/Content/Sidebar/JoinLoyalty/Contact/index.tsx b/components/Content/Sidebar/JoinLoyalty/Contact/index.tsx
deleted file mode 100644
index a7d39dcb7..000000000
--- a/components/Content/Sidebar/JoinLoyalty/Contact/index.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
-import { getIntl } from "@/i18n"
-
-import ContactRow from "./ContactRow"
-
-import styles from "./contact.module.css"
-
-import { JoinLoyaltyContactTypenameEnum } from "@/types/components/content/enums"
-import type { ContactProps } from "@/types/components/content/sidebar"
-
-export default async function Contact({ contactBlock }: ContactProps) {
-  const { formatMessage } = await getIntl()
-  return (
-    <article className={styles.contactContainer}>
-      <Subtitle>{formatMessage({ id: "Contact us" })}</Subtitle>
-      <section className={styles.contact}>
-        {contactBlock.map(({ contact, __typename }, i) => {
-          switch (__typename) {
-            case JoinLoyaltyContactTypenameEnum.ContentPageSidebarJoinLoyaltyContactBlockContactContact:
-              return (
-                <ContactRow
-                  key={`${contact.display_text}-${i}`}
-                  contact={contact}
-                />
-              )
-            default:
-              return null
-          }
-        })}
-      </section>
-    </article>
-  )
-}
diff --git a/components/Content/Sidebar/index.tsx b/components/Content/Sidebar/index.tsx
deleted file mode 100644
index ff2df53bb..000000000
--- a/components/Content/Sidebar/index.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import JsonToHtml from "@/components/JsonToHtml"
-
-import JoinLoyaltyContact from "./JoinLoyalty"
-import { MyPagesNavigation } from "./MyPagesNavigation"
-
-import styles from "./sidebar.module.css"
-
-import {
-  SidebarDynamicComponentEnum,
-  SidebarTypenameEnum,
-} from "@/types/components/content/enums"
-import type { SidebarProps } from "@/types/components/content/sidebar"
-
-export default function SidebarLoyalty({ blocks }: SidebarProps) {
-  return (
-    <aside className={styles.aside}>
-      {blocks.map((block, idx) => {
-        switch (block.__typename) {
-          case SidebarTypenameEnum.ContentPageSidebarContent:
-            return (
-              <section
-                className={styles.content}
-                key={`${block.__typename}-${idx}`}
-              >
-                <JsonToHtml
-                  embeds={block.content.content.embedded_itemsConnection.edges}
-                  nodes={block.content.content.json.children}
-                />
-              </section>
-            )
-          case SidebarTypenameEnum.ContentPageSidebarJoinLoyaltyContact:
-            return (
-              <JoinLoyaltyContact
-                block={block.join_loyalty_contact}
-                key={`${block.__typename}-${idx}`}
-              />
-            )
-          case SidebarTypenameEnum.ContentPageSidebarDynamicContent:
-            switch (block.dynamic_content.component) {
-              case SidebarDynamicComponentEnum.my_pages_navigation:
-                return <MyPagesNavigation key={`${block.__typename}-${idx}`} />
-              default:
-                return null
-            }
-
-          default:
-            return null
-        }
-      })}
-    </aside>
-  )
-}
diff --git a/components/ContentType/ContentPage/index.tsx b/components/ContentType/ContentPage/index.tsx
index 9179240fd..8e53cafd7 100644
--- a/components/ContentType/ContentPage/index.tsx
+++ b/components/ContentType/ContentPage/index.tsx
@@ -1,9 +1,9 @@
 import { serverClient } from "@/lib/trpc/server"
 
-import { Blocks } from "@/components/Content/Blocks"
-import Sidebar from "@/components/Content/Sidebar"
+import Blocks from "@/components/Blocks"
 import Hero from "@/components/Hero"
 import Intro from "@/components/Intro"
+import Sidebar from "@/components/Sidebar"
 import Preamble from "@/components/TempDesignSystem/Text/Preamble"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import TrackingSDK from "@/components/TrackingSDK"
@@ -18,7 +18,7 @@ export default async function ContentPage() {
   }
 
   const { tracking, contentPage } = contentPageRes
-  const heroImage = contentPage.heroImage
+  const heroImage = contentPage.hero_image
 
   return (
     <>
diff --git a/components/ContentType/HotelPage/Facilities/utils.ts b/components/ContentType/HotelPage/Facilities/utils.ts
index 32d49ee4b..1086e7430 100644
--- a/components/ContentType/HotelPage/Facilities/utils.ts
+++ b/components/ContentType/HotelPage/Facilities/utils.ts
@@ -1,17 +1,8 @@
 import type { Facility } from "@/types/components/hotelPage/facilities"
-import type { ImageVaultAsset } from "@/types/components/imageVault"
-
-type ActivityCard = {
-  background_image?: ImageVaultAsset
-  scripted_title?: string
-  heading: string
-  body_text: string
-  cta_text: string
-  contentPage: Array<{ href: string }>
-}
+import type { ActivityCard } from "@/types/trpc/routers/contentstack/hotelPage"
 
 export function setActivityCard(activitiesCard: ActivityCard): Facility {
-  const hasImage = activitiesCard.background_image
+  const hasImage = !!activitiesCard.background_image
   return [
     {
       id: "activities",
@@ -22,7 +13,7 @@ export function setActivityCard(activitiesCard: ActivityCard): Facility {
       backgroundImage: hasImage ? activitiesCard.background_image : undefined,
       primaryButton: hasImage
         ? {
-            href: activitiesCard.contentPage[0].href,
+            href: activitiesCard.contentPage.href,
             title: activitiesCard.cta_text,
             isExternal: false,
           }
@@ -30,7 +21,7 @@ export function setActivityCard(activitiesCard: ActivityCard): Facility {
       secondaryButton: hasImage
         ? undefined
         : {
-            href: activitiesCard.contentPage[0].href,
+            href: activitiesCard.contentPage.href,
             title: activitiesCard.cta_text,
             isExternal: false,
           },
diff --git a/components/ContentType/LoyaltyPage/index.tsx b/components/ContentType/LoyaltyPage/index.tsx
index dae031170..d28672daf 100644
--- a/components/ContentType/LoyaltyPage/index.tsx
+++ b/components/ContentType/LoyaltyPage/index.tsx
@@ -1,10 +1,9 @@
 import { serverClient } from "@/lib/trpc/server"
 
+import Blocks from "@/components/Blocks"
 import Hero from "@/components/Hero"
-import Intro from "@/components/Intro"
-import { Blocks } from "@/components/Loyalty/Blocks"
-import Sidebar from "@/components/Loyalty/Sidebar"
 import MaxWidth from "@/components/MaxWidth"
+import Sidebar from "@/components/Sidebar"
 import Preamble from "@/components/TempDesignSystem/Text/Preamble"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import TrackingSDK from "@/components/TrackingSDK"
@@ -41,7 +40,9 @@ export default async function LoyaltyPage() {
               />
             ) : null}
           </header>
-          {loyaltyPage.blocks ? <Blocks blocks={loyaltyPage.blocks} /> : null}
+          {loyaltyPage.blocks.length ? (
+            <Blocks blocks={loyaltyPage.blocks} />
+          ) : null}
         </MaxWidth>
       </section>
 
diff --git a/components/Current/Aside/Puff/index.tsx b/components/Current/Aside/Puff/index.tsx
index bfb8f0843..238df6440 100644
--- a/components/Current/Aside/Puff/index.tsx
+++ b/components/Current/Aside/Puff/index.tsx
@@ -4,8 +4,8 @@ import { useRouter } from "next/navigation"
 import { Button } from "@scandic-hotels/design-system/current"
 
 import { renderOptions as currentRenderOptions } from "@/components/Current/currentRenderOptions"
+import DeprecatedJsonToHtml from "@/components/DeprecatedJsonToHtml"
 import Image from "@/components/Image"
-import JsonToHtml from "@/components/JsonToHtml"
 
 import { renderOptions } from "./renderOptions"
 
@@ -42,7 +42,7 @@ export default function Puff({
             />
           ))}
           <section className={styles.content}>
-            <JsonToHtml
+            <DeprecatedJsonToHtml
               embeds={[]}
               nodes={text.json.children}
               renderOptions={{ ...currentRenderOptions, ...renderOptions }}
@@ -71,7 +71,7 @@ export default function Puff({
               <header>
                 <h3 className={styles.heading}>{title}</h3>
               </header>
-              <JsonToHtml
+              <DeprecatedJsonToHtml
                 embeds={[]}
                 nodes={text.json.children}
                 renderOptions={{ ...currentRenderOptions, ...renderOptions }}
diff --git a/components/Current/Aside/Puff/renderOptions.tsx b/components/Current/Aside/Puff/renderOptions.tsx
index 507abc30e..af9b46e32 100644
--- a/components/Current/Aside/Puff/renderOptions.tsx
+++ b/components/Current/Aside/Puff/renderOptions.tsx
@@ -1,6 +1,6 @@
 import styles from "./puff.module.css"
 
-import type { EmbedByUid } from "@/types/components/jsontohtml"
+import type { EmbedByUid } from "@/types/components/deprecatedjsontohtml"
 import { RTETypeEnum } from "@/types/rte/enums"
 import type { RTEDefaultNode, RTENext } from "@/types/rte/node"
 import type { RenderOptions } from "@/types/rte/option"
diff --git a/components/Current/Blocks/Text.tsx b/components/Current/Blocks/Text.tsx
index 4d20bd1fc..6fad892a5 100644
--- a/components/Current/Blocks/Text.tsx
+++ b/components/Current/Blocks/Text.tsx
@@ -1,4 +1,4 @@
-import JsonToHtml from "@/components/JsonToHtml"
+import DeprecatedJsonToHtml from "@/components/DeprecatedJsonToHtml"
 
 import { renderOptions } from "./../currentRenderOptions"
 
@@ -6,7 +6,7 @@ import type { TextProps } from "@/types/components/current/blocks/text"
 
 export default function Text({ text }: TextProps) {
   return (
-    <JsonToHtml
+    <DeprecatedJsonToHtml
       embeds={text.content.embedded_itemsConnection.edges}
       nodes={text.content.json.children}
       renderOptions={renderOptions}
diff --git a/components/Current/Header/index.tsx b/components/Current/Header/index.tsx
index 1c11b8045..82412edbd 100644
--- a/components/Current/Header/index.tsx
+++ b/components/Current/Header/index.tsx
@@ -22,14 +22,14 @@ export default async function Header() {
     serverClient().contentstack.myPages.navigation.get(),
   ])
 
-  if (!navigation || !languages || !data) {
+  if (!navigation || !languages || !data?.header) {
     return null
   }
 
   const homeHref = homeHrefs[env.NODE_ENV][getLang()]
-  const { frontpage_link_text, logo, menu, top_menu } = data
+  const { frontpageLinkText, logo, menu, topMenu } = data.header
 
-  const topMenuMobileLinks = top_menu.links
+  const topMenuMobileLinks = topMenu.links
     .filter((link) => link.show_on_mobile)
     .sort((a, b) => (a.sort_order_mobile < b.sort_order_mobile ? 1 : -1))
 
@@ -37,13 +37,13 @@ export default async function Header() {
     <header className={styles.header} role="banner">
       <OfflineBanner />
       <TopMenu
-        frontpageLinkText={frontpage_link_text}
+        frontpageLinkText={frontpageLinkText}
         homeHref={homeHref}
-        links={top_menu.links}
+        links={topMenu.links}
         languageSwitcher={<LanguageSwitcher urls={languages.urls} />}
       />
       <MainMenu
-        frontpageLinkText={frontpage_link_text}
+        frontpageLinkText={frontpageLinkText}
         homeHref={homeHref}
         links={menu.links}
         logo={logo}
diff --git a/components/Current/Preamble/index.tsx b/components/Current/Preamble/index.tsx
index bd0c7adc4..677bfbcd1 100644
--- a/components/Current/Preamble/index.tsx
+++ b/components/Current/Preamble/index.tsx
@@ -1,4 +1,4 @@
-import JsonToHtml from "@/components/JsonToHtml"
+import DeprecatedJsonToHtml from "@/components/DeprecatedJsonToHtml"
 
 import { renderOptions as currentRenderOptions } from "./../currentRenderOptions"
 import Breadcrumbs from "./Breadcrumbs"
@@ -25,7 +25,7 @@ export default function Preamble({
         />
         <h1>{title}</h1>
         {preamble?.text ? (
-          <JsonToHtml
+          <DeprecatedJsonToHtml
             embeds={preamble.text.embedded_itemsConnection.edges}
             nodes={preamble.text.json.children}
             renderOptions={{ ...currentRenderOptions, ...renderOptions }}
diff --git a/components/Current/Preamble/renderOptions.tsx b/components/Current/Preamble/renderOptions.tsx
index aad0599c5..1c613cab2 100644
--- a/components/Current/Preamble/renderOptions.tsx
+++ b/components/Current/Preamble/renderOptions.tsx
@@ -1,6 +1,6 @@
 import styles from "./preamble.module.css"
 
-import type { EmbedByUid } from "@/types/components/jsontohtml"
+import type { EmbedByUid } from "@/types/components/deprecatedjsontohtml"
 import { RTETypeEnum } from "@/types/rte/enums"
 import type { RTEDefaultNode, RTENext } from "@/types/rte/node"
 import type { RenderOptions } from "@/types/rte/option"
diff --git a/components/Current/currentRenderOptions.tsx b/components/Current/currentRenderOptions.tsx
index ae8c465be..2360e1805 100644
--- a/components/Current/currentRenderOptions.tsx
+++ b/components/Current/currentRenderOptions.tsx
@@ -3,7 +3,7 @@ import Link from "@/components/TempDesignSystem/Link"
 
 import styles from "./currentRenderOptions.module.css"
 
-import type { EmbedByUid } from "@/types/components/jsontohtml"
+import type { EmbedByUid } from "@/types/components/deprecatedjsontohtml"
 import { EmbedEnum } from "@/types/requests/utils/embeds"
 import type { Attributes } from "@/types/rte/attrs"
 import { RTEItemTypeEnum, RTETypeEnum } from "@/types/rte/enums"
diff --git a/components/DeprecatedJsonToHtml/index.tsx b/components/DeprecatedJsonToHtml/index.tsx
new file mode 100644
index 000000000..bcfd11119
--- /dev/null
+++ b/components/DeprecatedJsonToHtml/index.tsx
@@ -0,0 +1,20 @@
+import { nodesToHtml } from "./utils"
+
+import styles from "./jsontohtml.module.css"
+
+import type { DeprecatedJsonToHtmlProps } from "@/types/components/deprecatedjsontohtml"
+
+export default function DeprecatedJsonToHtml({
+  embeds,
+  nodes,
+  renderOptions = {},
+}: DeprecatedJsonToHtmlProps) {
+  if (!Array.isArray(nodes) || !nodes.length) {
+    return null
+  }
+  return (
+    <section className={styles.container}>
+      {nodesToHtml(nodes, embeds, renderOptions).filter(Boolean)}
+    </section>
+  )
+}
diff --git a/components/DeprecatedJsonToHtml/jsontohtml.module.css b/components/DeprecatedJsonToHtml/jsontohtml.module.css
new file mode 100644
index 000000000..94e27d4b8
--- /dev/null
+++ b/components/DeprecatedJsonToHtml/jsontohtml.module.css
@@ -0,0 +1,68 @@
+.image {
+  max-width: 100%;
+  width: 100%;
+  height: 365px;
+  object-fit: cover;
+  border-radius: var(--Corner-radius-Medium);
+  margin: var(--Spacing-x1) var(--Spacing-x0);
+}
+
+.ul,
+.ol {
+  padding: var(--Spacing-x2) var(--Spacing-x0);
+  display: grid;
+  gap: var(--Spacing-x1);
+}
+
+.ol > li::marker {
+  color: var(--Primary-Light-On-Surface-Accent);
+}
+
+.li:has(.heart),
+.li:has(.check) {
+  list-style: none;
+}
+
+.li {
+  margin-left: var(--Spacing-x3);
+}
+
+.li:has(.heart):before {
+  content: url("/_static/icons/heart.svg");
+  position: relative;
+  height: 8px;
+  top: 3px;
+  margin-right: var(--Spacing-x1);
+  margin-left: calc(var(--Spacing-x3) * -1);
+}
+
+.li:has(.check)::before {
+  content: url("/_static/icons/check-ring.svg");
+  position: relative;
+  height: 8px;
+  top: 3px;
+  margin-right: var(--Spacing-x1);
+  margin-left: calc(var(--Spacing-x3) * -1);
+}
+
+.container {
+  display: grid;
+  gap: var(--Spacing-x3);
+  max-width: 1197px;
+}
+
+.li > p {
+  display: inline;
+}
+
+.tableContainer {
+  max-width: 100%;
+  overflow-x: auto;
+}
+@media screen and (min-width: 768px) {
+  .ol:has(li:nth-last-child(n + 5)),
+  .ul:has(li:nth-last-child(n + 5)) {
+    grid-template-columns: 1fr 1fr;
+    grid-auto-flow: column;
+  }
+}
diff --git a/components/DeprecatedJsonToHtml/renderOptions.tsx b/components/DeprecatedJsonToHtml/renderOptions.tsx
new file mode 100644
index 000000000..a73efe396
--- /dev/null
+++ b/components/DeprecatedJsonToHtml/renderOptions.tsx
@@ -0,0 +1,696 @@
+import Image from "@/components/Image"
+import Link from "@/components/TempDesignSystem/Link"
+import { insertResponseToImageVaultAsset } from "@/utils/imageVault"
+import { removeMultipleSlashes } from "@/utils/url"
+
+import ImageContainer from "../ImageContainer"
+import Divider from "../TempDesignSystem/Divider"
+import Table from "../TempDesignSystem/Table"
+import BiroScript from "../TempDesignSystem/Text/BiroScript"
+import Body from "../TempDesignSystem/Text/Body"
+import Caption from "../TempDesignSystem/Text/Caption"
+import Footnote from "../TempDesignSystem/Text/Footnote"
+import Subtitle from "../TempDesignSystem/Text/Subtitle"
+import Title from "../TempDesignSystem/Text/Title"
+import { hasAvailableParagraphFormat, hasAvailableULFormat } from "./utils"
+
+import styles from "./jsontohtml.module.css"
+
+import type { EmbedByUid } from "@/types/components/deprecatedjsontohtml"
+import { ImageVaultAsset } from "@/types/components/imageVault"
+import { EmbedEnum } from "@/types/requests/utils/embeds"
+import type { Attributes, RTEImageVaultAttrs } from "@/types/rte/attrs"
+import {
+  AvailableParagraphFormatEnum,
+  RTEItemTypeEnum,
+  RTETypeEnum,
+} from "@/types/rte/enums"
+import type {
+  RTEDefaultNode,
+  RTEImageNode,
+  RTENext,
+  RTENode,
+  RTERegularNode,
+  RTETextNode,
+} from "@/types/rte/node"
+import { RTEMarkType } from "@/types/rte/node"
+import type { RenderOptions } from "@/types/rte/option"
+
+function extractPossibleAttributes(attrs: Attributes | undefined) {
+  if (!attrs) return {}
+  const props: Record<string, any> = {}
+  if (attrs.id) {
+    props.id = attrs.id
+  }
+
+  if (attrs.class) {
+    props.className = attrs.class
+  } else if (attrs["class-name"]) {
+    props.className = attrs["class-name"]
+  } else if (attrs.classname) {
+    props.className = attrs.classname
+  } else if (attrs?.style?.["text-align"]) {
+    props.style = {
+      textAlign: attrs?.style?.["text-align"],
+    }
+  }
+
+  return props
+}
+
+export const renderOptions: RenderOptions = {
+  [RTETypeEnum.a]: (
+    node: RTERegularNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    if (node.attrs.url) {
+      const props = extractPossibleAttributes(node.attrs)
+      return (
+        <Link
+          {...props}
+          href={node.attrs.url}
+          key={node.uid}
+          target={node.attrs.target ?? "_blank"}
+          variant="underscored"
+          color="burgundy"
+        >
+          {next(node.children, embeds, fullRenderOptions)}
+        </Link>
+      )
+    }
+    return null
+  },
+
+  [RTETypeEnum.blockquote]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <BiroScript key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </BiroScript>
+    )
+  },
+
+  [RTETypeEnum.code]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <code key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </code>
+    )
+  },
+
+  [RTETypeEnum.embed]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    if (node.attrs.src) {
+      props.src = node.attrs.src
+    }
+    if (node.attrs.url) {
+      props.src = node.attrs.url
+    }
+    if (!props.src) {
+      return null
+    }
+    return (
+      <iframe key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </iframe>
+    )
+  },
+
+  [RTETypeEnum.h1]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Title key={node.uid} {...props} level="h1">
+        {next(node.children, embeds, fullRenderOptions)}
+      </Title>
+    )
+  },
+
+  [RTETypeEnum.h2]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Title key={node.uid} {...props} level="h2">
+        {next(node.children, embeds, fullRenderOptions)}
+      </Title>
+    )
+  },
+
+  [RTETypeEnum.h3]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Title key={node.uid} {...props} level="h3">
+        {next(node.children, embeds, fullRenderOptions)}
+      </Title>
+    )
+  },
+
+  [RTETypeEnum.h4]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Title key={node.uid} {...props} level="h4">
+        {next(node.children, embeds, fullRenderOptions)}
+      </Title>
+    )
+  },
+
+  [RTETypeEnum.h5]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Title key={node.uid} {...props} level="h5">
+        {next(node.children, embeds, fullRenderOptions)}
+      </Title>
+    )
+  },
+
+  [RTETypeEnum.hr]: () => {
+    return <Divider />
+  },
+
+  [RTETypeEnum.li]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <li key={node.uid} {...props} className={styles.li}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </li>
+    )
+  },
+
+  [RTETypeEnum.ol]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+
+    // Set the number of rows dynamically to create even rows for each column. We want the li:s
+    // to flow with the column, so therefore this is needed.
+    let numberOfRows: number | undefined
+    if (node.children.length > 4) {
+      const half = node.children.length / 2
+      numberOfRows = Math.ceil(half)
+    }
+
+    return (
+      <ol
+        key={node.uid}
+        {...props}
+        className={styles.ol}
+        style={
+          numberOfRows
+            ? { gridTemplateRows: `repeat(${numberOfRows}, auto)` }
+            : {}
+        }
+      >
+        {next(node.children, embeds, fullRenderOptions)}
+      </ol>
+    )
+  },
+
+  [RTETypeEnum.p]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+
+    const hasFormat = node.children.some((item) =>
+      hasAvailableParagraphFormat((item as RTETextNode)?.classname)
+    )
+
+    // If a child node has an available format as className, we wrap it in a
+    // span and render the children with the correct component
+    if (hasFormat) {
+      return next(node.children, embeds, fullRenderOptions)
+    }
+
+    return (
+      <Body {...props} key={node.uid}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </Body>
+    )
+  },
+
+  [RTETypeEnum.reference]: (
+    node: RTENode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    if ("attrs" in node) {
+      const type = node.attrs.type
+      if (type === RTEItemTypeEnum.asset) {
+        const image = embeds?.[node?.attrs?.["asset-uid"]]
+        if (image?.node.__typename === EmbedEnum.SysAsset) {
+          const alt = image?.node?.title ?? node.attrs.alt
+          const props = extractPossibleAttributes(node.attrs)
+          props.className = styles.image
+          return (
+            <Image
+              key={node.uid}
+              alt={alt}
+              height={image.node.dimension.height}
+              src={image?.node?.url}
+              width={image.node.dimension.width}
+              {...props}
+            />
+          )
+        }
+      } else if (type === RTEItemTypeEnum.entry) {
+        const entry = embeds?.[node?.attrs?.["entry-uid"]]
+
+        if (entry?.node.__typename === EmbedEnum.ImageContainer) {
+          if (entry.node.image_left && entry.node.image_right) {
+            if ("dimensions" in entry.node.image_left) {
+              // Only temp until all ImageVaultAssets are
+              // handled in schema.transform()
+              return (
+                <ImageContainer
+                  leftImage={
+                    entry.node.image_left as unknown as ImageVaultAsset
+                  }
+                  rightImage={
+                    entry.node.image_right as unknown as ImageVaultAsset
+                  }
+                />
+              )
+            }
+            const leftImage = insertResponseToImageVaultAsset(
+              entry.node.image_left
+            )
+            const rightImage = insertResponseToImageVaultAsset(
+              entry.node.image_right
+            )
+            return (
+              <ImageContainer leftImage={leftImage} rightImage={rightImage} />
+            )
+          }
+          return null
+        } else if (
+          entry?.node.__typename === EmbedEnum.LoyaltyPage ||
+          entry?.node.__typename === EmbedEnum.ContentPage ||
+          entry?.node.__typename === EmbedEnum.AccountPage
+        ) {
+          // If entry is not an ImageContainer, it is a page and we return it as a link
+          const props = extractPossibleAttributes(node.attrs)
+          let href = ""
+          if (entry?.node.__typename === EmbedEnum.AccountPage) {
+            href = removeMultipleSlashes(
+              `/${entry.node.system.locale}${entry.node.url}`
+            )
+          } else {
+            href =
+              entry.node?.web?.original_url ||
+              removeMultipleSlashes(
+                `/${entry.node.system.locale}${entry.node.url}`
+              )
+          }
+
+          return (
+            <Link
+              {...props}
+              href={href}
+              key={node.uid}
+              variant="underscored"
+              color="burgundy"
+            >
+              {next(node.children, embeds, fullRenderOptions)}
+            </Link>
+          )
+        }
+      }
+    }
+
+    return null
+  },
+
+  [RTETypeEnum.ImageVault]: (node: RTEImageNode) => {
+    if ("attrs" in node) {
+      const type = node.type
+      if (type === RTETypeEnum.ImageVault) {
+        const attrs = node.attrs as RTEImageVaultAttrs
+        let image = undefined
+        if ("dimensions" in attrs) {
+          image = attrs
+        } else {
+          image = insertResponseToImageVaultAsset(attrs)
+        }
+        const alt = image.meta.alt ?? image.title
+
+        const width = attrs.width
+          ? parseInt(attrs.width.replaceAll("px", ""))
+          : image.dimensions.width
+        const props = extractPossibleAttributes(attrs)
+        return (
+          <section key={node.uid}>
+            <Image
+              alt={alt}
+              className={styles.image}
+              height={365}
+              src={image.url}
+              width={width}
+              {...props}
+            />
+            <Caption>{image.meta.caption}</Caption>
+          </section>
+        )
+      }
+    }
+
+    return null
+  },
+
+  [RTETypeEnum.table]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <div className={styles.tableContainer}>
+        <Table key={node.uid} {...props}>
+          {next(node.children, embeds, fullRenderOptions)}
+        </Table>
+      </div>
+    )
+  },
+
+  [RTETypeEnum.thead]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    // Override the styling of p tags inside the thead tag
+    const theadChildPRenderOptions = {
+      ...fullRenderOptions,
+      [RTETypeEnum.p]: (
+        node: RTEDefaultNode,
+        embeds: EmbedByUid,
+        next: RTENext,
+        fullRenderOptions: RenderOptions
+      ) => (
+        <Body color={"burgundy"} textTransform={"bold"}>
+          {next(node.children, embeds, fullRenderOptions)}
+        </Body>
+      ),
+    }
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Table.THead key={node.uid} {...props}>
+        {next(node.children, embeds, theadChildPRenderOptions)}
+      </Table.THead>
+    )
+  },
+
+  [RTETypeEnum.tbody]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Table.TBody key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </Table.TBody>
+    )
+  },
+
+  [RTETypeEnum.tfoot]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <tfoot key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </tfoot>
+    )
+  },
+
+  [RTETypeEnum.fragment]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    return <>{next(node.children, embeds, fullRenderOptions)}</>
+  },
+
+  [RTETypeEnum.tr]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Table.TR key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </Table.TR>
+    )
+  },
+
+  [RTETypeEnum.th]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Table.TH key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </Table.TH>
+    )
+  },
+
+  [RTETypeEnum.td]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+    return (
+      <Table.TD key={node.uid} {...props}>
+        {next(node.children, embeds, fullRenderOptions)}
+      </Table.TD>
+    )
+  },
+
+  [RTETypeEnum.ul]: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    const props = extractPossibleAttributes(node.attrs)
+
+    // Set the number of rows dynamically to create even rows for each column. We want the li:s
+    // to flow with the column, so therefore this is needed.
+    let numberOfRows: number | undefined
+    if (node.children.length > 4) {
+      const half = node.children.length / 2
+      numberOfRows = Math.ceil(half)
+    }
+
+    return (
+      <ul
+        key={node.uid}
+        {...props}
+        className={styles.ul}
+        style={
+          numberOfRows
+            ? {
+                gridTemplateRows: `repeat(${numberOfRows}, auto)`,
+              }
+            : {}
+        }
+      >
+        {next(node.children, embeds, fullRenderOptions)}
+      </ul>
+    )
+  },
+
+  /** TextNode wrappers */
+  [RTEMarkType.bold]: (children: React.ReactNode) => {
+    return <strong>{children}</strong>
+  },
+
+  [RTEMarkType.italic]: (children: React.ReactNode) => {
+    return <em>{children}</em>
+  },
+
+  [RTEMarkType.underline]: (children: React.ReactNode) => {
+    return <u>{children}</u>
+  },
+
+  [RTEMarkType.strikethrough]: (children: React.ReactNode) => {
+    return <s>{children}</s>
+  },
+
+  [RTEMarkType.inlineCode]: (children: React.ReactNode) => {
+    return <span>{children}</span>
+  },
+
+  [RTEMarkType.subscript]: (children: React.ReactNode) => {
+    return <sub>{children}</sub>
+  },
+
+  [RTEMarkType.superscript]: (children: React.ReactNode) => {
+    return <sup>{children}</sup>
+  },
+
+  [RTEMarkType.break]: (children: React.ReactNode) => {
+    return (
+      <>
+        <br />
+        {children}
+      </>
+    )
+  },
+
+  [RTEMarkType.classnameOrId]: (
+    children: React.ReactNode,
+    className?: string,
+    id?: string
+  ) => {
+    let props = {
+      className,
+      id,
+    }
+    if (!className) {
+      delete props.className
+    }
+    if (!id) {
+      delete props.id
+    }
+
+    if (className) {
+      if (hasAvailableULFormat(className)) {
+        // @ts-ignore:  We want to set css modules classNames even if it does not correspond
+        // to an existing class in the module style sheet. Due to our css modules plugin for
+        // typescript, we cannot do this without the ts-ignore
+        props.className = styles[className]
+      }
+    }
+
+    if (className === AvailableParagraphFormatEnum.footnote) {
+      return (
+        <Footnote key={id} {...props}>
+          {children}
+        </Footnote>
+      )
+    }
+
+    if (className === AvailableParagraphFormatEnum.caption) {
+      return (
+        <Caption key={id} {...props}>
+          {children}
+        </Caption>
+      )
+    }
+
+    if (className === AvailableParagraphFormatEnum["script-1"]) {
+      return (
+        <BiroScript key={id} type="one" {...props}>
+          {children}
+        </BiroScript>
+      )
+    }
+
+    if (className === AvailableParagraphFormatEnum["script-2"]) {
+      return (
+        <BiroScript key={id} type="two" {...props}>
+          {children}
+        </BiroScript>
+      )
+    }
+
+    if (className === AvailableParagraphFormatEnum["subtitle-1"]) {
+      return (
+        <Subtitle key={id} {...props} type="one">
+          {children}
+        </Subtitle>
+      )
+    }
+    if (className === AvailableParagraphFormatEnum["subtitle-2"]) {
+      return (
+        <Subtitle key={id} {...props} type="two">
+          {children}
+        </Subtitle>
+      )
+    }
+    return (
+      <span key={id} {...props}>
+        {children}
+      </span>
+    )
+  },
+
+  /**
+   * Contentstack can return something called `default` as seen here in their
+   * own SDK (https://github.com/contentstack/contentstack-utils-javascript/blob/master/src/options/default-node-options.ts#L89)
+   */
+  default: (
+    node: RTEDefaultNode,
+    embeds: EmbedByUid,
+    next: RTENext,
+    fullRenderOptions: RenderOptions
+  ) => {
+    return next(node.children, embeds, fullRenderOptions)
+  },
+}
diff --git a/components/DeprecatedJsonToHtml/utils.tsx b/components/DeprecatedJsonToHtml/utils.tsx
new file mode 100644
index 000000000..347a23106
--- /dev/null
+++ b/components/DeprecatedJsonToHtml/utils.tsx
@@ -0,0 +1,138 @@
+import { renderOptions } from "./renderOptions"
+
+import type { EmbedByUid } from "@/types/components/deprecatedjsontohtml"
+import type { Embeds } from "@/types/requests/embeds"
+import type { Node } from "@/types/requests/utils/edges"
+import {
+  AvailableParagraphFormatEnum,
+  AvailableULFormatEnum,
+  RTETypeEnum,
+} from "@/types/rte/enums"
+import type {
+  RTENode,
+  RTERenderOptionComponent,
+  RTETextNode,
+} from "@/types/rte/node"
+import { RTEMarkType, RTERenderMark } from "@/types/rte/node"
+import type { RenderOptions } from "@/types/rte/option"
+
+export function groupEmbedsByUid(embedsArray: Node<Embeds>[]) {
+  const embedsByUid = embedsArray.reduce<EmbedByUid>((acc, embed) => {
+    if (embed.node.system?.uid) {
+      acc[embed.node.system.uid] = embed
+    }
+    return acc
+  }, {})
+
+  return embedsByUid
+}
+
+export function nodeChildrenToHtml(
+  nodes: RTENode[],
+  embeds: EmbedByUid,
+  fullRenderOptions: RenderOptions
+): any {
+  return nodes.map((node, i) => {
+    // This function either returns a JSX element or null
+    return {
+      ...nodeToHtml(node, embeds, fullRenderOptions),
+      key: `child-rte-${i}`,
+    }
+  })
+}
+
+export function textNodeToHtml(
+  node: RTETextNode,
+  fullRenderOptions: RenderOptions
+) {
+  let text = <>{node.text}</>
+
+  if (node.classname || node.id) {
+    text = (fullRenderOptions[RTEMarkType.classnameOrId] as RTERenderMark)(
+      text,
+      node.classname,
+      node.id
+    )
+  }
+  if (node.break) {
+    text = (fullRenderOptions[RTEMarkType.break] as RTERenderMark)(text)
+  }
+  if (node.superscript) {
+    text = (fullRenderOptions[RTEMarkType.superscript] as RTERenderMark)(text)
+  }
+  if (node.subscript) {
+    text = (fullRenderOptions[RTEMarkType.subscript] as RTERenderMark)(text)
+  }
+  if (node.inlineCode) {
+    text = (fullRenderOptions[RTEMarkType.inlineCode] as RTERenderMark)(text)
+  }
+  if (node.strikethrough) {
+    text = (fullRenderOptions[RTEMarkType.strikethrough] as RTERenderMark)(text)
+  }
+  if (node.underline) {
+    text = (fullRenderOptions[RTEMarkType.underline] as RTERenderMark)(text)
+  }
+  if (node.italic) {
+    text = (fullRenderOptions[RTEMarkType.italic] as RTERenderMark)(text)
+  }
+  if (node.bold) {
+    text = (fullRenderOptions[RTEMarkType.bold] as RTERenderMark)(text)
+  }
+  return text
+}
+
+function next(
+  nodes: RTENode[],
+  embeds: EmbedByUid,
+  fullRenderOptions: RenderOptions
+) {
+  return nodeChildrenToHtml(nodes, embeds, fullRenderOptions)
+}
+
+export function hasAvailableParagraphFormat(className?: string) {
+  if (!className) {
+    return false
+  }
+  return Object.keys(AvailableParagraphFormatEnum).includes(className)
+}
+
+export function hasAvailableULFormat(className?: string) {
+  if (!className) {
+    return false
+  }
+  return Object.keys(AvailableULFormatEnum).includes(className)
+}
+
+export function nodeToHtml(
+  node: RTENode,
+  embeds: EmbedByUid,
+  fullRenderOptions: RenderOptions
+) {
+  if ("type" in node === false) {
+    return textNodeToHtml(node, fullRenderOptions)
+  } else {
+    if (fullRenderOptions[node.type] !== undefined) {
+      if (node.type === RTETypeEnum.doc) {
+        return null
+      }
+      return (fullRenderOptions[node.type] as RTERenderOptionComponent)(
+        node,
+        embeds,
+        next,
+        fullRenderOptions
+      )
+    } else {
+      return next(node.children, embeds, fullRenderOptions)
+    }
+  }
+}
+
+export function nodesToHtml(
+  nodes: RTENode[],
+  embedsArray: Node<Embeds>[],
+  overrideRenderOptions: RenderOptions
+) {
+  const embeds = groupEmbedsByUid(embedsArray)
+  const fullRenderOptions = { ...renderOptions, ...overrideRenderOptions }
+  return nodes.map((node) => nodeToHtml(node, embeds, fullRenderOptions))
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/button.module.css b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/button.module.css
new file mode 100644
index 000000000..d6da12b1b
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/button.module.css
@@ -0,0 +1,19 @@
+.button {
+  align-items: center;
+  border: none;
+  border-radius: var(--Corner-radius-Medium);
+  cursor: pointer;
+  display: flex;
+  gap: var(--Spacing-x-half);
+  outline: none;
+  padding: var(--Spacing-x1);
+}
+
+.default {
+  background-color: transparent;
+}
+
+.active,
+.button:focus {
+  background-color: var(--Base-Surface-Primary-light-Hover-alt);
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/index.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/index.tsx
new file mode 100644
index 000000000..a734e30ec
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/index.tsx
@@ -0,0 +1,47 @@
+"use client"
+import { useIntl } from "react-intl"
+
+import { DeleteIcon } from "@/components/Icons"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+
+import { buttonVariants } from "./variants"
+
+import type { ClearSearchButtonProps } from "@/types/components/search"
+
+export default function ClearSearchButton({
+  getItemProps,
+  highlightedIndex,
+  index,
+}: ClearSearchButtonProps) {
+  const intl = useIntl()
+  const classNames = buttonVariants({
+    variant: index === highlightedIndex ? "active" : "default",
+  })
+
+  function handleClick() {
+    // noop
+    // the click bubbles to handleOnSelect
+    // where selectedItem = "clear-search"
+    // which is the value for item below
+  }
+
+  return (
+    <button
+      {...getItemProps({
+        className: classNames,
+        id: "clear-search",
+        index,
+        item: "clear-search",
+        role: "button",
+      })}
+      onClick={handleClick}
+      tabIndex={0}
+      type="button"
+    >
+      <DeleteIcon color="burgundy" height={20} width={20} />
+      <Caption color="burgundy" textTransform="bold">
+        {intl.formatMessage({ id: "Clear searches" })}
+      </Caption>
+    </button>
+  )
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/variants.ts b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/variants.ts
new file mode 100644
index 000000000..2bbbf5fcc
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/ClearSearchButton/variants.ts
@@ -0,0 +1,17 @@
+import { cva } from "class-variance-authority"
+
+import styles from "./button.module.css"
+
+const config = {
+  variants: {
+    variant: {
+      active: styles.active,
+      default: styles.default,
+    },
+  },
+  defaultVariants: {
+    variant: "default",
+  },
+} as const
+
+export const buttonVariants = cva(styles.button, config)
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/dialog.module.css b/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/dialog.module.css
new file mode 100644
index 000000000..e1ca8f23d
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/dialog.module.css
@@ -0,0 +1,33 @@
+.dialog {
+  background-color: var(--Base-Surface-Primary-light-Normal);
+  border-radius: var(--Corner-radius-Large);
+  box-shadow: 0 0 14px 6px rgba(0, 0, 0, 0.1);
+  display: flex;
+  flex-direction: column;
+  left: 0;
+  list-style: none;
+  max-height: 380px;
+  overflow-y: auto;
+  padding: var(--Spacing-x2) var(--Spacing-x3);
+  position: absolute;
+  /** 
+   * var(--Spacing-x4) to account for padding inside 
+   * the bookingwidget and to add the padding for the
+   * box itself 
+   */
+  top: calc(100% + var(--Spacing-x4));
+  width: 360px;
+  z-index: 99;
+}
+
+.default {
+  gap: var(--Spacing-x1);
+}
+
+.error {
+  gap: var(--Spacing-x-half);
+}
+
+.search {
+  gap: var(--Spacing-x3);
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/index.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/index.tsx
new file mode 100644
index 000000000..77834b516
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/index.tsx
@@ -0,0 +1,13 @@
+import { dialogVariants } from "./variants"
+
+import type { DialogProps } from "@/types/components/search"
+
+export default function Dialog({
+  children,
+  className,
+  getMenuProps,
+  variant,
+}: DialogProps) {
+  const classNames = dialogVariants({ className, variant })
+  return <div {...getMenuProps({ className: classNames })}>{children}</div>
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/variants.ts b/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/variants.ts
new file mode 100644
index 000000000..072efcb6e
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/variants.ts
@@ -0,0 +1,18 @@
+import { cva } from "class-variance-authority"
+
+import styles from "./dialog.module.css"
+
+const config = {
+  variants: {
+    variant: {
+      default: styles.default,
+      error: styles.error,
+      search: styles.search,
+    },
+  },
+  defaultVariants: {
+    variant: "default",
+  },
+} as const
+
+export const dialogVariants = cva(styles.dialog, config)
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/List/Label.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/Label.tsx
new file mode 100644
index 000000000..e671052b1
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/Label.tsx
@@ -0,0 +1,13 @@
+import Footnote from "@/components/TempDesignSystem/Text/Footnote"
+
+import styles from "./list.module.css"
+
+export default function Label({ children }: React.PropsWithChildren) {
+  return (
+    <li className={styles.label}>
+      <Footnote color="uiTextPlaceholder" textTransform="uppercase">
+        {children}
+      </Footnote>
+    </li>
+  )
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/index.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/index.tsx
new file mode 100644
index 000000000..706f0d105
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/index.tsx
@@ -0,0 +1,40 @@
+import Body from "@/components/TempDesignSystem/Text/Body"
+
+import { listItemVariants } from "./variants"
+
+import type { ListItemProps } from "@/types/components/search"
+
+export default function ListItem({
+  getItemProps,
+  highlightedIndex,
+  index,
+  location,
+}: ListItemProps) {
+  const classNames = listItemVariants({
+    variant: index === highlightedIndex ? "active" : "default",
+  })
+
+  const isCity = location.type === "cities"
+  const isHotelLocation = location.type === "hotels"
+  return (
+    <li
+      {...getItemProps({
+        className: classNames,
+        index,
+        item: location,
+      })}
+    >
+      <Body color="black" textTransform="bold">
+        {location.name}
+      </Body>
+      {isCity && location?.country ? (
+        <Body color="uiTextPlaceholder">{location.country}</Body>
+      ) : null}
+      {isHotelLocation && location.relationships.city?.name ? (
+        <Body color="uiTextPlaceholder">
+          {location.relationships.city.name}
+        </Body>
+      ) : null}
+    </li>
+  )
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/listItem.module.css b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/listItem.module.css
new file mode 100644
index 000000000..978abcab2
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/listItem.module.css
@@ -0,0 +1,13 @@
+.listItem {
+  border-radius: var(--Corner-radius-Medium);
+  cursor: pointer;
+  padding: var(--Spacing-x1);
+}
+
+.default {
+  background-color: transparent;
+}
+
+.active {
+  background-color: var(--Base-Surface-Primary-light-Hover-alt);
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/variants.ts b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/variants.ts
new file mode 100644
index 000000000..8d7d05cb1
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/ListItem/variants.ts
@@ -0,0 +1,17 @@
+import { cva } from "class-variance-authority"
+
+import styles from "./listItem.module.css"
+
+const config = {
+  variants: {
+    variant: {
+      active: styles.active,
+      default: styles.default,
+    },
+  },
+  defaultVariants: {
+    variant: "default",
+  },
+} as const
+
+export const listItemVariants = cva(styles.listItem, config)
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/List/index.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/index.tsx
new file mode 100644
index 000000000..946fb2e28
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/index.tsx
@@ -0,0 +1,32 @@
+import Label from "./Label"
+import ListItem from "./ListItem"
+
+import styles from "./list.module.css"
+
+import type { ListProps } from "@/types/components/search"
+
+export default function List({
+  getItemProps,
+  highlightedIndex,
+  initialIndex = 0,
+  label,
+  locations,
+}: ListProps) {
+  if (!locations.length) {
+    return null
+  }
+  return (
+    <ul className={styles.list}>
+      {label ? <Label>{label}</Label> : null}
+      {locations.map((location, index) => (
+        <ListItem
+          getItemProps={getItemProps}
+          highlightedIndex={highlightedIndex}
+          index={initialIndex + index}
+          key={location.id}
+          location={location}
+        />
+      ))}
+    </ul>
+  )
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/List/list.module.css b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/list.module.css
new file mode 100644
index 000000000..5278ef667
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/List/list.module.css
@@ -0,0 +1,9 @@
+.list {
+  display: flex;
+  flex-direction: column;
+  list-style: none;
+}
+
+.label {
+  padding: 0 var(--Spacing-x1);
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx b/components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx
new file mode 100644
index 000000000..2bbc3b43d
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/index.tsx
@@ -0,0 +1,174 @@
+"use client"
+import { useEffect, useState } from "react"
+import { useFormContext } from "react-hook-form"
+import { useIntl } from "react-intl"
+
+import { ErrorCircleIcon } from "@/components/Icons"
+import Divider from "@/components/TempDesignSystem/Divider"
+import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+import Footnote from "@/components/TempDesignSystem/Text/Footnote"
+
+import ClearSearchButton from "./ClearSearchButton"
+import Dialog from "./Dialog"
+import List from "./List"
+
+import styles from "./searchList.module.css"
+
+import type { SearchListProps } from "@/types/components/search"
+
+export default function SearchList({
+  getItemProps,
+  getMenuProps,
+  highlightedIndex,
+  isOpen,
+  locations,
+  search,
+  searchHistory,
+}: SearchListProps) {
+  const intl = useIntl()
+  const [hasMounted, setHasMounted] = useState(false)
+  const {
+    clearErrors,
+    formState: { errors },
+  } = useFormContext()
+  const searchError = errors["search"]
+
+  useEffect(() => {
+    let timeoutID: ReturnType<typeof setTimeout> | null = null
+    if (searchError && searchError.message === "Required") {
+      timeoutID = setTimeout(() => {
+        clearErrors("search")
+        // magic number originates from animation
+        // 5000ms delay + 120ms exectuion
+      }, 5120)
+    }
+
+    return () => {
+      if (timeoutID) {
+        clearTimeout(timeoutID)
+      }
+    }
+  }, [clearErrors, searchError])
+
+  useEffect(() => {
+    setHasMounted(true)
+  }, [setHasMounted])
+
+  if (!hasMounted) {
+    return null
+  }
+
+  if (searchError) {
+    if (typeof searchError.message === "string") {
+      if (!isOpen) {
+        if (searchError.message === "Required") {
+          return (
+            <Dialog
+              className={styles.fadeOut}
+              getMenuProps={getMenuProps}
+              variant="error"
+            >
+              <Caption className={styles.heading} color="red">
+                <ErrorCircleIcon color="red" />
+                {intl.formatMessage({ id: "Enter destination or hotel" })}
+              </Caption>
+              <Body>
+                {intl.formatMessage({
+                  id: "A destination or hotel name is needed to be able to search for a hotel room.",
+                })}
+              </Body>
+            </Dialog>
+          )
+        }
+      }
+    }
+  }
+
+  if (!isOpen) {
+    return null
+  }
+
+  if (locations.length) {
+    const cities = locations.filter((location) => location.type === "cities")
+    const hotels = locations.filter((location) => location.type === "hotels")
+    return (
+      <Dialog getMenuProps={getMenuProps} variant="search">
+        <List
+          getItemProps={getItemProps}
+          highlightedIndex={highlightedIndex}
+          label={intl.formatMessage({ id: "Cities" })}
+          locations={cities}
+        />
+        <List
+          getItemProps={getItemProps}
+          highlightedIndex={highlightedIndex}
+          initialIndex={cities.length}
+          label={intl.formatMessage({ id: "Hotels" })}
+          locations={hotels}
+        />
+      </Dialog>
+    )
+  }
+
+  if (!search && searchHistory?.length) {
+    return (
+      <Dialog getMenuProps={getMenuProps}>
+        <Footnote color="uiTextPlaceholder" textTransform="uppercase">
+          {intl.formatMessage({ id: "Latest searches" })}
+        </Footnote>
+        <List
+          getItemProps={getItemProps}
+          highlightedIndex={highlightedIndex}
+          locations={searchHistory}
+        />
+        <Divider className={styles.divider} color="beige" />
+        <ClearSearchButton
+          getItemProps={getItemProps}
+          highlightedIndex={highlightedIndex}
+          index={searchHistory.length}
+        />
+      </Dialog>
+    )
+  }
+
+  if (search) {
+    return (
+      <Dialog getMenuProps={getMenuProps} variant="error">
+        <Body className={styles.text} textTransform="bold">
+          {intl.formatMessage({ id: "No results" })}
+        </Body>
+        <Body className={styles.text} color="uiTextPlaceholder">
+          {intl.formatMessage({
+            id: "We couldn't find a matching location for your search.",
+          })}
+        </Body>
+        {searchHistory ? (
+          <>
+            <Divider className={styles.noResultsDivider} color="beige" />
+            <Footnote
+              className={styles.text}
+              color="uiTextPlaceholder"
+              textTransform="uppercase"
+            >
+              {intl.formatMessage({ id: "Latest searches" })}
+            </Footnote>
+            <List
+              getItemProps={getItemProps}
+              highlightedIndex={highlightedIndex}
+              locations={searchHistory}
+            />
+            <Divider className={styles.divider} color="beige" />
+            <ClearSearchButton
+              getItemProps={getItemProps}
+              highlightedIndex={highlightedIndex}
+              index={searchHistory.length}
+            />
+          </>
+        ) : null}
+      </Dialog>
+    )
+  }
+
+  return null
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/SearchList/searchList.module.css b/components/Forms/BookingWidget/FormContent/Search/SearchList/searchList.module.css
new file mode 100644
index 000000000..6e8b4467a
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/SearchList/searchList.module.css
@@ -0,0 +1,31 @@
+@keyframes fade-out {
+  0% {
+    opacity: 1;
+  }
+
+  100% {
+    opacity: 0;
+  }
+}
+
+.fadeOut {
+  animation: fade-out 120ms ease-out 5000ms forwards;
+}
+
+.divider {
+  margin: var(--Spacing-x2) var(--Spacing-x0) var(--Spacing-x1);
+}
+
+.noResultsDivider {
+  margin: var(--Spacing-x2) 0;
+}
+
+.heading {
+  align-items: center;
+  display: flex;
+  gap: var(--Spacing-x1);
+}
+
+.text {
+  padding: 0 var(--Spacing-x1);
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/index.tsx b/components/Forms/BookingWidget/FormContent/Search/index.tsx
new file mode 100644
index 000000000..1ce969a29
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/index.tsx
@@ -0,0 +1,180 @@
+"use client"
+import Downshift from "downshift"
+import {
+  ChangeEvent,
+  FocusEvent,
+  FormEvent,
+  useCallback,
+  useReducer,
+} from "react"
+import { useFormContext, useWatch } from "react-hook-form"
+import { useIntl } from "react-intl"
+
+import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+
+import { init, localStorageKey, reducer, sessionStorageKey } from "./reducer"
+import SearchList from "./SearchList"
+
+import styles from "./search.module.css"
+
+import type { BookingWidgetSchema } from "@/types/components/bookingWidget"
+import { ActionType } from "@/types/components/form/bookingwidget"
+import type { SearchProps } from "@/types/components/search"
+import type { Location } from "@/types/trpc/routers/hotel/locations"
+
+const name = "search"
+export default function Search({ locations }: SearchProps) {
+  const [state, dispatch] = useReducer(
+    reducer,
+    { defaultLocations: locations },
+    init
+  )
+  const { register, setValue, trigger } = useFormContext<BookingWidgetSchema>()
+  const intl = useIntl()
+  const value = useWatch({ name })
+
+  const handleMatchLocations = useCallback(
+    function (searchValue: string) {
+      return locations.filter((location) => {
+        return location.name.toLowerCase().includes(searchValue.toLowerCase())
+      })
+    },
+    [locations]
+  )
+
+  function handleOnBlur() {
+    if (!value && state.searchData?.name) {
+      setValue(name, state.searchData.name)
+      // Always need to manually trigger
+      // revalidation when setting value r-h-f
+      trigger()
+    }
+  }
+
+  function handleOnChange(
+    evt: FormEvent<HTMLInputElement> | ChangeEvent<HTMLInputElement>
+  ) {
+    const value = evt.currentTarget.value
+    if (value) {
+      dispatch({
+        payload: { search: value },
+        type: ActionType.SEARCH_LOCATIONS,
+      })
+    } else {
+      dispatch({ type: ActionType.CLEAR_SEARCH_LOCATIONS })
+    }
+  }
+
+  function handleOnFocus(evt: FocusEvent<HTMLInputElement>) {
+    const searchValue = evt.currentTarget.value
+    if (searchValue) {
+      const matchingLocations = handleMatchLocations(searchValue)
+      if (matchingLocations.length) {
+        dispatch({
+          payload: { search: searchValue },
+          type: ActionType.SEARCH_LOCATIONS,
+        })
+      }
+    }
+  }
+
+  function handleOnSelect(selectedItem: Location | null | "clear-search") {
+    if (selectedItem === "clear-search") {
+      localStorage.removeItem(localStorageKey)
+      dispatch({ type: ActionType.CLEAR_HISTORY_LOCATIONS })
+    } else if (selectedItem) {
+      const stringified = JSON.stringify(selectedItem)
+      setValue("location", encodeURIComponent(stringified))
+      sessionStorage.setItem(sessionStorageKey, stringified)
+      setValue(name, selectedItem.name)
+      trigger()
+
+      const searchHistoryMap = new Map()
+      searchHistoryMap.set(selectedItem.name, selectedItem)
+      if (state.searchHistory) {
+        state.searchHistory.forEach((location) => {
+          searchHistoryMap.set(location.name, location)
+        })
+      }
+
+      const searchHistory: Location[] = []
+      searchHistoryMap.forEach((location) => {
+        searchHistory.push(location)
+      })
+      localStorage.setItem(localStorageKey, JSON.stringify(searchHistory))
+      dispatch({
+        payload: {
+          location: selectedItem,
+          searchHistory,
+        },
+        type: ActionType.SELECT_ITEM,
+      })
+    } else {
+      sessionStorage.removeItem(sessionStorageKey)
+    }
+  }
+
+  return (
+    <Downshift
+      initialSelectedItem={state.searchData}
+      inputValue={value}
+      itemToString={(value) => (value ? value.name : "")}
+      onSelect={handleOnSelect}
+    >
+      {({
+        closeMenu,
+        getInputProps,
+        getItemProps,
+        getLabelProps,
+        getMenuProps,
+        getRootProps,
+        highlightedIndex,
+        isOpen,
+        openMenu,
+      }) => (
+        <div className={styles.container}>
+          <label {...getLabelProps({ htmlFor: name })} className={styles.label}>
+            <Caption color={isOpen ? "uiTextActive" : "red"}>
+              {intl.formatMessage({ id: "Where to" })}
+            </Caption>
+          </label>
+          <div {...getRootProps({}, { suppressRefError: true })}>
+            <Body asChild>
+              <input
+                {...getInputProps({
+                  className: styles.input,
+                  id: name,
+                  onFocus(evt) {
+                    handleOnFocus(evt)
+                    openMenu()
+                  },
+                  placeholder: intl.formatMessage({
+                    id: "Destinations & hotels",
+                  }),
+                  ...register(name, {
+                    onBlur: function () {
+                      handleOnBlur()
+                      closeMenu()
+                    },
+                    onChange: handleOnChange,
+                  }),
+                  type: "search",
+                })}
+              />
+            </Body>
+          </div>
+          <SearchList
+            getItemProps={getItemProps}
+            getMenuProps={getMenuProps}
+            highlightedIndex={highlightedIndex}
+            isOpen={isOpen}
+            locations={state.locations}
+            search={state.search}
+            searchHistory={state.searchHistory}
+          />
+        </div>
+      )}
+    </Downshift>
+  )
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/reducer.ts b/components/Forms/BookingWidget/FormContent/Search/reducer.ts
new file mode 100644
index 000000000..9771d11b2
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/reducer.ts
@@ -0,0 +1,104 @@
+import {
+  type Action,
+  ActionType,
+  type InitState,
+  type State,
+} from "@/types/components/form/bookingwidget"
+import type { Location, Locations } from "@/types/trpc/routers/hotel/locations"
+
+export const localStorageKey = "searchHistory"
+export function getSearchHistoryFromLocalStorage() {
+  if (typeof window !== "undefined") {
+    const storageSearchHistory = window.localStorage.getItem(localStorageKey)
+    if (storageSearchHistory) {
+      const parsedStorageSearchHistory: Locations =
+        JSON.parse(storageSearchHistory)
+      if (parsedStorageSearchHistory?.length) {
+        return parsedStorageSearchHistory
+      }
+    }
+  }
+  return null
+}
+
+export const sessionStorageKey = "searchData"
+export function getSearchDataFromSessionStorage() {
+  if (typeof window !== "undefined") {
+    const storageSearchData = window.sessionStorage.getItem(sessionStorageKey)
+    if (storageSearchData) {
+      const parsedStorageSearchData: Location = JSON.parse(storageSearchData)
+      if (parsedStorageSearchData) {
+        return parsedStorageSearchData
+      }
+    }
+  }
+  return undefined
+}
+
+export function init(initState: InitState): State {
+  const searchHistory = getSearchHistoryFromLocalStorage()
+  const searchData = getSearchDataFromSessionStorage()
+  return {
+    defaultLocations: initState.defaultLocations,
+    locations: [],
+    search: "",
+    searchData,
+    searchHistory,
+  }
+}
+
+export function reducer(state: State, action: Action) {
+  const type = action.type
+  switch (type) {
+    case ActionType.CLEAR_HISTORY_LOCATIONS: {
+      return {
+        ...state,
+        locations: [],
+        search: "",
+        searchHistory: null,
+      }
+    }
+    case ActionType.CLEAR_SEARCH_LOCATIONS:
+      return {
+        ...state,
+        locations: [],
+        search: "",
+      }
+    case ActionType.SEARCH_LOCATIONS: {
+      const matchesMap = new Map()
+      const search = action.payload.search.toLowerCase()
+      state.defaultLocations.forEach((location) => {
+        const locationName = location.name.toLowerCase()
+        const keyWords = location.keyWords?.map((l) => l.toLowerCase())
+        if (locationName.includes(search.trim())) {
+          matchesMap.set(location.name, location)
+        }
+        if (keyWords?.find((keyWord) => keyWord.includes(search.trim()))) {
+          matchesMap.set(location.name, location)
+        }
+      })
+
+      const matches: Locations = []
+      matchesMap.forEach((value) => {
+        matches.push(value)
+      })
+
+      return {
+        ...state,
+        locations: matches,
+        search: action.payload.search,
+      }
+    }
+    case ActionType.SELECT_ITEM: {
+      return {
+        ...state,
+        searchData: action.payload.location,
+        searchHistory: action.payload.searchHistory,
+      }
+    }
+    default:
+      const unhandledActionType: never = type
+      console.info(`Unhandled type: ${unhandledActionType}`)
+      return state
+  }
+}
diff --git a/components/Forms/BookingWidget/FormContent/Search/search.module.css b/components/Forms/BookingWidget/FormContent/Search/search.module.css
new file mode 100644
index 000000000..4b2d2047a
--- /dev/null
+++ b/components/Forms/BookingWidget/FormContent/Search/search.module.css
@@ -0,0 +1,47 @@
+.container {
+  border-color: transparent;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: var(--Corner-radius-Small);
+  padding: var(--Spacing-x1) var(--Spacing-x-one-and-half);
+}
+
+.container:hover,
+.container:has(.input:active, .input:focus, .input:focus-within) {
+  background-color: var(--Base-Surface-Primary-light-Hover-alt);
+}
+
+.container:has(.input:active, .input:focus, .input:focus-within) {
+  border-color: 1px solid var(--UI-Input-Controls-Border-Focus);
+}
+
+.label:has(
+    ~ .inputContainer .input:active,
+    ~ .inputContainer .input:focus,
+    ~ .inputContainer .input:focus-within
+  )
+  p {
+  color: var(--UI-Text-Active);
+}
+
+.input {
+  background-color: transparent;
+  border: none;
+  height: 24px;
+  outline: none;
+  position: relative;
+  z-index: 2;
+}
+
+.input::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+  appearance: none;
+  background-image: url("/_static/icons/close.svg");
+  height: 20px;
+  width: 20px;
+}
+
+.container:hover:has(.input:not(:active, :focus, :focus-within))
+  .input::-webkit-search-cancel-button {
+  display: none;
+}
diff --git a/components/Forms/BookingWidget/FormContent/formContent.module.css b/components/Forms/BookingWidget/FormContent/formContent.module.css
index 0193a7ffb..bacb06b50 100644
--- a/components/Forms/BookingWidget/FormContent/formContent.module.css
+++ b/components/Forms/BookingWidget/FormContent/formContent.module.css
@@ -5,26 +5,31 @@
 
 .input input[type="text"] {
   border: none;
-  padding: var(--Spacing-x1) var(--Spacing-x0);
-}
-
-.where {
-  width: 100%;
-  max-width: 280px;
-  border-right: 1px solid var(--Base-Surface-Subtle-Normal);
+  height: 24px;
 }
 
+.rooms,
+.vouchers,
 .when,
-.rooms {
-  width: 100%;
-  max-width: 240px;
+.where {
   border-right: 1px solid var(--Base-Surface-Subtle-Normal);
+  width: 100%;
+}
+
+.rooms,
+.when {
+  max-width: 240px;
+  padding: var(--Spacing-x1) var(--Spacing-x-one-and-half);
 }
 
 .vouchers {
-  width: 100%;
   max-width: 200px;
-  border-right: 1px solid var(--Base-Surface-Subtle-Normal);
+  padding: var(--Spacing-x1) 0;
+}
+
+.where {
+  max-width: 280px;
+  position: relative;
 }
 
 .options {
diff --git a/components/Forms/BookingWidget/FormContent/index.tsx b/components/Forms/BookingWidget/FormContent/index.tsx
index c7347e03f..787d32708 100644
--- a/components/Forms/BookingWidget/FormContent/index.tsx
+++ b/components/Forms/BookingWidget/FormContent/index.tsx
@@ -3,23 +3,25 @@ import { useIntl } from "react-intl"
 
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 
+import Search from "./Search"
+
 import styles from "./formContent.module.css"
 
-export default function FormContent() {
-  const intl = useIntl()
+import type { BookingWidgetFormContentProps } from "@/types/components/form/bookingwidget"
 
-  const where = intl.formatMessage({ id: "Where to" })
+export default function FormContent({
+  locations,
+}: BookingWidgetFormContentProps) {
+  const intl = useIntl()
   const when = intl.formatMessage({ id: "When" })
   const rooms = intl.formatMessage({ id: "Rooms & Guests" })
   const vouchers = intl.formatMessage({ id: "Booking codes and vouchers" })
   const bonus = intl.formatMessage({ id: "Use bonus cheque" })
   const reward = intl.formatMessage({ id: "Book reward night" })
-
   return (
     <div className={styles.input}>
       <div className={styles.where}>
-        <Caption color="red">{where}</Caption>
-        <input type="text" placeholder={where} />
+        <Search locations={locations} />
       </div>
       <div className={styles.when}>
         <Caption color="red" textTransform="bold">
diff --git a/components/Forms/BookingWidget/form.module.css b/components/Forms/BookingWidget/form.module.css
index 37e5471b6..e3c71df66 100644
--- a/components/Forms/BookingWidget/form.module.css
+++ b/components/Forms/BookingWidget/form.module.css
@@ -1,8 +1,8 @@
 .section {
-  display: flex;
   align-items: center;
-  max-width: 1432px;
-  padding: var(--Spacing-x2) var(--Spacing-x5);
+  display: flex;
+  margin: 0 auto;
+  max-width: var(--max-width-navigation);
 }
 
 .form {
diff --git a/components/Forms/BookingWidget/index.tsx b/components/Forms/BookingWidget/index.tsx
index 7dadceeaa..106eeedf0 100644
--- a/components/Forms/BookingWidget/index.tsx
+++ b/components/Forms/BookingWidget/index.tsx
@@ -14,19 +14,29 @@ import { bookingWidgetSchema } from "./schema"
 
 import styles from "./form.module.css"
 
-import { BookingWidgetSchema } from "@/types/components/bookingWidget"
+import type { BookingWidgetSchema } from "@/types/components/bookingWidget"
+import type { BookingWidgetFormProps } from "@/types/components/form/bookingwidget"
+import type { Location } from "@/types/trpc/routers/hotel/locations"
 
 const formId = "booking-widget"
 
-export default function Form() {
+export default function Form({ locations }: BookingWidgetFormProps) {
   const intl = useIntl()
   const router = useRouter()
+
+  const sessionStorageSearchData =
+    typeof window !== "undefined"
+      ? sessionStorage.getItem("searchData")
+      : undefined
+  const initialSelectedLocation: Location | undefined = sessionStorageSearchData
+    ? JSON.parse(sessionStorageSearchData)
+    : undefined
   const methods = useForm<BookingWidgetSchema>({
     defaultValues: {
-      search: {
-        stayType: "",
-        stayValue: "",
-      },
+      search: initialSelectedLocation?.name ?? "",
+      location: sessionStorageSearchData
+        ? encodeURIComponent(sessionStorageSearchData)
+        : undefined,
       nights: {
         // UTC is required to handle requests from far away timezones https://scandichotels.atlassian.net/browse/SWAP-6375 & PET-507
         // This is specifically to handle timezones falling in different dates.
@@ -43,12 +53,14 @@ export default function Form() {
         },
       ],
     },
+    shouldFocusError: false,
     mode: "all",
     resolver: zodResolver(bookingWidgetSchema),
     reValidateMode: "onChange",
   })
 
   function onSubmit(data: BookingWidgetSchema) {
+    data.location = JSON.parse(decodeURIComponent(data.location))
     console.log(data)
     // TODO: Parse data and route accordignly to Select hotel or select room-rate page
     console.log("to be routing")
@@ -63,7 +75,8 @@ export default function Form() {
         id={formId}
       >
         <FormProvider {...methods}>
-          <FormContent />
+          <input {...methods.register("location")} type="hidden" />
+          <FormContent locations={locations} />
         </FormProvider>
       </form>
       <Button
diff --git a/components/Forms/BookingWidget/schema.ts b/components/Forms/BookingWidget/schema.ts
index 057b5496e..a27182ef9 100644
--- a/components/Forms/BookingWidget/schema.ts
+++ b/components/Forms/BookingWidget/schema.ts
@@ -1,15 +1,29 @@
 import { z } from "zod"
 
+import type { Location } from "@/types/trpc/routers/hotel/locations"
+
 export const bookingWidgetSchema = z.object({
-  search: z.object({
-    stayType: z.string(),
-    stayValue: z.string(),
-  }),
+  search: z.string({ coerce: true }).min(1, "Required"),
   nights: z.object({
     // Update this as required once started working with Date picker in Nights component
     fromDate: z.string(),
     toDate: z.string(),
   }),
+  location: z.string().refine(
+    (value) => {
+      if (value) {
+        const parsedValue: Location = JSON.parse(decodeURIComponent(value))
+        switch (parsedValue?.type) {
+          case "cities":
+          case "hotels":
+            return true
+          default:
+            return false
+        }
+      }
+    },
+    { message: "Required" }
+  ),
   bookingCode: z.string(), // Update this as required when working with booking codes component
   redemption: z.boolean().default(false),
   voucher: z.boolean().default(false),
diff --git a/components/Icons/ErrorCircle.tsx b/components/Icons/ErrorCircle.tsx
new file mode 100644
index 000000000..87b1514d3
--- /dev/null
+++ b/components/Icons/ErrorCircle.tsx
@@ -0,0 +1,40 @@
+import { iconVariants } from "./variants"
+
+import type { IconProps } from "@/types/components/icon"
+
+export default function ErrorCircleIcon({
+  className,
+  color,
+  ...props
+}: IconProps) {
+  const classNames = iconVariants({ className, color })
+  return (
+    <svg
+      className={classNames}
+      fill="none"
+      height="20"
+      viewBox="0 0 20 20"
+      width="20"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <mask
+        height="20"
+        id="mask0_157_2210"
+        maskUnits="userSpaceOnUse"
+        style={{ maskType: "alpha" }}
+        width="20"
+        x="0"
+        y="0"
+      >
+        <rect width="20" height="20" fill="#D9D9D9" />
+      </mask>
+      <g mask="url(#mask0_157_2210)">
+        <path
+          d="M10.0061 13.8958C10.1965 13.8958 10.3612 13.8274 10.5 13.6906C10.6389 13.5538 10.7084 13.3896 10.7084 13.1979V9.71873C10.7084 9.52706 10.6404 9.36283 10.5044 9.22602C10.3685 9.08922 10.2053 9.02081 10.0149 9.02081C9.82442 9.02081 9.65976 9.08922 9.52087 9.22602C9.38199 9.36283 9.31254 9.52706 9.31254 9.71873V13.1979C9.31254 13.3896 9.38052 13.5538 9.51648 13.6906C9.65245 13.8274 9.81564 13.8958 10.0061 13.8958ZM9.99346 7.58331C10.1923 7.58331 10.3612 7.51606 10.5 7.38156C10.6389 7.24706 10.7084 7.0804 10.7084 6.88156C10.7084 6.68273 10.6411 6.51387 10.5066 6.37498C10.3721 6.23609 10.2055 6.16665 10.0066 6.16665C9.80779 6.16665 9.63893 6.2339 9.50004 6.3684C9.36115 6.5029 9.29171 6.66956 9.29171 6.8684C9.29171 7.06723 9.35896 7.23609 9.49346 7.37498C9.62796 7.51387 9.79462 7.58331 9.99346 7.58331ZM10.0058 17.7916C8.9338 17.7916 7.92449 17.5884 6.97785 17.182C6.0312 16.7756 5.20275 16.2165 4.4925 15.5049C3.78225 14.7933 3.224 13.9649 2.81775 13.0199C2.4115 12.0748 2.20837 11.065 2.20837 9.99044C2.20837 8.91476 2.41159 7.90707 2.81802 6.96738C3.22445 6.02767 3.78348 5.20269 4.4951 4.49244C5.20673 3.78219 6.03508 3.22394 6.98017 2.81769C7.92523 2.41144 8.93504 2.20831 10.0096 2.20831C11.0853 2.20831 12.093 2.41153 13.0326 2.81796C13.9724 3.22439 14.7973 3.78342 15.5076 4.49504C16.2178 5.20667 16.7761 6.0334 17.1823 6.97523C17.5886 7.91705 17.7917 8.92338 17.7917 9.99423C17.7917 11.0662 17.5885 12.0755 17.1821 13.0222C16.7756 13.9688 16.2166 14.7973 15.505 15.5075C14.7934 16.2178 13.9666 16.776 13.0248 17.1823C12.083 17.5885 11.0766 17.7916 10.0058 17.7916ZM10 16.3958C11.7709 16.3958 13.2796 15.7725 14.5261 14.526C15.7726 13.2795 16.3959 11.7708 16.3959 9.99998C16.3959 8.22915 15.7726 6.72047 14.5261 5.47394C13.2796 4.22741 11.7709 3.60415 10 3.60415C8.22921 3.60415 6.72053 4.22741 5.474 5.47394C4.22747 6.72047 3.60421 8.22915 3.60421 9.99998C3.60421 11.7708 4.22747 13.2795 5.474 14.526C6.72053 15.7725 8.22921 16.3958 10 16.3958Z"
+          fill="#26201E"
+        />
+      </g>
+    </svg>
+  )
+}
diff --git a/components/Icons/index.tsx b/components/Icons/index.tsx
index 5d09f7d4e..c1806693d 100644
--- a/components/Icons/index.tsx
+++ b/components/Icons/index.tsx
@@ -18,10 +18,11 @@ export { default as ConciergeIcon } from "./Concierge"
 export { default as CreditCard } from "./CreditCard"
 export { default as CrossCircle } from "./CrossCircle"
 export { default as CulturalIcon } from "./Cultural"
-export { default as Delete } from "./Delete"
+export { default as DeleteIcon } from "./Delete"
 export { default as DoorOpenIcon } from "./DoorOpen"
 export { default as ElectricBikeIcon } from "./ElectricBike"
 export { default as EmailIcon } from "./Email"
+export { default as ErrorCircleIcon } from "./ErrorCircle"
 export { default as FitnessIcon } from "./Fitness"
 export { default as GiftIcon } from "./Gift"
 export { default as GlobeIcon } from "./Globe"
diff --git a/components/JsonToHtml/index.tsx b/components/JsonToHtml/index.tsx
index 501e394e0..dc9584aef 100644
--- a/components/JsonToHtml/index.tsx
+++ b/components/JsonToHtml/index.tsx
@@ -2,7 +2,7 @@ import { nodesToHtml } from "./utils"
 
 import styles from "./jsontohtml.module.css"
 
-import type { JsonToHtmlProps } from "@/types/components/jsontohtml"
+import type { JsonToHtmlProps } from "@/types/transitionTypes/jsontohtml"
 
 export default function JsonToHtml({
   embeds,
diff --git a/components/JsonToHtml/renderOptions.tsx b/components/JsonToHtml/renderOptions.tsx
index e56b0a6de..77f1b41f5 100644
--- a/components/JsonToHtml/renderOptions.tsx
+++ b/components/JsonToHtml/renderOptions.tsx
@@ -1,6 +1,7 @@
 import Image from "@/components/Image"
 import Link from "@/components/TempDesignSystem/Link"
 import { insertResponseToImageVaultAsset } from "@/utils/imageVault"
+import { removeMultipleSlashes } from "@/utils/url"
 
 import ImageContainer from "../ImageContainer"
 import Divider from "../TempDesignSystem/Divider"
@@ -15,14 +16,17 @@ import { hasAvailableParagraphFormat, hasAvailableULFormat } from "./utils"
 
 import styles from "./jsontohtml.module.css"
 
-import type { EmbedByUid } from "@/types/components/jsontohtml"
-import { EmbedEnum } from "@/types/requests/utils/embeds"
-import type { Attributes, RTEImageVaultAttrs } from "@/types/rte/attrs"
+import { ContentEnum } from "@/types/enums/content"
+import type { EmbedByUid } from "@/types/transitionTypes/jsontohtml"
+import type {
+  Attributes,
+  RTEImageVaultAttrs,
+} from "@/types/transitionTypes/rte/attrs"
 import {
   AvailableParagraphFormatEnum,
   RTEItemTypeEnum,
   RTETypeEnum,
-} from "@/types/rte/enums"
+} from "@/types/transitionTypes/rte/enums"
 import type {
   RTEDefaultNode,
   RTEImageNode,
@@ -30,9 +34,9 @@ import type {
   RTENode,
   RTERegularNode,
   RTETextNode,
-} from "@/types/rte/node"
-import { RTEMarkType } from "@/types/rte/node"
-import type { RenderOptions } from "@/types/rte/option"
+} from "@/types/transitionTypes/rte/node"
+import { RTEMarkType } from "@/types/transitionTypes/rte/node"
+import type { RenderOptions } from "@/types/transitionTypes/rte/option"
 
 function extractPossibleAttributes(attrs: Attributes | undefined) {
   if (!attrs) return {}
@@ -287,44 +291,55 @@ export const renderOptions: RenderOptions = {
       const type = node.attrs.type
       if (type === RTEItemTypeEnum.asset) {
         const image = embeds?.[node?.attrs?.["asset-uid"]]
-        if (image?.node.__typename === EmbedEnum.SysAsset) {
-          const alt = image?.node?.title ?? node.attrs.alt
-          const props = extractPossibleAttributes(node.attrs)
-          props.className = styles.image
-          return (
-            <Image
-              key={node.uid}
-              alt={alt}
-              height={image.node.dimension.height}
-              src={image?.node?.url}
-              width={image.node.dimension.width}
-              {...props}
-            />
-          )
+        if (image?.node.__typename === ContentEnum.blocks.SysAsset) {
+          if (image.node.url) {
+            const alt = image?.node?.title ?? node.attrs.alt
+            const props = extractPossibleAttributes(node.attrs)
+            props.className = styles.image
+            return (
+              <Image
+                key={node.uid}
+                alt={alt}
+                height={image.node.dimension.height}
+                src={image.node.url}
+                width={image.node.dimension.width}
+                {...props}
+              />
+            )
+          }
         }
       } else if (type === RTEItemTypeEnum.entry) {
         const entry = embeds?.[node?.attrs?.["entry-uid"]]
 
-        if (entry?.node.__typename === EmbedEnum.ImageContainer) {
-          const leftImage = insertResponseToImageVaultAsset(
-            entry.node.image_left
-          )
-          const rightImage = insertResponseToImageVaultAsset(
-            entry.node.image_right
-          )
-          return (
-            <ImageContainer leftImage={leftImage} rightImage={rightImage} />
-          )
+        if (entry?.node.__typename === ContentEnum.blocks.ImageContainer) {
+          if (entry.node.image_left && entry.node.image_right) {
+            return (
+              <ImageContainer
+                leftImage={entry.node.image_left}
+                rightImage={entry.node.image_right}
+              />
+            )
+          }
+          return null
         } else if (
-          entry?.node.__typename === EmbedEnum.LoyaltyPage ||
-          entry?.node.__typename === EmbedEnum.ContentPage ||
-          entry?.node.__typename === EmbedEnum.AccountPage
+          entry?.node.__typename === ContentEnum.blocks.LoyaltyPage ||
+          entry?.node.__typename === ContentEnum.blocks.ContentPage ||
+          entry?.node.__typename === ContentEnum.blocks.AccountPage
         ) {
           // If entry is not an ImageContainer, it is a page and we return it as a link
           const props = extractPossibleAttributes(node.attrs)
-          const href =
-            entry.node?.web?.original_url ||
-            `/${entry.node.system.locale}${entry.node.url}`
+          let href = ""
+          if (entry?.node.__typename === ContentEnum.blocks.AccountPage) {
+            href = removeMultipleSlashes(
+              `/${entry.node.system.locale}${entry.node.url}`
+            )
+          } else {
+            href =
+              entry.node?.web?.original_url ||
+              removeMultipleSlashes(
+                `/${entry.node.system.locale}${entry.node.url}`
+              )
+          }
 
           return (
             <Link
@@ -349,7 +364,12 @@ export const renderOptions: RenderOptions = {
       const type = node.type
       if (type === RTETypeEnum.ImageVault) {
         const attrs = node.attrs as RTEImageVaultAttrs
-        const image = insertResponseToImageVaultAsset(attrs)
+        let image = undefined
+        if ("dimensions" in attrs) {
+          image = attrs
+        } else {
+          image = insertResponseToImageVaultAsset(attrs)
+        }
         const alt = image.meta.alt ?? image.title
 
         const width = attrs.width
diff --git a/components/JsonToHtml/utils.tsx b/components/JsonToHtml/utils.tsx
index 496b9f9e4..f09f5216f 100644
--- a/components/JsonToHtml/utils.tsx
+++ b/components/JsonToHtml/utils.tsx
@@ -1,20 +1,20 @@
 import { renderOptions } from "./renderOptions"
 
-import type { EmbedByUid } from "@/types/components/jsontohtml"
-import type { Embeds } from "@/types/requests/embeds"
 import type { Node } from "@/types/requests/utils/edges"
+import type { EmbedByUid } from "@/types/transitionTypes/jsontohtml"
 import {
   AvailableParagraphFormatEnum,
   AvailableULFormatEnum,
   RTETypeEnum,
-} from "@/types/rte/enums"
+} from "@/types/transitionTypes/rte/enums"
 import type {
   RTENode,
   RTERenderOptionComponent,
   RTETextNode,
-} from "@/types/rte/node"
-import { RTEMarkType, RTERenderMark } from "@/types/rte/node"
-import type { RenderOptions } from "@/types/rte/option"
+} from "@/types/transitionTypes/rte/node"
+import { RTEMarkType, RTERenderMark } from "@/types/transitionTypes/rte/node"
+import type { RenderOptions } from "@/types/transitionTypes/rte/option"
+import type { Embeds } from "@/types/trpc/routers/utils/embeds"
 
 export function groupEmbedsByUid(embedsArray: Node<Embeds>[]) {
   const embedsByUid = embedsArray.reduce<EmbedByUid>((acc, embed) => {
diff --git a/components/Loyalty/Blocks/CardsGrid/index.tsx b/components/Loyalty/Blocks/CardsGrid/index.tsx
deleted file mode 100644
index 72da61722..000000000
--- a/components/Loyalty/Blocks/CardsGrid/index.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import SectionContainer from "@/components/Section/Container"
-import SectionHeader from "@/components/Section/Header"
-import Card from "@/components/TempDesignSystem/Card"
-import Grids from "@/components/TempDesignSystem/Grids"
-import LoyaltyCard from "@/components/TempDesignSystem/LoyaltyCard"
-
-import { CardsGridProps } from "@/types/components/loyalty/blocks"
-import { LoyaltyCardsGridEnum } from "@/types/components/loyalty/enums"
-
-export default function CardsGrid({
-  cards_grid,
-  firstItem = false,
-}: CardsGridProps) {
-  return (
-    <SectionContainer>
-      <SectionHeader
-        title={cards_grid.title}
-        preamble={cards_grid.preamble}
-        topTitle={firstItem}
-      />
-      <Grids.Stackable>
-        {cards_grid.cards.map((card) => {
-          switch (card.__typename) {
-            case LoyaltyCardsGridEnum.LoyaltyCard:
-              return (
-                <LoyaltyCard
-                  key={card.system.uid}
-                  image={card.image}
-                  heading={card.heading}
-                  bodyText={card.body_text}
-                  link={card.link}
-                />
-              )
-            case LoyaltyCardsGridEnum.Card: {
-              return (
-                <Card
-                  theme={cards_grid.theme || "one"}
-                  key={card.system.uid}
-                  scriptedTopTitle={card.scripted_top_title}
-                  heading={card.heading}
-                  bodyText={card.body_text}
-                  secondaryButton={card.secondaryButton}
-                  primaryButton={card.primaryButton}
-                />
-              )
-            }
-          }
-        })}
-      </Grids.Stackable>
-    </SectionContainer>
-  )
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/HowItWorks/howItWorks.module.css b/components/Loyalty/Blocks/DynamicContent/HowItWorks/howItWorks.module.css
deleted file mode 100644
index b9a1afac8..000000000
--- a/components/Loyalty/Blocks/DynamicContent/HowItWorks/howItWorks.module.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.container {
-  align-items: center;
-  background-color: var(--UI-Grey-10);
-  border-radius: var(--Corner-radius-xLarge);
-  display: flex;
-  height: 370px;
-  justify-content: center;
-  width: 100%;
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/HowItWorks/index.tsx b/components/Loyalty/Blocks/DynamicContent/HowItWorks/index.tsx
deleted file mode 100644
index 447a4fb1e..000000000
--- a/components/Loyalty/Blocks/DynamicContent/HowItWorks/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import Title from "@/components/TempDesignSystem/Text/Title"
-import { getIntl } from "@/i18n"
-
-import styles from "./howItWorks.module.css"
-
-export default async function HowItWorks() {
-  const { formatMessage } = await getIntl()
-  return (
-    <section className={styles.container}>
-      <Title level="h3">{formatMessage({ id: "How it works" })}</Title>
-    </section>
-  )
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/LoyaltyLevels/index.tsx b/components/Loyalty/Blocks/DynamicContent/LoyaltyLevels/index.tsx
deleted file mode 100644
index 292452607..000000000
--- a/components/Loyalty/Blocks/DynamicContent/LoyaltyLevels/index.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-"use client"
-
-import { notFound, useParams } from "next/navigation"
-import { useIntl } from "react-intl"
-
-import { Lang } from "@/constants/languages"
-
-import { CheckIcon } from "@/components/Icons"
-import {
-  BestFriend,
-  CloseFriend,
-  DearFriend,
-  GoodFriend,
-  LoyalFriend,
-  NewFriend,
-  TrueFriend,
-} from "@/components/Levels"
-import BiroScript from "@/components/TempDesignSystem/Text/BiroScript"
-import Caption from "@/components/TempDesignSystem/Text/Caption"
-import Title from "@/components/TempDesignSystem/Text/Title"
-import levelsData from "@/data/loyaltyLevels"
-
-import styles from "./loyaltyLevels.module.css"
-
-import type { Level, LevelCardProps } from "@/types/components/loyalty/blocks"
-
-export default function LoyaltyLevels() {
-  const params = useParams()
-  const lang = params.lang as Lang
-  const { formatMessage } = useIntl()
-
-  const { levels } = levelsData[lang]
-  return (
-    <section className={styles.cardContainer}>
-      {levels.map((level: Level) => (
-        <LevelCard
-          key={level.level}
-          formatMessage={formatMessage}
-          lang={lang}
-          level={level}
-        />
-      ))}
-    </section>
-  )
-}
-
-function LevelCard({ formatMessage, lang, level }: LevelCardProps) {
-  let Level = null
-  switch (level.level) {
-    case 1:
-      Level = NewFriend
-      break
-    case 2:
-      Level = GoodFriend
-      break
-    case 3:
-      Level = CloseFriend
-      break
-    case 4:
-      Level = DearFriend
-      break
-    case 5:
-      Level = LoyalFriend
-      break
-    case 6:
-      Level = TrueFriend
-      break
-    case 7:
-      Level = BestFriend
-      break
-    default: {
-      const loyaltyLevel = level.level as never
-      console.error(`Unsupported loyalty level given: ${loyaltyLevel}`)
-      notFound()
-    }
-  }
-  const pointsString = `${level.requiredPoints.toLocaleString(lang)} ${formatMessage({ id: "points" })} `
-
-  return (
-    <article className={styles.card}>
-      <header>
-        <BiroScript
-          type="two"
-          color="primaryLightOnSurfaceAccent"
-          tilted="large"
-        >
-          {formatMessage({ id: "Level" })} {level.level}
-        </BiroScript>
-        <Level color="red" />
-      </header>
-      <Title textAlign="center" level="h5">
-        {pointsString}
-        {level.requiredNights ? (
-          <span className={styles.redText}>
-            {formatMessage({ id: "or" })} {level.requiredNights}{" "}
-            {formatMessage({ id: "nights" })}
-          </span>
-        ) : null}
-      </Title>
-      <div className={styles.textContainer}>
-        {level.benefits.map((benefit) => (
-          <Caption
-            className={styles.levelText}
-            key={benefit.title}
-            textAlign="center"
-            color="textMediumContrast"
-          >
-            <CheckIcon
-              className={styles.checkIcon}
-              color="primaryLightOnSurfaceAccent"
-            />
-            {benefit.title}
-          </Caption>
-        ))}
-      </div>
-    </article>
-  )
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/LoyaltyLevels/loyaltyLevels.module.css b/components/Loyalty/Blocks/DynamicContent/LoyaltyLevels/loyaltyLevels.module.css
deleted file mode 100644
index 13b379c8e..000000000
--- a/components/Loyalty/Blocks/DynamicContent/LoyaltyLevels/loyaltyLevels.module.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.cardContainer {
-  display: grid;
-  gap: var(--Spacing-x2);
-}
-
-.link {
-  justify-self: center;
-}
-
-.card {
-  background-color: var(--Scandic-Brand-Pale-Peach);
-  border-radius: var(--Corner-radius-xLarge);
-  display: grid;
-  gap: var(--Spacing-x2);
-  min-height: 280px;
-  justify-items: center;
-  padding: var(--Spacing-x5) var(--Spacing-x1);
-  grid-template-rows: auto auto 1fr;
-}
-
-.textContainer {
-  align-content: flex-start;
-  display: flex;
-  gap: var(--Spacing-x-one-and-half);
-  width: 100%;
-  flex-wrap: wrap;
-  justify-content: center;
-}
-
-.redText {
-  color: var(--Base-Text-Accent);
-}
-
-.levelText {
-  margin: 0;
-}
-
-.checkIcon {
-  vertical-align: middle;
-}
-
-@media screen and (min-width: 1367px) {
-  .cardContainer {
-    display: grid;
-    grid-template-columns: repeat(12, 1fr);
-  }
-
-  .card:nth-of-type(-n + 3) {
-    grid-column: span 4;
-  }
-
-  .card:nth-of-type(n + 4) {
-    grid-column: span 3;
-  }
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitCard/benefitCard.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitCard/benefitCard.module.css
deleted file mode 100644
index ae643de29..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitCard/benefitCard.module.css
+++ /dev/null
@@ -1,56 +0,0 @@
-.benefitCard {
-  padding-bottom: var(--Spacing-x-one-and-half);
-  z-index: 2;
-  grid-column: 1/3;
-}
-
-.benefitCardHeader {
-  display: grid;
-  grid-template-columns: 1fr auto;
-}
-
-.benefitCardDescription {
-  font-size: var(--typography-Caption-Regular-fontSize);
-  line-height: 150%;
-  padding-right: var(--Spacing-x4);
-}
-
-.benefitInfo {
-  padding-bottom: var(--Spacing-x-one-and-half);
-}
-
-.benefitComparison {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-}
-
-.comparisonItem {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding-top: var(--Spacing-x-one-and-half);
-}
-
-.details[open] .chevron {
-  transform: rotate(180deg);
-}
-
-.chevron {
-  display: flex;
-  align-items: center;
-  color: var(--UI-Grey-80);
-}
-
-.summary::-webkit-details-marker {
-  display: none;
-}
-
-.summary {
-  list-style: none;
-}
-
-@media screen and (min-width: 950px) {
-  .benefitComparison {
-    grid-template-columns: 1fr 1fr 1fr;
-  }
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitList/benefitList.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitList/benefitList.module.css
deleted file mode 100644
index dba0dd085..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitList/benefitList.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.benefitCardWrapper {
-  border-bottom: 1px solid var(--Base-Border-Subtle);
-  position: relative;
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  grid-column: 1/3;
-  padding-top: 0;
-  margin: var(--Spacing-x1) var(--Spacing-x2);
-}
-
-.benefitCardWrapper:last-child {
-  border: none;
-}
-
-@media screen and (min-width: 950px) {
-  .benefitCardWrapper {
-    grid-column: 1/4;
-  }
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx b/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx
deleted file mode 100644
index dc947bfe0..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitList/index.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { findBenefit, getUnlockedBenefits } from "@/utils/loyaltyTable"
-
-import BenefitCard from "../BenefitCard"
-
-import styles from "./benefitList.module.css"
-
-import type { BenefitListProps } from "@/types/components/loyalty/blocks"
-
-export default function BenefitList({ levels }: BenefitListProps) {
-  return getUnlockedBenefits(levels).map((benefit) => {
-    const levelBenefits = levels.map((level) => {
-      return findBenefit(benefit, level)
-    })
-    return (
-      <div key={benefit.name} className={styles.benefitCardWrapper}>
-        <BenefitCard
-          title={benefit.name}
-          description={benefit.description}
-          comparedValues={levelBenefits.map((benefit, idx) => {
-            return {
-              key: `${benefit.name}-${idx}`,
-              value: benefit.value,
-              unlocked: benefit.unlocked,
-              valueDetails: benefit.valueDetails,
-            }
-          })}
-        />
-      </div>
-    )
-  })
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitValue/benefitValue.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitValue/benefitValue.module.css
deleted file mode 100644
index c72e3dd7f..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/BenefitValue/benefitValue.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.benefitValueContainer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: var(--Spacing-x-half);
-  padding: 0 var(--Spacing-x4) 0 var(--Spacing-x4);
-  text-wrap: balance;
-}
-
-.benefitValue {
-  font-size: var(--typography-Body-Bold-fontSize);
-  font-weight: var(--typography-Body-Bold-fontWeight);
-}
-
-.benefitValueDetails {
-  font-size: var(--typography-Footnote-Regular-fontSize);
-  text-align: center;
-  color: var(--UI-Grey-80);
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/desktopHeader.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/desktopHeader.module.css
deleted file mode 100644
index 32ed2be4d..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/DesktopHeader/desktopHeader.module.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.iconRow {
-  border-bottom: none;
-  position: sticky;
-  top: 0;
-  z-index: 1;
-}
-
-.verticalTableHeader {
-  min-width: 242px;
-}
-
-.iconTh {
-  padding: var(--Spacing-x5) var(--Spacing-x2) var(--Spacing-x2);
-  font-weight: var(--typography-Caption-Regular-fontWeight);
-  vertical-align: bottom;
-}
-
-.summaryTh {
-  font-size: var(--typography-Caption-Regular-fontSize);
-  font-weight: var(--typography-Caption-Regular-fontWeight);
-  padding: 0 var(--Spacing-x2) var(--Spacing-x2);
-  vertical-align: top;
-}
-
-.select {
-  font-weight: var(--typography-Caption-Regular-fontWeight);
-  padding: 0 var(--Spacing-x2) var(--Spacing-x2);
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx b/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx
deleted file mode 100644
index 5c3566cd8..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/index.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ChevronDown } from "react-feather"
-
-import Title from "@/components/TempDesignSystem/Text/Title"
-import { findBenefit, getUnlockedBenefits } from "@/utils/loyaltyTable"
-
-import BenefitValue from "../BenefitValue"
-import DesktopHeader from "./DesktopHeader"
-
-import styles from "./largeTable.module.css"
-
-import type {
-  BenefitTableHeaderProps,
-  LargeTableProps,
-} from "@/types/components/loyalty/blocks"
-
-export default function LargeTable({
-  levels,
-  activeLevel,
-  Select,
-}: LargeTableProps) {
-  return (
-    <table className={styles.table}>
-      <DesktopHeader
-        levels={levels}
-        activeLevel={activeLevel}
-        Select={Select}
-      />
-      <tbody className={styles.tbody}>
-        {getUnlockedBenefits(levels).map((benefit) => {
-          return (
-            <tr key={benefit.name} className={styles.tr}>
-              <th scope={"row"} className={styles.benefitTh}>
-                <BenefitTableHeader
-                  name={benefit.name}
-                  description={benefit.description}
-                />
-              </th>
-              {levels.map((level, idx) => {
-                return (
-                  <td key={"icon" + level.level + idx} className={styles.td}>
-                    <BenefitValue benefit={findBenefit(benefit, level)} />
-                  </td>
-                )
-              })}
-            </tr>
-          )
-        })}
-      </tbody>
-    </table>
-  )
-}
-
-function BenefitTableHeader({ name, description }: BenefitTableHeaderProps) {
-  return (
-    <details className={styles.details}>
-      <summary className={styles.summary}>
-        <hgroup className={styles.benefitHeader}>
-          <Title
-            as="h5"
-            level="h2"
-            textTransform={"regular"}
-            className={styles.benefitTitle}
-          >
-            {name}
-          </Title>
-          <span className={styles.chevron}>
-            <ChevronDown />
-          </span>
-        </hgroup>
-      </summary>
-      <p
-        className={styles.benefitDescription}
-        dangerouslySetInnerHTML={{ __html: description }}
-      />
-    </details>
-  )
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/largeTable.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/largeTable.module.css
deleted file mode 100644
index 4b27568bd..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LargeTable/largeTable.module.css
+++ /dev/null
@@ -1,58 +0,0 @@
-.table {
-  border: none;
-  border-collapse: collapse;
-  background-color: var(--UI-Opacity-White-100);
-  border-radius: var(--Corner-radius-Medium);
-  color: var(--UI-Grey-100);
-}
-
-.tr {
-  border-bottom: 1px solid var(--Base-Border-Subtle);
-}
-
-.tr:last-child {
-  border: none;
-}
-
-.td {
-  font-size: var(--typography-Footnote-Regular-fontSize);
-  text-align: center;
-}
-
-.benefitTh {
-  padding: var(--Spacing-x3) var(--Spacing-x2);
-  font-size: var(--typography-Caption-Regular-fontSize);
-  font-weight: var(--typography-Caption-Regular-fontWeight);
-}
-
-.details[open] .chevron {
-  transform: rotate(180deg);
-}
-
-.benefitHeader {
-  display: grid;
-  gap: var(--Spacing-x1);
-  grid-template-columns: 1fr auto;
-  text-align: start;
-}
-
-.benefitDescription {
-  margin: 0;
-  padding-top: var(--Spacing-x1);
-  text-align: start;
-  padding-right: calc(var(--Spacing-x3) + var(--Spacing-x1));
-}
-
-.chevron {
-  display: flex;
-  align-self: start;
-  color: var(--UI-Grey-80);
-}
-
-.summary::-webkit-details-marker {
-  display: none;
-}
-
-.summary {
-  list-style: none;
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx b/components/Loyalty/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx
deleted file mode 100644
index 153ba1f11..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LevelSummary/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import styles from "./levelSummary.module.css"
-
-import type { LevelSummaryProps } from "@/types/components/loyalty/blocks"
-
-export default function LevelSummary({
-  level,
-  showDescription = true,
-}: LevelSummaryProps) {
-  return (
-    <div className={styles.levelSummary}>
-      <span className={styles.levelRequirements}>{level.requirement}</span>
-      {showDescription && (
-        <p className={styles.levelSummaryText}>{level.description}</p>
-      )}
-    </div>
-  )
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LevelSummary/levelSummary.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/LevelSummary/levelSummary.module.css
deleted file mode 100644
index 93ed147e1..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/LevelSummary/levelSummary.module.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.levelSummary {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: var(--Spacing-x3);
-  padding-bottom: var(--Spacing-x1);
-}
-
-.levelRequirements {
-  border-radius: var(--Corner-radius-Medium);
-  background-color: var(--Scandic-Brand-Pale-Peach);
-  color: var(--Scandic-Peach-80);
-  padding: var(--Spacing-x-half) var(--Spacing-x5);
-}
-
-.levelSummaryText {
-  font-size: var(--typography-Caption-Regular-fontSize);
-  line-height: var(--typography-Body-Regular-lineHeight);
-  margin: 0;
-}
-
-@media screen and (min-width: 950px) {
-  .levelRequirements {
-    padding: var(--Spacing-x-half) var(--Spacing-x1);
-  }
-}
-@media screen and (min-width: 1367px) {
-  .levelRequirements {
-    font-size: var(--typography-Footnote-Regular-fontSize);
-  }
-
-  .levelSummaryText {
-    font-size: var(--typography-Caption-Regular-fontSize);
-  }
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/YourLevelScript/index.tsx b/components/Loyalty/Blocks/DynamicContent/OverviewTable/YourLevelScript/index.tsx
deleted file mode 100644
index 904606571..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/YourLevelScript/index.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useIntl } from "react-intl"
-
-import BiroScript from "@/components/TempDesignSystem/Text/BiroScript"
-
-import styles from "./yourLevel.module.css"
-
-export default function YourLevel() {
-  const intl = useIntl()
-  return (
-    <BiroScript
-      className={styles.script}
-      color="peach80"
-      type="two"
-      textAlign={"center"}
-    >
-      {intl.formatMessage({ id: "Your level" })}
-    </BiroScript>
-  )
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/YourLevelScript/yourLevel.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/YourLevelScript/yourLevel.module.css
deleted file mode 100644
index bd7c93973..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/YourLevelScript/yourLevel.module.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.script {
-  transform: rotate(-4deg);
-  padding-bottom: var(--Spacing-x-half);
-}
-
-@media screen and (min-width: 950px) {
-  .script {
-    padding-bottom: var(--Spacing-x1);
-  }
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/DA.json b/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/DA.json
deleted file mode 100644
index 551d46b58..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/DA.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
-  "levels": [
-    {
-      "level": 1,
-      "name": "New Friend",
-      "requirement": "0p",
-      "description": "Det her er starten på noget smukt. Som New Friend kan du godt glæde dig til at opdage alt det skønne ved Scandic.",
-      "icon": "/_static/icons/loyaltylevels/new-friend.svg",
-      "benefits": [
-        {
-          "name": "Venlige priser",
-          "description": "Som vores ven får du altid de bedste tilbud, uanset tid og sted. Her er der ingen hemmelige aftaler eller bookingkoder – du skal bare booke som normalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabat på mad",
-          "description": "Mums! I weekenderne får du en lækker rabat på 10% i vores restaurant og hotelshop. Tilbuddet gælder, uanset om du overnatter eller bare kigger forbi for at få en bid mad. Så kom i gang med at forkæle dig selv og bestille ekstra roomservice.",
-          "unlocked": true,
-          "value": "10%"
-        },
-        {
-          "name": "Gratis mocktail til børn under opholdet",
-          "description": "Vi vil så gerne have, at børnene føler sig som de VIPs, de er, så vi giver en forfriskende mocktail under hvert ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen check ud, når tilgængeligt",
-          "description": "Vi ved godt, at muligheden for at checke sent ud virkelig kan redde turen, og nu skal du ikke længere skynde dig ud af sengen. Check ud en time senere uden ekstra omkostninger, og nyd at kunne sove lidt længere.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurantvoucher",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Venskabsboost",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Tidlig check ind, når tilgængeligt",
-          "description": "Vil du tage hul på opholdet lidt hurtigere? Intet problem. Check ind en time før uden ekstra omkostninger, og nyd at kunne slappe en smule mere af.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis opgraderinger, når tilgængelige",
-          "description": "På det her venskabsniveau opgraderer vi dit værelse, hvis det er muligt, så du får et endnu mere behageligt ophold.",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 morgenmad",
-          "description": "Uanset om du overnatter hos os eller ej, kan du invitere en ven på morgenmad, for I kan spise for to personer og kun betale for én! Men husk, at tjekke detaljerne først, så alt er klar til et hyggeligt morgenmøde.",
-          "unlocked": false
-        },
-        {
-          "name": "48-timers værelsesgaranti",
-          "description": "Kun få af jer får denne særlige fordel! Selv hvis vi er fuldt bookede, er du garanteret et værelse, så længe du booker mindst 48 timer i forvejen.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis morgenmad – altid",
-          "description": "Klar til noget lækkert om morgenen? Nu kan du starte dagen med gratis morgenmad – og ved du hvad? Det gælder uanset om du overnatter hos os eller ej.",
-          "unlocked": false
-        },
-        {
-          "name": "En fantastisk gave hvert år",
-          "description": "Som vores Best Friend fortjener du virkelig en særlig behandling, og derfor har vi en eksklusiv og ret fantastisk gave klar til dig en gang om året. Hvad det er? Det er jo en overraskelse!",
-          "unlocked": false
-        },
-        {
-          "name": "Børneboost",
-          "description": "Dit barn er også vores ven, og det betyder en særlig boostgave, når I overnatter hos os. Hvorfor? Fordi børn er de bedste!",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 2,
-      "name": "Good Friend",
-      "requirement": "5 000p",
-      "description": "Du har været her meget på det sidste! Lad os tage venskabet videre ét behageligt ophold ad gangen.",
-      "icon": "/_static/icons/loyaltylevels/good-friend.svg",
-      "benefits": [
-        {
-          "name": "Venlige priser",
-          "description": "Som vores ven får du altid de bedste tilbud, uanset tid og sted. Her er der ingen hemmelige aftaler eller bookingkoder – du skal bare booke som normalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabat på mad",
-          "description": "Hvad er mere lækkert end en rabat? Som vores ven får du i weekenderne og på udvalgte helligdage 10-15% rabat i vores restaurant og på maden i vores hotel shop – og det er uanset om du overnatter hos os eller ej. Så kom i gang med at forkæle dig selv: Bestil noget roomservice!",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Gratis mocktail til børn under opholdet",
-          "description": "Vi vil så gerne have, at børnenes føler sig som de VIPs, de er, så vi giver en forfriskende mocktail under hvert ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen check ud, når tilgængeligt",
-          "description": "Vi ved godt, at muligheden for at checke sent ud virkelig kan redde turen, og nu skal du ikke længere skynde dig ud af sengen. Check ud en time senere uden ekstra omkostninger, og nyd at kunne sove lidt længere.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurantvoucher",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Venskabsboost",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Tidlig check ind, når tilgængeligt",
-          "description": "Vil du tage hul på opholdet lidt hurtigere? Intet problem. Check ind en time før uden ekstra omkostninger, og nyd at kunne slappe en smule mere af.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis opgraderinger, når tilgængelige",
-          "description": "På det her venskabsniveau opgraderer vi dit værelse, hvis det er muligt, så du får et endnu mere behageligt ophold.",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 morgenmad",
-          "description": "Uanset om du overnatter hos os eller ej, kan du invitere en ven på morgenmad, for I kan spise for to personer og kun betale for én! Men husk, at tjekke detaljerne først, så alt er klar til et hyggeligt morgenmøde.",
-          "unlocked": false
-        },
-        {
-          "name": "48-timers værelsesgaranti",
-          "description": "Kun få af jer får denne særlige fordel! Selv hvis vi er fuldt bookede, er du garanteret et værelse, så længe du booker mindst 48 timer i forvejen.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis morgenmad – altid",
-          "description": "Klar til noget lækkert om morgenen? Nu kan du starte dagen med gratis morgenmad – og ved du hvad? Det gælder uanset om du overnatter hos os eller ej.",
-          "unlocked": false
-        },
-        {
-          "name": "En fantastisk gave hvert år",
-          "description": "Som vores Best Friend fortjener du virkelig en særlig behandling, og derfor har vi en eksklusiv og ret fantastisk gave klar til dig en gang om året. Hvad det er? Det er jo en overraskelse!",
-          "unlocked": false
-        },
-        {
-          "name": "Børneboost",
-          "description": "Dit barn er også vores ven, og det betyder en særlig boostgave, når I overnatter hos os. Hvorfor? Fordi børn er de bedste!",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 3,
-      "name": "Close Friend",
-      "requirement": "10 000p",
-      "description": "Vi har lært hinanden bedre at kende, og det gør din oplevelse hos Scandic meget mere personlig.",
-      "icon": "/_static/icons/loyaltylevels/close-friend.svg",
-      "benefits": [
-        {
-          "name": "Venlige priser",
-          "description": "Som vores ven får du altid de bedste tilbud, uanset tid og sted. Her er der ingen hemmelige aftaler eller bookingkoder – du skal bare booke som normalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabat på mad",
-          "description": "Hvad er mere lækkert end en rabat? Som vores ven får du i weekenderne og på udvalgte helligdage 10-15% rabat i vores restaurant og på maden i vores hotel shop – og det er uanset om du overnatter hos os eller ej. Så kom i gang med at forkæle dig selv: Bestil noget roomservice!",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Gratis mocktail til børn under opholdet",
-          "description": "Vi vil så gerne have, at børnenes føler sig som de VIPs, de er, så vi giver en forfriskende mocktail under hvert ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen check ud, når tilgængeligt",
-          "description": "Vi ved godt, at muligheden for at checke sent ud virkelig kan redde turen, og nu skal du ikke længere skynde dig ud af sengen. Check ud en time senere uden ekstra omkostninger, og nyd at kunne sove lidt længere.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantvoucher",
-          "description": "For hver pointgivende overnatning hos os giver vi dig en restaurantvoucher på DKK 50,-.",
-          "unlocked": true,
-          "value": "DKK 50,-"
-        },
-        {
-          "name": "Venskabsboost",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Tidlig check ind, når tilgængeligt",
-          "description": "Vil du tage hul på opholdet lidt hurtigere? Intet problem. Check ind en time før uden ekstra omkostninger, og nyd at kunne slappe en smule mere af.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis opgraderinger, når tilgængelige",
-          "description": "På det her venskabsniveau opgraderer vi dit værelse, hvis det er muligt, så du får et endnu mere behageligt ophold.",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 morgenmad",
-          "description": "Uanset om du overnatter hos os eller ej, kan du invitere en ven på morgenmad, for I kan spise for to personer og kun betale for én! Men husk, at tjekke detaljerne først, så alt er klar til et hyggeligt morgenmøde.",
-          "unlocked": false
-        },
-        {
-          "name": "48-timers værelsesgaranti",
-          "description": "Kun få af jer får denne særlige fordel! Selv hvis vi er fuldt bookede, er du garanteret et værelse, så længe du booker mindst 48 timer i forvejen.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis morgenmad – altid",
-          "description": "Klar til noget lækkert om morgenen? Nu kan du starte dagen med gratis morgenmad – og ved du hvad? Det gælder uanset om du overnatter hos os eller ej.",
-          "unlocked": false
-        },
-        {
-          "name": "En fantastisk gave hvert år",
-          "description": "Som vores Best Friend fortjener du virkelig en særlig behandling, og derfor har vi en eksklusiv og ret fantastisk gave klar til dig en gang om året. Hvad det er? Det er jo en overraskelse!",
-          "unlocked": false
-        },
-        {
-          "name": "Børneboost",
-          "description": "Dit barn er også vores ven, og det betyder en særlig boostgave, når I overnatter hos os. Hvorfor? Fordi børn er de bedste!",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 4,
-      "name": "Dear Friend",
-      "requirement": "25 000p",
-      "description": "Her er vist grobund for et livslangt venskab, og det betyder, at du får adgang til meget mere med Scandic.",
-      "icon": "/_static/icons/loyaltylevels/dear-friend.svg",
-      "benefits": [
-        {
-          "name": "Venlige priser",
-          "description": "Som vores ven får du altid de bedste tilbud, uanset tid og sted. Her er der ingen hemmelige aftaler eller bookingkoder – du skal bare booke som normalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabat på mad",
-          "description": "Hvad er mere lækkert end en rabat? Som vores ven får du i weekenderne og på udvalgte helligdage 10-15% rabat i vores restaurant og på maden i vores hotelshop – og det er uanset om du overnatter hos os eller ej. Så kom i gang med at forkæle dig selv: Bestil noget roomservice!",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Gratis mocktail til børn under opholdet",
-          "description": "Vi vil så gerne have, at børnenes føler sig som de VIPs, de er, så vi giver en forfriskende mocktail under hvert ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen check ud, når tilgængeligt",
-          "description": "Vi ved godt, at muligheden for at checke sent ud virkelig kan redde turen, og nu skal du ikke længere skynde dig ud af sengen. Check ud en time senere uden ekstra omkostninger, og nyd at kunne sove lidt længere.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantvoucher",
-          "description": "Vores venskab blev lige en smule bedre! Få en restaurantvoucher på DKK 75,- for hver pointgivende overnatning.",
-          "unlocked": true,
-          "value": "DKK 75,-"
-        },
-        {
-          "name": "Venskabsboost",
-          "description": "Hver gang du booster dine venskabspoint, får du 25% ekstra! Så kom i gang med at optjene point på ophold, måltider m.m., og pludselig har du en gratis overnatning.",
-          "unlocked": true,
-          "value": "25%"
-        },
-        {
-          "name": "Tidlig check ind, når tilgængeligt",
-          "description": "Vil du tage hul på opholdet lidt hurtigere? Intet problem. Check ind en time før uden ekstra omkostninger, og nyd at kunne slappe en smule mere af.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis opgraderinger, når tilgængelige",
-          "description": "På det her venskabsniveau opgraderer vi dit værelse, hvis det er muligt, så du får et endnu mere behageligt ophold.",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 morgenmad",
-          "description": "Uanset om du overnatter hos os eller ej, kan du invitere en ven på morgenmad, for I kan spise for to personer og kun betale for én! Men husk, at tjekke detaljerne først, så alt er klar til et hyggeligt morgenmøde.",
-          "unlocked": false
-        },
-        {
-          "name": "48-timers værelsesgaranti",
-          "description": "Kun få af jer får denne særlige fordel! Selv hvis vi er fuldt bookede, er du garanteret et værelse, så længe du booker mindst 48 timer i forvejen.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis morgenmad – altid",
-          "description": "Klar til noget lækkert om morgenen? Nu kan du starte dagen med gratis morgenmad – og ved du hvad? Det gælder uanset om du overnatter hos os eller ej.",
-          "unlocked": false
-        },
-        {
-          "name": "En fantastisk gave hvert år",
-          "description": "Som vores Best Friend fortjener du virkelig en særlig behandling, og derfor har vi en eksklusiv og ret fantastisk gave klar til dig en gang om året. Hvad det er? Det er jo en overraskelse!",
-          "unlocked": false
-        },
-        {
-          "name": "Børneboost",
-          "description": "Dit barn er også vores ven, og det betyder en særlig boostgave, når I overnatter hos os. Hvorfor? Fordi børn er de bedste!",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 5,
-      "name": "Loyal Friend",
-      "requirement": "100 000p",
-      "description": "Du har været hos os på mange ophold, så derfor vil vi gerne give dig nogle af vores bedste fordele.",
-      "icon": "/_static/icons/loyaltylevels/loyal-friend.svg",
-      "benefits": [
-        {
-          "name": "Venlige priser",
-          "description": "Som vores ven får du altid de bedste tilbud, uanset tid og sted. Her er der ingen hemmelige aftaler eller bookingkoder – du skal bare booke som normalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabat på mad",
-          "description": "Hvad er mere lækkert end en rabat? Som vores ven får du i weekenderne og på udvalgte helligdage 10-15% rabat i vores restaurant og på maden i vores hotel shop – og det er uanset om du overnatter hos os eller ej. Så kom i gang med at forkæle dig selv: Bestil noget roomservice!",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Gratis mocktail til børn under opholdet",
-          "description": "Vi vil så gerne have, at børnenes føler sig som de VIPs, de er, så vi giver en forfriskende mocktail under hvert ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen check ud, når tilgængeligt",
-          "description": "Vi ved godt, at muligheden for at checke sent ud virkelig kan redde turen, og nu skal du ikke længere skynde dig ud af sengen. Check ud en time senere uden ekstra omkostninger, og nyd at kunne sove lidt længere.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantvoucher",
-          "description": "Vi giver dig en restaurantvoucher på DKK 100,- for hver pointgivende overnatning. Det kan blive til mange croissanter!",
-          "unlocked": true,
-          "value": "DKK 100,-"
-        },
-        {
-          "name": "Venskabsboost",
-          "description": "Hver gang du booster dine venskabspoint, får du 25% ekstra! Så kom i gang med at optjene point på ophold, måltider m.m., og pludselig har du en gratis overnatning.",
-          "unlocked": true,
-          "value": "25%"
-        },
-        {
-          "name": "Tidlig check ind, når tilgængeligt",
-          "description": "Vil du tage hul på opholdet lidt hurtigere? Intet problem. Check ind en time før uden ekstra omkostninger, og nyd at kunne slappe en smule mere af.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis opgraderinger, når tilgængelige",
-          "description": "På det her venskabsniveau opgraderer vi dit værelse, hvis det er muligt, så du får et endnu mere behageligt ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 morgenmad",
-          "description": "Uanset om du overnatter hos os eller ej, kan du invitere en ven på morgenmad, for I kan spise for to personer og kun betale for én! Men husk, at tjekke detaljerne først, så alt er klar til et hyggeligt morgenmøde.",
-          "unlocked": true
-        },
-        {
-          "name": "48-timers værelsesgaranti",
-          "description": "Kun få af jer får denne særlige fordel! Selv hvis vi er fuldt bookede, er du garanteret et værelse, så længe du booker mindst 48 timer i forvejen.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis morgenmad – altid",
-          "description": "Klar til noget lækkert om morgenen? Nu kan du starte dagen med gratis morgenmad – og ved du hvad? Det gælder uanset om du overnatter hos os eller ej.",
-          "unlocked": false
-        },
-        {
-          "name": "En fantastisk gave hvert år",
-          "description": "Som vores Best Friend fortjener du virkelig en særlig behandling, og derfor har vi en eksklusiv og ret fantastisk gave klar til dig en gang om året. Hvad det er? Det er jo en overraskelse!",
-          "unlocked": false
-        },
-        {
-          "name": "Børneboost",
-          "description": "Dit barn er også vores ven, og det betyder en særlig boostgave, når I overnatter hos os. Hvorfor? Fordi børn er de bedste!",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 6,
-      "name": "True Friend",
-      "requirement": "250 000p",
-      "description": "Vi er glade for, at du besøger os, uanset om det er høj- eller lavsæson. Derfor får du endnu flere skræddersyede fordele.",
-      "icon": "/_static/icons/loyaltylevels/true-friend.svg",
-      "benefits": [
-        {
-          "name": "Venlige priser",
-          "description": "Som vores ven får du altid de bedste tilbud, uanset tid og sted. Her er der ingen hemmelige aftaler eller bookingkoder – du skal bare booke som normalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabat på mad",
-          "description": "Hvad er mere lækkert end en rabat? Som vores ven får du i weekenderne og på udvalgte helligdage 10-15% rabat i vores restaurant og på maden i vores hotel shop – og det er uanset om du overnatter hos os eller ej. Så kom i gang med at forkæle dig selv: Bestil noget roomservice!",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Gratis mocktail til børn under opholdet",
-          "description": "Vi vil så gerne have, at børnenes føler sig som de VIPs, de er, så vi giver en forfriskende mocktail under hvert ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen check ud, når tilgængeligt",
-          "description": "Vi ved godt, at muligheden for at checke sent ud virkelig kan redde turen, og nu skal du ikke længere skynde dig ud af sengen. Check ud en time senere uden ekstra omkostninger, og nyd at kunne sove lidt længere.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantvoucher",
-          "description": "Det går ret godt, så nu giver hver pointgivende overnatning en restaurantvoucher. Den er helt sikkert god at have ved hånden, næste gang du vil spise en god middag!",
-          "unlocked": true,
-          "value": "DKK 150,-"
-        },
-        {
-          "name": "Venskabsboost",
-          "description": "Du kan godt glæde dig. Hver gang du booster dine venskabspoint, får du 25-50% ekstra! Så kom i gang med at optjene point på ophold, måltider m.m., og pludselig har du en gratis overnatning.",
-          "unlocked": true,
-          "value": "50%"
-        },
-        {
-          "name": "Tidlig check ind, når tilgængeligt",
-          "description": "Vil du tage hul på opholdet lidt hurtigere? Intet problem. Check ind en time før uden ekstra omkostninger, og nyd at kunne slappe en smule mere af.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis opgraderinger, når tilgængelige",
-          "description": "På det her venskabsniveau opgraderer vi dit værelse, hvis det er muligt, så du får et endnu mere behageligt ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 morgenmad",
-          "description": "Uanset om du overnatter hos os eller ej, kan du invitere en ven på morgenmad, for I kan spise for to personer og kun betale for én! Men husk, at tjekke detaljerne først, så alt er klar til et hyggeligt morgenmøde.",
-          "unlocked": false
-        },
-        {
-          "name": "48-timers værelsesgaranti",
-          "description": "Kun få af jer får denne særlige fordel! Selv hvis vi er fuldt bookede, er du garanteret et værelse, så længe du booker mindst 48 timer i forvejen.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis morgenmad – altid",
-          "description": "Klar til noget lækkert om morgenen? Nu kan du starte dagen med gratis morgenmad – og ved du hvad? Det gælder uanset om du overnatter hos os eller ej.",
-          "unlocked": true
-        },
-        {
-          "name": "En fantastisk gave hvert år",
-          "description": "Som vores Best Friend fortjener du virkelig en særlig behandling, og derfor har vi en eksklusiv og ret fantastisk gave klar til dig en gang om året. Hvad det er? Det er jo en overraskelse!",
-          "unlocked": false
-        },
-        {
-          "name": "Børneboost",
-          "description": "Dit barn er også vores ven, og det betyder en særlig boostgave, når I overnatter hos os. Hvorfor? Fordi børn er de bedste!",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 7,
-      "name": "Best Friend",
-      "requirement": "400 000p eller 100 nætter",
-      "description": "Det bliver simpelthen ikke bedre end det her, når det kommer til de helt eksklusive oplevelser!",
-      "icon": "/_static/icons/loyaltylevels/best-friend.svg",
-      "benefits": [
-        {
-          "name": "Venlige priser",
-          "description": "Som vores ven får du altid de bedste tilbud, uanset tid og sted. Her er der ingen hemmelige aftaler eller bookingkoder – du skal bare booke som normalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabat på mad",
-          "description": "Hvad er mere lækkert end en rabat? Som vores ven får du i weekenderne og på udvalgte helligdage 10-15% rabat i vores restaurant og på maden i vores hotel shop – og det er uanset om du overnatter hos os eller ej. Så kom i gang med at forkæle dig selv: Bestil noget roomservice!",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Gratis mocktail til børn under opholdet",
-          "description": "Vi vil så gerne have, at børnenes føler sig som de VIPs, de er, så vi giver en forfriskende mocktail under hvert ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen check ud, når tilgængeligt",
-          "description": "Vi ved godt, at muligheden for at checke sent ud virkelig kan redde turen, og nu skal du ikke længere skynde dig ud af sengen. Check ud en time senere uden ekstra omkostninger, og nyd at kunne sove lidt længere.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantvoucher",
-          "description": "Nu giver hver pointgivende overnatning en restaurantvoucher. Forestil dig lige, hvor mange croissanter du kan få!",
-          "unlocked": true,
-          "value": "DKK 200,-"
-        },
-        {
-          "name": "Venskabsboost",
-          "description": "Du kan godt glæde dig. Hver gang du booster dine venskabspoint, får du 25-50% ekstra! Så kom i gang med at optjene point på ophold, måltider m.m., og pludselig har du en gratis overnatning.",
-          "unlocked": true,
-          "value": "50%"
-        },
-        {
-          "name": "Tidlig check ind, når tilgængeligt",
-          "description": "Vil du tage hul på opholdet lidt hurtigere? Intet problem. Check ind en time før uden ekstra omkostninger, og nyd at kunne slappe en smule mere af.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis opgraderinger, når tilgængelige",
-          "description": "På det her venskabsniveau opgraderer vi dit værelse, hvis det er muligt, så du får et endnu mere behageligt ophold.",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 morgenmad",
-          "description": "Uanset om du overnatter hos os eller ej, kan du invitere en ven på morgenmad, for I kan spise for to personer og kun betale for én! Men husk, at tjekke detaljerne først, så alt er klar til et hyggeligt morgenmøde.",
-          "unlocked": false
-        },
-        {
-          "name": "48-timers værelsesgaranti",
-          "description": "Kun få af jer får denne særlige fordel! Selv hvis vi er fuldt bookede, er du garanteret et værelse, så længe du booker mindst 48 timer i forvejen.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis morgenmad – altid",
-          "description": "Klar til noget lækkert om morgenen? Nu kan du starte dagen med gratis morgenmad – og ved du hvad? Det gælder uanset om du overnatter hos os eller ej.",
-          "unlocked": true
-        },
-        {
-          "name": "En fantastisk gave hvert år",
-          "description": "Som vores Best Friend fortjener du virkelig en særlig behandling, og derfor har vi en eksklusiv og ret fantastisk gave klar til dig en gang om året. Hvad det er? Det er jo en overraskelse!",
-          "unlocked": true
-        },
-        {
-          "name": "Børneboost",
-          "description": "Dit barn er også vores ven, og det betyder en særlig boostgave, når I overnatter hos os. Hvorfor? Fordi børn er de bedste!",
-          "unlocked": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/DE.json b/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/DE.json
deleted file mode 100644
index 5d11c6a36..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/DE.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
-  "levels": [
-    {
-      "level": 1,
-      "name": "New Friend",
-      "requirement": "0 Punkte",
-      "description": "Dies ist der Beginn von etwas Wunderbarem: Als New Friend können Sie sich auf eine Reise voller herrlicher Scandic-Entdeckungen freuen.",
-      "icon": "/_static/icons/loyaltylevels/new-friend.svg",
-      "benefits": [
-        {
-          "name": "Freundschaftspreise",
-          "description": "Als unser Freund erhalten Sie immer das beste Angebot: an jedem Tag und an jedem Ort. Und dafür ist weder ein Handschlag noch ein Buchungscode erforderlich – stürzen Sie sich einfach ins Buchungserlebnis und überzeugen Sie sich selbst.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt auf Speisen",
-          "description": "Mmmh, lecker! Genießen Sie an den Wochenenden einen verlockenden Preisnachlass von 10 % in unserem Restaurant und Hotelshop. Dieses Angebot gilt unabhängig davon, ob Sie bei uns übernachten oder nur auf einen Happen zu essen bei uns vorbeischauen. Worauf warten Sie also noch? Gönnen Sie sich etwas und bestellen Sie den zusätzlichen Zimmerservice.",
-          "unlocked": true,
-          "value": "10%"
-        },
-        {
-          "name": "Kostenloser Kinder-Mocktail während des Aufenthalts",
-          "description": "Oh, Sie haben ja die Kinder dabei! Wie schön – hallo junger Freund! Wir möchten, dass sich Kinder bei uns wie VIPs fühlen, und deshalb bekommen sie von uns bei jedem Aufenthalt einen erfrischenden Mocktail spendiert.",
-          "unlocked": true
-        },
-        {
-          "name": "Später Check-out, wenn verfügbar",
-          "description": "Wir wissen, dass ein später Check-out manchmal eine große Erleichterung sein kann. Und an diesem Punkt unserer Freundschaft gibt es keinen Grund mehr, sich aus dem Bett zu quälen: Wir kommen Ihnen gerne entgegen. Checken Sie kostenlos 1 Stunde später aus und schlafen Sie einfach etwas länger.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurantgutschein",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Freundschaftsbonus",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Früher Check-in, wenn verfügbar",
-          "description": "Sie treffen schon früher bei uns ein? Kein Problem! Checken Sie einfach kostenlos eine Stunde früher ein – so können Sie sich gleich ein wenig ausruhen und haben noch mehr von Ihrem Aufenthalt.",
-          "unlocked": false
-        },
-        {
-          "name": "Kostenlose Upgrades wenn verfügbar",
-          "description": "Um auf den Punkt zu kommen – wir setzen noch einen drauf. Auf dieser Stufe unserer Freundschaft bieten wir Ihnen, wann immer es möglich ist, ein Zimmer-Upgrade an – so wird Ihr Aufenthalt noch komfortabler. Wenn das nicht großartig klingt …",
-          "unlocked": false
-        },
-        {
-          "name": "Frühstück für zwei zum Preis von einem",
-          "description": "Wenn das kein delikater Deal ist: Egal, ob Sie bei uns übernachten oder nicht, schnappen Sie sich einen Frühstückspartner, denn jetzt können Sie zu zweit zum Preis von einem bei uns essen! Informieren Sie sich einfach vorher über alle Details und genießen Sie ein gemütliches Frühstück zu zweit.",
-          "unlocked": false
-        },
-        {
-          "name": "48-Stunden-Zimmergarantie",
-          "description": "Pssst! Diesen ganz besonderen Leckerbissen bekommen bei uns nur die Wenigsten! Also aufgepasst: Selbst wenn wir völlig ausgebucht sind, erhalten Sie bei uns garantiert ein Zimmer, wenn Sie 48 Stunden im Voraus buchen. Ist das nicht einfach unglaublich?",
-          "unlocked": false
-        },
-        {
-          "name": "Ein kostenloses Frühstück – jederzeit",
-          "description": "Lust auf einen leckeren Start in den Tag? Dann schauen Sie doch einfach bei uns vorbei! Denn jetzt können Sie Ihren Tag mit einem kostenlosen Frühstück beginnen – und zwar ganz unabhängig davon, ob Sie bei uns übernachten oder nicht.",
-          "unlocked": false
-        },
-        {
-          "name": "Ein exklusives Geschenk pro Jahr",
-          "description": "Als Best Friend haben Sie natürlich eine königliche Behandlung verdient – deshalb haben wir einmal im Jahr ein exklusives und ziemlich großartiges Geschenk für Sie. Neugierig? Tja, das bleibt leider eine Überraschung. Es wird noch nichts verraten!",
-          "unlocked": false
-        },
-        {
-          "name": "Ein Geschenk für Kinder",
-          "description": "An diesem Punkt unserer Freundschaft betrachten wir natürlich auch Ihr Kind als Freund – was bedeutet, dass es bei jeder Übernachtung ein ganz spezielles Geschenk von uns erhält. Und warum? Weil Kinder einfach cool sind! Sie haben eine VIP-Behandlung verdient.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 2,
-      "name": "Good Friend",
-      "requirement": "5 000 Punkte",
-      "description": "Sie waren in letzter Zeit viel bei uns! Und ehrlich gesagt haben wir das Gefühl, dass wir auf einer Wellenlänge sind – die vielen angenehmen Aufenthalte und lustigen Überraschungen sprechen für sich.",
-      "icon": "/_static/icons/loyaltylevels/good-friend.svg",
-      "benefits": [
-        {
-          "name": "Freundschaftspreise",
-          "description": "Als unser Freund erhalten Sie immer das beste Angebot: an jedem Tag und an jedem Ort. Und dafür ist weder ein Handschlag noch ein Buchungscode erforderlich – stürzen Sie sich einfach ins Buchungserlebnis und überzeugen Sie sich selbst.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt auf Speisen",
-          "description": "Was gibt es Schöneres als einen Preisnachlass? Als Freund erhalten Sie an Wochenenden und ausgewählten Feiertagen 10-15% Rabatt auf die Speisen in unseren Restaurants und Hotelshops – und zwar unabhängig davon, ob Sie bei uns übernachten oder nicht. Also kommen Sie vorbei und tun Sie sich etwas Gutes! Zum Beispiel mit unserem zusätzlichen Zimmerservice.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Kostenloser Kinder-Mocktail während des Aufenthalts",
-          "description": "Oh, Sie haben ja die Kinder dabei! Wie schön – hallo junger Freund! Wir möchten, dass sich Kinder bei uns wie VIPs fühlen, und deshalb bekommen sie von uns bei jedem Aufenthalt einen erfrischenden Mocktail spendiert.",
-          "unlocked": true
-        },
-        {
-          "name": "Später Check-out, wenn verfügbar",
-          "description": "Wir wissen, dass ein später Check-out manchmal eine große Erleichterung sein kann. Und an diesem Punkt unserer Freundschaft gibt es keinen Grund mehr, sich aus dem Bett zu quälen: Wir kommen Ihnen gerne entgegen. Checken Sie kostenlos 1 Stunde später aus und schlafen Sie einfach etwas länger.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurantgutschein",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Freundschaftsbonus",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Früher Check-in, wenn verfügbar",
-          "description": "Sie treffen schon früher bei uns ein? Kein Problem! Checken Sie einfach kostenlos eine Stunde früher ein – so können Sie sich gleich ein wenig ausruhen und haben noch mehr von Ihrem Aufenthalt.",
-          "unlocked": false
-        },
-        {
-          "name": "Kostenlose Upgrades wenn verfügbar",
-          "description": "Um auf den Punkt zu kommen – wir setzen noch einen drauf. Auf dieser Stufe unserer Freundschaft bieten wir Ihnen, wann immer es möglich ist, ein Zimmer-Upgrade an – so wird Ihr Aufenthalt noch komfortabler. Wenn das nicht großartig klingt …",
-          "unlocked": false
-        },
-        {
-          "name": "Frühstück für zwei zum Preis von einem",
-          "description": "Wenn das kein delikater Deal ist: Egal, ob Sie bei uns übernachten oder nicht, schnappen Sie sich einen Frühstückspartner, denn jetzt können Sie zu zweit zum Preis von einem bei uns essen! Informieren Sie sich einfach vorher über alle Details und genießen Sie ein gemütliches Frühstück zu zweit.",
-          "unlocked": false
-        },
-        {
-          "name": "48-Stunden-Zimmergarantie",
-          "description": "Pssst! Diesen ganz besonderen Leckerbissen bekommen bei uns nur die Wenigsten! Also aufgepasst: Selbst wenn wir völlig ausgebucht sind, erhalten Sie bei uns garantiert ein Zimmer, wenn Sie 48 Stunden im Voraus buchen. Ist das nicht einfach unglaublich?",
-          "unlocked": false
-        },
-        {
-          "name": "Ein kostenloses Frühstück – jederzeit",
-          "description": "Lust auf einen leckeren Start in den Tag? Dann schauen Sie doch einfach bei uns vorbei! Denn jetzt können Sie Ihren Tag mit einem kostenlosen Frühstück beginnen – und zwar ganz unabhängig davon, ob Sie bei uns übernachten oder nicht.",
-          "unlocked": false
-        },
-        {
-          "name": "Ein exklusives Geschenk pro Jahr",
-          "description": "Als Best Friend haben Sie natürlich eine königliche Behandlung verdient – deshalb haben wir einmal im Jahr ein exklusives und ziemlich großartiges Geschenk für Sie. Neugierig? Tja, das bleibt leider eine Überraschung. Es wird noch nichts verraten!",
-          "unlocked": false
-        },
-        {
-          "name": "Ein Geschenk für Kinder",
-          "description": "An diesem Punkt unserer Freundschaft betrachten wir natürlich auch Ihr Kind als Freund – was bedeutet, dass es bei jeder Übernachtung ein ganz spezielles Geschenk von uns erhält. Und warum? Weil Kinder einfach cool sind! Sie haben eine VIP-Behandlung verdient.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 3,
-      "name": "Close Friend",
-      "requirement": "10 000 Punkte",
-      "description": "Jetzt wird es ernst: Wir lernen uns wirklich besser kennen, was bedeutet, dass Ihre Zeit mit Scandic noch viel persönlicher wird.",
-      "icon": "/_static/icons/loyaltylevels/close-friend.svg",
-      "benefits": [
-        {
-          "name": "Freundschaftspreise",
-          "description": "Als unser Freund erhalten Sie immer das beste Angebot: an jedem Tag und an jedem Ort. Und dafür ist weder ein Handschlag noch ein Buchungscode erforderlich – stürzen Sie sich einfach ins Buchungserlebnis und überzeugen Sie sich selbst.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt auf Speisen",
-          "description": "Was gibt es Schöneres als einen Preisnachlass? Als Freund erhalten Sie an Wochenenden und ausgewählten Feiertagen 10-15% Rabatt auf die Speisen in unseren Restaurants und Hotelshops – und zwar unabhängig davon, ob Sie bei uns übernachten oder nicht. Also kommen Sie vorbei und tun Sie sich etwas Gutes! Zum Beispiel mit unserem zusätzlichen Zimmerservice.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Kostenloser Kinder-Mocktail während des Aufenthalts",
-          "description": "Oh, Sie haben ja die Kinder dabei! Wie schön – hallo junger Freund! Wir möchten, dass sich Kinder bei uns wie VIPs fühlen, und deshalb bekommen sie von uns bei jedem Aufenthalt einen erfrischenden Mocktail spendiert.",
-          "unlocked": true
-        },
-        {
-          "name": "Später Check-out, wenn verfügbar",
-          "description": "Wir wissen, dass ein später Check-out manchmal eine große Erleichterung sein kann. Und an diesem Punkt unserer Freundschaft gibt es keinen Grund mehr, sich aus dem Bett zu quälen: Wir kommen Ihnen gerne entgegen. Checken Sie kostenlos 1 Stunde später aus und schlafen Sie einfach etwas länger.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantgutschein",
-          "description": "Und jetzt kommt der Clou: Für jede Übernachtung, mit der Sie bei uns Freundschaftspunkte sammeln, schenken wir Ihnen zusätzlich einen Restaurantgutschein über 5 €.",
-          "unlocked": true,
-          "value": "5 €"
-        },
-        {
-          "name": "Freundschaftsbonus",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Früher Check-in, wenn verfügbar",
-          "description": "Sie treffen schon früher bei uns ein? Kein Problem! Checken Sie einfach kostenlos eine Stunde früher ein – so können Sie sich gleich ein wenig ausruhen und haben noch mehr von Ihrem Aufenthalt.",
-          "unlocked": false
-        },
-        {
-          "name": "Kostenlose Upgrades wenn verfügbar",
-          "description": "Um auf den Punkt zu kommen – wir setzen noch einen drauf. Auf dieser Stufe unserer Freundschaft bieten wir Ihnen, wann immer es möglich ist, ein Zimmer-Upgrade an – so wird Ihr Aufenthalt noch komfortabler. Wenn das nicht großartig klingt …",
-          "unlocked": false
-        },
-        {
-          "name": "Frühstück für zwei zum Preis von einem",
-          "description": "Wenn das kein delikater Deal ist: Egal, ob Sie bei uns übernachten oder nicht, schnappen Sie sich einen Frühstückspartner, denn jetzt können Sie zu zweit zum Preis von einem bei uns essen! Informieren Sie sich einfach vorher über alle Details und genießen Sie ein gemütliches Frühstück zu zweit.",
-          "unlocked": false
-        },
-        {
-          "name": "48-Stunden-Zimmergarantie",
-          "description": "Pssst! Diesen ganz besonderen Leckerbissen bekommen bei uns nur die Wenigsten! Also aufgepasst: Selbst wenn wir völlig ausgebucht sind, erhalten Sie bei uns garantiert ein Zimmer, wenn Sie 48 Stunden im Voraus buchen. Ist das nicht einfach unglaublich?",
-          "unlocked": false
-        },
-        {
-          "name": "Ein kostenloses Frühstück – jederzeit",
-          "description": "Lust auf einen leckeren Start in den Tag? Dann schauen Sie doch einfach bei uns vorbei! Denn jetzt können Sie Ihren Tag mit einem kostenlosen Frühstück beginnen – und zwar ganz unabhängig davon, ob Sie bei uns übernachten oder nicht.",
-          "unlocked": false
-        },
-        {
-          "name": "Ein exklusives Geschenk pro Jahr",
-          "description": "Als Best Friend haben Sie natürlich eine königliche Behandlung verdient – deshalb haben wir einmal im Jahr ein exklusives und ziemlich großartiges Geschenk für Sie. Neugierig? Tja, das bleibt leider eine Überraschung. Es wird noch nichts verraten!",
-          "unlocked": false
-        },
-        {
-          "name": "Ein Geschenk für Kinder",
-          "description": "An diesem Punkt unserer Freundschaft betrachten wir natürlich auch Ihr Kind als Freund – was bedeutet, dass es bei jeder Übernachtung ein ganz spezielles Geschenk von uns erhält. Und warum? Weil Kinder einfach cool sind! Sie haben eine VIP-Behandlung verdient.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 4,
-      "name": "Dear Friend",
-      "requirement": "25 000 Punkte",
-      "description": "Ein Hoch auf uns! Unser Verhältnis scheint sich in Richtung Freunde fürs Leben zu entwickeln – was auch bedeutet, dass Sie Zugang zu einer ganzen Menge mehr Scandic bekommen.",
-      "icon": "/_static/icons/loyaltylevels/dear-friend.svg",
-      "benefits": [
-        {
-          "name": "Freundschaftspreise",
-          "description": "Als unser Freund erhalten Sie immer das beste Angebot: an jedem Tag und an jedem Ort. Und dafür ist weder ein Handschlag noch ein Buchungscode erforderlich – stürzen Sie sich einfach ins Buchungserlebnis und überzeugen Sie sich selbst.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt auf Speisen",
-          "description": "Was gibt es Schöneres als einen Preisnachlass? Als Freund erhalten Sie an Wochenenden und ausgewählten Feiertagen 10-15% Rabatt auf die Speisen in unseren Restaurants und Hotelshops – und zwar unabhängig davon, ob Sie bei uns übernachten oder nicht. Also kommen Sie vorbei und tun Sie sich etwas Gutes! Zum Beispiel mit unserem zusätzlichen Zimmerservice.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Kostenloser Kinder-Mocktail während des Aufenthalts",
-          "description": "Oh, Sie haben ja die Kinder dabei! Wie schön – hallo junger Freund! Wir möchten, dass sich Kinder bei uns wie VIPs fühlen, und deshalb bekommen sie von uns bei jedem Aufenthalt einen erfrischenden Mocktail spendiert.",
-          "unlocked": true
-        },
-        {
-          "name": "Später Check-out, wenn verfügbar",
-          "description": "Wir wissen, dass ein später Check-out manchmal eine große Erleichterung sein kann. Und an diesem Punkt unserer Freundschaft gibt es keinen Grund mehr, sich aus dem Bett zu quälen: Wir kommen Ihnen gerne entgegen. Checken Sie kostenlos 1 Stunde später aus und schlafen Sie einfach etwas länger.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantgutschein",
-          "description": "Unsere Freundschaft wird jetzt noch schöner! Genießen Sie einen Restaurantgutschein im Wert von 7,50 € für jede Übernachtung, mit der Sie bei uns Punkte sammeln. Ist das nicht aufregend?",
-          "unlocked": true,
-          "value": "7,50 €"
-        },
-        {
-          "name": "Freundschaftsbonus",
-          "description": "Hier haben wir etwas wirklich Großartiges für Sie: Jedes Mal, wenn Sie einen neuen Schub an Freundschaftspunkten erhalten, gibt es von uns 25 % dazu – ein ordentlicher Extra-Schub! Wenn Sie also anfangen, diese Punkte für Aufenthalte, Mahlzeiten und anderes zu sammeln, erhalten Sie im Handumdrehen eine kostenlose Übernachtung.",
-          "unlocked": true,
-          "value": "25%"
-        },
-        {
-          "name": "Früher Check-in, wenn verfügbar",
-          "description": "Sie treffen schon früher bei uns ein? Kein Problem! Checken Sie einfach kostenlos eine Stunde früher ein – so können Sie sich gleich ein wenig ausruhen und haben noch mehr von Ihrem Aufenthalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Kostenlose Upgrades wenn verfügbar",
-          "description": "Um auf den Punkt zu kommen – wir setzen noch einen drauf. Auf dieser Stufe unserer Freundschaft bieten wir Ihnen, wann immer es möglich ist, ein Zimmer-Upgrade an – so wird Ihr Aufenthalt noch komfortabler. Wenn das nicht großartig klingt …",
-          "unlocked": false
-        },
-        {
-          "name": "Frühstück für zwei zum Preis von einem",
-          "description": "Wenn das kein delikater Deal ist: Egal, ob Sie bei uns übernachten oder nicht, schnappen Sie sich einen Frühstückspartner, denn jetzt können Sie zu zweit zum Preis von einem bei uns essen! Informieren Sie sich einfach vorher über alle Details und genießen Sie ein gemütliches Frühstück zu zweit.",
-          "unlocked": false
-        },
-        {
-          "name": "48-Stunden-Zimmergarantie",
-          "description": "Pssst! Diesen ganz besonderen Leckerbissen bekommen bei uns nur die Wenigsten! Also aufgepasst: Selbst wenn wir völlig ausgebucht sind, erhalten Sie bei uns garantiert ein Zimmer, wenn Sie 48 Stunden im Voraus buchen. Ist das nicht einfach unglaublich?",
-          "unlocked": false
-        },
-        {
-          "name": "Ein kostenloses Frühstück – jederzeit",
-          "description": "Lust auf einen leckeren Start in den Tag? Dann schauen Sie doch einfach bei uns vorbei! Denn jetzt können Sie Ihren Tag mit einem kostenlosen Frühstück beginnen – und zwar ganz unabhängig davon, ob Sie bei uns übernachten oder nicht.",
-          "unlocked": false
-        },
-        {
-          "name": "Ein exklusives Geschenk pro Jahr",
-          "description": "Als Best Friend haben Sie natürlich eine königliche Behandlung verdient – deshalb haben wir einmal im Jahr ein exklusives und ziemlich großartiges Geschenk für Sie. Neugierig? Tja, das bleibt leider eine Überraschung. Es wird noch nichts verraten!",
-          "unlocked": false
-        },
-        {
-          "name": "Ein Geschenk für Kinder",
-          "description": "An diesem Punkt unserer Freundschaft betrachten wir natürlich auch Ihr Kind als Freund – was bedeutet, dass es bei jeder Übernachtung ein ganz spezielles Geschenk von uns erhält. Und warum? Weil Kinder einfach cool sind! Sie haben eine VIP-Behandlung verdient.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 5,
-      "name": "Loyal Friend",
-      "requirement": "100 000 Punkte",
-      "description": "Sie haben uns während zahlreicher Aufenthalte, Happy Hours und Workouts im Fitnessstudio die Treue gehalten – deshalb wollen wir uns mit einigen unserer großartigsten Belohnungen bei Ihnen revanchieren.",
-      "icon": "/_static/icons/loyaltylevels/loyal-friend.svg",
-      "benefits": [
-        {
-          "name": "Freundschaftspreise",
-          "description": "Als unser Freund erhalten Sie immer das beste Angebot: an jedem Tag und an jedem Ort. Und dafür ist weder ein Handschlag noch ein Buchungscode erforderlich – stürzen Sie sich einfach ins Buchungserlebnis und überzeugen Sie sich selbst.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt auf Speisen",
-          "description": "Was gibt es Schöneres als einen Preisnachlass? Als Freund erhalten Sie an Wochenenden und ausgewählten Feiertagen 10-15% Rabatt auf die Speisen in unseren Restaurants und Hotelshops – und zwar unabhängig davon, ob Sie bei uns übernachten oder nicht. Also kommen Sie vorbei und tun Sie sich etwas Gutes! Zum Beispiel mit unserem zusätzlichen Zimmerservice.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Kostenloser Kinder-Mocktail während des Aufenthalts",
-          "description": "Oh, Sie haben ja die Kinder dabei! Wie schön – hallo junger Freund! Wir möchten, dass sich Kinder bei uns wie VIPs fühlen, und deshalb bekommen sie von uns bei jedem Aufenthalt einen erfrischenden Mocktail spendiert.",
-          "unlocked": true
-        },
-        {
-          "name": "Später Check-out, wenn verfügbar",
-          "description": "Wir wissen, dass ein später Check-out manchmal eine große Erleichterung sein kann. Und an diesem Punkt unserer Freundschaft gibt es keinen Grund mehr, sich aus dem Bett zu quälen: Wir kommen Ihnen gerne entgegen. Checken Sie kostenlos 1 Stunde später aus und schlafen Sie einfach etwas länger.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantgutschein",
-          "description": "Wir schenken Ihnen einen zusätzlichen Restaurantgutschein über 10 € für jede Übernachtung, mit der Sie bei uns Freundschaftspunkte sammeln. Dafür bekommen Sie schon einen ganzen Berg von Croissants! Klingt das nicht verlockend?",
-          "unlocked": true,
-          "value": "10 €"
-        },
-        {
-          "name": "Freundschaftsbonus",
-          "description": "Hier haben wir etwas wirklich Großartiges für Sie: Jedes Mal, wenn Sie einen neuen Schub an Freundschaftspunkten erhalten, gibt es von uns 25 % dazu – ein ordentlicher Extra-Schub! Wenn Sie also anfangen, diese Punkte für Aufenthalte, Mahlzeiten und anderes zu sammeln, erhalten Sie im Handumdrehen eine kostenlose Übernachtung.",
-          "unlocked": true,
-          "value": "25%"
-        },
-        {
-          "name": "Früher Check-in, wenn verfügbar",
-          "description": "Sie treffen schon früher bei uns ein? Kein Problem! Checken Sie einfach kostenlos eine Stunde früher ein – so können Sie sich gleich ein wenig ausruhen und haben noch mehr von Ihrem Aufenthalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Kostenlose Upgrades wenn verfügbar",
-          "description": "Um auf den Punkt zu kommen – wir setzen noch einen drauf. Auf dieser Stufe unserer Freundschaft bieten wir Ihnen, wann immer es möglich ist, ein Zimmer-Upgrade an – so wird Ihr Aufenthalt noch komfortabler. Wenn das nicht großartig klingt …",
-          "unlocked": true
-        },
-        {
-          "name": "Frühstück für zwei zum Preis von einem",
-          "description": "Wenn das kein delikater Deal ist: Egal, ob Sie bei uns übernachten oder nicht, schnappen Sie sich einen Frühstückspartner, denn jetzt können Sie zu zweit zum Preis von einem bei uns essen! Informieren Sie sich einfach vorher über alle Details und genießen Sie ein gemütliches Frühstück zu zweit.",
-          "unlocked": true
-        },
-        {
-          "name": "48-Stunden-Zimmergarantie",
-          "description": "Pssst! Diesen ganz besonderen Leckerbissen bekommen bei uns nur die Wenigsten! Also aufgepasst: Selbst wenn wir völlig ausgebucht sind, erhalten Sie bei uns garantiert ein Zimmer, wenn Sie 48 Stunden im Voraus buchen. Ist das nicht einfach unglaublich?",
-          "unlocked": false
-        },
-        {
-          "name": "Ein kostenloses Frühstück – jederzeit",
-          "description": "Lust auf einen leckeren Start in den Tag? Dann schauen Sie doch einfach bei uns vorbei! Denn jetzt können Sie Ihren Tag mit einem kostenlosen Frühstück beginnen – und zwar ganz unabhängig davon, ob Sie bei uns übernachten oder nicht.",
-          "unlocked": false
-        },
-        {
-          "name": "Ein exklusives Geschenk pro Jahr",
-          "description": "Als Best Friend haben Sie natürlich eine königliche Behandlung verdient – deshalb haben wir einmal im Jahr ein exklusives und ziemlich großartiges Geschenk für Sie. Neugierig? Tja, das bleibt leider eine Überraschung. Es wird noch nichts verraten!",
-          "unlocked": false
-        },
-        {
-          "name": "Ein Geschenk für Kinder",
-          "description": "An diesem Punkt unserer Freundschaft betrachten wir natürlich auch Ihr Kind als Freund – was bedeutet, dass es bei jeder Übernachtung ein ganz spezielles Geschenk von uns erhält. Und warum? Weil Kinder einfach cool sind! Sie haben eine VIP-Behandlung verdient.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 6,
-      "name": "True Friend",
-      "requirement": "250 000 Punkte",
-      "description": "Es spielt keine Rolle, ob Haupt- oder Nebensaison: Sie sind immer für uns da. Genießen Sie noch mehr individuelle Vorteile – genau nach Ihrem Geschmack.",
-      "icon": "/_static/icons/loyaltylevels/true-friend.svg",
-      "benefits": [
-        {
-          "name": "Freundschaftspreise",
-          "description": "Als unser Freund erhalten Sie immer das beste Angebot: an jedem Tag und an jedem Ort. Und dafür ist weder ein Handschlag noch ein Buchungscode erforderlich – stürzen Sie sich einfach ins Buchungserlebnis und überzeugen Sie sich selbst.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt auf Speisen",
-          "description": "Was gibt es Schöneres als einen Preisnachlass? Als Freund erhalten Sie an Wochenenden und ausgewählten Feiertagen 10-15% Rabatt auf die Speisen in unseren Restaurants und Hotelshops – und zwar unabhängig davon, ob Sie bei uns übernachten oder nicht. Also kommen Sie vorbei und tun Sie sich etwas Gutes! Zum Beispiel mit unserem zusätzlichen Zimmerservice.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Kostenloser Kinder-Mocktail während des Aufenthalts",
-          "description": "Oh, Sie haben ja die Kinder dabei! Wie schön – hallo junger Freund! Wir möchten, dass sich Kinder bei uns wie VIPs fühlen, und deshalb bekommen sie von uns bei jedem Aufenthalt einen erfrischenden Mocktail spendiert.",
-          "unlocked": true
-        },
-        {
-          "name": "Später Check-out, wenn verfügbar",
-          "description": "Wir wissen, dass ein später Check-out manchmal eine große Erleichterung sein kann. Und an diesem Punkt unserer Freundschaft gibt es keinen Grund mehr, sich aus dem Bett zu quälen: Wir kommen Ihnen gerne entgegen. Checken Sie kostenlos 1 Stunde später aus und schlafen Sie einfach etwas länger.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantgutschein",
-          "description": "Zwischen uns läuft es inzwischen so gut, dass Sie für jede Nacht, in der Sie bei uns Freundschaftspunkte sammeln, zusätzlich noch einen Restaurantgutschein im Wert von 15 € erhalten. Perfekt für Ihr nächstes köstliches Frühstück oder Abendessen!",
-          "unlocked": true,
-          "value": "15 €"
-        },
-        {
-          "name": "Freundschaftsbonus",
-          "description": "Was für ein Spaß! Jedes Mal, wenn Sie einen neuen Schub an Freundschaftspunkten erhalten, gibt es von uns 25-50 % dazu – ein ordentlicher Extraschub! Je früher Sie also anfangen, Punkte für Ihre Aufenthalte, Mahlzeiten und vieles mehr zu sammeln, desto schneller erhalten Sie Ihre erste kostenlose Übernachtung.",
-          "unlocked": true,
-          "value": "50%"
-        },
-        {
-          "name": "Früher Check-in, wenn verfügbar",
-          "description": "Sie treffen schon früher bei uns ein? Kein Problem! Checken Sie einfach kostenlos eine Stunde früher ein – so können Sie sich gleich ein wenig ausruhen und haben noch mehr von Ihrem Aufenthalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Kostenlose Upgrades wenn verfügbar",
-          "description": "Um auf den Punkt zu kommen – wir setzen noch einen drauf. Auf dieser Stufe unserer Freundschaft bieten wir Ihnen, wann immer es möglich ist, ein Zimmer-Upgrade an – so wird Ihr Aufenthalt noch komfortabler. Wenn das nicht großartig klingt …",
-          "unlocked": true
-        },
-        {
-          "name": "Frühstück für zwei zum Preis von einem",
-          "description": "Wenn das kein delikater Deal ist: Egal, ob Sie bei uns übernachten oder nicht, schnappen Sie sich einen Frühstückspartner, denn jetzt können Sie zu zweit zum Preis von einem bei uns essen! Informieren Sie sich einfach vorher über alle Details und genießen Sie ein gemütliches Frühstück zu zweit.",
-          "unlocked": false
-        },
-        {
-          "name": "48-Stunden-Zimmergarantie",
-          "description": "Pssst! Diesen ganz besonderen Leckerbissen bekommen bei uns nur die Wenigsten! Also aufgepasst: Selbst wenn wir völlig ausgebucht sind, erhalten Sie bei uns garantiert ein Zimmer, wenn Sie 48 Stunden im Voraus buchen. Ist das nicht einfach unglaublich?",
-          "unlocked": true
-        },
-        {
-          "name": "Ein kostenloses Frühstück – jederzeit",
-          "description": "Lust auf einen leckeren Start in den Tag? Dann schauen Sie doch einfach bei uns vorbei! Denn jetzt können Sie Ihren Tag mit einem kostenlosen Frühstück beginnen – und zwar ganz unabhängig davon, ob Sie bei uns übernachten oder nicht.",
-          "unlocked": true
-        },
-        {
-          "name": "Ein exklusives Geschenk pro Jahr",
-          "description": "Als Best Friend haben Sie natürlich eine königliche Behandlung verdient – deshalb haben wir einmal im Jahr ein exklusives und ziemlich großartiges Geschenk für Sie. Neugierig? Tja, das bleibt leider eine Überraschung. Es wird noch nichts verraten!",
-          "unlocked": false
-        },
-        {
-          "name": "Ein Geschenk für Kinder",
-          "description": "An diesem Punkt unserer Freundschaft betrachten wir natürlich auch Ihr Kind als Freund – was bedeutet, dass es bei jeder Übernachtung ein ganz spezielles Geschenk von uns erhält. Und warum? Weil Kinder einfach cool sind! Sie haben eine VIP-Behandlung verdient.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 7,
-      "name": "Best Friend",
-      "requirement": "400 000 Punkte oder 100 Nächte",
-      "description": "Für eine Freundschaft wie diese gibt es im Grunde keine passenden Worte, aber wir versuchen es trotzdem: Denn es könnte gar nichts Besseres geben, wenn es um sehr, sehr exklusive Erlebnisse geht!",
-      "icon": "/_static/icons/loyaltylevels/best-friend.svg",
-      "benefits": [
-        {
-          "name": "Freundschaftspreise",
-          "description": "Als unser Freund erhalten Sie immer das beste Angebot: an jedem Tag und an jedem Ort. Und dafür ist weder ein Handschlag noch ein Buchungscode erforderlich – stürzen Sie sich einfach ins Buchungserlebnis und überzeugen Sie sich selbst.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt auf Speisen",
-          "description": "Was gibt es Schöneres als einen Preisnachlass? Als Freund erhalten Sie an Wochenenden und ausgewählten Feiertagen 10-15% Rabatt auf die Speisen in unseren Restaurants und Hotelshops – und zwar unabhängig davon, ob Sie bei uns übernachten oder nicht. Also kommen Sie vorbei und tun Sie sich etwas Gutes! Zum Beispiel mit unserem zusätzlichen Zimmerservice.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Kostenloser Kinder-Mocktail während des Aufenthalts",
-          "description": "Oh, Sie haben ja die Kinder dabei! Wie schön – hallo junger Freund! Wir möchten, dass sich Kinder bei uns wie VIPs fühlen, und deshalb bekommen sie von uns bei jedem Aufenthalt einen erfrischenden Mocktail spendiert.",
-          "unlocked": true
-        },
-        {
-          "name": "Später Check-out, wenn verfügbar",
-          "description": "Wir wissen, dass ein später Check-out manchmal eine große Erleichterung sein kann. Und an diesem Punkt unserer Freundschaft gibt es keinen Grund mehr, sich aus dem Bett zu quälen: Wir kommen Ihnen gerne entgegen. Checken Sie kostenlos 1 Stunde später aus und schlafen Sie einfach etwas länger.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantgutschein",
-          "description": "Für jede Nacht, in der Sie bei uns Freundschaftspunkte sammeln, erhalten Sie einen Restaurantgutschein in Höhe von 20 €. Stellen Sie sich vor, wie viele Croissants Sie dafür essen könnten! Wenn das nicht verlockend ist?",
-          "unlocked": true,
-          "value": "20 €"
-        },
-        {
-          "name": "Freundschaftsbonus",
-          "description": "Was für ein Spaß! Jedes Mal, wenn Sie einen neuen Schub an Freundschaftspunkten erhalten, gibt es von uns 25-50 % dazu – ein ordentlicher Extraschub! Je früher Sie also anfangen, Punkte für Ihre Aufenthalte, Mahlzeiten und vieles mehr zu sammeln, desto schneller erhalten Sie Ihre erste kostenlose Übernachtung.",
-          "unlocked": true,
-          "value": "50%"
-        },
-        {
-          "name": "Früher Check-in, wenn verfügbar",
-          "description": "Sie treffen schon früher bei uns ein? Kein Problem! Checken Sie einfach kostenlos eine Stunde früher ein – so können Sie sich gleich ein wenig ausruhen und haben noch mehr von Ihrem Aufenthalt.",
-          "unlocked": true
-        },
-        {
-          "name": "Kostenlose Upgrades wenn verfügbar",
-          "description": "Um auf den Punkt zu kommen – wir setzen noch einen drauf. Auf dieser Stufe unserer Freundschaft bieten wir Ihnen, wann immer es möglich ist, ein Zimmer-Upgrade an – so wird Ihr Aufenthalt noch komfortabler. Wenn das nicht großartig klingt …",
-          "unlocked": true
-        },
-        {
-          "name": "Frühstück für zwei zum Preis von einem",
-          "description": "Wenn das kein delikater Deal ist: Egal, ob Sie bei uns übernachten oder nicht, schnappen Sie sich einen Frühstückspartner, denn jetzt können Sie zu zweit zum Preis von einem bei uns essen! Informieren Sie sich einfach vorher über alle Details und genießen Sie ein gemütliches Frühstück zu zweit.",
-          "unlocked": false
-        },
-        {
-          "name": "48-Stunden-Zimmergarantie",
-          "description": "Pssst! Diesen ganz besonderen Leckerbissen bekommen bei uns nur die Wenigsten! Also aufgepasst: Selbst wenn wir völlig ausgebucht sind, erhalten Sie bei uns garantiert ein Zimmer, wenn Sie 48 Stunden im Voraus buchen. Ist das nicht einfach unglaublich?",
-          "unlocked": true
-        },
-        {
-          "name": "Ein kostenloses Frühstück – jederzeit",
-          "description": "Lust auf einen leckeren Start in den Tag? Dann schauen Sie doch einfach bei uns vorbei! Denn jetzt können Sie Ihren Tag mit einem kostenlosen Frühstück beginnen – und zwar ganz unabhängig davon, ob Sie bei uns übernachten oder nicht.",
-          "unlocked": true
-        },
-        {
-          "name": "Ein exklusives Geschenk pro Jahr",
-          "description": "Als Best Friend haben Sie natürlich eine königliche Behandlung verdient – deshalb haben wir einmal im Jahr ein exklusives und ziemlich großartiges Geschenk für Sie. Neugierig? Tja, das bleibt leider eine Überraschung. Es wird noch nichts verraten!",
-          "unlocked": true
-        },
-        {
-          "name": "Ein Geschenk für Kinder",
-          "description": "An diesem Punkt unserer Freundschaft betrachten wir natürlich auch Ihr Kind als Freund – was bedeutet, dass es bei jeder Übernachtung ein ganz spezielles Geschenk von uns erhält. Und warum? Weil Kinder einfach cool sind! Sie haben eine VIP-Behandlung verdient.",
-          "unlocked": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/EN.json b/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/EN.json
deleted file mode 100644
index b791a6e60..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/EN.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
-  "levels": [
-    {
-      "level": 1,
-      "name": "New Friend",
-      "requirement": "0p",
-      "description": "This is the start of something beautiful: as a New Friend, get ready for a journey of delightful Scandic discoveries.",
-      "icon": "/_static/icons/loyaltylevels/new-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendly rates",
-          "description": "Being our friend means you’re always scoring the best deal: any day, any place. No secret handshake or booking code needed – just dive into the booking and see for yourself.",
-          "unlocked": true
-        },
-        {
-          "name": "Discount on food",
-          "description": "Yumm! Enjoy a savory 10% or more off in our restaurant and hotel shop on weekends. This offer stands whether you're our guest for the night or just dropping by for a bite. So, go ahead, treat yourself and order that extra room service.",
-          "unlocked": true,
-          "value": "10%"
-        },
-        {
-          "name": "Free kids mocktail during stay",
-          "description": "Got the kiddos with you? That’s amazing – hello there, buddy! We wanna make sure that kids feel like the VIPs they really are, so every stay they get a refreshing mocktail on us.",
-          "unlocked": true
-        },
-        {
-          "name": "Late checkout when available",
-          "description": "We get it – late checkout can be a total trip-saver at times. At this point in our friendship, there’s no need to rush out of bed: we’ve got you covered. Check out 1 hour later at no cost and get those last, extra refreshing minutes of sleep.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurant voucher",
-          "description": "Yeah, that’s right: for each friendship point-boosting night, you get a voucher to redeem when you dine or drink at our restaurants and bars.",
-          "unlocked": false
-        },
-        {
-          "name": "Friendship point boost",
-          "description": "Now here’s something pretty sweet: every time you get a boost of friendship points, you get 25% or 50% extra – a boost! So you know, start racking up those points on stays, meals and more and you’ll get a free night in no time.",
-          "unlocked": false
-        },
-        {
-          "name": "Early check-in when available",
-          "description": "Wanna get a head start on your stay? No problem, no problem. Check in 1 hour earlier at no cost and take the highway to relaxation and bliss.",
-          "unlocked": false
-        },
-        {
-          "name": "Free upgrades when available",
-          "description": "Let's cut to the chase – we’re taking things up a notch. At this level in our friendship, we'll upgrade your room whenever possible for an even comfier stay. Sounds good, right?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 breakfast",
-          "description": "Now, this is a delicious deal: regardless if you’re staying with us or not, go grab a breakfast buddy because you're eating two for the price of one! Just make sure to check the details first so everything is in place for your yummy get-together.",
-          "unlocked": false
-        },
-        {
-          "name": "48hr room guarantee",
-          "description": "Hush – this one's a special treat just for a few of you! So listen up: even if we're fully booked, you're guaranteed a room as long as you book 48 hours in advance. Pretty incredible!",
-          "unlocked": false
-        },
-        {
-          "name": "Free breakfast – always",
-          "description": "Care for a tasty morning treat? Come on over! You now get to kickstart your day with free breakfast – and guess what: that goes regardless if you’re staying with us or not.",
-          "unlocked": false
-        },
-        {
-          "name": "Yearly awesome gift",
-          "description": "As our Best Friend, you totally deserve princess treatment – so we’ve got an exclusive, annual and pretty awesome gift all lined up. What it is? Well, that’s a surprise. No peeking!",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "At this friendship level, your kid is our friend, too – and that means a special kid’s boost gift when you stay with us. Why? Because kids are cool! They totally deserve VIP treatment.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 2,
-      "name": "Good Friend",
-      "requirement": "5 000p",
-      "description": "You've been around a lot lately! And honestly, we feel like we're vibing - one enjoyable stay at a time.",
-      "icon": "/_static/icons/loyaltylevels/good-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendly rates",
-          "description": "Being our friend means you’re always scoring the best deal: any day, any place. No secret handshake or booking code needed – just dive into the booking and see for yourself.",
-          "unlocked": true
-        },
-        {
-          "name": "Discount on food",
-          "description": "What’s more delicious than a discount? As our friend, you get 10-15% off on our restaurant and hotel shop food on weekends and selected holidays – and that goes for when you’re staying with us and when you’re not. So come on, spoil yourself! Get some room service.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Free kids mocktail during stay",
-          "description": "Got the kiddos with you? That’s amazing – hello there, buddy! We wanna make sure that kids feel like the VIPs they really are, so every stay they get a refreshing mocktail on us.",
-          "unlocked": true
-        },
-        {
-          "name": "Late checkout when available",
-          "description": "We get it – late checkout can be a total trip-saver at times. At this point in our friendship, there’s no need to rush out of bed: we’ve got you covered. Check out 1 hour later at no cost and get those last, extra refreshing minutes of sleep.",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurant voucher",
-          "description": "Yeah, that’s right: for each friendship point-boosting night, you get a voucher to redeem when you dine or drink at our restaurants and bars.",
-          "unlocked": false
-        },
-        {
-          "name": "Friendship point boost",
-          "description": "Now here’s something pretty sweet: every time you get a boost of friendship points, you get 25% or 50% extra – a boost! So you know, start racking up those points on stays, meals and more and you’ll get a free night in no time.",
-          "unlocked": false
-        },
-        {
-          "name": "Early check-in when available",
-          "description": "Wanna get a head start on your stay? No problem, no problem. Check in 1 hour earlier at no cost and take the highway to relaxation and bliss.",
-          "unlocked": false
-        },
-        {
-          "name": "Free upgrades when available",
-          "description": "Let's cut to the chase – we’re taking things up a notch. At this level in our friendship, we'll upgrade your room whenever possible for an even comfier stay. Sounds good, right?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 breakfast",
-          "description": "Now, this is a delicious deal: regardless if you’re staying with us or not, go grab a breakfast buddy because you're eating two for the price of one! Just make sure to check the details first so everything is in place for your yummy get-together.",
-          "unlocked": false
-        },
-        {
-          "name": "48hr room guarantee",
-          "description": "Hush – this one's a special treat just for a few of you! So listen up: even if we're fully booked, you're guaranteed a room as long as you book 48 hours in advance. Pretty incredible!",
-          "unlocked": false
-        },
-        {
-          "name": "Free breakfast – always",
-          "description": "Care for a tasty morning treat? Come on over! You now get to kickstart your day with free breakfast – and guess what: that goes regardless if you’re staying with us or not.",
-          "unlocked": false
-        },
-        {
-          "name": "Yearly awesome gift",
-          "description": "As our Best Friend, you totally deserve princess treatment – so we’ve got an exclusive, annual and pretty awesome gift all lined up. What it is? Well, that’s a surprise. No peeking!",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "At this friendship level, your kid is our friend, too – and that means a special kid’s boost gift when you stay with us. Why? Because kids are cool! They totally deserve VIP treatment.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 3,
-      "name": "Close Friend",
-      "requirement": "10 000p",
-      "description": "It's serious now: we're really getting to know each other which makes your Scandic experiences a lot more personal.",
-      "icon": "/_static/icons/loyaltylevels/close-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendly rates",
-          "description": "Being our friend means you’re always scoring the best deal: any day, any place. No secret handshake or booking code needed – just dive into the booking and see for yourself.",
-          "unlocked": true
-        },
-        {
-          "name": "Discount on food",
-          "description": "What’s more delicious than a discount? As our friend, you get 10-15% off on our restaurant and hotel shop food on weekends and selected holidays – and that goes for when you’re staying with us and when you’re not. So come on, spoil yourself! Get some room service.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Free kids mocktail during stay",
-          "description": "Got the kiddos with you? That’s amazing – hello there, buddy! We wanna make sure that kids feel like the VIPs they really are, so every stay they get a refreshing mocktail on us.",
-          "unlocked": true
-        },
-        {
-          "name": "Late checkout when available",
-          "description": "We get it – late checkout can be a total trip-saver at times. At this point in our friendship, there’s no need to rush out of bed: we’ve got you covered. Check out 1 hour later at no cost and get those last, extra refreshing minutes of sleep.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurant voucher",
-          "description": "Yeah, that’s right: for each friendship point-boosting night, you get a voucher to redeem when you dine or drink at our restaurants and bars.",
-          "unlocked": true,
-          "value": "€5"
-        },
-        {
-          "name": "Friendship point boost",
-          "description": "Now here’s something pretty sweet: every time you get a boost of friendship points, you get 25% or 50% extra – a boost! So you know, start racking up those points on stays, meals and more and you’ll get a free night in no time.",
-          "unlocked": false
-        },
-        {
-          "name": "Early check-in when available",
-          "description": "Wanna get a head start on your stay? No problem, no problem. Check in 1 hour earlier at no cost and take the highway to relaxation and bliss.",
-          "unlocked": false
-        },
-        {
-          "name": "Free upgrades when available",
-          "description": "Let's cut to the chase – we’re taking things up a notch. At this level in our friendship, we'll upgrade your room whenever possible for an even comfier stay. Sounds good, right?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 breakfast",
-          "description": "Now, this is a delicious deal: regardless if you’re staying with us or not, go grab a breakfast buddy because you're eating two for the price of one! Just make sure to check the details first so everything is in place for your yummy get-together.",
-          "unlocked": false
-        },
-        {
-          "name": "48hr room guarantee",
-          "description": "Hush – this one's a special treat just for a few of you! So listen up: even if we're fully booked, you're guaranteed a room as long as you book 48 hours in advance. Pretty incredible!",
-          "unlocked": false
-        },
-        {
-          "name": "Free breakfast – always",
-          "description": "Care for a tasty morning treat? Come on over! You now get to kickstart your day with free breakfast – and guess what: that goes regardless if you’re staying with us or not.",
-          "unlocked": false
-        },
-        {
-          "name": "Yearly awesome gift",
-          "description": "As our Best Friend, you totally deserve princess treatment – so we’ve got an exclusive, annual and pretty awesome gift all lined up. What it is? Well, that’s a surprise. No peeking!",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "At this friendship level, your kid is our friend, too – and that means a special kid’s boost gift when you stay with us. Why? Because kids are cool! They totally deserve VIP treatment.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 4,
-      "name": "Dear Friend",
-      "requirement": "25 000p",
-      "description": "Cheers to us! This seems to be going in the direction of friends for life - and that comes with access to a-whole-lotta-more of Scandic.",
-      "icon": "/_static/icons/loyaltylevels/dear-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendly rates",
-          "description": "Being our friend means you’re always scoring the best deal: any day, any place. No secret handshake or booking code needed – just dive into the booking and see for yourself.",
-          "unlocked": true
-        },
-        {
-          "name": "Discount on food",
-          "description": "What’s more delicious than a discount? As our friend, you get 10-15% off on our restaurant and hotel shop food on weekends and selected holidays – and that goes for when you’re staying with us and when you’re not. So come on, spoil yourself! Get some room service.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Free kids mocktail during stay",
-          "description": "Got the kiddos with you? That’s amazing – hello there, buddy! We wanna make sure that kids feel like the VIPs they really are, so every stay they get a refreshing mocktail on us.",
-          "unlocked": true
-        },
-        {
-          "name": "Late checkout when available",
-          "description": "We get it – late checkout can be a total trip-saver at times. At this point in our friendship, there’s no need to rush out of bed: we’ve got you covered. Check out 1 hour later at no cost and get those last, extra refreshing minutes of sleep.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurant voucher",
-          "description": "Yeah, that’s right: for each friendship point-boosting night, you get a voucher to redeem when you dine or drink at our restaurants and bars.",
-          "unlocked": true,
-          "value": "€7.5"
-        },
-        {
-          "name": "Friendship point boost",
-          "description": "Now here’s something pretty sweet: every time you get a boost of friendship points, you get 25% or 50% extra – a boost! So you know, start racking up those points on stays, meals and more and you’ll get a free night in no time.",
-          "unlocked": true,
-          "value": "+25%"
-        },
-        {
-          "name": "Early check-in when available",
-          "description": "Wanna get a head start on your stay? No problem, no problem. Check in 1 hour earlier at no cost and take the highway to relaxation and bliss.",
-          "unlocked": true
-        },
-        {
-          "name": "Free upgrades when available",
-          "description": "Let's cut to the chase – we’re taking things up a notch. At this level in our friendship, we'll upgrade your room whenever possible for an even comfier stay. Sounds good, right?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 breakfast",
-          "description": "Now, this is a delicious deal: regardless if you’re staying with us or not, go grab a breakfast buddy because you're eating two for the price of one! Just make sure to check the details first so everything is in place for your yummy get-together.",
-          "unlocked": false
-        },
-        {
-          "name": "48hr room guarantee",
-          "description": "Hush – this one's a special treat just for a few of you! So listen up: even if we're fully booked, you're guaranteed a room as long as you book 48 hours in advance. Pretty incredible!",
-          "unlocked": false
-        },
-        {
-          "name": "Free breakfast – always",
-          "description": "Care for a tasty morning treat? Come on over! You now get to kickstart your day with free breakfast – and guess what: that goes regardless if you’re staying with us or not.",
-          "unlocked": false
-        },
-        {
-          "name": "Yearly awesome gift",
-          "description": "As our Best Friend, you totally deserve princess treatment – so we’ve got an exclusive, annual and pretty awesome gift all lined up. What it is? Well, that’s a surprise. No peeking!",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "At this friendship level, your kid is our friend, too – and that means a special kid’s boost gift when you stay with us. Why? Because kids are cool! They totally deserve VIP treatment.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 5,
-      "name": "Loyal Friend",
-      "requirement": "100 000p",
-      "description": "You've stuck with us through stays, after works and gym sessions - so we'll stick with you through some of our very best rewards.",
-      "icon": "/_static/icons/loyaltylevels/loyal-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendly rates",
-          "description": "Being our friend means you’re always scoring the best deal: any day, any place. No secret handshake or booking code needed – just dive into the booking and see for yourself.",
-          "unlocked": true
-        },
-        {
-          "name": "Discount on food",
-          "description": "What’s more delicious than a discount? As our friend, you get 10-15% off on our restaurant and hotel shop food on weekends and selected holidays – and that goes for when you’re staying with us and when you’re not. So come on, spoil yourself! Get some room service.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Free kids mocktail during stay",
-          "description": "Got the kiddos with you? That’s amazing – hello there, buddy! We wanna make sure that kids feel like the VIPs they really are, so every stay they get a refreshing mocktail on us.",
-          "unlocked": true
-        },
-        {
-          "name": "Late checkout when available",
-          "description": "We get it – late checkout can be a total trip-saver at times. At this point in our friendship, there’s no need to rush out of bed: we’ve got you covered. Check out 1 hour later at no cost and get those last, extra refreshing minutes of sleep.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurant voucher",
-          "description": "Yeah, that’s right: for each friendship point-boosting night, you get a voucher to redeem when you dine or drink at our restaurants and bars.",
-          "unlocked": true,
-          "value": "€10"
-        },
-        {
-          "name": "Friendship point boost",
-          "description": "Now here’s something pretty sweet: every time you get a boost of friendship points, you get 25% or 50% extra – a boost! So you know, start racking up those points on stays, meals and more and you’ll get a free night in no time.",
-          "unlocked": true,
-          "value": "+25%"
-        },
-        {
-          "name": "Early check-in when available",
-          "description": "Wanna get a head start on your stay? No problem, no problem. Check in 1 hour earlier at no cost and take the highway to relaxation and bliss.",
-          "unlocked": true
-        },
-        {
-          "name": "Free upgrades when available",
-          "description": "Let's cut to the chase – we’re taking things up a notch. At this level in our friendship, we'll upgrade your room whenever possible for an even comfier stay. Sounds good, right?",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 breakfast",
-          "description": "Now, this is a delicious deal: regardless if you’re staying with us or not, go grab a breakfast buddy because you're eating two for the price of one! Just make sure to check the details first so everything is in place for your yummy get-together.",
-          "unlocked": true
-        },
-        {
-          "name": "48hr room guarantee",
-          "description": "Hush – this one's a special treat just for a few of you! So listen up: even if we're fully booked, you're guaranteed a room as long as you book 48 hours in advance. Pretty incredible!",
-          "unlocked": false
-        },
-        {
-          "name": "Free breakfast – always",
-          "description": "Care for a tasty morning treat? Come on over! You now get to kickstart your day with free breakfast – and guess what: that goes regardless if you’re staying with us or not.",
-          "unlocked": false
-        },
-        {
-          "name": "Yearly awesome gift",
-          "description": "As our Best Friend, you totally deserve princess treatment – so we’ve got an exclusive, annual and pretty awesome gift all lined up. What it is? Well, that’s a surprise. No peeking!",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "At this friendship level, your kid is our friend, too – and that means a special kid’s boost gift when you stay with us. Why? Because kids are cool! They totally deserve VIP treatment.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 6,
-      "name": "True Friend",
-      "requirement": "250 000p",
-      "description": "It doesn't matter if it's peak or off season, you're always there for us. Enjoy even more tailored perks - just the way you like them.",
-      "icon": "/_static/icons/loyaltylevels/true-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendly rates",
-          "description": "Being our friend means you’re always scoring the best deal: any day, any place. No secret handshake or booking code needed – just dive into the booking and see for yourself.",
-          "unlocked": true
-        },
-        {
-          "name": "Discount on food",
-          "description": "What’s more delicious than a discount? As our friend, you get 10-15% off on our restaurant and hotel shop food on weekends and selected holidays – and that goes for when you’re staying with us and when you’re not. So come on, spoil yourself! Get some room service.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Free kids mocktail during stay",
-          "description": "Got the kiddos with you? That’s amazing – hello there, buddy! We wanna make sure that kids feel like the VIPs they really are, so every stay they get a refreshing mocktail on us.",
-          "unlocked": true
-        },
-        {
-          "name": "Late checkout when available",
-          "description": "We get it – late checkout can be a total trip-saver at times. At this point in our friendship, there’s no need to rush out of bed: we’ve got you covered. Check out 1 hour later at no cost and get those last, extra refreshing minutes of sleep.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurant voucher",
-          "description": "Yeah, that’s right: for each friendship point-boosting night, you get a voucher to redeem when you dine or drink at our restaurants and bars.",
-          "unlocked": true,
-          "value": "€15"
-        },
-        {
-          "name": "Friendship point boost",
-          "description": "Now here’s something pretty sweet: every time you get a boost of friendship points, you get 25% or 50% extra – a boost! So you know, start racking up those points on stays, meals and more and you’ll get a free night in no time.",
-          "unlocked": true,
-          "value": "+50%"
-        },
-        {
-          "name": "Early check-in when available",
-          "description": "Wanna get a head start on your stay? No problem, no problem. Check in 1 hour earlier at no cost and take the highway to relaxation and bliss.",
-          "unlocked": true
-        },
-        {
-          "name": "Free upgrades when available",
-          "description": "Let's cut to the chase – we’re taking things up a notch. At this level in our friendship, we'll upgrade your room whenever possible for an even comfier stay. Sounds good, right?",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 breakfast",
-          "description": "Now, this is a delicious deal: regardless if you’re staying with us or not, go grab a breakfast buddy because you're eating two for the price of one! Just make sure to check the details first so everything is in place for your yummy get-together.",
-          "unlocked": false
-        },
-        {
-          "name": "48hr room guarantee",
-          "description": "Hush – this one's a special treat just for a few of you! So listen up: even if we're fully booked, you're guaranteed a room as long as you book 48 hours in advance. Pretty incredible!",
-          "unlocked": true
-        },
-        {
-          "name": "Free breakfast – always",
-          "description": "Care for a tasty morning treat? Come on over! You now get to kickstart your day with free breakfast – and guess what: that goes regardless if you’re staying with us or not.",
-          "unlocked": true
-        },
-        {
-          "name": "Yearly awesome gift",
-          "description": "As our Best Friend, you totally deserve princess treatment – so we’ve got an exclusive, annual and pretty awesome gift all lined up. What it is? Well, that’s a surprise. No peeking!",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "At this friendship level, your kid is our friend, too – and that means a special kid’s boost gift when you stay with us. Why? Because kids are cool! They totally deserve VIP treatment.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 7,
-      "name": "Best Friend",
-      "requirement": "400 000p or 100 nights",
-      "description": "There are no words for a bond like this, but here's a few anyway: It simply doesn't get any better when it comes to very, very exclusive experiences!",
-      "icon": "/_static/icons/loyaltylevels/best-friend.svg",
-      "benefits": [
-        {
-          "name": "Friendly rates",
-          "description": "Being our friend means you’re always scoring the best deal: any day, any place. No secret handshake or booking code needed – just dive into the booking and see for yourself.",
-          "unlocked": true
-        },
-        {
-          "name": "Discount on food",
-          "description": "What’s more delicious than a discount? As our friend, you get 10-15% off on our restaurant and hotel shop food on weekends and selected holidays – and that goes for when you’re staying with us and when you’re not. So come on, spoil yourself! Get some room service.",
-          "unlocked": true,
-          "value": "15%"
-        },
-        {
-          "name": "Free kids mocktail during stay",
-          "description": "Got the kiddos with you? That’s amazing – hello there, buddy! We wanna make sure that kids feel like the VIPs they really are, so every stay they get a refreshing mocktail on us.",
-          "unlocked": true
-        },
-        {
-          "name": "Late checkout when available",
-          "description": "We get it – late checkout can be a total trip-saver at times. At this point in our friendship, there’s no need to rush out of bed: we’ve got you covered. Check out 1 hour later at no cost and get those last, extra refreshing minutes of sleep.",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurant voucher",
-          "description": "Yeah, that’s right: for each friendship point-boosting night, you get a voucher to redeem when you dine or drink at our restaurants and bars.",
-          "unlocked": true,
-          "value": "€20"
-        },
-        {
-          "name": "Friendship point boost",
-          "description": "Now here’s something pretty sweet: every time you get a boost of friendship points, you get 25% or 50% extra – a boost! So you know, start racking up those points on stays, meals and more and you’ll get a free night in no time.",
-          "unlocked": true,
-          "value": "+50%"
-        },
-        {
-          "name": "Early check-in when available",
-          "description": "Wanna get a head start on your stay? No problem, no problem. Check in 1 hour earlier at no cost and take the highway to relaxation and bliss.",
-          "unlocked": true
-        },
-        {
-          "name": "Free upgrades when available",
-          "description": "Let's cut to the chase – we’re taking things up a notch. At this level in our friendship, we'll upgrade your room whenever possible for an even comfier stay. Sounds good, right?",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 breakfast",
-          "description": "Now, this is a delicious deal: regardless if you’re staying with us or not, go grab a breakfast buddy because you're eating two for the price of one! Just make sure to check the details first so everything is in place for your yummy get-together.",
-          "unlocked": false
-        },
-        {
-          "name": "48hr room guarantee",
-          "description": "Hush – this one's a special treat just for a few of you! So listen up: even if we're fully booked, you're guaranteed a room as long as you book 48 hours in advance. Pretty incredible!",
-          "unlocked": true
-        },
-        {
-          "name": "Free breakfast – always",
-          "description": "Care for a tasty morning treat? Come on over! You now get to kickstart your day with free breakfast – and guess what: that goes regardless if you’re staying with us or not.",
-          "unlocked": true
-        },
-        {
-          "name": "Yearly awesome gift",
-          "description": "As our Best Friend, you totally deserve princess treatment – so we’ve got an exclusive, annual and pretty awesome gift all lined up. What it is? Well, that’s a surprise. No peeking!",
-          "unlocked": true
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "At this friendship level, your kid is our friend, too – and that means a special kid’s boost gift when you stay with us. Why? Because kids are cool! They totally deserve VIP treatment.",
-          "unlocked": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/FI.json b/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/FI.json
deleted file mode 100644
index d1aa3ee98..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/FI.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
-  "levels": [
-    {
-      "level": 1,
-      "name": "New Friend",
-      "requirement": "0 p",
-      "description": "Ystävänämme pääset nauttimaan kaikesta ihanasta, mitä Scandic tarjoaa.",
-      "icon": "/_static/icons/loyaltylevels/new-friend.svg",
-      "benefits": [
-        {
-          "name": "Ystävähinnat",
-          "description": "Ystävänämme saat aina parhaan hinnan.",
-          "unlocked": true
-        },
-        {
-          "name": "Alennus ruoasta",
-          "description": "Mikä herkullinen etu! Hyödynnä 10 %:n alennus hotelliemme ravintoloissa ja shopissa viikonloppuisin. Tarjous on voimassa niin majoittujille kuin hotellitunnelmaa hetkeksi etsiville. Hemmottele siis itseäsi ja löydä tie lähimpään Scandiciin.",
-          "unlocked": true,
-          "value": "10 %"
-        },
-        {
-          "name": "Mocktail lapsille maksutta",
-          "description": "Meillä lapset saavat raikkaan mocktailin majoittumisen yhteydessä.",
-          "unlocked": true
-        },
-        {
-          "name": "Myöhäinen uloskirjautuminen",
-          "description": "Kirjaudu ulos tuntia myöhemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Ravintolakuponki",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Enemmän pisteitä",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Aikainen sisäänkirjautuminen",
-          "description": "Kirjaudu sisään tuntia aiemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Maksuton huoneluokan korotus",
-          "description": "Saat huoneluokan korotuksen ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen – kaksi yhden hinnalla",
-          "description": "Saat kaksi aamiaista yhden hinnalla, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "48 tunnin huonetakuu",
-          "description": "Lupaamme sinulle huoneen, vaikka hotelli olisi täyteen buukattu, kunhan varaat sen vähintään 48 tuntia ennen saapumistasi.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen aina maksutta",
-          "description": "Tarjoamme sinulle hotelliaamiaisen maksutta, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "Upea vuotuinen lahja",
-          "description": "Palkitsemme sinut vuosittain mahtavalla ja eksklusiivisella yllätyslahjalla.",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "Muistamme lapsia pienellä lahjalla majoituksen yhteydessä.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 2,
-      "name": "Good Friend",
-      "requirement": "5 000 p",
-      "description": "Tästä on hyvä jatkaa, yksi yöpyminen ja iloinen yllätys kerrallaan!",
-      "icon": "/_static/icons/loyaltylevels/good-friend.svg",
-      "benefits": [
-        {
-          "name": "Ystävähinnat",
-          "description": "Ystävänämme saat aina parhaan hinnan.",
-          "unlocked": true
-        },
-        {
-          "name": "Alennus ruoasta",
-          "description": "Ystävänämme saat 10-15 % alennusta ruoasta hotelliemme ravintoloissa ja shopissa viikonloppuisin ja valittuina loma-aikoina.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Mocktail lapsille maksutta",
-          "description": "Meillä lapset saavat raikkaan mocktailin majoittumisen yhteydessä.",
-          "unlocked": true
-        },
-        {
-          "name": "Myöhäinen uloskirjautuminen",
-          "description": "Kirjaudu ulos tuntia myöhemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Ravintolakuponki",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Enemmän pisteitä",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Aikainen sisäänkirjautuminen",
-          "description": "Kirjaudu sisään tuntia aiemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Maksuton huoneluokan korotus",
-          "description": "Saat huoneluokan korotuksen ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen – kaksi yhden hinnalla",
-          "description": "Saat kaksi aamiaista yhden hinnalla, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "48 tunnin huonetakuu",
-          "description": "Lupaamme sinulle huoneen, vaikka hotelli olisi täyteen buukattu, kunhan varaat sen vähintään 48 tuntia ennen saapumistasi.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen aina maksutta",
-          "description": "Tarjoamme sinulle hotelliaamiaisen maksutta, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "Upea vuotuinen lahja",
-          "description": "Palkitsemme sinut vuosittain mahtavalla ja eksklusiivisella yllätyslahjalla.",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "Muistamme lapsia pienellä lahjalla majoituksen yhteydessä.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 3,
-      "name": "Close Friend",
-      "requirement": "10 000 p",
-      "description": "Nyt etusi vain paranevat, sillä olemmehan jo enemmän kuin hyvän päivän tuttuja.",
-      "icon": "/_static/icons/loyaltylevels/close-friend.svg",
-      "benefits": [
-        {
-          "name": "Ystävähinnat",
-          "description": "Ystävänämme saat aina parhaan hinnan.",
-          "unlocked": true
-        },
-        {
-          "name": "Alennus ruoasta",
-          "description": "Ystävänämme saat 10-15 % alennusta ruoasta hotelliemme ravintoloissa ja shopissa viikonloppuisin ja valittuina loma-aikoina.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Mocktail lapsille maksutta",
-          "description": "Meillä lapset saavat raikkaan mocktailin majoittumisen yhteydessä.",
-          "unlocked": true
-        },
-        {
-          "name": "Myöhäinen uloskirjautuminen",
-          "description": "Kirjaudu ulos tuntia myöhemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Ravintolakuponki",
-          "description": "Tässä sinulle makoisa herkku: saat 5 € ravintolakupongin jokaisesta pisteisiin oikeuttavasta yöstä. <a href=''>Katso tästä lisätiedot</a>.",
-          "unlocked": true,
-          "value": "5 €"
-        },
-        {
-          "name": "Enemmän pisteitä",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Aikainen sisäänkirjautuminen",
-          "description": "Kirjaudu sisään tuntia aiemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Maksuton huoneluokan korotus",
-          "description": "Saat huoneluokan korotuksen ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen – kaksi yhden hinnalla",
-          "description": "Saat kaksi aamiaista yhden hinnalla, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "48 tunnin huonetakuu",
-          "description": "Lupaamme sinulle huoneen, vaikka hotelli olisi täyteen buukattu, kunhan varaat sen vähintään 48 tuntia ennen saapumistasi.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen aina maksutta",
-          "description": "Tarjoamme sinulle hotelliaamiaisen maksutta, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "Upea vuotuinen lahja",
-          "description": "Palkitsemme sinut vuosittain mahtavalla ja eksklusiivisella yllätyslahjalla.",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "Muistamme lapsia pienellä lahjalla majoituksen yhteydessä.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 4,
-      "name": "Dear Friend",
-      "requirement": "25 000 p",
-      "description": "Kippis syventyvälle ystävyydellemme. Nyt pääset nauttimaan liudasta uusia etuja.",
-      "icon": "/_static/icons/loyaltylevels/dear-friend.svg",
-      "benefits": [
-        {
-          "name": "Ystävähinnat",
-          "description": "Ystävänämme saat aina parhaan hinnan.",
-          "unlocked": true
-        },
-        {
-          "name": "Alennus ruoasta",
-          "description": "Ystävänämme saat 10-15 % alennusta ruoasta hotelliemme ravintoloissa ja shopissa viikonloppuisin ja valittuina loma-aikoina.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Mocktail lapsille maksutta",
-          "description": "Meillä lapset saavat raikkaan mocktailin majoittumisen yhteydessä.",
-          "unlocked": true
-        },
-        {
-          "name": "Myöhäinen uloskirjautuminen",
-          "description": "Kirjaudu ulos tuntia myöhemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Ravintolakuponki",
-          "description": "Ystävyytemme on entistä makeampaa! Saat 7,50 € ravintolakupongin jokaisesta pisteisiin oikeuttavasta yöstä. Huippua, vai mitä?",
-          "unlocked": true,
-          "value": "7,50 €"
-        },
-        {
-          "name": "Enemmän pisteitä",
-          "description": "Tässä lisäboostia sinulle: saat 25 % enemmän pisteitä joka kerta kun ansaitset pisteitä! Pistä tuulemaan ja haali pisteet yöpymisistä, aterioista ja muusta, niin pääset nauttimaan palkintoyöstä tuossa tuokiossa.",
-          "unlocked": true,
-          "value": "25 %"
-        },
-        {
-          "name": "Aikainen sisäänkirjautuminen",
-          "description": "Kirjaudu sisään tuntia aiemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Maksuton huoneluokan korotus",
-          "description": "Saat huoneluokan korotuksen ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen – kaksi yhden hinnalla",
-          "description": "Saat kaksi aamiaista yhden hinnalla, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "48 tunnin huonetakuu",
-          "description": "Lupaamme sinulle huoneen, vaikka hotelli olisi täyteen buukattu, kunhan varaat sen vähintään 48 tuntia ennen saapumistasi.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen aina maksutta",
-          "description": "Tarjoamme sinulle hotelliaamiaisen maksutta, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "Upea vuotuinen lahja",
-          "description": "Palkitsemme sinut vuosittain mahtavalla ja eksklusiivisella yllätyslahjalla.",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "Muistamme lapsia pienellä lahjalla majoituksen yhteydessä.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 5,
-      "name": "Loyal Friend",
-      "requirement": "100 000 p",
-      "description": "Haluamme panostaa ystävyyteemme myös jatkossa ja annammekin sinulle kasan uusia, ihania etuja.",
-      "icon": "/_static/icons/loyaltylevels/loyal-friend.svg",
-      "benefits": [
-        {
-          "name": "Ystävähinnat",
-          "description": "Ystävänämme saat aina parhaan hinnan.",
-          "unlocked": true
-        },
-        {
-          "name": "Alennus ruoasta",
-          "description": "Ystävänämme saat 10-15 % alennusta ruoasta hotelliemme ravintoloissa ja shopissa viikonloppuisin ja valittuina loma-aikoina.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Mocktail lapsille maksutta",
-          "description": "Meillä lapset saavat raikkaan mocktailin majoittumisen yhteydessä.",
-          "unlocked": true
-        },
-        {
-          "name": "Myöhäinen uloskirjautuminen",
-          "description": "Kirjaudu ulos tuntia myöhemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Ravintolakuponki",
-          "description": "Saat 10 € ravintolakupongin jokaisesta pisteisiin oikeuttavasta yöstä. Se tuo varmasti iloa seuraavaan herkutteluhetkeen.",
-          "unlocked": true,
-          "value": "10 €"
-        },
-        {
-          "name": "Enemmän pisteitä",
-          "description": "Tässä lisäboostia sinulle: saat 25 % enemmän pisteitä joka kerta kun ansaitset pisteitä! Pistä tuulemaan ja haali pisteet yöpymisistä, aterioista ja muusta, niin pääset nauttimaan palkintoyöstä tuossa tuokiossa.",
-          "unlocked": true,
-          "value": "25 %"
-        },
-        {
-          "name": "Aikainen sisäänkirjautuminen",
-          "description": "Kirjaudu sisään tuntia aiemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Maksuton huoneluokan korotus",
-          "description": "Saat huoneluokan korotuksen ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Aamiainen – kaksi yhden hinnalla",
-          "description": "Saat kaksi aamiaista yhden hinnalla, majoitut meillä tai et.",
-          "unlocked": true
-        },
-        {
-          "name": "48 tunnin huonetakuu",
-          "description": "Lupaamme sinulle huoneen, vaikka hotelli olisi täyteen buukattu, kunhan varaat sen vähintään 48 tuntia ennen saapumistasi.",
-          "unlocked": false
-        },
-        {
-          "name": "Aamiainen aina maksutta",
-          "description": "Tarjoamme sinulle hotelliaamiaisen maksutta, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "Upea vuotuinen lahja",
-          "description": "Palkitsemme sinut vuosittain mahtavalla ja eksklusiivisella yllätyslahjalla.",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "Muistamme lapsia pienellä lahjalla majoituksen yhteydessä.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 6,
-      "name": "True Friend",
-      "requirement": "250 000 p",
-      "description": "Tosiystävän tapaan haluamme palkita sinua entistä yksilöllisemmillä eduilla.",
-      "icon": "/_static/icons/loyaltylevels/true-friend.svg",
-      "benefits": [
-        {
-          "name": "Ystävähinnat",
-          "description": "Ystävänämme saat aina parhaan hinnan.",
-          "unlocked": true
-        },
-        {
-          "name": "Alennus ruoasta",
-          "description": "Ystävänämme saat 10-15 % alennusta ruoasta hotelliemme ravintoloissa ja shopissa viikonloppuisin ja valittuina loma-aikoina.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Mocktail lapsille maksutta",
-          "description": "Meillä lapset saavat raikkaan mocktailin majoittumisen yhteydessä.",
-          "unlocked": true
-        },
-        {
-          "name": "Myöhäinen uloskirjautuminen",
-          "description": "Kirjaudu ulos tuntia myöhemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Ravintolakuponki",
-          "description": "Ystävyytemme vain vahvistuu ja nyt saat 15 € ravintolakupongin jokaisesta pisteisiin oikeuttavasta yöstä. Kuinkahan paljon herkkuja sillä saisi?",
-          "unlocked": true,
-          "value": "15 €"
-        },
-        {
-          "name": "Enemmän pisteitä",
-          "description": "Saat 25 % tai 50 % enemmän pisteitä joka kerta kun ansaitset pisteitä!.",
-          "unlocked": true,
-          "value": "50 %"
-        },
-        {
-          "name": "Aikainen sisäänkirjautuminen",
-          "description": "Kirjaudu sisään tuntia aiemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Maksuton huoneluokan korotus",
-          "description": "Saat huoneluokan korotuksen ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Aamiainen – kaksi yhden hinnalla",
-          "description": "Saat kaksi aamiaista yhden hinnalla, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "48 tunnin huonetakuu",
-          "description": "Lupaamme sinulle huoneen, vaikka hotelli olisi täyteen buukattu, kunhan varaat sen vähintään 48 tuntia ennen saapumistasi.",
-          "unlocked": true
-        },
-        {
-          "name": "Aamiainen aina maksutta",
-          "description": "Tarjoamme sinulle hotelliaamiaisen maksutta, majoitut meillä tai et.",
-          "unlocked": true
-        },
-        {
-          "name": "Upea vuotuinen lahja",
-          "description": "Palkitsemme sinut vuosittain mahtavalla ja eksklusiivisella yllätyslahjalla.",
-          "unlocked": false
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "Muistamme lapsia pienellä lahjalla majoituksen yhteydessä.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 7,
-      "name": "Best Friend",
-      "requirement": "400 000 p tai 100 yötä",
-      "description": "Koska sanat eivät riitä kiittämään ystävyydestämme, pääset nyt käsiksi kaikkein eksklusiivisimpiin elämyksiin.",
-      "icon": "/_static/icons/loyaltylevels/best-friend.svg",
-      "benefits": [
-        {
-          "name": "Ystävähinnat",
-          "description": "Ystävänämme saat aina parhaan hinnan.",
-          "unlocked": true
-        },
-        {
-          "name": "Alennus ruoasta",
-          "description": "Ystävänämme saat 10-15 % alennusta ruoasta hotelliemme ravintoloissa ja shopissa viikonloppuisin ja valittuina loma-aikoina.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Mocktail lapsille maksutta",
-          "description": "Meillä lapset saavat raikkaan mocktailin majoittumisen yhteydessä.",
-          "unlocked": true
-        },
-        {
-          "name": "Myöhäinen uloskirjautuminen",
-          "description": "Kirjaudu ulos tuntia myöhemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Ravintolakuponki",
-          "description": "Ystävänämme saat ravintolakupongin jokaisesta pisteisiin oikeuttavasta yöstä.",
-          "unlocked": true,
-          "value": "20 €"
-        },
-        {
-          "name": "Enemmän pisteitä",
-          "description": "Saat 25 % tai 50 % enemmän pisteitä joka kerta kun ansaitset pisteitä!.",
-          "unlocked": true,
-          "value": "50 %"
-        },
-        {
-          "name": "Aikainen sisäänkirjautuminen",
-          "description": "Kirjaudu sisään tuntia aiemmin ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Maksuton huoneluokan korotus",
-          "description": "Saat huoneluokan korotuksen ilman lisämaksua. Saatavilla varaustilanteen mukaan.",
-          "unlocked": true
-        },
-        {
-          "name": "Aamiainen – kaksi yhden hinnalla",
-          "description": "Saat kaksi aamiaista yhden hinnalla, majoitut meillä tai et.",
-          "unlocked": false
-        },
-        {
-          "name": "48 tunnin huonetakuu",
-          "description": "Lupaamme sinulle huoneen, vaikka hotelli olisi täyteen buukattu, kunhan varaat sen vähintään 48 tuntia ennen saapumistasi.",
-          "unlocked": true
-        },
-        {
-          "name": "Aamiainen aina maksutta",
-          "description": "Tarjoamme sinulle hotelliaamiaisen maksutta, majoitut meillä tai et.",
-          "unlocked": true
-        },
-        {
-          "name": "Upea vuotuinen lahja",
-          "description": "Palkitsemme sinut vuosittain mahtavalla ja eksklusiivisella yllätyslahjalla.",
-          "unlocked": true
-        },
-        {
-          "name": "Kid’s boost",
-          "description": "Muistamme lapsia pienellä lahjalla majoituksen yhteydessä.",
-          "unlocked": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/NO.json b/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/NO.json
deleted file mode 100644
index fbe79e466..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/data/NO.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
-  "levels": [
-    {
-      "level": 1,
-      "name": "New Friend",
-      "requirement": "0p",
-      "description": "Dette er starten på noe vakkert: Som en New Friend, gjør deg klar for en reise fylt av fine Scandic-opplevelser.",
-      "icon": "/_static/icons/loyaltylevels/new-friend.svg",
-      "benefits": [
-        {
-          "name": "Vennlige priser",
-          "description": "Å være vennen vår betyr at du alltid får det beste tilbudet: Når som helst, hvor som helst. Det er ikke nødvendig med noe hemmelig håndtrykk eller bestillingskode – bare dykk inn i bestillingene og se selv.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Nam! Nyt en smakfull 10 % rabatt i restauranten og shoppen vår i helgene. Dette tilbudet gjelder enten du er gjesten vår over natten eller bare kommer innom for en matbit. Så, sett i gang, unn deg selv noe godt.",
-          "unlocked": true,
-          "value": "10 %"
-        },
-        {
-          "name": "Gratis barne-mocktail under oppholdet",
-          "description": "Har du barna med deg? Det er fantastisk – hei der, kompis! Vi vil sørge for at ungene føler seg som de VIP-ene de faktisk er, og spanderer en forfriskende mocktail på dem ved hvert opphold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utsjekking når tilgjengelig",
-          "description": "Vi skjønner – sen utsjekkingen kan til tider være redningen for en reise. På dette punktet i vennskapet vårt, trenger du ikke skynde deg ut av sengen: Vi går god for deg, så sjekk ut én time senere kostnadsfritt, og få de siste, ekstra oppfriskende minuttene med søvn!",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurantkupong",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Friendsboost",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Tidlig innsjekk når tilgjengelig",
-          "description": "Vil du få et forsprang på oppholdet ditt? Det er ikke noe problem. Sjekk inn én time tidligere kostnadsfritt, og ta snarveien til avslapning og lykke.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis oppgraderinger (når tilgjengelig)",
-          "description": "La oss ikke gå som katten rundt grøten – vi tar ting opp et nivå. På dette nivået i vennskapet vårt vil vi oppgradere rommet ditt når det er mulig, for et enda mer komfortabelt opphold. Høres ikke det bra ut?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 frokost",
-          "description": "Dette er virkelig et deilig tilbud: Uavhengig om du bor hos oss eller ikke, finn deg en frokostkompis, og dere kan spise for prisen av én! Bare sørg for å sjekke detaljene først, slik at alt er på plass for deres smakfulle sammenkomst.",
-          "unlocked": false
-        },
-        {
-          "name": "Romgaranti i 48 timer",
-          "description": "Hysj – dette er en spesiell godbit, kun for noen få av dere! Så merk deg: Selv om vi er fullbooket, er du garantert et rom så lenge du bestiller 48 timer på forhånd. Ganske utrolig!",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis frokost – alltid",
-          "description": "Har du lyst på en smakfull morgengodbit? Bare kom innom! Nå kan du sparke i gang dagen din med gratis frokost – og gjett hva: Det gjelder uavhengig om du bor hos oss eller ikke.",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig fantastisk gave",
-          "description": "Som vår Best Friend fortjener du absolutt spesialbehandling, så vi har en eksklusiv, årlig, og ganske fantastisk gave klar til deg. Hva det er? Vel, det er en overraskelse. Ingen sniktitting!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost for barn",
-          "description": "På dette vennskapsnivået er barnet ditt også vår venn – og det betyr en spesiell boost-gave for barn når du bor hos oss. Hvorfor? Fordi barn er kule! De fortjener virkelig VIP-behandling.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 2,
-      "name": "Good Friend",
-      "requirement": "5 000p",
-      "description": "Du har vært her mye i det siste! Og ærlig talt føler vi at vi er på bølgelengde – ett behagelig opphold og én morsom overraskelse om gangen.",
-      "icon": "/_static/icons/loyaltylevels/good-friend.svg",
-      "benefits": [
-        {
-          "name": "Vennlige priser",
-          "description": "Å være vennen vår betyr at du alltid får det beste tilbudet: Når som helst, hvor som helst. Det er ikke nødvendig med noe hemmelig håndtrykk eller bestillingskode – bare dykk inn i bestillingene og se selv.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Hva er bedre enn rabatt? Som vår Friend får du 10-15 % rabatt på mat i vår restaurant og shop i helger og utvalgte ferier og helligdager. Det gjelder uansett om du bor hos oss eller ikke. Så kom igjen, skjem deg bort.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Gratis barne-mocktail under oppholdet",
-          "description": "Har du barna med deg? Det er fantastisk – hei der, kompis! Vi vil sørge for at ungene føler seg som de VIP-ene de faktisk er, og spanderer en forfriskende mocktail på dem ved hvert opphold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utsjekking når tilgjengelig",
-          "description": "Vi skjønner – sen utsjekkingen kan til tider være redningen for en reise. På dette punktet i vennskapet vårt, trenger du ikke skynde deg ut av sengen: Vi går god for deg, så sjekk ut én time senere kostnadsfritt, og få de siste, ekstra oppfriskende minuttene med søvn!",
-          "unlocked": false
-        },
-        {
-          "name": "Restaurantkupong",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Friendsboost",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Tidlig innsjekk når tilgjengelig",
-          "description": "Vil du få et forsprang på oppholdet ditt? Det er ikke noe problem. Sjekk inn én time tidligere kostnadsfritt, og ta snarveien til avslapning og lykke.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis oppgraderinger (når tilgjengelig)",
-          "description": "La oss ikke gå som katten rundt grøten – vi tar ting opp et nivå. På dette nivået i vennskapet vårt vil vi oppgradere rommet ditt når det er mulig, for et enda mer komfortabelt opphold. Høres ikke det bra ut?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 frokost",
-          "description": "Dette er virkelig et deilig tilbud: Uavhengig om du bor hos oss eller ikke, finn deg en frokostkompis, og dere kan spise for prisen av én! Bare sørg for å sjekke detaljene først, slik at alt er på plass for deres smakfulle sammenkomst.",
-          "unlocked": false
-        },
-        {
-          "name": "Romgaranti i 48 timer",
-          "description": "Hysj – dette er en spesiell godbit, kun for noen få av dere! Så merk deg: Selv om vi er fullbooket, er du garantert et rom så lenge du bestiller 48 timer på forhånd. Ganske utrolig!",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis frokost – alltid",
-          "description": "Har du lyst på en smakfull morgengodbit? Bare kom innom! Nå kan du sparke i gang dagen din med gratis frokost – og gjett hva: Det gjelder uavhengig om du bor hos oss eller ikke.",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig fantastisk gave",
-          "description": "Som vår Best Friend fortjener du absolutt spesialbehandling, så vi har en eksklusiv, årlig, og ganske fantastisk gave klar til deg. Hva det er? Vel, det er en overraskelse. Ingen sniktitting!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost for barn",
-          "description": "På dette vennskapsnivået er barnet ditt også vår venn – og det betyr en spesiell boost-gave for barn når du bor hos oss. Hvorfor? Fordi barn er kule! De fortjener virkelig VIP-behandling.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 3,
-      "name": "Close Friend",
-      "requirement": "10 000p",
-      "description": "Nå er det seriøst: Vi begynner virkelig å bli kjent med hverandre, noe som gjør Scandic-opplevelsen din mye mer personlig.",
-      "icon": "/_static/icons/loyaltylevels/close-friend.svg",
-      "benefits": [
-        {
-          "name": "Vennlige priser",
-          "description": "Å være vennen vår betyr at du alltid får det beste tilbudet: Når som helst, hvor som helst. Det er ikke nødvendig med noe hemmelig håndtrykk eller bestillingskode – bare dykk inn i bestillingene og se selv.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Hva er bedre enn en rabatt? Som vår venn får du 10-15 % rabatt på mat i restauranten og shoppen vår i helger og på utvalgte helligdager – og det gjelder både når du bor hos oss og når du ikke har det. Så kom igjen, skjem deg selv bort.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Gratis barne-mocktail under oppholdet",
-          "description": "Har du barna med deg? Det er fantastisk – hei der, kompis! Vi vil sørge for at ungene føler seg som de VIP-ene de faktisk er, og spanderer en forfriskende mocktail på dem ved hvert opphold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utsjekking når tilgjengelig",
-          "description": "Vi skjønner – sen utsjekkingen kan til tider være redningen for en reise. På dette punktet i vennskapet vårt, trenger du ikke skynde deg ut av sengen: Vi går god for deg, så sjekk ut én time senere kostnadsfritt, og få de siste, ekstra oppfriskende minuttene med søvn!",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantkupong",
-          "description": "Så, her er godbiten: For hver vennskapspoenggivende natt du bor hos oss, gir vi deg en restaurantkupong på 50 NOK.",
-          "unlocked": true,
-          "value": "50 NOK"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "",
-          "unlocked": false
-        },
-        {
-          "name": "Tidlig innsjekk når tilgjengelig",
-          "description": "Vil du få et forsprang på oppholdet ditt? Det er ikke noe problem. Sjekk inn én time tidligere kostnadsfritt, og ta snarveien til avslapning og lykke.",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis oppgraderinger (når tilgjengelig)",
-          "description": "La oss ikke gå som katten rundt grøten – vi tar ting opp et nivå. På dette nivået i vennskapet vårt vil vi oppgradere rommet ditt når det er mulig, for et enda mer komfortabelt opphold. Høres ikke det bra ut?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 frokost",
-          "description": "Dette er virkelig et deilig tilbud: Uavhengig om du bor hos oss eller ikke, finn deg en frokostkompis, og dere kan spise for prisen av én! Bare sørg for å sjekke detaljene først, slik at alt er på plass for deres smakfulle sammenkomst.",
-          "unlocked": false
-        },
-        {
-          "name": "Romgaranti i 48 timer",
-          "description": "Hysj – dette er en spesiell godbit, kun for noen få av dere! Så merk deg: Selv om vi er fullbooket, er du garantert et rom så lenge du bestiller 48 timer på forhånd. Ganske utrolig!",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis frokost – alltid",
-          "description": "Har du lyst på en smakfull morgengodbit? Bare kom innom! Nå kan du sparke i gang dagen din med gratis frokost – og gjett hva: Det gjelder uavhengig om du bor hos oss eller ikke.",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig fantastisk gave",
-          "description": "Som vår Best Friend fortjener du absolutt spesialbehandling, så vi har en eksklusiv, årlig, og ganske fantastisk gave klar til deg. Hva det er? Vel, det er en overraskelse. Ingen sniktitting!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost for barn",
-          "description": "På dette vennskapsnivået er barnet ditt også vår venn – og det betyr en spesiell boost-gave for barn når du bor hos oss. Hvorfor? Fordi barn er kule! De fortjener virkelig VIP-behandling.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 4,
-      "name": "Dear Friend",
-      "requirement": "25 000p",
-      "description": "Hurra for oss! Dette ser ut til å gå i retning av venner for livet – og det kommer med tilgang til mye mer av Scandic.",
-      "icon": "/_static/icons/loyaltylevels/dear-friend.svg",
-      "benefits": [
-        {
-          "name": "Vennlige priser",
-          "description": "Å være vennen vår betyr at du alltid får det beste tilbudet: Når som helst, hvor som helst. Det er ikke nødvendig med noe hemmelig håndtrykk eller bestillingskode – bare dykk inn i bestillingene og se selv.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Hva er bedre enn rabatt? Som vår Friend får du 10-15 % rabatt på mat i vår restaurant og shop i helger og utvalgte ferier og helligdager. Det gjelder uansett om du bor hos oss eller ikke. Så kom igjen, skjem deg bort.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Gratis barne-mocktail under oppholdet",
-          "description": "Har du barna med deg? Det er fantastisk – hei der, kompis! Vi vil sørge for at ungene føler seg som de VIP-ene de faktisk er, og spanderer en forfriskende mocktail på dem ved hvert opphold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utsjekking når tilgjengelig",
-          "description": "Vi skjønner – sen utsjekkingen kan til tider være redningen for en reise. På dette punktet i vennskapet vårt, trenger du ikke skynde deg ut av sengen: Vi går god for deg, så sjekk ut én time senere kostnadsfritt, og få de siste, ekstra oppfriskende minuttene med søvn!",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantkupong",
-          "description": "Vennskapet vårt ble nettopp enda bedre! Nyt en restaurantkupong på 75 NOK for hver poenggivende natt. Bra, ikke sant?",
-          "unlocked": true,
-          "value": "75 NOK"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Her har du noe veldig bra: Hver gang du øker antall vennskapspoeng, får du 25 % ekstra – ekstra på det ekstra! Så, begynn å samle poeng på opphold, måltider og mer, og du vil veldig snart få et gratis opphold.",
-          "unlocked": true,
-          "value": "25 %"
-        },
-        {
-          "name": "Tidlig innsjekk når tilgjengelig",
-          "description": "Vil du få et forsprang på oppholdet ditt? Det er ikke noe problem. Sjekk inn én time tidligere kostnadsfritt, og ta snarveien til avslapning og lykke.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis oppgraderinger (når tilgjengelig)",
-          "description": "La oss ikke gå som katten rundt grøten – vi tar ting opp et nivå. På dette nivået i vennskapet vårt vil vi oppgradere rommet ditt når det er mulig, for et enda mer komfortabelt opphold. Høres ikke det bra ut?",
-          "unlocked": false
-        },
-        {
-          "name": "2-for-1 frokost",
-          "description": "Dette er virkelig et deilig tilbud: Uavhengig om du bor hos oss eller ikke, finn deg en frokostkompis, og dere kan spise for prisen av én! Bare sørg for å sjekke detaljene først, slik at alt er på plass for deres smakfulle sammenkomst.",
-          "unlocked": false
-        },
-        {
-          "name": "Romgaranti i 48 timer",
-          "description": "Hysj – dette er en spesiell godbit, kun for noen få av dere! Så merk deg: Selv om vi er fullbooket, er du garantert et rom så lenge du bestiller 48 timer på forhånd. Ganske utrolig!",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis frokost – alltid",
-          "description": "Har du lyst på en smakfull morgengodbit? Bare kom innom! Nå kan du sparke i gang dagen din med gratis frokost – og gjett hva: Det gjelder uavhengig om du bor hos oss eller ikke.",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig fantastisk gave",
-          "description": "Som vår Best Friend fortjener du absolutt spesialbehandling, så vi har en eksklusiv, årlig, og ganske fantastisk gave klar til deg. Hva det er? Vel, det er en overraskelse. Ingen sniktitting!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost for barn",
-          "description": "På dette vennskapsnivået er barnet ditt også vår venn – og det betyr en spesiell boost-gave for barn når du bor hos oss. Hvorfor? Fordi barn er kule! De fortjener virkelig VIP-behandling.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 5,
-      "name": "Loyal Friend",
-      "requirement": "100 000p",
-      "description": "Du har vært lojal mot oss gjennom opphold, happy hours og treningsøkter – så vi er der for deg med noen av de aller beste fordelene våre.",
-      "icon": "/_static/icons/loyaltylevels/loyal-friend.svg",
-      "benefits": [
-        {
-          "name": "Vennlige priser",
-          "description": "Å være vennen vår betyr at du alltid får det beste tilbudet: Når som helst, hvor som helst. Det er ikke nødvendig med noe hemmelig håndtrykk eller bestillingskode – bare dykk inn i bestillingene og se selv.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Hva er bedre enn rabatt? Som vår Friend får du 10-15 % rabatt på mat i vår restaurant og shop i helger og utvalgte ferier og helligdager. Det gjelder uansett om du bor hos oss eller ikke. Så kom igjen, skjem deg bort.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Gratis barne-mocktail under oppholdet",
-          "description": "Har du barna med deg? Det er fantastisk – hei der, kompis! Vi vil sørge for at ungene føler seg som de VIP-ene de faktisk er, og spanderer en forfriskende mocktail på dem ved hvert opphold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utsjekking når tilgjengelig",
-          "description": "Vi skjønner – sen utsjekkingen kan til tider være redningen for en reise. På dette punktet i vennskapet vårt, trenger du ikke skynde deg ut av sengen: Vi går god for deg, så sjekk ut én time senere kostnadsfritt, og få de siste, ekstra oppfriskende minuttene med søvn!",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantkupong",
-          "description": "Vi gir deg en restaurantkupong på 100 NOK for hver vennskapspoenggivende natt du bor. Det kan gi deg et fjell av croissanter! Herlig, hva?",
-          "unlocked": true,
-          "value": "100 NOK"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Her har du noe veldig bra: Hver gang du øker antall vennskapspoeng, får du 25 % ekstra – ekstra på det ekstra! Så, begynn å samle poeng på opphold, måltider og mer, og du vil veldig snart få et gratis opphold.",
-          "unlocked": true,
-          "value": "25 %"
-        },
-        {
-          "name": "Tidlig innsjekk når tilgjengelig",
-          "description": "Vil du få et forsprang på oppholdet ditt? Det er ikke noe problem. Sjekk inn én time tidligere kostnadsfritt, og ta snarveien til avslapning og lykke.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis oppgraderinger (når tilgjengelig)",
-          "description": "La oss ikke gå som katten rundt grøten – vi tar ting opp et nivå. På dette nivået i vennskapet vårt vil vi oppgradere rommet ditt når det er mulig, for et enda mer komfortabelt opphold. Høres ikke det bra ut?",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 frokost",
-          "description": "Dette er virkelig et deilig tilbud: Uavhengig om du bor hos oss eller ikke, finn deg en frokostkompis, og dere kan spise for prisen av én! Bare sørg for å sjekke detaljene først, slik at alt er på plass for deres smakfulle sammenkomst.",
-          "unlocked": true
-        },
-        {
-          "name": "Romgaranti i 48 timer",
-          "description": "Hysj – dette er en spesiell godbit, kun for noen få av dere! Så merk deg: Selv om vi er fullbooket, er du garantert et rom så lenge du bestiller 48 timer på forhånd. Ganske utrolig!",
-          "unlocked": false
-        },
-        {
-          "name": "Gratis frokost – alltid",
-          "description": "Har du lyst på en smakfull morgengodbit? Bare kom innom! Nå kan du sparke i gang dagen din med gratis frokost – og gjett hva: Det gjelder uavhengig om du bor hos oss eller ikke.",
-          "unlocked": false
-        },
-        {
-          "name": "Årlig fantastisk gave",
-          "description": "Som vår Best Friend fortjener du absolutt spesialbehandling, så vi har en eksklusiv, årlig, og ganske fantastisk gave klar til deg. Hva det er? Vel, det er en overraskelse. Ingen sniktitting!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost for barn",
-          "description": "På dette vennskapsnivået er barnet ditt også vår venn – og det betyr en spesiell boost-gave for barn når du bor hos oss. Hvorfor? Fordi barn er kule! De fortjener virkelig VIP-behandling.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 6,
-      "name": "True Friend",
-      "requirement": "250 000p",
-      "description": "Det spiller ingen rolle om det er høysesong eller lavsesong, du er alltid der for oss. Nyt enda flere skreddersydde fordeler – akkurat slik du liker dem.",
-      "icon": "/_static/icons/loyaltylevels/true-friend.svg",
-      "benefits": [
-        {
-          "name": "Vennlige priser",
-          "description": "Å være vennen vår betyr at du alltid får det beste tilbudet: Når som helst, hvor som helst. Det er ikke nødvendig med noe hemmelig håndtrykk eller bestillingskode – bare dykk inn i bestillingene og se selv.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Hva er bedre enn rabatt? Som vår Friend får du 10-15 % rabatt på mat i vår restaurant og shop i helger og utvalgte ferier og helligdager. Det gjelder uansett om du bor hos oss eller ikke. Så kom igjen, skjem deg bort.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Gratis barne-mocktail under oppholdet",
-          "description": "Har du barna med deg? Det er fantastisk – hei der, kompis! Vi vil sørge for at ungene føler seg som de VIP-ene de faktisk er, og spanderer en forfriskende mocktail på dem ved hvert opphold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utsjekking når tilgjengelig",
-          "description": "Vi skjønner – sen utsjekkingen kan til tider være redningen for en reise. På dette punktet i vennskapet vårt, trenger du ikke skynde deg ut av sengen: Vi går god for deg, så sjekk ut én time senere kostnadsfritt, og få de siste, ekstra oppfriskende minuttene med søvn!",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantkupong",
-          "description": "Dette går virkelig flott! Nå vil hver vennskapspoenggivende natt gi deg en restaurantkupong på 150 NOK. Det vil garantert være nyttig for den neste lekre frokosten eller middagsdaten din!",
-          "unlocked": true,
-          "value": "150 NOK"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Gled deg! Hver gang du tjener nye Friends-poeng får du 25 % eller 50 % ekstra poeng – som en superboost! Begynn å tjene poeng ved å bo og spise hos oss, og du vil få en bonusnatt før du aner det.",
-          "unlocked": true,
-          "value": "50 %"
-        },
-        {
-          "name": "Tidlig innsjekk når tilgjengelig",
-          "description": "Vil du få et forsprang på oppholdet ditt? Det er ikke noe problem. Sjekk inn én time tidligere kostnadsfritt, og ta snarveien til avslapning og lykke.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis oppgraderinger (når tilgjengelig)",
-          "description": "La oss ikke gå som katten rundt grøten – vi tar ting opp et nivå. På dette nivået i vennskapet vårt vil vi oppgradere rommet ditt når det er mulig, for et enda mer komfortabelt opphold. Høres ikke det bra ut?",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 frokost",
-          "description": "Dette er virkelig et deilig tilbud: Uavhengig om du bor hos oss eller ikke, finn deg en frokostkompis, og dere kan spise for prisen av én! Bare sørg for å sjekke detaljene først, slik at alt er på plass for deres smakfulle sammenkomst.",
-          "unlocked": false
-        },
-        {
-          "name": "Romgaranti i 48 timer",
-          "description": "Hysj – dette er en spesiell godbit, kun for noen få av dere! Så merk deg: Selv om vi er fullbooket, er du garantert et rom så lenge du bestiller 48 timer på forhånd. Ganske utrolig!",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis frokost – alltid",
-          "description": "Har du lyst på en smakfull morgengodbit? Bare kom innom! Nå kan du sparke i gang dagen din med gratis frokost – og gjett hva: Det gjelder uavhengig om du bor hos oss eller ikke.",
-          "unlocked": true
-        },
-        {
-          "name": "Årlig fantastisk gave",
-          "description": "Som vår Best Friend fortjener du absolutt spesialbehandling, så vi har en eksklusiv, årlig, og ganske fantastisk gave klar til deg. Hva det er? Vel, det er en overraskelse. Ingen sniktitting!",
-          "unlocked": false
-        },
-        {
-          "name": "Boost for barn",
-          "description": "På dette vennskapsnivået er barnet ditt også vår venn – og det betyr en spesiell boost-gave for barn når du bor hos oss. Hvorfor? Fordi barn er kule! De fortjener virkelig VIP-behandling.",
-          "unlocked": false
-        }
-      ]
-    },
-    {
-      "level": 7,
-      "name": "Best Friend",
-      "requirement": "400 000p eller 100 netter",
-      "description": "Det finnes ikke ord for et bånd som dette, men vi gjør et forsøk allikevel: Det blir bare ikke bedre når det gjelder svært eksklusive opplevelser!",
-      "icon": "/_static/icons/loyaltylevels/best-friend.svg",
-      "benefits": [
-        {
-          "name": "Vennlige priser",
-          "description": "Å være vennen vår betyr at du alltid får det beste tilbudet: Når som helst, hvor som helst. Det er ikke nødvendig med noe hemmelig håndtrykk eller bestillingskode – bare dykk inn i bestillingene og se selv.",
-          "unlocked": true
-        },
-        {
-          "name": "Rabatt på mat",
-          "description": "Hva er bedre enn rabatt? Som vår Friend får du 10-15 % rabatt på mat i vår restaurant og shop i helger og utvalgte ferier og helligdager. Det gjelder uansett om du bor hos oss eller ikke. Så kom igjen, skjem deg bort.",
-          "unlocked": true,
-          "value": "15 %"
-        },
-        {
-          "name": "Gratis barne-mocktail under oppholdet",
-          "description": "Har du barna med deg? Det er fantastisk – hei der, kompis! Vi vil sørge for at ungene føler seg som de VIP-ene de faktisk er, og spanderer en forfriskende mocktail på dem ved hvert opphold.",
-          "unlocked": true
-        },
-        {
-          "name": "Sen utsjekking når tilgjengelig",
-          "description": "Vi skjønner – sen utsjekkingen kan til tider være redningen for en reise. På dette punktet i vennskapet vårt, trenger du ikke skynde deg ut av sengen: Vi går god for deg, så sjekk ut én time senere kostnadsfritt, og få de siste, ekstra oppfriskende minuttene med søvn!",
-          "unlocked": true
-        },
-        {
-          "name": "Restaurantkupong",
-          "description": "Vi gir deg en restaurantkupong på 200 NOK for hver vennskapspoenggivende natt du bor. Det kan gi deg et fjell av croissanter! Herlig, hva?",
-          "unlocked": true,
-          "value": "200 NOK"
-        },
-        {
-          "name": "Friendsboost",
-          "description": "Gled deg! Hver gang du tjener nye Friends-poeng får du 25 % eller 50 % ekstra poeng – som en superboost! Begynn å tjene poeng ved å bo og spise hos oss, og du vil få en bonusnatt før du aner det.",
-          "unlocked": true,
-          "value": "50 %"
-        },
-        {
-          "name": "Tidlig innsjekk når tilgjengelig",
-          "description": "Vil du få et forsprang på oppholdet ditt? Det er ikke noe problem. Sjekk inn én time tidligere kostnadsfritt, og ta snarveien til avslapning og lykke.",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis oppgraderinger (når tilgjengelig)",
-          "description": "La oss ikke gå som katten rundt grøten – vi tar ting opp et nivå. På dette nivået i vennskapet vårt vil vi oppgradere rommet ditt når det er mulig, for et enda mer komfortabelt opphold. Høres ikke det bra ut?",
-          "unlocked": true
-        },
-        {
-          "name": "2-for-1 frokost",
-          "description": "Dette er virkelig et deilig tilbud: Uavhengig om du bor hos oss eller ikke, finn deg en frokostkompis, og dere kan spise for prisen av én! Bare sørg for å sjekke detaljene først, slik at alt er på plass for deres smakfulle sammenkomst.",
-          "unlocked": false
-        },
-        {
-          "name": "Romgaranti i 48 timer",
-          "description": "Hysj – dette er en spesiell godbit, kun for noen få av dere! Så merk deg: Selv om vi er fullbooket, er du garantert et rom så lenge du bestiller 48 timer på forhånd. Ganske utrolig!",
-          "unlocked": true
-        },
-        {
-          "name": "Gratis frokost – alltid",
-          "description": "Har du lyst på en smakfull morgengodbit? Bare kom innom! Nå kan du sparke i gang dagen din med gratis frokost – og gjett hva: Det gjelder uavhengig om du bor hos oss eller ikke.",
-          "unlocked": true
-        },
-        {
-          "name": "Årlig fantastisk gave",
-          "description": "Som vår Best Friend fortjener du absolutt spesialbehandling, så vi har en eksklusiv, årlig, og ganske fantastisk gave klar til deg. Hva det er? Vel, det er en overraskelse. Ingen sniktitting!",
-          "unlocked": true
-        },
-        {
-          "name": "Boost for barn",
-          "description": "På dette vennskapsnivået er barnet ditt også vår venn – og det betyr en spesiell boost-gave for barn når du bor hos oss. Hvorfor? Fordi barn er kule! De fortjener virkelig VIP-behandling.",
-          "unlocked": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx b/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx
deleted file mode 100644
index 044043b08..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/index.tsx
+++ /dev/null
@@ -1,278 +0,0 @@
-"use client"
-
-import { useReducer } from "react"
-import { useIntl } from "react-intl"
-
-import { Lang } from "@/constants/languages"
-import { membershipLevels } from "@/constants/membershipLevels"
-
-import Image from "@/components/Image"
-import Select from "@/components/TempDesignSystem/Select"
-import useLang from "@/hooks/useLang"
-import { getMembership } from "@/utils/user"
-
-import DA from "./data/DA.json"
-import DE from "./data/DE.json"
-import EN from "./data/EN.json"
-import FI from "./data/FI.json"
-import NO from "./data/NO.json"
-import SV from "./data/SV.json"
-import BenefitList from "./BenefitList"
-import LargeTable from "./LargeTable"
-import LevelSummary from "./LevelSummary"
-import YourLevel from "./YourLevelScript"
-
-import styles from "./overviewTable.module.css"
-
-import type { Key } from "react-aria-components"
-
-import {
-  ComparisonLevel,
-  DesktopSelectColumns,
-  type MobileColumnHeaderProps,
-  overviewTableActionsEnum,
-  type OverviewTableProps,
-  OverviewTableReducerAction,
-} from "@/types/components/loyalty/blocks"
-import type { User } from "@/types/user"
-
-const levelsTranslations = {
-  [Lang.en]: EN,
-  [Lang.sv]: SV,
-  [Lang.no]: NO,
-  [Lang.da]: DA,
-  [Lang.fi]: FI,
-  [Lang.de]: DE,
-}
-
-function getTranslatedLevel(membershipLevel: membershipLevels, lang: Lang) {
-  return levelsTranslations[lang].levels.find(
-    (level) => level.level === membershipLevel
-  ) as ComparisonLevel
-}
-
-function getInitialState({ user, lang }: { user?: User; lang: Lang }) {
-  const membership = user?.memberships ? getMembership(user.memberships) : null
-  if (!membership?.membershipLevel) {
-    return {
-      selectedLevelAMobile: getTranslatedLevel(1, lang),
-      selectedLevelBMobile: getTranslatedLevel(2, lang),
-      selectedLevelADesktop: getTranslatedLevel(1, lang),
-      selectedLevelBDesktop: getTranslatedLevel(2, lang),
-      selectedLevelCDesktop: getTranslatedLevel(3, lang),
-    }
-  }
-  if (!membership.membershipLevel) return null
-  // @ts-expect-error: membership levels needs proper fix
-  const level = membershipLevels[membership.membershipLevel]
-
-  switch (level) {
-    case 6:
-      return {
-        selectedLevelAMobile: getTranslatedLevel(6, lang),
-        selectedLevelBMobile: getTranslatedLevel(7, lang),
-        selectedLevelADesktop: getTranslatedLevel(5, lang),
-        selectedLevelBDesktop: getTranslatedLevel(6, lang),
-        selectedLevelCDesktop: getTranslatedLevel(7, lang),
-      }
-    case 7:
-      return {
-        selectedLevelAMobile: getTranslatedLevel(6, lang),
-        selectedLevelBMobile: getTranslatedLevel(7, lang),
-        selectedLevelADesktop: getTranslatedLevel(6, lang),
-        selectedLevelBDesktop: getTranslatedLevel(7, lang),
-        selectedLevelCDesktop: getTranslatedLevel(1, lang),
-      }
-    default:
-      return {
-        selectedLevelAMobile: getTranslatedLevel(level, lang),
-        selectedLevelBMobile: getTranslatedLevel(level + 1, lang),
-        selectedLevelADesktop: getTranslatedLevel(level, lang),
-        selectedLevelBDesktop: getTranslatedLevel(level + 1, lang),
-        selectedLevelCDesktop: getTranslatedLevel(level + 2, lang),
-      }
-  }
-}
-
-function reducer(state: any, action: OverviewTableReducerAction) {
-  switch (action.type) {
-    case overviewTableActionsEnum.SET_SELECTED_LEVEL_A_MOBILE:
-      return {
-        ...state,
-        selectedLevelAMobile: action.payload,
-      }
-    case overviewTableActionsEnum.SET_SELECTED_LEVEL_B_MOBILE:
-      return {
-        ...state,
-        selectedLevelBMobile: action.payload,
-      }
-    case overviewTableActionsEnum.SET_SELECTED_LEVEL_A_DESKTOP:
-      return {
-        ...state,
-        selectedLevelADesktop: action.payload,
-      }
-    case overviewTableActionsEnum.SET_SELECTED_LEVEL_B_DESKTOP:
-      return {
-        ...state,
-        selectedLevelBDesktop: action.payload,
-      }
-    case overviewTableActionsEnum.SET_SELECTED_LEVEL_C_DESKTOP:
-      return {
-        ...state,
-        selectedLevelCDesktop: action.payload,
-      }
-    default:
-      return state
-  }
-}
-
-export default function OverviewTable({
-  activeMembership,
-}: OverviewTableProps) {
-  const intl = useIntl()
-  const lang = useLang()
-  const levelsData = levelsTranslations[lang]
-  const [selectionState, dispatch] = useReducer(
-    reducer,
-    { activeMembership, lang },
-    getInitialState
-  )
-
-  function handleSelectChange(actionType: overviewTableActionsEnum) {
-    return (key: Key) => {
-      if (typeof key === "number") {
-        dispatch({
-          payload: getTranslatedLevel(key, lang),
-          type: actionType,
-        })
-      }
-    }
-  }
-
-  const levelOptions = levelsData.levels.map((level) => ({
-    label: [level.level, level.name].join(" "),
-    value: level.level,
-  }))
-
-  let activeMembershipLevel: membershipLevels | null = null
-  if (activeMembership?.membershipLevel) {
-    // @ts-expect-error: membershiplevel needs proper fix
-    activeMembershipLevel = membershipLevels[activeMembership?.membershipLevel]
-  }
-
-  function MobileColumnHeader({ column }: MobileColumnHeaderProps) {
-    let selectedLevelMobile: ComparisonLevel
-    let actionEnumMobile: overviewTableActionsEnum
-    switch (column) {
-      case "A":
-        selectedLevelMobile = selectionState.selectedLevelAMobile
-        actionEnumMobile = overviewTableActionsEnum.SET_SELECTED_LEVEL_A_MOBILE
-        break
-      case "B":
-        selectedLevelMobile = selectionState.selectedLevelBMobile
-        actionEnumMobile = overviewTableActionsEnum.SET_SELECTED_LEVEL_B_MOBILE
-        break
-      default:
-        return null
-    }
-    return (
-      <div className={styles.columnHeader}>
-        <div className={styles.icon}>
-          {activeMembershipLevel === selectedLevelMobile.level ? (
-            <YourLevel />
-          ) : null}
-          <Image
-            src={selectedLevelMobile.icon}
-            alt={selectedLevelMobile.name}
-            height={50}
-            width={100}
-          />
-        </div>
-        <LevelSummary
-          level={
-            levelsData.levels.find(
-              (level) => level.level === selectedLevelMobile.level
-            ) as ComparisonLevel
-          }
-          showDescription={false}
-        />
-        <Select
-          aria-label={intl.formatMessage({ id: "Level" })}
-          name={`benefit` + column}
-          label={intl.formatMessage({ id: "Level" })}
-          items={levelOptions}
-          value={selectedLevelMobile.level}
-          onSelect={handleSelectChange(actionEnumMobile)}
-        />
-      </div>
-    )
-  }
-
-  function SelectDesktop({ column }: DesktopSelectColumns) {
-    let selectedLevelDesktop: ComparisonLevel
-    let actionEnumDesktop: overviewTableActionsEnum
-    switch (column) {
-      case "A":
-        selectedLevelDesktop = selectionState.selectedLevelADesktop
-        actionEnumDesktop =
-          overviewTableActionsEnum.SET_SELECTED_LEVEL_A_DESKTOP
-        break
-      case "B":
-        selectedLevelDesktop = selectionState.selectedLevelBDesktop
-        actionEnumDesktop =
-          overviewTableActionsEnum.SET_SELECTED_LEVEL_B_DESKTOP
-        break
-      case "C":
-        selectedLevelDesktop = selectionState.selectedLevelCDesktop
-        actionEnumDesktop =
-          overviewTableActionsEnum.SET_SELECTED_LEVEL_C_DESKTOP
-        break
-      default:
-        return null
-    }
-    return (
-      <Select
-        aria-label={intl.formatMessage({ id: "Level" })}
-        name={`benefit` + column}
-        label={intl.formatMessage({ id: "Level" })}
-        items={levelOptions}
-        value={selectedLevelDesktop.level}
-        onSelect={handleSelectChange(actionEnumDesktop)}
-      />
-    )
-  }
-  return (
-    <div>
-      <div className={styles.mobileColumns}>
-        <div className={styles.columnHeaderContainer}>
-          <MobileColumnHeader column={"A"} />
-          <MobileColumnHeader column={"B"} />
-        </div>
-        <BenefitList
-          levels={[
-            selectionState.selectedLevelAMobile,
-            selectionState.selectedLevelBMobile,
-          ]}
-        />
-      </div>
-      <div className={styles.columns}>
-        <LargeTable
-          levels={[
-            selectionState.selectedLevelADesktop,
-            selectionState.selectedLevelBDesktop,
-            selectionState.selectedLevelCDesktop,
-          ]}
-          activeLevel={activeMembershipLevel}
-          Select={SelectDesktop}
-        />
-      </div>
-      <div className={styles.largeTableContainer}>
-        {/* Remove `as` once we have real data */}
-        <LargeTable
-          levels={levelsData.levels as ComparisonLevel[]}
-          activeLevel={activeMembershipLevel}
-        />
-      </div>
-    </div>
-  )
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/OverviewTable/overviewTable.module.css b/components/Loyalty/Blocks/DynamicContent/OverviewTable/overviewTable.module.css
deleted file mode 100644
index dbab394c3..000000000
--- a/components/Loyalty/Blocks/DynamicContent/OverviewTable/overviewTable.module.css
+++ /dev/null
@@ -1,94 +0,0 @@
-.intro {
-  display: grid;
-  gap: var(--Spacing-x3);
-}
-
-.largeTableContainer {
-  display: none;
-}
-
-.columns {
-  display: none;
-  position: relative;
-  background-color: var(--UI-Opacity-White-100);
-  border-radius: var(--Corner-radius-Medium);
-}
-
-.mobileColumns {
-  background-color: var(--UI-Opacity-White-100);
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  margin: 0 calc(var(--Spacing-x2) * -1) calc(var(--Spacing-x9) * -1)
-    calc(var(--Spacing-x2) * -1);
-  padding-bottom: var(--Spacing-x9);
-  position: relative;
-}
-
-.columnHeaderContainer {
-  display: contents;
-  grid-template-columns: 1fr 1fr;
-  gap: var(--Spacing-x2);
-  z-index: 2;
-}
-
-.columnHeader {
-  display: flex;
-  flex-direction: column;
-  gap: var(--Spacing-x2);
-  padding: var(--Spacing-x4) var(--Spacing-x2);
-  justify-content: flex-end;
-}
-
-.icon {
-  align-self: center;
-}
-
-.columnHeader:nth-child(1) {
-  padding-right: var(--Spacing-x1);
-}
-
-.columnHeader:nth-child(2) {
-  padding-left: var(--Spacing-x1);
-  border-top-left-radius: var(--Corner-radius-Medium);
-}
-
-.columnHeader:nth-child(2):has(+ .columnHeader) {
-  padding-left: var(--Spacing-x1);
-  padding-right: var(--Spacing-x1);
-}
-
-.columnHeader:nth-child(3) {
-  padding-left: var(--Spacing-x1);
-}
-
-@media screen and (min-width: 950px) {
-  .mobileColumns {
-    display: none;
-  }
-
-  .columnHeaderContainer {
-    grid-template-columns: 1fr 1fr 1fr;
-  }
-  .columnHeader:nth-child(2) {
-    border-top-right-radius: var(--Corner-radius-Medium);
-  }
-
-  .columns {
-    display: block;
-  }
-}
-
-@media screen and (min-width: 1367px) {
-  .columns {
-    display: none;
-  }
-
-  .intro {
-    margin: auto;
-  }
-
-  .largeTableContainer {
-    display: block;
-    margin: auto;
-  }
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/dynamicContent.module.css b/components/Loyalty/Blocks/DynamicContent/dynamicContent.module.css
deleted file mode 100644
index 059ecdac1..000000000
--- a/components/Loyalty/Blocks/DynamicContent/dynamicContent.module.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.container {
-  /* These negative margins are needed for getting the right background color for mobile loyalty table overview */
-  margin: 0 calc(0px - var(--Spacing-x2)) calc(0px - var(--Spacing-x9))
-    calc(0px - var(--Spacing-x2));
-  overflow-x: hidden;
-  padding: 0 var(--Spacing-x2) var(--Spacing-x9) var(--Spacing-x2);
-}
-
-.header {
-  display: grid;
-  gap: var(--Spacing-x1);
-  padding-bottom: var(--Spacing-x2);
-}
-
-.tableTitle {
-  text-wrap: balance;
-}
-
-.preamble {
-  color: var(--Base-Text-High-contrast);
-  font-size: var(--typography-Body-Regular-fontSize);
-  line-height: var(--typography-Body-Regular-lineHeight);
-  margin: 0;
-}
-
-@media screen and (min-width: 950px) {
-  .header {
-    width: 800px;
-  }
-}
diff --git a/components/Loyalty/Blocks/DynamicContent/index.tsx b/components/Loyalty/Blocks/DynamicContent/index.tsx
deleted file mode 100644
index 48b488dbf..000000000
--- a/components/Loyalty/Blocks/DynamicContent/index.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { serverClient } from "@/lib/trpc/server"
-
-import SectionContainer from "@/components/Section/Container"
-import SectionHeader from "@/components/Section/Header"
-import SectionLink from "@/components/Section/Link"
-import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
-import Title from "@/components/TempDesignSystem/Text/Title"
-
-import HowItWorks from "./HowItWorks"
-import LoyaltyLevels from "./LoyaltyLevels"
-import OverviewTable from "./OverviewTable"
-
-import styles from "./dynamicContent.module.css"
-
-import type {
-  DynamicComponentProps,
-  DynamicContentProps,
-} from "@/types/components/loyalty/blocks"
-import { LoyaltyComponentEnum } from "@/types/components/loyalty/enums"
-
-async function DynamicComponentBlock({ component }: DynamicComponentProps) {
-  const membershipLevel = await serverClient().user.safeMembershipLevel()
-  switch (component) {
-    case LoyaltyComponentEnum.how_it_works:
-      return <HowItWorks />
-    case LoyaltyComponentEnum.loyalty_levels:
-      return <LoyaltyLevels />
-    case LoyaltyComponentEnum.overview_table:
-      return <OverviewTable activeMembership={membershipLevel} />
-    default:
-      return null
-  }
-}
-
-export default function DynamicContent({
-  dynamicContent,
-  firstItem,
-}: DynamicContentProps) {
-  const displayHeader = !!(
-    dynamicContent.link ||
-    dynamicContent.subtitle ||
-    dynamicContent.title
-  )
-  const isOverviewTable =
-    dynamicContent.component === LoyaltyComponentEnum.overview_table
-  return (
-    <SectionContainer className={styles.container}>
-      {isOverviewTable ? (
-        <div className={styles.header}>
-          <Title className={styles.tableTitle}> {dynamicContent.title}</Title>
-          <Subtitle>{dynamicContent.subtitle}</Subtitle>
-        </div>
-      ) : displayHeader ? (
-        <SectionHeader
-          link={dynamicContent.link}
-          preamble={dynamicContent.subtitle}
-          title={dynamicContent.title}
-          topTitle={firstItem}
-        />
-      ) : null}
-      <DynamicComponentBlock component={dynamicContent.component} />
-      {displayHeader && (
-        <SectionLink link={dynamicContent.link} variant="mobile" />
-      )}
-    </SectionContainer>
-  )
-}
diff --git a/components/Loyalty/Blocks/index.tsx b/components/Loyalty/Blocks/index.tsx
deleted file mode 100644
index c272026fa..000000000
--- a/components/Loyalty/Blocks/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import JsonToHtml from "@/components/JsonToHtml"
-import DynamicContentBlock from "@/components/Loyalty/Blocks/DynamicContent"
-import Shortcuts from "@/components/MyPages/Blocks/Shortcuts"
-
-import CardsGrid from "./CardsGrid"
-
-import type { BlocksProps } from "@/types/components/loyalty/blocks"
-import { LoyaltyBlocksTypenameEnum } from "@/types/components/loyalty/enums"
-
-export function Blocks({ blocks }: BlocksProps) {
-  return blocks.map((block, idx) => {
-    const firstItem = idx === 0
-    switch (block.__typename) {
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksContent:
-        return (
-          <section key={`${block.__typename}-${idx}`}>
-            <JsonToHtml
-              nodes={block.content.content.json.children}
-              embeds={block.content.content.embedded_itemsConnection.edges}
-            />
-          </section>
-        )
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent:
-        return (
-          <DynamicContentBlock
-            dynamicContent={block.dynamic_content}
-            firstItem={firstItem}
-            key={`${block.dynamic_content.title}-${idx}`}
-          />
-        )
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts:
-        return (
-          <Shortcuts
-            firstItem={firstItem}
-            key={`${block.shortcuts.title}-${idx}`}
-            shortcuts={block.shortcuts.shortcuts}
-            subtitle={block.shortcuts.preamble}
-            title={block.shortcuts.title}
-          />
-        )
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid:
-        return (
-          <CardsGrid
-            cards_grid={block.cards_grid}
-            key={`${block.cards_grid.title}-${idx}`}
-            firstItem={firstItem}
-          />
-        )
-      default:
-        return null
-    }
-  })
-}
diff --git a/components/Loyalty/Sidebar/JoinLoyalty/Contact/ContactRow/contactRow.module.css b/components/Loyalty/Sidebar/JoinLoyalty/Contact/ContactRow/contactRow.module.css
deleted file mode 100644
index 3dc5d411b..000000000
--- a/components/Loyalty/Sidebar/JoinLoyalty/Contact/ContactRow/contactRow.module.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.link {
-  display: flex;
-  align-items: center;
-  gap: var(--Spacing-x1);
-}
diff --git a/components/Loyalty/Sidebar/JoinLoyalty/Contact/contact.module.css b/components/Loyalty/Sidebar/JoinLoyalty/Contact/contact.module.css
deleted file mode 100644
index 55234e9d2..000000000
--- a/components/Loyalty/Sidebar/JoinLoyalty/Contact/contact.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.contactContainer {
-  display: none;
-}
-
-@media screen and (min-width: 1367px) {
-  .contactContainer {
-    border-top: 1px solid var(--UI-Grey-30);
-    display: flex;
-    flex-direction: column;
-    gap: var(--Spacing-x2);
-    justify-content: center;
-    padding-top: var(--Spacing-x2);
-  }
-
-  .contact {
-    display: grid;
-    gap: var(--Spacing-x-one-and-half);
-  }
-}
diff --git a/components/Loyalty/Sidebar/JoinLoyalty/index.tsx b/components/Loyalty/Sidebar/JoinLoyalty/index.tsx
deleted file mode 100644
index 49a58b070..000000000
--- a/components/Loyalty/Sidebar/JoinLoyalty/index.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { serverClient } from "@/lib/trpc/server"
-
-import LoginButton from "@/components/Current/Header/LoginButton"
-import ArrowRight from "@/components/Icons/ArrowRight"
-import { ScandicFriends } from "@/components/Levels"
-import Button from "@/components/TempDesignSystem/Button"
-import Link from "@/components/TempDesignSystem/Link"
-import Body from "@/components/TempDesignSystem/Text/Body"
-import Title from "@/components/TempDesignSystem/Text/Title"
-import { getIntl } from "@/i18n"
-
-import Contact from "./Contact"
-
-import styles from "./joinLoyalty.module.css"
-
-import type { JoinLoyaltyContactProps } from "@/types/components/loyalty/sidebar"
-
-export default async function JoinLoyaltyContact({
-  block,
-}: JoinLoyaltyContactProps) {
-  const { formatMessage } = await getIntl()
-  const user = await serverClient().user.name()
-
-  // Check if we have user, that means we are logged in.
-  if (user) {
-    return null
-  }
-  return (
-    <section>
-      <article className={styles.wrapper}>
-        <Title as="h4" level="h3" textTransform="capitalize">
-          {block.title}
-        </Title>
-        <ScandicFriends color="red" />
-        {block.preamble ? <Body>{block.preamble}</Body> : null}
-        {block.button ? (
-          <Button
-            asChild
-            intent="primary"
-            theme="base"
-            className={styles.button}
-          >
-            <Link
-              href={block.button.href}
-              color="white"
-              target={block.button.openInNewTab ? "_blank" : "_self"}
-            >
-              {block.button.title}
-            </Link>
-          </Button>
-        ) : null}
-        <section className={styles.loginContainer}>
-          <Body>{formatMessage({ id: "Already a friend?" })}</Body>
-          <LoginButton
-            className={styles.link}
-            trackingId="loginJoinLoyalty"
-            position="join scandic friends sidebar"
-            color="burgundy"
-          >
-            <ArrowRight
-              color="burgundy"
-              className={styles.icon}
-              height="20"
-              width="20"
-            />
-            {formatMessage({ id: "Log in here" })}
-          </LoginButton>
-        </section>
-      </article>
-      {block.contact ? <Contact contactBlock={block.contact} /> : null}
-    </section>
-  )
-}
diff --git a/components/Loyalty/Sidebar/JoinLoyalty/joinLoyalty.module.css b/components/Loyalty/Sidebar/JoinLoyalty/joinLoyalty.module.css
deleted file mode 100644
index 23d1e2049..000000000
--- a/components/Loyalty/Sidebar/JoinLoyalty/joinLoyalty.module.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.wrapper {
-  display: grid;
-  gap: var(--Spacing-x3);
-  padding-bottom: var(--Spacing-x5);
-  padding-top: var(--Spacing-x4);
-}
-
-.loginContainer {
-  display: grid;
-  gap: var(--Spacing-x2);
-}
-
-.button {
-  width: fit-content;
-}
-
-.link {
-  display: flex;
-  align-items: center;
-}
-
-.icon {
-  align-self: center;
-}
diff --git a/components/Loyalty/Sidebar/MyPagesNavigation/index.tsx b/components/Loyalty/Sidebar/MyPagesNavigation/index.tsx
deleted file mode 100644
index 19ea70405..000000000
--- a/components/Loyalty/Sidebar/MyPagesNavigation/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { serverClient } from "@/lib/trpc/server"
-
-import MyPagesSidebar from "@/components/MyPages/Sidebar"
-
-export async function MyPagesNavigation() {
-  const user = await serverClient().user.name()
-
-  // Check if we have user, that means we are logged in andt the My Pages menu can show.
-  if (!user) {
-    return null
-  }
-  return <MyPagesSidebar />
-}
diff --git a/components/Loyalty/Sidebar/index.tsx b/components/Loyalty/Sidebar/index.tsx
deleted file mode 100644
index 53f0137b8..000000000
--- a/components/Loyalty/Sidebar/index.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import JsonToHtml from "@/components/JsonToHtml"
-
-import JoinLoyaltyContact from "./JoinLoyalty"
-import { MyPagesNavigation } from "./MyPagesNavigation"
-
-import styles from "./sidebar.module.css"
-
-import {
-  LoyaltySidebarDynamicComponentEnum,
-  SidebarTypenameEnum,
-} from "@/types/components/loyalty/enums"
-import { SidebarProps } from "@/types/components/loyalty/sidebar"
-
-export default function SidebarLoyalty({ blocks }: SidebarProps) {
-  return (
-    <aside className={styles.aside}>
-      {blocks.map((block, idx) => {
-        switch (block.__typename) {
-          case SidebarTypenameEnum.LoyaltyPageSidebarContent:
-            return (
-              <section
-                className={styles.content}
-                key={`${block.__typename}-${idx}`}
-              >
-                <JsonToHtml
-                  embeds={block.content.content.embedded_itemsConnection.edges}
-                  nodes={block.content.content.json.children}
-                />
-              </section>
-            )
-          case SidebarTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContact:
-            return (
-              <JoinLoyaltyContact
-                block={block.join_loyalty_contact}
-                key={`${block.__typename}-${idx}`}
-              />
-            )
-          case SidebarTypenameEnum.LoyaltyPageSidebarDynamicContent:
-            switch (block.dynamic_content.component) {
-              case LoyaltySidebarDynamicComponentEnum.my_pages_navigation:
-                return <MyPagesNavigation key={`${block.__typename}-${idx}`} />
-              default:
-                return null
-            }
-
-          default:
-            return null
-        }
-      })}
-    </aside>
-  )
-}
diff --git a/components/Loyalty/Sidebar/sidebar.module.css b/components/Loyalty/Sidebar/sidebar.module.css
deleted file mode 100644
index c4b8627a0..000000000
--- a/components/Loyalty/Sidebar/sidebar.module.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.aside {
-  display: none;
-}
-
-.content {
-  padding: var(--Spacing-x0) var(--Spacing-x2);
-}
-
-@media screen and (min-width: 1366px) {
-  .aside {
-    align-content: flex-start;
-    display: grid;
-    gap: var(--Spacing-x4);
-  }
-}
diff --git a/components/MyPages/AccountPage/Content.tsx b/components/MyPages/AccountPage/Content.tsx
deleted file mode 100644
index 3ccff01d0..000000000
--- a/components/MyPages/AccountPage/Content.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import JsonToHtml from "@/components/JsonToHtml"
-import CurrentBenefitsBlock from "@/components/MyPages/Blocks/Benefits/CurrentLevel"
-import NextLevelBenefitsBlock from "@/components/MyPages/Blocks/Benefits/NextLevel"
-import Overview from "@/components/MyPages/Blocks/Overview"
-import EarnAndBurn from "@/components/MyPages/Blocks/Points/EarnAndBurn"
-import ExpiringPoints from "@/components/MyPages/Blocks/Points/ExpiringPoints"
-import PointsOverview from "@/components/MyPages/Blocks/Points/Overview"
-import Shortcuts from "@/components/MyPages/Blocks/Shortcuts"
-import PreviousStays from "@/components/MyPages/Blocks/Stays/Previous"
-import SoonestStays from "@/components/MyPages/Blocks/Stays/Soonest"
-import UpcomingStays from "@/components/MyPages/Blocks/Stays/Upcoming"
-import { getLang } from "@/i18n/serverContext"
-import { removeMultipleSlashes } from "@/utils/url"
-
-import {
-  AccountPageContentProps,
-  ContentProps,
-} from "@/types/components/myPages/myPage/accountPage"
-import {
-  ContentEntries,
-  DynamicContentComponents,
-} from "@/types/components/myPages/myPage/enums"
-
-function DynamicComponent({ component, props }: AccountPageContentProps) {
-  switch (component) {
-    case DynamicContentComponents.membership_overview:
-      return <Overview {...props} />
-    case DynamicContentComponents.points_overview:
-      return <PointsOverview {...props} />
-    case DynamicContentComponents.previous_stays:
-      return <PreviousStays {...props} />
-    case DynamicContentComponents.soonest_stays:
-      return <SoonestStays {...props} />
-    case DynamicContentComponents.upcoming_stays:
-      return <UpcomingStays {...props} />
-    case DynamicContentComponents.current_benefits:
-      return <CurrentBenefitsBlock {...props} />
-    case DynamicContentComponents.next_benefits:
-      return <NextLevelBenefitsBlock {...props} />
-    case DynamicContentComponents.expiring_points:
-      return <ExpiringPoints {...props} />
-    case DynamicContentComponents.earn_and_burn:
-      return <EarnAndBurn {...props} />
-    default:
-      return null
-  }
-}
-
-export default function Content({ content }: ContentProps) {
-  return content.map((item, idx) => {
-    switch (item.__typename) {
-      case ContentEntries.AccountPageContentDynamicContent:
-        const link = item.dynamic_content.link.linkConnection.edges.length
-          ? {
-              href:
-                item.dynamic_content.link.linkConnection.edges[0].node
-                  .original_url ||
-                removeMultipleSlashes(
-                  `/${getLang()}/${item.dynamic_content.link.linkConnection.edges[0].node.url}`
-                ),
-              text: item.dynamic_content.link.link_text,
-            }
-          : null
-
-        const componentProps = {
-          title: item.dynamic_content.title,
-          // TODO: rename preamble to subtitle in Contentstack?
-          subtitle: item.dynamic_content.preamble,
-          ...(link && { link }),
-        }
-        return (
-          <DynamicComponent
-            key={`${item.dynamic_content.title}-${idx}`}
-            component={item.dynamic_content.component}
-            props={componentProps}
-          />
-        )
-      case ContentEntries.AccountPageContentShortcuts:
-        return (
-          <Shortcuts
-            key={`${item.shortcuts.title}-${idx}`}
-            shortcuts={item.shortcuts.shortcuts}
-            subtitle={item.shortcuts.preamble}
-            title={item.shortcuts.title}
-          />
-        )
-      case ContentEntries.AccountPageContentTextContent:
-        return (
-          <section key={`${item.__typename}-${idx}`}>
-            <JsonToHtml
-              embeds={item.text_content.content.embedded_itemsConnection.edges}
-              nodes={item.text_content.content.json.children}
-            />
-          </section>
-        )
-      default:
-        return null
-    }
-  })
-}
diff --git a/components/MyPages/AccountPage/Webview/Content.tsx b/components/MyPages/AccountPage/Webview/Content.tsx
deleted file mode 100644
index 43f404947..000000000
--- a/components/MyPages/AccountPage/Webview/Content.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import JsonToHtml from "@/components/JsonToHtml"
-import Overview from "@/components/MyPages/Blocks/Overview"
-import Shortcuts from "@/components/MyPages/Blocks/Shortcuts"
-import { getLang } from "@/i18n/serverContext"
-import { removeMultipleSlashes } from "@/utils/url"
-import { modWebviewLink } from "@/utils/webviews"
-
-import CurrentBenefitsBlock from "../../Blocks/Benefits/CurrentLevel"
-import NextLevelBenefitsBlock from "../../Blocks/Benefits/NextLevel"
-import EarnAndBurn from "../../Blocks/Points/EarnAndBurn"
-import PointsOverview from "../../Blocks/Points/Overview"
-
-import {
-  AccountPageContentProps,
-  ContentProps,
-} from "@/types/components/myPages/myPage/accountPage"
-import {
-  ContentEntries,
-  DynamicContentComponents,
-} from "@/types/components/myPages/myPage/enums"
-
-function DynamicComponent({ component, props }: AccountPageContentProps) {
-  switch (component) {
-    case DynamicContentComponents.membership_overview:
-      return <Overview {...props} />
-    case DynamicContentComponents.points_overview:
-      return <PointsOverview {...props} />
-    case DynamicContentComponents.current_benefits:
-      return <CurrentBenefitsBlock {...props} />
-    case DynamicContentComponents.next_benefits:
-      return <NextLevelBenefitsBlock {...props} />
-    case DynamicContentComponents.expiring_points:
-      // TODO: Add once available
-      // return <ExpiringPoints />
-      return null
-    case DynamicContentComponents.earn_and_burn:
-      return <EarnAndBurn {...props} />
-    default:
-      return null
-  }
-}
-
-export default function Content({ content }: ContentProps) {
-  return (
-    <>
-      {content.map((item, idx) => {
-        switch (item.__typename) {
-          case ContentEntries.AccountPageContentDynamicContent:
-            const link = item.dynamic_content.link.linkConnection.edges.length
-              ? {
-                  href:
-                    item.dynamic_content.link.linkConnection.edges[0].node
-                      .original_url ||
-                    modWebviewLink(
-                      removeMultipleSlashes(
-                        `/${item.dynamic_content.link.linkConnection.edges[0].node.system.locale}/${item.dynamic_content.link.linkConnection.edges[0].node.url}`
-                      ),
-                      item.dynamic_content.link.linkConnection.edges[0].node
-                        .system.locale
-                    ),
-                  text: item.dynamic_content.link.link_text,
-                }
-              : null
-
-            const componentProps = {
-              title: item.dynamic_content.title,
-              // TODO: rename preamble to subtitle in Contentstack?
-              subtitle: item.dynamic_content.preamble,
-              ...(link && { link }),
-            }
-            return (
-              <DynamicComponent
-                key={`${item.dynamic_content.title}-${idx}`}
-                component={item.dynamic_content.component}
-                props={componentProps}
-              />
-            )
-          case ContentEntries.AccountPageContentShortcuts:
-            const shortcuts = item.shortcuts.shortcuts.map((shortcut) => {
-              return {
-                ...shortcut,
-                url: modWebviewLink(shortcut.url, getLang()),
-              }
-            })
-            return (
-              <Shortcuts
-                key={`${item.shortcuts.title}-${idx}`}
-                shortcuts={shortcuts}
-                subtitle={item.shortcuts.preamble}
-                title={item.shortcuts.title}
-              />
-            )
-          case ContentEntries.AccountPageContentTextContent:
-            return (
-              <section key={`${item.__typename}-${idx}`}>
-                <JsonToHtml
-                  embeds={
-                    item.text_content.content.embedded_itemsConnection.edges
-                  }
-                  nodes={item.text_content.content.json.children}
-                />
-              </section>
-            )
-          default:
-            return null
-        }
-      })}
-    </>
-  )
-}
diff --git a/components/MyPages/Blocks/Overview/Friend/MemershipNumber/membershipNumber.ts b/components/MyPages/Blocks/Overview/Friend/MemershipNumber/membershipNumber.ts
deleted file mode 100644
index 71d6cf3db..000000000
--- a/components/MyPages/Blocks/Overview/Friend/MemershipNumber/membershipNumber.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { VariantProps } from "class-variance-authority"
-
-import { membershipNumberVariants } from "./membershipNumberVariants"
-
-import { User } from "@/types/user"
-
-export interface MembershipNumberProps
-  extends Omit<React.HTMLAttributes<HTMLDivElement>, "color">,
-    VariantProps<typeof membershipNumberVariants> {
-  membership: User["memberships"][number]
-}
diff --git a/components/Profile/DeleteCreditCardButton/index.tsx b/components/Profile/DeleteCreditCardButton/index.tsx
index 16448d0b1..69ebbd21b 100644
--- a/components/Profile/DeleteCreditCardButton/index.tsx
+++ b/components/Profile/DeleteCreditCardButton/index.tsx
@@ -3,8 +3,7 @@ import { useIntl } from "react-intl"
 
 import { trpc } from "@/lib/trpc/client"
 
-import { Delete } from "@/components/Icons"
-import LoadingSpinner from "@/components/LoadingSpinner"
+import { DeleteIcon } from "@/components/Icons"
 import Button from "@/components/TempDesignSystem/Button"
 import { toast } from "@/components/TempDesignSystem/Toasts"
 
@@ -34,7 +33,7 @@ export default function DeleteCreditCardButton({
   }
   return (
     <Button variant="icon" theme="base" intent="text" onClick={handleDelete}>
-      <Delete color="burgundy" />
+      <DeleteIcon color="burgundy" />
     </Button>
   )
 }
diff --git a/components/Profile/DeleteCreditCardConfirmation.tsx b/components/Profile/DeleteCreditCardConfirmation.tsx
index d1c07ee2e..dd8d76b30 100644
--- a/components/Profile/DeleteCreditCardConfirmation.tsx
+++ b/components/Profile/DeleteCreditCardConfirmation.tsx
@@ -4,7 +4,7 @@ import { useIntl } from "react-intl"
 import { trpc } from "@/lib/trpc/client"
 
 import Dialog from "@/components/Dialog"
-import { Delete } from "@/components/Icons"
+import { DeleteIcon } from "@/components/Icons"
 import { toast } from "@/components/TempDesignSystem/Toasts"
 
 import type { DeleteCreditCardConfirmationProps } from "@/types/components/myPages/myProfile/creditCards"
@@ -52,7 +52,7 @@ export default function DeleteCreditCardConfirmation({
       proceedOnClick={handleProceedDeleteCard}
       proceedText={intl.formatMessage({ id: "Yes, remove my card" })}
       titleText={intl.formatMessage({ id: "Remove card from member profile" })}
-      triggerButtonText={<Delete color="burgundy" />}
+      triggerButtonText={<DeleteIcon color="burgundy" />}
     />
   )
 }
diff --git a/components/Content/Sidebar/JoinLoyalty/Contact/ContactRow/contactRow.module.css b/components/Sidebar/JoinLoyalty/Contact/ContactRow/contactRow.module.css
similarity index 100%
rename from components/Content/Sidebar/JoinLoyalty/Contact/ContactRow/contactRow.module.css
rename to components/Sidebar/JoinLoyalty/Contact/ContactRow/contactRow.module.css
diff --git a/components/Loyalty/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx b/components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
similarity index 94%
rename from components/Loyalty/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
rename to components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
index ee9f95ac1..ea66239df 100644
--- a/components/Loyalty/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
+++ b/components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
@@ -8,7 +8,7 @@ import { getValueFromContactConfig } from "@/utils/contactConfig"
 
 import styles from "./contactRow.module.css"
 
-import type { ContactRowProps } from "@/types/components/loyalty/sidebar"
+import type { ContactRowProps } from "@/types/components/sidebar/joinLoyaltyContact"
 
 export default async function ContactRow({ contact }: ContactRowProps) {
   const data = await serverClient().contentstack.base.contact()
diff --git a/components/Content/Sidebar/JoinLoyalty/Contact/contact.module.css b/components/Sidebar/JoinLoyalty/Contact/contact.module.css
similarity index 100%
rename from components/Content/Sidebar/JoinLoyalty/Contact/contact.module.css
rename to components/Sidebar/JoinLoyalty/Contact/contact.module.css
diff --git a/components/Loyalty/Sidebar/JoinLoyalty/Contact/index.tsx b/components/Sidebar/JoinLoyalty/Contact/index.tsx
similarity index 58%
rename from components/Loyalty/Sidebar/JoinLoyalty/Contact/index.tsx
rename to components/Sidebar/JoinLoyalty/Contact/index.tsx
index 7a05ec61f..8a7ff01f4 100644
--- a/components/Loyalty/Sidebar/JoinLoyalty/Contact/index.tsx
+++ b/components/Sidebar/JoinLoyalty/Contact/index.tsx
@@ -5,18 +5,18 @@ import ContactRow from "./ContactRow"
 
 import styles from "./contact.module.css"
 
-import { JoinLoyaltyContactTypenameEnum } from "@/types/components/loyalty/enums"
-import type { ContactProps } from "@/types/components/loyalty/sidebar"
+import type { ContactProps } from "@/types/components/sidebar/joinLoyaltyContact"
+import { JoinLoyaltyContactEnums } from "@/types/enums/joinLoyaltyContact"
 
 export default async function Contact({ contactBlock }: ContactProps) {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()
   return (
     <article className={styles.contactContainer}>
-      <Subtitle>{formatMessage({ id: "Contact us" })}</Subtitle>
+      <Subtitle>{intl.formatMessage({ id: "Contact us" })}</Subtitle>
       <section className={styles.contact}>
-        {contactBlock.map(({ contact, __typename }, i) => {
-          switch (__typename) {
-            case JoinLoyaltyContactTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact:
+        {contactBlock.map((contact, i) => {
+          switch (contact.typename) {
+            case JoinLoyaltyContactEnums.contact.Contact:
               return (
                 <ContactRow
                   key={`${contact.display_text}-${i}`}
diff --git a/components/Content/Sidebar/JoinLoyalty/index.tsx b/components/Sidebar/JoinLoyalty/index.tsx
similarity index 91%
rename from components/Content/Sidebar/JoinLoyalty/index.tsx
rename to components/Sidebar/JoinLoyalty/index.tsx
index 12598a686..b6227579a 100644
--- a/components/Content/Sidebar/JoinLoyalty/index.tsx
+++ b/components/Sidebar/JoinLoyalty/index.tsx
@@ -13,12 +13,12 @@ import Contact from "./Contact"
 
 import styles from "./joinLoyalty.module.css"
 
-import type { JoinLoyaltyContactProps } from "@/types/components/content/sidebar"
+import type { JoinLoyaltyContactProps } from "@/types/components/sidebar/joinLoyaltyContact"
 
 export default async function JoinLoyaltyContact({
   block,
 }: JoinLoyaltyContactProps) {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()
   const user = await serverClient().user.name()
 
   // Check if we have user, that means we are logged in.
@@ -50,7 +50,7 @@ export default async function JoinLoyaltyContact({
           </Button>
         ) : null}
         <section className={styles.loginContainer}>
-          <Body>{formatMessage({ id: "Already a friend?" })}</Body>
+          <Body>{intl.formatMessage({ id: "Already a friend?" })}</Body>
           <LoginButton
             className={styles.link}
             trackingId="loginJoinLoyalty"
@@ -63,7 +63,7 @@ export default async function JoinLoyaltyContact({
               height="20"
               width="20"
             />
-            {formatMessage({ id: "Log in here" })}
+            {intl.formatMessage({ id: "Log in here" })}
           </LoginButton>
         </section>
       </article>
diff --git a/components/Content/Sidebar/JoinLoyalty/joinLoyalty.module.css b/components/Sidebar/JoinLoyalty/joinLoyalty.module.css
similarity index 100%
rename from components/Content/Sidebar/JoinLoyalty/joinLoyalty.module.css
rename to components/Sidebar/JoinLoyalty/joinLoyalty.module.css
diff --git a/components/Content/Sidebar/MyPagesNavigation/index.tsx b/components/Sidebar/MyPagesNavigation.tsx
similarity index 85%
rename from components/Content/Sidebar/MyPagesNavigation/index.tsx
rename to components/Sidebar/MyPagesNavigation.tsx
index 19ea70405..23f60e144 100644
--- a/components/Content/Sidebar/MyPagesNavigation/index.tsx
+++ b/components/Sidebar/MyPagesNavigation.tsx
@@ -2,7 +2,7 @@ import { serverClient } from "@/lib/trpc/server"
 
 import MyPagesSidebar from "@/components/MyPages/Sidebar"
 
-export async function MyPagesNavigation() {
+export default async function MyPagesNavigation() {
   const user = await serverClient().user.name()
 
   // Check if we have user, that means we are logged in andt the My Pages menu can show.
diff --git a/components/Sidebar/index.tsx b/components/Sidebar/index.tsx
new file mode 100644
index 000000000..3e0f59637
--- /dev/null
+++ b/components/Sidebar/index.tsx
@@ -0,0 +1,49 @@
+import JsonToHtml from "@/components/JsonToHtml"
+
+import JoinLoyaltyContact from "./JoinLoyalty"
+import MyPagesNavigation from "./MyPagesNavigation"
+
+import styles from "./sidebar.module.css"
+
+import type { SidebarProps } from "@/types/components/sidebar"
+import { DynamicContentEnum } from "@/types/enums/dynamicContent"
+import { SidebarEnums } from "@/types/enums/sidebar"
+
+export default function Sidebar({ blocks }: SidebarProps) {
+  return (
+    <aside className={styles.aside}>
+      {blocks.map((block, idx) => {
+        switch (block.typename) {
+          case SidebarEnums.blocks.Content:
+            return (
+              <section
+                className={styles.content}
+                key={`${block.typename}-${idx}`}
+              >
+                <JsonToHtml
+                  embeds={block.content.embedded_itemsConnection.edges}
+                  nodes={block.content.json.children}
+                />
+              </section>
+            )
+          case SidebarEnums.blocks.DynamicContent:
+            switch (block.dynamic_content.component) {
+              case DynamicContentEnum.Sidebar.components.my_pages_navigation:
+                return <MyPagesNavigation key={`${block.typename}-${idx}`} />
+              default:
+                return null
+            }
+          case SidebarEnums.blocks.JoinLoyaltyContact:
+            return (
+              <JoinLoyaltyContact
+                block={block.join_loyalty_contact}
+                key={`${block.typename}-${idx}`}
+              />
+            )
+          default:
+            return null
+        }
+      })}
+    </aside>
+  )
+}
diff --git a/components/Content/Sidebar/sidebar.module.css b/components/Sidebar/sidebar.module.css
similarity index 100%
rename from components/Content/Sidebar/sidebar.module.css
rename to components/Sidebar/sidebar.module.css
diff --git a/components/TempDesignSystem/LoyaltyCard/loyaltyCard.ts b/components/TempDesignSystem/LoyaltyCard/loyaltyCard.ts
index d5941ef5e..45100d39e 100644
--- a/components/TempDesignSystem/LoyaltyCard/loyaltyCard.ts
+++ b/components/TempDesignSystem/LoyaltyCard/loyaltyCard.ts
@@ -9,9 +9,9 @@ export interface LoyaltyCardProps
     VariantProps<typeof loyaltyCardVariants> {
   link?: {
     href: string
-    title: string
-    openInNewTab?: boolean
     isExternal: boolean
+    openInNewTab: boolean
+    title: string
   }
   image?: ImageVaultAsset
   heading?: string | null
diff --git a/components/TempDesignSystem/Text/Body/body.module.css b/components/TempDesignSystem/Text/Body/body.module.css
index d13de5b44..238128edd 100644
--- a/components/TempDesignSystem/Text/Body/body.module.css
+++ b/components/TempDesignSystem/Text/Body/body.module.css
@@ -87,3 +87,7 @@
 .peach80 {
   color: var(--Base-Text-Medium-contrast);
 }
+
+.uiTextPlaceholder {
+  color: var(--UI-Text-Placeholder);
+}
diff --git a/components/TempDesignSystem/Text/Body/variants.ts b/components/TempDesignSystem/Text/Body/variants.ts
index 034f1eeba..e55bbc3e2 100644
--- a/components/TempDesignSystem/Text/Body/variants.ts
+++ b/components/TempDesignSystem/Text/Body/variants.ts
@@ -14,6 +14,7 @@ const config = {
       white: styles.white,
       peach50: styles.peach50,
       peach80: styles.peach80,
+      uiTextPlaceholder: styles.uiTextPlaceholder,
     },
     textAlign: {
       center: styles.textAlignCenter,
diff --git a/components/TempDesignSystem/Text/Caption/caption.module.css b/components/TempDesignSystem/Text/Caption/caption.module.css
index d2dcd9208..124f3cbc5 100644
--- a/components/TempDesignSystem/Text/Caption/caption.module.css
+++ b/components/TempDesignSystem/Text/Caption/caption.module.css
@@ -59,6 +59,10 @@
   color: var(--UI-Opacity-White-100);
 }
 
+.uiTextActive {
+  color: var(--UI-Text-Active);
+}
+
 .center {
   text-align: center;
 }
diff --git a/components/TempDesignSystem/Text/Caption/variants.ts b/components/TempDesignSystem/Text/Caption/variants.ts
index b8a3ef6b1..dc0437fff 100644
--- a/components/TempDesignSystem/Text/Caption/variants.ts
+++ b/components/TempDesignSystem/Text/Caption/variants.ts
@@ -11,6 +11,7 @@ const config = {
       textMediumContrast: styles.textMediumContrast,
       red: styles.red,
       white: styles.white,
+      uiTextActive: styles.uiTextActive,
     },
     textTransform: {
       bold: styles.bold,
diff --git a/components/TempDesignSystem/Text/Footnote/footnote.module.css b/components/TempDesignSystem/Text/Footnote/footnote.module.css
index 7c24a8ddc..39cd86591 100644
--- a/components/TempDesignSystem/Text/Footnote/footnote.module.css
+++ b/components/TempDesignSystem/Text/Footnote/footnote.module.css
@@ -62,3 +62,7 @@
 .textMediumContrast {
   color: var(--UI-Text-Medium-contrast);
 }
+
+.uiTextPlaceholder {
+  color: var(--UI-Text-Placeholder);
+}
diff --git a/components/TempDesignSystem/Text/Footnote/variants.ts b/components/TempDesignSystem/Text/Footnote/variants.ts
index e07213e6d..3c2e58441 100644
--- a/components/TempDesignSystem/Text/Footnote/variants.ts
+++ b/components/TempDesignSystem/Text/Footnote/variants.ts
@@ -10,6 +10,7 @@ const config = {
       pale: styles.pale,
       peach50: styles.peach50,
       textMediumContrast: styles.textMediumContrast,
+      uiTextPlaceholder: styles.uiTextPlaceholder,
     },
     textAlign: {
       center: styles.center,
diff --git a/components/Webviews/AccountPage/Blocks.tsx b/components/Webviews/AccountPage/Blocks.tsx
new file mode 100644
index 000000000..f8c8f0bb0
--- /dev/null
+++ b/components/Webviews/AccountPage/Blocks.tsx
@@ -0,0 +1,92 @@
+import CurrentBenefitsBlock from "@/components/Blocks/DynamicContent/Benefits/CurrentLevel"
+import NextLevelBenefitsBlock from "@/components/Blocks/DynamicContent/Benefits/NextLevel"
+import Overview from "@/components/Blocks/DynamicContent/Overview"
+import EarnAndBurn from "@/components/Blocks/DynamicContent/Points/EarnAndBurn"
+import PointsOverview from "@/components/Blocks/DynamicContent/Points/Overview"
+import Shortcuts from "@/components/Blocks/Shortcuts"
+import JsonToHtml from "@/components/JsonToHtml"
+import { getLang } from "@/i18n/serverContext"
+import { modWebviewLink } from "@/utils/webviews"
+
+import type {
+  AccountPageContentProps,
+  ContentProps,
+} from "@/types/components/myPages/myPage/accountPage"
+import { BlocksEnums } from "@/types/enums/blocks"
+import { DynamicContentEnum } from "@/types/enums/dynamicContent"
+
+function DynamicComponent({ dynamic_content }: AccountPageContentProps) {
+  const dynamicContent = {
+    ...dynamic_content,
+    link: dynamic_content.link
+      ? {
+          ...dynamic_content.link,
+          href: modWebviewLink(dynamic_content.link.href, getLang()),
+        }
+      : undefined,
+  }
+  switch (dynamic_content.component) {
+    case DynamicContentEnum.Blocks.components.membership_overview:
+      return <Overview {...dynamicContent} />
+    case DynamicContentEnum.Blocks.components.points_overview:
+      return <PointsOverview {...dynamicContent} />
+    case DynamicContentEnum.Blocks.components.current_benefits:
+      return <CurrentBenefitsBlock {...dynamicContent} />
+    case DynamicContentEnum.Blocks.components.next_benefits:
+      return <NextLevelBenefitsBlock {...dynamicContent} />
+    case DynamicContentEnum.Blocks.components.expiring_points:
+      // TODO: Add once available
+      // return <ExpiringPoints />
+      return null
+    case DynamicContentEnum.Blocks.components.earn_and_burn:
+      return <EarnAndBurn {...dynamicContent} />
+    default:
+      return null
+  }
+}
+
+export default function Content({ content }: ContentProps) {
+  return (
+    <>
+      {content.map((item, idx) => {
+        switch (item.typename) {
+          case BlocksEnums.block.DynamicContent:
+            return (
+              <DynamicComponent
+                key={`${item.dynamic_content.title}-${idx}`}
+                dynamic_content={item.dynamic_content}
+              />
+            )
+          case BlocksEnums.block.Shortcuts:
+            const shortcuts = item.shortcuts.shortcuts.map((shortcut) => {
+              return {
+                ...shortcut,
+                url: modWebviewLink(shortcut.url, getLang()),
+              }
+            })
+            return (
+              <Shortcuts
+                key={`${item.shortcuts.title}-${idx}`}
+                shortcuts={shortcuts}
+                subtitle={item.shortcuts.subtitle}
+                title={item.shortcuts.title}
+              />
+            )
+          case BlocksEnums.block.TextContent:
+            return (
+              <section key={`${item.__typename}-${idx}`}>
+                <JsonToHtml
+                  embeds={
+                    item.text_content.content.embedded_itemsConnection.edges
+                  }
+                  nodes={item.text_content.content.json.children}
+                />
+              </section>
+            )
+          default:
+            return null
+        }
+      })}
+    </>
+  )
+}
diff --git a/components/ContentType/Webviews/accountPage.module.css b/components/Webviews/AccountPage/accountPage.module.css
similarity index 100%
rename from components/ContentType/Webviews/accountPage.module.css
rename to components/Webviews/AccountPage/accountPage.module.css
diff --git a/components/ContentType/Webviews/AccountPage.tsx b/components/Webviews/AccountPage/index.tsx
similarity index 84%
rename from components/ContentType/Webviews/AccountPage.tsx
rename to components/Webviews/AccountPage/index.tsx
index dd4511d56..572ea485e 100644
--- a/components/ContentType/Webviews/AccountPage.tsx
+++ b/components/Webviews/AccountPage/index.tsx
@@ -5,14 +5,14 @@ import { overview } from "@/constants/routes/webviews"
 import { serverClient } from "@/lib/trpc/server"
 
 import MaxWidth from "@/components/MaxWidth"
-import Content from "@/components/MyPages/AccountPage/Webview/Content"
 import TrackingSDK from "@/components/TrackingSDK"
+import Blocks from "@/components/Webviews/AccountPage/Blocks"
 import LinkToOverview from "@/components/Webviews/LinkToOverview"
 import { getLang } from "@/i18n/serverContext"
 
 import styles from "./accountPage.module.css"
 
-export default async function MyPages() {
+export default async function AccountPage() {
   const accountPageRes = await serverClient().contentstack.accountPage.get()
 
   if (!accountPageRes) {
@@ -28,7 +28,7 @@ export default async function MyPages() {
     <>
       <MaxWidth className={styles.blocks} tag="main">
         {linkToOverview ? <LinkToOverview /> : null}
-        <Content content={accountPage.content} />
+        <Blocks content={accountPage.content} />
       </MaxWidth>
 
       <TrackingSDK pageData={tracking} />
diff --git a/components/Loyalty/Blocks/WebView/index.tsx b/components/Webviews/LoyaltyPage/Blocks.tsx
similarity index 60%
rename from components/Loyalty/Blocks/WebView/index.tsx
rename to components/Webviews/LoyaltyPage/Blocks.tsx
index 6b1fb4664..77d59dd22 100644
--- a/components/Loyalty/Blocks/WebView/index.tsx
+++ b/components/Webviews/LoyaltyPage/Blocks.tsx
@@ -1,35 +1,34 @@
+import CardsGrid from "@/components/Blocks/CardsGrid"
+import DynamicContent from "@/components/Blocks/DynamicContent"
+import Shortcuts from "@/components/Blocks/Shortcuts"
 import JsonToHtml from "@/components/JsonToHtml"
-import DynamicContentBlock from "@/components/Loyalty/Blocks/DynamicContent"
-import Shortcuts from "@/components/MyPages/Blocks/Shortcuts"
 import { getLang } from "@/i18n/serverContext"
 import { modWebviewLink } from "@/utils/webviews"
 
-import CardsGrid from "../CardsGrid"
+import type { BlocksProps } from "@/types/components/blocks"
+import { BlocksEnums } from "@/types/enums/blocks"
 
-import type { BlocksProps } from "@/types/components/loyalty/blocks"
-import { LoyaltyBlocksTypenameEnum } from "@/types/components/loyalty/enums"
-
-export function Blocks({ blocks }: BlocksProps) {
+export default function Blocks({ blocks }: BlocksProps) {
   return blocks.map((block, idx) => {
     const firstItem = idx === 0
-    switch (block.__typename) {
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid:
+    switch (block.typename) {
+      case BlocksEnums.block.CardsGrid:
         return (
           <CardsGrid
             key={`${block.cards_grid.title}-${idx}`}
             cards_grid={block.cards_grid}
           />
         )
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksContent:
+      case BlocksEnums.block.Content:
         return (
           <section key={`${block.__typename}-${idx}`}>
             <JsonToHtml
-              nodes={block.content.content.json.children}
-              embeds={block.content.content.embedded_itemsConnection.edges}
+              nodes={block.content.json.children}
+              embeds={block.content.embedded_itemsConnection.edges}
             />
           </section>
         )
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent:
+      case BlocksEnums.block.DynamicContent:
         const dynamicContent = {
           ...block.dynamic_content,
           link: block.dynamic_content.link
@@ -44,24 +43,24 @@ export function Blocks({ blocks }: BlocksProps) {
         }
 
         return (
-          <DynamicContentBlock
-            dynamicContent={dynamicContent}
+          <DynamicContent
+            dynamic_content={dynamicContent}
             firstItem={firstItem}
             key={`${block.dynamic_content.title}-${idx}`}
           />
         )
-      case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts:
+      case BlocksEnums.block.Shortcuts:
         const shortcuts = block.shortcuts.shortcuts.map((shortcut) => ({
           ...shortcut,
           url: modWebviewLink(shortcut.url, getLang()),
         }))
         return (
           <Shortcuts
-            firstItem={firstItem}
             key={`${block.shortcuts.title}-${idx}`}
+            firstItem={firstItem}
             shortcuts={shortcuts}
+            subtitle={block.shortcuts.subtitle}
             title={block.shortcuts.title}
-            subtitle={block.shortcuts.preamble}
           />
         )
       default:
diff --git a/components/ContentType/Webviews/LoyaltyPage.tsx b/components/Webviews/LoyaltyPage/index.tsx
similarity index 93%
rename from components/ContentType/Webviews/LoyaltyPage.tsx
rename to components/Webviews/LoyaltyPage/index.tsx
index ac210a197..b14563772 100644
--- a/components/ContentType/Webviews/LoyaltyPage.tsx
+++ b/components/Webviews/LoyaltyPage/index.tsx
@@ -1,11 +1,12 @@
 import { serverClient } from "@/lib/trpc/server"
 
-import { Blocks } from "@/components/Loyalty/Blocks/WebView"
 import MaxWidth from "@/components/MaxWidth"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import TrackingSDK from "@/components/TrackingSDK"
 import LinkToOverview from "@/components/Webviews/LinkToOverview"
 
+import Blocks from "./Blocks"
+
 import styles from "./loyaltyPage.module.css"
 
 export default async function AboutScandicFriends() {
diff --git a/components/ContentType/Webviews/loyaltyPage.module.css b/components/Webviews/LoyaltyPage/loyaltyPage.module.css
similarity index 100%
rename from components/ContentType/Webviews/loyaltyPage.module.css
rename to components/Webviews/LoyaltyPage/loyaltyPage.module.css
diff --git a/i18n/dictionaries/da.json b/i18n/dictionaries/da.json
index 367a43724..d6b4ab721 100644
--- a/i18n/dictionaries/da.json
+++ b/i18n/dictionaries/da.json
@@ -1,4 +1,5 @@
 {
+  "A destination or hotel name is needed to be able to search for a hotel room.": "Et destinations- eller hotelnavn er nødvendigt for at kunne søge efter et hotelværelse.",
   "A photo of the room": "Et foto af værelset",
   "Activities": "Aktiviteter",
   "Add code": "Tilføj kode",
@@ -11,10 +12,8 @@
   "An error occurred when adding a credit card, please try again later.": "Der opstod en fejl under tilføjelse af et kreditkort. Prøv venligst igen senere.",
   "An error occurred when trying to update profile.": "Der opstod en fejl under forsøg på at opdatere profilen.",
   "Any changes you've made will be lost.": "Alle ændringer, du har foretaget, går tabt.",
-  "Are you sure you want to remove the card ending with": "Er du sikker på, at du vil fjerne kortet, der slutter med",
   "Are you sure you want to remove the card ending with {lastFourDigits} from your member profile?": "Er du sikker på, at du vil fjerne kortet, der slutter me {lastFourDigits} fra din medlemsprofil?",
   "Arrival date": "Ankomstdato",
-  "as of today": "fra idag",
   "As our": "Som vores {level}",
   "As our Close Friend": "Som vores nære ven",
   "At latest": "Senest",
@@ -29,15 +28,15 @@
   "Breakfast excluded": "Morgenmad ikke inkluderet",
   "Breakfast included": "Morgenmad inkluderet",
   "Bus terminal": "Busstation",
-  "by": "inden",
   "Cancel": "Afbestille",
-  "characters": "tegn",
   "Check in": "Check ind",
   "Check out": "Check ud",
   "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.": "Tjek de kreditkort, der er gemt på din profil. Betal med et gemt kort, når du er logget ind for en mere jævn weboplevelse.",
   "Choose room": "Vælg rum",
+  "Cities": "Byer",
   "City": "By",
   "City/State": "By/Stat",
+  "Clear searches": "Ryd søgninger",
   "Click here to log in": "Klik her for at logge ind",
   "Close": "Tæt",
   "Close language menu": "Luk sprogmenu",
@@ -58,16 +57,20 @@
   "Date of Birth": "Fødselsdato",
   "Day": "Dag",
   "Description": "Beskrivelse",
+  "Destinations & hotels": "Destinationer & hoteller",
   "Discard changes": "Kassér ændringer",
   "Discard unsaved changes?": "Slette ændringer, der ikke er gemt?",
+  "Distance to city centre": "{number}km til centrum",
   "Do you want to start the day with Scandics famous breakfast buffé?": "Vil du starte dagen med Scandics berømte morgenbuffet?",
   "Download the Scandic app": "Download Scandic-appen",
   "Edit": "Redigere",
   "Edit profile": "Rediger profil",
   "Email": "E-mail",
+  "Enter destination or hotel": "Indtast destination eller hotel",
   "Explore all levels and benefits": "Udforsk alle niveauer og fordele",
   "Explore nearby": "Udforsk i nærheden",
   "Extras to your booking": "Tillæg til din booking",
+  "FAQ": "Ofte stillede spørgsmål",
   "Failed to delete credit card, please try again later.": "Kunne ikke slette kreditkort. Prøv venligst igen senere.",
   "Fair": "Messe",
   "Find booking": "Find booking",
@@ -86,12 +89,13 @@
   "Hotel": "Hotel",
   "Hotel facilities": "Hotel faciliteter",
   "Hotel surroundings": "Hotel omgivelser",
+  "Hotels": "Hoteller",
   "How do you want to sleep?": "Hvordan vil du sove?",
   "How it works": "Hvordan det virker",
   "Image gallery": "Billedgalleri",
   "Join Scandic Friends": "Tilmeld dig Scandic Friends",
-  "km to city center": "km til byens centrum",
   "Language": "Sprog",
+  "Latest searches": "Seneste søgninger",
   "Level": "Niveau",
   "Level 1": "Niveau 1",
   "Level 2": "Niveau 2",
@@ -101,6 +105,7 @@
   "Level 6": "Niveau 6",
   "Level 7": "Niveau 7",
   "Level up to unlock": "Stig i niveau for at låse op",
+  "Locations": "Placeringer",
   "Log in": "Log på",
   "Log in here": "Log ind her",
   "Log in/Join": "Log på/Tilmeld dig",
@@ -114,9 +119,9 @@
   "Member price": "Medlemspris",
   "Member price from": "Medlemspris fra",
   "Members": "Medlemmer",
-  "Membership cards": "Medlemskort",
   "Membership ID": "Medlems-id",
   "Membership ID copied to clipboard": "Medlems-ID kopieret til udklipsholder",
+  "Membership cards": "Medlemskort",
   "Menu": "Menu",
   "Modify": "Ændre",
   "Month": "Måned",
@@ -131,24 +136,21 @@
   "Nearby companies": "Nærliggende virksomheder",
   "New password": "Nyt kodeord",
   "Next": "Næste",
-  "next level:": "Næste niveau:",
-  "night": "nat",
-  "nights": "nætter",
   "Nights needed to level up": "Nætter nødvendige for at komme i niveau",
   "No content published": "Intet indhold offentliggjort",
+  "No matching location found": "Der blev ikke fundet nogen matchende placering",
+  "No results": "Ingen resultater",
   "No transactions available": "Ingen tilgængelige transaktioner",
   "No, keep card": "Nej, behold kortet",
   "Non refundable": "Ikke-refunderbart",
   "Non-refundable": "Ikke-refunderbart",
   "Not found": "Ikke fundet",
   "Nr night, nr adult": "{nights, number} nat, {adults, number} voksen",
-  "number": "nummer",
   "On your journey": "På din rejse",
   "Open": "Åben",
   "Open language menu": "Åbn sprogmenuen",
   "Open menu": "Åbn menuen",
   "Open my pages menu": "Åbn mine sider menuen",
-  "or": "eller",
   "Overview": "Oversigt",
   "Parking / Garage": "Parkering / Garage",
   "Password": "Adgangskode",
@@ -160,7 +162,6 @@
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Indtast venligst et gyldigt telefonnummer",
   "Points": "Point",
-  "points": "Point",
   "Points being calculated": "Point udregnes",
   "Points earned prior to May 1, 2021": "Point optjent inden 1. maj 2021",
   "Points may take up to 10 days to be displayed.": "Det kan tage op til 10 dage at få vist point.",
@@ -183,6 +184,7 @@
   "Scandic Friends Point Shop": "Scandic Friends Point Shop",
   "See all photos": "Se alle billeder",
   "See hotel details": "Se hoteloplysninger",
+  "See room details": "Se værelsesdetaljer",
   "See rooms": "Se værelser",
   "Select a country": "Vælg et land",
   "Select country of residence": "Vælg bopælsland",
@@ -199,29 +201,25 @@
   "Something went wrong and we couldn't add your card. Please try again later.": "Noget gik galt, og vi kunne ikke tilføje dit kort. Prøv venligst igen senere.",
   "Something went wrong and we couldn't remove your card. Please try again later.": "Noget gik galt, og vi kunne ikke fjerne dit kort. Prøv venligst igen senere.",
   "Something went wrong!": "Noget gik galt!",
-  "special character": "speciel karakter",
-  "spendable points expiring by": "{points} Brugbare point udløber den {date}",
   "Sports": "Sport",
   "Standard price": "Standardpris",
   "Street": "Gade",
   "Successfully updated profile!": "Profilen er opdateret med succes!",
   "Summary": "Opsummering",
+  "TUI Points": "TUI Points",
   "Tell us what information and updates you'd like to receive, and how, by clicking the link below.": "Fortæl os, hvilke oplysninger og opdateringer du gerne vil modtage, og hvordan, ved at klikke på linket nedenfor.",
   "Thank you": "Tak",
   "Theatre": "Teater",
   "There are no transactions to display": "Der er ingen transaktioner at vise",
   "Things nearby HOTEL_NAME": "Ting i nærheden af {hotelName}",
-  "to": "til",
   "Total Points": "Samlet antal point",
   "Tourist": "Turist",
   "Transaction date": "Overførselsdato",
   "Transactions": "Transaktioner",
   "Transportations": "Transport",
   "Tripadvisor reviews": "{rating} ({count} anmeldelser på Tripadvisor)",
-  "TUI Points": "TUI Points",
   "Type of bed": "Sengtype",
   "Type of room": "Værelsestype",
-  "uppercase letter": "stort bogstav",
   "Use bonus cheque": "Brug Bonus Cheque",
   "User information": "Brugeroplysninger",
   "View as list": "Vis som liste",
@@ -229,6 +227,7 @@
   "View your booking": "Se din booking",
   "Visiting address": "Besøgsadresse",
   "We could not add a card right now, please try again later.": "Vi kunne ikke tilføje et kort lige nu. Prøv venligst igen senere.",
+  "We couldn't find a matching location for your search.": "Vi kunne ikke finde en matchende lokation til din søgning.",
   "We have sent a detailed confirmation of your booking to your email:": "Vi har sendt en detaljeret bekræftelse af din booking til din email:",
   "We look forward to your visit!": "Vi ser frem til dit besøg!",
   "Weekdays": "Hverdage",
@@ -246,9 +245,9 @@
   "You canceled adding a new credit card.": "Du har annulleret tilføjelsen af et nyt kreditkort.",
   "You have no previous stays.": "Du har ingen tidligere ophold.",
   "You have no upcoming stays.": "Du har ingen kommende ophold.",
+  "Your Challenges Conquer & Earn!": "Dine udfordringer Overvind og tjen!",
   "Your card was successfully removed!": "Dit kort blev fjernet!",
   "Your card was successfully saved!": "Dit kort blev gemt!",
-  "Your Challenges Conquer & Earn!": "Dine udfordringer Overvind og tjen!",
   "Your current level": "Dit nuværende niveau",
   "Your details": "Dine oplysninger",
   "Your level": "Dit niveau",
@@ -256,5 +255,22 @@
   "Zip code": "Postnummer",
   "Zoo": "Zoo",
   "Zoom in": "Zoom ind",
-  "Zoom out": "Zoom ud"
-}
+  "Zoom out": "Zoom ud",
+  "as of today": "fra idag",
+  "by": "inden",
+  "characters": "tegn",
+  "hotelPages.rooms.roomCard.person": "person",
+  "hotelPages.rooms.roomCard.persons": "personer",
+  "hotelPages.rooms.roomCard.seeRoomDetails": "Se værelsesdetaljer",
+  "km to city center": "km til byens centrum",
+  "next level:": "Næste niveau:",
+  "night": "nat",
+  "nights": "nætter",
+  "number": "nummer",
+  "or": "eller",
+  "points": "Point",
+  "special character": "speciel karakter",
+  "spendable points expiring by": "{points} Brugbare point udløber den {date}",
+  "to": "til",
+  "uppercase letter": "stort bogstav"
+}
\ No newline at end of file
diff --git a/i18n/dictionaries/de.json b/i18n/dictionaries/de.json
index 70d527064..279e43409 100644
--- a/i18n/dictionaries/de.json
+++ b/i18n/dictionaries/de.json
@@ -1,5 +1,7 @@
 {
+  "A destination or hotel name is needed to be able to search for a hotel room.": "Ein Reiseziel oder Hotelname wird benötigt, um nach einem Hotelzimmer suchen zu können.",
   "A photo of the room": "Ein Foto des Zimmers",
+  "Activities": "Aktivitäten",
   "Add code": "Code hinzufügen",
   "Add new card": "Neue Karte hinzufügen",
   "Address": "Adresse",
@@ -12,7 +14,6 @@
   "Any changes you've made will be lost.": "Alle Änderungen, die Sie vorgenommen haben, gehen verloren.",
   "Are you sure you want to remove the card ending with {lastFourDigits} from your member profile?": "Möchten Sie die Karte mit der Endung {lastFourDigits} wirklich aus Ihrem Mitgliedsprofil entfernen?",
   "Arrival date": "Ankunftsdatum",
-  "as of today": "Stand heute",
   "As our": "Als unser {level}",
   "As our Close Friend": "Als unser enger Freund",
   "At latest": "Spätestens",
@@ -27,15 +28,15 @@
   "Breakfast excluded": "Frühstück nicht inbegriffen",
   "Breakfast included": "Frühstück inbegriffen",
   "Bus terminal": "Busbahnhof",
-  "by": "bis",
   "Cancel": "Stornieren",
-  "characters": "figuren",
   "Check in": "Einchecken",
   "Check out": "Auschecken",
   "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.": "Sehen Sie sich die in Ihrem Profil gespeicherten Kreditkarten an. Bezahlen Sie mit einer gespeicherten Karte, wenn Sie angemeldet sind, für ein reibungsloseres Web-Erlebnis.",
   "Choose room": "Zimmer wählen",
+  "Cities": "Städte",
   "City": "Stadt",
   "City/State": "Stadt/Zustand",
+  "Clear searches": "Suche löschen",
   "Click here to log in": "Klicken Sie hier, um sich einzuloggen",
   "Close": "Schließen",
   "Close language menu": "Sprachmenü schließen",
@@ -56,16 +57,20 @@
   "Date of Birth": "Geburtsdatum",
   "Day": "Tag",
   "Description": "Beschreibung",
+  "Destinations & hotels": "Reiseziele & Hotels",
   "Discard changes": "Änderungen verwerfen",
   "Discard unsaved changes?": "Nicht gespeicherte Änderungen verwerfen?",
+  "Distance to city centre": "{number}km zum Stadtzentrum",
   "Do you want to start the day with Scandics famous breakfast buffé?": "Möchten Sie den Tag mit Scandics berühmtem Frühstücksbuffet beginnen?",
   "Download the Scandic app": "Laden Sie die Scandic-App herunter",
   "Edit": "Bearbeiten",
   "Edit profile": "Profil bearbeiten",
   "Email": "Email",
+  "Enter destination or hotel": "Reiseziel oder Hotel eingeben",
   "Explore all levels and benefits": "Entdecken Sie alle Levels und Vorteile",
   "Explore nearby": "Erkunden Sie die Umgebung",
   "Extras to your booking": "Extras zu Ihrer Buchung",
+  "FAQ": "Häufig gestellte Fragen",
   "Failed to delete credit card, please try again later.": "Kreditkarte konnte nicht gelöscht werden. Bitte versuchen Sie es später noch einmal.",
   "Fair": "Messe",
   "Find booking": "Buchung finden",
@@ -84,12 +89,13 @@
   "Hotel": "Hotel",
   "Hotel facilities": "Hotel-Infos",
   "Hotel surroundings": "Umgebung des Hotels",
+  "Hotels": "Hotels",
   "How do you want to sleep?": "Wie möchtest du schlafen?",
   "How it works": "Wie es funktioniert",
   "Image gallery": "Bildergalerie",
   "Join Scandic Friends": "Treten Sie Scandic Friends bei",
-  "km to city center": "km bis zum Stadtzentrum",
   "Language": "Sprache",
+  "Latest searches": "Letzte Suchanfragen",
   "Level": "Level",
   "Level 1": "Level 1",
   "Level 2": "Level 2",
@@ -99,6 +105,7 @@
   "Level 6": "Level 6",
   "Level 7": "Level 7",
   "Level up to unlock": "Zum Freischalten aufsteigen",
+  "Locations": "Orte",
   "Log in": "Anmeldung",
   "Log in here": "Hier einloggen",
   "Log in/Join": "Log in/Anmelden",
@@ -108,12 +115,13 @@
   "Map": "Karte",
   "Map of HOTEL_NAME": "Map of {hotelName}",
   "Marketing city": "Marketingstadt",
+  "Meetings & Conferences": "Tagungen & Konferenzen",
   "Member price": "Mitgliederpreis",
   "Member price from": "Mitgliederpreis ab",
   "Members": "Mitglieder",
-  "Membership cards": "Mitgliedskarten",
   "Membership ID": "Mitglieds-ID",
   "Membership ID copied to clipboard": "Mitglieds-ID in die Zwischenablage kopiert",
+  "Membership cards": "Mitgliedskarten",
   "Menu": "Menu",
   "Modify": "Ändern",
   "Month": "Monat",
@@ -128,26 +136,22 @@
   "Nearby companies": "Nahe gelegene Unternehmen",
   "New password": "Neues Kennwort",
   "Next": "Nächste",
-  "next level:": "Nächstes Level:",
-  "night": "nacht",
-  "nights": "Nächte",
   "Nights needed to level up": "Nächte, die zum Levelaufstieg benötigt werden",
   "No content published": "Kein Inhalt veröffentlicht",
+  "No matching location found": "Kein passender Standort gefunden",
+  "No results": "Keine Ergebnisse",
   "No transactions available": "Keine Transaktionen verfügbar",
   "No, keep card": "Nein, Karte behalten",
   "Non refundable": "Nicht erstattungsfähig",
   "Non-refundable": "Nicht erstattungsfähig",
   "Not found": "Nicht gefunden",
   "Nr night, nr adult": "{nights, number} Nacht, {adults, number} Erwachsener",
-  "number": "nummer",
   "On your journey": "Auf deiner Reise",
   "Open": "Offen",
   "Open language menu": "Sprachmenü öffnen",
   "Open menu": "Menü öffnen",
   "Open my pages menu": "Meine Seiten Menü öffnen",
-  "or": "oder",
   "Parking / Garage": "Parken / Garage",
-  "Password": "Passwort",
   "Pay later": "Später bezahlen",
   "Pay now": "Jetzt bezahlen",
   "Payment info": "Zahlungsinformationen",
@@ -156,7 +160,6 @@
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Bitte geben Sie eine gültige Telefonnummer ein",
   "Points": "Punkte",
-  "points": "Punkte",
   "Points being calculated": "Punkte werden berechnet",
   "Points earned prior to May 1, 2021": "Zusammengeführte Punkte vor dem 1. Mai 2021",
   "Points may take up to 10 days to be displayed.": "Es kann bis zu 10 Tage dauern, bis Punkte angezeigt werden.",
@@ -168,15 +171,18 @@
   "Read more about the hotel": "Lesen Sie mehr über das Hotel",
   "Remove card from member profile": "Karte aus dem Mitgliedsprofil entfernen",
   "Restaurant": "Restaurant",
+  "Restaurant & Bar": "Restaurant & Bar",
   "Retype new password": "Neues Passwort erneut eingeben",
   "Room & Terms": "Zimmer & Bedingungen",
   "Room facilities": "Zimmerausstattung",
+  "Rooms": "Räume",
   "Rooms & Guests": "Zimmer & Gäste",
   "Save": "Speichern",
   "Scandic Friends Mastercard": "Scandic Friends Mastercard",
   "Scandic Friends Point Shop": "Scandic Friends Point Shop",
   "See all photos": "Alle Fotos ansehen",
   "See hotel details": "Hotelinformationen ansehen",
+  "See room details": "Zimmerdetails ansehen",
   "See rooms": "Zimmer ansehen",
   "Select a country": "Wähle ein Land",
   "Select country of residence": "Wählen Sie das Land Ihres Wohnsitzes aus",
@@ -193,29 +199,25 @@
   "Something went wrong and we couldn't add your card. Please try again later.": "Ein Fehler ist aufgetreten und wir konnten Ihre Karte nicht hinzufügen. Bitte versuchen Sie es später erneut.",
   "Something went wrong and we couldn't remove your card. Please try again later.": "Ein Fehler ist aufgetreten und wir konnten Ihre Karte nicht entfernen. Bitte versuchen Sie es später noch einmal.",
   "Something went wrong!": "Etwas ist schief gelaufen!",
-  "special character": "sonderzeichen",
-  "spendable points expiring by": "{points} Einlösbare punkte verfallen bis zum {date}",
   "Sports": "Sport",
   "Standard price": "Standardpreis",
   "Street": "Straße",
   "Successfully updated profile!": "Profil erfolgreich aktualisiert!",
   "Summary": "Zusammenfassung",
+  "TUI Points": "TUI Points",
   "Tell us what information and updates you'd like to receive, and how, by clicking the link below.": "Teilen Sie uns mit, welche Informationen und Updates Sie wie erhalten möchten, indem Sie auf den unten stehenden Link klicken.",
   "Thank you": "Danke",
   "Theatre": "Theater",
   "There are no transactions to display": "Es sind keine Transaktionen zum Anzeigen vorhanden",
   "Things nearby HOTEL_NAME": "Dinge in der Nähe von {hotelName}",
-  "to": "zu",
   "Total Points": "Gesamtpunktzahl",
   "Tourist": "Tourist",
   "Transaction date": "Transaktionsdatum",
   "Transactions": "Transaktionen",
   "Transportations": "Transportmittel",
   "Tripadvisor reviews": "{rating} ({count} Bewertungen auf Tripadvisor)",
-  "TUI Points": "TUI Points",
   "Type of bed": "Bettentyp",
   "Type of room": "Zimmerart",
-  "uppercase letter": "großbuchstabe",
   "Use bonus cheque": "Bonusscheck nutzen",
   "User information": "Nutzerinformation",
   "View as list": "Als Liste anzeigen",
@@ -223,12 +225,14 @@
   "View your booking": "Ihre Buchung ansehen",
   "Visiting address": "Besuchsadresse",
   "We could not add a card right now, please try again later.": "Wir konnten momentan keine Karte hinzufügen. Bitte versuchen Sie es später noch einmal.",
+  "We couldn't find a matching location for your search.": "Wir konnten keinen passenden Standort für Ihre Suche finden.",
   "We have sent a detailed confirmation of your booking to your email:": "Wir haben eine detaillierte Bestätigung Ihrer Buchung an Ihre E-Mail gesendet:",
   "We look forward to your visit!": "Wir freuen uns auf Ihren Besuch!",
   "Weekdays": "Wochentage",
   "Weekends": "Wochenenden",
   "Welcome": "Willkommen",
   "Welcome to": "Willkommen zu",
+  "Wellness & Exercise": "Wellness & Bewegung",
   "When": "Wann",
   "Where should you go next?": "Wo geht es als Nächstes hin?",
   "Where to": "Wohin",
@@ -239,9 +243,9 @@
   "You canceled adding a new credit card.": "Sie haben das Hinzufügen einer neuen Kreditkarte abgebrochen.",
   "You have no previous stays.": "Sie haben keine vorherigen Aufenthalte.",
   "You have no upcoming stays.": "Sie haben keine bevorstehenden Aufenthalte.",
+  "Your Challenges Conquer & Earn!": "Meistern Sie Ihre Herausforderungen und verdienen Sie Geld!",
   "Your card was successfully removed!": "Ihre Karte wurde erfolgreich entfernt!",
   "Your card was successfully saved!": "Ihre Karte wurde erfolgreich gespeichert!",
-  "Your Challenges Conquer & Earn!": "Meistern Sie Ihre Herausforderungen und verdienen Sie Geld!",
   "Your current level": "Ihr aktuelles Level",
   "Your details": "Ihre Angaben",
   "Your level": "Dein level",
@@ -249,5 +253,22 @@
   "Zip code": "PLZ",
   "Zoo": "Zoo",
   "Zoom in": "Vergrößern",
-  "Zoom out": "Verkleinern"
-}
+  "Zoom out": "Verkleinern",
+  "as of today": "Stand heute",
+  "by": "bis",
+  "characters": "figuren",
+  "hotelPages.rooms.roomCard.person": "person",
+  "hotelPages.rooms.roomCard.persons": "personen",
+  "hotelPages.rooms.roomCard.seeRoomDetails": "Zimmerdetails ansehen",
+  "km to city center": "km bis zum Stadtzentrum",
+  "next level:": "Nächstes Level:",
+  "night": "nacht",
+  "nights": "Nächte",
+  "number": "nummer",
+  "or": "oder",
+  "points": "Punkte",
+  "special character": "sonderzeichen",
+  "spendable points expiring by": "{points} Einlösbare punkte verfallen bis zum {date}",
+  "to": "zu",
+  "uppercase letter": "großbuchstabe"
+}
\ No newline at end of file
diff --git a/i18n/dictionaries/en.json b/i18n/dictionaries/en.json
index 8a3937452..0bc741364 100644
--- a/i18n/dictionaries/en.json
+++ b/i18n/dictionaries/en.json
@@ -1,4 +1,5 @@
 {
+  "A destination or hotel name is needed to be able to search for a hotel room.": "A destination or hotel name is needed to be able to search for a hotel room.",
   "A photo of the room": "A photo of the room",
   "Activities": "Activities",
   "Add code": "Add code",
@@ -35,8 +36,10 @@
   "Check out": "Check out",
   "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.": "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.",
   "Choose room": "Choose room",
+  "Cities": "Cities",
   "City": "City",
   "City/State": "City/State",
+  "Clear searches": "Clear searches",
   "Click here to log in": "Click here to log in",
   "Close": "Close",
   "Close language menu": "Close language menu",
@@ -57,6 +60,7 @@
   "Date of Birth": "Date of Birth",
   "Day": "Day",
   "Description": "Description",
+  "Destinations & hotels": "Destinations & hotels",
   "Discard changes": "Discard changes",
   "Discard unsaved changes?": "Discard unsaved changes?",
   "Distance to city centre": "{number}km to city centre",
@@ -65,6 +69,7 @@
   "Edit": "Edit",
   "Edit profile": "Edit profile",
   "Email": "Email",
+  "Enter destination or hotel": "Enter destination or hotel",
   "Explore all levels and benefits": "Explore all levels and benefits",
   "Explore nearby": "Explore nearby",
   "Extras to your booking": "Extras to your booking",
@@ -90,12 +95,14 @@
   "hotelPages.rooms.roomCard.person": "person",
   "hotelPages.rooms.roomCard.persons": "persons",
   "hotelPages.rooms.roomCard.seeRoomDetails": "See room details",
+  "Hotels": "Hotels",
   "How do you want to sleep?": "How do you want to sleep?",
   "How it works": "How it works",
   "Image gallery": "Image gallery",
   "Join Scandic Friends": "Join Scandic Friends",
   "km to city center": "km to city center",
   "Language": "Language",
+  "Latest searches": "Latest searches",
   "Level": "Level",
   "Level 1": "Level 1",
   "Level 2": "Level 2",
@@ -105,6 +112,7 @@
   "Level 6": "Level 6",
   "Level 7": "Level 7",
   "Level up to unlock": "Level up to unlock",
+  "Locations": "Locations",
   "Log in": "Log in",
   "Log in here": "Log in here",
   "Log in/Join": "Log in/Join",
@@ -140,6 +148,8 @@
   "nights": "nights",
   "Nights needed to level up": "Nights needed to level up",
   "No content published": "No content published",
+  "No matching location found": "No matching location found",
+  "No results": "No results",
   "No transactions available": "No transactions available",
   "No, keep card": "No, keep card",
   "Non refundable": "Non refundable",
@@ -234,6 +244,7 @@
   "View your booking": "View your booking",
   "Visiting address": "Visiting address",
   "We could not add a card right now, please try again later.": "We could not add a card right now, please try again later.",
+  "We couldn't find a matching location for your search.": "We couldn't find a matching location for your search.",
   "We have sent a detailed confirmation of your booking to your email: ": "We have sent a detailed confirmation of your booking to your email: ",
   "We look forward to your visit!": "We look forward to your visit!",
   "Weekdays": "Weekdays",
@@ -244,7 +255,7 @@
   "When": "When",
   "Where should you go next?": "Where should you go next?",
   "Where to": "Where to",
-  "Which room class suits yo∏u the best?": "Which room class suits you the best?",
+  "Which room class suits you the best?": "Which room class suits you the best?",
   "Year": "Year",
   "Yes, discard changes": "Yes, discard changes",
   "Yes, remove my card": "Yes, remove my card",
@@ -262,4 +273,4 @@
   "Zoo": "Zoo",
   "Zoom in": "Zoom in",
   "Zoom out": "Zoom out"
-}
+}
\ No newline at end of file
diff --git a/i18n/dictionaries/fi.json b/i18n/dictionaries/fi.json
index 075552ddf..f14202c86 100644
--- a/i18n/dictionaries/fi.json
+++ b/i18n/dictionaries/fi.json
@@ -1,4 +1,5 @@
 {
+  "A destination or hotel name is needed to be able to search for a hotel room.": "Kohteen tai hotellin nimi tarvitaan, jotta hotellihuonetta voidaan hakea.",
   "A photo of the room": "Kuva huoneesta",
   "Activities": "Aktiviteetit",
   "Add code": "Lisää koodi",
@@ -13,7 +14,6 @@
   "Any changes you've made will be lost.": "Kaikki tekemäsi muutokset menetetään.",
   "Are you sure you want to remove the card ending with {lastFourDigits} from your member profile?": "Haluatko varmasti poistaa kortin, joka päättyy numeroon {lastFourDigits} jäsenprofiilistasi?",
   "Arrival date": "Saapumispäivä",
-  "as of today": "tänään",
   "As our": "{level}-etu",
   "As our Close Friend": "Läheisenä ystävänämme",
   "At latest": "Viimeistään",
@@ -28,15 +28,15 @@
   "Breakfast excluded": "Aamiainen ei sisälly",
   "Breakfast included": "Aamiainen sisältyy",
   "Bus terminal": "Bussiasema",
-  "by": "mennessä",
   "Cancel": "Peruuttaa",
-  "characters": "hahmoja",
   "Check in": "Sisäänkirjautuminen",
   "Check out": "Uloskirjautuminen",
   "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.": "Tarkista profiiliisi tallennetut luottokortit. Maksa tallennetulla kortilla kirjautuneena, jotta verkkokokemus on sujuvampi.",
   "Choose room": "Valitse huone",
+  "Cities": "Kaupungit",
   "City": "Kaupunki",
   "City/State": "Kaupunki/Osavaltio",
+  "Clear searches": "Tyhjennä haut",
   "Click here to log in": "Napsauta tästä kirjautuaksesi sisään",
   "Close": "Kiinni",
   "Close language menu": "Sulje kielivalikko",
@@ -57,16 +57,20 @@
   "Date of Birth": "Syntymäaika",
   "Day": "Päivä",
   "Description": "Kuvaus",
+  "Destinations & hotels": "Kohteet ja hotellit",
   "Discard changes": "Hylkää muutokset",
   "Discard unsaved changes?": "Hylkäätkö tallentamattomat muutokset?",
+  "Distance to city centre": "{number}km Etäisyys kaupunkiin",
   "Do you want to start the day with Scandics famous breakfast buffé?": "Haluatko aloittaa päiväsi Scandicsin kuuluisalla aamiaisbuffella?",
   "Download the Scandic app": "Lataa Scandic-sovellus",
   "Edit": "Muokata",
   "Edit profile": "Muokkaa profiilia",
   "Email": "Sähköposti",
+  "Enter destination or hotel": "Anna kohde tai hotelli",
   "Explore all levels and benefits": "Tutustu kaikkiin tasoihin ja etuihin",
   "Explore nearby": "Tutustu lähialueeseen",
   "Extras to your booking": "Varauksessa lisäpalveluita",
+  "FAQ": "UKK",
   "Failed to delete credit card, please try again later.": "Luottokortin poistaminen epäonnistui, yritä myöhemmin uudelleen.",
   "Fair": "Messukeskus",
   "Find booking": "Etsi varaus",
@@ -85,12 +89,13 @@
   "Hotel": "Hotelli",
   "Hotel facilities": "Hotellin palvelut",
   "Hotel surroundings": "Hotellin ympäristö",
+  "Hotels": "Hotellit",
   "How do you want to sleep?": "Kuinka haluat nukkua?",
   "How it works": "Kuinka se toimii",
   "Image gallery": "Kuvagalleria",
   "Join Scandic Friends": "Liity jäseneksi",
-  "km to city center": "km keskustaan",
   "Language": "Kieli",
+  "Latest searches": "Viimeisimmät haut",
   "Level": "Level",
   "Level 1": "Taso 1",
   "Level 2": "Taso 2",
@@ -100,6 +105,7 @@
   "Level 6": "Taso 6",
   "Level 7": "Taso 7",
   "Level up to unlock": "Nosta taso avataksesi lukituksen",
+  "Locations": "Sijainnit",
   "Log in": "Kirjaudu sisään",
   "Log in here": "Kirjaudu sisään",
   "Log in/Join": "Kirjaudu sisään/Liittyä",
@@ -113,9 +119,9 @@
   "Member price": "Jäsenhinta",
   "Member price from": "Jäsenhinta alkaen",
   "Members": "Jäsenet",
-  "Membership cards": "Jäsenkortit",
   "Membership ID": "Jäsentunnus",
   "Membership ID copied to clipboard": "Jäsenyystunnus kopioitu leikepöydälle",
+  "Membership cards": "Jäsenkortit",
   "Menu": "Valikko",
   "Modify": "Muokkaa",
   "Month": "Kuukausi",
@@ -130,24 +136,21 @@
   "Nearby companies": "Läheiset yritykset",
   "New password": "Uusi salasana",
   "Next": "Seuraava",
-  "next level:": "pistettä tasolle:",
-  "night": "yö",
-  "nights": "yötä",
   "Nights needed to level up": "Yöt, joita tarvitaan tasolle",
   "No content published": "Ei julkaistua sisältöä",
+  "No matching location found": "Vastaavaa sijaintia ei löytynyt",
+  "No results": "Ei tuloksia",
   "No transactions available": "Ei tapahtumia saatavilla",
   "No, keep card": "Ei, pidä kortti",
   "Non refundable": "Ei palautettavissa",
   "Non-refundable": "Ei palautettavissa",
   "Not found": "Ei löydetty",
   "Nr night, nr adult": "{nights, number} yö, {adults, number} aikuinen",
-  "number": "määrä",
   "On your journey": "Matkallasi",
   "Open": "Avata",
   "Open language menu": "Avaa kielivalikko",
   "Open menu": "Avaa valikko",
   "Open my pages menu": "Avaa omat sivut -valikko",
-  "or": "tai",
   "Overview": "Yleiskatsaus",
   "Parking / Garage": "Pysäköinti / Autotalli",
   "Password": "Salasana",
@@ -159,7 +162,6 @@
   "Phone number": "Puhelinnumero",
   "Please enter a valid phone number": "Ole hyvä ja näppäile voimassaoleva puhelinnumero",
   "Points": "Pisteet",
-  "points": "pistettä",
   "Points being calculated": "Pisteitä lasketaan",
   "Points earned prior to May 1, 2021": "Pisteet, jotka ansaittu ennen 1.5.2021",
   "Points may take up to 10 days to be displayed.": "Pisteiden näyttäminen voi kestää jopa 10 päivää.",
@@ -176,12 +178,14 @@
   "Room & Terms": "Huone & Ehdot",
   "Room facilities": "Huoneen varustelu",
   "Rooms": "Huoneet",
+  "Rooms & Guests": "Huoneet & Vieraat",
   "Rooms & Guestss": "Huoneet & Vieraat",
   "Save": "Tallentaa",
   "Scandic Friends Mastercard": "Scandic Friends Mastercard",
   "Scandic Friends Point Shop": "Scandic Friends Point Shop",
   "See all photos": "Katso kaikki kuvat",
   "See hotel details": "Katso hotellin tiedot",
+  "See room details": "Katso huoneen tiedot",
   "See rooms": "Katso huoneet",
   "Select a country": "Valitse maa",
   "Select country of residence": "Valitse asuinmaa",
@@ -198,29 +202,25 @@
   "Something went wrong and we couldn't add your card. Please try again later.": "Jotain meni pieleen, emmekä voineet lisätä korttiasi. Yritä myöhemmin uudelleen.",
   "Something went wrong and we couldn't remove your card. Please try again later.": "Jotain meni pieleen, emmekä voineet poistaa korttiasi. Yritä myöhemmin uudelleen.",
   "Something went wrong!": "Jotain meni pieleen!",
-  "special character": "erikoishahmo",
-  "spendable points expiring by": "{points} pistettä vanhenee {date} mennessä",
   "Sports": "Urheilu",
   "Standard price": "Normaali hinta",
   "Street": "Katu",
   "Successfully updated profile!": "Profiilin päivitys onnistui!",
   "Summary": "Yhteenveto",
+  "TUI Points": "TUI Points",
   "Tell us what information and updates you'd like to receive, and how, by clicking the link below.": "Kerro meille, mitä tietoja ja päivityksiä haluat saada ja miten, napsauttamalla alla olevaa linkkiä.",
   "Thank you": "Kiitos",
   "Theatre": "Teatteri",
   "There are no transactions to display": "Näytettäviä tapahtumia ei ole",
   "Things nearby HOTEL_NAME": "Lähellä olevia asioita {hotelName}",
-  "to": "to",
   "Total Points": "Kokonaispisteet",
   "Tourist": "Turisti",
   "Transaction date": "Tapahtuman päivämäärä",
   "Transactions": "Tapahtumat",
   "Transportations": "Kuljetukset",
   "Tripadvisor reviews": "{rating} ({count} arvostelua TripAdvisorissa)",
-  "TUI Points": "TUI Points",
   "Type of bed": "Vuodetyyppi",
   "Type of room": "Huonetyyppi",
-  "uppercase letter": "iso kirjain",
   "Use bonus cheque": "Käytä bonussekkiä",
   "User information": "Käyttäjän tiedot",
   "View as list": "Näytä listana",
@@ -228,6 +228,7 @@
   "View your booking": "Näytä varauksesi",
   "Visiting address": "Käyntiosoite",
   "We could not add a card right now, please try again later.": "Emme voineet lisätä korttia juuri nyt. Yritä myöhemmin uudelleen.",
+  "We couldn't find a matching location for your search.": "Emme löytäneet hakuasi vastaavaa sijaintia.",
   "We have sent a detailed confirmation of your booking to your email:": "Olemme lähettäneet yksityiskohtaisen varausvahvistuksen sähköpostiisi:",
   "We look forward to your visit!": "Odotamme innolla vierailuasi!",
   "Weekdays": "Arkisin",
@@ -245,9 +246,9 @@
   "You canceled adding a new credit card.": "Peruutit uuden luottokortin lisäämisen.",
   "You have no previous stays.": "Sinulla ei ole aiempia majoituksia.",
   "You have no upcoming stays.": "Sinulla ei ole tulevia majoituksia.",
+  "Your Challenges Conquer & Earn!": "Voita ja ansaitse haasteesi!",
   "Your card was successfully removed!": "Korttisi poistettiin onnistuneesti!",
   "Your card was successfully saved!": "Korttisi tallennettu onnistuneesti!",
-  "Your Challenges Conquer & Earn!": "Voita ja ansaitse haasteesi!",
   "Your current level": "Nykyinen tasosi",
   "Your details": "Tietosi",
   "Your level": "Tasosi",
@@ -255,5 +256,22 @@
   "Zip code": "Postinumero",
   "Zoo": "Eläintarha",
   "Zoom in": "Lähennä",
-  "Zoom out": "Loitonna"
-}
+  "Zoom out": "Loitonna",
+  "as of today": "tänään",
+  "by": "mennessä",
+  "characters": "hahmoja",
+  "hotelPages.rooms.roomCard.person": "henkilö",
+  "hotelPages.rooms.roomCard.persons": "Henkilöä",
+  "hotelPages.rooms.roomCard.seeRoomDetails": "Katso huoneen tiedot",
+  "km to city center": "km keskustaan",
+  "next level:": "pistettä tasolle:",
+  "night": "yö",
+  "nights": "yötä",
+  "number": "määrä",
+  "or": "tai",
+  "points": "pistettä",
+  "special character": "erikoishahmo",
+  "spendable points expiring by": "{points} pistettä vanhenee {date} mennessä",
+  "to": "to",
+  "uppercase letter": "iso kirjain"
+}
\ No newline at end of file
diff --git a/i18n/dictionaries/no.json b/i18n/dictionaries/no.json
index ea318036f..12e6f162a 100644
--- a/i18n/dictionaries/no.json
+++ b/i18n/dictionaries/no.json
@@ -1,4 +1,5 @@
 {
+  "A destination or hotel name is needed to be able to search for a hotel room.": "Et reisemål eller hotellnavn er nødvendig for å kunne søke etter et hotellrom.",
   "A photo of the room": "Et bilde av rommet",
   "Activities": "Aktiviteter",
   "Add code": "Legg til kode",
@@ -13,7 +14,6 @@
   "Any changes you've made will be lost.": "Eventuelle endringer du har gjort, går tapt.",
   "Are you sure you want to remove the card ending with {lastFourDigits} from your member profile?": "Er du sikker på at du vil fjerne kortet som slutter på {lastFourDigits} fra medlemsprofilen din?",
   "Arrival date": "Ankomstdato",
-  "as of today": "per idag",
   "As our": "Som vår {level}",
   "As our Close Friend": "Som vår nære venn",
   "At latest": "Senest",
@@ -28,15 +28,15 @@
   "Breakfast excluded": "Frokost ekskludert",
   "Breakfast included": "Frokost inkludert",
   "Bus terminal": "Bussterminal",
-  "by": "innen",
   "Cancel": "Avbryt",
-  "characters": "tegn",
   "Check in": "Sjekk inn",
   "Check out": "Sjekk ut",
   "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.": "Sjekk ut kredittkortene som er lagret på profilen din. Betal med et lagret kort når du er pålogget for en jevnere nettopplevelse.",
   "Choose room": "Velg rom",
+  "Cities": "Byer",
   "City": "By",
   "City/State": "By/Stat",
+  "Clear searches": "Tømme søk",
   "Click here to log in": "Klikk her for å logge inn",
   "Close": "Lukk",
   "Close language menu": "Lukk språkmeny",
@@ -57,16 +57,20 @@
   "Date of Birth": "Fødselsdato",
   "Day": "Dag",
   "Description": "Beskrivelse",
+  "Destinations & hotels": "Destinasjoner og hoteller",
   "Discard changes": "Forkaste endringer",
   "Discard unsaved changes?": "Forkaste endringer som ikke er lagret?",
+  "Distance to city centre": "{number}km til sentrum",
   "Do you want to start the day with Scandics famous breakfast buffé?": "Vil du starte dagen med Scandics berømte frokostbuffé?",
   "Download the Scandic app": "Last ned Scandic-appen",
   "Edit": "Redigere",
   "Edit profile": "Rediger profil",
   "Email": "E-post",
+  "Enter destination or hotel": "Skriv inn destinasjon eller hotell",
   "Explore all levels and benefits": "Utforsk alle nivåer og fordeler",
   "Explore nearby": "Utforsk i nærheten",
   "Extras to your booking": "Tilvalg til bestillingen din",
+  "FAQ": "FAQ",
   "Failed to delete credit card, please try again later.": "Kunne ikke slette kredittkortet, prøv igjen senere.",
   "Fair": "Messe",
   "Find booking": "Finn booking",
@@ -85,12 +89,13 @@
   "Hotel": "Hotel",
   "Hotel facilities": "Hotelfaciliteter",
   "Hotel surroundings": "Hotellomgivelser",
+  "Hotels": "Hoteller",
   "How do you want to sleep?": "Hvordan vil du sove?",
   "How it works": "Hvordan det fungerer",
   "Image gallery": "Bildegalleri",
   "Join Scandic Friends": "Bli med i Scandic Friends",
-  "km to city center": "km til sentrum",
   "Language": "Språk",
+  "Latest searches": "Siste søk",
   "Level": "Nivå",
   "Level 1": "Nivå 1",
   "Level 2": "Nivå 2",
@@ -100,6 +105,7 @@
   "Level 6": "Nivå 6",
   "Level 7": "Nivå 7",
   "Level up to unlock": "Nivå opp for å låse opp",
+  "Locations": "Steder",
   "Log in": "Logg Inn",
   "Log in here": "Logg inn her",
   "Log in/Join": "Logg på/Bli med",
@@ -113,9 +119,9 @@
   "Member price": "Medlemspris",
   "Member price from": "Medlemspris fra",
   "Members": "Medlemmer",
-  "Membership cards": "Medlemskort",
   "Membership ID": "Medlems-ID",
   "Membership ID copied to clipboard": "Medlems-ID kopiert til utklippstavlen",
+  "Membership cards": "Medlemskort",
   "Menu": "Menu",
   "Modify": "Endre",
   "Month": "Måned",
@@ -130,24 +136,21 @@
   "Nearby companies": "Nærliggende selskaper",
   "New password": "Nytt passord",
   "Next": "Neste",
-  "next level:": "Neste nivå:",
-  "night": "natt",
-  "nights": "netter",
   "Nights needed to level up": "Netter som trengs for å komme opp i nivå",
   "No content published": "Ingen innhold publisert",
+  "No matching location found": "Fant ingen samsvarende plassering",
+  "No results": "Ingen resultater",
   "No transactions available": "Ingen transaksjoner tilgjengelig",
   "No, keep card": "Nei, behold kortet",
   "Non refundable": "Ikke-refunderbart",
   "Non-refundable": "Ikke-refunderbart",
   "Not found": "Ikke funnet",
   "Nr night, nr adult": "{nights, number} natt, {adults, number} voksen",
-  "number": "antall",
   "On your journey": "På reisen din",
   "Open": "Åpen",
   "Open language menu": "Åpne språkmenyen",
   "Open menu": "Åpne menyen",
   "Open my pages menu": "Åpne mine sider menyen",
-  "or": "eller",
   "Overview": "Oversikt",
   "Parking / Garage": "Parkering / Garasje",
   "Password": "Passord",
@@ -158,7 +161,6 @@
   "Phone is required": "Telefon kreves",
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Vennligst oppgi et gyldig telefonnummer",
-  "points": "poeng",
   "Points": "Poeng",
   "Points being calculated": "Poeng beregnes",
   "Points earned prior to May 1, 2021": "Opptjente poeng før 1. mai 2021",
@@ -182,6 +184,7 @@
   "Scandic Friends Point Shop": "Scandic Friends Point Shop",
   "See all photos": "Se alle bilder",
   "See hotel details": "Se hotellinformasjon",
+  "See room details": "Se detaljer om rommet",
   "See rooms": "Se rom",
   "Select a country": "Velg et land",
   "Select country of residence": "Velg bostedsland",
@@ -198,29 +201,25 @@
   "Something went wrong and we couldn't add your card. Please try again later.": "Noe gikk galt, og vi kunne ikke legge til kortet ditt. Prøv igjen senere.",
   "Something went wrong and we couldn't remove your card. Please try again later.": "Noe gikk galt, og vi kunne ikke fjerne kortet ditt. Vennligst prøv igjen senere.",
   "Something went wrong!": "Noe gikk galt!",
-  "special character": "spesiell karakter",
-  "spendable points expiring by": "{points} Brukbare poeng utløper innen {date}",
   "Sports": "Sport",
   "Standard price": "Standardpris",
   "Street": "Gate",
   "Successfully updated profile!": "Vellykket oppdatert profil!",
   "Summary": "Sammendrag",
+  "TUI Points": "TUI Points",
   "Tell us what information and updates you'd like to receive, and how, by clicking the link below.": "Fortell oss hvilken informasjon og hvilke oppdateringer du ønsker å motta, og hvordan, ved å klikke på lenken nedenfor.",
   "Thank you": "Takk",
   "Theatre": "Teater",
   "There are no transactions to display": "Det er ingen transaksjoner å vise",
   "Things nearby HOTEL_NAME": "Ting i nærheten av {hotelName}",
-  "to": "til",
   "Total Points": "Totale poeng",
   "Tourist": "Turist",
   "Transaction date": "Transaksjonsdato",
   "Transactions": "Transaksjoner",
   "Transportations": "Transport",
   "Tripadvisor reviews": "{rating} ({count} anmeldelser på Tripadvisor)",
-  "TUI Points": "TUI Points",
   "Type of bed": "Sengtype",
   "Type of room": "Romtype",
-  "uppercase letter": "stor bokstav",
   "Use bonus cheque": "Bruk bonussjekk",
   "User information": "Brukerinformasjon",
   "View as list": "Vis som liste",
@@ -228,6 +227,7 @@
   "View your booking": "Se din bestilling",
   "Visiting address": "Besøksadresse",
   "We could not add a card right now, please try again later.": "Vi kunne ikke legge til et kort akkurat nå. Prøv igjen senere.",
+  "We couldn't find a matching location for your search.": "Vi finner ikke et sted som samsvarer for søket ditt.",
   "We have sent a detailed confirmation of your booking to your email:": "Vi har sendt en detaljert bekreftelse av din bestilling til din e-post:",
   "We look forward to your visit!": "Vi ser frem til ditt besøk!",
   "Weekdays": "Hverdager",
@@ -245,9 +245,9 @@
   "You canceled adding a new credit card.": "Du kansellerte å legge til et nytt kredittkort.",
   "You have no previous stays.": "Du har ingen tidligere opphold.",
   "You have no upcoming stays.": "Du har ingen kommende opphold.",
+  "Your Challenges Conquer & Earn!": "Dine utfordringer Erobre og tjen!",
   "Your card was successfully removed!": "Kortet ditt ble fjernet!",
   "Your card was successfully saved!": "Kortet ditt ble lagret!",
-  "Your Challenges Conquer & Earn!": "Dine utfordringer Erobre og tjen!",
   "Your current level": "Ditt nåværende nivå",
   "Your details": "Dine detaljer",
   "Your level": "Ditt nivå",
@@ -255,5 +255,22 @@
   "Zip code": "Post kode",
   "Zoo": "Dyrehage",
   "Zoom in": "Zoom inn",
-  "Zoom out": "Zoom ut"
-}
+  "Zoom out": "Zoom ut",
+  "as of today": "per idag",
+  "by": "innen",
+  "characters": "tegn",
+  "hotelPages.rooms.roomCard.person": "person",
+  "hotelPages.rooms.roomCard.persons": "personer",
+  "hotelPages.rooms.roomCard.seeRoomDetails": "Se detaljer om rommet",
+  "km to city center": "km til sentrum",
+  "next level:": "Neste nivå:",
+  "night": "natt",
+  "nights": "netter",
+  "number": "antall",
+  "or": "eller",
+  "points": "poeng",
+  "special character": "spesiell karakter",
+  "spendable points expiring by": "{points} Brukbare poeng utløper innen {date}",
+  "to": "til",
+  "uppercase letter": "stor bokstav"
+}
\ No newline at end of file
diff --git a/i18n/dictionaries/sv.json b/i18n/dictionaries/sv.json
index 4a6d5c3eb..946161111 100644
--- a/i18n/dictionaries/sv.json
+++ b/i18n/dictionaries/sv.json
@@ -1,4 +1,5 @@
 {
+  "A destination or hotel name is needed to be able to search for a hotel room.": "Ett destinations- eller hotellnamn behövs för att kunna söka efter ett hotellrum.",
   "A photo of the room": "Ett foto av rummet",
   "Activities": "Aktiviteter",
   "Add code": "Lägg till kod",
@@ -13,7 +14,6 @@
   "Any changes you've made will be lost.": "Alla ändringar du har gjort kommer att gå förlorade.",
   "Are you sure you want to remove the card ending with {lastFourDigits} from your member profile?": "Är du säker på att du vill ta bort kortet som slutar med {lastFourDigits} från din medlemsprofil?",
   "Arrival date": "Ankomstdatum",
-  "as of today": "från och med idag",
   "As our": "Som vår {level}",
   "As our Close Friend": "Som vår nära vän",
   "At latest": "Senast",
@@ -28,15 +28,15 @@
   "Breakfast excluded": "Frukost ingår ej",
   "Breakfast included": "Frukost ingår",
   "Bus terminal": "Bussterminal",
-  "by": "innan",
   "Cancel": "Avbryt",
-  "characters": "tecken",
   "Check in": "Checka in",
   "Check out": "Checka ut",
   "Check out the credit cards saved to your profile. Pay with a saved card when signed in for a smoother web experience.": "Kolla in kreditkorten som sparats i din profil. Betala med ett sparat kort när du är inloggad för en smidigare webbupplevelse.",
   "Choose room": "Välj rum",
+  "Cities": "Städer",
   "City": "Ort",
   "City/State": "Ort",
+  "Clear searches": "Rensa tidigare sökningar",
   "Click here to log in": "Klicka här för att logga in",
   "Close": "Stäng",
   "Close language menu": "Stäng språkmenyn",
@@ -57,16 +57,20 @@
   "Date of Birth": "Födelsedatum",
   "Day": "Dag",
   "Description": "Beskrivning",
+  "Destinations & hotels": "Destinationer & hotell",
   "Discard changes": "Ignorera ändringar",
   "Discard unsaved changes?": "Vill du ignorera ändringar som inte har sparats?",
+  "Distance to city centre": "{number}km till centrum",
   "Do you want to start the day with Scandics famous breakfast buffé?": "Vill du starta dagen med Scandics berömda frukostbuffé?",
   "Download the Scandic app": "Ladda ner Scandic-appen",
   "Edit": "Redigera",
   "Edit profile": "Redigera profil",
   "Email": "E-post",
+  "Enter destination or hotel": "Ange destination eller hotell",
   "Explore all levels and benefits": "Utforska alla nivåer och fördelar",
   "Explore nearby": "Utforska i närheten",
   "Extras to your booking": "Extra tillval till din bokning",
+  "FAQ": "FAQ",
   "Failed to delete credit card, please try again later.": "Det gick inte att ta bort kreditkortet, försök igen senare.",
   "Fair": "Mässa",
   "Find booking": "Hitta bokning",
@@ -85,14 +89,13 @@
   "Hotel": "Hotell",
   "Hotel facilities": "Hotellfaciliteter",
   "Hotel surroundings": "Hotellomgivning",
-  "hotelPages.rooms.roomCard.person": "person",
-  "hotelPages.rooms.roomCard.persons": "personer",
+  "Hotels": "Hotell",
   "How do you want to sleep?": "Hur vill du sova?",
   "How it works": "Hur det fungerar",
   "Image gallery": "Bildgalleri",
   "Join Scandic Friends": "Gå med i Scandic Friends",
-  "km to city center": "km till stadens centrum",
   "Language": "Språk",
+  "Latest searches": "Senaste sökningarna",
   "Level": "Nivå",
   "Level 1": "Nivå 1",
   "Level 2": "Nivå 2",
@@ -102,6 +105,7 @@
   "Level 6": "Nivå 6",
   "Level 7": "Nivå 7",
   "Level up to unlock": "Levla upp för att låsa upp",
+  "Locations": "Platser",
   "Log in": "Logga in",
   "Log in here": "Logga in här",
   "Log in/Join": "Logga in/Gå med",
@@ -115,9 +119,9 @@
   "Member price": "Medlemspris",
   "Member price from": "Medlemspris från",
   "Members": "Medlemmar",
-  "Membership cards": "Medlemskort",
   "Membership ID": "Medlems-ID",
   "Membership ID copied to clipboard": "Medlems-ID kopierat till urklipp",
+  "Membership cards": "Medlemskort",
   "Menu": "Meny",
   "Modify": "Ändra",
   "Month": "Månad",
@@ -132,24 +136,21 @@
   "Nearby companies": "Närliggande företag",
   "New password": "Nytt lösenord",
   "Next": "Nästa",
-  "next level:": "Nästa nivå:",
-  "night": "natt",
-  "nights": "nätter",
   "Nights needed to level up": "Nätter som behövs för att gå upp i nivå",
   "No content published": "Inget innehåll publicerat",
+  "No matching location found": "Ingen matchande plats hittades",
+  "No results": "Inga resultat",
   "No transactions available": "Inga transaktioner tillgängliga",
   "No, keep card": "Nej, behåll kortet",
   "Non refundable": "Ej återbetalningsbar",
   "Non-refundable": "Ej återbetalningsbar",
   "Not found": "Hittades inte",
   "Nr night, nr adult": "{nights, number} natt, {adults, number} vuxen",
-  "number": "nummer",
   "On your journey": "På din resa",
   "Open": "Öppna",
   "Open language menu": "Öppna språkmenyn",
   "Open menu": "Öppna menyn",
   "Open my pages menu": "Öppna mina sidor menyn",
-  "or": "eller",
   "Overview": "Översikt",
   "Parking / Garage": "Parkering / Garage",
   "Password": "Lösenord",
@@ -161,7 +162,6 @@
   "Phone number": "Telefonnummer",
   "Please enter a valid phone number": "Var vänlig och ange ett giltigt telefonnummer",
   "Points": "Poäng",
-  "points": "poäng",
   "Points being calculated": "Poäng beräknas",
   "Points earned prior to May 1, 2021": "Intjänade poäng före den 1 maj 2021",
   "Points may take up to 10 days to be displayed.": "Det kan ta upp till 10 dagar innan poäng visas.",
@@ -201,29 +201,25 @@
   "Something went wrong and we couldn't add your card. Please try again later.": "Något gick fel och vi kunde inte lägga till ditt kort. Försök igen senare.",
   "Something went wrong and we couldn't remove your card. Please try again later.": "Något gick fel och vi kunde inte ta bort ditt kort. Försök igen senare.",
   "Something went wrong!": "Något gick fel!",
-  "special character": "speciell karaktär",
-  "spendable points expiring by": "{points} poäng förfaller {date}",
   "Sports": "Sport",
   "Standard price": "Standardpris",
   "Street": "Gata",
   "Successfully updated profile!": "Profilen har uppdaterats framgångsrikt!",
   "Summary": "Sammanfattning",
+  "TUI Points": "TUI Points",
   "Tell us what information and updates you'd like to receive, and how, by clicking the link below.": "Berätta för oss vilken information och vilka uppdateringar du vill få och hur genom att klicka på länken nedan.",
   "Thank you": "Tack",
   "Theatre": "Teater",
   "There are no transactions to display": "Det finns inga transaktioner att visa",
   "Things nearby HOTEL_NAME": "Saker i närheten av {hotelName}",
-  "to": "till",
   "Total Points": "Poäng totalt",
   "Tourist": "Turist",
   "Transaction date": "Transaktionsdatum",
   "Transactions": "Transaktioner",
   "Transportations": "Transport",
   "Tripadvisor reviews": "{rating} ({count} recensioner på Tripadvisor)",
-  "TUI Points": "TUI Points",
   "Type of bed": "Sängtyp",
   "Type of room": "Rumstyp",
-  "uppercase letter": "stor bokstav",
   "Use bonus cheque": "Use bonus cheque",
   "User information": "Användarinformation",
   "View as list": "Visa som lista",
@@ -231,11 +227,13 @@
   "View your booking": "Visa din bokning",
   "Visiting address": "Besöksadress",
   "We could not add a card right now, please try again later.": "Vi kunde inte lägga till ett kort just nu, vänligen försök igen senare.",
+  "We couldn't find a matching location for your search.": "Vi kunde inte hitta en plats som matchade din sökning.",
   "We have sent a detailed confirmation of your booking to your email:": "Vi har skickat en detaljerad bekräftelse av din bokning till din e-post:",
   "We look forward to your visit!": "Vi ser fram emot ditt besök!",
   "Weekdays": "Vardagar",
   "Weekends": "Helger",
   "Welcome": "Välkommen",
+  "Welcome to": "Välkommen till",
   "Wellness & Exercise": "Hälsa & Träning",
   "When": "När",
   "Where should you go next?": "Låter inte en spontanweekend härligt?",
@@ -247,9 +245,9 @@
   "You canceled adding a new credit card.": "Du avbröt att lägga till ett nytt kreditkort.",
   "You have no previous stays.": "Du har inga tidigare vistelser.",
   "You have no upcoming stays.": "Du har inga planerade resor.",
+  "Your Challenges Conquer & Earn!": "Dina utmaningar Erövra och tjäna!",
   "Your card was successfully removed!": "Ditt kort har tagits bort!",
   "Your card was successfully saved!": "Ditt kort har sparats!",
-  "Your Challenges Conquer & Earn!": "Dina utmaningar Erövra och tjäna!",
   "Your current level": "Din nuvarande nivå",
   "Your details": "Dina uppgifter",
   "Your level": "Din nivå",
@@ -257,5 +255,22 @@
   "Zip code": "Postnummer",
   "Zoo": "Djurpark",
   "Zoom in": "Zooma in",
-  "Zoom out": "Zooma ut"
-}
+  "Zoom out": "Zooma ut",
+  "as of today": "från och med idag",
+  "by": "innan",
+  "characters": "tecken",
+  "hotelPages.rooms.roomCard.person": "person",
+  "hotelPages.rooms.roomCard.persons": "personer",
+  "hotelPages.rooms.roomCard.seeRoomDetails": "Se information om rummet",
+  "km to city center": "km till stadens centrum",
+  "next level:": "Nästa nivå:",
+  "night": "natt",
+  "nights": "nätter",
+  "number": "nummer",
+  "or": "eller",
+  "points": "poäng",
+  "special character": "speciell karaktär",
+  "spendable points expiring by": "{points} poäng förfaller {date}",
+  "to": "till",
+  "uppercase letter": "stor bokstav"
+}
\ No newline at end of file
diff --git a/i18n/serverContext.ts b/i18n/serverContext.ts
index f0957d0a9..132a8ff20 100644
--- a/i18n/serverContext.ts
+++ b/i18n/serverContext.ts
@@ -12,11 +12,13 @@ const getRef = cache(() => ({ current: Lang.en }))
  *
  * @param newLang
  */
-export const setLang = (newLang: Lang) => {
+export function setLang(newLang: Lang) {
   getRef().current = newLang
 }
 
 /**
  * Get the global language set for the current request
  */
-export const getLang = () => getRef().current
+export function getLang() {
+  return getRef().current
+}
diff --git a/lib/api/endpoints.ts b/lib/api/endpoints.ts
index 14460c1a9..0d85c5061 100644
--- a/lib/api/endpoints.ts
+++ b/lib/api/endpoints.ts
@@ -8,15 +8,17 @@ export namespace endpoints {
   }
   export const enum v1 {
     profile = "profile/v1/Profile",
-    creditCards = `${profile}/creditCards`,
-    initiateSaveCard = `${creditCards}/initiateSaveCard`,
-    friendTransactions = "profile/v1/Transaction/friendTransactions",
-    upcomingStays = "booking/v1/Stays/future",
-    previousStays = "booking/v1/Stays/past",
-    hotels = "hotel/v1/Hotels",
-    intiateSaveCard = `${creditCards}/initiateSaveCard`,
-    deleteCreditCard = `${profile}/creditCards`,
     booking = "booking/v1/Bookings",
+    creditCards = `${profile}/creditCards`,
+    city = "hotel/v1/Cities",
+    citiesCountry = `${city}/country`,
+    countries = "hotel/v1/Countries",
+    friendTransactions = "profile/v1/Transaction/friendTransactions",
+    hotels = "hotel/v1/Hotels",
+    initiateSaveCard = `${creditCards}/initiateSaveCard`,
+    locations = "hotel/v1/Locations",
+    previousStays = "booking/v1/Stays/past",
+    upcomingStays = "booking/v1/Stays/future",
   }
 }
 
diff --git a/lib/api/index.ts b/lib/api/index.ts
index 104c8c17d..9e32ac0cc 100644
--- a/lib/api/index.ts
+++ b/lib/api/index.ts
@@ -20,7 +20,7 @@ const defaultOptions: RequestInit = {
   mode: "cors",
 }
 
-const fetch = fetchRetry(global.fetch, {
+const wrappedFetch = fetchRetry(fetch, {
   retries: 3,
   retryDelay: function (attempt, error, response) {
     return Math.pow(2, attempt) * 150 // 150, 300, 600
@@ -41,7 +41,10 @@ export async function get(
     })
     url.searchParams.sort()
   }
-  return fetch(url, merge.all([defaultOptions, { method: "GET" }, options]))
+  return wrappedFetch(
+    url,
+    merge.all([defaultOptions, { method: "GET" }, options])
+  )
 }
 
 export async function patch(
@@ -59,7 +62,7 @@ export async function patch(
     })
     url.searchParams.sort()
   }
-  return fetch(
+  return wrappedFetch(
     url,
     merge.all([
       defaultOptions,
@@ -84,7 +87,7 @@ export async function post(
     })
     url.searchParams.sort()
   }
-  return fetch(
+  return wrappedFetch(
     url,
     merge.all([
       defaultOptions,
@@ -108,5 +111,8 @@ export async function remove(
     })
     url.searchParams.sort()
   }
-  return fetch(url, merge.all([defaultOptions, { method: "DELETE" }, options]))
+  return wrappedFetch(
+    url,
+    merge.all([defaultOptions, { method: "DELETE" }, options])
+  )
 }
diff --git a/lib/discriminatedUnion.ts b/lib/discriminatedUnion.ts
new file mode 100644
index 000000000..2f7c5c12a
--- /dev/null
+++ b/lib/discriminatedUnion.ts
@@ -0,0 +1,48 @@
+import { z } from "zod"
+
+import type {
+  DiscriminatedUnionError,
+  Option,
+} from "@/types/discriminatedUnion"
+
+/**
+ * This file is created to handle our discriminated unions
+ * validations primarily for union returns from Contentstacks
+ * GraphQL server.
+ *
+ * In the case of a new block being added to the union in Contenstack,
+ * Zod will throw because that typename is not expected ("invalid_union_discriminator").
+ * Therefore we add a safety that we return everytime we stumble upon
+ * the issue and then we filter it out in the transform.
+ *
+ * This replaces the `cleanEmptyObjects` function that would require
+ * everyone to never make a mistake in adding __typename to root
+ * anywhere (or any other potentially global fields in case the return type
+ * is an Interface e.g).
+ */
+
+export function discriminatedUnion<T extends Option>(options: T[]) {
+  return z
+    .discriminatedUnion("__typename", [
+      z.object({ __typename: z.literal(undefined) }),
+      ...options,
+    ])
+    .catch(({ error }: DiscriminatedUnionError) => {
+      if (
+        error.issues.find(
+          (issue) => issue.code === "invalid_union_discriminator"
+        )
+      ) {
+        return { __typename: undefined }
+      }
+      throw new Error(error.message)
+    })
+}
+
+export function discriminatedUnionArray<T extends Option>(options: T[]) {
+  return z
+    .array(discriminatedUnion(options))
+    .transform((blocks) =>
+      blocks.filter((block) => !!block)
+    ) as unknown as z.ZodEffects<z.ZodArray<T>>
+}
diff --git a/lib/graphql/Fragments/Refs/MyPages/AccountPage.graphql b/lib/graphql/Fragments/AccountPage/Ref.graphql
similarity index 100%
rename from lib/graphql/Fragments/Refs/MyPages/AccountPage.graphql
rename to lib/graphql/Fragments/AccountPage/Ref.graphql
diff --git a/lib/graphql/Fragments/Blocks/Card.graphql b/lib/graphql/Fragments/Blocks/Card.graphql
index d10ee4d5c..2adc5a75b 100644
--- a/lib/graphql/Fragments/Blocks/Card.graphql
+++ b/lib/graphql/Fragments/Blocks/Card.graphql
@@ -1,47 +1,53 @@
+#import "../System.graphql"
+
+#import "../PageLink/AccountPageLink.graphql"
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+
 fragment CardBlock on Card {
-  is_content_card
-  heading
-  body_text
   background_image
-  scripted_top_title
-  title
+  body_text
   has_primary_button
   has_secondary_button
   has_sidepeek_button
+  heading
+  is_content_card
+  scripted_top_title
+  title
   primary_button {
-    is_contentstack_link
     cta_text
+    is_contentstack_link
     open_in_new_tab
     external_link {
-      title
       href
+      title
     }
     linkConnection {
       edges {
         node {
           __typename
-          ...LoyaltyPageLink
-          ...ContentPageLink
           ...AccountPageLink
+          ...ContentPageLink
+          ...LoyaltyPageLink
         }
       }
     }
   }
   secondary_button {
-    is_contentstack_link
     cta_text
+    is_contentstack_link
     open_in_new_tab
     external_link {
-      title
       href
+      title
     }
     linkConnection {
       edges {
         node {
           __typename
-          ...LoyaltyPageLink
-          ...ContentPageLink
           ...AccountPageLink
+          ...ContentPageLink
+          ...LoyaltyPageLink
         }
       }
     }
@@ -50,7 +56,6 @@ fragment CardBlock on Card {
     call_to_action_text
   }
   system {
-    locale
-    uid
+    ...System
   }
 }
diff --git a/lib/graphql/Fragments/Blocks/CardsGrid.graphql b/lib/graphql/Fragments/Blocks/CardsGrid.graphql
new file mode 100644
index 000000000..5697bba22
--- /dev/null
+++ b/lib/graphql/Fragments/Blocks/CardsGrid.graphql
@@ -0,0 +1,68 @@
+#import "./Card.graphql"
+#import "./LoyaltyCard.graphql"
+#import "./Refs/Card.graphql"
+#import "./Refs/LoyaltyCard.graphql"
+
+fragment CardsGrid_ContentPage on ContentPageBlocksCardsGrid {
+  cards_grid {
+    layout
+    preamble
+    theme
+    title
+    cardConnection(limit: 10) {
+      edges {
+        node {
+          __typename
+          ...CardBlock
+          ...LoyaltyCardBlock
+        }
+      }
+    }
+  }
+}
+
+fragment CardsGrid_ContentPageRefs on ContentPageBlocksCardsGrid {
+  cards_grid {
+    cardConnection(limit: 10) {
+      edges {
+        node {
+          __typename
+          ...CardBlockRef
+          ...LoyaltyCardBlockRef
+        }
+      }
+    }
+  }
+}
+
+fragment CardsGrid_LoyaltyPage on LoyaltyPageBlocksCardsGrid {
+  cards_grid {
+    layout
+    preamble
+    theme
+    title
+    cardConnection(limit: 10) {
+      edges {
+        node {
+          __typename
+          ...CardBlock
+          ...LoyaltyCardBlock
+        }
+      }
+    }
+  }
+}
+
+fragment CardsGrid_LoyaltyPageRefs on LoyaltyPageBlocksCardsGrid {
+  cards_grid {
+    cardConnection(limit: 10) {
+      edges {
+        node {
+          __typename
+          ...CardBlockRef
+          ...LoyaltyCardBlockRef
+        }
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Fragments/Blocks/Content.graphql b/lib/graphql/Fragments/Blocks/Content.graphql
new file mode 100644
index 000000000..56b39e34b
--- /dev/null
+++ b/lib/graphql/Fragments/Blocks/Content.graphql
@@ -0,0 +1,87 @@
+#import "../Image.graphql"
+#import "../ImageContainer.graphql"
+
+#import "../AccountPage/Ref.graphql"
+#import "../ContentPage/Ref.graphql"
+#import "../HotelPage/Ref.graphql"
+#import "../LoyaltyPage/Ref.graphql"
+
+#import "../PageLink/AccountPageLink.graphql"
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+
+fragment Content_ContentPage on ContentPageBlocksContent {
+  content {
+    content {
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageLink
+            ...ContentPageLink
+            ...HotelPageLink
+            ...LoyaltyPageLink
+          }
+        }
+      }
+      json
+    }
+  }
+}
+
+fragment Content_ContentPageRefs on ContentPageBlocksContent {
+  content {
+    content {
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageRef
+            ...ContentPageRef
+            ...HotelPageRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment Content_LoyaltyPage on LoyaltyPageBlocksContent {
+  content {
+    content {
+      json
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageLink
+            ...ContentPageLink
+            ...Image
+            ...ImageContainer
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment Content_LoyaltyPageRefs on LoyaltyPageBlocksContent {
+  content {
+    content {
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageRef
+            ...ContentPageRef
+            ...ImageContainerRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Fragments/Blocks/DynamicContent.graphql b/lib/graphql/Fragments/Blocks/DynamicContent.graphql
new file mode 100644
index 000000000..aee4c82fa
--- /dev/null
+++ b/lib/graphql/Fragments/Blocks/DynamicContent.graphql
@@ -0,0 +1,119 @@
+#import "../AccountPage/Ref.graphql"
+#import "../ContentPage/Ref.graphql"
+#import "../HotelPage/Ref.graphql"
+#import "../LoyaltyPage/Ref.graphql"
+
+#import "../PageLink/AccountPageLink.graphql"
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+
+fragment DynamicContent_AccountPage on AccountPageContentDynamicContent {
+  dynamic_content {
+    component
+    subtitle: preamble
+    title
+    link {
+      text: link_text
+      linkConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageLink
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment DynamicContent_AccountPageRefs on AccountPageContentDynamicContent {
+  dynamic_content {
+    link {
+      linkConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment DynamicContent_ContentPage on ContentPageBlocksDynamicContent {
+  dynamic_content {
+    component
+    subtitle
+    title
+    link {
+      text
+      linkConnection: pageConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageLink
+            ...HotelPageLink
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment DynamicContent_ContentPageRefs on ContentPageBlocksDynamicContent {
+  dynamic_content {
+    link {
+      linkConnection: pageConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageRef
+            ...HotelPageRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment DynamicContent_LoyaltyPage on LoyaltyPageBlocksDynamicContent {
+  dynamic_content {
+    component
+    subtitle
+    title
+    link {
+      text
+      linkConnection: pageConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageLink
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment DynamicContent_LoyaltyPageRefs on LoyaltyPageBlocksDynamicContent {
+  dynamic_content {
+    link {
+      linkConnection: pageConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageLink
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql b/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql
index fcd19ea65..84da04bcb 100644
--- a/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql
+++ b/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql
@@ -1,6 +1,8 @@
+#import "../System.graphql"
+
 fragment LoyaltyCardBlock on LoyaltyCard {
-  heading
   body_text
+  heading
   image
   title
   link {
@@ -22,7 +24,6 @@ fragment LoyaltyCardBlock on LoyaltyCard {
     }
   }
   system {
-    locale
-    uid
+    ...System
   }
 }
diff --git a/lib/graphql/Fragments/Blocks/Refs/Card.graphql b/lib/graphql/Fragments/Blocks/Refs/Card.graphql
index 138a45b5e..3b3c33a9a 100644
--- a/lib/graphql/Fragments/Blocks/Refs/Card.graphql
+++ b/lib/graphql/Fragments/Blocks/Refs/Card.graphql
@@ -1,5 +1,4 @@
 fragment CardBlockRef on Card {
-  __typename
   secondary_button {
     linkConnection {
       edges {
diff --git a/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql b/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql
index 2bb847c8c..34275c120 100644
--- a/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql
+++ b/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql
@@ -1,5 +1,4 @@
 fragment LoyaltyCardBlockRef on LoyaltyCard {
-  __typename
   link {
     linkConnection {
       edges {
diff --git a/lib/graphql/Fragments/Blocks/Shortcuts.graphql b/lib/graphql/Fragments/Blocks/Shortcuts.graphql
new file mode 100644
index 000000000..b7d597db3
--- /dev/null
+++ b/lib/graphql/Fragments/Blocks/Shortcuts.graphql
@@ -0,0 +1,77 @@
+#import "../AccountPage/Ref.graphql"
+#import "../ContentPage/Ref.graphql"
+#import "../LoyaltyPage/Ref.graphql"
+
+#import "../PageLink/AccountPageLink.graphql"
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+
+fragment Shortcuts on Shortcuts {
+  subtitle: preamble
+  title
+  shortcuts {
+    open_in_new_tab
+    text
+    linkConnection {
+      edges {
+        node {
+          __typename
+          ...AccountPageLink
+          ...ContentPageLink
+          ...LoyaltyPageLink
+        }
+      }
+    }
+  }
+}
+
+fragment Shortcuts_AccountPage on AccountPageContentShortcuts {
+  shortcuts {
+    ...Shortcuts
+  }
+}
+
+fragment Shortcuts_ContentPage on ContentPageBlocksShortcuts {
+  shortcuts {
+    ...Shortcuts
+  }
+}
+
+fragment Shortcuts_LoyaltyPage on LoyaltyPageBlocksShortcuts {
+  shortcuts {
+    ...Shortcuts
+  }
+}
+
+fragment ShortcutsRefs on Shortcuts {
+  shortcuts {
+    linkConnection {
+      edges {
+        node {
+          __typename
+          ...AccountPageRef
+          ...ContentPageRef
+          ...LoyaltyPageRef
+        }
+      }
+    }
+  }
+}
+
+fragment Shortcuts_AccountPageRefs on AccountPageContentShortcuts {
+  shortcuts {
+    ...ShortcutsRefs
+  }
+}
+
+fragment Shortcuts_ContentPageRefs on ContentPageBlocksShortcuts {
+  shortcuts {
+    ...ShortcutsRefs
+  }
+}
+
+fragment Shortcuts_LoyaltyPageRefs on LoyaltyPageBlocksShortcuts {
+  shortcuts {
+    ...ShortcutsRefs
+  }
+}
diff --git a/lib/graphql/Fragments/Blocks/TextCols.graphql b/lib/graphql/Fragments/Blocks/TextCols.graphql
new file mode 100644
index 000000000..236078c8a
--- /dev/null
+++ b/lib/graphql/Fragments/Blocks/TextCols.graphql
@@ -0,0 +1,49 @@
+#import "../ContentPage/Ref.graphql"
+#import "../HotelPage/Ref.graphql"
+#import "../LoyaltyPage/Ref.graphql"
+
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+
+fragment TextCols_ContentPage on ContentPageBlocksTextCols {
+  text_cols {
+    columns {
+      title
+      text {
+        json
+        embedded_itemsConnection {
+          edges {
+            node {
+              __typename
+              ...ContentPageLink
+              ...HotelPageLink
+              ...LoyaltyPageLink
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment TextCols_ContentPageRef on ContentPageBlocksTextCols {
+  text_cols {
+    columns {
+      title
+      text {
+        json
+        embedded_itemsConnection {
+          edges {
+            node {
+              __typename
+              ...ContentPageRef
+              ...HotelPageRef
+              ...LoyaltyPageRef
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentTextContent.graphql b/lib/graphql/Fragments/Blocks/TextContent.graphql
similarity index 67%
rename from lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentTextContent.graphql
rename to lib/graphql/Fragments/Blocks/TextContent.graphql
index 5ce1f9280..2aac6d1b5 100644
--- a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentTextContent.graphql
+++ b/lib/graphql/Fragments/Blocks/TextContent.graphql
@@ -1,8 +1,9 @@
-#import "../../Image.graphql"
+#import "../Image.graphql"
 
-fragment AccountPageContentTextContent on AccountPageContentTextContent {
+fragment TextContent_AccountPage on AccountPageContentTextContent {
   text_content {
     content {
+      json
       embedded_itemsConnection {
         totalCount
         edges {
@@ -12,7 +13,6 @@ fragment AccountPageContentTextContent on AccountPageContentTextContent {
           }
         }
       }
-      json
     }
   }
 }
diff --git a/lib/graphql/Fragments/Breadcrumbs/AccountPage.graphql b/lib/graphql/Fragments/Breadcrumbs/AccountPage.graphql
new file mode 100644
index 000000000..74bfd6096
--- /dev/null
+++ b/lib/graphql/Fragments/Breadcrumbs/AccountPage.graphql
@@ -0,0 +1,24 @@
+#import "../System.graphql"
+
+fragment AccountPageBreadcrumb on AccountPage {
+  web {
+    breadcrumbs {
+      title
+    }
+  }
+  system {
+    ...System
+  }
+  url
+}
+
+fragment AccountPageBreadcrumbRef on AccountPage {
+  web {
+    breadcrumbs {
+      title
+    }
+  }
+  system {
+    ...System
+  }
+}
diff --git a/lib/graphql/Fragments/Breadcrumbs/Breadcrumbs.graphql b/lib/graphql/Fragments/Breadcrumbs/Breadcrumbs.graphql
new file mode 100644
index 000000000..86b35eeef
--- /dev/null
+++ b/lib/graphql/Fragments/Breadcrumbs/Breadcrumbs.graphql
@@ -0,0 +1,31 @@
+#import "./AccountPage.graphql"
+#import "./ContentPage.graphql"
+#import "./LoyaltyPage.graphql"
+
+fragment Breadcrumbs on Breadcrumbs {
+  title
+  parentsConnection {
+    edges {
+      node {
+        __typename
+        ...AccountPageBreadcrumb
+        ...ContentPageBreadcrumb
+        ...LoyaltyPageBreadcrumb
+      }
+    }
+  }
+}
+
+fragment BreadcrumbsRefs on Breadcrumbs {
+  title
+  parentsConnection {
+    edges {
+      node {
+        __typename
+        ...AccountPageBreadcrumbRef
+        ...ContentPageBreadcrumbRef
+        ...LoyaltyPageBreadcrumbRef
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Fragments/Breadcrumbs/ContentPage.graphql b/lib/graphql/Fragments/Breadcrumbs/ContentPage.graphql
new file mode 100644
index 000000000..4e2e88da7
--- /dev/null
+++ b/lib/graphql/Fragments/Breadcrumbs/ContentPage.graphql
@@ -0,0 +1,24 @@
+#import "../System.graphql"
+
+fragment ContentPageBreadcrumb on ContentPage {
+  web {
+    breadcrumbs {
+      title
+    }
+  }
+  system {
+    ...System
+  }
+  url
+}
+
+fragment ContentPageBreadcrumbRef on ContentPage {
+  web {
+    breadcrumbs {
+      title
+    }
+  }
+  system {
+    ...System
+  }
+}
diff --git a/lib/graphql/Fragments/Breadcrumbs.graphql b/lib/graphql/Fragments/Breadcrumbs/CurrentBlocksPage.graphql
similarity index 55%
rename from lib/graphql/Fragments/Breadcrumbs.graphql
rename to lib/graphql/Fragments/Breadcrumbs/CurrentBlocksPage.graphql
index 585ecbf40..765eddb3f 100644
--- a/lib/graphql/Fragments/Breadcrumbs.graphql
+++ b/lib/graphql/Fragments/Breadcrumbs/CurrentBlocksPage.graphql
@@ -1,4 +1,4 @@
-fragment Breadcrumbs on CurrentBlocksPage {
+fragment CurrentBlocksPageBreadcrumbs on CurrentBlocksPage {
   breadcrumbs {
     parents {
       href
diff --git a/lib/graphql/Fragments/Breadcrumbs/LoyaltyPage.graphql b/lib/graphql/Fragments/Breadcrumbs/LoyaltyPage.graphql
new file mode 100644
index 000000000..5386bc7ef
--- /dev/null
+++ b/lib/graphql/Fragments/Breadcrumbs/LoyaltyPage.graphql
@@ -0,0 +1,24 @@
+#import "../System.graphql"
+
+fragment LoyaltyPageBreadcrumb on LoyaltyPage {
+  web {
+    breadcrumbs {
+      title
+    }
+  }
+  system {
+    ...System
+  }
+  url
+}
+
+fragment LoyaltyPageBreadcrumbRef on LoyaltyPage {
+  web {
+    breadcrumbs {
+      title
+    }
+  }
+  system {
+    ...System
+  }
+}
diff --git a/lib/graphql/Fragments/ContentPage/Breadcrumbs.graphql b/lib/graphql/Fragments/ContentPage/Breadcrumbs.graphql
deleted file mode 100644
index 036889c24..000000000
--- a/lib/graphql/Fragments/ContentPage/Breadcrumbs.graphql
+++ /dev/null
@@ -1,37 +0,0 @@
-fragment ContentPageBreadcrumbs on ContentPage {
-  web {
-    breadcrumbs {
-      title
-      parentsConnection {
-        edges {
-          node {
-            ... on ContentPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                locale
-                uid
-              }
-              url
-            }
-            ... on LoyaltyPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                locale
-                uid
-              }
-              url
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/lib/graphql/Fragments/Refs/ContentPage/ContentPage.graphql b/lib/graphql/Fragments/ContentPage/Ref.graphql
similarity index 100%
rename from lib/graphql/Fragments/Refs/ContentPage/ContentPage.graphql
rename to lib/graphql/Fragments/ContentPage/Ref.graphql
diff --git a/lib/graphql/Fragments/CurrentFooter/AppDownloads.graphql b/lib/graphql/Fragments/CurrentFooter/AppDownloads.graphql
index 20b7d112f..efac1cc31 100644
--- a/lib/graphql/Fragments/CurrentFooter/AppDownloads.graphql
+++ b/lib/graphql/Fragments/CurrentFooter/AppDownloads.graphql
@@ -1,6 +1,6 @@
 #import "../Image.graphql"
 
-fragment AppDownloads on CurrentFooter {
+fragment CurrentFooterAppDownloads on CurrentFooter {
   app_downloads {
     title
     app_store {
diff --git a/lib/graphql/Fragments/CurrentFooter/SocialMedia.graphql b/lib/graphql/Fragments/CurrentFooter/SocialMedia.graphql
index 55cf49515..aef07bd76 100644
--- a/lib/graphql/Fragments/CurrentFooter/SocialMedia.graphql
+++ b/lib/graphql/Fragments/CurrentFooter/SocialMedia.graphql
@@ -1,4 +1,4 @@
-fragment SocialMedia on CurrentFooter {
+fragment CurrentFooterSocialMedia on CurrentFooter {
   social_media {
     title
     facebook {
diff --git a/lib/graphql/Fragments/Refs/HotelPage/HotelPage.graphql b/lib/graphql/Fragments/HotelPage/Ref.graphql
similarity index 100%
rename from lib/graphql/Fragments/Refs/HotelPage/HotelPage.graphql
rename to lib/graphql/Fragments/HotelPage/Ref.graphql
diff --git a/lib/graphql/Fragments/ImageContainer.graphql b/lib/graphql/Fragments/ImageContainer.graphql
new file mode 100644
index 000000000..1b04a993f
--- /dev/null
+++ b/lib/graphql/Fragments/ImageContainer.graphql
@@ -0,0 +1,16 @@
+#import "./System.graphql"
+
+fragment ImageContainer on ImageContainer {
+  image_left
+  image_right
+  title
+  system {
+    ...System
+  }
+}
+
+fragment ImageContainerRef on ImageContainer {
+  system {
+    ...System
+  }
+}
diff --git a/lib/graphql/Fragments/LoyaltyPage/Breadcrumbs.graphql b/lib/graphql/Fragments/LoyaltyPage/Breadcrumbs.graphql
deleted file mode 100644
index 621cee4b5..000000000
--- a/lib/graphql/Fragments/LoyaltyPage/Breadcrumbs.graphql
+++ /dev/null
@@ -1,37 +0,0 @@
-fragment LoyaltyPageBreadcrumbs on LoyaltyPage {
-  web {
-    breadcrumbs {
-      title
-      parentsConnection {
-        edges {
-          node {
-            ... on AccountPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                locale
-                uid
-              }
-              url
-            }
-            ... on LoyaltyPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                locale
-                uid
-              }
-              url
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/lib/graphql/Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql b/lib/graphql/Fragments/LoyaltyPage/Ref.graphql
similarity index 100%
rename from lib/graphql/Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql
rename to lib/graphql/Fragments/LoyaltyPage/Ref.graphql
diff --git a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentDynamicContent.graphql b/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentDynamicContent.graphql
deleted file mode 100644
index c7abc5fa0..000000000
--- a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentDynamicContent.graphql
+++ /dev/null
@@ -1,22 +0,0 @@
-#import "../../PageLink/AccountPageLink.graphql"
-#import "../../PageLink/LoyaltyPageLink.graphql"
-
-fragment AccountPageContentDynamicContent on AccountPageContentDynamicContent {
-  dynamic_content {
-    component
-    title
-    preamble
-    link {
-      link_text
-      linkConnection {
-        totalCount
-        edges {
-          node {
-            ...LoyaltyPageLink
-            ...AccountPageLink
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql b/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql
deleted file mode 100644
index 4b8076973..000000000
--- a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-#import "../../PageLink/AccountPageLink.graphql"
-#import "../../PageLink/ContentPageLink.graphql"
-#import "../../PageLink/LoyaltyPageLink.graphql"
-
-fragment AccountPageContentShortcuts on AccountPageContentShortcuts {
-  shortcuts {
-    title
-    preamble
-    shortcuts {
-      text
-      open_in_new_tab
-      linkConnection {
-        edges {
-          node {
-            __typename
-            ...AccountPageLink
-            ...LoyaltyPageLink
-            ...ContentPageLink
-          }
-        }
-        totalCount
-      }
-    }
-  }
-}
diff --git a/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql b/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql
deleted file mode 100644
index a2396bc18..000000000
--- a/lib/graphql/Fragments/MyPages/Breadcrumbs.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-fragment MyPagesBreadcrumbs on AccountPage {
-  web {
-    breadcrumbs {
-      title
-      parentsConnection {
-        edges {
-          node {
-            ... on AccountPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                locale
-                uid
-              }
-              url
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/lib/graphql/Fragments/PageLink/AccountPageLink.graphql b/lib/graphql/Fragments/PageLink/AccountPageLink.graphql
index dc5ed6667..ba7f64e49 100644
--- a/lib/graphql/Fragments/PageLink/AccountPageLink.graphql
+++ b/lib/graphql/Fragments/PageLink/AccountPageLink.graphql
@@ -1,7 +1,8 @@
+#import "../System.graphql"
+
 fragment AccountPageLink on AccountPage {
   system {
-    locale
-    uid
+    ...System
   }
   title
   url
diff --git a/lib/graphql/Fragments/PageLink/ContentPageLink.graphql b/lib/graphql/Fragments/PageLink/ContentPageLink.graphql
index 8b7d5421a..2965d3b22 100644
--- a/lib/graphql/Fragments/PageLink/ContentPageLink.graphql
+++ b/lib/graphql/Fragments/PageLink/ContentPageLink.graphql
@@ -1,10 +1,11 @@
+#import "../System.graphql"
+
 fragment ContentPageLink on ContentPage {
-  system {
-    locale
-    uid
-  }
   title
   url
+  system {
+    ...System
+  }
   web {
     original_url
   }
diff --git a/lib/graphql/Fragments/PageLink/CurrentBlocksPageLink.graphql b/lib/graphql/Fragments/PageLink/CurrentBlocksPageLink.graphql
index 1b82b2a59..4b8a7eab2 100644
--- a/lib/graphql/Fragments/PageLink/CurrentBlocksPageLink.graphql
+++ b/lib/graphql/Fragments/PageLink/CurrentBlocksPageLink.graphql
@@ -1,8 +1,9 @@
+#import "../System.graphql"
+
 fragment CurrentBlocksPageLink on CurrentBlocksPage {
-  system {
-    locale
-    uid
-  }
   title
   url
+  system {
+    ...System
+  }
 }
diff --git a/lib/graphql/Fragments/PageLink/CurrentContentPageLink.graphql b/lib/graphql/Fragments/PageLink/CurrentContentPageLink.graphql
index 1b82b2a59..4b8a7eab2 100644
--- a/lib/graphql/Fragments/PageLink/CurrentContentPageLink.graphql
+++ b/lib/graphql/Fragments/PageLink/CurrentContentPageLink.graphql
@@ -1,8 +1,9 @@
+#import "../System.graphql"
+
 fragment CurrentBlocksPageLink on CurrentBlocksPage {
-  system {
-    locale
-    uid
-  }
   title
   url
+  system {
+    ...System
+  }
 }
diff --git a/lib/graphql/Fragments/PageLink/HotelPageLink.graphql b/lib/graphql/Fragments/PageLink/HotelPageLink.graphql
index eda76855c..cc5f1f5ff 100644
--- a/lib/graphql/Fragments/PageLink/HotelPageLink.graphql
+++ b/lib/graphql/Fragments/PageLink/HotelPageLink.graphql
@@ -1,7 +1,8 @@
+#import "../System.graphql"
+
 fragment HotelPageLink on HotelPage {
   system {
-    locale
-    uid
+    ...System
   }
   title
   url
diff --git a/lib/graphql/Fragments/PageLink/LoyaltyPageLink.graphql b/lib/graphql/Fragments/PageLink/LoyaltyPageLink.graphql
index b4759e6bd..fa4d7ee90 100644
--- a/lib/graphql/Fragments/PageLink/LoyaltyPageLink.graphql
+++ b/lib/graphql/Fragments/PageLink/LoyaltyPageLink.graphql
@@ -1,10 +1,11 @@
+#import "../System.graphql"
+
 fragment LoyaltyPageLink on LoyaltyPage {
-  system {
-    locale
-    uid
-  }
   title
   url
+  system {
+    ...System
+  }
   web {
     original_url
   }
diff --git a/lib/graphql/Fragments/Refs/ContentPage/Breadcrumbs.graphql b/lib/graphql/Fragments/Refs/ContentPage/Breadcrumbs.graphql
deleted file mode 100644
index b3c887a34..000000000
--- a/lib/graphql/Fragments/Refs/ContentPage/Breadcrumbs.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-#import "../System.graphql"
-
-fragment ContentPageBreadcrumbsRefs on ContentPage {
-  web {
-    breadcrumbs {
-      title
-      parentsConnection {
-        edges {
-          node {
-            ... on ContentPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                ...System
-              }
-            }
-            ... on LoyaltyPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                ...System
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  system {
-    ...System
-  }
-}
diff --git a/lib/graphql/Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql b/lib/graphql/Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql
deleted file mode 100644
index b0e0946bf..000000000
--- a/lib/graphql/Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-#import "../System.graphql"
-
-fragment LoyaltyPageBreadcrumbsRefs on LoyaltyPage {
-  web {
-    breadcrumbs {
-      title
-      parentsConnection {
-        edges {
-          node {
-            ... on AccountPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                ...System
-              }
-            }
-            ... on LoyaltyPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                ...System
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  system {
-    ...System
-  }
-}
diff --git a/lib/graphql/Fragments/Refs/MyPages/Breadcrumbs.graphql b/lib/graphql/Fragments/Refs/MyPages/Breadcrumbs.graphql
deleted file mode 100644
index 03fe9c485..000000000
--- a/lib/graphql/Fragments/Refs/MyPages/Breadcrumbs.graphql
+++ /dev/null
@@ -1,28 +0,0 @@
-#import "../System.graphql"
-
-fragment MyPagesBreadcrumbsRefs on AccountPage {
-  web {
-    breadcrumbs {
-      title
-      parentsConnection {
-        edges {
-          node {
-            ... on AccountPage {
-              web {
-                breadcrumbs {
-                  title
-                }
-              }
-              system {
-                ...System
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  system {
-    ...System
-  }
-}
diff --git a/lib/graphql/Fragments/Sidebar/Content.graphql b/lib/graphql/Fragments/Sidebar/Content.graphql
new file mode 100644
index 000000000..f02d5a928
--- /dev/null
+++ b/lib/graphql/Fragments/Sidebar/Content.graphql
@@ -0,0 +1,80 @@
+#import "../Image.graphql"
+#import "../ImageContainer.graphql"
+
+#import "../ContentPage/Ref.graphql"
+#import "../LoyaltyPage/Ref.graphql"
+
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+
+fragment ContentSidebar_ContentPage on ContentPageSidebarContent {
+  content {
+    content {
+      json
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageLink
+            ...Image
+            ...ImageContainer
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment ContentSidebar_ContentPageRefs on ContentPageSidebarContent {
+  content {
+    content {
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageRef
+            ...ImageContainerRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment ContentSidebar_LoyaltyPage on LoyaltyPageSidebarContent {
+  content {
+    content {
+      json
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageLink
+            ...Image
+            ...ImageContainer
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment ContentSidebar_LoyaltyPageRefs on LoyaltyPageSidebarContent {
+  content {
+    content {
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...ContentPageRef
+            ...ImageContainerRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Fragments/Sidebar/DynamicContent.graphql b/lib/graphql/Fragments/Sidebar/DynamicContent.graphql
new file mode 100644
index 000000000..9d9da6e58
--- /dev/null
+++ b/lib/graphql/Fragments/Sidebar/DynamicContent.graphql
@@ -0,0 +1,11 @@
+fragment DynamicContentSidebar_ContentPage on ContentPageSidebarDynamicContent {
+  dynamic_content {
+    component
+  }
+}
+
+fragment DynamicContentSidebar_LoyaltyPage on LoyaltyPageSidebarDynamicContent {
+  dynamic_content {
+    component
+  }
+}
diff --git a/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql b/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
new file mode 100644
index 000000000..99f529cd7
--- /dev/null
+++ b/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
@@ -0,0 +1,113 @@
+#import "../AccountPage/Ref.graphql"
+#import "../ContentPage/Ref.graphql"
+#import "../LoyaltyPage/Ref.graphql"
+
+#import "../PageLink/AccountPageLink.graphql"
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+
+fragment ContactFields on ContactFields {
+  display_text
+  contact_field
+  footnote
+}
+
+fragment JoinLoyaltyContactSidebar_ContentPage on ContentPageSidebarJoinLoyaltyContact {
+  join_loyalty_contact {
+    preamble
+    title
+    button {
+      cta_text
+      open_in_new_tab
+      external_link {
+        href
+        title
+      }
+      linkConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageLink
+            ...ContentPageLink
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+    contact {
+      __typename
+      ... on ContentPageSidebarJoinLoyaltyContactBlockContactContact {
+        contact {
+          ...ContactFields
+        }
+      }
+    }
+  }
+}
+
+fragment JoinLoyaltyContactSidebar_ContentPageRefs on ContentPageSidebarJoinLoyaltyContact {
+  join_loyalty_contact {
+    button {
+      linkConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageRef
+            ...ContentPageRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment JoinLoyaltyContactSidebar_LoyaltyPage on LoyaltyPageSidebarJoinLoyaltyContact {
+  join_loyalty_contact {
+    preamble
+    title
+    button {
+      cta_text
+      open_in_new_tab
+      external_link {
+        href
+        title
+      }
+      linkConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageLink
+            ...ContentPageLink
+            ...LoyaltyPageLink
+          }
+        }
+      }
+    }
+    contact {
+      __typename
+      ... on LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact {
+        contact {
+          ...ContactFields
+        }
+      }
+    }
+  }
+}
+
+fragment JoinLoyaltyContactSidebar_LoyaltyPageRefs on LoyaltyPageSidebarJoinLoyaltyContact {
+  join_loyalty_contact {
+    button {
+      linkConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageRef
+            ...ContentPageRef
+            ...LoyaltyPageRef
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Fragments/Refs/System.graphql b/lib/graphql/Fragments/System.graphql
similarity index 87%
rename from lib/graphql/Fragments/Refs/System.graphql
rename to lib/graphql/Fragments/System.graphql
index f6875f865..2706540ce 100644
--- a/lib/graphql/Fragments/Refs/System.graphql
+++ b/lib/graphql/Fragments/System.graphql
@@ -1,4 +1,5 @@
 fragment System on EntrySystemField {
   content_type_uid
+  locale
   uid
 }
diff --git a/lib/graphql/Query/AccountPage.graphql b/lib/graphql/Query/AccountPage.graphql
deleted file mode 100644
index 538b7e64a..000000000
--- a/lib/graphql/Query/AccountPage.graphql
+++ /dev/null
@@ -1,107 +0,0 @@
-#import "../Fragments/MyPages/AccountPage/AccountPageContentDynamicContent.graphql"
-#import "../Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql"
-#import "../Fragments/MyPages/AccountPage/AccountPageContentTextContent.graphql"
-
-#import "../Fragments/Refs/MyPages/AccountPage.graphql"
-#import "../Fragments/Refs/ContentPage/ContentPage.graphql"
-#import "../Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql"
-#import "../Fragments/Refs/System.graphql"
-
-query GetAccountPage($locale: String!, $uid: String!) {
-  account_page(locale: $locale, uid: $uid) {
-    heading
-    url
-    title
-    content {
-      __typename
-      ...AccountPageContentDynamicContent
-      ...AccountPageContentShortcuts
-      ...AccountPageContentTextContent
-    }
-    system {
-      uid
-      created_at
-      updated_at
-      locale
-    }
-  }
-}
-
-query GetAccountPageRefs($locale: String!, $uid: String!) {
-  account_page(locale: $locale, uid: $uid) {
-    content {
-      ... on AccountPageContentDynamicContent {
-        __typename
-        dynamic_content {
-          link {
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on AccountPageContentShortcuts {
-        __typename
-        shortcuts {
-          shortcuts {
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageRef
-                  ...ContentPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    system {
-      ...System
-    }
-  }
-}
-
-query GetDaDeEnUrlsAccountPage($uid: String!) {
-  de: all_account_page(where: { uid: $uid }, locale: "de") {
-    items {
-      url
-    }
-  }
-  en: all_account_page(where: { uid: $uid }, locale: "en") {
-    items {
-      url
-    }
-  }
-  da: all_account_page(where: { uid: $uid }, locale: "da") {
-    items {
-      url
-    }
-  }
-}
-
-query GetFiNoSvUrlsAccountPage($uid: String!) {
-  fi: all_account_page(where: { uid: $uid }, locale: "fi") {
-    items {
-      url
-    }
-  }
-  no: all_account_page(where: { uid: $uid }, locale: "no") {
-    items {
-      url
-    }
-  }
-  sv: all_account_page(where: { uid: $uid }, locale: "sv") {
-    items {
-      url
-    }
-  }
-}
diff --git a/lib/graphql/Query/AccountPage/AccountPage.graphql b/lib/graphql/Query/AccountPage/AccountPage.graphql
new file mode 100644
index 000000000..d18f69bff
--- /dev/null
+++ b/lib/graphql/Query/AccountPage/AccountPage.graphql
@@ -0,0 +1,61 @@
+#import "../../Fragments/System.graphql"
+
+#import "../../Fragments/Blocks/DynamicContent.graphql"
+#import "../../Fragments/Blocks/Shortcuts.graphql"
+#import "../../Fragments/Blocks/TextContent.graphql"
+
+query GetAccountPage($locale: String!, $uid: String!) {
+  account_page(locale: $locale, uid: $uid) {
+    heading
+    title
+    url
+    content {
+      __typename
+      ...DynamicContent_AccountPage
+      ...Shortcuts_AccountPage
+      ...TextContent_AccountPage
+    }
+    system {
+      ...System
+      created_at
+      updated_at
+    }
+  }
+}
+
+query GetAccountPageRefs($locale: String!, $uid: String!) {
+  account_page(locale: $locale, uid: $uid) {
+    content {
+      __typename
+      ...DynamicContent_AccountPageRefs
+      ...Shortcuts_AccountPageRefs
+    }
+    system {
+      ...System
+    }
+  }
+}
+
+query GetDaDeEnUrlsAccountPage($uid: String!) {
+  de: account_page(locale: "de", uid: $uid) {
+    url
+  }
+  en: account_page(locale: "en", uid: $uid) {
+    url
+  }
+  da: account_page(locale: "da", uid: $uid) {
+    url
+  }
+}
+
+query GetFiNoSvUrlsAccountPage($uid: String!) {
+  fi: account_page(locale: "fi", uid: $uid) {
+    url
+  }
+  no: account_page(locale: "no", uid: $uid) {
+    url
+  }
+  sv: account_page(locale: "sv", uid: $uid) {
+    url
+  }
+}
diff --git a/lib/graphql/Query/MetaDataMyPages.graphql b/lib/graphql/Query/AccountPage/MetaData.graphql
similarity index 79%
rename from lib/graphql/Query/MetaDataMyPages.graphql
rename to lib/graphql/Query/AccountPage/MetaData.graphql
index c30d086f5..966f38fa1 100644
--- a/lib/graphql/Query/MetaDataMyPages.graphql
+++ b/lib/graphql/Query/AccountPage/MetaData.graphql
@@ -1,9 +1,10 @@
-#import "../Fragments/Image.graphql"
+#import "../../Fragments/Image.graphql"
+#import "../../Fragments/System.graphql"
 
 query GetMyPagesMetaData($locale: String!, $uid: String!) {
   account_page(locale: $locale, uid: $uid) {
     system {
-      uid
+      ...System
     }
     web {
       breadcrumbs {
diff --git a/lib/graphql/Query/NavigationMyPages.graphql b/lib/graphql/Query/AccountPage/Navigation.graphql
similarity index 71%
rename from lib/graphql/Query/NavigationMyPages.graphql
rename to lib/graphql/Query/AccountPage/Navigation.graphql
index c0f8acb44..defd6fe39 100644
--- a/lib/graphql/Query/NavigationMyPages.graphql
+++ b/lib/graphql/Query/AccountPage/Navigation.graphql
@@ -1,10 +1,10 @@
-#import "../Fragments/PageLink/AccountPageLink.graphql"
-#import "../Fragments/PageLink/ContentPageLink.graphql"
-#import "../Fragments/PageLink/LoyaltyPageLink.graphql"
-#import "../Fragments/Refs/MyPages/AccountPage.graphql"
-#import "../Fragments/Refs/ContentPage/ContentPage.graphql"
-#import "../Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql"
-#import "../Fragments/Refs/System.graphql"
+#import "../../Fragments/PageLink/AccountPageLink.graphql"
+#import "../../Fragments/PageLink/ContentPageLink.graphql"
+#import "../../Fragments/PageLink/LoyaltyPageLink.graphql"
+#import "../../Fragments/AccountPage/Ref.graphql"
+#import "../../Fragments/ContentPage/Ref.graphql"
+#import "../../Fragments/LoyaltyPage/Ref.graphql"
+#import "../../Fragments/System.graphql"
 
 query GetNavigationMyPages($locale: String!) {
   all_navigation_my_pages(locale: $locale, limit: 1) {
diff --git a/lib/graphql/Query/Breadcrumbs/AccountPage.graphql b/lib/graphql/Query/Breadcrumbs/AccountPage.graphql
new file mode 100644
index 000000000..038ab6290
--- /dev/null
+++ b/lib/graphql/Query/Breadcrumbs/AccountPage.graphql
@@ -0,0 +1,28 @@
+#import "../../Fragments/Breadcrumbs/Breadcrumbs.graphql"
+#import "../../Fragments/System.graphql"
+
+query GetMyPagesBreadcrumbs($locale: String!, $uid: String!) {
+  account_page(locale: $locale, uid: $uid) {
+    web {
+      breadcrumbs {
+        ...Breadcrumbs
+      }
+    }
+    system {
+      ...System
+    }
+  }
+}
+
+query GetMyPagesBreadcrumbsRefs($locale: String!, $uid: String!) {
+  account_page(locale: $locale, uid: $uid) {
+    web {
+      breadcrumbs {
+        ...BreadcrumbsRefs
+      }
+    }
+    system {
+      ...System
+    }
+  }
+}
diff --git a/lib/graphql/Query/Breadcrumbs/ContentPage.graphql b/lib/graphql/Query/Breadcrumbs/ContentPage.graphql
new file mode 100644
index 000000000..27af9e871
--- /dev/null
+++ b/lib/graphql/Query/Breadcrumbs/ContentPage.graphql
@@ -0,0 +1,28 @@
+#import "../../Fragments/Breadcrumbs/Breadcrumbs.graphql"
+#import "../../Fragments/System.graphql"
+
+query GetContentPageBreadcrumbs($locale: String!, $uid: String!) {
+  content_page(locale: $locale, uid: $uid) {
+    web {
+      breadcrumbs {
+        ...Breadcrumbs
+      }
+    }
+    system {
+      ...System
+    }
+  }
+}
+
+query GetContentPageBreadcrumbsRefs($locale: String!, $uid: String!) {
+  content_page(locale: $locale, uid: $uid) {
+    web {
+      breadcrumbs {
+        ...BreadcrumbsRefs
+      }
+    }
+    system {
+      ...System
+    }
+  }
+}
diff --git a/lib/graphql/Query/Breadcrumbs/LoyaltyPage.graphql b/lib/graphql/Query/Breadcrumbs/LoyaltyPage.graphql
new file mode 100644
index 000000000..d2f05e1ac
--- /dev/null
+++ b/lib/graphql/Query/Breadcrumbs/LoyaltyPage.graphql
@@ -0,0 +1,28 @@
+#import "../../Fragments/Breadcrumbs/Breadcrumbs.graphql"
+#import "../../Fragments/System.graphql"
+
+query GetLoyaltyPageBreadcrumbs($locale: String!, $uid: String!) {
+  loyalty_page(locale: $locale, uid: $uid) {
+    web {
+      breadcrumbs {
+        ...Breadcrumbs
+      }
+    }
+    system {
+      ...System
+    }
+  }
+}
+
+query GetLoyaltyPageBreadcrumbsRefs($locale: String!, $uid: String!) {
+  loyalty_page(locale: $locale, uid: $uid) {
+    web {
+      breadcrumbs {
+        ...BreadcrumbsRefs
+      }
+    }
+    system {
+      ...System
+    }
+  }
+}
diff --git a/lib/graphql/Query/BreadcrumbsContentPage.graphql b/lib/graphql/Query/BreadcrumbsContentPage.graphql
deleted file mode 100644
index fddbffc09..000000000
--- a/lib/graphql/Query/BreadcrumbsContentPage.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-#import "../Fragments/ContentPage/Breadcrumbs.graphql"
-#import "../Fragments/Refs/ContentPage/Breadcrumbs.graphql"
-
-query GetContentPageBreadcrumbs($locale: String!, $url: String!) {
-  all_content_page(locale: $locale, where: { url: $url }) {
-    items {
-      ...ContentPageBreadcrumbs
-      system {
-        uid
-      }
-    }
-  }
-}
-
-query GetContentPageBreadcrumbsRefs($locale: String!, $url: String!) {
-  all_content_page(locale: $locale, where: { url: $url }) {
-    items {
-      ...ContentPageBreadcrumbsRefs
-    }
-  }
-}
diff --git a/lib/graphql/Query/BreadcrumbsLoyaltyPage.graphql b/lib/graphql/Query/BreadcrumbsLoyaltyPage.graphql
deleted file mode 100644
index d0f6edf0b..000000000
--- a/lib/graphql/Query/BreadcrumbsLoyaltyPage.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-#import "../Fragments/LoyaltyPage/Breadcrumbs.graphql"
-#import "../Fragments/Refs/LoyaltyPage/Breadcrumbs.graphql"
-
-query GetLoyaltyPageBreadcrumbs($locale: String!, $url: String!) {
-  all_loyalty_page(locale: $locale, where: { url: $url }) {
-    items {
-      ...LoyaltyPageBreadcrumbs
-      system {
-        uid
-      }
-    }
-  }
-}
-
-query GetLoyaltyPageBreadcrumbsRefs($locale: String!, $url: String!) {
-  all_loyalty_page(locale: $locale, where: { url: $url }) {
-    items {
-      ...LoyaltyPageBreadcrumbsRefs
-    }
-  }
-}
diff --git a/lib/graphql/Query/BreadcrumbsMyPages.graphql b/lib/graphql/Query/BreadcrumbsMyPages.graphql
deleted file mode 100644
index f19ee00e4..000000000
--- a/lib/graphql/Query/BreadcrumbsMyPages.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-#import "../Fragments/MyPages/Breadcrumbs.graphql"
-#import "../Fragments/Refs/MyPages/Breadcrumbs.graphql"
-
-query GetMyPagesBreadcrumbs($locale: String!, $url: String!) {
-  all_account_page(locale: $locale, where: { url: $url }) {
-    items {
-      ...MyPagesBreadcrumbs
-      system {
-        uid
-      }
-    }
-  }
-}
-
-query GetMyPagesBreadcrumbsRefs($locale: String!, $url: String!) {
-  all_account_page(locale: $locale, where: { url: $url }) {
-    items {
-      ...MyPagesBreadcrumbsRefs
-    }
-  }
-}
diff --git a/lib/graphql/Query/ContentPage.graphql b/lib/graphql/Query/ContentPage.graphql
deleted file mode 100644
index e84612c0c..000000000
--- a/lib/graphql/Query/ContentPage.graphql
+++ /dev/null
@@ -1,384 +0,0 @@
-#import "../Fragments/Image.graphql"
-#import "../Fragments/Blocks/Card.graphql"
-#import "../Fragments/Blocks/LoyaltyCard.graphql"
-
-#import "../Fragments/Blocks/Refs/Card.graphql"
-#import "../Fragments/Blocks/Refs/LoyaltyCard.graphql"
-
-#import "../Fragments/PageLink/AccountPageLink.graphql"
-#import "../Fragments/PageLink/ContentPageLink.graphql"
-#import "../Fragments/PageLink/HotelPageLink.graphql"
-#import "../Fragments/PageLink/LoyaltyPageLink.graphql"
-
-#import "../Fragments/Refs/MyPages/AccountPage.graphql"
-#import "../Fragments/Refs/ContentPage/ContentPage.graphql"
-#import "../Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql"
-#import "../Fragments/Refs/System.graphql"
-
-query GetContentPage($locale: String!, $uid: String!) {
-  content_page(uid: $uid, locale: $locale) {
-    blocks {
-      ... on ContentPageBlocksContent {
-        __typename
-        content {
-          content {
-            embedded_itemsConnection {
-              edges {
-                node {
-                  __typename
-                  ...LoyaltyPageLink
-                  ...ContentPageLink
-                  ...AccountPageLink
-                  ...HotelPageLink
-                }
-              }
-              totalCount
-            }
-            json
-          }
-        }
-      }
-      ... on ContentPageBlocksShortcuts {
-        __typename
-        shortcuts {
-          title
-          preamble
-          shortcuts {
-            open_in_new_tab
-            text
-            linkConnection {
-              totalCount
-              edges {
-                node {
-                  ...LoyaltyPageLink
-                  ...ContentPageLink
-                  ...AccountPageLink
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on ContentPageBlocksCardsGrid {
-        __typename
-        cards_grid {
-          title
-          preamble
-          layout
-          theme
-          cardConnection(limit: 10) {
-            edges {
-              node {
-                __typename
-                ...CardBlock
-                ...LoyaltyCardBlock
-              }
-            }
-          }
-        }
-      }
-      ... on ContentPageBlocksDynamicContent {
-        __typename
-        dynamic_content {
-          title
-          subtitle
-          component
-          link {
-            text
-            pageConnection {
-              edges {
-                node {
-                  ...ContentPageLink
-                  ...LoyaltyPageLink
-                  ...HotelPageLink
-                }
-              }
-              totalCount
-            }
-          }
-        }
-      }
-      ... on ContentPageBlocksTextCols {
-        __typename
-        text_cols {
-          columns {
-            title
-            text {
-              json
-              embedded_itemsConnection {
-                edges {
-                  node {
-                    __typename
-                    ...LoyaltyPageLink
-                    ...ContentPageLink
-                    ...HotelPageLink
-                  }
-                }
-                totalCount
-              }
-            }
-          }
-        }
-      }
-    }
-    title
-    header {
-      heading
-      preamble
-    }
-    hero_image
-    sidebar {
-      __typename
-      ... on ContentPageSidebarDynamicContent {
-        dynamic_content {
-          component
-        }
-      }
-      ... on ContentPageSidebarJoinLoyaltyContact {
-        join_loyalty_contact {
-          title
-          preamble
-          button {
-            cta_text
-            external_link {
-              title
-              href
-            }
-            open_in_new_tab
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageLink
-                  ...ContentPageLink
-                  ...LoyaltyPageLink
-                }
-              }
-            }
-          }
-          contact {
-            ... on ContentPageSidebarJoinLoyaltyContactBlockContactContact {
-              __typename
-              contact {
-                display_text
-                contact_field
-                footnote
-              }
-            }
-          }
-        }
-      }
-      ... on ContentPageSidebarContent {
-        content {
-          content {
-            json
-            embedded_itemsConnection {
-              edges {
-                node {
-                  __typename
-                  ...Image
-                  ...LoyaltyPageLink
-                  ...ContentPageLink
-                }
-              }
-              totalCount
-            }
-          }
-        }
-      }
-    }
-    system {
-      uid
-      created_at
-      updated_at
-      locale
-    }
-  }
-}
-
-query GetContentPageRefs($locale: String!, $uid: String!) {
-  content_page(locale: $locale, uid: $uid) {
-    blocks {
-      ... on ContentPageBlocksContent {
-        __typename
-        content {
-          content {
-            embedded_itemsConnection {
-              edges {
-                node {
-                  # No fragments used since we want to include __typename for each type to avoid fetching SystemAsset
-                  ... on ContentPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                  ... on LoyaltyPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                  ... on AccountPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on ContentPageBlocksShortcuts {
-        __typename
-        shortcuts {
-          shortcuts {
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageRef
-                  ...ContentPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on ContentPageBlocksCardsGrid {
-        __typename
-        cards_grid {
-          cardConnection(limit: 10) {
-            edges {
-              node {
-                ...CardBlockRef
-                ...LoyaltyCardBlockRef
-              }
-            }
-          }
-        }
-      }
-      ... on ContentPageBlocksDynamicContent {
-        __typename
-        dynamic_content {
-          link {
-            pageConnection {
-              edges {
-                node {
-                  __typename
-                  ...ContentPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    sidebar {
-      ... on ContentPageSidebarContent {
-        __typename
-        content {
-          content {
-            embedded_itemsConnection {
-              edges {
-                node {
-                  # No fragments used since we want to include __typename for each type to avoid fetching SystemAsset
-                  ... on ContentPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                  ... on LoyaltyPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on ContentPageSidebarJoinLoyaltyContact {
-        __typename
-        join_loyalty_contact {
-          button {
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageRef
-                  ...ContentPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    system {
-      ...System
-    }
-  }
-}
-
-query GetDaDeEnUrlsContentPage($uid: String!) {
-  de: all_content_page(where: { uid: $uid }, locale: "de") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  en: all_content_page(where: { uid: $uid }, locale: "en") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  da: all_content_page(where: { uid: $uid }, locale: "da") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-}
-
-query GetFiNoSvUrlsContentPage($uid: String!) {
-  fi: all_content_page(where: { uid: $uid }, locale: "fi") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  no: all_content_page(where: { uid: $uid }, locale: "no") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  sv: all_content_page(where: { uid: $uid }, locale: "sv") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-}
diff --git a/lib/graphql/Query/ContentPage/ContentPage.graphql b/lib/graphql/Query/ContentPage/ContentPage.graphql
new file mode 100644
index 000000000..150429ee0
--- /dev/null
+++ b/lib/graphql/Query/ContentPage/ContentPage.graphql
@@ -0,0 +1,86 @@
+#import "../../Fragments/System.graphql"
+
+#import "../../Fragments/Blocks/CardsGrid.graphql"
+#import "../../Fragments/Blocks/Content.graphql"
+#import "../../Fragments/Blocks/DynamicContent.graphql"
+#import "../../Fragments/Blocks/Shortcuts.graphql"
+#import "../../Fragments/Blocks/TextCols.graphql"
+
+#import "../../Fragments/Sidebar/Content.graphql"
+#import "../../Fragments/Sidebar/DynamicContent.graphql"
+#import "../../Fragments/Sidebar/JoinLoyaltyContact.graphql"
+
+query GetContentPage($locale: String!, $uid: String!) {
+  content_page(uid: $uid, locale: $locale) {
+    hero_image
+    title
+    header {
+      heading
+      preamble
+    }
+    blocks {
+      __typename
+      ...CardsGrid_ContentPage
+      ...Content_ContentPage
+      ...DynamicContent_ContentPage
+      ...Shortcuts_ContentPage
+      ...TextCols_ContentPage
+    }
+    sidebar {
+      __typename
+      ...ContentSidebar_ContentPage
+      ...DynamicContentSidebar_ContentPage
+      ...JoinLoyaltyContactSidebar_ContentPage
+    }
+    system {
+      ...System
+      created_at
+      updated_at
+    }
+  }
+}
+
+query GetContentPageRefs($locale: String!, $uid: String!) {
+  content_page(locale: $locale, uid: $uid) {
+    blocks {
+      __typename
+      ...CardsGrid_ContentPageRefs
+      ...Content_ContentPageRefs
+      ...DynamicContent_ContentPageRefs
+      ...Shortcuts_ContentPageRefs
+      ...TextCols_ContentPageRef
+    }
+    sidebar {
+      __typename
+      ...ContentSidebar_ContentPageRefs
+      ...JoinLoyaltyContactSidebar_ContentPageRefs
+    }
+    system {
+      ...System
+    }
+  }
+}
+
+query GetDaDeEnUrlsContentPage($uid: String!) {
+  de: content_page(locale: "de", uid: $uid) {
+    url
+  }
+  en: content_page(locale: "en", uid: $uid) {
+    url
+  }
+  da: content_page(locale: "da", uid: $uid) {
+    url
+  }
+}
+
+query GetFiNoSvUrlsContentPage($uid: String!) {
+  fi: content_page(locale: "fi", uid: $uid) {
+    url
+  }
+  no: content_page(locale: "no", uid: $uid) {
+    url
+  }
+  sv: content_page(locale: "sv", uid: $uid) {
+    url
+  }
+}
diff --git a/lib/graphql/Query/CurrentBlockPage.graphql b/lib/graphql/Query/Current/CurrentBlockPage.graphql
similarity index 55%
rename from lib/graphql/Query/CurrentBlockPage.graphql
rename to lib/graphql/Query/Current/CurrentBlockPage.graphql
index b275b328f..96ae6cccf 100644
--- a/lib/graphql/Query/CurrentBlockPage.graphql
+++ b/lib/graphql/Query/Current/CurrentBlockPage.graphql
@@ -1,11 +1,11 @@
-#import "../Fragments/Aside/Contact.graphql"
-#import "../Fragments/Aside/Puff.graphql"
-#import "../Fragments/Blocks/List.graphql"
-#import "../Fragments/Blocks/Puff.graphql"
-#import "../Fragments/Blocks/Text.graphql"
-#import "../Fragments/Breadcrumbs.graphql"
-#import "../Fragments/Hero.graphql"
-#import "../Fragments/Preamble.graphql"
+#import "../../Fragments/Aside/Contact.graphql"
+#import "../../Fragments/Aside/Puff.graphql"
+#import "../../Fragments/Blocks/List.graphql"
+#import "../../Fragments/Blocks/Puff.graphql"
+#import "../../Fragments/Blocks/Text.graphql"
+#import "../../Fragments/Breadcrumbs/CurrentBlocksPage.graphql"
+#import "../../Fragments/Hero.graphql"
+#import "../../Fragments/Preamble.graphql"
 
 query GetCurrentBlockPage($locale: String!, $url: String!) {
   all_current_blocks_page(limit: 1, locale: $locale, where: { url: $url }) {
@@ -21,7 +21,7 @@ query GetCurrentBlockPage($locale: String!, $url: String!) {
         ...PuffBlock
         ...TextBlock
       }
-      ...Breadcrumbs
+      ...CurrentBlocksPageBreadcrumbs
       hero {
         ...Hero
       }
diff --git a/lib/graphql/Query/CurrentBlockPageTrackingData.graphql b/lib/graphql/Query/Current/CurrentBlockPageTrackingData.graphql
similarity index 100%
rename from lib/graphql/Query/CurrentBlockPageTrackingData.graphql
rename to lib/graphql/Query/Current/CurrentBlockPageTrackingData.graphql
diff --git a/lib/graphql/Query/Current/Footer.graphql b/lib/graphql/Query/Current/Footer.graphql
new file mode 100644
index 000000000..56d368b61
--- /dev/null
+++ b/lib/graphql/Query/Current/Footer.graphql
@@ -0,0 +1,36 @@
+#import "../../Fragments/CurrentFooter/AppDownloads.graphql"
+#import "../../Fragments/CurrentFooter/Logo.graphql"
+#import "../../Fragments/CurrentFooter/Navigation.graphql"
+#import "../../Fragments/CurrentFooter/SocialMedia.graphql"
+#import "../../Fragments/CurrentFooter/TripAdvisor.graphql"
+#import "../../Fragments/System.graphql"
+
+query GetCurrentFooter($locale: String!) {
+  all_current_footer(limit: 1, locale: $locale) {
+    items {
+      ...CurrentFooterAppDownloads
+      ...CurrentFooterSocialMedia
+      ...Logo
+      ...Navigation
+      ...TripAdvisor
+      title
+      about {
+        text
+        title
+      }
+      system {
+        ...System
+      }
+    }
+  }
+}
+
+query GetCurrentFooterRef($locale: String!) {
+  all_current_footer(limit: 1, locale: $locale) {
+    items {
+      system {
+        ...System
+      }
+    }
+  }
+}
diff --git a/lib/graphql/Query/CurrentHeader.graphql b/lib/graphql/Query/Current/Header.graphql
similarity index 89%
rename from lib/graphql/Query/CurrentHeader.graphql
rename to lib/graphql/Query/Current/Header.graphql
index dc65aba09..dfced2ba3 100644
--- a/lib/graphql/Query/CurrentHeader.graphql
+++ b/lib/graphql/Query/Current/Header.graphql
@@ -1,5 +1,5 @@
-#import "../Fragments/Image.graphql"
-#import "../Fragments/Refs/System.graphql"
+#import "../../Fragments/Image.graphql"
+#import "../../Fragments/System.graphql"
 
 query GetCurrentHeader($locale: String!) {
   all_current_header(limit: 1, locale: $locale) {
diff --git a/lib/graphql/Query/LanguageSwitcherCurrent.graphql b/lib/graphql/Query/Current/LanguageSwitcher.graphql
similarity index 100%
rename from lib/graphql/Query/LanguageSwitcherCurrent.graphql
rename to lib/graphql/Query/Current/LanguageSwitcher.graphql
diff --git a/lib/graphql/Query/CurrentFooter.graphql b/lib/graphql/Query/CurrentFooter.graphql
deleted file mode 100644
index 325f7c04e..000000000
--- a/lib/graphql/Query/CurrentFooter.graphql
+++ /dev/null
@@ -1,37 +0,0 @@
-#import "../Fragments/CurrentFooter/AppDownloads.graphql"
-#import "../Fragments/CurrentFooter/Logo.graphql"
-#import "../Fragments/CurrentFooter/Navigation.graphql"
-#import "../Fragments/CurrentFooter/SocialMedia.graphql"
-#import "../Fragments/CurrentFooter/TripAdvisor.graphql"
-#import "../Fragments/Refs/System.graphql"
-
-query GetCurrentFooter($locale: String!) {
-  all_current_footer(limit: 1, locale: $locale) {
-    items {
-      title
-      system {
-        locale
-        uid
-      }
-      about {
-        text
-        title
-      }
-      ...AppDownloads
-      ...Logo
-      ...Navigation
-      ...SocialMedia
-      ...TripAdvisor
-    }
-  }
-}
-
-query GetCurrentFooterRef($locale: String!) {
-  all_current_footer(limit: 1, locale: $locale) {
-    items {
-      system {
-        ...System
-      }
-    }
-  }
-}
diff --git a/lib/graphql/Query/Footer.graphql b/lib/graphql/Query/Footer.graphql
index a1ca752fe..789e5c109 100644
--- a/lib/graphql/Query/Footer.graphql
+++ b/lib/graphql/Query/Footer.graphql
@@ -1,14 +1,14 @@
-#import "../Fragments/Refs/System.graphql"
+#import "../Fragments/System.graphql"
 
 #import "../Fragments/PageLink/AccountPageLink.graphql"
 #import "../Fragments/PageLink/ContentPageLink.graphql"
 #import "../Fragments/PageLink/HotelPageLink.graphql"
 #import "../Fragments/PageLink/LoyaltyPageLink.graphql"
 
-#import "../Fragments/Refs/ContentPage/ContentPage.graphql"
-#import "../Fragments/Refs/HotelPage/HotelPage.graphql"
-#import "../Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql"
-#import "../Fragments/Refs/MyPages/AccountPage.graphql"
+#import "../Fragments/AccountPage/Ref.graphql"
+#import "../Fragments/ContentPage/Ref.graphql"
+#import "../Fragments/HotelPage/Ref.graphql"
+#import "../Fragments/LoyaltyPage/Ref.graphql"
 
 #import "../Fragments/Footer/AppDownloads.graphql"
 #import "../Fragments/Footer/SocialMedia.graphql"
diff --git a/lib/graphql/Query/Header.graphql b/lib/graphql/Query/Header.graphql
index 1e3fddd01..ec6be3b72 100644
--- a/lib/graphql/Query/Header.graphql
+++ b/lib/graphql/Query/Header.graphql
@@ -1,4 +1,4 @@
-#import "../Fragments/Refs/System.graphql"
+#import "../Fragments/System.graphql"
 
 #import "../Fragments/PageLink/AccountPageLink.graphql"
 #import "../Fragments/PageLink/ContentPageLink.graphql"
@@ -7,10 +7,10 @@
 #import "../Fragments/Blocks/Card.graphql"
 
 #import "../Fragments/Blocks/Refs/Card.graphql"
-#import "../Fragments/Refs/ContentPage/ContentPage.graphql"
-#import "../Fragments/Refs/HotelPage/HotelPage.graphql"
-#import "../Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql"
-#import "../Fragments/Refs/MyPages/AccountPage.graphql"
+#import "../Fragments/AccountPage/Ref.graphql"
+#import "../Fragments/ContentPage/Ref.graphql"
+#import "../Fragments/HotelPage/Ref.graphql"
+#import "../Fragments/LoyaltyPage/Ref.graphql"
 
 query GetHeader($locale: String!) {
   all_header(limit: 1, locale: $locale) {
diff --git a/lib/graphql/Query/HotelPage.graphql b/lib/graphql/Query/HotelPage/HotelPage.graphql
similarity index 63%
rename from lib/graphql/Query/HotelPage.graphql
rename to lib/graphql/Query/HotelPage/HotelPage.graphql
index 39e4e230f..dee41c6a8 100644
--- a/lib/graphql/Query/HotelPage.graphql
+++ b/lib/graphql/Query/HotelPage/HotelPage.graphql
@@ -1,8 +1,8 @@
 query GetHotelPage($locale: String!, $uid: String!) {
   hotel_page(locale: $locale, uid: $uid) {
     hotel_page_id
-    url
     title
+    url
     content {
       ... on HotelPageContentUpcomingActivitiesCard {
         __typename
@@ -35,37 +35,25 @@ query GetHotelPage($locale: String!, $uid: String!) {
 }
 
 query GetDaDeEnUrlsHotelPage($uid: String!) {
-  de: all_hotel_page(where: { uid: $uid }, locale: "de") {
-    items {
-      url
-    }
+  de: hotel_page(locale: "de", uid: $uid) {
+    url
   }
-  en: all_hotel_page(where: { uid: $uid }, locale: "en") {
-    items {
-      url
-    }
+  en: hotel_page(locale: "en", uid: $uid) {
+    url
   }
-  da: all_hotel_page(where: { uid: $uid }, locale: "da") {
-    items {
-      url
-    }
+  da: hotel_page(locale: "da", uid: $uid) {
+    url
   }
 }
 
 query GetFiNoSvUrlsHotelPage($uid: String!) {
-  fi: all_hotel_page(where: { uid: $uid }, locale: "fi") {
-    items {
-      url
-    }
+  fi: hotel_page(locale: "fi", uid: $uid) {
+    url
   }
-  no: all_hotel_page(where: { uid: $uid }, locale: "no") {
-    items {
-      url
-    }
+  no: hotel_page(locale: "no", uid: $uid) {
+    url
   }
-  sv: all_hotel_page(where: { uid: $uid }, locale: "sv") {
-    items {
-      url
-    }
+  sv: hotel_page(locale: "sv", uid: $uid) {
+    url
   }
 }
diff --git a/lib/graphql/Query/LoyaltyPage.graphql b/lib/graphql/Query/LoyaltyPage.graphql
deleted file mode 100644
index c5ef91f81..000000000
--- a/lib/graphql/Query/LoyaltyPage.graphql
+++ /dev/null
@@ -1,372 +0,0 @@
-#import "../Fragments/Image.graphql"
-#import "../Fragments/Blocks/Card.graphql"
-#import "../Fragments/Blocks/LoyaltyCard.graphql"
-
-#import "../Fragments/Blocks/Refs/Card.graphql"
-#import "../Fragments/Blocks/Refs/LoyaltyCard.graphql"
-
-#import "../Fragments/PageLink/AccountPageLink.graphql"
-#import "../Fragments/PageLink/ContentPageLink.graphql"
-#import "../Fragments/PageLink/LoyaltyPageLink.graphql"
-
-#import "../Fragments/Refs/MyPages/AccountPage.graphql"
-#import "../Fragments/Refs/ContentPage/ContentPage.graphql"
-#import "../Fragments/Refs/LoyaltyPage/LoyaltyPage.graphql"
-#import "../Fragments/Refs/System.graphql"
-
-query GetLoyaltyPage($locale: String!, $uid: String!) {
-  loyalty_page(uid: $uid, locale: $locale) {
-    blocks {
-      ... on LoyaltyPageBlocksShortcuts {
-        __typename
-        shortcuts {
-          title
-          preamble
-          shortcuts {
-            text
-            open_in_new_tab
-            linkConnection {
-              edges {
-                node {
-                  ...LoyaltyPageLink
-                  ...ContentPageLink
-                  ...AccountPageLink
-                }
-              }
-              totalCount
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageBlocksDynamicContent {
-        __typename
-        dynamic_content {
-          title
-          subtitle
-          component
-          link {
-            text
-            pageConnection {
-              edges {
-                node {
-                  ...ContentPageLink
-                  ...LoyaltyPageLink
-                }
-              }
-              totalCount
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageBlocksContent {
-        __typename
-        content {
-          content {
-            json
-            embedded_itemsConnection {
-              edges {
-                node {
-                  __typename
-                  ...LoyaltyPageLink
-                  ...ContentPageLink
-                  ...AccountPageLink
-                  ...Image
-                  ... on ImageContainer {
-                    title
-                    image_left
-                    image_right
-                    system {
-                      uid
-                    }
-                  }
-                }
-              }
-              totalCount
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageBlocksCardsGrid {
-        __typename
-        cards_grid {
-          title
-          preamble
-          layout
-          theme
-          cardConnection(limit: 10) {
-            edges {
-              node {
-                __typename
-                ...CardBlock
-                ...LoyaltyCardBlock
-              }
-            }
-          }
-        }
-      }
-    }
-    title
-    heading
-    preamble
-    hero_image
-    sidebar {
-      __typename
-      ... on LoyaltyPageSidebarDynamicContent {
-        dynamic_content {
-          component
-        }
-      }
-      ... on LoyaltyPageSidebarJoinLoyaltyContact {
-        join_loyalty_contact {
-          title
-          preamble
-          button {
-            cta_text
-            external_link {
-              title
-              href
-            }
-            open_in_new_tab
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageLink
-                  ...ContentPageLink
-                  ...LoyaltyPageLink
-                }
-              }
-            }
-          }
-          contact {
-            ... on LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact {
-              __typename
-              contact {
-                display_text
-                contact_field
-                footnote
-              }
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageSidebarContent {
-        content {
-          content {
-            json
-            embedded_itemsConnection {
-              edges {
-                node {
-                  __typename
-                  ...Image
-                  ...LoyaltyPageLink
-                  ...ContentPageLink
-                }
-              }
-              totalCount
-            }
-          }
-        }
-      }
-    }
-    system {
-      uid
-      created_at
-      updated_at
-      locale
-    }
-  }
-}
-
-query GetLoyaltyPageRefs($locale: String!, $uid: String!) {
-  loyalty_page(locale: $locale, uid: $uid) {
-    blocks {
-      ... on LoyaltyPageBlocksShortcuts {
-        __typename
-        shortcuts {
-          shortcuts {
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageRef
-                  ...ContentPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageBlocksDynamicContent {
-        __typename
-        dynamic_content {
-          link {
-            pageConnection {
-              edges {
-                node {
-                  __typename
-                  ...ContentPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageBlocksContent {
-        __typename
-        content {
-          content {
-            embedded_itemsConnection {
-              edges {
-                node {
-                  # No fragments used since we want to include __typename for each type to avoid fetching SystemAsset
-                  ... on ContentPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                  ... on LoyaltyPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                  ... on AccountPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                  ... on ImageContainer {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageBlocksCardsGrid {
-        __typename
-        cards_grid {
-          cardConnection(limit: 10) {
-            edges {
-              node {
-                ...CardBlockRef
-                ...LoyaltyCardBlockRef
-              }
-            }
-          }
-        }
-      }
-    }
-    sidebar {
-      ... on LoyaltyPageSidebarContent {
-        __typename
-        content {
-          content {
-            embedded_itemsConnection {
-              edges {
-                node {
-                  # No fragments used since we want to include __typename for each type to avoid fetching SystemAsset
-                  ... on ContentPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                  ... on LoyaltyPage {
-                    __typename
-                    system {
-                      ...System
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      ... on LoyaltyPageSidebarJoinLoyaltyContact {
-        __typename
-        join_loyalty_contact {
-          button {
-            linkConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageRef
-                  ...ContentPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    system {
-      ...System
-    }
-  }
-}
-
-query GetDaDeEnUrlsLoyaltyPage($uid: String!) {
-  de: all_loyalty_page(where: { uid: $uid }, locale: "de") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  en: all_loyalty_page(where: { uid: $uid }, locale: "en") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  da: all_loyalty_page(where: { uid: $uid }, locale: "da") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-}
-
-query GetFiNoSvUrlsLoyaltyPage($uid: String!) {
-  sv: all_loyalty_page(where: { uid: $uid }, locale: "sv") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  no: all_loyalty_page(where: { uid: $uid }, locale: "no") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-  fi: all_loyalty_page(where: { uid: $uid }, locale: "fi") {
-    items {
-      web {
-        original_url
-      }
-      url
-    }
-  }
-}
diff --git a/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql b/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql
new file mode 100644
index 000000000..7a0d8650a
--- /dev/null
+++ b/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql
@@ -0,0 +1,99 @@
+#import "../../Fragments/System.graphql"
+
+#import "../../Fragments/Blocks/CardsGrid.graphql"
+#import "../../Fragments/Blocks/Content.graphql"
+#import "../../Fragments/Blocks/DynamicContent.graphql"
+#import "../../Fragments/Blocks/Shortcuts.graphql"
+
+#import "../../Fragments/Sidebar/Content.graphql"
+#import "../../Fragments/Sidebar/DynamicContent.graphql"
+#import "../../Fragments/Sidebar/JoinLoyaltyContact.graphql"
+
+query GetLoyaltyPage($locale: String!, $uid: String!) {
+  loyalty_page(uid: $uid, locale: $locale) {
+    heading
+    hero_image
+    preamble
+    title
+    blocks {
+      __typename
+      ...CardsGrid_LoyaltyPage
+      ...Content_LoyaltyPage
+      ...DynamicContent_LoyaltyPage
+      ...Shortcuts_LoyaltyPage
+    }
+    sidebar {
+      __typename
+      ...ContentSidebar_LoyaltyPage
+      ...DynamicContentSidebar_LoyaltyPage
+      ...JoinLoyaltyContactSidebar_LoyaltyPage
+    }
+    system {
+      ...System
+      created_at
+      updated_at
+    }
+  }
+}
+
+query GetLoyaltyPageRefs($locale: String!, $uid: String!) {
+  loyalty_page(locale: $locale, uid: $uid) {
+    blocks {
+      __typename
+      ...CardsGrid_LoyaltyPageRefs
+      ...Content_LoyaltyPageRefs
+      ...DynamicContent_LoyaltyPageRefs
+      ...Shortcuts_LoyaltyPageRefs
+    }
+    sidebar {
+      __typename
+      ...ContentSidebar_LoyaltyPageRefs
+      ...JoinLoyaltyContactSidebar_LoyaltyPageRefs
+    }
+    system {
+      ...System
+    }
+  }
+}
+
+query GetDaDeEnUrlsLoyaltyPage($uid: String!) {
+  de: loyalty_page(locale: "de", uid: $uid) {
+    web {
+      original_url
+    }
+    url
+  }
+  en: loyalty_page(locale: "en", uid: $uid) {
+    web {
+      original_url
+    }
+    url
+  }
+  da: loyalty_page(locale: "da", uid: $uid) {
+    web {
+      original_url
+    }
+    url
+  }
+}
+
+query GetFiNoSvUrlsLoyaltyPage($uid: String!) {
+  sv: loyalty_page(locale: "sv", uid: $uid) {
+    web {
+      original_url
+    }
+    url
+  }
+  no: loyalty_page(locale: "no", uid: $uid) {
+    web {
+      original_url
+    }
+    url
+  }
+  fi: loyalty_page(locale: "fi", uid: $uid) {
+    web {
+      original_url
+    }
+    url
+  }
+}
diff --git a/lib/graphql/Query/MetaDataLoyaltyPage.graphql b/lib/graphql/Query/LoyaltyPage/MetaData.graphql
similarity index 79%
rename from lib/graphql/Query/MetaDataLoyaltyPage.graphql
rename to lib/graphql/Query/LoyaltyPage/MetaData.graphql
index 01ea5f768..a1233dc8c 100644
--- a/lib/graphql/Query/MetaDataLoyaltyPage.graphql
+++ b/lib/graphql/Query/LoyaltyPage/MetaData.graphql
@@ -1,9 +1,10 @@
-#import "../Fragments/Image.graphql"
+#import "../../Fragments/Image.graphql"
+#import "../../Fragments/System.graphql"
 
 query GetLoyaltyPageMetaData($locale: String!, $uid: String!) {
   loyalty_page(locale: $locale, uid: $uid) {
     system {
-      uid
+      ...System
     }
     web {
       seo_metadata {
diff --git a/lib/graphql/Query/ResolveEntry.graphql b/lib/graphql/Query/ResolveEntry.graphql
index 278ed1cbe..0a07a9cbe 100644
--- a/lib/graphql/Query/ResolveEntry.graphql
+++ b/lib/graphql/Query/ResolveEntry.graphql
@@ -1,4 +1,4 @@
-#import "../Fragments/Refs/System.graphql"
+#import "../Fragments/System.graphql"
 
 query ResolveEntryByUrl($locale: String!, $url: String!) {
   all_account_page(where: { url: $url }, locale: $locale) {
diff --git a/lib/graphql/_request.ts b/lib/graphql/_request.ts
index 174202e70..27178ed7c 100644
--- a/lib/graphql/_request.ts
+++ b/lib/graphql/_request.ts
@@ -1,7 +1,8 @@
 import "server-only"
 
-import { GraphQLClient } from "graphql-request"
+import { ClientError, GraphQLClient } from "graphql-request"
 
+import { Lang } from "@/constants/languages"
 import { env } from "@/env/server"
 
 import type { DocumentNode } from "graphql"
@@ -74,8 +75,31 @@ export async function request<T>(
 
     return { data: response }
   } catch (error) {
-    console.error("Error in graphql request")
-    console.error(error)
+    if (error instanceof ClientError) {
+      if (error.response.errors?.length) {
+        const failedToFetchItem = error.response.errors.find(
+          (err) => err.message === "Failed to fetch item"
+        )
+        if (
+          failedToFetchItem &&
+          failedToFetchItem.extensions?.errors === "Object not found!" &&
+          failedToFetchItem.path?.find((p) => Lang[p as Lang])
+        ) {
+          /**
+           * Because of Contentstacks totally obscure way of implementing
+           * GraphQL where they throw an error when you are querying for
+           * a single item that is nullable and doesn't exist. This leads
+           * to the issue where when we have a page that is missing a published
+           * version for one language, it throws an error which we have to recover
+           * from here since it isn't an error.
+           */
+          return { data: error.response.data as T }
+        }
+      }
+    }
+
+    // console.error("Error in graphql request")
+    // console.error(error)
     throw new Error("Something went wrong")
   }
 }
diff --git a/lib/graphql/request.ts b/lib/graphql/request.ts
index 1b7f8fa18..a6dbbf00f 100644
--- a/lib/graphql/request.ts
+++ b/lib/graphql/request.ts
@@ -14,7 +14,7 @@ const client = new GraphQLClient(env.CMS_URL, {
     url: URL | RequestInfo,
     params: RequestInit | undefined
   ) {
-    const wrappedFetch = fetchRetry(global.fetch, {
+    const wrappedFetch = fetchRetry(fetch, {
       retries: 3,
       retryDelay: function (attempt, error, response) {
         return Math.pow(2, attempt) * 150 // 150, 300, 600
diff --git a/lib/trpc/memoizedRequests/index.ts b/lib/trpc/memoizedRequests/index.ts
new file mode 100644
index 000000000..43c1959f9
--- /dev/null
+++ b/lib/trpc/memoizedRequests/index.ts
@@ -0,0 +1,11 @@
+import { cache } from "react"
+
+import { serverClient } from "../server"
+
+export const getLocations = cache(async function getMemoizedLocations() {
+  return serverClient().hotel.locations.get()
+})
+
+export const getProfile = cache(async function getMemoizedProfile() {
+  return serverClient().user.get()
+})
diff --git a/middlewares/bookingFlow.ts b/middlewares/bookingFlow.ts
index 691d9b869..6c8826c8f 100644
--- a/middlewares/bookingFlow.ts
+++ b/middlewares/bookingFlow.ts
@@ -2,7 +2,9 @@ import { NextResponse } from "next/server"
 
 import { hotelReservation } from "@/constants/routes/hotelReservation"
 
+import { resolve as resolveEntry } from "@/utils/entry"
 import { findLang } from "@/utils/languages"
+import { removeTrailingSlash } from "@/utils/url"
 
 import { getDefaultRequestHeaders } from "./utils"
 
@@ -10,8 +12,21 @@ import type { NextMiddleware } from "next/server"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
 
-export const middleware: NextMiddleware = (request) => {
+export const middleware: NextMiddleware = async (request) => {
+  const { nextUrl } = request
+  const lang = findLang(nextUrl.pathname)!
+
+  const pathWithoutTrailingSlash = removeTrailingSlash(nextUrl.pathname)
+  const pathNameWithoutLang = pathWithoutTrailingSlash.replace(`/${lang}`, "")
+  const { contentType, uid } = await resolveEntry(pathNameWithoutLang, lang)
+
   const headers = getDefaultRequestHeaders(request)
+  if (uid) {
+    headers.set("x-uid", uid)
+  }
+  if (contentType) {
+    headers.set("x-contenttype", contentType)
+  }
   return NextResponse.next({
     request: {
       headers,
diff --git a/middlewares/utils.ts b/middlewares/utils.ts
index cc437133a..0cf1c5b46 100644
--- a/middlewares/utils.ts
+++ b/middlewares/utils.ts
@@ -1,5 +1,4 @@
 import { env } from "@/env/server"
-import { internalServerError } from "@/server/errors/next"
 
 import { findLang } from "@/utils/languages"
 import { removeTrailingSlash } from "@/utils/url"
diff --git a/package-lock.json b/package-lock.json
index 0ec69dde2..4d671fa93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,6 +32,7 @@
         "clean-deep": "^3.4.0",
         "dayjs": "^1.11.10",
         "deepmerge": "^4.3.1",
+        "downshift": "^9.0.8",
         "fetch-retry": "^6.0.0",
         "framer-motion": "^11.3.28",
         "graphql": "^16.8.1",
@@ -39,7 +40,7 @@
         "graphql-tag": "^2.12.6",
         "immer": "10.1.1",
         "libphonenumber-js": "^1.10.60",
-        "next": "^14.2.3",
+        "next": "^14.2.7",
         "next-auth": "^5.0.0-beta.19",
         "react": "^18",
         "react-dom": "^18",
@@ -2365,10 +2366,10 @@
       "license": "MIT"
     },
     "node_modules/@babel/runtime": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz",
-      "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==",
-      "dev": true,
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
+      "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -3377,9 +3378,10 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz",
-      "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA=="
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.7.tgz",
+      "integrity": "sha512-OTx9y6I3xE/eih+qtthppwLytmpJVPM5PPoJxChFsbjIEFXIayG0h/xLzefHGJviAa3Q5+Fd+9uYojKkHDKxoQ==",
+      "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
       "version": "14.1.4",
@@ -3391,12 +3393,13 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz",
-      "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.7.tgz",
+      "integrity": "sha512-UhZGcOyI9LE/tZL3h9rs/2wMZaaJKwnpAyegUVDGZqwsla6hMfeSj9ssBWQS9yA4UXun3pPhrFLVnw5KXZs3vw==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3406,12 +3409,13 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz",
-      "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.7.tgz",
+      "integrity": "sha512-ys2cUgZYRc+CbyDeLAaAdZgS7N1Kpyy+wo0b/gAj+SeOeaj0Lw/q+G1hp+DuDiDAVyxLBCJXEY/AkhDmtihUTA==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3421,12 +3425,13 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz",
-      "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.7.tgz",
+      "integrity": "sha512-2xoWtE13sUJ3qrC1lwE/HjbDPm+kBQYFkkiVECJWctRASAHQ+NwjMzgrfqqMYHfMxFb5Wws3w9PqzZJqKFdWcQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3436,12 +3441,13 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz",
-      "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.7.tgz",
+      "integrity": "sha512-+zJ1gJdl35BSAGpkCbfyiY6iRTaPrt3KTl4SF/B1NyELkqqnrNX6cp4IjjjxKpd64/7enI0kf6b9O1Uf3cL0pw==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3451,12 +3457,13 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz",
-      "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.7.tgz",
+      "integrity": "sha512-m6EBqrskeMUzykBrv0fDX/28lWIBGhMzOYaStp0ihkjzIYJiKUOzVYD1gULHc8XDf5EMSqoH/0/TRAgXqpQwmw==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3466,12 +3473,13 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz",
-      "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.7.tgz",
+      "integrity": "sha512-gUu0viOMvMlzFRz1r1eQ7Ql4OE+hPOmA7smfZAhn8vC4+0swMZaZxa9CSIozTYavi+bJNDZ3tgiSdMjmMzRJlQ==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -3481,12 +3489,13 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz",
-      "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.7.tgz",
+      "integrity": "sha512-PGbONHIVIuzWlYmLvuFKcj+8jXnLbx4WrlESYlVnEzDsa3+Q2hI1YHoXaSmbq0k4ZwZ7J6sWNV4UZfx1OeOlbQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3496,12 +3505,13 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz",
-      "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.7.tgz",
+      "integrity": "sha512-BiSY5umlx9ed5RQDoHcdbuKTUkuFORDqzYKPHlLeS+STUWQKWziVOn3Ic41LuTBvqE0TRJPKpio9GSIblNR+0w==",
       "cpu": [
         "ia32"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3511,12 +3521,13 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz",
-      "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.7.tgz",
+      "integrity": "sha512-pxsI23gKWRt/SPHFkDEsP+w+Nd7gK37Hpv0ngc5HpWy2e7cKx9zR/+Q2ptAUqICNTecAaGWvmhway7pj/JLEWA==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -8250,6 +8261,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/compute-scroll-into-view": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz",
+      "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==",
+      "license": "MIT"
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -9073,6 +9090,28 @@
         "url": "https://dotenvx.com"
       }
     },
+    "node_modules/downshift": {
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/downshift/-/downshift-9.0.8.tgz",
+      "integrity": "sha512-59BWD7+hSUQIM1DeNPLirNNnZIO9qMdIK5GQ/Uo8q34gT4B78RBlb9dhzgnh0HfQTJj4T/JKYD8KoLAlMWnTsA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.24.5",
+        "compute-scroll-into-view": "^3.1.0",
+        "prop-types": "^15.8.1",
+        "react-is": "18.2.0",
+        "tslib": "^2.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.12.0"
+      }
+    },
+    "node_modules/downshift/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "license": "MIT"
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -14700,11 +14739,12 @@
       }
     },
     "node_modules/next": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz",
-      "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==",
+      "version": "14.2.7",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.7.tgz",
+      "integrity": "sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==",
+      "license": "MIT",
       "dependencies": {
-        "@next/env": "14.2.3",
+        "@next/env": "14.2.7",
         "@swc/helpers": "0.5.5",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001579",
@@ -14719,15 +14759,15 @@
         "node": ">=18.17.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.2.3",
-        "@next/swc-darwin-x64": "14.2.3",
-        "@next/swc-linux-arm64-gnu": "14.2.3",
-        "@next/swc-linux-arm64-musl": "14.2.3",
-        "@next/swc-linux-x64-gnu": "14.2.3",
-        "@next/swc-linux-x64-musl": "14.2.3",
-        "@next/swc-win32-arm64-msvc": "14.2.3",
-        "@next/swc-win32-ia32-msvc": "14.2.3",
-        "@next/swc-win32-x64-msvc": "14.2.3"
+        "@next/swc-darwin-arm64": "14.2.7",
+        "@next/swc-darwin-x64": "14.2.7",
+        "@next/swc-linux-arm64-gnu": "14.2.7",
+        "@next/swc-linux-arm64-musl": "14.2.7",
+        "@next/swc-linux-x64-gnu": "14.2.7",
+        "@next/swc-linux-x64-musl": "14.2.7",
+        "@next/swc-win32-arm64-msvc": "14.2.7",
+        "@next/swc-win32-ia32-msvc": "14.2.7",
+        "@next/swc-win32-x64-msvc": "14.2.7"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
@@ -16326,8 +16366,7 @@
     "node_modules/regenerator-runtime": {
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
diff --git a/package.json b/package.json
index d84e0fb31..22f2a0fa7 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "clean-deep": "^3.4.0",
     "dayjs": "^1.11.10",
     "deepmerge": "^4.3.1",
+    "downshift": "^9.0.8",
     "fetch-retry": "^6.0.0",
     "framer-motion": "^11.3.28",
     "graphql": "^16.8.1",
@@ -55,7 +56,7 @@
     "graphql-tag": "^2.12.6",
     "immer": "10.1.1",
     "libphonenumber-js": "^1.10.60",
-    "next": "^14.2.3",
+    "next": "^14.2.7",
     "next-auth": "^5.0.0-beta.19",
     "react": "^18",
     "react-dom": "^18",
diff --git a/public/_static/icons/close.svg b/public/_static/icons/close.svg
new file mode 100644
index 000000000..ee13603ae
--- /dev/null
+++ b/public/_static/icons/close.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_160_2425" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="20" height="20">
+<rect width="20" height="20" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_160_2425)">
+<path d="M6.17675 14.9563C5.86441 15.2686 5.35718 15.266 5.04813 14.9503C4.74424 14.64 4.74619 14.143 5.0525 13.8351L8.86695 9.99998L5.0525 6.16491C4.74619 5.85695 4.74424 5.35999 5.04813 5.04963C5.35718 4.73401 5.86441 4.73134 6.17675 5.04369L10 8.86694L13.8232 5.04369C14.1356 4.73134 14.6428 4.73401 14.9519 5.04963C15.2558 5.35999 15.2538 5.85695 14.9475 6.16491L11.133 9.99998L14.9475 13.8351C15.2538 14.143 15.2558 14.64 14.9519 14.9503C14.6428 15.266 14.1356 15.2686 13.8232 14.9563L10 11.133L6.17675 14.9563Z" fill="#26201E"/>
+</g>
+</svg>
diff --git a/server/errors/trpc.ts b/server/errors/trpc.ts
index ac61d9015..eda2ff86f 100644
--- a/server/errors/trpc.ts
+++ b/server/errors/trpc.ts
@@ -41,7 +41,7 @@ export function internalServerError(cause?: unknown) {
 }
 
 export const SESSION_EXPIRED = "SESSION_EXPIRED"
-export class SessionExpiredError extends Error {}
+export class SessionExpiredError extends Error { }
 export function sessionExpiredError() {
   return new TRPCError({
     code: "UNAUTHORIZED",
@@ -51,7 +51,7 @@ export function sessionExpiredError() {
 }
 
 export const PUBLIC_UNAUTHORIZED = "PUBLIC_UNAUTHORIZED"
-export class PublicUnauthorizedError extends Error {}
+export class PublicUnauthorizedError extends Error { }
 export function publicUnauthorizedError() {
   return new TRPCError({
     code: "UNAUTHORIZED",
diff --git a/server/routers/contentstack/accountPage/output.ts b/server/routers/contentstack/accountPage/output.ts
index 7d99bdbba..b0703784f 100644
--- a/server/routers/contentstack/accountPage/output.ts
+++ b/server/routers/contentstack/accountPage/output.ts
@@ -1,197 +1,87 @@
 import { z } from "zod"
 
-import { Lang } from "@/constants/languages"
+import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
 
 import {
-  ContentEntries,
-  DynamicContentComponents,
-} from "@/types/components/myPages/myPage/enums"
-import { Embeds } from "@/types/requests/embeds"
-import { PageLinkEnum } from "@/types/requests/pageLinks"
-import { Edges } from "@/types/requests/utils/edges"
-import { RTEDocument } from "@/types/rte/node"
+  dynamicContentRefsSchema,
+  dynamicContentSchema,
+} from "../schemas/blocks/dynamicContent"
+import {
+  shortcutsRefsSchema,
+  shortcutsSchema,
+} from "../schemas/blocks/shortcuts"
+import { textContentSchema } from "../schemas/blocks/textContent"
+import { page } from "../schemas/metadata"
+import { systemSchema } from "../schemas/system"
 
-const accountPageShortcuts = z.object({
-  __typename: z.literal(ContentEntries.AccountPageContentShortcuts),
-  shortcuts: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    shortcuts: z.array(
-      z.object({
-        linkConnection: z.object({
-          edges: z.array(
-            z.object({
-              node: z.object({
-                system: z.object({
-                  uid: z.string(),
-                  locale: z.nativeEnum(Lang),
-                }),
-                original_url: z.string().nullable().optional(),
-                url: z.string(),
-                title: z.string(),
-              }),
-            })
-          ),
-          totalCount: z.number(),
-        }),
-        text: z.string().nullable(),
-        open_in_new_tab: z.boolean(),
-      })
-    ),
-  }),
-})
+import { AccountPageEnum } from "@/types/enums/accountPage"
 
-const accountPageDynamicContent = z.object({
-  __typename: z.literal(ContentEntries.AccountPageContentDynamicContent),
-  dynamic_content: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    component: z.nativeEnum(DynamicContentComponents),
-    link: z.object({
-      linkConnection: z.object({
-        edges: z.array(
-          z.object({
-            node: z.object({
-              system: z.object({
-                uid: z.string(),
-                locale: z.nativeEnum(Lang),
-              }),
-              url: z.string(),
-              original_url: z.string().nullable().optional(),
-              title: z.string(),
-            }),
-          })
-        ),
-        totalCount: z.number(),
-      }),
-      link_text: z.string(),
-    }),
-  }),
-})
+const accountPageDynamicContent = z
+  .object({
+    __typename: z.literal(AccountPageEnum.ContentStack.blocks.DynamicContent),
+  })
+  .merge(dynamicContentSchema)
 
-const accountPageTextContent = z.object({
-  __typename: z.literal(ContentEntries.AccountPageContentTextContent),
-  text_content: z.object({
-    content: z.object({
-      json: z.any(),
-      embedded_itemsConnection: z.object({
-        edges: z.array(z.any()),
-        totalCount: z.number(),
-      }),
-    }),
-  }),
-})
+const accountPageShortcuts = z
+  .object({
+    __typename: z.literal(AccountPageEnum.ContentStack.blocks.ShortCuts),
+  })
+  .merge(shortcutsSchema)
 
-type TextContentRaw = z.infer<typeof accountPageTextContent>
+const accountPageTextContent = z
+  .object({
+    __typename: z.literal(AccountPageEnum.ContentStack.blocks.TextContent),
+  })
+  .merge(textContentSchema)
 
-type DynamicContentRaw = z.infer<typeof accountPageDynamicContent>
-
-type ShortcutsRaw = z.infer<typeof accountPageShortcuts>
-
-export type Shortcuts = Omit<ShortcutsRaw, "shortcuts"> & {
-  shortcuts: Omit<ShortcutsRaw["shortcuts"], "shortcuts"> & {
-    shortcuts: {
-      text?: string
-      openInNewTab: boolean
-      url: string
-      title: string
-    }[]
-  }
-}
-
-export type RteTextContent = Omit<TextContentRaw, "text_content"> & {
-  text_content: {
-    content: {
-      json: RTEDocument
-      embedded_itemsConnection: Edges<Embeds>
-    }
-  }
-}
-
-export type AccountPageContentItem =
-  | DynamicContentRaw
-  | Shortcuts
-  | RteTextContent
-
-const accountPageContentItem = z.discriminatedUnion("__typename", [
-  accountPageShortcuts,
+export const blocksSchema = z.discriminatedUnion("__typename", [
   accountPageDynamicContent,
+  accountPageShortcuts,
   accountPageTextContent,
 ])
 
-export const validateAccountPageSchema = z.object({
+export const accountPageSchema = z.object({
   account_page: z.object({
+    content: discriminatedUnionArray(blocksSchema.options),
     heading: z.string().nullable(),
-    url: z.string(),
     title: z.string(),
-    content: z.array(accountPageContentItem),
-    system: z.object({
-      uid: z.string(),
-      locale: z.nativeEnum(Lang),
-      created_at: z.string(),
-      updated_at: z.string(),
-    }),
-  }),
-})
-
-export type AccountPageDataRaw = z.infer<typeof validateAccountPageSchema>
-
-type AccountPageRaw = AccountPageDataRaw["account_page"]
-
-export type AccountPage = Omit<AccountPageRaw, "content"> & {
-  content: AccountPageContentItem[]
-}
-
-// Refs types
-const pageConnectionRefs = z.object({
-  edges: z.array(
-    z.object({
-      node: z.object({
-        __typename: z.nativeEnum(PageLinkEnum),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
-      }),
-    })
-  ),
-})
-
-const accountPageShortcutsRefs = z.object({
-  __typename: z.literal(ContentEntries.AccountPageContentShortcuts),
-  shortcuts: z.object({
-    shortcuts: z.array(
+    url: z.string(),
+    system: systemSchema.merge(
       z.object({
-        linkConnection: pageConnectionRefs,
+        created_at: z.string(),
+        updated_at: z.string(),
       })
     ),
   }),
 })
 
-const accountPageDynamicContentRefs = z.object({
-  __typename: z.literal(ContentEntries.AccountPageContentDynamicContent),
-  dynamic_content: z.object({
-    link: z.object({
-      linkConnection: pageConnectionRefs,
-    }),
-  }),
-})
+const accountPageDynamicContentRefs = z
+  .object({
+    __typename: z.literal(AccountPageEnum.ContentStack.blocks.DynamicContent),
+  })
+  .merge(dynamicContentRefsSchema)
+
+const accountPageShortcutsRefs = z
+  .object({
+    __typename: z.literal(AccountPageEnum.ContentStack.blocks.ShortCuts),
+  })
+  .merge(shortcutsRefsSchema)
 
 const accountPageContentItemRefs = z.discriminatedUnion("__typename", [
+  z.object({
+    __typename: z.literal(AccountPageEnum.ContentStack.blocks.TextContent),
+  }),
   accountPageDynamicContentRefs,
   accountPageShortcutsRefs,
 ])
 
-export const validateAccountPageRefsSchema = z.object({
+export const accountPageRefsSchema = z.object({
   account_page: z.object({
-    content: z.array(accountPageContentItemRefs),
-    system: z.object({
-      content_type_uid: z.string(),
-      uid: z.string(),
-    }),
+    content: discriminatedUnionArray(accountPageContentItemRefs.options),
+    system: systemSchema,
   }),
 })
 
-export type AccountPageRefsDataRaw = z.infer<
-  typeof validateAccountPageRefsSchema
->
+export const accountPageMetadataSchema = z.object({
+  account_page: page,
+})
diff --git a/server/routers/contentstack/accountPage/query.ts b/server/routers/contentstack/accountPage/query.ts
index 141bd20cb..612dd37c2 100644
--- a/server/routers/contentstack/accountPage/query.ts
+++ b/server/routers/contentstack/accountPage/query.ts
@@ -4,7 +4,8 @@ import { Lang } from "@/constants/languages"
 import {
   GetAccountPage,
   GetAccountPageRefs,
-} from "@/lib/graphql/Query/AccountPage.graphql"
+} from "@/lib/graphql/Query/AccountPage/AccountPage.graphql"
+import { GetMyPagesMetaData } from "@/lib/graphql/Query/AccountPage/MetaData.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
@@ -12,27 +13,27 @@ import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 import {
   generateRefsResponseTag,
   generateTag,
-  generateTags,
+  generateTagsFromSystem,
 } from "@/utils/generateTag"
 
 import { removeEmptyObjects } from "../../utils"
+import { getMetaData, getResponse } from "../metadata/utils"
 import {
-  type AccountPage,
-  AccountPageDataRaw,
-  AccountPageRefsDataRaw,
-  validateAccountPageRefsSchema,
-  validateAccountPageSchema,
+  accountPageMetadataSchema,
+  accountPageRefsSchema,
+  accountPageSchema,
 } from "./output"
 import { getConnections } from "./utils"
 
-import { ContentEntries } from "@/types/components/myPages/myPage/enums"
 import {
   TrackingChannelEnum,
-  TrackingSDKPageData,
+  type TrackingSDKPageData,
 } from "@/types/components/tracking"
-import { Embeds } from "@/types/requests/embeds"
-import { Edges } from "@/types/requests/utils/edges"
-import { RTEDocument } from "@/types/rte/node"
+import type {
+  GetAccountpageMetadata,
+  GetAccountPageRefsSchema,
+  GetAccountPageSchema,
+} from "@/types/trpc/routers/contentstack/accountPage"
 
 const meter = metrics.getMeter("trpc.accountPage")
 
@@ -64,7 +65,7 @@ export const accountPageQueryRouter = router({
       "contentstack.accountPage.refs start",
       JSON.stringify({ query: { lang, uid } })
     )
-    const refsResponse = await request<AccountPageRefsDataRaw>(
+    const refsResponse = await request<GetAccountPageRefsSchema>(
       GetAccountPageRefs,
       {
         locale: lang,
@@ -96,10 +97,9 @@ export const accountPageQueryRouter = router({
       throw notFoundError
     }
 
-    const cleanedData = removeEmptyObjects(refsResponse.data)
-
-    const validatedAccountPageRefs =
-      validateAccountPageRefsSchema.safeParse(cleanedData)
+    const validatedAccountPageRefs = accountPageRefsSchema.safeParse(
+      refsResponse.data
+    )
     if (!validatedAccountPageRefs.success) {
       getAccountPageRefsFailCounter.add(1, {
         lang,
@@ -120,7 +120,7 @@ export const accountPageQueryRouter = router({
     const connections = getConnections(validatedAccountPageRefs.data)
 
     const tags = [
-      generateTags(lang, connections),
+      generateTagsFromSystem(lang, connections),
       generateTag(lang, validatedAccountPageRefs.data.account_page.system.uid),
     ].flat()
     getAccountPageRefsSuccessCounter.add(1, { lang, uid, tags })
@@ -129,7 +129,7 @@ export const accountPageQueryRouter = router({
       "contentstack.accountPage start",
       JSON.stringify({ query: { lang, uid } })
     )
-    const response = await request<AccountPageDataRaw>(
+    const response = await request<GetAccountPageSchema>(
       GetAccountPage,
       {
         locale: lang,
@@ -161,9 +161,7 @@ export const accountPageQueryRouter = router({
       throw notFoundError
     }
 
-    const validatedAccountPage = validateAccountPageSchema.safeParse(
-      response.data
-    )
+    const validatedAccountPage = accountPageSchema.safeParse(response.data)
 
     if (!validatedAccountPage.success) {
       getAccountPageFailCounter.add(1, {
@@ -186,48 +184,6 @@ export const accountPageQueryRouter = router({
       "contentstack.accountPage success",
       JSON.stringify({ query: { lang, uid } })
     )
-    // TODO: Make returned data nicer
-    const content = validatedAccountPage.data.account_page.content.map(
-      (block) => {
-        switch (block.__typename) {
-          case ContentEntries.AccountPageContentDynamicContent:
-            return block
-          case ContentEntries.AccountPageContentShortcuts:
-            return {
-              ...block,
-              shortcuts: {
-                ...block.shortcuts,
-                shortcuts: block.shortcuts.shortcuts.map((shortcut) => ({
-                  text: shortcut.text,
-                  openInNewTab: shortcut.open_in_new_tab,
-                  ...shortcut.linkConnection.edges[0].node,
-                  url:
-                    shortcut.linkConnection.edges[0].node.original_url ||
-                    `/${shortcut.linkConnection.edges[0].node.system.locale}${shortcut.linkConnection.edges[0].node.url}`,
-                })),
-              },
-            }
-          case ContentEntries.AccountPageContentTextContent:
-            return {
-              ...block,
-              text_content: {
-                content: {
-                  json: block.text_content.content.json as RTEDocument,
-                  embedded_itemsConnection: block.text_content.content
-                    .embedded_itemsConnection as Edges<Embeds>,
-                },
-              },
-            }
-          default:
-            return null
-        }
-      }
-    )
-
-    const accountPage = {
-      ...validatedAccountPage.data.account_page,
-      content,
-    } as AccountPage
 
     const parsedtitle = response.data.account_page.title
       .replaceAll(" ", "")
@@ -243,8 +199,34 @@ export const accountPageQueryRouter = router({
     }
 
     return {
-      accountPage,
+      accountPage: validatedAccountPage.data.account_page,
       tracking,
     }
   }),
+  metadata: router({
+    get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
+      const variables = {
+        locale: ctx.lang,
+        uid: ctx.uid,
+      }
+      const response = await getResponse<GetAccountpageMetadata>(
+        GetMyPagesMetaData,
+        variables
+      )
+
+      const validatedMetadata = accountPageMetadataSchema.safeParse(
+        response.data
+      )
+
+      if (!validatedMetadata.success) {
+        console.error(
+          `Failed to validate My Page MetaData Data - (uid: ${variables.uid})`
+        )
+        console.error(validatedMetadata.error)
+        return null
+      }
+
+      return getMetaData(validatedMetadata.data.account_page)
+    }),
+  }),
 })
diff --git a/server/routers/contentstack/accountPage/utils.ts b/server/routers/contentstack/accountPage/utils.ts
index 8b1e73d7d..44a8cb76d 100644
--- a/server/routers/contentstack/accountPage/utils.ts
+++ b/server/routers/contentstack/accountPage/utils.ts
@@ -1,25 +1,22 @@
-import { AccountPageRefsDataRaw } from "./output"
+import { AccountPageEnum } from "@/types/enums/accountPage"
+import type { System } from "@/types/requests/system"
+import type { AccountPageRefs } from "@/types/trpc/routers/contentstack/accountPage"
 
-import { ContentEntries } from "@/types/components/myPages/myPage/enums"
-import type { Edges } from "@/types/requests/utils/edges"
-import type { NodeRefs } from "@/types/requests/utils/refs"
+export function getConnections({ account_page }: AccountPageRefs) {
+  const connections: System["system"][] = [account_page.system]
 
-export function getConnections(refs: AccountPageRefsDataRaw) {
-  const connections: Edges<NodeRefs>[] = []
-  if (refs.account_page.content) {
-    refs.account_page.content.forEach((item) => {
-      switch (item.__typename) {
-        case ContentEntries.AccountPageContentShortcuts: {
-          item.shortcuts.shortcuts.forEach((shortcut) => {
-            if (shortcut.linkConnection.edges.length) {
-              connections.push(shortcut.linkConnection)
-            }
-          })
+  if (account_page.content) {
+    account_page.content.forEach((block) => {
+      switch (block.__typename) {
+        case AccountPageEnum.ContentStack.blocks.ShortCuts: {
+          if (block.shortcuts.shortcuts.length) {
+            connections.push(...block.shortcuts.shortcuts)
+          }
           break
         }
-        case ContentEntries.AccountPageContentDynamicContent: {
-          if (item.dynamic_content.link.linkConnection.edges.length) {
-            connections.push(item.dynamic_content.link.linkConnection)
+        case AccountPageEnum.ContentStack.blocks.DynamicContent: {
+          if (block.dynamic_content.link) {
+            connections.push(block.dynamic_content.link)
           }
           break
         }
diff --git a/server/routers/contentstack/base/output.ts b/server/routers/contentstack/base/output.ts
index 9b015969f..f098392c8 100644
--- a/server/routers/contentstack/base/output.ts
+++ b/server/routers/contentstack/base/output.ts
@@ -5,6 +5,7 @@ import { Lang } from "@/constants/languages"
 import { removeMultipleSlashes } from "@/utils/url"
 
 import { imageVaultAssetTransformedSchema } from "../schemas/imageVault"
+import { systemSchema } from "../schemas/system"
 
 import { Image } from "@/types/image"
 
@@ -68,74 +69,81 @@ export type ContactFields = {
   footnote: string | null
 }
 
-export const validateCurrentHeaderConfigSchema = z.object({
-  all_current_header: z.object({
-    items: z.array(
-      z.object({
-        frontpage_link_text: z.string(),
-        logoConnection: z.object({
-          edges: z.array(
-            z.object({
-              node: z.object({
-                description: z.string().optional().nullable(),
-                dimension: z.object({
-                  height: z.number(),
-                  width: z.number(),
+export const validateCurrentHeaderConfigSchema = z
+  .object({
+    all_current_header: z.object({
+      items: z.array(
+        z.object({
+          frontpage_link_text: z.string(),
+          logoConnection: z.object({
+            edges: z.array(
+              z.object({
+                node: z.object({
+                  description: z.string().optional().nullable(),
+                  dimension: z.object({
+                    height: z.number(),
+                    width: z.number(),
+                  }),
+                  metadata: z.any().nullable(),
+                  system: z.object({
+                    uid: z.string(),
+                  }),
+                  title: z.string().optional().default(""),
+                  url: z.string().optional().default(""),
                 }),
-                metadata: z.any().nullable(),
-                system: z.object({
-                  uid: z.string(),
-                }),
-                title: z.string().nullable(),
-                url: z.string().nullable(),
-              }),
-            })
-          ),
-        }),
-        menu: z.object({
-          links: z.array(
-            z.object({
-              href: z.string(),
-              title: z.string(),
-            })
-          ),
-        }),
-        top_menu: z.object({
-          links: z.array(
-            z.object({
-              link: z.object({
+              })
+            ),
+          }),
+          menu: z.object({
+            links: z.array(
+              z.object({
                 href: z.string(),
                 title: z.string(),
-              }),
-              show_on_mobile: z.boolean(),
-              sort_order_mobile: z.number(),
-            })
-          ),
-        }),
-      })
-    ),
-  }),
-})
+              })
+            ),
+          }),
+          top_menu: z.object({
+            links: z.array(
+              z.object({
+                link: z.object({
+                  href: z.string(),
+                  title: z.string(),
+                }),
+                show_on_mobile: z.boolean(),
+                sort_order_mobile: z.number(),
+              })
+            ),
+          }),
+        })
+      ),
+    }),
+  })
+  .transform((data) => {
+    if (!data.all_current_header.items.length) {
+      return {
+        header: null,
+      }
+    }
+    const header = data.all_current_header.items[0]
+    return {
+      header: {
+        frontpageLinkText: header.frontpage_link_text,
+        logo: header.logoConnection.edges[0].node,
+        menu: header.menu,
+        topMenu: header.top_menu,
+      },
+    }
+  })
 
-export type CurrentHeaderDataRaw = z.infer<
-  typeof validateCurrentHeaderConfigSchema
->
-
-export type CurrentHeaderData = Omit<
-  CurrentHeaderDataRaw["all_current_header"]["items"][0],
-  "logoConnection"
-> & {
-  logo: Image
-}
+export interface GetCurrentHeaderData
+  extends z.input<typeof validateCurrentHeaderConfigSchema> {}
+export type HeaderData = z.output<typeof validateCurrentHeaderConfigSchema>
 
 const validateCurrentHeaderRefConfigSchema = z.object({
   all_current_header: z.object({
     items: z.array(
       z.object({
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
+        system: systemSchema,
       })
     ),
   }),
@@ -257,10 +265,7 @@ const validateCurrentFooterRefConfigSchema = z.object({
   all_current_footer: z.object({
     items: z.array(
       z.object({
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
+        system: systemSchema,
       })
     ),
   }),
@@ -387,10 +392,7 @@ const pageConnectionRefs = z.object({
     .array(
       z.object({
         node: z.object({
-          system: z.object({
-            content_type_uid: z.string(),
-            uid: z.string(),
-          }),
+          system: systemSchema,
         }),
       })
     )
@@ -421,10 +423,7 @@ export const validateFooterRefConfigSchema = z.object({
               pageConnection: pageConnectionRefs,
             })
           ),
-          system: z.object({
-            content_type_uid: z.string(),
-            uid: z.string(),
-          }),
+          system: systemSchema,
         })
       )
       .length(1),
@@ -437,10 +436,7 @@ const linkConnectionNodeSchema = z
       .array(
         z.object({
           node: z.object({
-            system: z.object({
-              uid: z.string(),
-              locale: z.nativeEnum(Lang),
-            }),
+            system: systemSchema,
             url: z.string(),
             title: z.string(),
             web: z.object({
@@ -595,10 +591,7 @@ const linkConnectionRefs = z.object({
     .array(
       z.object({
         node: z.object({
-          system: z.object({
-            content_type_uid: z.string(),
-            uid: z.string(),
-          }),
+          system: systemSchema,
         }),
       })
     )
@@ -656,10 +649,7 @@ export const getHeaderRefSchema = z.object({
               ),
             })
           ),
-          system: z.object({
-            content_type_uid: z.string(),
-            uid: z.string(),
-          }),
+          system: systemSchema,
         })
       )
       .length(1),
diff --git a/server/routers/contentstack/base/query.ts b/server/routers/contentstack/base/query.ts
index c2f0c948a..a78043f22 100644
--- a/server/routers/contentstack/base/query.ts
+++ b/server/routers/contentstack/base/query.ts
@@ -4,13 +4,19 @@ import { GetContactConfig } from "@/lib/graphql/Query/ContactConfig.graphql"
 import {
   GetCurrentFooter,
   GetCurrentFooterRef,
-} from "@/lib/graphql/Query/CurrentFooter.graphql"
+} from "@/lib/graphql/Query/Current/Footer.graphql"
 import {
   GetCurrentHeader,
   GetCurrentHeaderRef,
-} from "@/lib/graphql/Query/CurrentHeader.graphql"
-import { GetFooter, GetFooterRef } from "@/lib/graphql/Query/Footer.graphql"
-import { GetHeader, GetHeaderRef } from "@/lib/graphql/Query/Header.graphql"
+} from "@/lib/graphql/Query/Current/Header.graphql"
+import {
+  GetFooter,
+  GetFooterRef,
+} from "@/lib/graphql/Query/Footer.graphql"
+import {
+  GetHeader,
+  GetHeaderRef,
+} from "@/lib/graphql/Query/Header.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 import { contentstackBaseProcedure, router } from "@/server/trpc"
@@ -23,19 +29,18 @@ import {
 
 import { langInput } from "./input"
 import {
+  type GetCurrentHeaderData,
   type ContactConfigData,
   CurrentFooterDataRaw,
   CurrentFooterRefDataRaw,
-  CurrentHeaderData,
-  CurrentHeaderDataRaw,
   CurrentHeaderRefDataRaw,
   getHeaderRefSchema,
   getHeaderSchema,
   validateContactConfigSchema,
   validateCurrentFooterConfigSchema,
-  validateCurrentHeaderConfigSchema,
   validateFooterConfigSchema,
   validateFooterRefConfigSchema,
+  validateCurrentHeaderConfigSchema,
 } from "./output"
 import { getConnections, getFooterConnections } from "./utils"
 
@@ -357,7 +362,7 @@ export const baseQueryRouter = router({
       const currentHeaderUID =
         responseRef.data.all_current_header.items[0].system.uid
       // There's currently no error handling/validation for the responseRef, should it be added?
-      const response = await request<CurrentHeaderDataRaw>(
+      const response = await request<GetCurrentHeaderData>(
         GetCurrentHeader,
         { locale: input.lang },
         {
@@ -415,14 +420,8 @@ export const baseQueryRouter = router({
           query: { lang: input.lang },
         })
       )
-      const logo =
-        validatedHeaderConfig.data.all_current_header.items[0].logoConnection
-          .edges?.[0]?.node
 
-      return {
-        ...validatedHeaderConfig.data.all_current_header.items[0],
-        logo,
-      } as CurrentHeaderData
+      return validatedHeaderConfig.data
     }),
   currentFooter: contentstackBaseProcedure
     .input(langInput)
diff --git a/server/routers/contentstack/bookingwidget/query.ts b/server/routers/contentstack/bookingwidget/query.ts
index 9b67dba16..c8a64f20e 100644
--- a/server/routers/contentstack/bookingwidget/query.ts
+++ b/server/routers/contentstack/bookingwidget/query.ts
@@ -21,73 +21,74 @@ import { affix as bookingwidgetAffix } from "./utils"
 import { ContentTypeEnum } from "@/types/requests/contentType"
 
 export const bookingwidgetQueryRouter = router({
-  getToggle: contentstackBaseProcedure.query(async ({ ctx }) => {
-    const failedResponse = { hideBookingWidget: false }
-    const { contentType, uid, lang } = ctx
+  toggle: router({
+    get: contentstackBaseProcedure.query(async ({ ctx }) => {
+      const failedResponse = { hideBookingWidget: false }
+      const { contentType, uid, lang } = ctx
 
-    // This condition is to handle 404 page case
-    if (!contentType || !uid) {
-      console.log("No proper params defined: ", contentType, uid)
-      return failedResponse
-    }
-    let GetPageSettings = ""
-    const contentTypeCMS = <ValueOf<typeof ContentTypeEnum>>(
-      contentType.replaceAll("-", "_")
-    )
-
-    switch (contentTypeCMS) {
-      case ContentTypeEnum.accountPage:
-        GetPageSettings = GetAccountPageSettings
-        break
-      case ContentTypeEnum.loyaltyPage:
-        GetPageSettings = GetLoyaltyPageSettings
-        break
-      case ContentTypeEnum.contentPage:
-        GetPageSettings = GetContentPageSettings
-        break
-      case ContentTypeEnum.hotelPage:
-        GetPageSettings = GetHotelPageSettings
-        break
-      case ContentTypeEnum.currentBlocksPage:
-        GetPageSettings = GetCurrentBlocksPageSettings
-        break
-    }
-
-    if (!GetPageSettings) {
-      console.error("No proper Content type defined: ", contentType)
-      return failedResponse
-    }
-
-    const response = await request<ValidateBookingWidgetToggleType>(
-      GetPageSettings,
-      {
-        uid: uid,
-        locale: lang,
-      },
-      {
-        next: {
-          tags: [generateTag(lang, uid, bookingwidgetAffix)],
-        },
+      // This condition is to handle 404 page case
+      if (!contentType || !uid) {
+        console.log("No proper params defined: ", contentType, uid)
+        return failedResponse
       }
-    )
-
-    const bookingWidgetToggleData = validateBookingWidgetToggleSchema.safeParse(
-      response.data
-    )
-    if (!bookingWidgetToggleData.success) {
-      console.error(
-        "Flag hide_booking_widget fetch error: ",
-        bookingWidgetToggleData.error
+      let GetPageSettings = ""
+      const contentTypeCMS = <ValueOf<typeof ContentTypeEnum>>(
+        contentType.replaceAll("-", "_")
       )
-      return failedResponse
-    }
 
-    const hideBookingWidget =
-      bookingWidgetToggleData.data[contentTypeCMS]?.page_settings
-        ?.hide_booking_widget
+      switch (contentTypeCMS) {
+        case ContentTypeEnum.accountPage:
+          GetPageSettings = GetAccountPageSettings
+          break
+        case ContentTypeEnum.loyaltyPage:
+          GetPageSettings = GetLoyaltyPageSettings
+          break
+        case ContentTypeEnum.contentPage:
+          GetPageSettings = GetContentPageSettings
+          break
+        case ContentTypeEnum.hotelPage:
+          GetPageSettings = GetHotelPageSettings
+          break
+        case ContentTypeEnum.currentBlocksPage:
+          GetPageSettings = GetCurrentBlocksPageSettings
+          break
+      }
 
-    return {
-      hideBookingWidget,
-    }
+      if (!GetPageSettings) {
+        console.error("No proper Content type defined: ", contentType)
+        return failedResponse
+      }
+
+      const response = await request<ValidateBookingWidgetToggleType>(
+        GetPageSettings,
+        {
+          uid: uid,
+          locale: lang,
+        },
+        {
+          next: {
+            tags: [generateTag(lang, uid, bookingwidgetAffix)],
+          },
+        }
+      )
+
+      const bookingWidgetToggleData =
+        validateBookingWidgetToggleSchema.safeParse(response.data)
+      if (!bookingWidgetToggleData.success) {
+        console.error(
+          "Flag hide_booking_widget fetch error: ",
+          bookingWidgetToggleData.error
+        )
+        return failedResponse
+      }
+
+      const hideBookingWidget =
+        !!bookingWidgetToggleData.data[contentTypeCMS]?.page_settings
+          ?.hide_booking_widget
+
+      return {
+        hideBookingWidget,
+      }
+    }),
   }),
 })
diff --git a/server/routers/contentstack/breadcrumbs/output.ts b/server/routers/contentstack/breadcrumbs/output.ts
index 2fca07734..e5a058699 100644
--- a/server/routers/contentstack/breadcrumbs/output.ts
+++ b/server/routers/contentstack/breadcrumbs/output.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 
-import { Lang } from "@/constants/languages"
+import { systemSchema } from "../schemas/system"
 
 export const getBreadcrumbsSchema = z.array(
   z.object({
@@ -10,42 +10,32 @@ export const getBreadcrumbsSchema = z.array(
   })
 )
 
-const breadcrumbsRefsItems = z.object({
-  items: z.array(
-    z.object({
-      web: z
+const breadcrumbsRefs = z.object({
+  web: z
+    .object({
+      breadcrumbs: z
         .object({
-          breadcrumbs: z
-            .object({
-              title: z.string(),
-              parentsConnection: z.object({
-                edges: z.array(
-                  z.object({
-                    node: z.object({
-                      system: z.object({
-                        content_type_uid: z.string(),
-                        uid: z.string(),
-                      }),
-                    }),
-                  })
-                ),
-              }),
-            })
-            .optional(),
+          title: z.string(),
+          parentsConnection: z.object({
+            edges: z.array(
+              z.object({
+                node: z.object({
+                  system: systemSchema,
+                }),
+              })
+            ),
+          }),
         })
         .optional(),
-      system: z.object({
-        content_type_uid: z.string(),
-        uid: z.string(),
-      }),
     })
-  ),
+    .optional(),
+  system: systemSchema,
 })
 
-export type BreadcrumbsRefsItems = z.infer<typeof breadcrumbsRefsItems>
+export type BreadcrumbsRefs = z.infer<typeof breadcrumbsRefs>
 
 export const validateMyPagesBreadcrumbsRefsContentstackSchema = z.object({
-  all_account_page: breadcrumbsRefsItems,
+  account_page: breadcrumbsRefs,
 })
 
 export type GetMyPagesBreadcrumbsRefsData = z.infer<
@@ -53,7 +43,7 @@ export type GetMyPagesBreadcrumbsRefsData = z.infer<
 >
 
 export const validateLoyaltyPageBreadcrumbsRefsContentstackSchema = z.object({
-  all_loyalty_page: breadcrumbsRefsItems,
+  loyalty_page: breadcrumbsRefs,
 })
 
 export type GetLoyaltyPageBreadcrumbsRefsData = z.infer<
@@ -61,7 +51,7 @@ export type GetLoyaltyPageBreadcrumbsRefsData = z.infer<
 >
 
 export const validateContentPageBreadcrumbsRefsContentstackSchema = z.object({
-  all_content_page: breadcrumbsRefsItems,
+  content_page: breadcrumbsRefs,
 })
 
 export type GetContentPageBreadcrumbsRefsData = z.infer<
@@ -81,10 +71,7 @@ const page = z.object({
                   title: z.string(),
                 }),
               }),
-              system: z.object({
-                locale: z.nativeEnum(Lang),
-                uid: z.string(),
-              }),
+              system: systemSchema,
               url: z.string(),
             }),
           })
@@ -92,19 +79,13 @@ const page = z.object({
       }),
     }),
   }),
-  system: z.object({
-    uid: z.string(),
-  }),
+  system: systemSchema,
 })
 
 export type Page = z.infer<typeof page>
 
-const breadcrumbsItems = z.object({
-  items: z.array(page),
-})
-
 export const validateMyPagesBreadcrumbsContentstackSchema = z.object({
-  all_account_page: breadcrumbsItems,
+  account_page: page,
 })
 
 export type GetMyPagesBreadcrumbsData = z.infer<
@@ -112,7 +93,7 @@ export type GetMyPagesBreadcrumbsData = z.infer<
 >
 
 export const validateLoyaltyPageBreadcrumbsContentstackSchema = z.object({
-  all_loyalty_page: breadcrumbsItems,
+  loyalty_page: page,
 })
 
 export type GetLoyaltyPageBreadcrumbsData = z.infer<
@@ -120,7 +101,7 @@ export type GetLoyaltyPageBreadcrumbsData = z.infer<
 >
 
 export const validateContentPageBreadcrumbsContentstackSchema = z.object({
-  all_content_page: breadcrumbsItems,
+  content_page: page,
 })
 
 export type GetContentPageBreadcrumbsData = z.infer<
diff --git a/server/routers/contentstack/breadcrumbs/query.ts b/server/routers/contentstack/breadcrumbs/query.ts
index 113f0430f..b4dc3ecd2 100644
--- a/server/routers/contentstack/breadcrumbs/query.ts
+++ b/server/routers/contentstack/breadcrumbs/query.ts
@@ -1,15 +1,15 @@
-import {
-  GetContentPageBreadcrumbs,
-  GetContentPageBreadcrumbsRefs,
-} from "@/lib/graphql/Query/BreadcrumbsContentPage.graphql"
-import {
-  GetLoyaltyPageBreadcrumbs,
-  GetLoyaltyPageBreadcrumbsRefs,
-} from "@/lib/graphql/Query/BreadcrumbsLoyaltyPage.graphql"
 import {
   GetMyPagesBreadcrumbs,
   GetMyPagesBreadcrumbsRefs,
-} from "@/lib/graphql/Query/BreadcrumbsMyPages.graphql"
+} from "@/lib/graphql/Query/Breadcrumbs/AccountPage.graphql"
+import {
+  GetContentPageBreadcrumbs,
+  GetContentPageBreadcrumbsRefs,
+} from "@/lib/graphql/Query/Breadcrumbs/ContentPage.graphql"
+import {
+  GetLoyaltyPageBreadcrumbs,
+  GetLoyaltyPageBreadcrumbsRefs,
+} from "@/lib/graphql/Query/Breadcrumbs/LoyaltyPage.graphql"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
 import {
@@ -49,13 +49,13 @@ async function getLoyaltyPageBreadcrumbs(variables: Variables) {
 
   if (!validatedRefsData.success) {
     console.error(
-      `Failed to validate Loyaltypage Breadcrumbs Refs - (url: ${variables.url})`
+      `Failed to validate Loyaltypage Breadcrumbs Refs - (uid: ${variables.uid})`
     )
     console.error(validatedRefsData.error)
     return null
   }
 
-  const tags = getTags(validatedRefsData.data.all_loyalty_page, variables)
+  const tags = getTags(validatedRefsData.data.loyalty_page, variables)
 
   const response = await getResponse<GetLoyaltyPageBreadcrumbsData>(
     GetLoyaltyPageBreadcrumbs,
@@ -63,7 +63,7 @@ async function getLoyaltyPageBreadcrumbs(variables: Variables) {
     tags
   )
 
-  if (!response.data.all_loyalty_page.items[0].web?.breadcrumbs?.title) {
+  if (!response.data.loyalty_page.web?.breadcrumbs?.title) {
     return null
   }
 
@@ -72,14 +72,14 @@ async function getLoyaltyPageBreadcrumbs(variables: Variables) {
 
   if (!validatedBreadcrumbsData.success) {
     console.error(
-      `Failed to validate Loyaltypage Breadcrumbs Data - (url: ${variables.url})`
+      `Failed to validate Loyaltypage Breadcrumbs Data - (uid: ${variables.uid})`
     )
     console.error(validatedBreadcrumbsData.error)
     return null
   }
 
   return getBreadcrumbs(
-    validatedBreadcrumbsData.data.all_loyalty_page.items[0],
+    validatedBreadcrumbsData.data.loyalty_page,
     variables.locale
   )
 }
@@ -97,13 +97,13 @@ async function getContentPageBreadcrumbs(variables: Variables) {
 
   if (!validatedRefsData.success) {
     console.error(
-      `Failed to validate Contentpage Breadcrumbs Refs - (url: ${variables.url})`
+      `Failed to validate Contentpage Breadcrumbs Refs - (uid: ${variables.uid})`
     )
     console.error(validatedRefsData.error)
     return null
   }
 
-  const tags = getTags(validatedRefsData.data.all_content_page, variables)
+  const tags = getTags(validatedRefsData.data.content_page, variables)
 
   const response = await getResponse<GetContentPageBreadcrumbsData>(
     GetContentPageBreadcrumbs,
@@ -111,7 +111,7 @@ async function getContentPageBreadcrumbs(variables: Variables) {
     tags
   )
 
-  if (!response.data.all_content_page.items[0].web?.breadcrumbs?.title) {
+  if (!response.data.content_page.web?.breadcrumbs?.title) {
     return null
   }
 
@@ -120,14 +120,14 @@ async function getContentPageBreadcrumbs(variables: Variables) {
 
   if (!validatedBreadcrumbsData.success) {
     console.error(
-      `Failed to validate Contentpage Breadcrumbs Data - (url: ${variables.url})`
+      `Failed to validate Contentpage Breadcrumbs Data - (uid: ${variables.uid})`
     )
     console.error(validatedBreadcrumbsData.error)
     return null
   }
 
   return getBreadcrumbs(
-    validatedBreadcrumbsData.data.all_content_page.items[0],
+    validatedBreadcrumbsData.data.content_page,
     variables.locale
   )
 }
@@ -144,13 +144,13 @@ async function getMyPagesBreadcrumbs(variables: Variables) {
     )
   if (!validatedRefsData.success) {
     console.error(
-      `Failed to validate My Page Breadcrumbs Refs - (url: ${variables.url})`
+      `Failed to validate My Page Breadcrumbs Refs - (uid: ${variables.uid})`
     )
     console.error(validatedRefsData.error)
     return null
   }
 
-  const tags = getTags(validatedRefsData.data.all_account_page, variables)
+  const tags = getTags(validatedRefsData.data.account_page, variables)
 
   const response = await getResponse<GetMyPagesBreadcrumbsData>(
     GetMyPagesBreadcrumbs,
@@ -158,7 +158,7 @@ async function getMyPagesBreadcrumbs(variables: Variables) {
     tags
   )
 
-  if (!response.data.all_account_page.items[0].web?.breadcrumbs?.title) {
+  if (!response.data.account_page.web?.breadcrumbs?.title) {
     return []
   }
 
@@ -167,14 +167,14 @@ async function getMyPagesBreadcrumbs(variables: Variables) {
 
   if (!validatedBreadcrumbsData.success) {
     console.error(
-      `Failed to validate My Page Breadcrumbs Data - (url: ${variables.url})`
+      `Failed to validate My Page Breadcrumbs Data - (uid: ${variables.uid})`
     )
     console.error(validatedBreadcrumbsData.error)
     return null
   }
 
   return getBreadcrumbs(
-    validatedBreadcrumbsData.data.all_account_page.items[0],
+    validatedBreadcrumbsData.data.account_page,
     variables.locale
   )
 }
@@ -183,7 +183,7 @@ export const breadcrumbsQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
     const variables = {
       locale: ctx.lang,
-      url: ctx.pathname,
+      uid: ctx.uid,
     }
 
     switch (ctx.contentType) {
diff --git a/server/routers/contentstack/breadcrumbs/utils.ts b/server/routers/contentstack/breadcrumbs/utils.ts
index d16c79049..acb908083 100644
--- a/server/routers/contentstack/breadcrumbs/utils.ts
+++ b/server/routers/contentstack/breadcrumbs/utils.ts
@@ -9,19 +9,18 @@ import {
 } from "@/utils/generateTag"
 import { removeMultipleSlashes } from "@/utils/url"
 
-import { type BreadcrumbsRefsItems, getBreadcrumbsSchema, Page } from "./output"
+import { type BreadcrumbsRefs, getBreadcrumbsSchema, Page } from "./output"
 
 import type { Edges } from "@/types/requests/utils/edges"
 import type { NodeRefs } from "@/types/requests/utils/refs"
 
-export function getConnections(refs: BreadcrumbsRefsItems) {
+export function getConnections(refs: BreadcrumbsRefs) {
   const connections: Edges<NodeRefs>[] = []
 
-  refs.items.forEach((ref) => {
-    if (ref.web?.breadcrumbs) {
-      connections.push(ref.web.breadcrumbs.parentsConnection)
-    }
-  })
+  if (refs.web?.breadcrumbs) {
+    connections.push(refs.web.breadcrumbs.parentsConnection)
+  }
+
   return connections
 }
 
@@ -63,14 +62,14 @@ export const homeBreadcrumbs = {
 
 export type Variables = {
   locale: Lang
-  url: string
+  uid: string
 }
 
 export async function getRefsResponse<T>(query: string, variables: Variables) {
   const refsResponse = await request<T>(query, variables, {
     cache: "force-cache",
     next: {
-      tags: [generateRefsResponseTag(variables.locale, variables.url, affix)],
+      tags: [generateRefsResponseTag(variables.locale, variables.uid, affix)],
     },
   })
   if (!refsResponse.data) {
@@ -80,10 +79,10 @@ export async function getRefsResponse<T>(query: string, variables: Variables) {
   return refsResponse
 }
 
-export function getTags(page: BreadcrumbsRefsItems, variables: Variables) {
+export function getTags(page: BreadcrumbsRefs, variables: Variables) {
   const connections = getConnections(page)
   const tags = generateTags(variables.locale, connections)
-  tags.push(generateTag(variables.locale, page.items[0].system.uid, affix))
+  tags.push(generateTag(variables.locale, page.system.uid, affix))
   return tags
 }
 
diff --git a/server/routers/contentstack/contentPage/output.ts b/server/routers/contentstack/contentPage/output.ts
index 21d7b1708..2be699b43 100644
--- a/server/routers/contentstack/contentPage/output.ts
+++ b/server/routers/contentstack/contentPage/output.ts
@@ -1,386 +1,187 @@
 import { z } from "zod"
 
-import { Lang } from "@/constants/languages"
-
-import { imageVaultAssetSchema } from "../schemas/imageVault"
+import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
 
 import {
-  CardsGridEnum,
-  ContentBlocksTypenameEnum,
-  DynamicContentComponentEnum,
-  JoinLoyaltyContactTypenameEnum,
-  SidebarDynamicComponentEnum,
-  SidebarTypenameEnum,
-} from "@/types/components/content/enums"
-import { PageLinkEnum } from "@/types/requests/pageLinks"
-import { RTEEmbedsEnum } from "@/types/requests/rte"
+  cardGridRefsSchema,
+  cardsGridSchema,
+} from "../schemas/blocks/cardsGrid"
+import {
+  contentRefsSchema as blockContentRefsSchema,
+  contentSchema as blockContentSchema,
+} from "../schemas/blocks/content"
+import {
+  dynamicContentRefsSchema,
+  dynamicContentSchema as blockDynamicContentSchema,
+} from "../schemas/blocks/dynamicContent"
+import {
+  shortcutsRefsSchema,
+  shortcutsSchema,
+} from "../schemas/blocks/shortcuts"
+import { tempImageVaultAssetSchema } from "../schemas/imageVault"
+import {
+  contentRefsSchema as sidebarContentRefsSchema,
+  contentSchema as sidebarContentSchema,
+} from "../schemas/sidebar/content"
+import { dynamicContentSchema as sidebarDynamicContentSchema } from "../schemas/sidebar/dynamicContent"
+import {
+  joinLoyaltyContactRefsSchema,
+  joinLoyaltyContactSchema,
+} from "../schemas/sidebar/joinLoyaltyContact"
+import { systemSchema } from "../schemas/system"
+
+import { ContentPageEnum } from "@/types/enums/contentPage"
+import { textColsRefsSchema, textColsSchema } from "../schemas/blocks/textCols"
 
 // Block schemas
-export const contentPageBlockTextContent = z.object({
-  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: z.object({
-        edges: z.array(z.any()),
-        totalCount: z.number(),
-      }),
-      json: z.any(),
-    }),
-  }),
-})
+export const contentPageCards = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.CardsGrid),
+  })
+  .merge(cardsGridSchema)
 
-export const contentPageShortcuts = z.object({
-  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksShortcuts),
-  shortcuts: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    shortcuts: z.array(
-      z.object({
-        text: z.string().optional(),
-        openInNewTab: z.boolean(),
-        url: z.string(),
-        title: z.string(),
-      })
-    ),
-  }),
-})
+export const contentPageContent = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(blockContentSchema)
 
-export const contentPageDynamicContent = z.object({
-  __typename: z.literal(
-    ContentBlocksTypenameEnum.ContentPageBlocksDynamicContent
-  ),
-  dynamic_content: z.object({
-    title: z.string().nullable(),
-    subtitle: z.string().nullable(),
-    component: z.nativeEnum(DynamicContentComponentEnum),
-    link: z
-      .object({
-        text: z.string(),
-        href: z.string(),
-      })
-      .optional(),
-  }),
-})
+export const contentPageDynamicContent = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.DynamicContent),
+  })
+  .merge(blockDynamicContentSchema)
 
-export const cardBlock = z.object({
-  __typename: z.literal(CardsGridEnum.Card),
-  isContentCard: z.boolean(),
-  heading: z.string().nullable(),
-  body_text: z.string().nullable(),
-  background_image: z.any(),
-  scripted_top_title: z.string().nullable(),
-  primaryButton: z
-    .object({
-      openInNewTab: z.boolean(),
-      title: z.string(),
-      href: z.string(),
-      isExternal: z.boolean(),
-    })
-    .optional(),
-  secondaryButton: z
-    .object({
-      openInNewTab: z.boolean(),
-      title: z.string(),
-      href: z.string(),
-      isExternal: z.boolean(),
-    })
-    .optional(),
-  sidePeekButton: z
-    .object({
-      title: z.string(),
-    })
-    .optional(),
-  system: z.object({
-    locale: z.nativeEnum(Lang),
-    uid: z.string(),
-  }),
-})
-
-export const loyaltyCardBlock = z.object({
-  __typename: z.literal(CardsGridEnum.LoyaltyCard),
-  heading: z.string().nullable(),
-  body_text: z.string().nullable(),
-  image: z.any(),
-  link: z
-    .object({
-      openInNewTab: z.boolean(),
-      title: z.string(),
-      href: z.string(),
-      isExternal: z.boolean(),
-    })
-    .optional(),
-  system: z.object({
-    locale: z.nativeEnum(Lang),
-    uid: z.string(),
-  }),
-})
-
-const contentPageCardsItems = z.discriminatedUnion("__typename", [
-  loyaltyCardBlock,
-  cardBlock,
-])
-
-export const contentPageCards = z.object({
-  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksCardsGrid),
-  cards_grid: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    layout: z.enum(["twoColumnGrid", "threeColumnGrid", "twoPlusOne"]),
-    theme: z.enum(["one", "two", "three"]).nullable(),
-    cards: z.array(contentPageCardsItems),
-  }),
-})
+export const contentPageShortcuts = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.Shortcuts),
+  })
+  .merge(shortcutsSchema)
 
 export const contentPageTextCols = z.object({
-  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksTextCols),
-  text_cols: z.object({
-    columns: z.array(
-      z.object({
-        title: z.string(),
-        text: z.object({
-          json: z.any(),
-          embedded_itemsConnection: z.object({
-            edges: z.array(z.any()),
-            totalCount: z.number(),
-          }),
-        }),
-      })
-    ),
-  }),
-})
-const contentPageBlockItem = z.discriminatedUnion("__typename", [
-  contentPageBlockTextContent,
+  __typename: z.literal(ContentPageEnum.ContentStack.blocks.TextCols),
+}).merge(textColsSchema)
+
+export const blocksSchema = z.discriminatedUnion("__typename", [
   contentPageCards,
+  contentPageContent,
   contentPageDynamicContent,
   contentPageShortcuts,
   contentPageTextCols,
 ])
 
-export const contentPageSidebarTextContent = z.object({
-  __typename: z.literal(SidebarTypenameEnum.ContentPageSidebarContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: z.object({
-        edges: z.array(z.any()),
-        totalCount: z.number(),
-      }),
-      json: z.any(),
-    }),
-  }),
-})
+export const contentPageSidebarContent = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.Content),
+  })
+  .merge(sidebarContentSchema)
 
-export const contentPageJoinLoyaltyContact = z.object({
-  __typename: z.literal(
-    SidebarTypenameEnum.ContentPageSidebarJoinLoyaltyContact
-  ),
-  join_loyalty_contact: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    button: z
-      .object({
-        openInNewTab: z.boolean(),
-        title: z.string(),
-        href: z.string(),
-        isExternal: z.boolean(),
-      })
-      .nullable(),
-    contact: z.array(
-      z.object({
-        __typename: z.literal(
-          JoinLoyaltyContactTypenameEnum.ContentPageSidebarJoinLoyaltyContactBlockContactContact
-        ),
-        contact: z.object({
-          display_text: z.string().nullable(),
-          contact_field: z.string(),
-          footnote: z.string().nullable(),
-        }),
-      })
+export const contentPageSidebarDynamicContent = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.DynamicContent),
+  })
+  .merge(sidebarDynamicContentSchema)
+
+export const contentPageJoinLoyaltyContact = z
+  .object({
+    __typename: z.literal(
+      ContentPageEnum.ContentStack.sidebar.JoinLoyaltyContact
     ),
-  }),
-})
+  })
+  .merge(joinLoyaltyContactSchema)
 
-export const contentPageSidebarDynamicContent = z.object({
-  __typename: z.literal(SidebarTypenameEnum.ContentPageSidebarDynamicContent),
-  dynamic_content: z.object({
-    component: z.nativeEnum(SidebarDynamicComponentEnum),
-  }),
-})
-
-const contentPageSidebarItem = z.discriminatedUnion("__typename", [
-  contentPageSidebarTextContent,
+export const sidebarSchema = z.discriminatedUnion("__typename", [
+  contentPageSidebarContent,
   contentPageSidebarDynamicContent,
   contentPageJoinLoyaltyContact,
 ])
 
 // Content Page Schema and types
-export const validateContentPageSchema = z.object({
+export const contentPageSchema = z.object({
   content_page: z.object({
+    hero_image: tempImageVaultAssetSchema,
+    blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
+    sidebar: discriminatedUnionArray(sidebarSchema.options).nullable(),
     title: z.string(),
     header: z.object({
       heading: z.string(),
       preamble: z.string(),
     }),
-    hero_image: imageVaultAssetSchema.nullable().optional(),
-    blocks: z.array(contentPageBlockItem).nullable(),
-    sidebar: z.array(contentPageSidebarItem).nullable(),
-    system: z.object({
-      uid: z.string(),
-      locale: z.nativeEnum(Lang),
-      created_at: z.string(),
-      updated_at: z.string(),
-    }),
-  }),
-})
-
-const pageConnectionRefs = z.object({
-  edges: z.array(
-    z.object({
-      node: z.object({
-        __typename: z.nativeEnum(PageLinkEnum),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
-      }),
-    })
-  ),
-})
-
-const rteConnectionRefs = z.object({
-  edges: z.array(
-    z.object({
-      node: z.object({
-        __typename: z.nativeEnum(RTEEmbedsEnum),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
-      }),
-    })
-  ),
-})
-
-const cardBlockRefs = z.object({
-  __typename: z.literal(CardsGridEnum.Card),
-  primary_button: z
-    .object({
-      linkConnection: pageConnectionRefs,
-    })
-    .nullable(),
-  secondary_button: z
-    .object({
-      linkConnection: pageConnectionRefs,
-    })
-    .nullable(),
-  system: z.object({
-    content_type_uid: z.string(),
-    uid: z.string(),
-  }),
-})
-
-const loyaltyCardBlockRefs = z.object({
-  __typename: z.literal(CardsGridEnum.LoyaltyCard),
-  link: z
-    .object({
-      linkConnection: pageConnectionRefs,
-    })
-    .nullable(),
-  system: z.object({
-    content_type_uid: z.string(),
-    uid: z.string(),
-  }),
-})
-
-const cardGridCardsRef = z.discriminatedUnion("__typename", [
-  loyaltyCardBlockRefs,
-  cardBlockRefs,
-])
-
-const contentPageBlockTextContentRefs = z.object({
-  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: rteConnectionRefs,
-    }),
-  }),
-})
-
-const contentPageCardsRefs = z.object({
-  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksCardsGrid),
-  cards_grid: z.object({
-    cardConnection: z.object({
-      edges: z.array(
-        z.object({
-          node: cardGridCardsRef,
-        })
-      ),
-    }),
-  }),
-})
-
-const contentPageShortcutsRefs = z.object({
-  __typename: z.literal(ContentBlocksTypenameEnum.ContentPageBlocksShortcuts),
-  shortcuts: z.object({
-    shortcuts: z.array(
+    system: systemSchema.merge(
       z.object({
-        linkConnection: rteConnectionRefs,
+        created_at: z.string(),
+        updated_at: z.string(),
       })
     ),
   }),
 })
 
-const contentPageDynamicContentRefs = z.object({
-  __typename: z.literal(
-    ContentBlocksTypenameEnum.ContentPageBlocksDynamicContent
-  ),
-  dynamic_content: z.object({
-    link: z.object({
-      pageConnection: pageConnectionRefs,
-    }),
-  }),
-})
+/** REFS */
+const contentPageCardsRefs = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.CardsGrid),
+  })
+  .merge(cardGridRefsSchema)
+
+const contentPageBlockContentRefs = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(blockContentRefsSchema)
+
+const contentPageDynamicContentRefs = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.DynamicContent),
+  })
+  .merge(dynamicContentRefsSchema)
+
+const contentPageShortcutsRefs = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.Shortcuts),
+  })
+  .merge(shortcutsRefsSchema)
+
+const contentPageTextColsRefs = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.blocks.TextCols),
+  })
+  .merge(textColsRefsSchema)
 
 const contentPageBlockRefsItem = z.discriminatedUnion("__typename", [
-  contentPageBlockTextContentRefs,
+  contentPageBlockContentRefs,
   contentPageShortcutsRefs,
   contentPageCardsRefs,
   contentPageDynamicContentRefs,
+  contentPageTextColsRefs,
 ])
 
-const contentPageSidebarTextContentRef = z.object({
-  __typename: z.literal(SidebarTypenameEnum.ContentPageSidebarContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: rteConnectionRefs,
-    }),
-  }),
-})
+const contentPageSidebarContentRef = z
+  .object({
+    __typename: z.literal(ContentPageEnum.ContentStack.sidebar.Content),
+  })
+  .merge(sidebarContentRefsSchema)
 
-const contentPageSidebarJoinLoyaltyContactRef = z.object({
-  __typename: z.literal(
-    SidebarTypenameEnum.ContentPageSidebarJoinLoyaltyContact
-  ),
-  join_loyalty_contact: z.object({
-    button: z
-      .object({
-        linkConnection: pageConnectionRefs,
-      })
-      .nullable(),
-  }),
-})
+const contentPageSidebarJoinLoyaltyContactRef = z
+  .object({
+    __typename: z.literal(
+      ContentPageEnum.ContentStack.sidebar.JoinLoyaltyContact
+    ),
+  })
+  .merge(joinLoyaltyContactRefsSchema)
 
 const contentPageSidebarRefsItem = z.discriminatedUnion("__typename", [
-  contentPageSidebarTextContentRef,
+  contentPageSidebarContentRef,
   contentPageSidebarJoinLoyaltyContactRef,
 ])
 
-export const validateContentPageRefsSchema = z.object({
+export const contentPageRefsSchema = z.object({
   content_page: z.object({
-    blocks: z.array(contentPageBlockRefsItem).nullable(),
-    sidebar: z.array(contentPageSidebarRefsItem).nullable(),
-    system: z.object({
-      content_type_uid: z.string(),
-      uid: z.string(),
-    }),
+    blocks: discriminatedUnionArray(
+      contentPageBlockRefsItem.options
+    ).nullable(),
+    sidebar: discriminatedUnionArray(
+      contentPageSidebarRefsItem.options
+    ).nullable(),
+    system: systemSchema,
   }),
 })
diff --git a/server/routers/contentstack/contentPage/query.ts b/server/routers/contentstack/contentPage/query.ts
index 16ff7e7c1..79ef83a4e 100644
--- a/server/routers/contentstack/contentPage/query.ts
+++ b/server/routers/contentstack/contentPage/query.ts
@@ -1,49 +1,36 @@
 import { Lang } from "@/constants/languages"
-import { GetContentPage } from "@/lib/graphql/Query/ContentPage.graphql"
+import { GetContentPage } from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
 import { request } from "@/lib/graphql/request"
-import { notFound } from "@/server/errors/trpc"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
-import { makeImageVaultImage } from "@/utils/imageVault"
-import { removeMultipleSlashes } from "@/utils/url"
-
-import { removeEmptyObjects } from "../../utils"
-import { validateContentPageSchema } from "./output"
+import { contentPageSchema } from "./output"
 import {
   fetchContentPageRefs,
   generatePageTags,
   getContentPageCounter,
-  makeButtonObject,
   validateContentPageRefs,
 } from "./utils"
 
-import {
-  CardsGridEnum,
-  ContentBlocksTypenameEnum,
-  SidebarTypenameEnum,
-} from "@/types/components/content/enums"
 import {
   TrackingChannelEnum,
-  TrackingSDKPageData,
+  type TrackingSDKPageData,
 } from "@/types/components/tracking"
-import {
-  Block,
-  ContentPage,
-  ContentPageDataRaw,
-  Sidebar,
-} from "@/types/trpc/routers/contentstack/contentPage"
+import type { GetContentPageSchema } from "@/types/trpc/routers/contentstack/contentPage"
 
 export const contentPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
     const { lang, uid } = ctx
 
-    const cleanedRefsData = await fetchContentPageRefs(lang, uid)
-    const validatedRefsData = validateContentPageRefs(
-      cleanedRefsData,
+    const contentPageRefsData = await fetchContentPageRefs(lang, uid)
+    const contentPageRefs = validateContentPageRefs(
+      contentPageRefsData,
       lang,
       uid
     )
-    const tags = generatePageTags(validatedRefsData, lang)
+    if (!contentPageRefs) {
+      return null
+    }
+    const tags = generatePageTags(contentPageRefs, lang)
 
     getContentPageCounter.add(1, { lang, uid })
     console.info(
@@ -53,7 +40,7 @@ export const contentPageQueryRouter = router({
       })
     )
 
-    const response = await request<ContentPageDataRaw>(
+    const response = await request<GetContentPageSchema>(
       GetContentPage,
       { locale: lang, uid },
       {
@@ -64,154 +51,27 @@ export const contentPageQueryRouter = router({
       }
     )
 
-    const { content_page } = removeEmptyObjects(response.data)
-    if (!content_page) {
-      throw notFound(response)
-    }
+    const contentPage = contentPageSchema.safeParse(response.data)
 
-    const processedBlocks = content_page.blocks
-      ? content_page.blocks.map((block: any) => {
-          switch (block.__typename) {
-            case ContentBlocksTypenameEnum.ContentPageBlocksContent:
-              return block
-            case ContentBlocksTypenameEnum.ContentPageBlocksShortcuts:
-              return {
-                ...block,
-                shortcuts: {
-                  ...block.shortcuts,
-                  shortcuts: block.shortcuts.shortcuts.map((shortcut: any) => ({
-                    text: shortcut.text,
-                    openInNewTab: shortcut.open_in_new_tab,
-                    ...shortcut.linkConnection.edges[0].node,
-                    url:
-                      shortcut.linkConnection.edges[0].node.web?.original_url ||
-                      removeMultipleSlashes(
-                        `/${shortcut.linkConnection.edges[0].node.system.locale}/${shortcut.linkConnection.edges[0].node.url}`
-                      ),
-                  })),
-                },
-              }
-            case ContentBlocksTypenameEnum.ContentPageBlocksCardsGrid:
-              return {
-                ...block,
-                cards_grid: {
-                  ...block.cards_grid,
-                  cards: block.cards_grid.cardConnection.edges.map(
-                    ({ node: card }: { node: any }) => {
-                      switch (card.__typename) {
-                        case CardsGridEnum.Card:
-                          return {
-                            ...card,
-                            isContentCard: !!card.is_content_card,
-                            backgroundImage: makeImageVaultImage(
-                              card.background_image
-                            ),
-                            primaryButton: card.has_primary_button
-                              ? makeButtonObject(card.primary_button)
-                              : undefined,
-                            secondaryButton: card.has_secondary_button
-                              ? makeButtonObject(card.secondary_button)
-                              : undefined,
-                            sidePeekButton:
-                              card.has_sidepeek_button ||
-                              !!card.sidepeek_button?.call_to_action_text
-                                ? {
-                                    title:
-                                      card.sidepeek_button.call_to_action_text,
-                                  }
-                                : undefined,
-                          }
-                        case CardsGridEnum.LoyaltyCard:
-                          return {
-                            ...card,
-                            image: makeImageVaultImage(card.image),
-                            link: makeButtonObject(card.link),
-                          }
-                      }
-                    }
-                  ),
-                },
-              }
-            case ContentBlocksTypenameEnum.ContentPageBlocksDynamicContent:
-              return {
-                ...block,
-                dynamic_content: {
-                  ...block.dynamic_content,
-                  link: block.dynamic_content.link.pageConnection.edges.length
-                    ? {
-                        text: block.dynamic_content.link.text,
-                        href: removeMultipleSlashes(
-                          `/${block.dynamic_content.link.pageConnection.edges[0].node.system.locale}/${block.dynamic_content.link.pageConnection.edges[0].node.url}`
-                        ),
-                        title:
-                          block.dynamic_content.link.pageConnection.edges[0]
-                            .node.title,
-                      }
-                    : undefined,
-                },
-              }
-            default:
-              return block
-          }
-        })
-      : null
-
-    const sidebar = response.data.content_page.sidebar
-      ? response.data.content_page.sidebar.map((item: any) => {
-          switch (item.__typename) {
-            case SidebarTypenameEnum.ContentPageSidebarJoinLoyaltyContact:
-              return {
-                ...item,
-                join_loyalty_contact: {
-                  ...item.join_loyalty_contact,
-                  button: makeButtonObject(item.join_loyalty_contact.button),
-                },
-              }
-            default:
-              return item
-          }
-        })
-      : null
-
-    const heroImage = makeImageVaultImage(content_page.hero_image)
-    const validatedContentPage = validateContentPageSchema.safeParse({
-      content_page: {
-        ...content_page,
-        blocks: processedBlocks,
-        sidebar,
-        hero_image: heroImage,
-      },
-    })
-
-    if (!validatedContentPage.success) {
+    if (!contentPage.success) {
       console.error(
         `Failed to validate Contentpage Data - (lang: ${lang}, uid: ${uid})`
       )
-      console.error(validatedContentPage.error?.format())
+      console.error(contentPage.error?.format())
       return null
     }
 
-    const { hero_image, blocks, ...restContentPage } =
-      validatedContentPage.data.content_page
-
-    const contentPage: ContentPage = {
-      ...restContentPage,
-      heroImage,
-      blocks: blocks as Block[],
-      sidebar: sidebar as Sidebar[],
-    }
-
     const tracking: TrackingSDKPageData = {
-      pageId: contentPage.system.uid,
-      lang: contentPage.system.locale as Lang,
-      publishedDate: contentPage.system.updated_at,
-      createdDate: contentPage.system.created_at,
+      pageId: contentPage.data.content_page.system.uid,
+      lang: contentPage.data.content_page.system.locale as Lang,
+      publishedDate: contentPage.data.content_page.system.updated_at,
+      createdDate: contentPage.data.content_page.system.created_at,
       channel: TrackingChannelEnum["static-content-page"],
       pageType: "staticcontentpage",
     }
 
     return {
-      contentPage,
+      contentPage: contentPage.data.content_page,
       tracking,
     }
   }),
diff --git a/server/routers/contentstack/contentPage/utils.ts b/server/routers/contentstack/contentPage/utils.ts
index f5068735b..c4cc9c5c5 100644
--- a/server/routers/contentstack/contentPage/utils.ts
+++ b/server/routers/contentstack/contentPage/utils.ts
@@ -1,20 +1,20 @@
 import { metrics } from "@opentelemetry/api"
 
 import { Lang } from "@/constants/languages"
-import { GetContentPageRefs } from "@/lib/graphql/Query/ContentPage.graphql"
+import { GetContentPageRefs } from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 
-import { generateTag, generateTags } from "@/utils/generateTag"
-import { removeMultipleSlashes } from "@/utils/url"
+import { generateTag, generateTagsFromSystem } from "@/utils/generateTag"
 
-import { removeEmptyObjects } from "../../utils"
-import { validateContentPageRefsSchema } from "./output"
+import { contentPageRefsSchema } from "./output"
 
-import { ContentBlocksTypenameEnum } from "@/types/components/content/enums"
-import { Edges } from "@/types/requests/utils/edges"
-import { NodeRefs } from "@/types/requests/utils/refs"
-import { ContentPageRefsDataRaw } from "@/types/trpc/routers/contentstack/contentPage"
+import { ContentPageEnum } from "@/types/enums/contentPage"
+import { System } from "@/types/requests/system"
+import {
+  ContentPageRefs,
+  GetContentPageRefsSchema,
+} from "@/types/trpc/routers/contentstack/contentPage"
 
 const meter = metrics.getMeter("trpc.contentPage")
 // OpenTelemetry metrics: ContentPage
@@ -41,10 +41,15 @@ export async function fetchContentPageRefs(lang: Lang, uid: string) {
       query: { lang, uid },
     })
   )
-  const refsResponse = await request<ContentPageRefsDataRaw>(
+  const refsResponse = await request<GetContentPageRefsSchema>(
     GetContentPageRefs,
     { locale: lang, uid },
-    { cache: "force-cache", next: { tags: [generateTag(lang, uid)] } }
+    {
+      cache: "force-cache",
+      next: {
+        tags: [generateTag(lang, uid)],
+      },
+    }
   )
   if (!refsResponse.data) {
     const notFoundError = notFound(refsResponse)
@@ -69,11 +74,15 @@ export async function fetchContentPageRefs(lang: Lang, uid: string) {
     throw notFoundError
   }
 
-  return removeEmptyObjects(refsResponse.data)
+  return refsResponse.data
 }
 
-export function validateContentPageRefs(data: any, lang: Lang, uid: string) {
-  const validatedData = validateContentPageRefsSchema.safeParse(data)
+export function validateContentPageRefs(
+  data: GetContentPageRefsSchema,
+  lang: Lang,
+  uid: string
+) {
+  const validatedData = contentPageRefsSchema.safeParse(data)
   if (!validatedData.success) {
     getContentPageRefsFailCounter.add(1, {
       lang,
@@ -97,64 +106,70 @@ export function validateContentPageRefs(data: any, lang: Lang, uid: string) {
       query: { lang, uid },
     })
   )
+
   return validatedData.data
 }
 
-export function generatePageTags(validatedData: any, lang: Lang): string[] {
+export function generatePageTags(
+  validatedData: ContentPageRefs,
+  lang: Lang
+): string[] {
   const connections = getConnections(validatedData)
   return [
-    generateTags(lang, connections),
+    generateTagsFromSystem(lang, connections),
     generateTag(lang, validatedData.content_page.system.uid),
   ].flat()
 }
 
-export function getConnections(refs: ContentPageRefsDataRaw) {
-  const connections: Edges<NodeRefs>[] = []
-  if (refs.content_page.blocks) {
-    refs.content_page.blocks.forEach((item) => {
-      switch (item.__typename) {
-        case ContentBlocksTypenameEnum.ContentPageBlocksContent: {
-          if (item.content.content.embedded_itemsConnection.edges.length) {
-            connections.push(item.content.content.embedded_itemsConnection)
+export function getConnections({ content_page }: ContentPageRefs) {
+  const connections: System["system"][] = [content_page.system]
+  if (content_page.blocks) {
+    content_page.blocks.forEach((block) => {
+      switch (block.__typename) {
+        case ContentPageEnum.ContentStack.blocks.Content:
+          {
+            if (block.content.length) {
+              // TS has trouble infering the filtered types
+              // @ts-ignore
+              connections.push(...block.content)
+            }
+          }
+          break
+        case ContentPageEnum.ContentStack.blocks.Shortcuts: {
+          if (block.shortcuts.shortcuts.length) {
+            connections.push(...block.shortcuts.shortcuts)
           }
           break
         }
-        case ContentBlocksTypenameEnum.ContentPageBlocksShortcuts: {
-          item.shortcuts.shortcuts.forEach((shortcut) => {
-            if (shortcut.linkConnection.edges.length) {
-              connections.push(shortcut.linkConnection)
-            }
-          })
+        case ContentPageEnum.ContentStack.blocks.TextCols: {
+          if (block.text_cols.length) {
+            connections.push(...block.text_cols)
+          }
           break
         }
       }
     })
   }
+
+  if (content_page.sidebar) {
+    content_page.sidebar.forEach((block) => {
+      switch (block.__typename) {
+        case ContentPageEnum.ContentStack.sidebar.Content:
+          if (block.content.length) {
+            connections.push(...block.content)
+          }
+          break
+
+        case ContentPageEnum.ContentStack.sidebar.JoinLoyaltyContact:
+          if (block.join_loyalty_contact?.button) {
+            connections.push(block.join_loyalty_contact.button)
+          }
+          break
+        default:
+          break
+      }
+    })
+  }
+
   return connections
 }
-
-export function makeButtonObject(button: any) {
-  if (!button) return null
-
-  const isContenstackLink =
-    button?.is_contentstack_link || button.linkConnection?.edges?.length
-  const linkConnnectionNode = isContenstackLink
-    ? button.linkConnection.edges[0]?.node
-    : null
-
-  return {
-    openInNewTab: button?.open_in_new_tab,
-    title:
-      button.cta_text ||
-      (linkConnnectionNode
-        ? linkConnnectionNode.title
-        : button.external_link.title),
-    href: linkConnnectionNode
-      ? linkConnnectionNode.web?.original_url ||
-        removeMultipleSlashes(
-          `/${linkConnnectionNode.system.locale}/${linkConnnectionNode.url}`
-        )
-      : button.external_link.href,
-    isExternal: !isContenstackLink,
-  }
-}
diff --git a/server/routers/contentstack/hotelPage/output.ts b/server/routers/contentstack/hotelPage/output.ts
index 347df6e17..b07121934 100644
--- a/server/routers/contentstack/hotelPage/output.ts
+++ b/server/routers/contentstack/hotelPage/output.ts
@@ -1,64 +1,26 @@
 import { z } from "zod"
 
-import { HotelBlocksTypenameEnum } from "@/types/components/hotelPage/enums"
+import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
 
-export const activityCardSchema = z.object({
-  background_image: z.any(),
-  cta_text: z.string(),
-  heading: z.string(),
-  open_in_new_tab: z.boolean(),
-  scripted_title: z.string().optional(),
-  body_text: z.string(),
-  hotel_page_activities_content_pageConnection: z.object({
-    edges: z.array(
-      z.object({
-        node: z.object({
-          url: z.string(),
-          web: z.object({
-            original_url: z.string().optional(),
-          }),
-          system: z.object({
-            locale: z.string(),
-          }),
-        }),
-      })
-    ),
-  }),
-})
+import { activitiesCard } from "../schemas/blocks/activitiesCard"
 
-const contentBlockActivity = z.object({
-  __typename: z.literal(
-    HotelBlocksTypenameEnum.HotelPageContentUpcomingActivitiesCard
-  ),
-  upcoming_activities_card: activityCardSchema,
-})
+import { HotelPageEnum } from "@/types/enums/hotelPage"
 
-const contentBlockItem = z.discriminatedUnion("__typename", [
-  contentBlockActivity,
+const contentBlockActivities = z
+  .object({
+    __typename: z.literal(HotelPageEnum.ContentStack.blocks.ActivitiesCard),
+  })
+  .merge(activitiesCard)
+
+export const contentBlock = z.discriminatedUnion("__typename", [
+  contentBlockActivities,
 ])
 
-export const validateHotelPageSchema = z.object({
-  hotel_page: z.object({
-    hotel_page_id: z.string(),
-    title: z.string(),
-    url: z.string(),
-    content: z.array(contentBlockItem).nullable(),
-  }),
-})
-
 export const hotelPageSchema = z.object({
   hotel_page: z.object({
+    content: discriminatedUnionArray(contentBlock.options).nullable(),
     hotel_page_id: z.string(),
     title: z.string(),
     url: z.string(),
   }),
 })
-
-// Will be extended once we introduce more functionality to our entries.
-export type HotelPageDataRaw = z.infer<typeof validateHotelPageSchema>
-
-type HotelPageRaw = HotelPageDataRaw["hotel_page"]
-export type HotelPage = HotelPageRaw
-
-export type ActivityCard = z.infer<typeof activityCardSchema>
-export type ContentBlockItem = z.infer<typeof contentBlockItem>
diff --git a/server/routers/contentstack/hotelPage/query.ts b/server/routers/contentstack/hotelPage/query.ts
index 6be9e7306..9bec62769 100644
--- a/server/routers/contentstack/hotelPage/query.ts
+++ b/server/routers/contentstack/hotelPage/query.ts
@@ -1,13 +1,15 @@
 import { metrics } from "@opentelemetry/api"
 
-import { GetHotelPage } from "@/lib/graphql/Query/HotelPage.graphql"
+import { GetHotelPage } from "@/lib/graphql/Query/HotelPage/HotelPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
 import { generateTag } from "@/utils/generateTag"
 
-import { HotelPage, HotelPageDataRaw, validateHotelPageSchema } from "./output"
+import { hotelPageSchema } from "./output"
+
+import { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage"
 
 // OpenTelemetry metrics
 const meter = metrics.getMeter("trpc.contentstack.hotelPage")
@@ -31,7 +33,7 @@ export const hotelPageQueryRouter = router({
         query: { lang, uid },
       })
     )
-    const response = await request<HotelPageDataRaw>(
+    const response = await request<GetHotelPageData>(
       GetHotelPage,
       {
         locale: lang,
@@ -62,7 +64,7 @@ export const hotelPageQueryRouter = router({
       throw notFoundError
     }
 
-    const validatedHotelPage = validateHotelPageSchema.safeParse(response.data)
+    const validatedHotelPage = hotelPageSchema.safeParse(response.data)
 
     if (!validatedHotelPage.success) {
       getHotelPageFailCounter.add(1, {
@@ -81,9 +83,6 @@ export const hotelPageQueryRouter = router({
       return null
     }
 
-    const hotelPage = {
-      ...validatedHotelPage.data.hotel_page,
-    } as HotelPage
     getHotelPageSuccessCounter.add(1, { lang, uid: `${uid}` })
     console.info(
       "contentstack.hotelPage success",
@@ -91,6 +90,6 @@ export const hotelPageQueryRouter = router({
         query: { lang, uid },
       })
     )
-    return hotelPage
+    return validatedHotelPage.data.hotel_page
   }),
 })
diff --git a/server/routers/contentstack/languageSwitcher/output.ts b/server/routers/contentstack/languageSwitcher/output.ts
index 1dceb9166..7ed9cfff8 100644
--- a/server/routers/contentstack/languageSwitcher/output.ts
+++ b/server/routers/contentstack/languageSwitcher/output.ts
@@ -2,6 +2,7 @@ import { z } from "zod"
 
 const link = z
   .object({ url: z.string().optional(), isExternal: z.boolean() })
+  .optional()
   .nullable()
 
 export const validateLanguageSwitcherData = z.object({
diff --git a/server/routers/contentstack/languageSwitcher/query.ts b/server/routers/contentstack/languageSwitcher/query.ts
index e51219184..89e7f82ce 100644
--- a/server/routers/contentstack/languageSwitcher/query.ts
+++ b/server/routers/contentstack/languageSwitcher/query.ts
@@ -6,23 +6,23 @@ import { batchRequest } from "@/lib/graphql/batchRequest"
 import {
   GetDaDeEnUrlsAccountPage,
   GetFiNoSvUrlsAccountPage,
-} from "@/lib/graphql/Query/AccountPage.graphql"
+} from "@/lib/graphql/Query/AccountPage/AccountPage.graphql"
 import {
   GetDaDeEnUrlsContentPage,
   GetFiNoSvUrlsContentPage,
-} from "@/lib/graphql/Query/ContentPage.graphql"
-import {
-  GetDaDeEnUrlsHotelPage,
-  GetFiNoSvUrlsHotelPage,
-} from "@/lib/graphql/Query/HotelPage.graphql"
+} from "@/lib/graphql/Query/ContentPage/ContentPage.graphql"
 import {
   GetDaDeEnUrlsCurrentBlocksPage,
   GetFiNoSvUrlsCurrentBlocksPage,
-} from "@/lib/graphql/Query/LanguageSwitcherCurrent.graphql"
+} from "@/lib/graphql/Query/Current/LanguageSwitcher.graphql"
+import {
+  GetDaDeEnUrlsHotelPage,
+  GetFiNoSvUrlsHotelPage,
+} from "@/lib/graphql/Query/HotelPage/HotelPage.graphql"
 import {
   GetDaDeEnUrlsLoyaltyPage,
   GetFiNoSvUrlsLoyaltyPage,
-} from "@/lib/graphql/Query/LoyaltyPage.graphql"
+} from "@/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql"
 import { internalServerError } from "@/server/errors/trpc"
 import { publicProcedure, router } from "@/server/trpc"
 
@@ -65,128 +65,61 @@ async function getLanguageSwitcher(options: LanguageSwitcherVariables) {
     generateTag(Lang.no, options.uid, languageSwitcherAffix),
     generateTag(Lang.sv, options.uid, languageSwitcherAffix),
   ]
+  let daDeEnDocument = null
+  let fiNoSvDocument = null
   switch (options.contentType) {
     case PageTypeEnum.accountPage:
-      return await batchRequest<LanguageSwitcherQueryDataRaw>([
-        {
-          document: GetDaDeEnUrlsAccountPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsDaDeEn,
-            },
-          },
-        },
-        {
-          document: GetFiNoSvUrlsAccountPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsFiNoSv,
-            },
-          },
-        },
-      ])
+      daDeEnDocument = GetDaDeEnUrlsAccountPage
+      fiNoSvDocument = GetFiNoSvUrlsAccountPage
+      break
     case PageTypeEnum.currentBlocksPage:
-      return await batchRequest<LanguageSwitcherQueryDataRaw>([
-        {
-          document: GetDaDeEnUrlsCurrentBlocksPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsDaDeEn,
-            },
-          },
-        },
-        {
-          document: GetFiNoSvUrlsCurrentBlocksPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsFiNoSv,
-            },
-          },
-        },
-      ])
+      daDeEnDocument = GetDaDeEnUrlsCurrentBlocksPage
+      fiNoSvDocument = GetFiNoSvUrlsCurrentBlocksPage
+      break
     case PageTypeEnum.loyaltyPage:
-      return await batchRequest<LanguageSwitcherQueryDataRaw>([
-        {
-          document: GetDaDeEnUrlsLoyaltyPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsDaDeEn,
-            },
-          },
-        },
-        {
-          document: GetFiNoSvUrlsLoyaltyPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsFiNoSv,
-            },
-          },
-        },
-      ])
+      daDeEnDocument = GetDaDeEnUrlsLoyaltyPage
+      fiNoSvDocument = GetFiNoSvUrlsLoyaltyPage
+      break
     case PageTypeEnum.hotelPage:
-      return await batchRequest<LanguageSwitcherQueryDataRaw>([
-        {
-          document: GetDaDeEnUrlsHotelPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsDaDeEn,
-            },
-          },
-        },
-        {
-          document: GetFiNoSvUrlsHotelPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsFiNoSv,
-            },
-          },
-        },
-      ])
+      daDeEnDocument = GetDaDeEnUrlsHotelPage
+      fiNoSvDocument = GetFiNoSvUrlsHotelPage
+      break
     case PageTypeEnum.contentPage:
-      return await batchRequest<LanguageSwitcherQueryDataRaw>([
-        {
-          document: GetDaDeEnUrlsContentPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsDaDeEn,
-            },
-          },
-        },
-        {
-          document: GetFiNoSvUrlsContentPage,
-          variables,
-          options: {
-            cache: "force-cache",
-            next: {
-              tags: tagsFiNoSv,
-            },
-          },
-        },
-      ])
-
+      daDeEnDocument = GetDaDeEnUrlsContentPage
+      fiNoSvDocument = GetFiNoSvUrlsContentPage
+      break
     default:
       console.error(`type: [${options.contentType}]`)
       console.error(`Trying to get a content type that is not supported`)
       throw internalServerError()
   }
+
+  if (daDeEnDocument && fiNoSvDocument) {
+    return await batchRequest<LanguageSwitcherQueryDataRaw>([
+      {
+        document: daDeEnDocument,
+        variables,
+        options: {
+          cache: "force-cache",
+          next: {
+            tags: tagsDaDeEn,
+          },
+        },
+      },
+      {
+        document: fiNoSvDocument,
+        variables,
+        options: {
+          cache: "force-cache",
+          next: {
+            tags: tagsFiNoSv,
+          },
+        },
+      },
+    ])
+  }
+
+  throw internalServerError()
 }
 
 export const languageSwitcherQueryRouter = router({
@@ -213,9 +146,10 @@ export const languageSwitcherQueryRouter = router({
       contentType: ctx.contentType!,
       uid: ctx.uid,
     })
+
     const urls = Object.keys(res.data).reduce<LanguageSwitcherData>(
       (acc, key) => {
-        const item = res.data[key as Lang]?.items[0]
+        const item = res.data[key as Lang]
         const url = item
           ? item.web?.original_url || `/${key}${item.url}`
           : undefined
diff --git a/server/routers/contentstack/loyaltyPage/output.ts b/server/routers/contentstack/loyaltyPage/output.ts
index fb6d5e6cc..e4ddfe35a 100644
--- a/server/routers/contentstack/loyaltyPage/output.ts
+++ b/server/routers/contentstack/loyaltyPage/output.ts
@@ -1,432 +1,192 @@
 import { z } from "zod"
 
-import { Lang } from "@/constants/languages"
+import { discriminatedUnionArray } from "@/lib/discriminatedUnion"
 
-import { imageVaultAssetSchema } from "../schemas/imageVault"
-
-import { ImageVaultAsset } from "@/types/components/imageVault"
 import {
-  JoinLoyaltyContactTypenameEnum,
-  LoyaltyBlocksTypenameEnum,
-  LoyaltyCardsGridEnum,
-  LoyaltyComponentEnum,
-  LoyaltySidebarDynamicComponentEnum,
-  SidebarTypenameEnum,
-} from "@/types/components/loyalty/enums"
-import { Embeds } from "@/types/requests/embeds"
-import { PageLinkEnum } from "@/types/requests/pageLinks"
-import { RTEEmbedsEnum } from "@/types/requests/rte"
-import { EdgesWithTotalCount } from "@/types/requests/utils/edges"
-import { RTEDocument } from "@/types/rte/node"
+  cardGridRefsSchema,
+  cardsGridSchema,
+} from "../schemas/blocks/cardsGrid"
+import {
+  contentRefsSchema as blockContentRefsSchema,
+  contentSchema as blockContentSchema,
+} from "../schemas/blocks/content"
+import {
+  dynamicContentRefsSchema,
+  dynamicContentSchema as blockDynamicContentSchema,
+} from "../schemas/blocks/dynamicContent"
+import {
+  shortcutsRefsSchema,
+  shortcutsSchema,
+} from "../schemas/blocks/shortcuts"
+import { tempImageVaultAssetSchema } from "../schemas/imageVault"
+import {
+  contentRefsSchema as sidebarContentRefsSchema,
+  contentSchema as sidebarContentSchema,
+} from "../schemas/sidebar/content"
+import { dynamicContentSchema as sidebarDynamicContentSchema } from "../schemas/sidebar/dynamicContent"
+import {
+  joinLoyaltyContactRefsSchema,
+  joinLoyaltyContactSchema,
+} from "../schemas/sidebar/joinLoyaltyContact"
+import { systemSchema } from "../schemas/system"
 
-const loyaltyPageDynamicContent = z.object({
-  __typename: z.literal(
-    LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent
-  ),
-  dynamic_content: z.object({
-    title: z.string().nullable(),
-    subtitle: z.string().nullable(),
-    component: z.nativeEnum(LoyaltyComponentEnum),
-    link: z
-      .object({
-        text: z.string(),
-        href: z.string(),
-      })
-      .optional(),
-  }),
-})
+import { LoyaltyPageEnum } from "@/types/enums/loyaltyPage"
 
-const loyaltyPageShortcuts = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts),
-  shortcuts: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    shortcuts: z.array(
-      z.object({
-        text: z.string().optional(),
-        openInNewTab: z.boolean(),
-        url: z.string(),
-        title: z.string(),
-      })
+// LoyaltyPage Refs
+const extendedCardGridRefsSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.CardsGrid),
+  })
+  .merge(cardGridRefsSchema)
+
+const extendedContentRefsSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(blockContentRefsSchema)
+
+const extendedDynamicContentRefsSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.DynamicContent),
+  })
+  .merge(dynamicContentRefsSchema)
+
+const extendedShortcutsRefsSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.Shortcuts),
+  })
+  .merge(shortcutsRefsSchema)
+
+const blocksRefsSchema = z.discriminatedUnion("__typename", [
+  extendedCardGridRefsSchema,
+  extendedContentRefsSchema,
+  extendedDynamicContentRefsSchema,
+  extendedShortcutsRefsSchema,
+])
+
+const contentSidebarRefsSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.sidebar.Content),
+  })
+  .merge(sidebarContentRefsSchema)
+
+const extendedJoinLoyaltyContactRefsSchema = z
+  .object({
+    __typename: z.literal(
+      LoyaltyPageEnum.ContentStack.sidebar.JoinLoyaltyContact
     ),
-  }),
-})
+  })
+  .merge(joinLoyaltyContactRefsSchema)
 
-const cardBlock = z.object({
-  __typename: z.literal(LoyaltyCardsGridEnum.Card),
-  heading: z.string().nullable(),
-  body_text: z.string().nullable(),
-  background_image: z.any(),
-  scripted_top_title: z.string().nullable(),
-  primaryButton: z
-    .object({
-      openInNewTab: z.boolean(),
-      title: z.string(),
-      href: z.string(),
-      isExternal: z.boolean(),
-    })
-    .optional(),
-  secondaryButton: z
-    .object({
-      openInNewTab: z.boolean(),
-      title: z.string(),
-      href: z.string(),
-      isExternal: z.boolean(),
-    })
-    .optional(),
-  system: z.object({
-    locale: z.nativeEnum(Lang),
-    uid: z.string(),
+const sidebarRefsSchema = z.discriminatedUnion("__typename", [
+  contentSidebarRefsSchema,
+  extendedJoinLoyaltyContactRefsSchema,
+  z.object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.sidebar.DynamicContent),
   }),
-})
-
-const loyaltyCardBlock = z.object({
-  __typename: z.literal(LoyaltyCardsGridEnum.LoyaltyCard),
-  heading: z.string().nullable(),
-  body_text: z.string().nullable(),
-  image: z.any(),
-  link: z
-    .object({
-      openInNewTab: z.boolean(),
-      title: z.string(),
-      href: z.string(),
-      isExternal: z.boolean(),
-    })
-    .optional(),
-  system: z.object({
-    locale: z.nativeEnum(Lang),
-    uid: z.string(),
-  }),
-})
-
-const loyaltyPageCardsItems = z.discriminatedUnion("__typename", [
-  loyaltyCardBlock,
-  cardBlock,
 ])
 
-const loyaltyPageCards = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid),
-  cards_grid: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    layout: z.enum(["twoColumnGrid", "threeColumnGrid", "twoPlusOne"]),
-    theme: z.enum(["one", "two", "three"]).nullable(),
-    cards: z.array(loyaltyPageCardsItems),
-  }),
-})
-
-const loyaltyPageBlockTextContent = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: z.object({
-        edges: z.array(z.any()),
-        totalCount: z.number(),
+export const loyaltyPageRefsSchema = z.object({
+  loyalty_page: z.object({
+    blocks: discriminatedUnionArray(blocksRefsSchema.options).optional(),
+    sidebar: discriminatedUnionArray(sidebarRefsSchema.options)
+      .optional()
+      .transform((data) => {
+        if (data) {
+          return data.filter(
+            (block) =>
+              block.__typename !==
+              LoyaltyPageEnum.ContentStack.sidebar.DynamicContent
+          )
+        }
+        return data
       }),
-      json: z.any(),
-    }),
+    system: systemSchema,
   }),
 })
 
-const loyaltyPageBlockItem = z.discriminatedUnion("__typename", [
-  loyaltyPageDynamicContent,
-  loyaltyPageBlockTextContent,
-  loyaltyPageShortcuts,
-  loyaltyPageCards,
+// LoyaltyPage
+export const extendedCardsGridSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.CardsGrid),
+  })
+  .merge(cardsGridSchema)
+
+export const extendedContentSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.Content),
+  })
+  .merge(blockContentSchema)
+
+export const extendedDynamicContentSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.DynamicContent),
+  })
+  .merge(blockDynamicContentSchema)
+
+export const extendedShortcutsSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.blocks.Shortcuts),
+  })
+  .merge(shortcutsSchema)
+
+export const blocksSchema = z.discriminatedUnion("__typename", [
+  extendedCardsGridSchema,
+  extendedContentSchema,
+  extendedDynamicContentSchema,
+  extendedShortcutsSchema,
 ])
 
-const loyaltyPageSidebarTextContent = z.object({
-  __typename: z.literal(SidebarTypenameEnum.LoyaltyPageSidebarContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: z.object({
-        edges: z.array(z.any()),
-        totalCount: z.number(),
-      }),
-      json: z.any(),
-    }),
-  }),
-})
+const contentSidebarSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.sidebar.Content),
+  })
+  .merge(sidebarContentSchema)
 
-const loyaltyPageJoinLoyaltyContact = z.object({
-  __typename: z.literal(
-    SidebarTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContact
-  ),
-  join_loyalty_contact: z.object({
-    title: z.string().nullable(),
-    preamble: z.string().nullable(),
-    button: z
-      .object({
-        openInNewTab: z.boolean(),
-        title: z.string(),
-        href: z.string(),
-        isExternal: z.boolean(),
-      })
-      .nullable(),
-    contact: z.array(
-      z.object({
-        __typename: z.literal(
-          JoinLoyaltyContactTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact
-        ),
-        contact: z.object({
-          display_text: z.string().nullable(),
-          contact_field: z.string(),
-          footnote: z.string().nullable(),
-        }),
-      })
+const dynamicContentSidebarSchema = z
+  .object({
+    __typename: z.literal(LoyaltyPageEnum.ContentStack.sidebar.DynamicContent),
+  })
+  .merge(sidebarDynamicContentSchema)
+
+export const joinLoyaltyContactSidebarSchema = z
+  .object({
+    __typename: z.literal(
+      LoyaltyPageEnum.ContentStack.sidebar.JoinLoyaltyContact
     ),
-  }),
-})
+  })
+  .merge(joinLoyaltyContactSchema)
 
-const loyaltyPageSidebarDynamicContent = z.object({
-  __typename: z.literal(SidebarTypenameEnum.LoyaltyPageSidebarDynamicContent),
-  dynamic_content: z.object({
-    component: z.nativeEnum(LoyaltySidebarDynamicComponentEnum),
-  }),
-})
-
-const loyaltyPageSidebarItem = z.discriminatedUnion("__typename", [
-  loyaltyPageSidebarTextContent,
-  loyaltyPageSidebarDynamicContent,
-  loyaltyPageJoinLoyaltyContact,
+export const sidebarSchema = z.discriminatedUnion("__typename", [
+  contentSidebarSchema,
+  dynamicContentSidebarSchema,
+  joinLoyaltyContactSidebarSchema,
 ])
 
-export const validateLoyaltyPageSchema = z.object({
-  heading: z.string().nullable(),
-  preamble: z.string().nullable(),
-  hero_image: imageVaultAssetSchema.nullable().optional(),
-  blocks: z.array(loyaltyPageBlockItem).nullable(),
-  sidebar: z.array(loyaltyPageSidebarItem).nullable(),
-  system: z.object({
-    uid: z.string(),
-    locale: z.nativeEnum(Lang),
-    created_at: z.string(),
-    updated_at: z.string(),
-  }),
-})
-
-// Block types
-export type DynamicContent = z.infer<typeof loyaltyPageDynamicContent>
-
-type BlockContentRaw = z.infer<typeof loyaltyPageBlockTextContent>
-export interface RteBlockContent extends BlockContentRaw {
-  content: {
-    content: {
-      json: RTEDocument
-      embedded_itemsConnection: EdgesWithTotalCount<Embeds>
-    }
-  }
-}
-
-type LoyaltyCardRaw = z.infer<typeof loyaltyCardBlock>
-
-type LoyaltyCard = Omit<LoyaltyCardRaw, "image"> & {
-  image?: ImageVaultAsset
-}
-
-type CardRaw = z.infer<typeof cardBlock>
-
-type Card = Omit<CardRaw, "background_image"> & {
-  backgroundImage?: ImageVaultAsset
-}
-
-type CardsGridRaw = z.infer<typeof loyaltyPageCards>
-
-export type CardsGrid = Omit<CardsGridRaw, "cards"> & {
-  cards: (LoyaltyCard | Card)[]
-}
-
-export type CardsRaw = CardsGrid["cards_grid"]["cards"][number]
-
-export type Shortcuts = z.infer<typeof loyaltyPageShortcuts>
-
-export type Block = RteBlockContent | DynamicContent | Shortcuts | CardsGrid
-
-// Sidebar block types
-type SidebarContentRaw = z.infer<typeof loyaltyPageSidebarTextContent>
-
-export type RteSidebarContent = Omit<SidebarContentRaw, "content"> & {
-  content: {
-    content: {
-      json: RTEDocument
-      embedded_itemsConnection: EdgesWithTotalCount<Embeds>
-    }
-  }
-}
-type SideBarDynamicContent = z.infer<typeof loyaltyPageSidebarDynamicContent>
-
-export type JoinLoyaltyContact = z.infer<typeof loyaltyPageJoinLoyaltyContact>
-export type Sidebar =
-  | JoinLoyaltyContact
-  | RteSidebarContent
-  | SideBarDynamicContent
-type LoyaltyPageDataRaw = z.infer<typeof validateLoyaltyPageSchema>
-
-export type LoyaltyPage = Omit<
-  LoyaltyPageDataRaw,
-  "blocks" | "sidebar" | "hero_image"
-> & {
-  heroImage?: ImageVaultAsset
-  blocks: Block[]
-  sidebar: Sidebar[]
-}
-
-// Refs types
-const pageConnectionRefs = z.object({
-  edges: z.array(
-    z.object({
-      node: z.object({
-        __typename: z.nativeEnum(PageLinkEnum),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
-      }),
-    })
-  ),
-})
-
-const rteConnectionRefs = z.object({
-  edges: z.array(
-    z.object({
-      node: z.object({
-        __typename: z.nativeEnum(RTEEmbedsEnum),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
-      }),
-    })
-  ),
-})
-
-const cardBlockRefs = z.object({
-  __typename: z.literal(LoyaltyCardsGridEnum.Card),
-  primary_button: z
+export const loyaltyPageSchema = z.object({
+  loyalty_page: z
     .object({
-      linkConnection: pageConnectionRefs,
-    })
-    .nullable(),
-  secondary_button: z
-    .object({
-      linkConnection: pageConnectionRefs,
-    })
-    .nullable(),
-
-  system: z.object({
-    content_type_uid: z.string(),
-    uid: z.string(),
-  }),
-})
-
-const loyaltyCardBlockRefs = z.object({
-  __typename: z.literal(LoyaltyCardsGridEnum.LoyaltyCard),
-  link: z
-    .object({
-      linkConnection: pageConnectionRefs,
-    })
-    .nullable(),
-
-  system: z.object({
-    content_type_uid: z.string(),
-    uid: z.string(),
-  }),
-})
-
-const cardGridCardsRef = z.discriminatedUnion("__typename", [
-  loyaltyCardBlockRefs,
-  cardBlockRefs,
-])
-
-const loyaltyPageCardsRefs = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid),
-  cards_grid: z.object({
-    cardConnection: z.object({
-      edges: z.array(
+      blocks: discriminatedUnionArray(blocksSchema.options).nullable(),
+      heading: z.string().optional(),
+      hero_image: tempImageVaultAssetSchema,
+      preamble: z.string().optional(),
+      sidebar: discriminatedUnionArray(sidebarSchema.options).nullable(),
+      title: z.string().optional(),
+      system: systemSchema.merge(
         z.object({
-          node: cardGridCardsRef,
+          created_at: z.string(),
+          updated_at: z.string(),
         })
       ),
+    })
+    .transform((data) => {
+      return {
+        blocks: data.blocks ? data.blocks : [],
+        heading: data.heading,
+        heroImage: data.hero_image,
+        preamble: data.preamble,
+        sidebar: data.sidebar ? data.sidebar : [],
+        system: data.system,
+      }
     }),
-  }),
 })
-
-const loyaltyPageDynamicContentRefs = z.object({
-  __typename: z.literal(
-    LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent
-  ),
-  dynamic_content: z.object({
-    link: z.object({
-      pageConnection: pageConnectionRefs,
-    }),
-  }),
-})
-
-const loyaltyPageShortcutsRefs = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts),
-  shortcuts: z.object({
-    shortcuts: z.array(
-      z.object({
-        linkConnection: pageConnectionRefs,
-      })
-    ),
-  }),
-})
-
-const loyaltyPageBlockTextContentRefs = z.object({
-  __typename: z.literal(LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: rteConnectionRefs,
-    }),
-  }),
-})
-
-const loyaltyPageBlocRefsItem = z.discriminatedUnion("__typename", [
-  loyaltyPageDynamicContentRefs,
-  loyaltyPageBlockTextContentRefs,
-  loyaltyPageShortcutsRefs,
-  loyaltyPageCardsRefs,
-])
-
-const loyaltyPageSidebarTextContentRef = z.object({
-  __typename: z.literal(SidebarTypenameEnum.LoyaltyPageSidebarContent),
-  content: z.object({
-    content: z.object({
-      embedded_itemsConnection: rteConnectionRefs,
-    }),
-  }),
-})
-
-const loyaltyPageSidebarJoinLoyaltyContactRef = z.object({
-  __typename: z.literal(
-    SidebarTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContact
-  ),
-  join_loyalty_contact: z.object({
-    button: z
-      .object({
-        linkConnection: pageConnectionRefs,
-      })
-      .nullable(),
-  }),
-})
-
-const loyaltyPageSidebarRefsItem = z.discriminatedUnion("__typename", [
-  loyaltyPageSidebarTextContentRef,
-  loyaltyPageSidebarJoinLoyaltyContactRef,
-])
-
-export const validateLoyaltyPageRefsSchema = z.object({
-  loyalty_page: z.object({
-    blocks: z.array(loyaltyPageBlocRefsItem).nullable(),
-    sidebar: z.array(loyaltyPageSidebarRefsItem).nullable(),
-    system: z.object({
-      content_type_uid: z.string(),
-      uid: z.string(),
-    }),
-  }),
-})
-
-export type LoyaltyPageRefsDataRaw = z.infer<
-  typeof validateLoyaltyPageRefsSchema
->
diff --git a/server/routers/contentstack/loyaltyPage/query.ts b/server/routers/contentstack/loyaltyPage/query.ts
index 58e630939..e6d181d76 100644
--- a/server/routers/contentstack/loyaltyPage/query.ts
+++ b/server/routers/contentstack/loyaltyPage/query.ts
@@ -4,7 +4,7 @@ import { Lang } from "@/constants/languages"
 import {
   GetLoyaltyPage,
   GetLoyaltyPageRefs,
-} from "@/lib/graphql/Query/LoyaltyPage.graphql"
+} from "@/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
@@ -12,28 +12,20 @@ import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 import {
   generateRefsResponseTag,
   generateTag,
-  generateTags,
+  generateTagsFromSystem,
 } from "@/utils/generateTag"
-import { makeImageVaultImage } from "@/utils/imageVault"
-import { removeMultipleSlashes } from "@/utils/url"
 
-import { removeEmptyObjects } from "../../utils"
-import {
-  type LoyaltyPageRefsDataRaw,
-  validateLoyaltyPageRefsSchema,
-  validateLoyaltyPageSchema,
-} from "./output"
-import { getConnections, makeButtonObject } from "./utils"
+import { loyaltyPageRefsSchema, loyaltyPageSchema } from "./output"
+import { getConnections } from "./utils"
 
-import {
-  LoyaltyBlocksTypenameEnum,
-  LoyaltyCardsGridEnum,
-  SidebarTypenameEnum,
-} from "@/types/components/loyalty/enums"
 import {
   TrackingChannelEnum,
   TrackingSDKPageData,
 } from "@/types/components/tracking"
+import type {
+  GetLoyaltyPageRefsSchema,
+  GetLoyaltyPageSchema,
+} from "@/types/trpc/routers/contentstack/loyaltyPage"
 
 const meter = metrics.getMeter("trpc.loyaltyPage")
 // OpenTelemetry metrics: LoyaltyPage
@@ -59,19 +51,18 @@ const getLoyaltyPageFailCounter = meter.createCounter(
 export const loyaltyPageQueryRouter = router({
   get: contentstackExtendedProcedureUID.query(async ({ ctx }) => {
     const { lang, uid } = ctx
-    getLoyaltyPageRefsCounter.add(1, { lang, uid })
+    const metricsVariables = { lang, uid }
+    const variables = { locale: lang, uid }
+    getLoyaltyPageRefsCounter.add(1, metricsVariables)
     console.info(
       "contentstack.loyaltyPage.refs start",
       JSON.stringify({
-        query: { lang, uid },
+        query: metricsVariables,
       })
     )
-    const refsResponse = await request<LoyaltyPageRefsDataRaw>(
+    const refsResponse = await request<GetLoyaltyPageRefsSchema>(
       GetLoyaltyPageRefs,
-      {
-        locale: lang,
-        uid,
-      },
+      variables,
       {
         cache: "force-cache",
         next: {
@@ -83,8 +74,7 @@ export const loyaltyPageQueryRouter = router({
     if (!refsResponse.data) {
       const notFoundError = notFound(refsResponse)
       getLoyaltyPageRefsFailCounter.add(1, {
-        lang,
-        uid,
+        ...metricsVariables,
         error_type: "http_error",
         error: JSON.stringify({
           code: notFoundError.code,
@@ -93,222 +83,111 @@ export const loyaltyPageQueryRouter = router({
       console.error(
         "contentstack.loyaltyPage.refs not found error",
         JSON.stringify({
-          query: {
-            lang,
-            uid,
-          },
+          query: metricsVariables,
           error: { code: notFoundError.code },
         })
       )
       throw notFoundError
     }
 
-    const cleanedData = removeEmptyObjects(refsResponse.data)
-
-    const validatedLoyaltyPageRefs =
-      validateLoyaltyPageRefsSchema.safeParse(cleanedData)
+    const validatedLoyaltyPageRefs = loyaltyPageRefsSchema.safeParse(
+      refsResponse.data
+    )
     if (!validatedLoyaltyPageRefs.success) {
       getLoyaltyPageRefsFailCounter.add(1, {
-        lang,
-        uid,
+        ...metricsVariables,
         error_type: "validation_error",
         error: JSON.stringify(validatedLoyaltyPageRefs.error),
       })
       console.error(
         "contentstack.loyaltyPage.refs validation error",
         JSON.stringify({
-          query: { lang, uid },
+          query: metricsVariables,
           error: validatedLoyaltyPageRefs.error,
         })
       )
       return null
     }
-    getLoyaltyPageRefsSuccessCounter.add(1, { lang, uid })
+    getLoyaltyPageRefsSuccessCounter.add(1, metricsVariables)
     console.info(
       "contentstack.loyaltyPage.refs success",
       JSON.stringify({
-        query: { lang, uid },
+        query: metricsVariables,
       })
     )
+
     const connections = getConnections(validatedLoyaltyPageRefs.data)
 
     const tags = [
-      generateTags(lang, connections),
+      generateTagsFromSystem(lang, connections),
       generateTag(lang, validatedLoyaltyPageRefs.data.loyalty_page.system.uid),
     ].flat()
-    getLoyaltyPageCounter.add(1, { lang, uid })
+    getLoyaltyPageCounter.add(1, metricsVariables)
     console.info(
       "contentstack.loyaltyPage start",
       JSON.stringify({
-        query: { lang, uid },
+        query: metricsVariables,
       })
     )
-    const response = await request<any>(
+    const response = await request<GetLoyaltyPageSchema>(
       GetLoyaltyPage,
-      {
-        locale: lang,
-        uid,
-      },
+      variables,
       {
         cache: "force-cache",
-        next: {
-          tags,
-        },
+        next: { tags },
       }
     )
 
     if (!response.data) {
       const notFoundError = notFound(response)
       getLoyaltyPageFailCounter.add(1, {
-        lang,
-        uid,
+        ...metricsVariables,
         error_type: "http_error",
         error: JSON.stringify({ code: notFoundError.code }),
       })
       console.error(
         "contentstack.loyaltyPage not found error",
         JSON.stringify({
-          query: { lang, uid },
+          query: metricsVariables,
           error: { code: notFoundError.code },
         })
       )
       throw notFound(response)
     }
 
-    const blocks = response.data.loyalty_page.blocks
-      ? response.data.loyalty_page.blocks.map((block: any) => {
-          switch (block.__typename) {
-            case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent:
-              return {
-                ...block,
-                dynamic_content: {
-                  ...block.dynamic_content,
-                  link: block.dynamic_content.link.pageConnection.edges.length
-                    ? {
-                        text: block.dynamic_content.link.text,
-                        href: removeMultipleSlashes(
-                          `/${block.dynamic_content.link.pageConnection.edges[0].node.system.locale}/${block.dynamic_content.link.pageConnection.edges[0].node.url}`
-                        ),
-                        title:
-                          block.dynamic_content.link.pageConnection.edges[0]
-                            .node.title,
-                      }
-                    : undefined,
-                },
-              }
-            case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts:
-              return {
-                ...block,
-                shortcuts: {
-                  ...block.shortcuts,
-                  shortcuts: block.shortcuts.shortcuts.map((shortcut: any) => ({
-                    text: shortcut.text,
-                    openInNewTab: shortcut.open_in_new_tab,
-                    ...shortcut.linkConnection.edges[0].node,
-                    url:
-                      shortcut.linkConnection.edges[0].node.web?.original_url ||
-                      removeMultipleSlashes(
-                        `/${shortcut.linkConnection.edges[0].node.system.locale}/${shortcut.linkConnection.edges[0].node.url}`
-                      ),
-                  })),
-                },
-              }
-            case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid:
-              return {
-                ...block,
-                cards_grid: {
-                  ...block.cards_grid,
-                  cards: block.cards_grid.cardConnection.edges.map(
-                    ({ node: card }: { node: any }) => {
-                      switch (card.__typename) {
-                        case LoyaltyCardsGridEnum.LoyaltyCard:
-                          return {
-                            ...card,
-                            image: makeImageVaultImage(card.image),
-                            link: makeButtonObject(card.link),
-                          }
-                        case LoyaltyCardsGridEnum.Card:
-                          return {
-                            ...card,
-                            backgroundImage: makeImageVaultImage(
-                              card.background_image
-                            ),
-                            primaryButton: card.has_primary_button
-                              ? makeButtonObject(card.primary_button)
-                              : undefined,
-                            secondaryButton: card.has_secondary_button
-                              ? makeButtonObject(card.secondary_button)
-                              : undefined,
-                          }
-                      }
-                    }
-                  ),
-                },
-              }
-            default:
-              return block
-          }
-        })
-      : null
-
-    const sidebar = response.data.loyalty_page.sidebar
-      ? response.data.loyalty_page.sidebar.map((item: any) => {
-          switch (item.__typename) {
-            case SidebarTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContact:
-              return {
-                ...item,
-                join_loyalty_contact: {
-                  ...item.join_loyalty_contact,
-                  button: makeButtonObject(item.join_loyalty_contact.button),
-                },
-              }
-            default:
-              return item
-          }
-        })
-      : null
-
-    const loyaltyPage = {
-      heading: response.data.loyalty_page.heading,
-      preamble: response.data.loyalty_page.preamble,
-      heroImage: makeImageVaultImage(response.data.loyalty_page.hero_image),
-      system: response.data.loyalty_page.system,
-      blocks,
-      sidebar,
-    }
-
-    const validatedLoyaltyPage =
-      validateLoyaltyPageSchema.safeParse(loyaltyPage)
+    const validatedLoyaltyPage = loyaltyPageSchema.safeParse(response.data)
     if (!validatedLoyaltyPage.success) {
       getLoyaltyPageFailCounter.add(1, {
-        lang,
-        uid,
+        ...metricsVariables,
         error_type: "validation_error",
         error: JSON.stringify(validatedLoyaltyPage.error),
       })
       console.error(
         "contentstack.loyaltyPage validation error",
         JSON.stringify({
-          query: { lang, uid },
+          query: metricsVariables,
           error: validatedLoyaltyPage.error,
         })
       )
       return null
     }
 
+    const loyaltyPage = validatedLoyaltyPage.data.loyalty_page
+
     const loyaltyTrackingData: TrackingSDKPageData = {
-      pageId: response.data.loyalty_page.system.uid,
-      lang: response.data.loyalty_page.system.locale as Lang,
-      publishedDate: response.data.loyalty_page.system.updated_at,
-      createdDate: response.data.loyalty_page.system.created_at,
+      pageId: loyaltyPage.system.uid,
+      lang: loyaltyPage.system.locale as Lang,
+      publishedDate: loyaltyPage.system.updated_at,
+      createdDate: loyaltyPage.system.created_at,
       channel: TrackingChannelEnum["scandic-friends"],
       pageType: "loyaltycontentpage",
     }
-    getLoyaltyPageSuccessCounter.add(1, { lang, uid })
+    getLoyaltyPageSuccessCounter.add(1, metricsVariables)
     console.info(
       "contentstack.loyaltyPage success",
-      JSON.stringify({ query: { lang, uid } })
+      JSON.stringify({ query: metricsVariables })
     )
+
     // Assert LoyaltyPage type to get correct typings for RTE fields
     return {
       loyaltyPage,
diff --git a/server/routers/contentstack/loyaltyPage/utils.ts b/server/routers/contentstack/loyaltyPage/utils.ts
index 80e1f4208..cf2de76c6 100644
--- a/server/routers/contentstack/loyaltyPage/utils.ts
+++ b/server/routers/contentstack/loyaltyPage/utils.ts
@@ -1,106 +1,62 @@
-import { removeMultipleSlashes } from "@/utils/url"
+import { LoyaltyPageEnum } from "@/types/enums/loyaltyPage"
+import type { System } from "@/types/requests/system"
+import type { LoyaltyPageRefs } from "@/types/trpc/routers/contentstack/loyaltyPage"
 
-import { LoyaltyPageRefsDataRaw } from "./output"
+export function getConnections({ loyalty_page }: LoyaltyPageRefs) {
+  const connections: System["system"][] = [loyalty_page.system]
 
-import {
-  LoyaltyBlocksTypenameEnum,
-  LoyaltyCardsGridEnum,
-  SidebarTypenameEnum,
-} from "@/types/components/loyalty/enums"
-import type { Edges } from "@/types/requests/utils/edges"
-import type { NodeRefs } from "@/types/requests/utils/refs"
-
-export function getConnections(refs: LoyaltyPageRefsDataRaw) {
-  const connections: Edges<NodeRefs>[] = []
-  if (refs.loyalty_page.blocks) {
-    refs.loyalty_page.blocks.forEach((item) => {
-      switch (item.__typename) {
-        case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksContent: {
-          if (item.content.content.embedded_itemsConnection.edges.length) {
-            connections.push(item.content.content.embedded_itemsConnection)
+  if (loyalty_page.blocks) {
+    loyalty_page.blocks.forEach((block) => {
+      switch (block.__typename) {
+        case LoyaltyPageEnum.ContentStack.blocks.CardsGrid:
+          if (block.cards_grid.length) {
+            connections.push(...block.cards_grid)
           }
           break
-        }
-        case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksCardsGrid: {
-          connections.push(item.cards_grid.cardConnection)
-          item.cards_grid.cardConnection.edges.forEach((card) => {
-            switch (card.node.__typename) {
-              case LoyaltyCardsGridEnum.LoyaltyCard: {
-                if (card.node.link) {
-                  connections.push(card.node.link?.linkConnection)
-                }
-                break
-              }
-              case LoyaltyCardsGridEnum.Card: {
-                if (card.node.primary_button) {
-                  connections.push(card.node.primary_button?.linkConnection)
-                } else if (card.node.secondary_button) {
-                  connections.push(card.node.secondary_button?.linkConnection)
-                }
-                break
-              }
-            }
-          })
-          break
-        }
-        case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksShortcuts: {
-          item.shortcuts.shortcuts.forEach((shortcut) => {
-            if (shortcut.linkConnection.edges.length) {
-              connections.push(shortcut.linkConnection)
-            }
-          })
-          break
-        }
-        case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent: {
-          if (item.dynamic_content.link.pageConnection.edges.length) {
-            connections.push(item.dynamic_content.link.pageConnection)
+        case LoyaltyPageEnum.ContentStack.blocks.Content:
+          if (block.content.length) {
+            // TS has trouble infering the filtered types
+            // @ts-ignore
+            connections.push(...block.content)
           }
           break
-        }
+        case LoyaltyPageEnum.ContentStack.blocks.DynamicContent:
+          if (block.dynamic_content.link) {
+            connections.push(block.dynamic_content.link)
+          }
+          break
+        case LoyaltyPageEnum.ContentStack.blocks.Shortcuts:
+          if (block.shortcuts.shortcuts.length) {
+            connections.push(...block.shortcuts.shortcuts)
+          }
+          break
+        default:
+          break
       }
     })
   }
-  if (refs.loyalty_page.sidebar) {
-    refs.loyalty_page.sidebar?.forEach((item) => {
-      switch (item.__typename) {
-        case SidebarTypenameEnum.LoyaltyPageSidebarContent:
-          if (item.content.content.embedded_itemsConnection.edges.length) {
-            connections.push(item.content.content.embedded_itemsConnection)
+
+  if (loyalty_page.sidebar) {
+    loyalty_page.sidebar.forEach((block) => {
+      switch (block?.__typename) {
+        case LoyaltyPageEnum.ContentStack.sidebar.Content:
+          if (block.content.length) {
+            // TS has trouble infering the filtered types
+            // @ts-ignore
+            connections.push(...block.content)
           }
           break
-        case SidebarTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContact:
-          if (item.join_loyalty_contact.button?.linkConnection) {
-            connections.push(item.join_loyalty_contact.button.linkConnection)
+        case LoyaltyPageEnum.ContentStack.sidebar.JoinLoyaltyContact:
+          if (block.join_loyalty_contact?.button) {
+            connections.push(block.join_loyalty_contact.button)
           }
           break
+
+        default:
+          break
       }
     })
   }
 
   return connections
 }
-export function makeButtonObject(button: any) {
-  if (!button) return null
-
-  const isContenstackLink =
-    button?.is_contentstack_link || button.linkConnection?.edges?.length
-  const linkConnnectionNode = isContenstackLink
-    ? button.linkConnection.edges[0]?.node
-    : null
-
-  return {
-    openInNewTab: button?.open_in_new_tab,
-    title:
-      button.cta_text ||
-      (linkConnnectionNode
-        ? linkConnnectionNode.title
-        : button.external_link.title),
-    href: linkConnnectionNode
-      ? linkConnnectionNode.web?.original_url ||
-        removeMultipleSlashes(
-          `/${linkConnnectionNode.system.locale}/${linkConnnectionNode.url}`
-        )
-      : button.external_link.href,
-    isExternal: !isContenstackLink,
-  }
-}
diff --git a/server/routers/contentstack/metadata/output.ts b/server/routers/contentstack/metadata/output.ts
index f5fc9a945..e641a3d99 100644
--- a/server/routers/contentstack/metadata/output.ts
+++ b/server/routers/contentstack/metadata/output.ts
@@ -1,62 +1,11 @@
 import { z } from "zod"
 
-export const getMetaDataSchema = z.object({
-  breadcrumbsTitle: z.string().optional(),
-  title: z.string().optional(),
-  description: z.string().optional(),
-  imageConnection: z
-    .object({
-      edges: z.array(
-        z.object({
-          node: z.object({
-            url: z.string(),
-          }),
-        })
-      ),
-    })
-    .optional(),
-})
+import { page } from "../schemas/metadata"
 
-const page = z.object({
-  web: z.object({
-    seo_metadata: z.object({
-      title: z.string().optional(),
-      description: z.string().optional(),
-      imageConnection: z
-        .object({
-          edges: z.array(
-            z.object({
-              node: z.object({
-                url: z.string(),
-              }),
-            })
-          ),
-        })
-        .optional(),
-    }),
-    breadcrumbs: z.object({
-      title: z.string(),
-    }),
-  }),
-  system: z.object({
-    uid: z.string(),
-  }),
-})
-
-export type Page = z.infer<typeof page>
-
-export const validateMyPagesMetaDataContentstackSchema = z.object({
-  account_page: page,
-})
-
-export type GetMyPagesMetaDataData = z.infer<
-  typeof validateMyPagesMetaDataContentstackSchema
->
-
-export const validateLoyaltyPageMetaDataContentstackSchema = z.object({
+export const getLoyaltyPageMetadataSchema = z.object({
   loyalty_page: page,
 })
 
 export type GetLoyaltyPageMetaDataData = z.infer<
-  typeof validateLoyaltyPageMetaDataContentstackSchema
+  typeof getLoyaltyPageMetadataSchema
 >
diff --git a/server/routers/contentstack/metadata/query.ts b/server/routers/contentstack/metadata/query.ts
index ad4523a19..3de11938d 100644
--- a/server/routers/contentstack/metadata/query.ts
+++ b/server/routers/contentstack/metadata/query.ts
@@ -1,12 +1,9 @@
-import { GetLoyaltyPageMetaData } from "@/lib/graphql/Query/MetaDataLoyaltyPage.graphql"
-import { GetMyPagesMetaData } from "@/lib/graphql/Query/MetaDataMyPages.graphql"
+import { GetLoyaltyPageMetaData } from "@/lib/graphql/Query/LoyaltyPage/MetaData.graphql"
 import { contentstackExtendedProcedureUID, router } from "@/server/trpc"
 
 import {
   type GetLoyaltyPageMetaDataData,
-  type GetMyPagesMetaDataData,
-  validateLoyaltyPageMetaDataContentstackSchema,
-  validateMyPagesMetaDataContentstackSchema,
+  getLoyaltyPageMetadataSchema,
 } from "./output"
 import { getMetaData, getResponse, type Variables } from "./utils"
 
@@ -18,38 +15,19 @@ async function getLoyaltyPageMetaData(variables: Variables) {
     variables
   )
 
-  const validatedMetaDataData =
-    validateLoyaltyPageMetaDataContentstackSchema.safeParse(response.data)
+  const validatedMetadata = getLoyaltyPageMetadataSchema.safeParse(
+    response.data
+  )
 
-  if (!validatedMetaDataData.success) {
+  if (!validatedMetadata.success) {
     console.error(
       `Failed to validate Loyaltypage MetaData Data - (uid: ${variables.uid})`
     )
-    console.error(validatedMetaDataData.error)
+    console.error(validatedMetadata.error)
     return null
   }
 
-  return getMetaData(validatedMetaDataData.data.loyalty_page)
-}
-
-async function getMyPagesMetaData(variables: Variables) {
-  const response = await getResponse<GetMyPagesMetaDataData>(
-    GetMyPagesMetaData,
-    variables
-  )
-
-  const validatedMetaDataData =
-    validateMyPagesMetaDataContentstackSchema.safeParse(response.data)
-
-  if (!validatedMetaDataData.success) {
-    console.error(
-      `Failed to validate My Page MetaData Data - (uid: ${variables.uid})`
-    )
-    console.error(validatedMetaDataData.error)
-    return null
-  }
-
-  return getMetaData(validatedMetaDataData.data.account_page)
+  return getMetaData(validatedMetadata.data.loyalty_page)
 }
 
 export const metaDataQueryRouter = router({
@@ -60,8 +38,6 @@ export const metaDataQueryRouter = router({
     }
 
     switch (ctx.contentType) {
-      case PageTypeEnum.accountPage:
-        return await getMyPagesMetaData(variables)
       case PageTypeEnum.loyaltyPage:
         return await getLoyaltyPageMetaData(variables)
       default:
diff --git a/server/routers/contentstack/metadata/utils.ts b/server/routers/contentstack/metadata/utils.ts
index fdc62c407..c1dc47a1d 100644
--- a/server/routers/contentstack/metadata/utils.ts
+++ b/server/routers/contentstack/metadata/utils.ts
@@ -4,7 +4,7 @@ import { internalServerError, notFound } from "@/server/errors/trpc"
 
 import { generateTag } from "@/utils/generateTag"
 
-import { getMetaDataSchema, Page } from "./output"
+import { getMetaDataSchema, Page } from "../schemas/metadata"
 
 export type Variables = {
   locale: Lang
diff --git a/server/routers/contentstack/myPages/navigation/output.ts b/server/routers/contentstack/myPages/navigation/output.ts
index d32c89d60..e277a0c92 100644
--- a/server/routers/contentstack/myPages/navigation/output.ts
+++ b/server/routers/contentstack/myPages/navigation/output.ts
@@ -1,49 +1,17 @@
 import { z } from "zod"
 
 import { Lang } from "@/constants/languages"
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
 
-import { PageLinkEnum } from "@/types/requests/pageLinks"
-
-const node = z.object({
-  system: z.object({
-    locale: z.nativeEnum(Lang),
-    uid: z.string(),
-  }),
-  title: z.string(),
-  url: z.string(),
-})
-
-const web = z.object({
-  original_url: z.string().optional(),
-})
-
-const accountPageLink = z
-  .object({
-    __typename: z.literal(PageLinkEnum.AccountPage),
-  })
-  .merge(node)
-
-const contentPageLink = z
-  .object({
-    __typename: z.literal(PageLinkEnum.ContentPage),
-    web,
-  })
-  .merge(node)
-
-const loyaltyPageLink = z
-  .object({
-    __typename: z.literal(PageLinkEnum.LoyaltyPage),
-    web,
-  })
-  .merge(node)
+import { systemSchema } from "../../schemas/system"
 
 const pageConnection = z.object({
   edges: z.array(
     z.object({
       node: z.discriminatedUnion("__typename", [
-        accountPageLink,
-        contentPageLink,
-        loyaltyPageLink,
+        pageLinks.accountPageSchema,
+        pageLinks.contentPageSchema,
+        pageLinks.loyaltyPageSchema,
       ]),
     })
   ),
@@ -52,13 +20,11 @@ const pageConnection = z.object({
 const pageConnectionRefs = z.object({
   edges: z.array(
     z.object({
-      node: z.object({
-        __typename: z.nativeEnum(PageLinkEnum),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
-      }),
+      node: z.discriminatedUnion("__typename", [
+        pageLinks.accountPageRefSchema,
+        pageLinks.contentPageRefSchema,
+        pageLinks.loyaltyPageRefSchema,
+      ]),
     })
   ),
 })
@@ -76,10 +42,7 @@ export const navigationRefsPayloadSchema = z.object({
             ),
           })
         ),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
+        system: systemSchema,
       })
     ),
   }),
diff --git a/server/routers/contentstack/myPages/navigation/query.ts b/server/routers/contentstack/myPages/navigation/query.ts
index c47f6ac5f..2079e3681 100644
--- a/server/routers/contentstack/myPages/navigation/query.ts
+++ b/server/routers/contentstack/myPages/navigation/query.ts
@@ -3,7 +3,7 @@ import { metrics } from "@opentelemetry/api"
 import {
   GetNavigationMyPages,
   GetNavigationMyPagesRefs,
-} from "@/lib/graphql/Query/NavigationMyPages.graphql"
+} from "@/lib/graphql/Query/AccountPage/Navigation.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 import { contentstackBaseProcedure, router } from "@/server/trpc"
diff --git a/server/routers/contentstack/myPages/navigation/utils.ts b/server/routers/contentstack/myPages/navigation/utils.ts
index 3a3083c85..6c6e1cdd5 100644
--- a/server/routers/contentstack/myPages/navigation/utils.ts
+++ b/server/routers/contentstack/myPages/navigation/utils.ts
@@ -1,6 +1,6 @@
 import { removeMultipleSlashes } from "@/utils/url"
 
-import { PageLinkEnum } from "@/types/requests/pageLinks"
+import { ContentEnum } from "@/types/enums/content"
 import type { Edges } from "@/types/requests/utils/edges"
 import type { NodeRefs } from "@/types/requests/utils/refs"
 import type { GetNavigationMyPagesRefsData, MenuItems } from "./output"
@@ -32,8 +32,8 @@ export function mapMenuItems(menuItems: MenuItems) {
           const page = link.page.edges[0].node
           let originalUrl = undefined
           if (
-            page.__typename === PageLinkEnum.ContentPage ||
-            page.__typename === PageLinkEnum.LoyaltyPage
+            page.__typename === ContentEnum.blocks.ContentPage ||
+            page.__typename === ContentEnum.blocks.LoyaltyPage
           ) {
             if (page.web.original_url) {
               originalUrl = page.web.original_url
diff --git a/server/routers/contentstack/schemas/blocks/activitiesCard.ts b/server/routers/contentstack/schemas/blocks/activitiesCard.ts
new file mode 100644
index 000000000..d98e985a7
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/activitiesCard.ts
@@ -0,0 +1,59 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+import { removeMultipleSlashes } from "@/utils/url"
+
+import { tempImageVaultAssetSchema } from "../imageVault"
+
+import { HotelPageEnum } from "@/types/enums/hotelPage"
+
+export const activitiesCard = z.object({
+  typename: z
+    .literal(HotelPageEnum.ContentStack.blocks.ActivitiesCard)
+    .optional()
+    .default(HotelPageEnum.ContentStack.blocks.ActivitiesCard),
+  upcoming_activities_card: z
+    .object({
+      background_image: tempImageVaultAssetSchema,
+      body_text: z.string(),
+      cta_text: z.string(),
+      heading: z.string(),
+      open_in_new_tab: z.boolean(),
+      scripted_title: z.string().optional(),
+      hotel_page_activities_content_pageConnection: z.object({
+        edges: z.array(
+          z.object({
+            node: z.discriminatedUnion("__typename", [
+              pageLinks.contentPageSchema,
+            ]),
+          })
+        ),
+      }),
+    })
+    .transform((data) => {
+      let contentPage = { href: "" }
+      if (data.hotel_page_activities_content_pageConnection.edges.length) {
+        const page =
+          data.hotel_page_activities_content_pageConnection.edges[0].node
+        if (page.web.original_url) {
+          contentPage = {
+            href: page.web.original_url,
+          }
+        } else {
+          contentPage = {
+            href: removeMultipleSlashes(`/${page.system.locale}/${page.url}`),
+          }
+        }
+      }
+      return {
+        background_image: data.background_image,
+        body_text: data.body_text,
+        contentPage,
+        cta_text: data.cta_text,
+        heading: data.heading,
+        open_in_new_tab: !!data.open_in_new_tab,
+        scripted_title: data.scripted_title,
+      }
+    }),
+})
diff --git a/server/routers/contentstack/schemas/blocks/cardsGrid.ts b/server/routers/contentstack/schemas/blocks/cardsGrid.ts
new file mode 100644
index 000000000..a37a70724
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/cardsGrid.ts
@@ -0,0 +1,162 @@
+import { z } from "zod"
+
+import { tempImageVaultAssetSchema } from "../imageVault"
+import { systemSchema } from "../system"
+import { buttonSchema } from "./utils/buttonLinkSchema"
+import { linkConnectionRefsSchema } from "./utils/linkConnection"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+import { CardsGridEnum } from "@/types/enums/cardsGrid"
+
+const cardBlockSchema = z.object({
+  __typename: z.literal(CardsGridEnum.cards.Card),
+  // JSON - ImageVault Image
+  background_image: tempImageVaultAssetSchema,
+  body_text: z.string().optional().default(""),
+  has_primary_button: z.boolean().default(false),
+  has_secondary_button: z.boolean().default(false),
+  has_sidepeek_button: z.boolean().optional().default(false),
+  heading: z.string().optional().default(""),
+  is_content_card: z.boolean().optional().default(false),
+  primary_button: buttonSchema,
+  scripted_top_title: z.string().optional(),
+  secondary_button: buttonSchema,
+  sidepeek_button: z
+    .object({
+      call_to_action_text: z.string().optional(),
+    })
+    .optional(),
+  system: systemSchema,
+  title: z.string().optional(),
+})
+
+const loyaltyCardBlockSchema = z.object({
+  __typename: z.literal(CardsGridEnum.cards.LoyaltyCard),
+  body_text: z.string().optional(),
+  heading: z.string().optional().default(""),
+  // JSON - ImageVault Image
+  image: tempImageVaultAssetSchema,
+  link: buttonSchema,
+  system: systemSchema,
+  title: z.string().optional(),
+})
+
+export const cardsGridSchema = z.object({
+  typename: z
+    .literal(BlocksEnums.block.CardsGrid)
+    .optional()
+    .default(BlocksEnums.block.CardsGrid),
+  cards_grid: z
+    .object({
+      cardConnection: z.object({
+        edges: z.array(
+          z.object({
+            node: z.discriminatedUnion("__typename", [
+              cardBlockSchema,
+              loyaltyCardBlockSchema,
+            ]),
+          })
+        ),
+      }),
+      layout: z.enum(["twoColumnGrid", "threeColumnGrid", "twoPlusOne"]),
+      preamble: z.string().optional().default(""),
+      theme: z.enum(["one", "two", "three"]).nullable(),
+      title: z.string().optional().default(""),
+    })
+    .transform((data) => {
+      return {
+        layout: data.layout,
+        preamble: data.preamble,
+        theme: data.theme,
+        title: data.title,
+        cards: data.cardConnection.edges.map((card) => {
+          if (card.node.__typename === CardsGridEnum.cards.Card) {
+            return {
+              __typename: card.node.__typename,
+              backgroundImage: card.node.background_image,
+              body_text: card.node.body_text,
+              heading: card.node.heading,
+              isContentCard: card.node.is_content_card,
+              primaryButton: card.node.has_primary_button
+                ? card.node.primary_button
+                : undefined,
+              scripted_top_title: card.node.scripted_top_title,
+              secondaryButton: card.node.has_secondary_button
+                ? card.node.secondary_button
+                : undefined,
+              sidePeekButton:
+                card.node.has_sidepeek_button &&
+                card.node.sidepeek_button?.call_to_action_text
+                  ? {
+                      title: card.node.sidepeek_button.call_to_action_text,
+                    }
+                  : undefined,
+              system: card.node.system,
+              title: card.node.title,
+            }
+          } else {
+            return {
+              __typename: card.node.__typename,
+              body_text: card.node.body_text,
+              heading: card.node.heading,
+              image: card.node.image,
+              link: card.node.link,
+              system: card.node.system,
+              title: card.node.title,
+            }
+          }
+        }),
+      }
+    }),
+})
+
+const cardBlockRefsSchema = z.object({
+  __typename: z.literal(CardsGridEnum.cards.Card),
+  primary_button: linkConnectionRefsSchema,
+  secondary_button: linkConnectionRefsSchema,
+  system: systemSchema,
+})
+
+const loyaltyCardBlockRefsSchema = z.object({
+  __typename: z.literal(CardsGridEnum.cards.LoyaltyCard),
+  link: linkConnectionRefsSchema,
+  system: systemSchema,
+})
+
+export const cardGridRefsSchema = z.object({
+  cards_grid: z
+    .object({
+      cardConnection: z.object({
+        edges: z.array(
+          z.object({
+            node: z.discriminatedUnion("__typename", [
+              cardBlockRefsSchema,
+              loyaltyCardBlockRefsSchema,
+            ]),
+          })
+        ),
+      }),
+    })
+    .transform((data) => {
+      return data.cardConnection.edges
+        .map(({ node }) => {
+          if (node.__typename === CardsGridEnum.cards.Card) {
+            const cards = [node.system]
+            if (node.primary_button) {
+              cards.push(node.primary_button)
+            }
+            if (node.secondary_button) {
+              cards.push(node.secondary_button)
+            }
+            return cards
+          } else {
+            const loyaltyCards = [node.system]
+            if (node.link) {
+              loyaltyCards.push(node.link)
+            }
+            return loyaltyCards
+          }
+        })
+        .flat()
+    }),
+})
diff --git a/server/routers/contentstack/schemas/blocks/content.ts b/server/routers/contentstack/schemas/blocks/content.ts
new file mode 100644
index 000000000..f7ede04d3
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/content.ts
@@ -0,0 +1,83 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+import { imageRefsSchema, imageSchema } from "./image"
+import {
+  imageContainerRefsSchema,
+  imageContainerSchema,
+} from "./imageContainer"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+import { ContentEnum } from "@/types/enums/content"
+
+export const contentSchema = z.object({
+  typename: z
+    .literal(BlocksEnums.block.Content)
+    .optional()
+    .default(BlocksEnums.block.Content),
+  content: z
+    .object({
+      content: z.object({
+        json: z.any(), // JSON
+        embedded_itemsConnection: z.object({
+          edges: z.array(
+            z.object({
+              node: z
+                .discriminatedUnion("__typename", [
+                  imageContainerSchema,
+                  imageSchema,
+                  pageLinks.accountPageSchema,
+                  pageLinks.contentPageSchema,
+                  pageLinks.hotelPageSchema,
+                  pageLinks.loyaltyPageSchema,
+                ])
+                .transform((data) => {
+                  const link = pageLinks.transform(data)
+                  if (link) {
+                    return link
+                  }
+                  return data
+                }),
+            })
+          ),
+        }),
+      }),
+    })
+    .transform((data) => {
+      return data.content
+    }),
+})
+
+export const contentRefsSchema = z.object({
+  content: z
+    .object({
+      content: z.object({
+        embedded_itemsConnection: z.object({
+          edges: z.array(
+            z.object({
+              node: z.discriminatedUnion("__typename", [
+                imageRefsSchema,
+                imageContainerRefsSchema,
+                pageLinks.accountPageRefSchema,
+                pageLinks.contentPageRefSchema,
+                pageLinks.hotelPageRefSchema,
+                pageLinks.loyaltyPageRefSchema,
+              ]),
+            })
+          ),
+        }),
+      }),
+    })
+    .transform((data) => {
+      return data.content.embedded_itemsConnection.edges
+        .filter(({ node }) => node.__typename !== ContentEnum.blocks.SysAsset)
+        .map(({ node }) => {
+          if ("system" in node) {
+            return node.system
+          }
+          return null
+        })
+        .filter((node) => !!node)
+    }),
+})
diff --git a/server/routers/contentstack/schemas/blocks/contentEmbeds.ts b/server/routers/contentstack/schemas/blocks/contentEmbeds.ts
new file mode 100644
index 000000000..88549fd63
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/contentEmbeds.ts
@@ -0,0 +1,23 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+import { imageSchema } from "./image"
+import { imageContainerSchema } from "./imageContainer"
+
+export const contentEmbedsSchema = z
+  .discriminatedUnion("__typename", [
+    imageContainerSchema,
+    imageSchema,
+    pageLinks.accountPageSchema,
+    pageLinks.contentPageSchema,
+    pageLinks.hotelPageSchema,
+    pageLinks.loyaltyPageSchema,
+  ])
+  .transform((data) => {
+    const link = pageLinks.transform(data)
+    if (link) {
+      return link
+    }
+    return data
+  })
diff --git a/server/routers/contentstack/schemas/blocks/dynamicContent.ts b/server/routers/contentstack/schemas/blocks/dynamicContent.ts
new file mode 100644
index 000000000..8b317648a
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/dynamicContent.ts
@@ -0,0 +1,79 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+import { DynamicContentEnum } from "@/types/enums/dynamicContent"
+
+export const dynamicContentSchema = z.object({
+  typename: z
+    .literal(BlocksEnums.block.DynamicContent)
+    .optional()
+    .default(BlocksEnums.block.DynamicContent),
+  dynamic_content: z.object({
+    component: z.enum(DynamicContentEnum.Blocks.enums),
+    subtitle: z.string().optional().default(""),
+    title: z.string().optional().default(""),
+    link: z
+      .object({
+        text: z.string().optional().default(""),
+        linkConnection: z.object({
+          edges: z.array(
+            z.object({
+              node: z
+                .discriminatedUnion("__typename", [
+                  pageLinks.accountPageSchema,
+                  pageLinks.contentPageSchema,
+                  pageLinks.hotelPageSchema,
+                  pageLinks.loyaltyPageSchema,
+                ])
+                .transform((data) => {
+                  const link = pageLinks.transform(data)
+                  if (link) {
+                    return link
+                  }
+                  return data
+                }),
+            })
+          ),
+        }),
+      })
+      .transform((data) => {
+        if (data.linkConnection?.edges.length) {
+          const link = data.linkConnection.edges?.[0]?.node
+          return {
+            href: link.url,
+            text: data.text,
+            title: link.title,
+          }
+        }
+        return undefined
+      }),
+  }),
+})
+
+export const dynamicContentRefsSchema = z.object({
+  dynamic_content: z.object({
+    link: z
+      .object({
+        linkConnection: z.object({
+          edges: z.array(
+            z.object({
+              node: z.discriminatedUnion("__typename", [
+                pageLinks.accountPageRefSchema,
+                pageLinks.contentPageRefSchema,
+                pageLinks.hotelPageRefSchema,
+                pageLinks.loyaltyPageRefSchema,
+              ]),
+            })
+          ),
+        }),
+      })
+      .transform((data) => {
+        if (data.linkConnection?.edges.length) {
+          return data.linkConnection.edges[0].node.system
+        }
+        return null
+      }),
+  }),
+})
diff --git a/server/routers/contentstack/schemas/blocks/image.ts b/server/routers/contentstack/schemas/blocks/image.ts
new file mode 100644
index 000000000..a2c3e74b3
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/image.ts
@@ -0,0 +1,27 @@
+import { z } from "zod"
+
+import { ContentEnum } from "@/types/enums/content"
+
+export const imageSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.SysAsset),
+  description: z.string().optional(),
+  dimension: z.object({
+    height: z.number(),
+    width: z.number(),
+  }),
+  metadata: z.any(), // JSON
+  // system for SysAssets is not the same type
+  // as for all other types eventhough they have
+  // the exact same structure, that's why systemSchema
+  // is not used as that correlates to the
+  // EntrySystemField type
+  system: z.object({
+    uid: z.string(),
+  }),
+  title: z.string().optional(),
+  url: z.string().optional(),
+})
+
+export const imageRefsSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.SysAsset),
+})
diff --git a/server/routers/contentstack/schemas/blocks/imageContainer.ts b/server/routers/contentstack/schemas/blocks/imageContainer.ts
new file mode 100644
index 000000000..fd96fe876
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/imageContainer.ts
@@ -0,0 +1,21 @@
+import { z } from "zod"
+
+import { tempImageVaultAssetSchema } from "../imageVault"
+import { systemSchema } from "../system"
+
+import { ContentEnum } from "@/types/enums/content"
+
+export const imageContainerSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.ImageContainer),
+  // JSON - ImageVault Image
+  image_left: tempImageVaultAssetSchema,
+  // JSON - ImageVault Image
+  image_right: tempImageVaultAssetSchema,
+  system: systemSchema,
+  title: z.string().optional(),
+})
+
+export const imageContainerRefsSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.ImageContainer),
+  system: systemSchema,
+})
diff --git a/server/routers/contentstack/schemas/blocks/shortcuts.ts b/server/routers/contentstack/schemas/blocks/shortcuts.ts
new file mode 100644
index 000000000..1059a9485
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/shortcuts.ts
@@ -0,0 +1,83 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+
+export const shortcutsSchema = z.object({
+  typename: z
+    .literal(BlocksEnums.block.Shortcuts)
+    .optional()
+    .default(BlocksEnums.block.Shortcuts),
+  shortcuts: z.object({
+    subtitle: z.string().nullable(),
+    title: z.string().nullable(),
+    shortcuts: z
+      .array(
+        z.object({
+          open_in_new_tab: z.boolean(),
+          text: z.string().optional().default(""),
+          linkConnection: z.object({
+            edges: z.array(
+              z.object({
+                node: z
+                  .discriminatedUnion("__typename", [
+                    pageLinks.accountPageSchema,
+                    pageLinks.contentPageSchema,
+                    pageLinks.loyaltyPageSchema,
+                  ])
+                  .transform((data) => {
+                    const link = pageLinks.transform(data)
+                    if (link) {
+                      return link
+                    }
+                    return data
+                  }),
+              })
+            ),
+          }),
+        })
+      )
+      .transform((data) => {
+        return data
+          .filter((node) => node.linkConnection.edges.length)
+          .map((node) => {
+            const link = node.linkConnection.edges[0].node
+            return {
+              openInNewTab: node.open_in_new_tab,
+              text: node.text,
+              title: link.title,
+              url: link.url,
+            }
+          })
+      }),
+  }),
+})
+
+export const shortcutsRefsSchema = z.object({
+  shortcuts: z.object({
+    shortcuts: z
+      .array(
+        z.object({
+          linkConnection: z.object({
+            edges: z.array(
+              z.object({
+                node: z.discriminatedUnion("__typename", [
+                  pageLinks.accountPageRefSchema,
+                  pageLinks.contentPageRefSchema,
+                  pageLinks.loyaltyPageRefSchema,
+                ]),
+              })
+            ),
+          }),
+        })
+      )
+      .transform((data) =>
+        data
+          .map((shortcut) => {
+            return shortcut.linkConnection.edges.map(({ node }) => node.system)
+          })
+          .flat()
+      ),
+  }),
+})
diff --git a/server/routers/contentstack/schemas/blocks/textCols.ts b/server/routers/contentstack/schemas/blocks/textCols.ts
new file mode 100644
index 000000000..01c37953b
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/textCols.ts
@@ -0,0 +1,84 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+import { imageRefsSchema, imageSchema } from "./image"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+import { ContentEnum } from "@/types/enums/content"
+
+export const textColsSchema = z
+  .object({
+    typename: z
+      .literal(BlocksEnums.block.TextCols)
+      .optional()
+      .default(BlocksEnums.block.TextCols),
+    text_cols: z.object({
+      columns: z.array(
+        z.object({
+          title: z.string().optional().default(""),
+          text: z.object({
+            json: z.any(), // JSON
+            embedded_itemsConnection: z.object({
+              edges: z.array(
+                z.object({
+                  node: z.discriminatedUnion("__typename", [
+                    imageSchema,
+                    pageLinks.contentPageSchema,
+                    pageLinks.hotelPageSchema,
+                    pageLinks.loyaltyPageSchema,
+                  ])
+                    .transform((data) => {
+                      const link = pageLinks.transform(data)
+                      if (link) {
+                        return link
+                      }
+                      return data
+                    }),
+                })
+              ),
+            }),
+          }),
+        })
+      ),
+    }),
+  })
+
+const actualRefs = z.discriminatedUnion("__typename", [
+  pageLinks.contentPageRefSchema,
+  pageLinks.hotelPageRefSchema,
+  pageLinks.loyaltyPageRefSchema,
+])
+
+type Refs = {
+  node: z.TypeOf<typeof actualRefs>
+}
+
+export const textColsRefsSchema = z
+  .object({
+    text_cols: z.object({
+      columns: z.array(
+        z.object({
+          text: z.object({
+            embedded_itemsConnection: z.object({
+              edges: z.array(
+                z.object({
+                  node: z.discriminatedUnion("__typename", [
+                    imageRefsSchema,
+                    ...actualRefs.options,
+                  ])
+                })
+              ),
+            }),
+          }),
+        })
+      ),
+    }).transform(data => {
+      return data.columns.map(column => {
+        const filtered = column.text.embedded_itemsConnection.edges
+          .filter(
+            block => block.node.__typename !== ContentEnum.blocks.SysAsset
+          ) as unknown as Refs[] // TS issue with filtered out types
+        return filtered.map(({ node }) => node.system)
+      }).flat()
+    }),
+  })
\ No newline at end of file
diff --git a/server/routers/contentstack/schemas/blocks/textContent.ts b/server/routers/contentstack/schemas/blocks/textContent.ts
new file mode 100644
index 000000000..39eccdb07
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/textContent.ts
@@ -0,0 +1,25 @@
+import { z } from "zod"
+
+import { imageSchema } from "./image"
+
+import { BlocksEnums } from "@/types/enums/blocks"
+
+export const textContentSchema = z.object({
+  typename: z
+    .literal(BlocksEnums.block.TextContent)
+    .optional()
+    .default(BlocksEnums.block.TextContent),
+  text_content: z.object({
+    content: z.object({
+      json: z.any(),
+      embedded_itemsConnection: z.object({
+        edges: z.array(
+          z.object({
+            node: z.discriminatedUnion("__typename", [imageSchema]),
+          })
+        ),
+        totalCount: z.number(),
+      }),
+    }),
+  }),
+})
diff --git a/server/routers/contentstack/schemas/blocks/utils/buttonLinkSchema.ts b/server/routers/contentstack/schemas/blocks/utils/buttonLinkSchema.ts
new file mode 100644
index 000000000..9735c276f
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/utils/buttonLinkSchema.ts
@@ -0,0 +1,54 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+export const buttonSchema = z
+  .object({
+    cta_text: z.string().optional().default(""),
+    open_in_new_tab: z.boolean().default(false),
+    external_link: z
+      .object({
+        href: z.string().optional().default(""),
+        title: z.string().optional(),
+      })
+      .optional(),
+    linkConnection: z.object({
+      edges: z.array(
+        z.object({
+          node: z
+            .discriminatedUnion("__typename", [
+              pageLinks.accountPageSchema,
+              pageLinks.contentPageSchema,
+              pageLinks.loyaltyPageSchema,
+            ])
+            .transform((data) => {
+              const link = pageLinks.transform(data)
+              if (link) {
+                return link
+              }
+              return data
+            }),
+        })
+      ),
+    }),
+  })
+  .transform((data) => {
+    if (data.linkConnection?.edges?.length) {
+      const link = data.linkConnection.edges[0].node
+      return {
+        href: link.url,
+        isExternal: false,
+        openInNewTab: data.open_in_new_tab,
+        title: data.cta_text ? data.cta_text : link.title,
+      }
+    } else {
+      return {
+        href: data.external_link?.href ?? "",
+        isExternal: true,
+        openInNewTab: data.open_in_new_tab,
+        title: data.external_link?.title
+          ? data.external_link?.title
+          : data.cta_text,
+      }
+    }
+  })
diff --git a/server/routers/contentstack/schemas/blocks/utils/linkConnection.ts b/server/routers/contentstack/schemas/blocks/utils/linkConnection.ts
new file mode 100644
index 000000000..1febeebd5
--- /dev/null
+++ b/server/routers/contentstack/schemas/blocks/utils/linkConnection.ts
@@ -0,0 +1,25 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+export const linkConnectionRefsSchema = z
+  .object({
+    linkConnection: z.object({
+      edges: z.array(
+        z.object({
+          node: z.discriminatedUnion("__typename", [
+            pageLinks.accountPageRefSchema,
+            pageLinks.contentPageRefSchema,
+            pageLinks.loyaltyPageRefSchema,
+          ]),
+        })
+      ),
+    }),
+  })
+  .transform((data) => {
+    if (!data.linkConnection.edges.length) {
+      return null
+    }
+
+    return data.linkConnection.edges[0].node.system
+  })
diff --git a/server/routers/contentstack/schemas/imageVault.ts b/server/routers/contentstack/schemas/imageVault.ts
index 633beb6fa..6d8729c96 100644
--- a/server/routers/contentstack/schemas/imageVault.ts
+++ b/server/routers/contentstack/schemas/imageVault.ts
@@ -1,5 +1,7 @@
 import { z } from "zod"
 
+import { makeImageVaultImage } from "@/utils/imageVault"
+
 const metaData = z.object({
   DefinitionType: z.number().nullable().optional(),
   Description: z.string().nullable(),
@@ -120,3 +122,21 @@ export const imageVaultAssetTransformedSchema = imageVaultAssetSchema.transform(
     }
   }
 )
+
+export const tempImageVaultAssetSchema = imageVaultAssetSchema
+  .optional()
+  .or(
+    // Temp since there is a bug in Contentstack
+    // sending empty objects when there has been an
+    // image selected previously but has since been
+    // deleted
+    z.object({})
+  )
+  .transform((data) => {
+    if (data) {
+      if ("Name" in data) {
+        return makeImageVaultImage(data)
+      }
+    }
+    return undefined
+  })
diff --git a/server/routers/contentstack/schemas/metadata.ts b/server/routers/contentstack/schemas/metadata.ts
new file mode 100644
index 000000000..9399f3a61
--- /dev/null
+++ b/server/routers/contentstack/schemas/metadata.ts
@@ -0,0 +1,46 @@
+import { z } from "zod"
+
+import { systemSchema } from "./system"
+
+export const getMetaDataSchema = z.object({
+  breadcrumbsTitle: z.string().optional(),
+  title: z.string().optional(),
+  description: z.string().optional(),
+  imageConnection: z
+    .object({
+      edges: z.array(
+        z.object({
+          node: z.object({
+            url: z.string(),
+          }),
+        })
+      ),
+    })
+    .optional(),
+})
+
+export const page = z.object({
+  web: z.object({
+    seo_metadata: z.object({
+      title: z.string().optional(),
+      description: z.string().optional(),
+      imageConnection: z
+        .object({
+          edges: z.array(
+            z.object({
+              node: z.object({
+                url: z.string(),
+              }),
+            })
+          ),
+        })
+        .optional(),
+    }),
+    breadcrumbs: z.object({
+      title: z.string(),
+    }),
+  }),
+  system: systemSchema,
+})
+
+export type Page = z.infer<typeof page>
diff --git a/server/routers/contentstack/schemas/pageLinks.ts b/server/routers/contentstack/schemas/pageLinks.ts
new file mode 100644
index 000000000..d7e7d493b
--- /dev/null
+++ b/server/routers/contentstack/schemas/pageLinks.ts
@@ -0,0 +1,120 @@
+import { z } from "zod"
+
+import { removeMultipleSlashes } from "@/utils/url"
+
+import { systemSchema } from "./system"
+
+import { ContentEnum } from "@/types/enums/content"
+
+export const pageLinkSchema = z.object({
+  system: systemSchema,
+  title: z.string().optional().default(""),
+  url: z.string().optional().default(""),
+})
+
+export const accountPageSchema = z
+  .object({
+    __typename: z.literal(ContentEnum.blocks.AccountPage),
+  })
+  .merge(pageLinkSchema)
+
+export const accountPageRefSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.AccountPage),
+  system: systemSchema,
+})
+
+export const extendedPageLinkSchema = pageLinkSchema.merge(
+  z.object({
+    web: z.object({
+      original_url: z.string().optional().default(""),
+    }),
+  })
+)
+
+export const contentPageSchema = z
+  .object({
+    __typename: z.literal(ContentEnum.blocks.ContentPage),
+  })
+  .merge(extendedPageLinkSchema)
+
+export const contentPageRefSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.ContentPage),
+  system: systemSchema,
+})
+
+export const hotelPageSchema = z
+  .object({
+    __typename: z.literal(ContentEnum.blocks.HotelPage),
+  })
+  .merge(extendedPageLinkSchema)
+
+export const hotelPageRefSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.HotelPage),
+  system: systemSchema,
+})
+
+export const loyaltyPageSchema = z
+  .object({
+    __typename: z.literal(ContentEnum.blocks.LoyaltyPage),
+  })
+  .merge(extendedPageLinkSchema)
+
+export const loyaltyPageRefSchema = z.object({
+  __typename: z.literal(ContentEnum.blocks.LoyaltyPage),
+  system: systemSchema,
+})
+
+type Data =
+  | z.output<typeof accountPageSchema>
+  | z.output<typeof contentPageSchema>
+  | z.output<typeof hotelPageSchema>
+  | z.output<typeof loyaltyPageSchema>
+  | Object
+
+export function transform(data: Data) {
+  if (data && "__typename" in data) {
+    switch (data.__typename) {
+      case ContentEnum.blocks.AccountPage:
+      case ContentEnum.blocks.HotelPage:
+        return {
+          __typename: data.__typename,
+          system: data.system,
+          title: data.title,
+          url: removeMultipleSlashes(`/${data.system.locale}/${data.url}`),
+        }
+      case ContentEnum.blocks.ContentPage:
+      case ContentEnum.blocks.LoyaltyPage:
+        // TODO: Once all links use this transform
+        // `web` can be removed and not to be worried
+        // about throughout the application
+        return {
+          __typename: data.__typename,
+          system: data.system,
+          title: data.title,
+          url: data.web.original_url
+            ? removeMultipleSlashes(data.web.original_url)
+            : removeMultipleSlashes(`/${data.system.locale}/${data.url}`),
+          web: data.web,
+        }
+    }
+  }
+}
+
+type RefData =
+  | z.output<typeof accountPageRefSchema>
+  | z.output<typeof contentPageRefSchema>
+  | z.output<typeof hotelPageRefSchema>
+  | z.output<typeof loyaltyPageRefSchema>
+  | Object
+
+export function transformRef(data: RefData) {
+  if (data && "__typename" in data) {
+    switch (data.__typename) {
+      case ContentEnum.blocks.AccountPage:
+      case ContentEnum.blocks.ContentPage:
+      case ContentEnum.blocks.HotelPage:
+      case ContentEnum.blocks.LoyaltyPage:
+        return data.system
+    }
+  }
+}
diff --git a/server/routers/contentstack/schemas/sidebar/content.ts b/server/routers/contentstack/schemas/sidebar/content.ts
new file mode 100644
index 000000000..d1d03c6bd
--- /dev/null
+++ b/server/routers/contentstack/schemas/sidebar/content.ts
@@ -0,0 +1,87 @@
+import { z } from "zod"
+
+import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
+
+import { imageRefsSchema, imageSchema } from "../blocks/image"
+import {
+  imageContainerRefsSchema,
+  imageContainerSchema,
+} from "../blocks/imageContainer"
+
+import { ContentEnum } from "@/types/enums/content"
+import { SidebarEnums } from "@/types/enums/sidebar"
+import { System } from "@/types/requests/system"
+
+export const contentSchema = z.object({
+  typename: z
+    .literal(SidebarEnums.blocks.Content)
+    .optional()
+    .default(SidebarEnums.blocks.Content),
+  content: z
+    .object({
+      content: z.object({
+        json: z.any(), // JSON
+        embedded_itemsConnection: z.object({
+          edges: z.array(
+            z.object({
+              node: z
+                .discriminatedUnion("__typename", [
+                  imageContainerSchema,
+                  imageSchema,
+                  pageLinks.contentPageSchema,
+                  pageLinks.loyaltyPageSchema,
+                ])
+                .transform((data) => {
+                  const link = pageLinks.transform(data)
+                  if (link) {
+                    return link
+                  }
+                  return data
+                }),
+            })
+          ),
+        }),
+      }),
+    })
+    .transform((data) => {
+      return {
+        embedded_itemsConnection: data.content.embedded_itemsConnection,
+        json: data.content.json,
+      }
+    }),
+})
+
+const actualRefs = z.discriminatedUnion("__typename", [
+  imageContainerRefsSchema,
+  pageLinks.contentPageRefSchema,
+  pageLinks.loyaltyPageRefSchema,
+])
+
+type Ref = typeof actualRefs._type
+type Refs = {
+  node: Ref
+}
+
+export const contentRefsSchema = z.object({
+  content: z
+    .object({
+      content: z.object({
+        embedded_itemsConnection: z.object({
+          edges: z.array(
+            z.object({
+              node: z.discriminatedUnion("__typename", [
+                imageRefsSchema,
+                ...actualRefs.options,
+              ]),
+            })
+          ),
+        }),
+      }),
+    })
+    .transform((data) => {
+      const filtered = data.content.embedded_itemsConnection.edges.filter(
+        (block) => block.node.__typename !== ContentEnum.blocks.SysAsset
+      ) as unknown as Refs[] // TS issues with filtered arrays
+      return filtered.map((block) => block.node.system)
+    }),
+})
diff --git a/server/routers/contentstack/schemas/sidebar/dynamicContent.ts b/server/routers/contentstack/schemas/sidebar/dynamicContent.ts
new file mode 100644
index 000000000..c52a395a3
--- /dev/null
+++ b/server/routers/contentstack/schemas/sidebar/dynamicContent.ts
@@ -0,0 +1,14 @@
+import { z } from "zod"
+
+import { DynamicContentEnum } from "@/types/enums/dynamicContent"
+import { SidebarEnums } from "@/types/enums/sidebar"
+
+export const dynamicContentSchema = z.object({
+  typename: z
+    .literal(SidebarEnums.blocks.DynamicContent)
+    .optional()
+    .default(SidebarEnums.blocks.DynamicContent),
+  dynamic_content: z.object({
+    component: z.enum(DynamicContentEnum.Sidebar.enums),
+  }),
+})
diff --git a/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts b/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts
new file mode 100644
index 000000000..ebee0023f
--- /dev/null
+++ b/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts
@@ -0,0 +1,58 @@
+import { z } from "zod"
+
+import { buttonSchema } from "../blocks/utils/buttonLinkSchema"
+import { linkConnectionRefsSchema } from "../blocks/utils/linkConnection"
+
+import { JoinLoyaltyContactEnums } from "@/types/enums/joinLoyaltyContact"
+import { SidebarEnums } from "@/types/enums/sidebar"
+
+export const contactSchema = z.object({
+  contact: z.array(
+    z
+      .object({
+        __typename: z
+          .literal(JoinLoyaltyContactEnums.ContentStack.contact.ContentPage)
+          .or(
+            z.literal(JoinLoyaltyContactEnums.ContentStack.contact.LoyaltyPage)
+          ),
+        typename: z
+          .literal(JoinLoyaltyContactEnums.contact.Contact)
+          .optional()
+          .default(JoinLoyaltyContactEnums.contact.Contact),
+        contact: z.object({
+          contact_field: z.string(),
+          display_text: z.string().optional().nullable().default(null),
+          footnote: z.string().optional().nullable().default(null),
+        }),
+      })
+      .transform((data) => {
+        return {
+          __typename: data.__typename,
+          typename: data.typename,
+          contact_field: data.contact.contact_field,
+          display_text: data.contact.display_text,
+          footnote: data.contact.footnote,
+        }
+      })
+  ),
+})
+
+export const joinLoyaltyContactSchema = z.object({
+  typename: z
+    .literal(SidebarEnums.blocks.JoinLoyaltyContact)
+    .optional()
+    .default(SidebarEnums.blocks.JoinLoyaltyContact),
+  join_loyalty_contact: z
+    .object({
+      button: buttonSchema,
+      preamble: z.string().optional(),
+      title: z.string().optional(),
+    })
+    .merge(contactSchema),
+})
+
+export const joinLoyaltyContactRefsSchema = z.object({
+  join_loyalty_contact: z.object({
+    button: linkConnectionRefsSchema,
+  }),
+})
diff --git a/server/routers/contentstack/schemas/system.ts b/server/routers/contentstack/schemas/system.ts
new file mode 100644
index 000000000..bf6c19129
--- /dev/null
+++ b/server/routers/contentstack/schemas/system.ts
@@ -0,0 +1,9 @@
+import { z } from "zod"
+
+import { Lang } from "@/constants/languages"
+
+export const systemSchema = z.object({
+  content_type_uid: z.string(),
+  locale: z.nativeEnum(Lang),
+  uid: z.string(),
+})
diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts
index f894e9aab..8ad890049 100644
--- a/server/routers/hotels/output.ts
+++ b/server/routers/hotels/output.ts
@@ -584,3 +584,192 @@ const rate = z.object({
 
 export const getRatesSchema = z.array(rate)
 export type Rate = z.infer<typeof rate>
+
+const hotelFilter = z.object({
+  roomFacilities: z.array(z.string()),
+  hotelFacilities: z.array(z.string()),
+  hotelSurroundings: z.array(z.string()),
+})
+
+export const getFiltersSchema = hotelFilter
+export type HotelFilter = z.infer<typeof hotelFilter>
+
+export const apiCitiesByCountrySchema = z.object({
+  data: z.array(
+    z
+      .object({
+        attributes: z.object({
+          cityIdentifier: z.string().optional(),
+          name: z.string(),
+          keywords: z.array(z.string()).optional(),
+          timeZoneId: z.string().optional(),
+          ianaTimeZoneId: z.string().optional(),
+          isPublished: z.boolean().optional().default(false),
+        }),
+        id: z.string(),
+        type: z.literal("cities"),
+      })
+      .transform((data) => {
+        return {
+          ...data.attributes,
+          id: data.id,
+          type: data.type,
+        }
+      })
+  ),
+})
+
+export interface CitiesByCountry
+  extends z.output<typeof apiCitiesByCountrySchema> {}
+export type CitiesGroupedByCountry = Record<string, CitiesByCountry["data"]>
+
+export const apiCountriesSchema = z.object({
+  data: z
+    .array(
+      z.object({
+        attributes: z.object({
+          currency: z.string().optional(),
+          name: z.string(),
+        }),
+        hotelInformationSystemId: z.number().optional(),
+        id: z.string().optional(),
+        language: z.string().optional(),
+        type: z.literal("countries"),
+      })
+    )
+    .transform((data) => {
+      return data.map((country) => {
+        return {
+          ...country.attributes,
+          hotelInformationSystemId: country.hotelInformationSystemId,
+          id: country.id,
+          language: country.language,
+          type: country.type,
+        }
+      })
+    }),
+})
+
+export interface Countries extends z.output<typeof apiCountriesSchema> {}
+
+export const apiLocationCitySchema = z.object({
+  attributes: z.object({
+    cityIdentifier: z.string().optional(),
+    keyWords: z.array(z.string()).optional(),
+    name: z.string().optional().default(""),
+  }),
+  country: z.string().optional().default(""),
+  id: z.string().optional().default(""),
+  type: z.literal("cities"),
+})
+
+export const apiCitySchema = z
+  .object({
+    data: z.array(
+      z.object({
+        attributes: z.object({
+          cityIdentifier: z.string().optional(),
+          name: z.string(),
+          keywords: z.array(z.string()),
+          timeZoneId: z.string().optional(),
+          ianaTimeZoneId: z.string().optional(),
+          isPublished: z.boolean().optional().default(false),
+        }),
+        id: z.string().optional(),
+        type: z.literal("cities"),
+      })
+    ),
+  })
+  .transform(({ data }) => {
+    if (data.length) {
+      const city = data[0]
+      return {
+        ...city.attributes,
+        id: city.id,
+        type: city.type,
+      }
+    }
+    return null
+  })
+
+export const apiLocationHotelSchema = z.object({
+  attributes: z.object({
+    distanceToCentre: z.number().optional(),
+    images: z
+      .object({
+        large: z.string().optional(),
+        medium: z.string().optional(),
+        small: z.string().optional(),
+        tiny: z.string().optional(),
+      })
+      .optional(),
+    keyWords: z.array(z.string()).optional(),
+    name: z.string().optional().default(""),
+    operaId: z.string().optional(),
+  }),
+  id: z.string().optional().default(""),
+  relationships: z
+    .object({
+      city: z
+        .object({
+          links: z
+            .object({
+              related: z.string().optional(),
+            })
+            .optional(),
+        })
+        .optional(),
+    })
+    .optional(),
+  type: z.literal("hotels"),
+})
+
+export const apiLocationsSchema = z.object({
+  data: z
+    .array(
+      z
+        .discriminatedUnion("type", [
+          apiLocationCitySchema,
+          apiLocationHotelSchema,
+        ])
+        .transform((location) => {
+          if (location.type === "cities") {
+            return {
+              ...location.attributes,
+              country: location?.country ?? "",
+              id: location.id,
+              type: location.type,
+            }
+          }
+          return {
+            ...location.attributes,
+            id: location.id,
+            relationships: {
+              city: {
+                cityIdentifier: "",
+                ianaTimeZoneId: "",
+                id: "",
+                isPublished: false,
+                keywords: [],
+                name: "",
+                timeZoneId: "",
+                type: "cities",
+                url: location?.relationships?.city?.links?.related ?? "",
+              },
+            },
+            type: location.type,
+          }
+        })
+    )
+    .transform((data) =>
+      data
+        .filter((node) => !!node)
+        .sort((a, b) => {
+          if (a.type === b.type) {
+            return a.name.localeCompare(b.name)
+          } else {
+            return a.type === "cities" ? -1 : 1
+          }
+        })
+    ),
+})
diff --git a/server/routers/hotels/query.ts b/server/routers/hotels/query.ts
index ada0e96ca..b1562419a 100644
--- a/server/routers/hotels/query.ts
+++ b/server/routers/hotels/query.ts
@@ -1,7 +1,8 @@
 import { metrics } from "@opentelemetry/api"
+import { unstable_cache } from "next/cache"
 
 import * as api from "@/lib/api"
-import { GetHotelPage } from "@/lib/graphql/Query/HotelPage.graphql"
+import { GetHotelPage } from "@/lib/graphql/Query/HotelPage/HotelPage.graphql"
 import { request } from "@/lib/graphql/request"
 import {
   badRequestError,
@@ -17,14 +18,7 @@ import {
 } from "@/server/trpc"
 import { toApiLang } from "@/server/utils"
 
-import { makeImageVaultImage } from "@/utils/imageVault"
-import { removeMultipleSlashes } from "@/utils/url"
-
-import {
-  type ContentBlockItem,
-  type HotelPageDataRaw,
-  validateHotelPageSchema,
-} from "../contentstack/hotelPage/output"
+import { hotelPageSchema } from "../contentstack/hotelPage/output"
 import {
   getAvailabilityInputSchema,
   getHotelInputSchema,
@@ -38,9 +32,17 @@ import {
   roomSchema,
 } from "./output"
 import tempRatesData from "./tempRatesData.json"
+import {
+  getCitiesByCountry,
+  getCountries,
+  getLocations,
+  locationsAffix,
+  TWENTYFOUR_HOURS,
+} from "./utils"
 
-import { HotelBlocksTypenameEnum } from "@/types/components/hotelPage/enums"
 import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
+import type { RequestOptionsWithOutBody } from "@/types/fetch"
+import type { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage"
 
 const meter = metrics.getMeter("trpc.hotels")
 const getHotelCounter = meter.createCounter("trpc.hotel.get")
@@ -59,19 +61,16 @@ async function getContentstackData(
   locale: string,
   uid: string | null | undefined
 ) {
-  const rawContentStackData = await request<HotelPageDataRaw>(GetHotelPage, {
+  const response = await request<GetHotelPageData>(GetHotelPage, {
     locale,
     uid,
   })
 
-  if (!rawContentStackData.data) {
-    throw notFound(rawContentStackData)
+  if (!response.data) {
+    throw notFound(response)
   }
 
-  const hotelPageData = validateHotelPageSchema.safeParse(
-    rawContentStackData.data
-  )
-
+  const hotelPageData = hotelPageSchema.safeParse(response.data)
   if (!hotelPageData.success) {
     console.error(
       `Failed to validate Hotel Page - (uid: ${uid}, lang: ${locale})`
@@ -116,7 +115,6 @@ export const hotelQueryRouter = router({
       const apiResponse = await api.get(
         `${api.endpoints.v1.hotels}/${hotelId}`,
         {
-          cache: "no-store",
           headers: {
             Authorization: `Bearer ${ctx.serviceToken}`,
           },
@@ -180,60 +178,38 @@ export const hotelQueryRouter = router({
 
       const roomCategories = included
         ? included
-            .filter((item) => item.type === "roomcategories")
-            .map((roomCategory) => {
-              const validatedRoom = roomSchema.safeParse(roomCategory)
-              if (!validatedRoom.success) {
-                getHotelFailCounter.add(1, {
-                  hotelId,
-                  lang,
-                  include,
-                  error_type: "validation_error",
-                  error: JSON.stringify(
-                    validatedRoom.error.issues.map(({ code, message }) => ({
-                      code,
-                      message,
-                    }))
-                  ),
+          .filter((item) => item.type === "roomcategories")
+          .map((roomCategory) => {
+            const validatedRoom = roomSchema.safeParse(roomCategory)
+            if (!validatedRoom.success) {
+              getHotelFailCounter.add(1, {
+                hotelId,
+                lang,
+                include,
+                error_type: "validation_error",
+                error: JSON.stringify(
+                  validatedRoom.error.issues.map(({ code, message }) => ({
+                    code,
+                    message,
+                  }))
+                ),
+              })
+              console.error(
+                "api.hotels.hotel validation error",
+                JSON.stringify({
+                  query: { hotelId, params },
+                  error: validatedRoom.error,
                 })
-                console.error(
-                  "api.hotels.hotel validation error",
-                  JSON.stringify({
-                    query: { hotelId, params },
-                    error: validatedRoom.error,
-                  })
-                )
-                throw badRequestError()
-              }
+              )
+              throw badRequestError()
+            }
 
-              return validatedRoom.data
-            })
+            return validatedRoom.data
+          })
         : []
 
       const activities = contentstackData?.content
-        ? contentstackData.content.map((block: ContentBlockItem) => {
-            switch (block.__typename) {
-              case HotelBlocksTypenameEnum.HotelPageContentUpcomingActivitiesCard:
-                return {
-                  ...block.upcoming_activities_card,
-                  background_image: makeImageVaultImage(
-                    block.upcoming_activities_card?.background_image
-                  ),
-                  contentPage:
-                    block.upcoming_activities_card?.hotel_page_activities_content_pageConnection?.edges.map(
-                      ({ node: contentPage }: { node: any }) => {
-                        return {
-                          href:
-                            contentPage.web?.original_url ||
-                            removeMultipleSlashes(
-                              `/${contentPage.system.locale}/${contentPage.url}`
-                            ),
-                        }
-                      }
-                    ),
-                }
-            }
-          })[0]
+        ? contentstackData?.content[0]
         : null
 
       getHotelSuccessCounter.add(1, { hotelId, lang, include })
@@ -253,7 +229,7 @@ export const hotelQueryRouter = router({
         hotelImages: images,
         pointsOfInterest: hotelAttributes.pointsOfInterest,
         roomCategories,
-        activitiesCard: activities,
+        activitiesCard: activities?.upcoming_activities_card,
       }
     }),
   availability: router({
@@ -516,4 +492,66 @@ export const hotelQueryRouter = router({
         return validateHotelData.data
       }),
   }),
+  locations: router({
+    get: serviceProcedure.query(async function ({ ctx }) {
+      const searchParams = new URLSearchParams()
+      searchParams.set("language", toApiLang(ctx.lang))
+
+      const options: RequestOptionsWithOutBody = {
+        // needs to clear default option as only
+        // cache or next.revalidate is permitted
+        cache: undefined,
+        headers: {
+          Authorization: `Bearer ${ctx.serviceToken}`,
+        },
+        next: {
+          revalidate: TWENTYFOUR_HOURS,
+        },
+      }
+
+      const getCachedCountries = unstable_cache(
+        getCountries,
+        [`${ctx.lang}:${locationsAffix}:countries`],
+        { revalidate: TWENTYFOUR_HOURS }
+      )
+
+      const countries = await getCachedCountries(options, searchParams)
+
+      const getCachedCitiesByCountry = unstable_cache(
+        getCitiesByCountry,
+        [`${ctx.lang}:${locationsAffix}:cities-by-country`],
+        { revalidate: TWENTYFOUR_HOURS }
+      )
+
+      let citiesByCountry = null
+      if (countries) {
+        citiesByCountry = await getCachedCitiesByCountry(
+          countries,
+          options,
+          searchParams
+        )
+      }
+
+      const getCachedLocations = unstable_cache(
+        getLocations,
+        [`${ctx.lang}:${locationsAffix}`],
+        { revalidate: TWENTYFOUR_HOURS }
+      )
+
+      const locations = await getCachedLocations(
+        ctx.lang,
+        options,
+        searchParams,
+        citiesByCountry
+      )
+
+      if (Array.isArray(locations)) {
+        return {
+          data: locations,
+        }
+      }
+
+      return locations
+    }),
+  }),
 })
diff --git a/server/routers/hotels/utils.ts b/server/routers/hotels/utils.ts
index 3dddae69a..6fa8e168f 100644
--- a/server/routers/hotels/utils.ts
+++ b/server/routers/hotels/utils.ts
@@ -1,5 +1,23 @@
 import { IconName } from "@/types/components/icon"
 
+import deepmerge from "deepmerge"
+import { unstable_cache } from "next/cache"
+
+import * as api from "@/lib/api"
+
+import {
+  apiCitiesByCountrySchema,
+  apiCitySchema,
+  apiCountriesSchema,
+  apiLocationsSchema,
+  type CitiesGroupedByCountry,
+  type Countries,
+} from "./output"
+
+import type { RequestOptionsWithOutBody } from "@/types/fetch"
+import type { Lang } from "@/constants/languages"
+import type { Endpoint } from "@/lib/api/endpoints"
+
 export function getIconByPoiCategory(category: string) {
   switch (category) {
     case "Transportations":
@@ -16,3 +34,169 @@ export function getIconByPoiCategory(category: string) {
       return null
   }
 }
+
+export const locationsAffix = "locations"
+
+export const TWENTYFOUR_HOURS = 60 * 60 * 24
+export async function getCity(
+  cityUrl: string,
+  options: RequestOptionsWithOutBody
+) {
+  const url = new URL(cityUrl)
+  const cityResponse = await api.get(
+    url.pathname as Endpoint,
+    options,
+    url.searchParams
+  )
+
+  if (!cityResponse.ok) {
+    return null
+  }
+
+  const cityJson = await cityResponse.json()
+  const city = apiCitySchema.safeParse(cityJson)
+  if (!city.success) {
+    console.info(`Validation of city failed`)
+    console.info(`cityUrl: ${cityUrl}`)
+    console.error(city.error)
+    return null
+  }
+
+  return city.data
+}
+
+export async function getCountries(
+  options: RequestOptionsWithOutBody,
+  params: URLSearchParams
+) {
+  const countryResponse = await api.get(
+    api.endpoints.v1.countries,
+    options,
+    params
+  )
+
+  if (!countryResponse.ok) {
+    return null
+  }
+
+  const countriesJson = await countryResponse.json()
+  const countries = apiCountriesSchema.safeParse(countriesJson)
+  if (!countries.success) {
+    console.info(`Validation for countries failed`)
+    console.error(countries.error)
+    return null
+  }
+
+  return countries.data
+}
+
+export async function getCitiesByCountry(
+  countries: Countries,
+  options: RequestOptionsWithOutBody,
+  params: URLSearchParams
+) {
+  const citiesGroupedByCountry: CitiesGroupedByCountry = {}
+
+  await Promise.all(
+    countries.data.map(async (country) => {
+      const countryResponse = await api.get(
+        `${api.endpoints.v1.citiesCountry}/${country.name}`,
+        options,
+        params
+      )
+
+      if (!countryResponse.ok) {
+        return null
+      }
+
+      const countryJson = await countryResponse.json()
+      const citiesByCountry = apiCitiesByCountrySchema.safeParse(countryJson)
+      if (!citiesByCountry.success) {
+        console.info(`Failed to validate Cities by Country payload`)
+        console.error(citiesByCountry.error)
+        return null
+      }
+
+      citiesGroupedByCountry[country.name] = citiesByCountry.data.data
+      return true
+    })
+  )
+
+  return citiesGroupedByCountry
+}
+
+export async function getLocations(
+  lang: Lang,
+  options: RequestOptionsWithOutBody,
+  params: URLSearchParams,
+  citiesByCountry: CitiesGroupedByCountry | null
+) {
+  const apiResponse = await api.get(api.endpoints.v1.locations, options, params)
+
+  if (!apiResponse.ok) {
+    if (apiResponse.status === 401) {
+      return { error: true, cause: "unauthorized" } as const
+    } else if (apiResponse.status === 403) {
+      return { error: true, cause: "forbidden" } as const
+    }
+    return null
+  }
+
+  const apiJson = await apiResponse.json()
+  const verifiedLocations = apiLocationsSchema.safeParse(apiJson)
+  if (!verifiedLocations.success) {
+    console.info(`Locations Verification Failed`)
+    console.error(verifiedLocations.error)
+    return null
+  }
+
+  return await Promise.all(
+    verifiedLocations.data.data.map(async (location) => {
+      if (location.type === "cities") {
+        if (citiesByCountry) {
+          const country = Object.keys(citiesByCountry).find((country) => {
+            if (
+              citiesByCountry[country].find((loc) => loc.name === location.name)
+            ) {
+              return true
+            }
+            return false
+          })
+          if (country) {
+            return {
+              ...location,
+              country,
+            }
+          } else {
+            console.info(
+              `Location cannot be found in any of the countries cities`
+            )
+            console.info(location)
+          }
+        }
+      } else if (location.type === "hotels") {
+        if (location.relationships.city?.url) {
+          const getCachedCity = unstable_cache(
+            getCity,
+            [`${lang}:${location.relationships.city}`],
+            { revalidate: TWENTYFOUR_HOURS }
+          )
+
+          const city = await getCachedCity(
+            location.relationships.city.url,
+            options
+          )
+          if (city) {
+            return deepmerge(location, {
+              relationships: {
+                city,
+              },
+            })
+          }
+        }
+      }
+
+      return location
+    })
+  )
+}
diff --git a/server/routers/user/mutation.ts b/server/routers/user/mutation.ts
index 21b266464..38bb458e3 100644
--- a/server/routers/user/mutation.ts
+++ b/server/routers/user/mutation.ts
@@ -18,7 +18,7 @@ export const userMutationRouter = router({
         "api.user.creditCard.add start",
         JSON.stringify({ query: { language: input.language } })
       )
-      const apiResponse = await api.post(api.endpoints.v1.intiateSaveCard, {
+      const apiResponse = await api.post(api.endpoints.v1.initiateSaveCard, {
         headers: {
           Authorization: `Bearer ${ctx.session.token.access_token}`,
         },
diff --git a/server/routers/user/output.ts b/server/routers/user/output.ts
index 1ffa16743..8ee482057 100644
--- a/server/routers/user/output.ts
+++ b/server/routers/user/output.ts
@@ -1,40 +1,54 @@
 import { z } from "zod"
 
 import { countriesMap } from "@/components/TempDesignSystem/Form/Country/countries"
+import { getMembership } from "@/utils/user"
 
-export const getUserSchema = z.object({
-  address: z.object({
-    city: z.string().optional(),
-    country: z.string().optional(),
-    countryCode: z.nativeEnum(countriesMap).optional(),
-    streetAddress: z.string().optional(),
-    zipCode: z.string().optional(),
-  }),
-  dateOfBirth: z.string().optional().default("1900-01-01"),
-  email: z.string().email(),
-  firstName: z.string(),
-  language: z.string().optional(),
-  lastName: z.string(),
-  memberships: z.array(
-    z.object({
-      currentPoints: z.number(),
-      expirationDate: z.string(),
-      membershipNumber: z.string(),
-      membershipLevel: z.string().optional(),
-      memberSince: z.string(),
-      membershipType: z.string(),
-      nextLevel: z.string().optional(),
-      nightsToTopTier: z.number().optional(),
-      pointsExpiryDate: z.string().optional(),
-      pointsRequiredToNextlevel: z.number().optional(),
-      pointsToExpire: z.number().optional(),
-      tierExpirationDate: z.string().optional(),
-    })
-  ),
-  phoneNumber: z.string().optional(),
-  profileId: z.string(),
+export const membershipSchema = z.object({
+  currentPoints: z.number(),
+  expirationDate: z.string(),
+  membershipNumber: z.string(),
+  membershipLevel: z.string().optional(),
+  memberSince: z.string(),
+  membershipType: z.string(),
+  nextLevel: z.string().optional(),
+  nightsToTopTier: z.number().optional(),
+  pointsExpiryDate: z.string().optional(),
+  pointsRequiredToNextlevel: z.number().optional(),
+  pointsToExpire: z.number().optional(),
+  tierExpirationDate: z.string().optional(),
 })
 
+export const getUserSchema = z
+  .object({
+    data: z.object({
+      attributes: z.object({
+        address: z.object({
+          city: z.string().optional(),
+          country: z.string().optional(),
+          countryCode: z.nativeEnum(countriesMap).optional(),
+          streetAddress: z.string().optional(),
+          zipCode: z.string().optional(),
+        }),
+        dateOfBirth: z.string().optional().default("1900-01-01"),
+        email: z.string().email(),
+        firstName: z.string(),
+        language: z.string().optional(),
+        lastName: z.string(),
+        memberships: z.array(membershipSchema),
+        phoneNumber: z.string().optional(),
+        profileId: z.string(),
+      }),
+      type: z.string(),
+    }),
+  })
+  .transform((apiResponse) => {
+    return {
+      ...apiResponse.data.attributes,
+      membership: getMembership(apiResponse.data.attributes.memberships),
+      name: `${apiResponse.data.attributes.firstName} ${apiResponse.data.attributes.lastName}`,
+    }
+  })
+
 // Schema is the same for upcoming and previous stays endpoints
 export const getStaysSchema = z.object({
   data: z.array(
diff --git a/server/routers/user/query.ts b/server/routers/user/query.ts
index a482f9787..b3e9a1e4d 100644
--- a/server/routers/user/query.ts
+++ b/server/routers/user/query.ts
@@ -1,7 +1,5 @@
 import { metrics } from "@opentelemetry/api"
 
-import { Lang } from "@/constants/languages"
-import { env } from "@/env/server"
 import * as api from "@/lib/api"
 import {
   protectedProcedure,
@@ -13,26 +11,24 @@ import { countries } from "@/components/TempDesignSystem/Form/Country/countries"
 import * as maskValue from "@/utils/maskValue"
 import { getMembership, getMembershipCards } from "@/utils/user"
 
-import encryptValue from "../utils/encryptValue"
 import { friendTransactionsInput, staysInput } from "./input"
 import {
   creditCardsSchema,
-  FriendTransaction,
   getFriendTransactionsSchema,
   getMembershipCardsSchema,
   getStaysSchema,
   getUserSchema,
-  Stay,
 } from "./output"
-import { benefits, extendedUser, nextLevelPerks } from "./temp"
+import { updateStaysBookingUrl } from "./utils"
 
 import type { Session } from "next-auth"
 
-import { RewardTransactionTypes } from "@/types/components/myPages/myPage/enums"
 import type {
   LoginType,
   TrackingSDKUserData,
 } from "@/types/components/tracking"
+import { BlocksEnums } from "@/types/enums/blocks"
+import { Transactions } from "@/types/enums/transactions"
 import type { MembershipLevel } from "@/constants/membershipLevels"
 
 // OpenTelemetry metrics: User
@@ -93,7 +89,6 @@ export async function getVerifiedUser({ session }: { session: Session }) {
   getVerifiedUserCounter.add(1)
   console.info("api.user.profile getVerifiedUser start", JSON.stringify({}))
   const apiResponse = await api.get(api.endpoints.v1.profile, {
-    cache: "no-store",
     headers: {
       Authorization: `Bearer ${session.token.access_token}`,
     },
@@ -147,7 +142,7 @@ export async function getVerifiedUser({ session }: { session: Session }) {
     return null
   }
 
-  const verifiedData = getUserSchema.safeParse(apiJson.data.attributes)
+  const verifiedData = getUserSchema.safeParse(apiJson)
   if (!verifiedData.success) {
     getVerifiedUserFailCounter.add(1, {
       error_type: "validation_error",
@@ -166,109 +161,6 @@ export async function getVerifiedUser({ session }: { session: Session }) {
   return verifiedData
 }
 
-function fakingRequest<T>(payload: T): Promise<T> {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve(payload)
-    }, 1500)
-  })
-}
-
-async function updateStaysBookingUrl(
-  data: Stay[],
-  token: string,
-  lang: Lang
-): Promise<Stay[]>
-
-async function updateStaysBookingUrl(
-  data: FriendTransaction[],
-  token: string,
-  lang: Lang
-): Promise<FriendTransaction[]>
-
-async function updateStaysBookingUrl(
-  data: Stay[] | FriendTransaction[],
-  token: string,
-  lang: Lang
-) {
-  // Tenporary API call needed till we have user name in ctx session data
-  getProfileCounter.add(1)
-  console.info("api.user.profile updatebookingurl start", JSON.stringify({}))
-  const apiResponse = await api.get(api.endpoints.v1.profile, {
-    cache: "no-store",
-    headers: {
-      Authorization: `Bearer ${token}`,
-    },
-  })
-
-  // Temporary Url, domain and lang support for current web
-  let localeDomain = env.PUBLIC_URL
-  let fullBookingUrl = localeDomain + "/hotelreservation/my-booking"
-  switch (lang) {
-    case Lang.sv:
-      localeDomain = localeDomain?.replace(".com", ".se")
-      fullBookingUrl = localeDomain + "/hotelreservation/din-bokning"
-      break
-    case Lang.no:
-      localeDomain = localeDomain?.replace(".com", ".no")
-      fullBookingUrl = localeDomain + "/hotelreservation/my-booking"
-      break
-    case Lang.da:
-      localeDomain = localeDomain?.replace(".com", ".dk")
-      fullBookingUrl = localeDomain + "/hotelreservation/min-booking"
-      break
-    case Lang.fi:
-      localeDomain = localeDomain?.replace(".com", ".fi")
-      fullBookingUrl = localeDomain + "/varaa-hotelli/varauksesi"
-      break
-    case Lang.de:
-      localeDomain = localeDomain?.replace(".com", ".de")
-      fullBookingUrl = localeDomain + "/hotelreservation/my-booking"
-      break
-    default:
-      break
-  }
-
-  if (apiResponse.ok) {
-    getProfileSuccessCounter.add(1)
-    console.info(
-      "api.user.profile updatebookingurl success",
-      JSON.stringify({})
-    )
-    const apiJson = await apiResponse.json()
-    if (apiJson.data?.attributes) {
-      return data.map((d) => {
-        const originalString =
-          d.attributes.confirmationNumber.toString() +
-          "," +
-          apiJson.data.attributes.lastName
-        const encryptedBookingValue = encryptValue(originalString)
-        const bookingUrl = !!encryptedBookingValue
-          ? fullBookingUrl + "?RefId=" + encryptedBookingValue
-          : fullBookingUrl +
-            "?lastName=" +
-            apiJson.data.attributes.lastName +
-            "&bookingId=" +
-            d.attributes.confirmationNumber
-        return {
-          ...d,
-          attributes: {
-            ...d.attributes,
-            bookingUrl: bookingUrl,
-          },
-        }
-      })
-    }
-  }
-  getProfileFailCounter.add(1, { error: JSON.stringify(apiResponse) })
-  console.info(
-    "api.user.profile updatebookingurl error",
-    JSON.stringify({ error: apiResponse })
-  )
-
-  return data
-}
-
 export const userQueryRouter = router({
   get: protectedProcedure
     .use(async function (opts) {
@@ -299,7 +191,6 @@ export const userQueryRouter = router({
       )
 
       const user = {
-        ...extendedUser,
         address: {
           city: verifiedData.data.address.city,
           country: country?.name ?? "",
@@ -312,6 +203,7 @@ export const userQueryRouter = router({
         firstName: verifiedData.data.firstName,
         language: verifiedData.data.language,
         lastName: verifiedData.data.lastName,
+        membership: getMembership(verifiedData.data.memberships),
         memberships: verifiedData.data.memberships,
         name: `${verifiedData.data.firstName} ${verifiedData.data.lastName}`,
         phoneNumber: verifiedData.data.phoneNumber,
@@ -460,16 +352,6 @@ export const userQueryRouter = router({
     }
     return loggedInUserTrackingData
   }),
-  benefits: router({
-    current: protectedProcedure.query(async function (opts) {
-      // TODO: Make request to get user data from Scandic API
-      return await fakingRequest<typeof benefits>(benefits)
-    }),
-    nextLevel: protectedProcedure.query(async function (opts) {
-      // TODO: Make request to get user data from Scandic API
-      return await fakingRequest<typeof nextLevelPerks>(nextLevelPerks)
-    }),
-  }),
 
   stays: router({
     previous: protectedProcedure
@@ -735,7 +617,7 @@ export const userQueryRouter = router({
         )
 
         const pageData = updatedData
-          .filter((t) => t.type !== RewardTransactionTypes.expired)
+          .filter((t) => t.type !== Transactions.rewardType.expired)
           .sort((a, b) => {
             // 'BALFWD' are transactions from Opera migration that happended in May 2021
             if (a.attributes.confirmationNumber === "BALFWD") return 1
@@ -787,7 +669,6 @@ export const userQueryRouter = router({
     getCreditCardsCounter.add(1)
     console.info("api.profile.creditCards start", JSON.stringify({}))
     const apiResponse = await api.get(api.endpoints.v1.creditCards, {
-      cache: "no-store",
       headers: {
         Authorization: `Bearer ${ctx.session.token.access_token}`,
       },
diff --git a/server/routers/user/temp.ts b/server/routers/user/temp.ts
deleted file mode 100644
index 5d9b48657..000000000
--- a/server/routers/user/temp.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-export const benefits = [
-  {
-    id: 1,
-    value: "€5 voucher",
-    explanation: "to spend in bar & restaurant for each night",
-    subtitle:
-      "Lorem ipsum dolor sit amet consectetur. Pharetra lectus sagittis turpis blandit feugiat amet enim massa.",
-    href: "#",
-  },
-  {
-    id: 2,
-    value: "Breakfast to go",
-    explanation: "for early birds, when staying",
-    subtitle:
-      "Lorem ipsum dolor sit amet consectetur. Pharetra lectus sagittis turpis blandit feugiat amet enim massa.",
-    href: "#",
-  },
-  {
-    id: 3,
-    value: "15% discount",
-    explanation: "in the restaurant & the bar",
-    subtitle:
-      "Lorem ipsum dolor sit amet consectetur. Pharetra lectus sagittis turpis blandit feugiat amet enim massa.",
-    href: "#",
-  },
-]
-
-export const challenges = {
-  journeys: [
-    {
-      tag: "After work queen",
-      title: "Try 3 Hotel Bars, Pocket 200 Points",
-    },
-    {
-      tag: "Dine & Shine",
-      title: "Visit 3 scandic Restaurants, Earn 150 Points",
-    },
-  ],
-  victories: [
-    {
-      tag: "Capital Explorer",
-      title: "Stay in 3 scandic hotels, in three Capitals, Gain 2000 Points",
-    },
-    {
-      tag: "Friends Feast",
-      title: "Dine with 3 Buddies, Snag a Free Breakfast",
-    },
-    {
-      tag: "Eco Warrior",
-      title: "Choose Green, Get 500 Points",
-    },
-  ],
-}
-
-export const nextLevelPerks = {
-  nextLevel: "Close Friend",
-  perks: [
-    {
-      id: 1,
-
-      explanation: "Free soft drink voucher for the kids when staying",
-    },
-    {
-      id: 2,
-
-      explanation: "Free early check in",
-    },
-    {
-      id: 3,
-      explanation: "25% extra bonus points on each stay",
-    },
-    {
-      id: 4,
-      explanation: "25% extra bonus points on each stay",
-    },
-  ],
-}
-
-export const shortcuts = [
-  {
-    href: "#",
-    title: "My Benefit",
-  },
-  {
-    href: "#",
-    title: "Program overview",
-  },
-  // {
-  //   href: "#",
-  //   title: "Scandic Friends shop",
-  // },
-  // {
-  //   href: "#",
-  //   title: "Fire and safety",
-  // },
-  // {
-  //   href: "#",
-  //   title: "Our sustainability work",
-  // },
-  // {
-  //   href: "#",
-  //   title: "How you earn points",
-  // },
-  // {
-  //   href: "#",
-  //   title: "How you use points",
-  // },
-  // {
-  //   href: "#",
-  //   title: "Missing points",
-  // },
-  // {
-  //   href: "#",
-  //   title: "Our term and conditions",
-  // },
-]
-
-export const extendedUser = {
-  journeys: challenges.journeys,
-  nights: 14,
-  shortcuts,
-  victories: challenges.victories,
-}
diff --git a/server/routers/user/utils.ts b/server/routers/user/utils.ts
new file mode 100644
index 000000000..7196f389d
--- /dev/null
+++ b/server/routers/user/utils.ts
@@ -0,0 +1,116 @@
+import { metrics } from "@opentelemetry/api"
+import { Lang } from "@/constants/languages"
+import { env } from "@/env/server"
+import * as api from "@/lib/api"
+
+import encryptValue from "../utils/encryptValue"
+
+import type { FriendTransaction, Stay } from "./output"
+
+const meter = metrics.getMeter("trpc.user")
+const getProfileCounter = meter.createCounter("trpc.user.profile")
+const getProfileSuccessCounter = meter.createCounter("trpc.user.profile-success")
+const getProfileFailCounter = meter.createCounter("trpc.user.profile-fail")
+
+async function updateStaysBookingUrl(
+  data: Stay[],
+  token: string,
+  lang: Lang
+): Promise<Stay[]>
+
+async function updateStaysBookingUrl(
+  data: FriendTransaction[],
+  token: string,
+  lang: Lang
+): Promise<FriendTransaction[]>
+
+async function updateStaysBookingUrl(
+  data: Stay[] | FriendTransaction[],
+  token: string,
+  lang: Lang
+) {
+  // Temporary API call needed till we have user name in ctx session data
+  getProfileCounter.add(1)
+  console.info("api.user.profile updatebookingurl start", JSON.stringify({}))
+  const apiResponse = await api.get(api.endpoints.v1.profile, {
+    cache: "no-store",
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  })
+  // Temporary Url, domain and lang support for current web
+  const bookingUrl = new URL(
+    "/hotelreservation/my-booking",
+    env.PUBLIC_URL ?? ""
+  )
+  switch (lang) {
+    case Lang.sv:
+      bookingUrl.host = bookingUrl.host.replace(".com", ".se")
+      bookingUrl.pathname = "/hotelreservation/din-bokning"
+      break
+    case Lang.no:
+      bookingUrl.host = bookingUrl.host.replace(".com", ".no")
+      bookingUrl.pathname = "/hotelreservation/my-booking"
+      break
+    case Lang.da:
+      bookingUrl.host = bookingUrl.host.replace(".com", ".dk")
+      bookingUrl.pathname = "/hotelreservation/min-booking"
+      break
+    case Lang.fi:
+      bookingUrl.host = bookingUrl.host.replace(".com", ".fi")
+      bookingUrl.pathname = "/varaa-hotelli/varauksesi"
+      break
+    case Lang.de:
+      bookingUrl.host = bookingUrl.host.replace(".com", ".de")
+      bookingUrl.pathname = "/hotelreservation/my-booking"
+      break
+    default:
+      break
+  }
+
+  if (!apiResponse.ok) {
+    getProfileFailCounter.add(1, { error: JSON.stringify(apiResponse) })
+    console.info(
+      "api.user.profile updatebookingurl error",
+      JSON.stringify({ error: apiResponse })
+    )
+    return data
+  }
+
+  const apiJson = await apiResponse.json()
+  if (!apiJson.data?.attributes) {
+    return data
+  }
+
+  getProfileSuccessCounter.add(1)
+  console.info(
+    "api.user.profile updatebookingurl success",
+    JSON.stringify({})
+  )
+
+  return data.map((d) => {
+    const originalString =
+      d.attributes.confirmationNumber.toString() +
+      "," +
+      apiJson.data.attributes.lastName
+    const encryptedBookingValue = encryptValue(originalString)
+    if (!!encryptedBookingValue) {
+      bookingUrl.searchParams.set("RefId", encryptedBookingValue)
+    } else {
+      bookingUrl.searchParams.set("lastName", apiJson.data.attributes.lastName)
+      bookingUrl.searchParams.set(
+        "bookingId",
+        d.attributes.confirmationNumber
+      )
+    }
+    return {
+      ...d,
+      attributes: {
+        ...d.attributes,
+        bookingUrl: bookingUrl.toString(),
+      },
+    }
+  })
+}
+
+export { updateStaysBookingUrl }
\ No newline at end of file
diff --git a/types/components/blocks/cardsGrid.ts b/types/components/blocks/cardsGrid.ts
new file mode 100644
index 000000000..5b1566b27
--- /dev/null
+++ b/types/components/blocks/cardsGrid.ts
@@ -0,0 +1,5 @@
+import { CardsGrid } from "@/types/trpc/routers/contentstack/blocks"
+
+export interface CardsGridProps extends Pick<CardsGrid, "cards_grid"> {
+  firstItem?: boolean
+}
diff --git a/types/components/blocks/dynamicContent.ts b/types/components/blocks/dynamicContent.ts
new file mode 100644
index 000000000..b2c779e45
--- /dev/null
+++ b/types/components/blocks/dynamicContent.ts
@@ -0,0 +1,20 @@
+import type { DynamicContent } from "@/types/trpc/routers/contentstack/blocks"
+
+interface PartialDynamicContent
+  extends Pick<DynamicContent, "dynamic_content"> {}
+
+export interface DynamicContentProps extends PartialDynamicContent {
+  firstItem: boolean
+}
+
+export interface HowItWorksProps extends PartialDynamicContent {
+  firstItem: boolean
+}
+
+export interface LoyaltyLevelsProps extends PartialDynamicContent {
+  firstItem: boolean
+}
+
+export interface OverviewTableProps extends PartialDynamicContent {
+  firstItem: boolean
+}
diff --git a/types/components/blocks/index.ts b/types/components/blocks/index.ts
new file mode 100644
index 000000000..5ddc0765c
--- /dev/null
+++ b/types/components/blocks/index.ts
@@ -0,0 +1,9 @@
+import type { Block as AccountPageBlock } from "@/types/trpc/routers/contentstack/accountPage"
+import type { Block as ContentPageBlock } from "@/types/trpc/routers/contentstack/contentPage"
+import type { Block as LoyaltyPageBlock } from "@/types/trpc/routers/contentstack/loyaltyPage"
+
+export type Blocks = AccountPageBlock | ContentPageBlock | LoyaltyPageBlock
+
+export interface BlocksProps {
+  blocks: Blocks[]
+}
diff --git a/types/components/blocks/textCols.ts b/types/components/blocks/textCols.ts
new file mode 100644
index 000000000..55c7ab939
--- /dev/null
+++ b/types/components/blocks/textCols.ts
@@ -0,0 +1,3 @@
+import type { TextCols } from "@/types/trpc/routers/contentstack/blocks"
+
+export interface TextColProps extends Pick<TextCols, "text_cols"> { }
\ No newline at end of file
diff --git a/types/components/content/blocks.ts b/types/components/content/blocks.ts
deleted file mode 100644
index a29912359..000000000
--- a/types/components/content/blocks.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Lang } from "@/constants/languages"
-import { membershipLevels } from "@/constants/membershipLevels"
-
-import type { IntlFormatters } from "@formatjs/intl"
-
-import {
-  Block,
-  CardsGrid,
-  DynamicContent,
-  TextCols,
-} from "@/types/trpc/routers/contentstack/contentPage"
-
-export type BlocksProps = {
-  blocks: Block[]
-}
-
-export type CardsGridProps = Pick<CardsGrid, "cards_grid"> & {
-  firstItem?: boolean
-}
-
-export type TextColsProps = {
-  textCols: TextCols["text_cols"]
-}
-
-export type DynamicContentProps = {
-  dynamicContent: DynamicContent["dynamic_content"]
-  firstItem: boolean
-}
-
-export type DynamicComponentProps = {
-  component: DynamicContent["dynamic_content"]["component"]
-}
-
-type BenefitTitle = { title: string }
-
-export type Level = {
-  level: membershipLevels
-  name: string
-  requiredPoints: number
-  requiredNights?: number
-  benefits: BenefitTitle[]
-}
-
-export type LevelCardProps = {
-  formatMessage: IntlFormatters["formatMessage"]
-  lang: Lang
-  level: Level
-}
-
-export type BenefitCardProps = {
-  comparedValues: BenefitValueInformation[]
-  title: string
-  description: string
-}
-
-type BenefitValueInformation = {
-  unlocked: boolean
-  value?: string
-  valueDetails?: string
-}
-
-export type Benefit = {
-  name: string
-  description: string
-  unlocked: boolean
-  value?: string
-  valueDetails?: string
-}
-
-export type ComparisonLevel = {
-  level: membershipLevels
-  name: string
-  description: string
-  requirement: string
-  icon: string
-  benefits: Benefit[]
-}
-
-export type BenefitListProps = {
-  levels: ComparisonLevel[]
-}
-
-export type BenefitValueProps = {
-  benefit: BenefitValueInformation
-}
-
-export type MobileColumnHeaderProps = {
-  column: "A" | "B"
-}
-
-export type DesktopSelectColumns = {
-  column: MobileColumnHeaderProps["column"] | "C"
-}
-
-export type LargeTableProps = {
-  levels: ComparisonLevel[]
-  activeLevel: membershipLevels | null
-  Select?: (column: DesktopSelectColumns) => JSX.Element | null
-}
-
-export type BenefitTableHeaderProps = {
-  name: string
-  description: string
-}
-
-export type LevelSummaryProps = {
-  level: ComparisonLevel
-  showDescription?: boolean
-}
diff --git a/types/components/content/enums.ts b/types/components/content/enums.ts
deleted file mode 100644
index cafb608fa..000000000
--- a/types/components/content/enums.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Typename } from "@/types/requests/utils/typename"
-import { JoinLoyaltyContact } from "@/types/trpc/routers/contentstack/contentPage"
-
-export enum ContentBlocksTypenameEnum {
-  ContentPageBlocksContent = "ContentPageBlocksContent",
-  ContentPageBlocksShortcuts = "ContentPageBlocksShortcuts",
-  ContentPageBlocksCardsGrid = "ContentPageBlocksCardsGrid",
-  ContentPageBlocksDynamicContent = "ContentPageBlocksDynamicContent",
-  ContentPageBlocksTextCols = "ContentPageBlocksTextCols",
-}
-
-export enum CardsGridEnum {
-  LoyaltyCard = "LoyaltyCard",
-  Card = "Card",
-}
-
-export enum DynamicContentComponentEnum {
-  loyalty_levels = "loyalty_levels",
-  how_it_works = "how_it_works",
-  overview_table = "overview_table",
-}
-
-export enum SidebarTypenameEnum {
-  ContentPageSidebarJoinLoyaltyContact = "ContentPageSidebarJoinLoyaltyContact",
-  ContentPageSidebarContent = "ContentPageSidebarContent",
-  ContentPageSidebarDynamicContent = "ContentPageSidebarDynamicContent",
-}
-
-export type SidebarTypename = keyof typeof SidebarTypenameEnum
-
-export enum JoinLoyaltyContactTypenameEnum {
-  ContentPageSidebarJoinLoyaltyContactBlockContactContact = "ContentPageSidebarJoinLoyaltyContactBlockContactContact",
-}
-
-export type JoinLoyaltyContactContact = Typename<
-  JoinLoyaltyContact["join_loyalty_contact"],
-  JoinLoyaltyContactTypenameEnum.ContentPageSidebarJoinLoyaltyContactBlockContactContact
->
-
-export enum SidebarDynamicComponentEnum {
-  my_pages_navigation = "my_pages_navigation",
-}
diff --git a/types/components/content/sidebar.ts b/types/components/content/sidebar.ts
deleted file mode 100644
index 6b740a386..000000000
--- a/types/components/content/sidebar.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ContactFields } from "@/server/routers/contentstack/base/output"
-
-import {
-  JoinLoyaltyContact,
-  Sidebar,
-} from "@/types/trpc/routers/contentstack/contentPage"
-
-export type SidebarProps = {
-  blocks: Sidebar[]
-}
-
-export type JoinLoyaltyContactProps = {
-  block: JoinLoyaltyContact["join_loyalty_contact"]
-}
-
-export type ContactProps = {
-  contactBlock: JoinLoyaltyContact["join_loyalty_contact"]["contact"]
-}
-
-export type ContactRowProps = {
-  contact: ContactFields
-}
diff --git a/types/components/jsontohtml.ts b/types/components/deprecatedjsontohtml.ts
similarity index 88%
rename from types/components/jsontohtml.ts
rename to types/components/deprecatedjsontohtml.ts
index c12ef513f..201485cb2 100644
--- a/types/components/jsontohtml.ts
+++ b/types/components/deprecatedjsontohtml.ts
@@ -3,7 +3,7 @@ import type { Node } from "@/types/requests/utils/edges"
 import type { RTENode } from "../rte/node"
 import type { RenderOptions } from "../rte/option"
 
-export type JsonToHtmlProps = {
+export type DeprecatedJsonToHtmlProps = {
   embeds: Node<Embeds>[]
   nodes: RTENode[]
   renderOptions?: RenderOptions
diff --git a/types/components/form/bookingwidget.ts b/types/components/form/bookingwidget.ts
new file mode 100644
index 000000000..f9ef4d2e1
--- /dev/null
+++ b/types/components/form/bookingwidget.ts
@@ -0,0 +1,55 @@
+import type { Location, Locations } from "@/types/trpc/routers/hotel/locations"
+
+export interface BookingWidgetFormProps {
+  locations: Locations
+}
+
+export interface BookingWidgetFormContentProps {
+  locations: Locations
+}
+
+export enum ActionType {
+  CLEAR_HISTORY_LOCATIONS = "CLEAR_HISTORY_LOCATIONS",
+  CLEAR_SEARCH_LOCATIONS = "CLEAR_SEARCH_LOCATIONS",
+  SEARCH_LOCATIONS = "SEARCH_LOCATIONS",
+  SELECT_ITEM = "SELECT_ITEM",
+}
+
+interface ClearHistoryLocationsAction {
+  type: ActionType.CLEAR_HISTORY_LOCATIONS
+}
+
+interface ClearSearchLocationsAction {
+  type: ActionType.CLEAR_SEARCH_LOCATIONS
+}
+
+interface SearchLocationsAction {
+  payload: {
+    search: string
+  }
+  type: ActionType.SEARCH_LOCATIONS
+}
+
+interface SetItemAction {
+  payload: {
+    location: Location
+    searchHistory: Locations
+  }
+  type: ActionType.SELECT_ITEM
+}
+
+export type Action =
+  | ClearHistoryLocationsAction
+  | ClearSearchLocationsAction
+  | SearchLocationsAction
+  | SetItemAction
+
+export interface State {
+  defaultLocations: Locations
+  locations: Locations
+  search: string
+  searchData: Location | undefined
+  searchHistory: Locations | null
+}
+
+export interface InitState extends Pick<State, "defaultLocations"> {}
diff --git a/types/components/hotelPage/enums.ts b/types/components/hotelPage/enums.ts
deleted file mode 100644
index d7e5f5bec..000000000
--- a/types/components/hotelPage/enums.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export enum HotelBlocksTypenameEnum {
-  HotelPageContentUpcomingActivitiesCard = "HotelPageContentUpcomingActivitiesCard",
-}
diff --git a/types/components/loyalty/enums.ts b/types/components/loyalty/enums.ts
deleted file mode 100644
index 4859d23eb..000000000
--- a/types/components/loyalty/enums.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Typename } from "@/types/requests/utils/typename"
-import type { JoinLoyaltyContact } from "@/server/routers/contentstack/loyaltyPage/output"
-
-export enum JoinLoyaltyContactTypenameEnum {
-  LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact = "LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact",
-}
-
-export type JoinLoyaltyContactContact = Typename<
-  JoinLoyaltyContact["join_loyalty_contact"],
-  JoinLoyaltyContactTypenameEnum.LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact
->
-
-export enum SidebarTypenameEnum {
-  LoyaltyPageSidebarJoinLoyaltyContact = "LoyaltyPageSidebarJoinLoyaltyContact",
-  LoyaltyPageSidebarContent = "LoyaltyPageSidebarContent",
-  LoyaltyPageSidebarDynamicContent = "LoyaltyPageSidebarDynamicContent",
-}
-
-export type SidebarTypename = keyof typeof SidebarTypenameEnum
-
-export enum LoyaltySidebarDynamicComponentEnum {
-  my_pages_navigation = "my_pages_navigation",
-}
-
-export enum LoyaltyComponentEnum {
-  loyalty_levels = "loyalty_levels",
-  how_it_works = "how_it_works",
-  overview_table = "overview_table",
-}
-
-export type LoyaltyComponent = keyof typeof LoyaltyComponentEnum
-
-export enum LoyaltyBlocksTypenameEnum {
-  LoyaltyPageBlocksDynamicContent = "LoyaltyPageBlocksDynamicContent",
-  LoyaltyPageBlocksContent = "LoyaltyPageBlocksContent",
-  LoyaltyPageBlocksShortcuts = "LoyaltyPageBlocksShortcuts",
-  LoyaltyPageBlocksCardsGrid = "LoyaltyPageBlocksCardsGrid",
-}
-
-export enum LoyaltyCardsGridEnum {
-  LoyaltyCard = "LoyaltyCard",
-  Card = "Card",
-}
diff --git a/types/components/loyalty/sidebar.ts b/types/components/loyalty/sidebar.ts
deleted file mode 100644
index 75d0a74e0..000000000
--- a/types/components/loyalty/sidebar.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ContactFields } from "@/server/routers/contentstack/base/output"
-import {
-  JoinLoyaltyContact,
-  Sidebar,
-} from "@/server/routers/contentstack/loyaltyPage/output"
-
-import { LangParams } from "@/types/params"
-
-export type SidebarProps = {
-  blocks: Sidebar[]
-}
-
-export type JoinLoyaltyContactProps = {
-  block: JoinLoyaltyContact["join_loyalty_contact"]
-}
-
-export type ContactProps = {
-  contactBlock: JoinLoyaltyContact["join_loyalty_contact"]["contact"]
-}
-
-export type ContactRowProps = {
-  contact: ContactFields
-}
diff --git a/types/components/metadata/index.ts b/types/components/metadata/index.ts
index bcc71f13f..6c4eedc4a 100644
--- a/types/components/metadata/index.ts
+++ b/types/components/metadata/index.ts
@@ -1,5 +1,5 @@
 import { z } from "zod"
 
-import { getMetaDataSchema } from "@/server/routers/contentstack/metadata/output"
+import { getMetaDataSchema } from "@/server/routers/contentstack/schemas/metadata"
 
 export interface MetaData extends z.infer<typeof getMetaDataSchema> {}
diff --git a/types/components/myPages/friend.ts b/types/components/myPages/friend.ts
new file mode 100644
index 000000000..d7b3ec28f
--- /dev/null
+++ b/types/components/myPages/friend.ts
@@ -0,0 +1,4 @@
+import { User } from "@/types/user"
+
+export interface FriendProps
+  extends React.PropsWithChildren<Pick<User, "membership" | "name">> {}
diff --git a/types/components/myPages/membershipNumber.ts b/types/components/myPages/membershipNumber.ts
new file mode 100644
index 000000000..75c904b9c
--- /dev/null
+++ b/types/components/myPages/membershipNumber.ts
@@ -0,0 +1,10 @@
+import { VariantProps } from "class-variance-authority"
+
+import { membershipNumberVariants } from "@/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants"
+
+import type { User } from "@/types/user"
+
+export interface MembershipNumberProps
+  extends Omit<React.HTMLAttributes<HTMLDivElement>, "color">,
+    VariantProps<typeof membershipNumberVariants>,
+    Pick<User, "membership"> {}
diff --git a/types/components/myPages/myPage/accountPage.ts b/types/components/myPages/myPage/accountPage.ts
index 91460b17b..1546f7979 100644
--- a/types/components/myPages/myPage/accountPage.ts
+++ b/types/components/myPages/myPage/accountPage.ts
@@ -1,22 +1,20 @@
-import { AccountPageContentItem } from "@/server/routers/contentstack/accountPage/output"
+import { z } from "zod"
 
-import { DynamicContentComponents } from "@/types/components/myPages/myPage/enums"
+import { blocksSchema } from "@/server/routers/contentstack/accountPage/output"
 
-export type AccountPageContentProps = {
-  component: DynamicContentComponents
-  props: {
-    title: string | null
-    subtitle: string | null
-    link?: { href: string; text: string }
-  }
-}
+import { DynamicContent } from "@/types/trpc/routers/contentstack/blocks"
 
-export type AccountPageComponentProps = {
+export interface AccountPageContentProps
+  extends Pick<DynamicContent, "dynamic_content"> {}
+
+export interface AccountPageComponentProps {
   title: string | null
   subtitle: string | null
   link?: { href: string; text: string }
 }
 
+type Content = z.output<typeof blocksSchema>
+
 export type ContentProps = {
-  content: AccountPageContentItem[]
+  content: Content[]
 }
diff --git a/types/components/myPages/myPage/challenges.ts b/types/components/myPages/myPage/challenges.ts
deleted file mode 100644
index 135f238f1..000000000
--- a/types/components/myPages/myPage/challenges.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type { User } from "@/types/user"
-
-export type ChallengesProps = {
-  journeys: User["journeys"]
-  victories: User["victories"]
-}
diff --git a/types/components/myPages/myPage/earnAndBurn.ts b/types/components/myPages/myPage/earnAndBurn.ts
index 615f7fa29..e7836f908 100644
--- a/types/components/myPages/myPage/earnAndBurn.ts
+++ b/types/components/myPages/myPage/earnAndBurn.ts
@@ -1,4 +1,4 @@
-import { awardPointsVariants } from "@/components/MyPages/Blocks/Points/EarnAndBurn/AwardPoints/awardPointsVariants"
+import { awardPointsVariants } from "@/components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPointsVariants"
 
 import type { VariantProps } from "class-variance-authority"
 
diff --git a/types/components/myPages/myPage/enums.ts b/types/components/myPages/myPage/enums.ts
deleted file mode 100644
index 67ee8e12a..000000000
--- a/types/components/myPages/myPage/enums.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-export enum DynamicContentComponents {
-  membership_overview = "membership_overview",
-  points_overview = "points_overview",
-  soonest_stays = "soonest_stays",
-  previous_stays = "previous_stays",
-  upcoming_stays = "upcoming_stays",
-  current_benefits = "current_benefits",
-  next_benefits = "next_benefits",
-  my_points = "my_points",
-  expiring_points = "expiring_points",
-  earn_and_burn = "earn_and_burn",
-}
-
-export enum ContentEntries {
-  AccountPageContentDynamicContent = "AccountPageContentDynamicContent",
-  AccountPageContentShortcuts = "AccountPageContentShortcuts",
-  AccountPageContentTextContent = "AccountPageContentTextContent",
-}
-
-export enum RewardTransactionTypes {
-  stay = "stay",
-  rewardNight = "rewardnight",
-  enrollment = "enrollment",
-  expired = "expired",
-  redgift = "redgift",
-  ancillary = "ancillary",
-  pointShop = "pointshop",
-  tui_points = "tui_points",
-  mastercard_points = "mastercard_points",
-  stayAdj = "stay/adj",
-  othersAdj = "others/adj",
-}
diff --git a/types/components/myPages/myPage/shortcuts.ts b/types/components/myPages/myPage/shortcuts.ts
index d6317124a..9ef3a5f84 100644
--- a/types/components/myPages/myPage/shortcuts.ts
+++ b/types/components/myPages/myPage/shortcuts.ts
@@ -1,12 +1,5 @@
-export type ShortcutsProps = {
+import type { Shortcut } from "@/types/trpc/routers/contentstack/blocks"
+
+export interface ShortcutsProps extends Shortcut {
   firstItem?: boolean
-  openInNewTab?: boolean
-  shortcuts: {
-    url: string
-    title: string
-    openInNewTab?: boolean
-    text?: string
-  }[]
-  subtitle: string | null
-  title: string | null
 }
diff --git a/types/components/myPages/stays/previous.ts b/types/components/myPages/stays/previous.ts
index 9a90b24de..d236f55eb 100644
--- a/types/components/myPages/stays/previous.ts
+++ b/types/components/myPages/stays/previous.ts
@@ -1,4 +1,3 @@
-import type { Lang } from "@/constants/languages"
 import type { UserQueryRouter } from "../user"
 
 export type PreviousStaysResponse = Awaited<
diff --git a/types/components/loyalty/blocks.ts b/types/components/overviewTable.ts
similarity index 77%
rename from types/components/loyalty/blocks.ts
rename to types/components/overviewTable.ts
index f0664b6ed..5cb049523 100644
--- a/types/components/loyalty/blocks.ts
+++ b/types/components/overviewTable.ts
@@ -1,38 +1,15 @@
 import { Lang } from "@/constants/languages"
 import { membershipLevels } from "@/constants/membershipLevels"
-import {
-  Block,
-  CardsGrid,
-  DynamicContent,
-  RteBlockContent,
-} from "@/server/routers/contentstack/loyaltyPage/output"
 
 import { MembershipLevel } from "@/utils/user"
 
 import type { IntlFormatters } from "@formatjs/intl"
 
-export type BlocksProps = {
-  blocks: Block[]
-}
-
-export type DynamicContentProps = {
-  dynamicContent: DynamicContent["dynamic_content"]
-  firstItem: boolean
-}
-
-export type DynamicComponentProps = {
-  component: DynamicContent["dynamic_content"]["component"]
-}
-
-export type CardsGridProps = Pick<CardsGrid, "cards_grid"> & {
-  firstItem?: boolean
-}
-
-export type Content = { content: RteBlockContent["content"]["content"] }
-
 type BenefitTitle = { title: string }
 
-export type OverviewTableProps = { activeMembership: MembershipLevel | null }
+export type OverviewTableClientProps = {
+  activeMembership: MembershipLevel | null
+}
 
 export type Level = {
   level: membershipLevels
diff --git a/types/components/search.ts b/types/components/search.ts
new file mode 100644
index 000000000..b35f9d3d2
--- /dev/null
+++ b/types/components/search.ts
@@ -0,0 +1,54 @@
+import { dialogVariants } from "@/components/Forms/BookingWidget/FormContent/Search/SearchList/Dialog/variants"
+
+import type { VariantProps } from "class-variance-authority"
+import type { PropGetters } from "downshift"
+
+import type { Location, Locations } from "../trpc/routers/hotel/locations"
+
+export interface SearchProps {
+  locations: Locations
+}
+
+type HighlightedIndex = number | null
+
+export interface SearchListProps {
+  getItemProps: PropGetters<unknown>["getItemProps"]
+  getMenuProps: PropGetters<unknown>["getMenuProps"]
+  isOpen: boolean
+  highlightedIndex: HighlightedIndex
+  locations: Locations
+  search: string
+  searchHistory: Locations | null
+}
+
+export interface ListProps {
+  getItemProps: PropGetters<unknown>["getItemProps"]
+  highlightedIndex: HighlightedIndex
+  initialIndex?: number
+  label?: string
+  locations: Locations
+}
+
+export interface ListItemProps {
+  getItemProps: PropGetters<unknown>["getItemProps"]
+  highlightedIndex: HighlightedIndex
+  index: number
+  location: Location
+}
+
+export interface DialogProps
+  extends React.PropsWithChildren,
+    VariantProps<typeof dialogVariants> {
+  className?: string
+  getMenuProps: PropGetters<unknown>["getMenuProps"]
+}
+
+export interface ErrorDialogProps extends React.PropsWithChildren {
+  getMenuProps: PropGetters<unknown>["getMenuProps"]
+}
+
+export interface ClearSearchButtonProps {
+  getItemProps: PropGetters<unknown>["getItemProps"]
+  highlightedIndex: HighlightedIndex
+  index: number
+}
diff --git a/types/components/sidebar/index.ts b/types/components/sidebar/index.ts
new file mode 100644
index 000000000..43e250d2c
--- /dev/null
+++ b/types/components/sidebar/index.ts
@@ -0,0 +1,8 @@
+import type { SidebarBlock as ContentPageSidebarBlock } from "@/types/trpc/routers/contentstack/contentPage"
+import type { SidebarBlock as LoyaltyPageSidebarBlock } from "@/types/trpc/routers/contentstack/loyaltyPage"
+
+export type Blocks = ContentPageSidebarBlock | LoyaltyPageSidebarBlock
+
+export interface SidebarProps {
+  blocks: Blocks[]
+}
diff --git a/types/components/sidebar/joinLoyaltyContact.ts b/types/components/sidebar/joinLoyaltyContact.ts
new file mode 100644
index 000000000..b826220ae
--- /dev/null
+++ b/types/components/sidebar/joinLoyaltyContact.ts
@@ -0,0 +1,17 @@
+import type {
+  Contacts,
+  JoinLoyaltyContact,
+} from "@/types/trpc/routers/contentstack/sidebar"
+import type { ContactFields } from "@/server/routers/contentstack/base/output"
+
+export interface JoinLoyaltyContactProps {
+  block: JoinLoyaltyContact["join_loyalty_contact"]
+}
+
+export interface ContactProps {
+  contactBlock: Contacts
+}
+
+export interface ContactRowProps {
+  contact: ContactFields
+}
diff --git a/types/discriminatedUnion.ts b/types/discriminatedUnion.ts
new file mode 100644
index 000000000..86ef7df88
--- /dev/null
+++ b/types/discriminatedUnion.ts
@@ -0,0 +1,7 @@
+import type { ZodDiscriminatedUnionOption, ZodError } from "zod"
+
+export interface DiscriminatedUnionError {
+  error: ZodError<unknown>
+}
+
+export interface Option extends ZodDiscriminatedUnionOption<"__typename"> {}
diff --git a/types/enums/accountPage.ts b/types/enums/accountPage.ts
new file mode 100644
index 000000000..1d0dcdfd6
--- /dev/null
+++ b/types/enums/accountPage.ts
@@ -0,0 +1,9 @@
+export namespace AccountPageEnum {
+  export namespace ContentStack {
+    export const enum blocks {
+      DynamicContent = "AccountPageContentDynamicContent",
+      ShortCuts = "AccountPageContentShortcuts",
+      TextContent = "AccountPageContentTextContent",
+    }
+  }
+}
diff --git a/types/enums/blocks.ts b/types/enums/blocks.ts
new file mode 100644
index 000000000..88dfe5055
--- /dev/null
+++ b/types/enums/blocks.ts
@@ -0,0 +1,10 @@
+export namespace BlocksEnums {
+  export const enum block {
+    CardsGrid = "CardsGrid",
+    Content = "Content",
+    DynamicContent = "DynamicContent",
+    Shortcuts = "Shortcuts",
+    TextCols = "TextCols",
+    TextContent = "TextContent",
+  }
+}
diff --git a/types/enums/cardsGrid.ts b/types/enums/cardsGrid.ts
new file mode 100644
index 000000000..c6b6b2983
--- /dev/null
+++ b/types/enums/cardsGrid.ts
@@ -0,0 +1,6 @@
+export namespace CardsGridEnum {
+  export const enum cards {
+    Card = "Card",
+    LoyaltyCard = "LoyaltyCard",
+  }
+}
diff --git a/types/enums/content.ts b/types/enums/content.ts
new file mode 100644
index 000000000..ad94dbd28
--- /dev/null
+++ b/types/enums/content.ts
@@ -0,0 +1,10 @@
+export namespace ContentEnum {
+  export const enum blocks {
+    AccountPage = "AccountPage",
+    ContentPage = "ContentPage",
+    HotelPage = "HotelPage",
+    ImageContainer = "ImageContainer",
+    LoyaltyPage = "LoyaltyPage",
+    SysAsset = "SysAsset",
+  }
+}
diff --git a/types/enums/contentPage.ts b/types/enums/contentPage.ts
new file mode 100644
index 000000000..79663d74d
--- /dev/null
+++ b/types/enums/contentPage.ts
@@ -0,0 +1,17 @@
+export namespace ContentPageEnum {
+  export namespace ContentStack {
+    export const enum blocks {
+      CardsGrid = "ContentPageBlocksCardsGrid",
+      Content = "ContentPageBlocksContent",
+      DynamicContent = "ContentPageBlocksDynamicContent",
+      Shortcuts = "ContentPageBlocksShortcuts",
+      TextCols = "ContentPageBlocksTextCols",
+    }
+
+    export const enum sidebar {
+      Content = "ContentPageSidebarContent",
+      DynamicContent = "ContentPageSidebarDynamicContent",
+      JoinLoyaltyContact = "ContentPageSidebarJoinLoyaltyContact",
+    }
+  }
+}
diff --git a/types/enums/dynamicContent.ts b/types/enums/dynamicContent.ts
new file mode 100644
index 000000000..c314b1c7e
--- /dev/null
+++ b/types/enums/dynamicContent.ts
@@ -0,0 +1,45 @@
+export namespace DynamicContentEnum {
+  export namespace Blocks {
+    export const enum components {
+      current_benefits = "current_benefits",
+      earn_and_burn = "earn_and_burn",
+      expiring_points = "expiring_points",
+      how_it_works = "how_it_works",
+      loyalty_levels = "loyalty_levels",
+      membership_overview = "membership_overview",
+      my_points = "my_points",
+      next_benefits = "next_benefits",
+      overview_table = "overview_table",
+      points_overview = "points_overview",
+      previous_stays = "previous_stays",
+      soonest_stays = "soonest_stays",
+      upcoming_stays = "upcoming_stays",
+    }
+
+    /** Type needed to satisfy zod enum type */
+    export const enums: [components, ...components[]] = [
+      components.current_benefits,
+      components.earn_and_burn,
+      components.expiring_points,
+      components.how_it_works,
+      components.loyalty_levels,
+      components.membership_overview,
+      components.my_points,
+      components.next_benefits,
+      components.overview_table,
+      components.points_overview,
+      components.previous_stays,
+      components.soonest_stays,
+      components.upcoming_stays,
+    ]
+  }
+
+  export namespace Sidebar {
+    export const enum components {
+      my_pages_navigation = "my_pages_navigation",
+    }
+
+    /** Type needed to satisfy zod enum type */
+    export const enums: [string, ...string[]] = [components.my_pages_navigation]
+  }
+}
diff --git a/types/enums/hotelPage.ts b/types/enums/hotelPage.ts
new file mode 100644
index 000000000..c7de7b727
--- /dev/null
+++ b/types/enums/hotelPage.ts
@@ -0,0 +1,7 @@
+export namespace HotelPageEnum {
+  export namespace ContentStack {
+    export const enum blocks {
+      ActivitiesCard = "HotelPageContentUpcomingActivitiesCard",
+    }
+  }
+}
diff --git a/types/enums/joinLoyaltyContact.ts b/types/enums/joinLoyaltyContact.ts
new file mode 100644
index 000000000..db30bb5ce
--- /dev/null
+++ b/types/enums/joinLoyaltyContact.ts
@@ -0,0 +1,11 @@
+export namespace JoinLoyaltyContactEnums {
+  export namespace ContentStack {
+    export const enum contact {
+      ContentPage = "ContentPageSidebarJoinLoyaltyContactBlockContactContact",
+      LoyaltyPage = "LoyaltyPageSidebarJoinLoyaltyContactBlockContactContact",
+    }
+  }
+  export const enum contact {
+    Contact = "Contact",
+  }
+}
diff --git a/types/enums/loyaltyPage.ts b/types/enums/loyaltyPage.ts
new file mode 100644
index 000000000..87c96e9c6
--- /dev/null
+++ b/types/enums/loyaltyPage.ts
@@ -0,0 +1,16 @@
+export namespace LoyaltyPageEnum {
+  export namespace ContentStack {
+    export const enum blocks {
+      CardsGrid = "LoyaltyPageBlocksCardsGrid",
+      Content = "LoyaltyPageBlocksContent",
+      DynamicContent = "LoyaltyPageBlocksDynamicContent",
+      Shortcuts = "LoyaltyPageBlocksShortcuts",
+    }
+
+    export const enum sidebar {
+      Content = "LoyaltyPageSidebarContent",
+      DynamicContent = "LoyaltyPageSidebarDynamicContent",
+      JoinLoyaltyContact = "LoyaltyPageSidebarJoinLoyaltyContact",
+    }
+  }
+}
diff --git a/types/enums/sidebar.ts b/types/enums/sidebar.ts
new file mode 100644
index 000000000..fbdb589a8
--- /dev/null
+++ b/types/enums/sidebar.ts
@@ -0,0 +1,7 @@
+export namespace SidebarEnums {
+  export const enum blocks {
+    Content = "Content",
+    DynamicContent = "DynamicContent",
+    JoinLoyaltyContact = "JoinLoyaltyContact",
+  }
+}
diff --git a/types/enums/transactions.ts b/types/enums/transactions.ts
new file mode 100644
index 000000000..83c990aa9
--- /dev/null
+++ b/types/enums/transactions.ts
@@ -0,0 +1,15 @@
+export namespace Transactions {
+  export const enum rewardType {
+    stay = "stay",
+    rewardNight = "rewardnight",
+    enrollment = "enrollment",
+    expired = "expired",
+    redgift = "redgift",
+    ancillary = "ancillary",
+    pointShop = "pointshop",
+    tui_points = "tui_points",
+    mastercard_points = "mastercard_points",
+    stayAdj = "stay/adj",
+    othersAdj = "others/adj",
+  }
+}
diff --git a/types/image.ts b/types/image.ts
index 5c442c4df..f5efeae00 100644
--- a/types/image.ts
+++ b/types/image.ts
@@ -1,10 +1,10 @@
-export type Image = {
-  description?: string
+export interface Image {
+  description?: string | null
   dimension: {
     height: number
     width: number
   }
-  metadata: JSON | null
+  metadata?: JSON | null
   system: {
     uid: string
   }
diff --git a/types/requests/embeds.ts b/types/requests/embeds.ts
index f0324753a..092b05914 100644
--- a/types/requests/embeds.ts
+++ b/types/requests/embeds.ts
@@ -1,20 +1,23 @@
 import { EmbedEnum } from "./utils/embeds"
-import { PageLink } from "./utils/pageLink"
-import { Typename } from "./utils/typename"
+import { PageLink, PageLinkWithOriginalUrl } from "./utils/pageLink"
+import { TypenameInterface } from "./utils/typename"
 
 import type { ImageContainer } from "./imageContainer"
 import type { SysAsset } from "./utils/asset"
 
-type PageLinkWithOriginalUrl = PageLink & {
-  web: { original_url?: string | null }
-}
-type ContentPage = Typename<PageLinkWithOriginalUrl, EmbedEnum.ContentPage>
-type LoyaltyPage = Typename<PageLinkWithOriginalUrl, EmbedEnum.LoyaltyPage>
-type AccountPage = Typename<PageLinkWithOriginalUrl, EmbedEnum.AccountPage>
+interface AccountPage
+  extends TypenameInterface<EmbedEnum.AccountPage>,
+    PageLink {}
+interface ContentPage
+  extends TypenameInterface<EmbedEnum.ContentPage>,
+    PageLinkWithOriginalUrl {}
+interface LoyaltyPage
+  extends TypenameInterface<EmbedEnum.LoyaltyPage>,
+    PageLinkWithOriginalUrl {}
 
 export type Embeds =
-  | SysAsset
-  | ImageContainer
-  | ContentPage
-  | LoyaltyPage
   | AccountPage
+  | ContentPage
+  | ImageContainer
+  | LoyaltyPage
+  | SysAsset
diff --git a/types/requests/imageContainer.ts b/types/requests/imageContainer.ts
index 2a604b948..d6a21185b 100644
--- a/types/requests/imageContainer.ts
+++ b/types/requests/imageContainer.ts
@@ -1,14 +1,12 @@
-import { ImageVaultAssetResponse } from "../components/imageVault"
 import { EmbedEnum } from "./utils/embeds"
-import { Typename } from "./utils/typename"
 
-export type ImageContainer = Typename<
-  {
-    image_left: ImageVaultAssetResponse
-    image_right: ImageVaultAssetResponse
-    system: {
-      uid: string
-    }
-  },
-  EmbedEnum.ImageContainer
->
+import type { ImageVaultAssetResponse } from "../components/imageVault"
+import type { System } from "./system"
+import type { TypenameInterface } from "./utils/typename"
+
+export interface ImageContainer
+  extends TypenameInterface<EmbedEnum.ImageContainer>,
+    System {
+  image_left?: ImageVaultAssetResponse
+  image_right?: ImageVaultAssetResponse
+}
diff --git a/types/requests/languageSwitcher.ts b/types/requests/languageSwitcher.ts
index 00c315790..90f033f35 100644
--- a/types/requests/languageSwitcher.ts
+++ b/types/requests/languageSwitcher.ts
@@ -13,7 +13,10 @@ export type LanguageSwitcherData = {
 }
 
 type LanguageResult = {
-  items: { web?: { original_url?: string | null }; url: string }[]
+  web?: {
+    original_url?: string | null
+  }
+  url: string
 }
 
 export type LanguageSwitcherQueryDataRaw = {
diff --git a/types/requests/system.ts b/types/requests/system.ts
index 05954ce80..d3d053dac 100644
--- a/types/requests/system.ts
+++ b/types/requests/system.ts
@@ -1,6 +1,9 @@
+import { Lang } from "@/constants/languages"
+
 export interface System {
   system: {
     content_type_uid: string
+    locale: Lang
     uid: string
   }
 }
diff --git a/types/requests/utils/asset.ts b/types/requests/utils/asset.ts
index d9dae927e..1a200fb8e 100644
--- a/types/requests/utils/asset.ts
+++ b/types/requests/utils/asset.ts
@@ -1,5 +1,7 @@
 import type { Image } from "@/types/image"
 import type { EmbedEnum } from "./embeds"
-import type { Typename } from "./typename"
+import type { TypenameInterface } from "./typename"
 
-export type SysAsset = Typename<Image, EmbedEnum.SysAsset>
+export interface SysAsset
+  extends TypenameInterface<EmbedEnum.SysAsset>,
+    Image {}
diff --git a/types/requests/utils/pageLink.ts b/types/requests/utils/pageLink.ts
index 58221c440..a389d313c 100644
--- a/types/requests/utils/pageLink.ts
+++ b/types/requests/utils/pageLink.ts
@@ -1,14 +1,18 @@
-import type { Lang } from "@/constants/languages"
+import { z } from "zod"
+
+import {
+  extendedPageLinkSchema,
+  pageLinkSchema,
+} from "@/server/routers/contentstack/schemas/pageLinks"
+
 import type { EmbedEnum } from "./embeds"
-import type { Typename } from "./typename"
+import type { TypenameInterface } from "./typename"
 
-export type PageLink = {
-  system: {
-    uid: string
-    locale: Lang
-  }
-  title: string
-  url: string
-}
+export interface PageLink extends z.output<typeof pageLinkSchema> {}
 
-export type PageLinkType = Typename<PageLink, EmbedEnum.CurrentBlocksPage>
+export interface PageLinkWithOriginalUrl
+  extends z.output<typeof extendedPageLinkSchema> {}
+
+export interface PageLinkType
+  extends TypenameInterface<EmbedEnum.CurrentBlocksPage>,
+    PageLink {}
diff --git a/types/rte/attrs.ts b/types/rte/attrs.ts
index b99cca8b0..0f635d0cc 100644
--- a/types/rte/attrs.ts
+++ b/types/rte/attrs.ts
@@ -1,4 +1,7 @@
-import { ImageVaultAssetResponse } from "../components/imageVault"
+import {
+  ImageVaultAsset,
+  ImageVaultAssetResponse,
+} from "../components/imageVault"
 import { RTEItemTypeEnum } from "./enums"
 
 import type { Lang } from "@/constants/languages"
@@ -39,10 +42,8 @@ export interface RTELinkAttrs extends Attributes {
   type: RTEItemTypeEnum.entry
 }
 
-export interface RTEImageVaultAttrs
-  extends Attributes,
-    ImageVaultAssetResponse {
+export type RTEImageVaultAttrs = Attributes & {
   height: string
-  width: string
   style: string[]
-}
+  width: string
+} & (ImageVaultAssetResponse | ImageVaultAsset)
diff --git a/types/rte/node.ts b/types/rte/node.ts
index dca0f9281..5625e282c 100644
--- a/types/rte/node.ts
+++ b/types/rte/node.ts
@@ -1,6 +1,6 @@
 import { RTETypeEnum } from "./enums"
 
-import type { EmbedByUid } from "../components/jsontohtml"
+import type { EmbedByUid } from "../components/deprecatedjsontohtml"
 import type {
   Attributes,
   RTEAnchorAttrs,
diff --git a/types/transitionTypes/jsontohtml.ts b/types/transitionTypes/jsontohtml.ts
new file mode 100644
index 000000000..ecbb14739
--- /dev/null
+++ b/types/transitionTypes/jsontohtml.ts
@@ -0,0 +1,12 @@
+import type { Node } from "@/types/requests/utils/edges"
+import type { Embeds } from "@/types/trpc/routers/utils/embeds"
+import type { RTENode } from "./rte/node"
+import type { RenderOptions } from "./rte/option"
+
+export type JsonToHtmlProps = {
+  embeds: Node<Embeds>[]
+  nodes: RTENode[]
+  renderOptions?: RenderOptions
+}
+
+export type EmbedByUid = Record<string, Node<Embeds>>
diff --git a/types/transitionTypes/rte/attrs.ts b/types/transitionTypes/rte/attrs.ts
new file mode 100644
index 000000000..602dc28ce
--- /dev/null
+++ b/types/transitionTypes/rte/attrs.ts
@@ -0,0 +1,46 @@
+import { ImageVaultAsset } from "../../components/imageVault"
+import { RTEItemTypeEnum } from "./enums"
+
+import type { Lang } from "@/constants/languages"
+import type { EmbedTypesEnum, RTEItemType } from "./enums"
+
+export interface Attributes {
+  [key: string]: any
+  "class-name"?: string
+  type: RTEItemType
+}
+
+export interface RTEAssetAttrs extends Attributes {
+  alt: string
+  "asset-alt": string
+  "asset-link": string
+  "asset-name": string
+  "asset-type": "image/png" | "image/jpg" | "image/jpeg"
+  "asset-uid": string
+  "display-type": EmbedTypesEnum.display
+  "content-type-uid": "sys_assets"
+  inline: false
+  type: RTEItemTypeEnum.asset
+}
+
+export interface RTEAnchorAttrs extends Attributes {
+  target: string
+  url: string
+}
+
+export interface RTELinkAttrs extends Attributes {
+  "display-type": EmbedTypesEnum.link
+  "class-name": string
+  "content-type-uid": string
+  "entry-uid": string
+  locale: Lang
+  href: string
+  target: HTMLAnchorElement["target"]
+  type: RTEItemTypeEnum.entry
+}
+
+export interface RTEImageVaultAttrs extends Attributes, ImageVaultAsset {
+  height: string
+  style: string[]
+  width: string
+}
diff --git a/types/transitionTypes/rte/enums.ts b/types/transitionTypes/rte/enums.ts
new file mode 100644
index 000000000..f4d6bd86c
--- /dev/null
+++ b/types/transitionTypes/rte/enums.ts
@@ -0,0 +1,64 @@
+export enum EmbedTypesEnum {
+  block = "block",
+  display = "display",
+  download = "download",
+  inline = "inline",
+  link = "link",
+}
+
+export type EmbedTypes = keyof typeof EmbedTypesEnum
+
+/** Copied from https://github.com/contentstack/contentstack-utils-javascript/blob/master/src/nodes/node-type.ts */
+export enum RTETypeEnum {
+  a = "a",
+  blockquote = "blockquote",
+  code = "code",
+  doc = "doc",
+  embed = "embed",
+  h1 = "h1",
+  h2 = "h2",
+  h3 = "h3",
+  h4 = "h4",
+  h5 = "h5",
+  h6 = "h6",
+  hr = "hr",
+  img = "img",
+  li = "li",
+  ol = "ol",
+  p = "p",
+  reference = "reference",
+  table = "table",
+  tbody = "tbody",
+  td = "td",
+  text = "text",
+  tfoot = "tfoot",
+  th = "th",
+  thead = "thead",
+  tr = "tr",
+  ul = "ul",
+  ImageVault = "ImageVault",
+  fragment = "fragment",
+}
+
+export type RTEType = keyof typeof RTETypeEnum
+
+export enum RTEItemTypeEnum {
+  asset = "asset",
+  entry = "entry",
+}
+
+export type RTEItemType = keyof typeof RTEItemTypeEnum
+
+export enum AvailableParagraphFormatEnum {
+  "script-1" = "script-1",
+  "script-2" = "script-2",
+  "footnote" = "footnote",
+  "caption" = "caption",
+  "subtitle-1" = "subtitle-1",
+  "subtitle-2" = "subtitle-2",
+}
+
+export enum AvailableULFormatEnum {
+  "heart" = "heart",
+  "check" = "check",
+}
diff --git a/types/transitionTypes/rte/node.ts b/types/transitionTypes/rte/node.ts
new file mode 100644
index 000000000..d43be2344
--- /dev/null
+++ b/types/transitionTypes/rte/node.ts
@@ -0,0 +1,97 @@
+import { RTETypeEnum } from "./enums"
+
+import type { EmbedByUid } from "../jsontohtml"
+import type {
+  Attributes,
+  RTEAnchorAttrs,
+  RTEAssetAttrs,
+  RTEImageVaultAttrs,
+  RTELinkAttrs,
+} from "./attrs"
+import type { RenderOptions } from "./option"
+
+export interface RTEDefaultNode {
+  attrs: Attributes
+  children: RTENode[]
+  type: RTETypeEnum
+  uid: string
+}
+
+export interface RTELinkNode {
+  attrs: Attributes
+  children: RTENode[]
+  type: RTETypeEnum
+  uid: string
+}
+
+export interface RTEReferenceAssetNode extends RTEDefaultNode {
+  attrs: RTEAssetAttrs
+}
+
+export interface RTEAnchorNode extends RTEDefaultNode {
+  attrs: RTEAnchorAttrs
+  type: RTETypeEnum.a
+}
+
+export interface RTEReferenceLinkNode extends RTEDefaultNode {
+  attrs: RTELinkAttrs
+}
+
+export interface RTEImageVaultNode extends RTEDefaultNode {
+  attrs: RTEImageVaultAttrs
+  type: RTETypeEnum.ImageVault
+}
+
+export enum RTEMarkType {
+  bold = "bold",
+  break = "break",
+  classnameOrId = "classnameOrId",
+  inlineCode = "inlineCode",
+  italic = "italic",
+  strikethrough = "strikethrough",
+  subscript = "subscript",
+  superscript = "superscript",
+  underline = "underline",
+}
+
+type RTETextNodeOptionalKeys = {
+  [key in RTEMarkType]?: boolean
+}
+
+export type RTETextNode = RTETextNodeOptionalKeys & {
+  classname?: string
+  id?: string
+  text: string
+}
+
+export type RTERegularNode = RTEDefaultNode | RTEAnchorNode | RTEImageVaultNode
+
+export type RTEImageNode = RTEDefaultNode | RTEImageVaultNode
+
+export type RTEReferenceNode = RTEAnchorNode
+
+export type RTENode = RTERegularNode | RTEReferenceNode | RTETextNode
+
+export type RTERenderMark = (
+  children: React.ReactNode,
+  classname?: string,
+  id?: string
+) => JSX.Element
+
+export interface RTEDocument extends RTEDefaultNode {
+  type: RTETypeEnum.doc
+  _version: number
+}
+
+export type RTERenderOptionComponent = (
+  node: RTERegularNode,
+  embeds: EmbedByUid,
+  next: RTENext,
+  fullRenderOptions: RenderOptions
+) => React.ReactNode
+
+export type RTENext = (
+  nodes: RTENode[],
+  embeds: EmbedByUid,
+  fullRenderOptions: RenderOptions
+) => string
diff --git a/types/transitionTypes/rte/option.ts b/types/transitionTypes/rte/option.ts
new file mode 100644
index 000000000..126a5aeec
--- /dev/null
+++ b/types/transitionTypes/rte/option.ts
@@ -0,0 +1,5 @@
+import type { RTERenderMark, RTERenderOptionComponent } from "./node"
+
+export type RenderOptions = {
+  [type: string]: RTERenderOptionComponent | RTERenderMark
+}
diff --git a/types/trpc/routers/contentstack/accountPage.ts b/types/trpc/routers/contentstack/accountPage.ts
new file mode 100644
index 000000000..4bdf2b490
--- /dev/null
+++ b/types/trpc/routers/contentstack/accountPage.ts
@@ -0,0 +1,27 @@
+import { z } from "zod"
+
+import {
+  accountPageMetadataSchema,
+  accountPageRefsSchema,
+  accountPageSchema,
+  blocksSchema,
+} from "@/server/routers/contentstack/accountPage/output"
+
+export interface GetAccountPageRefsSchema
+  extends z.input<typeof accountPageRefsSchema> {}
+
+export interface AccountPageRefs
+  extends z.output<typeof accountPageRefsSchema> {}
+
+export interface GetAccountPageSchema
+  extends z.input<typeof accountPageSchema> {}
+
+export interface AccountPage extends z.output<typeof accountPageSchema> {}
+
+export interface GetAccountpageMetadata
+  extends z.output<typeof accountPageMetadataSchema> {}
+
+export interface AccountPageMetadata
+  extends z.output<typeof accountPageMetadataSchema> {}
+
+export type Block = z.output<typeof blocksSchema>
diff --git a/types/trpc/routers/contentstack/blocks.ts b/types/trpc/routers/contentstack/blocks.ts
new file mode 100644
index 000000000..8d8e449ab
--- /dev/null
+++ b/types/trpc/routers/contentstack/blocks.ts
@@ -0,0 +1,16 @@
+import { z } from "zod"
+
+import { cardsGridSchema } from "@/server/routers/contentstack/schemas/blocks/cardsGrid"
+import { contentSchema } from "@/server/routers/contentstack/schemas/blocks/content"
+import { dynamicContentSchema } from "@/server/routers/contentstack/schemas/blocks/dynamicContent"
+import { shortcutsSchema } from "@/server/routers/contentstack/schemas/blocks/shortcuts"
+
+import { textColsSchema } from "@/server/routers/contentstack/schemas/blocks/textCols"
+
+export interface CardsGrid extends z.output<typeof cardsGridSchema> { }
+export interface Content extends z.output<typeof contentSchema> { }
+export interface DynamicContent extends z.output<typeof dynamicContentSchema> { }
+export interface Shortcuts extends z.output<typeof shortcutsSchema> { }
+export type Shortcut = Shortcuts["shortcuts"]
+export interface TextCols extends z.output<typeof textColsSchema> { }
+
diff --git a/types/trpc/routers/contentstack/contentPage.ts b/types/trpc/routers/contentstack/contentPage.ts
index 29eaf983e..d95521319 100644
--- a/types/trpc/routers/contentstack/contentPage.ts
+++ b/types/trpc/routers/contentstack/contentPage.ts
@@ -1,103 +1,23 @@
 import { z } from "zod"
 
 import {
-  cardBlock,
-  contentPageBlockTextContent,
-  contentPageCards,
-  contentPageDynamicContent,
-  contentPageJoinLoyaltyContact,
-  contentPageShortcuts,
-  contentPageSidebarDynamicContent,
-  contentPageSidebarTextContent,
-  contentPageTextCols,
-  loyaltyCardBlock,
-  validateContentPageRefsSchema,
-  validateContentPageSchema,
+  blocksSchema,
+  contentPageRefsSchema,
+  contentPageSchema,
+  sidebarSchema,
 } from "@/server/routers/contentstack/contentPage/output"
 
-import { ImageVaultAsset } from "@/types/components/imageVault"
-import { Embeds } from "@/types/requests/embeds"
-import { EdgesWithTotalCount } from "@/types/requests/utils/edges"
-import { RTEDocument } from "@/types/rte/node"
+export interface GetContentPageRefsSchema
+  extends z.input<typeof contentPageRefsSchema> { }
 
-export type ContentPageDataRaw = z.infer<typeof validateContentPageSchema>
+export interface ContentPageRefs
+  extends z.output<typeof contentPageRefsSchema> { }
 
-type ContentPageRaw = ContentPageDataRaw["content_page"]
+export interface GetContentPageSchema
+  extends z.input<typeof contentPageSchema> { }
 
-export type ContentPage = Omit<
-  ContentPageRaw,
-  "blocks" | "hero_image" | "sidebar"
-> & {
-  heroImage?: ImageVaultAsset
-  blocks: Block[]
-  sidebar: Sidebar[]
-}
+export interface ContentPage extends z.output<typeof contentPageSchema> { }
 
-export type ContentPageRefsDataRaw = z.infer<
-  typeof validateContentPageRefsSchema
->
+export type Block = z.output<typeof blocksSchema>
 
-type SidebarContentRaw = z.infer<typeof contentPageSidebarTextContent>
-type SideBarDynamicContent = z.infer<typeof contentPageSidebarDynamicContent>
-export type JoinLoyaltyContact = z.infer<typeof contentPageJoinLoyaltyContact>
-export type RteSidebarContent = Omit<SidebarContentRaw, "content"> & {
-  content: {
-    content: {
-      json: RTEDocument
-      embedded_itemsConnection: EdgesWithTotalCount<Embeds>
-    }
-  }
-}
-
-export type Sidebar =
-  | JoinLoyaltyContact
-  | RteSidebarContent
-  | SideBarDynamicContent
-
-export type DynamicContent = z.infer<typeof contentPageDynamicContent>
-
-type BlockContentRaw = z.infer<typeof contentPageBlockTextContent>
-export interface RteBlockContent extends BlockContentRaw {
-  content: {
-    content: {
-      json: RTEDocument
-      embedded_itemsConnection: EdgesWithTotalCount<Embeds>
-    }
-  }
-}
-
-export type Shortcuts = z.infer<typeof contentPageShortcuts>
-
-type LoyaltyCardRaw = z.infer<typeof loyaltyCardBlock>
-type LoyaltyCard = Omit<LoyaltyCardRaw, "image"> & {
-  image?: ImageVaultAsset
-}
-type CardRaw = z.infer<typeof cardBlock>
-type Card = Omit<CardRaw, "background_image"> & {
-  backgroundImage?: ImageVaultAsset
-}
-type CardsGridRaw = z.infer<typeof contentPageCards>
-export type CardsGrid = Omit<CardsGridRaw, "cards"> & {
-  cards: (LoyaltyCard | Card)[]
-}
-export type CardsRaw = CardsGrid["cards_grid"]["cards"][number]
-
-type TextColsRaw = z.infer<typeof contentPageTextCols>
-export interface TextCols extends TextColsRaw {
-  textCols: {
-    columns: {
-      title: string
-      text: {
-        json: RTEDocument
-        embedded_itemsConnection: EdgesWithTotalCount<Embeds>
-      }
-    }[]
-  }
-}
-
-export type Block =
-  | RteBlockContent
-  | Shortcuts
-  | CardsGrid
-  | DynamicContent
-  | TextCols
+export type SidebarBlock = z.output<typeof sidebarSchema>
diff --git a/types/trpc/routers/contentstack/hotelPage.ts b/types/trpc/routers/contentstack/hotelPage.ts
new file mode 100644
index 000000000..329a7b207
--- /dev/null
+++ b/types/trpc/routers/contentstack/hotelPage.ts
@@ -0,0 +1,15 @@
+import { z } from "zod"
+
+import {
+  contentBlock,
+  hotelPageSchema,
+} from "@/server/routers/contentstack/hotelPage/output"
+import { activitiesCard } from "@/server/routers/contentstack/schemas/blocks/activitiesCard"
+
+// Will be extended once we introduce more functionality to our entries.
+export interface GetHotelPageData extends z.input<typeof hotelPageSchema> {}
+export interface HotelPage extends z.output<typeof hotelPageSchema> {}
+
+export interface ActivitiesCard extends z.output<typeof activitiesCard> {}
+export type ActivityCard = ActivitiesCard["upcoming_activities_card"]
+export interface ContentBlock extends z.output<typeof contentBlock> {}
diff --git a/types/trpc/routers/contentstack/loyaltyPage.ts b/types/trpc/routers/contentstack/loyaltyPage.ts
new file mode 100644
index 000000000..277d45ae0
--- /dev/null
+++ b/types/trpc/routers/contentstack/loyaltyPage.ts
@@ -0,0 +1,23 @@
+import { z } from "zod"
+
+import {
+  blocksSchema,
+  loyaltyPageRefsSchema,
+  loyaltyPageSchema,
+  sidebarSchema,
+} from "@/server/routers/contentstack/loyaltyPage/output"
+
+export interface GetLoyaltyPageRefsSchema
+  extends z.input<typeof loyaltyPageRefsSchema> {}
+
+export interface LoyaltyPageRefs
+  extends z.output<typeof loyaltyPageRefsSchema> {}
+
+export interface GetLoyaltyPageSchema
+  extends z.input<typeof loyaltyPageSchema> {}
+
+export interface LoyaltyPage extends z.output<typeof loyaltyPageSchema> {}
+
+export type Block = z.output<typeof blocksSchema>
+
+export type SidebarBlock = z.output<typeof sidebarSchema>
diff --git a/types/trpc/routers/contentstack/sidebar.ts b/types/trpc/routers/contentstack/sidebar.ts
new file mode 100644
index 000000000..b0998fb95
--- /dev/null
+++ b/types/trpc/routers/contentstack/sidebar.ts
@@ -0,0 +1,12 @@
+import { z } from "zod"
+
+import { joinLoyaltyContactSidebarSchema } from "@/server/routers/contentstack/loyaltyPage/output"
+import { contactSchema } from "@/server/routers/contentstack/schemas/sidebar/joinLoyaltyContact"
+
+export interface JoinLoyaltyContact
+  extends z.output<typeof joinLoyaltyContactSidebarSchema> {}
+type ContactsSchema = z.output<typeof contactSchema>
+export type Contacts = ContactsSchema["contact"]
+export interface Contact {
+  contact: NonNullable<Contacts[number]>
+}
diff --git a/types/trpc/routers/hotel/locations.ts b/types/trpc/routers/hotel/locations.ts
new file mode 100644
index 000000000..859aa8a03
--- /dev/null
+++ b/types/trpc/routers/hotel/locations.ts
@@ -0,0 +1,8 @@
+import { z } from "zod"
+
+import { apiLocationsSchema } from "@/server/routers/hotels/output"
+
+export interface LocationSchema extends z.output<typeof apiLocationsSchema> {}
+
+export type Locations = LocationSchema["data"]
+export type Location = Locations[number]
diff --git a/types/trpc/routers/utils/embeds.ts b/types/trpc/routers/utils/embeds.ts
new file mode 100644
index 000000000..d32971741
--- /dev/null
+++ b/types/trpc/routers/utils/embeds.ts
@@ -0,0 +1,5 @@
+import { z } from "zod"
+
+import { contentEmbedsSchema } from "@/server/routers/contentstack/schemas/blocks/contentEmbeds"
+
+export type Embeds = z.output<typeof contentEmbedsSchema>
diff --git a/types/user.ts b/types/user.ts
index a90602661..78587fa7c 100644
--- a/types/user.ts
+++ b/types/user.ts
@@ -1,32 +1,15 @@
 import { z } from "zod"
 
-import { creditCardSchema, getUserSchema } from "@/server/routers/user/output"
-
-type Journey = {
-  tag: string
-  title: string
-}
-
-type ShortcutLink = {
-  href: string
-  title: string
-}
-
-type Victory = {
-  tag: string
-  title: string
-}
+import { creditCardSchema, getUserSchema, membershipSchema } from "@/server/routers/user/output"
 
 /**
  * All extended field needs to be added by API team to response or
  * we have to get the values from elsewhere
  */
-export interface User extends z.infer<typeof getUserSchema> {
-  name: string
-  journeys: Journey[]
-  nights: number
-  shortcuts: ShortcutLink[]
-  victories: Victory[]
-}
+export interface User extends z.output<typeof getUserSchema> { }
 
 export type CreditCard = z.output<typeof creditCardSchema>
+
+export interface Membership extends z.output<typeof membershipSchema> { }
+
+export type Memberships = Membership[]
diff --git a/utils/generateMetadata.ts b/utils/generateMetadata.ts
index ba56b33c9..c75579587 100644
--- a/utils/generateMetadata.ts
+++ b/utils/generateMetadata.ts
@@ -28,3 +28,32 @@ export async function generateMetadata() {
     },
   }
 }
+
+export async function generateMetadataAccountPage() {
+  const metaData = await serverClient().contentstack.accountPage.metadata.get()
+
+  if (!metaData) {
+    return {
+      title: "",
+      description: "",
+      openGraph: {
+        images: [],
+      },
+    }
+  }
+
+  const title = metaData?.breadcrumbsTitle ?? metaData?.title ?? ""
+  const description = metaData?.description ?? ""
+  const images =
+    metaData?.imageConnection?.edges?.map((edge) => ({
+      url: edge.node.url,
+    })) || []
+
+  return {
+    title,
+    description,
+    openGraph: {
+      images,
+    },
+  }
+}
diff --git a/utils/generateTag.ts b/utils/generateTag.ts
index 09b7e8a2f..c74dd08c1 100644
--- a/utils/generateTag.ts
+++ b/utils/generateTag.ts
@@ -1,3 +1,4 @@
+import { System } from "@/types/requests/system"
 import type { Edges } from "@/types/requests/utils/edges"
 import type { NodeRefs } from "@/types/requests/utils/refs"
 import type { Lang } from "@/constants/languages"
@@ -69,3 +70,16 @@ export function generateTags(lang: Lang, connections: Edges<NodeRefs>[]) {
     })
     .flat()
 }
+
+export function generateTagsFromSystem(
+  lang: Lang,
+  connections: System["system"][]
+) {
+  return connections.map((system) => {
+    return generateRefTag(
+      system.locale ?? lang,
+      system.content_type_uid,
+      system.uid
+    )
+  })
+}
diff --git a/utils/loyaltyTable.ts b/utils/loyaltyTable.ts
index 996a2a7a4..bd5e56bc7 100644
--- a/utils/loyaltyTable.ts
+++ b/utils/loyaltyTable.ts
@@ -1,7 +1,4 @@
-import type {
-  Benefit,
-  ComparisonLevel,
-} from "@/types/components/loyalty/blocks"
+import type { Benefit, ComparisonLevel } from "@/types/components/overviewTable"
 
 export function getUnlockedBenefits(levels: ComparisonLevel[]) {
   const allBenefits = levels
diff --git a/utils/user.ts b/utils/user.ts
index 25157fc80..66ddea937 100644
--- a/utils/user.ts
+++ b/utils/user.ts
@@ -3,14 +3,14 @@ import { z } from "zod"
 import { MembershipLevelEnum } from "@/constants/membershipLevels"
 import { getMembershipCardsSchema } from "@/server/routers/user/output"
 
-import { User } from "@/types/user"
+import type { Memberships, User } from "@/types/user"
 
 enum scandicMemberships {
   guestpr = "guestpr",
   scandicfriends = "scandicfriend's",
 }
 
-export function getMembership(memberships: User["memberships"]) {
+export function getMembership(memberships: Memberships) {
   return memberships?.find(
     (membership) =>
       membership.membershipType.toLowerCase() === scandicMemberships.guestpr