diff --git a/.env.example b/.env.example
index daa0dc0a52..0a75c7390a 100644
--- a/.env.example
+++ b/.env.example
@@ -79,6 +79,9 @@ CALENDSO_ENCRYPTION_KEY=
 # Intercom Config
 NEXT_PUBLIC_INTERCOM_APP_ID=
 
+# Secret to enable Intercom Identity Verification
+INTERCOM_SECRET=
+
 # Zendesk Config
 NEXT_PUBLIC_ZENDESK_KEY=
 
@@ -160,9 +163,6 @@ CLOSECOM_API_KEY=
 # Sendgrid internal sync service
 SENDGRID_SYNC_API_KEY=
 
-# Sentry
-NEXT_PUBLIC_SENTRY_DSN=
-SENTRY_IGNORE_API_RESOLUTION_ERROR=
 
 # Change your Brand
 NEXT_PUBLIC_APP_NAME="Cal.com"
@@ -178,4 +178,4 @@ CSP_POLICY=
 # Vercel Edge Config
 EDGE_CONFIG=
 
-NEXT_PUBLIC_MINUTES_TO_BOOK=5 # Minutes 
\ No newline at end of file
+NEXT_PUBLIC_MINUTES_TO_BOOK=5 # Minutes
diff --git a/.github/workflows/cron-stale-issue.yml b/.github/workflows/cron-stale-issue.yml
index 900f4c0bd9..b8ee224654 100644
--- a/.github/workflows/cron-stale-issue.yml
+++ b/.github/workflows/cron-stale-issue.yml
@@ -2,6 +2,7 @@ name: Cron - mark stale for inactive issues
 
 permissions:
   issues: write
+  pull-requests: write
 
 on:
   # "Scheduled workflows run on the latest commit on the default or base branch."
diff --git a/.github/workflows/nextjs-bundle-analysis.yml b/.github/workflows/nextjs-bundle-analysis.yml
index e5586be406..1e5d821a01 100644
--- a/.github/workflows/nextjs-bundle-analysis.yml
+++ b/.github/workflows/nextjs-bundle-analysis.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Analyze bundle
         run: |
           cd apps/web
-          npx -p nextjs-bundle-analysis report
+          npx -p nextjs-bundle-analysis@0.5.0 report
 
       - name: Upload bundle
         uses: actions/upload-artifact@v2
@@ -76,7 +76,7 @@ jobs:
         id: fc
         with:
           issue-number: ${{ github.event.number }}
-          body-includes: "<!-- __NEXTJS_BUNDLE -->"
+          body-includes: "<!-- __NEXTJS_BUNDLE_@calcom/web -->"
 
       - name: Create Comment
         uses: peter-evans/create-or-update-comment@v1.4.4
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 6a9d968c05..16f119312b 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -2,7 +2,6 @@ name: PR Update
 
 on:
   pull_request_target:
-    types: [ready_for_review, review_requested]
     branches:
       - main
     paths-ignore:
diff --git a/apps/storybook/.storybook/main.js b/apps/storybook/.storybook/main.js
index 3b7382f1ed..9b0d21eada 100644
--- a/apps/storybook/.storybook/main.js
+++ b/apps/storybook/.storybook/main.js
@@ -4,6 +4,7 @@ module.exports = {
   stories: [
     "../intro.stories.mdx",
     "../../../packages/ui/components/**/*.stories.mdx",
+    "../../../packages/atoms/**/*.stories.mdx",
     "../../../packages/features/**/*.stories.mdx",
     "../../../packages/ui/components/**/*.stories.@(js|jsx|ts|tsx)",
   ],
@@ -70,4 +71,5 @@ module.exports = {
 
     return config;
   },
+  typescript: { reactDocgen: 'react-docgen' }
 };
diff --git a/apps/web/.gitignore b/apps/web/.gitignore
index e9c028b5aa..520a11d78c 100644
--- a/apps/web/.gitignore
+++ b/apps/web/.gitignore
@@ -68,5 +68,3 @@ public/embed
 
 # Copied app-store images
 public/app-store
-# Sentry
-.sentryclirc
diff --git a/apps/web/components/I18nLanguageHandler.tsx b/apps/web/components/I18nLanguageHandler.tsx
index 3072b3504c..f7c9ba2930 100644
--- a/apps/web/components/I18nLanguageHandler.tsx
+++ b/apps/web/components/I18nLanguageHandler.tsx
@@ -1,7 +1,7 @@
+import { isEmpty } from "lodash";
 import { useTranslation } from "next-i18next";
 import { useEffect } from "react";
 
-import { getDirFromLang } from "@calcom/lib/i18n";
 import { trpc } from "@calcom/trpc/react";
 
 export function useViewerI18n() {
@@ -22,16 +22,18 @@ export function useViewerI18n() {
  */
 const I18nLanguageHandler = (): null => {
   const { i18n } = useTranslation("common");
-  const locale = useViewerI18n().data?.locale || "en";
+  const locale = useViewerI18n().data?.locale || i18n.language;
 
   useEffect(() => {
-    if (locale && i18n.language && i18n.language !== locale) {
-      if (typeof i18n.changeLanguage === "function") i18n.changeLanguage(locale);
+    // bail early when i18n = {}
+    if (isEmpty(i18n)) return;
+    // if locale is ready and the i18n.language does != locale - changeLanguage
+    if (locale && i18n.language !== locale) {
+      i18n.changeLanguage(locale);
     }
-
-    const dir = getDirFromLang(locale);
+    // set dir="rtl|ltr"
+    document.dir = i18n.dir();
     document.documentElement.setAttribute("lang", locale);
-    document.documentElement.setAttribute("dir", dir);
   }, [locale, i18n]);
 
   return null;
diff --git a/apps/web/components/ImageUploader.tsx b/apps/web/components/ImageUploader.tsx
deleted file mode 100644
index d4c133154c..0000000000
--- a/apps/web/components/ImageUploader.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import type { FormEvent } from "react";
-import { useCallback, useEffect, useState } from "react";
-import Cropper from "react-easy-crop";
-
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogClose, DialogContent, DialogTrigger } from "@calcom/ui";
-
-import type { Area } from "@lib/cropImage";
-import { getCroppedImg } from "@lib/cropImage";
-import { useFileReader } from "@lib/hooks/useFileReader";
-
-import Slider from "@components/Slider";
-
-type ImageUploaderProps = {
-  id: string;
-  buttonMsg: string;
-  handleAvatarChange: (imageSrc: string) => void;
-  imageSrc?: string;
-  target: string;
-};
-
-interface FileEvent<T = Element> extends FormEvent<T> {
-  target: EventTarget & T;
-}
-
-// This is separate to prevent loading the component until file upload
-function CropContainer({
-  onCropComplete,
-  imageSrc,
-}: {
-  imageSrc: string;
-  onCropComplete: (croppedAreaPixels: Area) => void;
-}) {
-  const { t } = useLocale();
-  const [crop, setCrop] = useState({ x: 0, y: 0 });
-  const [zoom, setZoom] = useState(1);
-
-  const handleZoomSliderChange = (value: number) => {
-    value < 1 ? setZoom(1) : setZoom(value);
-  };
-
-  return (
-    <div className="crop-container h-40 max-h-40 w-40 rounded-full">
-      <div className="relative h-40 w-40 rounded-full">
-        <Cropper
-          image={imageSrc}
-          crop={crop}
-          zoom={zoom}
-          aspect={1}
-          onCropChange={setCrop}
-          onCropComplete={(croppedArea, croppedAreaPixels) => onCropComplete(croppedAreaPixels)}
-          onZoomChange={setZoom}
-        />
-      </div>
-      <Slider
-        value={zoom}
-        min={1}
-        max={3}
-        step={0.1}
-        label={t("slide_zoom_drag_instructions")}
-        changeHandler={handleZoomSliderChange}
-      />
-    </div>
-  );
-}
-
-/** @deprecated Use `packages/ui/v2/core/ImageUploader.tsx` */
-export default function ImageUploader({
-  target,
-  id,
-  buttonMsg,
-  handleAvatarChange,
-  ...props
-}: ImageUploaderProps) {
-  const { t } = useLocale();
-  const [imageSrc, setImageSrc] = useState<string | null>(null);
-  const [croppedAreaPixels, setCroppedAreaPixels] = useState<Area | null>(null);
-
-  const [{ result }, setFile] = useFileReader({
-    method: "readAsDataURL",
-  });
-
-  useEffect(() => {
-    if (props.imageSrc) setImageSrc(props.imageSrc);
-  }, [props.imageSrc]);
-
-  const onInputFile = (e: FileEvent<HTMLInputElement>) => {
-    if (!e.target.files?.length) {
-      return;
-    }
-    setFile(e.target.files[0]);
-  };
-
-  const showCroppedImage = useCallback(
-    async (croppedAreaPixels: Area | null) => {
-      try {
-        if (!croppedAreaPixels) return;
-        const croppedImage = await getCroppedImg(
-          result as string /* result is always string when using readAsDataUrl */,
-          croppedAreaPixels
-        );
-        setImageSrc(croppedImage);
-        handleAvatarChange(croppedImage);
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    [result, handleAvatarChange]
-  );
-
-  return (
-    <Dialog
-      onOpenChange={
-        (opened) => !opened && setFile(null) // unset file on close
-      }>
-      <DialogTrigger asChild>
-        <div className="flex items-center">
-          <Button color="secondary" type="button" className="py-1 text-xs">
-            {buttonMsg}
-          </Button>
-        </div>
-      </DialogTrigger>
-      <DialogContent>
-        <div className="mb-4 sm:flex sm:items-start">
-          <div className="mt-3 text-center sm:mt-0 sm:text-left">
-            <h3 className="font-cal text-emphasis text-lg leading-6" id="modal-title">
-              {t("upload_target", { target })}
-            </h3>
-          </div>
-        </div>
-        <div className="mb-4">
-          <div className="cropper mt-6 flex flex-col items-center justify-center p-8">
-            {!result && (
-              <div className="bg-muted flex h-20 max-h-20 w-20 items-center justify-start rounded-full">
-                {!imageSrc && (
-                  <p className="text-inverted w-full text-center text-sm sm:text-xs">
-                    {t("no_target", { target })}
-                  </p>
-                )}
-                {imageSrc && (
-                  // eslint-disable-next-line @next/next/no-img-element
-                  <img className="h-20 w-20 rounded-full" src={imageSrc} alt={target} />
-                )}
-              </div>
-            )}
-            {result && <CropContainer imageSrc={result as string} onCropComplete={setCroppedAreaPixels} />}
-            <label className="border-default bg-default hover:bg-mutedover:text-emphasis dark:hover:bg-inverted text-default dark:text-inverted focus:ring-empthasis mt-8 rounded-sm border px-3 py-1 text-xs font-medium leading-4 focus:outline-none focus:ring-2 focus:ring-offset-1 dark:border-gray-800 dark:bg-transparent">
-              <input
-                onInput={onInputFile}
-                type="file"
-                name={id}
-                placeholder={t("upload_image")}
-                className="pointer-events-none absolute mt-4 opacity-0"
-                accept="image/*"
-              />
-              {t("choose_a_file")}
-            </label>
-          </div>
-        </div>
-        <div className="mt-5 gap-x-2 sm:mt-4 sm:flex sm:flex-row-reverse">
-          <DialogClose onClick={() => showCroppedImage(croppedAreaPixels)}>{t("save")}</DialogClose>
-          <DialogClose color="secondary">{t("cancel")}</DialogClose>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/apps/web/components/NavTabs.tsx b/apps/web/components/NavTabs.tsx
index f92e0fda40..fe66bc3558 100644
--- a/apps/web/components/NavTabs.tsx
+++ b/apps/web/components/NavTabs.tsx
@@ -1,4 +1,3 @@
-import { AdminRequired } from "components/ui/AdminRequired";
 import { noop } from "lodash";
 import type { LinkProps } from "next/link";
 import Link from "next/link";
@@ -6,6 +5,7 @@ import { useRouter } from "next/router";
 import type { FC, MouseEventHandler } from "react";
 import { Fragment } from "react";
 
+import { PermissionContainer } from "@calcom/features/auth/PermissionContainer";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 
 import classNames from "@lib/classNames";
@@ -60,7 +60,7 @@ const NavTabs: FC<NavTabProps> = ({ tabs, linkProps, ...props }) => {
               }
             : noop;
 
-          const Component = tab.adminRequired ? AdminRequired : Fragment;
+          const Component = tab.adminRequired ? PermissionContainer : Fragment;
           const className = tab.className || "";
           return (
             <Component key={tab.name}>
diff --git a/apps/web/components/PageWrapper.tsx b/apps/web/components/PageWrapper.tsx
new file mode 100644
index 0000000000..cbd9f19ece
--- /dev/null
+++ b/apps/web/components/PageWrapper.tsx
@@ -0,0 +1,82 @@
+import { DefaultSeo } from "next-seo";
+import { Inter } from "next/font/google";
+import localFont from "next/font/local";
+import Script from "next/script";
+
+import "@calcom/embed-core/src/embed-iframe";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
+
+import type { AppProps } from "@lib/app-providers";
+import AppProviders from "@lib/app-providers";
+import { seoConfig } from "@lib/config/next-seo.config";
+
+import I18nLanguageHandler from "@components/I18nLanguageHandler";
+
+export interface CalPageWrapper {
+  (props?: any): JSX.Element;
+  PageWrapper?: AppProps["Component"]["PageWrapper"];
+}
+
+const interFont = Inter({ subsets: ["latin"], variable: "--font-inter", preload: true, display: "swap" });
+const calFont = localFont({
+  src: "../fonts/CalSans-SemiBold.woff2",
+  variable: "--font-cal",
+  preload: true,
+  display: "swap",
+});
+
+function PageWrapper(props: AppProps) {
+  const { Component, pageProps, err, router } = props;
+  let pageStatus = "200";
+
+  if (router.pathname === "/404") {
+    pageStatus = "404";
+  } else if (router.pathname === "/500") {
+    pageStatus = "500";
+  }
+
+  // On client side don't let nonce creep into DOM
+  // It also avoids hydration warning that says that Client has the nonce value but server has "" because browser removes nonce attributes before DOM is built
+  // See https://github.com/kentcdodds/nonce-hydration-issues
+  // Set "" only if server had it set otherwise keep it undefined because server has to match with client to avoid hydration error
+  const nonce = typeof window !== "undefined" ? (pageProps.nonce ? "" : undefined) : pageProps.nonce;
+  const providerProps = {
+    ...props,
+    pageProps: {
+      ...props.pageProps,
+      nonce,
+    },
+  };
+  // Use the layout defined at the page level, if available
+  const getLayout = Component.getLayout ?? ((page) => page);
+  return (
+    <AppProviders {...providerProps}>
+      <DefaultSeo {...seoConfig.defaultNextSeo} />
+      <I18nLanguageHandler />
+      <Script
+        nonce={nonce}
+        id="page-status"
+        dangerouslySetInnerHTML={{ __html: `window.CalComPageStatus = '${pageStatus}'` }}
+      />
+      <style jsx global>{`
+        :root {
+          --font-inter: ${interFont.style.fontFamily};
+          --font-cal: ${calFont.style.fontFamily};
+        }
+      `}</style>
+
+      {getLayout(
+        Component.requiresLicense ? (
+          <LicenseRequired>
+            <Component {...pageProps} err={err} />
+          </LicenseRequired>
+        ) : (
+          <Component {...pageProps} err={err} />
+        ),
+        router
+      )}
+    </AppProviders>
+  );
+}
+
+export default PageWrapper;
diff --git a/apps/web/components/SettingsShell.tsx b/apps/web/components/SettingsShell.tsx
index 0dfb97d090..fb53eb7e04 100644
--- a/apps/web/components/SettingsShell.tsx
+++ b/apps/web/components/SettingsShell.tsx
@@ -46,7 +46,7 @@ export default function SettingsShell({
   ...rest
 }: { children: React.ReactNode } & ComponentProps<typeof Shell>) {
   return (
-    <Shell {...rest}>
+    <Shell {...rest} hideHeadingOnMobile>
       <div className="sm:mx-auto">
         <NavTabs tabs={tabs} />
       </div>
diff --git a/apps/web/components/Slider.tsx b/apps/web/components/Slider.tsx
deleted file mode 100644
index cf8e4d54ee..0000000000
--- a/apps/web/components/Slider.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as SliderPrimitive from "@radix-ui/react-slider";
-import React from "react";
-
-const Slider = ({
-  value,
-  label,
-  changeHandler,
-  ...props
-}: Omit<SliderPrimitive.SliderProps, "value"> & {
-  value: number;
-  label: string;
-  changeHandler: (value: number) => void;
-}) => (
-  <SliderPrimitive.Root
-    className="slider mt-2"
-    value={[value]}
-    aria-label={label}
-    onValueChange={(value: number[]) => changeHandler(value[0] ?? value)}
-    {...props}>
-    <SliderPrimitive.Track className="slider-track">
-      <SliderPrimitive.Range className="slider-range" />
-    </SliderPrimitive.Track>
-    <SliderPrimitive.Thumb className="slider-thumb" />
-  </SliderPrimitive.Root>
-);
-
-export default Slider;
diff --git a/apps/web/components/apps/App.tsx b/apps/web/components/apps/App.tsx
index ccc379a3ea..dfb9fad24b 100644
--- a/apps/web/components/apps/App.tsx
+++ b/apps/web/components/apps/App.tsx
@@ -6,7 +6,7 @@ import React, { useState } from "react";
 import useAddAppMutation from "@calcom/app-store/_utils/useAddAppMutation";
 import { InstallAppButton, AppDependencyComponent } from "@calcom/app-store/components";
 import DisconnectIntegration from "@calcom/features/apps/components/DisconnectIntegration";
-import LicenseRequired from "@calcom/features/ee/common/components/v2/LicenseRequired";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import Shell from "@calcom/features/shell/Shell";
 import classNames from "@calcom/lib/classNames";
 import { APP_NAME, COMPANY_NAME, SUPPORT_MAIL_ADDRESS } from "@calcom/lib/constants";
@@ -41,7 +41,7 @@ const Component = ({
   isTemplate,
   dependencies,
 }: Parameters<typeof App>[0]) => {
-  const { t } = useLocale();
+  const { t, i18n } = useLocale();
   const hasDescriptionItems = descriptionItems && descriptionItems.length > 0;
   const router = useRouter();
 
@@ -238,7 +238,7 @@ const Component = ({
           </span>
         )}
 
-        <div className="prose-sm prose prose-headings:text-emphasis prose-code:text-default prose-strong:text-default text-default mt-8">
+        <div className="prose-sm prose prose-a:text-default prose-headings:text-emphasis prose-code:text-default prose-strong:text-default text-default mt-8">
           {body}
         </div>
         <h4 className="text-emphasis mt-8 font-semibold ">{t("pricing")}</h4>
@@ -247,7 +247,7 @@ const Component = ({
             t("free_to_use_apps")
           ) : (
             <>
-              {Intl.NumberFormat("en-US", {
+              {Intl.NumberFormat(i18n.language, {
                 style: "currency",
                 currency: "USD",
                 useGrouping: false,
@@ -366,7 +366,7 @@ export default function App(props: {
   dependencies?: string[];
 }) {
   return (
-    <Shell smallHeading isPublic heading={<ShellHeading />} backPath="/apps" withoutSeo>
+    <Shell smallHeading isPublic hideHeadingOnMobile heading={<ShellHeading />} backPath="/apps" withoutSeo>
       <HeadSeo
         title={props.name}
         description={props.description}
diff --git a/apps/web/components/apps/CalendarListContainer.tsx b/apps/web/components/apps/CalendarListContainer.tsx
index 8b1bb84dd9..c66596f138 100644
--- a/apps/web/components/apps/CalendarListContainer.tsx
+++ b/apps/web/components/apps/CalendarListContainer.tsx
@@ -264,7 +264,7 @@ export function CalendarListContainer(props: { heading?: boolean; fromOnboarding
             {!!data.connectedCalendars.length || !!installedCalendars.data?.items.length ? (
               <>
                 {heading && (
-                  <div className="flex flex-col gap-6 rounded-md border p-7">
+                  <div className="border-default flex flex-col gap-6 rounded-md border p-7">
                     <ShellSubHeading
                       title={t("calendar")}
                       subtitle={t("installed_app_calendar_description")}
diff --git a/apps/web/components/apps/layouts/AppsLayout.tsx b/apps/web/components/apps/layouts/AppsLayout.tsx
index 36fe812814..f7a5ec0a7a 100644
--- a/apps/web/components/apps/layouts/AppsLayout.tsx
+++ b/apps/web/components/apps/layouts/AppsLayout.tsx
@@ -22,7 +22,7 @@ export default function AppsLayout({ children, actions, emptyStore, ...rest }: A
   if (session.status === "loading") return <></>;
 
   return (
-    <Shell {...rest} actions={actions?.("block")}>
+    <Shell {...rest} actions={actions?.("block")} hideHeadingOnMobile>
       <div className="flex flex-col xl:flex-row">
         <main className="w-full">
           {emptyStore ? (
diff --git a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx
index 1c00655b61..23107868e3 100644
--- a/apps/web/components/apps/layouts/InstalledAppsLayout.tsx
+++ b/apps/web/components/apps/layouts/InstalledAppsLayout.tsx
@@ -57,7 +57,7 @@ export default function InstalledAppsLayout({
   }
 
   return (
-    <Shell {...rest}>
+    <Shell {...rest} hideHeadingOnMobile>
       <AppCategoryNavigation baseURL="/apps/installed" containerClassname="min-w-0 w-full">
         {children}
       </AppCategoryNavigation>
diff --git a/apps/web/components/booking/AvailableEventLocations.tsx b/apps/web/components/booking/AvailableEventLocations.tsx
index 3210e92281..c0825cd53f 100644
--- a/apps/web/components/booking/AvailableEventLocations.tsx
+++ b/apps/web/components/booking/AvailableEventLocations.tsx
@@ -41,7 +41,7 @@ export function AvailableEventLocations({ locations }: { locations: Props["event
     return (
       <div key={`${location.type}-${index}`} className="flex flex-row items-center text-sm font-medium">
         {eventLocationType.iconUrl === "/link.svg" ? (
-          <Link className="text-default min-h-4 min-w-4 ml-[2px] opacity-70 ltr:mr-[10px] rtl:ml-[10px] " />
+          <Link className="text-default ml-[2px] h-4 w-4  ltr:mr-[10px] rtl:ml-[10px] " />
         ) : (
           <img
             src={eventLocationType.iconUrl}
diff --git a/apps/web/components/booking/BookingDescriptionPayment.tsx b/apps/web/components/booking/BookingDescriptionPayment.tsx
index 9fe9478c15..2f9ef06652 100644
--- a/apps/web/components/booking/BookingDescriptionPayment.tsx
+++ b/apps/web/components/booking/BookingDescriptionPayment.tsx
@@ -1,5 +1,5 @@
+import { i18n } from "next-i18next";
 import type { TFunction } from "next-i18next";
-import { FormattedNumber, IntlProvider } from "react-intl";
 
 import getPaymentAppData from "@calcom/lib/getPaymentAppData";
 import { CreditCard } from "@calcom/ui/components/icon";
@@ -7,28 +7,29 @@ import { CreditCard } from "@calcom/ui/components/icon";
 const BookingDescriptionPayment = (props: {
   eventType: Parameters<typeof getPaymentAppData>[0];
   t: TFunction;
+  i18n: typeof i18n;
 }) => {
   const paymentAppData = getPaymentAppData(props.eventType);
   if (!paymentAppData || paymentAppData.price <= 0) return null;
 
+  const params = {
+    amount: paymentAppData.price / 100.0,
+    formatParams: { amount: { currency: paymentAppData.currency } },
+  };
+
   return (
     <p className="text-bookinglight -ml-2 px-2 text-sm ">
       <CreditCard className="ml-[2px] -mt-1 inline-block h-4 w-4 ltr:mr-[10px] rtl:ml-[10px]" />
       {paymentAppData.paymentOption === "HOLD" ? (
-        <>
-          {props.t("no_show_fee_amount", {
-            amount: paymentAppData.price / 100.0,
-            formatParams: { amount: { currency: paymentAppData.currency } },
-          })}
-        </>
+        <>{props.t("no_show_fee_amount", params)}</>
       ) : (
-        <IntlProvider locale="en">
-          <FormattedNumber
-            value={paymentAppData.price / 100.0}
-            style="currency"
-            currency={paymentAppData.currency?.toUpperCase()}
-          />
-        </IntlProvider>
+        <>
+          {/* If undefined this will default to the browser locale */}
+          {new Intl.NumberFormat(i18n?.language, {
+            style: "currency",
+            currency: paymentAppData.currency,
+          }).format(paymentAppData.price / 100)}
+        </>
       )}
     </p>
   );
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index 04b86a9132..64c7d24b09 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -10,6 +10,7 @@ import "@calcom/dayjs/locales";
 import ViewRecordingsDialog from "@calcom/features/ee/video/ViewRecordingsDialog";
 import classNames from "@calcom/lib/classNames";
 import { formatTime } from "@calcom/lib/date-fns";
+import getPaymentAppData from "@calcom/lib/getPaymentAppData";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { getEveryFreqFor } from "@calcom/lib/recurringStrings";
 import type { RouterInputs, RouterOutputs } from "@calcom/trpc/react";
@@ -86,6 +87,8 @@ function BookingListItem(booking: BookingItemProps) {
   const isTabRecurring = booking.listingStatus === "recurring";
   const isTabUnconfirmed = booking.listingStatus === "unconfirmed";
 
+  const paymentAppData = getPaymentAppData(booking.eventType);
+
   const bookingConfirm = async (confirm: boolean) => {
     let body = {
       bookingId: booking.id,
@@ -258,7 +261,12 @@ function BookingListItem(booking: BookingItemProps) {
   };
 
   const title = booking.title;
-  const showRecordingsButtons = booking.isRecorded && isPast && isConfirmed;
+  // To be used after we run query on legacy bookings
+  // const showRecordingsButtons = booking.isRecorded && isPast && isConfirmed;
+
+  const showRecordingsButtons =
+    (booking.location === "integrations:daily" || booking?.location?.trim() === "") && isPast && isConfirmed;
+
   return (
     <>
       <RescheduleDialog
@@ -408,7 +416,7 @@ function BookingListItem(booking: BookingItemProps) {
               {title}
               <span> </span>
 
-              {!!booking?.eventType?.price && !booking.paid && (
+              {paymentAppData.enabled && !booking.paid && booking.payment.length && (
                 <Badge className="ms-2 me-2 hidden sm:inline-flex" variant="orange">
                   {t("pending_payment")}
                 </Badge>
diff --git a/apps/web/components/booking/CancelBooking.tsx b/apps/web/components/booking/CancelBooking.tsx
index eff581bde9..5bb7578d1b 100644
--- a/apps/web/components/booking/CancelBooking.tsx
+++ b/apps/web/components/booking/CancelBooking.tsx
@@ -2,7 +2,6 @@ import { useRouter } from "next/router";
 import { useCallback, useState } from "react";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import useTheme from "@calcom/lib/hooks/useTheme";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import type { RecurringEvent } from "@calcom/types/Calendar";
 import { Button, TextArea } from "@calcom/ui";
@@ -34,7 +33,6 @@ export default function CancelBooking(props: Props) {
   const [loading, setLoading] = useState(false);
   const telemetry = useTelemetry();
   const [error, setError] = useState<string | null>(booking ? null : t("booking_already_cancelled"));
-  useTheme(props.theme);
 
   const cancelBookingRef = useCallback((node: HTMLTextAreaElement) => {
     if (node !== null) {
diff --git a/apps/web/components/booking/pages/AvailabilityPage.tsx b/apps/web/components/booking/pages/AvailabilityPage.tsx
index 8f41228ec1..dbfa63657e 100644
--- a/apps/web/components/booking/pages/AvailabilityPage.tsx
+++ b/apps/web/components/booking/pages/AvailabilityPage.tsx
@@ -1,7 +1,6 @@
 import dynamic from "next/dynamic";
 import { useRouter } from "next/router";
 import { useEffect, useMemo, useReducer, useState } from "react";
-import { FormattedNumber, IntlProvider } from "react-intl";
 import { z } from "zod";
 
 import BookingPageTagManager from "@calcom/app-store/BookingPageTagManager";
@@ -21,7 +20,6 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import useTheme from "@calcom/lib/hooks/useTheme";
 import notEmpty from "@calcom/lib/notEmpty";
 import { getRecurringFreq } from "@calcom/lib/recurringStrings";
-import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { detectBrowserTimeFormat, setIs24hClockInLocalStorage, TimeFormat } from "@calcom/lib/timeFormat";
 import { trpc } from "@calcom/trpc";
 import { HeadSeo, NumberInput, useCalcomTheme } from "@calcom/ui";
@@ -38,7 +36,7 @@ import type { AvailabilityPageProps } from "../../../pages/[user]/[type]";
 import type { DynamicAvailabilityPageProps } from "../../../pages/d/[link]/[slug]";
 import type { AvailabilityTeamPageProps } from "../../../pages/team/[slug]/[type]";
 
-const PoweredByCal = dynamic(() => import("@components/ui/PoweredByCal"));
+const PoweredBy = dynamic(() => import("@calcom/ee/components/PoweredBy"));
 
 const Toaster = dynamic(() => import("react-hot-toast").then((mod) => mod.Toaster), { ssr: false });
 /*const SlotPicker = dynamic(() => import("../SlotPicker").then((mod) => mod.SlotPicker), {
@@ -76,7 +74,7 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
     brandColor: profile.brandColor,
     darkBrandColor: profile.darkBrandColor,
   });
-  const { t } = useLocale();
+  const { t, i18n } = useLocale();
   const availabilityDatePickerEmbedStyles = useEmbedStyles("availabilityDatePicker");
   //TODO: Plan to remove shouldAlignCentrallyInEmbed config
   const shouldAlignCentrallyInEmbed = useEmbedNonStylesConfig("align") !== "left";
@@ -105,8 +103,9 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
 
   const [recurringEventCount, setRecurringEventCount] = useState(eventType.recurringEvent?.count);
 
+  /*
   const telemetry = useTelemetry();
-  useEffect(() => {
+   useEffect(() => {
     if (top !== window) {
       //page_view will be collected automatically by _middleware.ts
       telemetry.event(
@@ -114,7 +113,7 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
         collectPageParameters("/availability", { isTeamBooking: document.URL.includes("team/") })
       );
     }
-  }, [telemetry]);
+  }, [telemetry]); */
   const embedUiConfig = useEmbedUiConfig();
   // get dynamic user list here
   const userList = eventType.users ? eventType.users.map((user) => user.username).filter(notEmpty) : [];
@@ -124,16 +123,7 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
     [timeZone]
   );
   const paymentAppData = getPaymentAppData(eventType);
-  const paymentAmount = () => {
-    return;
-    <IntlProvider locale="en">
-      <FormattedNumber
-        value={paymentAppData.price / 100.0}
-        style="currency"
-        currency={paymentAppData.currency?.toUpperCase()}
-      />
-    </IntlProvider>;
-  };
+
   const rainbowAppData = getEventTypeAppData(eventType, "rainbow") || {};
   const rawSlug = profile.slug ? profile.slug.split("/") : [];
   if (rawSlug.length > 1) rawSlug.pop(); //team events have team name as slug, but user events have [user]/[type] as slug.
@@ -257,13 +247,12 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
                               })}
                             </>
                           ) : (
-                            <IntlProvider locale="en">
-                              <FormattedNumber
-                                value={paymentAppData.price / 100.0}
-                                style="currency"
-                                currency={paymentAppData.currency?.toUpperCase()}
-                              />
-                            </IntlProvider>
+                            <>
+                              {new Intl.NumberFormat(i18n.language, {
+                                style: "currency",
+                                currency: paymentAppData.currency,
+                              }).format(paymentAppData.price / 100)}
+                            </>
                           )}
                         </p>
                       )}
@@ -312,7 +301,7 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
               </div>
             </div>
             {/* FIXME: We don't show branding in Embed yet because we need to place branding on top of the main content. Keeping it outside the main content would have visibility issues because outside main content background is transparent */}
-            {!restProps.isBrandingHidden && !isEmbed && <PoweredByCal />}
+            {!restProps.isBrandingHidden && !isEmbed && <PoweredBy />}
           </div>
         </main>
       </div>
diff --git a/apps/web/components/booking/pages/BookingPage.tsx b/apps/web/components/booking/pages/BookingPage.tsx
index 13adccadae..42e9bb454d 100644
--- a/apps/web/components/booking/pages/BookingPage.tsx
+++ b/apps/web/components/booking/pages/BookingPage.tsx
@@ -21,6 +21,7 @@ import {
   useIsBackgroundTransparent,
   useIsEmbed,
 } from "@calcom/embed-core/embed-iframe";
+import { createBooking, createRecurringBooking } from "@calcom/features/bookings/lib";
 import {
   getBookingFieldsWithSystemFields,
   SystemField,
@@ -38,8 +39,9 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import useTheme from "@calcom/lib/hooks/useTheme";
 import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
 import { HttpError } from "@calcom/lib/http-error";
+import { parseDate, parseRecurringDates } from "@calcom/lib/parse-dates";
 import { getEveryFreqFor } from "@calcom/lib/recurringStrings";
-import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
+import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { TimeFormat } from "@calcom/lib/timeFormat";
 import { trpc } from "@calcom/trpc";
 import { Button, Form, Tooltip, useCalcomTheme } from "@calcom/ui";
@@ -47,9 +49,6 @@ import { AlertTriangle, Calendar, RefreshCw, User } from "@calcom/ui/components/
 
 import { timeZone } from "@lib/clock";
 import useRouterQuery from "@lib/hooks/useRouterQuery";
-import createBooking from "@lib/mutations/bookings/create-booking";
-import createRecurringBooking from "@lib/mutations/bookings/create-recurring-booking";
-import { parseRecurringDates, parseDate } from "@lib/parseDate";
 
 import type { Gate, GateState } from "@components/Gates";
 import Gates from "@components/Gates";
@@ -252,13 +251,13 @@ const BookingPage = ({
   }
 
   useEffect(() => {
-    if (top !== window) {
+    /* if (top !== window) {
       //page_view will be collected automatically by _middleware.ts
       telemetry.event(
         telemetryEventTypes.embedView,
         collectPageParameters("/book", { isTeamBooking: document.URL.includes("team/") })
       );
-    }
+    } */
     reserveSlot();
     const interval = setInterval(reserveSlot, parseInt(MINUTES_TO_BOOK) * 60 * 1000 - 2000);
     return () => {
@@ -433,7 +432,6 @@ const BookingPage = ({
   // Calculate the booking date(s)
   let recurringStrings: string[] = [],
     recurringDates: Date[] = [];
-
   if (eventType.recurringEvent?.freq && recurringEventCount !== null) {
     [recurringStrings, recurringDates] = parseRecurringDates(
       {
@@ -443,7 +441,7 @@ const BookingPage = ({
         recurringCount: parseInt(recurringEventCount.toString()),
         selectedTimeFormat: timeFormat,
       },
-      i18n
+      i18n.language
     );
   }
 
@@ -554,7 +552,7 @@ const BookingPage = ({
             {showEventTypeDetails && (
               <div className="sm:border-subtle  text-default flex flex-col px-6 pt-6 pb-0 sm:w-1/2 sm:border-r sm:pb-6">
                 <BookingDescription isBookingPage profile={profile} eventType={eventType}>
-                  <BookingDescriptionPayment eventType={eventType} t={t} />
+                  <BookingDescriptionPayment eventType={eventType} t={t} i18n={i18n} />
                   {!rescheduleUid && eventType.recurringEvent?.freq && recurringEventCount && (
                     <div className="dark:text-inverted text-default items-start text-sm font-medium">
                       <RefreshCw className="ml-[2px] inline-block h-4 w-4 ltr:mr-[10px] rtl:ml-[10px]" />
@@ -572,7 +570,7 @@ const BookingPage = ({
                     <div className="text-sm font-medium">
                       {isClientTimezoneAvailable &&
                         (rescheduleUid || !eventType.recurringEvent?.freq) &&
-                        `${parseDate(date, i18n, timeFormat)}`}
+                        `${parseDate(date, i18n.language, { selectedTimeFormat: timeFormat })}`}
                       {isClientTimezoneAvailable &&
                         !rescheduleUid &&
                         eventType.recurringEvent?.freq &&
@@ -602,7 +600,9 @@ const BookingPage = ({
                         <Calendar className="ml-[2px] -mt-1 inline-block h-4 w-4 ltr:mr-[10px] rtl:ml-[10px]" />
                         {isClientTimezoneAvailable &&
                           typeof booking.startTime === "string" &&
-                          parseDate(dayjs(booking.startTime), i18n, timeFormat)}
+                          parseDate(dayjs(booking.startTime), i18n.language, {
+                            selectedTimeFormat: timeFormat,
+                          })}
                       </p>
                     </div>
                   )}
diff --git a/apps/web/components/dialog/ChargeCardDialog.tsx b/apps/web/components/dialog/ChargeCardDialog.tsx
index e2c6a06c89..0295f4ced4 100644
--- a/apps/web/components/dialog/ChargeCardDialog.tsx
+++ b/apps/web/components/dialog/ChargeCardDialog.tsx
@@ -1,7 +1,5 @@
-import { Trans } from "next-i18next";
 import { useState } from "react";
 import type { Dispatch, SetStateAction } from "react";
-import { IntlProvider, FormattedNumber } from "react-intl";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
@@ -40,6 +38,11 @@ export const ChargeCardDialog = (props: IRescheduleDialog) => {
     },
   });
 
+  const currencyStringParams = {
+    amount: props.paymentAmount / 100.0,
+    formatParams: { amount: { currency: props.paymentCurrency } },
+  };
+
   return (
     <Dialog open={isOpenDialog} onOpenChange={setIsOpenDialog}>
       <DialogContent>
@@ -49,19 +52,7 @@ export const ChargeCardDialog = (props: IRescheduleDialog) => {
           </div>
           <div className="pt-1">
             <DialogHeader title={t("charge_card")} />
-            <Trans i18nKey="charge_card_dialog_body">
-              <p className="text-sm text-gray-500">
-                You are about to charge the attendee{" "}
-                <IntlProvider locale="en">
-                  <FormattedNumber
-                    value={props.paymentAmount / 100.0}
-                    style="currency"
-                    currency={props.paymentCurrency?.toUpperCase()}
-                  />
-                </IntlProvider>
-                . Are you sure you want to continue?
-              </p>
-            </Trans>
+            <p>{t("charge_card_dialog_body", currencyStringParams)}</p>
 
             {chargeError && (
               <div className="mt-4 flex text-red-500">
@@ -80,16 +71,7 @@ export const ChargeCardDialog = (props: IRescheduleDialog) => {
                     bookingId,
                   })
                 }>
-                <Trans i18nKey="charge_card_confirm">
-                  Charge attendee{" "}
-                  <IntlProvider locale="en">
-                    <FormattedNumber
-                      value={props.paymentAmount / 100.0}
-                      style="currency"
-                      currency={props.paymentCurrency?.toUpperCase()}
-                    />
-                  </IntlProvider>
-                </Trans>
+                {t("charge_attendee", currencyStringParams)}
               </Button>
             </DialogFooter>
           </div>
diff --git a/apps/web/components/dialog/EditLocationDialog.tsx b/apps/web/components/dialog/EditLocationDialog.tsx
index 158e416051..ac7f83ed72 100644
--- a/apps/web/components/dialog/EditLocationDialog.tsx
+++ b/apps/web/components/dialog/EditLocationDialog.tsx
@@ -174,7 +174,6 @@ export const EditLocationDialog = (props: ISetLocationDialog) => {
               id="locationInput"
               placeholder={t(eventLocationType.organizerInputPlaceholder || "")}
               required
-              className="border-default block w-full rounded-sm text-sm"
               // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               defaultValue={
                 defaultLocation ? defaultLocation[eventLocationType.defaultValueVariable] : undefined
diff --git a/apps/web/components/error/error-page.tsx b/apps/web/components/error/error-page.tsx
index b394191129..e3102f230b 100644
--- a/apps/web/components/error/error-page.tsx
+++ b/apps/web/components/error/error-page.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { HttpError } from "@lib/core/http/error";
+import { HttpError } from "@calcom/lib/http-error";
 
 type Props = {
   statusCode?: number | null;
diff --git a/apps/web/components/eventtype/EventAppsTab.tsx b/apps/web/components/eventtype/EventAppsTab.tsx
index 50dabb4abf..faa71884b3 100644
--- a/apps/web/components/eventtype/EventAppsTab.tsx
+++ b/apps/web/components/eventtype/EventAppsTab.tsx
@@ -106,7 +106,7 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
       {!shouldLockDisableProps("apps").disabled && (
         <div>
           {!isLoading && notInstalledApps?.length ? (
-            <h2 className="text-emphasis mt-0 mb-2 text-lg font-semibold">{t("available_apps")}</h2>
+            <h2 className="text-emphasis my-2 text-lg font-semibold">{t("available_apps")}</h2>
           ) : null}
           <div className="before:border-0">
             {notInstalledApps?.map((app) => (
diff --git a/apps/web/components/eventtype/EventAvailabilityTab.tsx b/apps/web/components/eventtype/EventAvailabilityTab.tsx
index 68240b3b82..ac425eafc8 100644
--- a/apps/web/components/eventtype/EventAvailabilityTab.tsx
+++ b/apps/web/components/eventtype/EventAvailabilityTab.tsx
@@ -1,21 +1,23 @@
 import { SchedulingType } from "@prisma/client";
-import type { FormValues, EventTypeSetup } from "pages/event-types/[type]";
+import type { EventTypeSetup, FormValues } from "pages/event-types/[type]";
+import { useState } from "react";
 import { Controller, useFormContext } from "react-hook-form";
 import type { OptionProps, SingleValueProps } from "react-select";
 import { components } from "react-select";
 
 import dayjs from "@calcom/dayjs";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
-import { NewScheduleButton } from "@calcom/features/schedules";
 import classNames from "@calcom/lib/classNames";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { weekdayNames } from "@calcom/lib/weekday";
 import { trpc } from "@calcom/trpc/react";
 import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import { Badge, Button, Select, SettingsToggle, SkeletonText, EmptyScreen } from "@calcom/ui";
-import { ExternalLink, Globe, Clock } from "@calcom/ui/components/icon";
+import { Badge, Button, Select, SettingsToggle, SkeletonText } from "@calcom/ui";
+import { ExternalLink, Globe } from "@calcom/ui/components/icon";
 
-type AvailabilityOption = {
+import { SelectSkeletonLoader } from "@components/availability/SkeletonLoader";
+
+export type AvailabilityOption = {
   label: string;
   value: number;
   isDefault: boolean;
@@ -62,40 +64,12 @@ const SingleValue = ({ ...props }: SingleValueProps<AvailabilityOption>) => {
   );
 };
 
-const AvailabilitySelect = ({
-  className = "",
-  options,
-  value,
-  ...props
-}: {
-  className?: string;
-  name: string;
-  value: AvailabilityOption | undefined;
-  options: AvailabilityOption[];
-  isDisabled?: boolean;
-  onBlur: () => void;
-  onChange: (value: AvailabilityOption | null) => void;
-}) => {
-  const { t } = useLocale();
-  return (
-    <Select
-      placeholder={t("select")}
-      options={options}
-      isDisabled={props.isDisabled}
-      isSearchable={false}
-      onChange={props.onChange}
-      className={classNames("block w-full min-w-0 flex-1 rounded-sm text-sm", className)}
-      defaultValue={value}
-      components={{ Option, SingleValue }}
-      isMulti={false}
-    />
-  );
-};
-
 const format = (date: Date, hour12: boolean) =>
-  Intl.DateTimeFormat(undefined, { hour: "numeric", minute: "numeric", hour12 }).format(
-    new Date(dayjs.utc(date).format("YYYY-MM-DDTHH:mm:ss"))
-  );
+  Intl.DateTimeFormat(undefined, {
+    hour: "numeric",
+    minute: "numeric",
+    hourCycle: hour12 ? "h12" : "h24",
+  }).format(new Date(dayjs.utc(date).format("YYYY-MM-DDTHH:mm:ss")));
 
 const EventTypeScheduleDetails = ({
   isManagedEventType,
@@ -188,61 +162,57 @@ const EventTypeSchedule = ({ eventType }: { eventType: EventTypeSetup }) => {
     );
   const { watch } = useFormContext<FormValues>();
   const watchSchedule = watch("schedule");
+  const formMethods = useFormContext<FormValues>();
+  const [options, setOptions] = useState<AvailabilityOption[]>([]);
 
-  const { data, isLoading } = trpc.viewer.availability.list.useQuery();
+  const { isLoading } = trpc.viewer.availability.list.useQuery(undefined, {
+    onSuccess: ({ schedules }) => {
+      const options = schedules.map((schedule) => ({
+        value: schedule.id,
+        label: schedule.name,
+        isDefault: schedule.isDefault,
+        isManaged: false,
+      }));
 
-  if (!data?.schedules.length && !isLoading)
-    return (
-      <EmptyScreen
-        Icon={Clock}
-        headline={t("new_schedule_heading")}
-        description={t("new_schedule_description")}
-        buttonRaw={<NewScheduleButton fromEventType />}
-        border={false}
-      />
-    );
+      // We are showing a managed event for a team admin, so adding the option to let members choose their schedule
+      if (isManagedEventType) {
+        options.push({
+          value: 0,
+          label: t("members_default_schedule"),
+          isDefault: false,
+          isManaged: false,
+        });
+      }
 
-  const schedules = data?.schedules || [];
+      // We are showing a managed event for a member and team owner selected their own schedule, so adding
+      // the managed schedule option
+      if (
+        isChildrenManagedEventType &&
+        watchSchedule &&
+        !schedules.find((schedule) => schedule.id === watchSchedule)
+      ) {
+        options.push({
+          value: watchSchedule,
+          label: eventType.scheduleName ?? t("default_schedule_name"),
+          isDefault: false,
+          isManaged: false,
+        });
+      }
 
-  const options = schedules.map((schedule) => ({
-    value: schedule.id,
-    label: schedule.name,
-    isDefault: schedule.isDefault,
-    isManaged: false,
-  }));
+      setOptions(options);
 
-  // We are showing a managed event for a team admin, so adding the option to let members choose their schedule
-  if (isManagedEventType) {
-    options.push({
-      value: 0,
-      label: t("members_default_schedule"),
-      isDefault: false,
-      isManaged: false,
-    });
-  }
+      const scheduleId = formMethods.getValues("schedule");
+      const value = options.find((option) =>
+        scheduleId
+          ? option.value === scheduleId
+          : option.value === schedules.find((schedule) => schedule.isDefault)?.id
+      );
 
-  // We are showing a managed event for a member and team owner selected their own schedule, so adding
-  // the managed schedule option
-  if (
-    isChildrenManagedEventType &&
-    watchSchedule &&
-    !schedules.find((schedule) => schedule.id === watchSchedule)
-  ) {
-    options.push({
-      value: watchSchedule,
-      label: eventType.scheduleName ?? t("default_schedule_name"),
-      isDefault: false,
-      isManaged: false,
-    });
-  }
+      formMethods.setValue("availability", value);
+    },
+  });
 
-  const value = options.find((option) =>
-    watchSchedule
-      ? option.value === watchSchedule
-      : isManagedEventType
-      ? option.value === 0
-      : option.value === schedules.find((schedule) => schedule.isDefault)?.id
-  );
+  const availabilityValue = formMethods.watch("availability");
 
   return (
     <div className="space-y-4">
@@ -251,27 +221,33 @@ const EventTypeSchedule = ({ eventType }: { eventType: EventTypeSetup }) => {
           {t("availability")}
           {shouldLockIndicator("availability")}
         </label>
-        <Controller
-          name="schedule"
-          render={({ field }) => (
-            <>
-              <AvailabilitySelect
-                value={value}
-                options={options}
-                onBlur={field.onBlur}
-                isDisabled={shouldLockDisableProps("schedule").disabled}
-                name={field.name}
-                onChange={(selected) => {
-                  field.onChange(selected?.value || null);
-                }}
-              />
-            </>
-          )}
-        />
+        {isLoading && <SelectSkeletonLoader />}
+        {!isLoading && (
+          <Controller
+            name="schedule"
+            render={({ field }) => {
+              return (
+                <Select
+                  placeholder={t("select")}
+                  options={options}
+                  isSearchable={false}
+                  onChange={(selected) => {
+                    field.onChange(selected?.value || null);
+                    if (selected?.value) formMethods.setValue("availability", selected);
+                  }}
+                  className="block w-full min-w-0 flex-1 rounded-sm text-sm"
+                  value={availabilityValue}
+                  components={{ Option, SingleValue }}
+                  isMulti={false}
+                />
+              );
+            }}
+          />
+        )}
       </div>
-      {value?.value !== 0 ? (
+      {availabilityValue?.value !== 0 ? (
         <EventTypeScheduleDetails
-          selectedScheduleValue={value}
+          selectedScheduleValue={availabilityValue}
           isManagedEventType={isManagedEventType || isChildrenManagedEventType}
         />
       ) : (
diff --git a/apps/web/components/eventtype/EventSetupTab.tsx b/apps/web/components/eventtype/EventSetupTab.tsx
index 57aa396573..bc2f1b1181 100644
--- a/apps/web/components/eventtype/EventSetupTab.tsx
+++ b/apps/web/components/eventtype/EventSetupTab.tsx
@@ -12,6 +12,7 @@ import { z } from "zod";
 import type { EventLocationType } from "@calcom/app-store/locations";
 import { getEventLocationType, MeetLocationType, LocationType } from "@calcom/app-store/locations";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import cx from "@calcom/lib/classNames";
 import { CAL_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { md } from "@calcom/lib/markdownIt";
@@ -80,6 +81,7 @@ const DescriptionEditor = (props: DescriptionEditorProps) => {
   const [mounted, setIsMounted] = useState(false);
   const { t } = useLocale();
   const { description } = props;
+  const [firstRender, setFirstRender] = useState(true);
   useEffect(() => {
     setIsMounted(true);
   }, []);
@@ -91,6 +93,8 @@ const DescriptionEditor = (props: DescriptionEditorProps) => {
       excludedToolbarItems={["blockType"]}
       placeholder={t("quick_video_meeting")}
       editable={props.editable}
+      firstRender={firstRender}
+      setFirstRender={setFirstRender}
     />
   ) : (
     <SkeletonContainer>
@@ -277,7 +281,13 @@ export const EventSetupTab = (
                     <div className="flex items-center">
                       <img
                         src={eventLocationType.iconUrl}
-                        className="h-4 w-4"
+                        className={cx(
+                          "h-4 w-4",
+                          // invert all the icons except app icons
+                          eventLocationType.iconUrl &&
+                            !eventLocationType.iconUrl.startsWith("/api") &&
+                            "dark:invert"
+                        )}
                         alt={`${eventLocationType.label} logo`}
                       />
                       <span className="line-clamp-1 ms-1 text-sm">{eventLabel}</span>
diff --git a/apps/web/components/eventtype/EventTypeSingleLayout.tsx b/apps/web/components/eventtype/EventTypeSingleLayout.tsx
index 1eb973182c..78bf2ae373 100644
--- a/apps/web/components/eventtype/EventTypeSingleLayout.tsx
+++ b/apps/web/components/eventtype/EventTypeSingleLayout.tsx
@@ -51,6 +51,7 @@ import {
 } from "@calcom/ui/components/icon";
 
 import { EmbedButton, EmbedDialog } from "@components/Embed";
+import type { AvailabilityOption } from "@components/eventtype/EventAvailabilityTab";
 
 type Props = {
   children: React.ReactNode;
@@ -63,6 +64,7 @@ type Props = {
   enabledWorkflowsNumber: number;
   formMethods: UseFormReturn<FormValues>;
   isUpdateMutationLoading?: boolean;
+  availability?: AvailabilityOption;
 };
 
 function getNavigation(props: {
@@ -71,8 +73,10 @@ function getNavigation(props: {
   enabledAppsNumber: number;
   enabledWorkflowsNumber: number;
   installedAppsNumber: number;
+  availability: AvailabilityOption | undefined;
 }) {
-  const { eventType, t, enabledAppsNumber, installedAppsNumber, enabledWorkflowsNumber } = props;
+  const { eventType, t, enabledAppsNumber, installedAppsNumber, enabledWorkflowsNumber, availability } =
+    props;
   const duration =
     eventType.metadata?.multipleDuration?.map((duration) => ` ${duration}`) || eventType.length;
 
@@ -128,6 +132,7 @@ function EventTypeSingleLayout({
   enabledWorkflowsNumber,
   isUpdateMutationLoading,
   formMethods,
+  availability,
 }: Props) {
   const utils = trpc.useContext();
   const { t } = useLocale();
@@ -171,6 +176,7 @@ function EventTypeSingleLayout({
       enabledAppsNumber,
       installedAppsNumber,
       enabledWorkflowsNumber,
+      availability,
     });
     navigation.splice(1, 0, {
       name: "availability",
@@ -214,7 +220,7 @@ function EventTypeSingleLayout({
       });
     }
     return navigation;
-  }, [t, eventType, installedAppsNumber, enabledAppsNumber, enabledWorkflowsNumber, team]);
+  }, [t, eventType, installedAppsNumber, enabledAppsNumber, enabledWorkflowsNumber, team, availability]);
 
   const permalink = `${CAL_URL}/${team ? `team/${team.slug}` : eventType.users[0].username}/${
     eventType.slug
@@ -374,6 +380,8 @@ function EventTypeSingleLayout({
               tabs={EventTypeTabs}
               sticky
               linkProps={{ shallow: true }}
+              itemClassname="items-start"
+              iconClassName="md:mt-px"
             />
           </div>
           <div className="p-2 md:mx-0 md:p-0 xl:hidden">
diff --git a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx
index 3abfee66af..93861095d3 100644
--- a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx
+++ b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx
@@ -50,7 +50,7 @@ const SetupAvailability = (props: ISetupAvailabilityProps) => {
   const updateSchedule = trpc.viewer.availability.schedule.update.useMutation(mutationOptions);
   return (
     <Form
-      className="bg-default dark:text-inverted text-emphasis w-full dark:bg-opacity-5"
+      className="bg-default dark:text-inverted text-emphasis w-full [--cal-brand-accent:#fafafa] dark:bg-opacity-5"
       form={availabilityForm}
       handleSubmit={async (values) => {
         try {
diff --git a/apps/web/components/getting-started/steps-views/UserProfile.tsx b/apps/web/components/getting-started/steps-views/UserProfile.tsx
index 40c119c657..1657da0044 100644
--- a/apps/web/components/getting-started/steps-views/UserProfile.tsx
+++ b/apps/web/components/getting-started/steps-views/UserProfile.tsx
@@ -35,6 +35,7 @@ const UserProfile = (props: IUserProfileProps) => {
   const router = useRouter();
   const createEventType = trpc.viewer.eventTypes.create.useMutation();
   const telemetry = useTelemetry();
+  const [firstRender, setFirstRender] = useState(true);
 
   const mutation = trpc.viewer.updateProfile.useMutation({
     onSuccess: async (_data, context) => {
@@ -147,6 +148,8 @@ const UserProfile = (props: IUserProfileProps) => {
           getText={() => md.render(getValues("bio") || user?.bio || "")}
           setText={(value: string) => setValue("bio", turndown(value))}
           excludedToolbarItems={["blockType"]}
+          firstRender={firstRender}
+          setFirstRender={setFirstRender}
         />
         <p className="dark:text-inverted text-default mt-2 font-sans text-sm font-normal">
           {t("few_sentences_about_yourself")}
diff --git a/apps/web/components/ui/AdminRequired.tsx b/apps/web/components/ui/AdminRequired.tsx
deleted file mode 100644
index 34458396b0..0000000000
--- a/apps/web/components/ui/AdminRequired.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useSession } from "next-auth/react";
-import type { FC } from "react";
-import { Fragment } from "react";
-
-type AdminRequiredProps = {
-  as?: keyof JSX.IntrinsicElements;
-  children?: React.ReactNode;
-};
-
-/** @deprecated use PermssionContainer instead. Will delete once V2 goes live */
-export const AdminRequired: FC<AdminRequiredProps> = ({ children, as, ...rest }) => {
-  const session = useSession();
-
-  if (session.data?.user.role !== "ADMIN") return null;
-  const Component = as ?? Fragment;
-  return <Component {...rest}>{children}</Component>;
-};
diff --git a/apps/web/components/ui/AuthContainer.tsx b/apps/web/components/ui/AuthContainer.tsx
index 12d356a851..9da5b38c0f 100644
--- a/apps/web/components/ui/AuthContainer.tsx
+++ b/apps/web/components/ui/AuthContainer.tsx
@@ -1,7 +1,6 @@
 import classNames from "classnames";
 
-import { APP_NAME, LOGO } from "@calcom/lib/constants";
-import { HeadSeo } from "@calcom/ui";
+import { HeadSeo, Logo } from "@calcom/ui";
 
 import Loader from "@components/Loader";
 
@@ -18,10 +17,7 @@ export default function AuthContainer(props: React.PropsWithChildren<Props>) {
   return (
     <div className="flex min-h-screen flex-col justify-center bg-[#f3f4f6] py-12 sm:px-6 lg:px-8">
       <HeadSeo title={props.title} description={props.description} />
-      {props.showLogo && (
-        // eslint-disable-next-line @next/next/no-img-element
-        <img className="mb-auto h-4" src={LOGO} alt={`${APP_NAME} Logo`} />
-      )}
+      {props.showLogo && <Logo small inline={false} className="mx-auto mb-auto" />}
 
       <div className={classNames(props.showLogo ? "text-center" : "", "sm:mx-auto sm:w-full sm:max-w-md")}>
         {props.heading && <h2 className="font-cal text-emphasis text-center text-3xl">{props.heading}</h2>}
diff --git a/apps/web/components/ui/EditableHeading.tsx b/apps/web/components/ui/EditableHeading.tsx
index 56e31609c9..3cc6e8902d 100644
--- a/apps/web/components/ui/EditableHeading.tsx
+++ b/apps/web/components/ui/EditableHeading.tsx
@@ -16,8 +16,10 @@ const EditableHeading = function EditableHeading({
   const [isEditing, setIsEditing] = useState(false);
   const enableEditing = () => setIsEditing(true);
   return (
-    <div className="group relative cursor-pointer" onClick={enableEditing}>
-      <div className="flex items-center">
+    <div
+      className="group pointer-events-none relative truncate sm:pointer-events-auto"
+      onClick={enableEditing}>
+      <div className="flex cursor-pointer items-center">
         <label className="min-w-8 relative inline-block">
           <span className="whitespace-pre text-xl tracking-normal text-transparent">{value}&nbsp;</span>
           {!isEditing && isReady && (
@@ -29,7 +31,7 @@ const EditableHeading = function EditableHeading({
             value={value}
             required
             className={classNames(
-              "text-emphasis hover:text-default focus:text-emphasis absolute top-0 left-0 w-full cursor-pointer border-none bg-transparent p-0 align-top text-xl focus:outline-none focus:ring-0"
+              "text-emphasis hover:text-default focus:text-emphasis absolute top-0 left-0 w-full cursor-pointer truncate border-none bg-transparent p-0 align-top text-xl focus:outline-none focus:ring-0"
             )}
             onFocus={(e) => {
               setIsEditing(true);
diff --git a/apps/web/components/ui/PoweredByCal.tsx b/apps/web/components/ui/PoweredByCal.tsx
deleted file mode 100644
index 3825fc11f4..0000000000
--- a/apps/web/components/ui/PoweredByCal.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import Link from "next/link";
-
-import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
-import { POWERED_BY_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-
-const PoweredByCal = () => {
-  const { t } = useLocale();
-  const isEmbed = useIsEmbed();
-  return (
-    <div className={"p-2 text-center text-xs sm:text-right" + (isEmbed ? " max-w-3xl" : "")}>
-      <Link href={POWERED_BY_URL} target="_blank" className="text-subtle opacity-50 hover:opacity-100">
-        {t("powered_by")}{" "}
-        <img
-          className="relative -mt-px inline h-[10px] w-auto dark:hidden"
-          src="/cal-logo-word.svg"
-          alt="Cal.com Logo"
-        />
-        <img
-          className="relativ -mt-px hidden h-[10px] w-auto dark:inline"
-          src="/cal-logo-word-dark.svg"
-          alt="Cal.com Logo"
-        />
-      </Link>
-    </div>
-  );
-};
-
-export default PoweredByCal;
diff --git a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx
index d5fe0f0746..f6d39ba2d8 100644
--- a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx
+++ b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx
@@ -195,7 +195,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
         <span
           className={classNames(
             isInputUsernamePremium ? "border border-orange-400 " : "",
-            "border-default bg-muted text-subtle hidden h-9 items-center rounded-l-md border border-r-0 border-r-gray-300 px-3 text-sm md:inline-flex"
+            "border-default bg-muted text-subtle hidden h-9 items-center rounded-l-md border border-r-0 px-3 text-sm md:inline-flex"
           )}>
           {process.env.NEXT_PUBLIC_WEBSITE_URL.replace("https://", "").replace("http://", "")}/
         </span>
@@ -215,7 +215,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
                 : "border focus:border",
               markAsError
                 ? "focus:shadow-0 focus:ring-shadow-0 border-red-500  focus:border-red-500 focus:outline-none"
-                : "border-l-gray-300",
+                : "border-l-default",
               disabled ? "bg-subtle text-muted focus:border-0" : ""
             )}
             value={inputUsernameValue}
@@ -234,8 +234,8 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
                 isInputUsernamePremium ? "text-orange-400" : "",
                 usernameIsAvailable ? "" : ""
               )}>
-              {isInputUsernamePremium ? <StarIconSolid className="mt-[2px] w-6" /> : <></>}
-              {!isInputUsernamePremium && usernameIsAvailable ? <Check className="mt-2 w-6" /> : <></>}
+              {isInputUsernamePremium ? <StarIconSolid className="mt-[2px] h-4 w-4" /> : <></>}
+              {!isInputUsernamePremium && usernameIsAvailable ? <Check className="mt-2 h-4 w-4" /> : <></>}
             </span>
           </div>
         </div>
diff --git a/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx b/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx
index d21b394209..acd51c6759 100644
--- a/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx
+++ b/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx
@@ -136,8 +136,8 @@ const UsernameTextfield = (props: ICustomUsernameProps) => {
           />
           {currentUsername !== inputUsernameValue && (
             <div className="absolute right-[2px] top-6 flex flex-row">
-              <span className={classNames("mx-2 py-2")}>
-                {usernameIsAvailable ? <Check className="w-6" /> : <></>}
+              <span className={classNames("mx-2 py-2.5")}>
+                {usernameIsAvailable ? <Check className="h-4 w-4" /> : <></>}
               </span>
             </div>
           )}
diff --git a/apps/web/components/ui/form/CheckboxField.tsx b/apps/web/components/ui/form/CheckboxField.tsx
index 20b6816469..222cbd7731 100644
--- a/apps/web/components/ui/form/CheckboxField.tsx
+++ b/apps/web/components/ui/form/CheckboxField.tsx
@@ -49,7 +49,7 @@ const CheckboxField = forwardRef<HTMLInputElement, Props>(
                     {...rest}
                     ref={ref}
                     type="checkbox"
-                    className="text-primary-600 focus:ring-primary-500 border-default h-4 w-4 rounded"
+                    className="text-primary-600 focus:ring-primary-500 border-default bg-default h-4 w-4 rounded"
                   />
                 </div>
                 <span className="ms-3 text-sm">{description}</span>
diff --git a/apps/web/components/ui/form/LocationSelect.tsx b/apps/web/components/ui/form/LocationSelect.tsx
index 4096ceec78..f81e11d225 100644
--- a/apps/web/components/ui/form/LocationSelect.tsx
+++ b/apps/web/components/ui/form/LocationSelect.tsx
@@ -3,6 +3,7 @@ import { components } from "react-select";
 
 import type { EventLocationType } from "@calcom/app-store/locations";
 import { classNames } from "@calcom/lib";
+import cx from "@calcom/lib/classNames";
 import { Select } from "@calcom/ui";
 
 export type LocationOption = {
@@ -19,10 +20,14 @@ export type GroupOptionType = GroupBase<LocationOption>;
 const OptionWithIcon = ({ icon, label }: { icon?: string; label: string }) => {
   return (
     <div className="flex items-center gap-3">
-      {/* TODO: figure out a way to invert icons when in dark mode. We can't just
-        dark:invert due to google meet cal etc all breaking when we do this
-      */}
-      {icon && <img src={icon} alt="cover" className="h-3.5 w-3.5 dark:hidden" />}
+      {icon && (
+        <img
+          src={icon}
+          alt="cover"
+          // invert all the icons except app icons
+          className={cx("h-3.5 w-3.5", icon && !icon.startsWith("/api") && "dark:invert")}
+        />
+      )}
       <span className={classNames("text-sm font-medium")}>{label}</span>
     </div>
   );
diff --git a/apps/web/lib/app-providers.tsx b/apps/web/lib/app-providers.tsx
index b793123e7e..dad9e15d33 100644
--- a/apps/web/lib/app-providers.tsx
+++ b/apps/web/lib/app-providers.tsx
@@ -27,8 +27,10 @@ const I18nextAdapter = appWithTranslation<NextJsAppProps<SSRConfig> & { children
 export type AppProps = Omit<NextAppProps<WithNonceProps & Record<string, unknown>>, "Component"> & {
   Component: NextAppProps["Component"] & {
     requiresLicense?: boolean;
-    isThemeSupported?: boolean | ((arg: { router: NextRouter }) => boolean);
+    isThemeSupported?: boolean;
+    isBookingPage?: boolean | ((arg: { router: NextRouter }) => boolean);
     getLayout?: (page: React.ReactElement, router: NextRouter) => ReactNode;
+    PageWrapper?: (props: AppProps) => JSX.Element;
   };
 
   /** Will be defined only is there was an error */
@@ -61,45 +63,66 @@ const CustomI18nextProvider = (props: AppPropsWithChildren) => {
   return <I18nextAdapter {...passedProps} />;
 };
 
+const enum ThemeSupport {
+  // e.g. Login Page
+  None = "none",
+  // Entire App except Booking Pages
+  App = "systemOnly",
+  // Booking Pages(including Routing Forms)
+  Booking = "userConfigured",
+}
+
 const CalcomThemeProvider = (
   props: PropsWithChildren<
-    WithNonceProps & { isThemeSupported?: boolean | ((arg: { router: NextRouter }) => boolean) }
+    WithNonceProps & {
+      isBookingPage?: boolean | ((arg: { router: NextRouter }) => boolean);
+      isThemeSupported?: boolean;
+    }
   >
 ) => {
   // We now support the inverse of how we handled it in the past. Setting this to false will disable theme.
   // undefined or true means we use system theme
   const router = useRouter();
-  const isThemeSupported = (() => {
-    if (typeof props.isThemeSupported === "function") {
-      return props.isThemeSupported({ router: router });
+  const isBookingPage = (() => {
+    if (typeof props.isBookingPage === "function") {
+      return props.isBookingPage({ router: router });
     }
-    if (typeof props.isThemeSupported === "undefined") {
-      return true;
-    }
-    return props.isThemeSupported;
+
+    return props.isBookingPage;
   })();
 
-  const forcedTheme = !isThemeSupported ? "light" : undefined;
+  const themeSupport = isBookingPage
+    ? ThemeSupport.Booking
+    : // if isThemeSupported is explicitly false, we don't use theme there
+    props.isThemeSupported === false
+    ? ThemeSupport.None
+    : ThemeSupport.App;
+
+  const forcedTheme = themeSupport === ThemeSupport.None ? "light" : undefined;
   // Use namespace of embed to ensure same namespaced embed are displayed with same theme. This allows different embeds on the same website to be themed differently
   // One such example is our Embeds Demo and Testing page at http://localhost:3100
   // Having `getEmbedNamespace` defined on window before react initializes the app, ensures that embedNamespace is available on the first mount and can be used as part of storageKey
   const embedNamespace = typeof window !== "undefined" ? window.getEmbedNamespace() : null;
   const isEmbedMode = typeof embedNamespace === "string";
-  // If embedNamespace is not defined, we use the default storageKey -> The default storage key changs based on if we force light mode or not
-  // This is done to ensure that the default theme is light when we force light mode and as soon as you navigate to a page that is dark we dont need a hard refresh to change
+
   const storageKey = isEmbedMode
     ? `embed-theme-${embedNamespace}`
-    : !isThemeSupported
-    ? "cal-light"
-    : "theme";
+    : themeSupport === ThemeSupport.App
+    ? "app-theme"
+    : themeSupport === ThemeSupport.Booking
+    ? "booking-theme"
+    : undefined;
 
   return (
     <ThemeProvider
       nonce={props.nonce}
       enableColorScheme={false}
-      enableSystem={isThemeSupported}
+      enableSystem={themeSupport !== ThemeSupport.None}
       forcedTheme={forcedTheme}
       storageKey={storageKey}
+      // next-themes doesn't listen to changes on storageKey. So we need to force a re-render when storageKey changes
+      // This is how login to dashboard soft navigation changes theme from light to dark
+      key={storageKey}
       attribute="class">
       {/* Embed Mode can be detected reliably only on client side here as there can be static generated pages as well which can't determine if it's embed mode at backend */}
       {/* color-scheme makes background:transparent not work in iframe which is required by embed. */}
@@ -132,9 +155,11 @@ const AppProviders = (props: AppPropsWithChildren) => {
       <SessionProvider session={session || undefined}>
         <CustomI18nextProvider {...props}>
           <TooltipProvider>
+            {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */}
             <CalcomThemeProvider
               nonce={props.pageProps.nonce}
-              isThemeSupported={props.Component.isThemeSupported}>
+              isThemeSupported={props.Component.isThemeSupported}
+              isBookingPage={props.Component.isBookingPage}>
               <FeatureFlagsProvider>
                 <MetaProvider>{props.children}</MetaProvider>
               </FeatureFlagsProvider>
diff --git a/apps/web/lib/csp.ts b/apps/web/lib/csp.ts
index 120448b3ff..c033ccd031 100644
--- a/apps/web/lib/csp.ts
+++ b/apps/web/lib/csp.ts
@@ -13,9 +13,6 @@ function getCspPolicy(nonce: string) {
   // We can remove 'unsafe-inline' from style-src when we add nonces to all style tags
   // Maybe see how @next-safe/middleware does it if it's supported.
   const useNonStrictPolicy = CSP_POLICY === "non-strict";
-  const SENTRY_ENDPOINT = process.env.NEXT_PUBLIC_SENTRY_DSN
-    ? new URL(process.env.NEXT_PUBLIC_SENTRY_DSN, "http://base_url").origin
-    : "";
 
   // We add WEBAPP_URL to img-src because of booking pages, which end up loading images from app.cal.com on cal.com
   // FIXME: Write a layer to extract out EventType Analytics tracking endpoints and add them to img-src or connect-src as needed. e.g. fathom, Google Analytics and others
@@ -36,7 +33,7 @@ function getCspPolicy(nonce: string) {
     } app.cal.com;
 	  font-src 'self';
 	  img-src 'self' ${WEBAPP_URL} https://www.gravatar.com https://img.youtube.com https://eu.ui-avatars.com/api/ data:;
-    connect-src 'self' ${SENTRY_ENDPOINT}
+    connect-src 'self'
 	`;
 }
 
diff --git a/apps/web/lib/mutations/bookings/create-booking.ts b/apps/web/lib/mutations/bookings/create-booking.ts
deleted file mode 100644
index d0b677adab..0000000000
--- a/apps/web/lib/mutations/bookings/create-booking.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { BookingCreateBody } from "@calcom/prisma/zod-utils";
-
-import * as fetch from "@lib/core/http/fetch-wrapper";
-import type { BookingResponse } from "@lib/types/booking";
-
-type BookingCreateBodyForMutation = Omit<BookingCreateBody, "location">;
-const createBooking = async (data: BookingCreateBodyForMutation) => {
-  const response = await fetch.post<BookingCreateBodyForMutation, BookingResponse>("/api/book/event", data);
-
-  return response;
-};
-
-export default createBooking;
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index ca5eb7e6a4..2d4cb61622 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -7,9 +7,16 @@ import { CONSOLE_URL, WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import { isIpInBanlist } from "@calcom/lib/getIP";
 import { extendEventData, nextCollectBasicSettings } from "@calcom/lib/telemetry";
 
+let cold = true;
+
 const middleware: NextMiddleware = async (req) => {
   const url = req.nextUrl;
+  const requestHeaders = new Headers(req.headers);
 
+  // This console.log is required to create a report in axios for hot and cold requests
+  console.log(cold ? "Cold Start" : "Hot Start");
+  requestHeaders.set("x-cal-cold-start", cold ? "true" : "false");
+  cold = false;
   if (!url.pathname.startsWith("/api")) {
     //
     // NOTE: When tRPC hits an error a 500 is returned, when this is received
@@ -61,27 +68,19 @@ const middleware: NextMiddleware = async (req) => {
   }
 
   if (url.pathname.startsWith("/api/trpc/")) {
-    const requestHeaders = new Headers(req.headers);
     requestHeaders.set("x-cal-timezone", req.headers.get("x-vercel-ip-timezone") ?? "");
-    return NextResponse.next({
-      request: {
-        headers: requestHeaders,
-      },
-    });
   }
 
   if (url.pathname.startsWith("/auth/login")) {
-    const moreHeaders = new Headers(req.headers);
     // Use this header to actually enforce CSP, otherwise it is running in Report Only mode on all pages.
-    moreHeaders.set("x-csp-enforce", "true");
-    return NextResponse.next({
-      request: {
-        headers: moreHeaders,
-      },
-    });
+    requestHeaders.set("x-csp-enforce", "true");
   }
 
-  return NextResponse.next();
+  return NextResponse.next({
+    request: {
+      headers: requestHeaders,
+    },
+  });
 };
 
 export const config = {
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 6dcc8610f9..f859499763 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -1,7 +1,7 @@
 require("dotenv").config({ path: "../../.env" });
 const CopyWebpackPlugin = require("copy-webpack-plugin");
-const { withSentryConfig } = require("@sentry/nextjs");
 const os = require("os");
+const glob = require("glob");
 
 const { withAxiom } = require("next-axiom");
 const { i18n } = require("./next-i18next.config");
@@ -67,6 +67,18 @@ if (process.env.ANALYZE === "true") {
 }
 
 plugins.push(withAxiom);
+
+/** Needed to rewrite public booking page, gets all static pages but [user] */
+const pages = glob
+  .sync("pages/**/[^_]*.{tsx,js,ts}", { cwd: __dirname })
+  .map((filename) =>
+    filename
+      .substr(6)
+      .replace(/(\.tsx|\.js|\.ts)/, "")
+      .replace(/\/.*/, "")
+  )
+  .filter((v, i, self) => self.indexOf(v) === i && !v.startsWith("[user]"));
+
 /** @type {import("next").NextConfig} */
 const nextConfig = {
   i18n,
@@ -99,6 +111,12 @@ const nextConfig = {
       transform: "lucide-react/dist/esm/icons/{{ kebabCase member }}",
       preventFullImport: true,
     },
+    "@heroicons/react/solid": {
+      transform: "@heroicons/react/solid/esm/{{ member }}",
+    },
+    "@heroicons/react/outline": {
+      transform: "@heroicons/react/outline/esm/{{ member }}",
+    },
     "@calcom/features/insights/components": {
       transform: "@calcom/features/insights/components/{{member}}",
       skipDefaultConversion: true,
@@ -193,6 +211,16 @@ const nextConfig = {
         source: "/embed/embed.js",
         destination: process.env.NEXT_PUBLIC_EMBED_LIB_URL?,
       }, */
+      {
+        source: `/:user((?!${pages.join("|")}).*)/:type`,
+        destination: "/new-booker/:user/:type",
+        has: [{ type: "cookie", key: "new-booker-enabled" }],
+      },
+      {
+        source: "/team/:slug/:type",
+        destination: "/new-booker/team/:slug/:type",
+        has: [{ type: "cookie", key: "new-booker-enabled" }],
+      },
     ];
   },
   async headers() {
@@ -292,6 +320,11 @@ const nextConfig = {
         destination: "/api/link?action=:action&email=:email&bookingUid=:bookingUid&oldToken=:oldToken",
         permanent: true,
       },
+      {
+        source: "/support",
+        destination: "/event-types?openIntercom=true",
+        permanent: true,
+      },
     ];
 
     if (process.env.NEXT_PUBLIC_WEBAPP_URL === "https://app.cal.com") {
@@ -318,21 +351,4 @@ const nextConfig = {
   },
 };
 
-const sentryWebpackPluginOptions = {
-  silent: true, // Suppresses all logs
-};
-
-const moduleExports = () => plugins.reduce((acc, next) => next(acc), nextConfig);
-
-if (process.env.NEXT_PUBLIC_SENTRY_DSN) {
-  nextConfig.sentry = {
-    hideSourceMaps: true,
-    // Prevents Sentry from running on this Edge function, where Sentry doesn't work yet (build whould crash the api route).
-    excludeServerRoutes: [/\/api\/social\/og\/image\/?/],
-  };
-}
-
-// Sentry should be the last thing to export to catch everything right
-module.exports = process.env.NEXT_PUBLIC_SENTRY_DSN
-  ? withSentryConfig(moduleExports, sentryWebpackPluginOptions)
-  : moduleExports;
+module.exports = () => plugins.reduce((acc, next) => next(acc), nextConfig);
diff --git a/apps/web/package.json b/apps/web/package.json
index eac9ee3237..21ec394929 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@calcom/web",
-  "version": "2.8.1",
+  "version": "2.8.9",
   "private": true,
   "scripts": {
     "analyze": "ANALYZE=true next build",
@@ -57,7 +57,6 @@
     "@radix-ui/react-switch": "^1.0.0",
     "@radix-ui/react-toggle-group": "^1.0.0",
     "@radix-ui/react-tooltip": "^1.0.0",
-    "@sentry/nextjs": "^7.20.0",
     "@stripe/react-stripe-js": "^1.10.0",
     "@stripe/stripe-js": "^1.35.0",
     "@tanstack/react-query": "^4.3.9",
@@ -116,8 +115,6 @@
     "react-select": "^5.7.0",
     "react-timezone-select": "^1.4.0",
     "react-use-intercom": "1.5.1",
-    "react-virtualized-auto-sizer": "^1.0.6",
-    "react-window": "^1.8.7",
     "remark": "^14.0.2",
     "rrule": "^2.7.1",
     "sanitize-html": "^2.10.0",
@@ -156,8 +153,6 @@
     "@types/qrcode": "^1.4.3",
     "@types/react": "18.0.26",
     "@types/react-phone-number-input": "^3.0.14",
-    "@types/react-virtualized-auto-sizer": "^1.0.1",
-    "@types/react-window": "^1.8.5",
     "@types/sanitize-html": "^2.9.0",
     "@types/stripe": "^8.0.417",
     "@types/uuid": "8.3.1",
diff --git a/apps/web/pages/404.tsx b/apps/web/pages/404.tsx
index 2ab4d5c8c1..dd119df042 100644
--- a/apps/web/pages/404.tsx
+++ b/apps/web/pages/404.tsx
@@ -8,6 +8,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { HeadSeo } from "@calcom/ui";
 import { BookOpen, Check, ChevronRight, FileText } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 import { ssgInit } from "@server/lib/ssg";
 
 export default function Custom404() {
@@ -366,6 +368,8 @@ export default function Custom404() {
   );
 }
 
+Custom404.PageWrapper = PageWrapper;
+
 export const getStaticProps = async (context: GetStaticPropsContext) => {
   const ssr = await ssgInit(context);
 
diff --git a/apps/web/pages/500.tsx b/apps/web/pages/500.tsx
index 7ee1cb6c50..2b10ff9612 100644
--- a/apps/web/pages/500.tsx
+++ b/apps/web/pages/500.tsx
@@ -6,6 +6,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, showToast } from "@calcom/ui";
 import { Copy } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function Error500() {
   const { t } = useLocale();
   const router = useRouter();
@@ -52,3 +54,5 @@ export default function Error500() {
     </div>
   );
 }
+
+Error500.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/[user].tsx b/apps/web/pages/[user].tsx
index f81bb65272..2ec25163fd 100644
--- a/apps/web/pages/[user].tsx
+++ b/apps/web/pages/[user].tsx
@@ -3,7 +3,6 @@ import classNames from "classnames";
 import type { GetServerSidePropsContext } from "next";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { useEffect } from "react";
 import { Toaster } from "react-hot-toast";
 
 import {
@@ -24,7 +23,6 @@ import defaultEvents, {
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import useTheme from "@calcom/lib/hooks/useTheme";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
-import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import prisma from "@calcom/prisma";
 import { baseEventTypeSelect } from "@calcom/prisma/selects";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
@@ -34,6 +32,8 @@ import { ArrowRight } from "@calcom/ui/components/icon";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 import type { EmbedProps } from "@lib/withEmbedSsr";
 
+import PageWrapper from "@components/PageWrapper";
+
 import { ssrInit } from "@server/lib/ssr";
 
 export default function User(props: inferSSRProps<typeof getServerSideProps> & EmbedProps) {
@@ -59,7 +59,7 @@ export default function User(props: inferSSRProps<typeof getServerSideProps> & E
       {eventTypes.map((type, index) => (
         <li
           key={index}
-          className=" border-subtle bg-default hover:bg-muted group relative border-b first:rounded-t-md last:rounded-b-md last:border-b-0">
+          className=" border-subtle bg-default dark:bg-muted dark:hover:bg-emphasis hover:bg-muted group relative border-b first:rounded-t-md last:rounded-b-md last:border-b-0">
           <ArrowRight className="text-emphasis absolute right-3 top-3 h-4 w-4 opacity-0 transition-opacity group-hover:opacity-100" />
           <Link
             href={getUsernameSlugLink({ users: props.users, slug: type.slug })}
@@ -93,14 +93,15 @@ export default function User(props: inferSSRProps<typeof getServerSideProps> & E
   const query = { ...router.query };
   delete query.user; // So it doesn't display in the Link (and make tests fail)
   const nameOrUsername = user.name || user.username || "";
-  const telemetry = useTelemetry();
 
-  useEffect(() => {
+  /* 
+   const telemetry = useTelemetry();
+   useEffect(() => {
     if (top !== window) {
       //page_view will be collected automatically by _middleware.ts
       telemetry.event(telemetryEventTypes.embedView, collectPageParameters("/[user]"));
     }
-  }, [telemetry, router.asPath]);
+  }, [telemetry, router.asPath]); */
   const isEventListEmpty = eventTypes.length === 0;
   return (
     <>
@@ -122,7 +123,7 @@ export default function User(props: inferSSRProps<typeof getServerSideProps> & E
         <main
           className={classNames(
             shouldAlignCentrally ? "mx-auto" : "",
-            isEmbed ? " border-booker border-booker-width  bg-default rounded-md border" : "",
+            isEmbed ? "border-booker border-booker-width  bg-default rounded-md border" : "",
             "max-w-3xl py-24 px-4"
           )}>
           {isSingleUser && ( // When we deal with a single user, not dynamic group
@@ -160,7 +161,7 @@ export default function User(props: inferSSRProps<typeof getServerSideProps> & E
                 <div
                   key={type.id}
                   style={{ display: "flex", ...eventTypeListItemEmbedStyles }}
-                  className=" border-subtle bg-default hover:bg-muted group relative border-b first:rounded-t-md last:rounded-b-md last:border-b-0">
+                  className="bg-default border-subtle dark:bg-muted dark:hover:bg-emphasis hover:bg-muted group relative border-b first:rounded-t-md last:rounded-b-md last:border-b-0">
                   <ArrowRight className="text-emphasis  absolute right-4 top-4 h-4 w-4 opacity-0 transition-opacity group-hover:opacity-100" />
                   {/* Don't prefetch till the time we drop the amount of javascript in [user][type] page which is impacting score for [user] page */}
                   <div className="block w-full p-5">
@@ -196,6 +197,9 @@ export default function User(props: inferSSRProps<typeof getServerSideProps> & E
   );
 }
 
+User.isBookingPage = true;
+User.PageWrapper = PageWrapper;
+
 const getEventTypesWithHiddenFromDB = async (userId: number) => {
   return (
     await prisma.eventType.findMany({
diff --git a/apps/web/pages/[user]/[type].tsx b/apps/web/pages/[user]/[type].tsx
index 664d7b0166..7468e89061 100644
--- a/apps/web/pages/[user]/[type].tsx
+++ b/apps/web/pages/[user]/[type].tsx
@@ -12,6 +12,7 @@ import { isBrandingHidden } from "@lib/isBrandingHidden";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 import type { EmbedProps } from "@lib/withEmbedSsr";
 
+import PageWrapper from "@components/PageWrapper";
 import AvailabilityPage from "@components/booking/pages/AvailabilityPage";
 
 export type AvailabilityPageProps = inferSSRProps<typeof getStaticProps> & EmbedProps;
@@ -54,6 +55,9 @@ export default function Type(props: AvailabilityPageProps) {
   );
 }
 
+Type.isBookingPage = true;
+Type.PageWrapper = PageWrapper;
+
 const paramsSchema = z.object({ type: z.string(), user: z.string() });
 async function getUserPageProps(context: GetStaticPropsContext) {
   // load server side dependencies
diff --git a/apps/web/pages/[user]/book.tsx b/apps/web/pages/[user]/book.tsx
index 244f4bc42d..741f35882d 100644
--- a/apps/web/pages/[user]/book.tsx
+++ b/apps/web/pages/[user]/book.tsx
@@ -5,6 +5,8 @@ import type { LocationObject } from "@calcom/app-store/locations";
 import { privacyFilteredLocations } from "@calcom/app-store/locations";
 import { getAppFromSlug } from "@calcom/app-store/utils";
 import dayjs from "@calcom/dayjs";
+import getBooking from "@calcom/features/bookings/lib/get-booking";
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
 import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
 import { parseRecurringEvent } from "@calcom/lib";
 import {
@@ -13,8 +15,6 @@ import {
   getGroupName,
   getUsernameList,
 } from "@calcom/lib/defaultEvents";
-import getBooking from "@calcom/lib/getBooking";
-import type { GetBookingType } from "@calcom/lib/getBooking";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import prisma, { bookEventTypeSelect } from "@calcom/prisma";
@@ -26,6 +26,7 @@ import {
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import BookingPage from "@components/booking/pages/BookingPage";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -69,6 +70,9 @@ export default function Book(props: BookPageProps) {
   );
 }
 
+Book.isBookingPage = true;
+Book.PageWrapper = PageWrapper;
+
 const querySchema = z.object({
   bookingUid: z.string().optional(),
   count: z.coerce.number().optional(),
diff --git a/apps/web/pages/[user]/calendar-cache/[month].tsx b/apps/web/pages/[user]/calendar-cache/[month].tsx
index 8eff9ad2fc..9cd9359bb5 100644
--- a/apps/web/pages/[user]/calendar-cache/[month].tsx
+++ b/apps/web/pages/[user]/calendar-cache/[month].tsx
@@ -18,7 +18,7 @@ export const getStaticProps: GetStaticProps<
   { user: string }
 > = async (context) => {
   const { user: username, month } = paramsSchema.parse(context.params);
-  const user = await prisma.user.findUnique({
+  const userWithCredentials = await prisma.user.findUnique({
     where: {
       username,
     },
@@ -34,14 +34,15 @@ export const getStaticProps: GetStaticProps<
   ).startOf("day");
   const endDate = startDate.endOf("month");
   try {
-    const results = user?.credentials
+    const results = userWithCredentials?.credentials
       ? await getCachedResults(
-          user?.credentials,
+          userWithCredentials?.credentials,
           startDate.format(),
           endDate.format(),
-          user?.selectedCalendars
+          userWithCredentials?.selectedCalendars
         )
       : [];
+
     return {
       props: { results, date: new Date().toISOString() },
       revalidate: 1,
diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx
index 231c005abe..c5690123d1 100644
--- a/apps/web/pages/_app.tsx
+++ b/apps/web/pages/_app.tsx
@@ -1,101 +1,13 @@
-import { DefaultSeo } from "next-seo";
-import { Inter } from "next/font/google";
-import localFont from "next/font/local";
-import Head from "next/head";
-import Script from "next/script";
-
-import "@calcom/embed-core/src/embed-iframe";
-import { useEmbedUiConfig } from "@calcom/embed-core/src/embed-iframe";
-import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { trpc } from "@calcom/trpc/react";
 
 import type { AppProps } from "@lib/app-providers";
-import AppProviders from "@lib/app-providers";
-import { seoConfig } from "@lib/config/next-seo.config";
-
-import I18nLanguageHandler from "@components/I18nLanguageHandler";
 
 import "../styles/globals.css";
 
-const interFont = Inter({ subsets: ["latin"], variable: "--font-inter", preload: true, display: "swap" });
-const calFont = localFont({
-  src: "../fonts/CalSans-SemiBold.woff2",
-  variable: "--font-cal",
-  preload: true,
-  display: "swap",
-});
-
 function MyApp(props: AppProps) {
-  const { Component, pageProps, err, router } = props;
-  let pageStatus = "200";
-  const { cssVarsPerTheme } = useEmbedUiConfig();
-  const cssVarsStyle = [];
-  if (cssVarsPerTheme) {
-    for (const [themeName, cssVars] of Object.entries(cssVarsPerTheme)) {
-      cssVarsStyle.push(`.${themeName} {`);
-      for (const [cssVarName, value] of Object.entries(cssVars)) {
-        cssVarsStyle.push(`--${cssVarName}: ${value};`);
-      }
-      cssVarsStyle.push(`}`);
-    }
-  }
-
-  if (router.pathname === "/404") {
-    pageStatus = "404";
-  } else if (router.pathname === "/500") {
-    pageStatus = "500";
-  }
-
-  // On client side don't let nonce creep into DOM
-  // It also avoids hydration warning that says that Client has the nonce value but server has "" because browser removes nonce attributes before DOM is built
-  // See https://github.com/kentcdodds/nonce-hydration-issues
-  // Set "" only if server had it set otherwise keep it undefined because server has to match with client to avoid hydration error
-  const nonce = typeof window !== "undefined" ? (pageProps.nonce ? "" : undefined) : pageProps.nonce;
-  const providerProps = {
-    ...props,
-    pageProps: {
-      ...props.pageProps,
-      nonce,
-    },
-  };
-  // Use the layout defined at the page level, if available
-  const getLayout = Component.getLayout ?? ((page) => page);
-  return (
-    <AppProviders {...providerProps}>
-      <DefaultSeo {...seoConfig.defaultNextSeo} />
-      <I18nLanguageHandler />
-      <Script
-        nonce={nonce}
-        id="page-status"
-        dangerouslySetInnerHTML={{ __html: `window.CalComPageStatus = '${pageStatus}'` }}
-      />
-      <style jsx global>{`
-        :root {
-          --font-inter: ${interFont.style.fontFamily};
-          --font-cal: ${calFont.style.fontFamily};
-        }
-      `}</style>
-
-      <style jsx global>
-        {`
-          ${cssVarsStyle.join("")}
-        `}
-      </style>
-      <Head>
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-      </Head>
-      {getLayout(
-        Component.requiresLicense ? (
-          <LicenseRequired>
-            <Component {...pageProps} err={err} />
-          </LicenseRequired>
-        ) : (
-          <Component {...pageProps} err={err} />
-        ),
-        router
-      )}
-    </AppProviders>
-  );
+  const { Component, pageProps } = props;
+  if (Component.PageWrapper !== undefined) return Component.PageWrapper(props);
+  return <Component {...pageProps} />;
 }
 
 export default trpc.withTRPC(MyApp);
diff --git a/apps/web/pages/_document.tsx b/apps/web/pages/_document.tsx
index 715ec084a0..f7b51e9352 100644
--- a/apps/web/pages/_document.tsx
+++ b/apps/web/pages/_document.tsx
@@ -1,22 +1,27 @@
+import type { NextPageContext } from "next";
 import type { DocumentContext, DocumentProps } from "next/document";
 import Document, { Head, Html, Main, NextScript } from "next/document";
-import Script from "next/script";
 import { z } from "zod";
 
-import { getDirFromLang } from "@calcom/lib/i18n";
-
 import { csp } from "@lib/csp";
 
 type Props = Record<string, unknown> & DocumentProps;
-
+function setHeader(ctx: NextPageContext, name: string, value: string) {
+  try {
+    ctx.res?.setHeader(name, value);
+  } catch (e) {
+    // Getting "Error [ERR_HTTP_HEADERS_SENT]: Cannot set headers after they are sent to the client" when revalidate calendar chache
+    console.log(`Error setting header ${name}=${value} for ${ctx.asPath || "unknown asPath"}`, e);
+  }
+}
 class MyDocument extends Document<Props> {
   static async getInitialProps(ctx: DocumentContext) {
     const { nonce } = csp(ctx.req || null, ctx.res || null);
     if (!process.env.CSP_POLICY) {
-      ctx.res?.setHeader("x-csp", "not-opted-in");
+      setHeader(ctx, "x-csp", "not-opted-in");
     } else if (!ctx.res?.getHeader("x-csp")) {
       // If x-csp not set by gSSP, then it's initialPropsOnly
-      ctx.res?.setHeader("x-csp", "initialPropsOnly");
+      setHeader(ctx, "x-csp", "initialPropsOnly");
     }
     const asPath = ctx.asPath || "";
     // Use a dummy URL as default so that URL parsing works for relative URLs as well. We care about searchParams and pathname only
@@ -31,9 +36,8 @@ class MyDocument extends Document<Props> {
     const { isEmbed } = this.props;
     const nonceParsed = z.string().safeParse(this.props.nonce);
     const nonce = nonceParsed.success ? nonceParsed.data : "";
-    const dir = getDirFromLang(locale);
     return (
-      <Html lang={locale} dir={dir}>
+      <Html lang={locale}>
         <Head nonce={nonce}>
           <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
           <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
@@ -42,7 +46,6 @@ class MyDocument extends Document<Props> {
           <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#000000" />
           <meta name="msapplication-TileColor" content="#ff0000" />
           <meta name="theme-color" content="var(--cal-bg)" />
-          <Script src="/embed-init-iframe.js" strategy="beforeInteractive" />
         </Head>
 
         <body
diff --git a/apps/web/pages/_error.tsx b/apps/web/pages/_error.tsx
index 528294e7a5..fb0ce29505 100644
--- a/apps/web/pages/_error.tsx
+++ b/apps/web/pages/_error.tsx
@@ -2,17 +2,15 @@
  * Typescript class based component for custom-error
  * @link https://nextjs.org/docs/advanced-features/custom-error-page
  */
-import * as Sentry from "@sentry/nextjs";
 import type { NextPage, NextPageContext } from "next";
 import type { ErrorProps } from "next/error";
 import NextError from "next/error";
 import React from "react";
 
 import { getErrorFromUnknown } from "@calcom/lib/errors";
+import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 
-import { HttpError } from "@lib/core/http/error";
-
 import { ErrorPage } from "@components/error/error-page";
 
 // Adds HttpException to the list of possible error types.
@@ -50,7 +48,6 @@ const CustomError: NextPage<CustomErrorProps> = (props) => {
  */
 CustomError.getInitialProps = async (ctx: AugmentedNextPageContext) => {
   const { res, err, asPath } = ctx;
-  await Sentry.captureUnderscoreErrorException(ctx);
   const errorInitialProps = (await NextError.getInitialProps({
     res,
     err,
diff --git a/apps/web/pages/api/auth/oidc.ts b/apps/web/pages/api/auth/oidc.ts
index f8cd8799eb..0e65b2b551 100644
--- a/apps/web/pages/api/auth/oidc.ts
+++ b/apps/web/pages/api/auth/oidc.ts
@@ -1,8 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 
 import jackson from "@calcom/features/ee/sso/lib/jackson";
-
-import { HttpError } from "@lib/core/http/error";
+import { HttpError } from "@calcom/lib/http-error";
 
 // This is the callback endpoint for the OIDC provider
 // A team must set this endpoint in the OIDC provider's configuration
diff --git a/apps/web/pages/api/auth/saml/authorize.ts b/apps/web/pages/api/auth/saml/authorize.ts
index 8d42bec42e..337406cb4f 100644
--- a/apps/web/pages/api/auth/saml/authorize.ts
+++ b/apps/web/pages/api/auth/saml/authorize.ts
@@ -2,8 +2,7 @@ import type { OAuthReq } from "@boxyhq/saml-jackson";
 import type { NextApiRequest, NextApiResponse } from "next";
 
 import jackson from "@calcom/features/ee/sso/lib/jackson";
-
-import type { HttpError } from "@lib/core/http/error";
+import type { HttpError } from "@calcom/lib/http-error";
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   const { oauthController } = await jackson();
diff --git a/apps/web/pages/api/availability/calendar.ts b/apps/web/pages/api/availability/calendar.ts
index aecbe4f51b..5726fb3827 100644
--- a/apps/web/pages/api/availability/calendar.ts
+++ b/apps/web/pages/api/availability/calendar.ts
@@ -14,7 +14,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     return;
   }
 
-  const user = await prisma.user.findUnique({
+  const userWithCredentials = await prisma.user.findUnique({
     where: {
       id: session.user.id,
     },
@@ -25,11 +25,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       selectedCalendars: true,
     },
   });
-
-  if (!user) {
+  if (!userWithCredentials) {
     res.status(401).json({ message: "Not authenticated" });
     return;
   }
+  const { credentials, ...user } = userWithCredentials;
 
   if (req.method === "POST") {
     await prisma.selectedCalendar.upsert({
@@ -80,7 +80,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     });
 
     // get user's credentials + their connected integrations
-    const calendarCredentials = getCalendarCredentials(user.credentials);
+    const calendarCredentials = getCalendarCredentials(credentials);
     // get all the connected integrations' calendars (from third party)
     const { connectedCalendars } = await getConnectedCalendars(calendarCredentials, user.selectedCalendars);
     const calendars = connectedCalendars.flatMap((c) => c.calendars).filter(notEmpty);
diff --git a/apps/web/pages/api/integrations/[...args].ts b/apps/web/pages/api/integrations/[...args].ts
index 228b896125..5b789e8ffd 100644
--- a/apps/web/pages/api/integrations/[...args].ts
+++ b/apps/web/pages/api/integrations/[...args].ts
@@ -4,12 +4,11 @@ import type { Session } from "next-auth";
 import getInstalledAppPath from "@calcom/app-store/_utils/getInstalledAppPath";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { deriveAppDictKeyFromType } from "@calcom/lib/deriveAppDictKeyFromType";
+import { HttpError } from "@calcom/lib/http-error";
 import { revalidateCalendarCache } from "@calcom/lib/server/revalidateCalendarCache";
 import prisma from "@calcom/prisma";
 import type { AppDeclarativeHandler, AppHandler } from "@calcom/types/AppHandler";
 
-import { HttpError } from "@lib/core/http/error";
-
 const defaultIntegrationAddHandler = async ({
   slug,
   supportsMultipleInstalls,
diff --git a/apps/web/pages/api/intercom-hash.ts b/apps/web/pages/api/intercom-hash.ts
new file mode 100644
index 0000000000..54f2419331
--- /dev/null
+++ b/apps/web/pages/api/intercom-hash.ts
@@ -0,0 +1,28 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import crypto from "node:crypto";
+
+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { defaultHandler } from "@calcom/lib/server";
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const session = await getServerSession({ req, res });
+  const secret = process.env.INTERCOM_SECRET;
+
+  if (!session) {
+    return res.status(401).json({ message: "user not authenticated" });
+  }
+
+  if (!secret) {
+    return res.status(400).json({ message: "Intercom Identity Verification secret not set" });
+  }
+
+  const hmac = crypto.createHmac("sha256", secret);
+  hmac.update(String(session.user.id));
+  const hash = hmac.digest("hex");
+
+  return res.status(200).json({ hash });
+}
+
+export default defaultHandler({
+  GET: Promise.resolve({ default: handler }),
+});
diff --git a/apps/web/pages/api/logo.ts b/apps/web/pages/api/logo.ts
new file mode 100644
index 0000000000..5afdedeb16
--- /dev/null
+++ b/apps/web/pages/api/logo.ts
@@ -0,0 +1,80 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import { z } from "zod";
+
+import { IS_SELF_HOSTED, LOGO, LOGO_ICON, WEBAPP_URL } from "@calcom/lib/constants";
+
+function removePort(url: string) {
+  return url.replace(/:\d+$/, "");
+}
+
+function extractSubdomainAndDomain(hostname: string) {
+  const hostParts = removePort(hostname).split(".");
+
+  const subdomainParts = hostParts.slice(0, hostParts.length - 2);
+  const domain = hostParts.slice(hostParts.length - 2).join(".");
+
+  return [subdomainParts[0], domain];
+}
+
+const logoApiSchema = z.object({
+  icon: z.coerce.boolean().optional(),
+});
+
+const SYSTEM_SUBDOMAINS = ["console", "app", "www"];
+
+async function getTeamLogos(subdomain: string) {
+  if (
+    // if not cal.com
+    IS_SELF_HOSTED ||
+    // missing subdomain (empty string)
+    !subdomain ||
+    // in SYSTEM_SUBDOMAINS list
+    SYSTEM_SUBDOMAINS.includes(subdomain)
+  ) {
+    return {
+      appLogo: `${WEBAPP_URL}${LOGO}`,
+      appIconLogo: `${WEBAPP_URL}${LOGO_ICON}`,
+    };
+  }
+  // load from DB
+  const { default: prisma } = await import("@calcom/prisma");
+  const team = await prisma.team.findUniqueOrThrow({
+    where: {
+      slug: subdomain,
+    },
+    select: {
+      appLogo: true,
+      appIconLogo: true,
+    },
+  });
+  // try to use team logos, otherwise default to LOGO/LOGO_ICON regardless
+  return {
+    appLogo: team.appLogo || `${WEBAPP_URL}${LOGO}`,
+    appIconLogo: team.appIconLogo || `${WEBAPP_URL}${LOGO_ICON}`,
+  };
+}
+
+/**
+ * This API endpoint is used to serve the logo associated with a team if no logo is found we serve our default logo
+ */
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { query } = req;
+  const parsedQuery = logoApiSchema.parse(query);
+
+  const hostname = req?.headers["host"];
+  if (!hostname) throw new Error("No hostname");
+  const domains = extractSubdomainAndDomain(hostname);
+  if (!domains) throw new Error("No domains");
+
+  const [subdomain] = domains;
+  const { appLogo, appIconLogo } = await getTeamLogos(subdomain);
+
+  const filteredLogo = parsedQuery?.icon ? appIconLogo : appLogo;
+
+  const response = await fetch(filteredLogo);
+  const arrayBuffer = await response.arrayBuffer();
+  const buffer = Buffer.from(arrayBuffer);
+  res.setHeader("Content-Type", response.headers.get("content-type") as string);
+  res.setHeader("Cache-Control", "s-maxage=86400");
+  res.send(buffer);
+}
diff --git a/apps/web/pages/api/newbooker/[status].tsx b/apps/web/pages/api/newbooker/[status].tsx
new file mode 100644
index 0000000000..13bc1db346
--- /dev/null
+++ b/apps/web/pages/api/newbooker/[status].tsx
@@ -0,0 +1,26 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import { z } from "zod";
+
+import { defaultResponder } from "@calcom/lib/server";
+
+const newBookerSchema = z.object({
+  status: z.enum(["enable", "disable"]),
+});
+
+/**
+ * Very basic temporary api route to enable/disable new booker access.
+ */
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { status } = newBookerSchema.parse(req.query);
+
+  if (status === "enable") {
+    const expires = new Date();
+    expires.setFullYear(expires.getFullYear() + 1);
+    res.setHeader("Set-Cookie", `new-booker-enabled=true; path=/; expires=${expires.toUTCString()}`);
+  } else {
+    res.setHeader("Set-Cookie", "new-booker-enabled=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT");
+  }
+  res.send({ status: 200, body: `Done – ${status}` });
+}
+
+export default defaultResponder(handler);
diff --git a/apps/web/pages/api/recorded-daily-video.ts b/apps/web/pages/api/recorded-daily-video.ts
index 0ff65f7dc5..19de912751 100644
--- a/apps/web/pages/api/recorded-daily-video.ts
+++ b/apps/web/pages/api/recorded-daily-video.ts
@@ -54,7 +54,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
         user: {
           select: {
             id: true,
-            credentials: true,
             timeZone: true,
             email: true,
             name: true,
diff --git a/apps/web/pages/apps/[slug]/[...pages].tsx b/apps/web/pages/apps/[slug]/[...pages].tsx
index a4c502ff1c..5d7acac573 100644
--- a/apps/web/pages/apps/[slug]/[...pages].tsx
+++ b/apps/web/pages/apps/[slug]/[...pages].tsx
@@ -9,13 +9,16 @@ import type { AppGetServerSideProps } from "@calcom/types/AppGetServerSideProps"
 
 import type { AppProps } from "@lib/app-providers";
 
+import PageWrapper from "@components/PageWrapper";
+
 import { ssrInit } from "@server/lib/ssr";
 
 type AppPageType = {
   getServerSideProps: AppGetServerSideProps;
   // A component than can accept any properties
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  default: ((props: any) => JSX.Element) & Pick<AppProps["Component"], "isThemeSupported" | "getLayout">;
+  default: ((props: any) => JSX.Element) &
+    Pick<AppProps["Component"], "isBookingPage" | "getLayout" | "PageWrapper">;
 };
 
 type Found = {
@@ -70,17 +73,17 @@ const AppPage: AppPageType["default"] = function AppPage(props) {
   return <route.Component {...componentProps} />;
 };
 
-AppPage.isThemeSupported = ({ router }) => {
+AppPage.isBookingPage = ({ router }) => {
   const route = getRoute(router.query.slug as string, router.query.pages as string[]);
   if (route.notFound) {
     return false;
   }
-  const isThemeSupported = route.Component.isThemeSupported;
-  if (typeof isThemeSupported === "function") {
-    return isThemeSupported({ router });
+  const isBookingPage = route.Component.isBookingPage;
+  if (typeof isBookingPage === "function") {
+    return isBookingPage({ router });
   }
 
-  return !!isThemeSupported;
+  return !!isBookingPage;
 };
 
 AppPage.getLayout = (page, router) => {
@@ -94,6 +97,8 @@ AppPage.getLayout = (page, router) => {
   return route.Component.getLayout(page, router);
 };
 
+AppPage.PageWrapper = PageWrapper;
+
 export default AppPage;
 
 export async function getServerSideProps(
diff --git a/apps/web/pages/apps/[slug]/index.tsx b/apps/web/pages/apps/[slug]/index.tsx
index 35fc252b73..adc35ee727 100644
--- a/apps/web/pages/apps/[slug]/index.tsx
+++ b/apps/web/pages/apps/[slug]/index.tsx
@@ -10,6 +10,7 @@ import prisma from "@calcom/prisma";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import App from "@components/apps/App";
 
 const md = new MarkdownIt("default", { html: true, breaks: true });
@@ -122,4 +123,6 @@ export const getStaticProps = async (ctx: GetStaticPropsContext) => {
   };
 };
 
+SingleAppPage.PageWrapper = PageWrapper;
+
 export default SingleAppPage;
diff --git a/apps/web/pages/apps/[slug]/setup.tsx b/apps/web/pages/apps/[slug]/setup.tsx
index 5378d3e7df..c53b61aea1 100644
--- a/apps/web/pages/apps/[slug]/setup.tsx
+++ b/apps/web/pages/apps/[slug]/setup.tsx
@@ -5,6 +5,8 @@ import { useRouter } from "next/router";
 import { AppSetupPage } from "@calcom/app-store/_pages/setup";
 import { getStaticProps } from "@calcom/app-store/_pages/setup/_getStaticProps";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function SetupInformation(props: InferGetStaticPropsType<typeof getStaticProps>) {
   const router = useRouter();
   const slug = router.query.slug as string;
@@ -26,6 +28,8 @@ export default function SetupInformation(props: InferGetStaticPropsType<typeof g
   return <AppSetupPage slug={slug} {...props} />;
 }
 
+SetupInformation.PageWrapper = PageWrapper;
+
 export const getStaticPaths: GetStaticPaths = async () => {
   return {
     paths: [],
diff --git a/apps/web/pages/apps/categories/[category].tsx b/apps/web/pages/apps/categories/[category].tsx
index c66f891418..5897eb1d21 100644
--- a/apps/web/pages/apps/categories/[category].tsx
+++ b/apps/web/pages/apps/categories/[category].tsx
@@ -9,6 +9,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import prisma from "@calcom/prisma";
 import { AppCard, SkeletonText } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function Apps({ apps }: InferGetStaticPropsType<typeof getStaticProps>) {
   const { t, isLocaleReady } = useLocale();
   const router = useRouter();
@@ -47,6 +49,8 @@ export default function Apps({ apps }: InferGetStaticPropsType<typeof getStaticP
   );
 }
 
+Apps.PageWrapper = PageWrapper;
+
 export const getStaticPaths = async () => {
   const paths = Object.keys(AppCategories);
 
diff --git a/apps/web/pages/apps/categories/index.tsx b/apps/web/pages/apps/categories/index.tsx
index 70cc450374..ec0f5ec22d 100644
--- a/apps/web/pages/apps/categories/index.tsx
+++ b/apps/web/pages/apps/categories/index.tsx
@@ -7,11 +7,13 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { SkeletonText } from "@calcom/ui";
 import { ArrowLeft, ArrowRight } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function Apps({ categories }: InferGetStaticPropsType<typeof getStaticProps>) {
   const { t, isLocaleReady } = useLocale();
 
   return (
-    <Shell isPublic large>
+    <Shell isPublic large hideHeadingOnMobile>
       <div className="text-md flex items-center gap-1 px-4 pb-3 pt-3 font-normal md:px-8 lg:px-0 lg:pt-0">
         <Link
           href="/apps"
@@ -43,6 +45,8 @@ export default function Apps({ categories }: InferGetStaticPropsType<typeof getS
   );
 }
 
+Apps.PageWrapper = PageWrapper;
+
 export const getStaticProps = async () => {
   const appStore = await getAppRegistry();
   const categories = appStore.reduce((c, app) => {
diff --git a/apps/web/pages/apps/index.tsx b/apps/web/pages/apps/index.tsx
index 97e6e12e0d..16430ffcd7 100644
--- a/apps/web/pages/apps/index.tsx
+++ b/apps/web/pages/apps/index.tsx
@@ -12,6 +12,7 @@ import type { HorizontalTabItemProps } from "@calcom/ui";
 import { AllApps, AppStoreCategories, HorizontalTabs, TextField, PopularAppsSlider } from "@calcom/ui";
 import { Search } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
 import AppsLayout from "@components/apps/layouts/AppsLayout";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -85,6 +86,8 @@ export default function Apps({ categories, appStore }: inferSSRProps<typeof getS
   );
 }
 
+Apps.PageWrapper = PageWrapper;
+
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { req, res } = context;
 
diff --git a/apps/web/pages/apps/installed/[category].tsx b/apps/web/pages/apps/installed/[category].tsx
index 075c8618e7..6edda5ecbb 100644
--- a/apps/web/pages/apps/installed/[category].tsx
+++ b/apps/web/pages/apps/installed/[category].tsx
@@ -44,6 +44,7 @@ import {
 import { QueryCell } from "@lib/QueryCell";
 
 import AppListCard from "@components/AppListCard";
+import PageWrapper from "@components/PageWrapper";
 import { CalendarListContainer } from "@components/apps/CalendarListContainer";
 import InstalledAppsLayout from "@components/apps/layouts/InstalledAppsLayout";
 
@@ -372,3 +373,5 @@ export async function getServerSideProps(ctx: AppGetServerSidePropsContext) {
     },
   };
 }
+
+InstalledApps.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/auth/error.tsx b/apps/web/pages/auth/error.tsx
index a73972a979..281969aec9 100644
--- a/apps/web/pages/auth/error.tsx
+++ b/apps/web/pages/auth/error.tsx
@@ -7,6 +7,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, SkeletonText } from "@calcom/ui";
 import { X } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
 import AuthContainer from "@components/ui/AuthContainer";
 
 import { ssgInit } from "@server/lib/ssg";
@@ -49,6 +50,8 @@ export default function Error() {
   );
 }
 
+Error.PageWrapper = PageWrapper;
+
 export const getStaticProps = async (context: GetStaticPropsContext) => {
   const ssr = await ssgInit(context);
 
diff --git a/apps/web/pages/auth/forgot-password/[id].tsx b/apps/web/pages/auth/forgot-password/[id].tsx
index 0fa3b730ce..d4549a5f0d 100644
--- a/apps/web/pages/auth/forgot-password/[id].tsx
+++ b/apps/web/pages/auth/forgot-password/[id].tsx
@@ -12,6 +12,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import prisma from "@calcom/prisma";
 import { Button, TextField } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
 import AuthContainer from "@components/ui/AuthContainer";
 
 type Props = {
@@ -174,7 +175,7 @@ export default function Page({ resetPasswordRequest, csrfToken }: Props) {
 }
 
 Page.isThemeSupported = false;
-
+Page.PageWrapper = PageWrapper;
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const id = context.params?.id as string;
 
diff --git a/apps/web/pages/auth/forgot-password/index.tsx b/apps/web/pages/auth/forgot-password/index.tsx
index e3fd74ef71..9cb5052000 100644
--- a/apps/web/pages/auth/forgot-password/index.tsx
+++ b/apps/web/pages/auth/forgot-password/index.tsx
@@ -11,6 +11,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, EmailField } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
 import AuthContainer from "@components/ui/AuthContainer";
 
 export default function ForgotPassword({ csrfToken }: { csrfToken: string }) {
@@ -144,6 +145,7 @@ export default function ForgotPassword({ csrfToken }: { csrfToken: string }) {
 }
 
 ForgotPassword.isThemeSupported = false;
+ForgotPassword.PageWrapper = PageWrapper;
 
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { req, res } = context;
diff --git a/apps/web/pages/auth/login.tsx b/apps/web/pages/auth/login.tsx
index 2f3359af42..d3c1ede016 100644
--- a/apps/web/pages/auth/login.tsx
+++ b/apps/web/pages/auth/login.tsx
@@ -26,6 +26,7 @@ import type { WithNonceProps } from "@lib/withNonce";
 import withNonce from "@lib/withNonce";
 
 import AddToHomescreen from "@components/AddToHomescreen";
+import PageWrapper from "@components/PageWrapper";
 import TwoFactor from "@components/auth/TwoFactor";
 import AuthContainer from "@components/ui/AuthContainer";
 
@@ -164,14 +165,6 @@ export default function Login({
                   {...register("email")}
                 />
                 <div className="relative">
-                  <div className="absolute -top-[6px]  z-10 ltr:right-0 rtl:left-0">
-                    <Link
-                      href="/auth/forgot-password"
-                      tabIndex={-1}
-                      className="text-default text-sm font-medium">
-                      {t("forgot")}
-                    </Link>
-                  </div>
                   <PasswordField
                     id="password"
                     autoComplete="off"
@@ -179,6 +172,14 @@ export default function Login({
                     className="mb-0"
                     {...register("password")}
                   />
+                  <div className="absolute -top-1.5 ltr:right-0 rtl:left-0">
+                    <Link
+                      href="/auth/forgot-password"
+                      tabIndex={-1}
+                      className="text-default text-sm font-medium">
+                      {t("forgot")}
+                    </Link>
+                  </div>
                 </div>
               </div>
 
@@ -302,5 +303,6 @@ const _getServerSideProps = async function getServerSideProps(context: GetServer
 };
 
 Login.isThemeSupported = false;
+Login.PageWrapper = PageWrapper;
 
 export const getServerSideProps = withNonce(_getServerSideProps);
diff --git a/apps/web/pages/auth/logout.tsx b/apps/web/pages/auth/logout.tsx
index 28323c447f..b655fe1d49 100644
--- a/apps/web/pages/auth/logout.tsx
+++ b/apps/web/pages/auth/logout.tsx
@@ -10,6 +10,7 @@ import { Check } from "@calcom/ui/components/icon";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import AuthContainer from "@components/ui/AuthContainer";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -51,7 +52,7 @@ export function Logout(props: Props) {
 }
 
 Logout.isThemeSupported = false;
-
+Logout.PageWrapper = PageWrapper;
 export default Logout;
 
 export async function getServerSideProps(context: GetServerSidePropsContext) {
diff --git a/apps/web/pages/auth/saml-idp.tsx b/apps/web/pages/auth/saml-idp.tsx
index 5834c74bbe..153fffed41 100644
--- a/apps/web/pages/auth/saml-idp.tsx
+++ b/apps/web/pages/auth/saml-idp.tsx
@@ -2,6 +2,8 @@ import { signIn } from "next-auth/react";
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
+import PageWrapper from "@components/PageWrapper";
+
 // To handle the IdP initiated login flow callback
 export default function Page() {
   const router = useRouter();
@@ -21,3 +23,4 @@ export default function Page() {
 
   return null;
 }
+Page.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/auth/setup/index.tsx b/apps/web/pages/auth/setup/index.tsx
index df31a2b7d0..9afbab6327 100644
--- a/apps/web/pages/auth/setup/index.tsx
+++ b/apps/web/pages/auth/setup/index.tsx
@@ -11,6 +11,7 @@ import prisma from "@calcom/prisma";
 import type { inferSSRProps } from "@calcom/types/inferSSRProps";
 import { Meta, WizardForm } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
 import { AdminUserContainer as AdminUser } from "@components/setup/AdminUser";
 import ChooseLicense from "@components/setup/ChooseLicense";
 import EnterpriseLicense from "@components/setup/EnterpriseLicense";
@@ -136,7 +137,7 @@ export function Setup(props: inferSSRProps<typeof getServerSideProps>) {
 }
 
 Setup.isThemeSupported = false;
-
+Setup.PageWrapper = PageWrapper;
 export default Setup;
 
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
diff --git a/apps/web/pages/auth/signin.tsx b/apps/web/pages/auth/signin.tsx
index ee16a15540..295879ddd3 100644
--- a/apps/web/pages/auth/signin.tsx
+++ b/apps/web/pages/auth/signin.tsx
@@ -4,6 +4,8 @@ import { getProviders, signIn, getCsrfToken } from "next-auth/react";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { Button } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
+
 type Provider = {
   name: string;
   id: string;
@@ -23,6 +25,8 @@ function signin({ providers }: { providers: Provider[] }) {
   );
 }
 
+signin.PageWrapper = PageWrapper;
+
 export default signin;
 
 export async function getServerSideProps(context: GetServerSidePropsContext) {
diff --git a/apps/web/pages/auth/sso/[provider].tsx b/apps/web/pages/auth/sso/[provider].tsx
index b15c186ba5..6a68051cf5 100644
--- a/apps/web/pages/auth/sso/[provider].tsx
+++ b/apps/web/pages/auth/sso/[provider].tsx
@@ -19,6 +19,8 @@ import prisma from "@calcom/prisma";
 import { asStringOrNull } from "@lib/asStringOrNull";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
+
 import { ssrInit } from "@server/lib/ssr";
 
 export type SSOProviderPageProps = inferSSRProps<typeof getServerSideProps>;
@@ -49,6 +51,8 @@ export default function Provider(props: SSOProviderPageProps) {
   return null;
 }
 
+Provider.PageWrapper = PageWrapper;
+
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   // get query params and typecast them to string
   // (would be even better to assert them instead of typecasting)
diff --git a/apps/web/pages/auth/sso/direct.tsx b/apps/web/pages/auth/sso/direct.tsx
index 23b0a66be4..d1390a3043 100644
--- a/apps/web/pages/auth/sso/direct.tsx
+++ b/apps/web/pages/auth/sso/direct.tsx
@@ -1,33 +1,41 @@
 import { signIn } from "next-auth/react";
 import { useRouter } from "next/router";
+import { useEffect } from "react";
 
 import { samlProductID, samlTenantID } from "@calcom/features/ee/sso/lib/saml";
 import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
+
 // This page is used to initiate the SAML authentication flow by redirecting to the SAML provider.
 // Accessible only on self-hosted Cal.com instances.
 export default function Page({ samlTenantID, samlProductID }: inferSSRProps<typeof getServerSideProps>) {
   const router = useRouter();
 
-  if (HOSTED_CAL_FEATURES) {
-    router.push("/auth/login");
-    return;
-  }
+  useEffect(() => {
+    if (HOSTED_CAL_FEATURES) {
+      router.push("/auth/login");
+    }
+  }, []);
 
-  // Initiate SAML authentication flow
-  signIn(
-    "saml",
-    {
-      callbackUrl: "/",
-    },
-    { tenant: samlTenantID, product: samlProductID }
-  );
+  useEffect(() => {
+    // Initiate SAML authentication flow
+    signIn(
+      "saml",
+      {
+        callbackUrl: "/",
+      },
+      { tenant: samlTenantID, product: samlProductID }
+    );
+  }, []);
 
   return null;
 }
 
+Page.PageWrapper = PageWrapper;
+
 export async function getServerSideProps() {
   return {
     props: {
diff --git a/apps/web/pages/auth/verify.tsx b/apps/web/pages/auth/verify.tsx
index a9c041b551..06433aa783 100644
--- a/apps/web/pages/auth/verify.tsx
+++ b/apps/web/pages/auth/verify.tsx
@@ -11,6 +11,7 @@ import { trpc } from "@calcom/trpc/react";
 import { Button, showToast } from "@calcom/ui";
 
 import Loader from "@components/Loader";
+import PageWrapper from "@components/PageWrapper";
 
 async function sendVerificationLogin(email: string, username: string) {
   await signIn("email", {
@@ -177,3 +178,5 @@ export default function Verify() {
     </div>
   );
 }
+
+Verify.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/availability/[schedule].tsx b/apps/web/pages/availability/[schedule].tsx
index 6751a678f2..aa25e7e84b 100644
--- a/apps/web/pages/availability/[schedule].tsx
+++ b/apps/web/pages/availability/[schedule].tsx
@@ -1,4 +1,5 @@
 import { useRouter } from "next/router";
+import { useState } from "react";
 import { Controller, useFieldArray, useForm } from "react-hook-form";
 import { z } from "zod";
 
@@ -9,6 +10,7 @@ import { availabilityAsString } from "@calcom/lib/availability";
 import { yyyymmdd } from "@calcom/lib/date-fns";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
+import { HttpError } from "@calcom/lib/http-error";
 import { trpc } from "@calcom/trpc/react";
 import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
 import type { Schedule as ScheduleType, TimeRange, WorkingHours } from "@calcom/types/schedule";
@@ -24,13 +26,17 @@ import {
   Tooltip,
   Dialog,
   DialogTrigger,
+  DropdownMenuSeparator,
+  Dropdown,
+  DropdownMenuContent,
+  DropdownItem,
+  DropdownMenuTrigger,
   ConfirmationDialogContent,
   VerticalDivider,
 } from "@calcom/ui";
-import { Info, Plus, Trash } from "@calcom/ui/components/icon";
-
-import { HttpError } from "@lib/core/http/error";
+import { Info, Plus, Trash, MoreHorizontal } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
 import { SelectSkeletonLoader } from "@components/availability/SkeletonLoader";
 import EditableHeading from "@components/ui/EditableHeading";
 
@@ -96,6 +102,7 @@ export default function Availability() {
 
   const { fromEventType } = router.query;
   const { timeFormat } = me.data || { timeFormat: null };
+  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const { data: schedule, isLoading } = trpc.viewer.availability.schedule.get.useQuery(
     { scheduleId },
     {
@@ -181,11 +188,8 @@ export default function Availability() {
       }
       CTA={
         <div className="flex items-center justify-end">
-          <div className="sm:hover:bg-subtle flex items-center rounded-md px-2">
-            <Skeleton
-              as={Label}
-              htmlFor="hiddenSwitch"
-              className="mt-2 hidden cursor-pointer self-center pr-2 sm:inline">
+          <div className="hidden items-center rounded-md px-2 sm:flex sm:hover:bg-gray-100">
+            <Skeleton as={Label} htmlFor="hiddenSwitch" className="mt-2 cursor-pointer self-center pr-2 ">
               {t("set_to_default")}
             </Skeleton>
             <Switch
@@ -198,7 +202,7 @@ export default function Availability() {
             />
           </div>
 
-          <VerticalDivider />
+          <VerticalDivider className="hidden sm:inline" />
           <Dialog>
             <DialogTrigger asChild>
               <Button
@@ -206,6 +210,7 @@ export default function Availability() {
                 variant="icon"
                 color="destructive"
                 aria-label={t("delete")}
+                className="hidden sm:inline"
                 disabled={schedule?.isLastSchedule}
                 tooltip={t("requires_at_least_one_schedule")}
               />
@@ -222,8 +227,51 @@ export default function Availability() {
               {t("delete_schedule_description")}
             </ConfirmationDialogContent>
           </Dialog>
-
-          <VerticalDivider />
+          <VerticalDivider className="hidden sm:inline" />
+          <Dropdown>
+            <DropdownMenuTrigger asChild>
+              <Button className="sm:hidden" StartIcon={MoreHorizontal} variant="icon" color="secondary" />
+            </DropdownMenuTrigger>
+            <DropdownMenuContent style={{ minWidth: "200px" }}>
+              <DropdownItem
+                type="button"
+                color="destructive"
+                StartIcon={Trash}
+                onClick={() => setDeleteDialogOpen(true)}>
+                {t("delete")}
+              </DropdownItem>
+              <Dialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
+                <ConfirmationDialogContent
+                  isLoading={deleteMutation.isLoading}
+                  variety="danger"
+                  title={t("delete_schedule")}
+                  confirmBtnText={t("delete")}
+                  loadingText={t("delete")}
+                  onConfirm={() => {
+                    schedule !== undefined && deleteMutation.mutate({ scheduleId: schedule.id });
+                  }}>
+                  {t("delete_schedule_description")}
+                </ConfirmationDialogContent>
+              </Dialog>
+              <DropdownMenuSeparator />
+              <div className="flex h-9 flex-row items-center justify-between py-2 px-4 hover:bg-gray-100">
+                <Skeleton
+                  as={Label}
+                  htmlFor="hiddenSwitch"
+                  className="mt-2 cursor-pointer self-center pr-2 sm:inline">
+                  {t("set_to_default")}
+                </Skeleton>
+                <Switch
+                  id="hiddenSwitch"
+                  disabled={isLoading || schedule?.isDefault}
+                  checked={form.watch("isDefault")}
+                  onCheckedChange={(e) => {
+                    form.setValue("isDefault", e);
+                  }}
+                />
+              </div>
+            </DropdownMenuContent>
+          </Dropdown>
 
           <div className="border-default border-l-2" />
           <Button className="ml-4 lg:ml-0" type="submit" form="availability-form">
@@ -301,3 +349,5 @@ export default function Availability() {
     </Shell>
   );
 }
+
+Availability.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/availability/index.tsx b/apps/web/pages/availability/index.tsx
index b487c7e3ce..8c0cb069d7 100644
--- a/apps/web/pages/availability/index.tsx
+++ b/apps/web/pages/availability/index.tsx
@@ -3,14 +3,15 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { NewScheduleButton, ScheduleListItem } from "@calcom/features/schedules";
 import Shell from "@calcom/features/shell/Shell";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { HttpError } from "@calcom/lib/http-error";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import { EmptyScreen, showToast } from "@calcom/ui";
 import { Clock } from "@calcom/ui/components/icon";
 
 import { withQuery } from "@lib/QueryCell";
-import { HttpError } from "@lib/core/http/error";
 
+import PageWrapper from "@components/PageWrapper";
 import SkeletonLoader from "@components/availability/SkeletonLoader";
 
 export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availability"]["list"]) {
@@ -110,9 +111,15 @@ export default function AvailabilityPage() {
   const { t } = useLocale();
   return (
     <div>
-      <Shell heading={t("availability")} subtitle={t("configure_availability")} CTA={<NewScheduleButton />}>
+      <Shell
+        heading={t("availability")}
+        hideHeadingOnMobile
+        subtitle={t("configure_availability")}
+        CTA={<NewScheduleButton />}>
         <WithQuery success={({ data }) => <AvailabilityList {...data} />} customLoader={<SkeletonLoader />} />
       </Shell>
     </div>
   );
 }
+
+AvailabilityPage.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/availability/troubleshoot.tsx b/apps/web/pages/availability/troubleshoot.tsx
index d7b9373722..e5e4a4aad7 100644
--- a/apps/web/pages/availability/troubleshoot.tsx
+++ b/apps/web/pages/availability/troubleshoot.tsx
@@ -7,6 +7,8 @@ import { SkeletonText } from "@calcom/ui";
 
 import useRouterQuery from "@lib/hooks/useRouterQuery";
 
+import PageWrapper from "@components/PageWrapper";
+
 type User = RouterOutputs["viewer"]["me"];
 
 export interface IBusySlot {
@@ -120,12 +122,13 @@ export default function Troubleshoot() {
   const { t } = useLocale();
   return (
     <div>
-      <Shell heading={t("troubleshoot")} subtitle={t("troubleshoot_description")}>
+      <Shell heading={t("troubleshoot")} hideHeadingOnMobile subtitle={t("troubleshoot_description")}>
         {!isLoading && data && <AvailabilityView user={data} />}
       </Shell>
     </div>
   );
 }
+Troubleshoot.PageWrapper = PageWrapper;
 
 function convertMinsToHrsMins(mins: number) {
   const h = Math.floor(mins / 60);
diff --git a/apps/web/pages/booking/[uid].tsx b/apps/web/pages/booking/[uid].tsx
index 928daf900d..20a5bd6141 100644
--- a/apps/web/pages/booking/[uid].tsx
+++ b/apps/web/pages/booking/[uid].tsx
@@ -23,6 +23,8 @@ import {
   useIsBackgroundTransparent,
   useIsEmbed,
 } from "@calcom/embed-core/embed-iframe";
+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { getBookingWithResponses } from "@calcom/features/bookings/lib/get-booking";
 import {
   SystemField,
   getBookingFieldsWithSystemFields,
@@ -35,13 +37,11 @@ import {
   formatToLocalizedTimezone,
 } from "@calcom/lib/date-fns";
 import { getDefaultEvent } from "@calcom/lib/defaultEvents";
-import { getBookingWithResponses } from "@calcom/lib/getBooking";
 import useGetBrandingColours from "@calcom/lib/getBrandColours";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import useTheme from "@calcom/lib/hooks/useTheme";
 import { getEveryFreqFor } from "@calcom/lib/recurringStrings";
 import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
-import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { getIs24hClockFromLocalStorage, isBrowserLocale24h } from "@calcom/lib/timeFormat";
 import { localStorage } from "@calcom/lib/webstorage";
 import prisma from "@calcom/prisma";
@@ -54,6 +54,7 @@ import { X, ExternalLink, ChevronLeft, Check, Calendar } from "@calcom/ui/compon
 import { timeZone } from "@lib/clock";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import CancelBooking from "@components/booking/CancelBooking";
 import EventReservationSchema from "@components/schemas/EventReservationSchema";
 
@@ -106,10 +107,10 @@ export default function Success(props: SuccessProps) {
     seatReferenceUid,
   } = querySchema.parse(router.query);
 
-  const tz =
-    (isSuccessBookingPage
-      ? props.bookingInfo.attendees.find((attendee) => attendee.email === email)?.timeZone
-      : props.bookingInfo.eventType?.timeZone || props.bookingInfo.user?.timeZone) || timeZone();
+  const attendeeTimeZone = props?.bookingInfo?.attendees.find(
+    (attendee) => attendee.email === email
+  )?.timeZone;
+  const tz = isSuccessBookingPage && attendeeTimeZone ? attendeeTimeZone : props.tz ? props.tz : timeZone();
 
   const location = props.bookingInfo.location as ReturnType<typeof getEventLocationValue>;
 
@@ -186,13 +187,13 @@ export default function Success(props: SuccessProps) {
     (!!seatReferenceUid &&
       !bookingInfo.seatsReferences.some((reference) => reference.referenceUid === seatReferenceUid));
 
-  const telemetry = useTelemetry();
-  useEffect(() => {
+  // const telemetry = useTelemetry();
+  /*  useEffect(() => {
     if (top !== window) {
       //page_view will be collected automatically by _middleware.ts
       telemetry.event(telemetryEventTypes.embedView, collectPageParameters("/booking"));
     }
-  }, [telemetry]);
+  }, [telemetry]); */
 
   useEffect(() => {
     const users = eventType.users;
@@ -269,7 +270,9 @@ export default function Success(props: SuccessProps) {
     return t("emailed_you_and_attendees" + titleSuffix);
   }
 
-  useTheme(isSuccessBookingPage ? props.profile.theme : "light");
+  // This is a weird case where the same route can be opened in booking flow as a success page or as a booking detail page from the app
+  // As Booking Page it has to support configured theme, but as booking detail page it should not do any change. Let Shell.tsx handle it.
+  useTheme(isSuccessBookingPage ? props.profile.theme : undefined);
   useBrandColors({
     brandColor: props.profile.brandColor,
     darkBrandColor: props.profile.darkBrandColor,
@@ -706,6 +709,9 @@ export default function Success(props: SuccessProps) {
   );
 }
 
+Success.isBookingPage = true;
+Success.PageWrapper = PageWrapper;
+
 type RecurringBookingsProps = {
   eventType: SuccessProps["eventType"];
   recurringBookings: SuccessProps["recurringBookings"];
@@ -885,16 +891,31 @@ const getEventTypesFromDB = async (id: number) => {
   };
 };
 
-const handleSeatsEventTypeOnBooking = (
+const handleSeatsEventTypeOnBooking = async (
   eventType: {
     seatsPerTimeSlot?: number | null;
     seatsShowAttendees: boolean | null;
     [x: string | number | symbol]: unknown;
   },
   bookingInfo: Partial<
-    Prisma.BookingGetPayload<{ include: { attendees: { select: { name: true; email: true } } } }>
+    Prisma.BookingGetPayload<{
+      include: {
+        attendees: { select: { name: true; email: true } };
+        seatsReferences: { select: { referenceUid: true } };
+        user: {
+          select: {
+            id: true;
+            name: true;
+            email: true;
+            username: true;
+            timeZone: true;
+          };
+        };
+      };
+    }>
   >,
-  email: string
+  seatReferenceUid?: string,
+  userId?: number
 ) => {
   if (eventType?.seatsPerTimeSlot !== null) {
     // @TODO: right now bookings with seats doesn't save every description that its entered by every user
@@ -902,21 +923,52 @@ const handleSeatsEventTypeOnBooking = (
   } else {
     return;
   }
+  // @TODO: If handling teams, we need to do more check ups for this.
+  if (bookingInfo?.user?.id === userId) {
+    return;
+  }
+
   if (!eventType.seatsShowAttendees) {
-    const attendee = bookingInfo?.attendees?.find((a) => {
-      return a.email === email;
+    const seatAttendee = await prisma.bookingSeat.findFirst({
+      where: {
+        referenceUid: seatReferenceUid,
+      },
+      include: {
+        attendee: {
+          select: {
+            name: true,
+            email: true,
+          },
+        },
+      },
     });
 
-    bookingInfo["attendees"] = attendee ? [attendee] : [];
+    if (seatAttendee) {
+      const attendee = bookingInfo?.attendees?.find((a) => {
+        return a.email === seatAttendee.attendee?.email;
+      });
+      bookingInfo["attendees"] = attendee ? [attendee] : [];
+    } else {
+      bookingInfo["attendees"] = [];
+    }
   }
   return bookingInfo;
 };
 
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const ssr = await ssrInit(context);
+  const session = await getServerSession(context);
+  let tz: string | null = null;
+
+  if (session) {
+    const user = await ssr.viewer.me.fetch();
+    tz = user.timeZone;
+  }
+
   const parsedQuery = querySchema.safeParse(context.query);
+
   if (!parsedQuery.success) return { notFound: true };
-  const { uid, email, eventTypeSlug, cancel, isSuccessBookingPage } = parsedQuery.data;
+  const { uid, eventTypeSlug, seatReferenceUid } = parsedQuery.data;
 
   const bookingInfoRaw = await prisma.booking.findFirst({
     where: {
@@ -1022,8 +1074,8 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
     slug: eventType.team?.slug || eventType.users[0]?.username || null,
   };
 
-  if (bookingInfo !== null && email && eventType.seatsPerTimeSlot) {
-    handleSeatsEventTypeOnBooking(eventType, bookingInfo, email);
+  if (bookingInfo !== null && eventType.seatsPerTimeSlot) {
+    await handleSeatsEventTypeOnBooking(eventType, bookingInfo, seatReferenceUid, session?.user.id);
   }
 
   const payment = await prisma.payment.findFirst({
@@ -1046,6 +1098,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       dynamicEventName: bookingInfo?.eventType?.eventName || "",
       bookingInfo,
       paymentStatus: payment,
+      ...(tz && { tz }),
     },
   };
 }
diff --git a/apps/web/pages/bookings/[status].tsx b/apps/web/pages/bookings/[status].tsx
index 3ab9c41d26..72b0777d8e 100644
--- a/apps/web/pages/bookings/[status].tsx
+++ b/apps/web/pages/bookings/[status].tsx
@@ -16,6 +16,7 @@ import { Calendar } from "@calcom/ui/components/icon";
 
 import { useInViewObserver } from "@lib/hooks/useInViewObserver";
 
+import PageWrapper from "@components/PageWrapper";
 import BookingListItem from "@components/booking/BookingListItem";
 import SkeletonLoader from "@components/booking/SkeletonLoader";
 
@@ -194,6 +195,8 @@ export default function Bookings() {
   );
 }
 
+Bookings.PageWrapper = PageWrapper;
+
 export const getStaticProps: GetStaticProps = async (ctx) => {
   const params = querySchema.safeParse(ctx.params);
   const ssg = await ssgInit(ctx);
diff --git a/apps/web/pages/d/[link]/[slug].tsx b/apps/web/pages/d/[link]/[slug].tsx
index 2e1bdafb46..3017918cdb 100644
--- a/apps/web/pages/d/[link]/[slug].tsx
+++ b/apps/web/pages/d/[link]/[slug].tsx
@@ -3,9 +3,9 @@ import { z } from "zod";
 
 import type { LocationObject } from "@calcom/core/location";
 import { privacyFilteredLocations } from "@calcom/core/location";
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
 import { parseRecurringEvent } from "@calcom/lib";
 import { getWorkingHours } from "@calcom/lib/availability";
-import type { GetBookingType } from "@calcom/lib/getBooking";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import { availiblityPageEventTypeSelect } from "@calcom/prisma";
 import prisma from "@calcom/prisma";
@@ -14,6 +14,7 @@ import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 import type { EmbedProps } from "@lib/withEmbedSsr";
 
+import PageWrapper from "@components/PageWrapper";
 import AvailabilityPage from "@components/booking/pages/AvailabilityPage";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -24,6 +25,9 @@ export default function Type(props: DynamicAvailabilityPageProps) {
   return <AvailabilityPage {...props} />;
 }
 
+Type.isBookingPage = true;
+Type.PageWrapper = PageWrapper;
+
 const querySchema = z.object({
   link: z.string().optional().default(""),
   slug: z.string().optional().default(""),
diff --git a/apps/web/pages/d/[link]/book.tsx b/apps/web/pages/d/[link]/book.tsx
index a8a3684846..eb01b2627d 100644
--- a/apps/web/pages/d/[link]/book.tsx
+++ b/apps/web/pages/d/[link]/book.tsx
@@ -9,6 +9,7 @@ import { customInputSchema, eventTypeBookingFields, EventTypeMetaDataSchema } fr
 import { asStringOrNull, asStringOrThrow } from "@lib/asStringOrNull";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import BookingPage from "@components/booking/pages/BookingPage";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -19,6 +20,9 @@ export default function Book(props: HashLinkPageProps) {
   return <BookingPage {...props} />;
 }
 
+Book.isBookingPage = true;
+Book.PageWrapper = PageWrapper;
+
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const ssr = await ssrInit(context);
   const link = asStringOrThrow(context.query.link as string);
diff --git a/apps/web/pages/event-types/[type]/index.tsx b/apps/web/pages/event-types/[type]/index.tsx
index fb868dd330..c40404e61d 100644
--- a/apps/web/pages/event-types/[type]/index.tsx
+++ b/apps/web/pages/event-types/[type]/index.tsx
@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { zodResolver } from "@hookform/resolvers/zod";
-import type { PeriodType } from "@prisma/client";
-import type { SchedulingType } from "@prisma/client";
+import type { PeriodType, SchedulingType } from "@prisma/client";
 import type { GetServerSidePropsContext } from "next";
 import { Trans } from "next-i18next";
 import { useEffect, useState } from "react";
@@ -18,10 +17,10 @@ import { CAL_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
 import { HttpError } from "@calcom/lib/http-error";
-import { useTelemetry, telemetryEventTypes } from "@calcom/lib/telemetry";
+import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import type { Prisma } from "@calcom/prisma/client";
-import { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
 import type { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import type { IntervalLimit, RecurringEvent } from "@calcom/types/Calendar";
@@ -30,9 +29,11 @@ import { ConfirmationDialogContent, Dialog, Form, showToast } from "@calcom/ui";
 import { asStringOrThrow } from "@lib/asStringOrNull";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 // These can't really be moved into calcom/ui due to the fact they use infered getserverside props typings
 import { EventAdvancedTab } from "@components/eventtype/EventAdvancedTab";
 import { EventAppsTab } from "@components/eventtype/EventAppsTab";
+import type { AvailabilityOption } from "@components/eventtype/EventAvailabilityTab";
 import { EventAvailabilityTab } from "@components/eventtype/EventAvailabilityTab";
 import { EventLimitsTab } from "@components/eventtype/EventLimitsTab";
 import { EventRecurringTab } from "@components/eventtype/EventRecurringTab";
@@ -93,6 +94,7 @@ export type FormValues = {
   children: ChildrenEventType[];
   hosts: { userId: number; isFixed: boolean }[];
   bookingFields: z.infer<typeof eventTypeBookingFields>;
+  availability?: AvailabilityOption;
 };
 
 export type CustomInputParsed = typeof customInputSchema._output;
@@ -261,6 +263,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
   }, [defaultValues]);
 
   const appsMetadata = formMethods.getValues("metadata")?.apps;
+  const availability = formMethods.watch("availability");
   const numberOfInstalledApps = eventTypeApps?.filter((app) => app.isInstalled).length || 0;
   let numberOfActiveApps = 0;
 
@@ -377,6 +380,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
         enabledWorkflowsNumber={eventType.workflows.length}
         eventType={eventType}
         team={team}
+        availability={availability}
         isUpdateMutationLoading={updateMutation.isLoading}
         formMethods={formMethods}
         disableBorder={tabName === "apps" || tabName === "workflows" || tabName === "webhooks"}
@@ -384,13 +388,66 @@ const EventTypePage = (props: EventTypeSetupProps) => {
         <Form
           form={formMethods}
           id="event-type-form"
-          handleSubmit={async (values: FormValues) => {
-            if (!values.children.length) return handleSubmit(values);
-            const existingSlugEventTypes = values.children.filter((ch) =>
-              ch.owner.eventTypeSlugs.includes(slug)
-            );
-            if (!existingSlugEventTypes.length) return handleSubmit(values);
-            setSlugExistsChildrenDialogOpen(existingSlugEventTypes);
+          handleSubmit={async (values) => {
+            const {
+              periodDates,
+              periodCountCalendarDays,
+              beforeBufferTime,
+              afterBufferTime,
+              seatsPerTimeSlot,
+              seatsShowAttendees,
+              bookingLimits,
+              durationLimits,
+              recurringEvent,
+              locations,
+              metadata,
+              customInputs,
+              // We don't need to send send these values to the backend
+              // eslint-disable-next-line @typescript-eslint/no-unused-vars
+              seatsPerTimeSlotEnabled,
+              // eslint-disable-next-line @typescript-eslint/no-unused-vars
+              minimumBookingNoticeInDurationType,
+              availability,
+              ...input
+            } = values;
+
+            if (bookingLimits) {
+              const isValid = validateIntervalLimitOrder(bookingLimits);
+              if (!isValid) throw new Error(t("event_setup_booking_limits_error"));
+            }
+
+            if (durationLimits) {
+              const isValid = validateIntervalLimitOrder(durationLimits);
+              if (!isValid) throw new Error(t("event_setup_duration_limits_error"));
+            }
+
+            if (metadata?.multipleDuration !== undefined) {
+              if (metadata?.multipleDuration.length < 1) {
+                throw new Error(t("event_setup_multiple_duration_error"));
+              } else {
+                if (!input.length && !metadata?.multipleDuration?.includes(input.length)) {
+                  throw new Error(t("event_setup_multiple_duration_default_error"));
+                }
+              }
+            }
+
+            updateMutation.mutate({
+              ...input,
+              locations,
+              recurringEvent,
+              periodStartDate: periodDates.startDate,
+              periodEndDate: periodDates.endDate,
+              periodCountCalendarDays: periodCountCalendarDays === "1",
+              id: eventType.id,
+              beforeEventBuffer: beforeBufferTime,
+              afterEventBuffer: afterBufferTime,
+              bookingLimits,
+              durationLimits,
+              seatsPerTimeSlot,
+              seatsShowAttendees,
+              metadata,
+              customInputs,
+            });
           }}>
           <div ref={animationParentRef}>{tabMap[tabName]}</div>
         </Form>
@@ -477,4 +534,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   };
 };
 
+EventTypePageWrapper.PageWrapper = PageWrapper;
+
 export default EventTypePageWrapper;
diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx
index 389b04e553..0f679ea447 100644
--- a/apps/web/pages/event-types/index.tsx
+++ b/apps/web/pages/event-types/index.tsx
@@ -8,6 +8,7 @@ import type { FC } from "react";
 import { useEffect, useState, memo } from "react";
 import { z } from "zod";
 
+import useIntercom from "@calcom/features/ee/support/lib/intercom/useIntercom";
 import { EventTypeDescriptionLazy as EventTypeDescription } from "@calcom/features/eventtypes/components";
 import CreateEventTypeDialog from "@calcom/features/eventtypes/components/CreateEventTypeDialog";
 import { DuplicateDialog } from "@calcom/features/eventtypes/components/DuplicateDialog";
@@ -16,6 +17,7 @@ import { APP_NAME, CAL_URL, WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
 import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
+import { HttpError } from "@calcom/lib/http-error";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc, TRPCClientError } from "@calcom/trpc/react";
 import {
@@ -58,9 +60,9 @@ import {
 } from "@calcom/ui/components/icon";
 
 import { withQuery } from "@lib/QueryCell";
-import { HttpError } from "@lib/core/http/error";
 
 import { EmbedButton, EmbedDialog } from "@components/Embed";
+import PageWrapper from "@components/PageWrapper";
 import SkeletonLoader from "@components/eventtype/SkeletonLoader";
 
 type EventTypeGroups = RouterOutputs["viewer"]["eventTypes"]["getByViewer"]["eventTypeGroups"];
@@ -755,9 +757,16 @@ const WithQuery = withQuery(trpc.viewer.eventTypes.getByViewer);
 const EventTypesPage = () => {
   const { t } = useLocale();
   const router = useRouter();
-
+  const { open } = useIntercom();
+  const { query } = router;
   const isMobile = useMediaQuery("(max-width: 768px)");
 
+  useEffect(() => {
+    if (query?.openIntercom && query?.openIntercom === "true") {
+      open();
+    }
+  }, []);
+
   return (
     <div>
       <HeadSeo
@@ -767,6 +776,7 @@ const EventTypesPage = () => {
       <Shell
         withoutSeo
         heading={t("event_types_page_title")}
+        hideHeadingOnMobile
         subtitle={t("event_types_page_subtitle")}
         CTA={<CTA />}>
         <WithQuery
@@ -817,4 +827,6 @@ const EventTypesPage = () => {
   );
 };
 
+EventTypesPage.PageWrapper = PageWrapper;
+
 export default EventTypesPage;
diff --git a/apps/web/pages/getting-started/[[...step]].tsx b/apps/web/pages/getting-started/[[...step]].tsx
index 660517573b..f68a9bd32b 100644
--- a/apps/web/pages/getting-started/[[...step]].tsx
+++ b/apps/web/pages/getting-started/[[...step]].tsx
@@ -13,6 +13,7 @@ import { Button, StepCard, Steps } from "@calcom/ui";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import { ConnectedCalendars } from "@components/getting-started/steps-views/ConnectCalendars";
 import { SetupAvailability } from "@components/getting-started/steps-views/SetupAvailability";
 import UserProfile from "@components/getting-started/steps-views/UserProfile";
@@ -203,5 +204,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
 };
 
 OnboardingPage.isThemeSupported = false;
+OnboardingPage.PageWrapper = PageWrapper;
 
 export default OnboardingPage;
diff --git a/apps/web/pages/insights/index.tsx b/apps/web/pages/insights/index.tsx
index b6b50541c1..c895fddfff 100644
--- a/apps/web/pages/insights/index.tsx
+++ b/apps/web/pages/insights/index.tsx
@@ -17,6 +17,8 @@ import { trpc } from "@calcom/trpc";
 import { Button, ButtonGroup } from "@calcom/ui";
 import { RefreshCcw, UserPlus, Users } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 const Heading = () => {
   const { t } = useLocale();
 
@@ -53,7 +55,7 @@ export default function InsightsPage() {
 
   return (
     <div>
-      <Shell>
+      <Shell hideHeadingOnMobile>
         <UpgradeTip
           title={t("make_informed_decisions")}
           description={t("make_informed_decisions_description")}
@@ -111,6 +113,8 @@ export default function InsightsPage() {
   );
 }
 
+InsightsPage.PageWrapper = PageWrapper;
+
 // If feature flag is disabled, return not found on getServerSideProps
 export const getServerSideProps = async () => {
   const prisma = await import("@calcom/prisma").then((mod) => mod.default);
diff --git a/apps/web/pages/maintenance.tsx b/apps/web/pages/maintenance.tsx
index b418920a94..a86e7e42cd 100644
--- a/apps/web/pages/maintenance.tsx
+++ b/apps/web/pages/maintenance.tsx
@@ -4,6 +4,8 @@ import { APP_NAME, WEBSITE_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function MaintenancePage() {
   const { t, isLocaleReady } = useLocale();
   if (!isLocaleReady) return null;
@@ -25,3 +27,5 @@ export default function MaintenancePage() {
     </div>
   );
 }
+
+MaintenancePage.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/more.tsx b/apps/web/pages/more.tsx
index ff45b39f1e..17ed23ccb4 100644
--- a/apps/web/pages/more.tsx
+++ b/apps/web/pages/more.tsx
@@ -1,10 +1,12 @@
 import Shell, { MobileNavigationMoreItems } from "@calcom/features/shell/Shell";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function MorePage() {
   const { t } = useLocale();
   return (
-    <Shell>
+    <Shell hideHeadingOnMobile>
       <div className="max-w-screen-lg">
         <MobileNavigationMoreItems />
         <p className="text-subtle mt-6 text-xs leading-tight md:hidden">{t("more_page_footer")}</p>
@@ -12,3 +14,4 @@ export default function MorePage() {
     </Shell>
   );
 }
+MorePage.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/new-booker/[user]/[type].tsx b/apps/web/pages/new-booker/[user]/[type].tsx
new file mode 100644
index 0000000000..6a6db3e0e8
--- /dev/null
+++ b/apps/web/pages/new-booker/[user]/[type].tsx
@@ -0,0 +1,112 @@
+import type { GetServerSidePropsContext } from "next";
+import { z } from "zod";
+
+import { Booker } from "@calcom/atoms";
+import { getBookingByUidOrRescheduleUid } from "@calcom/features/bookings/lib/get-booking";
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
+import { getUsernameList } from "@calcom/lib/defaultEvents";
+import prisma from "@calcom/prisma";
+
+import type { inferSSRProps } from "@lib/types/inferSSRProps";
+
+import PageWrapper from "@components/PageWrapper";
+
+type PageProps = inferSSRProps<typeof getServerSideProps>;
+
+export default function Type({ slug, user, booking, away }: PageProps) {
+  return (
+    <main className="flex justify-center">
+      <Booker username={user} eventSlug={slug} rescheduleBooking={booking} isAway={away} />
+    </main>
+  );
+}
+
+Type.PageWrapper = PageWrapper;
+
+async function getDynamicGroupPageProps(context: GetServerSidePropsContext) {
+  const { user, type: slug } = paramsSchema.parse(context.params);
+  const { rescheduleUid } = context.query;
+
+  const { ssgInit } = await import("@server/lib/ssg");
+  const ssg = await ssgInit(context);
+  const usernameList = getUsernameList(user);
+
+  const users = await prisma.user.findMany({
+    where: {
+      username: {
+        in: usernameList,
+      },
+    },
+    select: {
+      allowDynamicBooking: true,
+    },
+  });
+
+  if (!users.length) {
+    return {
+      notFound: true,
+    };
+  }
+
+  let booking: GetBookingType | null = null;
+  if (rescheduleUid) {
+    booking = await getBookingByUidOrRescheduleUid(`${rescheduleUid}`);
+  }
+
+  return {
+    props: {
+      booking,
+      user,
+      slug,
+      away: false,
+      trpcState: ssg.dehydrate(),
+    },
+  };
+}
+
+async function getUserPageProps(context: GetServerSidePropsContext) {
+  const { user: username, type: slug } = paramsSchema.parse(context.params);
+  const { rescheduleUid } = context.query;
+  const { ssgInit } = await import("@server/lib/ssg");
+  const ssg = await ssgInit(context);
+  const user = await prisma.user.findUnique({
+    where: {
+      username,
+    },
+    select: {
+      away: true,
+    },
+  });
+
+  if (!user) {
+    return {
+      notFound: true,
+    };
+  }
+
+  let booking: GetBookingType | null = null;
+  if (rescheduleUid) {
+    booking = await getBookingByUidOrRescheduleUid(`${rescheduleUid}`);
+  }
+
+  return {
+    props: {
+      booking,
+      away: user?.away,
+      user: username,
+      slug,
+      trpcState: ssg.dehydrate(),
+    },
+  };
+}
+
+const paramsSchema = z.object({ type: z.string(), user: z.string() });
+
+// Booker page fetches a tiny bit of data server side, to determine early
+// whether the page should show an away state or dynamic booking not allowed.
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const { user } = paramsSchema.parse(context.params);
+  const isDynamicGroup = user.includes("+");
+
+  return isDynamicGroup ? await getDynamicGroupPageProps(context) : await getUserPageProps(context);
+};
diff --git a/apps/web/pages/new-booker/team/[slug]/[type].tsx b/apps/web/pages/new-booker/team/[slug]/[type].tsx
new file mode 100644
index 0000000000..46a91e6890
--- /dev/null
+++ b/apps/web/pages/new-booker/team/[slug]/[type].tsx
@@ -0,0 +1,65 @@
+import type { GetServerSidePropsContext } from "next";
+import { z } from "zod";
+
+import { Booker } from "@calcom/atoms";
+import { getBookingByUidOrRescheduleUid } from "@calcom/features/bookings/lib/get-booking";
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
+import prisma from "@calcom/prisma";
+
+import type { inferSSRProps } from "@lib/types/inferSSRProps";
+
+import PageWrapper from "@components/PageWrapper";
+
+type PageProps = inferSSRProps<typeof getServerSideProps>;
+
+export default function Type({ slug, user, booking, away }: PageProps) {
+  return (
+    <main className="flex justify-center">
+      <Booker username={user} eventSlug={slug} rescheduleBooking={booking} isAway={away} />
+    </main>
+  );
+}
+
+Type.PageWrapper = PageWrapper;
+
+const paramsSchema = z.object({ type: z.string(), slug: z.string() });
+
+// Booker page fetches a tiny bit of data server side:
+// 1. Check if team exists, to show 404
+// 2. If rescheduling, get the booking details
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const { slug: teamSlug, type: meetingSlug } = paramsSchema.parse(context.params);
+  const { rescheduleUid } = context.query;
+  const { ssgInit } = await import("@server/lib/ssg");
+  const ssg = await ssgInit(context);
+
+  const team = await prisma.team.findFirst({
+    where: {
+      slug: teamSlug,
+    },
+    select: {
+      id: true,
+    },
+  });
+
+  if (!team) {
+    return {
+      notFound: true,
+    };
+  }
+
+  let booking: GetBookingType | null = null;
+  if (rescheduleUid) {
+    booking = await getBookingByUidOrRescheduleUid(`${rescheduleUid}`);
+  }
+
+  return {
+    props: {
+      booking,
+      away: false,
+      user: teamSlug,
+      slug: meetingSlug,
+      trpcState: ssg.dehydrate(),
+    },
+  };
+};
diff --git a/apps/web/pages/payment/[uid].tsx b/apps/web/pages/payment/[uid].tsx
index 296462f34d..3e512d5b3d 100644
--- a/apps/web/pages/payment/[uid].tsx
+++ b/apps/web/pages/payment/[uid].tsx
@@ -2,8 +2,10 @@ import PaymentPage from "@calcom/features/ee/payments/components/PaymentPage";
 import { getServerSideProps } from "@calcom/features/ee/payments/pages/payment";
 import type { inferSSRProps } from "@calcom/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function Payment(props: inferSSRProps<typeof getServerSideProps>) {
   return <PaymentPage {...props} />;
 }
-
+Payment.PageWrapper = PageWrapper;
 export { getServerSideProps };
diff --git a/apps/web/pages/settings/admin/apps/[category].tsx b/apps/web/pages/settings/admin/apps/[category].tsx
index bee7a674bd..d16c454cd4 100644
--- a/apps/web/pages/settings/admin/apps/[category].tsx
+++ b/apps/web/pages/settings/admin/apps/[category].tsx
@@ -2,6 +2,7 @@ import AdminAppsList from "@calcom/features/apps/AdminAppsList";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Meta } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
 import { getLayout } from "@components/auth/layouts/AdminLayout";
 
 function AdminAppsView() {
@@ -15,5 +16,6 @@ function AdminAppsView() {
 }
 
 AdminAppsView.getLayout = getLayout;
+AdminAppsView.PageWrapper = PageWrapper;
 
 export default AdminAppsView;
diff --git a/apps/web/pages/settings/admin/flags.tsx b/apps/web/pages/settings/admin/flags.tsx
index 85635fd3de..dba5c307de 100644
--- a/apps/web/pages/settings/admin/flags.tsx
+++ b/apps/web/pages/settings/admin/flags.tsx
@@ -1,9 +1,11 @@
 import { FlagListingView } from "@calcom/features/flags/pages/flag-listing-view";
 
+import PageWrapper from "@components/PageWrapper";
 import { getLayout } from "@components/auth/layouts/AdminLayout";
 
 const FlagsPage = () => <FlagListingView />;
 
 FlagsPage.getLayout = getLayout;
+FlagsPage.PageWrapper = PageWrapper;
 
 export default FlagsPage;
diff --git a/apps/web/pages/settings/admin/impersonation.tsx b/apps/web/pages/settings/admin/impersonation.tsx
index f04fcdd3cc..5e7f02c661 100644
--- a/apps/web/pages/settings/admin/impersonation.tsx
+++ b/apps/web/pages/settings/admin/impersonation.tsx
@@ -4,6 +4,7 @@ import { useRef } from "react";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, Meta, TextField } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
 import { getLayout } from "@components/auth/layouts/AdminLayout";
 
 function AdminView() {
@@ -37,5 +38,6 @@ function AdminView() {
 }
 
 AdminView.getLayout = getLayout;
+AdminView.PageWrapper = PageWrapper;
 
 export default AdminView;
diff --git a/apps/web/pages/settings/admin/index.tsx b/apps/web/pages/settings/admin/index.tsx
index 4152051329..27122c8849 100644
--- a/apps/web/pages/settings/admin/index.tsx
+++ b/apps/web/pages/settings/admin/index.tsx
@@ -1,5 +1,6 @@
 import { Meta } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
 import { getLayout } from "@components/auth/layouts/AdminLayout";
 
 function AdminAppsView() {
@@ -12,5 +13,6 @@ function AdminAppsView() {
 }
 
 AdminAppsView.getLayout = getLayout;
+AdminAppsView.PageWrapper = PageWrapper;
 
 export default AdminAppsView;
diff --git a/apps/web/pages/settings/admin/users/[id]/edit.tsx b/apps/web/pages/settings/admin/users/[id]/edit.tsx
index 318b3a052c..0ee1269cca 100644
--- a/apps/web/pages/settings/admin/users/[id]/edit.tsx
+++ b/apps/web/pages/settings/admin/users/[id]/edit.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/users/pages/users-edit-view";
+import UsersEditView from "@calcom/features/ee/users/pages/users-edit-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = UsersEditView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/admin/users/add.tsx b/apps/web/pages/settings/admin/users/add.tsx
index c6c8c3cc3f..293a90214e 100644
--- a/apps/web/pages/settings/admin/users/add.tsx
+++ b/apps/web/pages/settings/admin/users/add.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/users/pages/users-add-view";
+import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = UsersAddView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/admin/users/index.tsx b/apps/web/pages/settings/admin/users/index.tsx
index 699d3eb327..194c966682 100644
--- a/apps/web/pages/settings/admin/users/index.tsx
+++ b/apps/web/pages/settings/admin/users/index.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/users/pages/users-listing-view";
+import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = UsersListingView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/billing/index.tsx b/apps/web/pages/settings/billing/index.tsx
index a8423cd36b..142c6df4fb 100644
--- a/apps/web/pages/settings/billing/index.tsx
+++ b/apps/web/pages/settings/billing/index.tsx
@@ -8,6 +8,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, Meta } from "@calcom/ui";
 import { ExternalLink } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 interface CtaRowProps {
   title: string;
   description: string;
@@ -37,8 +39,8 @@ const BillingView = () => {
   const returnTo = router.asPath;
   const billingHref = `/api/integrations/stripepayment/portal?returnTo=${WEBAPP_URL}${returnTo}`;
 
-  const onContactSupportClick = () => {
-    open();
+  const onContactSupportClick = async () => {
+    await open();
   };
 
   return (
@@ -64,5 +66,6 @@ const BillingView = () => {
 };
 
 BillingView.getLayout = getLayout;
+BillingView.PageWrapper = PageWrapper;
 
 export default BillingView;
diff --git a/apps/web/pages/settings/developer/api-keys.tsx b/apps/web/pages/settings/developer/api-keys.tsx
index e36c04ce22..3cadde85c5 100644
--- a/apps/web/pages/settings/developer/api-keys.tsx
+++ b/apps/web/pages/settings/developer/api-keys.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 
 import type { TApiKeys } from "@calcom/ee/api-keys/components/ApiKeyListItem";
-import LicenseRequired from "@calcom/ee/common/components/v2/LicenseRequired";
+import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
 import ApiKeyDialogForm from "@calcom/features/ee/api-keys/components/ApiKeyDialogForm";
 import ApiKeyListItem from "@calcom/features/ee/api-keys/components/ApiKeyListItem";
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
@@ -18,6 +18,8 @@ import {
 } from "@calcom/ui";
 import { Link as LinkIcon, Plus } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 const ApiKeysView = () => {
   const { t } = useLocale();
 
@@ -92,5 +94,6 @@ const ApiKeysView = () => {
 };
 
 ApiKeysView.getLayout = getLayout;
+ApiKeysView.PageWrapper = PageWrapper;
 
 export default ApiKeysView;
diff --git a/apps/web/pages/settings/developer/webhooks/[id]/index.tsx b/apps/web/pages/settings/developer/webhooks/[id]/index.tsx
index b8da528284..9daf00ba80 100644
--- a/apps/web/pages/settings/developer/webhooks/[id]/index.tsx
+++ b/apps/web/pages/settings/developer/webhooks/[id]/index.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/webhooks/pages/webhook-edit-view";
+import WebhookEditView from "@calcom/features/webhooks/pages/webhook-edit-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = WebhookEditView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/developer/webhooks/index.tsx b/apps/web/pages/settings/developer/webhooks/index.tsx
index d06442e3d2..67fc89e4ae 100644
--- a/apps/web/pages/settings/developer/webhooks/index.tsx
+++ b/apps/web/pages/settings/developer/webhooks/index.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/webhooks/pages/webhooks-view";
+import WeebhooksView from "@calcom/features/webhooks/pages/webhooks-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = WeebhooksView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/developer/webhooks/new.tsx b/apps/web/pages/settings/developer/webhooks/new.tsx
index 05e067b199..5c957b16ac 100644
--- a/apps/web/pages/settings/developer/webhooks/new.tsx
+++ b/apps/web/pages/settings/developer/webhooks/new.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/webhooks/pages/webhook-new-view";
+import WeebhookNewView from "@calcom/features/webhooks/pages/webhook-new-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = WeebhookNewView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/my-account/appearance.tsx b/apps/web/pages/settings/my-account/appearance.tsx
index 32315d3fa6..8403619d68 100644
--- a/apps/web/pages/settings/my-account/appearance.tsx
+++ b/apps/web/pages/settings/my-account/appearance.tsx
@@ -22,6 +22,8 @@ import {
   UpgradeTeamsBadge,
 } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
+
 const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
   return (
     <SkeletonContainer>
@@ -50,6 +52,7 @@ const AppearanceView = () => {
   const utils = trpc.useContext();
   const { data: user, isLoading } = trpc.viewer.me.useQuery();
   const [darkModeError, setDarkModeError] = useState(false);
+  const [lightModeError, setLightModeError] = useState(false);
 
   const { isLoading: isTeamPlanStatusLoading, hasPaidPlan } = useHasPaidPlan();
 
@@ -143,7 +146,14 @@ const AppearanceView = () => {
               <p className="text-default mb-2 block text-sm font-medium">{t("light_brand_color")}</p>
               <ColorPicker
                 defaultValue={user.brandColor}
-                onChange={(value) => formMethods.setValue("brandColor", value, { shouldDirty: true })}
+                onChange={(value) => {
+                  if (!checkWCAGContrastColor("#ffffff", value)) {
+                    setLightModeError(true);
+                  } else {
+                    setLightModeError(false);
+                  }
+                  formMethods.setValue("brandColor", value, { shouldDirty: true });
+                }}
               />
             </div>
           )}
@@ -178,6 +188,14 @@ const AppearanceView = () => {
           />
         </div>
       ) : null}
+      {lightModeError ? (
+        <div className="mt-4">
+          <Alert
+            severity="warning"
+            message="Light Theme color doesn't pass contrast check. We recommend you change this colour so your buttons will be more visible."
+          />
+        </div>
+      ) : null}
       {/* TODO future PR to preview brandColors */}
       {/* <Button
         color="secondary"
@@ -230,5 +248,6 @@ const AppearanceView = () => {
 };
 
 AppearanceView.getLayout = getLayout;
+AppearanceView.PageWrapper = PageWrapper;
 
 export default AppearanceView;
diff --git a/apps/web/pages/settings/my-account/calendars.tsx b/apps/web/pages/settings/my-account/calendars.tsx
index 7590778134..97afcdddda 100644
--- a/apps/web/pages/settings/my-account/calendars.tsx
+++ b/apps/web/pages/settings/my-account/calendars.tsx
@@ -28,6 +28,7 @@ import { Plus, Calendar } from "@calcom/ui/components/icon";
 
 import { QueryCell } from "@lib/QueryCell";
 
+import PageWrapper from "@components/PageWrapper";
 import { CalendarSwitch } from "@components/settings/CalendarSwitch";
 
 const SkeletonLoader = () => {
@@ -228,5 +229,6 @@ const CalendarsView = () => {
 };
 
 CalendarsView.getLayout = getLayout;
+CalendarsView.PageWrapper = PageWrapper;
 
 export default CalendarsView;
diff --git a/apps/web/pages/settings/my-account/conferencing.tsx b/apps/web/pages/settings/my-account/conferencing.tsx
index 1914445a13..48c1a94758 100644
--- a/apps/web/pages/settings/my-account/conferencing.tsx
+++ b/apps/web/pages/settings/my-account/conferencing.tsx
@@ -27,6 +27,7 @@ import {
 import { AlertCircle, MoreHorizontal, Trash, Video } from "@calcom/ui/components/icon";
 
 import AppListCard from "@components/AppListCard";
+import PageWrapper from "@components/PageWrapper";
 
 const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
   return (
@@ -188,5 +189,6 @@ const ConferencingLayout = () => {
 };
 
 ConferencingLayout.getLayout = getLayout;
+ConferencingLayout.PageWrapper = PageWrapper;
 
 export default ConferencingLayout;
diff --git a/apps/web/pages/settings/my-account/general.tsx b/apps/web/pages/settings/my-account/general.tsx
index 3f0b1d61f3..1c422d6424 100644
--- a/apps/web/pages/settings/my-account/general.tsx
+++ b/apps/web/pages/settings/my-account/general.tsx
@@ -22,6 +22,8 @@ import {
 
 import { withQuery } from "@lib/QueryCell";
 
+import PageWrapper from "@components/PageWrapper";
+
 const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
   return (
     <SkeletonContainer>
@@ -219,5 +221,6 @@ const GeneralView = ({ localeProp, user }: GeneralViewProps) => {
 };
 
 GeneralQueryView.getLayout = getLayout;
+GeneralQueryView.PageWrapper = PageWrapper;
 
 export default GeneralQueryView;
diff --git a/apps/web/pages/settings/my-account/profile.tsx b/apps/web/pages/settings/my-account/profile.tsx
index 9f23d0ba94..fb40b46b59 100644
--- a/apps/web/pages/settings/my-account/profile.tsx
+++ b/apps/web/pages/settings/my-account/profile.tsx
@@ -40,6 +40,7 @@ import {
 } from "@calcom/ui";
 import { AlertTriangle, Trash2 } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
 import TwoFactor from "@components/auth/TwoFactor";
 import { UsernameAvailabilityField } from "@components/ui/UsernameAvailability";
 
@@ -319,6 +320,7 @@ const ProfileForm = ({
   extraField?: React.ReactNode;
 }) => {
   const { t } = useLocale();
+  const [firstRender, setFirstRender] = useState(true);
 
   const profileFormSchema = z.object({
     username: z.string(),
@@ -384,6 +386,8 @@ const ProfileForm = ({
           }}
           excludedToolbarItems={["blockType"]}
           disableLists
+          firstRender={firstRender}
+          setFirstRender={setFirstRender}
         />
       </div>
       <Button disabled={isDisabled} color="primary" className="mt-8" type="submit">
@@ -394,5 +398,6 @@ const ProfileForm = ({
 };
 
 ProfileView.getLayout = getLayout;
+ProfileView.PageWrapper = PageWrapper;
 
 export default ProfileView;
diff --git a/apps/web/pages/settings/security/impersonation.tsx b/apps/web/pages/settings/security/impersonation.tsx
index 654b6732c5..046526ce30 100644
--- a/apps/web/pages/settings/security/impersonation.tsx
+++ b/apps/web/pages/settings/security/impersonation.tsx
@@ -6,6 +6,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Button, Form, Label, Meta, showToast, Skeleton, Switch } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
+
 import { ssrInit } from "@server/lib/ssr";
 
 const ProfileImpersonationView = () => {
@@ -85,6 +87,7 @@ const ProfileImpersonationView = () => {
 };
 
 ProfileImpersonationView.getLayout = getLayout;
+ProfileImpersonationView.PageWrapper = PageWrapper;
 
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const ssr = await ssrInit(context);
diff --git a/apps/web/pages/settings/security/password.tsx b/apps/web/pages/settings/security/password.tsx
index 599053e576..e57d853e0d 100644
--- a/apps/web/pages/settings/security/password.tsx
+++ b/apps/web/pages/settings/security/password.tsx
@@ -9,6 +9,8 @@ import { userMetadata } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
 import { Alert, Button, Form, Meta, PasswordField, Select, SettingsToggle, showToast } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
+
 type ChangePasswordSessionFormValues = {
   oldPassword: string;
   newPassword: string;
@@ -207,5 +209,6 @@ const PasswordView = () => {
 };
 
 PasswordView.getLayout = getLayout;
+PasswordView.PageWrapper = PageWrapper;
 
 export default PasswordView;
diff --git a/apps/web/pages/settings/security/sso.tsx b/apps/web/pages/settings/security/sso.tsx
index 7b9d48b68e..e20f72e7cd 100644
--- a/apps/web/pages/settings/security/sso.tsx
+++ b/apps/web/pages/settings/security/sso.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/sso/page/user-sso-view";
+import UserSSOView from "@calcom/features/ee/sso/page/user-sso-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = UserSSOView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/security/two-factor-auth.tsx b/apps/web/pages/settings/security/two-factor-auth.tsx
index d2a98ce9be..5d8f6373cf 100644
--- a/apps/web/pages/settings/security/two-factor-auth.tsx
+++ b/apps/web/pages/settings/security/two-factor-auth.tsx
@@ -5,6 +5,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Badge, Meta, Switch, SkeletonButton, SkeletonContainer, SkeletonText, Alert } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
 import DisableTwoFactorModal from "@components/settings/DisableTwoFactorModal";
 import EnableTwoFactorModal from "@components/settings/EnableTwoFactorModal";
 
@@ -84,5 +85,6 @@ const TwoFactorAuthView = () => {
 };
 
 TwoFactorAuthView.getLayout = getLayout;
+TwoFactorAuthView.PageWrapper = PageWrapper;
 
 export default TwoFactorAuthView;
diff --git a/apps/web/pages/settings/teams/[id]/appearance.tsx b/apps/web/pages/settings/teams/[id]/appearance.tsx
index a5514889ac..6c6343e791 100644
--- a/apps/web/pages/settings/teams/[id]/appearance.tsx
+++ b/apps/web/pages/settings/teams/[id]/appearance.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/teams/pages/team-appearance-view";
+import TeamAppearenceView from "@calcom/features/ee/teams/pages/team-appearance-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = TeamAppearenceView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/teams/[id]/billing.tsx b/apps/web/pages/settings/teams/[id]/billing.tsx
index f127a20d53..abf744c320 100644
--- a/apps/web/pages/settings/teams/[id]/billing.tsx
+++ b/apps/web/pages/settings/teams/[id]/billing.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/teams/pages/team-billing-view";
+import TeamBillingView from "@calcom/features/ee/teams/pages/team-billing-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = TeamBillingView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/teams/[id]/members.tsx b/apps/web/pages/settings/teams/[id]/members.tsx
index cce1f79bd4..5381265926 100644
--- a/apps/web/pages/settings/teams/[id]/members.tsx
+++ b/apps/web/pages/settings/teams/[id]/members.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/teams/pages/team-members-view";
+import TeamMembersView from "@calcom/features/ee/teams/pages/team-members-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = TeamMembersView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/teams/[id]/onboard-members.tsx b/apps/web/pages/settings/teams/[id]/onboard-members.tsx
index 313db59910..92a300ba4f 100644
--- a/apps/web/pages/settings/teams/[id]/onboard-members.tsx
+++ b/apps/web/pages/settings/teams/[id]/onboard-members.tsx
@@ -3,6 +3,7 @@ import Head from "next/head";
 import AddNewTeamMembers from "@calcom/features/ee/teams/components/AddNewTeamMembers";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 
+import PageWrapper from "@components/PageWrapper";
 import WizardLayout from "@components/layouts/WizardLayout";
 
 const OnboardTeamMembersPage = () => {
@@ -24,4 +25,6 @@ OnboardTeamMembersPage.getLayout = (page: React.ReactElement) => (
   </WizardLayout>
 );
 
+OnboardTeamMembersPage.PageWrapper = PageWrapper;
+
 export default OnboardTeamMembersPage;
diff --git a/apps/web/pages/settings/teams/[id]/profile.tsx b/apps/web/pages/settings/teams/[id]/profile.tsx
index 5318cc8478..9845bac378 100644
--- a/apps/web/pages/settings/teams/[id]/profile.tsx
+++ b/apps/web/pages/settings/teams/[id]/profile.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/teams/pages/team-profile-view";
+import TeamProfileView from "@calcom/features/ee/teams/pages/team-profile-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = TeamProfileView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/teams/[id]/sso.tsx b/apps/web/pages/settings/teams/[id]/sso.tsx
index afb0724157..d2022162a1 100644
--- a/apps/web/pages/settings/teams/[id]/sso.tsx
+++ b/apps/web/pages/settings/teams/[id]/sso.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/sso/page/teams-sso-view";
+import TeamSSOView from "@calcom/features/ee/sso/page/teams-sso-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = TeamSSOView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/teams/index.ts b/apps/web/pages/settings/teams/index.ts
index 1f80faa1c1..2f00167179 100644
--- a/apps/web/pages/settings/teams/index.ts
+++ b/apps/web/pages/settings/teams/index.ts
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/teams/pages/team-listing-view";
+import TeamListView from "@calcom/features/ee/teams/pages/team-listing-view";
+
+import PageWrapper from "@components/PageWrapper";
+import type { CalPageWrapper } from "@components/PageWrapper";
+
+const Page = TeamListView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
diff --git a/apps/web/pages/settings/teams/new/index.tsx b/apps/web/pages/settings/teams/new/index.tsx
index b129912117..604dd287c5 100644
--- a/apps/web/pages/settings/teams/new/index.tsx
+++ b/apps/web/pages/settings/teams/new/index.tsx
@@ -3,6 +3,7 @@ import Head from "next/head";
 import { CreateANewTeamForm } from "@calcom/features/ee/teams/components";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 
+import PageWrapper from "@components/PageWrapper";
 import WizardLayout from "@components/layouts/WizardLayout";
 
 const CreateNewTeamPage = () => {
@@ -26,5 +27,6 @@ const LayoutWrapper = (page: React.ReactElement) => {
 };
 
 CreateNewTeamPage.getLayout = LayoutWrapper;
+CreateNewTeamPage.PageWrapper = PageWrapper;
 
 export default CreateNewTeamPage;
diff --git a/apps/web/pages/signup.tsx b/apps/web/pages/signup.tsx
index 235e2cfb0f..a454648351 100644
--- a/apps/web/pages/signup.tsx
+++ b/apps/web/pages/signup.tsx
@@ -5,7 +5,7 @@ import type { CSSProperties } from "react";
 import type { SubmitHandler } from "react-hook-form";
 import { FormProvider, useForm } from "react-hook-form";
 
-import LicenseRequired from "@calcom/features/ee/common/components/v2/LicenseRequired";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -14,6 +14,8 @@ import prisma from "@calcom/prisma";
 import type { inferSSRProps } from "@calcom/types/inferSSRProps";
 import { Alert, Button, EmailField, HeadSeo, PasswordField, TextField } from "@calcom/ui";
 
+import PageWrapper from "@components/PageWrapper";
+
 import { asStringOrNull } from "../lib/asStringOrNull";
 import { IS_GOOGLE_LOGIN_ENABLED } from "../server/lib/constants";
 import { ssrInit } from "../server/lib/ssr";
@@ -95,7 +97,17 @@ export default function Signup({ prepopulateFormValues }: inferSSRProps<typeof g
         <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
           <div className="bg-default mx-2 px-4 py-8 shadow sm:rounded-lg sm:px-10">
             <FormProvider {...methods}>
-              <form onSubmit={methods.handleSubmit(signUp)} className="bg-default space-y-6">
+              <form
+                onSubmit={(event) => {
+                  event.preventDefault();
+                  event.stopPropagation();
+
+                  if (methods.formState?.errors?.apiError) {
+                    methods.clearErrors("apiError");
+                  }
+                  methods.handleSubmit(signUp)(event);
+                }}
+                className="bg-default space-y-6">
                 {errors.apiError && <Alert severity="error" message={errors.apiError?.message} />}
                 <div className="space-y-2">
                   <TextField
@@ -220,3 +232,4 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
 };
 
 Signup.isThemeSupported = false;
+Signup.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/team/[slug].tsx b/apps/web/pages/team/[slug].tsx
index dd9043634f..e5f1237b63 100644
--- a/apps/web/pages/team/[slug].tsx
+++ b/apps/web/pages/team/[slug].tsx
@@ -20,6 +20,7 @@ import { ArrowRight } from "@calcom/ui/components/icon";
 import { useToggleQuery } from "@lib/hooks/useToggleQuery";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import Team from "@components/team/screens/Team";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -203,4 +204,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   } as const;
 };
 
+TeamPage.isBookingPage = true;
+TeamPage.PageWrapper = PageWrapper;
+
 export default TeamPage;
diff --git a/apps/web/pages/team/[slug]/[type].tsx b/apps/web/pages/team/[slug]/[type].tsx
index 69eaadfeaa..1eeb235b24 100644
--- a/apps/web/pages/team/[slug]/[type].tsx
+++ b/apps/web/pages/team/[slug]/[type].tsx
@@ -2,10 +2,10 @@ import type { GetServerSidePropsContext } from "next";
 
 import type { LocationObject } from "@calcom/core/location";
 import { privacyFilteredLocations } from "@calcom/core/location";
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
+import getBooking from "@calcom/features/bookings/lib/get-booking";
 import { parseRecurringEvent } from "@calcom/lib";
 import { getWorkingHours } from "@calcom/lib/availability";
-import getBooking from "@calcom/lib/getBooking";
-import type { GetBookingType } from "@calcom/lib/getBooking";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import prisma from "@calcom/prisma";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
@@ -14,6 +14,7 @@ import { asStringOrNull } from "@lib/asStringOrNull";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 import type { EmbedProps } from "@lib/withEmbedSsr";
 
+import PageWrapper from "@components/PageWrapper";
 import AvailabilityPage from "@components/booking/pages/AvailabilityPage";
 
 import { ssgInit } from "@server/lib/ssg";
@@ -24,6 +25,9 @@ export default function TeamType(props: AvailabilityTeamPageProps) {
   return <AvailabilityPage {...props} />;
 }
 
+TeamType.isBookingPage = true;
+TeamType.PageWrapper = PageWrapper;
+
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const slugParam = asStringOrNull(context.query.slug);
   const typeParam = asStringOrNull(context.query.type);
diff --git a/apps/web/pages/team/[slug]/book.tsx b/apps/web/pages/team/[slug]/book.tsx
index 5fb2f7d66c..6f85ead949 100644
--- a/apps/web/pages/team/[slug]/book.tsx
+++ b/apps/web/pages/team/[slug]/book.tsx
@@ -3,10 +3,10 @@ import { z } from "zod";
 
 import type { LocationObject } from "@calcom/app-store/locations";
 import { privacyFilteredLocations } from "@calcom/app-store/locations";
+import getBooking from "@calcom/features/bookings/lib/get-booking";
+import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
 import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
 import { parseRecurringEvent } from "@calcom/lib";
-import type { GetBookingType } from "@calcom/lib/getBooking";
-import getBooking from "@calcom/lib/getBooking";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import prisma from "@calcom/prisma";
 import { customInputSchema, eventTypeBookingFields, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
@@ -14,6 +14,7 @@ import { customInputSchema, eventTypeBookingFields, EventTypeMetaDataSchema } fr
 import { asStringOrNull, asStringOrThrow } from "@lib/asStringOrNull";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
 import BookingPage from "@components/booking/pages/BookingPage";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -23,6 +24,8 @@ export type TeamBookingPageProps = inferSSRProps<typeof getServerSideProps>;
 export default function TeamBookingPage(props: TeamBookingPageProps) {
   return <BookingPage {...props} />;
 }
+TeamBookingPage.isBookingPage = true;
+TeamBookingPage.PageWrapper = PageWrapper;
 
 const querySchema = z.object({
   rescheduleUid: z.string().optional(),
diff --git a/apps/web/pages/teams/index.tsx b/apps/web/pages/teams/index.tsx
index 9c54896c91..a179513181 100644
--- a/apps/web/pages/teams/index.tsx
+++ b/apps/web/pages/teams/index.tsx
@@ -7,11 +7,14 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button } from "@calcom/ui";
 import { Plus } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 function Teams() {
   const { t } = useLocale();
   return (
     <Shell
       heading={t("teams")}
+      hideHeadingOnMobile
       subtitle={t("create_manage_teams_collaborative")}
       CTA={
         <Button
@@ -36,5 +39,6 @@ export const getStaticProps = async () => {
 };
 
 Teams.requiresLicense = false;
+Teams.PageWrapper = PageWrapper;
 
 export default Teams;
diff --git a/apps/web/pages/video/[uid].tsx b/apps/web/pages/video/[uid].tsx
index fd6cfc43e5..1e09536fe5 100644
--- a/apps/web/pages/video/[uid].tsx
+++ b/apps/web/pages/video/[uid].tsx
@@ -16,6 +16,8 @@ import prisma, { bookingMinimalSelect } from "@calcom/prisma";
 import type { inferSSRProps } from "@calcom/types/inferSSRProps";
 import { ChevronRight } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 import { ssrInit } from "@server/lib/ssr";
 
 const recordingStartedEventResponse = z
@@ -261,6 +263,8 @@ export function VideoMeetingInfo(props: VideoMeetingInfo) {
   );
 }
 
+VideoMeetingInfo.PageWrapper = PageWrapper;
+
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const { req, res } = context;
 
@@ -278,7 +282,6 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       user: {
         select: {
           id: true,
-          credentials: true,
           timeZone: true,
           name: true,
           email: true,
diff --git a/apps/web/pages/video/meeting-ended/[uid].tsx b/apps/web/pages/video/meeting-ended/[uid].tsx
index 1991e8a957..e89d8ec6a4 100644
--- a/apps/web/pages/video/meeting-ended/[uid].tsx
+++ b/apps/web/pages/video/meeting-ended/[uid].tsx
@@ -9,6 +9,8 @@ import { ArrowRight, Calendar, X } from "@calcom/ui/components/icon";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function MeetingUnavailable(props: inferSSRProps<typeof getServerSideProps>) {
   const { t } = useLocale();
 
@@ -62,6 +64,8 @@ export default function MeetingUnavailable(props: inferSSRProps<typeof getServer
   );
 }
 
+MeetingUnavailable.PageWrapper = PageWrapper;
+
 export async function getServerSideProps(context: NextPageContext) {
   const booking = await prisma.booking.findUnique({
     where: {
diff --git a/apps/web/pages/video/meeting-not-started/[uid].tsx b/apps/web/pages/video/meeting-not-started/[uid].tsx
index 45228bd592..21f793a9e8 100644
--- a/apps/web/pages/video/meeting-not-started/[uid].tsx
+++ b/apps/web/pages/video/meeting-not-started/[uid].tsx
@@ -8,6 +8,8 @@ import type { inferSSRProps } from "@calcom/types/inferSSRProps";
 import { Button, HeadSeo, EmptyScreen } from "@calcom/ui";
 import { ArrowRight, Calendar, Clock } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function MeetingNotStarted(props: inferSSRProps<typeof getServerSideProps>) {
   const { t } = useLocale();
   return (
@@ -37,6 +39,8 @@ export default function MeetingNotStarted(props: inferSSRProps<typeof getServerS
   );
 }
 
+MeetingNotStarted.PageWrapper = PageWrapper;
+
 export async function getServerSideProps(context: NextPageContext) {
   const booking = await prisma.booking.findUnique({
     where: {
diff --git a/apps/web/pages/video/no-meeting-found.tsx b/apps/web/pages/video/no-meeting-found.tsx
index 3b990a36b2..7de824c944 100644
--- a/apps/web/pages/video/no-meeting-found.tsx
+++ b/apps/web/pages/video/no-meeting-found.tsx
@@ -2,6 +2,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, EmptyScreen, HeadSeo } from "@calcom/ui";
 import { X, ArrowRight } from "@calcom/ui/components/icon";
 
+import PageWrapper from "@components/PageWrapper";
+
 export default function NoMeetingFound() {
   const { t } = useLocale();
 
@@ -23,3 +25,5 @@ export default function NoMeetingFound() {
     </>
   );
 }
+
+NoMeetingFound.PageWrapper = PageWrapper;
diff --git a/apps/web/pages/workflows/[workflow].tsx b/apps/web/pages/workflows/[workflow].tsx
index 1be2ceb1bc..53f72bf08f 100644
--- a/apps/web/pages/workflows/[workflow].tsx
+++ b/apps/web/pages/workflows/[workflow].tsx
@@ -1,7 +1,10 @@
 import type { GetStaticPaths, GetStaticProps } from "next";
 import { z } from "zod";
 
-export { default } from "@calcom/features/ee/workflows/pages/workflow";
+import Workflow from "@calcom/features/ee/workflows/pages/workflow";
+
+import PageWrapper from "@components/PageWrapper";
+import type { CalPageWrapper } from "@components/PageWrapper";
 
 const querySchema = z.object({
   workflow: z.string(),
@@ -26,3 +29,8 @@ export const getStaticPaths: GetStaticPaths = () => {
     fallback: "blocking",
   };
 };
+
+const WorkflowsPage = Workflow as CalPageWrapper;
+WorkflowsPage.PageWrapper = PageWrapper;
+
+export default WorkflowsPage;
diff --git a/apps/web/pages/workflows/index.tsx b/apps/web/pages/workflows/index.tsx
index a0ea681736..6112df1592 100644
--- a/apps/web/pages/workflows/index.tsx
+++ b/apps/web/pages/workflows/index.tsx
@@ -1 +1,9 @@
-export { default } from "@calcom/features/ee/workflows/pages/index";
+import Workflows from "@calcom/features/ee/workflows/pages/index";
+
+import PageWrapper from "@components/PageWrapper";
+import type { CalPageWrapper } from "@components/PageWrapper";
+
+const WorkflowsPage = Workflows as CalPageWrapper;
+WorkflowsPage.PageWrapper = PageWrapper;
+
+export default WorkflowsPage;
diff --git a/apps/web/playwright/booking-pages.e2e.ts b/apps/web/playwright/booking-pages.e2e.ts
index 7a956a3871..985125be5a 100644
--- a/apps/web/playwright/booking-pages.e2e.ts
+++ b/apps/web/playwright/booking-pages.e2e.ts
@@ -1,6 +1,7 @@
 import { expect } from "@playwright/test";
 
 import { test } from "./lib/fixtures";
+import { testBothBookers } from "./lib/new-booker";
 import {
   bookFirstEvent,
   bookOptinEvent,
@@ -12,7 +13,7 @@ import {
 test.describe.configure({ mode: "parallel" });
 test.afterEach(async ({ users }) => users.deleteAll());
 
-test.describe("free user", () => {
+testBothBookers.describe("free user", (bookerVariant) => {
   test.beforeEach(async ({ page, users }) => {
     const free = await users.create();
     await page.goto(`/${free.username}`);
@@ -24,12 +25,18 @@ test.describe("free user", () => {
 
     await selectFirstAvailableTimeSlotNextMonth(page);
 
-    // Navigate to book page
-    await page.waitForNavigation({
-      url(url) {
-        return url.pathname.endsWith("/book");
-      },
-    });
+    // Kept in if statement here, since it's only temporary
+    // until the old booker isn't used anymore, and I wanted
+    // to change the test as little as possible.
+    // eslint-disable-next-line playwright/no-conditional-in-test
+    if (bookerVariant !== "new-booker") {
+      // Navigate to book page
+      await page.waitForNavigation({
+        url(url) {
+          return url.pathname.endsWith("/book");
+        },
+      });
+    }
 
     // save booking url
     const bookingUrl: string = page.url();
@@ -51,7 +58,7 @@ test.describe("free user", () => {
   });
 });
 
-test.describe("pro user", () => {
+testBothBookers.describe("pro user", () => {
   test.beforeEach(async ({ page, users }) => {
     const pro = await users.create();
     await page.goto(`/${pro.username}`);
diff --git a/apps/web/playwright/booking-seats.e2e.ts b/apps/web/playwright/booking-seats.e2e.ts
index 17d83f2809..2a872151d6 100644
--- a/apps/web/playwright/booking-seats.e2e.ts
+++ b/apps/web/playwright/booking-seats.e2e.ts
@@ -7,6 +7,7 @@ import prisma from "@calcom/prisma";
 
 import type { Fixtures } from "./lib/fixtures";
 import { test } from "./lib/fixtures";
+import { testBothBookers } from "./lib/new-booker";
 import {
   bookTimeSlot,
   createNewSeatedEventType,
@@ -46,7 +47,7 @@ async function createUserWithSeatedEventAndAttendees(
   return { user, eventType, booking };
 }
 
-test.describe("Booking with Seats", () => {
+testBothBookers.describe("Booking with Seats", (bookerVariant) => {
   test("User can create a seated event (2 seats as example)", async ({ users, page }) => {
     const user = await users.create({ name: "Seated event" });
     await user.login();
@@ -64,11 +65,19 @@ test.describe("Booking with Seats", () => {
     });
     await page.goto(`/${user.username}/${slug}`);
     await selectFirstAvailableTimeSlotNextMonth(page);
-    await page.waitForNavigation({
-      url(url) {
-        return url.pathname.endsWith("/book");
-      },
-    });
+
+    // Kept in if statement here, since it's only temporary
+    // until the old booker isn't used anymore, and I wanted
+    // to change the test as little as possible.
+    // eslint-disable-next-line playwright/no-conditional-in-test
+    if (bookerVariant === "old-booker") {
+      await page.waitForNavigation({
+        url(url) {
+          return url.pathname.endsWith("/book");
+        },
+      });
+    }
+
     const bookingUrl = page.url();
     await test.step("Attendee #1 can book a seated event time slot", async () => {
       await page.goto(bookingUrl);
@@ -93,7 +102,7 @@ test.describe("Booking with Seats", () => {
   // TODO: Make E2E test: All attendees canceling should delete the booking for the User
   // todo("All attendees canceling should delete the booking for the User");
 
-  test.describe("Reschedule for booking with seats", () => {
+  testBothBookers.describe("Reschedule for booking with seats", () => {
     test("Should reschedule booking with seats", async ({ page, users, bookings }) => {
       const { booking } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
         { name: "John First", email: "first+seats@cal.com", timeZone: "Europe/Berlin" },
@@ -313,5 +322,145 @@ test.describe("Booking with Seats", () => {
       // Validate that the number of seats its 10
       expect(await page.locator("text=9 / 10 Seats available").count()).toEqual(0);
     });
+
+    test("Should cancel with seats but event should be still accesible and with one less attendee/seat", async ({
+      page,
+      users,
+      bookings,
+    }) => {
+      const { user, booking } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
+        { name: "John First", email: "first+seats@cal.com", timeZone: "Europe/Berlin" },
+        { name: "Jane Second", email: "second+seats@cal.com", timeZone: "Europe/Berlin" },
+      ]);
+      await user.login();
+
+      const bookingAttendees = await prisma.attendee.findMany({
+        where: { bookingId: booking.id },
+        select: {
+          id: true,
+        },
+      });
+
+      const bookingSeats = [
+        { bookingId: booking.id, attendeeId: bookingAttendees[0].id, referenceUid: uuidv4() },
+        { bookingId: booking.id, attendeeId: bookingAttendees[1].id, referenceUid: uuidv4() },
+      ];
+
+      await prisma.bookingSeat.createMany({
+        data: bookingSeats,
+      });
+
+      // Now we cancel the booking as the first attendee
+      // booking/${bookingUid}?cancel=true&allRemainingBookings=false&seatReferenceUid={bookingSeat.referenceUid}
+      await page.goto(
+        `/booking/${booking.uid}?cancel=true&allRemainingBookings=false&seatReferenceUid=${bookingSeats[0].referenceUid}`
+      );
+
+      await page.locator('[data-testid="cancel"]').click();
+
+      await page.waitForLoadState("networkidle");
+
+      await expect(page).toHaveURL(/.*booking/);
+
+      await page.goto(
+        `/booking/${booking.uid}?cancel=true&allRemainingBookings=false&seatReferenceUid=${bookingSeats[1].referenceUid}`
+      );
+
+      // Page should not be 404
+      await page.locator('[data-testid="cancel"]').click();
+
+      await page.waitForLoadState("networkidle");
+
+      await expect(page).toHaveURL(/.*booking/);
+    });
+
+    test("Should book with seats and hide attendees info from showAttendees true", async ({
+      page,
+      users,
+      bookings,
+    }) => {
+      const { user, booking } = await createUserWithSeatedEventAndAttendees({ users, bookings }, [
+        { name: "John First", email: "first+seats@cal.com", timeZone: "Europe/Berlin" },
+        { name: "Jane Second", email: "second+seats@cal.com", timeZone: "Europe/Berlin" },
+      ]);
+      await user.login();
+      const bookingWithEventType = await prisma.booking.findFirst({
+        where: { uid: booking.uid },
+        select: {
+          id: true,
+          eventTypeId: true,
+        },
+      });
+
+      await prisma.eventType.update({
+        data: {
+          seatsShowAttendees: false,
+        },
+        where: {
+          id: bookingWithEventType?.eventTypeId || -1,
+        },
+      });
+
+      const bookingAttendees = await prisma.attendee.findMany({
+        where: { bookingId: booking.id },
+        select: {
+          id: true,
+        },
+      });
+
+      const bookingSeats = [
+        { bookingId: booking.id, attendeeId: bookingAttendees[0].id, referenceUid: uuidv4() },
+        { bookingId: booking.id, attendeeId: bookingAttendees[1].id, referenceUid: uuidv4() },
+      ];
+
+      await prisma.bookingSeat.createMany({
+        data: bookingSeats,
+      });
+
+      // Go to cancel page and see that attendees are listed and myself as I'm owner of the booking
+      await page.goto(`/booking/${booking.uid}?cancel=true&allRemainingBookings=false`);
+
+      const foundFirstAttendeeAsOwner = await page.locator('p[data-testid="attendee-first+seats@cal.com"]');
+      await expect(foundFirstAttendeeAsOwner).toHaveCount(1);
+      const foundSecondAttendeeAsOwner = await page.locator('p[data-testid="attendee-second+seats@cal.com"]');
+      await expect(foundSecondAttendeeAsOwner).toHaveCount(1);
+      await page.pause();
+      await page.goto("auth/logout");
+
+      // Now we cancel the booking as the first attendee
+      // booking/${bookingUid}?cancel=true&allRemainingBookings=false&seatReferenceUid={bookingSeat.referenceUid}
+      await page.goto(
+        `/booking/${booking.uid}?cancel=true&allRemainingBookings=false&seatReferenceUid=${bookingSeats[0].referenceUid}`
+      );
+
+      // No attendees should be displayed only the one that it's cancelling
+      const notFoundSecondAttendee = await page.locator('p[data-testid="attendee-second+seats@cal.com"]');
+
+      await expect(notFoundSecondAttendee).toHaveCount(0);
+      const foundFirstAttendee = await page.locator('p[data-testid="attendee-first+seats@cal.com"]');
+      await expect(foundFirstAttendee).toHaveCount(1);
+
+      await prisma.eventType.update({
+        data: {
+          seatsShowAttendees: true,
+        },
+        where: {
+          id: bookingWithEventType?.eventTypeId || -1,
+        },
+      });
+
+      await page.goto(
+        `/booking/${booking.uid}?cancel=true&allRemainingBookings=false&seatReferenceUid=${bookingSeats[1].referenceUid}`
+      );
+
+      // Now attendees should be displayed
+      const foundSecondAttendee = await page.locator('p[data-testid="attendee-second+seats@cal.com"]');
+
+      await expect(foundSecondAttendee).toHaveCount(1);
+      const foundFirstAttendeeAgain = await page
+        .locator('p[data-testid="attendee-first+seats@cal.com"]')
+        .first();
+      await expect(foundFirstAttendeeAgain).toHaveCount(1);
+    });
   });
 });
diff --git a/apps/web/playwright/event-types.e2e.ts b/apps/web/playwright/event-types.e2e.ts
index bdfe43ae69..d3a12f1622 100644
--- a/apps/web/playwright/event-types.e2e.ts
+++ b/apps/web/playwright/event-types.e2e.ts
@@ -4,12 +4,13 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
 import { randomString } from "@calcom/lib/random";
 
 import { test } from "./lib/fixtures";
+import { testBothBookers } from "./lib/new-booker";
 import { bookTimeSlot, createNewEventType, selectFirstAvailableTimeSlotNextMonth } from "./lib/testUtils";
 
 test.describe.configure({ mode: "parallel" });
 
 test.describe("Event Types tests", () => {
-  test.describe("user", () => {
+  testBothBookers.describe("user", (bookerVariant) => {
     test.beforeEach(async ({ page, users }) => {
       const user = await users.create();
       await user.login();
@@ -147,11 +148,17 @@ test.describe("Event Types tests", () => {
       await selectFirstAvailableTimeSlotNextMonth(page);
 
       // Navigate to book page
-      await page.waitForNavigation({
-        url(url) {
-          return url.pathname.endsWith("/book");
-        },
-      });
+      // Kept in if statement here, since it's only temporary
+      // until the old booker isn't used anymore, and I wanted
+      // to change the test as little as possible.
+      // eslint-disable-next-line playwright/no-conditional-in-test
+      if (bookerVariant === "old-booker") {
+        await page.waitForNavigation({
+          url(url) {
+            return url.pathname.endsWith("/book");
+          },
+        });
+      }
 
       for (const location of locationData) {
         await page.locator(`span:has-text("${location}")`).click();
diff --git a/apps/web/playwright/lib/fixtures.ts b/apps/web/playwright/lib/fixtures.ts
index 2868cc1c0d..7b86f34f75 100644
--- a/apps/web/playwright/lib/fixtures.ts
+++ b/apps/web/playwright/lib/fixtures.ts
@@ -1,3 +1,4 @@
+import type { Page } from "@playwright/test";
 import { test as base } from "@playwright/test";
 
 import prisma from "@calcom/prisma";
@@ -10,6 +11,7 @@ import { createServersFixture } from "../fixtures/servers";
 import { createUsersFixture } from "../fixtures/users";
 
 export interface Fixtures {
+  page: Page;
   users: ReturnType<typeof createUsersFixture>;
   bookings: ReturnType<typeof createBookingsFixture>;
   payments: ReturnType<typeof createPaymentsFixture>;
diff --git a/apps/web/playwright/lib/new-booker.ts b/apps/web/playwright/lib/new-booker.ts
new file mode 100644
index 0000000000..7d9fea6057
--- /dev/null
+++ b/apps/web/playwright/lib/new-booker.ts
@@ -0,0 +1,31 @@
+import { test } from "./fixtures";
+
+export type BookerVariants = "new-booker" | "old-booker";
+
+const bookerVariants = ["new-booker", "old-booker"];
+
+/**
+ * Small wrapper around test.describe().
+ * When using testbothBookers.describe() instead of test.describe(), this will run the specified
+ * tests twice. One with the old booker, and one with the new booker. It will also add the booker variant
+ * name to the test name for easier debugging.
+ * Finally it also adds a parameter bookerVariant to your testBothBooker.describe() callback, which
+ * can be used to do any conditional rendering in the test for a specific booker variant (should be as little
+ * as possible).
+ *
+ * See apps/web/playwright/booking-pages.e2e.ts for an example.
+ */
+export const testBothBookers = {
+  describe: (testName: string, testFn: (bookerVariant: BookerVariants) => void) => {
+    bookerVariants.forEach((bookerVariant) => {
+      test.describe(`${testName} -- ${bookerVariant}`, () => {
+        if (bookerVariant === "new-booker") {
+          test.beforeEach(({ context }) => {
+            context.addCookies([{ name: "new-booker-enabled", value: "true", url: "http://localhost:3000" }]);
+          });
+        }
+        testFn(bookerVariant as BookerVariants);
+      });
+    });
+  },
+};
diff --git a/apps/web/playwright/manage-booking-questions.e2e.ts b/apps/web/playwright/manage-booking-questions.e2e.ts
index bb19dd2d6b..7aa5706999 100644
--- a/apps/web/playwright/manage-booking-questions.e2e.ts
+++ b/apps/web/playwright/manage-booking-questions.e2e.ts
@@ -7,6 +7,8 @@ import { uuid } from "short-uuid";
 import prisma from "@calcom/prisma";
 
 import { test } from "./lib/fixtures";
+import { testBothBookers } from "./lib/new-booker";
+import type { BookerVariants } from "./lib/new-booker";
 import { createHttpServer, waitFor, selectFirstAvailableTimeSlotNextMonth } from "./lib/testUtils";
 
 async function getLabelText(field: Locator) {
@@ -18,7 +20,7 @@ test.describe("Manage Booking Questions", () => {
     await users.deleteAll();
   });
 
-  test.describe("For User EventType", () => {
+  testBothBookers.describe("For User EventType", (bookerVariant) => {
     test("Do a booking with a user added question and verify a few thing in b/w", async ({
       page,
       users,
@@ -37,11 +39,11 @@ test.describe("Manage Booking Questions", () => {
         await firstEventTypeElement.click();
       });
 
-      await runTestStepsCommonForTeamAndUserEventType(page, context, webhookReceiver);
+      await runTestStepsCommonForTeamAndUserEventType(page, context, webhookReceiver, bookerVariant);
     });
   });
 
-  test.describe("For Team EventType", () => {
+  testBothBookers.describe("For Team EventType", (bookerVariant) => {
     test("Do a booking with a user added question and verify a few thing in b/w", async ({
       page,
       users,
@@ -60,7 +62,7 @@ test.describe("Manage Booking Questions", () => {
         await firstEventTypeElement.click();
       });
 
-      await runTestStepsCommonForTeamAndUserEventType(page, context, webhookReceiver);
+      await runTestStepsCommonForTeamAndUserEventType(page, context, webhookReceiver, bookerVariant);
     });
   });
 });
@@ -73,7 +75,8 @@ async function runTestStepsCommonForTeamAndUserEventType(
     close: () => import("http").Server;
     requestList: (import("http").IncomingMessage & { body?: unknown })[];
     url: string;
-  }
+  },
+  bookerVariant: BookerVariants
 ) {
   await page.click('[href$="tabName=advanced"]');
 
@@ -89,7 +92,7 @@ async function runTestStepsCommonForTeamAndUserEventType(
       },
     });
 
-    await doOnFreshPreview(page, context, async (page) => {
+    await doOnFreshPreview(page, context, bookerVariant, async (page) => {
       const allFieldsLocator = await expectSystemFieldsToBeThere(page);
       const userFieldLocator = allFieldsLocator.nth(5);
 
@@ -105,7 +108,7 @@ async function runTestStepsCommonForTeamAndUserEventType(
       name: "how_are_you",
       page,
     });
-    await doOnFreshPreview(page, context, async (page) => {
+    await doOnFreshPreview(page, context, bookerVariant, async (page) => {
       const formBuilderFieldLocator = page.locator('[data-fob-field-name="how_are_you"]');
       await expect(formBuilderFieldLocator).toBeHidden();
     });
@@ -119,7 +122,7 @@ async function runTestStepsCommonForTeamAndUserEventType(
   });
 
   await test.step('Try to book without providing "How are you?" response', async () => {
-    await doOnFreshPreview(page, context, async (page) => {
+    await doOnFreshPreview(page, context, bookerVariant, async (page) => {
       await bookTimeSlot({ page, name: "Booker", email: "booker@example.com" });
       await expectErrorToBeThereFor({ page, name: "how_are_you" });
     });
@@ -138,6 +141,7 @@ async function runTestStepsCommonForTeamAndUserEventType(
       return await doOnFreshPreview(
         page,
         context,
+        bookerVariant,
         async (page) => {
           const formBuilderFieldLocator = page.locator('[data-fob-field-name="how_are_you"]');
           await expect(formBuilderFieldLocator).toBeVisible();
@@ -196,8 +200,7 @@ async function runTestStepsCommonForTeamAndUserEventType(
 
   await test.step("Do a reschedule and notice that we can't book without giving a value for rescheduleReason", async () => {
     const page = previewTabPage;
-    await rescheduleFromTheLinkOnPage({ page });
-    await page.pause();
+    await rescheduleFromTheLinkOnPage({ page, bookerVariant });
     await expectErrorToBeThereFor({ page, name: "rescheduleReason" });
   });
 }
@@ -304,10 +307,11 @@ async function expectErrorToBeThereFor({ page, name }: { page: Page; name: strin
 async function doOnFreshPreview(
   page: Page,
   context: PlaywrightTestArgs["context"],
+  bookerVariant: BookerVariants,
   callback: (page: Page) => Promise<void>,
   persistTab = false
 ) {
-  const previewTabPage = await openBookingFormInPreviewTab(context, page);
+  const previewTabPage = await openBookingFormInPreviewTab(context, page, bookerVariant);
   await callback(previewTabPage);
   if (!persistTab) {
     await previewTabPage.close();
@@ -347,25 +351,39 @@ async function createAndLoginUserWithEventTypes({ users }: { users: ReturnType<t
   return user;
 }
 
-async function rescheduleFromTheLinkOnPage({ page }: { page: Page }) {
+async function rescheduleFromTheLinkOnPage({
+  page,
+  bookerVariant,
+}: {
+  page: Page;
+  bookerVariant: BookerVariants;
+}) {
   await page.locator('[data-testid="reschedule-link"]').click();
   await page.waitForLoadState();
   await selectFirstAvailableTimeSlotNextMonth(page);
-  await page.waitForNavigation({
-    url: (url) => url.pathname.endsWith("/book"),
-  });
+  if (bookerVariant === "old-booker") {
+    await page.waitForNavigation({
+      url: (url) => url.pathname.endsWith("/book"),
+    });
+  }
   await page.click('[data-testid="confirm-reschedule-button"]');
 }
 
-async function openBookingFormInPreviewTab(context: PlaywrightTestArgs["context"], page: Page) {
+async function openBookingFormInPreviewTab(
+  context: PlaywrightTestArgs["context"],
+  page: Page,
+  bookerVariant: BookerVariants
+) {
   const previewTabPromise = context.waitForEvent("page");
   await page.locator('[data-testid="preview-button"]').click();
   const previewTabPage = await previewTabPromise;
   await previewTabPage.waitForLoadState();
   await selectFirstAvailableTimeSlotNextMonth(previewTabPage);
-  await previewTabPage.waitForNavigation({
-    url: (url) => url.pathname.endsWith("/book"),
-  });
+  if (bookerVariant === "old-booker") {
+    await previewTabPage.waitForNavigation({
+      url: (url) => url.pathname.endsWith("/book"),
+    });
+  }
   return previewTabPage;
 }
 
diff --git a/apps/web/playwright/reschedule.e2e.ts b/apps/web/playwright/reschedule.e2e.ts
index 70a648345f..6bab7bd4b6 100644
--- a/apps/web/playwright/reschedule.e2e.ts
+++ b/apps/web/playwright/reschedule.e2e.ts
@@ -4,6 +4,7 @@ import { BookingStatus } from "@prisma/client";
 import prisma from "@calcom/prisma";
 
 import { test } from "./lib/fixtures";
+import { testBothBookers } from "./lib/new-booker";
 import { selectFirstAvailableTimeSlotNextMonth } from "./lib/testUtils";
 
 const IS_STRIPE_ENABLED = !!(
@@ -16,7 +17,7 @@ test.describe.configure({ mode: "parallel" });
 
 test.afterEach(({ users }) => users.deleteAll());
 
-test.describe("Reschedule Tests", async () => {
+testBothBookers.describe("Reschedule Tests", async () => {
   test("Should do a booking request reschedule from /bookings", async ({ page, users, bookings }) => {
     const user = await users.create();
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
diff --git a/apps/web/public/embed-init-iframe.js b/apps/web/public/embed-init-iframe.js
deleted file mode 100644
index 73d5778714..0000000000
--- a/apps/web/public/embed-init-iframe.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const calEmbedMode = typeof new URL(document.URL).searchParams.get("embed") === "string";
-/* Iframe Name */
-window.name.includes("cal-embed");
-
-window.isEmbed = () => {
-  // Once an embed mode always an embed mode
-  return calEmbedMode;
-};
-
-window.resetEmbedStatus = () => {
-  try {
-    // eslint-disable-next-line @calcom/eslint/avoid-web-storage
-    window.sessionStorage.removeItem("calEmbedMode");
-  } catch (e) {}
-};
-
-window.getEmbedTheme = () => {
-  const url = new URL(document.URL);
-  return url.searchParams.get("theme");
-};
-
-window.getEmbedNamespace = () => {
-  const url = new URL(document.URL);
-  const namespace = url.searchParams.get("embed");
-  return namespace;
-};
diff --git a/apps/web/public/static/locales/ar/common.json b/apps/web/public/static/locales/ar/common.json
index 80da332383..ff82e8d4f8 100644
--- a/apps/web/public/static/locales/ar/common.json
+++ b/apps/web/public/static/locales/ar/common.json
@@ -1126,13 +1126,11 @@
   "current_username": "اسم المستخدم الحالي",
   "example_1": "مثال 1",
   "example_2": "مثال 2",
-  "additional_input_label": "تسمية الإدخال الاضافي",
   "company_size": "حجم الشركة",
   "what_help_needed": "ما الذي تحتاج إلى مساعدة بشأنه؟",
   "variable_format": "تنسيق المتغير",
   "webhook_subscriber_url_reserved": "رابط مشترك Webhook معرّف بالفعل",
   "custom_input_as_variable_info": "تجاهل جميع الأحرف الخاصة من تسمية الإدخال الإضافي (استخدم الأحرف والأرقام فقط)، واستخدم الحروف الكبيرة لجميع الأحرف واستبدل المساحات البيضاء بالشرط.",
-  "using_additional_inputs_as_variables": "كيف أستخدم مدخلات إضافية كمتغيرات؟",
   "download_desktop_app": "تحميل تطبيق سطح المكتب",
   "set_ping_link": "تعيين رابط Ping",
   "rate_limit_exceeded": "تم تجاوز حد السعر",
@@ -1345,7 +1343,6 @@
   "add_limit": "إضافة حد",
   "team_name_required": "اسم الفريق مطلوب",
   "show_attendees": "مشاركة معلومات الحضور مع الضيوف",
-  "how_additional_inputs_as_variables": "كيفية استخدام مدخلات إضافية كمتغيرات",
   "format": "التنسيق",
   "uppercase_for_letters": "استخدم الحروف الكبيرة لجميع الأحرف",
   "replace_whitespaces_underscores": "استبدل المساحات البيضاء بالشرطات السفلية",
@@ -1360,7 +1357,6 @@
   "billing_help_title": "هل تحتاج إلى أي شيء آخر؟",
   "billing_help_description": "إذا كنت تحتاج إلى أي مساعدة إضافية بخصوص الفوترة، فإن فريق الدعم لدينا في انتظارك لتقديم المساعدة.",
   "billing_help_cta": "الاتصال بالدعم",
-  "ignore_special_characters": "تجاهل الأحرف الخاصة في تسمية الإدخال الإضافية. استخدم فقط الأحرف والأرقام",
   "retry": "إعادة المحاولة",
   "fetching_calendars_error": "حدثت مشكلة أثناء جلب التقويمات الخاصة بك. يرجى <1>إعادة المحاولة</1> أو الاتصال بدعم العملاء.",
   "calendar_connection_fail": "فشل الاتصال بالتقويم",
@@ -1649,8 +1645,9 @@
   "verification_code": "رمز التحقق",
   "can_you_try_again": "هلّا جربت المحاولة ثانيةً في وقت مختلف؟",
   "verify": "التحقق",
+  "timezone_variable": "المنطقة الزمنية",
+  "invalid_event_name_variables": "ثمة متغيّر غير غير صالح في اسم فعاليتك",
   "select_all": "اختيار الكل",
   "default_conferencing_bulk_title": "التحديث الجماعي لمجموعة أنواع الفعاليات الحالية",
-  "invalid_event_name_variables": "ثمة متغيّر غير غير صالح في اسم فعاليتك",
   "default_conferencing_bulk_description": "تحديث المواقع لأنواع الفعاليات المحددة"
 }
diff --git a/apps/web/public/static/locales/cs/common.json b/apps/web/public/static/locales/cs/common.json
index 3cd0cf8cd7..fa99e41f51 100644
--- a/apps/web/public/static/locales/cs/common.json
+++ b/apps/web/public/static/locales/cs/common.json
@@ -860,7 +860,7 @@
   "add_new_calendar": "Přidat nový kalendář",
   "set_calendar": "Nastavte, kam se mají při rezervaci přidávat nové události.",
   "delete_schedule": "Odstranit plán",
-  "delete_schedule_description": "Odstranění plánu má za následek, že bude odstraněn ze všech typů událostí. Tuto akci nelze vrátit zpět.",
+  "delete_schedule_description": "Odstraněný plán bude odstraněn ze všech typů událostí. Tuto akci nelze vrátit zpět.",
   "schedule_created_successfully": "Plán {{scheduleName}} byl úspěšně vytvořen",
   "availability_updated_successfully": "Plán {{scheduleName}} byl úspěšně aktualizován",
   "schedule_deleted_successfully": "Plán byl úspěšně odstraněn",
@@ -1126,13 +1126,11 @@
   "current_username": "Současné uživatelské jméno",
   "example_1": "Příklad 1",
   "example_2": "Příklad 2",
-  "additional_input_label": "Další vstupní štítek",
   "company_size": "Velikost společnosti",
   "what_help_needed": "S čím potřebujete pomoci?",
   "variable_format": "Formát proměnné",
   "webhook_subscriber_url_reserved": "Adresa URL odběratele webhooku je již definována",
   "custom_input_as_variable_info": "Ignorujte všechny speciální znaky doplňkového vstupního štítku (používejte pouze písmena a číslice), používejte velká písmena a bílé znaky nahraďte podtržítky.",
-  "using_additional_inputs_as_variables": "Jak používat doplňkové vstupy jako proměnné?",
   "download_desktop_app": "Stáhněte si aplikaci pro stolní počítače",
   "set_ping_link": "Nastavení odkazu Ping",
   "rate_limit_exceeded": "Byl překročen limit rychlosti",
@@ -1156,7 +1154,7 @@
   "event_setup_multiple_duration_error": "Nastavení události: více dob trvání vyžaduje alespoň 1 možnost.",
   "event_setup_multiple_duration_default_error": "Nastavení události: vyberte prosím platnou výchozí dobu trvání.",
   "event_setup_booking_limits_error": "Limity rezervací musí být seřazeny vzestupně. [den,týden,měsíc,rok]",
-  "event_setup_duration_limits_error": "Limity doby trvání musí být seřazeny vzestupně. [den,týden,měsíc,rok]",
+  "event_setup_duration_limits_error": "Limity doby trvání musí být seřazeny vzestupně. [den, týden, měsíc, rok]",
   "select_which_cal": "Vyberte kalendář, do kterého se mají přidávat rezervace",
   "custom_event_name": "Vlastní název události",
   "custom_event_name_description": "Vytvářejte vlastní názvy událostí, které se budou zobrazovat v kalendáři událostí",
@@ -1345,7 +1343,6 @@
   "add_limit": "Přidat limit",
   "team_name_required": "Je vyžadován název týmu",
   "show_attendees": "Sdílet informace o účastnících",
-  "how_additional_inputs_as_variables": "Jak používat doplňkové vstupy jako proměnné",
   "format": "Formát",
   "uppercase_for_letters": "Použít velká písmena pro všechna písmena",
   "replace_whitespaces_underscores": "Nahradit mezery podtržítky",
@@ -1360,7 +1357,6 @@
   "billing_help_title": "Potřebujete ještě něco?",
   "billing_help_description": "Pokud potřebujete jakoukoliv pomoc s fakturací, náš tým zákaznické podpory je tu pro Vás.",
   "billing_help_cta": "Kontaktovat podporu",
-  "ignore_special_characters": "Ignorovat speciální znaky ve štítku Dodatečný vstup. Použít pouze písmena a čísla",
   "retry": "Opakovat",
   "fetching_calendars_error": "Při ukládání vašich údajů došlo k problému. Zkuste to znovu, <1>případně</1> se obraťte na zákaznickou podporu.",
   "calendar_connection_fail": "Připojení kalendáře se nezdařilo",
@@ -1618,7 +1614,7 @@
   "form_builder_field_add_subtitle": "Přizpůsobte otázky položené na stránce rezervace",
   "get_started_zapier_templates": "Začněte používat šablony Zapier",
   "team_is_unpublished": "Tým {{team}} není zveřejněn",
-  "team_is_unpublished_description": "Tento týmový odkaz není v současné době k dispozici. Kontaktujte prosím vlastníka týmu nebo ho požádejte o jeho zveřejnění.",
+  "team_is_unpublished_description": "Tento týmový odkaz není v současné době k dispozici. Kontaktujte vlastníka týmu nebo ho požádejte o jeho zveřejnění.",
   "team_member": "Člen týmu",
   "a_routing_form": "Směrovací formulář",
   "form_description_placeholder": "Popis formuláře",
@@ -1649,8 +1645,9 @@
   "verification_code": "Ověřovací kód",
   "can_you_try_again": "Můžete to zkusit znovu a použít jiný čas?",
   "verify": "Ověřit",
+  "timezone_variable": "Časová zóna",
+  "invalid_event_name_variables": "V názvu události je neplatná proměnná",
   "select_all": "Vybrat vše",
   "default_conferencing_bulk_title": "Hromadná aktualizace stávajících typů událostí",
-  "invalid_event_name_variables": "V názvu události je neplatná proměnná",
   "default_conferencing_bulk_description": "Aktualizujte místa pro vybrané typy událostí"
 }
diff --git a/apps/web/public/static/locales/da/common.json b/apps/web/public/static/locales/da/common.json
index b90140979f..6670ce2a5b 100644
--- a/apps/web/public/static/locales/da/common.json
+++ b/apps/web/public/static/locales/da/common.json
@@ -1122,13 +1122,11 @@
   "current_username": "Nuværende brugernavn",
   "example_1": "Eksempel 1",
   "example_2": "Eksempel 2",
-  "additional_input_label": "Ekstra Input Label",
   "company_size": "Firma størrelse",
   "what_help_needed": "Hvad har du brug for hjælp til?",
   "variable_format": "Variabelt format",
   "webhook_subscriber_url_reserved": "Webhook abonnent url er allerede defineret",
   "custom_input_as_variable_info": "Ignorér alle specialtegn i den ekstra input label (brug kun bogstaver og tal), brug store bogstaver for alle bogstaver og erstat blanke tegn med understregninger.",
-  "using_additional_inputs_as_variables": "Hvordan bruger jeg Ekstra Inputs som variabler?",
   "download_desktop_app": "Download desktop app",
   "set_ping_link": "Angiv Ping link",
   "rate_limit_exceeded": "Satsgrænsen er overskredet",
@@ -1338,7 +1336,6 @@
   "add_limit": "Tilføj Begrænsning",
   "team_name_required": "Teamnavn påkrævet",
   "show_attendees": "Del deltagerinformation mellem gæster",
-  "how_additional_inputs_as_variables": "Sådan bruger du Ekstra Inputs som Variabler",
   "format": "Formatér",
   "uppercase_for_letters": "Brug store bogstaver for alle bogstaver",
   "replace_whitespaces_underscores": "Erstat blanke tegn med understregninger",
@@ -1353,7 +1350,6 @@
   "billing_help_title": "Brug for noget andet?",
   "billing_help_description": "Hvis du har brug for yderligere hjælp til fakturering, er vores supportteam her for at hjælpe.",
   "billing_help_cta": "Kontakt support",
-  "ignore_special_characters": "Ignorér specialtegn i din Ekstra Input Label. Brug kun bogstaver og tal",
   "retry": "Prøv igen",
   "fetching_calendars_error": "Der opstod et problem med at hente dine kalendere. Venligst <1>prøv igen</1> eller kontakt kundeservice.",
   "calendar_connection_fail": "Forbindelse til kalender mislykkedes",
@@ -1619,5 +1615,6 @@
   "no_responses_yet": "Ingen svar endnu",
   "this_will_be_the_placeholder": "Dette vil være pladsholderen",
   "verification_code": "Bekræftelseskode",
-  "verify": "Bekræft"
+  "verify": "Bekræft",
+  "timezone_variable": "Tidszone"
 }
diff --git a/apps/web/public/static/locales/de/common.json b/apps/web/public/static/locales/de/common.json
index 32ee100776..3d4ad54dbb 100644
--- a/apps/web/public/static/locales/de/common.json
+++ b/apps/web/public/static/locales/de/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Identitätsanbieter",
   "trial_days_left": "Sie haben noch $t(Tage, {\"count\": {{days}} }) im Testzeitraum der PRO-Version",
   "day_one": "{{count}} Tag",
   "day_other": "{{count}} Tage",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Warte auf Bestätigung: {{title}} um {{date}}",
   "event_still_awaiting_approval": "Ein Termin wartet noch auf Ihre Bestätigung",
   "booking_submitted_subject": "Buchung eingereicht: {{title}} am {{date}}",
+  "download_recording_subject": "Aufnahme herunterladen: {{title}} am {{date}}",
+  "download_your_recording": "Ihre Aufnahme herunterladen",
   "your_meeting_has_been_booked": "Dein Termin wurde gebucht",
   "event_type_has_been_rescheduled_on_time_date": "Ihr {{title}} wurde auf den {{date}} verschoben.",
   "event_has_been_rescheduled": "Ihr Termin wurde verschoben.",
@@ -224,6 +227,7 @@
   "done": "Erledigt",
   "all_done": "Erledigt!",
   "all_apps": "Alle Apps",
+  "available_apps": "Verfügbare Apps",
   "check_email_reset_password": "Überprüfen Sie Ihre E-Mail. Wir haben Ihnen einen Link zum Zurücksetzen Ihres Passworts gesendet.",
   "finish": "Fertig",
   "few_sentences_about_yourself": "Schreiben Sie eine kurze Beschreibung, welche auf Ihrer persönlichen URL-Seite erscheinen wird.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Neues Zeitfenster hinzufügen",
   "add_an_extra_layer_of_security": "Fügen Sie Ihrem Konto eine zusätzliche Sicherheitsstufe hinzu, falls Ihr Passwort gestohlen wird.",
   "2fa": "Zwei-Faktor-Authentifizierung",
+  "2fa_disabled": "Zwei-Faktor-Authentifizierung kann nur für E-Mail- und Passwort-Authentifizierung aktiviert werden",
   "enable_2fa": "Zwei-Faktor-Authentifizierung aktivieren",
   "disable_2fa": "Zwei-Faktor-Authentifizierung deaktivieren",
   "disable_2fa_recommendation": "Falls Sie 2FA deaktivieren müssen, empfehlen wir, es so schnell wie möglich wieder zu aktivieren.",
@@ -585,6 +590,20 @@
   "minutes": "Minuten",
   "round_robin": "Round Robin",
   "round_robin_description": "Treffen zwischen mehreren Teammitgliedern durchwechseln.",
+  "managed_event": "Verwaltetes Ereignis",
+  "username_placeholder": "Benutzername",
+  "managed_event_description": "Erstellen und verteilen Sie Ereignistypen im Block an Teammitglieder",
+  "managed": "Verwaltet",
+  "managed_event_url_clarification": "„Benutzername“ wird mit dem Benutzernamen der zugewiesenen Mitglieder ausgefüllt",
+  "assign_to": "Zuordnen zu",
+  "add_members": "Mitglieder hinzufügen...",
+  "count_members_one": "{{count}} Mitglied",
+  "count_members_other": "{{count}} Mitglieder",
+  "no_assigned_members": "Keine zugeordneten Mitglieder",
+  "assigned_to": "Zugeordnet zu",
+  "start_assigning_members_above": "Mit der Zuordnung von Mitgliedern oben beginnen",
+  "locked_fields_admin_description": "Mitglieder werden dies nicht bearbeiten können",
+  "locked_fields_member_description": "Diese Option wurde vom Team-Admin gesperrt",
   "url": "URL",
   "hidden": "Versteckt",
   "readonly": "Schreibgeschützt",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Mindesvorlaufzeit für eine Buchung",
   "slot_interval": "Zeit-Slot-Intervalle",
   "slot_interval_default": "Verwende Terminlänge (Standard)",
+  "delete_event_type": "Ereignistyp löschen?",
+  "delete_managed_event_type": "Verwalteten Ereignistyp löschen?",
+  "delete_event_type_description": "Jede Person, mit der Sie diesen Link geteilt haben, kann nicht mehr über den Link buchen.",
+  "delete_managed_event_type_description": "<ul><li>Diesem Ereignistypen zugewiesene Mitglieder werden ebenfalls ihre Ereignistypen gelöscht bekommen.</li><li>Jeder, mit dem sie ihren Link geteilt haben, wird nicht mehr über diesen Link buchen können.</li></ul>",
+  "confirm_delete_event_type": "Ja, löschen",
   "delete_account": "Account löschen",
   "confirm_delete_account": "Ja, Account löschen",
   "delete_account_confirmation_message": "Sind Sie sicher, dass Sie Ihr {{appName}}-Konto löschen möchten? Sie können dann nicht mehr über Ihre geteilten Links gebucht werden und alle Einstellungen werden gelöscht.",
@@ -1126,13 +1150,13 @@
   "current_username": "Aktueller Benutzername",
   "example_1": "Beispiel 1",
   "example_2": "Beispiel 2",
-  "additional_input_label": "Zusätzliches Eingabefeld",
+  "booking_question_identifier": "Buchungsfragenbezeichner",
   "company_size": "Unternehmensgröße",
   "what_help_needed": "Wobei benötigen Sie Hilfe?",
   "variable_format": "Variablenformat",
   "webhook_subscriber_url_reserved": "Webhook Abonnenten-URL ist bereits definiert",
   "custom_input_as_variable_info": "Ignorieren Sie alle Sonderzeichen der zusätzlichen Eingabebezeichnung (verwenden Sie nur Buchstaben und Zahlen), schreiben Sie alle Buchstaben groß und ersetzen Sie Leerzeichen durch Unterstriche.",
-  "using_additional_inputs_as_variables": "Wie kann ich zusätzliche Eingaben als Variablen verwenden?",
+  "using_booking_questions_as_variables": "Wie verwende ich Buchungsfragen als Variablen?",
   "download_desktop_app": "Desktop-App herunterladen",
   "set_ping_link": "Ping-Link festlegen",
   "rate_limit_exceeded": "Anmeldeversuchsgrenze überschritten",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Wochenstart",
   "recordings_title": "Aufnahmen",
   "recording": "Aufnahme",
+  "happy_scheduling": "Fröhliche Terminplanung",
   "select_calendars": "Wählen Sie aus, in welchen Kalendern Sie nach Konflikten suchen wollen, um Doppelbuchungen zu vermeiden.",
   "check_for_conflicts": "Auf Konflikte prüfen",
   "view_recordings": "Aufnahmen anzeigen",
@@ -1215,6 +1240,7 @@
   "impersonation": "Benutzeridentitätswechsel",
   "impersonation_description": "Einstellungen zur Verwaltung der Benutzeridentifikation",
   "users": "Benutzer",
+  "user": "Benutzer",
   "profile_description": "Einstellungen für Ihr {{appName}} Profil verwalten",
   "users_description": "Hier finden Sie eine Liste aller Benutzer",
   "users_listing": "Benutzer-Listing",
@@ -1255,6 +1281,8 @@
   "download_responses": "Antworten herunterladen",
   "download_responses_description": "Laden Sie alle Antworten zu Ihrem Formular im CSV-Format herunter.",
   "download": "Herunterladen",
+  "download_recording": "Aufnahme herunterladen",
+  "recording_from_your_recent_call": "Eine Aufnahme von Ihrem letzten Anruf auf Cal.com steht zum Download bereit",
   "create_your_first_form": "Erstellen Sie Ihr erstes Formular",
   "create_your_first_form_description": "Mithilfe von Leitungsformularen können Sie qualifizierende Fragen stellen und zur richtigen Person oder zum richtigen Veranstaltungstyp weiterleiten.",
   "create_your_first_webhook": "Erstellen Sie Ihren ersten Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Basisauthentifizierung",
   "exchange_authentication_ntlm": "NTLM-Authentifizierung",
   "exchange_compression": "GZip-Kompression",
+  "exchange_version": "Exchange Version",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Hier sehen Sie alle Formulare und Weiterleitungen, die Sie erstellt haben.",
   "routing_forms_send_email_owner": "E-Mail an Eigentümer senden",
   "routing_forms_send_email_owner_description": "Sendet eine E-Mail an den Eigentümer, wenn das Formular abgeschickt wird",
@@ -1345,7 +1382,7 @@
   "add_limit": "Begrenzung hinzufügen",
   "team_name_required": "Teamname erforderlich",
   "show_attendees": "Teilnehmerinformationen zwischen Gästen teilen",
-  "how_additional_inputs_as_variables": "Wie man zusätzliche Eingaben als Variablen verwendet",
+  "how_booking_questions_as_variables": "Wie verwendet man Buchungsfragen als Variablen?",
   "format": "Format",
   "uppercase_for_letters": "Großbuchstaben für alle Buchstaben verwenden",
   "replace_whitespaces_underscores": "Leerzeichen durch Unterstriche ersetzen",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Brauchen Sie etwas anderes?",
   "billing_help_description": "Wenn Sie weitere Hilfe bei der Rechnungsstellung benötigen, hilft Ihnen unser Support-Team gerne weiter.",
   "billing_help_cta": "Support kontaktieren",
-  "ignore_special_characters": "Ignorieren Sie Sonderzeichen in Ihrer zusätzlichen Eingabebezeichnung. Verwenden Sie nur Buchstaben und Zahlen",
+  "ignore_special_characters_booking_questions": "Ignorieren Sie Sonderzeichen in Ihrem Buchungsfragenbezeichner. Verwenden Sie nur Buchstaben und Zahlen",
   "retry": "Erneut versuchen",
   "fetching_calendars_error": "Beim Abrufen Ihrer Kalender ist ein Problem aufgetreten. Bitte <1>versuchen Sie es erneut</1> oder wenden Sie sich an den Support.",
   "calendar_connection_fail": "Kalenderverbindung fehlgeschlagen",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Festgelegter Round Robin",
   "add_one_fixed_attendee": "Fügen Sie einen festen Teilnehmer und einen Round Robin mit einer Reihe von Teilnehmern hinzu.",
   "calcom_is_better_with_team": "Cal.com ist mit Teams besser",
+  "the_calcom_team": "Das Cal.com Team",
   "add_your_team_members": "Fügen Sie Ihre Teammitglieder zu Ihren Termintypen hinzu. Nutzen Sie kollektive Planung, um alle einzubinden oder finden Sie die geeignetste Person mit der Round Robin Planung.",
   "booking_limit_reached": "Das Buchungslimit für diesen Termintyp wurde erreicht",
   "duration_limit_reached": "Das Zeitlimit für diesen Termintyp wurde erreicht",
   "admin_has_disabled": "Ein Admin hat {{appName}} deaktiviert",
   "disabled_app_affects_event_type": "Ein Admin hat {{appName}} deaktiviert, was Ihren Termintyp {{eventType}} betrifft",
+  "event_replaced_notice": "Ein Admin hat einen Ihrer Ereignistypen ersetzt",
+  "email_subject_slug_replacement": "Ein Teamadministrator hat Ihr Ereignis ersetzt /{{slug}}",
+  "email_body_slug_replacement_notice": "Ein Administrator im <strong>{{teamName}}</strong>-Team hat Ihren Ereignistyp <strong>/{{slug}}</strong> durch einen verwalteten Ereignistyp ersetzt, den er steuert.",
+  "email_body_slug_replacement_info": "Ihr Link wird weiterhin funktionieren, aber einige Einstellungen werden möglicherweise geändert. Sie können ihn bei Ereignistypen überprüfen.",
+  "email_body_slug_replacement_suggestion": "Wenn Sie Fragen zum Ereignistyp haben, wenden Sie sich bitte an Ihren Administrator.<br /><br />Fröhliche Terminplanung, <br />Das Cal.com-Team",
   "disable_payment_app": "Der Admin hat {{appName}} deaktiviert, wodurch Ihr Termintyp {{title}} beeinflusst wurde. Die Teilnehmer können diesen Termintyp immer noch buchen, werden aber nicht zur Zahlung aufgefordert. Sie können den Termintyp ausblenden, um dies zu verhindern, bis Ihr Administrator Ihre Zahlungsmethode wieder aktiviert.",
   "payment_disabled_still_able_to_book": "Die Teilnehmer können diesen Termintyp immer noch buchen, werden aber nicht zur Zahlung aufgefordert. Sie können den Termintyp ausblenden, um dies zu verhindern, bis Ihr Administrator Ihre Zahlungsmethode wieder aktiviert.",
   "app_disabled_with_event_type": "Der Admin hat {{appName}} deaktiviert, was Ihren Termintyp {{title}} beeinflusst.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Überschreiben aktualisieren",
   "event_type_duplicate_copy_text": "{{slug}}-Kopie",
   "set_as_default": "Als Standard festlegen",
+  "hide_eventtype_details": "Ereignistyp-Einzelheiten ausblenden",
   "show_navigation": "Navigation anzeigen",
   "hide_navigation": "Navigation ausblenden",
   "verification_code_sent": "Bestätigungscode gesendet",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Erstellen Sie Ihren ersten Webhook für diesen Team-Ereignistyp",
   "create_webhook_team_event_type": "Einen Webhook für diesen Team-Ereignistyp erstellen",
   "disable_success_page": "Erfolgsseite deaktivieren (funktioniert nur, wenn eine Weiterleitungs-URL vorhanden ist)",
+  "invalid_admin_password": "Sie sind als Admin festgelegt, benutzen allerdings ein Passwort, das kürzer als 15 Zeichen ist oder verwenden noch keine 2FA",
   "change_password_admin": "Passwort ändern, um Adminzugriff zu erhalten",
   "username_already_taken": "Benutzername ist bereits vergeben",
   "assignment": "Zuordnung",
@@ -1529,7 +1574,7 @@
   "sender_name": "Absendername",
   "already_invited": "Teilnehmer bereits eingeladen",
   "no_recordings_found": "Keine Aufnahmen gefunden",
-  "new_workflow_subtitle": "Neuer Workflow für...",
+  "new_workflow_subtitle": "Neuer Workflow für ...",
   "reporting": "Meldungen",
   "reporting_feature": "Alle eingehenden Daten anzeigen und als CSV herunterladen",
   "teams_plan_required": "Teams-Plan benötigt",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "„/ee“ Enterprise-Lizenz",
   "enterprise_booking_fee": "Ab {{enterprise_booking_fee}}/Monat",
   "enterprise_license_includes": "Alles für einen kommerziellen Anwendungsfall",
+  "no_need_to_keep_your_code_open_source": "Ihr Code muss nicht open-source bleiben",
   "repackage_rebrand_resell": "Einfaches Neuverpacken, Rebranding und Weiterverkaufen",
   "a_vast_suite_of_enterprise_features": "Eine große Auswahl an Enterprise-Funktionen",
   "free_license_fee": "0,00 €/Monat",
@@ -1590,18 +1636,19 @@
   "recommended_next_steps": "Empfohlene nächste Schritte",
   "create_a_managed_event": "Einen verwalteten Ereignistyp erstellen",
   "meetings_are_better_with_the_right": "Meetings sind mit den richtigen Teammitgliedern besser. Laden Sie sie jetzt ein.",
-  "create_a_one_one_template": "Erstellen Sie eine One-on-One Vorlage für einen Termintyp und verteilen Sie diese an mehrere Mitglieder.",
+  "create_a_one_one_template": "Erstellen Sie eine One-on-One-Vorlage für einen Termintyp und verteilen Sie diese an mehrere Mitglieder.",
   "collective_or_roundrobin": "Kollektiv oder Round-Robin",
   "book_your_team_members": "Buchen Sie Ihre Teammitglieder zusammen mit Kollektivveranstaltungen oder wählen Sie mit Round-Robin die richtige Person.",
   "event_no_longer_attending_subject": "Nimmt nicht mehr an {{title}} am {{date}} teil",
   "no_longer_attending": "Sie nehmen an diesem Termin nicht mehr teil",
   "attendee_no_longer_attending_subject": "Ein Teilnehmer nimmt nicht mehr an {{title}} am {{date}} teil",
   "attendee_no_longer_attending": "Ein Teilnehmer nimmt nicht mehr an Ihrem Termin teil",
-  "attendee_no_longer_attending_subtitle": "{{name}} wurde abgebrochen. Das bedeutet, dass ein Platz für dieses Zeitfenster geöffnet wurde",
-  "create_event_on": "Erstelle Termin in",
+  "attendee_no_longer_attending_subtitle": "{{name}} hat abgesagt. Das bedeutet, dass ein Platz für dieses Zeitfenster geöffnet wurde",
+  "create_event_on": "Erstelle Termin am",
   "default_app_link_title": "Standard-App-Link festlegen",
   "default_app_link_description": "Mit dem Festlegen eines Standard-App-Links können alle neu erstellten Ereignistypen den App-Link verwenden, den Sie gesetzt haben.",
   "change_default_conferencing_app": "Als Standard festlegen",
+  "organizer_default_conferencing_app": "Standard-App des Organisators",
   "under_maintenance": "Wartungsarbeiten",
   "under_maintenance_description": "Das {{appName}} Team führt geplante Wartungsarbeiten durch. Wenn Sie Fragen haben, wenden Sie sich bitte an den Support.",
   "event_type_seats": "{{numberOfSeats}} Sitze",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "Nicht genügend Plätze",
   "form_builder_field_already_exists": "Ein Feld mit diesem Namen ist bereits vorhanden",
   "form_builder_field_add_subtitle": "Passen Sie die Fragen an, die auf der Buchungsseite gefragt werden",
+  "show_on_booking_page": "Auf der Buchungsseite anzeigen",
   "get_started_zapier_templates": "Legen Sie mit Zapier-Vorlagen los",
   "team_is_unpublished": "{{team}} ist unveröffentlicht",
   "team_is_unpublished_description": "Dieser Team-Link ist derzeit nicht verfügbar. Bitte kontaktieren Sie den Team-Besitzer oder fragen Sie ihn, ob er ihn veröffentlicht.",
@@ -1625,9 +1673,9 @@
   "keep_me_connected_with_form": "Verbindung mit dem Formular beibehalten",
   "fields_in_form_duplicated": "Alle Änderungen an Weiterleitungsformularen und in den Feldern des Formulars, die dupliziert werden, werden auch im Duplikat wiedergegeben.",
   "form_deleted": "Formular gelöscht",
-  "delete_form": "Formular löschen",
+  "delete_form": "Möchten Sie dieses Formular wirklich löschen?",
   "delete_form_action": "Ja, Formular löschen",
-  "delete_form_confirmation": "Sind Sie sicher, dass Sie dieses Formular löschen möchten? Jede Person, mit der Sie den Link geteilt haben, kann nicht mehr über das Formular buchen. Außerdem würden alle zugehörigen Antworten gelöscht werden.",
+  "delete_form_confirmation": "Jede Person, mit der Sie den Link geteilt haben, kann nicht mehr über das Formular buchen.",
   "delete_form_confirmation_2": "Alle zugehörigen Antworten werden gelöscht.",
   "typeform_redirect_url_copied": "Typeform Umleitungs-URL kopiert! Sie können die URL in Typeform einstellen.",
   "modifications_in_fields_warning": "Änderungen in den Feldern und Weiterleitungen der folgenden Formulare werden in diesem Formular reflektiert.",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "1 Option pro Zeile hinzufügen",
   "select_a_router": "Weiterleitungsformular auswählen",
   "add_a_new_route": "Neue Route hinzufügen",
+  "make_informed_decisions": "Treffen Sie mit Einblicke fundierte Entscheidungen",
+  "make_informed_decisions_description": "Unser Einsichten-Dashboard deckt alle Aktivitäten in Ihrem Team ab und zeigt Ihnen Trends, die eine bessere Teamplanung und Entscheidungsfindung ermöglichen.",
+  "view_bookings_across": "Buchungen für alle Mitglieder anzeigen",
+  "view_bookings_across_description": "Sehen Sie, wer am häufigsten gebucht wird und sorgen Sie für die beste Verteilung in Ihrem Team",
+  "identify_booking_trends": "Buchungstrends erkennen",
+  "identify_booking_trends_description": "Sehen Sie, welche Wochenzeiten und welche Tageszeiten bei Ihren Buchern beliebt sind",
+  "spot_popular_event_types": "Machen Sie beliebte Ereignistypen ausfindig",
+  "spot_popular_event_types_description": "Sehen Sie, welche Ihrer Ereignistypen die meisten Klicks und Buchungen erhalten",
   "no_responses_yet": "Noch keine Antworten",
   "this_will_be_the_placeholder": "Dies wird der Platzhalter sein",
   "this_meeting_has_not_started_yet": "Dieses Meeting hat noch nicht begonnen",
@@ -1648,9 +1704,85 @@
   "requires_app": "Benötigt {{dependencyName}}",
   "verification_code": "Bestätigungscode",
   "can_you_try_again": "Können Sie es zu einem anderen Zeitpunkt erneut versuchen?",
-  "verify": "Verifizieren",
+  "verify": "Bestätigen",
+  "timezone_variable": "Zeitzone",
+  "timezone_info": "Die Zeitzone der empfangenen Person",
+  "event_end_time_variable": "Ereignis-Endzeitpunkt",
+  "event_end_time_info": "Der Endzeitpunkt des Termins",
+  "cancel_url_variable": "Absage-URL",
+  "cancel_url_info": "Die URL, um die Buchung abzusagen",
+  "reschedule_url_variable": "Umplanungs-URL",
+  "reschedule_url_info": "Die URL, um die Buchung umzuplanen",
+  "invalid_event_name_variables": "Es gibt eine ungültige Variable in Ihrem Terminnamen",
   "select_all": "Alle auswählen",
   "default_conferencing_bulk_title": "Massenaktualisierung vorhandener Termintypen",
-  "invalid_event_name_variables": "Es gibt eine ungültige Variable in Ihrem Terminnamen",
-  "default_conferencing_bulk_description": "Orte für die ausgewählten Termintypen aktualisieren"
+  "members_default_schedule": "Standardverfügbarkeitsplan des Mitglieds",
+  "set_by_admin": "Vom Team-Admin festgelegt",
+  "members_default_location": "Standardstandort des Mitglieds",
+  "members_default_schedule_description": "Wir werden den Standardverfügbarkeitsplan jedes Mitglieds verwenden. Sie können ihn bearbeiten oder ändern.",
+  "requires_at_least_one_schedule": "Sie müssen mindestens einen Verfügbarkeitsplan haben",
+  "default_conferencing_bulk_description": "Orte für die ausgewählten Termintypen aktualisieren",
+  "locked_for_members": "Für Mitglieder gesperrt",
+  "locked_apps_description": "Mitglieder können die aktiven Apps sehen, können aber keine App-Einstellungen anpassen",
+  "locked_webhooks_description": "Mitglieder können die aktiven Webhooks sehen, können aber keine Webhook-Einstellungen anpassen",
+  "locked_workflows_description": "Mitglieder können die aktiven Workflows sehen, können aber keine Workflow-Einstellungen anpassen",
+  "locked_by_admin": "Von Admin gesperrt",
+  "app_not_connected": "Sie haben kein {{appName}}-Konto verbunden.",
+  "connect_now": "Jetzt verbinden",
+  "managed_event_dialog_confirm_button_one": "{{count}} Mitglied ersetzen & benachrichtigen",
+  "managed_event_dialog_confirm_button_other": "{{count}} Mitglieder ersetzen & benachrichtigen",
+  "managed_event_dialog_title_one": "Die URL /{{slug}} ist bereits für {{count}} Mitglied vorhanden. Möchten Sie sie ersetzen?",
+  "managed_event_dialog_title_other": "Die URL /{{slug}} ist bereits für {{count}} Mitglieder vorhanden. Möchten Sie sie ersetzen?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> verwendet bereits die <strong>/{{slug}}</strong>-URL.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> verwenden bereits die <string>/{{slug}}</strong>-URL.",
+  "managed_event_dialog_clarification": "Wenn Sie ihn ersetzen, werden wir sie benachrichtigen. Gehen Sie zurück und entfernen Sie sie, wenn Sie ihn nicht überschreiben möchten.",
+  "review_event_type": "Ereignistyp überprüfen",
+  "looking_for_more_analytics": "Suchen Sie nach weiteren Analysedaten?",
+  "looking_for_more_insights": "Suchen Sie nach weiteren Einsichten?",
+  "add_filter": "Filter hinzufügen",
+  "select_user": "Benutzer auswählen",
+  "select_event_type": "Ereignistyp auswählen",
+  "select_date_range": "Datumsbereich auswählen",
+  "popular_events": "Beliebte Ereignisse",
+  "no_event_types_found": "Keine Ereignistypen gefunden",
+  "average_event_duration": "Durchschnittliche Ereignisdauer",
+  "most_booked_members": "Meistgebuchte Mitglieder",
+  "least_booked_members": "Am wenigsten gebuchte Mitglieder",
+  "events_created": "Ereignisse erstellt",
+  "events_completed": "Ereignisse abgeschlossen",
+  "events_cancelled": "Ereignisse abgesagt",
+  "events_rescheduled": "Ereignisse neu geplant",
+  "from_last_period": "vom letzten Zeitraum",
+  "from_to_date_period": "Von: {{startDate}} Bis: {{endDate}}",
+  "analytics_for_organisation": "Einsichten",
+  "subtitle_analytics": "Erfahren Sie mehr über die Aktivität Ihres Teams",
+  "redirect_url_warning": "Das Hinzufügen einer Umleitung wird die Erfolgsseite deaktivieren. Erwähnen Sie \"Buchung bestätigt\" auf Ihrer benutzerdefinierten Erfolgsseite.",
+  "event_trends": "Ereignistrends",
+  "clear_filters": "Filter löschen",
+  "hold": "Halten",
+  "on_booking_option": "Zahlung bei Buchung erhalten",
+  "hold_option": "Gebühr für das Nichterscheinen berechnen",
+  "card_held": "Karte gehalten",
+  "charge_card": "Karte belasten",
+  "card_charged": "Karte belastet",
+  "no_show_fee_amount": "{{amount, currency}} Gebühr für das Nichterscheinen",
+  "no_show_fee": "Gebühr für das Nichterscheinen",
+  "submit_card": "Karte senden",
+  "submit_payment_information": "Zahlungsinformationen senden",
+  "meeting_awaiting_payment_method": "Ihr Meeting wartet auf eine Zahlungsmethode",
+  "no_show_fee_charged_email_subject": "Gebühr für das Nichterscheinen in Höhe von {{amount, currency}} für {{title}} am {{date}} berechnet",
+  "no_show_fee_charged_text_body": "Die Gebühr für das Nichterscheinen wurde berechnet",
+  "no_show_fee_charged_subtitle": "Gebühr für das Nichterscheinen in Höhe von {{amount, currency}} wurde für das folgende Ereignis berechnet",
+  "error_charging_card": "Beim Berechnen der Nichterscheinungsgebühr ist etwas schiefgelaufen. Bitte versuchen Sie es später erneut.",
+  "collect_no_show_fee": "Gebühr für das Nichterscheinen anfordern",
+  "no_show_fee_charged": "Gebühr für das Nichterscheinen berechnet",
+  "insights": "Einsichten",
+  "testing_workflow_info_message": "Bitte beachten Sie beim Testen dieses Workflows, dass E-Mails und SMS spätestens 1 Stunde im Voraus geplant werden können",
+  "insights_no_data_found_for_filter": "Keine Daten für den ausgewählten Filter oder das ausgewählte Datum gefunden.",
+  "acknowledge_booking_no_show_fee": "Ich bestätige, dass meiner Karte eine Gebühr von {{amount, currency}} berechnet wird, sofern ich nicht an diesem Ereignis teilnehme.",
+  "card_details": "Karteninformationen",
+  "seats_and_no_show_fee_error": "Aktuell können keine Plätze aktiviert werden oder eine Gebühr für das Nichterscheinen berechnet werden",
+  "complete_your_booking": "Schließen Sie Ihre Buchung ab",
+  "complete_your_booking_subject": "Schließen Sie Ihre Buchung ab: {{title}} am {{date}}",
+  "email_invite_team": "{{email}} wurde eingeladen"
 }
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 50651d2c9b..a24a616af8 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1150,13 +1150,13 @@
   "current_username": "Current username",
   "example_1": "Example 1",
   "example_2": "Example 2",
-  "additional_input_label": "Additional Input Label",
+  "booking_question_identifier": "Booking Question Identifier",
   "company_size": "Company size",
   "what_help_needed": "What do you need help with?",
   "variable_format": "Variable format",
   "webhook_subscriber_url_reserved": "Webhook subscriber url is already defined",
   "custom_input_as_variable_info": "Ignore all special characters of the additional input label (use only letters and numbers), use uppercase for all letters and replace whitespaces with underscores.",
-  "using_additional_inputs_as_variables": "How do I use Additional Inputs as variables?",
+  "using_booking_questions_as_variables": "How do I use booking questions as variables?",
   "download_desktop_app": "Download desktop app",
   "set_ping_link": "Set Ping link",
   "rate_limit_exceeded": "Rate limit exceeded",
@@ -1319,6 +1319,15 @@
   "exchange_authentication_standard": "Basic authentication",
   "exchange_authentication_ntlm": "NTLM authentication",
   "exchange_compression": "GZip compression",
+  "exchange_version": "Exchange Version",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Create forms to direct attendees to the correct destinations",
   "routing_forms_send_email_owner": "Send Email to Owner",
   "routing_forms_send_email_owner_description": "Sends an email to the owner when the form is submitted",
@@ -1373,7 +1382,7 @@
   "add_limit": "Add Limit",
   "team_name_required": "Team name required",
   "show_attendees": "Share attendee information between guests",
-  "how_additional_inputs_as_variables": "How to use Additional Inputs as Variables",
+  "how_booking_questions_as_variables": "How to use booking questions as variables?",
   "format": "Format",
   "uppercase_for_letters": "Use uppercase for all letters",
   "replace_whitespaces_underscores": "Replace whitespaces with underscores",
@@ -1388,7 +1397,7 @@
   "billing_help_title": "Need anything else?",
   "billing_help_description": "If you need any further help with billing, our support team are here to help.",
   "billing_help_cta": "Contact support",
-  "ignore_special_characters": "Ignore special characters in your Additional Input label. Use only letters and numbers",
+  "ignore_special_characters_booking_questions": "Ignore special characters in your booking question identifier. Use only letters and numbers",
   "retry": "Retry",
   "fetching_calendars_error": "There was a problem fetching your calendars. Please <1>try again</1> or reach out to customer support.",
   "calendar_connection_fail": "Calendar connection failed",
@@ -1688,6 +1697,15 @@
   "spot_popular_event_types_description": "See which of your event types are receiving the most clicks and bookings",
   "no_responses_yet": "No responses yet",
   "this_will_be_the_placeholder": "This will be the placeholder",
+  "error_booking_event": "An error occured when booking the event, please refresh the page and try again",
+  "timeslot_missing_title": "No timeslot selected",
+  "timeslot_missing_description": "Please select a timeslot to book the event.",
+  "timeslot_missing_cta": "Select timeslot",
+  "switch_monthly": "Switch to monthly view",
+  "switch_weekly": "Switch to weekly view",
+  "switch_multiday": "Switch to day view",
+  "num_locations": "{{num}} location options",
+  "select_on_next_step": "Select on the next step",
   "this_meeting_has_not_started_yet": "This meeting has not started yet",
   "this_app_requires_connected_account": "{{appName}} requires a connected {{dependencyName}} account",
   "connect_app": "Connect {{dependencyName}}",
@@ -1696,9 +1714,17 @@
   "verification_code": "Verification code",
   "can_you_try_again": "Can you try again with a different time?",
   "verify": "Verify",
+  "timezone_variable": "Timezone",
+  "timezone_info": "The timezone of the person receiving",
+  "event_end_time_variable": "Event end time",
+  "event_end_time_info": "The event end time",
+  "cancel_url_variable": "Cancel URL",
+  "cancel_url_info": "The URL to cancel the booking",
+  "reschedule_url_variable": "Reschedule URL",
+  "reschedule_url_info": "The URL to reschedule the booking",
+  "invalid_event_name_variables": "There is an invalid variable in your event name",
   "select_all": "Select All",
   "default_conferencing_bulk_title": "Bulk update existing event types",
-  "invalid_event_name_variables": "There is an invalid variable in your event name",
   "members_default_schedule": "Member's default schedule",
   "set_by_admin": "Set by team admin",
   "members_default_location": "Member's default location",
@@ -1760,11 +1786,17 @@
   "collect_no_show_fee": "Collect no-show fee",
   "no_show_fee_charged": "No-show fee charged",
   "insights": "Insights",
+  "testing_workflow_info_message": "When testing this workflow, be aware that Emails and SMS can only be scheduled at least 1 hour in advance",
   "insights_no_data_found_for_filter": "No data found for the selected filter or selected dates.",
   "acknowledge_booking_no_show_fee": "I acknowledge that if I do not attend this event that a {{amount, currency}} no show fee will be applied to my card.",
   "card_details": "Card details",
   "seats_and_no_show_fee_error": "Currently cannot enable seats and charge a no-show fee",
   "complete_your_booking": "Complete your booking",
   "complete_your_booking_subject": "Complete your booking: {{title}} on {{date}}",
-  "email_invite_team": "{{email}} has been invited"
+  "currency_string": "{{amount, currency}}",
+  "charge_card_dialog_body": "You are about to charge the attendee {{amount, currency}}. Are you sure you want to continue?",
+  "charge_attendee": "Charge attendee {{amount, currency}}",
+  "payment_app_commission": "Require payment ({{paymentFeePercentage}}% + {{fee, currency}} commission per transaction)",
+  "email_invite_team": "{{email}} has been invited",
+  "image_size_limit_exceed": "Uploaded image shouldn't exceed 5mb size limit"
 }
diff --git a/apps/web/public/static/locales/es/common.json b/apps/web/public/static/locales/es/common.json
index cf6f7b4ca4..310c75cb15 100644
--- a/apps/web/public/static/locales/es/common.json
+++ b/apps/web/public/static/locales/es/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Proveedor de identidad",
   "trial_days_left": "Tienes $t(day, {\"count\": {{days}} }) restantes en tu prueba PRO",
   "day_one": "{{count}} día",
   "day_other": "{{count}} días",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Esperando aprobación: {{title}} en {{date}}",
   "event_still_awaiting_approval": "Un evento aún está esperando su aprobación",
   "booking_submitted_subject": "Reserva enviada:{{title}} el {{date}}",
+  "download_recording_subject": "Descargar grabación: {{title}} el {{date}}",
+  "download_your_recording": "Descargue su grabación",
   "your_meeting_has_been_booked": "Su reunión ha sido reservada",
   "event_type_has_been_rescheduled_on_time_date": "Tu {{title}} ha sido reprogramado para el {{date}}.",
   "event_has_been_rescheduled": "Tu evento ha sido reprogramado.",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "Necesitas una cuenta Pro para gestionar equipos, permanecerás oculto hasta que se realice la mejora.",
   "link_expires": "p.s. Expira en {{expiresIn}} horas.",
   "upgrade_to_per_seat": "Actualiza a Por-Asiento",
-  "seat_options_doesnt_support_confirmation": "La opción de cupos no admite el requisito de confirmación",
+  "seat_options_doesnt_support_confirmation": "La opción de plazas no admite el requisito de confirmación",
   "team_upgrade_seats_details": "De los {{memberCount}} miembros de su equipo, no se han pagado {{unpaidCount}} licencia(s). A {{seatPrice}} $/m por licencia, el coste total estimado de su membresía es de {{totalCost}} $/mes.",
   "team_upgrade_banner_description": "Gracias por probar nuestro nuevo plan de equipo. Notamos que su equipo \"{{teamName}}\" necesita actualizarse.",
   "team_upgrade_banner_action": "Actualizar aquí",
@@ -224,6 +227,7 @@
   "done": "Hecho",
   "all_done": "¡Todo listo!",
   "all_apps": "Todas las aplicaciones",
+  "available_apps": "Aplicaciones disponibles",
   "check_email_reset_password": "Revisa tu email. Te hemos enviado un enlace para restablecer tu contraseña.",
   "finish": "Terminar",
   "few_sentences_about_yourself": "Unas pocas frases sobre ti mismo. Esto aparecerá en tu página de url personal.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Añadir nuevo intervalo de tiempo",
   "add_an_extra_layer_of_security": "Agregue una capa adicional de seguridad a su cuenta en caso de que le roben su contraseña.",
   "2fa": "Autorización de dos factores",
+  "2fa_disabled": "La autenticación de dos factores solo se puede habilitar para la autenticación por correo electrónico y contraseña",
   "enable_2fa": "Habilitar la autenticación de dos factores",
   "disable_2fa": "Deshabilitar la autenticación de dos factores",
   "disable_2fa_recommendation": "Si necesita deshabilitar 2FA, le recomendamos que lo vuelva a habilitar lo antes posible.",
@@ -433,7 +438,7 @@
   "password_hint_min": "Mínimo 7 caracteres",
   "password_hint_admin_min": "Longitud mínima de 15 caracteres",
   "password_hint_num": "Debe contener al menos 1 número",
-  "max_limit_allowed_hint": "Debe tener {{limit}} o menos caracteres de largo",
+  "max_limit_allowed_hint": "Debe tener {{limit}} o menos caracteres",
   "invalid_password_hint": "La contraseña debe tener un mínimo de {{passwordLength}} caracteres que contengan al menos un número y una mezcla de letras mayúsculas y minúsculas",
   "incorrect_password": "La Contraseña es Incorrecta.",
   "incorrect_username_password": "El nombre de usuario o la contraseña son incorrectos.",
@@ -585,6 +590,20 @@
   "minutes": "Minutos",
   "round_robin": "Petición Firmada por Turnos",
   "round_robin_description": "Ciclo de reuniones entre varios miembros del equipo.",
+  "managed_event": "Evento gestionado",
+  "username_placeholder": "nombre de usuario",
+  "managed_event_description": "Cree distribuya tipos de eventos de forma masiva a los miembros del equipo",
+  "managed": "Gestionado",
+  "managed_event_url_clarification": "El \"nombre de usuario\" se completará con el nombre de usuario de los miembros asignados",
+  "assign_to": "Asignar a",
+  "add_members": "Agregar miembros...",
+  "count_members_one": "{{count}} miembro",
+  "count_members_other": "{{count}} miembros",
+  "no_assigned_members": "No hay miembros asignados",
+  "assigned_to": "Asignado a",
+  "start_assigning_members_above": "Empezar a asignar miembros arriba",
+  "locked_fields_admin_description": "Los miembros no podrán editar esto",
+  "locked_fields_member_description": "El administrador del equipo bloqueó esta opción",
   "url": "URL",
   "hidden": "Oculto",
   "readonly": "Sólo Lectura",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Aviso de Reserva",
   "slot_interval": "Intervalos de tiempo",
   "slot_interval_default": "Usar duración del evento (por defecto)",
+  "delete_event_type": "¿Eliminar tipo de evento?",
+  "delete_managed_event_type": "¿Eliminar tipo de evento administrado?",
+  "delete_event_type_description": "Cualquier persona con la que hayas compartido este enlace ya no podrá reservar con él.",
+  "delete_managed_event_type_description": "<ul><li>Los miembros asignados a este tipo de evento también verán eliminados sus tipos de evento.</li><li>Cualquier persona con la que hayan compartido su enlace ya no podrá reservar mediante su uso.</li> </ul>",
+  "confirm_delete_event_type": "Sí, eliminar",
   "delete_account": "Eliminar cuenta",
   "confirm_delete_account": "Sí, eliminar cuenta",
   "delete_account_confirmation_message": "¿Estás seguro de que quieres eliminar tu cuenta de {{appName}}? Cualquier persona con la que hayas compartido el enlace de tu cuenta ya no podrá agendar con ella y cualquier preferencia que hayas guardado se perderá.",
@@ -860,7 +884,7 @@
   "add_new_calendar": "Añadir un calendario nuevo",
   "set_calendar": "Especifica dónde se añadirán los eventos nuevos cuando haya reservas.",
   "delete_schedule": "Eliminar agenda",
-  "delete_schedule_description": "Eliminar un horario lo eliminará de todos los tipos de eventos. Esta acción no se puede deshacer.",
+  "delete_schedule_description": "Al borrar un horario se eliminará de todos los tipos de eventos. Esta acción no se puede deshacer.",
   "schedule_created_successfully": "Horario {{scheduleName}} creado con éxito",
   "availability_updated_successfully": "El horario de {{scheduleName}} se actualizó correctamente",
   "schedule_deleted_successfully": "Programación eliminada exitosamente",
@@ -1126,13 +1150,13 @@
   "current_username": "Nombre de usuario actual",
   "example_1": "Ejemplo 1",
   "example_2": "Ejemplo 2",
-  "additional_input_label": "Etiqueta de entrada adicional",
+  "booking_question_identifier": "Identificador de preguntas de reserva",
   "company_size": "Tamaño de la empresa",
   "what_help_needed": "¿Con qué necesitas ayuda?",
   "variable_format": "Formato variable",
   "webhook_subscriber_url_reserved": "La URL del suscriptor de Webhook ya está definida",
   "custom_input_as_variable_info": "Ignore todos los caracteres especiales de la etiqueta de entrada adicional (utilice solo letras y números), utilice mayúsculas para todas las letras y sustituya los espacios en blanco por guiones bajos.",
-  "using_additional_inputs_as_variables": "¿Cómo usar entradas adicionales como variables?",
+  "using_booking_questions_as_variables": "¿Cómo uso las preguntas de reserva como variables?",
   "download_desktop_app": "Descargar la aplicación de escritorio",
   "set_ping_link": "Establecer enlace Ping",
   "rate_limit_exceeded": "Límite de tasa excedido",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Inicio de la semana",
   "recordings_title": "Grabaciones",
   "recording": "Grabación",
+  "happy_scheduling": "Feliz programación",
   "select_calendars": "Seleccione los calendarios en los que desee comprobar conflictos para evitar reservas dobles.",
   "check_for_conflicts": "Comprobar conflictos",
   "view_recordings": "Ver grabaciones",
@@ -1215,6 +1240,7 @@
   "impersonation": "Suplantación",
   "impersonation_description": "Configuración para administrar la suplantación del usuario",
   "users": "Usuarios",
+  "user": "Usuario",
   "profile_description": "Administra los ajustes para tu perfil de {{appName}}",
   "users_description": "Aquí puede encontrar una lista de todos los usuarios",
   "users_listing": "Lista de usuarios",
@@ -1255,6 +1281,8 @@
   "download_responses": "Descargar respuestas",
   "download_responses_description": "Descargue todas las respuestas de su formulario en formato CSV.",
   "download": "Descargar",
+  "download_recording": "Descargar grabación",
+  "recording_from_your_recent_call": "Una grabación de su llamada reciente en Cal.com está lista para su descarga",
   "create_your_first_form": "Crea tu primer formulario",
   "create_your_first_form_description": "Con los formularios de orientación puedes hacer preguntas calificadoras y encaminarte hacia la persona o tipo de evento correctos.",
   "create_your_first_webhook": "Crea tu primer Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Autenticación básica",
   "exchange_authentication_ntlm": "Autenticación NTLM",
   "exchange_compression": "Compresión GZip",
+  "exchange_version": "Versión de Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Aquí puedes ver todos los formularios y rutas que has creado.",
   "routing_forms_send_email_owner": "Enviar correo electrónico al propietario",
   "routing_forms_send_email_owner_description": "Mande un correo electrónico al propietario cuando se envía el formulario",
@@ -1340,12 +1377,12 @@
   "report_app": "Denunciar aplicación",
   "limit_booking_frequency": "Limite la frecuencia de reserva",
   "limit_booking_frequency_description": "Limite la cantidad de veces que se puede reservar este evento",
-  "limit_total_booking_duration": "Limite la duración total de la reserva",
-  "limit_total_booking_duration_description": "Limite la cantidad total de tiempo que se puede reservar este evento",
+  "limit_total_booking_duration": "Limitar la duración total de la reserva",
+  "limit_total_booking_duration_description": "Limitar la cantidad total de tiempo que se puede reservar este evento",
   "add_limit": "Agregue un límite",
   "team_name_required": "Nombre de equipo requerido",
   "show_attendees": "Comparta información de los asistentes entre los invitados",
-  "how_additional_inputs_as_variables": "Cómo usar entradas adicionales como variables",
+  "how_booking_questions_as_variables": "¿Cómo se utilizan las preguntas de reserva como variables?",
   "format": "Formato",
   "uppercase_for_letters": "Use mayúsculas para todas las letras",
   "replace_whitespaces_underscores": "Reemplace espacios en blanco con guiones bajos",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "¿Necesitas algo más?",
   "billing_help_description": "Si necesitas más ayuda con la facturación, nuestro equipo de soporte está a tu disposición.",
   "billing_help_cta": "Contacte con soporte",
-  "ignore_special_characters": "Ignore caracteres especiales en su etiqueta de entrada adicional. Use solo letras y números",
+  "ignore_special_characters_booking_questions": "Ignore los caracteres especiales en su identificador de pregunta de reserva. Use solo letras y números",
   "retry": "Reintentar",
   "fetching_calendars_error": "Se produjo un problema al recuperar sus calendarios. <1>Inténtelo de nuevo</1> o contacte con el servicio de atención al cliente.",
   "calendar_connection_fail": "Error de conexión con el calendario",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Rotación fija por turnos",
   "add_one_fixed_attendee": "Agregue un asistente fijo y realice rotación por turnos a través de un número de asistentes.",
   "calcom_is_better_with_team": "Cal.com funciona mejor con equipos",
+  "the_calcom_team": "El equipo de Cal.com",
   "add_your_team_members": "Añada los miembros de su equipo a sus tipos de eventos. Utilice la programación colectiva para incluir a todos o encuentre a la persona más adecuada con programación de rotación por turnos.",
   "booking_limit_reached": "Se ha alcanzado el límite de reserva para este tipo de evento",
   "duration_limit_reached": "Se ha alcanzado el límite de duración para este tipo de evento",
   "admin_has_disabled": "Un administrador desactivó {{appName}}",
   "disabled_app_affects_event_type": "Un administrador desactivó {{appName}}, lo que afecta a su tipo de evento {{eventType}}",
+  "event_replaced_notice": "Un administrador ha reemplazado uno de sus tipos de eventos",
+  "email_subject_slug_replacement": "Un administrador del equipo ha reemplazado su evento /{{slug}}",
+  "email_body_slug_replacement_notice": "Un administrador del equipo <strong>{{teamName}}</strong> reemplazó su tipo de evento <strong>/{{slug}}</strong> con un tipo de evento administrado que él controla.",
+  "email_body_slug_replacement_info": "Su enlace seguirá funcionando, pero algunas configuraciones pueden haber cambiado. Puede revisarlo en tipos de eventos.",
+  "email_body_slug_replacement_suggestion": "Si tiene alguna pregunta sobre el tipo de evento, comuníquese con su administrador.<br /><br />Feliz programación, <br />El equipo de Cal.com",
   "disable_payment_app": "El administrador ha deshabilitado {{appName}}, lo que afecta a su tipo de evento {{title}}. Los asistentes todavía pueden reservar este tipo de evento, pero no se les pedirá que paguen. Puede ocultar el tipo de evento para evitar esto hasta que su administrador habilite de nuevo su método de pago.",
   "payment_disabled_still_able_to_book": "Los asistentes todavía pueden reservar este tipo de evento, pero no se les pedirá que paguen. Puede ocultar el tipo de evento para evitarlo hasta que su administrador reactive su método de pago.",
   "app_disabled_with_event_type": "El administrador desactivó {{appName}}, lo que afecta a su tipo de evento {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Actualizar anulación",
   "event_type_duplicate_copy_text": "{{slug}}-copia",
   "set_as_default": "Establecer como predeterminado",
+  "hide_eventtype_details": "Ocultar detalles del tipo de evento",
   "show_navigation": "Mostrar navegación",
   "hide_navigation": "Ocultar navegación",
   "verification_code_sent": "Se envió el código de verificación",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Cree su primer webhook para este tipo de evento de equipo",
   "create_webhook_team_event_type": "Crear un webhook para este tipo de evento de equipo",
   "disable_success_page": "Desactivar página de éxito (solo funciona si tiene una URL de redireccionamiento)",
+  "invalid_admin_password": "Usted es administrador pero no tiene una contraseña de al menos 15 caracteres o ni autenticación de 2 factores",
   "change_password_admin": "Cambie la contraseña para obtener acceso de administrador",
   "username_already_taken": "Este nombre de usuario ya está en uso",
   "assignment": "Asignación",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "Licencia Empresarial \"/ee\"",
   "enterprise_booking_fee": "A partir de {{enterprise_booking_fee}}/mes",
   "enterprise_license_includes": "Todo para un caso de uso comercial",
+  "no_need_to_keep_your_code_open_source": "No es necesario mantener su código abierto",
   "repackage_rebrand_resell": "Vuelva a empaquetar, cambie la marca y revenda fácilmente",
   "a_vast_suite_of_enterprise_features": "Un amplio conjunto de funciones empresariales",
   "free_license_fee": "$0,00/mes",
@@ -1590,18 +1636,19 @@
   "recommended_next_steps": "Siguientes pasos recomendados",
   "create_a_managed_event": "Crear un tipo de evento administrado",
   "meetings_are_better_with_the_right": "Las reuniones son mejores si están los miembros adecuados del equipo. Invítelos ahora.",
-  "create_a_one_one_template": "Cree una plantilla uno a uno para un tipo de evento y distribúyala a varios miembros.",
+  "create_a_one_one_template": "Cree una plantilla de reunión individual para un tipo de evento y distribúyala a varios miembros.",
   "collective_or_roundrobin": "Colectivo o turnos rotativos",
   "book_your_team_members": "Reserve a los miembros de su equipo juntos con eventos colectivos o por ciclos para conseguir a la persona adecuada con turnos rotativos.",
-  "event_no_longer_attending_subject": "Ya no asistirá a {{title}} el {{date}}",
+  "event_no_longer_attending_subject": "Ya no asistirá a {{title}} a las {{date}}",
   "no_longer_attending": "Ya no asistirá a este evento",
-  "attendee_no_longer_attending_subject": "Un asistente ya no asistirá a {{title}} el {{date}}",
+  "attendee_no_longer_attending_subject": "Un asistente ya no asistirá a {{title}} a las {{date}}",
   "attendee_no_longer_attending": "Un asistente ya no asistirá a su evento",
-  "attendee_no_longer_attending_subtitle": "{{name}} ha cancelado. Esto significa que está disponible un cupo para esta franja horaria",
-  "create_event_on": "Crear evento el",
+  "attendee_no_longer_attending_subtitle": "{{name}} ha cancelado. Esto significa que está disponible una plaza para esta franja horaria",
+  "create_event_on": "Crear evento en",
   "default_app_link_title": "Establecer un enlace de aplicación predeterminado",
   "default_app_link_description": "Establecer un enlace de aplicación predeterminado permite que todos los tipos de eventos recién creados utilicen el enlace de aplicación que establezca.",
   "change_default_conferencing_app": "Establecer como predeterminado",
+  "organizer_default_conferencing_app": "Aplicación por defecto del organizador",
   "under_maintenance": "Fuera de servicio por mantenimiento",
   "under_maintenance_description": "El equipo de {{appName}} está realizando un mantenimiento programado. Si tiene alguna pregunta, comuníquese con soporte.",
   "event_type_seats": "{{numberOfSeats}} plazas",
@@ -1613,9 +1660,10 @@
   "booking_with_payment_cancelled_already_paid": "Un reembolso por el pago de esta reserva está en camino.",
   "booking_with_payment_cancelled_refunded": "El pago de esta reserva se ha reembolsado.",
   "booking_confirmation_failed": "Error al confirmar la reserva",
-  "not_enough_seats": "No hay suficientes cupos",
+  "not_enough_seats": "No hay suficientes plazas",
   "form_builder_field_already_exists": "Ya existe un campo con este nombre",
   "form_builder_field_add_subtitle": "Personalice las preguntas que se hacen en la página de reservas",
+  "show_on_booking_page": "Mostrar en la página de reserva",
   "get_started_zapier_templates": "Comience con las plantillas de Zapier",
   "team_is_unpublished": "{{team}} no está publicado",
   "team_is_unpublished_description": "Este enlace del equipo no está disponible actualmente. Póngase en contacto con el propietario del equipo o pídale que lo publique.",
@@ -1625,9 +1673,9 @@
   "keep_me_connected_with_form": "Mantenerme conectado con el formulario",
   "fields_in_form_duplicated": "Cualquier cambio en el enrutador y los campos del formulario que se está duplicando se reflejará en el duplicado.",
   "form_deleted": "Formulario eliminado",
-  "delete_form": "Eliminar formulario",
+  "delete_form": "¿Está seguro de que desea eliminar este formulario?",
   "delete_form_action": "Sí, eliminar formulario",
-  "delete_form_confirmation": "¿Está seguro de que desea eliminar este formulario? Cualquier persona con la que haya compartido el enlace ya no podrá reservar con él. Además, se eliminarían todas las respuestas asociadas.",
+  "delete_form_confirmation": "Cualquier persona con la que hayas compartido el enlace ya no podrá acceder a él.",
   "delete_form_confirmation_2": "Se eliminarán todas las respuestas asociadas.",
   "typeform_redirect_url_copied": "¡Se copió la URL de redireccionamiento de Typeform! Puede ir y establecer la URL en el formulario Typeform.",
   "modifications_in_fields_warning": "Las modificaciones en los campos y rutas de los siguientes formularios se reflejarán en este formulario.",
@@ -1639,18 +1687,102 @@
   "add_1_option_per_line": "Agregue 1 opción por línea",
   "select_a_router": "Seleccione un enrutador",
   "add_a_new_route": "Agregar una ruta nueva",
+  "make_informed_decisions": "Tome decisiones informadas con Insights",
+  "make_informed_decisions_description": "Nuestro panel de Insights muestra toda la actividad de su equipo y le muestra las tendencias que permiten una mejor programación y toma de decisiones del equipo.",
+  "view_bookings_across": "Ver reservas entre todos los miembros",
+  "view_bookings_across_description": "Vea quién recibe la mayor cantidad de reservas y garantice la mejor distribución en su equipo",
+  "identify_booking_trends": "Identificar tendencias de reserva",
+  "identify_booking_trends_description": "Consultar qué horas de la semana y qué horas durante el día son populares para sus reservas",
+  "spot_popular_event_types": "Detectar tipos de eventos populares",
+  "spot_popular_event_types_description": "Consulte cuál de sus tipos de eventos están recibiendo más clics y reservas",
   "no_responses_yet": "Aún no hay respuestas",
   "this_will_be_the_placeholder": "Este será el marcador de posición",
   "this_meeting_has_not_started_yet": "Esta reunión aún no ha comenzado",
   "this_app_requires_connected_account": "{{appName}} requiere una cuenta {{dependencyName}} conectada",
   "connect_app": "Conectar {{dependencyName}}",
-  "app_is_connected": "{{dependencyName}} está conectado",
+  "app_is_connected": "{{dependencyName}} está conectada",
   "requires_app": "Requiere {{dependencyName}}",
   "verification_code": "Código de verificación",
   "can_you_try_again": "¿Puede intentarlo de nuevo con una hora diferente?",
   "verify": "Verificar",
-  "select_all": "Seleccionar todo",
-  "default_conferencing_bulk_title": "Actualización masiva de tipos de eventos existentes",
+  "timezone_variable": "Zona Horaria",
+  "timezone_info": "La zona horaria de la persona que recibe",
+  "event_end_time_variable": "Hora de finalización del evento",
+  "event_end_time_info": "La hora de finalización del evento",
+  "cancel_url_variable": "URL de cancelación",
+  "cancel_url_info": "La URL para cancelar la reserva",
+  "reschedule_url_variable": "URL de reprogramación",
+  "reschedule_url_info": "La URL para reprogramar la reserva",
   "invalid_event_name_variables": "Hay una variable no válida en el nombre de su evento",
-  "default_conferencing_bulk_description": "Actualizar las ubicaciones para los tipos de eventos seleccionados"
+  "select_all": "Seleccionar todo",
+  "default_conferencing_bulk_title": "Actualización masiva de los tipos de eventos existentes",
+  "members_default_schedule": "Horario predeterminado del miembro",
+  "set_by_admin": "Establecido por el administrador del equipo",
+  "members_default_location": "Ubicación predeterminada del miembro",
+  "members_default_schedule_description": "Usaremos el horario de disponibilidad predeterminado de cada miembro. Podrán editarlo o cambiarlo.",
+  "requires_at_least_one_schedule": "Es necesario tener al menos un horario",
+  "default_conferencing_bulk_description": "Actualizar las ubicaciones para los tipos de eventos seleccionados",
+  "locked_for_members": "Bloqueado para miembros",
+  "locked_apps_description": "Los miembros podrán ver las aplicaciones activas pero no podrán editar ninguna configuración de la aplicación",
+  "locked_webhooks_description": "Los miembros podrán ver los webhooks activos, pero no podrán editar ninguna configuración de webhooks",
+  "locked_workflows_description": "Los miembros podrán ver los flujos de trabajo activos, pero no podrán editar ninguna configuración de flujo de trabajo",
+  "locked_by_admin": "Bloqueado por el administrador",
+  "app_not_connected": "No ha conectado una cuenta de {{appName}}.",
+  "connect_now": "Conectar ahora",
+  "managed_event_dialog_confirm_button_one": "Reemplazar y notificar a {{count}} miembro",
+  "managed_event_dialog_confirm_button_other": "Reemplazar y notificar a {{count}} miembros",
+  "managed_event_dialog_title_one": "La url /{{slug}} ya existe para {{count}} miembro. ¿Desea reemplazarla?",
+  "managed_event_dialog_title_other": "La url /{{slug}} ya existe para {{count}} miembros. ¿Desea reemplazarla?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> ya usa la url <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> ya usan la url <string>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Si elige reemplazarlo, se lo notificaremos. Regrese y elimínelos si no desea sobrescribirlo.",
+  "review_event_type": "Revisar tipo de evento",
+  "looking_for_more_analytics": "¿Busca más datos de análisis?",
+  "looking_for_more_insights": "¿Busca más perspectivas?",
+  "add_filter": "Añadir filtro",
+  "select_user": "Seleccionar usuario",
+  "select_event_type": "Seleccionar tipo de evento",
+  "select_date_range": "Seleccionar rango de fechas",
+  "popular_events": "Eventos populares",
+  "no_event_types_found": "No se encontraron tipos de eventos",
+  "average_event_duration": "Duración promedio del evento",
+  "most_booked_members": "Miembros con más reservas",
+  "least_booked_members": "Miembros con menos reservas",
+  "events_created": "Eventos creados",
+  "events_completed": "Eventos completados",
+  "events_cancelled": "Eventos cancelados",
+  "events_rescheduled": "Eventos reprogramados",
+  "from_last_period": "desde el último período",
+  "from_to_date_period": "Desde: {{startDate}} Hasta: {{endDate}}",
+  "analytics_for_organisation": "Perspectivas",
+  "subtitle_analytics": "Obtenga más información sobre la actividad de su equipo",
+  "redirect_url_warning": "Agregar una redirección deshabilitará la página de éxito. Asegúrese de mencionar \"Reserva confirmada\" en su página de éxito personalizada.",
+  "event_trends": "Tendencias del evento",
+  "clear_filters": "Eliminar filtros",
+  "hold": "Retener",
+  "on_booking_option": "Cobrar el pago durante la reserva",
+  "hold_option": "Cobrar comisión por no presentarse",
+  "card_held": "Tarjeta retenida",
+  "charge_card": "Cargar la tarjeta",
+  "card_charged": "Se le cobró a la tarjeta",
+  "no_show_fee_amount": "{{amount, currency}} cargo por no presentarse",
+  "no_show_fee": "Comisión por no presentarse",
+  "submit_card": "Enviar tarjeta",
+  "submit_payment_information": "Enviar información de pago",
+  "meeting_awaiting_payment_method": "Su reunión está esperando un método de pago",
+  "no_show_fee_charged_email_subject": "Comisión por no presentarse de {{amount, currency}} cobrada para {{title}} el {{date}}",
+  "no_show_fee_charged_text_body": "Se cobró una tarifa por no presentarse",
+  "no_show_fee_charged_subtitle": "Se cobró una comisión de {{amount, currency}} por no presentarse al siguiente evento",
+  "error_charging_card": "Algo salió mal al cobrar la tarifa por no presentarse. Inténtelo de nuevo más tarde.",
+  "collect_no_show_fee": "Cobrar comisión por no presentarse",
+  "no_show_fee_charged": "Comisión por no presentarse cobrada",
+  "insights": "Insights",
+  "testing_workflow_info_message": "Al probar este flujo de trabajo, tenga en cuenta que los correos electrónicos y los SMS solo se pueden programar con al menos 1 hora de anticipación",
+  "insights_no_data_found_for_filter": "No se encontraron datos para el filtro seleccionado o las fechas seleccionadas.",
+  "acknowledge_booking_no_show_fee": "Reconozco que si no asisto a este evento, se aplicará a mi tarjeta una tarifa de {{amount, currency}} por no presentarse.",
+  "card_details": "Detalles de la tarjeta",
+  "seats_and_no_show_fee_error": "Actualmente no se pueden habilitar cupos ni cobrar una tarifa por no presentarse",
+  "complete_your_booking": "Complete su reserva",
+  "complete_your_booking_subject": "Complete su reserva: {{title}} el {{date}}",
+  "email_invite_team": "Se ha invitado a {{email}}"
 }
diff --git a/apps/web/public/static/locales/fr/common.json b/apps/web/public/static/locales/fr/common.json
index 60def46eee..eb08828587 100644
--- a/apps/web/public/static/locales/fr/common.json
+++ b/apps/web/public/static/locales/fr/common.json
@@ -1150,13 +1150,13 @@
   "current_username": "Nom d'utilisateur actuel",
   "example_1": "Exemple 1",
   "example_2": "Exemple 2",
-  "additional_input_label": "Libellé du champ supplémentaire",
+  "booking_question_identifier": "Identifiant de la question de réservation",
   "company_size": "Taille de l'entreprise",
   "what_help_needed": "Avez-vous besoin d'aide ?",
   "variable_format": "Format des variables",
   "webhook_subscriber_url_reserved": "Le lien de l'abonné webhook est déjà défini",
   "custom_input_as_variable_info": "Ignorer tous les caractères spéciaux du libellé de champ supplémentaire (utiliser uniquement des lettres et des chiffres), utiliser des majuscules pour toutes les lettres et remplacer les espaces par des tirets bas.",
-  "using_additional_inputs_as_variables": "Comment utiliser des champs supplémentaires en tant que variables ?",
+  "using_booking_questions_as_variables": "Comment puis-je utiliser les questions de réservation comme variables ?",
   "download_desktop_app": "Télécharger l'application de bureau",
   "set_ping_link": "Définir le lien Ping",
   "rate_limit_exceeded": "Limite dépassée",
@@ -1319,6 +1319,15 @@
   "exchange_authentication_standard": "Authentification de base",
   "exchange_authentication_ntlm": "Authentification NTLM",
   "exchange_compression": "Compression GZip",
+  "exchange_version": "Version d'Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Créez des formulaires pour acheminer les participants vers les bonnes destinations.",
   "routing_forms_send_email_owner": "Envoyer un e-mail au propriétaire",
   "routing_forms_send_email_owner_description": "Envoie un e-mail au propriétaire lorsque le formulaire est soumis",
@@ -1373,7 +1382,7 @@
   "add_limit": "Ajouter une limite",
   "team_name_required": "Nom d'équipe requis",
   "show_attendees": "Partagez les informations des participants entre les invités",
-  "how_additional_inputs_as_variables": "Comment utiliser des champs supplémentaires en tant que variables",
+  "how_booking_questions_as_variables": "Comment utiliser les questions de réservation comme variables ?",
   "format": "Format",
   "uppercase_for_letters": "Utilisez des majuscules pour toutes les lettres.",
   "replace_whitespaces_underscores": "Remplacez les espaces par des tirets bas.",
@@ -1388,7 +1397,7 @@
   "billing_help_title": "Besoin d'autre chose ?",
   "billing_help_description": "Si vous avez besoin d'aide pour la facturation, notre équipe d'assistance est là pour vous aider.",
   "billing_help_cta": "Contacter l'assistance",
-  "ignore_special_characters": "Ignorez les caractères spéciaux dans le libellé du champ supplémentaire, utilisez uniquement les lettres et les chiffres.",
+  "ignore_special_characters_booking_questions": "Ignorez les caractères spéciaux dans l'identifiant de votre question de réservation, utilisez uniquement des lettres et des chiffres.",
   "retry": "Réessayer",
   "fetching_calendars_error": "Un problème est survenu lors de la récupération de vos calendriers. Veuillez <1>réessayer</1> ou contacter le service client.",
   "calendar_connection_fail": "Échec de la connexion au calendrier",
@@ -1696,9 +1705,17 @@
   "verification_code": "Code de vérification",
   "can_you_try_again": "Pouvez-vous réessayer avec un autre créneau ?",
   "verify": "Vérifier",
+  "timezone_variable": "Fuseau horaire",
+  "timezone_info": "Le fuseau horaire du destinataire",
+  "event_end_time_variable": "Heure de fin de l'événement",
+  "event_end_time_info": "L'heure de fin de l'événement",
+  "cancel_url_variable": "Lien d'annulation",
+  "cancel_url_info": "Le lien d'annulation de la réservation",
+  "reschedule_url_variable": "Lien de replanification",
+  "reschedule_url_info": "Le lien de replanification de la réservation",
+  "invalid_event_name_variables": "Il y a une variable invalide dans le nom de votre événement",
   "select_all": "Tout sélectionner",
   "default_conferencing_bulk_title": "Mise à jour multiple des types d'événements existants",
-  "invalid_event_name_variables": "Il y a une variable invalide dans le nom de votre événement",
   "members_default_schedule": "Planning par défaut du membre",
   "set_by_admin": "Défini par l'administrateur de l'équipe",
   "members_default_location": "Lieu par défaut du membre",
@@ -1760,11 +1777,17 @@
   "collect_no_show_fee": "Percevoir les frais d'absence",
   "no_show_fee_charged": "Frais d'absence facturés",
   "insights": "Statistiques",
+  "testing_workflow_info_message": "Lors du test de ce workflow, sachez que les e-mails et les SMS ne peuvent être programmés qu'au moins 1 heure à l'avance",
   "insights_no_data_found_for_filter": "Aucune donnée trouvée pour le filtre ou les dates sélectionnés.",
   "acknowledge_booking_no_show_fee": "Je reconnais que si je ne participe pas à cet événement, des frais d'absence de {{amount, currency}} seront appliqués à ma carte.",
   "card_details": "Détails de la carte",
   "seats_and_no_show_fee_error": "Il n'est pas possible d'activer les places et de facturer des frais d'absence pour le moment",
   "complete_your_booking": "Terminer votre réservation",
   "complete_your_booking_subject": "Terminer votre réservation : {{title}} le {{date}}",
-  "email_invite_team": "{{email}} a été invité"
+  "currency_string": "{{amount, currency}}",
+  "charge_card_dialog_body": "Vous êtes sur le point de facturer {{amount, currency}} au participant. Voulez-vous vraiment continuer ?",
+  "charge_attendee": "Facturer {{amount, currency}} au participant",
+  "payment_app_commission": "Exiger un paiement ({{paymentFeePercentage}} % + {{fee, currency}} de commission par transaction)",
+  "email_invite_team": "{{email}} a été invité",
+  "image_size_limit_exceed": "L'image téléchargée ne doit pas dépasser 5 Mo"
 }
diff --git a/apps/web/public/static/locales/he/common.json b/apps/web/public/static/locales/he/common.json
index dd32ba7ed0..d3057426a7 100644
--- a/apps/web/public/static/locales/he/common.json
+++ b/apps/web/public/static/locales/he/common.json
@@ -1126,13 +1126,11 @@
   "current_username": "שם משתמש נוכחי",
   "example_1": "דוגמה 1",
   "example_2": "דוגמה 2",
-  "additional_input_label": "תווית קלט נוספת",
   "company_size": "גודל החברה",
   "what_help_needed": "במה דרושה לך עזרה?",
   "variable_format": "הפורמט של המשתנה",
   "webhook_subscriber_url_reserved": "כתובת ה-URL של מנוי Webhook כבר מוגדרת",
   "custom_input_as_variable_info": "התעלמות מכל התווים המיוחדים של תווית הקלט הנוספת (שימוש באותיות ובספרות בלבד), שימוש באותיות רישיות עבור כל האותיות והחלפת רווחים במקפים תחתונים.",
-  "using_additional_inputs_as_variables": "איך ניתן להשתמש בסוגי קלט נוספים כמשתנים?",
   "download_desktop_app": "הורדת האפליקציה למחשבים שולחניים",
   "set_ping_link": "הגדרת קישור Ping",
   "rate_limit_exceeded": "חריגה מהגבלת קצב",
@@ -1345,7 +1343,6 @@
   "add_limit": "הוספת הגבלה",
   "team_name_required": "נדרש שם צוות",
   "show_attendees": "שיתוף האורחים בפרטי המשתתפים",
-  "how_additional_inputs_as_variables": "איך ניתן להשתמש בסוגי קלט נוספים כמשתנים",
   "format": "פורמט",
   "uppercase_for_letters": "שימוש באותיות רישיות עבור כל האותיות",
   "replace_whitespaces_underscores": "החלפת רווחים במקפים תחתונים",
@@ -1360,7 +1357,6 @@
   "billing_help_title": "צריך/ה משהו נוסף?",
   "billing_help_description": "אם דרוש לך סיוע נוסף בענייני חיוב, צוות התמיכה שלנו כאן כדי לעזור.",
   "billing_help_cta": "פנייה לתמיכה",
-  "ignore_special_characters": "להתעלם מתווים מיוחדים בתווית הקלט הנוספת. להשתמש באותיות ובספרות בלבד",
   "retry": "ניסיון נוסף",
   "fetching_calendars_error": "אירעה בעיה בטעינת לוחות השנה שלך. <1>נסה/י שוב</1> או פנה/י למחלקת תמיכת הלקוחות.",
   "calendar_connection_fail": "החיבור ללוח השנה נכשל",
@@ -1657,9 +1653,10 @@
   "verification_code": "קוד אימות",
   "can_you_try_again": "אתה יכול לנסות שוב עם שעה אחרת?",
   "verify": "אמת",
+  "timezone_variable": "אזור זמן",
+  "invalid_event_name_variables": "יש משתנה שגוי בשם הארוע שלך",
   "select_all": "בחר הכל",
   "default_conferencing_bulk_title": "בצע עדכון אצווה של סוגי הארועים הקיימים",
-  "invalid_event_name_variables": "יש משתנה שגוי בשם הארוע שלך",
   "requires_at_least_one_schedule": "אתה חייב שיהיה לך לפחות לוח זמנים אחד",
   "default_conferencing_bulk_description": "עדכן את המיקומים עבור סוגי הארועים שנבחרו",
   "looking_for_more_analytics": "מחפש עוד מידע אנליטי?",
diff --git a/apps/web/public/static/locales/hu/common.json b/apps/web/public/static/locales/hu/common.json
index d379e55851..6504fdf5f3 100644
--- a/apps/web/public/static/locales/hu/common.json
+++ b/apps/web/public/static/locales/hu/common.json
@@ -217,5 +217,6 @@
   "additional_notes_variable": "Egyéb jegyzetek",
   "organizer_name_info": "Neved",
   "theme_light": "Világos",
-  "theme_dark": "Sötét"
+  "theme_dark": "Sötét",
+  "timezone_variable": "Időzóna"
 }
diff --git a/apps/web/public/static/locales/it/common.json b/apps/web/public/static/locales/it/common.json
index 2fe039493d..dac07cb851 100644
--- a/apps/web/public/static/locales/it/common.json
+++ b/apps/web/public/static/locales/it/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Provider di identità",
   "trial_days_left": "Ti rimangono $t(day, {\"count\": {{days}} }) di prova con il piano PRO",
   "day_one": "{{count}} giorno",
   "day_other": "{{count}} giorni",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "In attesa di approvazione: {{title}} il {{date}}",
   "event_still_awaiting_approval": "Un evento è ancora in attesa della tua approvazione",
   "booking_submitted_subject": "Prenotazione inviata: {{title}} il {{date}}",
+  "download_recording_subject": "Scarica registrazione: {{title}} alle {{date}}",
+  "download_your_recording": "Scarica la tua registrazione",
   "your_meeting_has_been_booked": "Il tuo meeting è stata prenotato",
   "event_type_has_been_rescheduled_on_time_date": "Il tuo {{title}} è stato riprogrammato per il {{date}}.",
   "event_has_been_rescheduled": "Aggiornato: il tuo evento è stato riprogrammato",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "Per utilizzare i team ti occorre un account Pro. Sarai nascosto finché non cambierai piano.",
   "link_expires": "p.s. Scade tra {{expiresIn}} ore.",
   "upgrade_to_per_seat": "Passa al piano Per-posto",
-  "seat_options_doesnt_support_confirmation": "L'opzione Posti non supporta la richiesta di conferma",
+  "seat_options_doesnt_support_confirmation": "L'opzione di prenotazione dei posti non è disponibile per le prenotazioni che richiedono conferma",
   "team_upgrade_seats_details": "Per i {{memberCount}} membri del tuo team, {{unpaidCount}} posti non sono pagati. A € {{seatPrice}}/m per posto, il costo totale stimato della tua adesione è di € {{totalCost}}/m.",
   "team_upgrade_banner_description": "Grazie per aver provato il nostro piano team. Abbiamo notato che è necessario effettuare l'upgrade del tuo team \"{{teamName}}\".",
   "team_upgrade_banner_action": "Effettua l'upgrade",
@@ -224,6 +227,7 @@
   "done": "Fatto",
   "all_done": "Operazione completata!",
   "all_apps": "Tutte le app",
+  "available_apps": "Applicazioni disponibili",
   "check_email_reset_password": "Controlla la tua email. Ti abbiamo inviato un link per reimpostare la password.",
   "finish": "Fine",
   "few_sentences_about_yourself": "Alcune frasi su di te. Questo apparirà sulla tua pagina url personale.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Aggiungi nuova fascia oraria",
   "add_an_extra_layer_of_security": "Aggiungi un ulteriore livello di sicurezza al tuo account nel caso in cui la password venga rubata.",
   "2fa": "Autenticazione A Due Fattori",
+  "2fa_disabled": "L'autenticazione a due fattori può essere abilitata solo per l'autenticazione tramite e-mail e password",
   "enable_2fa": "Abilita autenticazione a due fattori",
   "disable_2fa": "Disabilita autenticazione a due fattori",
   "disable_2fa_recommendation": "Se è necessario disattivare 2FA, si consiglia di riattivarlo il prima possibile.",
@@ -585,6 +590,20 @@
   "minutes": "Minuti",
   "round_robin": "Round Robin",
   "round_robin_description": "Ciclo di riunioni tra più membri del team.",
+  "managed_event": "Evento gestito",
+  "username_placeholder": "username",
+  "managed_event_description": "Crea e distribuisci tipi di evento in blocco ai membri del team",
+  "managed": "Gestito",
+  "managed_event_url_clarification": "il campo \"username\" può essere compilato solo con il nome utente dei membri assegnati",
+  "assign_to": "Assegna a",
+  "add_members": "Aggiungi membri...",
+  "count_members_one": "{{count}} membro",
+  "count_members_other": "{{count}} membri",
+  "no_assigned_members": "Nessun membro assegnato",
+  "assigned_to": "Assegnato a",
+  "start_assigning_members_above": "Inizia ad assegnare membri in alto",
+  "locked_fields_admin_description": "I membri non saranno in grado di apportare modifiche qui",
+  "locked_fields_member_description": "Questa opzione è stata bloccata dall'amministratore del team",
   "url": "URL",
   "hidden": "Nascosto",
   "readonly": "Sola lettura",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Preavviso minimo",
   "slot_interval": "Intervalli di fascia oraria",
   "slot_interval_default": "Usa durata evento (impostazione predefinita)",
+  "delete_event_type": "Eliminare il tipo di evento?",
+  "delete_managed_event_type": "Eliminare il tipo di evento gestito?",
+  "delete_event_type_description": "Gli utenti con cui hai condiviso il link non saranno più in grado di usarlo per prenotare.",
+  "delete_managed_event_type_description": "<ul><li>Questo tipo di evento sarà eliminato anche ai membri a esso assegnati.</li><li>Gli utenti con cui hai condiviso il link non saranno più in grado di usarlo per prenotare.</li></ul>",
+  "confirm_delete_event_type": "Sì, elimina",
   "delete_account": "Elimina account",
   "confirm_delete_account": "Sì, elimina account",
   "delete_account_confirmation_message": "Sei sicuro di voler eliminare il tuo account {{appName}}? Chiunque abbia il link del tuo account non potrà più utilizzarlo per prenotare e le preferenze che hai salvato andranno perse.",
@@ -1126,13 +1150,13 @@
   "current_username": "Nome utente corrente",
   "example_1": "Esempio 1",
   "example_2": "Esempio 2",
-  "additional_input_label": "Etichetta del campo di input aggiuntivo",
+  "booking_question_identifier": "Identificatore domanda alla prenotazione",
   "company_size": "Dimensione dell'azienda",
   "what_help_needed": "Per cosa ti serve assistenza?",
   "variable_format": "Formato variabile",
   "webhook_subscriber_url_reserved": "URL dell'abbonato Webhook già definito",
   "custom_input_as_variable_info": "Ignora tutti i caratteri speciali dell'etichetta del campo di input aggiuntivo (usa solo lettere e numeri), usa solo lettere maiuscole e sostituisci gli spazi con il trattino basso.",
-  "using_additional_inputs_as_variables": "Come usare i campi di input aggiuntivi come variabili?",
+  "using_booking_questions_as_variables": "Come posso utilizzare le domande poste nella pagina di prenotazione come variabili?",
   "download_desktop_app": "Scarica app desktop",
   "set_ping_link": "Imposta link di Ping",
   "rate_limit_exceeded": "Limite superato",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Inizio della settimana",
   "recordings_title": "Registrazioni",
   "recording": "Registrazione",
+  "happy_scheduling": "Ti auguriamo una piacevole esperienza di pianificazione",
   "select_calendars": "Seleziona su quali calendari desideri controllare i conflitti per evitare doppie prenotazioni.",
   "check_for_conflicts": "Controlla conflitti",
   "view_recordings": "Visualizza registrazioni",
@@ -1215,6 +1240,7 @@
   "impersonation": "Accesso con altra identità",
   "impersonation_description": "Impostazioni per gestire gli accessi con altra identità",
   "users": "Utenti",
+  "user": "Utente",
   "profile_description": "Gestisci le impostazioni del tuo profilo {{appName}}",
   "users_description": "Qui è possibile trovare l'elenco di tutti gli utenti",
   "users_listing": "Elenco degli utenti",
@@ -1255,6 +1281,8 @@
   "download_responses": "Scarica risposte",
   "download_responses_description": "Scarica tutte le risposte al tuo modulo in formato CSV.",
   "download": "Scarica",
+  "download_recording": "Scarica registrazione",
+  "recording_from_your_recent_call": "Una registrazione della tua recente chiamata su Cal.com è pronta per il download",
   "create_your_first_form": "Crea il tuo primo modulo",
   "create_your_first_form_description": "I Moduli di instradamento consentono di porre domande qualificanti agli utenti per indirizzarli a persone o eventi pertinenti.",
   "create_your_first_webhook": "Crea il tuo primo Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Autenticazione di base",
   "exchange_authentication_ntlm": "Autenticazione NTLM",
   "exchange_compression": "Compressione GZip",
+  "exchange_version": "Versione di Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Qui puoi vedere tutti i moduli e tutti i percorsi che hai creato.",
   "routing_forms_send_email_owner": "Invia e-mail al proprietario",
   "routing_forms_send_email_owner_description": "Invia un'e-mail al proprietario quando il modulo viene inviato",
@@ -1345,7 +1382,7 @@
   "add_limit": "Aggiungi limite",
   "team_name_required": "Nome del team richiesto",
   "show_attendees": "Condividi le informazioni dei partecipanti tra gli ospiti",
-  "how_additional_inputs_as_variables": "Come usare input aggiuntivi come variabili",
+  "how_booking_questions_as_variables": "Come utilizzare le domande poste nella pagina di prenotazione come variabili?",
   "format": "Formato",
   "uppercase_for_letters": "Usa tutte lettere maiuscole",
   "replace_whitespaces_underscores": "Sostituisci spazi con sottolineature",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Hai bisogno di altro?",
   "billing_help_description": "Se hai bisogno di ulteriore aiuto per la fatturazione, il nostro team di supporto è qui per aiutarti.",
   "billing_help_cta": "Contatta l'assistenza",
-  "ignore_special_characters": "Ignora i caratteri speciali nelle etichette degli input aggiuntivi. Usa solo lettere e numeri",
+  "ignore_special_characters_booking_questions": "Ignora i caratteri speciali nell'identificatore della domanda da porre nella pagina di prenotazione. Usa solo lettere e numeri",
   "retry": "Riprova",
   "fetching_calendars_error": "Si è verificato un problema durante il recupero dei calendari. <1>Riprova</1> o contatta l'assistenza clienti.",
   "calendar_connection_fail": "Impossibile connettersi al calendario",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Round robin fisso",
   "add_one_fixed_attendee": "Aggiungi un partecipante fisso e fai intervenire a turno altri partecipanti.",
   "calcom_is_better_with_team": "Cal.com funziona meglio in team",
+  "the_calcom_team": "Il team Cal.com",
   "add_your_team_members": "Aggiungi i membri del tuo team ai tuoi tipi di eventi. Usa la pianificazione collettiva per includere tutti o trova la persona più adatta con la pianificazione round robin.",
   "booking_limit_reached": "È stato raggiunto il limite di prenotazione per questo tipo di evento",
   "duration_limit_reached": "È stato raggiunto il limite di durata per questo tipo di evento",
   "admin_has_disabled": "Un amministratore ha disabilitato {{appName}}",
   "disabled_app_affects_event_type": "Un amministratore ha disabilitato {{appName}}, il che ha effetto sul tuo tipo di evento {{eventType}}",
+  "event_replaced_notice": "Un amministratore ha sostituito uno dei tuoi tipi di evento",
+  "email_subject_slug_replacement": "Un amministratore di team ha sostituito il tuo evento /{{slug}}",
+  "email_body_slug_replacement_notice": "Un amministratore del team <strong>{{teamName}}</strong> ha sostituito il tuo tipo di evento <strong>/{{slug}}</strong> con un tipo di evento gestito da lui controllato.",
+  "email_body_slug_replacement_info": "Il tuo link continuerà a funzionare, ma alcune sue impostazioni potrebbero essere state cambiate. Puoi verificarlo nella sezione Tipi di evento.",
+  "email_body_slug_replacement_suggestion": "Per qualsiasi domanda sui tipi di evento, contatta il nostro amministratore.<br /><br />Ti auguriamo una piacevole esperienza di pianificazione, <br />Il team Cal.com",
   "disable_payment_app": "L'amministratore ha disabilitato {{appName}}, il che ha effetto sul tuo tipo di evento {{title}}. I partecipanti sono ancora in grado di prenotare questo tipo di evento ma non gli verrà richiesto di pagare. Per evitarlo, è possibile nascondere questo tipo di evento fino a che l'amministratore non riattivi il tuo metodo di pagamento.",
   "payment_disabled_still_able_to_book": "I partecipanti sono ancora in grado di prenotare questo tipo di evento ma non gli verrà richiesto di pagare. Per evitarlo, è possibile nascondere questo tipo di evento fino a che l'amministratore non riattivi il tuo metodo di pagamento.",
   "app_disabled_with_event_type": "L'amministratore ha disabilitato {{appName}}, il che ha effetto sul tuo tipo di evento {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Aggiorna configurazione data specifica",
   "event_type_duplicate_copy_text": "{{slug}}-copia",
   "set_as_default": "Imposta come predefinito",
+  "hide_eventtype_details": "Nascondi dettagli del tipo di evento",
   "show_navigation": "Mostra navigazione",
   "hide_navigation": "Nascondi navigazione",
   "verification_code_sent": "Codice di verifica inviato",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Crea il primo webhook per questo tipo di evento del team",
   "create_webhook_team_event_type": "Crea un webhook per questo tipo di evento del team",
   "disable_success_page": "Disabilita pagina di conferma dell'esito (funziona solo se si dispone di un URL di reindirizzamento)",
+  "invalid_admin_password": "Sei un amministratore, ma la tua password non ha la lunghezza minima di 15 caratteri, né utilizzi l'autenticazione a due fattori",
   "change_password_admin": "Cambia password per ottenere i diritti di accesso come amministratore",
   "username_already_taken": "Nome utente già in uso",
   "assignment": "Assegnazione",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "Licenza Enterprise “/ee”",
   "enterprise_booking_fee": "A partire da {{enterprise_booking_fee}}/mese",
   "enterprise_license_includes": "Tutto il necessario per l'utilizzo commerciale",
+  "no_need_to_keep_your_code_open_source": "Non è necessario che il codice rimanga open source",
   "repackage_rebrand_resell": "Rivendi facilmente con un nuovo marchio",
   "a_vast_suite_of_enterprise_features": "Un'estesa suite di funzionalità enterprise",
   "free_license_fee": "0,00 $/mese",
@@ -1590,22 +1636,23 @@
   "recommended_next_steps": "Passaggi successivi consigliati",
   "create_a_managed_event": "Crea un tipo di evento gestito",
   "meetings_are_better_with_the_right": "Le riunioni sono efficaci quando sono presenti le persone giuste. Invitale adesso.",
-  "create_a_one_one_template": "Crea un modello di incontro uno a uno per un tipo di evento e distribuiscilo a più membri.",
+  "create_a_one_one_template": "Crea un modello uno a uno per un tipo di evento e distribuiscilo a più membri.",
   "collective_or_roundrobin": "Di gruppo o round robin",
   "book_your_team_members": "Usa eventi di gruppo per riunire tutti i membri del team o eventi round robin per fare partecipare a rotazione le persone giuste.",
-  "event_no_longer_attending_subject": "Non partecipa più a {{title}} del {{date}}",
+  "event_no_longer_attending_subject": "Non partecipa più a {{title}} con il seguente orario: {{date}}",
   "no_longer_attending": "Non partecipi più a questo evento",
-  "attendee_no_longer_attending_subject": "Un partecipante non partecipa più a {{title}} del {{date}}",
+  "attendee_no_longer_attending_subject": "Un partecipante non partecipa più a {{title}} con il seguente orario {{date}}",
   "attendee_no_longer_attending": "Un partecipante non partecipa più al tuo evento",
-  "attendee_no_longer_attending_subtitle": "{{name}} ha cancellato. Di conseguenza, si è liberato un posto in questa fascia oraria",
-  "create_event_on": "Crea evento in data",
+  "attendee_no_longer_attending_subtitle": "{{name}} ha disdetto. Di conseguenza, si è liberato un posto in questa fascia oraria",
+  "create_event_on": "Crea evento in",
   "default_app_link_title": "Imposta il link dell'app predefinita",
   "default_app_link_description": "L'impostazione di un link dell'app predefinita permette a tutti i nuovi tipi di eventi di usare il link dell'app impostato.",
   "change_default_conferencing_app": "Imposta come predefinito",
+  "organizer_default_conferencing_app": "Applicazione predefinita dell'organizzatore",
   "under_maintenance": "Inattivo per manutenzione",
   "under_maintenance_description": "Il team di {{appName}} sta eseguendo la manutenzione programmata. Per qualsiasi domanda, contattare il supporto.",
   "event_type_seats": "{{numberOfSeats}} posti",
-  "booking_questions_title": "Domande al momento della prenotazione",
+  "booking_questions_title": "Domande per la prenotazione",
   "booking_questions_description": "Personalizza le domande poste nella pagina di prenotazione",
   "add_a_booking_question": "Aggiungi una domanda",
   "duplicate_email": "Indirizzo e-mail duplicato",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "Posti insufficienti",
   "form_builder_field_already_exists": "Esiste già un campo con questo nome",
   "form_builder_field_add_subtitle": "Personalizza le domande poste nella pagina di prenotazione",
+  "show_on_booking_page": "Mostra nella pagina di prenotazione",
   "get_started_zapier_templates": "Inizia con i modelli Zapier",
   "team_is_unpublished": "{{team}} non è pubblicato",
   "team_is_unpublished_description": "Questo link del team non è attualmente disponibile. Contattare il proprietario del team o chiedergli di pubblicarlo.",
@@ -1625,9 +1673,9 @@
   "keep_me_connected_with_form": "Mantieni la connessione con il modulo",
   "fields_in_form_duplicated": "Le eventuali modifiche all'instradatore e ai campi del modulo da duplicare si rifletteranno nel duplicato.",
   "form_deleted": "Modulo eliminato",
-  "delete_form": "Elimina modulo",
+  "delete_form": "Confermi l'eliminazione del modulo?",
   "delete_form_action": "Sì, elimina modulo",
-  "delete_form_confirmation": "Eliminare questo modulo? Gli utenti con cui hai condiviso il link non saranno più in grado di usarlo per prenotare. Inoltre, verranno eliminate tutte le risposte a esso associate.",
+  "delete_form_confirmation": "Gli utenti con cui hai condiviso il link non potranno più accedervi.",
   "delete_form_confirmation_2": "Tutte le risposte associate verranno eliminate.",
   "typeform_redirect_url_copied": "URL di reindirizzamento Typeform copiato! È possibile andare a impostare l'URL ne modulo Typeform.",
   "modifications_in_fields_warning": "Le eventuali modifiche apportate ai campi e ai percorsi dei seguenti moduli si rifletteranno in questo modulo.",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "Aggiungi 1 opzione per riga",
   "select_a_router": "Seleziona un instradatore",
   "add_a_new_route": "Aggiungi un nuovo percorso",
+  "make_informed_decisions": "Prendi decisioni informate con Approfondimenti",
+  "make_informed_decisions_description": "Il pannello di controllo Approfondimenti offre una panoramica di tutte le attività del team e mostra le tendenze, il che consente di migliorare la pianificazione di gruppo e il processo decisionale.",
+  "view_bookings_across": "Visualizza le prenotazioni di tutti i membri",
+  "view_bookings_across_description": "Individua la persona che riceve il maggior numero di prenotazioni e assicura la migliore distribuzione delle prenotazioni all'interno del team",
+  "identify_booking_trends": "Identifica le tendenze di prenotazione",
+  "identify_booking_trends_description": "Scopri quali giorni della settimana e quali fasce orarie sono popolari tra le persone che prenotano",
+  "spot_popular_event_types": "Individua i tipi di evento popolari",
+  "spot_popular_event_types_description": "Scopri quali tipi di evento ricevono più clic e prenotazioni",
   "no_responses_yet": "Per ora non ci sono risposte",
   "this_will_be_the_placeholder": "Questo sarà il segnaposto",
   "this_meeting_has_not_started_yet": "Questa riunione non è ancora iniziata",
@@ -1649,8 +1705,84 @@
   "verification_code": "Codice di verifica",
   "can_you_try_again": "Riprovare specificando un orario differente.",
   "verify": "Verifica",
+  "timezone_variable": "Timezone",
+  "timezone_info": "Il fuso orario della persona che riceve",
+  "event_end_time_variable": "Ora di fine evento",
+  "event_end_time_info": "Ora di fine dell'evento",
+  "cancel_url_variable": "URL di annullamento",
+  "cancel_url_info": "URL per annullare la prenotazione",
+  "reschedule_url_variable": "URL di riprogrammazione",
+  "reschedule_url_info": "URL per riprogrammare la prenotazione",
+  "invalid_event_name_variables": "Nel nome dell'evento è presente una variabile non valida",
   "select_all": "Seleziona tutto",
   "default_conferencing_bulk_title": "Aggiorna in blocco i tipi di eventi esistenti",
-  "invalid_event_name_variables": "Nel nome dell'evento è presente una variabile non valida",
-  "default_conferencing_bulk_description": "Aggiorna le posizioni per i tipi di eventi selezionati"
+  "members_default_schedule": "Pianificazione predefinita membro",
+  "set_by_admin": "Impostato dall'amministratore del team",
+  "members_default_location": "Posizione predefinita del membro",
+  "members_default_schedule_description": "Useremo il programma di disponibilità predefinito di ciascun membro. I membri saranno in grado di modificarlo.",
+  "requires_at_least_one_schedule": "È necessario avere almeno un programma",
+  "default_conferencing_bulk_description": "Aggiorna le posizioni per i tipi di eventi selezionati",
+  "locked_for_members": "Bloccato per i membri",
+  "locked_apps_description": "I membri saranno in grado di vedere le app attive, ma non saranno in grado di modificare le impostazioni delle app",
+  "locked_webhooks_description": "I membri saranno in grado di vedere i webhook attivi, ma non saranno in grado di modificare le impostazioni dei webhook",
+  "locked_workflows_description": "I membri saranno in grado di vedere i flussi di lavoro attivi, ma non saranno in grado di modificare le impostazioni dei flussi di lavoro",
+  "locked_by_admin": "Bloccato dall'amministratore",
+  "app_not_connected": "Non è stato connesso un account di {{appName}}.",
+  "connect_now": "Connetti ora",
+  "managed_event_dialog_confirm_button_one": "Sostituisci e invia notifica a {{count}} membro",
+  "managed_event_dialog_confirm_button_other": "Sostituisci e invia notifica a {{count}} membri",
+  "managed_event_dialog_title_one": "L'URL /{{slug}} esiste già per {{count}} membro. Sostituirlo?",
+  "managed_event_dialog_title_other": "L'URL /{{slug}} esiste già per {{count}} membri. Sostituirlo?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> utilizza già l'URL <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> utilizzano già l'URL <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Se si decide di sostituirlo, ai membri ne verrà inviata una notifica. Tornare indietro e rimuoverli se non si desidera sovrascriverlo.",
+  "review_event_type": "Verifica tipo di evento",
+  "looking_for_more_analytics": "Hai bisogno di più dati analitici?",
+  "looking_for_more_insights": "Hai bisogno di maggiori approfondimenti?",
+  "add_filter": "Aggiungi filtro",
+  "select_user": "Seleziona utente",
+  "select_event_type": "Seleziona tipo di evento",
+  "select_date_range": "Seleziona intervallo di date",
+  "popular_events": "Eventi popolari",
+  "no_event_types_found": "Nessun tipo di evento trovato",
+  "average_event_duration": "Durata media evento",
+  "most_booked_members": "Membri più prenotati",
+  "least_booked_members": "Membri meno prenotati",
+  "events_created": "Eventi creati",
+  "events_completed": "Eventi completati",
+  "events_cancelled": "Eventi annullati",
+  "events_rescheduled": "Eventi riprogrammati",
+  "from_last_period": "dall'ultimo periodo",
+  "from_to_date_period": "Da: {{startDate}} A: {{endDate}}",
+  "analytics_for_organisation": "Approfondimenti",
+  "subtitle_analytics": "Scopri di più sull'attività del tuo team",
+  "redirect_url_warning": "Aggiungendo un reindirizzamento, viene disabilitata la pagina di conferma dell'esito. Assicurati che nella pagina di conferma dell'esito personalizzata compaia la dicitura \"Prenotazione confermata\".",
+  "event_trends": "Tendenze eventi",
+  "clear_filters": "Cancella filtri",
+  "hold": "Preautorizzazione",
+  "on_booking_option": "Raccogli pagamento alla prenotazione",
+  "hold_option": "Addebita penale per mancata presentazione",
+  "card_held": "Preautorizzazione carta",
+  "charge_card": "Addebita carta",
+  "card_charged": "Carta addebitata",
+  "no_show_fee_amount": "Penale per mancata presentazione: {{amount, currency}}",
+  "no_show_fee": "Penale per mancata presentazione",
+  "submit_card": "Invia carta",
+  "submit_payment_information": "Invia informazioni di pagamento",
+  "meeting_awaiting_payment_method": "La tua riunione è in attesa di un metodo di pagamento",
+  "no_show_fee_charged_email_subject": "Una penale per mancata presentazione di {{amount, currency}} è stata addebitata per {{title}} alle {{date}}",
+  "no_show_fee_charged_text_body": "È stata addebitata una penale per mancata presentazione",
+  "no_show_fee_charged_subtitle": "Una penale per mancata presentazione di {{amount, currency}} è stata addebitata per il seguente evento",
+  "error_charging_card": "L'addebito della penale per mancata presentazione non è andato a buon fine. Riprovare più tardi.",
+  "collect_no_show_fee": "Riscuoti penale per mancata presentazione",
+  "no_show_fee_charged": "Penale per mancata presentazione addebitata",
+  "insights": "Approfondimenti",
+  "testing_workflow_info_message": "Durante il test di questo flusso di lavoro, tieni presente che le e-mail e i messaggi SMS possono essere programmati con almeno 1 ora di anticipo",
+  "insights_no_data_found_for_filter": "Nessun dato trovato per il filtro selezionato o le date selezionate.",
+  "acknowledge_booking_no_show_fee": "Confermo che in caso di mia mancata partecipazione a questo evento, una penale per mancata presentazione di {{amount, currency}} verrà addebitata sulla mia carta.",
+  "card_details": "Dati della carta",
+  "seats_and_no_show_fee_error": "Attualmente non è possibile abilitare i posti e addebitare la penale per mancata presentazione",
+  "complete_your_booking": "Completa la prenotazione",
+  "complete_your_booking_subject": "Completa la prenotazione: {{title}} del {{date}}",
+  "email_invite_team": "{{email}} è stato invitato"
 }
diff --git a/apps/web/public/static/locales/ja/common.json b/apps/web/public/static/locales/ja/common.json
index 899cdab9ed..6f2dabb204 100644
--- a/apps/web/public/static/locales/ja/common.json
+++ b/apps/web/public/static/locales/ja/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "アイデンティティプロバイダー",
   "trial_days_left": "PRO トライアル版は残り $t(day, {\"count\": {{days}} }) です",
   "day_one": "{{count}} 日",
   "day_other": "{{count}} 日",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "承認を待っています: {{date}} の {{title}}",
   "event_still_awaiting_approval": "イベントはまだあなたの承認待ちです",
   "booking_submitted_subject": "予約を送信しました: {{title}}、{{date}}",
+  "download_recording_subject": "録音のダウンロード: {{date}} の {{title}}",
+  "download_your_recording": "録音をダウンロード",
   "your_meeting_has_been_booked": "ミーティングが予約されました",
   "event_type_has_been_rescheduled_on_time_date": "あなたの {{title}} は {{date}} に再スケジュールされました。",
   "event_has_been_rescheduled": "更新 - イベントのスケジュールが変更されました",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "チームをご利用いただくためには、Pro アカウントが必要です。アップグレードするまでは非表示となります。",
   "link_expires": "追記: 有効期限は {{expiresIn}} 時間後に切れます。",
   "upgrade_to_per_seat": "座席ごとにアップグレードする",
-  "seat_options_doesnt_support_confirmation": "座席オプションは確認要件をサポートしていません",
+  "seat_options_doesnt_support_confirmation": "予約に確認が必要な場合、座席予約はできません",
   "team_upgrade_seats_details": "あなたのチームに所属する {{memberCount}} 人のメンバーのうち、{{unpaidCount}} 名分のライセンスが未払いとなっています。ライセンスごとの料金は、${{seatPrice}} / 月ですので、あなたのメンバーシップの合計金額は、${{totalCost}} / 月になると予想されます。",
   "team_upgrade_banner_description": "新しいチームプランをお試しいただき、ありがとうございます。あなたのチーム「{{teamName}}」には、アップグレードが必要なようです。",
   "team_upgrade_banner_action": "アップグレードはこちら",
@@ -224,6 +227,7 @@
   "done": "完了",
   "all_done": "すべて完了！",
   "all_apps": "すべて",
+  "available_apps": "利用可能なアプリ",
   "check_email_reset_password": "メールをご確認ください。パスワードをリセットするためのリンクを送信しました。",
   "finish": "完了",
   "few_sentences_about_yourself": "あなたについてのいくつかの文章。これはあなたの個人URLページに表示されます。",
@@ -404,6 +408,7 @@
   "add_time_availability": "新しい時間帯を追加",
   "add_an_extra_layer_of_security": "パスワードが盗まれる場合に備えて、アカウントのセキュリティを強化します。",
   "2fa": "二要素認証",
+  "2fa_disabled": "二要素認証はメールとパスワードの認証にのみ有効化できます",
   "enable_2fa": "二要素認証を有効にする",
   "disable_2fa": "二要素認証を無効にする",
   "disable_2fa_recommendation": "2FA を無効にする必要がある場合は、その必要がなくなった後すぐに有効にしなおすことをおすすめします。",
@@ -585,6 +590,20 @@
   "minutes": "分",
   "round_robin": "ラウンドロビン",
   "round_robin_description": "複数のチームメンバー間のミーティングを定期化する。",
+  "managed_event": "管理イベント",
+  "username_placeholder": "ユーザー名",
+  "managed_event_description": "イベントタイプを一括して作成し、チームメンバーに割り当てる",
+  "managed": "管理",
+  "managed_event_url_clarification": "「ユーザー名」には、割り当てられたメンバーのユーザー名が入ります",
+  "assign_to": "割り当て先",
+  "add_members": "メンバーを追加…",
+  "count_members_one": "{{count}} 人のメンバー",
+  "count_members_other": "{{count}} 人のメンバー",
+  "no_assigned_members": "割り当てられたメンバーはいません",
+  "assigned_to": "割り当て先",
+  "start_assigning_members_above": "上記のメンバーへの割り当てを開始する",
+  "locked_fields_admin_description": "メンバーはこれを編集できません",
+  "locked_fields_member_description": "このオプションはチーム管理者によってロックされました",
   "url": "URL",
   "hidden": "隠れている",
   "readonly": "読み込み専用",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "最低頻度の通知",
   "slot_interval": "時間帯の間隔",
   "slot_interval_default": "イベントの長さを使用する (デフォルト)",
+  "delete_event_type": "イベントタイプを削除しますか？",
+  "delete_managed_event_type": "管理イベントタイプを削除しますか？",
+  "delete_event_type_description": "これまでにこのリンクを共有された人は、リンクを使って予約することができなくなります。",
+  "delete_managed_event_type_description": "<ul><li>このイベントタイプを割り当てられたメンバーも、イベントタイプが削除されます。</li><li>これまでにこのリンクを共有された人は皆、このリンクを使った予約ができなくなります。</li></ul>",
+  "confirm_delete_event_type": "はい、削除します",
   "delete_account": "アカウントを削除する",
   "confirm_delete_account": "はい。アカウントを削除します",
   "delete_account_confirmation_message": "あなたの {{appName}} アカウントを本当に削除してもよろしいですか？あなたのアカウントリンクを共有しているユーザーは、そのアカウントを使用して予約を行うことができなくなり、保存していた設定も失われます。",
@@ -1126,13 +1150,13 @@
   "current_username": "現在のユーザー名",
   "example_1": "例 1",
   "example_2": "例 2",
-  "additional_input_label": "追加の入力ラベル",
+  "booking_question_identifier": "予約時の質問の識別子",
   "company_size": "会社の規模",
   "what_help_needed": "何かお困りですか？",
   "variable_format": "変数の形式",
   "webhook_subscriber_url_reserved": "ウェブフック購読者 URL は既に定義されています",
   "custom_input_as_variable_info": "追加の入力ラベルに含まれている特殊文字はすべて無視し (アルファベットと数字のみを使用)、アルファベットをすべて大文字に、そして空白をアンダースコアへと変換します。",
-  "using_additional_inputs_as_variables": "追加の入力内容を変数として使用するにはどうすればよいですか？",
+  "using_booking_questions_as_variables": "予約時の質問を変数として使う方法は？",
   "download_desktop_app": "デスクトップアプリをダウンロード",
   "set_ping_link": "Ping リンクを設定",
   "rate_limit_exceeded": "試行回数の上限を超えました",
@@ -1178,6 +1202,7 @@
   "start_of_week": "週の始まり",
   "recordings_title": "録音",
   "recording": "録音",
+  "happy_scheduling": "スケジュール設定をお楽しみください",
   "select_calendars": "ダブルブッキングを防ぐために、スケジュールの重なりをチェックするカレンダーを選択してください。",
   "check_for_conflicts": "スケジュールの重なりをチェック",
   "view_recordings": "録音を表示",
@@ -1215,6 +1240,7 @@
   "impersonation": "なりすまし",
   "impersonation_description": "ユーザーのなりすましを管理するための設定です",
   "users": "ユーザー",
+  "user": "ユーザー",
   "profile_description": "{{appName}} プロフィールの設定を管理します",
   "users_description": "こちらではすべてのユーザーの一覧をご確認いただけます",
   "users_listing": "ユーザー一覧",
@@ -1255,6 +1281,8 @@
   "download_responses": "回答をダウンロード",
   "download_responses_description": "CSV 形式ですべての回答をフォームにダウンロードします。",
   "download": "ダウンロード",
+  "download_recording": "録音をダウンロード",
+  "recording_from_your_recent_call": "Cal.com での最近の通話の録音がダウンロード可能です",
   "create_your_first_form": "最初のフォームを作成",
   "create_your_first_form_description": "ルーティングフォームを使用すれば、絞り込みの質問を通して適切な人物やイベントの種類へとルーティングを行うことができます。",
   "create_your_first_webhook": "最初のウェブフックを作成",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Basic 認証",
   "exchange_authentication_ntlm": "NTLM 認証",
   "exchange_compression": "GZip 圧縮",
+  "exchange_version": "Exchange のバージョン",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "作成したすべてのフォームとルートをここで確認できます。",
   "routing_forms_send_email_owner": "所有者にメールを送信",
   "routing_forms_send_email_owner_description": "フォームの送信時に所有者にメールを送信します",
@@ -1345,7 +1382,7 @@
   "add_limit": "上限を追加する",
   "team_name_required": "チーム名が必要です",
   "show_attendees": "ゲスト間で出席者情報を共有する",
-  "how_additional_inputs_as_variables": "変数として追加の入力を使用する方法は？",
+  "how_booking_questions_as_variables": "予約時の質問を変数として使う方法は？",
   "format": "書式",
   "uppercase_for_letters": "すべての文字に大文字を使用する",
   "replace_whitespaces_underscores": "空白をアンダーバー「 _ 」に置き換える",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "他にもお手伝いできることはありませんか？",
   "billing_help_description": "請求に関してサポートが必要な場合には、サポートチームがお手伝いさせていただきます。",
   "billing_help_cta": "サポートに問い合わせる",
-  "ignore_special_characters": "追加の入力ラベルに含まれている特殊文字はすべて無視し、アルファベットと数字のみを使用してください",
+  "ignore_special_characters_booking_questions": "予約時の質問の識別子に含まれている特殊文字はすべて無視し、アルファベットと数字のみを使用してください",
   "retry": "再試行",
   "fetching_calendars_error": "カレンダーの取得中にエラーが発生しました。<1>もう一度お試しいただく</1>か、カスタマーサポートまでお問い合わせください。",
   "calendar_connection_fail": "カレンダーの接続に失敗しました",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "固定ラウンドロビン",
   "add_one_fixed_attendee": "固定された出席者を 1 人追加し、複数の出席者についてラウンドロビン方式で出席スケジュールを決定します。",
   "calcom_is_better_with_team": "Cal.com はチームでの使用に適しています",
+  "the_calcom_team": "Cal.com チーム",
   "add_your_team_members": "イベントの種類にチームメンバーを追加します。一括スケジューリングで全員を参加させたり、ラウンドロビンスケジューリングで最適な人を設定したりすることができます。",
   "booking_limit_reached": "このイベントタイプの予約上限に達しました",
   "duration_limit_reached": "このイベントタイプの時間上限に達しました",
   "admin_has_disabled": "管理者が {{appName}} を無効にしています",
   "disabled_app_affects_event_type": "管理者が {{appName}} を無効にしているため、あなたのイベントの種類 {{eventType}} に影響を与える可能性があります",
+  "event_replaced_notice": "管理者があなたのイベントタイプの1つを置き換えました",
+  "email_subject_slug_replacement": "チーム管理者があなたのイベントの /{{slug}} を置き換えました",
+  "email_body_slug_replacement_notice": "<strong>{{teamName}}</strong>チームの管理者が、あなたのイベントタイプの <strong>/{{slug}}</strong> を彼らが管理する管理イベントタイプに置き換えました。",
+  "email_body_slug_replacement_info": "あなたのリンクは引き続き機能しますが、リンクの設定の一部が変更された可能性があります。変更はイベントタイプで確認できます。",
+  "email_body_slug_replacement_suggestion": "イベントタイプについてご質問がある場合は、管理者までお問合せください。<br /><br />スケジュール設定をお楽しみください、<br />Cal.comチーム",
   "disable_payment_app": "管理者が {{appName}} を無効にしたため、イベントの種類 {{title}} に影響を与える可能性があります。出席者がこの種類のイベントを予約することは可能ですが、支払いを促されることはありません。管理者が支払い方法を再度有効にするまでの間これを防ぐために、イベントの種類を非表示にすることができます。",
   "payment_disabled_still_able_to_book": "出席者がこの種類のイベントを予約することは可能ですが、支払いを促されることはありません。管理者が支払い方法を再度有効にするまでの間これを防ぐために、イベントの種類を非表示にすることができます。",
   "app_disabled_with_event_type": "管理者が {{appName}} を無効にしているため、あなたのイベントの種類 {{title}} に影響を与える可能性があります.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "上書きを更新",
   "event_type_duplicate_copy_text": "{{slug}}-copy",
   "set_as_default": "デフォルトとして設定",
+  "hide_eventtype_details": "イベントタイプの詳細を非表示にする",
   "show_navigation": "ナビゲーションを表示",
   "hide_navigation": "ナビゲーションを非表示にする",
   "verification_code_sent": "確認コードが送信されました",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "このチームイベントの種類の初めての webhook を作成します",
   "create_webhook_team_event_type": "このチームイベントの種類の webhook を作成します",
   "disable_success_page": "予約完了ページを無効化する (リダイレクト URL がある場合にのみ有効)",
+  "invalid_admin_password": "あなたは管理者ですが、パスワードの長さが足りないか（15文字以上必要です）、まだ二要素認証をしていません",
   "change_password_admin": "パスワードを変更して管理者アクセス権を取得する",
   "username_already_taken": "ユーザー名が既に使用されています",
   "assignment": "割り当て",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "\"/ee\" Enterprise ライセンス",
   "enterprise_booking_fee": "{{enterprise_booking_fee}}/月で開始する",
   "enterprise_license_includes": "商用ユースケースで必要となるすべてのもの",
+  "no_need_to_keep_your_code_open_source": "コードをオープンソースにしておく必要はありません",
   "repackage_rebrand_resell": "再パッケージ、リブランディング、再販売が簡単になります",
   "a_vast_suite_of_enterprise_features": "膨大な量の企業向け機能パッケージ",
   "free_license_fee": "0.00 ドル/月",
@@ -1590,7 +1636,7 @@
   "recommended_next_steps": "推奨される次のステップ",
   "create_a_managed_event": "管理されたイベントの種類を作成",
   "meetings_are_better_with_the_right": "ミーティングは適切なチームメンバーの参加によってより良いものになります。今すぐ彼らを招待しましょう。",
-  "create_a_one_one_template": "イベントタイプに One-One One テンプレートを作成して複数のメンバーに配布します。",
+  "create_a_one_one_template": "イベントタイプにマンツーマンテンプレートを作成して複数のメンバーに配布します。",
   "collective_or_roundrobin": "共有またはラウンドロビン",
   "book_your_team_members": "共有イベントでチームメンバーを一緒に予約するか、ラウンドロビンで持ち回りにして適切なユーザーを確保します。",
   "event_no_longer_attending_subject": "{{date}} の {{title}} には出席しなくなりました",
@@ -1602,13 +1648,14 @@
   "default_app_link_title": "デフォルトのアプリリンクを設定",
   "default_app_link_description": "デフォルトのアプリリンクを設定することで、新たに作成するすべてのイベントの種類が設定したアプリリンクを使用できるようになります。",
   "change_default_conferencing_app": "デフォルトとして設定",
+  "organizer_default_conferencing_app": "主催者のデフォルトアプリ",
   "under_maintenance": "メンテナンスのため停止中",
   "under_maintenance_description": "{{appName}} チームが定期メンテナンスを行っています。質問がある場合には、サポートへとお問い合わせください。",
   "event_type_seats": "{{numberOfSeats}} 席",
   "booking_questions_title": "予約の質問",
   "booking_questions_description": "予約ページで尋ねる質問をカスタマイズする",
   "add_a_booking_question": "質問を追加",
-  "duplicate_email": "メールアドレスが重複しています",
+  "duplicate_email": "メールが重複しています",
   "booking_with_payment_cancelled": "このイベントの支払いはもうできません",
   "booking_with_payment_cancelled_already_paid": "この予約に関するお支払いの払い戻しについては、現在処理中です。",
   "booking_with_payment_cancelled_refunded": "この予約に関するお支払いは、返金されています。",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "座席が足りません",
   "form_builder_field_already_exists": "この名前のフィールドは既に存在します",
   "form_builder_field_add_subtitle": "予約ページで尋ねる質問をカスタマイズする",
+  "show_on_booking_page": "予約ページに表示",
   "get_started_zapier_templates": "Zapier テンプレートの使用を開始する",
   "team_is_unpublished": "{{team}} は公開されていません",
   "team_is_unpublished_description": "このチームのリンクは現在利用できません。チームの所有者に問い合わせるか、リンクを公開するように依頼してください。",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "1 行に 1 つのオプションを追加する",
   "select_a_router": "ルーターを選択",
   "add_a_new_route": "新しいルートを追加",
+  "make_informed_decisions": "インサイトを使って情報に基づいた決定をする",
+  "make_informed_decisions_description": "インサイトダッシュボードではチーム全体のアクティビティがひと目でわかります。傾向もわかるので、チームはより良いスケジューリングと決定ができます。",
+  "view_bookings_across": "メンバー全体の予約を表示",
+  "view_bookings_across_description": "誰が最も予約されているか確認し、チーム全体で最適な配分ができるようにします",
+  "identify_booking_trends": "予約の傾向を明らかにする",
+  "identify_booking_trends_description": "週のどの期間と1日のどの時間帯が予約者に人気か確認します",
+  "spot_popular_event_types": "人気のイベントタイプを見つける",
+  "spot_popular_event_types_description": "どのイベントタイプが最もクリックされ、予約されているのか確認します",
   "no_responses_yet": "回答はまだありません",
   "this_will_be_the_placeholder": "これがプレースホルダーになります",
   "this_meeting_has_not_started_yet": "このミーティングはまだ開始されていません",
@@ -1647,10 +1703,86 @@
   "app_is_connected": "{{dependencyName}} が接続されました",
   "requires_app": "{{dependencyName}} が必要です",
   "verification_code": "確認コード",
-  "can_you_try_again": "別のタイミングでもう1度お試しください",
+  "can_you_try_again": "別の時間帯でもう1度お試しください",
   "verify": "確認する",
+  "timezone_variable": "タイムゾーン",
+  "timezone_info": "受け取る人のタイムゾーン",
+  "event_end_time_variable": "イベント終了時刻",
+  "event_end_time_info": "イベント終了時刻",
+  "cancel_url_variable": "キャンセル URL",
+  "cancel_url_info": "予約をキャンセルするための URL",
+  "reschedule_url_variable": "スケジュール変更 URL",
+  "reschedule_url_info": "予約をスケジュール変更するための URL",
+  "invalid_event_name_variables": "イベント名に無効な変数があります",
   "select_all": "すべてを選択",
   "default_conferencing_bulk_title": "既存のイベントタイプを一括更新する",
-  "invalid_event_name_variables": "イベント名に無効な変数があります",
-  "default_conferencing_bulk_description": "選択したイベントタイプの場所を更新します"
+  "members_default_schedule": "メンバーのデフォルトスケジュール",
+  "set_by_admin": "チーム管理者により設定",
+  "members_default_location": "メンバーのデフォルトの場所",
+  "members_default_schedule_description": "各メンバーのデフォルトの空き状況スケジュールを使用します。メンバーはスケジュールを編集したり、変更したりできます。",
+  "requires_at_least_one_schedule": "少なくとも 1 つのスケジュールが必要です",
+  "default_conferencing_bulk_description": "選択したイベントタイプの場所を更新します",
+  "locked_for_members": "メンバーにはロックされています",
+  "locked_apps_description": "メンバーは有効なアプリを確認できますが、アプリの設定を編集することはできません",
+  "locked_webhooks_description": "メンバーは有効なウェブフックを確認できますが、ウェブフックの設定を編集することはできません",
+  "locked_workflows_description": "メンバーは有効なワークフローを確認できますが、ワークフローの設定を編集することはできません",
+  "locked_by_admin": "管理者によりロックされています",
+  "app_not_connected": "{{appName}} のアカウントに接続していません。",
+  "connect_now": "今すぐ接続",
+  "managed_event_dialog_confirm_button_one": "{{count}} 人のメンバーを置き換えて通知する",
+  "managed_event_dialog_confirm_button_other": "{{count}} 人のメンバーを置き換えて通知する",
+  "managed_event_dialog_title_one": "{{count}} 人のメンバーには url/{{slug}} が既に存在します。置き換えますか？",
+  "managed_event_dialog_title_other": "{{count}} 人のメンバーには url/{{slug}} が既に存在します。置き換えますか？",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong>は既に <strong>/{{slug}}</strong> url を使用しています。",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong>は既に <string>/{{slug}}</strong> url を使用しています。",
+  "managed_event_dialog_clarification": "置き換えを選択すると、通知が送られます。上書きしたくない場合は、戻って削除してください。",
+  "review_event_type": "イベントタイプを確認",
+  "looking_for_more_analytics": "詳しい分析をお探しですか？",
+  "looking_for_more_insights": "詳しいインサイトをお探しですか？",
+  "add_filter": "フィルターを追加",
+  "select_user": "ユーザーを選択",
+  "select_event_type": "イベントタイプを選択",
+  "select_date_range": "日付範囲を選択",
+  "popular_events": "人気のイベント",
+  "no_event_types_found": "イベントタイプが見つかりません",
+  "average_event_duration": "イベントの平均時間",
+  "most_booked_members": "最も予約が多いメンバー",
+  "least_booked_members": "最も予約が少ないメンバー",
+  "events_created": "イベントが作成されました",
+  "events_completed": "イベントが完了しました",
+  "events_cancelled": "イベントがキャンセルされました",
+  "events_rescheduled": "イベントがスケジュール変更されました",
+  "from_last_period": "最後の期間から",
+  "from_to_date_period": "開始：{{startDate}} 終了：{{endDate}}",
+  "analytics_for_organisation": "インサイト",
+  "subtitle_analytics": "チームのアクティビティについてさらに詳しく知る",
+  "redirect_url_warning": "リダイレクトを追加すると予約完了ページが無効化されます。必ずカスタムの予約完了ページで「予約が確認されました」と伝えてください。",
+  "event_trends": "イベントのトレンド",
+  "clear_filters": "フィルターをクリア",
+  "hold": "保留",
+  "on_booking_option": "予約の支払いを受け取る",
+  "hold_option": "予約不参加料金を請求",
+  "card_held": "カードを保留",
+  "charge_card": "カードに請求",
+  "card_charged": "カードに請求されました",
+  "no_show_fee_amount": "{{amount, currency}} の予約不参加料金",
+  "no_show_fee": "予約不参加料金",
+  "submit_card": "カードを送信",
+  "submit_payment_information": "支払い情報を送信",
+  "meeting_awaiting_payment_method": "会議の支払い方法を待っています",
+  "no_show_fee_charged_email_subject": "{{date}} の {{title}} に {{amount, currency}} の予約不参加料金が請求されました",
+  "no_show_fee_charged_text_body": "予約不参加料金が請求されました",
+  "no_show_fee_charged_subtitle": "次のイベントに {{amount, currency}} の予約不参加料金が請求されました",
+  "error_charging_card": "予約不参加料金の請求に問題が発生しました。後でもう一度お試しください。",
+  "collect_no_show_fee": "予約不参加料金を受け取る",
+  "no_show_fee_charged": "予約不参加料金が請求されました",
+  "insights": "インサイト",
+  "testing_workflow_info_message": "このワークフローをテストする際は、少なくとも1時間前でないとメールとSMSをスケジュール設定できないことにご注意ください",
+  "insights_no_data_found_for_filter": "選択したフィルターまたは選択した日付のデータが見つかりません。",
+  "acknowledge_booking_no_show_fee": "このイベントに参加しない場合、{{amount, currency}} の予約不参加料金が私のカードに請求されることに同意します。",
+  "card_details": "カードの詳細",
+  "seats_and_no_show_fee_error": "現在、座席の有効化と予約不参加料金の請求はできません",
+  "complete_your_booking": "予約を完了する",
+  "complete_your_booking_subject": "次の予約を完了する：{{date}} の {{title}}",
+  "email_invite_team": "{{email}} は招待されました"
 }
diff --git a/apps/web/public/static/locales/ko/common.json b/apps/web/public/static/locales/ko/common.json
index 1b34e89dad..17f9925da0 100644
--- a/apps/web/public/static/locales/ko/common.json
+++ b/apps/web/public/static/locales/ko/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "ID 제공자",
   "trial_days_left": "PRO 평가판의 남은 기한 $t(day, {\"count\": {{days}} })",
   "day_one": "{{count}}일",
   "day_other": "{{count}}일",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "승인을 기다리고 있습니다: {{date}} {{title}}",
   "event_still_awaiting_approval": "이벤트가 아직 승인을 기다리고 있습니다.",
   "booking_submitted_subject": "예약 제출됨: {{date}}에 {{title}}",
+  "download_recording_subject": "기록 다운로드: {{title}} 날짜 {{date}}",
+  "download_your_recording": "사용자 기록 다운로드",
   "your_meeting_has_been_booked": "회의가 예약되었습니다.",
   "event_type_has_been_rescheduled_on_time_date": "귀하의 {{title}} 일정이 {{date}}로 변경되었습니다.",
   "event_has_been_rescheduled": "업데이트 - 이벤트 일정이 변경되었습니다.",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "팀을 사용하려면 Pro 계정이 필요합니다. 귀하의 계정은 업그레이드할 때까지 숨겨졌습니다.",
   "link_expires": "{{expiresIn}} 시간 안에 만료됩니다.",
   "upgrade_to_per_seat": "시트 단위로 업그레이드",
-  "seat_options_doesnt_support_confirmation": "좌석 옵션은 확인 요구 사항을 지원하지 않습니다",
+  "seat_options_doesnt_support_confirmation": "좌석 옵션이 확인 요구 사항을 지원하지 않습니다",
   "team_upgrade_seats_details": "귀하의 팀원 {{memberCount}}명 중 {{unpaidCount}}명의 시트 비용이 미지급되었습니다. 시트당 ${{seatPrice}}/m로 계산시, 예상 총 멤버십 비용은 ${{totalCost}}/m입니다.",
   "team_upgrade_banner_description": "당사의 새로운 팀 플랜을 사용해 주셔서 감사합니다. 귀하의 \"{{teamName}}\" 팀에 업그레이드가 필요한 것으로 확인되었습니다.",
   "team_upgrade_banner_action": "여기서 업그레이드",
@@ -435,7 +438,7 @@
   "password_hint_min": "최소 7자 길이",
   "password_hint_admin_min": "최소 15자 길이",
   "password_hint_num": "1개 이상 숫자 포함",
-  "max_limit_allowed_hint": "반드시 {{limit}}자 이하여야 합니다",
+  "max_limit_allowed_hint": "{{limit}}자 이하여야 합니다",
   "invalid_password_hint": "비밀번호는 7자 이상이어야 하고 숫자가 하나 이상 포함되어야 하며 대문자와 소문자가 혼합되어야 합니다",
   "incorrect_password": "비밀번호가 잘못되었습니다",
   "incorrect_username_password": "사용자 이름 또는 비밀번호가 잘못되었습니다.",
@@ -587,6 +590,20 @@
   "minutes": "분",
   "round_robin": "라운드 로빈",
   "round_robin_description": "여러 팀 구성원 간의 주기적인 회의",
+  "managed_event": "관리형 이벤트",
+  "username_placeholder": "사용자 이름",
+  "managed_event_description": "팀원들에게 대량으로 이벤트 유형 생성 및 배포",
+  "managed": "관리됨",
+  "managed_event_url_clarification": "\"사용자 이름\"은 할당된 회원의 사용자 이름으로 채워집니다",
+  "assign_to": "할당:",
+  "add_members": "회원 추가:",
+  "count_members_one": "회원 {{count}}명",
+  "count_members_other": "회원 {{count}}명",
+  "no_assigned_members": "할당된 회원 없음",
+  "assigned_to": "할당됨:",
+  "start_assigning_members_above": "위에서 회원 할당 시작",
+  "locked_fields_admin_description": "회원은 이 내용을 수정할 수 없게 됩니다",
+  "locked_fields_member_description": "이 옵션은 팀 관리자에 의해 잠겼습니다",
   "url": "링크",
   "hidden": "숨기기",
   "readonly": "읽기 전용",
@@ -739,6 +756,9 @@
   "slot_interval": "시간 슬롯 간격",
   "slot_interval_default": "이벤트 길이 사용(기본값)",
   "delete_event_type": "이벤트 타입을 삭제하시겠습니까?",
+  "delete_managed_event_type": "관리 이벤트 유형을 삭제하시겠습니까?",
+  "delete_event_type_description": "링크를 공유한 회원은 더 이상 링크를 사용하여 예약할 수 없게 됩니다.",
+  "delete_managed_event_type_description": "<ul><li>이 이벤트 유형에 할당된 회원은 이벤트 유형도 삭제됩니다.</li><li>링크를 공유한 회원은 더 이상 링크를 사용하여 예약할 수 없게 됩니다.</li> </ul>",
   "confirm_delete_event_type": "네, 삭제합니다",
   "delete_account": "계정 삭제",
   "confirm_delete_account": "예, 계정을 삭제합니다",
@@ -1130,13 +1150,13 @@
   "current_username": "현재 사용자 이름",
   "example_1": "예 1",
   "example_2": "예 2",
-  "additional_input_label": "추가 입력 레이블",
+  "booking_question_identifier": "예약 질문 ID",
   "company_size": "회사 규모",
   "what_help_needed": "어떻게 도와 드릴까요?",
   "variable_format": "변수 형식",
   "webhook_subscriber_url_reserved": "웹훅 구독자 URL이 이미 정의되었습니다",
   "custom_input_as_variable_info": "추가 입력 레이블의 모든 특수 문자는 무시하고(문자와 숫자만 사용) 모든 문자에 대문자를 사용하며 공백은 밑줄로 대체합니다.",
-  "using_additional_inputs_as_variables": "추가 입력을 변수로 사용하려면 어떻게 하나요?",
+  "using_booking_questions_as_variables": "예약 질문을 변수로 어떻게 사용합니까?",
   "download_desktop_app": "데스크탑 앱 다운로드",
   "set_ping_link": "Ping 링크 설정",
   "rate_limit_exceeded": "요금 한도 초과됨",
@@ -1182,6 +1202,7 @@
   "start_of_week": "주의 시작",
   "recordings_title": "녹음",
   "recording": "녹음",
+  "happy_scheduling": "즐거운 일정 관리 되세요",
   "select_calendars": "중복 예약을 방지하기 위해 충돌을 확인하려는 캘린더를 선택합니다.",
   "check_for_conflicts": "충돌 확인",
   "view_recordings": "녹음 보기",
@@ -1260,6 +1281,7 @@
   "download_responses": "다운로드 응답",
   "download_responses_description": "양식에 대한 모든 응답을 CSV 형식으로 다운로드합니다.",
   "download": "다운로드",
+  "download_recording": "기록 다운로드",
   "recording_from_your_recent_call": "Cal.com에서 최근 통화 내용 녹음 파일을 다운로드 할 준비가 되었습니다",
   "create_your_first_form": "첫 양식 작성",
   "create_your_first_form_description": "라우팅 양식을 사용하면 적격성 질문을 올리고 올바른 사람 또는 이벤트 유형으로 라우팅할 수 있습니다.",
@@ -1297,6 +1319,15 @@
   "exchange_authentication_standard": "기본 인증",
   "exchange_authentication_ntlm": "NTLM 인증",
   "exchange_compression": "GZip 압축",
+  "exchange_version": "전환 버전",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "여기에서 생성했던 모든 양식과 경로를 볼 수 있습니다.",
   "routing_forms_send_email_owner": "소유자에게 이메일 보내기",
   "routing_forms_send_email_owner_description": "양식이 제출되면 소유자에게 이메일을 발송합니다",
@@ -1351,7 +1382,7 @@
   "add_limit": "제한 추가",
   "team_name_required": "팀 이름 필수",
   "show_attendees": "게스트 간에 참석자 정보 공유",
-  "how_additional_inputs_as_variables": "추가 입력을 변수로 사용하는 방법",
+  "how_booking_questions_as_variables": "예약 질문을 변수로 어떻게 사용합니까?",
   "format": "형식",
   "uppercase_for_letters": "모든 문자에 대문자 사용",
   "replace_whitespaces_underscores": "공백을 밑줄로 바꾸기",
@@ -1366,7 +1397,7 @@
   "billing_help_title": "또 필요한 것이 있나요?",
   "billing_help_description": "청구와 관련하여 추가적인 도움이 필요한 경우 지원 팀이 도와드리겠습니다.",
   "billing_help_cta": "지원 문의",
-  "ignore_special_characters": "추가 입력 레이블의 특수 문자는 무시하십시오. 문자와 숫자만 사용하십시오",
+  "ignore_special_characters_booking_questions": "예약 질문 ID의 특수 문자는 무시하십시오. 문자와 숫자만 사용하십시오",
   "retry": "재시도",
   "fetching_calendars_error": "캘린더를 가져오는 중 문제가 발생했습니다. <1>다시 시도</1>하거나 고객 지원에 문의하십시오.",
   "calendar_connection_fail": "캘린더 연결 실패",
@@ -1455,8 +1486,11 @@
   "duration_limit_reached": "이 이벤트 타입에 대한 기간 한도에 도달했습니다",
   "admin_has_disabled": "관리자가 {{appName}} 앱을 비활성화했습니다",
   "disabled_app_affects_event_type": "관리자가 이벤트 타입 {{eventType}}에 영향을 미치는 {{appName}} 앱을 비활성화했습니다",
+  "event_replaced_notice": "관리자가 이벤트 유형 중 하나를 바꿨습니다",
   "email_subject_slug_replacement": "팀 관리자가 당신의 이벤트 /{{slug}}를 변경하였습니다",
+  "email_body_slug_replacement_notice": "<strong>{{teamName}}</strong> 팀의 관리자가 귀하의 이벤트 유형 <strong>/{{slug}}</strong>을(를) 관리 이벤트 유형으로 바꿨습니다.",
   "email_body_slug_replacement_info": "링크는 계속 유효하지만 일부 설정이 변경될 수 있습니다. 이벤트 타입에서 이를 검토할 수 있습니다.",
+  "email_body_slug_replacement_suggestion": "이벤트 유형에 대해 질문이 있는 경우 관리자에게 문의하십시오.<br /><br />즐거운 일정 되시기 바랍니다. <br />Cal.com 팀",
   "disable_payment_app": "관리자가 이벤트 타입 {{title}}에 영향을 미치는 {{appName}} 앱을 비활성화했습니다. 참석자는 여전히 이러한 타입의 이벤트를 예약할 수 있지만 결제하라는 메시지는 표시되지 않습니다. 관리자가 결제 수단을 다시 활성화할 때까지 이를 방지하기 위해 이벤트 타입을 숨길 수 있습니다.",
   "payment_disabled_still_able_to_book": "참석자는 여전히 이러한 타입의 이벤트를 예약할 수 있지만 결제하라는 메시지는 표시되지 않습니다. 관리자가 결제 수단을 다시 활성화할 때까지 이를 방지하기 위해 이벤트 타입을 숨길 수 있습니다.",
   "app_disabled_with_event_type": "관리자가 이벤트 타입 {{title}}에 영향을 미치는 {{appName}} 앱을 비활성화했습니다.",
@@ -1540,7 +1574,7 @@
   "sender_name": "발신자 이름",
   "already_invited": "이미 초대된 참석자",
   "no_recordings_found": "기록 없음",
-  "new_workflow_subtitle": "새 워크플로...",
+  "new_workflow_subtitle": "새 워크플로 대상...",
   "reporting": "보고",
   "reporting_feature": "데이터에서 들어오는 모든 것을 확인하고 CSV 파일로 다운로드",
   "teams_plan_required": "Teams 플랜이 필요함",
@@ -1552,6 +1586,7 @@
   "ee_enterprise_license": "“/ee” Enterprise 라이선스",
   "enterprise_booking_fee": "시작 가격 {{enterprise_booking_fee}}/월",
   "enterprise_license_includes": "모든 상업적 기능 구비",
+  "no_need_to_keep_your_code_open_source": "코드를 오픈 소스로 유지할 필요가 없습니다",
   "repackage_rebrand_resell": "쉽게 패키지를 재구성하여 새 브랜드로 재판매 가능",
   "a_vast_suite_of_enterprise_features": "방대한 엔터프라이즈 기능 모음",
   "free_license_fee": "$0.00/월",
@@ -1601,18 +1636,19 @@
   "recommended_next_steps": "권장하는 다음 단계",
   "create_a_managed_event": "관리형 이벤트 유형 생성",
   "meetings_are_better_with_the_right": "회의는 그 위치에서 해당 팀원과 함께 하는 것이 더 좋습니다. 지금 초대하세요.",
-  "create_a_one_one_template": "이벤트 유형에 대한 일대일 템플릿을 만들어 여러 일원에게 배포하십시오.",
+  "create_a_one_one_template": "이벤트 타입에 대한 일대일 템플릿을 만들어 여러 회원에게 배포하십시오.",
   "collective_or_roundrobin": "단체 또는 라운드로빈",
   "book_your_team_members": "단체 이벤트를 통해 팀원을 함께 예약하거나 라운드로빈으로 돌아가며 해당 팀원을 초대하세요.",
-  "event_no_longer_attending_subject": "더 이상 {{date}}자 {{title}}에 참석하지 않고 있습니다",
+  "event_no_longer_attending_subject": "더 이상 {{date}} 날짜에 {{title}}에 참석하지 않음",
   "no_longer_attending": "더 이상 이 이벤트에 참석하지 않고 계십니다",
-  "attendee_no_longer_attending_subject": "참석자가 더 이상 {{date}}자 {{title}}에 참석하고 있지 않습니다",
+  "attendee_no_longer_attending_subject": "참석자가 더 이상 {{date}} 날짜에 {{title}}에 참석하지 않습니다",
   "attendee_no_longer_attending": "참석자가 더 이상 이벤트에 참석하고 있지 않습니다",
-  "attendee_no_longer_attending_subtitle": "{{name}}이(가) 취소되었습니다. 즉, 이 시간대에 좌석이 비었다는 의미입니다",
+  "attendee_no_longer_attending_subtitle": "{{name}}이(가) 취소되었습니다. 즉, 이 시간 슬롯에 좌석이 비어 있습니다",
   "create_event_on": "이벤트 생성일:",
   "default_app_link_title": "기본 앱 링크 설정",
   "default_app_link_description": "기본 앱 링크를 설정하면 새로 생성된 모든 이벤트 유형에서 설정된 앱 링크를 사용할 수 있습니다.",
   "change_default_conferencing_app": "기본값으로 설정",
+  "organizer_default_conferencing_app": "주최자의 기본 앱",
   "under_maintenance": "아래로 밀어 유지관리",
   "under_maintenance_description": "{{appName}} 팀에서 예정된 유지관리를 수행하고 있습니다. 궁금한 점이 있으면 지원팀에 문의하세요.",
   "event_type_seats": "{{numberOfSeats}}개 시트",
@@ -1627,6 +1663,7 @@
   "not_enough_seats": "좌석이 부족합니다",
   "form_builder_field_already_exists": "이 이름을 가진 필드가 이미 존재합니다",
   "form_builder_field_add_subtitle": "예약 페이지에서 묻는 질문을 사용자 정의합니다",
+  "show_on_booking_page": "예약 페이지에 표시",
   "get_started_zapier_templates": "Zapier 템플릿 시작하기",
   "team_is_unpublished": "{{team}} 팀은 게시되지 않았습니다",
   "team_is_unpublished_description": "이 팀 링크는 현재 사용할 수 없습니다. 팀 소유자에게 연락하거나 게시하라고 요청하십시오.",
@@ -1636,10 +1673,10 @@
   "keep_me_connected_with_form": "양식과 연결 상태 유지",
   "fields_in_form_duplicated": "복제되는 양식에 있는 라우터 및 필드의 변경 사항은 복제본에 반영됩니다.",
   "form_deleted": "양식 삭제됨",
-  "delete_form": "양식 삭제",
+  "delete_form": "이 양식을 삭제하시겠습니까?",
   "delete_form_action": "예, 양식을 삭제하겠습니다",
-  "delete_form_confirmation": "이 양식을 삭제하시겠습니까? 링크를 공유한 사용자는 더 이상 링크를 사용하여 예약할 수 없습니다. 또한 모든 관련 응답도 삭제됩니다.",
-  "delete_form_confirmation_2": "모든 연결된 응답은 삭제됩니다.",
+  "delete_form_confirmation": "링크를 공유한 모든 사람이 더 이상 여기에 액세스할 수 없게 됩니다.",
+  "delete_form_confirmation_2": "연결된 모든 응답이 삭제됩니다.",
   "typeform_redirect_url_copied": "Typeform Redirect URL이 복사되었습니다! Typeform 양식으로 이동하여 URL을 설정할 수 있습니다.",
   "modifications_in_fields_warning": "다음 양식의 필드 및 경로에 대한 수정 사항은 이 양식에 반영됩니다.",
   "connected_forms": "연결된 양식",
@@ -1661,19 +1698,44 @@
   "no_responses_yet": "아직 응답 없음",
   "this_will_be_the_placeholder": "이것은 자리 표시자가 됩니다",
   "this_meeting_has_not_started_yet": "이 회의는 아직 시작되지 않았습니다",
-  "this_app_requires_connected_account": "{{appName}}에서 연결된 {{dependencyName}} 계정이 필요합니다",
+  "this_app_requires_connected_account": "{{appName}}에 연결된 {{dependencyName}} 계정이 필요합니다",
   "connect_app": "{{dependencyName}} 연결",
   "app_is_connected": "{{dependencyName}} 연결됨",
   "requires_app": "{{dependencyName}} 필요",
   "verification_code": "인증 코드",
   "can_you_try_again": "다른 시간으로 다시 해보시겠어요?",
   "verify": "인증",
-  "select_all": "모두 선택",
-  "default_conferencing_bulk_title": "기존 이벤트 유형 일괄 업데이트",
+  "timezone_variable": "시간대",
+  "timezone_info": "받는 사람의 시간대",
+  "event_end_time_variable": "이벤트 종료 시간",
+  "event_end_time_info": "이벤트 종료 시간",
+  "cancel_url_variable": "취소 URL",
+  "cancel_url_info": "예약 취소 URL",
+  "reschedule_url_variable": "일정 변경 URL",
+  "reschedule_url_info": "예약 일정 변경 URL",
   "invalid_event_name_variables": "이벤트 이름에 유효하지 않은 변수가 있습니다",
+  "select_all": "모두 선택",
+  "default_conferencing_bulk_title": "기존 이벤트 타입을 일괄 업데이트",
+  "members_default_schedule": "회원의 기본 일정",
+  "set_by_admin": "팀 관리자에 의해 설정됨",
+  "members_default_location": "회원의 기본 위치",
+  "members_default_schedule_description": "각 회원의 기본 사용 가능 일정을 사용합니다. 편집 또는 변경할 수 있습니다.",
   "requires_at_least_one_schedule": "적어도 한 개 이상의 스케줄이 필요합니다",
-  "default_conferencing_bulk_description": "선택한 이벤트 유형의 위치 업데이트",
+  "default_conferencing_bulk_description": "선택한 이벤트 타입의 위치 업데이트",
+  "locked_for_members": "회원에 대해 잠김",
+  "locked_apps_description": "회원은 활성 앱을 볼 수 있지만 앱 설정을 편집할 수는 없습니다",
+  "locked_webhooks_description": "회원은 활성 웹훅을 볼 수 있지만 웹훅 설정을 편집할 수는 없습니다",
+  "locked_workflows_description": "회원은 활성 워크플로를 볼 수 있지만 워크플로 설정을 편집할 수는 없습니다",
   "locked_by_admin": "관리자에 의해 잠금 됨",
+  "app_not_connected": "{{appName}} 계정을 연결하지 않으셨습니다.",
+  "connect_now": "지금 연결",
+  "managed_event_dialog_confirm_button_one": "회원 {{count}}명 바꾸기 및 알림",
+  "managed_event_dialog_confirm_button_other": "회원 {{count}}명 바꾸기 및 알림",
+  "managed_event_dialog_title_one": "URL /{{slug}}은(는) {{count}}명의 회원에 대해 이미 존재합니다. 바꾸시겠습니까?",
+  "managed_event_dialog_title_other": "URL /{{slug}}은(는) {{count}}명의 회원에 대해 이미 존재합니다. 바꾸시겠습니까?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> 님이 이미 <strong>/{{slug}}</strong> url을 사용하는 중입니다.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> 님이 이미 <string>/{{slug}}</strong> url을 사용하는 중입니다.",
+  "managed_event_dialog_clarification": "바꾸기를 선택하면 알려드립니다. 덮어쓰지 않으려면 돌아가서 제거하십시오.",
   "review_event_type": "이벤트 타입 검토",
   "looking_for_more_analytics": "추가적인 분석을 원하시나요?",
   "looking_for_more_insights": "더 많은 인사이트를 찾고계신가요?",
@@ -1681,21 +1743,46 @@
   "select_user": "사용자 선택",
   "select_event_type": "이벤트 타입 선택",
   "select_date_range": "날짜 범위 선택",
+  "popular_events": "인기 이벤트",
   "no_event_types_found": "이벤트 타입을 찾을 수 없습니다",
+  "average_event_duration": "평균 이벤트 기간",
+  "most_booked_members": "가장 많이 예약한 회원",
+  "least_booked_members": "가장 적게 예약한 회원",
   "events_created": "생성된 이벤트",
   "events_completed": "완료된 이벤트",
   "events_cancelled": "취소된 이벤트",
   "events_rescheduled": "일정이 변경된 이벤트",
+  "from_last_period": "마지막 기간부터",
+  "from_to_date_period": "시작일: {{startDate}} 종료일: {{endDate}}",
   "analytics_for_organisation": "인사이트",
+  "subtitle_analytics": "팀 활동에 대해 자세히 알아보기",
+  "redirect_url_warning": "리디렉션을 추가하면 성공 페이지가 비활성화됩니다. 사용자 지정 성공 페이지에 \"예약 확인됨\"을 언급해야 합니다.",
+  "event_trends": "이벤트 트렌드",
   "clear_filters": "필터 삭제",
+  "hold": "보류",
+  "on_booking_option": "예약 시 결제 징수",
+  "hold_option": "노쇼 수수료 부과",
+  "card_held": "카드 보류됨",
+  "charge_card": "카드 부과",
+  "card_charged": "카드 부과됨",
+  "no_show_fee_amount": "{{amount, currency}} 노쇼 수수료",
   "no_show_fee": "No-show 수수료",
+  "submit_card": "카드 제출",
   "submit_payment_information": "결제 정보 제출",
+  "meeting_awaiting_payment_method": "회의에 대한 결제 수단을 기다리는 중입니다",
+  "no_show_fee_charged_email_subject": "{{amount, currency}}에 대한 노쇼 수수료 부과됨: {{title}} 날짜 {{date}}",
   "no_show_fee_charged_text_body": "No-show 수수료가 부과되었습니다",
+  "no_show_fee_charged_subtitle": "다음 이벤트에 대해 {{amount, currency}}에 대한 노쇼 수수료가 부과되었습니다",
   "error_charging_card": "No-show 수수료 청구 중 문제가 발생했습니다. 나중에 다시 시도해주세요.",
   "collect_no_show_fee": "No-show 수수료를 청구하세요",
   "no_show_fee_charged": "No-show 수수료가 부과됩니다",
   "insights": "인사이트",
+  "testing_workflow_info_message": "이 워크플로를 테스트할 때 이메일 및 SMS는 최소 1시간 전에만 예약할 수 있다는 점에 유의하세요",
   "insights_no_data_found_for_filter": "선택한 필터 또는 날짜에 대한 데이터를 찾을 수 없습니다.",
+  "acknowledge_booking_no_show_fee": "본인은 이 이벤트에 참석하지 않을 경우 {{amount, currency}}에 대한 노쇼 수수료가 내 카드에 적용됨을 인정합니다.",
+  "card_details": "카드 세부정보",
+  "seats_and_no_show_fee_error": "현재 좌석을 활성화할 수 없으므로 노쇼 수수료를 부과할 수 없습니다",
   "complete_your_booking": "예약을 완료하세요",
+  "complete_your_booking_subject": "예약 완료: {{title}} 날짜 {{date}}",
   "email_invite_team": "{{email}} 이 초대되었습니다."
 }
diff --git a/apps/web/public/static/locales/nl/common.json b/apps/web/public/static/locales/nl/common.json
index 81442a7d82..001a730b42 100644
--- a/apps/web/public/static/locales/nl/common.json
+++ b/apps/web/public/static/locales/nl/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Identiteitsprovider",
   "trial_days_left": "U heeft nog $t(day, {\"count\": {{days}} }) over van uw PRO-proefperiode",
   "day_one": "{{count}} dag",
   "day_other": "{{count}} dagen",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "In afwachting van goedkeuring: {{title}} om {{date}}",
   "event_still_awaiting_approval": "Een gebeurtenis wacht nog op uw goedkeuring",
   "booking_submitted_subject": "Boeking verzonden: {{title}} om {{date}}",
+  "download_recording_subject": "Opname downloaden: {{title}} op {{date}}",
+  "download_your_recording": "Download uw opname",
   "your_meeting_has_been_booked": "Uw afspraak is geboekt",
   "event_type_has_been_rescheduled_on_time_date": "Uw {{title}} is verplaatst naar {{date}}.",
   "event_has_been_rescheduled": "Bijgewerkt - Uw gebeurtenis is verplaatst",
@@ -224,6 +227,7 @@
   "done": "Voltooid",
   "all_done": "Helemaal klaar!",
   "all_apps": "Alle apps",
+  "available_apps": "Beschikbare apps",
   "check_email_reset_password": "Controleer uw e-mail. We hebben u een link gestuurd om uw wachtwoord opnieuw in te stellen.",
   "finish": "Voltooien",
   "few_sentences_about_yourself": "Een korte introductie over uzelf. Dit wordt weergegeven op uw persoonlijke pagina.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Nieuw tijdslot toevoegen",
   "add_an_extra_layer_of_security": "Voeg een extra beveiligingslaag toe aan uw account in het geval uw wachtwoord gestolen wordt.",
   "2fa": "Tweestapsverificatie",
+  "2fa_disabled": "Tweestapsverificatie kan alleen worden ingeschakeld voor e-mail- en wachtwoordverificatie",
   "enable_2fa": "Tweestapsverificatie inschakelen",
   "disable_2fa": "Tweestapsverificatie uitschakelen",
   "disable_2fa_recommendation": "Als u tweestapsverificatie wilt deactiveren, raden wij aan om dit zo snel mogelijk ongedaan te maken.",
@@ -585,6 +590,20 @@
   "minutes": "Minuten",
   "round_robin": "Round Robin",
   "round_robin_description": "Afspraken wisselen tussen meerdere teamleden.",
+  "managed_event": "Beheerde gebeurtenis",
+  "username_placeholder": "gebruikersnaam",
+  "managed_event_description": "Maak en distribueer gebeurtenistypen in bulk naar teamleden",
+  "managed": "Beheerd",
+  "managed_event_url_clarification": "\"gebruikersnaam\" wordt gevuld met de gebruikersnaam van de toegewezen leden",
+  "assign_to": "Toewijzen aan",
+  "add_members": "Leden toevoegen...",
+  "count_members_one": "{{count}} lid",
+  "count_members_other": "{{count}} leden",
+  "no_assigned_members": "Geen toegewezen leden",
+  "assigned_to": "Toegewezen aan",
+  "start_assigning_members_above": "Begin met het toewijzen van leden hierboven",
+  "locked_fields_admin_description": "Leden kunnen dit niet bewerken",
+  "locked_fields_member_description": "Deze optie is vergrendeld door de teambeheerder",
   "url": "Link",
   "hidden": "Verborgen",
   "readonly": "Enkel-lezen",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Minimale kennisgevingstermijn",
   "slot_interval": "Tijdslot intervallen",
   "slot_interval_default": "Gebruik evenement lengte (standaard)",
+  "delete_event_type": "Gebeurtenistype verwijderen?",
+  "delete_managed_event_type": "Beheerd gebeurtenistype verwijderen?",
+  "delete_event_type_description": "Iedereen met wie u deze link hebt gedeeld, kan niet meer boeken via deze link.",
+  "delete_managed_event_type_description": "<ul><li>De gebeurtenistypen van leden die aan dit gebeurtenistype zijn toegewezen, worden ook verwijderd.</li><li>Iedereen met wie zij hun link hebben gedeeld, kan niet meer boeken via deze link.</li></ul>",
+  "confirm_delete_event_type": "Ja, verwijderen",
   "delete_account": "Account verwijderen",
   "confirm_delete_account": "Ja, account verwijderen",
   "delete_account_confirmation_message": "Weet u zeker dat u uw {{appName}}-account wilt verwijderen? Iedereen met wie u uw accountlink gedeeld heeft, kan er niet meer mee boeken en alle voorkeuren die u opgeslagen heeft gaan verloren.",
@@ -1126,13 +1150,13 @@
   "current_username": "Huidige gebruikersnaam",
   "example_1": "Voorbeeld 1",
   "example_2": "Voorbeeld 2",
-  "additional_input_label": "Aanvullend invoerlabel",
+  "booking_question_identifier": "Boekingsvraagidentificatiecode",
   "company_size": "Bedrijfsgrootte",
   "what_help_needed": "Waar heeft u hulp bij nodig?",
   "variable_format": "Variabele indeling",
   "webhook_subscriber_url_reserved": "De abonnee-URL voor Webhook is al gedefinieerd",
   "custom_input_as_variable_info": "Negeer alle speciale tekens van het label voor aanvullende invoer (gebruik alleen letters en cijfers) en gebruik hoofdletters voor alle letters en vervang spaties door onderstrepingstekens.",
-  "using_additional_inputs_as_variables": "Hoe gebruik ik aanvullende invoer als variabelen?",
+  "using_booking_questions_as_variables": "Hoe gebruik ik boekingsvragen als variabelen?",
   "download_desktop_app": "Desktop-app downloaden",
   "set_ping_link": "Ping-link instellen",
   "rate_limit_exceeded": "Tariefgrenswaarde overschreden",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Begin van de week",
   "recordings_title": "Opnames",
   "recording": "Opname",
+  "happy_scheduling": "Veel plezier met plannen",
   "select_calendars": "Selecteer de agenda's die u wilt controleren op conflicten om dubbele boekingen te voorkomen.",
   "check_for_conflicts": "Controleer op conflicten",
   "view_recordings": "Opnames weergeven",
@@ -1215,6 +1240,7 @@
   "impersonation": "Imitatie",
   "impersonation_description": "Instellingen voor imitatie van gebruiker beheren",
   "users": "Gebruikers",
+  "user": "Gebruiker",
   "profile_description": "Beheer de instellingen van uw {{appName}}-profiel",
   "users_description": "Hier vindt u een lijst met alle gebruikers",
   "users_listing": "Gebruikersbeschrijving",
@@ -1255,6 +1281,8 @@
   "download_responses": "Reacties downloaden",
   "download_responses_description": "Download alle reacties op uw formulier in CSV-indeling.",
   "download": "Downloaden",
+  "download_recording": "Opname downloaden",
+  "recording_from_your_recent_call": "Een opname van uw recente gesprek op Cal.com is klaar voor download",
   "create_your_first_form": "Maak uw eerste formulier",
   "create_your_first_form_description": "Met routeringsformulieren kunt u kwalificerende vragen stellen en doorverwijzen naar de juiste persoon of het juiste type gebeurtenis.",
   "create_your_first_webhook": "Maak uw eerste webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Basisverificatie",
   "exchange_authentication_ntlm": "NTLM-verificatie",
   "exchange_compression": "GZip-compressie",
+  "exchange_version": "Exchange-versie",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "U kunt hier alle formulieren en routes zien die u heeft gemaakt.",
   "routing_forms_send_email_owner": "E-mail naar eigenaar versturen",
   "routing_forms_send_email_owner_description": "Verstuurt een e-mail naar de eigenaar wanneer het formulier is verzonden",
@@ -1345,7 +1382,7 @@
   "add_limit": "Voeg een limiet toe",
   "team_name_required": "Teamnaam verplicht",
   "show_attendees": "Deel de deelnemersinformatie met de gasten",
-  "how_additional_inputs_as_variables": "Extra invoeren als variabelen gebruiken",
+  "how_booking_questions_as_variables": "Hoe gebruik ik boekingsvragen als variabelen?",
   "format": "Formatteren",
   "uppercase_for_letters": "Gebruik hoofdletters voor alle letters",
   "replace_whitespaces_underscores": "Vervang spaties door onderstrepingstekens",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Nog iets nodig?",
   "billing_help_description": "Als u verder nog hulp nodig heeft bij de facturering, is ons ondersteuningsteam er om u te helpen.",
   "billing_help_cta": "Contact opnemen met de ondersteuning",
-  "ignore_special_characters": "Speciale tekens negeren in uw label Extra invoer. Alleen letters en cijfers gebruiken",
+  "ignore_special_characters_booking_questions": "Negeer speciale tekens in uw boekingsvraagidentificatiecode. Gebruik alleen letters en cijfers",
   "retry": "Opnieuw proberen",
   "fetching_calendars_error": "Er is een probleem opgetreden bij het ophalen van uw agenda's. <1>Probeer het opnieuw</1> of neem contact op met de klantenservice.",
   "calendar_connection_fail": "Agendaverbinding mislukt",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Vaste round-robin",
   "add_one_fixed_attendee": "Voeg één vaste deelnemer en round-robin toe via een aantal deelnemers.",
   "calcom_is_better_with_team": "Cal.com is beter met teams",
+  "the_calcom_team": "Het Cal.com-team",
   "add_your_team_members": "Voeg uw teamleden toe aan uw gebeurtenistypes. Gebruik collectieve planning om iedereen op te nemen of zoek de meest geschikte persoon met round robin-planning.",
   "booking_limit_reached": "Boekingslimiet voor dit gebeurtenistype is bereikt",
   "duration_limit_reached": "Duurlimiet voor dit gebeurtenistype is bereikt",
   "admin_has_disabled": "Een beheerder heeft {{appName}} uitgeschakeld",
   "disabled_app_affects_event_type": "Een beheerder heeft {{appName}} uitgeschakeld die van invloed is op uw gebeurtenistype {{eventType}}",
+  "event_replaced_notice": "Een beheerder heeft een van uw gebeurtenistypen vervangen",
+  "email_subject_slug_replacement": "Een teambeheerder heeft uw gebeurtenis vervangen /{{slug}}",
+  "email_body_slug_replacement_notice": "Een beheerder van het team <strong>{{teamName}}</strong> heeft uw gebeurtenistype <strong>/{{slug}}</strong> vervangen door een beheerd gebeurtenistype dat de beheerder beheert.",
+  "email_body_slug_replacement_info": "Uw link blijft werken, maar sommige instellingen ervoor kunnen gewijzigd zijn. U kunt deze bekijken in gebeurtenistypen.",
+  "email_body_slug_replacement_suggestion": "Neem contact op met uw beheerder als u vragen heeft over het gebeurtenistype.<br /><br />Veel plezier met plannen, <br />Het Cal.com-team",
   "disable_payment_app": "De beheerder heeft {{appName}} uitgeschakeld die van invloed is op uw gebeurtenistype {{title}}. Deelnemers kunnen dit tyoe gebeurtenissen nog steeds boeken, maar worden niet gevraagd te betalen. U kunt het gebeurtenistype verbergen om dit te voorkomen totdat uw beheerde de betaalmethode opnieuw inschakelt.",
   "payment_disabled_still_able_to_book": "Deelnemers kunnen dit type gebeurtenis nog steeds boeken, maar worden niet gevraagd te betalen. U kunt het gebeurtenistype verbergen om dit te voorkomen totdat uw beheerde de betaalmethode opnieuw inschakelt.",
   "app_disabled_with_event_type": "De beheerder heeft {{appName}} uitgeschakeld die van invloed is op uw gebeurtenistype {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Overschrijving bijwerken",
   "event_type_duplicate_copy_text": "{{slug}}-kopie",
   "set_as_default": "Als standaard instellen",
+  "hide_eventtype_details": "Gebeurtenistypegegevens verbergen",
   "show_navigation": "Navigatie weergeven",
   "hide_navigation": "Navigatie verbergen",
   "verification_code_sent": "Verificatiecode verzonden",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Maak uw eerste webhook voor dit teamgebeurtenistype",
   "create_webhook_team_event_type": "Maak een webhook voor dit teamgebeurtenistype",
   "disable_success_page": "Succespagina uitschakelen (werkt alleen als u een omleidings-URL heeft)",
+  "invalid_admin_password": "U bent beheerder, maar u heeft geen wachtwoord van minimaal 15 tekens of nog geen tweestapsverificatie",
   "change_password_admin": "Wijzig het wachtwoord om beheerderstoegang te krijgen",
   "username_already_taken": "De gebruikersnaam is al in gebruik",
   "assignment": "Toewijzing",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "“/ee” Enterprise-licentie",
   "enterprise_booking_fee": "Vanaf {{enterprise_booking_fee}}/maand",
   "enterprise_license_includes": "Alles voor een commerciële toepassing",
+  "no_need_to_keep_your_code_open_source": "Uw code hoeft niet open source te zijn",
   "repackage_rebrand_resell": "Gemakkelijk opnieuw verpakken, rebranden en doorverkopen",
   "a_vast_suite_of_enterprise_features": "Een uitgebreid pakket bedrijfsfuncties",
   "free_license_fee": "$ 0,00/maand",
@@ -1602,6 +1648,7 @@
   "default_app_link_title": "Stel een standaard app-link in",
   "default_app_link_description": "Door een standaard app-link in te stellen kunnen alle nieuw gemaakte gebeurtenistypes de door u ingestelde app-link gebruiken.",
   "change_default_conferencing_app": "Als standaard instellen",
+  "organizer_default_conferencing_app": "Standaardapp organisator",
   "under_maintenance": "Onbereikbaar wegens onderhoud",
   "under_maintenance_description": "Het {{appName}}-team voert gepland onderhoud uit. Neem contact op met de ondersteuning als u vragen heeft.",
   "event_type_seats": "{{numberOfSeats}} plaatsen",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "Onvoldoende plaatsen",
   "form_builder_field_already_exists": "Een veld met deze naam bestaat al",
   "form_builder_field_add_subtitle": "De gestelde vragen op de boekingspagina aanpassen",
+  "show_on_booking_page": "Op boekingspagina weergeven",
   "get_started_zapier_templates": "Aan de slag met Zapier-sjablonen",
   "team_is_unpublished": "{{team}} is niet gepubliceerd",
   "team_is_unpublished_description": "Deze teamlink is momenteel niet beschikbaar. Neem contact op met de teameigenaar of vraag hem het te publiceren.",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "Voeg 1 optie per regel toe",
   "select_a_router": "Selecteer een router",
   "add_a_new_route": "Voeg een nieuwe route toe",
+  "make_informed_decisions": "Maak geïnformeerde beslissingen met Inzichten",
+  "make_informed_decisions_description": "Ons Inzichten-dashboard geeft alle activiteiten in uw team weer en toont u trends die betere teamplanning en besluitvorming mogelijk maken.",
+  "view_bookings_across": "Boekingen van alle leden weergeven",
+  "view_bookings_across_description": "Bekijk wie het meest geboekt wordt en zorg voor de beste verdeling over uw team",
+  "identify_booking_trends": "Boekingstrends identificeren",
+  "identify_booking_trends_description": "Bekijk welke tijden van de week en welke tijden overdag populair zijn voor uw boekers",
+  "spot_popular_event_types": "Populaire gebeurtenistypen spotten",
+  "spot_popular_event_types_description": "Bekijk welke van uw gebeurtenistypen de meeste kliks en boekingen ontvangen",
   "no_responses_yet": "Nog geen reacties",
   "this_will_be_the_placeholder": "Dit wordt de plaatshouder",
   "this_meeting_has_not_started_yet": "Deze vergadering is nog niet begonnen",
@@ -1649,8 +1705,84 @@
   "verification_code": "Verificatiecode",
   "can_you_try_again": "Kunt u het opnieuw proberen met een andere tijd?",
   "verify": "Verifiëren",
+  "timezone_variable": "Tijdzone",
+  "timezone_info": "De tijdzone van de ontvanger",
+  "event_end_time_variable": "Eindtijd gebeurtenis",
+  "event_end_time_info": "De eindtijd van de gebeurtenis",
+  "cancel_url_variable": "Annulerings-URL",
+  "cancel_url_info": "De URL om de boeking te annuleren",
+  "reschedule_url_variable": "Verplaatsings-URL",
+  "reschedule_url_info": "De URL om de boeking te verplaatsen",
+  "invalid_event_name_variables": "Uw gebeurtenisnaam bevat een ongeldige variabele",
   "select_all": "Alles selecteren",
   "default_conferencing_bulk_title": "Bestaande gebeurtenistypen in bulk bijwerken",
-  "invalid_event_name_variables": "Uw gebeurtenisnaam bevat een ongeldige variabele",
-  "default_conferencing_bulk_description": "Werk de locaties voor de geselecteerde gebeurtenistypen bij"
+  "members_default_schedule": "Standaardschema lid",
+  "set_by_admin": "Ingesteld door teambeheerder",
+  "members_default_location": "Standaardlocatie lid",
+  "members_default_schedule_description": "Wij gebruiken de standaard beschikbaarheidsplanning van elk lid. Ze kunnen dit bewerken of wijzigen.",
+  "requires_at_least_one_schedule": "U moet ten minste één planning hebben",
+  "default_conferencing_bulk_description": "Werk de locaties voor de geselecteerde gebeurtenistypen bij",
+  "locked_for_members": "Vergrendeld voor leden",
+  "locked_apps_description": "Leden kunnen de actieve apps zien, maar kunnen geen appinstellingen bewerken",
+  "locked_webhooks_description": "Leden kunnen de actieve webhooks zien, maar kunnen geen webhookinstellingen bewerken",
+  "locked_workflows_description": "Leden kunnen de actieve werkstromen zien, maar kunnen geen werkstroominstellingen bewerken",
+  "locked_by_admin": "Vergrendeld door beheerder",
+  "app_not_connected": "U heeft geen {{appName}}-account gekoppeld.",
+  "connect_now": "Nu koppelen",
+  "managed_event_dialog_confirm_button_one": "{{count}} lid vervangen en informeren",
+  "managed_event_dialog_confirm_button_other": "{{count}} leden vervangen en informeren",
+  "managed_event_dialog_title_one": "De URL /{{slug}} bestaat al voor {{count}} lid. Wilt u deze vervangen?",
+  "managed_event_dialog_title_other": "De URL /{{slug}} bestaat al voor {{count}} leden. Wilt u deze vervangen?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> gebruikt al de URL <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> gebruiken al de URL <string>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Als u ervoor kiest om het te vervangen, informeren wij hen daar over. Ga terug en verwijder ze als u ze niet wilt overschrijven.",
+  "review_event_type": "Gebeurtenistype bekijken",
+  "looking_for_more_analytics": "Op zoek naar meer analyses?",
+  "looking_for_more_insights": "Op zoek naar meer inzichten?",
+  "add_filter": "Filter toevoegen",
+  "select_user": "Gebruiker selecteren",
+  "select_event_type": "Gebeurtenistype selecteren",
+  "select_date_range": "Datumbereik selecteren",
+  "popular_events": "Populaire gebeurtenissen",
+  "no_event_types_found": "Geen gebeurtenistypen gevonden",
+  "average_event_duration": "Gemiddelde gebeurtenisduur",
+  "most_booked_members": "Meest geboekte leden",
+  "least_booked_members": "Minst geboekte leden",
+  "events_created": "Gemaakt gebeurtenissen",
+  "events_completed": "Voltooide gebeurtenissen",
+  "events_cancelled": "Geannuleerde gebeurtenissen",
+  "events_rescheduled": "Verplaatste gebeurtenissen",
+  "from_last_period": "van afgelopen periode",
+  "from_to_date_period": "Van: {{startDate}} Tot: {{endDate}}",
+  "analytics_for_organisation": "Inzichten",
+  "subtitle_analytics": "Meer informatie over de activiteit van uw team",
+  "redirect_url_warning": "Als u een omleiding toevoegt, wordt de succespagina uitgeschakeld. Zorg ervoor dat u op uw aangepaste succespagina \"Boeking bevestigd\" vermeldt.",
+  "event_trends": "Gebeurtenistrends",
+  "clear_filters": "Filters wissen",
+  "hold": "Vasthouden",
+  "on_booking_option": "Ontvang betaling bij boeking",
+  "hold_option": "Afwezigheidsvergoeding in rekening brengen",
+  "card_held": "Kaart vastgehouden",
+  "charge_card": "In rekening brengen op kaart",
+  "card_charged": "In rekening gebracht op kaart",
+  "no_show_fee_amount": "{{amount, currency}} afwezigheidsvergoeding",
+  "no_show_fee": "Afwezigheidsvergoeding",
+  "submit_card": "Kaart versturen",
+  "submit_payment_information": "Betaalgegevens versturen",
+  "meeting_awaiting_payment_method": "Uw vergadering wacht op een betaalmethode",
+  "no_show_fee_charged_email_subject": "Afwezigheidsvergoeding van {{amount, currency}} in rekening gebracht voor {{title}} om {{date}}",
+  "no_show_fee_charged_text_body": "Afwezigheidsvergoeding is in rekening gebracht",
+  "no_show_fee_charged_subtitle": "Er is een afwezigheidsvergoeding van {{amount, currency}} in rekening gebracht voor de volgende gebeurtenis",
+  "error_charging_card": "Er is iets misgegaan met het in rekening brengen van de afwezigheidsvergoeding. Probeer het later opnieuw.",
+  "collect_no_show_fee": "Afwezigheidsvergoeding ontvangen",
+  "no_show_fee_charged": "Afwezigheidsvergoeding in rekening gebracht",
+  "insights": "Inzichten",
+  "testing_workflow_info_message": "Let er bij het testen van deze werkstroom op dat e-mails en sms minimaal 1 uur van tevoren kunnen gepland moeten worden",
+  "insights_no_data_found_for_filter": "Geen gegevens gevonden voor het geselecteerde filter of de geselecteerde datums.",
+  "acknowledge_booking_no_show_fee": "Ik erken dat als ik deze gebeurtenis niet bijwoon, er {{amount, currency}} aan afwezigheidsvergoeding van mijn kaart worden afgeschreven.",
+  "card_details": "Kaartgegevens",
+  "seats_and_no_show_fee_error": "Kan op dit moment geen plaatsen inschakelen en afwezigheidsvergoeding in rekening brengen",
+  "complete_your_booking": "Voltooi uw boeking",
+  "complete_your_booking_subject": "Voltooi uw boeking: {{title}} op {{date}}",
+  "email_invite_team": "{{email}} is uitgenodigd"
 }
diff --git a/apps/web/public/static/locales/no/common.json b/apps/web/public/static/locales/no/common.json
index d7da1a79e5..26a0992d11 100644
--- a/apps/web/public/static/locales/no/common.json
+++ b/apps/web/public/static/locales/no/common.json
@@ -1101,13 +1101,11 @@
   "current_username": "Nåværende brukernavn",
   "example_1": "Eksempel 1",
   "example_2": "Eksempel 2",
-  "additional_input_label": "Etikett for tilleggs-input",
   "company_size": "Bedriftsstørrelse",
   "what_help_needed": "Hva trenger du hjelp med?",
   "variable_format": "Variabel format",
   "webhook_subscriber_url_reserved": "Webhook-abonnent-url er allerede definert",
   "custom_input_as_variable_info": "Ignorer alle spesialtegn i tilleggs-input-etiketten (bruk bare bokstaver og tall), bruk store bokstaver for alle bokstaver og erstatt mellomrom med understrek.",
-  "using_additional_inputs_as_variables": "Hvordan bruker jeg Tilleggsinput som variabler?",
   "download_desktop_app": "Last ned skrivebordsappen",
   "set_ping_link": "Sett Ping-lenke",
   "rate_limit_exceeded": "Sats-grensen er overskredet",
@@ -1312,7 +1310,6 @@
   "add_limit": "Legg til Grense",
   "team_name_required": "Team-navn er påkrevd",
   "show_attendees": "Del deltakerinformasjon mellom gjester",
-  "how_additional_inputs_as_variables": "Hvordan bruke Tilleggs-input som Variabler",
   "format": "Format",
   "uppercase_for_letters": "Bruk store bokstaver for alle bokstaver",
   "replace_whitespaces_underscores": "Erstatt mellomrom med understrek",
@@ -1327,7 +1324,6 @@
   "billing_help_title": "Trenger du noe annet?",
   "billing_help_description": "Hvis du trenger ytterligere hjelp med betaling, er supportteamet vårt her for å hjelpe.",
   "billing_help_cta": "Kontakt kundeservice",
-  "ignore_special_characters": "Ignorer spesialtegn i Tilleggsinput-etiketten. Bruk kun bokstaver og tall",
   "retry": "Prøv igjen",
   "fetching_calendars_error": "Det oppsto et problem med å hente kalenderne dine. Vennligst <1>prøv igjen</1> eller ta kontakt med kundeservice.",
   "calendar_connection_fail": "Kalender-tilkobling mislyktes",
@@ -1466,5 +1462,6 @@
   "sso_configuration": "Enkel Pålogging",
   "email_no_user_cta": "Opprett brukeren din",
   "change_default_conferencing_app": "Sett som standard",
-  "booking_confirmation_failed": "Booking-bekreftelse feilet"
+  "booking_confirmation_failed": "Booking-bekreftelse feilet",
+  "timezone_variable": "Tidssone"
 }
diff --git a/apps/web/public/static/locales/pl/common.json b/apps/web/public/static/locales/pl/common.json
index f6263b04d8..27a6c26541 100644
--- a/apps/web/public/static/locales/pl/common.json
+++ b/apps/web/public/static/locales/pl/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Dostawca tożsamości",
   "trial_days_left": "Pozostało Ci $t(day, {\"count\": {{days}} }) w wersji próbnej PRO",
   "day_one": "{{count}} dzień",
   "day_other": "{{count}} dni",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Oczekiwanie na zatwierdzenie: {{title}} w {{date}}",
   "event_still_awaiting_approval": "Wydarzenie nadal oczekuje na Twoje zatwierdzenie",
   "booking_submitted_subject": "Rezerwacja potwierdzona: {{title}} w {{date}}",
+  "download_recording_subject": "Pobierz nagranie: {{title}} z {{date}}",
+  "download_your_recording": "Pobierz nagranie",
   "your_meeting_has_been_booked": "Twoje spotkanie zostało zarezerwowane",
   "event_type_has_been_rescheduled_on_time_date": "Twój {{title}} został przełożony na {{date}}.",
   "event_has_been_rescheduled": "Zaktualizowano - Twoje wydarzenie zostało przełożone",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "Potrzebujesz konta pro aby korzystać z zespołów, jesteś ukryty do czasu ulepszenia.",
   "link_expires": "P.S. Wygasa za {{expiresIn}} godzin.",
   "upgrade_to_per_seat": "Ulepsz do Per-Seat",
-  "seat_options_doesnt_support_confirmation": "Opcja miejsc nie obsługuje wymogu potwierdzenia.",
+  "seat_options_doesnt_support_confirmation": "Opcja miejsc nie obsługuje wymogu potwierdzenia",
   "team_upgrade_seats_details": "Spośród {{memberCount}} członków Twojego zespołu, {{unpaidCount}} miejsc(e) nie jest opłacane. Szacowany całkowity koszt Twojego członkostwa w liczbie ${{seatPrice}} na miesiąc wynosi ${{totalCost}} na miesiąc.",
   "team_upgrade_banner_description": "Dziękujemy za wypróbowanie naszego nowego planu zespołowego. Zauważyliśmy, że Twój zespół „{{teamName}}” trzeba ulepszyć.",
   "team_upgrade_banner_action": "Ulepsz tutaj",
@@ -224,6 +227,7 @@
   "done": "Gotowe",
   "all_done": "Wszystko gotowe!",
   "all_apps": "Wszystkie",
+  "available_apps": "Dostępne aplikacje",
   "check_email_reset_password": "Sprawdź swój e-mail. Wysłaliśmy Ci link do zresetowania hasła.",
   "finish": "Ukończ",
   "few_sentences_about_yourself": "Kilka zdań o Tobie. To pojawi się na Twojej osobistej stronie URL.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Dodaj nowy przedział czasowy",
   "add_an_extra_layer_of_security": "Dodaj dodatkową warstwę zabezpieczeń do swojego konta na wypadek kradzieży hasła.",
   "2fa": "Uwierzytelnianie dwuetapowe",
+  "2fa_disabled": "Uwierzytelnianie dwuetapowe może zostać włączone tylko do uwierzytelniania adresu e-mail i hasła",
   "enable_2fa": "Włącz uwierzytelnianie dwuskładnikowe",
   "disable_2fa": "Wyłącz uwierzytelnianie dwuetapowe",
   "disable_2fa_recommendation": "Jeśli chcesz wyłączyć 2FA, zalecamy ponowne włączenie go tak szybko, jak to możliwe.",
@@ -433,7 +438,7 @@
   "password_hint_min": "Długość co najmniej 7 znaków",
   "password_hint_admin_min": "Długość co najmniej 15 znaków",
   "password_hint_num": "Zawrzyj co najmniej 1 cyfrę",
-  "max_limit_allowed_hint": "Może składać się maksymalnie z {{limit}} znaków.",
+  "max_limit_allowed_hint": "Może składać się z maksymalnie {{limit}} znaków",
   "invalid_password_hint": "Hasło musi składać się z co najmniej {{passwordLength}} znaków, zawierać co najmniej jedną cyfrę oraz kombinację wielkich i małych liter",
   "incorrect_password": "Hasło jest nieprawidłowe.",
   "incorrect_username_password": "Nieprawidłowa nazwa użytkownika lub hasło.",
@@ -585,6 +590,20 @@
   "minutes": "Minuty",
   "round_robin": "Round Robin",
   "round_robin_description": "Cykl spotkań między wieloma członkami zespołu.",
+  "managed_event": "Zarządzane wydarzenie",
+  "username_placeholder": "nazwa użytkownika",
+  "managed_event_description": "Masowo twórz i udostępniaj typy wydarzeń członkom zespołu",
+  "managed": "Zarządzane",
+  "managed_event_url_clarification": "Pole „nazwa użytkownika” zostanie uzupełnione nazwami przypisanych użytkowników",
+  "assign_to": "Przypisz do",
+  "add_members": "Dodaj członków...",
+  "count_members_one": "Liczba członków: {{count}}",
+  "count_members_other": "Liczba członków: {{count}}",
+  "no_assigned_members": "Brak przypisanych członków",
+  "assigned_to": "Przypisano do:",
+  "start_assigning_members_above": "Rozpocznij przypisywanie członków powyżej",
+  "locked_fields_admin_description": "Członkowie nie będą mogli tego edytować",
+  "locked_fields_member_description": "Ta opcja została zablokowana przez administratora zespołu",
   "url": "Adres URL",
   "hidden": "Ukryte",
   "readonly": "Tylko do odczytu",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Minimalne powiadomienie",
   "slot_interval": "Przedziały czasowe",
   "slot_interval_default": "Użyj długości zdarzenia (domyślnie)",
+  "delete_event_type": "Usunąć typ wydarzenia?",
+  "delete_managed_event_type": "Usunąć typ zarządzanego wydarzenia?",
+  "delete_event_type_description": "Osoby, którym udostępniono ten link, nie będą już mogły dokonać rezerwacji za jego pomocą.",
+  "delete_managed_event_type_description": "<ul><li>Typy wydarzeń należące do członków przypisanych do tego typu wydarzenia również zostaną usunięte.</li><li>Osoby, którym udostępniono linki, nie będą już mogły dokonać rezerwacji za ich pomocą.</li></ul>",
+  "confirm_delete_event_type": "Tak, usuń",
   "delete_account": "Usuń konto",
   "confirm_delete_account": "Tak, usuń konto",
   "delete_account_confirmation_message": "Czy na pewno chcesz usunąć swój {{appName}}. umówić konto? Każdy, kto udostępnił link do Twojego konta, nie będzie już mógł zarezerwować za jego pomocą i wszystkie zapisane preferencje zostaną utracone.",
@@ -1126,13 +1150,13 @@
   "current_username": "Bieżąca nazwa użytkownika",
   "example_1": "Przykład 1",
   "example_2": "Przykład 2",
-  "additional_input_label": "Dodatkowa etykieta wejściowa",
+  "booking_question_identifier": "Identyfikator pytania dotyczącego rezerwacji",
   "company_size": "Wielkość firmy",
   "what_help_needed": "W czym potrzebujesz pomocy?",
   "variable_format": "Format zmiennej",
   "webhook_subscriber_url_reserved": "Adres URL subskrybenta Webhook jest już zdefiniowany.",
   "custom_input_as_variable_info": "Ignoruj wszystkie znaki specjalne etykiety dodatkowych danych wejściowych (używaj tylko liter i cyfr), użyj wielkich liter w przypadku wszystkich liter i zastąp spacje znakami podkreślenia.",
-  "using_additional_inputs_as_variables": "Jak wykorzystać dodatkowe dane wejściowe jako zmienne?",
+  "using_booking_questions_as_variables": "Jak mogę używać pytań dotyczących rezerwacji jako zmiennych?",
   "download_desktop_app": "Pobierz aplikację komputerową",
   "set_ping_link": "Ustaw link do aplikacji Ping",
   "rate_limit_exceeded": "Przekroczono limit prób",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Początek tygodnia",
   "recordings_title": "Nagrania",
   "recording": "Nagranie",
+  "happy_scheduling": "Miłego planowania",
   "select_calendars": "Wybierz kalendarze, które chcesz sprawdzić pod kątem konfliktów, aby uniknąć podwójnych rezerwacji.",
   "check_for_conflicts": "Sprawdź konflikty",
   "view_recordings": "Wyświetl nagrania",
@@ -1215,6 +1240,7 @@
   "impersonation": "Podszywanie się",
   "impersonation_description": "Ustawienia do zarządzania podszywaniem się pod użytkownika",
   "users": "Użytkownicy",
+  "user": "Użytkownik",
   "profile_description": "Zarządzaj ustawieniami swojego profilu {{appName}}",
   "users_description": "Tutaj znajdziesz listę wszystkich użytkowników",
   "users_listing": "Lista użytkowników",
@@ -1255,6 +1281,8 @@
   "download_responses": "Pobierz odpowiedzi",
   "download_responses_description": "Pobierz wszystkie odpowiedzi do formularza w formacie CSV.",
   "download": "Pobierz",
+  "download_recording": "Pobierz nagranie",
+  "recording_from_your_recent_call": "Nagranie z ostatniego połączenia na Cal.com jest gotowe do pobrania",
   "create_your_first_form": "Utwórz pierwszy formularz",
   "create_your_first_form_description": "Za pomocą formularzy przekierowujących możesz zadawać pytania profilujące i przekierowywać użytkowników do odpowiednich osób lub typów wydarzeń.",
   "create_your_first_webhook": "Utwórz pierwszy Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Uwierzytelnianie podstawowe",
   "exchange_authentication_ntlm": "Uwierzytelnianie NTLM",
   "exchange_compression": "Kompresja gzip",
+  "exchange_version": "Wersja Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Możesz tutaj zobaczyć wszystkie utworzone przez siebie formularze i przekierowania.",
   "routing_forms_send_email_owner": "Wyślij wiadomość e-mail do właściciela",
   "routing_forms_send_email_owner_description": "Wysyła wiadomość e-mail do właściciela, gdy formularz zostanie przesłany.",
@@ -1341,11 +1378,11 @@
   "limit_booking_frequency": "Ogranicz częstotliwość rezerwacji",
   "limit_booking_frequency_description": "Ogranicz liczbę rezerwacji tego wydarzenia",
   "limit_total_booking_duration": "Ogranicz całkowity czas trwania rezerwacji",
-  "limit_total_booking_duration_description": "Ogranicz całkowity czas, przez jaki to wydarzenie może być rezerwowane.",
+  "limit_total_booking_duration_description": "Ogranicz całkowity czas, przez jaki można rezerwować to wydarzenie",
   "add_limit": "Dodaj limit",
   "team_name_required": "Wymagana nazwa zespołu",
   "show_attendees": "Udostępniaj gościom informacje o uczestnikach",
-  "how_additional_inputs_as_variables": "Jak wykorzystać dodatkowe dane wejściowe jako zmienne?",
+  "how_booking_questions_as_variables": "Jak używać pytań dotyczących rezerwacji jako zmiennych?",
   "format": "Formatowanie",
   "uppercase_for_letters": "Użyj wielkich liter w przypadku wszystkich liter",
   "replace_whitespaces_underscores": "Zastąp spacje podkreśleniami",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Potrzebujesz czegoś innego?",
   "billing_help_description": "Jeśli potrzebujesz dodatkowej pomocy w rozliczaniu, nasz zespół pomocy technicznej chętnie jej udzieli.",
   "billing_help_cta": "Skontaktuj się z pomocą techniczną",
-  "ignore_special_characters": "Ignoruj znaki specjalne w dodatkowej etykiecie wejściowej. Używaj tylko liter i cyfr",
+  "ignore_special_characters_booking_questions": "Ignoruj znaki specjalne w identyfikatorze pytania dotyczącego rezerwacji. Używaj tylko liter i cyfr",
   "retry": "Spróbuj ponownie",
   "fetching_calendars_error": "Podczas pobierania kalendarzy wystąpił problem. <1>Spróbuj ponownie</1> lub skontaktuj się z pomocą techniczną.",
   "calendar_connection_fail": "Połączenie z kalendarzem nie powiodło się",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Stały algorytm karuzelowy",
   "add_one_fixed_attendee": "Dodaj jednego stałego uczestnika i przeglądaj uczestników zgodnie z algorytmem karuzelowym",
   "calcom_is_better_with_team": "Usługa Cal.com jest lepsza z zespołami",
+  "the_calcom_team": "Zespół Cal.com",
   "add_your_team_members": "Dodaj członków zespołu do typów wydarzeń. Użyj zbiorowego ustalania harmonogramu, aby uwzględnić wszystkich lub znajdź najodpowiedniejszą osobę za pomocą algorytmu karuzelowego.",
   "booking_limit_reached": "Osiągnięto limit rezerwacji tego typu wydarzenia",
   "duration_limit_reached": "Osiągnięto limit czasu trwania tego typu wydarzenia",
   "admin_has_disabled": "Administrator wyłączył aplikację {{appName}}",
   "disabled_app_affects_event_type": "Administrator wyłączył aplikację {{appName}}, która ma wpływ na Twój typ wydarzenia ({{eventType}})",
+  "event_replaced_notice": "Administrator zastąpił jeden z Twoich typów wydarzeń",
+  "email_subject_slug_replacement": "Administrator zespołu zastąpił Twoje wydarzenie /{{slug}}",
+  "email_body_slug_replacement_notice": "Administrator zespołu <strong>{{teamName}}</strong> zastąpił Twój typ wydarzenia <strong>/{{slug}}</strong> kontrolowanym przez siebie typem zarządzanych wydarzeń.",
+  "email_body_slug_replacement_info": "Twój link nadal będzie działał, ale niektóre z jego ustawień mogły ulec zmianie. Możesz zobaczyć szczegóły w typach wydarzeń.",
+  "email_body_slug_replacement_suggestion": "Jeśli masz jakiekolwiek pytania dotyczące typu wydarzenia, skontaktuj się z administratorem.<br /><br />Miłego planowania, <br />Zespół Cal.com",
   "disable_payment_app": "Administrator wyłączył aplikację {{appName}}, która ma wpływ na Twój typ wydarzenia ({{title}}). Uczestnicy nadal mogą rezerwować wydarzenie tego typu, ale nie zostaną poproszeni o płatność. Możesz ukryć ten typ wydarzenia, aby temu zapobiec, póki administrator nie włączy ponownie Twojej metody płatności.",
   "payment_disabled_still_able_to_book": "Uczestnicy nadal mogą rezerwować wydarzenie tego typu, ale nie zostaną poproszeni o płatność. Możesz ukryć ten typ wydarzenia, aby temu zapobiec, póki administrator nie włączy ponownie Twojej metody płatności.",
   "app_disabled_with_event_type": "Administrator wyłączył aplikację {{appName}}, która ma wpływ na Twój typ wydarzenia ({{title}}).",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Zaktualizuj zastąpienie",
   "event_type_duplicate_copy_text": "{{slug}}-kopia",
   "set_as_default": "Ustaw jako domyślne",
+  "hide_eventtype_details": "Ukryj szczegóły typu wydarzenia",
   "show_navigation": "Pokaż nawigację",
   "hide_navigation": "Ukryj nawigację",
   "verification_code_sent": "Wysłano kod weryfikacyjny",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Utwórz swój pierwszy element webhook dla tego typu wydarzenia zespołowego",
   "create_webhook_team_event_type": "Utwórz element webhook dla tego typu wydarzenia zespołowego",
   "disable_success_page": "Wyłącz stronę powodzenia (działa tylko wtedy, gdy masz adres URL przekierowania)",
+  "invalid_admin_password": "Jesteś administratorem, ale Twoje hasło jest krótsze niż 15 znaków lub nie używasz jeszcze uwierzytelniania dwuetapowego",
   "change_password_admin": "Zmień hasło, aby uzyskać uprawnienia dostępu administratora",
   "username_already_taken": "Nazwa użytkownika jest już zajęta",
   "assignment": "Przypisanie",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "Licencja dla przedsiębiorstw „/ee”",
   "enterprise_booking_fee": "Od {{enterprise_booking_fee}}/miesiąc",
   "enterprise_license_includes": "Wszystko, co niezbędne do zastosowań komercyjnych",
+  "no_need_to_keep_your_code_open_source": "Twój kod nie musi pozostawać otwarty",
   "repackage_rebrand_resell": "Łatwa modyfikacja wyglądu, marki i możliwość odsprzedaży",
   "a_vast_suite_of_enterprise_features": "Duży wybór funkcji dla przedsiębiorstw",
   "free_license_fee": "0,00 USD/miesiąc",
@@ -1590,44 +1636,46 @@
   "recommended_next_steps": "Zalecane następne kroki",
   "create_a_managed_event": "Utwórz typ zarządzanego wydarzenia",
   "meetings_are_better_with_the_right": "Spotkania idą lepiej, gdy uczestniczą w nich właściwi członkowie zespołu. Zaproś ich teraz.",
-  "create_a_one_one_template": "Utwórz szablon jeden na jeden dla danego typu wydarzenia i udostępnij go wielu użytkownikom.",
+  "create_a_one_one_template": "Utwórz jeden szablon dla danego typu wydarzenia i udostępnij go wielu użytkownikom.",
   "collective_or_roundrobin": "Zbiorowo lub według algorytmu karuzelowego",
   "book_your_team_members": "Zarezerwuj wszystkich członków zespołu za pomocą wydarzeń zbiorowych lub przeglądaj dostępne osoby, aby znaleźć tę właściwą za pomocą algorytmu karuzelowego.",
-  "event_no_longer_attending_subject": "Nie bierzesz już udziału w wydarzeniu {{title}} odbywającym się {{date}}.",
-  "no_longer_attending": "Nie bierzesz już udziału w tym wydarzeniu.",
-  "attendee_no_longer_attending_subject": "Uczestnik nie bierze już udziału w wydarzeniu {{title}} odbywającym się {{date}}.",
+  "event_no_longer_attending_subject": "Nie bierzesz już udziału w wydarzeniu {{title}} odbywającym się {{date}}",
+  "no_longer_attending": "Nie bierzesz już udziału w tym wydarzeniu",
+  "attendee_no_longer_attending_subject": "Uczestnik nie bierze już udziału w wydarzeniu {{title}} odbywającym się {{date}}",
   "attendee_no_longer_attending": "Uczestnik nie bierze już udziału w Twoim wydarzeniu.",
-  "attendee_no_longer_attending_subtitle": "Użytkownik {{name}} anulował rezerwację. To oznacza, że zwolniło się miejsce w tym terminie.",
-  "create_event_on": "Utwórz wydarzenie w terminie",
+  "attendee_no_longer_attending_subtitle": "Użytkownik {{name}} anulował rezerwację. To znaczy, że zwolniło się miejsce w tym terminie",
+  "create_event_on": "Utwórz wydarzenie w kalendarzu",
   "default_app_link_title": "Ustaw domyślny link do aplikacji",
   "default_app_link_description": "Ustawienie domyślnego linku do aplikacji pozwala wszystkim nowo utworzonym typom wydarzeń na używanie ustawionego przez Ciebie linku do aplikacji.",
   "change_default_conferencing_app": "Ustaw jako domyślne",
+  "organizer_default_conferencing_app": "Domyślna aplikacja organizatora",
   "under_maintenance": "Przerwa konserwacyjna",
   "under_maintenance_description": "Zespół {{appName}} przeprowadza zaplanowane prace konserwacyjne. Jeśli masz jakieś pytania, skontaktuj się z pomocą techniczną.",
   "event_type_seats": "Liczba stanowisk: {{numberOfSeats}}",
   "booking_questions_title": "Pytania dotyczące rezerwacji",
   "booking_questions_description": "Dostosuj pytania zadawane na stronie rezerwacji",
   "add_a_booking_question": "Dodaj pytanie",
-  "duplicate_email": "Adres e-mail jest zduplikowany.",
+  "duplicate_email": "Adres e-mail jest zduplikowany",
   "booking_with_payment_cancelled": "Nie można już zapłacić za to wydarzenie",
   "booking_with_payment_cancelled_already_paid": "Zwrot środków za tę rezerwację jest już w drodze.",
   "booking_with_payment_cancelled_refunded": "Płatność za tę rezerwację została zwrócona.",
   "booking_confirmation_failed": "Potwierdzenie rezerwacji nie powiodło się",
   "not_enough_seats": "Za mało miejsc",
-  "form_builder_field_already_exists": "Pole o tej nazwie już istnieje.",
+  "form_builder_field_already_exists": "Pole o tej nazwie już istnieje",
   "form_builder_field_add_subtitle": "Dostosuj pytania zadawane na stronie rezerwacji",
+  "show_on_booking_page": "Wyświetl na stronie rezerwacji",
   "get_started_zapier_templates": "Zacznij korzystać z szablonów Zapier",
-  "team_is_unpublished": "Zespół {{team}} nie został opublikowany.",
-  "team_is_unpublished_description": "Ten link zespołu jest obecnie niedostępny. Skontaktuj się z właścicielem zespołu lub poproś o jego opublikowanie.",
+  "team_is_unpublished": "Zespół {{team}} nie został opublikowany",
+  "team_is_unpublished_description": "Link tego zespołu jest obecnie niedostępny. Skontaktuj się z właścicielem zespołu lub poproś o jego opublikowanie.",
   "team_member": "Członek zespołu",
   "a_routing_form": "Formularz przekierowania",
   "form_description_placeholder": "Opis formularza",
   "keep_me_connected_with_form": "Zachowaj połączenie z formularzem",
   "fields_in_form_duplicated": "Duplikowanie zmian w formularzu przekierowania i jego polach zostanie odzwierciedlone w duplikacie.",
   "form_deleted": "Formularz usunięty",
-  "delete_form": "Usuń formularz",
+  "delete_form": "Czy na pewno chcesz usunąć ten formularz?",
   "delete_form_action": "Tak, usuń formularz",
-  "delete_form_confirmation": "Czy na pewno chcesz usunąć ten formularz? Osoby, którym udostępniono link, nie będą już mogły użyć go do rezerwacji. Ponadto wszystkie powiązane odpowiedzi zostaną usunięte.",
+  "delete_form_confirmation": "Osoby, którym udostępniono ten link, nie będą miały już do niego dostępu.",
   "delete_form_confirmation_2": "Wszystkie powiązane odpowiedzi zostaną usunięte.",
   "typeform_redirect_url_copied": "Skopiowano adres URL przekierowania z rozwiązania Typeform! Możesz teraz skonfigurować adres URL w formularzu Typeform.",
   "modifications_in_fields_warning": "Zmiany w polach i przekierowaniach następujących formularzy zostaną odzwierciedlone w tym formularzu.",
@@ -1639,18 +1687,102 @@
   "add_1_option_per_line": "Dodaj 1 opcję w każdym wierszu",
   "select_a_router": "Wybierz formularz przekierowania",
   "add_a_new_route": "Dodaj nowe przekierowanie",
+  "make_informed_decisions": "Podejmuj świadome decyzje dzięki funkcji Wgląd",
+  "make_informed_decisions_description": "Panel Wglądu wyświetla całą aktywność zespołu i pokazuje trendy umożliwiające lepsze planowanie i podejmowanie decyzji w zespole.",
+  "view_bookings_across": "Zobacz rezerwacje wszystkich członków",
+  "view_bookings_across_description": "Zobacz, kto zapewnia najwięcej rezerwacji i upewnij się, że Twój zespół działa równomiernie",
+  "identify_booking_trends": "Identyfikuj trendy rezerwacji",
+  "identify_booking_trends_description": "Zobacz, jakie dni tygodnia i pory dnia są popularne wśród rezerwujących",
+  "spot_popular_event_types": "Przekonaj się, które typy wydarzeń są popularne",
+  "spot_popular_event_types_description": "Zobacz, które typy wydarzeń są najczęściej oglądane i rezerwowane",
   "no_responses_yet": "Nie ma jeszcze odpowiedzi",
   "this_will_be_the_placeholder": "To będzie symbol zastępczy",
-  "this_meeting_has_not_started_yet": "To spotkanie jeszcze się nie rozpoczęło.",
-  "this_app_requires_connected_account": "Aplikacja {{appName}} wymaga połączonego konta {{dependencyName}}.",
-  "connect_app": "Połącz {{dependencyName}}",
-  "app_is_connected": "{{dependencyName}} jest połączone.",
-  "requires_app": "Wymaga {{dependencyName}}",
+  "this_meeting_has_not_started_yet": "To spotkanie jeszcze się nie rozpoczęło",
+  "this_app_requires_connected_account": "Aplikacja {{appName}} wymaga podłączonego konta {{dependencyName}}",
+  "connect_app": "Podłącz {{dependencyName}}",
+  "app_is_connected": "Aplikacja {{dependencyName}} jest podłączona",
+  "requires_app": "Wymaga aplikacji {{dependencyName}}",
   "verification_code": "Kod weryfikacyjny",
-  "can_you_try_again": "Możesz spróbować ponownie w innym terminie?",
+  "can_you_try_again": "Czy możesz spróbować ponownie w innym terminie?",
   "verify": "Zweryfikuj",
+  "timezone_variable": "Strefa Czasowa",
+  "timezone_info": "Strefa czasowa osoby otrzymującej",
+  "event_end_time_variable": "Czas zakończenia wydarzenia",
+  "event_end_time_info": "Czas zakończenia wydarzenia",
+  "cancel_url_variable": "Adres URL do anulowania",
+  "cancel_url_info": "Adres URL do anulowania rezerwacji",
+  "reschedule_url_variable": "Adres URL do zmiany terminu",
+  "reschedule_url_info": "Adres URL do zmiany terminu rezerwacji",
+  "invalid_event_name_variables": "W Twojej nazwie wydarzenia występuje nieprawidłowa zmienna.",
   "select_all": "Zaznacz wszystko",
   "default_conferencing_bulk_title": "Zbiorcza aktualizacja istniejących typów wydarzeń",
-  "invalid_event_name_variables": "W Twojej nazwie wydarzenia występuje nieprawidłowa zmienna.",
-  "default_conferencing_bulk_description": "Aktualizuj lokalizacje wybranych typów wydarzeń"
+  "members_default_schedule": "Domyślny harmonogram użytkownika",
+  "set_by_admin": "Ustalone przez administratora zespołu",
+  "members_default_location": "Domyślna lokalizacja członka",
+  "members_default_schedule_description": "Będziemy używać domyślnego harmonogramu dostępności każdego członka. Każdy z nich będzie mógł go edytować lub zmienić.",
+  "requires_at_least_one_schedule": "Musisz mieć co najmniej jeden harmonogram",
+  "default_conferencing_bulk_description": "Aktualizuj lokalizacje wybranych typów wydarzeń",
+  "locked_for_members": "Zablokowane dla członków",
+  "locked_apps_description": "Członkowie będą mogli zobaczyć aktywne aplikacje, ale nie będą mogli zmieniać ich ustawień",
+  "locked_webhooks_description": "Członkowie będą mogli zobaczyć aktywne webhooki, ale nie będą mogli zmieniać ich ustawień",
+  "locked_workflows_description": "Członkowie będą mogli zobaczyć aktywne plany pracy, ale nie będą mogli zmieniać ich ustawień",
+  "locked_by_admin": "Zablokowane przez administratora",
+  "app_not_connected": "Nie połączono konta {{appName}}.",
+  "connect_now": "Połącz teraz",
+  "managed_event_dialog_confirm_button_one": "Zastąp i poinformuj {{count}} członka",
+  "managed_event_dialog_confirm_button_other": "Zastąp i poinformuj {{count}} członków",
+  "managed_event_dialog_title_one": "Adres URL /{{slug}} już istnieje dla {{count}} członka. Czy chcesz go zastąpić?",
+  "managed_event_dialog_title_other": "Adres URL /{{slug}} już istnieje dla {{count}} członków. Czy chcesz go zastąpić?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> używa już adresu URL <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> używają już adresu URL <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Jeśli zdecydujesz się go zastąpić, powiadomimy te osoby. Wróć i usuń je, jeśli nie chcesz nadpisywać adresu.",
+  "review_event_type": "Zobacz szczegóły typu wydarzenia",
+  "looking_for_more_analytics": "Szukasz dokładniejszych danych analitycznych?",
+  "looking_for_more_insights": "Potrzebujesz dokładniejszego Wglądu?",
+  "add_filter": "Dodaj filtr",
+  "select_user": "Wybierz użytkownika",
+  "select_event_type": "Wybierz typ wydarzenia",
+  "select_date_range": "Wybierz zakres dat",
+  "popular_events": "Popularne wydarzenia",
+  "no_event_types_found": "Nie znaleziono typów wydarzeń",
+  "average_event_duration": "Średni czas trwania wydarzenia",
+  "most_booked_members": "Najczęściej rezerwowani członkowie",
+  "least_booked_members": "Najrzadziej rezerwowani członkowie",
+  "events_created": "Utworzone wydarzenia",
+  "events_completed": "Zakończone wydarzenia",
+  "events_cancelled": "Anulowane wydarzenia",
+  "events_rescheduled": "Przełożone wydarzenia",
+  "from_last_period": "w ostatnim okresie",
+  "from_to_date_period": "Od: {{startDate}} Do: {{endDate}}",
+  "analytics_for_organisation": "Wgląd",
+  "subtitle_analytics": "Dowiedz się więcej o aktywności Twojego zespołu",
+  "redirect_url_warning": "Dodanie przekierowania sprawi, że strona potwierdzenia zostanie wyłączona. Upewnij się, że na swojej spersonalizowanej stronie potwierdzenia umieścisz informację o potwierdzeniu rezerwacji.",
+  "event_trends": "Trendy wydarzeń",
+  "clear_filters": "Wyczyść filtry",
+  "hold": "Wstrzymaj",
+  "on_booking_option": "Pobierz płatność przy rezerwacji",
+  "hold_option": "Pobierz opłatę za niestawienie się",
+  "card_held": "Posiadana karta",
+  "charge_card": "Obciąż kartę płatniczą",
+  "card_charged": "Obciążono kartę płatniczą",
+  "no_show_fee_amount": "Opłata za niestawienie się w wysokości {{amount, currency}}",
+  "no_show_fee": "Opłata za niestawienie się",
+  "submit_card": "Prześlij dane karty",
+  "submit_payment_information": "Prześlij informacje o płatności",
+  "meeting_awaiting_payment_method": "Twoje spotkanie nie ma jeszcze przypisanej metody płatności",
+  "no_show_fee_charged_email_subject": "Pobrano opłatę w wysokości {{amount, currency}} za niestawienie się na wydarzeniu: {{title}} dnia {{date}}",
+  "no_show_fee_charged_text_body": "Pobrano opłatę za niestawienie się",
+  "no_show_fee_charged_subtitle": "Za następujące wydarzenie pobrano opłatę za niestawienie się w wysokości {{amount, currency}}",
+  "error_charging_card": "Coś poszło nie tak podczas pobierania opłaty za niestawienie się. Spróbuj ponownie później.",
+  "collect_no_show_fee": "Pobierz opłatę za niestawienie się",
+  "no_show_fee_charged": "Pobrano opłatę za niestawienie się",
+  "insights": "Wgląd",
+  "testing_workflow_info_message": "Podczas testowania tego planu pracy pamiętaj, że wiadomości e-mail i SMS mogą zostać zaplanowane najpóźniej godzinę przed ich dostarczeniem",
+  "insights_no_data_found_for_filter": "Nie znaleziono danych dotyczących wybranego filtra lub dat.",
+  "acknowledge_booking_no_show_fee": "Rozumiem, że jeśli nie wezmę udziału w wydarzeniu, z mojej karty pobrana zostanie opłata w wysokości {{amount, currency}}.",
+  "card_details": "Dane karty",
+  "seats_and_no_show_fee_error": "Obecnie nie można udostępnić miejsc siedzących ani naliczyć opłaty za niestawienie się",
+  "complete_your_booking": "Ukończ rezerwację",
+  "complete_your_booking_subject": "Ukończ rezerwację: {{title}} dnia {{date}}",
+  "email_invite_team": "Zaproszono {{email}}"
 }
diff --git a/apps/web/public/static/locales/pt-BR/common.json b/apps/web/public/static/locales/pt-BR/common.json
index 5849d20f06..8c5d0d067e 100644
--- a/apps/web/public/static/locales/pt-BR/common.json
+++ b/apps/web/public/static/locales/pt-BR/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Provedor de identidade",
   "trial_days_left": "Você tem $t(day, {\"count\": {{days}} }) restantes no seu período de testes da versão PRO",
   "day_one": "{{count}} dia",
   "day_other": "{{count}} dias",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Aguardando aprovação: {{title}} em {{date}}",
   "event_still_awaiting_approval": "Um evento está aguardando a sua aprovação",
   "booking_submitted_subject": "Reserva enviada: {{title}} em {{date}}",
+  "download_recording_subject": "Baixar gravação: {{title}} à(s) {{date}}",
+  "download_your_recording": "Baixe sua gravação",
   "your_meeting_has_been_booked": "A sua reunião foi agendada",
   "event_type_has_been_rescheduled_on_time_date": "Seu {{title}} foi remarcado para {{date}}.",
   "event_has_been_rescheduled": "Atualização - O seu evento foi reagendado",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "É preciso ter uma conta Pro para usar equipes, você permanecerá oculto até a atualização.",
   "link_expires": "P.S.: Expira em {{expiresIn}} horas.",
   "upgrade_to_per_seat": "Atualize para \"Por assento\"",
-  "seat_options_doesnt_support_confirmation": "A opção de assentos não é compatível com requisito de confirmação",
+  "seat_options_doesnt_support_confirmation": "Não é possível usar reservas com assento quando a reserva exigir confirmação",
   "team_upgrade_seats_details": "Dos {{memberCount}} membros da sua equipe, há {{unpaidCount}} assento(s) não pago(s). A ${{seatPrice}}/mês por assento, o custo total estimado da sua assinatura é de ${{totalCost}}/mês.",
   "team_upgrade_banner_description": "Agradecemos por testar nosso novo plano de equipe. Notamos que a sua equipe \"{{teamName}}\" precisa ser atualizada.",
   "team_upgrade_banner_action": "Atualizar aqui",
@@ -224,6 +227,7 @@
   "done": "Concluído",
   "all_done": "Tudo pronto!",
   "all_apps": "Todos os apps",
+  "available_apps": "Aplicativos disponíveis",
   "check_email_reset_password": "Verifique o seu email. Enviamos um link para redefinir a sua senha.",
   "finish": "Finalizar",
   "few_sentences_about_yourself": "Fale um pouco sobre você. Isto será exibido em sua página pessoal.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Adicionar novo horário",
   "add_an_extra_layer_of_security": "Adicione uma camada extra de segurança à sua conta, caso sua senha seja comprometida.",
   "2fa": "Autenticação de dois fatores",
+  "2fa_disabled": "A autenticação de dois fatores pode ser habilitada para autenticação de senha e e-mail",
   "enable_2fa": "Ativar autenticação de dois fatores",
   "disable_2fa": "Desativar autenticação de dois fatores",
   "disable_2fa_recommendation": "Se precisar desativar a autenticação de dois fatores, recomendamos reativá-la o mais rápido possível.",
@@ -585,6 +590,20 @@
   "minutes": "Minutos",
   "round_robin": "Round Robin",
   "round_robin_description": "Reuniões recorrentes entre vários membros da equipe.",
+  "managed_event": "Evento gerenciado",
+  "username_placeholder": "nome de usuário",
+  "managed_event_description": "Crie e distribua tipos de eventos em massa aos membros da equipe",
+  "managed": "Gerenciado",
+  "managed_event_url_clarification": "o \"nome de usuário\" será preenchido com o nome de usuário dos membros atribuídos",
+  "assign_to": "Atribuir a",
+  "add_members": "Adicionar membros...",
+  "count_members_one": "{{count}} membro",
+  "count_members_other": "{{count}} membros",
+  "no_assigned_members": "Nenhum membro atribuído",
+  "assigned_to": "Atribuído a",
+  "start_assigning_members_above": "Começar a atribuir os membros acima",
+  "locked_fields_admin_description": "Os membros não poderão editar isto",
+  "locked_fields_member_description": "Esta opção foi bloqueada pelo administrador da equipe",
   "url": "URL",
   "hidden": "Esconder",
   "readonly": "Somente leitura",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Aviso mínimo",
   "slot_interval": "Intervalos de tempo",
   "slot_interval_default": "Usar a duração do evento (padrão)",
+  "delete_event_type": "Excluir tipo de evento?",
+  "delete_managed_event_type": "Excluir tipo de evento gerenciado?",
+  "delete_event_type_description": "Este link não poderá mais ser usado para fazer reserva por qualquer pessoa com quem tenha sido compartilhado.",
+  "delete_managed_event_type_description": "<ul><li>Membros atribuídos a este tipo de evento também terão seus tipos de evento excluídos.</li><li>Este link não poderá mais ser usado para fazer reserva por qualquer pessoa com quem tenha sido compartilhado.</li></ul>",
+  "confirm_delete_event_type": "Sim, excluir",
   "delete_account": "Apagar conta",
   "confirm_delete_account": "Sim, apagar conta",
   "delete_account_confirmation_message": "Você tem certeza de que deseja apagar sua conta {{appName}}? Qualquer pessoa que você compartilhou seu link de reservas não poderá mais utilizá-lo para agendar novos eventos e todas as suas preferências serão perdidas.",
@@ -1126,13 +1150,13 @@
   "current_username": "Nome de usuário atual",
   "example_1": "Exemplo 1",
   "example_2": "Exemplo 2",
-  "additional_input_label": "Etiqueta de entrada adicional",
+  "booking_question_identifier": "Identificador de pergunta de reserva",
   "company_size": "Tamanho da empresa",
   "what_help_needed": "Em que você precisa de ajuda?",
   "variable_format": "Formato variável",
   "webhook_subscriber_url_reserved": "URL de assinante de webhook já está definida",
   "custom_input_as_variable_info": "Ignore todos os caracteres especiais da etiqueta de entrada adicional (use apenas letras e números), use todas as letras maiúsculas e substitua espaços em branco por sublinhados.",
-  "using_additional_inputs_as_variables": "Como usar entradas adicionais como variáveis?",
+  "using_booking_questions_as_variables": "Como usar perguntas de reserva como variáveis?",
   "download_desktop_app": "Baixar app para desktop",
   "set_ping_link": "Definir link do Ping",
   "rate_limit_exceeded": "Limite excedido",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Início da semana",
   "recordings_title": "Gravações",
   "recording": "Gravação",
+  "happy_scheduling": "Bom agendamento",
   "select_calendars": "Selecionar em quais calendários você deseja verificar se há conflitos para evitar dupla reserva.",
   "check_for_conflicts": "Verificar se há conflitos",
   "view_recordings": "Ver gravações",
@@ -1215,6 +1240,7 @@
   "impersonation": "Representação",
   "impersonation_description": "Configurações para gerenciar representação de usuário",
   "users": "Usuários",
+  "user": "Usuário",
   "profile_description": "Gerencie as configurações para o seu perfil {{appName}}",
   "users_description": "Aqui você poderá encontrar uma lista de todos os usuários",
   "users_listing": "Listagem de usuários",
@@ -1255,6 +1281,8 @@
   "download_responses": "Baixar respostas",
   "download_responses_description": "Baixe todas as respostas para seu formulário em formato CSV.",
   "download": "Baixar",
+  "download_recording": "Baixar gravação",
+  "recording_from_your_recent_call": "Uma gravação da sua chamada recente no Cal.com está pronta para ser baixada",
   "create_your_first_form": "Criar seu primeiro formulário",
   "create_your_first_form_description": "Com os Formulários de roteamento, você pode fazer perguntas e encaminhar para a pessoa correta ou o tipo de evento.",
   "create_your_first_webhook": "Criar seu primeiro Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Autenticação básica",
   "exchange_authentication_ntlm": "Autenticação NTLM",
   "exchange_compression": "Compressão GZip",
+  "exchange_version": "Versão do Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Você pode ver todos os formulários e rotas que criou aqui.",
   "routing_forms_send_email_owner": "Enviar e-mail ao proprietário",
   "routing_forms_send_email_owner_description": "Envia um e-mail ao proprietário após o envio do formulário",
@@ -1345,7 +1382,7 @@
   "add_limit": "Adicione limite",
   "team_name_required": "Nome da equipe obrigatório",
   "show_attendees": "Compartilhe informações do participante entre convidados",
-  "how_additional_inputs_as_variables": "Como usar Dados Adicionais como variáveis",
+  "how_booking_questions_as_variables": "Como usar perguntas de reserva como variáveis?",
   "format": "Formato",
   "uppercase_for_letters": "Use letras maiúsculas para todas as letras",
   "replace_whitespaces_underscores": "Substituir espaços em branco com sublinhados",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Precisa de algo mais?",
   "billing_help_description": "Se precisar de mais ajuda com o faturamento, o nosso time de suporte está aqui para ajudar.",
   "billing_help_cta": "Falar com o suporte",
-  "ignore_special_characters": "Ignore caracteres especiais no seu rótulo adicional de entrada. Use apenas letras e números",
+  "ignore_special_characters_booking_questions": "Ignore caracteres especiais no seu identificador de pergunta de reserva. Use apenas letras e números",
   "retry": "Repetir",
   "fetching_calendars_error": "Houve um problema ao buscar suas agendas. <1>Tente novamente</1> ou entre em contato com o suporte ao cliente.",
   "calendar_connection_fail": "Falha na conexão com a agenda",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Round-robin fixo",
   "add_one_fixed_attendee": "Adicione um participante fixo e utilize o round-robin em uma determinada quantidade de participantes.",
   "calcom_is_better_with_team": "Cal.com é melhor com equipes",
+  "the_calcom_team": "Equipe do Cal.com",
   "add_your_team_members": "Adicione membros da sua equipe aos seus tipos de evento. Use programação coletiva para incluir todos ou encontre a pessoa mais apropriada pela programação com round-robin.",
   "booking_limit_reached": "O limite de reseva para este tipo de evento foi atingido",
   "duration_limit_reached": "O limite de duração para este tipo de evento foi atingido",
   "admin_has_disabled": "Um administrador desativou {{appName}}",
   "disabled_app_affects_event_type": "Um administrador desativou {{appName}}, afetando seu tipo de evento {{eventType}}",
+  "event_replaced_notice": "Um administrador substituiu um dos seus tipos de evento",
+  "email_subject_slug_replacement": "Um administrador de equipe substituiu seu evento /{{slug}}",
+  "email_body_slug_replacement_notice": "Um administrador na equipe <strong>{{teamName}}</strong> substituiu seu tipo de evento <strong>/{{slug}}</strong> por um tipo de evento controlado por ele.",
+  "email_body_slug_replacement_info": "Seu link continuará a funcionar, mas algumas configurações podem ter sido alteradas. Você pode revisar nos tipos de evento.",
+  "email_body_slug_replacement_suggestion": "Se tiver alguma pergunta sobre o tipo de evento, fale com o seu administrador.<br /><br />Bom agendamento, <br />Equipe do Cal.com",
   "disable_payment_app": "O administrador desativou {{appName}}, afetando o seu tipo de evento {{title}}. Os participantes ainda poderão reservar este tipo de evento, mas não será solicitado pagamento. Você poderá ocultar o tipo de evento para impedir isso até o adiministrador reativar seu método de pagamento.",
   "payment_disabled_still_able_to_book": "Os participantes ainda poderão reservar este tipo de evento, mas não será solicitado pagamento. Você poderá ocultar o tipo de evento para impedir isso até o adiministrador reativar seu método de pagamento.",
   "app_disabled_with_event_type": "O administrador desativou {{appName}}, afetando seu tipo de evento {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Atualizar substituição",
   "event_type_duplicate_copy_text": "Cópia de {{slug}}",
   "set_as_default": "Definir como padrão",
+  "hide_eventtype_details": "Ocultar detalhes de tipo de evento",
   "show_navigation": "Mostrar navegação",
   "hide_navigation": "Ocultar navegação",
   "verification_code_sent": "Código de verificação enviado",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Crie seu primeiro webhook para este tipo de evento em equipe",
   "create_webhook_team_event_type": "Crie um webhook para este tipo de evento em equipe",
   "disable_success_page": "Desativar página de reserva bem-sucedida (funciona apenas se você tiver uma URL de redirecionamento)",
+  "invalid_admin_password": "Você é administrador, mas ainda não tem uma senha de pelo menos 15 caracteres ou 2FA",
   "change_password_admin": "Altere a senha para obter acesso de administrador",
   "username_already_taken": "O nome do usuário já está em uso",
   "assignment": "Atribuição",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "“/ee” Licença Enterprise",
   "enterprise_booking_fee": "A partir de {{enterprise_booking_fee}}/mês",
   "enterprise_license_includes": "Tudo para um caso de uso comercial",
+  "no_need_to_keep_your_code_open_source": "Não precisa manter seu código em código aberto",
   "repackage_rebrand_resell": "Reempacote, troque de marca e revenda com facilidade",
   "a_vast_suite_of_enterprise_features": "Uma ampla variedade de recursos empresariais",
   "free_license_fee": "$0,00/mês",
@@ -1593,15 +1639,16 @@
   "create_a_one_one_template": "Crie um modelo um a um para um tipo de evento e distribua para vários membros.",
   "collective_or_roundrobin": "Coletivo ou round-robin",
   "book_your_team_members": "Reúna os membros da sua equipe com eventos coletivos, ou selecione a pessoa certa com o round-robin.",
-  "event_no_longer_attending_subject": "Não está mais participando de {{title}} em {{date}}",
+  "event_no_longer_attending_subject": "Não está mais participando de {{title}} à(s) {{date}}",
   "no_longer_attending": "Você não está mais participando deste evento",
-  "attendee_no_longer_attending_subject": "Um partipante não está mais participando de {{title}} em {{date}}",
+  "attendee_no_longer_attending_subject": "Um partipante não está mais participando de {{title}} à(s) {{date}}",
   "attendee_no_longer_attending": "Um partipante não está mais participando do seu evento",
   "attendee_no_longer_attending_subtitle": "{{name}} cancelou. Quer dizer que um assento foi liberado para este espaço de tempo",
   "create_event_on": "Criar evento em",
   "default_app_link_title": "Defina um link padrão para o app",
   "default_app_link_description": "Definir um link padrão para o app permite que todos os tipos de evento recém-criados usem o link definido para o app.",
   "change_default_conferencing_app": "Definir como padrão",
+  "organizer_default_conferencing_app": "Aplicativo padrão do organizador",
   "under_maintenance": "Serviço interrompido para manutenção",
   "under_maintenance_description": "A equipe do {{appName}} está realizando uma manutenção programada. Se tiver alguma dúvida, fale com o suporte.",
   "event_type_seats": "{{numberOfSeats}} assentos",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "Sem assentos suficientes",
   "form_builder_field_already_exists": "Já existe um campo com este nome",
   "form_builder_field_add_subtitle": "Personalize as perguntas feitas na página de reservas",
+  "show_on_booking_page": "Mostrar na página de reservas",
   "get_started_zapier_templates": "Comece agora com modelos do Zapier",
   "team_is_unpublished": "Publicação de {{team}} cancelada",
   "team_is_unpublished_description": "Este link de equipe não está dispoível por enquanto. Fale com o proprietário da equipe ou peça que seja publicado.",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "Adiciona uma opção por linha",
   "select_a_router": "Selecione um formulário de roteamento",
   "add_a_new_route": "Adicione uma nova Rota",
+  "make_informed_decisions": "Tomar decisões informadas com o Insights",
+  "make_informed_decisions_description": "Nosso painel de informações do Insights traz à tona todas as atividades da sua equipe e mostra as tendências que permitem melhore agendamento de equipe e tomada de decisão.",
+  "view_bookings_across": "Ver reservas em todos os membros",
+  "view_bookings_across_description": "Veja quem está recebendo a maioria das reservas e garanta a melhor distribuição para a sua equipe",
+  "identify_booking_trends": "Identificar tendências de reserva",
+  "identify_booking_trends_description": "Veja quais são os horários da semana e do dia mais procurados pelos reservantes",
+  "spot_popular_event_types": "Localizar tipos de evento populares",
+  "spot_popular_event_types_description": "Veja quais tipos de eventos estão recebendo a maioria dos cliques e reservas",
   "no_responses_yet": "Sem respostas por enquanto",
   "this_will_be_the_placeholder": "Este será o espaço reservado",
   "this_meeting_has_not_started_yet": "Esta reunião ainda não começou",
@@ -1649,8 +1705,84 @@
   "verification_code": "Código de verificação",
   "can_you_try_again": "Poderia tentar novamente em um horário diferente?",
   "verify": "Verificar",
+  "timezone_variable": "Fuso Horário",
+  "timezone_info": "O fuso horário do destinatário",
+  "event_end_time_variable": "Horário de término do evento",
+  "event_end_time_info": "O horário de término do evento",
+  "cancel_url_variable": "Cancelar URL",
+  "cancel_url_info": "A URL para cancelar a reserva",
+  "reschedule_url_variable": "URL de reagendamento",
+  "reschedule_url_info": "O URL para reagendar a reserva",
+  "invalid_event_name_variables": "Há uma variável inválida no seu nome do evento",
   "select_all": "Selecionar tudo",
   "default_conferencing_bulk_title": "Atualize em massa os tipos de evento existentes",
-  "invalid_event_name_variables": "Há uma variável inválida no seu nome do evento",
-  "default_conferencing_bulk_description": "Atualize as localizações para os tipos de evento selecionados"
+  "members_default_schedule": "Agenda padrão do membro",
+  "set_by_admin": "Definido pelo administrador da equipe",
+  "members_default_location": "Local padrão do membro",
+  "members_default_schedule_description": "Usaremos a agenda de disponibilidade padrão de cada membro. Não será possível editar ou alterar.",
+  "requires_at_least_one_schedule": "Você precisa ter pelo menos uma agenda",
+  "default_conferencing_bulk_description": "Atualize as localizações para os tipos de evento selecionados",
+  "locked_for_members": "Bloqueado para membros",
+  "locked_apps_description": "Os membros poderão ver os aplicativos ativos, mas não poderão editar as configurações",
+  "locked_webhooks_description": "Os membros poderão ver os webhooks ativos, mas não poderão editar as configurações",
+  "locked_workflows_description": "Os membros poderão ver os fluxos de trabalho ativos, mas não poderão editar as configurações",
+  "locked_by_admin": "Bloqueado pelo administrador",
+  "app_not_connected": "Você não conectou uma conta do {{appName}}.",
+  "connect_now": "Conectar agora",
+  "managed_event_dialog_confirm_button_one": "Substituir e notificar {{count}} membro",
+  "managed_event_dialog_confirm_button_other": "Substituir e notificar {{count}} membros",
+  "managed_event_dialog_title_one": "A url/{{slug}} já existe para {{count}} membro. Deseja substituir?",
+  "managed_event_dialog_title_other": "A url/{{slug}} já existe para {{count}} membros. Deseja substituir?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> já está usando a url <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> já estão usando a url <string>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Se você escolher substituir, serão enviadas notificações. Volte e remova caso não queira sobrescrever.",
+  "review_event_type": "Revisar tipo de evento",
+  "looking_for_more_analytics": "Procurando mais análises?",
+  "looking_for_more_insights": "Procurando mais Insights?",
+  "add_filter": "Adicionar filtro",
+  "select_user": "Selecionar usuário",
+  "select_event_type": "Selecionar tipo de evento",
+  "select_date_range": "Selecionar intervalo de data",
+  "popular_events": "Eventos populares",
+  "no_event_types_found": "Nenhum tipo de evento encontrado",
+  "average_event_duration": "Duração de evento média",
+  "most_booked_members": "Membros com mais reservas",
+  "least_booked_members": "Membros com menos reservas",
+  "events_created": "Eventos criados",
+  "events_completed": "Eventos concluídos",
+  "events_cancelled": "Eventos cancelados",
+  "events_rescheduled": "Eventos reagendados",
+  "from_last_period": "do último período",
+  "from_to_date_period": "De: {{startDate}} Para: {{endDate}}",
+  "analytics_for_organisation": "Insights",
+  "subtitle_analytics": "Saiba mais sobre as atividades da sua equipe",
+  "redirect_url_warning": "A página de sucesso será desabilitada ao adicionar um redirecionamento. Não se esqueça de mencionar \"Reserva confirmada\" à sua página de sucesso personalizada.",
+  "event_trends": "Tendências de evento",
+  "clear_filters": "Limpar filtros",
+  "hold": "Segurar",
+  "on_booking_option": "Coletar pagamento na reserva",
+  "hold_option": "Carregar taxa de não comparecimento",
+  "card_held": "Cartão em posse",
+  "charge_card": "Carregar cartão",
+  "card_charged": "Cartão carregado",
+  "no_show_fee_amount": "{{amount, currency}} de taxa de não comparecimento",
+  "no_show_fee": "Taxa de não comparecimento",
+  "submit_card": "Enviar cartão",
+  "submit_payment_information": "Enviar informações de pagamento",
+  "meeting_awaiting_payment_method": "Sua reunião está aguardando um método de pagamento",
+  "no_show_fee_charged_email_subject": "Foi cobrada uma taxa de não comparecimento de {{amount, currency}} para {{title}} à(s) {{date}}",
+  "no_show_fee_charged_text_body": "Taxa de não comparecimento cobrada",
+  "no_show_fee_charged_subtitle": "Foi cobrada uma taxa de não comparecimento de {{amount, currency}} para o evento seguinte",
+  "error_charging_card": "Algo deu errado ao cobrar a taxa de não comparecimento. Tente novamente mais tarde.",
+  "collect_no_show_fee": "Coletar taxa de não comparecimento",
+  "no_show_fee_charged": "Taxa de não comparecimento cobrada",
+  "insights": "Insights",
+  "testing_workflow_info_message": "Ao testar este fluxo de trabalho, não se esqueça de que E-mails e SMS só podem ser reprogramados com pelo menos uma hora de antecedência",
+  "insights_no_data_found_for_filter": "Nenhum dado encontrado para o filtro ou dados selecionados.",
+  "acknowledge_booking_no_show_fee": "Estou ciente de que, se eu não comparecer a este evento, será cobrada no meu cartão uma taxa de não comparecimento de {{amount, currency}}.",
+  "card_details": "Informações do cartão",
+  "seats_and_no_show_fee_error": "Neste momento, não é possível habilitar assentos e cobrar taxa de não comparecimento",
+  "complete_your_booking": "Conclua sua reserva",
+  "complete_your_booking_subject": "Conclua sua reserva: {{title}} à(s) {{date}}",
+  "email_invite_team": "{{email}} foi convidado"
 }
diff --git a/apps/web/public/static/locales/pt/common.json b/apps/web/public/static/locales/pt/common.json
index d7a991a945..73396e32af 100644
--- a/apps/web/public/static/locales/pt/common.json
+++ b/apps/web/public/static/locales/pt/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Fornecedor de identidade",
   "trial_days_left": "Restam $t(day, {\"count\": {{days}} }) da sua avaliação da versão PRO",
   "day_one": "{{count}} dia",
   "day_other": "{{count}} dias",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "A aguardar aprovação: {{title}} em {{date}}",
   "event_still_awaiting_approval": "Um evento ainda aguarda a sua aprovação",
   "booking_submitted_subject": "Reserva submetida: {{title}} em {{date}}",
+  "download_recording_subject": "Transferir gravação: {{title}} em {{date}}",
+  "download_your_recording": "Transferir a sua gravação",
   "your_meeting_has_been_booked": "A sua reunião foi reservada",
   "event_type_has_been_rescheduled_on_time_date": "Seu {{title}} foi remarcado para {{date}}.",
   "event_has_been_rescheduled": "O seu evento foi reagendado.",
@@ -224,6 +227,7 @@
   "done": "Concluído",
   "all_done": "Tudo pronto!",
   "all_apps": "Todos as aplicações",
+  "available_apps": "Aplicações disponíveis",
   "check_email_reset_password": "Verifique o seu email. Enviámos uma ligação para redefinir a sua senha.",
   "finish": "Terminar",
   "few_sentences_about_yourself": "Algumas frases sobre si. Isto será mostrado na sua página pessoal.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Adicionar novo horário",
   "add_an_extra_layer_of_security": "Adicione uma camada extra de segurança à sua conta, caso a sua senha seja roubada.",
   "2fa": "Autenticação com dois fatores",
+  "2fa_disabled": "A autenticação de dois fatores só pode ser ativada para autenticação por e-mail e palavra-passe",
   "enable_2fa": "Ativar autenticação de dois fatores",
   "disable_2fa": "Desativar autenticação de dois fatores",
   "disable_2fa_recommendation": "Se precisar desativar o 2FA, recomendamos reativá-lo o mais rápido possível.",
@@ -585,6 +590,20 @@
   "minutes": "Minutos",
   "round_robin": "Round Robin",
   "round_robin_description": "Reuniões de ciclo entre vários membros da equipa.",
+  "managed_event": "Evento gerido",
+  "username_placeholder": "nome de utilizador",
+  "managed_event_description": "Criar e distribuir tipos de eventos em conjunto para os membros da equipa",
+  "managed": "Gerido",
+  "managed_event_url_clarification": "\"nome de utilizador\" será substituído pelo nome de utilizador dos membros atribuídos",
+  "assign_to": "Atribuir a",
+  "add_members": "Adicionar membros...",
+  "count_members_one": "{{count}} membro",
+  "count_members_other": "{{count}} membros",
+  "no_assigned_members": "Sem membros atribuídos",
+  "assigned_to": "Atribuído a",
+  "start_assigning_members_above": "Comece a atribuir membros acima",
+  "locked_fields_admin_description": "Os membros não poderão editar isto",
+  "locked_fields_member_description": "Esta opção foi bloqueada pelo administrador da equipa",
   "url": "URL",
   "hidden": "Oculto",
   "readonly": "Somente Leitura",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Aviso de mínimo",
   "slot_interval": "Intervalos do horário",
   "slot_interval_default": "Usar duração do evento (por omissão)",
+  "delete_event_type": "Eliminar tipo de evento?",
+  "delete_managed_event_type": "Eliminar tipo de evento gerido?",
+  "delete_event_type_description": "Qualquer pessoa com quem tiver partilhado a ligação deixará de poder fazer reservas com a mesma.",
+  "delete_managed_event_type_description": "<ul><li>Também serão eliminados os tipos de eventos dos membros atribuídos a este tipo de evento.</li><li>Quaisquer pessoas com quem estes membros tenham partilhado as respetivas ligações deixarão de poder fazer reservas recorrendo às mesmas.</li></ul>",
+  "confirm_delete_event_type": "Sim, eliminar",
   "delete_account": "Eliminar conta",
   "confirm_delete_account": "Sim, eliminar conta",
   "delete_account_confirmation_message": "De certeza que quer eliminar a sua conta {{appName}}? Qualquer pessoa com quem tenha partilhado esta ligação de equipa deixará de poder fazer reservas através da respetiva ligação, e quaisquer preferências que tenha guardado serão perdidas.",
@@ -1126,13 +1150,13 @@
   "current_username": "Nome de utilizador atual",
   "example_1": "Exemplo 1",
   "example_2": "Exemplo 2",
-  "additional_input_label": "Etiqueta de campo adicional",
+  "booking_question_identifier": "Identificador de questão sobre a reserva",
   "company_size": "Tamanho da empresa",
   "what_help_needed": "Em que precisa de ajuda?",
   "variable_format": "Formato da variável",
   "webhook_subscriber_url_reserved": "O endereço webhook de subscrição já está definido",
   "custom_input_as_variable_info": "Ignora todos os caracteres especiais da etiqueta de entrada adicional (utiliza apenas letras e números), utiliza maiúsculas para todas as letras e substitui espaços em branco por carateres de sublinhado.",
-  "using_additional_inputs_as_variables": "Como utilizar entradas adicionais como variáveis?",
+  "using_booking_questions_as_variables": "Como posso utilizar questões sobre a reserva como variáveis?",
   "download_desktop_app": "Descarregar a aplicação para o computador",
   "set_ping_link": "Definir ligação do Ping",
   "rate_limit_exceeded": "Limite de transações excedido",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Início da semana",
   "recordings_title": "Gravações",
   "recording": "Gravação",
+  "happy_scheduling": "Votos de bons agendamentos",
   "select_calendars": "Selecione os calendários nos quais pretende procurar por conflitos para evitar sobreposição de reservas.",
   "check_for_conflicts": "Verificar se existem conflitos",
   "view_recordings": "Ver gravações",
@@ -1215,6 +1240,7 @@
   "impersonation": "Representação",
   "impersonation_description": "Definições para gerir a personificação de utilizadores",
   "users": "Utilizadores",
+  "user": "Utilizador",
   "profile_description": "Gerir as definições para o seu perfil {{appName}}",
   "users_description": "Aqui pode encontrar uma lista de todos os utilizadores",
   "users_listing": "Lista de utilizadores",
@@ -1255,6 +1281,8 @@
   "download_responses": "Descarregar respostas",
   "download_responses_description": "Descarregue todas as respostas ao seu formulário em formato CSV.",
   "download": "Descarregar",
+  "download_recording": "Transferir gravação",
+  "recording_from_your_recent_call": "Uma gravação da sua chamada recente no Cal.com está pronta para ser transferida",
   "create_your_first_form": "Crie o seu primeiro formulário",
   "create_your_first_form_description": "Com os Formulários de encaminhamento, pode fazer questões qualitativas e encaminhar para a pessoa ou o tipo de evento correto.",
   "create_your_first_webhook": "Crie o seu primeiro Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Autenticação básica",
   "exchange_authentication_ntlm": "Autenticação NTLM",
   "exchange_compression": "Compressão GZip",
+  "exchange_version": "Versão do Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Aqui pode ver todos os formulários e rotas que criou.",
   "routing_forms_send_email_owner": "Enviar e-mail ao proprietário",
   "routing_forms_send_email_owner_description": "Envia um e-mail ao proprietário quando o formulário for submetido",
@@ -1345,7 +1382,7 @@
   "add_limit": "Adicionar limite",
   "team_name_required": "É necessário um nome para a equipa",
   "show_attendees": "Partilhar informações dos participantes entre os convidados",
-  "how_additional_inputs_as_variables": "Como utilizar as Entradas adicionais como Variáveis",
+  "how_booking_questions_as_variables": "Como utilizar perguntas de agendamento como variáveis?",
   "format": "Formato",
   "uppercase_for_letters": "Utilize letras maiúsculas para todas as letras",
   "replace_whitespaces_underscores": "Substituir espaços em branco com carateres de sublinhado",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Precisa de outra coisa?",
   "billing_help_description": "Se precisar de mais ajuda com a faturação, a nossa equipa de apoio está aqui para ajudar.",
   "billing_help_cta": "Contactar o apoio",
-  "ignore_special_characters": "Ignorar caracteres especiais na sua etiqueta de Campo adicional. Utilizar apenas letras e números",
+  "ignore_special_characters_booking_questions": "Ignorar caracteres especiais no seu identificador de questões sobre a reserva. Utilizar apenas letras e números",
   "retry": "Repetir",
   "fetching_calendars_error": "Ocorreu um problema ao obter os seus calendários. Por favor, <1>tente novamente</1> ou contacte o apoio ao cliente.",
   "calendar_connection_fail": "A ligação ao calendário falhou",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Distribuição equilibrada fixa",
   "add_one_fixed_attendee": "Adicione um participante fixo e distribua de forma equilibrada a partir de um número de participantes.",
   "calcom_is_better_with_team": "Cal.com funciona melhor com equipas",
+  "the_calcom_team": "A equipa Cal.com",
   "add_your_team_members": "Adicione os membros da sua equipa aos seus tipos de eventos. Utilize o agendamento coletivo para incluir todos os membros ou encontre a pessoa mais adequada com o agendamento baseado numa distribuição equilibrada.",
   "booking_limit_reached": "O limite de reservas para este tipo de evento foi atingido",
   "duration_limit_reached": "O limite de duração para este tipo de evento foi atingido",
   "admin_has_disabled": "{{appName}} foi desativada por um administrador",
   "disabled_app_affects_event_type": "{{appName}} foi desativada por um administrador, o que afeta o seu tipo de evento {{eventType}}",
+  "event_replaced_notice": "Um administrador substituiu um dos seus tipos de eventos",
+  "email_subject_slug_replacement": "Um administrador da equipa substituiu o seu evento /{{slug}}",
+  "email_body_slug_replacement_notice": "Um administrador na equipa <strong>{{teamName}}</strong> substituiu o seu tipo de evento <strong>/{{slug}}</strong> por um tipo de evento gerido, controlado por eles.",
+  "email_body_slug_replacement_info": "A sua ligação vai continuar a funcionar, mas algumas das configurações podem ter sido alteradas. Pode rever a mesma nos tipos de eventos.",
+  "email_body_slug_replacement_suggestion": "Se tiver quaisquer questões sobre o tipo de evento, por favor, entre em contacto com o seu administrador.<br /><br />Votos de bons agendamentos, <br />da equipa Cal.com",
   "disable_payment_app": "O administrador desativou {{appName}}, que afeta o seu tipo de evento {{title}}. Os participantes ainda podem reservar este tipo de evento, mas não será pedido que façam qualquer pagamento. Pode ocultar o tipo de evento para evitar esta situação até que o administrador reative o seu método de pagamento.",
   "payment_disabled_still_able_to_book": "Os participantes ainda podem reservar este tipo de evento, mas não será solicitado que façam qualquer pagamento. Pode ocultar o tipo de evento para evitar esta situação até que o seu administrador reative o método de pagamento.",
   "app_disabled_with_event_type": "O administrador desativou {{appName}}, o que afeta o seu tipo de evento {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Atualizar sobreposição",
   "event_type_duplicate_copy_text": "cópia de {{slug}}",
   "set_as_default": "Predefinir",
+  "hide_eventtype_details": "Ocultar detalhes do tipo de evento",
   "show_navigation": "Mostrar navegação",
   "hide_navigation": "Ocultar navegação",
   "verification_code_sent": "Código de verificação enviado",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Crie o seu primeiro webhook para este tipo de evento de equipa",
   "create_webhook_team_event_type": "Crie um webhook para este tipo de evento de equipa",
   "disable_success_page": "Desativar a Página de sucesso (só funciona se tiver um URL de redirecionamento)",
+  "invalid_admin_password": "Você é um administrador, mas ainda não tem uma palavra-passe com pelo menos 15 caracteres",
   "change_password_admin": "Altere a palavra-passe para ter acesso de administrador",
   "username_already_taken": "O nome de utilizador já está a ser utilizado",
   "assignment": "Atribuição",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "Licença Enterprise “/ee”",
   "enterprise_booking_fee": "A partir de {{enterprise_booking_fee}}/mês",
   "enterprise_license_includes": "Tudo para uma utilização comercial",
+  "no_need_to_keep_your_code_open_source": "Não há necessidade de manter o seu código aberto",
   "repackage_rebrand_resell": "Republique, personalize a marca e revenda com facilidade",
   "a_vast_suite_of_enterprise_features": "Um vasto conjunto de funcionalidades empresariais",
   "free_license_fee": "$0,00/mês",
@@ -1590,18 +1636,19 @@
   "recommended_next_steps": "Próximos passos recomendados",
   "create_a_managed_event": "Criar um tipo de evento gerido",
   "meetings_are_better_with_the_right": "Os eventos são melhores com os elementos certos da equipa. Convide-os agora.",
-  "create_a_one_one_template": "Crie um modelo um-para-um para um tipo de evento e distribua-o a vários membros.",
+  "create_a_one_one_template": "Crie um modelo de um-para-um para um tipo de evento e distribua-o a vários membros.",
   "collective_or_roundrobin": "Coletiva ou rotativa",
   "book_your_team_members": "Associe os elementos da sua equipa a eventos coletivos ou rode pela equipa com utilização de uma distribuição equilibrada para obter a pessoa certa.",
-  "event_no_longer_attending_subject": "Já não irá participar em {{title}} a {{date}}",
+  "event_no_longer_attending_subject": "Já não irá participar em {{title}} em {{date}}",
   "no_longer_attending": "Você já não vai estar presente neste evento",
-  "attendee_no_longer_attending_subject": "Um participante não irá estar presente em {{title}} a {{date}}",
+  "attendee_no_longer_attending_subject": "Um participante não irá estar presente em {{title}} em {{date}}",
   "attendee_no_longer_attending": "Um participante já não irá participar no seu evento",
-  "attendee_no_longer_attending_subtitle": "{{name}} cancelou. Isto significa que existe uma nova vaga para este horário",
+  "attendee_no_longer_attending_subtitle": "{{name}} cancelou. Isto significa que existe uma nova disponibilidade para este horário",
   "create_event_on": "Criar evento em",
   "default_app_link_title": "Definir uma ligação predefinida de aplicação",
   "default_app_link_description": "Ao definir uma ligação predefinida da aplicação, permite que todos os tipos de eventos recém-criados utilizem a ligação de aplicação que definiu.",
   "change_default_conferencing_app": "Predefinir",
+  "organizer_default_conferencing_app": "Aplicação predefinida do organizador",
   "under_maintenance": "Em manutenção",
   "under_maintenance_description": "A equipa {{appName}} está a executar uma operação de manutenção programada. Se tiver alguma dúvida, por favor, entre em contacto com o suporte.",
   "event_type_seats": "{{numberOfSeats}} lugares",
@@ -1616,9 +1663,10 @@
   "not_enough_seats": "Não existem lugares suficientes",
   "form_builder_field_already_exists": "Já existe um campo com este nome",
   "form_builder_field_add_subtitle": "Personalize as questões colocadas na página da reserva",
+  "show_on_booking_page": "Mostrar na página de reservas",
   "get_started_zapier_templates": "Comece a utilizar os modelos Zapier",
-  "team_is_unpublished": "{{team}} não está publicado",
-  "team_is_unpublished_description": "Esta ligação de equipa não está disponível neste momento. Por favor, entre em contacto com o responsável pela equipa ou solicite-lhes a respetiva publicação.",
+  "team_is_unpublished": "A equipa {{team}} ainda não está publicada",
+  "team_is_unpublished_description": "Esta ligação de equipa não está disponível neste momento. Por favor, entre em contacto com o responsável pela equipa ou solicite-lhe a respetiva publicação.",
   "team_member": "Membro da equipa",
   "a_routing_form": "Um formulário de encaminhamento",
   "form_description_placeholder": "Descrição do formulário",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "Adicionar 1 opção por linha",
   "select_a_router": "Selecionar um roteador",
   "add_a_new_route": "Adicionar uma nova Rota",
+  "make_informed_decisions": "Tome decisões informadas com base em Insights",
+  "make_informed_decisions_description": "O nosso painel Insights apresenta toda a atividade da sua equipa e mostra as tendências que permitem melhorar o agendamento e os processos de decisão da equipa.",
+  "view_bookings_across": "Ver reservas de todos os membros",
+  "view_bookings_across_description": "Veja quem está a receber mais reservas e assegure a melhor distribuição em toda a sua equipa",
+  "identify_booking_trends": "Identifique tendências de reservas",
+  "identify_booking_trends_description": "Veja quais os horários da semana e do dia que são mais populares para os seus clientes",
+  "spot_popular_event_types": "Identifique tipos de eventos populares",
+  "spot_popular_event_types_description": "Veja quais os tipos de eventos que estão a receber mais cliques e reservas",
   "no_responses_yet": "Ainda sem respostas",
   "this_will_be_the_placeholder": "Isto será o marcador de posição",
   "this_meeting_has_not_started_yet": "Esta reunião ainda não começou",
@@ -1649,8 +1705,84 @@
   "verification_code": "Código de verificação",
   "can_you_try_again": "Pode tentar novamente noutra altura?",
   "verify": "Verificar",
+  "timezone_variable": "Fuso Horário",
+  "timezone_info": "O fuso horário da pessoa que recebe",
+  "event_end_time_variable": "Hora de fim do evento",
+  "event_end_time_info": "A hora de fim do evento",
+  "cancel_url_variable": "URL de cancelamento",
+  "cancel_url_info": "A URL para cancelar a reserva",
+  "reschedule_url_variable": "URL de reagendamento",
+  "reschedule_url_info": "A URL para reagendar a reserva",
+  "invalid_event_name_variables": "Existe uma variável inválida no nome do seu evento",
   "select_all": "Selecionar tudo",
   "default_conferencing_bulk_title": "Atualizar os tipos de evento existentes em conjunto",
-  "invalid_event_name_variables": "Existe uma variável inválida no nome do seu evento",
-  "default_conferencing_bulk_description": "Atualizar os locais para os tipos de evento selecionados"
+  "members_default_schedule": "Agenda predefinida do membro",
+  "set_by_admin": "Definido pelo administrador da equipa",
+  "members_default_location": "Localização predefinida do membro",
+  "members_default_schedule_description": "Vamos utilizar a agenda de disponibilidades predefinida de cada membro. Eles poderão editar ou alterar a mesma.",
+  "requires_at_least_one_schedule": "É necessário que tenha pelo menos uma agenda",
+  "default_conferencing_bulk_description": "Atualizar os locais para os tipos de evento selecionados",
+  "locked_for_members": "Bloqueado para os membros",
+  "locked_apps_description": "Os membros poderão ver as aplicações ativas, mas não poderão editar quaisquer configurações das aplicações",
+  "locked_webhooks_description": "Os membros poderão ver os webhooks ativos, mas não poderão editar quaisquer configurações dos webhooks",
+  "locked_workflows_description": "Os membros poderão ver os fluxos de trabalho ativos, mas não poderão editar quaisquer configurações dos fluxos de trabalho",
+  "locked_by_admin": "Bloqueado pelo administrador",
+  "app_not_connected": "Não associou uma conta {{appName}}.",
+  "connect_now": "Associar agora",
+  "managed_event_dialog_confirm_button_one": "Substituir e notificar {{count}} membro",
+  "managed_event_dialog_confirm_button_other": "Substituir e notificar {{count}} membros",
+  "managed_event_dialog_title_one": "A URL /{{slug}} já existe para {{count}} membro. Pretende substituir a mesma?",
+  "managed_event_dialog_title_other": "A URL /{{slug}} já existe para {{count}} membros. Pretende substituir a mesma?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> já está a utilizar a URL <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> já estão a utilizar a URL <string>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Se optar pela substituição, iremos notificá-los. Retroceda e remova-os se não quiser substituir.",
+  "review_event_type": "Rever Tipo de Evento",
+  "looking_for_more_analytics": "À procura de mais análises?",
+  "looking_for_more_insights": "À procura de mais Insights?",
+  "add_filter": "Adicionar filtro",
+  "select_user": "Selecionar utilizador",
+  "select_event_type": "Selecionar tipo de evento",
+  "select_date_range": "Selecionar intervalo de datas",
+  "popular_events": "Eventos populares",
+  "no_event_types_found": "Não foram encontrados tipos de eventos",
+  "average_event_duration": "Duração média do evento",
+  "most_booked_members": "Membros mais reservados",
+  "least_booked_members": "Membros menos reservados",
+  "events_created": "Eventos criados",
+  "events_completed": "Eventos concluídos",
+  "events_cancelled": "Eventos cancelados",
+  "events_rescheduled": "Eventos reagendados",
+  "from_last_period": "do último período",
+  "from_to_date_period": "De: {{startDate}} A: {{endDate}}",
+  "analytics_for_organisation": "Insights",
+  "subtitle_analytics": "Saiba mais sobre as atividades da sua equipa",
+  "redirect_url_warning": "Ao adicionar um redirecionamento irá desativar a página de sucesso. Certifique-se que indica que \"A reserva foi confirmada\" na sua página de sucesso personalizada.",
+  "event_trends": "Tendências de evento",
+  "clear_filters": "Limpar filtros",
+  "hold": "Reter",
+  "on_booking_option": "Receber o pagamento na reserva",
+  "hold_option": "Cobrar taxa de não-comparência",
+  "card_held": "Cartão retido",
+  "charge_card": "Debitar no cartão",
+  "card_charged": "Cartão debitado",
+  "no_show_fee_amount": "Taxa de não-comparência de {{amount, currency}}",
+  "no_show_fee": "Taxa de não-comparência",
+  "submit_card": "Submeter cartão",
+  "submit_payment_information": "Enviar informações de pagamento",
+  "meeting_awaiting_payment_method": "A sua reunião aguarda por um método de pagamento",
+  "no_show_fee_charged_email_subject": "Taxa de não-comparência de {{amount, currency}} debitada para {{title}} a {{date}}",
+  "no_show_fee_charged_text_body": "A taxa de não-comparência foi debitada",
+  "no_show_fee_charged_subtitle": "A taxa de não-comparência de {{amount, currency}} foi debitada para o seguinte evento",
+  "error_charging_card": "Algo não correu bem no débito da taxa de não-comparência. Por favor, tente novamente mais tarde.",
+  "collect_no_show_fee": "Cobrar taxa de não-comparência",
+  "no_show_fee_charged": "A taxa de não-comparência debitada",
+  "insights": "Insights",
+  "testing_workflow_info_message": "Ao testar este fluxo de trabalho tenha em consideração que e-mails e SMS só podem ser agendados com, pelo menos, 1 hora de antecedência",
+  "insights_no_data_found_for_filter": "Não foram encontrados dados para as datas ou filtros selecionados.",
+  "acknowledge_booking_no_show_fee": "Eu aceito que caso eu não compareça a este evento, será cobrada uma taxa de não-comparência de {{amount, currency}} no meu cartão.",
+  "card_details": "Detalhes do cartão",
+  "seats_and_no_show_fee_error": "Atualmente, não é possível ativar lugares e cobrar uma taxa de não-comparência",
+  "complete_your_booking": "Concluir a sua reserva",
+  "complete_your_booking_subject": "Concluir a sua reserva: {{title}} a {{date}}",
+  "email_invite_team": "{{email}} foi convidado/a"
 }
diff --git a/apps/web/public/static/locales/ro/common.json b/apps/web/public/static/locales/ro/common.json
index 40b3de60cd..1e82875bf1 100644
--- a/apps/web/public/static/locales/ro/common.json
+++ b/apps/web/public/static/locales/ro/common.json
@@ -111,7 +111,7 @@
   "hidden_team_owner_message": "Aveți nevoie de un cont Pro pentru a utiliza echipe. Sunteți ascuns până când faceți upgrade.",
   "link_expires": "p.s. Expiră în {{expiresIn}} ore.",
   "upgrade_to_per_seat": "Faceți upgrade la nivelul Per licență",
-  "seat_options_doesnt_support_confirmation": "Opțiunea pentru locuri nu acceptă cerința de confirmare",
+  "seat_options_doesnt_support_confirmation": "Opțiunea cu locuri nu este disponibilă dacă rezervarea necesită confirmare",
   "team_upgrade_seats_details": "Printre cei {{memberCount}} (de) membri din echipa dvs., {{unpaidCount}} (de) locuri nu sunt plătite. La {{seatPrice}} USD/lună/licență, costul total estimat al abonamentului dvs. este de {{totalCost}} USD/lună.",
   "team_upgrade_banner_description": "Vă mulțumim că ați încercat noul nostru plan pentru echipe. Am observat că planul echipei dvs. „{{teamName}}” necesită un upgrade.",
   "team_upgrade_banner_action": "Realizați upgrade aici",
@@ -1126,13 +1126,11 @@
   "current_username": "Nume de utilizator actual",
   "example_1": "Exemplul 1",
   "example_2": "Exemplul 2",
-  "additional_input_label": "Etichetă intrare suplimentară",
   "company_size": "Mărime companie",
   "what_help_needed": "Pentru ce anume aveți nevoie de ajutor?",
   "variable_format": "Format variabile",
   "webhook_subscriber_url_reserved": "URL-ul abonatului Webhook este deja definit",
   "custom_input_as_variable_info": "Ignorați toate caracterele speciale de pe eticheta de introducere suplimentară (utilizați numai litere și cifre), utilizați majuscule pentru toate literele și înlocuiți spațiile goale cu caractere de subliniere.",
-  "using_additional_inputs_as_variables": "Cum se folosesc intrările suplimentare ca variabile?",
   "download_desktop_app": "Descărcați aplicația pentru desktop",
   "set_ping_link": "Setare link Ping",
   "rate_limit_exceeded": "Limită rată depășită",
@@ -1340,12 +1338,11 @@
   "report_app": "Raportați aplicația",
   "limit_booking_frequency": "Limitați frecvența de rezervare",
   "limit_booking_frequency_description": "Limitați numărul de rezervări posibile pentru acest eveniment",
-  "limit_total_booking_duration": "Limitează durata totală a rezervării",
-  "limit_total_booking_duration_description": "Limitează durata totală de timp pentru care poate fi rezervat acest eveniment",
+  "limit_total_booking_duration": "Limitare durată totală a rezervării",
+  "limit_total_booking_duration_description": "Limitare durată totală de timp pentru care poate fi rezervat acest eveniment",
   "add_limit": "Adăugați o limită",
   "team_name_required": "Este necesar numele echipei",
   "show_attendees": "Distribuiți informațiile despre participanți între invitați",
-  "how_additional_inputs_as_variables": "Cum se utilizează intrările suplimentare ca variabile",
   "format": "Format",
   "uppercase_for_letters": "Utilizați majuscule pentru toate literele",
   "replace_whitespaces_underscores": "Înlocuiți spațiile cu caractere de subliniere",
@@ -1360,7 +1357,6 @@
   "billing_help_title": "Aveți nevoie de altceva?",
   "billing_help_description": "Dacă aveți nevoie de ajutor suplimentar pentru facturare, echipa noastră de asistență este aici pentru a vă ajuta.",
   "billing_help_cta": "Contactați serviciul de asistență",
-  "ignore_special_characters": "Ignorați caracterele speciale pe eticheta pentru intrări suplimentare. Utilizați doar litere și cifre",
   "retry": "Reîncercați",
   "fetching_calendars_error": "A survenit o problemă legată de recuperarea calendarelor dvs. <1>Încercați din nou</1> sau contactați serviciul de asistență pentru clienți.",
   "calendar_connection_fail": "Conexiune calendar nereușită",
@@ -1586,19 +1582,19 @@
   "available_variables": "Variabile disponibile",
   "scheduler": "{Scheduler}",
   "no_workflows": "Niciun flux de lucru",
-  "change_filter": "Schimbă filtrul pentru a vedea fluxurile tale de lucru personale și de echipă.",
+  "change_filter": "Schimbați filtrul pentru a vedea fluxurile de lucru personale și de echipă.",
   "recommended_next_steps": "Următorii pași recomandați",
   "create_a_managed_event": "Creați un tip de eveniment gestionat",
   "meetings_are_better_with_the_right": "Ședințele sunt mai agreabile dacă participă membrii potriviți ai echipei. Invitați-i acum.",
-  "create_a_one_one_template": "Creează un șablon unu-unu pentru un tip de eveniment și distribuie-l mai multor membri.",
+  "create_a_one_one_template": "Creați un șablon individualizat pentru un tip de eveniment și distribuiți-l mai multor membri.",
   "collective_or_roundrobin": "Alocare colectivă sau prin rotație",
   "book_your_team_members": "Efectuați rezervări comune pentru membrii echipei. Alegeți evenimente colective sau creați un ciclu pentru a găsi persoana potrivită în urma alocării prin rotație.",
-  "event_no_longer_attending_subject": "Nu mai participă la {{title}} de pe {{date}}",
-  "no_longer_attending": "Nu mai participi la acest eveniment",
-  "attendee_no_longer_attending_subject": "Un participant nu mai ia parte la {{title}} de pe {{date}}",
-  "attendee_no_longer_attending": "Un participant nu mai ia parte la evenimentul tău",
+  "event_no_longer_attending_subject": "Nu mai participă la {{title}} de la {{date}}",
+  "no_longer_attending": "Nu mai participați la acest eveniment",
+  "attendee_no_longer_attending_subject": "Un participant nu mai ia parte la {{title}} de la {{date}}",
+  "attendee_no_longer_attending": "Un participant nu mai ia parte la evenimentul dvs.",
   "attendee_no_longer_attending_subtitle": "{{name}} a anulat. Acest lucru înseamnă că s-a eliberat un loc pentru acest interval de timp",
-  "create_event_on": "Crează eveniment pe",
+  "create_event_on": "Creați eveniment pe",
   "default_app_link_title": "Setați un link implicit pentru aplicații",
   "default_app_link_description": "Setarea unui link implicit pentru aplicații permite tuturor tipurilor de evenimente nou-create să utilizeze linkul pentru aplicații pe care l-ați setat.",
   "change_default_conferencing_app": "Setează ca implicit",
@@ -1606,28 +1602,28 @@
   "under_maintenance_description": "Echipa {{appName}} efectuează lucrări de întreținere programate. Dacă aveți întrebări, contactați serviciul de asistență.",
   "event_type_seats": "{{numberOfSeats}} (de) locuri",
   "booking_questions_title": "Întrebări legate de rezervare",
-  "booking_questions_description": "Personalizează întrebările adresate pe pagina de rezervare",
-  "add_a_booking_question": "Adaugă o întrebare",
+  "booking_questions_description": "Personalizați întrebările adresate pe pagina de rezervare",
+  "add_a_booking_question": "Adăugați o întrebare",
   "duplicate_email": "E-mailul este duplicat",
   "booking_with_payment_cancelled": "Nu se mai poate plăti pentru acest eveniment",
   "booking_with_payment_cancelled_already_paid": "Există o rambursare în curs pentru plata acestei rezervări.",
   "booking_with_payment_cancelled_refunded": "Plata pentru această rezervare a fost rambursată.",
   "booking_confirmation_failed": "Confirmare rezervare nereușită",
-  "not_enough_seats": "Nu sunt destule locuri",
-  "form_builder_field_already_exists": "Deja exiztă un câmp cu acest nume",
-  "form_builder_field_add_subtitle": "Personalizează întrebările adresate pe pagina de rezervare",
+  "not_enough_seats": "Nu sunt suficiente locuri",
+  "form_builder_field_already_exists": "Există deja un câmp cu acest nume",
+  "form_builder_field_add_subtitle": "Personalizați întrebările adresate pe pagina de rezervare",
   "get_started_zapier_templates": "Faceți primii pași cu șabloanele Zapier",
-  "team_is_unpublished": "{{team}} este nepublicată",
-  "team_is_unpublished_description": "Acest link de echipă nu este disponibil momentan. Te rugăm să contactezi proprietarul echipei sau să îi spui să îl publice.",
+  "team_is_unpublished": "Echipa {{team}} nu este publicată",
+  "team_is_unpublished_description": "Acest link de echipă nu este disponibil momentan. Contactați proprietarul echipei sau rugați-l să îl publice.",
   "team_member": "Membru al echipei",
   "a_routing_form": "Un formular de parcurs",
   "form_description_placeholder": "Descriere formular",
   "keep_me_connected_with_form": "Vreau să primesc actualizări privind formularul",
   "fields_in_form_duplicated": "Orice modificări aduse parcursului și câmpurilor din formularul duplicat se vor reflecta în duplicat.",
   "form_deleted": "Formular șters",
-  "delete_form": "Ștergere formular",
+  "delete_form": "Sigur doriți să ștergeți acest formular?",
   "delete_form_action": "Da, șterg formularul",
-  "delete_form_confirmation": "Sigur doriți să ștergeți acest formular? Nicio persoană căreia i-ați transmis linkul nu va mai putea efectua rezervări pe baza lui. În plus, toate răspunsurile asociate vor fi șterse.",
+  "delete_form_confirmation": "Nicio persoană căreia i-ați transmis linkul nu îl va mai putea accesa.",
   "delete_form_confirmation_2": "Toate răspunsurile asociate vor fi șterse.",
   "typeform_redirect_url_copied": "URL-ul de redirecționare Typeform a fost copiat! Puteți accesa și seta URL-ul în formularul Typeform.",
   "modifications_in_fields_warning": "Modificările aduse câmpurilor și parcursurilor pentru următoarele formulare vor fi reproduse în acest formular.",
@@ -1651,16 +1647,17 @@
   "this_will_be_the_placeholder": "Acesta va fi substituentul",
   "this_meeting_has_not_started_yet": "Această întâlnire nu a început încă",
   "this_app_requires_connected_account": "{{appName}} necesită un cont {{dependencyName}} conectat",
-  "connect_app": "Conectează {{dependencyName}}",
-  "app_is_connected": "{{dependencyName}} este conectat",
+  "connect_app": "Conectare {{dependencyName}}",
+  "app_is_connected": "Aplicația {{dependencyName}} este conectată",
   "requires_app": "Necesită {{dependencyName}}",
   "verification_code": "Cod de verificare",
-  "can_you_try_again": "Poți încerca din nou cu o oră diferită?",
-  "verify": "Verifică",
-  "select_all": "Selectează tot",
-  "default_conferencing_bulk_title": "Actualizează în masă tipurile de evenimente existente",
+  "can_you_try_again": "Puteți încerca din nou cu o oră diferită?",
+  "verify": "Verificare",
+  "timezone_variable": "Timezone",
   "invalid_event_name_variables": "Numele evenimentului include o variabilă nevalidă",
-  "default_conferencing_bulk_description": "Actualizează locațiile pentru tipurile de evenimente selectate",
+  "select_all": "Selectare tot",
+  "default_conferencing_bulk_title": "Actualizare în masă tipuri de evenimente existente",
+  "default_conferencing_bulk_description": "Actualizați locațiile pentru tipurile de evenimente selectate",
   "looking_for_more_analytics": "Cauți mai multe analize?",
   "add_filter": "Adaugă filtru",
   "select_user": "Selectează utilizatorul",
diff --git a/apps/web/public/static/locales/ru/common.json b/apps/web/public/static/locales/ru/common.json
index 04fb5aea17..741fc6f901 100644
--- a/apps/web/public/static/locales/ru/common.json
+++ b/apps/web/public/static/locales/ru/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Поставщик удостоверений",
   "trial_days_left": "У вас осталось $t(day, {\"count\": {{days}} }) пробной версии PRO",
   "day_one": "{{count}} день",
   "day_other": "{{count}} дн.",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Ожидает подтверждения: {{title}} на {{date}}",
   "event_still_awaiting_approval": "Событие все еще ждет вашего подтверждения",
   "booking_submitted_subject": "Бронирование отправлено: {{title}}, {{date}}",
+  "download_recording_subject": "Скачать запись: {{title}} от {{date}}",
+  "download_your_recording": "Скачать запись",
   "your_meeting_has_been_booked": "Ваша встреча была забронирована",
   "event_type_has_been_rescheduled_on_time_date": "Ваше {{title}} было перенесено на {{date}}.",
   "event_has_been_rescheduled": "Ваше событие было перенесено.",
@@ -224,6 +227,7 @@
   "done": "Готово",
   "all_done": "Готово!",
   "all_apps": "Все приложения",
+  "available_apps": "Доступные приложения",
   "check_email_reset_password": "Проверьте вашу электронную почту, мы отправили вам ссылку для сброса пароля.",
   "finish": "Завершить",
   "few_sentences_about_yourself": "Напишите несколько предложений о себе. Они будут отображаться на вашей публичной странице.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Добавить новый интервал времени",
   "add_an_extra_layer_of_security": "Добавьте дополнительный уровень безопасности в свою учетную запись на случай кражи пароля.",
   "2fa": "Двухфакторная авторизация",
+  "2fa_disabled": "Двухфакторную аутентификацию можно включить только для аутентификации по электронной почте и паролю",
   "enable_2fa": "Включить двухфакторную авторизацию",
   "disable_2fa": "Отключить двухфакторную авторизацию",
   "disable_2fa_recommendation": "Если вам нужно отключить двухфакторную авторизацию, мы рекомендуем включить её как можно скорее.",
@@ -585,6 +590,20 @@
   "minutes": "мин.",
   "round_robin": "По кругу",
   "round_robin_description": "Цикл встреч между несколькими членами команды.",
+  "managed_event": "Управляемое событие",
+  "username_placeholder": "имя пользователя",
+  "managed_event_description": "Создавайте пакеты типов событий и рассылайте их участнкиам команды",
+  "managed": "Управляемые",
+  "managed_event_url_clarification": "в \"username\" указывается имя пользователя, присвоенное участнику",
+  "assign_to": "Назначить",
+  "add_members": "Добавить участников...",
+  "count_members_one": "{{count}} участник",
+  "count_members_other": "{{count}} участника(ов)",
+  "no_assigned_members": "Нет назначенных участников",
+  "assigned_to": "Назначено",
+  "start_assigning_members_above": "Начните назначать участников",
+  "locked_fields_admin_description": "Участники не смогут это редактировать",
+  "locked_fields_member_description": "Эта опция заблокирована администратором команды",
   "url": "URL",
   "hidden": "Скрытый",
   "readonly": "Только для чтения",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Минимальный срок уведомления о встрече",
   "slot_interval": "Интервалы времени",
   "slot_interval_default": "Использовать длину события (по умолчанию)",
+  "delete_event_type": "Удалить тип события?",
+  "delete_managed_event_type": "Удалить тип управляемого события?",
+  "delete_event_type_description": "Если вы поделились с кем-то ссылкой, с ее помощью больше нельзя оформлять бронирование.",
+  "delete_managed_event_type_description": "<ul><li>У участников, назначенных для этого типа события, будут удалены их типы событий.</li><li>Если они поделились с кем-то ссылкой, с ее помощью больше нельзя будет оформлять бронирование.</li></ul>",
+  "confirm_delete_event_type": "Да, удалить",
   "delete_account": "Удалить аккаунт",
   "confirm_delete_account": "Да, удалить аккаунт",
   "delete_account_confirmation_message": "Вы уверены, что хотите удалить свой {{appName}}-аккаунт? Любой, кто имеет ссылку на вашу учетную запись, больше не сможет забронировать встречу, и сохраненные настройки будут потеряны.",
@@ -1126,13 +1150,13 @@
   "current_username": "Текущее имя пользователя",
   "example_1": "Пример 1",
   "example_2": "Пример 2",
-  "additional_input_label": "Дополнительная метка ввода",
+  "booking_question_identifier": "Идентификатор вопроса о бронировании",
   "company_size": "Размер компании",
   "what_help_needed": "Какая помощь вам нужна?",
   "variable_format": "Формат переменной",
   "webhook_subscriber_url_reserved": "URL вебхука для подписчика уже определен",
   "custom_input_as_variable_info": "Игнорировать все специальные символы в дополнительной метке ввода (использовать только буквы и цифры), использовать верхний регистр для всех букв и заменить пробелы подчеркиванием.",
-  "using_additional_inputs_as_variables": "Как использовать ответы на дополнительные вопросы в качестве переменных?",
+  "using_booking_questions_as_variables": "Как использовать вопросы о бронировании в качестве переменных?",
   "download_desktop_app": "Скачать приложение для компьютера",
   "set_ping_link": "Ссылка на Ping",
   "rate_limit_exceeded": "Превышен лимит",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Начало недели",
   "recordings_title": "Записи",
   "recording": "Запись",
+  "happy_scheduling": "Счастливого планирования",
   "select_calendars": "Выберите, в каких календарях нужно проверить наличие конфликтов и дублированного бронирования.",
   "check_for_conflicts": "Проверить наличие конфликтов",
   "view_recordings": "Просмотреть записи",
@@ -1215,6 +1240,7 @@
   "impersonation": "Вход от вашего имени",
   "impersonation_description": "Настройки для управления входом в аккаунт от имени пользователя",
   "users": "Пользователи",
+  "user": "Пользователь",
   "profile_description": "Настройка вашего профиля в {{appName}}",
   "users_description": "Здесь представлен список всех пользователей",
   "users_listing": "Список пользователей",
@@ -1255,6 +1281,8 @@
   "download_responses": "Скачивайте ответы",
   "download_responses_description": "Скачивайте все ответы пользователей, заполнивших форму, в формате CSV.",
   "download": "Скачать",
+  "download_recording": "Скачать запись",
+  "recording_from_your_recent_call": "Запись вашего недавнего звонка на Cal.com готова для загрузки",
   "create_your_first_form": "Создайте первую форму",
   "create_your_first_form_description": "Формы маршрутизации позволяют задавать пользователям уточняющие вопросы, чтобы перенаправлять их к соответствующему лицу или типу события.",
   "create_your_first_webhook": "Создайте свой первый вебхук",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Базовая авторизация",
   "exchange_authentication_ntlm": "Авторизация при помощи NTLM",
   "exchange_compression": "Сжатие GZip",
+  "exchange_version": "Версия Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Здесь показываются все созданные вами формы и маршруты.",
   "routing_forms_send_email_owner": "Отправляйте письма владельцу",
   "routing_forms_send_email_owner_description": "Отправляйте владельцу формы электронное письмо, когда пользователь ее заполняет",
@@ -1345,7 +1382,7 @@
   "add_limit": "Добавить ограничение",
   "team_name_required": "Требуется название команды",
   "show_attendees": "Предоставлять гостям информацию об участниках",
-  "how_additional_inputs_as_variables": "Как использовать дополнительные данные в качестве переменных",
+  "how_booking_questions_as_variables": "Как использовать вопросы о бронировании в качестве переменных?",
   "format": "Формат",
   "uppercase_for_letters": "Использовать только прописные буквы",
   "replace_whitespaces_underscores": "Заменить пробелы подчеркиванием",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Нужно что-нибудь еще?",
   "billing_help_description": "Если вам нужна дальнейшая помощь с оплатой счета, наша служба поддержки готова помочь.",
   "billing_help_cta": "Обратиться в службу поддержки",
-  "ignore_special_characters": "Не используйте специальные символы в метке дополнительного поля ввода. Используйте только буквы и цифры",
+  "ignore_special_characters_booking_questions": "Не используйте специальные символы в идентификаторе вопроса о бронировании. Используйте только буквы и цифры",
   "retry": "Повторить",
   "fetching_calendars_error": "Ошибка при загрузке календарей. <1>Попробуйте еще раз</1> или обратитесь в службу поддержки.",
   "calendar_connection_fail": "Не удалось подключиться к календарю",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Фиксированная очередность",
   "add_one_fixed_attendee": "Добавьте одного фиксированного участника и назначайте участников по очереди.",
   "calcom_is_better_with_team": "Cal.com отлично подходит для командной работы",
+  "the_calcom_team": "Команда Cal.com",
   "add_your_team_members": "Добавьте участников команды к типам мероприятий. Благодаря совместному планированию можно включить в мероприятие всех пользователей или найти наиболее подходящего пользователя с циклическим планированием.",
   "booking_limit_reached": "Достигнут лимит бронирования для этого типа события",
   "duration_limit_reached": "Время бронирования для этого типа события истекло",
   "admin_has_disabled": "Администратор отключил {{appName}}",
   "disabled_app_affects_event_type": "Администратор отключил {{appName}}, которое влияет на тип мероприятия {{eventType}}",
+  "event_replaced_notice": "Администратор заменил вам один из типов событий",
+  "email_subject_slug_replacement": "Администратор команды заменил вам событие /{{slug}}",
+  "email_body_slug_replacement_notice": "Администратор команды <strong>{{teamName}}</strong> заменил вам тип события <strong>/{{slug}}</strong> на тип управляемого им события.",
+  "email_body_slug_replacement_info": "Ваша ссылка работает, но, возможно, для нее изменились некоторые настройки. Вы можете просмотреть ее в типах событий.",
+  "email_body_slug_replacement_suggestion": "Если у вас есть вопросы о типе события, свяжитесь с администратором.<br /><br />Счастливого планирования, <br />команда Cal.com",
   "disable_payment_app": "Приложение {{appName}}, используемое для событий типа «{{title}}», отключено администратором. Участники по-прежнему могут бронировать данный тип событий, но не будут получать сообщение о необходимости произвести оплату. Чтобы этого избежать, вы можете скрыть тип событий до тех пор, пока администратор снова не активирует способ оплаты.",
   "payment_disabled_still_able_to_book": "Участники все еще могут забронировать этот тип мероприятия, но они не получат сообщение о том, что нужно произвести оплату. Чтобы этого избежать, можно скрыть тип мероприятия, пока администратор не активирует способ оплаты снова.",
   "app_disabled_with_event_type": "Администратор отключил {{appName}}, которое влияет на тип мероприятия {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Обновить переопределение",
   "event_type_duplicate_copy_text": "{{slug}}-копия",
   "set_as_default": "Использовать по умолчанию",
+  "hide_eventtype_details": "Скрыть информацию о типе события",
   "show_navigation": "Показать навигацию",
   "hide_navigation": "Скрыть навигацию",
   "verification_code_sent": "Код подтверждения отправлен",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Создайте первый вебхук для этого командного типа событий",
   "create_webhook_team_event_type": "Создать вебхук для этого командного типа событий",
   "disable_success_page": "Отключить страницу успешного бронирования (работает, только если у вас есть URL-адрес перенаправления)",
+  "invalid_admin_password": "У вас есть права администратора, но ваш пароль короче 15 символов, либо у вас еще нет 2FA",
   "change_password_admin": "Измените пароль, чтобы получить административный доступ",
   "username_already_taken": "Имя пользователя уже занято",
   "assignment": "Назначение",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "Enterprise-лицензия «/ee»",
   "enterprise_booking_fee": "От {{enterprise_booking_fee}}/месяц",
   "enterprise_license_includes": "Всё для коммерческого использования",
+  "no_need_to_keep_your_code_open_source": "Необязательно оставлять исходный код открытым",
   "repackage_rebrand_resell": "Простая переупаковка, ребрендинг и перепродажа",
   "a_vast_suite_of_enterprise_features": "Множество функций для предприятий",
   "free_license_fee": "0,00 $/месяц",
@@ -1593,15 +1639,16 @@
   "create_a_one_one_template": "Создайте единый шаблон для данного типа события и распространите его среди нескольких участников.",
   "collective_or_roundrobin": "Коллективное событие или событие с назначением участников по очереди",
   "book_your_team_members": "Бронируйте встречи с несколькими участниками команды или назначайте участников по очереди.",
-  "event_no_longer_attending_subject": "Не планирует посетить {{title}} {{date}}",
+  "event_no_longer_attending_subject": "Посещение {{title}} в {{date}} не планируется",
   "no_longer_attending": "Вы не идете на это мероприятие",
-  "attendee_no_longer_attending_subject": "Пользователь не планирует посетить {{title}} {{date}}",
+  "attendee_no_longer_attending_subject": "Пользователь не планирует посетить {{title}} в {{date}}",
   "attendee_no_longer_attending": "Пользователь не участвует в вашем мероприятии",
-  "attendee_no_longer_attending_subtitle": "{{name}} отменено. Этот промежуток времени снова свободен",
+  "attendee_no_longer_attending_subtitle": "{{name}} отменил посещение мероприятия. Этот промежуток времени снова свободен",
   "create_event_on": "Создать события",
   "default_app_link_title": "Установить ссылку на приложение по умолчанию",
   "default_app_link_description": "Если установить ссылку на приложение по умолчанию, она будет присваиваться всем вновь создаваемым событиям.",
   "change_default_conferencing_app": "Использовать по умолчанию",
+  "organizer_default_conferencing_app": "Приложение организатора по умолчанию",
   "under_maintenance": "Идет техническое обслуживание",
   "under_maintenance_description": "Команда {{appName}} выполняет плановое техобслуживание. По вопросам обращайтесь в службу поддержки.",
   "event_type_seats": "Мест: {{numberOfSeats}}",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "Недостаточно мест",
   "form_builder_field_already_exists": "Поле с таким именем уже существует",
   "form_builder_field_add_subtitle": "Настроить вопросы, задаваемые на странице бронирования",
+  "show_on_booking_page": "Показывать на странице бронирования",
   "get_started_zapier_templates": "Начать работу с шаблонами Zapier",
   "team_is_unpublished": "{{team}} не опубликовано",
   "team_is_unpublished_description": "Эта ссылка команды в настоящее время недоступна. Пожалуйста, свяжитесь с владельцем команды или попросите его опубликовать ссылку.",
@@ -1639,6 +1687,12 @@
   "add_1_option_per_line": "1 вариант на строку",
   "select_a_router": "Выбрать форму маршрутизации",
   "add_a_new_route": "Добавить новый маршрут",
+  "make_informed_decisions": "Принимайте обоснованные решения с помощью Insights",
+  "make_informed_decisions_description": "На нашей панели мониторинга Insights видна вся работа вашей команды, а выявленные ею тенденции позволяют лучше планировать и принимать решения.",
+  "view_bookings_across": "Просмотреть бронирования для всех участников",
+  "view_bookings_across_description": "Выясните, кто участвует в мероприятиях больше всех, и обеспечьте оптимальное распределение задач в команде",
+  "identify_booking_trends": "Определяйте тренды бронирования",
+  "identify_booking_trends_description": "Посмотрите, в какое время и в какие дни бронирование оформляют чаще всего",
   "no_responses_yet": "Ответов пока нет",
   "this_will_be_the_placeholder": "Это текст-заполнитель",
   "this_meeting_has_not_started_yet": "Эта встреча еще не началась",
@@ -1649,8 +1703,23 @@
   "verification_code": "Код подтверждения",
   "can_you_try_again": "Попробуйте пожалуйста позже",
   "verify": "Подтвердить",
+  "timezone_variable": "Часовой пояс",
+  "timezone_info": "Часовой пояс получателя",
+  "invalid_event_name_variables": "В названии события недопустимая переменная",
   "select_all": "Выбрать все",
   "default_conferencing_bulk_title": "Массовое обновление существующих типов событий",
-  "invalid_event_name_variables": "В названии события недопустимая переменная",
-  "default_conferencing_bulk_description": "Обновить местоположение для выбранных типов событий"
+  "default_conferencing_bulk_description": "Обновить местоположение для выбранных типов событий",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> уже используют <string>/{{slug}}</strong> url.",
+  "from_last_period": "с последнего периода",
+  "hold": "Подождите",
+  "card_held": "Карта сохранена",
+  "charge_card": "Изменить карту",
+  "card_charged": "Оплата с карты списана",
+  "no_show_fee_amount": "{{amount, currency}} комиссия за отсутствие на событии",
+  "no_show_fee": "Комиссия за отсутствие на событии",
+  "submit_card": "Ввести карту",
+  "submit_payment_information": "Отправить платежную информацию",
+  "meeting_awaiting_payment_method": "Выберите способ оплаты для встречи",
+  "no_show_fee_charged_email_subject": "Комиссия за отсутствие на событии {{amount, currency}} списана с {{title}} от {{date}}",
+  "acknowledge_booking_no_show_fee": "Я понимаю, что в случае моего отказа посетить это мероприятие с моей карты будет списана комиссия за отсутствие на мероприятии в размере {{amount, currency}}."
 }
diff --git a/apps/web/public/static/locales/sr/common.json b/apps/web/public/static/locales/sr/common.json
index 14212252b7..2ad73c10b3 100644
--- a/apps/web/public/static/locales/sr/common.json
+++ b/apps/web/public/static/locales/sr/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Dobavljač identiteta",
   "trial_days_left": "Preostalo vam je $t(day, {\"count\": {{days}} }) na vašem probnom PRO nalogu",
   "day_one": "{{count}} dan",
   "day_other": "{{count}} dana",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Čeka na odobrenje: {{title}} datuma {{date}}",
   "event_still_awaiting_approval": "Događaj još čeka na vaše odobrenje",
   "booking_submitted_subject": "Rezervacija podneta:{{title}} datuma {{date}}",
+  "download_recording_subject": "Preuzimanje snimka: {{title}} dana {{date}}",
+  "download_your_recording": "Preuzmite svoj snimak",
   "your_meeting_has_been_booked": "Sastanak je zakazan",
   "event_type_has_been_rescheduled_on_time_date": "Ваш {{титле}} је померен за {{дате}}.",
   "event_has_been_rescheduled": "Ažurirano - Vaš dogadjaj je odložen",
@@ -224,6 +227,7 @@
   "done": "Urađeno",
   "all_done": "Završeno!",
   "all_apps": "Sve aplikacije",
+  "available_apps": "Dostupne aplikacije",
   "check_email_reset_password": "Proverite vašu e-poštu. Poslali smo vam link za resetovanje lozinke.",
   "finish": "Završi",
   "few_sentences_about_yourself": "Par rečenica o vama. Ovo će se pojaviti na vašoj ličnoj url stranici.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Dodaj novi vremenski interval",
   "add_an_extra_layer_of_security": "Dodajte dodatni nivo sigurnosti svom nalogu u slučaju da vam je lozinka ukradena.",
   "2fa": "Dvofaktorska Autentikacija",
+  "2fa_disabled": "Dvostruka potvrda identiteta pože biti omogućena samo za potvrdu identiteta putem imejla i lozinke",
   "enable_2fa": "Omogući dvofaktorsku autentikaciju",
   "disable_2fa": "Onemogući dvofaktorsku autentikaciju",
   "disable_2fa_recommendation": "Ako morate da onemogućite 2FA, predlažemo da je omogućite što pre.",
@@ -585,6 +590,20 @@
   "minutes": "Minuti",
   "round_robin": "Round Robin",
   "round_robin_description": "Ciklusirajte sastanke između više članova tima.",
+  "managed_event": "Upravljani događaj",
+  "username_placeholder": "korisničko ime",
+  "managed_event_description": "Kreirajte i distribuirajte veliku količinu tipova događaja članovima tima",
+  "managed": "Upravljano",
+  "managed_event_url_clarification": "„korisničko ime“ će biti ispunjeno korisničkim imenom dodeljenog člana",
+  "assign_to": "Dodelite",
+  "add_members": "Dodajte članove...",
+  "count_members_one": "{{count}} član",
+  "count_members_other": "{{count}} članova",
+  "no_assigned_members": "Nema dodeljenih članova",
+  "assigned_to": "Dodeljeno",
+  "start_assigning_members_above": "Počnite da dodeljujete korisnicima iznad",
+  "locked_fields_admin_description": "Članovi neće moći da uređuju ovo",
+  "locked_fields_member_description": "Ova opcija je zaključana od strane administratora tima",
   "url": "URL",
   "hidden": "Sakriven",
   "readonly": "Samo za čitanje",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Minimalni rok za najavu sastanka",
   "slot_interval": "Intervali vremenskih slotova",
   "slot_interval_default": "Koristi dužinu događaja (uobičajeno podešavanje)",
+  "delete_event_type": "Izbriši tip događaja?",
+  "delete_managed_event_type": "Izbriši upravljani tip događaja?",
+  "delete_event_type_description": "Niko sa kime ste podelili link neće više moći da rezerviše pomoću njega.",
+  "delete_managed_event_type_description": "<ul><li>Članovima dodeljenim ovom tipu događaja će takođe biti obrisani njihovi tipovi događaja.</li><li>Niko sa kim su podelili svoj link neće više moći da zakaže pomoću njega.</li></ul>",
+  "confirm_delete_event_type": "Da, izbriši",
   "delete_account": "Izbriši nalog",
   "confirm_delete_account": "Da, izbriši nalog",
   "delete_account_confirmation_message": "Da li ste sigurni da želite izbrisati svoj {{appName}} nalog? S kim god ste podelili link ovog naloga više neće moći da ga koristi za rezervacije i sva podešavanja koja imate neće biti sačuvana.",
@@ -1126,13 +1150,13 @@
   "current_username": "Trenutno korisničko ime",
   "example_1": "Primer 1",
   "example_2": "Primer 2",
-  "additional_input_label": "Dodatna oznaka ulaza",
+  "booking_question_identifier": "Identifikator pitanja o zakazivanju",
   "company_size": "Veličina kompanije",
   "what_help_needed": "U vezi sa čim vam je potrebna pomoć?",
   "variable_format": "Format promenljive",
   "webhook_subscriber_url_reserved": "Url adresa Webhook pretplatnika je već definisana",
   "custom_input_as_variable_info": "Zanemarite sve specijalne znakove za dodatne oznake unosa (koristite samo slova i brojeve), koristite samo velika slova i zamenite razmake donjim crtama.",
-  "using_additional_inputs_as_variables": "Kako da koristite dodatne unose kao promenljive?",
+  "using_booking_questions_as_variables": "Kako da koristim pitanja o zakazivanju kao promenljivu?",
   "download_desktop_app": "Preuzmite aplikaciju za stoni računar",
   "set_ping_link": "Podesi Ping vezu",
   "rate_limit_exceeded": "Premašeno ograničenje stope",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Početak nedelje",
   "recordings_title": "Snimci",
   "recording": "Snimanje",
+  "happy_scheduling": "Srećno planiranje",
   "select_calendars": "Izaberite kalendare koje želite da proverite da li imaju konflikta da biste sprečili dvostruka zakazivanja.",
   "check_for_conflicts": "Proverite konflikte",
   "view_recordings": "Pregledaj snimke",
@@ -1215,6 +1240,7 @@
   "impersonation": "Predstavljanje kao",
   "impersonation_description": "Podešavanja za upravljanje prijavljivanjem na nalog u ime korisnika",
   "users": "Korisnici",
+  "user": "Korisnik",
   "profile_description": "Upravljajte podešavanjima vašeg {{appName}} profila",
   "users_description": "Ovde možete pronaći spisak svih korisnika",
   "users_listing": "Spisak korisnika",
@@ -1255,6 +1281,8 @@
   "download_responses": "Preuzmi odgovore",
   "download_responses_description": "Preuzmite sve odgovore iz obrasca u CSV formatu.",
   "download": "Preuzmi",
+  "download_recording": "Preuzmi snimak",
+  "recording_from_your_recent_call": "Snimak vašeg nedavnog poziva na Cal.com je spreman za preuzimanje",
   "create_your_first_form": "Kreirajte vaš prvi formular",
   "create_your_first_form_description": "Sa formularima za rutiranje možete postavljati kvalifikaciona pitanja i usmeravati ih do prave osobe ili tipa događaja.",
   "create_your_first_webhook": "Kreirajte vaš prvi Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Osnovna potvrda identiteta",
   "exchange_authentication_ntlm": "NTLM potvrda identiteta",
   "exchange_compression": "GZip kompresija",
+  "exchange_version": "Verzija za razmenu",
+  "exchange_version_2007_SP1": "2007. SP1",
+  "exchange_version_2010": "2010.",
+  "exchange_version_2010_SP1": "2010. SP1",
+  "exchange_version_2010_SP2": "2010. SP2",
+  "exchange_version_2013": "2013.",
+  "exchange_version_2013_SP1": "2013. SP1",
+  "exchange_version_2015": "2015.",
+  "exchange_version_2016": "2016.",
   "routing_forms_description": "Možete da vidite sve formulare i rute koje ste kreirali ovde.",
   "routing_forms_send_email_owner": "Pošaljite imejl vlasniku",
   "routing_forms_send_email_owner_description": "Pošaljite imejl vlasniku kada pošaljete obrazac",
@@ -1345,7 +1382,7 @@
   "add_limit": "Dodajte ograničenje",
   "team_name_required": "Ime tima je potrebno",
   "show_attendees": "Podelite informacije o učesnicima između gostiju",
-  "how_additional_inputs_as_variables": "Kako da koristite dodatne unose kao promenljive",
+  "how_booking_questions_as_variables": "Kako da koristite pitanja o zakazivanju kao promenljivu?",
   "format": "Format",
   "uppercase_for_letters": "Koristite velika slova za sva slova",
   "replace_whitespaces_underscores": "Zamenite prazna mesta donjom crtom",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Treba li vam još nešto?",
   "billing_help_description": "Ako vam treba pomoć sa naplatom, naš tim podrške je tu da pomogne.",
   "billing_help_cta": "Obratite se podršci",
-  "ignore_special_characters": "Ignorisati specijalne znakove u vašim oznakama Dodatnih unosa. Koristiti samo slova i brojeve",
+  "ignore_special_characters_booking_questions": "Ignorišite specijalne znakove u vašim identifikatorima pitanja o zakazivanju. Koristite samo slova i brojeve",
   "retry": "Pokušajte ponovo",
   "fetching_calendars_error": "Došlo je do problema prilikom dobavljanja vaših kalendara. <1>Pokušajte ponovo</1> ili se obratite korisničkoj podršci.",
   "calendar_connection_fail": "Povezivanje sa kalendarom nije uspelo",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Fiksno kružno dodeljivanje",
   "add_one_fixed_attendee": "Dodajte jednog fiksnog učesnika i onda rotirajte ostale učesnike.",
   "calcom_is_better_with_team": "Cal.com je bolji uz timove",
+  "the_calcom_team": "Cal.com tim",
   "add_your_team_members": "Dodajte članove vašeg tima vašim tipovima događaja. Koristite kolektivno zakazivanje da uključite svakoga ili pronađete osobu koja najviše odgovara pomoću zakazivanja kružnim dodeljivanjem.",
   "booking_limit_reached": "Dostignuta je granica zakazivanja za ovaj tip događaja",
   "duration_limit_reached": "Dostignuta je granica trajanja za ovaj tip događaja",
   "admin_has_disabled": "Administrator je onemogućio {{appName}}",
   "disabled_app_affects_event_type": "Administrator je onemogućio {{appName}}, što utiče na vaš tip događaja {{eventType}}",
+  "event_replaced_notice": "Administrator je zamenio jedan od vaših tipova događaja",
+  "email_subject_slug_replacement": "Administrator tima je zamenio vaš događaj /{{slug}}",
+  "email_body_slug_replacement_notice": "Administrator iz <strong>{{teamName}}</strong> tima je zamenio vaš tip događaja <strong>{{slug}}</strong> upravljanim tipom događaja koji oni kontrolišu.",
+  "email_body_slug_replacement_info": "Vaš link će nastaviti da funkcioniše, ali neka od njegovih podešavanja su se možda promenila. Možete da ih pregledate u tipovima događaja.",
+  "email_body_slug_replacement_suggestion": "Ako imate bilo kakvih pitanja u vezi sa tipom događaja, obratite se svom administratoru.<br /><br />Srećno planiranje, <br />Cal.com tim",
   "disable_payment_app": "Administrator je onemogućio {{appName}}, što utiče na vaš tip događaja {{title}}. Učesnici još uvek mogu da zakažu ovaj tip događaja, ali od njih neće biti zatraženo da plate. Možete da sakrijete ovaj tip događaja da biste to sprečili dok vaš administrator ponovo ne omogući vaš način plaćanja.",
   "payment_disabled_still_able_to_book": "Učesnici još uvek mogu da zakažu ovaj tip događaja, ali od njih neće biti zatraženo da plate. Možete da sakrijete ovaj tip događaja da biste to sprečili dok vaš administrator ponovo ne omogući vaš način plaćanja.",
   "app_disabled_with_event_type": "Administrator je onemogućio {{appName}}, što utiče na vaš tip događaja {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Ažuriraj zamenu",
   "event_type_duplicate_copy_text": "{{slug}}-kopija",
   "set_as_default": "Postavi kao podrazumevano",
+  "hide_eventtype_details": "Sakrij detalje tipa događaja",
   "show_navigation": "Prikaži navigaciju",
   "hide_navigation": "Sakrij navigaciju",
   "verification_code_sent": "Verifikacioni kod je poslat",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Napravite svoj prvi webhook za ovaj tip timskog događaja",
   "create_webhook_team_event_type": "Napravite webhook za ovaj tip timskog događaja",
   "disable_success_page": "Onemogući stranicu Uspeh (radi samo ako imate URL za preusmeravanje)",
+  "invalid_admin_password": "Vi ste administrator ali nemate lozinku koja je duga najmanje 15 znakova ili još uvek nemate dvostruku potvrdu identiteta",
   "change_password_admin": "Promenite lozinku da biste dobili pristup administratora",
   "username_already_taken": "Korisničko ime je zauzeto",
   "assignment": "Dodeljivanje",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "“/ee” Licenca za preduzeća",
   "enterprise_booking_fee": "Već od {{enterprise_booking_fee}}/mesečno",
   "enterprise_license_includes": "Sve za komercijalnu upotrebu",
+  "no_need_to_keep_your_code_open_source": "Nije potrebno da vaš kôd bude otvoren",
   "repackage_rebrand_resell": "Prepakujte, rebrendirajte i lako ponovo prodajte",
   "a_vast_suite_of_enterprise_features": "Ogroman izbor funkcija za preduzeća",
   "free_license_fee": "0,00 $/mesečno",
@@ -1602,6 +1648,7 @@
   "default_app_link_title": "Podesite podrazumevani link aplikacije",
   "default_app_link_description": "Podešavanje podrazumevanog linka aplikacije omogućava novokreiranim tipovima događaja da koriste link aplikacije koji ste postavili.",
   "change_default_conferencing_app": "Postavi kao podrazumevano",
+  "organizer_default_conferencing_app": "Podrazumevana aplikacija organizatora",
   "under_maintenance": "Ne radi zbog održavanja",
   "under_maintenance_description": "Tim {{appName}} izvodi zakazano održavanje. Ako imate pitanja, obratite se korisničkoj podršci.",
   "event_type_seats": "{{numberOfSeats}} mesta",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "Nema dovoljno mesta",
   "form_builder_field_already_exists": "Polje sa ovim imenom već postoji",
   "form_builder_field_add_subtitle": "Prilagodite pitanja postavljana na stranici za zakazivanje",
+  "show_on_booking_page": "Prikaži na stranici zakazivanja",
   "get_started_zapier_templates": "Započnite sa Zapier predlošcima",
   "team_is_unpublished": "{{team}} više nije objavljen",
   "team_is_unpublished_description": "Ova veza tima više nije dostupna. Obratite se vlasniku tima ili ih zamolite da ga objave.",
@@ -1652,17 +1700,45 @@
   "this_meeting_has_not_started_yet": "Ovaj sastanak još nije počeo",
   "this_app_requires_connected_account": "{{appName}} zahteva povezani {{dependencyName}} nalog",
   "connect_app": "Povežite {{dependencyName}}",
-  "app_is_connected": "{{dependencyName}} je povezan",
+  "app_is_connected": "{{dependencyName}} je povezana",
   "requires_app": "Zahteva {{dependencyName}}",
   "verification_code": "Verifikacioni kôd",
-  "can_you_try_again": "Možete li da pokušate ponovo kasnije?",
+  "can_you_try_again": "Možete li da pokušate sa drugim terminom?",
   "verify": "Verifikuj",
+  "timezone_variable": "Vremenska zona",
+  "timezone_info": "Vremenska zona primaoca",
+  "event_end_time_variable": "Vreme završetka događaja",
+  "event_end_time_info": "Vreme završetka događaja",
+  "cancel_url_variable": "URL za otkazivanje",
+  "cancel_url_info": "URL za otkazivanje zakazivanja",
+  "reschedule_url_variable": "URL za promenu termina",
+  "reschedule_url_info": "URL za promenu termina",
+  "invalid_event_name_variables": "U nazivu vašeg događaja se nalazi nevažeća promenljiva",
   "select_all": "Izaberite sve",
   "default_conferencing_bulk_title": "Masovno ažuriranje postojećih vrsti događaja",
-  "invalid_event_name_variables": "U nazivu vašeg događaja se nalazi nevažeća promenljiva",
+  "members_default_schedule": "Podrazumevani raspored članova",
+  "set_by_admin": "Postavio administrator tima",
+  "members_default_location": "Podrazumevana lokacija članova",
+  "members_default_schedule_description": "Koristićemo podrazumevani raspored dostupnosti za svakog člana. Oni će moći da ga uređuju ili promene.",
   "requires_at_least_one_schedule": "Potrebno je da imate barem jedan raspored",
   "default_conferencing_bulk_description": "Ažuriranje lokacija za izabrane tipove događaja",
+  "locked_for_members": "Zaključano za članove",
+  "locked_apps_description": "Članovi će moći da vide aktivne aplikacije, ali neće moći da uređuju bilo kakva podešavanja aplikacije",
+  "locked_webhooks_description": "Članovi će moći da vide aktivne webhook-ove, ali neće moći da uređuju bilo kakva podešavanja webhook-ova",
+  "locked_workflows_description": "Članovi će moći da vide aktivne radne tokove, ali neće moći da uređuju bilo kakva podešavanja radnih tokova",
+  "locked_by_admin": "Zaključao administrator",
+  "app_not_connected": "Niste povezali {{appName}} nalog.",
+  "connect_now": "Povežite odmah",
+  "managed_event_dialog_confirm_button_one": "Zameni i obavesti {{count}} člana",
+  "managed_event_dialog_confirm_button_other": "Zameni i obavesti {{count}} članova",
+  "managed_event_dialog_title_one": "URL /{{slug}} već postoji za {{count}} člana. Da li želite da ga zamenite?",
+  "managed_event_dialog_title_other": "URL /{{slug}} već postoji za {{count}} članova. Da li želite da ga zamenite?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> već koristi <strong>/{{slug}}</strong> URL.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> već koriste <string>/{{slug}}</strong> URL.",
+  "managed_event_dialog_clarification": "Ako izaberete da ga zamenite, obavestićemo ih. Vratite se i uklonite ih ako ne želite da zamenite postojeće.",
+  "review_event_type": "Pregledajte tip događaja",
   "looking_for_more_analytics": "Tražite još analitike?",
+  "looking_for_more_insights": "Tražite još uvida?",
   "add_filter": "Dodajte filter",
   "select_user": "Izaberite korisnika",
   "select_event_type": "Izaberite tip događaja",
@@ -1678,5 +1754,40 @@
   "events_rescheduled": "Pomereni događaji",
   "from_last_period": "iz prošlog perioda",
   "from_to_date_period": "Od: {{startDate}} Do: {{endDate}}",
-  "event_trends": "Trendovi događaja"
+  "analytics_for_organisation": "Uvidi",
+  "subtitle_analytics": "Saznajte više o aktivnosti vašeg tima",
+  "redirect_url_warning": "Dodavanje preusmeravanja će onemogućiti stranicu uspeha. Uverite se da spomenete „Zakazivanje potvrđeno“ na vašoj prilagođenoj stranici uspeha.",
+  "event_trends": "Trendovi događaja",
+  "clear_filters": "Izbriši filtere",
+  "hold": "Zadrži",
+  "on_booking_option": "Sakupite plaćanje za zakazivanje",
+  "hold_option": "Naplatite nadoknadu za izostanak",
+  "card_held": "Karta zadržana",
+  "charge_card": "Naplati karticu",
+  "card_charged": "Kartica naplaćena",
+  "no_show_fee_amount": "{{amount, currency}} nadoknada za izostanak",
+  "no_show_fee": "Nadoknada za izostanak",
+  "submit_card": "Pošaljite karticu",
+  "submit_payment_information": "Pošaljite informacije o plaćanju",
+  "meeting_awaiting_payment_method": "Vaš sastanak čeka na način plaćanja",
+  "no_show_fee_charged_email_subject": "Nadoknada za izostanak u iznosu od {{amount, currency}} je naplaćena za {{title}} dana {{date}}",
+  "no_show_fee_charged_text_body": "Naplaćena je naknada za izostanak",
+  "no_show_fee_charged_subtitle": "Naknada za izostanak u iznosu od {{amount, currency}} je naplaćena za sledeći događaj",
+  "error_charging_card": "Došlo je do greške prilikom naplate naknade za izostanak. Pokušajte ponovo kasnije.",
+  "collect_no_show_fee": "Sakupite naknadu za izostanak",
+  "no_show_fee_charged": "Naplaćena je naknada za izostanak",
+  "insights": "Uvidi",
+  "testing_workflow_info_message": "Kada testirate ovaj radni tok, imajte na umu da imejlovi i SMS-ovi mogu da budu zakazani najmanje 1 sat unapred",
+  "insights_no_data_found_for_filter": "Nisu pronađeni podaci za izabrani filter ili izabrane datume.",
+  "acknowledge_booking_no_show_fee": "Jasno mi je da će mi biti naplaćena naknada za izostanak putem kartice u iznosu od {{amount, currency}} ukoliko ne dođem na ovaj događaj.",
+  "card_details": "Informacije o kartici",
+  "seats_and_no_show_fee_error": "Omogućavanje mesta i naplata naknade za izostanak trenutno nije moguće",
+  "complete_your_booking": "Završite svoje zakazivanje",
+  "complete_your_booking_subject": "Završite svoje zakazivanje: {{title}} dana {{date}}",
+  "currency_string": "{{amount, currency}}",
+  "charge_card_dialog_body": "Upravo ćete naplatiti polazniku {{amount, currency}}. Jeste li sigurni da želite da nastavite?",
+  "charge_attendee": "Naplatite polazniku {{amount, currency}}",
+  "payment_app_commission": "Zahtevajte plaćanje ({{paymentFeePercentage}}% + {{fee, currency}} provizija po transakciji)",
+  "email_invite_team": "{{email}} je pozvan",
+  "image_size_limit_exceed": "Otpremljena slika ne sme da prevazilazi ograničenje od 5mb"
 }
diff --git a/apps/web/public/static/locales/sv/common.json b/apps/web/public/static/locales/sv/common.json
index 48c11e1ca6..969eef4ff5 100644
--- a/apps/web/public/static/locales/sv/common.json
+++ b/apps/web/public/static/locales/sv/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Identitetsleverantör",
   "trial_days_left": "Du har $t(day, {\"count\": {{days}} }) kvar på din PRO-provperiod",
   "day_one": "{{count}} dag",
   "day_other": "{{count}} dagar",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Inväntar godkännande: {{title}} den {{date}}",
   "event_still_awaiting_approval": "En bokning väntar fortfarande på ditt godkännande",
   "booking_submitted_subject": "Bokning skickad: {{title}} {{date}}",
+  "download_recording_subject": "Ladda ner inspelning: {{title}} {{date}}",
+  "download_your_recording": "Ladda ner din inspelning",
   "your_meeting_has_been_booked": "Ditt möte har bokats",
   "event_type_has_been_rescheduled_on_time_date": "Din {{title}} har ändrats till {{date}}.",
   "event_has_been_rescheduled": "Uppdatering - Din bokning har blivit omplanerad",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "Du behöver ett pro-konto för att använda team, du är dold tills du uppgraderar.",
   "link_expires": "p.s. Den går ut om {{expiresIn}} timmar.",
   "upgrade_to_per_seat": "Uppgradera till Per-Seat",
-  "seat_options_doesnt_support_confirmation": "Platsalternativ stöder inte kravet på bekräftelse",
+  "seat_options_doesnt_support_confirmation": "Platsalternativ stöder inte krav på bekräftelse",
   "team_upgrade_seats_details": "Av {{memberCount}} medlemmar i ditt lag är {{unpaidCount}} plats(er) obetalda. Vid ${{seatPrice}}/m per plats är den uppskattade totala kostnaden för ditt medlemskap ${{totalCost}}/m.",
   "team_upgrade_banner_description": "Tack för att du testade vår nya teamplan. Vi märkte att ditt team \"{{teamName}}\" måste uppgraderas.",
   "team_upgrade_banner_action": "Uppgradera här",
@@ -224,6 +227,7 @@
   "done": "Klar",
   "all_done": "Allt klart!",
   "all_apps": "Alla",
+  "available_apps": "Tillgängliga appar",
   "check_email_reset_password": "Kolla din e-post. Vi har skickat en länk till dig för att återställa ditt lösenord.",
   "finish": "Slutför",
   "few_sentences_about_yourself": "Några meningar om dig själv. Detta kommer att visas på din personliga webbsida.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Lägg till ny tidslucka",
   "add_an_extra_layer_of_security": "Lägg till ett extra säkerhetslager till ditt konto om ditt lösenord blir stulet.",
   "2fa": "Tvåfaktorsautentisering",
+  "2fa_disabled": "Tvåfaktorsautentisering kan endast aktiveras för e-post- och lösenordsautentisering",
   "enable_2fa": "Aktivera tvåfaktorsautentisering",
   "disable_2fa": "Inaktivera tvåfaktorsautentisering",
   "disable_2fa_recommendation": "Om du behöver inaktivera 2FA rekommenderar vi att du återaktiverar den så snart som möjligt.",
@@ -433,7 +438,7 @@
   "password_hint_min": "Minst 7 tecken",
   "password_hint_admin_min": "Minst 15 tecken",
   "password_hint_num": "Innehåller minst 1 siffra",
-  "max_limit_allowed_hint": "Måste vara {{limit}} eller färre tecken långt",
+  "max_limit_allowed_hint": "Måste innehålla {{limit}} eller färre tecken",
   "invalid_password_hint": "Lösenordet måste innehålla minst {{passwordLength}} tecken och har minst en siffra samt en blandning av versaler och gemener",
   "incorrect_password": "Lösenordet är felaktigt.",
   "incorrect_username_password": "Felaktigt användarnamn eller lösenord.",
@@ -585,6 +590,20 @@
   "minutes": "Minuter",
   "round_robin": "Tur och ordning",
   "round_robin_description": "Variera möten mellan olika teammedlemmar.",
+  "managed_event": "Hanterad händelse",
+  "username_placeholder": "användarnamn",
+  "managed_event_description": "Skapa och distribuera evenemangstyper i bulk till teammedlemmar",
+  "managed": "Hanterad",
+  "managed_event_url_clarification": "\"användarnamn\" kommer att fyllas i med användarnamnet för de medlemmar som tilldelats",
+  "assign_to": "Tilldela till",
+  "add_members": "Lägg till medlemmar...",
+  "count_members_one": "{{count}} medlem",
+  "count_members_other": "{{count}} medlemmar",
+  "no_assigned_members": "Inga tilldelade medlemmar",
+  "assigned_to": "Tilldelad till",
+  "start_assigning_members_above": "Börja tilldela medlemmar ovan",
+  "locked_fields_admin_description": "Medlemmar kommer inte att kunna redigera detta",
+  "locked_fields_member_description": "Det här alternativet låstes av teamadministratören",
   "url": "Webbadress",
   "hidden": "Dold",
   "readonly": "Skrivskyddad",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Senaste tid för att boka",
   "slot_interval": "Tid mellan bokningar",
   "slot_interval_default": "Använd händelsens längd (standard)",
+  "delete_event_type": "Radera händelsetyp?",
+  "delete_managed_event_type": "Radera hanterad händelsetyp?",
+  "delete_event_type_description": "Alla som du har delat den här länken med kommer inte längre att kunna boka med hjälp av den.",
+  "delete_managed_event_type_description": "<ul><li>Medlemmar som tilldelats denna händelsetyp kommer också att få sina händelsetyper raderade.</li><li>Alla som de har delat sin länk med kommer inte längre att kunna boka med den.</li></ul>",
+  "confirm_delete_event_type": "Ja, radera",
   "delete_account": "Radera konto",
   "confirm_delete_account": "Ja, radera konto",
   "delete_account_confirmation_message": "Är du säker på att du vill radera ditt {{appName}} konto? Alla som du har delat din kontolänk med kommer inte längre att kunna boka med hjälp av den och eventuella inställningar du har sparat kommer att gå förlorade.",
@@ -860,7 +884,7 @@
   "add_new_calendar": "Lägg till en ny kalender",
   "set_calendar": "Ange var du vill lägga till nya händelser när du är bokad.",
   "delete_schedule": "Ta bort schema",
-  "delete_schedule_description": "Borttagning av ett schema kommer att ta bort det från alla händelsetyper. Denna åtgärd kan inte ångras.",
+  "delete_schedule_description": "Om du tar bort ett schema, tas det bort från alla händelsetyper. Åtgärden kan inte ångras.",
   "schedule_created_successfully": "{{scheduleName}}-schemat har skapats",
   "availability_updated_successfully": "Schemat för {{scheduleName}} har uppdaterats",
   "schedule_deleted_successfully": "Schemat har tagits bort",
@@ -1126,13 +1150,13 @@
   "current_username": "Nuvarande användarnamn",
   "example_1": "Exempel 1",
   "example_2": "Exempel 2",
-  "additional_input_label": "Ytterligare indata-etikett",
+  "booking_question_identifier": "Bokningsfrågeidentifierare",
   "company_size": "Företagets storlek",
   "what_help_needed": "Vad behöver du hjälp med?",
   "variable_format": "Variabelformat",
   "webhook_subscriber_url_reserved": "Webhook-prenumerantens url är redan definierad",
   "custom_input_as_variable_info": "Ignorera alla specialtecken i etiketten för ytterligare indata (använd endast bokstäver och siffror), använd versaler för alla bokstäver och ersätt blanktecken med understreck.",
-  "using_additional_inputs_as_variables": "Hur använder man ytterligare indata som variabler?",
+  "using_booking_questions_as_variables": "Hur använder jag bokningsfrågor som variabler?",
   "download_desktop_app": "Ladda ned skrivbordsappen",
   "set_ping_link": "Ange Ping-länk",
   "rate_limit_exceeded": "Betygsgränsen överskriden",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Början av veckan",
   "recordings_title": "Inspelningar",
   "recording": "Inspelning",
+  "happy_scheduling": "Glad schemaläggning",
   "select_calendars": "Välj vilka kalendrar du vill kontrollera för konflikter för att förhindra dubbelbokningar.",
   "check_for_conflicts": "Kontrollera om konflikter",
   "view_recordings": "Visa inspelningar",
@@ -1215,6 +1240,7 @@
   "impersonation": "Imitering",
   "impersonation_description": "Inställningar för att hantera användarpersonifiering",
   "users": "Användare",
+  "user": "Användare",
   "profile_description": "Hantera inställningar för din {{appName}}-profil",
   "users_description": "Här hittar du en lista med alla användare",
   "users_listing": "Användarlistning",
@@ -1255,8 +1281,10 @@
   "download_responses": "Ladda ned svar",
   "download_responses_description": "Ladda ned alla svar till ditt formulär i CSV-format.",
   "download": "Ladda ned",
+  "download_recording": "Ladda ner inspelning",
+  "recording_from_your_recent_call": "En inspelning från ditt senaste samtal på Cal.com är redo för nedladdning",
   "create_your_first_form": "Skapa ditt första formulär",
-  "create_your_first_form_description": "Med Dirigeringsformulär kan du ställa kvalificerade frågor och dirigera till rätt person eller händelsetyp.",
+  "create_your_first_form_description": "Med omdirigeringsformulär kan du ställa kvalificerade frågor och dirigera till rätt person eller händelsetyp.",
   "create_your_first_webhook": "Skapa din första webhook",
   "create_your_first_webhook_description": "Med webhooks kan du få mötesdata i realtid när något händer i {{appName}}.",
   "for_a_maximum_of": "Maximalt",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Grundläggande autentisering",
   "exchange_authentication_ntlm": "NTLM-autentisering",
   "exchange_compression": "GZip-komprimering",
+  "exchange_version": "Exchange-version",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Du kan se alla former och rutter som du har skapat här.",
   "routing_forms_send_email_owner": "Skicka e-post till ägare",
   "routing_forms_send_email_owner_description": "Skickar ett e-postmeddelande till ägaren när formuläret skickas",
@@ -1345,14 +1382,14 @@
   "add_limit": "Lägg till gräns",
   "team_name_required": "Teamnamn krävs",
   "show_attendees": "Dela deltagarinformation mellan gäster",
-  "how_additional_inputs_as_variables": "Hur man använder ytterligare ingångar som variabler",
+  "how_booking_questions_as_variables": "Hur används bokningsfrågor som variabler?",
   "format": "Formatera",
   "uppercase_for_letters": "Använd versaler för alla bokstäver",
   "replace_whitespaces_underscores": "Ersätt blanktecken med understreck",
   "manage_billing": "Hantera fakturering",
   "manage_billing_description": "Hantera allt som faktureras",
   "billing_freeplan_title": "Du använder för närvarande GRATIS-prenumerationen",
-  "billing_freeplan_description": "Vi arbetar bättre i team. Utöka dina arbetsflöden med round-robin och kollektiva händelser och skapa avancerade routingformulär",
+  "billing_freeplan_description": "Vi arbetar bättre i team. Utöka dina arbetsflöden med Round Robin och kollektiva händelser och skapa avancerade omdirigeringsformulär",
   "billing_freeplan_cta": "Testa nu",
   "billing_manage_details_title": "Visa och hantera dina faktureringsuppgifter",
   "billing_manage_details_description": "Visa och redigera dina faktureringsuppgifter samt avsluta din prenumeration.",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Behöver du något annat?",
   "billing_help_description": "Om du behöver mer hjälp med fakturering finns vårt supportteam här för att hjälpa till.",
   "billing_help_cta": "Kontakta support",
-  "ignore_special_characters": "Ignorera specialtecken för etiketten Ytterligare indata. Använd endast bokstäver och siffror",
+  "ignore_special_characters_booking_questions": "Ignorera specialtecken i din bokningsfrågeidentifierare. Använd endast bokstäver och siffror",
   "retry": "Försök igen",
   "fetching_calendars_error": "Det gick inte att hämta dina kalendrar. <1>Försök igen</1> eller kontakta kundtjänst.",
   "calendar_connection_fail": "Det gick inte att ansluta kalender",
@@ -1430,10 +1467,10 @@
   "reason": "Orsak",
   "sender_id": "Avsändar-ID",
   "sender_id_error_message": "Endast bokstäver, siffror och mellanslag tillåts (maximalt 11 tecken)",
-  "test_routing_form": "Testa routingformulär",
+  "test_routing_form": "Testa omdirigeringsformulär",
   "test_preview": "Testa förhandsgranskning",
   "route_to": "Dirigera till",
-  "test_preview_description": "Testa ditt routingformulär utan att skicka data",
+  "test_preview_description": "Testa ditt omdirigeringsformulär utan att skicka data",
   "test_routing": "Testa routing",
   "payment_app_disabled": "En administratör har inaktiverat en betalningsapp",
   "edit_event_type": "Redigera händelsetyp",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Fast Round Robin",
   "add_one_fixed_attendee": "Lägg till en fast deltagare och Round Robin för ett antal deltagare.",
   "calcom_is_better_with_team": "Cal.com är bättre med team",
+  "the_calcom_team": "Cal.com-teamet",
   "add_your_team_members": "Lägg till teammedlemmar i dina händelsetyper. Använd kollektiv schemaläggning för att inkludera alla eller hitta den lämpligaste personen med Round Robin-schemaläggning.",
   "booking_limit_reached": "Bokningsgränsen för denna händelsetyp har uppnåtts",
   "duration_limit_reached": "Varaktighetsgränsen för denna händelsetyp har uppnåtts",
   "admin_has_disabled": "En administratör har inaktiverat {{appName}}",
   "disabled_app_affects_event_type": "En administratör har inaktiverat {{appName}} vilket påverkar din händelsetyp {{eventType}}",
+  "event_replaced_notice": "En administratör har ersatt en av dina händelsetyper",
+  "email_subject_slug_replacement": "En teamadministratör har ersatt din händelse /{{slug}}",
+  "email_body_slug_replacement_notice": "En administratör i <strong>{{teamName}}</strong>-teamet har ersatt din händelsetyp <strong>/{{slug}}</strong> med en hanterad händelsetyp som de kontrollerar.",
+  "email_body_slug_replacement_info": "Din länk kommer att fortsätta fungera, men vissa inställningar för den kan ha ändrats. Du kan granska den i händelsetyper.",
+  "email_body_slug_replacement_suggestion": "Om du har några frågor om händelsetypen, kontakta din administratör.<br /><br />Glad schemaläggning, <br />Cal.com-teamet",
   "disable_payment_app": "Administratören har inaktiverat {{appName}} vilket påverkar din händelsetyp {{title}}. Deltagarna kan fortfarande boka den här händelsetypen, men de uppmanas inte att betala. Du kan dölja händelsetypen för att förhindra detta tills din administratör återaktiverar betalningsmetoden.",
   "payment_disabled_still_able_to_book": "Deltagarna kan fortfarande boka den här händelsetypen, men de uppmanas inte att betala. Du kan dölja händelsetypen för att förhindra detta tills din administratör återaktiverar betalningsmetoden.",
   "app_disabled_with_event_type": "Administratören har inaktiverat {{appName}} vilket påverkar din händelsetyp {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Uppdatera åsidosättning",
   "event_type_duplicate_copy_text": "{{slug}}-kopia",
   "set_as_default": "Ange som standard",
+  "hide_eventtype_details": "Dölj information om händelse",
   "show_navigation": "Visa navigering",
   "hide_navigation": "Dölj navigering",
   "verification_code_sent": "Verifieringskod har skickats",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Skapa din första webhook för denna teamhändelsetyp",
   "create_webhook_team_event_type": "Skapa en webhook för denna teamhändelsetyp",
   "disable_success_page": "Inaktivera framgångssida (fungerar bara om du har en omdirigerings-URL)",
+  "invalid_admin_password": "Du är administratör men du har inte ett lösenord med minst 15 tecken eller ingen 2FA än",
   "change_password_admin": "Ändra lösenord för att få administratörsåtkomst",
   "username_already_taken": "Användarnamnet används redan",
   "assignment": "Tilldelning",
@@ -1529,7 +1574,7 @@
   "sender_name": "Avsändarens namn",
   "already_invited": "Deltagaren är redan inbjuden",
   "no_recordings_found": "Inga inspelningar hittades",
-  "new_workflow_subtitle": "Nytt arbetsflöde för...",
+  "new_workflow_subtitle": "Nytt arbetsflöde för ...",
   "reporting": "Rapportering",
   "reporting_feature": "Se alla inkommande från data och ladda ned som CSV",
   "teams_plan_required": "Teams-plan krävs",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "\"/ee\" Enterprise-licens",
   "enterprise_booking_fee": "Från {{enterprise_booking_fee}}/månad",
   "enterprise_license_includes": "Allt för ett kommersiellt användningsfall",
+  "no_need_to_keep_your_code_open_source": "Inget behov av att behålla din kod som öppen källkod",
   "repackage_rebrand_resell": "Lätt att ompaketera, omprofilera och sälja vidare",
   "a_vast_suite_of_enterprise_features": "En omfattande uppsättning Enterprise-funktioner",
   "free_license_fee": "0,00 USD/månad",
@@ -1586,14 +1632,14 @@
   "available_variables": "Tillgängliga variabler",
   "scheduler": "{Scheduler}",
   "no_workflows": "Inga arbetsflöden",
-  "change_filter": "Ändra filter för att se dina personliga arbetsflöden och arbetsflöden i teamet.",
+  "change_filter": "Ändra filter för att se dina personliga arbetsflöden och teamarbetsflöden.",
   "recommended_next_steps": "Nästa steg som rekommenderas",
   "create_a_managed_event": "Skapa en hanterad händelsetyp",
   "meetings_are_better_with_the_right": "Möten är bättre när rätt teammedlemmar är närvarande. Bjud in dem nu.",
-  "create_a_one_one_template": "Skapa en en-en-mall för en evenemangstyp och distribuera den till flera medlemmar.",
+  "create_a_one_one_template": "Skapa en mall för personliga möten för en händelsetyp och distribuera den till flera medlemmar.",
   "collective_or_roundrobin": "Kollektiv eller Round Robin",
   "book_your_team_members": "Boka dina teammedlemmar tillsammans med gemensamma händelser eller gå igenom för att få rätt person med Round Robin.",
-  "event_no_longer_attending_subject": "Deltar inte längre i {{title}} kl. {{date}}",
+  "event_no_longer_attending_subject": "Deltar inte längre i {{title}} {{date}}",
   "no_longer_attending": "Du deltar inte längre i denna händelse",
   "attendee_no_longer_attending_subject": "En deltagare deltar inte längre i {{title}} den {{date}}",
   "attendee_no_longer_attending": "En deltagare deltar inte längre i din händelse",
@@ -1602,11 +1648,12 @@
   "default_app_link_title": "Skapa en standardapplänk",
   "default_app_link_description": "Om du skapar en standardapplänk kan alla händelsetyper som nyligen skapats använda den applänk som du har angett.",
   "change_default_conferencing_app": "Ange som standard",
+  "organizer_default_conferencing_app": "Arrangörens standardapp",
   "under_maintenance": "Nere för underhåll",
   "under_maintenance_description": "{{appName}}-teamet genomför planerat underhåll. Om du har några frågor kan du kontakta supporten.",
   "event_type_seats": "{{numberOfSeats}} platser",
   "booking_questions_title": "Bokningsfrågor",
-  "booking_questions_description": "Anpassa de frågor som ställs på bokningssidan",
+  "booking_questions_description": "Anpassa frågorna som ställs på bokningssidan",
   "add_a_booking_question": "Lägg till en fråga",
   "duplicate_email": "E-postadressen är duplicerad",
   "booking_with_payment_cancelled": "Det går inte längre att betala för den här händelsen",
@@ -1614,21 +1661,22 @@
   "booking_with_payment_cancelled_refunded": "Den här bokningsbetalningen har återbetalats.",
   "booking_confirmation_failed": "Bokningsbekräftelsen misslyckades",
   "not_enough_seats": "Inte tillräckligt med platser",
-  "form_builder_field_already_exists": "Ett fält med detta namn finns redan",
-  "form_builder_field_add_subtitle": "Anpassa de frågor som ställs på bokningssidan",
+  "form_builder_field_already_exists": "Det finns redan ett fält med det här namnet",
+  "form_builder_field_add_subtitle": "Anpassa frågorna som ställs på bokningssidan",
+  "show_on_booking_page": "Visa på bokningssidan",
   "get_started_zapier_templates": "Kom igång med Zapier-mallar",
   "team_is_unpublished": "{{team}} har avpublicerats",
-  "team_is_unpublished_description": "Den här teamlänken är för närvarande inte tillgänglig. Kontakta teamets ägare eller be dem publicera den.",
+  "team_is_unpublished_description": "Den här teamlänken är inte tillgänglig för närvarande. Kontakta teamets ägare eller be dem att publicera den.",
   "team_member": "Teammedlem",
   "a_routing_form": "Ett omdirigeringsformulär",
   "form_description_placeholder": "Formulärbeskrivning",
   "keep_me_connected_with_form": "Håll mig ansluten med formuläret",
   "fields_in_form_duplicated": "Alla ändringar i omdirigering och fält i formuläret som dupliceras återspeglas i dubbletten.",
   "form_deleted": "Formulär borttaget",
-  "delete_form": "Ta bort formulär",
+  "delete_form": "Vill du verkligen ta bort formuläret?",
   "delete_form_action": "Ja, ta bort formulär",
-  "delete_form_confirmation": "Är du säker på att du vill ta bort det här formuläret? Alla som du har delat länken med kommer inte längre att kunna boka med hjälp av den. Dessutom raderas alla tillhörande svar.",
-  "delete_form_confirmation_2": "Alla associerade svar kommer tas bort.",
+  "delete_form_confirmation": "Alla som du delat länken med kommer inte längre att ha tillgång till det.",
+  "delete_form_confirmation_2": "Alla tillhörande svar tas bort.",
   "typeform_redirect_url_copied": "Omdirigerings-URL för Typeform kopierad! Du kan ange URL:en i Typeform-formuläret.",
   "modifications_in_fields_warning": "Ändringar i fält och omdirigeringar i följande formulär kommer att återspeglas i detta formulär.",
   "connected_forms": "Anslutna formulär",
@@ -1639,9 +1687,17 @@
   "add_1_option_per_line": "Lägg till ett alternativ per rad",
   "select_a_router": "Välj en omdirigering",
   "add_a_new_route": "Lägg till ny omdirigering",
+  "make_informed_decisions": "Ta välgrundade beslut med Insights",
+  "make_informed_decisions_description": "Vår instrumentpanel i Insights visar all aktivitet i ditt team och visar trender som gör det möjligt att schemalägga teamet och fatta beslut på ett bättre sätt.",
+  "view_bookings_across": "Visa bokningar för alla medlemmar",
+  "view_bookings_across_description": "Se vem som får flest bokningar och se till att du får den bästa fördelningen i ditt team",
+  "identify_booking_trends": "Identifiera bokningstrender",
+  "identify_booking_trends_description": "Se vilka tider i veckan och vilka tider under dagen som är populära för dina bokare",
+  "spot_popular_event_types": "Hitta populära händelsetyper",
+  "spot_popular_event_types_description": "Se vilka av dina händelsetyper som får flest klick och bokningar",
   "no_responses_yet": "Inga svar ännu",
   "this_will_be_the_placeholder": "Det här blir platshållaren",
-  "this_meeting_has_not_started_yet": "Det här mötet har inte startat ännu",
+  "this_meeting_has_not_started_yet": "Mötet har inte startat än",
   "this_app_requires_connected_account": "{{appName}} kräver ett anslutet {{dependencyName}}-konto",
   "connect_app": "Anslut {{dependencyName}}",
   "app_is_connected": "{{dependencyName}} är ansluten",
@@ -1649,8 +1705,84 @@
   "verification_code": "Verifieringskod",
   "can_you_try_again": "Kan du försöka igen med en annan tid?",
   "verify": "Verifiera",
-  "select_all": "Välj alla",
-  "default_conferencing_bulk_title": "Uppdatera befintliga händelsetyper i bulk",
+  "timezone_variable": "Tidszon",
+  "timezone_info": "Tidszonen för den person som tar emot",
+  "event_end_time_variable": "Händelsens sluttid",
+  "event_end_time_info": "Händelsens sluttid",
+  "cancel_url_variable": "URL för att avbryta",
+  "cancel_url_info": "Webbadressen fö ratt avbryta bokningen",
+  "reschedule_url_variable": "URL för ombokning",
+  "reschedule_url_info": "Webbadressen för att ändra bokningen",
   "invalid_event_name_variables": "Det finns en ogiltig variabel i ditt händelsenamn",
-  "default_conferencing_bulk_description": "Uppdatera platserna för de valda händelsetyperna"
+  "select_all": "Välj alla",
+  "default_conferencing_bulk_title": "Massuppdatering av befintliga händelsetyper",
+  "members_default_schedule": "Medlemmens standardschema",
+  "set_by_admin": "Ställ in av teamadministratör",
+  "members_default_location": "Medlemmens förvalda plats",
+  "members_default_schedule_description": "Vi kommer att använda varje medlems standardschema för tillgänglighet. De kommer att kunna redigera eller ändra det.",
+  "requires_at_least_one_schedule": "Du måste ha minst ett schema",
+  "default_conferencing_bulk_description": "Uppdatera platserna för de valda händelsetyperna",
+  "locked_for_members": "Låst för medlemmar",
+  "locked_apps_description": "Medlemmarna kommer att kunna se de aktiva apparna, men de kommer inte att kunna ändra appinställningarna",
+  "locked_webhooks_description": "Medlemmarna kommer att kunna se aktiva webhooks men inte kunna redigera inställningar för webhooks",
+  "locked_workflows_description": "Medlemmarna kommer att kunna se de aktiva arbetsflödena, men de kommer inte att kunna ändra några arbetsflödesinställningar",
+  "locked_by_admin": "Låst av administratör",
+  "app_not_connected": "Du har inte anslutit ett {{appName}}-konto.",
+  "connect_now": "Anslut nu",
+  "managed_event_dialog_confirm_button_one": "Ersätt och meddela {{count}} medlem",
+  "managed_event_dialog_confirm_button_other": "Ersätt och meddela {{count}} medlemmar",
+  "managed_event_dialog_title_one": "Webbadressen /{{slug}} finns redan för {{count}} medlem. Vill du ersätta den?",
+  "managed_event_dialog_title_other": "Webbadressen /{{slug}} finns redan för {{count}} medlemmar. Vill du ersätta den?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> använder redan webbadressen <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> använder redan webbadressen <string>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Om du väljer att byta ut den kommer vi att meddela dem. Gå tillbaka och ta bort dem om du inte vill skriva över den.",
+  "review_event_type": "Granska händelsetyp",
+  "looking_for_more_analytics": "Vill du ha fler analyser?",
+  "looking_for_more_insights": "Vill du ha fler insikter?",
+  "add_filter": "Lägg till filter",
+  "select_user": "Välj användare",
+  "select_event_type": "Välj händelsetyp",
+  "select_date_range": "Välj datumintervall",
+  "popular_events": "Populära händelser",
+  "no_event_types_found": "Inga händelsetyper hittade",
+  "average_event_duration": "Genomsnittlig händelselängd",
+  "most_booked_members": "Mest bokade medlemmar",
+  "least_booked_members": "Minst bokade medlemmar",
+  "events_created": "Skapade händelser",
+  "events_completed": "Slutförda händelser",
+  "events_cancelled": "Händelser avbrutna",
+  "events_rescheduled": "Händelser ombokade",
+  "from_last_period": "från senaste perioden",
+  "from_to_date_period": "Från: {{startDate}} till: {{endDate}}",
+  "analytics_for_organisation": "Insikter",
+  "subtitle_analytics": "Läs mer om ditt teams aktivitet",
+  "redirect_url_warning": "Att lägga till en omdirigering kommer att inaktivera framgångssidan. Se till att nämna \"Bokning bekräftad\" på din anpassade framgångssida.",
+  "event_trends": "Händelsetrender",
+  "clear_filters": "Rensa filter",
+  "hold": "Vänta",
+  "on_booking_option": "Samla in betalning vid bokning",
+  "hold_option": "Ta ut en avgift för utebliven ankomst",
+  "card_held": "Kort som innehas",
+  "charge_card": "Debitera kort",
+  "card_charged": "Kort debiterat",
+  "no_show_fee_amount": "{{amount, currency}} i avgift för utebliven ankomst",
+  "no_show_fee": "Avgift för utebliven ankomst",
+  "submit_card": "Använd kort",
+  "submit_payment_information": "Ange betalningsinformation",
+  "meeting_awaiting_payment_method": "Ditt möte väntar på en betalningsmetod",
+  "no_show_fee_charged_email_subject": "Avgift för utebliven ankomst på {{amount, currency}} debiteras för {{title}} {{date}}",
+  "no_show_fee_charged_text_body": "Avgift för utebliven ankomst debiterades",
+  "no_show_fee_charged_subtitle": "Avgift för utebliven ankomst på {{amount, currency}} debiterades för följande händelse",
+  "error_charging_card": "Något gick fel när avgiften för utebliven ankomst debiterades. Försök igen senare.",
+  "collect_no_show_fee": "Samla in avgift för utebliven ankomst",
+  "no_show_fee_charged": "Avgift för utebliven ankomst debiterades",
+  "insights": "Insikter",
+  "testing_workflow_info_message": "När det här arbetsflödet testas, var medveten om att e-postmeddelanden och SMS endast kan schemaläggas minst en timme i förväg",
+  "insights_no_data_found_for_filter": "Inga data hittades för valda filter eller valda datum.",
+  "acknowledge_booking_no_show_fee": "Jag bekräftar att om jag inte deltar i händelsen kommer en avgift på {{amount, currency}} för utebliven ankomst att debiteras mitt kort.",
+  "card_details": "Kortuppgifter",
+  "seats_and_no_show_fee_error": "För närvarande går det inte att aktivera platser och ta ut en avgift för utebliven ankomst",
+  "complete_your_booking": "Slutför din bokning",
+  "complete_your_booking_subject": "Slutför din bokning: {{title}} {{date}}",
+  "email_invite_team": "{{email}} har bjudits in"
 }
diff --git a/apps/web/public/static/locales/ta/common.json b/apps/web/public/static/locales/ta/common.json
index 3c4b159481..eff7d3d3f0 100644
--- a/apps/web/public/static/locales/ta/common.json
+++ b/apps/web/public/static/locales/ta/common.json
@@ -110,9 +110,9 @@
   "verification_code": "சரிபார்ப்பு குறியீடு",
   "can_you_try_again": "வேறு நேரத்தில் மீண்டும் முயற்சிக்க முடியுமா?",
   "verify": "சரிபார்க்கவும்",
+  "invalid_event_name_variables": "உங்கள் நிகழ்வின் பெயரில் பிழை உள்ளது",
   "select_all": "அனைத்தையும் தேர்வுசெய்",
   "default_conferencing_bulk_title": "தற்போதுள்ள நிகழ்வு வகைகளை மொத்தமாகப் புதுப்பிக்கவும்",
-  "invalid_event_name_variables": "உங்கள் நிகழ்வின் பெயரில் பிழை உள்ளது",
   "default_conferencing_bulk_description": "தேர்ந்தெடுக்கப்பட்ட நிகழ்வு வகைகளுக்கான இருப்பிடங்களைப் புதுப்பிக்கவும்",
   "looking_for_more_analytics": "மேலும் பகுப்பாய்வுகளைத் தேடுகிறீர்களா?",
   "add_filter": "வடிகட்டிச் சேர்க்கவும்",
diff --git a/apps/web/public/static/locales/tr/common.json b/apps/web/public/static/locales/tr/common.json
index f7dee19231..9720009dd5 100644
--- a/apps/web/public/static/locales/tr/common.json
+++ b/apps/web/public/static/locales/tr/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Kimlik sağlayıcı",
   "trial_days_left": "PRO denemenizde $t(day, {\"count\": {{days}} }) gün kaldı",
   "day_one": "{{count}} gün",
   "day_other": "{{count}} gün",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Onay Bekleniyor: {{date}} tarihinde {{title}}",
   "event_still_awaiting_approval": "Bir etkinlik hâlâ onayınızı bekliyor",
   "booking_submitted_subject": "Rezervasyon Gönderildi: {{title}}, {{date}} tarihinde",
+  "download_recording_subject": "Kaydı İndir: {{title}} / {{date}}",
+  "download_your_recording": "Kaydınızı indirin",
   "your_meeting_has_been_booked": "Toplantı rezervasyonunuz yapıldı",
   "event_type_has_been_rescheduled_on_time_date": "{{title}}, {{date}} olarak yeniden planlandı.",
   "event_has_been_rescheduled": "Güncellendi - Etkinliğiniz yeniden planlandı",
@@ -224,6 +227,7 @@
   "done": "Tamam",
   "all_done": "Hepsi tamam!",
   "all_apps": "Tümü",
+  "available_apps": "Mevcut Uygulamalar",
   "check_email_reset_password": "E-posta adresinizi kontrol edin. Size şifrenizi sıfırlamanız için bir bağlantı göndereceğiz.",
   "finish": "Bitir",
   "few_sentences_about_yourself": "Birkaç cümleyle kendinizden bahsedin. Bu, kişisel URL sayfanızda görünecektir.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Yeni zaman aralığı ekle",
   "add_an_extra_layer_of_security": "Şifrenizin çalınmasına karşı hesabınıza ekstra bir güvenlik katmanı ekleyin.",
   "2fa": "İki Adımlı Kimlik Doğrulama",
+  "2fa_disabled": "İki Adımlı Kimlik Doğrulama, yalnızca e-posta ve şifre kimlik doğrulaması için etkinleştirilebilir",
   "enable_2fa": "İki adımlı kimlik doğrulamayı etkinleştir",
   "disable_2fa": "İki adımlı kimlik doğrulamayı devre dışı bırak",
   "disable_2fa_recommendation": "İki adımlı kimlik doğrulamayı devre dışı bırakmanız gerekiyorsa mümkün olan en kısa sürede yeniden etkinleştirmenizi öneririz.",
@@ -585,6 +590,20 @@
   "minutes": "Dakika",
   "round_robin": "Round Robin",
   "round_robin_description": "Toplantıları birden fazla ekip üyesi arasında döndürün.",
+  "managed_event": "Yönetilen Etkinlik",
+  "username_placeholder": "kullanıcı adı",
+  "managed_event_description": "Etkinlik türlerini toplu olarak oluşturun ve ekip üyelerine dağıtın",
+  "managed": "Yönetildi",
+  "managed_event_url_clarification": "\"username\" alanı atanan üyelerin kullanıcı adı ile doldurulacaktır",
+  "assign_to": "Şuraya ata:",
+  "add_members": "Üye ekle...",
+  "count_members_one": "{{count}} üye",
+  "count_members_other": "{{count}} üye",
+  "no_assigned_members": "Atanan üye yok",
+  "assigned_to": "Şuraya atandı:",
+  "start_assigning_members_above": "Üyeleri en üstten itibaren atamaya başlayın",
+  "locked_fields_admin_description": "Üyeler bunu düzenleyemez",
+  "locked_fields_member_description": "Bu seçenek ekip yöneticisi tarafından kilitlendi",
   "url": "URL",
   "hidden": "Gizli",
   "readonly": "Salt okunur",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Minimum Bildirim",
   "slot_interval": "Zaman dilimi aralıkları",
   "slot_interval_default": "Etkinlik uzunluğunu kullan (varsayılan)",
+  "delete_event_type": "Etkinlik türü silinsin mi?",
+  "delete_managed_event_type": "Yönetilen etkinlik türü silinsin mi?",
+  "delete_event_type_description": "Bağlantıyı paylaştığınız kullanıcıların hiçbiri artık rezervasyon yapmak için bu bağlantıyı kullanamayacak.",
+  "delete_managed_event_type_description": "<ul><li>Bu etkinlik türüne atanan üyelerin etkinlik türleri de silinecek.</li><li>Bağlantıyı paylaşan kullanıcıların hiçbiri artık rezervasyon yapmak için bu bağlantıyı kullanamayacak.</li> </ul>",
+  "confirm_delete_event_type": "Evet, sil",
   "delete_account": "Hesabı sil",
   "confirm_delete_account": "Evet, hesabı sil",
   "delete_account_confirmation_message": "{{appName}} hesabınızı silmek istediğinizden emin misiniz? Hesap bağlantısı paylaştığınız herkes artık bu bağlantıyı kullanarak rezervasyon yapamayacak ve kaydettiğiniz tüm tercihler kaybolacak.",
@@ -860,7 +884,7 @@
   "add_new_calendar": "Yeni takvim ekle",
   "set_calendar": "Size rezervasyon yapıldığında yeni etkinliklerin nereye ekleneceğini belirleyin.",
   "delete_schedule": "Planı sil",
-  "delete_schedule_description": "Bir planın silinmesi onu tüm etkinlik türlerinden kaldırır. Bu işlem geri alınamaz.",
+  "delete_schedule_description": "Plan silindiğinde tüm etkinlik türlerinden kaldırılır. Bu işlem geri alınamaz.",
   "schedule_created_successfully": "{{scheduleName}} planı başarıyla oluşturuldu",
   "availability_updated_successfully": "{{scheduleName}} planı başarıyla güncellendi",
   "schedule_deleted_successfully": "Plan başarıyla silindi",
@@ -1126,13 +1150,13 @@
   "current_username": "Mevcut kullanıcı adı",
   "example_1": "Örnek 1",
   "example_2": "Örnek 2",
-  "additional_input_label": "Ek Veri Giriş Etiketi",
+  "booking_question_identifier": "Rezervasyon Soru Tanımlayıcısı",
   "company_size": "Şirket büyüklüğü",
   "what_help_needed": "Hangi konuda yardıma ihtiyacınız var?",
   "variable_format": "Değişken biçimi",
   "webhook_subscriber_url_reserved": "Web kancası abone URL'si zaten tanımlı",
   "custom_input_as_variable_info": "Ek giriş etiketindeki tüm özel karakterleri yok sayın (yalnızca harfler ve rakamlar kullanın), tüm harfler için büyük harfleri kullanın ve boşlukları alt çizgilerle değiştirin.",
-  "using_additional_inputs_as_variables": "Değişken olarak ek girdiler nasıl kullanılır?",
+  "using_booking_questions_as_variables": "Rezervasyon sorularını değişken olarak nasıl kullanabilirim?",
   "download_desktop_app": "Masaüstü uygulamasını indirin",
   "set_ping_link": "Ping bağlantısını ayarla",
   "rate_limit_exceeded": "Deneme sayısı aşıldı",
@@ -1155,7 +1179,7 @@
   "event_advanced_tab_title": "Gelişmiş",
   "event_setup_multiple_duration_error": "Etkinlik Kurulumu: Birden çok süre için en az 1 seçenek gereklidir.",
   "event_setup_multiple_duration_default_error": "Etkinlik Kurulumu: Lütfen geçerli bir varsayılan süre seçin.",
-  "event_setup_booking_limits_error": "Rezervasyon limitleri artan sırada olmalıdır. [gün,hafta,ay,yıl]",
+  "event_setup_booking_limits_error": "Rezervasyon limitleri artan sırada olmalıdır. [gün, hafta, ay, yıl]",
   "event_setup_duration_limits_error": "Süre limitleri artan sırada olmalıdır. [gün, hafta, ay, yıl]",
   "select_which_cal": "Rezervasyonların hangi takvime ekleneceğini seçin",
   "custom_event_name": "Özel etkinlik adı",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Haftanın başlangıcı",
   "recordings_title": "Kayıtlar",
   "recording": "Kayıt",
+  "happy_scheduling": "Mutlu Planlama",
   "select_calendars": "Çifte rezervasyonu önlemek için çakışmaları kontrol etmek istediğiniz takvimleri seçin.",
   "check_for_conflicts": "Çakışmaları kontrol edin",
   "view_recordings": "Kayıtları görüntüle",
@@ -1215,6 +1240,7 @@
   "impersonation": "Kimliğe bürünme",
   "impersonation_description": "Kullanıcı kimliğine bürünmeyi yönetmek için ayarlar",
   "users": "Kullanıcılar",
+  "user": "Kullanıcı",
   "profile_description": "{{appName}} profiliniz için ayarları yönetin",
   "users_description": "Burada tüm kullanıcıların listesini bulabilirsiniz",
   "users_listing": "Kullanıcı listesi",
@@ -1255,6 +1281,8 @@
   "download_responses": "Yanıtları İndir",
   "download_responses_description": "Formunuza gelen tüm yanıtları CSV formatında indirin.",
   "download": "İndir",
+  "download_recording": "Kaydı İndir",
+  "recording_from_your_recent_call": "Cal.com'daki son görüşmenize ait bir kayıt indirilmeye hazır",
   "create_your_first_form": "İlk formunuzu oluşturun",
   "create_your_first_form_description": "Yönlendirme Formları ile yeterlik soruları sorabilir ve bunları doğru kişiye veya etkinlik türüne yönlendirebilirsiniz.",
   "create_your_first_webhook": "İlk Web kancanızı oluşturun",
@@ -1291,7 +1319,16 @@
   "exchange_authentication_standard": "Temel kimlik doğrulama",
   "exchange_authentication_ntlm": "NTLM kimlik doğrulama",
   "exchange_compression": "GZip sıkıştırma",
-  "routing_forms_description": "Oluşturduğunuz tüm formları ve rotaları burada görebilirsiniz.",
+  "exchange_version": "Exchange Sürümü",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
+  "routing_forms_description": "Katılımcıları doğru destinasyonlara yönlendirmek için form oluşturun",
   "routing_forms_send_email_owner": "Sahibine E-posta Gönderin",
   "routing_forms_send_email_owner_description": "Form gönderildiğinde sahibine bir e-posta gönderir",
   "add_new_form": "Yeni form ekle",
@@ -1345,7 +1382,7 @@
   "add_limit": "Kısıtlama Ekleyin",
   "team_name_required": "Ekip adı gereklidir",
   "show_attendees": "Katılımcı bilgilerini misafirler arasında paylaşın",
-  "how_additional_inputs_as_variables": "Ek Girdiler Değişken Olarak Nasıl Kullanılır",
+  "how_booking_questions_as_variables": "Rezervasyonla ilgili sorular değişken olarak nasıl kullanılır?",
   "format": "Biçim",
   "uppercase_for_letters": "Tüm harfleri büyük harf olarak kullanın",
   "replace_whitespaces_underscores": "Boşlukları alt çizgi ile değiştir",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Başka bir şeye ihtiyacınız var mı?",
   "billing_help_description": "Faturalandırma konusunda daha fazla yardıma ihtiyacınız olursa destek ekibimiz size yardımcı olmaya hazır.",
   "billing_help_cta": "Destek ekibimize ulaşın",
-  "ignore_special_characters": "Ek Girdi etiketinizdeki özel karakterleri yok sayın. Yalnızca harf ve sayı kullanın",
+  "ignore_special_characters_booking_questions": "Rezervasyon sorusu tanımlayıcınızdaki özel karakterleri kullanmayın. Yalnızca harfleri ve sayıları kullanın",
   "retry": "Yeniden dene",
   "fetching_calendars_error": "Takvimleriniz alınırken bir sorun oluştu. Lütfen <1>tekrar deneyin</1> veya müşteri destek ekibiyle iletişme geçin.",
   "calendar_connection_fail": "Takvim bağlantısı yapılamadı",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Sabit döngü",
   "add_one_fixed_attendee": "Bir sabit katılımcı ekleyin ve katılımcı sayısına göre rotasyon yapın.",
   "calcom_is_better_with_team": "Cal.com ekiplerle daha iyidir",
+  "the_calcom_team": "Cal.com ekibi",
   "add_your_team_members": "Ekip üyelerinizi etkinlik türlerinize ekleyin. Herkesi eklemek için toplu planlamayı kullanın veya döngüsel planlama ile en uygun kişiyi bulun.",
   "booking_limit_reached": "Bu etkinlik türü için Rezervasyon Sınırına ulaşıldı",
   "duration_limit_reached": "Bu etkinlik türü için Süre Sınırına ulaşıldı",
   "admin_has_disabled": "Bir yönetici {{appName}} adlı uygulamayı devre dışı bıraktı",
   "disabled_app_affects_event_type": "Bir yönetici {{eventType}} etkinlik türünüzü etkileyen {{appName}} adlı uygulamayı devre dışı bıraktı",
+  "event_replaced_notice": "Bir yönetici, etkinlik türlerinizden birini değiştirdi",
+  "email_subject_slug_replacement": "Bir ekip yöneticisi etkinliğinizi değiştirdi /{{slug}}",
+  "email_body_slug_replacement_notice": "<strong>{{teamName}}</strong> ekibindeki bir yönetici, <strong>/{{slug}}</strong> etkinlik türünüzü kontrol ettiği yönetilen bir etkinlik türüyle değiştirdi.",
+  "email_body_slug_replacement_info": "Bağlantınız çalışmaya devam edecek, ancak bazı ayarları değişebilir. Bağlantıyı bu etkinlik kategorilerinde inceleyebilirsiniz.",
+  "email_body_slug_replacement_suggestion": "Etkinlik türüyle ilgili herhangi bir sorunuz varsa lütfen yöneticinizle iletişime geçin.<br /><br />Mutlu planlama, <br />Cal.com ekibi",
   "disable_payment_app": "Yönetici, {{title}} etkinlik türünüzü etkileyebilecek {{appName}} uygulamasını devre dışı bıraktı. Katılımcılar yine de bu tür bir etkinlik için rezervasyon yaptırabilirler ancak herhangi bir ödeme yapmalarına gerek yoktur. Bu durumu önlemek için yöneticiniz ödeme yönteminizi yeniden etkinleştirene kadar etkinlik türünü gizleyebilirsiniz.",
   "payment_disabled_still_able_to_book": "Katılımcılar yine de bu tür bir etkinlik için rezervasyon yaptırabilirler, ancak herhangi bir ödeme yapmalarına gerek yoktur. Bu durumu önlemek için yöneticiniz ödeme yönteminizi yeniden etkinleştirene kadar etkinlik türünü gizleyebilirsiniz.",
   "app_disabled_with_event_type": "Yönetici, etkinlik {{title}} türünüzü etkileyen {{appName}} uygulamasını devre dışı bıraktı.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Üzerine Yazmayı Güncelle",
   "event_type_duplicate_copy_text": "{{slug}}-kopya",
   "set_as_default": "Varsayılan olarak ayarla",
+  "hide_eventtype_details": "Etkinlik türü ayrıntılarını gizle",
   "show_navigation": "Navigasyonu göster",
   "hide_navigation": "Navigasyonu gizle",
   "verification_code_sent": "Doğrulama kodu gönderildi",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Bu ekip etkinliği türü için ilk web kancanızı oluşturun",
   "create_webhook_team_event_type": "Bu ekip etkinliği türü için bir web kancası oluşturun",
   "disable_success_page": "Başarılı Sayfasını Devre Dışı Bırak (yalnızca yönlendirme URL'niz varsa çalışır)",
+  "invalid_admin_password": "Yöneticisiniz, ancak henüz en az 15 karakterden oluşan bir şifreniz veya 2 Adımlı Kimlik Doğrulamanız yok",
   "change_password_admin": "Yönetici erişimi kazanmak için Şifreyi değiştirin",
   "username_already_taken": "Kullanıcı adı zaten alınmış",
   "assignment": "Atama",
@@ -1529,7 +1574,7 @@
   "sender_name": "Gönderenin adı",
   "already_invited": "Katılımcı zaten davet edildi",
   "no_recordings_found": "Kayıt bulunamadı",
-  "new_workflow_subtitle": "Yeni iş akışı...",
+  "new_workflow_subtitle": "Şunun için yeni iş akışı...",
   "reporting": "Raporlama",
   "reporting_feature": "Gelen tüm verileri görüntüleyin ve CSV olarak indirin",
   "teams_plan_required": "Ekip planı gerekli",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "“/ee” Enterprise Lisansı",
   "enterprise_booking_fee": "Ayda {{enterprise_booking_fee}} başlangıç fiyatıyla",
   "enterprise_license_includes": "Ticari bir kullanım durumu için her şey",
+  "no_need_to_keep_your_code_open_source": "Kodunuzu açık kaynak olarak tutmanıza gerek yok",
   "repackage_rebrand_resell": "Kolayca yeniden paketleyin, yeniden markalalayın ve yeniden satın",
   "a_vast_suite_of_enterprise_features": "Kapsamlı kurumsal özellikler paketi",
   "free_license_fee": "0,00 $/ay",
@@ -1595,29 +1641,31 @@
   "book_your_team_members": "Ekip üyelerinizi toplu etkinliklerle bir araya getirmek için rezervasyon yapın veya döngüsel planlamayla en uygun doğru kişiyi bulmak için rotasyon yapın.",
   "event_no_longer_attending_subject": "Artık {{date}} tarihindeki {{title}} etkinliğine katılmıyorsunuz",
   "no_longer_attending": "Artık bu etkinliğe katılmıyorsunuz",
-  "attendee_no_longer_attending_subject": "Bir katılımcı, artık {{date}} tarihindeki {{title}} etkinliğine katılmıyor",
+  "attendee_no_longer_attending_subject": "Bir katılımcı, {{date}} tarihli {{title}} etkinliğine artık katılmıyor",
   "attendee_no_longer_attending": "Bir katılımcı artık etkinliğinize katılmıyor",
   "attendee_no_longer_attending_subtitle": "{{name}} etkinlik katılımını iptal etti. Bu, bu zaman aralığı için bir yerin açıldığı anlamına gelir",
   "create_event_on": "Şu tarih için etkinlik oluşturun:",
   "default_app_link_title": "Varsayılan uygulama bağlantısını ayarlayın",
   "default_app_link_description": "Varsayılan uygulama bağlantısını ayarlamak, yeni oluşturulan tüm etkinlik türlerinin ayarladığınız uygulama bağlantısını kullanmasına olanak tanır.",
   "change_default_conferencing_app": "Varsayılan olarak ayarla",
+  "organizer_default_conferencing_app": "Organizatörün varsayılan uygulaması",
   "under_maintenance": "Bakımda",
   "under_maintenance_description": "{{appName}} ekibi planlı bir bakım çalışması gerçekleştiriyor. Herhangi bir sorunuz varsa lütfen destek ekibiyle iletişime geçin.",
   "event_type_seats": "{{numberOfSeats}} yer",
   "booking_questions_title": "Rezervasyon soruları",
   "booking_questions_description": "Rezervasyon sayfasında sorulan soruları özelleştirin",
   "add_a_booking_question": "Soru ekle",
-  "duplicate_email": "E-posta yineleniyor",
+  "duplicate_email": "E-posta yinelenmiş",
   "booking_with_payment_cancelled": "Artık bu etkinlik için ödeme yapılamıyor",
   "booking_with_payment_cancelled_already_paid": "Bu rezervasyon ödemesi için iade yolda.",
   "booking_with_payment_cancelled_refunded": "Bu rezervasyon ödemesi iade edildi.",
   "booking_confirmation_failed": "Rezervasyon onayı yapılamadı",
-  "not_enough_seats": "Yeterli koltuk yok",
+  "not_enough_seats": "Yeterli yer yok",
   "form_builder_field_already_exists": "Bu ada sahip bir alan zaten var",
   "form_builder_field_add_subtitle": "Rezervasyon sayfasında sorulan soruları özelleştirin",
+  "show_on_booking_page": "Rezervasyon sayfasında göster",
   "get_started_zapier_templates": "Zapier şablonlarını kullanmaya başlayın",
-  "team_is_unpublished": "{{team}} bağlantısı paylaşılmadı",
+  "team_is_unpublished": "{{team}} paylaşılmadı",
   "team_is_unpublished_description": "Bu ekip bağlantısı şu anda kullanılamıyor. Lütfen ekip sahibiyle iletişime geçin veya ondan bir bağlantı paylaşmasını isteyin.",
   "team_member": "Ekip üyesi",
   "a_routing_form": "Yönlendirme Formu",
@@ -1625,9 +1673,9 @@
   "keep_me_connected_with_form": "Formla bağlantımı sürdür",
   "fields_in_form_duplicated": "Kopyalanan formun Yönlendirici ve Alanlarındaki tüm değişiklikler de kopyaya yansıtılır.",
   "form_deleted": "Form silindi",
-  "delete_form": "Formu sil",
+  "delete_form": "Bu formu silmek istediğinizden emin misiniz?",
   "delete_form_action": "Evet, Formu sil",
-  "delete_form_confirmation": "Bu formu silmek istediğinizden emin misiniz? Bağlantıyı paylaştığınız hiç kimse artık bu formu kullanarak rezervasyon yapamayacak. Ayrıca, tüm ilişkili yanıtlar silinecek.",
+  "delete_form_confirmation": "Bağlantıyı paylaştığınız hiç kimse artık bu formu kullanarak buna erişemeyecek.",
   "delete_form_confirmation_2": "İlişkili tüm yanıtlar silinecek.",
   "typeform_redirect_url_copied": "Typeform Yönlendirme URL'si kopyalandı! Adrese giderek Typeform formundaki URL'yi ayarlayabilirsiniz.",
   "modifications_in_fields_warning": "Aşağıdaki formların alan ve yönlendirme seçeneklerindeki değişiklikler bu forma yansıtılacak.",
@@ -1639,18 +1687,88 @@
   "add_1_option_per_line": "Satır başına 1 seçenek ekle",
   "select_a_router": "Yönlendirici seçin",
   "add_a_new_route": "Yeni bir Yönlendirme ekle",
+  "make_informed_decisions": "Öngörüler ile bilinçli kararlar verin",
+  "make_informed_decisions_description": "Öngörüler panomuz, ekibinizdeki tüm etkinlikleri analiz eder ve size daha iyi ekip planlaması yapma ve karar verme imkanı sağlayan eğilimleri gösterir.",
+  "view_bookings_across": "Tüm üyelerin rezervasyonlarını görüntüleyin",
+  "view_bookings_across_description": "En çok rezervasyonu kimin aldığını görün ve tüm ekibiniz için en iyi dağılımı sağlayın",
+  "identify_booking_trends": "Rezervasyon trendlerini belirleyin",
+  "identify_booking_trends_description": "Rezervasyon yapan kullanıcılarınız için haftanın ve günün hangi zamanlarının popüler olduğunu görün",
+  "spot_popular_event_types": "Popüler etkinlik türlerini tespit edin",
+  "spot_popular_event_types_description": "Hangi etkinlik türünüzün en çok tıklandığını ve rezervasyon aldığını görün",
   "no_responses_yet": "Henüz yanıt yok",
   "this_will_be_the_placeholder": "Bu, yer tutucu olacak",
   "this_meeting_has_not_started_yet": "Bu toplantı henüz başlamadı",
-  "this_app_requires_connected_account": "{{appName}} uygulaması için bağlı bir {{dependencyName}} hesabı gereklidir",
+  "this_app_requires_connected_account": "{{appName}} bağlı bir {{dependencyName}} hesabı gerektirir",
   "connect_app": "{{dependencyName}} hesabını bağla",
-  "app_is_connected": "{{dependencyName}} hesabı bağlandı",
-  "requires_app": "{{dependencyName}} hesabı gereklidir",
+  "app_is_connected": "{{dependencyName}} bağlandı",
+  "requires_app": "{{dependencyName}} gerektirir",
   "verification_code": "Doğrulama kodu",
-  "can_you_try_again": "Başka bir zaman tekrar deneyebilir misiniz?",
+  "can_you_try_again": "Başka bir saatle tekrar deneyebilir misiniz?",
   "verify": "Doğrula",
+  "timezone_variable": "Saat dilimi",
+  "timezone_info": "Alıcının saat dilimi",
+  "event_end_time_variable": "Etkinlik bitiş saati",
+  "event_end_time_info": "Etkinlik bitiş saati",
+  "cancel_url_variable": "URL'yi iptal et",
+  "cancel_url_info": "Rezervasyonu iptal etme URL'si",
+  "reschedule_url_variable": "Yeniden Planlama URL'si",
+  "reschedule_url_info": "Rezervasyonu yeniden planlama URL'si",
+  "invalid_event_name_variables": "Etkinlik adınızda geçersiz bir değişken var",
   "select_all": "Tümünü Seç",
   "default_conferencing_bulk_title": "Mevcut etkinlik türlerini toplu olarak güncelleyin",
-  "invalid_event_name_variables": "Etkinlik adınızda geçersiz bir değişken var",
-  "default_conferencing_bulk_description": "Seçilen etkinlik türleri için konumları güncelleyin"
+  "members_default_schedule": "Üyenin varsayılan programı",
+  "set_by_admin": "Ekip yöneticisi tarafından belirlendi",
+  "members_default_location": "Üyenin varsayılan konumu",
+  "members_default_schedule_description": "Her üyenin varsayılan uygunluk planını kullanacağız. Bunu düzenleyebilir veya değiştirebilir.",
+  "requires_at_least_one_schedule": "En az bir plana sahip olmanız gerekiyor",
+  "default_conferencing_bulk_description": "Seçilen etkinlik türleri için konumları güncelleyin",
+  "locked_for_members": "Üyeler için kilitli",
+  "locked_apps_description": "Üyeler aktif uygulamaları görebilir, ancak hiçbir uygulama ayarını düzenleyemez",
+  "locked_webhooks_description": "Üyeler aktif web kancalarını görebilir, ancak hiçbir web kancası ayarını düzenleyemez",
+  "locked_workflows_description": "Üyeler aktif iş akışlarını görebilir, ancak hiçbir iş akışı ayarını düzenleyemez",
+  "locked_by_admin": "Yönetici tarafından kilitlendi",
+  "app_not_connected": "Bir {{appName}} hesabı bağlamadınız.",
+  "connect_now": "Hemen bağlan",
+  "managed_event_dialog_confirm_button_one": "{{count}} üyeyi değiştirin ve bilgilendirin",
+  "managed_event_dialog_confirm_button_other": "{{count}} üyeyi değiştirin ve bilgilendirin",
+  "review_event_type": "Etkinlik Türünü inceleyin",
+  "looking_for_more_analytics": "Daha fazla analiz mi arıyorsunuz?",
+  "looking_for_more_insights": "Daha fazla Öngörü mü arıyorsunuz?",
+  "add_filter": "Filtre ekle",
+  "select_user": "Kullanıcı seç",
+  "select_event_type": "Etkinlik Türü seç",
+  "select_date_range": "Tarih Aralığı seçin",
+  "popular_events": "Popüler Etkinlikler",
+  "no_event_types_found": "Etkinlik türü bulunamadı",
+  "average_event_duration": "Ortalama Etkinlik Süresi",
+  "most_booked_members": "En Çok Rezerve Edilen Üyeler",
+  "least_booked_members": "En Az Rezerve Edilen Üyeler",
+  "events_created": "Oluşturulan Etkinlikler",
+  "events_completed": "Tamamlanan Etkinlikler",
+  "events_cancelled": "İptal Edilen Etkinlikler",
+  "events_rescheduled": "Etkinlikler Yeniden Planlandı",
+  "from_last_period": "son dönemden itibaren",
+  "from_to_date_period": "İlk tarih: {{startDate}} Son tarih: {{endDate}}",
+  "analytics_for_organisation": "Öngörüler",
+  "subtitle_analytics": "Ekibinizin aktivitesi hakkında daha fazla bilgi edinin",
+  "redirect_url_warning": "Yönlendirme eklemek başarı sayfasını devre dışı bırakır. Özel başarı sayfanızda \"Rezervasyon Onaylandı\" ifadesinden bahsetmeyi unutmayın.",
+  "event_trends": "Etkinlik Trendleri",
+  "clear_filters": "Filtreleri Temizle",
+  "hold": "Tut",
+  "on_booking_option": "Ödemeyi rezervasyon sırasında alın",
+  "hold_option": "Rezervasyonu kullanmama ücreti kesin",
+  "card_held": "Kart tutuldu",
+  "charge_card": "Karttan ücret alın",
+  "submit_card": "Kart gönderin",
+  "submit_payment_information": "Ödeme bilgilerini gönderin",
+  "meeting_awaiting_payment_method": "Toplantınız için bir ödeme yöntemi bekleniyor",
+  "no_show_fee_charged_email_subject": "{{date}} tarihindeki {{title}} adlı etkinlik için {{amount, currency}} katılmama ücreti alındı",
+  "insights": "Öngörüler",
+  "testing_workflow_info_message": "Bu iş akışını test ederken, E-postaların ve SMS'lerin yalnızca en az 1 saat önceden planlanabileceğini unutmayın",
+  "insights_no_data_found_for_filter": "Seçili filtre veya tarihler için veri bulunamadı.",
+  "acknowledge_booking_no_show_fee": "Bu etkinliğe katılmadığım takdirde kartımdan {{amount, currency}} tutarında katılmama ücreti alınmasını kabul ediyorum.",
+  "card_details": "Kart bilgileri",
+  "complete_your_booking": "Rezervasyonunuzu tamamlayın",
+  "complete_your_booking_subject": "Rezervasyonunuzu tamamlayın: {{title}}, {{date}}",
+  "email_invite_team": "{{email}} davet edildi"
 }
diff --git a/apps/web/public/static/locales/uk/common.json b/apps/web/public/static/locales/uk/common.json
index f65694cb6c..25076f30f1 100644
--- a/apps/web/public/static/locales/uk/common.json
+++ b/apps/web/public/static/locales/uk/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Постачальник посвідчень",
   "trial_days_left": "У вас ще $t(day, {\"count\": {{days}} }) користування пробною PRO-версією",
   "day_one": "{{count}} день",
   "day_other": "{{count}} д.",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Очікування на схвалення: {{title}}, {{date}}",
   "event_still_awaiting_approval": "Захід досі чекає на ваше схвалення",
   "booking_submitted_subject": "Бронювання надіслано: {{title}}, {{date}}",
+  "download_recording_subject": "Завантажити запис: {{title}} о {{date}}",
+  "download_your_recording": "Завантажте запис",
   "your_meeting_has_been_booked": "Вашу нараду заброньовано",
   "event_type_has_been_rescheduled_on_time_date": "Ваш {{title}} перенесено на {{date}}.",
   "event_has_been_rescheduled": "Оновлено – ваш захід перенесено",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "Щоб користуватися функціями команди, потрібен обліковий запис версії Pro. До переходу на цю версію вас буде приховано.",
   "link_expires": "P.S. Термін дії – ще {{expiresIn}} год.",
   "upgrade_to_per_seat": "Перейдіть на версію з оплатою за місце",
-  "seat_options_doesnt_support_confirmation": "Для параметра «Місця» підтвердження не потрібно",
+  "seat_options_doesnt_support_confirmation": "Для бронювань із місцями підтвердження не надається",
   "team_upgrade_seats_details": "У вас стільки неоплачених місць для учасників команди: {{unpaidCount}} із {{memberCount}}. Одне місце коштує {{seatPrice}} $ за місяць, тому загальна вартість вашого членства складатиме приблизно {{totalCost}} $ за місяць.",
   "team_upgrade_banner_description": "Дякуємо, що спробували наш новий план для команд! Ми помітили, що вашу команду «{{teamName}}» потрібно перевести на план вищого рівня.",
   "team_upgrade_banner_action": "Перейдіть на інший план",
@@ -224,6 +227,7 @@
   "done": "Готово",
   "all_done": "Усе готово!",
   "all_apps": "Усі",
+  "available_apps": "Доступні додатки",
   "check_email_reset_password": "Перевірте електронну пошту. Ми надіслали вам посилання для скидання пароля.",
   "finish": "Готово",
   "few_sentences_about_yourself": "Кілька речень про вас. Ця інформація з’явиться на сторінці за вашою URL-адресою.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Додати нове часове вікно",
   "add_an_extra_layer_of_security": "Підвищте рівень захисту свого облікового запису на випадок, якщо у вас викрадуть пароль.",
   "2fa": "Двоетапна автентифікація",
+  "2fa_disabled": "Двоетапну автентифікацію можна ввімкнути лише для автентифікації за допомогою ел. пошти й пароля",
   "enable_2fa": "Увімкнути двоетапну автентифікацію",
   "disable_2fa": "Вимкнути двоетапну автентифікацію",
   "disable_2fa_recommendation": "Якщо вам потрібно вимкнути двоетапну перевірку, рекомендуємо потім увімкнути її якомога швидше.",
@@ -585,6 +590,20 @@
   "minutes": "Хвилини",
   "round_robin": "Ротація",
   "round_robin_description": "Кілька учасників команди призначаються для нарад циклічно й по черзі.",
+  "managed_event": "Керований захід",
+  "username_placeholder": "ім’я користувача",
+  "managed_event_description": "Створюйте й надсилайте типи заходів усім учасникам команди пакетом",
+  "managed": "Керований",
+  "managed_event_url_clarification": "у полі «ім’я користувача» буде вказано імена користувачів призначених учасників",
+  "assign_to": "Призначити",
+  "add_members": "Додати учасників…",
+  "count_members_one": "{{count}} учасник",
+  "count_members_other": "{{count}} учасники(-ів)",
+  "no_assigned_members": "Немає призначених учасників",
+  "assigned_to": "Призначено",
+  "start_assigning_members_above": "Почніть призначати учасників вище",
+  "locked_fields_admin_description": "Учасники не зможуть редагувати це",
+  "locked_fields_member_description": "Адміністратор команди заблокував цю опцію",
   "url": "URL",
   "hidden": "Приховано",
   "readonly": "Тільки читання",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Мінімальний час до наступного заходу",
   "slot_interval": "Інтервали між бронюваннями",
   "slot_interval_default": "Використовувати тривалість заходу (за замовчуванням)",
+  "delete_event_type": "Видалити тип заходу?",
+  "delete_managed_event_type": "Видалити захід керованого типу?",
+  "delete_event_type_description": "Користувачі, з якими ви поділилися цим посиланням, більше не зможуть здійснити бронювання з його допомогою.",
+  "delete_managed_event_type_description": "<ul><li>В учасників, призначених для цього типу заходу, також буде видалено їхні типи заходів.</li><li> Користувачі, з якими вони поділилися своїм посиланням, більше не зможуть здійснити бронювання з його допомогою.</li></ul>",
+  "confirm_delete_event_type": "Так, видалити",
   "delete_account": "Видалити обліковий запис",
   "confirm_delete_account": "Так, видалити обліковий запис",
   "delete_account_confirmation_message": "Справді видалити обліковий запис {{appName}}? Усі, кому ви надавали посилання на свій обліковий запис, більше не зможуть бронювати ваш час за його допомогою. Усі збережені налаштування буде втрачено.",
@@ -860,7 +884,7 @@
   "add_new_calendar": "Додати новий календар",
   "set_calendar": "Укажіть, куди додавати нові заходи, коли ваш час бронюють.",
   "delete_schedule": "Видалити розклад",
-  "delete_schedule_description": "Видалення розкладу вилучить його з усіх типів заходів. Цю дію неможливо скасувати.",
+  "delete_schedule_description": "Видалений розклад буде вилучено з усіх типів заходів. Цю дію неможливо скасувати.",
   "schedule_created_successfully": "Розклад «{{scheduleName}}» створено",
   "availability_updated_successfully": "Розклад «{{scheduleName}}» оновлено",
   "schedule_deleted_successfully": "Розклад видалено",
@@ -1126,13 +1150,13 @@
   "current_username": "Поточне ім’я користувача",
   "example_1": "Приклад 1",
   "example_2": "Приклад 2",
-  "additional_input_label": "Додатковий введений підпис",
+  "booking_question_identifier": "Ідентифікатор запитання щодо бронювання",
   "company_size": "Розмір компанії",
   "what_help_needed": "З чим саме потрібна допомога?",
   "variable_format": "Формат змінної",
   "webhook_subscriber_url_reserved": "URL-адресу для абонента у вебгуку вже визначено",
   "custom_input_as_variable_info": "Усі спеціальні символи в додатковому введеному підписі пропускаються (використовуються тільки літери та цифри), використовуються лише великі літери, пробіли замінюються на підкреслення.",
-  "using_additional_inputs_as_variables": "Як використовувати додаткові поля введення як змінні?",
+  "using_booking_questions_as_variables": "Як використовувати запитання щодо бронювання як змінні?",
   "download_desktop_app": "Завантажити додаток для ПК",
   "set_ping_link": "Установити Ping-посилання",
   "rate_limit_exceeded": "Перевищено ліміт кількості запитів",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Початок тижня",
   "recordings_title": "Записи",
   "recording": "Запис",
+  "happy_scheduling": "Щасливого планування",
   "select_calendars": "Виберіть, які календарі потрібно перевірити на наявність конфліктів, щоб уникнути подвійних бронювань.",
   "check_for_conflicts": "Перевірка конфліктів",
   "view_recordings": "Переглянути записи",
@@ -1215,6 +1240,7 @@
   "impersonation": "Вхід під іншим іменем",
   "impersonation_description": "Налаштування входу під іншим іменем",
   "users": "Користувачі",
+  "user": "Користувач",
   "profile_description": "Керуйте налаштуваннями свого профілю {{appName}}",
   "users_description": "Тут наведено список усіх користувачів",
   "users_listing": "Список користувачів",
@@ -1255,6 +1281,8 @@
   "download_responses": "Завантажити відповіді",
   "download_responses_description": "Завантажте всі відповіді у свою форму у форматі CSV.",
   "download": "Завантажити",
+  "download_recording": "Завантажити запис",
+  "recording_from_your_recent_call": "Запис вашого попереднього дзвінка в Cal.com готовий до завантаження",
   "create_your_first_form": "Створіть свою першу форму",
   "create_your_first_form_description": "Форми переспрямування дають змогу надавати уточнювальні запитання та переходити до відповідної особи або типу заходу.",
   "create_your_first_webhook": "Створіть свій перший вебгук",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Проста автентифікація",
   "exchange_authentication_ntlm": "Автентифікація NTLM",
   "exchange_compression": "Стиснення GZip",
+  "exchange_version": "Версія обміну",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Тут можна переглянути всі створені вами форми й переспрямування.",
   "routing_forms_send_email_owner": "Надіслати власнику електронний лист",
   "routing_forms_send_email_owner_description": "Коли надсилається форма, власник отримує електронний лист",
@@ -1345,7 +1382,7 @@
   "add_limit": "Додати ліміт",
   "team_name_required": "Назва команди обов’язкова",
   "show_attendees": "Поширювати інформацію про учасників серед гостей",
-  "how_additional_inputs_as_variables": "Як використовувати додаткові поля введення як змінні",
+  "how_booking_questions_as_variables": "Як використовувати запитання щодо бронювання як змінні?",
   "format": "Формат",
   "uppercase_for_letters": "Використовувати всі великі літери",
   "replace_whitespaces_underscores": "Заміняти пробіли підкресленнями",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Потрібно щось інше?",
   "billing_help_description": "Якщо вам потрібна додаткова допомога з виставленням рахунків, наша служба підтримки готова її надати.",
   "billing_help_cta": "Звернутися в службу підтримки",
-  "ignore_special_characters": "Пропускати спеціальні символи в підписі додаткового поля. Використовувати лише літери та цифри.",
+  "ignore_special_characters_booking_questions": "Пропускайте спеціальні символи в ідентифікаторі запитання щодо бронювання. Використовуйте лише літери й цифри.",
   "retry": "Повторити",
   "fetching_calendars_error": "Під час отримання календарів виникла проблема. <1>Повторіть спробу</1> або зверніться в службу підтримки.",
   "calendar_connection_fail": "Не вдалося підключитися до календаря",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Фіксоване циклічне планування",
   "add_one_fixed_attendee": "Додайте одного постійного учасника та циклічно замінюйте кількох інших учасників.",
   "calcom_is_better_with_team": "З Cal.com краще працювати в командах",
+  "the_calcom_team": "Команда Cal.com",
   "add_your_team_members": "Додавайте членів своєї команди в типи заходів. Колективне планування дає змогу включати всіх або знаходити найвідповіднішого члена завдяки циклічній ротації.",
   "booking_limit_reached": "Для цього типу заходу досягнуто ліміт бронювання",
   "duration_limit_reached": "Досягнуто ліміту тривалості для цього типу заходу",
   "admin_has_disabled": "Адміністратор вимкнув додаток {{appName}}",
   "disabled_app_affects_event_type": "Адміністратор вимкнув додаток {{appName}}, що впливає на ваш тип заходу «{{eventType}}»",
+  "event_replaced_notice": "Адміністратор замінив один із типів ваших заходів",
+  "email_subject_slug_replacement": "Адміністратор команди замінив ваш захід /{{slug}}",
+  "email_body_slug_replacement_notice": "Адміністратор команди <strong>{{teamName}}</strong> замінив ваш тип заходу<strong>/{{slug}}</strong> на керований тип заходу, який він контролює.",
+  "email_body_slug_replacement_info": "Ваше посилання продовжуватиме працювати, але деякі параметри можуть бути змінені. Дізнайтеся більше в типах подій.",
+  "email_body_slug_replacement_suggestion": "Якщо у вас виникли запитання щодо типу заходу, зверніться до свого адміністратора.<br /><br />Щасливого планування!<br />Команда Cal.com",
   "disable_payment_app": "Адміністратор вимкнув додаток {{appName}}, що впливає на ваш тип заходу «{{title}}». Учасники все одно можуть бронювати події такого типу, але від них не вимагатиметься оплата. Ви можете приховати цей тип заходу, щоб уникнути цього, і дочекатись активації способу оплати адміністратором.",
   "payment_disabled_still_able_to_book": "Учасники все одно можуть бронювати події такого типу, але від них не вимагатиметься оплата. Ви можете приховати цей тип заходу, щоб уникнути цього, і дочекатись активації способу оплати адміністратором.",
   "app_disabled_with_event_type": "Адміністратор вимкнув додаток {{appName}}, що впливає на ваш тип заходу «{{title}}».",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Оновити перевизначення",
   "event_type_duplicate_copy_text": "{{slug}} (копія)",
   "set_as_default": "Установити за замовчуванням",
+  "hide_eventtype_details": "Приховати інформацію про тип заходу",
   "show_navigation": "Показати навігацію",
   "hide_navigation": "Приховати навігацію",
   "verification_code_sent": "Код перевірки надіслано",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Створіть свій перший вебгук для цього типу командного заходу",
   "create_webhook_team_event_type": "Створити вебгук для цього типу командного заходу",
   "disable_success_page": "Вимкнути сторінку, де показано результат бронювання (працює тільки з URL-адресою перенаправлення)",
+  "invalid_admin_password": "Ви адміністратор, але у вас немає пароля, що містить принаймні 15 символів, або не налаштовано двоетапну автентифікацію",
   "change_password_admin": "Змініть пароль, щоб отримати доступ адміністратора",
   "username_already_taken": "Таке ім’я користувача вже існує",
   "assignment": "Призначення",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "“/ee” Ліцензія для плану Enterprise",
   "enterprise_booking_fee": "Від {{enterprise_booking_fee}}/міс.",
   "enterprise_license_includes": "Усе для комерційного використання",
+  "no_need_to_keep_your_code_open_source": "Немає потреби залишати код відкритим",
   "repackage_rebrand_resell": "Легко здійснювати перепакування, ребрендинг і перепродаж",
   "a_vast_suite_of_enterprise_features": "Великий набір корпоративних функцій",
   "free_license_fee": "$0,00/міс.",
@@ -1586,48 +1632,50 @@
   "available_variables": "Доступні змінні",
   "scheduler": "{Scheduler}",
   "no_workflows": "Немає робочих процесів",
-  "change_filter": "Змініть фільтр, щоб побачити особисті та командні робочі процеси.",
+  "change_filter": "Змініть фільтр, щоб побачити особисті й командні робочі процеси.",
   "recommended_next_steps": "Рекомендовані наступні кроки",
   "create_a_managed_event": "Створіть подію керованого типу",
   "meetings_are_better_with_the_right": "Краще проводити наради з потрібними учасниками команди. Запросіть їх зараз.",
-  "create_a_one_one_template": "Створіть єдиний шаблон для типу заходу та розповсюдьте його між учасниками.",
+  "create_a_one_one_template": "Створіть один шаблон індивідуальної наради для цього типу заходу й розповсюдьте його між учасниками.",
   "collective_or_roundrobin": "Колективна або циклічна",
   "book_your_team_members": "Забронюйте час усіх учасників команди одночасно за допомогою колективних подій або виберіть потрібну людину за циклічним принципом.",
-  "event_no_longer_attending_subject": "Більше не відвідує захід «{{title}}» о {{date}}",
+  "event_no_longer_attending_subject": "Більше не відвідує захід «{{title}}», запланований на {{date}}",
   "no_longer_attending": "Ви більше не відвідуєте цей захід",
-  "attendee_no_longer_attending_subject": "Учасник більше не відвідує захід «{{title}}» о {{date}}",
+  "attendee_no_longer_attending_subject": "Учасник більше не відвідує захід «{{title}}», запланований на {{date}}",
   "attendee_no_longer_attending": "Учасник більше не відвідує ваш захід",
   "attendee_no_longer_attending_subtitle": "{{name}} скасував(-ла) участь. Це означає, що на цей час з’явилося вільне місце.",
-  "create_event_on": "Створити захід",
+  "create_event_on": "Створити захід у календарі",
   "default_app_link_title": "Установити посилання на додаток за замовчуванням",
   "default_app_link_description": "Посилання на додаток за замовчуванням використовуватиметься для всіх новостворених типів подій.",
   "change_default_conferencing_app": "Установити за замовчуванням",
+  "organizer_default_conferencing_app": "Додаток організації за замовчуванням",
   "under_maintenance": "На обслуговуванні",
   "under_maintenance_description": "Команда {{appName}} здійснює планове обслуговування. Якщо маєте запитання, зверніться в службу підтримки.",
   "event_type_seats": "Місць: {{numberOfSeats}}",
-  "booking_questions_title": "Питання про бронювання",
-  "booking_questions_description": "Налаштуйте запитання, які ставитимуться на сторінці бронювання",
+  "booking_questions_title": "Запитання про бронювання",
+  "booking_questions_description": "Налаштуйте запитання, відповіді на які потрібно буде надати на сторінці бронювання",
   "add_a_booking_question": "Додати запитання",
-  "duplicate_email": "Ця адреса ел. пошти дублюється",
+  "duplicate_email": "Ця електронна адреса дублюється",
   "booking_with_payment_cancelled": "Більше не можна оплатити цю подію",
   "booking_with_payment_cancelled_already_paid": "Повернення коштів за це бронювання вже виконано.",
   "booking_with_payment_cancelled_refunded": "Кошти за бронювання повернено.",
   "booking_confirmation_failed": "Не вдалося підтвердити бронювання",
   "not_enough_seats": "Недостатньо місць",
   "form_builder_field_already_exists": "Поле з такою назвою вже існує",
-  "form_builder_field_add_subtitle": "Налаштуйте запитання, які ставитимуться на сторінці бронювання",
+  "form_builder_field_add_subtitle": "Налаштуйте запитання, відповіді на які потрібно буде надати на сторінці бронювання",
+  "show_on_booking_page": "Показати на сторінці бронювання",
   "get_started_zapier_templates": "Розпочніть роботу із шаблонами Zapier",
-  "team_is_unpublished": "Публікацію такого елемента скасовано: {{team}}",
-  "team_is_unpublished_description": "Посилання на команду зараз недоступне. Зверніться до власника команди або попросіть його опублікувати це посилання.",
+  "team_is_unpublished": "Публікацію команди «{{team}}» скасовано",
+  "team_is_unpublished_description": "Посилання на команду зараз недоступне. Зверніться до власника команди або попросіть його опублікувати команду.",
   "team_member": "Учасник команди",
   "a_routing_form": "Форма переспрямування",
   "form_description_placeholder": "Опис форми",
   "keep_me_connected_with_form": "Підтримувати зі мною зв’язок за допомогою форми",
   "fields_in_form_duplicated": "Будь-які зміни, внесені у форму переспрямування і її поля, буде відображено в дублікаті цієї форми.",
   "form_deleted": "Форму видалено",
-  "delete_form": "Видалити форму",
+  "delete_form": "Видалити цю форму?",
   "delete_form_action": "Так, видалити форму",
-  "delete_form_confirmation": "Справді видалити цю форму? Користувачі, з якими ви поділилися посиланням, не зможуть забронювати час з її допомогою. Крім того, усі пов’язані відповіді буде видалено.",
+  "delete_form_confirmation": "Користувачі, з якими ви поділилися посиланням, більше не зможуть перейти за ним.",
   "delete_form_confirmation_2": "Усі пов’язані відповіді буде видалено.",
   "typeform_redirect_url_copied": "URL-адресу переспрямування Typeform скопійовано! Ви можете перейти й налаштувати URL-адресу у формі Typeform.",
   "modifications_in_fields_warning": "Зміни в полях і переспрямуваннях нижчезазначених форм будуть відображені в цій формі.",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "Додати 1 варіант на рядок",
   "select_a_router": "Вибрати форму переспрямування",
   "add_a_new_route": "Додати нове переспрямування",
+  "make_informed_decisions": "Приймайте обґрунтовані рішення за допомогою аналітики",
+  "make_informed_decisions_description": "У розділі «Аналітика» показано всю діяльність вашої команди й тенденції, які дають змогу краще планувати час команди й приймати рішення.",
+  "view_bookings_across": "Переглядайте бронювання всіх учасників",
+  "view_bookings_across_description": "Дізнайтеся, хто отримує найбільше бронювань і забезпечте найкращий розподіл у команді",
+  "identify_booking_trends": "Визначте тенденції бронювання",
+  "identify_booking_trends_description": "Дізнайтесь, які дні тижня і який час популярні в користувачів, які здійснюють бронювання",
+  "spot_popular_event_types": "Визначте популярні типи заходів",
+  "spot_popular_event_types_description": "Дізнайтеся, які типи заходів отримують найбільшу кількість переходів і бронювань",
   "no_responses_yet": "Поки немає відповідей",
   "this_will_be_the_placeholder": "Це заповнювач",
   "this_meeting_has_not_started_yet": "Ця нарада ще не почалася",
@@ -1647,10 +1703,86 @@
   "app_is_connected": "{{dependencyName}} підключено",
   "requires_app": "Потрібно підключити {{dependencyName}}",
   "verification_code": "Код перевірки",
-  "can_you_try_again": "Можете спробувати, указавши інший час?",
+  "can_you_try_again": "Виберіть інший час і повторіть спробу.",
   "verify": "Перевірити",
-  "select_all": "Вибрати всі",
-  "default_conferencing_bulk_title": "Масове оновлення існуючих типів заходів",
+  "timezone_variable": "Часовий пояс",
+  "timezone_info": "Часовий пояс одержувача",
+  "event_end_time_variable": "Час завершення заходу",
+  "event_end_time_info": "Час завершення заходу",
+  "cancel_url_variable": "URL-адреса для скасування",
+  "cancel_url_info": "URL-адреса для скасування бронювання",
+  "reschedule_url_variable": "URL-адреса для перенесення",
+  "reschedule_url_info": "URL-адреса для перенесення бронювання",
   "invalid_event_name_variables": "Назва вашого заходу містить неприпустиму змінну",
-  "default_conferencing_bulk_description": "Оновіть розташування для вибраних типів заходів"
+  "select_all": "Вибрати все",
+  "default_conferencing_bulk_title": "Масове оновлення наявних типів заходів",
+  "members_default_schedule": "Розклад учасника за замовчуванням",
+  "set_by_admin": "Встановлено адміністратором команди",
+  "members_default_location": "Розташування учасника за замовчуванням",
+  "members_default_schedule_description": "Ми використовуватимемо розклад кожного учасника за замовчуванням. Вони зможуть редагувати або змінювати його.",
+  "requires_at_least_one_schedule": "У вас має бути принаймні один розклад",
+  "default_conferencing_bulk_description": "Оновіть розташування для вибраних типів заходів",
+  "locked_for_members": "Заблоковано для учасників",
+  "locked_apps_description": "Учасники зможуть бачити активні додатки, але не зможуть редагувати налаштування додатка",
+  "locked_webhooks_description": "Учасники бачитимуть активні вебгуки, але не зможуть змінювати їх налаштування",
+  "locked_workflows_description": "Учасники бачитимуть активні робочі процеси, але не зможуть змінювати їх налаштування",
+  "locked_by_admin": "Заблоковано адміністратором",
+  "app_not_connected": "Ви не під’єднали обліковий запис {{appName}}.",
+  "connect_now": "Під’єднати",
+  "managed_event_dialog_confirm_button_one": "Замінити й повідомити {{count}} учасника",
+  "managed_event_dialog_confirm_button_other": "Замінити й повідомити учасників ({{count}})",
+  "managed_event_dialog_title_one": "URL-адреса /{{slug}} вже існує для {{count}} учасника. Хочете замінити її?",
+  "managed_event_dialog_title_other": "URL-адреса /{{slug}} вже існує для кількох учасників ({{count}}). Хочете замінити її?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> вже використовує URL-адресу <strong>/{{slug}}</strong>.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> вже використовують URL-адресу <string>/{{slug}}</strong>.",
+  "managed_event_dialog_clarification": "Якщо ви захочете замінити її, ми повідомимо їм. Поверніться і вилучіть їх, якщо ви не хочете перезаписувати її.",
+  "review_event_type": "Переглянути тип заходу",
+  "looking_for_more_analytics": "Вам потрібно більше аналітичних даних?",
+  "looking_for_more_insights": "Вам потрібно більше аналітики?",
+  "add_filter": "Додати фільтр",
+  "select_user": "Виберіть користувача",
+  "select_event_type": "Виберіть тип заходу",
+  "select_date_range": "Виберіть діапазон дат",
+  "popular_events": "Популярні заходи",
+  "no_event_types_found": "Типи заходів не знайдено",
+  "average_event_duration": "Середня тривалість заходу",
+  "most_booked_members": "Учасники з найбільшою кількістю бронювань",
+  "least_booked_members": "Учасники з найменшою кількістю бронювань",
+  "events_created": "Створені заходи",
+  "events_completed": "Завершені заходи",
+  "events_cancelled": "Скасовані заходи",
+  "events_rescheduled": "Перенесені заходи",
+  "from_last_period": "після останнього періоду",
+  "from_to_date_period": "З: {{startDate}} До: {{endDate}}",
+  "analytics_for_organisation": "Аналітика",
+  "subtitle_analytics": "Дізнайтеся більше про активність вашої команди",
+  "redirect_url_warning": "Додавання переспрямування вимкне сторінку з результатом бронювання. Переконайтеся, що ви додали текст «Бронювання підтверджено» на свою сторінку з результатом бронювання.",
+  "event_trends": "Тенденції заходів",
+  "clear_filters": "Очистити фільтри",
+  "hold": "Утримати",
+  "on_booking_option": "Отримуйте оплату за бронювання",
+  "hold_option": "Стягнути плату за відсутність",
+  "card_held": "Здійснено попередню авторизацію",
+  "charge_card": "Списати з картки",
+  "card_charged": "Списано кошти з картки",
+  "no_show_fee_amount": "Плата за відсутність у розмірі {{amount, currency}}",
+  "no_show_fee": "Плата за відсутність",
+  "submit_card": "Надіслати картку",
+  "submit_payment_information": "Надіслати платіжну інформацію",
+  "meeting_awaiting_payment_method": "Потрібно вказати спосіб оплати для вашої наради",
+  "no_show_fee_charged_email_subject": "Стягнуто плату за відсутність на заході «{{title}}» у розмірі {{amount, currency}} о {{date}}",
+  "no_show_fee_charged_text_body": "Стягнуто плату за відсутність",
+  "no_show_fee_charged_subtitle": "За нижчезазначений захід було стягнуто плату за відсутність у розмірі {{amount, currency}}",
+  "error_charging_card": "Сталася помилка під час стягнення плати за відсутність. Спробуйте ще раз пізніше.",
+  "collect_no_show_fee": "Стягнути плату за відсутність",
+  "no_show_fee_charged": "Стягнуто плату за відсутність",
+  "insights": "Аналітика",
+  "testing_workflow_info_message": "Тестуючи цей робочий процес, зважайте на те, що надсилання електронних листів і SMS-повідомлень можна запланувати мінімум за 1 годину",
+  "insights_no_data_found_for_filter": "Не знайдено жодних даних для вибраного фільтру або вибраних дат.",
+  "acknowledge_booking_no_show_fee": "Я підтверджую, що в разі моєї відсутності на цьому заході з моєї картки буде стягнуто плату за відсутність у розмірі {{amount, currency}}.",
+  "card_details": "Інформація про картку",
+  "seats_and_no_show_fee_error": "Наразі неможливо ввімкнути місця і стягнути плату за відсутність",
+  "complete_your_booking": "Завершіть бронювання",
+  "complete_your_booking_subject": "Завершіть бронювання: {{title}} {{date}}",
+  "email_invite_team": "{{email}} запрошено"
 }
diff --git a/apps/web/public/static/locales/vi/common.json b/apps/web/public/static/locales/vi/common.json
index da626f94fd..52155d5185 100644
--- a/apps/web/public/static/locales/vi/common.json
+++ b/apps/web/public/static/locales/vi/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "Nhà cung cấp danh tính",
   "trial_days_left": "Bạn có $t(day, {\"count\": {{days}} }) còn lại trên bản thử nghiệm PRO",
   "day_one": "{{count}} ngày",
   "day_other": "{{count}} ngày",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "Đang chờ phê duyệt: {{title}} lúc {{date}}",
   "event_still_awaiting_approval": "Một sự kiện vẫn đang chờ bạn phê duyệt",
   "booking_submitted_subject": "Lịch hẹn đã được gửi: {{title}} lúc {{date}}",
+  "download_recording_subject": "Tải xuống bản ghi âm: {{title}} vào ngày {{date}}",
+  "download_your_recording": "Tải xuống bản ghi âm của bạn",
   "your_meeting_has_been_booked": "Cuộc họp của bạn đã được đặt",
   "event_type_has_been_rescheduled_on_time_date": "{{title}} của bạn đã được chuyển sang ngày {{date}}.",
   "event_has_been_rescheduled": "Đã cập nhật - Sự kiện của bạn đã được đổi",
@@ -111,7 +114,7 @@
   "hidden_team_owner_message": "Bạn cần tài khoản Pro để sử dụng nhóm, bạn sẽ bị ẩn cho đến khi bạn thanh toán.",
   "link_expires": "p.s. Link hết hạn trong vòng {{expiresIn}} tiếng.",
   "upgrade_to_per_seat": "Nâng cấp từng tài khoản",
-  "seat_options_doesnt_support_confirmation": "Tuỳ chọn chỗ ngồi không hỗ trợ yêu cầu xác nhận",
+  "seat_options_doesnt_support_confirmation": "Tuỳ chọn chỗ ngồi không thể chọn cho yêu cầu xác nhận đặt lịch",
   "team_upgrade_seats_details": "Trong tổng {{memberCount}} thành viên của nhóm bạn, {{unpaidCount}} thành viên chưa được thanh toán. Với {{seatPrice}}$/tháng mỗi thành viên, tổng chi phí cho nhóm bạn là {{totalCost}}$/tháng.",
   "team_upgrade_banner_description": "Cám ơn bạn đã dùng thử gói kế hoạch mới dành cho nhóm. Chúng tôi để ý thấy nhóm \"{{teamName}}\" của bạn cần được nâng cấp.",
   "team_upgrade_banner_action": "Nâng cấp tại đây",
@@ -224,6 +227,7 @@
   "done": "Xong",
   "all_done": "Đã xong hết!",
   "all_apps": "Tất cả",
+  "available_apps": "Ứng dụng hiện có",
   "check_email_reset_password": "Kiểm tra hộp thư điện tử của bạn. Chúng tôi đã gửi cho bạn một liên kết để đặt lại mật khẩu của bạn.",
   "finish": "Hoàn thành",
   "few_sentences_about_yourself": "Vài câu về bản thân bạn - nó sẽ xuất hiện trên trang cá nhân của bạn.",
@@ -404,6 +408,7 @@
   "add_time_availability": "Thêm khoảng thời gian mới",
   "add_an_extra_layer_of_security": "Thêm một lớp bảo mật bổ sung cho tài khoản của bạn trong trường hợp mật khẩu của bạn bị đánh cắp.",
   "2fa": "Xác thực hai yếu tố",
+  "2fa_disabled": "Xác thực đa yếu tố chỉ được bật cho chức năng xác thực qua email và mật khẩu",
   "enable_2fa": "Bật xác thực hai yếu tố",
   "disable_2fa": "Tắt xác thực hai yếu tố",
   "disable_2fa_recommendation": "Nếu bạn cần tắt xác thực hai yếu tố, chúng tôi khuyên bạn nên bật lại nó càng sớm càng tốt.",
@@ -585,6 +590,20 @@
   "minutes": "Phút",
   "round_robin": "Round Robin",
   "round_robin_description": "Luân phiên những cuộc họp giữa các thành viên trong nhóm.",
+  "managed_event": "Sự kiện được quản lý",
+  "username_placeholder": "tên người dùng",
+  "managed_event_description": "Tạo & phân phối cả cụm nhiều loại sự kiện đến các thành viên nhóm",
+  "managed": "Được quản lý",
+  "managed_event_url_clarification": "\"tên người dùng\" sẽ được điền vào theo tên người dùng của những thành viên được phân công",
+  "assign_to": "Phân công cho",
+  "add_members": "Thêm thành viên...",
+  "count_members_one": "{{count}} thành viên",
+  "count_members_other": "{{count}} thành viên",
+  "no_assigned_members": "Không thành viên nào được phân công",
+  "assigned_to": "Được phân công cho",
+  "start_assigning_members_above": "Bắt đầu phân công những thành viên bên trên",
+  "locked_fields_admin_description": "Các thành viên sẽ không sửa được phần này",
+  "locked_fields_member_description": "Tuỳ chọn này do quản trị nhóm khoá lại",
   "url": "URL",
   "hidden": "Ẩn giấu",
   "readonly": "Chỉ đọc",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "Thời gian đệm tối thiểu",
   "slot_interval": "Khoảng thời gian giữa các lịch hẹn",
   "slot_interval_default": "Sử dụng độ dài sự kiện (mặc định)",
+  "delete_event_type": "Xoá loại sự kiện?",
+  "delete_managed_event_type": "Xoá loại sự kiện được quản lý?",
+  "delete_event_type_description": "Đối với những người mà bạn chia sẻ liên kết này, họ sẽ không thể đặt lịch hẹn bằng liên kết đó được nữa.",
+  "delete_managed_event_type_description": "<ul><li>Những thành viên được phân công cho loại sự kiện này cũng sẽ khiến cho loại sự kiện của họ được xoá đi.</li><li>Đối với những người mà bạn chia sẻ liên kết này, họ sẽ không thể đặt lịch hẹn bằng liên kết đó được nữa.</li></ul>",
+  "confirm_delete_event_type": "Có, hãy xoá",
   "delete_account": "Xóa tài khoản",
   "confirm_delete_account": "Có, xóa tài khoản",
   "delete_account_confirmation_message": "Bạn có chắc chắn muốn xóa tài khoản {{appName}} của mình không? Bất kỳ ai mà bạn đã chia sẻ liên kết tài khoản của mình sẽ không thể đặt trước bằng liên kết đó nữa và mọi tùy chọn bạn đã lưu sẽ bị mất.",
@@ -1126,13 +1150,13 @@
   "current_username": "Tên người dùng hiện tại",
   "example_1": "Ví dụ 1",
   "example_2": "Ví dụ 2",
-  "additional_input_label": "Nhãn thông tin đầu vào bổ sung",
+  "booking_question_identifier": "Mã định danh câu hỏi lịch hẹn",
   "company_size": "Quy mô công ty",
   "what_help_needed": "Bạn cần giúp điều gì?",
   "variable_format": "Định dạng biến số",
   "webhook_subscriber_url_reserved": "Url ghi danh Webhook đã được lập định",
   "custom_input_as_variable_info": "Bỏ qua tất cả các ký tự đặc biệt của nhãn thông tin đầu vào bổ sung (chỉ dùng chữ cái và con số), dùng chữ in hoa cho tất cả các chữ cái và thay thế khoảng trắng bằng dấu gạch dưới.",
-  "using_additional_inputs_as_variables": "Cách sử dụng thông tin đầu vào bổ sung ở vai trò biến số?",
+  "using_booking_questions_as_variables": "Làm cách nào tôi dùng những câu hỏi lịch hẹn ở dạng tham số?",
   "download_desktop_app": "Tải ứng dụng trên máy tính bàn",
   "set_ping_link": "Đặt liên kết Ping",
   "rate_limit_exceeded": "Đã vượt quá giới hạn đăng nhập",
@@ -1178,6 +1202,7 @@
   "start_of_week": "Khởi đầu tuần",
   "recordings_title": "Bản ghi âm",
   "recording": "Bản ghi âm",
+  "happy_scheduling": "Đặt lịch vui",
   "select_calendars": "Chọn lịch nào mà bạn muốn kiểm tra xung đột nhằm tránh đặt lịch hẹn trùng.",
   "check_for_conflicts": "Kiểm tra xung đột",
   "view_recordings": "Xem các bản ghi âm",
@@ -1215,6 +1240,7 @@
   "impersonation": "Mạo danh",
   "impersonation_description": "Cài đặt để quản lý mạo danh người dùng",
   "users": "Người dùng",
+  "user": "Người dùng",
   "profile_description": "Quản lí cài đặt cho hồ sơ {{appName}} của bạn",
   "users_description": "Tại đây bạn có thể tìm thấy danh sách tất cả người dùng",
   "users_listing": "Danh sách người dùng",
@@ -1255,6 +1281,8 @@
   "download_responses": "Tải xuống Phản hồi",
   "download_responses_description": "Tải xuống tất cả phản hồi vào biểu mẫu của bạn ở định dạng CSV.",
   "download": "Tải về",
+  "download_recording": "Tải xuống bản ghi âm",
+  "recording_from_your_recent_call": "Một bản ghi âm từ cuộc gọi gần đây trên Cal.com đã sẵn sàng để tải xuống",
   "create_your_first_form": "Tạo biểu mẫu đầu tiên",
   "create_your_first_form_description": "Với Biểu mẫu định hướng, bạn có thể hỏi một số câu sơ tuyển và định hướng đến đúng người hay đúng loại sự kiện.",
   "create_your_first_webhook": "Tạo Webhook đầu tiên",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "Xác thực cơ bản",
   "exchange_authentication_ntlm": "Xác thực NTLM",
   "exchange_compression": "Giao thức nén GZip",
+  "exchange_version": "Phiên bản Exchange",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "Bạn có thể thấy tất cả các biểu mẫu và định hướng mà bạn đã tạo ra ở đây.",
   "routing_forms_send_email_owner": "Gửi email đến chủ sở hữu",
   "routing_forms_send_email_owner_description": "Gửi một email đến chủ sở hữu khi biểu mẫu được gửi đi",
@@ -1345,7 +1382,7 @@
   "add_limit": "Thêm giới hạn",
   "team_name_required": "Cần có tên nhóm",
   "show_attendees": "Chia sẻ thông tin người tham gia cho khách",
-  "how_additional_inputs_as_variables": "Cách sử dụng Đầu vào bổ sung làm Tham số",
+  "how_booking_questions_as_variables": "Làm cách nào dùng những câu hỏi lịch hẹn ở dạng tham số?",
   "format": "Định dạng",
   "uppercase_for_letters": "In hoa hết tất cả các chữ cái",
   "replace_whitespaces_underscores": "Thay thế khoảng trắng bằng dấu gạch dưới",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "Cần gì nữa không?",
   "billing_help_description": "Nếu bạn cần thêm bất kỳ trợ giúp nào về thanh toán, nhóm hỗ trợ của chúng tôi luôn sẵn sàng trợ giúp.",
   "billing_help_cta": "Liên hệ với bộ phận hỗ trợ",
-  "ignore_special_characters": "Bỏ qua những kí tự đặc biệt trong Nhãn đầu vào bổ sung. Chỉ dùng chữ cái và số",
+  "ignore_special_characters_booking_questions": "Bỏ qua những kí tự đặc biệt trong mã định danh câu hỏi lịch hẹn. Chỉ dùng chữ cái và số",
   "retry": "Thử lại",
   "fetching_calendars_error": "Có vấn đề khi tìm dữ liệu của bạn. Vui lòng <1>thử lại</1> hoặc liên hệ với bộ phận hỗ trợ khách hàng.",
   "calendar_connection_fail": "Kết nối lịch bất thành",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "Round robin cố định",
   "add_one_fixed_attendee": "Thêm một người tham dự và round robin cố định thông qua số người tham dự.",
   "calcom_is_better_with_team": "Cal.com tốt hơn với nhóm",
+  "the_calcom_team": "Nhóm Cal.com",
   "add_your_team_members": "Thêm những thành viên nhóm của bạn vào những loại sự kiện của bạn. Sử dụng lên lịch tập thể để bao gồm mọi người hoặc tìm người thích hợp nhất với chức năng lên lịch round robin.",
   "booking_limit_reached": "Đã đạt mức giới hạn đặt hẹn cho loại sự kiện này",
   "duration_limit_reached": "Đã đạt mức giới hạn thời gian cho loại sự kiện này",
   "admin_has_disabled": "Một quản trị viên đã tắt {{appName}}",
   "disabled_app_affects_event_type": "Một quản trị viên đã tắt {{appName}} vốn có ảnh hưởng đến loại sự kiện {{eventType}}",
+  "event_replaced_notice": "Một quản trị viên đã thay thế một trong những loại sự kiện của bạn",
+  "email_subject_slug_replacement": "Một quản trị viên của nhóm đã thay thế sự kiện của bạn /{{slug}}",
+  "email_body_slug_replacement_notice": "Một quản trị viên trên nhóm <strong>{{teamName}}</strong> đã thay thế loại sự kiện của bạn <strong>/{{slug}}</strong> bằng một loại sự kiện được quản lý mà họ kiểm soát.",
+  "email_body_slug_replacement_info": "Liên kết của bạn sẽ tiếp tục hoạt động nhưng một số thiết lập cho nó có thể thay đổi. Bạn có thể xem lại nó trong những loại sự kiện.",
+  "email_body_slug_replacement_suggestion": "Nếu bạn có thắc mắc gì về loại sự kiện này, vui lòng liên lạc với quản trị viên của bạn. <br /><br />Đặt lịch vui,<br /> Nhóm Cal.com",
   "disable_payment_app": "Một quản trị viên đã tắt {{appName}} vốn có ảnh hưởng đến loại sự kiện {{title}}. Người tham dự vẫn có thể đặt hẹn cho loại sự kiện này nhưng sẽ được nhắc trả phí. Bạn có thể ẩn loại sự kiện này để tránh điều này cho đến khi quản trị viên kích hoạt lại phương thức thanh toán của bạn.",
   "payment_disabled_still_able_to_book": "Người tham dự vẫn có thể đặt hẹn cho loại sự kiện này nhưng sẽ được nhắc trả phí. Bạn có thể ẩn loại sự kiện này để tránh điều này cho đến khi quản trị viên kích hoạt lại phương thức thanh toán của bạn.",
   "app_disabled_with_event_type": "Quản trị viên đã tắt {{appName}} vốn có ảnh hưởng đến loại sự kiện {{title}}.",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "Cập nhận ngày ghi đè",
   "event_type_duplicate_copy_text": "{{slug}}-bansao",
   "set_as_default": "Đặt làm mặc định",
+  "hide_eventtype_details": "Ẩn chi tiết của loại sự kiện",
   "show_navigation": "Hiển thị điều hướng",
   "hide_navigation": "Ẩn điều hướng",
   "verification_code_sent": "Đã gửi mã xác minh",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "Tạo webhook đầu tiên của bạn cho loại sự kiện nhóm này",
   "create_webhook_team_event_type": "Tạo webhook cho loại sự kiện nhóm này",
   "disable_success_page": "Tắt trang báo hiệu đặt lịch thành công (chỉ hoạt động nếu bạn có URL chuyển hướng)",
+  "invalid_admin_password": "Bạn là quản trị viên nhưng bạn chưa đặt mật khẩu dài ít nhất 15 ký tự hoặc không có xác thực hai yếu tố",
   "change_password_admin": "Hãy đổi Mật khẩu để lấy quyền quản trị viên",
   "username_already_taken": "Tên này đã có người lấy rồi",
   "assignment": "Phân công",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "Giấy phép Enterprise \"/ee\"",
   "enterprise_booking_fee": "Bắt đầu từ mức {{enterprise_booking_fee}}/tháng",
   "enterprise_license_includes": "Mọi thứ cho trường hợp sử dụng thương mại",
+  "no_need_to_keep_your_code_open_source": "Không cần giữ mã của bạn ở dạng mã nguồn mở",
   "repackage_rebrand_resell": "Đóng gói lại, tái cấu trúc thương hiệu và bán lại dễ dàng",
   "a_vast_suite_of_enterprise_features": "Một bộ khổng lồ các tính năng doanh nghiệp",
   "free_license_fee": "0,00$/tháng",
@@ -1602,6 +1648,7 @@
   "default_app_link_title": "Đặt một liên kết ứng dụng mặc định",
   "default_app_link_description": "Thao tác đặt liên kết ứng dụng mặc định sẽ giúp cho phép tất cả các loại sự kiện mới tạo có thể dùng liên kết ứng dụng mà bạn đã đặt.",
   "change_default_conferencing_app": "Đặt làm mặc định",
+  "organizer_default_conferencing_app": "Ứng dụng mặc định của nhà tổ chức",
   "under_maintenance": "Tạm ngừng để bảo trì",
   "under_maintenance_description": "Nhóm {{appName}} đang thực hiện việc bảo trì theo lịch. Nếu bạn có thắc mắc gì, vui lòng liên hệ bộ phận hỗ trợ.",
   "event_type_seats": "{{numberOfSeats}} chỗ ngồi",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "Không đủ chỗ",
   "form_builder_field_already_exists": "Đã tồn tại một trường có tên này",
   "form_builder_field_add_subtitle": "Tùy chỉnh các câu hỏi ở trang đặt lịch hẹn",
+  "show_on_booking_page": "Hiện trên trang lịch hẹn",
   "get_started_zapier_templates": "Bắt đầu với các mẫu Zapier",
   "team_is_unpublished": "{{team}} chưa được công bố",
   "team_is_unpublished_description": "Liên kết nhóm này hiện không khả dụng. Hãy liên lạc với chủ nhóm hoặc yêu cầu họ công bố liên kết đó.",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "Thêm 1 tuỳ chọn cho mỗi hàng",
   "select_a_router": "Chọn một định hướng",
   "add_a_new_route": "Thêm một Định hướng mới",
+  "make_informed_decisions": "Đưa ra những quyết định sáng suốt với Insights",
+  "make_informed_decisions_description": "Bảng điều khiển Insights của chúng tôi nằm ở bề mặt xuyên suốt nhóm bạn và hiển thị cho bạn thấy những xu hướng giúp đặt lịch nhóm và ra quyết định tốt hơn.",
+  "view_bookings_across": "Xem lịch hẹn ở mọi thành viên",
+  "view_bookings_across_description": "Xem ai nhận được nhiều lịch hẹn nhất và bảo đảm việc phân phối tốt nhất cho khắp nhóm",
+  "identify_booking_trends": "Nhận diện xu hướng lịch hẹn",
+  "identify_booking_trends_description": "Xem thời điểm nào trong tuần và thời điểm nào trong ngày là thời điểm phổ biến cho người đặt lịch hẹn bên bạn",
+  "spot_popular_event_types": "Nhận ra các loại sự kiện phổ biến",
+  "spot_popular_event_types_description": "Xem loại sự kiện nào của bạn nhận được nhiều lần nhấp chuột và nhiều lịch hẹn nhất",
   "no_responses_yet": "Chưa có hồi đáp",
   "this_will_be_the_placeholder": "Đây sẽ là mã giữ chỗ",
   "this_meeting_has_not_started_yet": "Cuộc hẹn này chưa được bắt đầu",
@@ -1649,8 +1705,84 @@
   "verification_code": "Mã xác minh",
   "can_you_try_again": "Bạn có thể thử lại lúc khác được chứ?",
   "verify": "Xác minh",
+  "timezone_variable": "Múi giờ",
+  "timezone_info": "Múi giờ của người nhận",
+  "event_end_time_variable": "Thời gian kết thúc sự kiện",
+  "event_end_time_info": "Thời gian kết thúc sự kiện",
+  "cancel_url_variable": "URL huỷ lịch",
+  "cancel_url_info": "URL để huỷ lịch hẹn",
+  "reschedule_url_variable": "URL đặt lịch lại",
+  "reschedule_url_info": "URL để đặt lịch hẹn lại",
+  "invalid_event_name_variables": "Có biến số không hợp lệ trong tên sự kiện của bạn",
   "select_all": "Chọn tất cả",
   "default_conferencing_bulk_title": "Cập nhật hàng loại những loại sự kiện hiện có",
-  "invalid_event_name_variables": "Có biến số không hợp lệ trong tên sự kiện của bạn",
-  "default_conferencing_bulk_description": "Cập nhật địa điểm cho những loại sự kiện đã chọn"
+  "members_default_schedule": "Lịch biểu mặc định của thành viên",
+  "set_by_admin": "Đặt bởi quản trị viên của nhóm",
+  "members_default_location": "Vị trí mặc định của thành viên",
+  "members_default_schedule_description": "Chúng tôi sẽ dùng trạng thái trống lịch mặc định của mỗi thành viên. Họ sẽ có thể sửa hoặc thay đổi trạng thái này.",
+  "requires_at_least_one_schedule": "Bạn cần phải có ít nhất một lịch biểu",
+  "default_conferencing_bulk_description": "Cập nhật địa điểm cho những loại sự kiện đã chọn",
+  "locked_for_members": "Bị khoá đối với thành viên",
+  "locked_apps_description": "Các thành viên có thể thấy được những ứng dụng đang hoạt động nhưng không thể sửa bất kỳ thiết lập nào của ứng dụng",
+  "locked_webhooks_description": "Các thành viên có thể thấy được những webhook đang hoạt động nhưng không thể sửa bất kỳ thiết lập nào của webhook",
+  "locked_workflows_description": "Các thành viên có thể thấy được những tiến độ công việc đang hoạt động nhưng không thể sửa bất kỳ thiết lập nào của tiến độ công việc",
+  "locked_by_admin": "Bị khoá bởi quản trị viên",
+  "app_not_connected": "Bạn không có tài khoản {{appName}} đã được kết nối.",
+  "connect_now": "Kết nối ngay",
+  "managed_event_dialog_confirm_button_one": "Thay thế & thông báo cho {{count}} thành viên",
+  "managed_event_dialog_confirm_button_other": "Thay thế & thông báo cho {{count}} thành viên",
+  "managed_event_dialog_title_one": "URL / {{slug}} đã có sẵn cho {{count}} thành viên. Bạn có muốn thay thế nó?",
+  "managed_event_dialog_title_other": "URL /{{slug}} đã có sẵn cho {{count}} thành viên. Bạn có muốn thay thế nó?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> đã dùng URL <strong>/{{slug}}</strong> rồi.",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> đã dùng URL <string>/{{slug}}</strong> rồi.",
+  "managed_event_dialog_clarification": "Nếu bạn chọn phương án thay thế nó, chúng tôi sẽ thông báo cho họ biết. Hãy quay lại và xoá bỏ họ nếu bạn không muốn ghi đè nó.",
+  "review_event_type": "Xem lại loại sự kiện",
+  "looking_for_more_analytics": "Đang tìm thêm công cụ phân tích?",
+  "looking_for_more_insights": "Đang tìm thêm Insights?",
+  "add_filter": "Thêm bộ lọc",
+  "select_user": "Chọn người dùng",
+  "select_event_type": "Chọn loại sự kiện",
+  "select_date_range": "Chọn khoảng ngày",
+  "popular_events": "Sự kiện phổ biến",
+  "no_event_types_found": "Không tìm thấy loại sự kiện nào",
+  "average_event_duration": "Thời lượng trung bình của sự kiện",
+  "most_booked_members": "Thành viên được đặt lịch hẹn nhiều nhất",
+  "least_booked_members": "Thành viên được đặt lịch hẹn ít nhất",
+  "events_created": "Những sự kiện đã tạo",
+  "events_completed": "Những sự kiện đã hoàn thành",
+  "events_cancelled": "Những sự kiện đã huỷ",
+  "events_rescheduled": "Những sự kiện đã đặt lịch lại",
+  "from_last_period": "từ thời gian gần nhất",
+  "from_to_date_period": "Từ: {{startDate}} Đến: {{endDate}}",
+  "analytics_for_organisation": "Insights",
+  "subtitle_analytics": "Tìm hiểu thêm về hoạt động của nhóm bạn",
+  "redirect_url_warning": "Thêm mục chuyển hướng sẽ tắt đi trang thành công. Hãy bảo đảm có đề cập \"Lịch hẹn đã xác nhận\" trên trang thành công tuỳ chỉnh riêng của bạn.",
+  "event_trends": "Xu hướng sự kiện",
+  "clear_filters": "Xoá bộ lọc",
+  "hold": "Giữ đó",
+  "on_booking_option": "Thu tiền thanh toán cho lịch hẹn",
+  "hold_option": "Tính phí vắng mặt",
+  "card_held": "Thẻ đã được giữ",
+  "charge_card": "Tính phí cho thẻ",
+  "card_charged": "Thẻ đã thu phí",
+  "no_show_fee_amount": "Phí vắng mặt {{amount, currency}}",
+  "no_show_fee": "Phí vắng mặt",
+  "submit_card": "Gửi thẻ",
+  "submit_payment_information": "Gửi thông tin thanh toán",
+  "meeting_awaiting_payment_method": "Cuộc họp của bạn đang chờ phương thức thanh toán",
+  "no_show_fee_charged_email_subject": "Phí vắng mặt {{amount, currency}} sẽ được tính cho {{title}} vào ngày {{date}}",
+  "no_show_fee_charged_text_body": "Phí vắng mặt được tính",
+  "no_show_fee_charged_subtitle": "Phí vắng mặt {{amount, currency}} sẽ được tính cho sự kiện sau",
+  "error_charging_card": "Có sự cố khi tính phí vắng mặt. Vui lòng thử lại sau.",
+  "collect_no_show_fee": "Thu phí vắng mặt",
+  "no_show_fee_charged": "Phí vắng mặt đã tính",
+  "insights": "Insights",
+  "testing_workflow_info_message": "Khi kiểm tra tiến độ công việc này, hãy để ý rằng Email và SMS chỉ có thể được đặt lịch trước ít nhất 1 giờ",
+  "insights_no_data_found_for_filter": "Không tìm thấy dữ liệu cho bộ lọc hay ngày đã chọn.",
+  "acknowledge_booking_no_show_fee": "Tôi công nhận là nếu tôi không tham dự sự kiện này thì một khoản phí vắng mặt gồm {{amount, currency}} sẽ được áp dụng cho thẻ của tôi.",
+  "card_details": "Chi tiết thẻ",
+  "seats_and_no_show_fee_error": "Hiện không thể kích hoạt chỗ ngồi và tính khoản phí vắng mặt",
+  "complete_your_booking": "Hoàn thành lịch hẹn của bạn",
+  "complete_your_booking_subject": "Hoàn thành lịch hẹn của bạn: {{title}} vào {{date}}",
+  "email_invite_team": "{{email}} đã được mời"
 }
diff --git a/apps/web/public/static/locales/zh-CN/common.json b/apps/web/public/static/locales/zh-CN/common.json
index 141454a8ae..0ecbfe8d4e 100644
--- a/apps/web/public/static/locales/zh-CN/common.json
+++ b/apps/web/public/static/locales/zh-CN/common.json
@@ -70,6 +70,8 @@
   "event_awaiting_approval_subject": "等待批准：{{date}} 的 {{title}}",
   "event_still_awaiting_approval": "有活动仍在等待您的批准",
   "booking_submitted_subject": "已提交预订：{{title}}，于 {{date}}",
+  "download_recording_subject": "下载录制内容: {{date}} 的 {{title}}",
+  "download_your_recording": "下载您的录制内容",
   "your_meeting_has_been_booked": "您的会议已预定",
   "event_type_has_been_rescheduled_on_time_date": "您的 {{title}} 已改期至 {{date}}。",
   "event_has_been_rescheduled": "已更新 - 您的活动已被重新安排",
@@ -225,6 +227,7 @@
   "done": "完成",
   "all_done": "全部完成!",
   "all_apps": "所有应用",
+  "available_apps": "可用应用",
   "check_email_reset_password": "请检查您的邮箱，我们向您发送了一个重置密码的链接。",
   "finish": "完成",
   "few_sentences_about_yourself": "请写一段简单的自我介绍，该介绍将会展示在您的个人链接页面上。",
@@ -405,6 +408,7 @@
   "add_time_availability": "添加新的时间段",
   "add_an_extra_layer_of_security": "在您的密码被盗时，能给您的账户添加一层额外的安全保护",
   "2fa": "两步验证",
+  "2fa_disabled": "只能为电子邮件和密码身份验证启用双因素身份验证",
   "enable_2fa": "启用两步验证",
   "disable_2fa": "禁用两步验证",
   "disable_2fa_recommendation": "如果您需要临时禁用两步验证，我们建议尽快重新启用它。",
@@ -586,6 +590,20 @@
   "minutes": "分钟",
   "round_robin": "轮流模式",
   "round_robin_description": "和多个团队成员之间轮流举行会议。",
+  "managed_event": "托管活动",
+  "username_placeholder": "用户名",
+  "managed_event_description": "批量创建事件类型并分发给团队成员",
+  "managed": "托管",
+  "managed_event_url_clarification": "“用户名”将填写所分配的成员的用户名",
+  "assign_to": "分配给",
+  "add_members": "添加成员...",
+  "count_members_one": "{{count}} 个成员",
+  "count_members_other": "{{count}} 个成员",
+  "no_assigned_members": "没有已分配的成员",
+  "assigned_to": "已分配给",
+  "start_assigning_members_above": "开始分配上面的成员",
+  "locked_fields_admin_description": "成员将无法编辑此内容",
+  "locked_fields_member_description": "此选项已被团队管理员锁定",
   "url": "链接",
   "hidden": "隐藏",
   "readonly": "只读",
@@ -737,6 +755,11 @@
   "minimum_booking_notice": "最小预约通知提前时间",
   "slot_interval": "时间段间隔",
   "slot_interval_default": "使用活动时长 (默认)",
+  "delete_event_type": "删除活动类型?",
+  "delete_managed_event_type": "创建托管活动类型?",
+  "delete_event_type_description": "您将此链接共享给的任何人都将无法再使用它进行预约。",
+  "delete_managed_event_type_description": "<ul><li>分配给此活动类型的成员也将删除其活动类型。</li><li>他们将链接共享给的任何人都将无法再使用它进行预约。</li></ul>",
+  "confirm_delete_event_type": "是，删除",
   "delete_account": "删除账户",
   "confirm_delete_account": "是，删除账户",
   "delete_account_confirmation_message": "您确定要删除您的 {{appName}} 账户？ 任何曾通过您的账户链接与您预约过的人都将无法再使用它和您预约，您保存的任何偏好设置都将丢失。",
@@ -861,7 +884,7 @@
   "add_new_calendar": "添加新日历",
   "set_calendar": "设置当您被预约后添加新活动的位置。",
   "delete_schedule": "删除时间表",
-  "delete_schedule_description": "删除时间表会将其从所有活动类型中删除。此操作无法撤消。",
+  "delete_schedule_description": "删除日程安排会将其从所有活动类型中删除。此操作无法撤消。",
   "schedule_created_successfully": "{{scheduleName}} 时间表已成功创建",
   "availability_updated_successfully": "{{scheduleName}} 日程更新成功",
   "schedule_deleted_successfully": "已成功删除时间表",
@@ -1127,13 +1150,13 @@
   "current_username": "当前用户名",
   "example_1": "示例 1",
   "example_2": "示例 2",
-  "additional_input_label": "附加输入标签",
+  "booking_question_identifier": "预约问题标识符",
   "company_size": "公司规模",
   "what_help_needed": "您需要什么帮助？",
   "variable_format": "变量格式",
   "webhook_subscriber_url_reserved": "Webhook 订阅者 url 已定义",
   "custom_input_as_variable_info": "忽略附加输入标签的所有特殊字符（仅使用字母和数字），所有字母均使用大写，并将空格替换为下划线。",
-  "using_additional_inputs_as_variables": "如何将附加输入用作变量？",
+  "using_booking_questions_as_variables": "如何将预约问题用作变量?",
   "download_desktop_app": "下载桌面应用",
   "set_ping_link": "设置 Ping 链接",
   "rate_limit_exceeded": "已超过速率限制",
@@ -1179,6 +1202,7 @@
   "start_of_week": "一周开始",
   "recordings_title": "录制",
   "recording": "录制",
+  "happy_scheduling": "祝日程安排愉快",
   "select_calendars": "选择要检查冲突的日历，以防止重复预约。",
   "check_for_conflicts": "检查冲突",
   "view_recordings": "查看录制",
@@ -1216,6 +1240,7 @@
   "impersonation": "模拟",
   "impersonation_description": "用于管理用户模拟的设置",
   "users": "用户",
+  "user": "用户",
   "profile_description": "管理您的 {{appName}} 个人资料的设置",
   "users_description": "在此处可以找到所有用户的列表",
   "users_listing": "用户列表",
@@ -1256,6 +1281,8 @@
   "download_responses": "下载回应",
   "download_responses_description": "以 CSV 格式下载对表格的所有回复。",
   "download": "下载",
+  "download_recording": "下载录制内容",
+  "recording_from_your_recent_call": "您最近在 Cal.com 上的通话录制可供下载",
   "create_your_first_form": "创建您的第一个表格",
   "create_your_first_form_description": "利用途径表格，您可以提出符合条件的问题，并可根据途径找到正确的人或活动类型。",
   "create_your_first_webhook": "创建您的第一个 Webhook",
@@ -1292,6 +1319,15 @@
   "exchange_authentication_standard": "基本身份验证",
   "exchange_authentication_ntlm": "NTLM 身份验证",
   "exchange_compression": "GZip 压缩",
+  "exchange_version": "Exchange 版本",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "您可以在此处看到您创建的所有表格和途径。",
   "routing_forms_send_email_owner": "向所有者发送电子邮件",
   "routing_forms_send_email_owner_description": "提交表单后向所有者发送电子邮件",
@@ -1346,7 +1382,7 @@
   "add_limit": "添加限制",
   "team_name_required": "需要团队名称",
   "show_attendees": "在访客之间共享参与者信息",
-  "how_additional_inputs_as_variables": "如何将附加输入用作变量",
+  "how_booking_questions_as_variables": "如何将预约问题用作变量?",
   "format": "格式",
   "uppercase_for_letters": "所有字母均使用大写",
   "replace_whitespaces_underscores": "将空格替换为下划线",
@@ -1361,7 +1397,7 @@
   "billing_help_title": "还有其他需要？",
   "billing_help_description": "如果您在支付帐单时需要任何进一步的帮助，我们的支持团队随时为您提供。",
   "billing_help_cta": "联系支持",
-  "ignore_special_characters": "忽略附加输入标签中的特殊字符。仅使用字母和数字",
+  "ignore_special_characters_booking_questions": "忽略预约问题标识符中的特殊字符。仅使用字母和数字",
   "retry": "重试",
   "fetching_calendars_error": "获取您的日历时出现问题。请<1>重试</1>或联系客户支持。",
   "calendar_connection_fail": "日历连接失败",
@@ -1444,11 +1480,17 @@
   "fixed_round_robin": "固定轮流模式",
   "add_one_fixed_attendee": "添加一名固定参与者，并由多名参与者轮流担任。",
   "calcom_is_better_with_team": "Cal.com 更适合团队",
+  "the_calcom_team": "Cal.com 团队",
   "add_your_team_members": "将您的团队成员添加到您的活动类型。使用集体日程安排来包括所有人或以轮流安排的方式找到最适合的人员。",
   "booking_limit_reached": "已达到此活动类型的预约限制",
   "duration_limit_reached": "已达到此活动类型的时长限制",
   "admin_has_disabled": "管理员已禁用 {{appName}}",
   "disabled_app_affects_event_type": "管理员已禁用会影响活动类型 {{eventType}} 的 {{appName}}",
+  "event_replaced_notice": "管理员已替换您的一个活动类型",
+  "email_subject_slug_replacement": "团队管理员已替换您的活动/{{slug}}",
+  "email_body_slug_replacement_notice": "<strong>{{teamName}}</strong> 团队的管理员已将您的活动类型 <strong>{{slug}}</strong> 替换为他们控制的托管活动类型。",
+  "email_body_slug_replacement_info": "您的链接将继续有效，但其某些设置可能已更改。您可以在活动类型中查看它。",
+  "email_body_slug_replacement_suggestion": "如果您对活动类型有任何疑问，请联系您的管理员。<br /><br />祝日程安排愉快，<br />Cal.com 团队",
   "disable_payment_app": "管理员已禁用会影响活动类型 {{title}} 的 {{appName}}。参与者仍然能预约此类型的活动，但不会被提示付款。您可以隐藏该活动类型来防止出现这种情况，直到管理员重新启用您的支付方式。",
   "payment_disabled_still_able_to_book": "参与者仍然能预约此类型的活动，但不会被提示付款。您可以隐藏该活动类型来防止出现这种情况，直到管理员重新启用您的支付方式。",
   "app_disabled_with_event_type": "管理员已禁用会影响活动类型 {{title}} 的 {{appName}}。",
@@ -1497,6 +1539,7 @@
   "date_overrides_update_btn": "更新替代",
   "event_type_duplicate_copy_text": "{{slug}}-复制",
   "set_as_default": "设置为默认",
+  "hide_eventtype_details": "隐藏活动类型详细信息",
   "show_navigation": "显示导航",
   "hide_navigation": "隐藏导航",
   "verification_code_sent": "验证码已发送",
@@ -1510,6 +1553,7 @@
   "create_your_first_team_webhook_description": "为此团队活动类型创建第一个 Webhook",
   "create_webhook_team_event_type": "为此团队活动类型创建 Webhook",
   "disable_success_page": "禁用“成功”页面 (仅当有重定向链接时才有效)",
+  "invalid_admin_password": "您是管理员，但您的密码长度不足 15 个字符或尚未启用 2FA",
   "change_password_admin": "更改密码以获取管理员访问权限",
   "username_already_taken": "用户名已被占用",
   "assignment": "分配",
@@ -1592,7 +1636,7 @@
   "recommended_next_steps": "建议的后续步骤",
   "create_a_managed_event": "创建托管活动类型",
   "meetings_are_better_with_the_right": "有合适的团队成员参加会议会更好。立即邀请他们。",
-  "create_a_one_one_template": "为活动类型创建一个一对一模板，并将其分发给多个成员。",
+  "create_a_one_one_template": "为活动类型创建一个一对一模板，并将其分配给多个成员。",
   "collective_or_roundrobin": "集体或轮流",
   "book_your_team_members": "以集体模式预约您的团队成员，或以轮流模式循环到合适的人员。",
   "event_no_longer_attending_subject": "不再参加于 {{date}} 举行的 {{title}} ",
@@ -1600,10 +1644,11 @@
   "attendee_no_longer_attending_subject": "一名参与者不再参加于 {{date}} 举行的 {{title}} ",
   "attendee_no_longer_attending": "一名参与者不再参加您的活动",
   "attendee_no_longer_attending_subtitle": "{{name}} 已取消。这意味着该时段有一个位置空出来",
-  "create_event_on": "活动创建时间",
+  "create_event_on": "创建活动于",
   "default_app_link_title": "设置默认应用链接",
   "default_app_link_description": "设置默认应用链接可以让所有新创建的活动类型使用您设置的应用链接。",
   "change_default_conferencing_app": "设置为默认",
+  "organizer_default_conferencing_app": "组织者的默认应用",
   "under_maintenance": "停机维护",
   "under_maintenance_description": "{{appName}} 团队正在进行计划维护。如果您有任何疑问，请联系支持。",
   "event_type_seats": "{{numberOfSeats}} 个位置",
@@ -1618,6 +1663,7 @@
   "not_enough_seats": "位置不足",
   "form_builder_field_already_exists": "具有此名称的字段已存在",
   "form_builder_field_add_subtitle": "自定义预约页面上提出的问题",
+  "show_on_booking_page": "在预约页面上显示",
   "get_started_zapier_templates": "开始使用 Zapier 模板",
   "team_is_unpublished": "{{team}} 已被取消发布",
   "team_is_unpublished_description": "该团队链接当前不可用。请联系团队所有者或请他们发布。",
@@ -1627,10 +1673,10 @@
   "keep_me_connected_with_form": "让我与表格保持连接",
   "fields_in_form_duplicated": "所复制的途径表格本身和其字段的任何变化都会反映在副本中。",
   "form_deleted": "表格已删除",
-  "delete_form": "删除表格",
+  "delete_form": "确定要删除此表格吗？",
   "delete_form_action": "是，删除表格",
-  "delete_form_confirmation": "您确定要删除此表格吗？与您共享链接的任何人都将无法再使用它进行预约。此外，所有相关回复都将被删除。",
-  "delete_form_confirmation_2": "所有相关的回复都将被删除。",
+  "delete_form_confirmation": "与您共享链接的所有人都将无法再对其进行访问。",
+  "delete_form_confirmation_2": "所有关联的回复都将被删除。",
   "typeform_redirect_url_copied": "Typeform 重定向链接已复制！您可以在 TypeForm 表格中设置链接。",
   "modifications_in_fields_warning": "对以下表格中字段和途径的修改将反映在此表格中。",
   "connected_forms": "连接的表格",
@@ -1641,6 +1687,14 @@
   "add_1_option_per_line": "每行添加 1 个选项",
   "select_a_router": "选择途径",
   "add_a_new_route": "添加新途径",
+  "make_informed_decisions": "使用洞察做出明智的决策",
+  "make_informed_decisions_description": "我们的“洞察”仪表板会显示您团队中的所有活动，并向您展示趋势，以便更好地进行团队日程安排和制定决策。",
+  "view_bookings_across": "查看所有成员的预约",
+  "view_bookings_across_description": "查看谁收到的预约最多，并确保在团队中实现最佳分配",
+  "identify_booking_trends": "确定预约趋势",
+  "identify_booking_trends_description": "查看一周中的哪些时间和一天中的哪些时间受预约者欢迎",
+  "spot_popular_event_types": "发现热门的活动类型",
+  "spot_popular_event_types_description": "查看哪些活动类型获得最多点击和预约",
   "no_responses_yet": "尚无回复",
   "this_will_be_the_placeholder": "这将是占位符",
   "this_meeting_has_not_started_yet": "此会议尚未开始",
@@ -1651,8 +1705,84 @@
   "verification_code": "验证码",
   "can_you_try_again": "可否用不同的时间再次尝试？",
   "verify": "验证",
-  "select_all": "全选",
-  "default_conferencing_bulk_title": "批量更新现有事件类型",
+  "timezone_variable": "时区",
+  "timezone_info": "接收人的时区",
+  "event_end_time_variable": "活动结束时间",
+  "event_end_time_info": "活动结束时间",
+  "cancel_url_variable": "取消链接",
+  "cancel_url_info": "取消预约的链接",
+  "reschedule_url_variable": "重新安排链接",
+  "reschedule_url_info": "重新安排预约的链接",
   "invalid_event_name_variables": "活动名称中存在无效变量",
-  "default_conferencing_bulk_description": "更新选定活动类型的位置"
+  "select_all": "全选",
+  "default_conferencing_bulk_title": "批量更新现有活动类型",
+  "members_default_schedule": "成员的默认时间表",
+  "set_by_admin": "由团队管理员设置",
+  "members_default_location": "成员的默认位置",
+  "members_default_schedule_description": "我们将使用每个成员的默认可预约时间表。他们将能够编辑或更改它。",
+  "requires_at_least_one_schedule": "您需要至少有一个时间表",
+  "default_conferencing_bulk_description": "更新选定活动类型的位置",
+  "locked_for_members": "为成员锁定",
+  "locked_apps_description": "成员将能够查看活动的应用，但不能编辑任何应用设置",
+  "locked_webhooks_description": "成员将能够查看活动的 Webhook，但不能编辑任何 Webhook 设置",
+  "locked_workflows_description": "成员将能够查看活动的工作流程，但不能编辑任何工作流程设置",
+  "locked_by_admin": "被管理员锁定",
+  "app_not_connected": "您尚未连接 {{appName}} 账户。",
+  "connect_now": "立即连接",
+  "managed_event_dialog_confirm_button_one": "替换并通知 {{count}} 个成员",
+  "managed_event_dialog_confirm_button_other": "替换并通知 {{count}} 个成员",
+  "managed_event_dialog_title_one": "{{count}} 个成员的链接/{{slug}} 已存在。是否要将其替换?",
+  "managed_event_dialog_title_other": "{{count}} 个成员的链接/{{slug}} 已存在。是否要将其替换?",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> 已经在使用 <strong>/{{slug}}</strong> 链接。",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> 已经在使用 <string>/{{slug}}</strong> 链接。",
+  "managed_event_dialog_clarification": "如果您选择将其替换，我们会通知他们。如果您不想将其覆盖，请返回并移除它们。",
+  "review_event_type": "查看活动类型",
+  "looking_for_more_analytics": "寻找更多分析?",
+  "looking_for_more_insights": "寻找更多洞察?",
+  "add_filter": "添加筛选器",
+  "select_user": "选择用户",
+  "select_event_type": "选择活动类型",
+  "select_date_range": "选择日期范围",
+  "popular_events": "热门活动",
+  "no_event_types_found": "未找到任何活动类型",
+  "average_event_duration": "平均活动持续时间",
+  "most_booked_members": "预约最多的成员",
+  "least_booked_members": "预约最少的成员",
+  "events_created": "创建的活动",
+  "events_completed": "完成的活动",
+  "events_cancelled": "取消的活动",
+  "events_rescheduled": "重新安排的活动",
+  "from_last_period": "从上一期间",
+  "from_to_date_period": "开始日期: {{startDate}} 结束日期: {{endDate}}",
+  "analytics_for_organisation": "洞察",
+  "subtitle_analytics": "详细了解团队的活动",
+  "redirect_url_warning": "添加重定向将禁用成功页面。请确保在您的自定义成功页面上提及“预约已确认”。",
+  "event_trends": "活动趋势",
+  "clear_filters": "清除筛选器",
+  "hold": "保留",
+  "on_booking_option": "预约时收款",
+  "hold_option": "收取失约费",
+  "card_held": "卡已保留",
+  "charge_card": "对卡收款",
+  "card_charged": "卡已扣款",
+  "no_show_fee_amount": "{{amount, currency}} 失约费",
+  "no_show_fee": "失约费",
+  "submit_card": "提交卡",
+  "submit_payment_information": "提交付款信息",
+  "meeting_awaiting_payment_method": "您的会议正在等待付款方式",
+  "no_show_fee_charged_email_subject": "已为 {{date}} 的 {{title}} 收取 {{amount, currency}} 的失约费",
+  "no_show_fee_charged_text_body": "已收取失约费",
+  "no_show_fee_charged_subtitle": "已为以下活动收取 {{amount, currency}} 的失约费",
+  "error_charging_card": "收取失约费时出错。请稍后再试。",
+  "collect_no_show_fee": "收取失约费",
+  "no_show_fee_charged": "已收取失约费",
+  "insights": "洞察",
+  "testing_workflow_info_message": "测试此工作流程时请注意，电子邮件和短信只能提前至少 1 小时安排",
+  "insights_no_data_found_for_filter": "未找到所选筛选器或所选日期的数据。",
+  "acknowledge_booking_no_show_fee": "我确认，如果我不参加此活动，我的卡将被收取 {{amount, currency}} 的失约费。",
+  "card_details": "卡详细信息",
+  "seats_and_no_show_fee_error": "当前无法启用位置和收取失约费",
+  "complete_your_booking": "完成您的预约",
+  "complete_your_booking_subject": "完成您的预约: {{date}} 的 {{title}}",
+  "email_invite_team": "{{email}} 已被邀请"
 }
diff --git a/apps/web/public/static/locales/zh-TW/common.json b/apps/web/public/static/locales/zh-TW/common.json
index bf66cb166f..f10409609d 100644
--- a/apps/web/public/static/locales/zh-TW/common.json
+++ b/apps/web/public/static/locales/zh-TW/common.json
@@ -1,4 +1,5 @@
 {
+  "identity_provider": "身分提供者",
   "trial_days_left": "試用 PRO 方案還有 $t(day, {\"count\": {{days}} })",
   "day_one": "{{count}} 天",
   "day_other": "{{count}} 天",
@@ -69,6 +70,8 @@
   "event_awaiting_approval_subject": "等待核准：{{date}} 與 {{title}}",
   "event_still_awaiting_approval": "活動還在等待核准",
   "booking_submitted_subject": "已提出預約：{{date}} 與 {{title}}",
+  "download_recording_subject": "下載錄製內容：{{date}} 的 {{title}}",
+  "download_your_recording": "下載您的錄製內容",
   "your_meeting_has_been_booked": "會議已經預定",
   "event_type_has_been_rescheduled_on_time_date": "您的 {{title}} 已改期至 {{date}}。",
   "event_has_been_rescheduled": "已更新 - 已經重新預定活動時間",
@@ -224,6 +227,7 @@
   "done": "完成",
   "all_done": "大功告成！",
   "all_apps": "所有應用程式",
+  "available_apps": "可用的應用程式",
   "check_email_reset_password": "請檢查信箱。已經把重設密碼的連結寄出。",
   "finish": "結束",
   "few_sentences_about_yourself": "一些關於自己的句子，這會顯示在個人網址頁。",
@@ -404,6 +408,7 @@
   "add_time_availability": "新增時段",
   "add_an_extra_layer_of_security": "萬一密碼遭竊的時候，為帳號增加額外安全層級。",
   "2fa": "兩階段認證",
+  "2fa_disabled": "兩階段認證只能針對電子郵件和密碼驗證啟用",
   "enable_2fa": "開啟兩階段認證",
   "disable_2fa": "關閉兩階段認證",
   "disable_2fa_recommendation": "如果有必要關閉兩階段認證，我們建議還是要盡快重新開啟。",
@@ -585,6 +590,20 @@
   "minutes": "分鐘",
   "round_robin": "循環制",
   "round_robin_description": "與多位團隊成員進行週期會議。",
+  "managed_event": "受管活動",
+  "username_placeholder": "使用者名稱",
+  "managed_event_description": "大量建立並分配活動類型給團隊成員",
+  "managed": "受管",
+  "managed_event_url_clarification": "「使用者名稱」會填入獲指派成員的使用者名稱",
+  "assign_to": "指派給",
+  "add_members": "新增成員……",
+  "count_members_one": "{{count}} 名成員",
+  "count_members_other": "{{count}} 名成員",
+  "no_assigned_members": "未指派成員",
+  "assigned_to": "已指派給",
+  "start_assigning_members_above": "開始指派以上成員",
+  "locked_fields_admin_description": "成員將無法編輯此欄位",
+  "locked_fields_member_description": "此選項已被團隊管理員鎖定",
   "url": "網址",
   "hidden": "隱藏",
   "readonly": "唯讀",
@@ -736,6 +755,11 @@
   "minimum_booking_notice": "最晚預約通知",
   "slot_interval": "時間單位",
   "slot_interval_default": "使用活動長度（預設）",
+  "delete_event_type": "要刪除活動類型嗎？",
+  "delete_managed_event_type": "要刪除受管活動類型嗎？",
+  "delete_event_type_description": "與您共用此連結的任何使用者將無法再使用此連結預約。",
+  "delete_managed_event_type_description": "<ul><li>對於獲指派此活動類型的成員，他們的活動類型也將遭到刪除。</li><li>與他們共用此連結的任何使用者將無法再使用此連結預約。</li></ul>",
+  "confirm_delete_event_type": "是，刪除",
   "delete_account": "刪除帳號",
   "confirm_delete_account": "是，刪除帳號",
   "delete_account_confirmation_message": "確定要刪除 {{appName}} 的帳號？任何分享過帳號連結的人再也無法以此進行預約，而且任何儲存過的偏好設定都會消失。",
@@ -860,7 +884,7 @@
   "add_new_calendar": "新增新行事曆",
   "set_calendar": "設定您要為預約時間新增新活動的位置。",
   "delete_schedule": "刪除行程表",
-  "delete_schedule_description": "若刪除行程，該行程將從所有活動類型中移除。此動作無法復原。",
+  "delete_schedule_description": "若刪除行程，該行程將從所有活動類型中移除。此操作無法復原。",
   "schedule_created_successfully": "成功新增行程表 {{scheduleName}}",
   "availability_updated_successfully": "{{scheduleName}} 日程更新成功",
   "schedule_deleted_successfully": "成功刪除行程表",
@@ -1126,13 +1150,13 @@
   "current_username": "目前使用者名稱",
   "example_1": "範例 1",
   "example_2": "範例 2",
-  "additional_input_label": "額外的輸入標籤",
+  "booking_question_identifier": "預約問題識別項",
   "company_size": "公司規模",
   "what_help_needed": "您需要什麼協助？",
   "variable_format": "變數格式",
   "webhook_subscriber_url_reserved": "已定義 Webhook 訂閱者網址",
   "custom_input_as_variable_info": "忽略額外輸入標籤的所有特殊字元 (只使用字母和數字)，所有字母一律使用大寫，並以底線取代空格。",
-  "using_additional_inputs_as_variables": "如何將額外輸入內容作為變數使用？",
+  "using_booking_questions_as_variables": "要如何將預約問題當作變數？",
   "download_desktop_app": "下載桌面版應用程式",
   "set_ping_link": "設定 Ping 連結",
   "rate_limit_exceeded": "已超過限速",
@@ -1156,7 +1180,7 @@
   "event_setup_multiple_duration_error": "活動設定：多個時間長度需要至少 1 個選項。",
   "event_setup_multiple_duration_default_error": "活動設定：請選擇有效的預設時間長度。",
   "event_setup_booking_limits_error": "預約限制必須按遞增順序排列。[日、週、月、年]",
-  "event_setup_duration_limits_error": "時間長度限制必須以遞減順序填寫。[日、週、月、年]",
+  "event_setup_duration_limits_error": "時間長度限制必須以遞增順序填寫。[日、週、月、年]",
   "select_which_cal": "選取要新增預約的行事曆",
   "custom_event_name": "自訂活動名稱",
   "custom_event_name_description": "建立自訂活動名稱，以在行事曆活動上顯示",
@@ -1178,6 +1202,7 @@
   "start_of_week": "一週開始",
   "recordings_title": "錄製",
   "recording": "錄製",
+  "happy_scheduling": "祝排程愉快",
   "select_calendars": "選擇您想要檢查衝突的行事曆來避免重複預約。",
   "check_for_conflicts": "檢查衝突",
   "view_recordings": "檢視錄製內容",
@@ -1215,6 +1240,7 @@
   "impersonation": "模擬",
   "impersonation_description": "管理使用者模擬的設定",
   "users": "使用者",
+  "user": "使用者",
   "profile_description": "管理您的 {{appName}} 個人資料設定",
   "users_description": "您可以在這裡找到列出所有使用者的名單",
   "users_listing": "使用者名單",
@@ -1255,6 +1281,8 @@
   "download_responses": "下載回應",
   "download_responses_description": "以 CSV 格式下載您表單的所有回覆。",
   "download": "下載",
+  "download_recording": "下載錄製內容",
+  "recording_from_your_recent_call": "您最近在 Cal.com 的通話錄製內容已可供下載",
   "create_your_first_form": "建立您的第一份表單",
   "create_your_first_form_description": "您可使用引導表單提出符合條件的問題，並引導至適當的人員或活動類型。",
   "create_your_first_webhook": "建立您的第一個 Webhook",
@@ -1291,6 +1319,15 @@
   "exchange_authentication_standard": "基本驗證",
   "exchange_authentication_ntlm": "NTLM 驗證",
   "exchange_compression": "GZip 壓縮",
+  "exchange_version": "Exchange 版本",
+  "exchange_version_2007_SP1": "2007 SP1",
+  "exchange_version_2010": "2010",
+  "exchange_version_2010_SP1": "2010 SP1",
+  "exchange_version_2010_SP2": "2010 SP2",
+  "exchange_version_2013": "2013",
+  "exchange_version_2013_SP1": "2013 SP1",
+  "exchange_version_2015": "2015",
+  "exchange_version_2016": "2016",
   "routing_forms_description": "您可以在這裡查看您已建立的所有表單和引導路徑。",
   "routing_forms_send_email_owner": "傳送電子郵件給擁有者",
   "routing_forms_send_email_owner_description": "表單提交後傳送電子郵件給擁有者",
@@ -1345,7 +1382,7 @@
   "add_limit": "新增限制",
   "team_name_required": "需提供團隊名稱",
   "show_attendees": "和賓客分享與會者資訊",
-  "how_additional_inputs_as_variables": "如何將額外輸入內容作為變數使用",
+  "how_booking_questions_as_variables": "如何將預約問題當作變數？",
   "format": "格式",
   "uppercase_for_letters": "一律使用大寫字母",
   "replace_whitespaces_underscores": "以底線取代空格",
@@ -1360,7 +1397,7 @@
   "billing_help_title": "還需要什麼嗎？",
   "billing_help_description": "若您需要關於付費的進一步協助，我們的支援團隊會隨時幫助您。",
   "billing_help_cta": "聯絡支援",
-  "ignore_special_characters": "忽略額外輸入標籤中的所有特殊字元。只使用字母和數字",
+  "ignore_special_characters_booking_questions": "忽略預約問題識別項中的特殊字元。只使用字母和數字",
   "retry": "重試",
   "fetching_calendars_error": "擷取行事曆時發生問題。請<1>再試一次</1>，或聯絡客服支援團隊。",
   "calendar_connection_fail": "行事曆連線失敗",
@@ -1443,11 +1480,17 @@
   "fixed_round_robin": "固定輪流制",
   "add_one_fixed_attendee": "新增一名固定的與會者，並由多名與會者輪流擔任。",
   "calcom_is_better_with_team": "Cal.com 更適合團隊使用",
+  "the_calcom_team": "Cal.com 團隊",
   "add_your_team_members": "將團隊成員新增到活動類型。使用全體預定即可納入所有使用者，也可以使用輪流制預定找出最合適的人選。",
   "booking_limit_reached": "已達此活動類型的預約限制",
   "duration_limit_reached": "已達此活動類型的時間上限",
   "admin_has_disabled": "管理員已停用 {{appName}}",
   "disabled_app_affects_event_type": "管理員已停用會影響 {{eventType}} 活動類型的 {{appName}}",
+  "event_replaced_notice": "管理員已取代您其中一個活動類型",
+  "email_subject_slug_replacement": "團隊管理員已取代您的活動/{{slug}}",
+  "email_body_slug_replacement_notice": "<strong>{{teamName}}</strong> 團隊管理員已使用其所控管的受管活動類型來取代您的活動類型<strong>/{{slug}}</strong>。",
+  "email_body_slug_replacement_info": "您的連結會繼續正常運作，但該連結的部分設定可能已變更。您可以在活動類型中檢閱相關設定。",
+  "email_body_slug_replacement_suggestion": "若您對於活動類型有任何疑問，請聯絡您的管理員。<br /><br />祝排程愉快。<br />Cal.com 團隊",
   "disable_payment_app": "管理員已停用會影響 {{title}} 活動類型的 {{appName}}。與會者仍可預約此類型活動，但不會收到付費提示。您也可以隱藏此活動類型來避免這種情況，直到管理員再次啟用您的付款方式為止。",
   "payment_disabled_still_able_to_book": "與會者仍可預約此類型活動，但不會收到付費提示。您也可以隱藏此活動類型來避免這種情況，直到管理員再次啟用您的付款方式。",
   "app_disabled_with_event_type": "管理員已停用會影響 {{title}} 活動類型的 {{appName}}。",
@@ -1496,6 +1539,7 @@
   "date_overrides_update_btn": "更新覆寫",
   "event_type_duplicate_copy_text": "{{slug}}-複製",
   "set_as_default": "設為預設",
+  "hide_eventtype_details": "隱藏活動類型詳細資料",
   "show_navigation": "顯示導覽",
   "hide_navigation": "隱藏導覽",
   "verification_code_sent": "已傳送驗證碼",
@@ -1509,6 +1553,7 @@
   "create_your_first_team_webhook_description": "為此團隊活動類型建立第一個 Webhook",
   "create_webhook_team_event_type": "為此團隊活動類型建立 Webhook",
   "disable_success_page": "停用「成功」頁面 (只適用於您有重新導向網址時)",
+  "invalid_admin_password": "您是管理員，但您的密碼長度未符合至少 15 個字元的限制，或還未啟用兩階段驗證",
   "change_password_admin": "變更密碼以獲得管理員存取權",
   "username_already_taken": "已有人使用此使用者名稱",
   "assignment": "指派",
@@ -1529,7 +1574,7 @@
   "sender_name": "傳送者名稱",
   "already_invited": "與會者已獲邀",
   "no_recordings_found": "找不到錄製內容",
-  "new_workflow_subtitle": "新工作流程，適用於……",
+  "new_workflow_subtitle": "新工作流程，適用於…",
   "reporting": "報表",
   "reporting_feature": "查看所有傳入的資料，並以 CSV 檔案格式下載",
   "teams_plan_required": "需要團隊方案",
@@ -1541,6 +1586,7 @@
   "ee_enterprise_license": "「/ee」Enterprise 授權",
   "enterprise_booking_fee": "每月 {{enterprise_booking_fee}} 起",
   "enterprise_license_includes": "商業使用案例的所有功能",
+  "no_need_to_keep_your_code_open_source": "程式碼無須保持開源狀態",
   "repackage_rebrand_resell": "輕鬆重新包裝、換新品牌和轉售",
   "a_vast_suite_of_enterprise_features": "應有盡有的企業版功能套組",
   "free_license_fee": "$0.00/月",
@@ -1585,7 +1631,7 @@
   "impersonation_user_tip": "您即將模擬某位使用者，這表示您可以代表對方進行變更。請謹慎操作。",
   "available_variables": "可用的變數",
   "scheduler": "{Scheduler}",
-  "no_workflows": "沒有工作流程",
+  "no_workflows": "無工作流程",
   "change_filter": "變更篩選條件，即可查看您個人和團隊的工作流程。",
   "recommended_next_steps": "建議的後續步驟",
   "create_a_managed_event": "建立受管活動類型",
@@ -1593,15 +1639,16 @@
   "create_a_one_one_template": "為活動類型建立一對一範本，並分配給多位成員。",
   "collective_or_roundrobin": "集體或輪流制",
   "book_your_team_members": "使用集體活動一併預約所有團隊成員，或是使用輪流制循環找出合適的人員。",
-  "event_no_longer_attending_subject": "不再參加 {{date}} 的 {{title}}",
+  "event_no_longer_attending_subject": "不再參加於 {{date}} 舉辦的 {{title}}",
   "no_longer_attending": "您不再參加這個活動",
-  "attendee_no_longer_attending_subject": "與會者不再參加 {{date}} 的 {{title}}",
-  "attendee_no_longer_attending": "與會者不再參加您的活動",
-  "attendee_no_longer_attending_subtitle": "{{name}} 已取消，這表示這時段空出了一個座位",
+  "attendee_no_longer_attending_subject": "一位與會者不再參加 {{date}} 的 {{title}}",
+  "attendee_no_longer_attending": "一位與會者不再參加您的活動",
+  "attendee_no_longer_attending_subtitle": "{{name}} 已取消，這代表此時段空出了一個座位",
   "create_event_on": "活動建立日期",
   "default_app_link_title": "設定預設應用程式連結",
   "default_app_link_description": "設定預設應用程式連結，即可讓所有全新建立的活動類型使用您設定的應用程式連結。",
   "change_default_conferencing_app": "設為預設",
+  "organizer_default_conferencing_app": "主辦者的預設應用程式",
   "under_maintenance": "維修停機中",
   "under_maintenance_description": "{{appName}} 團隊正在執行預定維修。如有任何疑問，請聯絡支援團隊。",
   "event_type_seats": "{{numberOfSeats}} 個座位",
@@ -1616,6 +1663,7 @@
   "not_enough_seats": "座位不足",
   "form_builder_field_already_exists": "已存在使用此名稱的欄位",
   "form_builder_field_add_subtitle": "自訂預約頁面上的提問問題",
+  "show_on_booking_page": "在預約頁面上顯示",
   "get_started_zapier_templates": "開始使用 Zapier 範本",
   "team_is_unpublished": "已取消發佈 {{team}}",
   "team_is_unpublished_description": "此團隊連結目前無法使用。請聯絡團隊擁有者，或請對方發佈。",
@@ -1625,9 +1673,9 @@
   "keep_me_connected_with_form": "將我與此表單保持連結",
   "fields_in_form_duplicated": "目前複製的引導表單和表單欄位如有任何變更，也會反映在複本中。",
   "form_deleted": "已刪除表單",
-  "delete_form": "刪除表單",
+  "delete_form": "確定要刪除此表單嗎？",
   "delete_form_action": "是，刪除表單",
-  "delete_form_confirmation": "確定要刪除此表單嗎？您分享此連結的任何使用者，將無法再使用此表單預約。此外，所有相關的回應也會遭到刪除。",
+  "delete_form_confirmation": "您分享此連結的任何使用者，都將無法再使用此表單預約。",
   "delete_form_confirmation_2": "相關回應將全數刪除。",
   "typeform_redirect_url_copied": "已複製 Typeform 重新導向網址！您可以在 Typeform 表單中設定網址。",
   "modifications_in_fields_warning": "欄位與以下表單的引導路由如有任何修改之處，也會反映在此表單中。",
@@ -1639,6 +1687,14 @@
   "add_1_option_per_line": "每行新增 1 個選項",
   "select_a_router": "選取引導表單",
   "add_a_new_route": "新增新引導",
+  "make_informed_decisions": "運用 Insights 做出明智的決策",
+  "make_informed_decisions_description": "我們的 Insights 儀表版會顯示您團隊內部的所有活動，並顯示有助於團隊排程和決策的趨勢。",
+  "view_bookings_across": "查看所有成員的預約",
+  "view_bookings_across_description": "查看誰收到最多預約，並確保預約妥善分配給所有團隊成員",
+  "identify_booking_trends": "判斷出預約趨勢",
+  "identify_booking_trends_description": "查看當週和當天最受預約者青睞的時段",
+  "spot_popular_event_types": "探索熱門活動類型",
+  "spot_popular_event_types_description": "查看您哪個活動類型的點閱次數和預約次數最多",
   "no_responses_yet": "還沒有回應",
   "this_will_be_the_placeholder": "此處會是佔位符",
   "this_meeting_has_not_started_yet": "此會議尚未開始",
@@ -1647,10 +1703,86 @@
   "app_is_connected": "已連結 {{dependencyName}}",
   "requires_app": "需要 {{dependencyName}}",
   "verification_code": "驗證碼",
-  "can_you_try_again": "您可以使用不同的時間再試一次嗎？",
+  "can_you_try_again": "您可以再試試其他時間嗎？",
   "verify": "驗證",
+  "timezone_variable": "時區",
+  "timezone_info": "接收人的時區",
+  "event_end_time_variable": "活動結束時間",
+  "event_end_time_info": "活動結束時間",
+  "cancel_url_variable": "取消網址",
+  "cancel_url_info": "取消此預約的網址",
+  "reschedule_url_variable": "重新預定網址",
+  "reschedule_url_info": "重新預定此預約的網址",
+  "invalid_event_name_variables": "您的活動名稱包含無效的變數",
   "select_all": "全部選擇",
   "default_conferencing_bulk_title": "大量更新現有活動類型",
-  "invalid_event_name_variables": "您的活動名稱包含無效的變數",
-  "default_conferencing_bulk_description": "更新所選活動類型的地點"
+  "members_default_schedule": "成員的預設行程表",
+  "set_by_admin": "由團隊管理員設定",
+  "members_default_location": "成員的預設位置",
+  "members_default_schedule_description": "我們會使用每位成員的預設開放時間行程表。他們將能編輯或變更該行程表。",
+  "requires_at_least_one_schedule": "您需要擁有至少一個行程表",
+  "default_conferencing_bulk_description": "更新所選活動類型的地點",
+  "locked_for_members": "已為成員鎖定",
+  "locked_apps_description": "成員將能查看啟用的應用程式，但無法編輯任何應用程式設定",
+  "locked_webhooks_description": "成員將能查看啟用的 Webhook，但無法編輯任何 Webhook 設定",
+  "locked_workflows_description": "成員將能查看啟用的工作流程，但無法編輯任何工作流程設定",
+  "locked_by_admin": "已由管理員鎖定",
+  "app_not_connected": "您尚未連結 {{appName}} 帳號。",
+  "connect_now": "立即連結",
+  "managed_event_dialog_confirm_button_one": "取代並通知 {{count}} 位成員",
+  "managed_event_dialog_confirm_button_other": "取代並通知 {{count}} 位成員",
+  "managed_event_dialog_title_one": "{{count}} 位成員已有網址/{{slug}}。您要取代嗎？",
+  "managed_event_dialog_title_other": "{{count}} 位成員已有網址/{{slug}}。您要取代嗎？",
+  "managed_event_dialog_information_one": "<strong>{{names}}</strong> 已在使用 <strong>/{{slug}}</strong> 網址。",
+  "managed_event_dialog_information_other": "<strong>{{names}}</strong> 已在使用 <string>/{{slug}}</strong> 網址。",
+  "managed_event_dialog_clarification": "如果您選擇取代，我們會通知他們；如果不想覆寫既有設定，請返回並移除。",
+  "review_event_type": "檢閱活動類型",
+  "looking_for_more_analytics": "在找更多分析嗎？",
+  "looking_for_more_insights": "在找更多 Insights 嗎？",
+  "add_filter": "新增篩選條件",
+  "select_user": "選擇使用者",
+  "select_event_type": "選擇活動類型",
+  "select_date_range": "選擇日期範圍",
+  "popular_events": "熱門活動",
+  "no_event_types_found": "找不到活動類型",
+  "average_event_duration": "平均活動時間長度",
+  "most_booked_members": "最多預約的成員",
+  "least_booked_members": "最少預約的成員",
+  "events_created": "已建立的活動",
+  "events_completed": "已完成的活動",
+  "events_cancelled": "已取消的活動",
+  "events_rescheduled": "已重新預定的活動",
+  "from_last_period": "從最後一個時期",
+  "from_to_date_period": "開始：{{startDate}} 結束：{{endDate}}",
+  "analytics_for_organisation": "Insights",
+  "subtitle_analytics": "進一步瞭解您的團隊活動",
+  "redirect_url_warning": "加入重新導向功能會停用成功頁面。請務必在自訂的成功頁面中註明「預約已確認」。",
+  "event_trends": "活動趨勢",
+  "clear_filters": "清除篩選條件",
+  "hold": "保留",
+  "on_booking_option": "預約時收款",
+  "hold_option": "收取缺席費",
+  "card_held": "卡片已保留",
+  "charge_card": "從卡片扣款",
+  "card_charged": "卡片已扣款",
+  "no_show_fee_amount": "{{amount, currency}} 缺席費",
+  "no_show_fee": "缺席費",
+  "submit_card": "提交卡片",
+  "submit_payment_information": "提交付款資訊",
+  "meeting_awaiting_payment_method": "您的會議正在等待付款方式",
+  "no_show_fee_charged_email_subject": "已針對 {{date}} 的 {{title}} 收取 {{amount, currency}} 的缺席費",
+  "no_show_fee_charged_text_body": "已收取缺席費",
+  "no_show_fee_charged_subtitle": "已針對接下來的活動收取 {{amount, currency}} 的缺席費",
+  "error_charging_card": "收取缺席費時發生問題。請稍後再試一次。",
+  "collect_no_show_fee": "收取缺席費",
+  "no_show_fee_charged": "已收取缺席費",
+  "insights": "Insights",
+  "testing_workflow_info_message": "測試此工作流程時，請注意電子郵件和簡訊只能提前至少 1 小時預定",
+  "insights_no_data_found_for_filter": "找不到所選篩選條件或日期的資料。",
+  "acknowledge_booking_no_show_fee": "我同意若我未出席此活動，將從我的卡片收取 {{amount, currency}} 的缺席費。",
+  "card_details": "卡片詳細資料",
+  "seats_and_no_show_fee_error": "目前無法啟用座位並收取缺席費",
+  "complete_your_booking": "完成您的預約",
+  "complete_your_booking_subject": "完成您的預約：{{date}} 的 {{title}}",
+  "email_invite_team": "已邀請 {{email}}"
 }
diff --git a/apps/web/public/tips/insights-dark.jpg b/apps/web/public/tips/insights-dark.jpg
index 515a2093f3..d3d9cbf88c 100644
Binary files a/apps/web/public/tips/insights-dark.jpg and b/apps/web/public/tips/insights-dark.jpg differ
diff --git a/apps/web/sentry.client.config.js b/apps/web/sentry.client.config.js
deleted file mode 100644
index 17e9d9aef0..0000000000
--- a/apps/web/sentry.client.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// This file configures the initialization of Sentry on the browser.
-// The config you add here will be used whenever a page is visited.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-import * as Sentry from "@sentry/nextjs";
-
-const SENTRY_DSN = process.env.NEXT_PUBLIC_SENTRY_DSN;
-
-Sentry.init({
-  dsn: SENTRY_DSN,
-  // Adjust this value in production, or use tracesSampler for greater control
-  tracesSampleRate: 1.0,
-  // ...
-  // Note: if you want to override the automatic release value, do not set a
-  // `release` value here - use the environment variable `SENTRY_RELEASE`, so
-  // that it will also get attached to your source maps
-});
diff --git a/apps/web/sentry.properties b/apps/web/sentry.properties
deleted file mode 100644
index 93228f60da..0000000000
--- a/apps/web/sentry.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-defaults.url=https://sentry.io/
-defaults.org=calcom
-defaults.project=cal
\ No newline at end of file
diff --git a/apps/web/sentry.server.config.js b/apps/web/sentry.server.config.js
deleted file mode 100644
index 3956c7d359..0000000000
--- a/apps/web/sentry.server.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// This file configures the initialization of Sentry on the server.
-// The config you add here will be used whenever the server handles a request.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-import * as Sentry from "@sentry/nextjs";
-
-const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
-
-Sentry.init({
-  dsn: SENTRY_DSN,
-  // Adjust this value in production, or use tracesSampler for greater control
-  tracesSampleRate: 1.0,
-  // ...
-  // Note: if you want to override the automatic release value, do not set a
-  // `release` value here - use the environment variable `SENTRY_RELEASE`, so
-  // that it will also get attached to your source maps
-});
diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css
index 93f45a0553..2a97f45713 100644
--- a/apps/web/styles/globals.css
+++ b/apps/web/styles/globals.css
@@ -166,16 +166,16 @@ html.todesktop aside {
   margin: 0px -6px;
 }
 
-html.todesktop .desktop-transparent{
+html.todesktop-platform-darwin .desktop-transparent{
   background: transparent !important;
   border: none !important;
 }
 
-html.todesktop.dark main.bg-default{
+html.todesktop-platform-darwin.dark main.bg-default{
   background: rgba(0,0,0,0.6) !important
 }
 
-html.todesktop.light main.bg-default{
+html.todesktop-platform-darwin.light main.bg-default{
   background: rgba(255,255,255,0.8) !important
 }
 
@@ -205,7 +205,7 @@ html.todesktop nav a svg{
     https://github.com/tailwindlabs/tailwindcss/pull/5732
 */
 @layer utilities {
-  @variants responsive {
+  @layer responsive {
     /* Chrome, Safari and Opera */
     .no-scrollbar::-webkit-scrollbar {
       display: none;
diff --git a/apps/web/test/lib/parseZone.test.ts b/apps/web/test/lib/parseZone.test.ts
index d6fee7943a..0883283da9 100644
--- a/apps/web/test/lib/parseZone.test.ts
+++ b/apps/web/test/lib/parseZone.test.ts
@@ -1,4 +1,4 @@
-import { parseZone } from "@lib/parseZone";
+import { parseZone } from "@calcom/lib/parse-zone";
 
 const EXPECTED_DATE_STRING = "2021-06-20T11:59:59+02:00";
 
diff --git a/jest.config.ts b/jest.config.ts
index a7b3448f64..9fe67b3e5a 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -1,5 +1,8 @@
 import type { Config } from "jest";
 
+// Added +2 to ensure we need to do some conversions in our tests
+process.env.TZ = "GMT+2";
+
 const config: Config = {
   preset: "ts-jest",
   verbose: true,
@@ -66,6 +69,22 @@ const config: Config = {
       transformIgnorePatterns: ["/node_modules/", "^.+\\.module\\.(css|sass|scss)$"],
       testEnvironment: "jsdom",
     },
+    {
+      displayName: "@calcom/features",
+      roots: ["<rootDir>/packages/features"],
+      testMatch: ["**/*.(spec|test).(ts|tsx|js)"],
+      transform: {
+        "^.+\\.ts?$": "ts-jest",
+      },
+      transformIgnorePatterns: ["/node_modules/", "^.+\\.module\\.(css|sass|scss)$"],
+      testEnvironment: "jsdom",
+      moduleDirectories: ["node_modules", "<rootDir>"],
+      globals: {
+        "ts-jest": {
+          tsconfig: "<rootDir>/packages/features/tsconfig.json",
+        },
+      },
+    },
     // FIXME: Prevent this breaking Jest when API module is missing
     // {
     //   displayName: "@calcom/api",
diff --git a/packages/app-store/BookingPageTagManager.tsx b/packages/app-store/BookingPageTagManager.tsx
index 8d7b744b38..db333ec0a9 100644
--- a/packages/app-store/BookingPageTagManager.tsx
+++ b/packages/app-store/BookingPageTagManager.tsx
@@ -17,13 +17,33 @@ export default function BookingPageTagManager({
         if (!tag) {
           return null;
         }
-        const trackingId = getEventTypeAppData(eventType, appId as keyof typeof appDataSchemas)?.trackingId;
-        if (!trackingId) {
+
+        const appData = getEventTypeAppData(eventType, appId as keyof typeof appDataSchemas);
+
+        if (!appData) {
           return null;
         }
-        const parseValue = <T extends string | undefined>(val: T): T =>
-          //TODO: Support more template variables.
-          val ? (val.replace(/\{TRACKING_ID\}/g, trackingId) as T) : val;
+
+        const parseValue = <T extends string | undefined>(val: T): T => {
+          if (!val) {
+            return val;
+          }
+
+          // Only support UpperCase,_and numbers in template variables. This prevents accidental replacement of other strings.
+          const regex = /\{([A-Z_\d]+)\}/g;
+          let matches;
+          while ((matches = regex.exec(val))) {
+            const variableName = matches[1];
+            if (appData[variableName]) {
+              // Replace if value is available. It can possible not be a template variable that just matches the regex.
+              val = val.replace(
+                new RegExp(`{${variableName}}`, "g"),
+                appData[variableName]
+              ) as NonNullable<T>;
+            }
+          }
+          return val;
+        };
 
         return tag.scripts.map((script, index) => {
           const parsedAttributes: NonNullable<(typeof tag.scripts)[number]["attrs"]> = {};
diff --git a/packages/app-store/_utils/getEventTypeAppData.ts b/packages/app-store/_utils/getEventTypeAppData.ts
index e279539186..ce7de87546 100644
--- a/packages/app-store/_utils/getEventTypeAppData.ts
+++ b/packages/app-store/_utils/getEventTypeAppData.ts
@@ -15,7 +15,13 @@ export const getEventTypeAppData = <T extends EventTypeAppsList>(
   const appMetadata = metadata?.apps && metadata.apps[appId];
   if (appMetadata) {
     const allowDataGet = forcedGet ? true : appMetadata.enabled;
-    return allowDataGet ? appMetadata : null;
+    return allowDataGet
+      ? {
+          ...appMetadata,
+          // trackingId is legacy way to store value for TRACKING_ID. So, we need to support both.
+          TRACKING_ID: appMetadata.TRACKING_ID || appMetadata.trackingId,
+        }
+      : null;
   }
 
   // Backward compatibility for existing event types.
@@ -23,7 +29,7 @@ export const getEventTypeAppData = <T extends EventTypeAppsList>(
   // Migration isn't being done right now, to allow a revert if needed
   const legacyAppsData = {
     stripe: {
-      enabled: eventType.price > 0,
+      enabled: !!eventType.price,
       // Price default is 0 in DB. So, it would always be non nullish.
       price: eventType.price,
       // Currency default is "usd" in DB.So, it would also be available always
diff --git a/packages/app-store/appStoreMetaData.ts b/packages/app-store/appStoreMetaData.ts
index 000861575d..2b7ba7f5be 100644
--- a/packages/app-store/appStoreMetaData.ts
+++ b/packages/app-store/appStoreMetaData.ts
@@ -12,6 +12,7 @@ export const appStoreMetadata = {} as AppStoreMetaData;
 for (const [key, value] of Object.entries(rawAppStoreMetadata)) {
   appStoreMetadata[key as keyof typeof appStoreMetadata] = {
     appData: null,
+    dirName: "dirName" in value ? value.dirName : value.slug,
     __template: "",
     ...value,
   } as AppStoreMetaData[keyof AppStoreMetaData];
diff --git a/packages/app-store/apps.browser.generated.tsx b/packages/app-store/apps.browser.generated.tsx
index d483e35122..743fe1d355 100644
--- a/packages/app-store/apps.browser.generated.tsx
+++ b/packages/app-store/apps.browser.generated.tsx
@@ -24,6 +24,7 @@ export const EventTypeAddonMap = {
   ga4: dynamic(() => import("./ga4/components/EventTypeAppCardInterface")),
   giphy: dynamic(() => import("./giphy/components/EventTypeAppCardInterface")),
   gtm: dynamic(() => import("./gtm/components/EventTypeAppCardInterface")),
+  metapixel: dynamic(() => import("./metapixel/components/EventTypeAppCardInterface")),
   plausible: dynamic(() => import("./plausible/components/EventTypeAppCardInterface")),
   qr_code: dynamic(() => import("./qr_code/components/EventTypeAppCardInterface")),
   rainbow: dynamic(() => import("./rainbow/components/EventTypeAppCardInterface")),
diff --git a/packages/app-store/apps.keys-schemas.generated.ts b/packages/app-store/apps.keys-schemas.generated.ts
index 403584009b..4628d82620 100644
--- a/packages/app-store/apps.keys-schemas.generated.ts
+++ b/packages/app-store/apps.keys-schemas.generated.ts
@@ -10,6 +10,7 @@ import { appKeysSchema as googlecalendar_zod_ts } from "./googlecalendar/zod";
 import { appKeysSchema as gtm_zod_ts } from "./gtm/zod";
 import { appKeysSchema as hubspot_zod_ts } from "./hubspot/zod";
 import { appKeysSchema as larkcalendar_zod_ts } from "./larkcalendar/zod";
+import { appKeysSchema as metapixel_zod_ts } from "./metapixel/zod";
 import { appKeysSchema as office365calendar_zod_ts } from "./office365calendar/zod";
 import { appKeysSchema as office365video_zod_ts } from "./office365video/zod";
 import { appKeysSchema as plausible_zod_ts } from "./plausible/zod";
@@ -24,6 +25,7 @@ import { appKeysSchema as event_type_app_card_zod_ts } from "./templates/event-t
 import { appKeysSchema as vital_zod_ts } from "./vital/zod";
 import { appKeysSchema as wordpress_zod_ts } from "./wordpress/zod";
 import { appKeysSchema as zapier_zod_ts } from "./zapier/zod";
+import { appKeysSchema as zohocrm_zod_ts } from "./zohocrm/zod";
 import { appKeysSchema as zoomvideo_zod_ts } from "./zoomvideo/zod";
 
 export const appKeysSchemas = {
@@ -35,6 +37,7 @@ export const appKeysSchemas = {
   gtm: gtm_zod_ts,
   hubspot: hubspot_zod_ts,
   larkcalendar: larkcalendar_zod_ts,
+  metapixel: metapixel_zod_ts,
   office365calendar: office365calendar_zod_ts,
   office365video: office365video_zod_ts,
   plausible: plausible_zod_ts,
@@ -49,5 +52,6 @@ export const appKeysSchemas = {
   vital: vital_zod_ts,
   wordpress: wordpress_zod_ts,
   zapier: zapier_zod_ts,
+  zohocrm: zohocrm_zod_ts,
   zoomvideo: zoomvideo_zod_ts,
 };
diff --git a/packages/app-store/apps.metadata.generated.ts b/packages/app-store/apps.metadata.generated.ts
index f0da2045b3..e1e62f06ce 100644
--- a/packages/app-store/apps.metadata.generated.ts
+++ b/packages/app-store/apps.metadata.generated.ts
@@ -25,6 +25,7 @@ import { metadata as hubspot__metadata_ts } from "./hubspot/_metadata";
 import { metadata as huddle01video__metadata_ts } from "./huddle01video/_metadata";
 import { metadata as jitsivideo__metadata_ts } from "./jitsivideo/_metadata";
 import { metadata as larkcalendar__metadata_ts } from "./larkcalendar/_metadata";
+import metapixel_config_json from "./metapixel/config.json";
 import n8n_config_json from "./n8n/config.json";
 import { metadata as office365calendar__metadata_ts } from "./office365calendar/_metadata";
 import office365video_config_json from "./office365video/config.json";
@@ -86,6 +87,7 @@ export const appStoreMetadata = {
   huddle01video: huddle01video__metadata_ts,
   jitsivideo: jitsivideo__metadata_ts,
   larkcalendar: larkcalendar__metadata_ts,
+  metapixel: metapixel_config_json,
   n8n: n8n_config_json,
   office365calendar: office365calendar__metadata_ts,
   office365video: office365video_config_json,
diff --git a/packages/app-store/apps.schemas.generated.ts b/packages/app-store/apps.schemas.generated.ts
index d9d55a918a..005d0e6790 100644
--- a/packages/app-store/apps.schemas.generated.ts
+++ b/packages/app-store/apps.schemas.generated.ts
@@ -10,6 +10,7 @@ import { appDataSchema as googlecalendar_zod_ts } from "./googlecalendar/zod";
 import { appDataSchema as gtm_zod_ts } from "./gtm/zod";
 import { appDataSchema as hubspot_zod_ts } from "./hubspot/zod";
 import { appDataSchema as larkcalendar_zod_ts } from "./larkcalendar/zod";
+import { appDataSchema as metapixel_zod_ts } from "./metapixel/zod";
 import { appDataSchema as office365calendar_zod_ts } from "./office365calendar/zod";
 import { appDataSchema as office365video_zod_ts } from "./office365video/zod";
 import { appDataSchema as plausible_zod_ts } from "./plausible/zod";
@@ -24,6 +25,7 @@ import { appDataSchema as event_type_app_card_zod_ts } from "./templates/event-t
 import { appDataSchema as vital_zod_ts } from "./vital/zod";
 import { appDataSchema as wordpress_zod_ts } from "./wordpress/zod";
 import { appDataSchema as zapier_zod_ts } from "./zapier/zod";
+import { appDataSchema as zohocrm_zod_ts } from "./zohocrm/zod";
 import { appDataSchema as zoomvideo_zod_ts } from "./zoomvideo/zod";
 
 export const appDataSchemas = {
@@ -35,6 +37,7 @@ export const appDataSchemas = {
   gtm: gtm_zod_ts,
   hubspot: hubspot_zod_ts,
   larkcalendar: larkcalendar_zod_ts,
+  metapixel: metapixel_zod_ts,
   office365calendar: office365calendar_zod_ts,
   office365video: office365video_zod_ts,
   plausible: plausible_zod_ts,
@@ -49,5 +52,6 @@ export const appDataSchemas = {
   vital: vital_zod_ts,
   wordpress: wordpress_zod_ts,
   zapier: zapier_zod_ts,
+  zohocrm: zohocrm_zod_ts,
   zoomvideo: zoomvideo_zod_ts,
 };
diff --git a/packages/app-store/apps.server.generated.ts b/packages/app-store/apps.server.generated.ts
index 87df8e62fc..a0c37f7925 100644
--- a/packages/app-store/apps.server.generated.ts
+++ b/packages/app-store/apps.server.generated.ts
@@ -25,6 +25,7 @@ export const apiHandlers = {
   huddle01video: import("./huddle01video/api"),
   jitsivideo: import("./jitsivideo/api"),
   larkcalendar: import("./larkcalendar/api"),
+  metapixel: import("./metapixel/api"),
   n8n: import("./n8n/api"),
   office365calendar: import("./office365calendar/api"),
   office365video: import("./office365video/api"),
diff --git a/packages/app-store/components.tsx b/packages/app-store/components.tsx
index 3dc14e2395..5630b56ffd 100644
--- a/packages/app-store/components.tsx
+++ b/packages/app-store/components.tsx
@@ -2,6 +2,7 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import { useEffect, useRef } from "react";
 
+import useAddAppMutation from "@calcom/app-store/_utils/useAddAppMutation";
 import classNames from "@calcom/lib/classNames";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { CAL_URL } from "@calcom/lib/constants";
@@ -20,10 +21,21 @@ export const InstallAppButtonWithoutPlanCheck = (
     type: App["type"];
   } & InstallAppButtonProps
 ) => {
+  const mutation = useAddAppMutation(null);
   const key = deriveAppDictKeyFromType(props.type, InstallAppButtonMap);
   const InstallAppButtonComponent = InstallAppButtonMap[key as keyof typeof InstallAppButtonMap];
   if (!InstallAppButtonComponent)
-    return <>{props.render({ useDefaultComponent: true, disabled: props.disableInstall })}</>;
+    return (
+      <>
+        {props.render({
+          useDefaultComponent: true,
+          disabled: props.disableInstall,
+          onClick: () => {
+            mutation.mutate({ type: props.type });
+          },
+        })}
+      </>
+    );
 
   return (
     <InstallAppButtonComponent
diff --git a/packages/app-store/exchangecalendar/api/_postAdd.ts b/packages/app-store/exchangecalendar/api/_postAdd.ts
index 769a484620..017a0837de 100644
--- a/packages/app-store/exchangecalendar/api/_postAdd.ts
+++ b/packages/app-store/exchangecalendar/api/_postAdd.ts
@@ -8,7 +8,7 @@ import { defaultResponder } from "@calcom/lib/server";
 import prisma from "@calcom/prisma";
 
 import checkSession from "../../_utils/auth";
-import { ExchangeAuthentication } from "../enums";
+import { ExchangeAuthentication, ExchangeVersion } from "../enums";
 import { CalendarService } from "../lib";
 
 const formSchema = z
@@ -17,6 +17,7 @@ const formSchema = z
     username: z.string().email(),
     password: z.string(),
     authenticationMethod: z.number().default(ExchangeAuthentication.STANDARD),
+    exchangeVersion: z.number().default(ExchangeVersion.Exchange2016),
     useCompression: z.boolean().default(false),
   })
   .strict();
diff --git a/packages/app-store/exchangecalendar/enums.ts b/packages/app-store/exchangecalendar/enums.ts
index 795f264163..b77e328885 100644
--- a/packages/app-store/exchangecalendar/enums.ts
+++ b/packages/app-store/exchangecalendar/enums.ts
@@ -2,3 +2,13 @@ export enum ExchangeAuthentication {
   STANDARD = 0,
   NTLM = 1,
 }
+export enum ExchangeVersion {
+  Exchange2007_SP1 = 0,
+  Exchange2010 = 1,
+  Exchange2010_SP1 = 2,
+  Exchange2010_SP2 = 3,
+  Exchange2013 = 4,
+  Exchange2013_SP1 = 5,
+  Exchange2015 = 6,
+  Exchange2016 = 7,
+}
diff --git a/packages/app-store/exchangecalendar/lib/CalendarService.ts b/packages/app-store/exchangecalendar/lib/CalendarService.ts
index 3b4e71f171..9ba5823457 100644
--- a/packages/app-store/exchangecalendar/lib/CalendarService.ts
+++ b/packages/app-store/exchangecalendar/lib/CalendarService.ts
@@ -198,7 +198,7 @@ export default class ExchangeCalendarService implements Calendar {
   }
 
   private getExchangeService(): ExchangeService {
-    const service: ExchangeService = new ExchangeService();
+    const service: ExchangeService = new ExchangeService(this.payload.exchangeVersion);
     service.Credentials = new WebCredentials(this.payload.username, this.payload.password);
     service.Url = new Uri(this.payload.url);
     if (this.payload.authenticationMethod === ExchangeAuthentication.NTLM) {
diff --git a/packages/app-store/exchangecalendar/pages/setup/index.tsx b/packages/app-store/exchangecalendar/pages/setup/index.tsx
index 3ca0370241..128dbd73bb 100644
--- a/packages/app-store/exchangecalendar/pages/setup/index.tsx
+++ b/packages/app-store/exchangecalendar/pages/setup/index.tsx
@@ -8,13 +8,14 @@ import z from "zod";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Alert, Button, EmailField, Form, PasswordField, SelectField, Switch, TextField } from "@calcom/ui";
 
-import { ExchangeAuthentication } from "../../enums";
+import { ExchangeAuthentication, ExchangeVersion } from "../../enums";
 
 interface IFormData {
   url: string;
   username: string;
   password: string;
   authenticationMethod: ExchangeAuthentication;
+  exchangeVersion: ExchangeVersion;
   useCompression: boolean;
 }
 
@@ -24,6 +25,7 @@ const schema = z
     username: z.string().email(),
     password: z.string(),
     authenticationMethod: z.number().default(ExchangeAuthentication.STANDARD),
+    exchangeVersion: z.number().default(ExchangeVersion.Exchange2016),
     useCompression: z.boolean().default(false),
   })
   .strict();
@@ -33,13 +35,27 @@ export default function ExchangeSetup() {
   const router = useRouter();
   const [errorMessage, setErrorMessage] = useState("");
   const form = useForm<IFormData>({
-    defaultValues: { authenticationMethod: ExchangeAuthentication.STANDARD },
+    defaultValues: {
+      authenticationMethod: ExchangeAuthentication.STANDARD,
+      exchangeVersion: ExchangeVersion.Exchange2016,
+    },
     resolver: zodResolver(schema),
   });
   const authenticationMethods = [
     { value: ExchangeAuthentication.STANDARD, label: t("exchange_authentication_standard") },
     { value: ExchangeAuthentication.NTLM, label: t("exchange_authentication_ntlm") },
   ];
+  const exchangeVersions = [
+    { value: ExchangeVersion.Exchange2007_SP1, label: t("exchange_version_2007_SP1") },
+    { value: ExchangeVersion.Exchange2010, label: t("exchange_version_2010") },
+    { value: ExchangeVersion.Exchange2010_SP1, label: t("exchange_version_2010_SP1") },
+    { value: ExchangeVersion.Exchange2010_SP2, label: t("exchange_version_2010_SP2") },
+    { value: ExchangeVersion.Exchange2013, label: t("exchange_version_2013") },
+    { value: ExchangeVersion.Exchange2013_SP1, label: t("exchange_version_2013_SP1") },
+    { value: ExchangeVersion.Exchange2015, label: t("exchange_version_2015") },
+    { value: ExchangeVersion.Exchange2016, label: t("exchange_version_2016") },
+  ];
+
   return (
     <>
       <div className="bg-emphasis flex h-screen">
@@ -111,6 +127,21 @@ export default function ExchangeSetup() {
                         />
                       )}
                     />
+                    <Controller
+                      name="exchangeVersion"
+                      control={form.control}
+                      render={({ field: { onChange } }) => (
+                        <SelectField
+                          label={t("exchange_version")}
+                          options={exchangeVersions}
+                          defaultValue={exchangeVersions[7]}
+                          onChange={async (version) => {
+                            onChange(version?.value);
+                            form.setValue("exchangeVersion", version!.value);
+                          }}
+                        />
+                      )}
+                    />
                     <Switch
                       label={t("exchange_compression")}
                       name="useCompression"
diff --git a/packages/app-store/giphy/components/SearchDialog.tsx b/packages/app-store/giphy/components/SearchDialog.tsx
index 9b53eba716..17d7e2fc3b 100644
--- a/packages/app-store/giphy/components/SearchDialog.tsx
+++ b/packages/app-store/giphy/components/SearchDialog.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
 
 import classNames from "@calcom/lib/classNames";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, Dialog, DialogClose, DialogContent, DialogFooter } from "@calcom/ui";
+import { Alert, Button, Dialog, DialogClose, DialogContent, DialogFooter, Input } from "@calcom/ui";
 
 interface ISearchDialog {
   isOpenDialog: boolean;
@@ -87,15 +87,15 @@ export const SearchDialog = (props: ISearchDialog) => {
   const renderTab = (Icon: any, text: string, mode: Mode) => (
     <div
       className={classNames(
-        "flex cursor-pointer items-center border-b-2 p-2 text-sm",
-        selectedMode === mode ? "border-black" : "text-subtle border-transparent"
+        "flex cursor-pointer items-center border-b-2 p-2 text-sm ",
+        selectedMode === mode ? "text-default border-emphasis" : "text-subtle border-transparent"
       )}
       onClick={() => {
         setKeyword("");
         setGifImage("");
         setSelectedMode(mode);
       }}>
-      <Icon color={selectedMode === mode ? "black" : "grey"} className="h-4 w-4 ltr:mr-2 rtl:ml-2" />
+      <Icon className="h-4 w-4 ltr:mr-2 rtl:ml-2" />
       {text}
     </div>
   );
@@ -117,7 +117,7 @@ export const SearchDialog = (props: ISearchDialog) => {
           {t("add_gif_to_confirmation")}
         </h3>
         <p className="text-subtle mb-3 text-sm font-light">{t("find_gif_spice_confirmation")}</p>
-        <div className="flex items-center border-b border-solid">
+        <div className="border-emphasis flex items-center border-b border-solid">
           {renderTab(SearchIcon, t("search_giphy"), MODE_SEARCH)}
           {renderTab(LinkIcon, t("add_link_from_giphy"), MODE_URL)}
         </div>
@@ -125,9 +125,8 @@ export const SearchDialog = (props: ISearchDialog) => {
           className="flex w-full justify-center space-x-2 space-y-2 rtl:space-x-reverse"
           onSubmit={handleFormSubmit}>
           <div className="relative block w-full pt-2">
-            <input
+            <Input
               type="text"
-              className="border-default block w-full rounded-sm shadow-sm sm:text-sm"
               placeholder={
                 selectedMode === MODE_SEARCH
                   ? t("search_giphy")
diff --git a/packages/app-store/metapixel/DESCRIPTION.md b/packages/app-store/metapixel/DESCRIPTION.md
new file mode 100644
index 0000000000..61e7037d43
--- /dev/null
+++ b/packages/app-store/metapixel/DESCRIPTION.md
@@ -0,0 +1,8 @@
+---
+items:
+  - 1.png
+  - 2.png
+  - 3.png
+---
+
+{DESCRIPTION}
diff --git a/packages/app-store/metapixel/api/add.ts b/packages/app-store/metapixel/api/add.ts
new file mode 100644
index 0000000000..9a4afb9b2c
--- /dev/null
+++ b/packages/app-store/metapixel/api/add.ts
@@ -0,0 +1,16 @@
+import { createDefaultInstallation } from "@calcom/app-store/_utils/installation";
+import type { AppDeclarativeHandler } from "@calcom/types/AppHandler";
+
+import appConfig from "../config.json";
+
+const handler: AppDeclarativeHandler = {
+  appType: appConfig.type,
+  variant: appConfig.variant,
+  slug: appConfig.slug,
+  supportsMultipleInstalls: false,
+  handlerType: "add",
+  createCredential: ({ appType, user, slug }) =>
+    createDefaultInstallation({ appType, userId: user.id, slug, key: {} }),
+};
+
+export default handler;
diff --git a/packages/app-store/metapixel/api/index.ts b/packages/app-store/metapixel/api/index.ts
new file mode 100644
index 0000000000..4c0d2ead01
--- /dev/null
+++ b/packages/app-store/metapixel/api/index.ts
@@ -0,0 +1 @@
+export { default as add } from "./add";
diff --git a/packages/app-store/metapixel/components/EventTypeAppCardInterface.tsx b/packages/app-store/metapixel/components/EventTypeAppCardInterface.tsx
new file mode 100644
index 0000000000..58cf89df67
--- /dev/null
+++ b/packages/app-store/metapixel/components/EventTypeAppCardInterface.tsx
@@ -0,0 +1,28 @@
+import { useState } from "react";
+
+import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
+import AppCard from "@calcom/app-store/_components/AppCard";
+import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
+import { TextField } from "@calcom/ui";
+
+import type { appDataSchema } from "../zod";
+
+const EventTypeAppCard: EventTypeAppCardComponent = function EventTypeAppCard({ app }) {
+  const [getAppData, setAppData] = useAppContextWithSchema<typeof appDataSchema>();
+  const trackingId = getAppData("trackingId");
+  const [enabled, setEnabled] = useState(getAppData("enabled"));
+
+  return (
+    <AppCard setAppData={setAppData} app={app} switchOnClick={setEnabled} switchChecked={enabled}>
+      <TextField
+        name="Pixel ID"
+        value={trackingId}
+        onChange={(e) => {
+          setAppData("trackingId", e.target.value);
+        }}
+      />
+    </AppCard>
+  );
+};
+
+export default EventTypeAppCard;
diff --git a/packages/app-store/metapixel/config.json b/packages/app-store/metapixel/config.json
new file mode 100644
index 0000000000..28256d7301
--- /dev/null
+++ b/packages/app-store/metapixel/config.json
@@ -0,0 +1,27 @@
+{
+  "name": "Meta Pixel",
+  "slug": "metapixel",
+  "type": "metapixel_analytics",
+  "logo": "icon.svg",
+  "url": "https://developers.facebook.com/docs/metapixel/",
+  "variant": "analytics",
+  "categories": [
+    "analytics"
+  ],
+  "publisher": "regexyl",
+  "email": "info@regexyl.com",
+  "description": "Add Meta Pixel to your bookings page to measure, optimize and build audiences for your ad campaigns.",
+  "extendsFeature": "EventType",
+  "isTemplate": false,
+  "__createdUsingCli": true,
+  "__template": "event-type-app-card",
+  "appData": {
+    "tag": {
+      "scripts": [
+        {
+          "content": "!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,document,'script','https://connect.facebook.net/en_US/fbevents.js');fbq('init','{TRACKING_ID}');fbq('trackCustom','CalcomView');"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/app-store/metapixel/index.ts b/packages/app-store/metapixel/index.ts
new file mode 100644
index 0000000000..d7f3602204
--- /dev/null
+++ b/packages/app-store/metapixel/index.ts
@@ -0,0 +1 @@
+export * as api from "./api";
diff --git a/packages/app-store/metapixel/package.json b/packages/app-store/metapixel/package.json
new file mode 100644
index 0000000000..dd6606a3fa
--- /dev/null
+++ b/packages/app-store/metapixel/package.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "https://json.schemastore.org/package.json",
+  "private": true,
+  "name": "@calcom/metapixel",
+  "version": "0.0.0",
+  "main": "./index.ts",
+  "dependencies": {
+    "@calcom/lib": "*"
+  },
+  "devDependencies": {
+    "@calcom/types": "*"
+  },
+  "description": "Add Meta Pixel to your bookings page to measure, optimize and build audiences for your ad campaigns."
+}
diff --git a/packages/app-store/metapixel/static/1.png b/packages/app-store/metapixel/static/1.png
new file mode 100644
index 0000000000..b649ae7648
Binary files /dev/null and b/packages/app-store/metapixel/static/1.png differ
diff --git a/packages/app-store/metapixel/static/2.png b/packages/app-store/metapixel/static/2.png
new file mode 100644
index 0000000000..db61424939
Binary files /dev/null and b/packages/app-store/metapixel/static/2.png differ
diff --git a/packages/app-store/metapixel/static/3.png b/packages/app-store/metapixel/static/3.png
new file mode 100644
index 0000000000..75f58a8d02
Binary files /dev/null and b/packages/app-store/metapixel/static/3.png differ
diff --git a/packages/app-store/metapixel/static/icon.svg b/packages/app-store/metapixel/static/icon.svg
new file mode 100644
index 0000000000..444ccdf4f7
--- /dev/null
+++ b/packages/app-store/metapixel/static/icon.svg
@@ -0,0 +1,951 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100%" viewBox="0 0 3840 2160" enable-background="new 0 0 3840 2160" xml:space="preserve">
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" 
+	d="
+M2510.000000,2162.000000 
+	C1673.333496,2162.000000 837.666992,2162.000000 2.000336,2162.000000 
+	C2.000224,1442.000244 2.000224,722.000549 2.000112,2.000626 
+	C1281.999512,2.000417 2561.999023,2.000417 3841.999023,2.000209 
+	C3841.999268,721.999329 3841.999268,1441.998657 3841.999512,2161.999023 
+	C3398.333252,2162.000000 2954.666748,2162.000000 2510.000000,2162.000000 
+M396.017273,966.964172 
+	C396.078247,967.300415 396.139221,967.636597 395.530701,969.360046 
+	C391.083679,990.239441 386.636688,1011.118896 381.644043,1033.505371 
+	C381.258087,1034.414307 380.676208,1035.289917 380.514740,1036.237183 
+	C376.203705,1061.526123 371.503815,1086.758789 367.768280,1112.133301 
+	C362.910583,1145.130005 358.719604,1178.227051 354.482086,1211.311768 
+	C353.435852,1219.480469 353.318787,1227.768066 352.305695,1237.742065 
+	C350.311218,1264.495605 348.074158,1291.234009 346.407440,1318.007935 
+	C345.294647,1335.884277 344.403931,1353.812866 344.457062,1371.714966 
+	C344.555695,1404.936523 345.228210,1438.160645 346.064819,1471.373535 
+	C346.355988,1482.932617 347.838562,1494.461792 348.397919,1507.690552 
+	C349.966827,1523.748901 351.311523,1539.833496 353.183136,1555.856445 
+	C354.439941,1566.616455 356.443024,1577.289429 357.835693,1589.629028 
+	C358.679077,1594.416016 359.522461,1599.203003 360.259888,1605.617798 
+	C365.780029,1631.724976 370.570587,1658.012573 376.977936,1683.900146 
+	C388.910248,1732.109985 405.535950,1778.768799 427.089111,1823.542114 
+	C451.608246,1874.476807 481.893402,1921.624756 519.992676,1963.654541 
+	C548.541077,1995.147949 580.254883,2022.866333 615.695740,2046.261353 
+	C659.638123,2075.268311 707.294250,2096.050049 757.979492,2110.209473 
+	C795.559143,2120.707764 833.891357,2126.678711 872.672668,2129.460205 
+	C892.902832,2130.910889 913.294495,2130.113037 933.613342,2130.323486 
+	C966.281982,2130.661133 998.664429,2127.238525 1030.703125,2121.373535 
+	C1105.966797,2107.594727 1173.757324,2076.480957 1235.311279,2031.365479 
+	C1279.484131,1998.989258 1319.065552,1961.610352 1356.178955,1921.426880 
+	C1388.260742,1886.691650 1418.275024,1850.276489 1446.820679,1812.632202 
+	C1482.431519,1765.670898 1515.965576,1717.256104 1548.238770,1667.934692 
+	C1593.082031,1599.403076 1635.604370,1529.456055 1676.380493,1458.461060 
+	C1718.296143,1385.481934 1759.427734,1312.052368 1800.898193,1238.817505 
+	C1834.828491,1178.898315 1868.712646,1118.953125 1902.712646,1059.073486 
+	C1909.594604,1046.953125 1916.903076,1035.074951 1925.110474,1024.035278 
+	C1967.924438,1094.911743 2010.945679,1165.663940 2053.494629,1236.699097 
+	C2096.380859,1308.298096 2138.599121,1380.297363 2181.471191,1451.904907 
+	C2236.495605,1543.810059 2292.420898,1635.162964 2353.514893,1723.216919 
+	C2370.557617,1747.780518 2388.402588,1771.787720 2406.192627,1797.377808 
+	C2410.135986,1802.221924 2414.079590,1807.066040 2418.355225,1813.160767 
+	C2420.261963,1815.430420 2422.168701,1817.700073 2424.417480,1821.281738 
+	C2465.214844,1874.351562 2508.332275,1925.326782 2557.441162,1971.051392 
+	C2583.546631,1995.357666 2610.822998,2018.135010 2640.292725,2038.212769 
+	C2672.828369,2060.379639 2707.032715,2079.486816 2745.295654,2094.128906 
+	C2800.833984,2116.038818 2858.661133,2126.971191 2918.120850,2129.636230 
+	C2965.358398,2131.753174 3012.449951,2130.684570 3059.198730,2122.304932 
+	C3095.446289,2115.807861 3130.298096,2104.907227 3164.256836,2090.877930 
+	C3187.299561,2081.358398 3208.990967,2069.264404 3230.114014,2056.138184 
+	C3240.307373,2049.803711 3250.577148,2043.454956 3260.036133,2036.112671 
+	C3270.111572,2028.291626 3279.201660,2019.210449 3288.863037,2010.841919 
+	C3292.555664,2007.643311 3297.062744,2005.313232 3300.463867,2001.863159 
+	C3310.385742,1991.799072 3319.936523,1981.369751 3330.699219,1970.386475 
+	C3345.060791,1951.661133 3360.370850,1933.579346 3373.594482,1914.082397 
+	C3405.333008,1867.287964 3428.903809,1816.302124 3447.217041,1762.916260 
+	C3473.758545,1685.543457 3488.950928,1605.761230 3495.841553,1524.397949 
+	C3498.641113,1491.341431 3500.604980,1458.165039 3501.430664,1425.005493 
+	C3502.158936,1395.761230 3500.912842,1366.461426 3500.269043,1337.192139 
+	C3499.896484,1320.255859 3499.215820,1303.318604 3498.270996,1286.404419 
+	C3497.011963,1263.874023 3495.449951,1241.359131 3493.848145,1218.849731 
+	C3492.750000,1203.418335 3490.540283,1188.099243 3489.291992,1172.659058 
+	C3487.424316,1149.557495 3484.071289,1126.517334 3480.176758,1103.650879 
+	C3472.766846,1060.143433 3465.275146,1016.624268 3456.441162,973.391235 
+	C3445.527344,919.978821 3431.054932,867.441101 3414.729736,815.399353 
+	C3390.804688,739.131531 3361.827148,664.873108 3327.167969,592.864441 
+	C3297.103760,530.402527 3262.684570,470.405304 3223.582031,413.136932 
+	C3188.253418,361.395874 3149.292236,312.526428 3105.742432,267.488525 
+	C3086.796387,247.894852 3066.824951,229.203293 3046.384277,211.161331 
+	C2991.976318,163.138443 2932.407471,122.783264 2866.512451,91.940331 
+	C2795.618652,58.757664 2721.447266,38.461437 2643.143311,34.280968 
+	C2595.480957,31.736374 2548.195068,34.548454 2501.432861,44.966084 
+	C2439.469971,58.770096 2381.937988,83.221855 2327.608887,115.713722 
+	C2264.400879,153.515762 2208.356201,200.392288 2155.938477,251.737289 
+	C2136.939941,270.347137 2118.720703,289.820709 2101.061523,309.713226 
+	C2077.458740,336.301483 2054.269043,363.290497 2031.788086,390.830994 
+	C2009.294678,418.386810 1987.892578,446.833527 1964.901733,473.992157 
+	C1957.049194,464.205841 1949.315918,454.320618 1941.305908,444.664948 
+	C1935.039551,437.111328 1928.430298,429.842194 1920.971680,421.497467 
+	C1915.827759,415.100555 1910.948730,408.467529 1905.493652,402.347809 
+	C1882.363647,376.399780 1859.248779,350.433380 1835.752930,324.817902 
+	C1822.052734,309.881622 1808.075195,295.145111 1793.448853,281.125793 
+	C1772.812378,261.345825 1752.003540,241.678589 1730.306885,223.084946 
+	C1674.805176,175.520981 1615.193481,134.055664 1549.503296,101.392632 
+	C1471.372314,62.543747 1388.800415,40.415920 1302.030273,34.621109 
+	C1259.326050,31.769173 1216.427002,32.356586 1173.822754,38.281780 
+	C1140.212524,42.956116 1107.143799,50.072224 1074.756836,60.222172 
+	C996.805359,84.651833 926.022461,122.865204 860.813171,171.746674 
+	C810.850525,209.199173 765.917297,252.067734 724.110840,298.350037 
+	C686.125061,340.402679 652.117737,385.509583 620.604248,432.522064 
+	C594.285339,471.785065 570.445007,512.564209 548.217712,554.262756 
+	C540.259827,569.191833 533.347046,584.677979 524.877563,600.773804 
+	C516.457947,618.807861 507.770294,636.722412 499.669006,654.898376 
+	C475.205322,709.784912 453.860352,765.885071 435.903198,823.225159 
+	C426.900055,851.973633 418.963989,881.056335 409.893982,911.424622 
+	C405.435883,929.639954 400.977783,947.855286 396.017273,966.964172 
+z"/>
+<path fill="#0081FA" opacity="1.000000" stroke="none" 
+	d="
+M1966.012207,474.889740 
+	C1987.892578,446.833527 2009.294678,418.386810 2031.788086,390.830994 
+	C2054.269043,363.290497 2077.458740,336.301483 2101.061523,309.713226 
+	C2118.720703,289.820709 2136.939941,270.347137 2155.938477,251.737289 
+	C2208.356201,200.392288 2264.400879,153.515762 2327.608887,115.713722 
+	C2381.937988,83.221855 2439.469971,58.770096 2501.432861,44.966084 
+	C2548.195068,34.548454 2595.480957,31.736374 2643.143311,34.280968 
+	C2721.447266,38.461437 2795.618652,58.757664 2866.512451,91.940331 
+	C2932.407471,122.783264 2991.976318,163.138443 3046.384277,211.161331 
+	C3066.824951,229.203293 3086.796387,247.894852 3105.742432,267.488525 
+	C3149.292236,312.526428 3188.253418,361.395874 3223.582031,413.136932 
+	C3262.684570,470.405304 3297.103760,530.402527 3327.167969,592.864441 
+	C3361.827148,664.873108 3390.804688,739.131531 3414.729736,815.399353 
+	C3431.054932,867.441101 3445.527344,919.978821 3456.441162,973.391235 
+	C3465.275146,1016.624268 3472.766846,1060.143433 3480.176758,1103.650879 
+	C3484.071289,1126.517334 3487.424316,1149.557495 3489.291992,1172.659058 
+	C3490.540283,1188.099243 3492.750000,1203.418335 3493.848145,1218.849731 
+	C3495.449951,1241.359131 3497.011963,1263.874023 3498.270996,1286.404419 
+	C3499.215820,1303.318604 3499.896484,1320.255859 3500.269043,1337.192139 
+	C3500.912842,1366.461426 3502.158936,1395.761230 3501.430664,1425.005493 
+	C3500.604980,1458.165039 3498.641113,1491.341431 3495.841553,1524.397949 
+	C3488.950928,1605.761230 3473.758545,1685.543457 3447.217041,1762.916260 
+	C3428.903809,1816.302124 3405.333008,1867.287964 3373.594482,1914.082397 
+	C3360.370850,1933.579346 3345.060791,1951.661133 3329.297363,1970.246094 
+	C3324.364990,1969.404053 3320.849854,1968.206177 3317.301270,1968.097168 
+	C3307.978760,1967.810913 3298.640625,1968.093628 3289.311035,1967.968018 
+	C3281.750488,1967.866211 3280.752930,1967.389160 3279.142090,1959.890747 
+	C3278.041504,1954.768799 3278.202148,1949.353149 3278.033447,1944.061279 
+	C3277.906250,1940.074707 3277.265137,1936.061279 3272.459961,1936.251465 
+	C3265.689697,1936.519531 3263.926758,1932.251831 3262.696533,1927.177734 
+	C3261.657227,1922.890747 3259.901611,1919.715454 3254.781250,1919.971313 
+	C3250.187012,1920.200562 3248.227783,1917.370361 3247.556152,1913.321533 
+	C3246.963623,1909.748779 3246.101074,1906.156250 3246.069824,1902.566284 
+	C3245.916016,1884.905029 3246.065186,1867.241333 3245.968994,1849.579224 
+	C3245.927246,1841.927246 3245.820557,1841.720215 3237.952148,1840.041016 
+	C3234.537598,1839.312256 3232.510254,1837.799072 3231.876709,1834.461792 
+	C3231.201416,1830.901489 3230.230225,1827.338867 3230.083496,1823.748901 
+	C3229.797852,1816.762085 3229.891357,1809.753540 3230.029297,1802.757812 
+	C3230.147217,1796.777832 3228.210449,1792.824829 3221.937012,1790.823242 
+	C3214.000488,1788.290527 3214.042969,1787.869141 3214.018555,1779.517090 
+	C3213.961182,1759.855103 3214.276123,1740.187744 3213.913086,1720.532349 
+	C3213.619385,1704.618530 3215.284668,1688.677246 3212.293945,1672.754639 
+	C3211.290527,1667.411499 3209.787842,1663.714355 3204.697998,1662.602051 
+	C3198.665283,1661.283569 3197.900391,1657.427734 3197.939697,1652.253540 
+	C3198.089111,1632.592651 3198.123535,1612.928589 3197.922363,1593.268555 
+	C3197.866455,1587.812378 3199.469971,1584.749756 3205.135010,1583.209839 
+	C3215.337891,1580.436157 3213.968506,1579.165039 3213.987549,1570.527588 
+	C3214.028320,1552.198608 3213.989746,1533.869507 3214.004883,1515.540405 
+	C3214.012451,1506.136597 3213.282959,1505.399536 3222.801270,1502.811279 
+	C3228.403076,1501.287964 3230.175049,1498.312988 3230.082031,1492.798584 
+	C3229.834961,1478.139648 3230.040039,1463.473389 3229.984619,1448.810303 
+	C3229.951172,1439.975586 3229.996338,1439.617920 3221.441162,1436.918335 
+	C3216.189697,1435.261108 3213.872314,1432.801270 3213.903809,1427.069458 
+	C3214.100830,1391.078735 3214.082520,1355.086304 3213.920410,1319.095337 
+	C3213.896240,1313.746460 3216.094238,1311.231079 3221.063477,1310.096680 
+	C3229.895752,1308.080566 3229.975098,1307.960205 3229.982178,1299.317017 
+	C3230.020020,1252.994385 3230.023926,1206.671753 3229.979004,1160.349121 
+	C3229.969971,1151.249756 3229.477295,1150.565063 3220.678223,1147.877319 
+	C3216.361816,1146.558838 3213.803223,1144.566528 3213.932129,1139.543091 
+	C3214.188477,1129.552002 3214.077393,1119.549194 3213.983398,1109.552368 
+	C3213.942871,1105.270264 3215.561279,1102.530518 3219.960938,1101.765625 
+	C3228.175049,1100.337646 3230.189209,1095.038208 3230.114502,1087.310547 
+	C3229.830811,1057.986694 3230.020020,1028.658569 3229.988525,999.331970 
+	C3229.978516,989.966370 3229.947266,989.880432 3221.027832,986.643860 
+	C3217.848145,985.489929 3213.926025,984.845154 3214.214600,980.631958 
+	C3214.674805,973.913269 3210.486328,972.115234 3205.353516,970.699097 
+	C3202.187012,969.825562 3197.992920,969.201904 3198.295166,964.957092 
+	C3198.814697,957.663391 3193.995117,955.973938 3188.714355,954.507202 
+	C3185.319824,953.564453 3182.452881,952.444824 3182.034668,948.263184 
+	C3181.508545,943.005005 3180.123779,937.769775 3180.169922,932.533997 
+	C3180.220947,926.737488 3177.353271,923.860657 3172.457764,922.440979 
+	C3168.984863,921.433899 3165.819580,920.164062 3166.132568,916.022339 
+	C3166.610352,909.699646 3162.320312,908.330139 3157.719971,906.838318 
+	C3154.673340,905.850281 3150.174561,905.575256 3150.381836,901.340088 
+	C3150.755615,893.705139 3145.866211,891.724548 3140.136963,890.327698 
+	C3136.489990,889.438538 3133.925293,887.756653 3134.060303,883.674622 
+	C3134.300537,876.419861 3129.657959,875.671387 3123.717773,875.374695 
+	C3117.249756,856.461182 3111.370117,838.106140 3105.083984,819.891418 
+	C3080.725098,749.307983 3050.718750,681.249329 3013.921875,616.217529 
+	C2981.187500,558.366089 2943.257324,504.229218 2897.911377,455.566467 
+	C2865.584717,420.875366 2829.772461,390.095032 2789.463379,364.861877 
+	C2732.377686,329.126862 2670.895508,307.021423 2602.993164,304.158508 
+	C2569.782471,302.758301 2537.328125,306.423309 2505.437744,315.433136 
+	C2460.655029,328.085358 2420.707764,350.272766 2383.605713,377.919891 
+	C2345.022461,406.670746 2310.688232,440.036011 2278.817139,475.925049 
+	C2240.786865,518.749939 2205.948486,564.121277 2173.394043,611.229797 
+	C2155.796631,636.694031 2138.561035,662.407959 2120.683105,687.587952 
+	C2115.475098,680.775757 2110.613770,674.478027 2106.040283,667.977722 
+	C2087.332520,641.388733 2069.022461,614.513672 2049.978027,588.169067 
+	C2028.232910,558.088623 2005.869629,528.454956 1983.759277,498.638611 
+	C1977.872925,490.700562 1971.929443,482.804871 1966.012207,474.889740 
+z"/>
+<path fill="#0081FB" opacity="1.000000" stroke="none" 
+	d="
+M1924.014893,1023.084961 
+	C1916.903076,1035.074951 1909.594604,1046.953125 1902.712646,1059.073486 
+	C1868.712646,1118.953125 1834.828491,1178.898315 1800.898193,1238.817505 
+	C1759.427734,1312.052368 1718.296143,1385.481934 1676.380493,1458.461060 
+	C1635.604370,1529.456055 1593.082031,1599.403076 1548.238770,1667.934692 
+	C1515.965576,1717.256104 1482.431519,1765.670898 1446.820679,1812.632202 
+	C1418.275024,1850.276489 1388.260742,1886.691650 1356.178955,1921.426880 
+	C1319.065552,1961.610352 1279.484131,1998.989258 1235.311279,2031.365479 
+	C1173.757324,2076.480957 1105.966797,2107.594727 1030.703125,2121.373535 
+	C998.664429,2127.238525 966.281982,2130.661133 933.613342,2130.323486 
+	C913.294495,2130.113037 892.902832,2130.910889 872.672668,2129.460205 
+	C833.891357,2126.678711 795.559143,2120.707764 757.979492,2110.209473 
+	C707.294250,2096.050049 659.638123,2075.268311 615.695740,2046.261353 
+	C580.254883,2022.866333 548.541077,1995.147949 519.992676,1963.654541 
+	C481.893402,1921.624756 451.608246,1874.476807 427.089111,1823.542114 
+	C405.535950,1778.768799 388.910248,1732.109985 376.977936,1683.900146 
+	C370.570587,1658.012573 365.780029,1631.724976 361.009888,1604.637573 
+	C364.176819,1599.073975 366.593781,1594.490479 369.077972,1589.779541 
+	C366.324738,1584.499146 362.009186,1587.425293 358.112213,1588.001343 
+	C356.443024,1577.289429 354.439941,1566.616455 353.183136,1555.856445 
+	C351.311523,1539.833496 349.966827,1523.748901 349.469910,1506.844360 
+	C358.536072,1505.993896 366.530273,1505.997559 374.524475,1505.982666 
+	C379.669708,1505.973145 383.439331,1503.944946 385.414948,1498.911987 
+	C388.908264,1490.012573 388.967133,1490.034546 398.594727,1490.000977 
+	C400.593262,1489.994019 402.592926,1490.041870 404.590240,1489.991333 
+	C413.728851,1489.760132 414.998810,1488.619263 418.128693,1479.964600 
+	C418.914917,1477.790649 420.931824,1474.664551 422.656586,1474.475952 
+	C429.120392,1473.769043 432.547546,1469.702271 434.466553,1466.003174 
+	C440.951263,1466.003174 446.235809,1465.610107 451.422821,1466.151733 
+	C454.489563,1466.472046 458.116272,1467.529663 460.226685,1469.566040 
+	C463.962433,1473.171143 467.926147,1474.208008 472.847839,1474.068604 
+	C481.501343,1473.823608 490.168488,1473.897705 498.826843,1474.034302 
+	C506.360748,1474.153198 506.358917,1474.272705 508.019897,1481.426270 
+	C509.564392,1488.077881 511.336029,1489.700317 518.099915,1489.958374 
+	C523.422058,1490.161499 528.808411,1489.625488 534.059204,1490.278442 
+	C536.074585,1490.529053 537.793335,1493.164917 539.647278,1494.713989 
+	C538.111816,1496.247925 536.824951,1498.340210 534.973572,1499.164795 
+	C532.966187,1500.058838 530.436462,1499.909790 528.128113,1499.969727 
+	C523.800659,1500.082520 519.468506,1500.038696 515.138428,1500.021118 
+	C510.786285,1500.003296 508.740936,1501.949341 507.914734,1506.440918 
+	C506.325775,1515.078857 505.005798,1515.889526 495.866943,1515.980591 
+	C486.874207,1516.070312 477.877625,1515.876953 468.887115,1516.043823 
+	C461.315216,1516.184204 460.276031,1517.359863 460.005615,1524.746094 
+	C459.677185,1533.716919 461.809479,1537.307739 468.440796,1537.883667 
+	C473.070282,1538.285767 477.764771,1538.114990 482.422760,1537.966553 
+	C487.578857,1537.802246 491.750031,1538.543213 492.266785,1544.997314 
+	C492.379852,1546.409546 493.594177,1548.159912 494.819489,1548.982788 
+	C499.991699,1552.455444 511.218323,1549.654053 513.601562,1543.672729 
+	C515.492676,1538.926270 518.378662,1537.677002 522.748108,1538.016479 
+	C539.108948,1539.287231 555.130371,1536.675659 571.173401,1534.040649 
+	C574.412354,1533.508667 577.429749,1532.847778 577.703430,1529.225830 
+	C578.244690,1522.062744 582.983765,1521.773071 588.341125,1521.981934 
+	C591.001709,1522.085693 593.687805,1522.191895 596.331177,1521.952637 
+	C603.023499,1521.346924 608.831360,1519.344971 610.054077,1511.534180 
+	C610.696716,1507.428711 613.256592,1506.018188 617.053467,1506.021973 
+	C621.050476,1506.026001 625.074463,1506.281494 629.038269,1505.910400 
+	C635.380432,1505.316772 640.846313,1503.057373 641.987610,1495.816528 
+	C642.729065,1491.112915 645.648499,1489.938354 649.762756,1489.998413 
+	C653.426025,1490.051880 657.090637,1490.035156 660.754456,1490.013794 
+	C663.999756,1489.994873 666.830994,1490.786377 667.745361,1494.324341 
+	C669.568359,1501.378418 674.736328,1502.405151 680.895508,1502.031250 
+	C683.882385,1501.849731 686.889343,1501.999268 690.088684,1502.795410 
+	C690.733948,1505.526001 691.400696,1507.438599 691.588196,1509.397217 
+	C694.637756,1541.244019 701.159607,1572.422485 710.374451,1602.996216 
+	C722.666931,1643.781006 740.373474,1681.909424 767.833435,1714.946045 
+	C798.488586,1751.827271 837.225525,1775.501953 884.314453,1784.843018 
+	C906.824768,1789.308472 929.541443,1790.439575 952.617065,1788.559448 
+	C982.114502,1786.156372 1010.303406,1779.698975 1037.116577,1767.224365 
+	C1071.303955,1751.318726 1100.578369,1728.435547 1127.730225,1702.713257 
+	C1155.300537,1676.594727 1180.119873,1647.921387 1203.855713,1618.325562 
+	C1253.023438,1557.019165 1297.733276,1492.481201 1341.274170,1427.138794 
+	C1371.718140,1381.451050 1401.547974,1335.349365 1431.275269,1289.189941 
+	C1457.571167,1248.358765 1483.262451,1207.138794 1509.386719,1166.196533 
+	C1522.265625,1146.012573 1535.520020,1126.068237 1549.476807,1106.011475 
+	C1555.343628,1105.994751 1560.345703,1106.148193 1565.330811,1105.925537 
+	C1571.197876,1105.663696 1575.401123,1102.821655 1577.310059,1097.083252 
+	C1578.018066,1094.955322 1578.568481,1092.774902 1579.374512,1089.981812 
+	C1586.710449,1089.981812 1593.666016,1090.191772 1600.602661,1089.919678 
+	C1606.909302,1089.672363 1609.586670,1086.956299 1609.927002,1080.700806 
+	C1610.197998,1075.720459 1610.087036,1070.712769 1609.982544,1065.720459 
+	C1609.887573,1061.192749 1611.674683,1057.098999 1615.995972,1056.558594 
+	C1625.801392,1055.332520 1626.441406,1048.961060 1626.020386,1041.414185 
+	C1625.890747,1039.090698 1626.063354,1036.751709 1625.992065,1034.423096 
+	C1625.814331,1028.613281 1628.126587,1024.851196 1634.226807,1023.967224 
+	C1638.731567,1023.314331 1641.355469,1020.656311 1641.973511,1016.142700 
+	C1642.657959,1011.143311 1645.536499,1008.671082 1650.466309,1007.886597 
+	C1656.002686,1007.005432 1658.130981,1003.240112 1658.012695,997.866699 
+	C1657.924683,993.873047 1658.068481,989.874390 1657.988892,985.880371 
+	C1657.890625,980.944824 1659.843262,977.038818 1664.810913,976.309021 
+	C1672.229614,975.219177 1673.587280,970.188171 1673.961426,964.203552 
+	C1674.148071,961.218323 1673.931641,958.210083 1674.014771,955.215576 
+	C1674.229492,947.484558 1674.706421,946.556335 1682.470215,944.047974 
+	C1685.776611,942.979614 1687.593140,941.468201 1687.981812,938.001038 
+	C1688.533203,933.082092 1689.790283,928.197449 1689.875977,923.282959 
+	C1689.974243,917.653748 1691.462891,913.594849 1697.299316,911.884827 
+	C1703.860596,909.962463 1704.263184,904.697205 1704.021240,899.074341 
+	C1703.781006,893.492310 1704.890259,887.436401 1697.034058,885.615417 
+	C1695.676636,885.300781 1694.825684,882.801514 1693.872070,880.649719 
+	C1704.937012,862.964294 1715.756958,845.866150 1726.835815,828.937317 
+	C1738.446655,811.195435 1750.305908,793.616028 1762.657959,776.273987 
+	C1772.448242,789.540955 1782.042847,802.233154 1790.754517,815.504944 
+	C1826.250610,869.582031 1861.581787,923.768250 1896.731934,978.070801 
+	C1906.261963,992.793518 1914.943726,1008.065247 1924.014893,1023.084961 
+z"/>
+<path fill="#0264E0" opacity="1.000000" stroke="none" 
+	d="
+M525.957214,599.909912 
+	C533.347046,584.677979 540.259827,569.191833 548.217712,554.262756 
+	C570.445007,512.564209 594.285339,471.785065 620.604248,432.522064 
+	C652.117737,385.509583 686.125061,340.402679 724.110840,298.350037 
+	C765.917297,252.067734 810.850525,209.199173 860.813171,171.746674 
+	C926.022461,122.865204 996.805359,84.651833 1074.756836,60.222172 
+	C1107.143799,50.072224 1140.212524,42.956116 1173.822754,38.281780 
+	C1216.427002,32.356586 1259.326050,31.769173 1302.030273,34.621109 
+	C1388.800415,40.415920 1471.372314,62.543747 1549.503296,101.392632 
+	C1615.193481,134.055664 1674.805176,175.520981 1730.306885,223.084946 
+	C1752.003540,241.678589 1772.812378,261.345825 1793.448853,281.125793 
+	C1808.075195,295.145111 1822.052734,309.881622 1835.752930,324.817902 
+	C1859.248779,350.433380 1882.363647,376.399780 1905.493652,402.347809 
+	C1910.948730,408.467529 1915.827759,415.100555 1921.346802,422.614594 
+	C1921.105835,424.482330 1920.606323,425.384186 1919.856812,425.961792 
+	C1895.219360,444.949066 1870.595215,463.953766 1845.891724,482.854828 
+	C1809.104126,511.001648 1772.276123,539.095703 1735.429321,567.164795 
+	C1716.743408,581.399231 1698.026978,595.594421 1679.227295,609.677979 
+	C1670.773438,616.011169 1662.082153,622.027588 1652.899414,627.916321 
+	C1622.792725,591.597046 1591.958984,556.771118 1558.728149,524.062073 
+	C1526.395752,492.237183 1492.049438,462.967041 1453.823242,438.413879 
+	C1423.747559,419.096039 1391.963501,403.349548 1357.748413,392.712799 
+	C1331.004150,384.398529 1303.709595,379.533722 1275.727051,377.450897 
+	C1253.802612,375.818970 1232.001099,375.556000 1210.313843,378.614563 
+	C1163.442017,385.224945 1120.801636,403.155640 1081.189453,428.641052 
+	C1039.184692,455.665894 1002.813293,489.137085 970.127930,526.703613 
+	C926.924255,576.359253 890.901733,630.930481 859.821899,688.855042 
+	C854.183105,699.364319 848.289551,709.736938 841.733582,720.118652 
+	C837.636536,718.687683 833.699036,718.020813 831.135803,715.781067 
+	C826.285400,711.542664 821.140564,709.448608 814.773315,709.968628 
+	C811.343201,710.248657 807.948242,709.915771 806.204956,706.303467 
+	C804.015930,701.767639 800.001770,702.096436 795.949707,701.943115 
+	C792.025208,701.794739 786.550171,702.642151 784.513184,700.468506 
+	C779.432983,695.047424 773.895020,693.625854 766.968811,693.631287 
+	C764.311890,693.633362 761.125122,691.771912 759.112183,689.805237 
+	C755.620605,686.394043 751.710999,685.906128 747.244751,685.924805 
+	C743.647888,685.939819 738.533203,686.650330 736.743835,684.663696 
+	C732.030212,679.430664 725.116516,678.551025 720.216919,674.565613 
+	C715.610168,670.818481 711.073608,670.068970 705.610657,669.812134 
+	C701.880249,669.636719 697.364136,668.645386 694.778381,666.287354 
+	C691.842773,663.610168 689.277039,662.063416 685.373230,661.769226 
+	C683.222717,661.607178 680.302612,660.585022 679.250977,658.963745 
+	C675.932251,653.846985 671.196228,653.644226 666.106506,654.020508 
+	C660.560974,654.430359 655.636292,653.710938 651.742065,648.986755 
+	C650.437927,647.404785 647.792664,646.899719 645.724182,645.984253 
+	C643.622681,645.054138 640.485657,644.825317 639.527649,643.244080 
+	C636.075439,637.546021 630.853149,638.195068 625.505432,637.861450 
+	C622.024048,637.644348 617.520630,637.139221 615.442505,634.920410 
+	C612.145630,631.400513 608.817261,629.940247 604.280640,629.608948 
+	C602.470703,629.476807 600.017456,628.359985 599.146606,626.914612 
+	C595.947998,621.605530 591.040527,621.680054 586.001526,622.034546 
+	C580.423584,622.426819 575.703430,621.427856 571.609619,616.973816 
+	C569.892883,615.106018 566.384033,614.561279 563.578064,614.108215 
+	C560.656372,613.636536 557.476929,613.455750 554.624207,614.098022 
+	C544.499451,616.377136 540.113953,604.130371 530.522034,604.808350 
+	C529.122864,604.907288 527.484802,601.626709 525.957214,599.909912 
+z"/>
+<path fill="#0769E1" opacity="1.000000" stroke="none" 
+	d="
+M1653.498657,628.187744 
+	C1662.082153,622.027588 1670.773438,616.011169 1679.227295,609.677979 
+	C1698.026978,595.594421 1716.743408,581.399231 1735.429321,567.164795 
+	C1772.276123,539.095703 1809.104126,511.001648 1845.891724,482.854828 
+	C1870.595215,463.953766 1895.219360,444.949066 1919.856812,425.961792 
+	C1920.606323,425.384186 1921.105835,424.482330 1921.847656,423.089172 
+	C1928.430298,429.842194 1935.039551,437.111328 1941.305908,444.664948 
+	C1949.315918,454.320618 1957.049194,464.205841 1965.457031,474.440918 
+	C1971.929443,482.804871 1977.872925,490.700562 1983.759277,498.638611 
+	C2005.869629,528.454956 2028.232910,558.088623 2049.978027,588.169067 
+	C2069.022461,614.513672 2087.332520,641.388733 2106.040283,667.977722 
+	C2110.613770,674.478027 2115.475098,680.775757 2120.792480,688.318604 
+	C2137.757812,714.539124 2154.416748,739.428955 2170.453125,764.713501 
+	C2203.237061,816.403442 2236.358398,867.897522 2268.131592,920.206970 
+	C2331.160645,1023.974548 2392.733398,1128.629761 2456.130127,1232.169922 
+	C2502.684570,1308.203247 2551.182861,1383.046143 2598.819580,1458.416626 
+	C2606.621094,1470.760376 2614.444092,1483.090332 2621.954590,1496.097168 
+	C2618.607422,1499.165527 2615.891357,1502.333008 2612.450439,1503.802002 
+	C2605.073486,1506.951294 2604.152588,1507.446167 2604.032471,1515.132568 
+	C2603.897705,1523.789062 2604.108398,1532.451172 2603.963867,1541.107300 
+	C2603.843994,1548.286621 2602.694336,1549.708496 2596.233154,1551.973877 
+	C2588.952637,1554.526489 2588.151611,1555.529907 2588.024658,1563.421997 
+	C2587.912109,1570.413696 2587.739502,1577.420410 2588.056885,1584.399536 
+	C2588.638184,1597.189209 2586.568604,1600.786499 2571.913086,1600.059448 
+	C2564.936768,1599.713501 2557.926514,1599.886475 2550.936279,1600.034058 
+	C2543.345947,1600.194214 2541.174805,1601.625488 2540.164795,1608.753540 
+	C2539.476074,1613.615112 2537.586426,1615.498047 2532.730713,1616.164673 
+	C2525.914307,1617.100342 2524.348389,1619.297485 2524.039795,1625.958984 
+	C2523.854980,1629.946777 2524.055420,1633.950806 2523.989258,1637.946167 
+	C2523.839600,1646.980225 2523.061035,1648.294434 2514.366943,1649.922241 
+	C2509.858154,1650.766357 2507.992188,1652.881714 2508.016602,1657.209961 
+	C2508.042725,1661.872070 2508.115234,1666.537964 2507.971924,1671.196045 
+	C2507.731934,1678.994263 2505.926758,1680.896851 2498.125000,1682.001465 
+	C2490.575684,1683.070557 2490.143555,1683.447021 2490.030518,1691.491577 
+	C2489.904297,1700.481567 2490.041016,1709.474731 2489.988525,1718.466064 
+	C2489.933350,1727.900146 2489.933838,1728.102905 2480.367920,1729.940796 
+	C2476.506104,1730.682983 2473.896973,1732.197632 2474.138916,1736.204590 
+	C2474.559082,1743.160889 2471.037354,1745.869751 2464.662109,1746.018921 
+	C2460.758545,1746.110229 2457.939209,1747.873291 2458.169922,1751.928223 
+	C2458.598389,1759.460449 2454.672363,1761.946777 2447.941162,1762.106445 
+	C2443.852051,1762.203369 2441.835693,1764.765625 2442.097900,1768.652100 
+	C2442.538086,1775.177490 2439.103027,1777.794556 2433.211670,1777.949463 
+	C2428.223145,1778.080566 2426.368164,1780.488892 2425.892090,1785.367188 
+	C2425.209473,1792.360596 2423.708740,1793.238159 2416.490723,1794.037598 
+	C2412.923096,1794.432861 2409.414795,1795.362427 2405.879639,1796.050171 
+	C2388.402588,1771.787720 2370.557617,1747.780518 2353.514893,1723.216919 
+	C2292.420898,1635.162964 2236.495605,1543.810059 2181.471191,1451.904907 
+	C2138.599121,1380.297363 2096.380859,1308.298096 2053.494629,1236.699097 
+	C2010.945679,1165.663940 1967.924438,1094.911743 1924.562744,1023.560120 
+	C1914.943726,1008.065247 1906.261963,992.793518 1896.731934,978.070801 
+	C1861.581787,923.768250 1826.250610,869.582031 1790.754517,815.504944 
+	C1782.042847,802.233154 1772.448242,789.540955 1762.550049,775.586182 
+	C1739.096924,743.117676 1716.540894,711.507324 1693.536255,680.227051 
+	C1680.572388,662.599670 1666.869019,645.516174 1653.498657,628.187744 
+z"/>
+<path fill="#027BF3" opacity="1.000000" stroke="none" 
+	d="
+M3124.119141,875.997559 
+	C3129.657959,875.671387 3134.300537,876.419861 3134.060303,883.674622 
+	C3133.925293,887.756653 3136.489990,889.438538 3140.136963,890.327698 
+	C3145.866211,891.724548 3150.755615,893.705139 3150.381836,901.340088 
+	C3150.174561,905.575256 3154.673340,905.850281 3157.719971,906.838318 
+	C3162.320312,908.330139 3166.610352,909.699646 3166.132568,916.022339 
+	C3165.819580,920.164062 3168.984863,921.433899 3172.457764,922.440979 
+	C3177.353271,923.860657 3180.220947,926.737488 3180.169922,932.533997 
+	C3180.123779,937.769775 3181.508545,943.005005 3182.034668,948.263184 
+	C3182.452881,952.444824 3185.319824,953.564453 3188.714355,954.507202 
+	C3193.995117,955.973938 3198.814697,957.663391 3198.295166,964.957092 
+	C3197.992920,969.201904 3202.187012,969.825562 3205.353516,970.699097 
+	C3210.486328,972.115234 3214.674805,973.913269 3214.214600,980.631958 
+	C3213.926025,984.845154 3217.848145,985.489929 3221.027832,986.643860 
+	C3229.947266,989.880432 3229.978516,989.966370 3229.988525,999.331970 
+	C3230.020020,1028.658569 3229.830811,1057.986694 3230.114502,1087.310547 
+	C3230.189209,1095.038208 3228.175049,1100.337646 3219.960938,1101.765625 
+	C3215.561279,1102.530518 3213.942871,1105.270264 3213.983398,1109.552368 
+	C3214.077393,1119.549194 3214.188477,1129.552002 3213.932129,1139.543091 
+	C3213.803223,1144.566528 3216.361816,1146.558838 3220.678223,1147.877319 
+	C3229.477295,1150.565063 3229.969971,1151.249756 3229.979004,1160.349121 
+	C3230.023926,1206.671753 3230.020020,1252.994385 3229.982178,1299.317017 
+	C3229.975098,1307.960205 3229.895752,1308.080566 3221.063477,1310.096680 
+	C3216.094238,1311.231079 3213.896240,1313.746460 3213.920410,1319.095337 
+	C3214.082520,1355.086304 3214.100830,1391.078735 3213.903809,1427.069458 
+	C3213.872314,1432.801270 3216.189697,1435.261108 3221.441162,1436.918335 
+	C3229.996338,1439.617920 3229.951172,1439.975586 3229.984619,1448.810303 
+	C3230.040039,1463.473389 3229.834961,1478.139648 3230.082031,1492.798584 
+	C3230.175049,1498.312988 3228.403076,1501.287964 3222.801270,1502.811279 
+	C3213.282959,1505.399536 3214.012451,1506.136597 3214.004883,1515.540405 
+	C3213.989746,1533.869507 3214.028320,1552.198608 3213.987549,1570.527588 
+	C3213.968506,1579.165039 3215.337891,1580.436157 3205.135010,1583.209839 
+	C3199.469971,1584.749756 3197.866455,1587.812378 3197.922363,1593.268555 
+	C3198.123535,1612.928589 3198.089111,1632.592651 3197.939697,1652.253540 
+	C3197.900391,1657.427734 3198.665283,1661.283569 3204.697998,1662.602051 
+	C3209.787842,1663.714355 3211.290527,1667.411499 3212.293945,1672.754639 
+	C3215.284668,1688.677246 3213.619385,1704.618530 3213.913086,1720.532349 
+	C3214.276123,1740.187744 3213.961182,1759.855103 3214.018555,1779.517090 
+	C3214.042969,1787.869141 3214.000488,1788.290527 3221.937012,1790.823242 
+	C3228.210449,1792.824829 3230.147217,1796.777832 3230.029297,1802.757812 
+	C3229.891357,1809.753540 3229.797852,1816.762085 3230.083496,1823.748901 
+	C3230.230225,1827.338867 3231.201416,1830.901489 3231.876709,1834.461792 
+	C3232.510254,1837.799072 3234.537598,1839.312256 3237.952148,1840.041016 
+	C3245.820557,1841.720215 3245.927246,1841.927246 3245.968994,1849.579224 
+	C3246.065186,1867.241333 3245.916016,1884.905029 3246.069824,1902.566284 
+	C3246.101074,1906.156250 3246.963623,1909.748779 3247.556152,1913.321533 
+	C3248.227783,1917.370361 3250.187012,1920.200562 3254.781250,1919.971313 
+	C3259.901611,1919.715454 3261.657227,1922.890747 3262.696533,1927.177734 
+	C3263.926758,1932.251831 3265.689697,1936.519531 3272.459961,1936.251465 
+	C3277.265137,1936.061279 3277.906250,1940.074707 3278.033447,1944.061279 
+	C3278.202148,1949.353149 3278.041504,1954.768799 3279.142090,1959.890747 
+	C3280.752930,1967.389160 3281.750488,1967.866211 3289.311035,1967.968018 
+	C3298.640625,1968.093628 3307.978760,1967.810913 3317.301270,1968.097168 
+	C3320.849854,1968.206177 3324.364990,1969.404053 3328.764160,1970.594604 
+	C3319.936523,1981.369751 3310.385742,1991.799072 3300.463867,2001.863159 
+	C3297.062744,2005.313232 3292.555664,2007.643311 3288.863037,2010.841919 
+	C3279.201660,2019.210449 3270.111572,2028.291626 3260.036133,2036.112671 
+	C3250.577148,2043.454956 3240.307373,2049.803711 3230.114014,2056.138184 
+	C3208.990967,2069.264404 3187.299561,2081.358398 3164.256836,2090.877930 
+	C3130.298096,2104.907227 3095.446289,2115.807861 3059.198730,2122.304932 
+	C3012.449951,2130.684570 2965.358398,2131.753174 2918.120850,2129.636230 
+	C2858.661133,2126.971191 2800.833984,2116.038818 2744.646973,2092.858887 
+	C2744.010254,2085.926514 2743.756104,2080.247559 2744.104004,2074.605469 
+	C2744.522461,2067.814941 2746.681152,2065.140625 2753.453857,2064.106201 
+	C2758.660400,2063.311279 2760.120117,2060.556885 2760.004883,2055.964355 
+	C2759.938232,2053.301270 2759.999268,2050.635010 2759.999756,2047.970215 
+	C2760.002197,2035.978516 2759.835205,2023.983765 2760.064209,2011.996338 
+	C2760.218994,2003.886597 2762.027832,2001.656982 2770.059082,2000.036499 
+	C2774.708008,1999.098389 2776.349121,1996.471313 2775.938232,1992.364014 
+	C2773.766113,1970.651611 2779.981201,1949.484375 2779.963623,1927.928833 
+	C2779.959961,1923.419678 2781.515381,1919.614380 2785.784180,1918.537109 
+	C2790.644531,1917.310669 2792.018066,1914.002930 2792.955078,1910.033081 
+	C2794.080811,1905.265259 2796.813965,1902.400391 2801.791016,1902.016602 
+	C2807.148438,1901.603394 2808.097168,1898.079346 2808.014160,1893.624512 
+	C2807.933594,1889.296021 2807.775879,1884.946533 2808.089600,1880.638306 
+	C2808.570312,1874.039307 2811.740479,1870.816162 2817.873047,1870.062134 
+	C2825.790039,1869.088745 2829.784668,1872.383911 2829.949707,1880.550903 
+	C2830.151123,1890.539917 2830.001709,1900.536011 2830.020264,1910.529053 
+	C2830.026855,1914.118652 2830.744141,1917.684082 2835.146729,1917.558960 
+	C2839.538574,1917.434326 2839.979004,1913.745605 2839.990723,1910.225464 
+	C2840.003662,1906.228271 2839.873047,1902.225952 2840.031738,1898.234985 
+	C2840.355225,1890.106934 2842.395264,1887.195557 2850.292725,1886.208496 
+	C2855.656738,1885.537964 2858.026611,1883.566772 2858.114746,1878.167603 
+	C2858.189941,1873.578491 2861.072510,1871.128052 2865.479248,1870.043091 
+	C2873.850586,1867.982056 2873.839355,1867.891602 2873.992432,1859.918091 
+	C2874.037109,1857.587280 2874.028320,1855.254395 2873.994629,1852.923218 
+	C2873.874512,1844.569946 2873.766357,1844.834961 2865.850830,1841.841553 
+	C2863.034424,1840.776367 2859.701416,1838.589722 2858.554688,1836.038208 
+	C2854.146729,1826.233276 2854.441650,1826.100708 2845.038330,1826.000122 
+	C2823.888672,1825.773804 2823.554932,1825.454834 2824.038818,1803.992188 
+	C2824.097900,1801.372070 2824.340820,1798.658569 2825.106689,1796.175903 
+	C2826.117432,1792.900513 2828.089844,1790.686890 2832.019287,1789.923828 
+	C2839.839600,1788.405029 2839.817627,1788.107300 2839.984131,1780.359619 
+	C2840.070068,1776.364258 2839.429199,1772.255615 2840.168457,1768.400024 
+	C2840.870117,1764.740723 2842.944092,1761.344482 2845.094482,1757.953979 
+	C2846.957031,1758.684204 2848.181885,1759.223022 2849.315674,1759.912109 
+	C2884.123535,1781.061401 2922.422363,1789.291260 2962.585449,1789.467163 
+	C2977.108643,1789.530884 2991.784424,1788.138184 3006.143066,1785.853760 
+	C3042.752197,1780.029541 3075.251953,1765.001953 3102.792969,1739.865601 
+	C3133.556885,1711.788208 3153.571533,1676.854492 3168.039551,1638.250000 
+	C3182.709229,1599.107666 3190.869873,1558.449219 3195.398193,1517.148926 
+	C3198.395996,1489.809814 3199.830566,1462.192871 3200.072266,1434.683716 
+	C3200.410645,1396.118774 3199.170410,1357.534058 3198.236084,1318.966797 
+	C3197.834473,1302.379517 3196.950684,1285.775757 3195.493408,1269.249268 
+	C3193.373779,1245.217285 3190.593994,1221.242310 3187.989258,1197.254639 
+	C3185.959229,1178.559937 3184.316406,1159.800049 3181.516357,1141.217651 
+	C3177.494141,1114.526367 3172.410400,1087.996948 3168.080322,1061.349731 
+	C3161.791260,1022.644165 3152.650146,984.569336 3142.986572,946.614990 
+	C3136.975098,923.005188 3130.426758,899.532043 3124.119141,875.997559 
+z"/>
+<path fill="#0572EA" opacity="1.000000" stroke="none" 
+	d="
+M2844.414307,1757.832642 
+	C2842.944092,1761.344482 2840.870117,1764.740723 2840.168457,1768.400024 
+	C2839.429199,1772.255615 2840.070068,1776.364258 2839.984131,1780.359619 
+	C2839.817627,1788.107300 2839.839600,1788.405029 2832.019287,1789.923828 
+	C2828.089844,1790.686890 2826.117432,1792.900513 2825.106689,1796.175903 
+	C2824.340820,1798.658569 2824.097900,1801.372070 2824.038818,1803.992188 
+	C2823.554932,1825.454834 2823.888672,1825.773804 2845.038330,1826.000122 
+	C2854.441650,1826.100708 2854.146729,1826.233276 2858.554688,1836.038208 
+	C2859.701416,1838.589722 2863.034424,1840.776367 2865.850830,1841.841553 
+	C2873.766357,1844.834961 2873.874512,1844.569946 2873.994629,1852.923218 
+	C2874.028320,1855.254395 2874.037109,1857.587280 2873.992432,1859.918091 
+	C2873.839355,1867.891602 2873.850586,1867.982056 2865.479248,1870.043091 
+	C2861.072510,1871.128052 2858.189941,1873.578491 2858.114746,1878.167603 
+	C2858.026611,1883.566772 2855.656738,1885.537964 2850.292725,1886.208496 
+	C2842.395264,1887.195557 2840.355225,1890.106934 2840.031738,1898.234985 
+	C2839.873047,1902.225952 2840.003662,1906.228271 2839.990723,1910.225464 
+	C2839.979004,1913.745605 2839.538574,1917.434326 2835.146729,1917.558960 
+	C2830.744141,1917.684082 2830.026855,1914.118652 2830.020264,1910.529053 
+	C2830.001709,1900.536011 2830.151123,1890.539917 2829.949707,1880.550903 
+	C2829.784668,1872.383911 2825.790039,1869.088745 2817.873047,1870.062134 
+	C2811.740479,1870.816162 2808.570312,1874.039307 2808.089600,1880.638306 
+	C2807.775879,1884.946533 2807.933594,1889.296021 2808.014160,1893.624512 
+	C2808.097168,1898.079346 2807.148438,1901.603394 2801.791016,1902.016602 
+	C2796.813965,1902.400391 2794.080811,1905.265259 2792.955078,1910.033081 
+	C2792.018066,1914.002930 2790.644531,1917.310669 2785.784180,1918.537109 
+	C2781.515381,1919.614380 2779.959961,1923.419678 2779.963623,1927.928833 
+	C2779.981201,1949.484375 2773.766113,1970.651611 2775.938232,1992.364014 
+	C2776.349121,1996.471313 2774.708008,1999.098389 2770.059082,2000.036499 
+	C2762.027832,2001.656982 2760.218994,2003.886597 2760.064209,2011.996338 
+	C2759.835205,2023.983765 2760.002197,2035.978516 2759.999756,2047.970215 
+	C2759.999268,2050.635010 2759.938232,2053.301270 2760.004883,2055.964355 
+	C2760.120117,2060.556885 2758.660400,2063.311279 2753.453857,2064.106201 
+	C2746.681152,2065.140625 2744.522461,2067.814941 2744.104004,2074.605469 
+	C2743.756104,2080.247559 2744.010254,2085.926514 2744.002441,2092.465820 
+	C2707.032715,2079.486816 2672.828369,2060.379639 2640.292725,2038.212769 
+	C2610.822998,2018.135010 2583.546631,1995.357666 2557.441162,1971.051392 
+	C2508.332275,1925.326782 2465.214844,1874.351562 2424.761719,1820.190430 
+	C2426.520508,1813.980347 2424.067627,1810.867920 2419.479492,1808.026001 
+	C2418.859131,1809.680420 2418.441162,1810.795288 2418.022949,1811.910156 
+	C2414.079590,1807.066040 2410.135986,1802.221924 2406.036133,1796.713989 
+	C2409.414795,1795.362427 2412.923096,1794.432861 2416.490723,1794.037598 
+	C2423.708740,1793.238159 2425.209473,1792.360596 2425.892090,1785.367188 
+	C2426.368164,1780.488892 2428.223145,1778.080566 2433.211670,1777.949463 
+	C2439.103027,1777.794556 2442.538086,1775.177490 2442.097900,1768.652100 
+	C2441.835693,1764.765625 2443.852051,1762.203369 2447.941162,1762.106445 
+	C2454.672363,1761.946777 2458.598389,1759.460449 2458.169922,1751.928223 
+	C2457.939209,1747.873291 2460.758545,1746.110229 2464.662109,1746.018921 
+	C2471.037354,1745.869751 2474.559082,1743.160889 2474.138916,1736.204590 
+	C2473.896973,1732.197632 2476.506104,1730.682983 2480.367920,1729.940796 
+	C2489.933838,1728.102905 2489.933350,1727.900146 2489.988525,1718.466064 
+	C2490.041016,1709.474731 2489.904297,1700.481567 2490.030518,1691.491577 
+	C2490.143555,1683.447021 2490.575684,1683.070557 2498.125000,1682.001465 
+	C2505.926758,1680.896851 2507.731934,1678.994263 2507.971924,1671.196045 
+	C2508.115234,1666.537964 2508.042725,1661.872070 2508.016602,1657.209961 
+	C2507.992188,1652.881714 2509.858154,1650.766357 2514.366943,1649.922241 
+	C2523.061035,1648.294434 2523.839600,1646.980225 2523.989258,1637.946167 
+	C2524.055420,1633.950806 2523.854980,1629.946777 2524.039795,1625.958984 
+	C2524.348389,1619.297485 2525.914307,1617.100342 2532.730713,1616.164673 
+	C2537.586426,1615.498047 2539.476074,1613.615112 2540.164795,1608.753540 
+	C2541.174805,1601.625488 2543.345947,1600.194214 2550.936279,1600.034058 
+	C2557.926514,1599.886475 2564.936768,1599.713501 2571.913086,1600.059448 
+	C2586.568604,1600.786499 2588.638184,1597.189209 2588.056885,1584.399536 
+	C2587.739502,1577.420410 2587.912109,1570.413696 2588.024658,1563.421997 
+	C2588.151611,1555.529907 2588.952637,1554.526489 2596.233154,1551.973877 
+	C2602.694336,1549.708496 2603.843994,1548.286621 2603.963867,1541.107300 
+	C2604.108398,1532.451172 2603.897705,1523.789062 2604.032471,1515.132568 
+	C2604.152588,1507.446167 2605.073486,1506.951294 2612.450439,1503.802002 
+	C2615.891357,1502.333008 2618.607422,1499.165527 2622.504883,1496.514404 
+	C2645.215088,1528.045166 2666.787354,1560.030396 2688.999268,1591.565186 
+	C2720.412109,1636.162598 2754.792480,1678.378662 2792.786865,1717.572266 
+	C2797.095459,1722.016846 2802.473145,1725.407349 2806.970459,1729.690796 
+	C2818.365967,1740.544434 2830.673340,1750.127319 2844.414307,1757.832642 
+z"/>
+<path fill="#017BF4" opacity="1.000000" stroke="none" 
+	d="
+M689.887207,1501.998901 
+	C686.889343,1501.999268 683.882385,1501.849731 680.895508,1502.031250 
+	C674.736328,1502.405151 669.568359,1501.378418 667.745361,1494.324341 
+	C666.830994,1490.786377 663.999756,1489.994873 660.754456,1490.013794 
+	C657.090637,1490.035156 653.426025,1490.051880 649.762756,1489.998413 
+	C645.648499,1489.938354 642.729065,1491.112915 641.987610,1495.816528 
+	C640.846313,1503.057373 635.380432,1505.316772 629.038269,1505.910400 
+	C625.074463,1506.281494 621.050476,1506.026001 617.053467,1506.021973 
+	C613.256592,1506.018188 610.696716,1507.428711 610.054077,1511.534180 
+	C608.831360,1519.344971 603.023499,1521.346924 596.331177,1521.952637 
+	C593.687805,1522.191895 591.001709,1522.085693 588.341125,1521.981934 
+	C582.983765,1521.773071 578.244690,1522.062744 577.703430,1529.225830 
+	C577.429749,1532.847778 574.412354,1533.508667 571.173401,1534.040649 
+	C555.130371,1536.675659 539.108948,1539.287231 522.748108,1538.016479 
+	C518.378662,1537.677002 515.492676,1538.926270 513.601562,1543.672729 
+	C511.218323,1549.654053 499.991699,1552.455444 494.819489,1548.982788 
+	C493.594177,1548.159912 492.379852,1546.409546 492.266785,1544.997314 
+	C491.750031,1538.543213 487.578857,1537.802246 482.422760,1537.966553 
+	C477.764771,1538.114990 473.070282,1538.285767 468.440796,1537.883667 
+	C461.809479,1537.307739 459.677185,1533.716919 460.005615,1524.746094 
+	C460.276031,1517.359863 461.315216,1516.184204 468.887115,1516.043823 
+	C477.877625,1515.876953 486.874207,1516.070312 495.866943,1515.980591 
+	C505.005798,1515.889526 506.325775,1515.078857 507.914734,1506.440918 
+	C508.740936,1501.949341 510.786285,1500.003296 515.138428,1500.021118 
+	C519.468506,1500.038696 523.800659,1500.082520 528.128113,1499.969727 
+	C530.436462,1499.909790 532.966187,1500.058838 534.973572,1499.164795 
+	C536.824951,1498.340210 538.111816,1496.247925 539.647278,1494.713989 
+	C537.793335,1493.164917 536.074585,1490.529053 534.059204,1490.278442 
+	C528.808411,1489.625488 523.422058,1490.161499 518.099915,1489.958374 
+	C511.336029,1489.700317 509.564392,1488.077881 508.019897,1481.426270 
+	C506.358917,1474.272705 506.360748,1474.153198 498.826843,1474.034302 
+	C490.168488,1473.897705 481.501343,1473.823608 472.847839,1474.068604 
+	C467.926147,1474.208008 463.962433,1473.171143 460.226685,1469.566040 
+	C458.116272,1467.529663 454.489563,1466.472046 451.422821,1466.151733 
+	C446.235809,1465.610107 440.951263,1466.003174 434.466553,1466.003174 
+	C432.547546,1469.702271 429.120392,1473.769043 422.656586,1474.475952 
+	C420.931824,1474.664551 418.914917,1477.790649 418.128693,1479.964600 
+	C414.998810,1488.619263 413.728851,1489.760132 404.590240,1489.991333 
+	C402.592926,1490.041870 400.593262,1489.994019 398.594727,1490.000977 
+	C388.967133,1490.034546 388.908264,1490.012573 385.414948,1498.911987 
+	C383.439331,1503.944946 379.669708,1505.973145 374.524475,1505.982666 
+	C366.530273,1505.997559 358.536072,1505.993896 349.659424,1506.001465 
+	C347.838562,1494.461792 346.355988,1482.932617 346.064819,1471.373535 
+	C345.228210,1438.160645 344.555695,1404.936523 344.457062,1371.714966 
+	C344.403931,1353.812866 345.294647,1335.884277 346.407440,1318.007935 
+	C348.074158,1291.234009 350.311218,1264.495605 353.390869,1236.868652 
+	C360.361084,1235.512451 367.444305,1236.896118 371.831604,1234.079834 
+	C377.470428,1230.460327 382.751251,1230.007080 388.670166,1230.005249 
+	C423.939362,1229.994629 459.209900,1230.146973 494.476318,1229.834839 
+	C499.518860,1229.790161 506.480591,1229.142212 509.154968,1225.937134 
+	C514.146423,1219.955444 519.688721,1219.976562 526.024780,1219.981934 
+	C567.283081,1220.017090 608.541504,1220.040161 649.799500,1219.928345 
+	C653.336731,1219.918701 657.935974,1220.095215 660.183655,1218.095947 
+	C664.767090,1214.019409 669.675842,1213.940186 675.014893,1213.983887 
+	C682.667175,1214.046753 690.320251,1213.999146 698.116943,1214.876953 
+	C696.039001,1239.863281 693.519531,1263.948730 691.674133,1288.085571 
+	C689.575928,1315.529053 687.452759,1342.997070 686.506409,1370.494507 
+	C685.635925,1395.786133 686.303833,1421.131104 686.323242,1446.452515 
+	C686.325256,1449.109985 686.464783,1451.771240 686.642883,1454.423950 
+	C687.707642,1470.283447 688.802490,1486.140747 689.887207,1501.998901 
+z"/>
+<path fill="#0169E3" opacity="1.000000" stroke="none" 
+	d="
+M525.417358,600.341858 
+	C527.484802,601.626709 529.122864,604.907288 530.522034,604.808350 
+	C540.113953,604.130371 544.499451,616.377136 554.624207,614.098022 
+	C557.476929,613.455750 560.656372,613.636536 563.578064,614.108215 
+	C566.384033,614.561279 569.892883,615.106018 571.609619,616.973816 
+	C575.703430,621.427856 580.423584,622.426819 586.001526,622.034546 
+	C591.040527,621.680054 595.947998,621.605530 599.146606,626.914612 
+	C600.017456,628.359985 602.470703,629.476807 604.280640,629.608948 
+	C608.817261,629.940247 612.145630,631.400513 615.442505,634.920410 
+	C617.520630,637.139221 622.024048,637.644348 625.505432,637.861450 
+	C630.853149,638.195068 636.075439,637.546021 639.527649,643.244080 
+	C640.485657,644.825317 643.622681,645.054138 645.724182,645.984253 
+	C647.792664,646.899719 650.437927,647.404785 651.742065,648.986755 
+	C655.636292,653.710938 660.560974,654.430359 666.106506,654.020508 
+	C671.196228,653.644226 675.932251,653.846985 679.250977,658.963745 
+	C680.302612,660.585022 683.222717,661.607178 685.373230,661.769226 
+	C689.277039,662.063416 691.842773,663.610168 694.778381,666.287354 
+	C697.364136,668.645386 701.880249,669.636719 705.610657,669.812134 
+	C711.073608,670.068970 715.610168,670.818481 720.216919,674.565613 
+	C725.116516,678.551025 732.030212,679.430664 736.743835,684.663696 
+	C738.533203,686.650330 743.647888,685.939819 747.244751,685.924805 
+	C751.710999,685.906128 755.620605,686.394043 759.112183,689.805237 
+	C761.125122,691.771912 764.311890,693.633362 766.968811,693.631287 
+	C773.895020,693.625854 779.432983,695.047424 784.513184,700.468506 
+	C786.550171,702.642151 792.025208,701.794739 795.949707,701.943115 
+	C800.001770,702.096436 804.015930,701.767639 806.204956,706.303467 
+	C807.948242,709.915771 811.343201,710.248657 814.773315,709.968628 
+	C821.140564,709.448608 826.285400,711.542664 831.135803,715.781067 
+	C833.699036,718.020813 837.636536,718.687683 841.614868,720.856323 
+	C841.286133,724.104919 840.460693,726.643982 839.281616,729.006592 
+	C818.312805,771.023438 799.732605,814.078369 784.073059,858.338989 
+	C774.677612,884.894653 766.289368,911.805542 757.283447,938.501099 
+	C755.937683,942.490234 753.685425,946.173584 751.024536,949.998413 
+	C747.671509,949.694885 745.146423,949.391357 742.330078,949.052856 
+	C742.859131,937.844971 737.153137,933.224792 727.255127,933.395691 
+	C726.753357,931.957214 726.311951,931.067383 726.135315,930.127747 
+	C724.181580,919.731445 722.327087,918.144531 711.639465,918.010193 
+	C706.978516,917.951599 702.316162,917.978577 697.654602,918.004150 
+	C685.174011,918.072632 683.895020,919.175476 681.363586,931.747437 
+	C681.252380,932.299927 680.571594,932.737732 679.503967,934.000000 
+	C676.875610,934.000000 673.592346,934.000000 670.309143,934.000000 
+	C647.999756,934.000000 625.687256,934.209900 603.382751,933.881409 
+	C595.989197,933.772583 589.573425,934.737488 584.891602,941.041199 
+	C584.660828,941.351807 583.647461,941.081177 581.515381,941.081177 
+	C581.032776,937.636841 580.223206,933.962708 580.057495,930.259644 
+	C579.651367,921.180420 577.285645,918.362610 568.213684,918.070435 
+	C559.232544,917.781250 550.234131,918.067566 541.245361,917.946350 
+	C539.151672,917.918152 537.066406,917.262207 534.977295,916.895020 
+	C534.800110,916.182373 534.622864,915.469788 534.445679,914.757141 
+	C536.545410,913.849060 538.584778,912.391357 540.758118,912.152649 
+	C544.707336,911.718933 548.738220,912.087402 552.731323,911.982117 
+	C561.214661,911.758484 563.596680,909.519348 563.994690,901.587708 
+	C564.562256,890.276733 562.389404,886.395508 553.539062,886.170776 
+	C535.902893,885.722961 518.243713,885.834045 500.602264,886.159729 
+	C495.564026,886.252686 491.213257,888.037598 489.786591,894.379150 
+	C488.081451,901.958496 487.539429,901.930298 479.456879,901.978088 
+	C466.138306,902.056824 452.818695,902.048462 439.500031,901.977966 
+	C433.890411,901.948303 428.900604,902.999939 425.821655,908.317871 
+	C423.557983,912.227722 420.261658,912.500000 416.347137,911.179382 
+	C414.490540,910.552979 412.483978,910.371094 410.545349,909.987854 
+	C418.963989,881.056335 426.900055,851.973633 435.903198,823.225159 
+	C453.860352,765.885071 475.205322,709.784912 499.669006,654.898376 
+	C507.770294,636.722412 516.457947,618.807861 525.417358,600.341858 
+z"/>
+<path fill="#0172ED" opacity="1.000000" stroke="none" 
+	d="
+M697.973022,1213.998779 
+	C690.320251,1213.999146 682.667175,1214.046753 675.014893,1213.983887 
+	C669.675842,1213.940186 664.767090,1214.019409 660.183655,1218.095947 
+	C657.935974,1220.095215 653.336731,1219.918701 649.799500,1219.928345 
+	C608.541504,1220.040161 567.283081,1220.017090 526.024780,1219.981934 
+	C519.688721,1219.976562 514.146423,1219.955444 509.154968,1225.937134 
+	C506.480591,1229.142212 499.518860,1229.790161 494.476318,1229.834839 
+	C459.209900,1230.146973 423.939362,1229.994629 388.670166,1230.005249 
+	C382.751251,1230.007080 377.470428,1230.460327 371.831604,1234.079834 
+	C367.444305,1236.896118 360.361084,1235.512451 353.625305,1235.998291 
+	C353.318787,1227.768066 353.435852,1219.480469 354.482086,1211.311768 
+	C358.719604,1178.227051 362.910583,1145.130005 367.768280,1112.133301 
+	C371.503815,1086.758789 376.203705,1061.526123 380.514740,1036.237183 
+	C380.676208,1035.289917 381.258087,1034.414307 382.750275,1032.729736 
+	C387.421356,1031.304077 390.980103,1030.133789 394.552032,1030.092285 
+	C411.505096,1029.894531 428.468628,1029.741577 445.412445,1030.184082 
+	C449.811676,1030.299072 455.348724,1031.401978 458.223846,1034.227783 
+	C461.957428,1037.897339 465.634399,1037.987427 469.886871,1037.991333 
+	C491.164215,1038.010498 512.441895,1038.058716 533.718689,1037.955811 
+	C538.538513,1037.932495 543.506592,1038.157837 546.480896,1042.115356 
+	C549.429932,1046.039429 553.005310,1046.020630 557.022034,1046.013916 
+	C575.972168,1045.982178 594.922729,1046.065186 613.872253,1045.955200 
+	C618.705505,1045.927246 623.637695,1046.247803 626.594727,1050.218506 
+	C629.551941,1054.189453 633.195068,1054.008789 637.175598,1054.006592 
+	C661.777527,1053.993286 686.380310,1053.893555 710.980652,1054.090454 
+	C715.873718,1054.129639 720.757568,1055.329834 725.695923,1056.790771 
+	C721.357361,1079.376465 716.324280,1101.060791 712.741150,1122.982178 
+	C708.149780,1151.071167 700.556946,1178.710571 699.631226,1207.378052 
+	C699.559448,1209.600586 698.547852,1211.792603 697.973022,1213.998779 
+z"/>
+<path fill="#016DE9" opacity="1.000000" stroke="none" 
+	d="
+M725.645630,1055.994629 
+	C720.757568,1055.329834 715.873718,1054.129639 710.980652,1054.090454 
+	C686.380310,1053.893555 661.777527,1053.993286 637.175598,1054.006592 
+	C633.195068,1054.008789 629.551941,1054.189453 626.594727,1050.218506 
+	C623.637695,1046.247803 618.705505,1045.927246 613.872253,1045.955200 
+	C594.922729,1046.065186 575.972168,1045.982178 557.022034,1046.013916 
+	C553.005310,1046.020630 549.429932,1046.039429 546.480896,1042.115356 
+	C543.506592,1038.157837 538.538513,1037.932495 533.718689,1037.955811 
+	C512.441895,1038.058716 491.164215,1038.010498 469.886871,1037.991333 
+	C465.634399,1037.987427 461.957428,1037.897339 458.223846,1034.227783 
+	C455.348724,1031.401978 449.811676,1030.299072 445.412445,1030.184082 
+	C428.468628,1029.741577 411.505096,1029.894531 394.552032,1030.092285 
+	C390.980103,1030.133789 387.421356,1031.304077 383.023071,1031.976196 
+	C386.636688,1011.118896 391.083679,990.239441 396.168915,968.519409 
+	C396.941528,967.501221 397.226868,967.259888 397.183533,967.157471 
+	C397.020142,966.770691 396.749908,966.429138 396.519684,966.070618 
+	C400.977783,947.855286 405.435883,929.639954 410.219666,910.706238 
+	C412.483978,910.371094 414.490540,910.552979 416.347137,911.179382 
+	C420.261658,912.500000 423.557983,912.227722 425.821655,908.317871 
+	C428.900604,902.999939 433.890411,901.948303 439.500031,901.977966 
+	C452.818695,902.048462 466.138306,902.056824 479.456879,901.978088 
+	C487.539429,901.930298 488.081451,901.958496 489.786591,894.379150 
+	C491.213257,888.037598 495.564026,886.252686 500.602264,886.159729 
+	C518.243713,885.834045 535.902893,885.722961 553.539062,886.170776 
+	C562.389404,886.395508 564.562256,890.276733 563.994690,901.587708 
+	C563.596680,909.519348 561.214661,911.758484 552.731323,911.982117 
+	C548.738220,912.087402 544.707336,911.718933 540.758118,912.152649 
+	C538.584778,912.391357 536.545410,913.849060 534.445679,914.757141 
+	C534.622864,915.469788 534.800110,916.182373 534.977295,916.895020 
+	C537.066406,917.262207 539.151672,917.918152 541.245361,917.946350 
+	C550.234131,918.067566 559.232544,917.781250 568.213684,918.070435 
+	C577.285645,918.362610 579.651367,921.180420 580.057495,930.259644 
+	C580.223206,933.962708 581.032776,937.636841 581.515381,941.081177 
+	C583.647461,941.081177 584.660828,941.351807 584.891602,941.041199 
+	C589.573425,934.737488 595.989197,933.772583 603.382751,933.881409 
+	C625.687256,934.209900 647.999756,934.000000 670.309143,934.000000 
+	C673.592346,934.000000 676.875610,934.000000 679.503967,934.000000 
+	C680.571594,932.737732 681.252380,932.299927 681.363586,931.747437 
+	C683.895020,919.175476 685.174011,918.072632 697.654602,918.004150 
+	C702.316162,917.978577 706.978516,917.951599 711.639465,918.010193 
+	C722.327087,918.144531 724.181580,919.731445 726.135315,930.127747 
+	C726.311951,931.067383 726.753357,931.957214 727.255127,933.395691 
+	C737.153137,933.224792 742.859131,937.844971 742.330078,949.052856 
+	C745.146423,949.391357 747.671509,949.694885 751.281250,950.793335 
+	C750.593689,958.852722 748.924255,966.143982 747.029053,973.376160 
+	C742.330505,991.305786 737.471924,1009.193604 732.791138,1027.127808 
+	C730.288086,1036.718384 728.019836,1046.370361 725.645630,1055.994629 
+z"/>
+<path fill="#017BF4" opacity="1.000000" stroke="none" 
+	d="
+M357.973938,1588.815186 
+	C362.009186,1587.425293 366.324738,1584.499146 369.077972,1589.779541 
+	C366.593781,1594.490479 364.176819,1599.073975 361.062866,1603.823730 
+	C359.522461,1599.203003 358.679077,1594.416016 357.973938,1588.815186 
+z"/>
+<path fill="#0769E1" opacity="1.000000" stroke="none" 
+	d="
+M2418.188965,1812.535400 
+	C2418.441162,1810.795288 2418.859131,1809.680420 2419.479492,1808.026001 
+	C2424.067627,1810.867920 2426.520508,1813.980347 2424.590820,1819.534302 
+	C2422.168701,1817.700073 2420.261963,1815.430420 2418.188965,1812.535400 
+z"/>
+<path fill="#0172ED" opacity="1.000000" stroke="none" 
+	d="
+M396.268494,966.517395 
+	C396.749908,966.429138 397.020142,966.770691 397.183533,967.157471 
+	C397.226868,967.259888 396.941528,967.501221 396.503662,967.825806 
+	C396.139221,967.636597 396.078247,967.300415 396.268494,966.517395 
+z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" 
+	d="
+M2845.094482,1757.953979 
+	C2830.673340,1750.127319 2818.365967,1740.544434 2806.970459,1729.690796 
+	C2802.473145,1725.407349 2797.095459,1722.016846 2792.786865,1717.572266 
+	C2754.792480,1678.378662 2720.412109,1636.162598 2688.999268,1591.565186 
+	C2666.787354,1560.030396 2645.215088,1528.045166 2622.807373,1495.843750 
+	C2614.444092,1483.090332 2606.621094,1470.760376 2598.819580,1458.416626 
+	C2551.182861,1383.046143 2502.684570,1308.203247 2456.130127,1232.169922 
+	C2392.733398,1128.629761 2331.160645,1023.974548 2268.131592,920.206970 
+	C2236.358398,867.897522 2203.237061,816.403442 2170.453125,764.713501 
+	C2154.416748,739.428955 2137.757812,714.539124 2121.271484,688.739990 
+	C2138.561035,662.407959 2155.796631,636.694031 2173.394043,611.229797 
+	C2205.948486,564.121277 2240.786865,518.749939 2278.817139,475.925049 
+	C2310.688232,440.036011 2345.022461,406.670746 2383.605713,377.919891 
+	C2420.707764,350.272766 2460.655029,328.085358 2505.437744,315.433136 
+	C2537.328125,306.423309 2569.782471,302.758301 2602.993164,304.158508 
+	C2670.895508,307.021423 2732.377686,329.126862 2789.463379,364.861877 
+	C2829.772461,390.095032 2865.584717,420.875366 2897.911377,455.566467 
+	C2943.257324,504.229218 2981.187500,558.366089 3013.921875,616.217529 
+	C3050.718750,681.249329 3080.725098,749.307983 3105.083984,819.891418 
+	C3111.370117,838.106140 3117.249756,856.461182 3123.717773,875.374634 
+	C3130.426758,899.532043 3136.975098,923.005188 3142.986572,946.614990 
+	C3152.650146,984.569336 3161.791260,1022.644165 3168.080322,1061.349731 
+	C3172.410400,1087.996948 3177.494141,1114.526367 3181.516357,1141.217651 
+	C3184.316406,1159.800049 3185.959229,1178.559937 3187.989258,1197.254639 
+	C3190.593994,1221.242310 3193.373779,1245.217285 3195.493408,1269.249268 
+	C3196.950684,1285.775757 3197.834473,1302.379517 3198.236084,1318.966797 
+	C3199.170410,1357.534058 3200.410645,1396.118774 3200.072266,1434.683716 
+	C3199.830566,1462.192871 3198.395996,1489.809814 3195.398193,1517.148926 
+	C3190.869873,1558.449219 3182.709229,1599.107666 3168.039551,1638.250000 
+	C3153.571533,1676.854492 3133.556885,1711.788208 3102.792969,1739.865601 
+	C3075.251953,1765.001953 3042.752197,1780.029541 3006.143066,1785.853760 
+	C2991.784424,1788.138184 2977.108643,1789.530884 2962.585449,1789.467163 
+	C2922.422363,1789.291260 2884.123535,1781.061401 2849.315674,1759.912109 
+	C2848.181885,1759.223022 2846.957031,1758.684204 2845.094482,1757.953979 
+z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" 
+	d="
+M725.695923,1056.790771 
+	C728.019836,1046.370361 730.288086,1036.718384 732.791138,1027.127808 
+	C737.471924,1009.193604 742.330505,991.305786 747.029053,973.376160 
+	C748.924255,966.143982 750.593689,958.852722 752.109192,950.793335 
+	C753.685425,946.173584 755.937683,942.490234 757.283447,938.501099 
+	C766.289368,911.805542 774.677612,884.894653 784.073059,858.338989 
+	C799.732605,814.078369 818.312805,771.023438 839.281616,729.006592 
+	C840.460693,726.643982 841.286133,724.104919 842.394836,720.910278 
+	C848.289551,709.736938 854.183105,699.364319 859.821899,688.855042 
+	C890.901733,630.930481 926.924255,576.359253 970.127930,526.703613 
+	C1002.813293,489.137085 1039.184692,455.665894 1081.189453,428.641052 
+	C1120.801636,403.155640 1163.442017,385.224945 1210.313843,378.614563 
+	C1232.001099,375.556000 1253.802612,375.818970 1275.727051,377.450897 
+	C1303.709595,379.533722 1331.004150,384.398529 1357.748413,392.712799 
+	C1391.963501,403.349548 1423.747559,419.096039 1453.823242,438.413879 
+	C1492.049438,462.967041 1526.395752,492.237183 1558.728149,524.062073 
+	C1591.958984,556.771118 1622.792725,591.597046 1652.899414,627.916321 
+	C1666.869019,645.516174 1680.572388,662.599670 1693.536255,680.227051 
+	C1716.540894,711.507324 1739.096924,743.117676 1761.948608,775.277832 
+	C1750.305908,793.616028 1738.446655,811.195435 1726.835815,828.937317 
+	C1715.756958,845.866150 1704.937012,862.964294 1693.280273,881.028259 
+	C1690.143921,885.633545 1687.662476,889.154602 1685.327759,892.770386 
+	C1651.780029,944.725220 1618.196899,996.657288 1584.748779,1048.676147 
+	C1572.529663,1067.679321 1560.642822,1086.895996 1548.604370,1106.015381 
+	C1535.520020,1126.068237 1522.265625,1146.012573 1509.386719,1166.196533 
+	C1483.262451,1207.138794 1457.571167,1248.358765 1431.275269,1289.189941 
+	C1401.547974,1335.349365 1371.718140,1381.451050 1341.274170,1427.138794 
+	C1297.733276,1492.481201 1253.023438,1557.019165 1203.855713,1618.325562 
+	C1180.119873,1647.921387 1155.300537,1676.594727 1127.730225,1702.713257 
+	C1100.578369,1728.435547 1071.303955,1751.318726 1037.116577,1767.224365 
+	C1010.303406,1779.698975 982.114502,1786.156372 952.617065,1788.559448 
+	C929.541443,1790.439575 906.824768,1789.308472 884.314453,1784.843018 
+	C837.225525,1775.501953 798.488586,1751.827271 767.833435,1714.946045 
+	C740.373474,1681.909424 722.666931,1643.781006 710.374451,1602.996216 
+	C701.159607,1572.422485 694.637756,1541.244019 691.588196,1509.397217 
+	C691.400696,1507.438599 690.733948,1505.526001 690.088684,1502.795410 
+	C688.802490,1486.140747 687.707642,1470.283447 686.642883,1454.423950 
+	C686.464783,1451.771240 686.325256,1449.109985 686.323242,1446.452515 
+	C686.303833,1421.131104 685.635925,1395.786133 686.506409,1370.494507 
+	C687.452759,1342.997070 689.575928,1315.529053 691.674133,1288.085571 
+	C693.519531,1263.948730 696.039001,1239.863281 698.116943,1214.876953 
+	C698.547852,1211.792603 699.559448,1209.600586 699.631226,1207.378052 
+	C700.556946,1178.710571 708.149780,1151.071167 712.741150,1122.982178 
+	C716.324280,1101.060791 721.357361,1079.376465 725.695923,1056.790771 
+z"/>
+<path fill="#047FF9" opacity="1.000000" stroke="none" 
+	d="
+M1549.476807,1106.011475 
+	C1560.642822,1086.895996 1572.529663,1067.679321 1584.748779,1048.676147 
+	C1618.196899,996.657288 1651.780029,944.725220 1685.327759,892.770386 
+	C1687.662476,889.154602 1690.143921,885.633545 1693.148926,881.689941 
+	C1694.825684,882.801514 1695.676636,885.300781 1697.034058,885.615417 
+	C1704.890259,887.436401 1703.781006,893.492310 1704.021240,899.074341 
+	C1704.263184,904.697205 1703.860596,909.962463 1697.299316,911.884827 
+	C1691.462891,913.594849 1689.974243,917.653748 1689.875977,923.282959 
+	C1689.790283,928.197449 1688.533203,933.082092 1687.981812,938.001038 
+	C1687.593140,941.468201 1685.776611,942.979614 1682.470215,944.047974 
+	C1674.706421,946.556335 1674.229492,947.484558 1674.014771,955.215576 
+	C1673.931641,958.210083 1674.148071,961.218323 1673.961426,964.203552 
+	C1673.587280,970.188171 1672.229614,975.219177 1664.810913,976.309021 
+	C1659.843262,977.038818 1657.890625,980.944824 1657.988892,985.880371 
+	C1658.068481,989.874390 1657.924683,993.873047 1658.012695,997.866699 
+	C1658.130981,1003.240112 1656.002686,1007.005432 1650.466309,1007.886597 
+	C1645.536499,1008.671082 1642.657959,1011.143311 1641.973511,1016.142700 
+	C1641.355469,1020.656311 1638.731567,1023.314331 1634.226807,1023.967224 
+	C1628.126587,1024.851196 1625.814331,1028.613281 1625.992065,1034.423096 
+	C1626.063354,1036.751709 1625.890747,1039.090698 1626.020386,1041.414185 
+	C1626.441406,1048.961060 1625.801392,1055.332520 1615.995972,1056.558594 
+	C1611.674683,1057.098999 1609.887573,1061.192749 1609.982544,1065.720459 
+	C1610.087036,1070.712769 1610.197998,1075.720459 1609.927002,1080.700806 
+	C1609.586670,1086.956299 1606.909302,1089.672363 1600.602661,1089.919678 
+	C1593.666016,1090.191772 1586.710449,1089.981812 1579.374512,1089.981812 
+	C1578.568481,1092.774902 1578.018066,1094.955322 1577.310059,1097.083252 
+	C1575.401123,1102.821655 1571.197876,1105.663696 1565.330811,1105.925537 
+	C1560.345703,1106.148193 1555.343628,1105.994751 1549.476807,1106.011475 
+z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/app-store/metapixel/zod.ts b/packages/app-store/metapixel/zod.ts
new file mode 100644
index 0000000000..367b0dd2a3
--- /dev/null
+++ b/packages/app-store/metapixel/zod.ts
@@ -0,0 +1,10 @@
+import { z } from "zod";
+
+import { eventTypeAppCardZod } from "@calcom/app-store/eventTypeAppCardZod";
+
+export const appDataSchema = eventTypeAppCardZod.merge(
+  z.object({
+    trackingId: z.string().default("").optional(),
+  })
+);
+export const appKeysSchema = z.object({});
diff --git a/packages/app-store/plausible/components/EventTypeAppCardInterface.tsx b/packages/app-store/plausible/components/EventTypeAppCardInterface.tsx
index 1d35515358..33cb11f4d0 100644
--- a/packages/app-store/plausible/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/plausible/components/EventTypeAppCardInterface.tsx
@@ -9,6 +9,7 @@ import type { appDataSchema } from "../zod";
 
 const EventTypeAppCard: EventTypeAppCardComponent = function EventTypeAppCard({ app }) {
   const [getAppData, setAppData] = useAppContextWithSchema<typeof appDataSchema>();
+  const plausibleUrl = getAppData("PLAUSIBLE_URL");
   const trackingId = getAppData("trackingId");
   const [enabled, setEnabled] = useState(getAppData("enabled"));
 
@@ -24,8 +25,18 @@ const EventTypeAppCard: EventTypeAppCardComponent = function EventTypeAppCard({
         }
       }}
       switchChecked={enabled}>
+      <TextField
+        name="Plausible URL"
+        defaultValue="https://plausible.io/js/script.js"
+        placeholder="https://plausible.io/js/script.js"
+        value={plausibleUrl}
+        onChange={(e) => {
+          setAppData("PLAUSIBLE_URL", e.target.value);
+        }}
+      />
       <TextField
         name="Tracked Domain"
+        placeholder="yourdomain.com"
         value={trackingId}
         onChange={(e) => {
           setAppData("trackingId", e.target.value);
diff --git a/packages/app-store/plausible/config.json b/packages/app-store/plausible/config.json
index 61bd705505..e46024e0f1 100644
--- a/packages/app-store/plausible/config.json
+++ b/packages/app-store/plausible/config.json
@@ -15,7 +15,7 @@
     "tag": {
       "scripts": [
         {
-          "src": "https://plausible.io/js/script.js",
+          "src": "{PLAUSIBLE_URL}",
           "attrs": {
             "data-domain": "{TRACKING_ID}"
           }
diff --git a/packages/app-store/plausible/zod.ts b/packages/app-store/plausible/zod.ts
index 674bf3405d..ee8d9a8dc4 100644
--- a/packages/app-store/plausible/zod.ts
+++ b/packages/app-store/plausible/zod.ts
@@ -4,6 +4,7 @@ import { eventTypeAppCardZod } from "../eventTypeAppCardZod";
 
 export const appDataSchema = eventTypeAppCardZod.merge(
   z.object({
+    PLAUSIBLE_URL: z.string().optional().default("https://plausible.io/js/script.js").or(z.undefined()),
     trackingId: z.string().default("").optional(),
   })
 );
diff --git a/packages/app-store/routing-forms/components/FormActions.tsx b/packages/app-store/routing-forms/components/FormActions.tsx
index e733ac620f..256139a305 100644
--- a/packages/app-store/routing-forms/components/FormActions.tsx
+++ b/packages/app-store/routing-forms/components/FormActions.tsx
@@ -276,8 +276,13 @@ export function FormActionsProvider({ appUrl, children }: { appUrl: string; chil
       }
       return { previousValue };
     },
-    onSettled: () => {
+    onSettled: (routingForm) => {
       utils.viewer.appRoutingForms.forms.invalidate();
+      if (routingForm) {
+        utils.viewer.appRoutingForms.formQuery.invalidate({
+          id: routingForm.id,
+        });
+      }
     },
     onError: (err, value, context) => {
       if (context?.previousValue) {
@@ -347,13 +352,21 @@ type FormActionProps<T> = {
   action: FormActionType;
   children?: React.ReactNode;
   render?: (props: { routingForm: RoutingForm | null; className?: string; label?: string }) => JSX.Element;
+  extraClassNames?: string;
 } & ButtonProps;
 
 export const FormAction = forwardRef(function FormAction<T extends typeof Button>(
   props: FormActionProps<T>,
   forwardedRef: React.ForwardedRef<HTMLAnchorElement | HTMLButtonElement>
 ) {
-  const { action: actionName, routingForm, children, as: asFromElement, ...additionalProps } = props;
+  const {
+    action: actionName,
+    routingForm,
+    children,
+    as: asFromElement,
+    extraClassNames,
+    ...additionalProps
+  } = props;
   const { appUrl, _delete, toggle } = useContext(actionsCtx);
   const dropdownCtxValue = useContext(dropdownCtx);
   const dropdown = dropdownCtxValue?.dropdown;
@@ -414,11 +427,17 @@ export const FormAction = forwardRef(function FormAction<T extends typeof Button
           return <></>;
         }
         return (
-          <div {...restProps} className="hover:bg-emphasis self-center rounded-md p-2">
+          <div
+            {...restProps}
+            className={classNames(
+              "sm:hover:bg-subtle self-center rounded-md p-2 hover:bg-gray-200",
+              extraClassNames
+            )}>
             <Switch
               checked={!routingForm.disabled}
               label={label}
               onCheckedChange={(checked) => toggle.onAction({ routingForm, checked })}
+              labelOnLeading
             />
           </div>
         );
diff --git a/packages/app-store/routing-forms/components/SingleForm.tsx b/packages/app-store/routing-forms/components/SingleForm.tsx
index 560fc20b5e..dd11ae07c4 100644
--- a/packages/app-store/routing-forms/components/SingleForm.tsx
+++ b/packages/app-store/routing-forms/components/SingleForm.tsx
@@ -66,8 +66,10 @@ const Actions = ({
 
   return (
     <div className="flex items-center">
-      <FormAction className="self-center" data-testid="toggle-form" action="toggle" routingForm={form} />
-      <VerticalDivider />
+      <div className="hidden items-center sm:inline-flex">
+        <FormAction className="self-center" data-testid="toggle-form" action="toggle" routingForm={form} />
+        <VerticalDivider />
+      </div>
       <ButtonGroup combined containerProps={{ className: "hidden md:inline-flex items-center" }}>
         <Tooltip content={t("preview")}>
           <FormAction
@@ -186,7 +188,7 @@ const Actions = ({
               {t("Copy Typeform Redirect Url")}
             </FormAction>
           ) : null}
-          <DropdownMenuSeparator />
+          <DropdownMenuSeparator className="hidden sm:block" />
           <FormAction
             action="_delete"
             routingForm={form}
@@ -196,6 +198,16 @@ const Actions = ({
             StartIcon={Trash}>
             {t("delete")}
           </FormAction>
+          <div className="block sm:hidden">
+            <DropdownMenuSeparator />
+            <FormAction
+              data-testid="toggle-form"
+              action="toggle"
+              routingForm={form}
+              label="Disable Form"
+              extraClassNames="hover:bg-subtle cursor-pointer rounded-[5px] pr-4"
+            />
+          </div>
         </FormActionsDropdown>
       </div>
       <VerticalDivider />
@@ -272,8 +284,8 @@ function SingleForm({ form, appUrl, Page }: SingleFormComponentProps) {
             subtitle={form.description || ""}
             backPath={`/${appUrl}/forms`}
             CTA={<Actions form={form} mutation={mutation} />}>
-            <div className="-mx-4 px-4 sm:px-6 md:-mx-8 md:px-8">
-              <div className="flex flex-col items-center md:flex-row md:items-start">
+            <div className="-mx-4 mt-4 px-4 sm:px-6 md:-mx-8 md:mt-0 md:px-8">
+              <div className="flex flex-col items-center items-baseline md:flex-row md:items-start">
                 <div className="lg:min-w-72 lg:max-w-72 mb-6 md:mr-6">
                   <TextField
                     type="text"
diff --git a/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx b/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
index 99415bcfbc..6df0cdbfb9 100644
--- a/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
@@ -332,7 +332,6 @@ export default function FormEditPage({
     />
   );
 }
-FormEditPage.isThemeSupported = true;
 
 FormEditPage.getLayout = (page: React.ReactElement) => {
   return (
diff --git a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
index 12f048088a..adbde12d54 100644
--- a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
@@ -252,10 +252,12 @@ export default function RoutingForms({
   );
 }
 
-RoutingForms.isThemeSupported = true;
-
 RoutingForms.getLayout = (page: React.ReactElement) => {
-  return <Shell withoutMain={true}>{page}</Shell>;
+  return (
+    <Shell withoutMain={true} hideHeadingOnMobile>
+      {page}
+    </Shell>
+  );
 };
 
 export const getServerSideProps = async function getServerSideProps(
diff --git a/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx b/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
index 714e0a2053..96174cac1e 100644
--- a/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
@@ -197,8 +197,6 @@ export default function ReporterWrapper({
   );
 }
 
-ReporterWrapper.isThemeSupported = true;
-
 ReporterWrapper.getLayout = (page: React.ReactElement) => {
   return (
     <Shell backPath="/apps/routing-forms/forms" withoutMain={true}>
diff --git a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
index ae3b0fa40e..d36b792cc4 100644
--- a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
@@ -215,14 +215,14 @@ const Route = ({
                     name="externalRedirectUrl"
                     className="border-default flex w-full flex-grow text-sm"
                     containerClassName="w-full mt-2"
-                    type="text"
+                    type="url"
                     required
                     labelSrOnly
                     value={route.action.value}
                     onChange={(e) => {
                       setRoute(route.id, { action: { ...route.action, value: e.target.value } });
                     }}
-                    placeholder="Enter External Redirect URL"
+                    placeholder="https://example.com"
                   />
                 ) : (
                   <div className="block w-full">
@@ -523,7 +523,6 @@ export default function RouteBuilder({
     />
   );
 }
-RouteBuilder.isThemeSupported = true;
 
 RouteBuilder.getLayout = (page: React.ReactElement) => {
   return (
diff --git a/packages/app-store/routing-forms/pages/router/[...appPages].tsx b/packages/app-store/routing-forms/pages/router/[...appPages].tsx
index 6ca33edcc1..b9cc2c5516 100644
--- a/packages/app-store/routing-forms/pages/router/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/router/[...appPages].tsx
@@ -26,8 +26,6 @@ export default function Router({ form, message }: inferSSRProps<typeof getServer
   );
 }
 
-Router.isThemeSupported = true;
-
 const querySchema = z
   .object({
     form: z.string(),
diff --git a/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx b/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
index 3786b31612..5661a2e203 100644
--- a/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
@@ -86,7 +86,7 @@ function RoutingForm({ form, profile, ...restProps }: inferSSRProps<typeof getSe
       } else if (decidedAction.type === "eventTypeRedirectUrl") {
         router.push(`/${decidedAction.value}`);
       } else if (decidedAction.type === "externalRedirectUrl") {
-        window.location.href = decidedAction.value;
+        window.parent.location.href = decidedAction.value;
       }
       // showToast("Form submitted successfully! Redirecting now ...", "success");
     },
@@ -165,7 +165,7 @@ export default function RoutingLink(props: inferSSRProps<typeof getServerSidePro
   return <RoutingForm {...props} />;
 }
 
-RoutingLink.isThemeSupported = true;
+RoutingLink.isBookingPage = true;
 
 export const getServerSideProps = async function getServerSideProps(
   context: AppGetServerSidePropsContext,
diff --git a/packages/app-store/stripepayment/components/EventTypeAppCardInterface.tsx b/packages/app-store/stripepayment/components/EventTypeAppCardInterface.tsx
index 494f3ce196..f17473c7cc 100644
--- a/packages/app-store/stripepayment/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/stripepayment/components/EventTypeAppCardInterface.tsx
@@ -1,6 +1,5 @@
 import { useRouter } from "next/router";
 import { useState } from "react";
-import { FormattedNumber, IntlProvider } from "react-intl";
 
 import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
 import AppCard from "@calcom/app-store/_components/AppCard";
@@ -47,11 +46,11 @@ const EventTypeAppCard: EventTypeAppCardComponent = function EventTypeAppCard({
       description={
         <>
           <div className="">
-            {t("require_payment")} (0.5% +{" "}
-            <IntlProvider locale="en">
-              <FormattedNumber value={0.1} style="currency" currency={currency} />
-            </IntlProvider>{" "}
-            {t("commission_per_transaction")})
+            {t("payment_app_commission", {
+              paymentFeePercentage: 0.5,
+              fee: 0.1,
+              formatParams: { fee: { currency } },
+            })}
           </div>
         </>
       }>
diff --git a/packages/app-store/wipemycalother/components/confirmDialog.tsx b/packages/app-store/wipemycalother/components/confirmDialog.tsx
index 2c62aff2da..7ccd8dced1 100644
--- a/packages/app-store/wipemycalother/components/confirmDialog.tsx
+++ b/packages/app-store/wipemycalother/components/confirmDialog.tsx
@@ -66,7 +66,7 @@ export const ConfirmDialog = (props: IConfirmDialogWipe) => {
         }
       } catch (error) {
         showToast(t("unexpected_error_try_again"), "error");
-        // @TODO: notify sentry
+        // @TODO: notify
       }
       setIsLoading(false);
     },
diff --git a/packages/app-store/zapier/pages/setup/index.tsx b/packages/app-store/zapier/pages/setup/index.tsx
index aac35987f5..5a6b455d56 100644
--- a/packages/app-store/zapier/pages/setup/index.tsx
+++ b/packages/app-store/zapier/pages/setup/index.tsx
@@ -57,7 +57,7 @@ export default function ZapierSetup(props: IZapierSetupProps) {
               {!newApiKey ? (
                 <>
                   <div className="mt-1 text-xl">{t("generate_api_key")}:</div>
-                  <Button onClick={() => createApiKey()} className="mt-4 mb-4">
+                  <Button color="primary" onClick={() => createApiKey()} className="mt-4 mb-4">
                     {t("generate_api_key")}
                   </Button>
                 </>
diff --git a/packages/app-store/zohocrm/zod.ts b/packages/app-store/zohocrm/zod.ts
new file mode 100644
index 0000000000..fe378bc4bc
--- /dev/null
+++ b/packages/app-store/zohocrm/zod.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const appKeysSchema = z.object({
+  client_id: z.string().min(1),
+  client_secret: z.string().min(1),
+});
+
+export const appDataSchema = z.object({});
diff --git a/packages/atoms/booker/Booker.tsx b/packages/atoms/booker/Booker.tsx
new file mode 100644
index 0000000000..28e050bace
--- /dev/null
+++ b/packages/atoms/booker/Booker.tsx
@@ -0,0 +1,13 @@
+import type { BookerProps } from "@calcom/features/bookings/Booker";
+import { Booker as BookerComponent } from "@calcom/features/bookings/Booker";
+
+import type { AtomsGlobalConfigProps } from "../types";
+
+type BookerAtomProps = BookerProps & AtomsGlobalConfigProps;
+
+/**
+ * @TODO Before we can turn this into a reusable atom
+ * * Use the webAppUrl coming from AtomsGlobalConfigProps to make url dynamic
+ * * Find a solution for translations
+ */
+export const Booker = (props: BookerAtomProps) => <BookerComponent {...props} />;
diff --git a/packages/atoms/booker/booker.stories.mdx b/packages/atoms/booker/booker.stories.mdx
new file mode 100644
index 0000000000..1d89ee90fd
--- /dev/null
+++ b/packages/atoms/booker/booker.stories.mdx
@@ -0,0 +1,14 @@
+import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs';
+import { Title } from '@calcom/storybook/components'
+import { Icon } from "@calcom/ui";
+import { Booker } from './Booker';
+
+<Meta title="Atoms/Booker" component={Booker} />
+
+<Title title="Booker"/>
+
+<Canvas>
+  <Story name="Booker">
+    <Booker username="pro" />
+  </Story>
+</Canvas>
diff --git a/packages/atoms/booker/export.ts b/packages/atoms/booker/export.ts
new file mode 100644
index 0000000000..2bb3a2ac04
--- /dev/null
+++ b/packages/atoms/booker/export.ts
@@ -0,0 +1,5 @@
+/** Export file is only used for building the dist version of this Atom. */
+// import "../globals.css";
+
+export { Booker } from "./Booker";
+export * from "../types";
diff --git a/packages/atoms/booker/index.ts b/packages/atoms/booker/index.ts
new file mode 100644
index 0000000000..47fb01d585
--- /dev/null
+++ b/packages/atoms/booker/index.ts
@@ -0,0 +1 @@
+export { Booker } from "./Booker";
diff --git a/packages/atoms/build.mjs b/packages/atoms/build.mjs
new file mode 100644
index 0000000000..bd5c138cf6
--- /dev/null
+++ b/packages/atoms/build.mjs
@@ -0,0 +1,31 @@
+import path from "path";
+import { fileURLToPath } from "url";
+import { build } from "vite";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// @TODO: Do we want to automate this by checking all dirs for export.ts?
+const libraries = [
+  {
+    entry: path.resolve(__dirname, "./booker/export.ts"),
+    fileName: "booker",
+  },
+];
+
+libraries.forEach(async (lib) => {
+  await build({
+    build: {
+      outDir: `./dist/${lib.fileName}`,
+      lib: {
+        ...lib,
+        formats: ["es", "cjs"],
+      },
+      emptyOutDir: false,
+    },
+    resolve: {
+      alias: {
+        crypto: require.resolve("rollup-plugin-node-builtins"),
+      },
+    },
+  });
+});
diff --git a/packages/atoms/globals.css b/packages/atoms/globals.css
new file mode 100644
index 0000000000..47e4bc917b
--- /dev/null
+++ b/packages/atoms/globals.css
@@ -0,0 +1,10 @@
+/*
+ * @NOTE: This file is only imported when building the component's CSS file
+ * When using this component in any Cal project, the globals are automatically imported
+ * in that project.
+ */
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@import "../ui/styles/shared-globals.css";
\ No newline at end of file
diff --git a/packages/atoms/index.ts b/packages/atoms/index.ts
new file mode 100644
index 0000000000..647ca57b8d
--- /dev/null
+++ b/packages/atoms/index.ts
@@ -0,0 +1 @@
+export { Booker } from "./booker/Booker";
diff --git a/packages/atoms/package.json b/packages/atoms/package.json
new file mode 100644
index 0000000000..52cf9af7f4
--- /dev/null
+++ b/packages/atoms/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@calcom/atoms",
+  "private": true,
+  "sideEffects": false,
+  "type": "module",
+  "description": "Cal.com Atoms",
+  "authors": "Cal.com, Inc.",
+  "version": "1.0.0",
+  "scripts": {
+    "build": "node build.mjs"
+  },
+  "devDependencies": {
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@types/react": "^18.0.25",
+    "@types/react-dom": "^18.0.9",
+    "@vitejs/plugin-react": "^2.2.0",
+    "rollup-plugin-node-builtins": "^2.1.2",
+    "typescript": "^4.9.3",
+    "vite": "^3.2.4"
+  },
+  "main": "./index"
+}
diff --git a/packages/atoms/postcss.config.js b/packages/atoms/postcss.config.js
new file mode 100644
index 0000000000..a982c6414e
--- /dev/null
+++ b/packages/atoms/postcss.config.js
@@ -0,0 +1,8 @@
+const config = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};
+
+export default config;
diff --git a/packages/atoms/tailwind.config.cjs b/packages/atoms/tailwind.config.cjs
new file mode 100644
index 0000000000..55b6825ae4
--- /dev/null
+++ b/packages/atoms/tailwind.config.cjs
@@ -0,0 +1,7 @@
+const base = require("@calcom/config/tailwind-preset");
+
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  ...base,
+  content: ["./bookings/**/*.tsx"],
+};
diff --git a/packages/atoms/tsconfig.json b/packages/atoms/tsconfig.json
new file mode 100644
index 0000000000..b8fb2a6430
--- /dev/null
+++ b/packages/atoms/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "@calcom/tsconfig/react-library.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["/*"]
+    },
+    "resolveJsonModule": true
+  },
+  "include": [".", "../types/next-auth.d.ts"],
+  "exclude": ["dist", "build", "node_modules"]
+}
diff --git a/packages/atoms/types.ts b/packages/atoms/types.ts
new file mode 100644
index 0000000000..8ebbf932ba
--- /dev/null
+++ b/packages/atoms/types.ts
@@ -0,0 +1,7 @@
+export interface AtomsGlobalConfigProps {
+  /**
+   * API endpoint for the Booker component to fetch data from,
+   * defaults to https://cal.com
+   */
+  webAppUrl?: string;
+}
diff --git a/packages/atoms/vite.config.ts b/packages/atoms/vite.config.ts
new file mode 100644
index 0000000000..0950e3ce06
--- /dev/null
+++ b/packages/atoms/vite.config.ts
@@ -0,0 +1,28 @@
+import { resolve } from "path";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: [resolve(__dirname, "booker/export.ts")],
+      name: "CalAtoms",
+      fileName: "cal-atoms",
+    },
+    rollupOptions: {
+      external: ["react", "fs", "path", "os", "react-dom"],
+      output: {
+        globals: {
+          react: "React",
+          "react-dom": "ReactDOM",
+        },
+      },
+    },
+  },
+  resolve: {
+    alias: {
+      fs: resolve("../../node_modules/rollup-plugin-node-builtins"),
+      path: resolve("../../node_modules/rollup-plugin-node-builtins"),
+      os: resolve("../../node_modules/rollup-plugin-node-builtins"),
+    },
+  },
+});
diff --git a/packages/config/eslint-preset.js b/packages/config/eslint-preset.js
index 7b55dc27a3..aae6eb0a93 100644
--- a/packages/config/eslint-preset.js
+++ b/packages/config/eslint-preset.js
@@ -1,7 +1,13 @@
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
   root: true,
-  extends: ["plugin:playwright/playwright-test", "next", "plugin:prettier/recommended", "turbo"],
+  extends: [
+    "plugin:playwright/playwright-test",
+    "next",
+    "plugin:prettier/recommended",
+    "turbo",
+    "plugin:you-dont-need-lodash-underscore/compatible-warn",
+  ],
   plugins: ["unused-imports"],
   parserOptions: {
     tsconfigRootDir: __dirname,
diff --git a/packages/config/package.json b/packages/config/package.json
index 6301f6caee..77ceef3747 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -17,6 +17,7 @@
     "eslint-plugin-prettier": "^4.2.1"
   },
   "devDependencies": {
+    "@savvywombat/tailwindcss-grid-areas": "^3.0.0",
     "@tailwindcss/forms": "^0.5.2",
     "@tailwindcss/line-clamp": "^0.4.0",
     "@tailwindcss/typography": "^0.5.4",
@@ -25,6 +26,7 @@
     "@typescript-eslint/parser": "^5.52.0",
     "eslint": "^8.34.0",
     "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
     "prettier": "^2.8.6",
     "prettier-plugin-tailwindcss": "^0.2.5",
     "tailwind-scrollbar": "^2.0.1",
diff --git a/packages/config/tailwind-preset.js b/packages/config/tailwind-preset.js
index 7afae1c72c..2c05681336 100644
--- a/packages/config/tailwind-preset.js
+++ b/packages/config/tailwind-preset.js
@@ -10,6 +10,7 @@ module.exports = {
     "../../packages/app-store/**/*{components,pages}/**/*.{js,ts,jsx,tsx}",
     "../../packages/features/**/*.{js,ts,jsx,tsx}",
     "../../packages/ui/**/*.{js,ts,jsx,tsx}",
+    "../../packages/atoms/**/*.{js,ts,jsx,tsx}",
   ],
   darkMode: "class",
   theme: {
@@ -26,9 +27,10 @@ module.exports = {
         error: "var(--cal-bg-error)",
         black: "#111111",
         brand: {
-          default: "var(--cal-brand,'#111827')",
-          emphasis: "var(--cal-brand-emphasis,'#101010')",
-          subtle: "var(--cal-brand-subtle,'#9CA3AF')",
+          default: "var(--cal-brand,#111827)",
+          emphasis: "var(--cal-brand-emphasis,#101010)",
+          subtle: "var(--cal-brand-subtle,#9CA3AF)",
+          accent: "var(--cal-brand-accent,white)",
         },
         gray: {
           50: "#F9FAFB",
@@ -91,18 +93,12 @@ module.exports = {
       },
       keyframes: {
         "fade-in-up": {
-          "0%": {
-            opacity: 0.75,
-            transform: "translateY(20px)",
-          },
-          "100%": {
-            opacity: 1,
-            transform: "translateY(0)",
-          },
+          from: { opacity: 0, transform: "translateY(10px)" },
+          to: { opacity: 1, transform: "none" },
         },
       },
       animation: {
-        "fade-in-up": "fade-in-up 0.35s cubic-bezier(.21,1.02,.73,1)",
+        "fade-in-up": "fade-in-up 600ms var(--animation-delay, 0ms) cubic-bezier(.21,1.02,.73,1) forwards",
       },
       boxShadow: {
         dropdown: "0px 2px 6px -1px rgba(0, 0, 0, 0.08)",
@@ -151,6 +147,7 @@ module.exports = {
     require("@tailwindcss/typography"),
     require("tailwind-scrollbar"),
     require("tailwindcss-radix")(),
+    require("@savvywombat/tailwindcss-grid-areas"),
     plugin(({ addVariant }) => {
       addVariant("mac", ".mac &");
       addVariant("windows", ".windows &");
diff --git a/packages/core/CalendarManager.ts b/packages/core/CalendarManager.ts
index 4d3ee42cf1..af2c845655 100644
--- a/packages/core/CalendarManager.ts
+++ b/packages/core/CalendarManager.ts
@@ -19,6 +19,7 @@ import type { CredentialPayload, CredentialWithAppName } from "@calcom/types/Cre
 import type { EventResult } from "@calcom/types/EventManager";
 
 const log = logger.getChildLogger({ prefix: ["CalendarManager"] });
+let coldStart = true;
 
 export const getCalendarCredentials = (credentials: Array<CredentialPayload>) => {
   const calendarCredentials = getApps(credentials)
@@ -183,48 +184,71 @@ export const getCachedResults = async (
  */
 const getNextCache = async (username: string, month: string): Promise<EventBusyDate[][]> => {
   let localCache: EventBusyDate[][] = [];
+  const { NODE_ENV } = process.env;
+  const cacheDir = `${NODE_ENV === "development" ? NODE_ENV : process.env.BUILD_ID}`;
+  const baseUrl = `${WEBAPP_URL}/_next/data/${cacheDir}/en`;
+  const url = `${baseUrl}/${username}/calendar-cache/${month}.json?user=${username}&month=${month}`;
   try {
-    const { NODE_ENV } = process.env;
-    const cacheDir = `${NODE_ENV === "development" ? NODE_ENV : process.env.BUILD_ID}`;
-    const baseUrl = `${WEBAPP_URL}/_next/data/${cacheDir}/en`;
-    console.log(`${baseUrl}/${username}/calendar-cache/${month}.json?user=${username}&month=${month}`);
-    localCache = await fetch(
-      `${baseUrl}/${username}/calendar-cache/${month}.json?user=${username}&month=${month}`
-    )
+    localCache = await fetch(url)
       .then((r) => r.json())
       .then((json) => json?.pageProps?.results);
-    // No need to wait for this, the purpose is to force re-validation every second as indicated
-    // in page getStaticProps.
-    fetch(`${baseUrl}/${username}/calendar-cache/${month}`).catch(console.log);
   } catch (e) {
-    log.warn(e);
+    log.warn(url, e);
   }
   return localCache;
 };
+/**
+ * Get months between given dates
+ * @returns ["2023-04", "2024-05"]
+ */
+const getMonths = (dateFrom: string, dateTo: string): string[] => {
+  const months: string[] = [dayjs(dateFrom).format("YYYY-MM")];
+  for (
+    let i = 1;
+    dayjs(dateFrom).add(i, "month").isBefore(dateTo) ||
+    dayjs(dateFrom).add(i, "month").isSame(dateTo, "month");
+    i++
+  ) {
+    months.push(dayjs(dateFrom).add(i, "month").format("YYYY-MM"));
+  }
+  return months;
+};
 
+const createCalendarCachePage = (username: string, month: string): void => {
+  // No need to wait for this, the purpose is to force re-validation every second as indicated
+  // in page getStaticProps.
+  fetch(`${WEBAPP_URL}/${username}/calendar-cache/${month}`).catch(console.log);
+};
 export const getBusyCalendarTimes = async (
   username: string,
   withCredentials: CredentialPayload[],
   dateFrom: string,
-  dateTo: string
+  dateTo: string,
+  selectedCalendars: SelectedCalendar[]
 ) => {
   let results: EventBusyDate[][] = [];
-  if (dayjs(dateFrom).isSame(dayjs(dateTo), "month")) {
-    results = await getNextCache(username, dayjs(dateFrom).format("YYYY-MM"));
-  } else {
-    // if dateFrom and dateTo is from different months get cache by each month
-    const months: string[] = [dayjs(dateFrom).format("YYYY-MM")];
-    for (
-      let i = 1;
-      dayjs(dateFrom).add(i, "month").isBefore(dateTo) ||
-      dayjs(dateFrom).add(i, "month").isSame(dateTo, "month");
-      i++
-    ) {
-      months.push(dayjs(dateFrom).add(i, "month").format("YYYY-MM"));
+  const months = getMonths(dateFrom, dateTo);
+  try {
+    if (coldStart) {
+      results = await getCachedResults(withCredentials, dateFrom, dateTo, selectedCalendars);
+      logger.info("Generating calendar cache in background");
+      // on cold start the calendar cache page generated in the background
+      Promise.all(months.map((month) => createCalendarCachePage(username, month)));
+    } else {
+      if (months.length === 1) {
+        results = await getNextCache(username, dayjs(dateFrom).format("YYYY-MM"));
+      } else {
+        // if dateFrom and dateTo is from different months get cache by each month
+        const data: EventBusyDate[][][] = await Promise.all(
+          months.map((month) => getNextCache(username, month))
+        );
+        results = data.flat(1);
+      }
     }
-    const data: EventBusyDate[][][] = await Promise.all(months.map((month) => getNextCache(username, month)));
-    results = data.flat(1);
+  } catch (e) {
+    logger.warn(e);
   }
+  coldStart = false;
   return results.reduce((acc, availability) => acc.concat(availability), []);
 };
 
diff --git a/packages/core/getBusyTimes.ts b/packages/core/getBusyTimes.ts
index 5aad4eac59..42928970d3 100644
--- a/packages/core/getBusyTimes.ts
+++ b/packages/core/getBusyTimes.ts
@@ -6,6 +6,7 @@ import dayjs from "@calcom/dayjs";
 import logger from "@calcom/lib/logger";
 import { performance } from "@calcom/lib/server/perfObserver";
 import prisma from "@calcom/prisma";
+import type { SelectedCalendar } from "@calcom/prisma/client";
 import type { EventBusyDetails } from "@calcom/types/Calendar";
 
 export async function getBusyTimes(params: {
@@ -17,6 +18,7 @@ export async function getBusyTimes(params: {
   beforeEventBuffer?: number;
   afterEventBuffer?: number;
   endTime: string;
+  selectedCalendars: SelectedCalendar[];
 }) {
   const {
     credentials,
@@ -27,6 +29,7 @@ export async function getBusyTimes(params: {
     endTime,
     beforeEventBuffer,
     afterEventBuffer,
+    selectedCalendars,
   } = params;
   logger.silly(
     `Checking Busy time from Cal Bookings in range ${startTime} to ${endTime} for input ${JSON.stringify({
@@ -119,7 +122,20 @@ export async function getBusyTimes(params: {
   performance.mark("prismaBookingGetEnd");
   performance.measure(`prisma booking get took $1'`, "prismaBookingGetStart", "prismaBookingGetEnd");
   if (credentials?.length > 0) {
-    const calendarBusyTimes = await getBusyCalendarTimes(username, credentials, startTime, endTime);
+    const startConnectedCalendarsGet = performance.now();
+    const calendarBusyTimes = await getBusyCalendarTimes(
+      username,
+      credentials,
+      startTime,
+      endTime,
+      selectedCalendars
+    );
+    const endConnectedCalendarsGet = performance.now();
+    logger.debug(
+      `Connected Calendars get took ${
+        endConnectedCalendarsGet - startConnectedCalendarsGet
+      } ms for user ${username}`
+    );
     busyTimes.push(
       ...calendarBusyTimes.map((value) => ({
         ...value,
diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
index 942ec1b26a..16d94b5573 100644
--- a/packages/core/getUserAvailability.ts
+++ b/packages/core/getUserAvailability.ts
@@ -70,7 +70,10 @@ type EventType = Awaited<ReturnType<typeof getEventType>>;
 const getUser = (where: Prisma.UserWhereUniqueInput) =>
   prisma.user.findUnique({
     where,
-    select: availabilityUserSelect,
+    select: {
+      ...availabilityUserSelect,
+      credentials: true,
+    },
   });
 
 type User = Awaited<ReturnType<typeof getUser>>;
@@ -149,6 +152,7 @@ export async function getUserAvailability(
     username: `${user.username}`,
     beforeEventBuffer,
     afterEventBuffer,
+    selectedCalendars: user.selectedCalendars,
   });
 
   let bufferedBusyTimes: EventBusyDetails[] = busyTimes.map((a) => ({
diff --git a/packages/embeds/embed-core/embed-iframe-init.ts b/packages/embeds/embed-core/embed-iframe-init.ts
new file mode 100644
index 0000000000..e5b0d3d89d
--- /dev/null
+++ b/packages/embeds/embed-core/embed-iframe-init.ts
@@ -0,0 +1,55 @@
+export default function EmbedInitIframe() {
+  if (typeof window === "undefined" || window.isEmbed) {
+    return;
+  }
+
+  const calEmbedMode = typeof new URL(document.URL).searchParams.get("embed") === "string";
+
+  /* Iframe Name */
+  window.name.includes("cal-embed");
+
+  window.isEmbed = () => {
+    // Once an embed mode always an embed mode
+    return calEmbedMode;
+  };
+
+  window.resetEmbedStatus = () => {
+    try {
+      // eslint-disable-next-line @calcom/eslint/avoid-web-storage
+      window.sessionStorage.removeItem("calEmbedMode");
+    } catch (e) {}
+  };
+
+  window.getEmbedTheme = () => {
+    const url = new URL(document.URL);
+    return url.searchParams.get("theme") as "light" | "dark" | null;
+  };
+
+  window.getEmbedNamespace = () => {
+    const url = new URL(document.URL);
+    const namespace = url.searchParams.get("embed");
+    return namespace;
+  };
+
+  window.CalEmbed = window.CalEmbed || {};
+
+  window.CalEmbed.applyCssVars = (cssVarsPerTheme) => {
+    const cssVarsStyle = [];
+    if (cssVarsPerTheme) {
+      for (const [themeName, cssVars] of Object.entries(cssVarsPerTheme)) {
+        cssVarsStyle.push(`.${themeName} {`);
+        for (const [cssVarName, value] of Object.entries(cssVars)) {
+          cssVarsStyle.push(`--${cssVarName}: ${value};`);
+        }
+        cssVarsStyle.push(`}`);
+      }
+    }
+    const style = document.createElement("style");
+    style.id = "embed-css-vars";
+    style.innerText = cssVarsStyle.join("\n");
+    if (document.head.querySelector("#embed-css-vars")) {
+      return;
+    }
+    document.head.appendChild(style);
+  };
+}
diff --git a/packages/embeds/embed-core/index.html b/packages/embeds/embed-core/index.html
index f05ebfed0e..cd7e1396ff 100644
--- a/packages/embeds/embed-core/index.html
+++ b/packages/embeds/embed-core/index.html
@@ -161,6 +161,8 @@
         <h3>
           <a href="?only=ns:default">[Dark Theme][Guests(janedoe@example.com and test@example.com)]</a>
         </h3>
+        <button onclick="Cal('ui',{theme:'light'})" >Toggle to Light</button>
+
         <i class="last-action"> You would see last Booking page action in my place </i>
         <div>
           <div class="place" style="width: 100%"></div>
@@ -174,20 +176,20 @@
             If you render booking embed in me, I won't restrict you. The entire page is yours. Content is by
             default aligned center
           </div>
-          <button
-            onclick="(function () {Cal.ns.second('ui', {styles:{eventTypeListItem:{backgroundColor:'blue'}}})})()">
-            Change <code>eventTypeListItem</code> bg color
-          </button>
-          <button onclick="(function () {Cal.ns.second('ui', {styles:{body:{background:'red'}}})})()">
-            Change <code>body</code> bg color
-          </button>
           <button
             onclick="(function () {Cal.ns.second('ui', {cssVarsPerTheme:{light:{'cal-border-booker':'green', 'cal-border-booker-width':'20px'},dark:{'cal-border-booker':'red', 'cal-border-booker-width':'5px'}}})})()">
             Change booker border for dark and light themes
           </button>
-          <button onclick="(function () {Cal.ns.second('ui', {styles:{align:'left'}})})()">Align left</button>
+          <button
+            onclick="(function () {Cal.ns.second('ui', {styles:{eventTypeListItem:{backgroundColor:'blue'}}})})()">
+            Change <code>eventTypeListItem</code> bg color[Deprecated]
+          </button>
+          <button onclick="(function () {Cal.ns.second('ui', {styles:{body:{background:'red'}}})})()">
+            Change <code>body</code> bg color[Deprecated]
+          </button>
+          <button onclick="(function () {Cal.ns.second('ui', {styles:{align:'left'}})})()">Align left[Deprecated]</button>
           <button onclick="(function () {Cal.ns.second('ui', {styles:{align:'center'}})})()">
-            Align Center
+            Align Center[Deprecated]
           </button>
           <button
             onclick="(function () {Cal.ns.second('ui', {styles:{enabledDateButton: {
@@ -196,7 +198,7 @@
           disabledDateButton: {
             backgroundColor: generateRandomHexColor(),
           },}})})()">
-            Change 'enabledDateButton` and `disabledDateButton` background Color
+            Change 'enabledDateButton` and `disabledDateButton` background Color[Deprecated]
           </button>
         </div>
       </div>
diff --git a/packages/embeds/embed-core/src/embed-iframe.ts b/packages/embeds/embed-core/src/embed-iframe.ts
index 4102b54631..8f09414430 100644
--- a/packages/embeds/embed-core/src/embed-iframe.ts
+++ b/packages/embeds/embed-core/src/embed-iframe.ts
@@ -2,6 +2,8 @@ import { useRouter } from "next/router";
 import type { CSSProperties } from "react";
 import { useState, useEffect } from "react";
 
+import embedInit from "@calcom/embed-core/embed-iframe-init";
+
 import type { Message } from "./embed";
 import { sdkActionManager } from "./sdk-event";
 
@@ -40,9 +42,10 @@ declare global {
     CalEmbed: {
       __logQueue?: unknown[];
       embedStore: typeof embedStore;
+      applyCssVars: (cssVarsPerTheme: UiConfig["cssVarsPerTheme"]) => void;
     };
     CalComPageStatus: string;
-    isEmbed: () => boolean;
+    isEmbed?: () => boolean;
     resetEmbedStatus: () => void;
     getEmbedNamespace: () => string | null;
     getEmbedTheme: () => "dark" | "light" | null;
@@ -303,6 +306,11 @@ const methods = {
 
     // Set the value here so that if setUiConfig state isn't available and later it's defined,it uses this value
     embedStore.uiConfig = uiConfig;
+
+    if (uiConfig.cssVarsPerTheme) {
+      window.CalEmbed.applyCssVars(uiConfig.cssVarsPerTheme);
+    }
+
     if (embedStore.setUiConfig) {
       embedStore.setUiConfig(uiConfig);
     }
@@ -423,6 +431,8 @@ function keepParentInformedAboutDimensionChanges() {
 
 if (isBrowser) {
   log("Embed SDK loaded", { isEmbed: window?.isEmbed?.() || false });
+  // Exposes certain global variables/fns that are used by the app to get interface with the embed.
+  embedInit();
   const url = new URL(document.URL);
   embedStore.theme = (window?.getEmbedTheme?.() || "auto") as UiConfig["theme"];
   if (url.searchParams.get("prerender") !== "true" && window?.isEmbed?.()) {
diff --git a/packages/embeds/embed-react/inline.tsx b/packages/embeds/embed-react/inline.tsx
index 666d8c6c70..32e08cb9b7 100644
--- a/packages/embeds/embed-react/inline.tsx
+++ b/packages/embeds/embed-react/inline.tsx
@@ -20,6 +20,19 @@ function App() {
         action: "*",
         callback,
       });
+
+      api("ui", {
+        cssVarsPerTheme: {
+          light: {
+            "cal-border-booker": "red",
+            "cal-border-booker-width": "20px",
+          },
+          dark: {
+            "cal-border-booker": "red",
+            "cal-border-booker-width": "5px",
+          },
+        },
+      });
     });
     return () => {
       api.then((api) => {
diff --git a/packages/features/apps/AdminAppsList.tsx b/packages/features/apps/AdminAppsList.tsx
index 845faa9543..3863c3b43b 100644
--- a/packages/features/apps/AdminAppsList.tsx
+++ b/packages/features/apps/AdminAppsList.tsx
@@ -104,7 +104,7 @@ const IntegrationContainer = ({
                 } else if (app.keys) {
                   showKeyModal(true);
                 } else {
-                  enableAppMutation.mutate({ slug: app.slug, enabled: app.enabled });
+                  enableAppMutation.mutate({ slug: app.slug, enabled: !app.enabled });
                 }
               }}
             />
@@ -117,7 +117,7 @@ const IntegrationContainer = ({
           title={t("disable_app")}
           variety="danger"
           onConfirm={() => {
-            enableAppMutation.mutate({ slug: app.slug, enabled: app.enabled });
+            enableAppMutation.mutate({ slug: app.slug, enabled: !app.enabled });
           }}>
           {t("disable_app_description")}
         </ConfirmationDialogContent>
diff --git a/packages/features/auth/PermissionContainer.tsx b/packages/features/auth/PermissionContainer.tsx
index dbe4a8222d..445aa45948 100644
--- a/packages/features/auth/PermissionContainer.tsx
+++ b/packages/features/auth/PermissionContainer.tsx
@@ -19,7 +19,8 @@ export const PermissionContainer: FC<AdminRequiredProps> = ({
   const session = useSession();
 
   // Admin can do everything
-  if (session.data?.user.role !== roleRequired || !UserPermissionRole.ADMIN) return null;
+  if (session.data?.user.role !== roleRequired && session.data?.user.role != UserPermissionRole.ADMIN)
+    return null;
   const Component = as ?? Fragment;
   return <Component {...rest}>{children}</Component>;
 };
diff --git a/packages/features/auth/lib/getServerSession.ts b/packages/features/auth/lib/getServerSession.ts
index 6b8308c4e6..5368484be3 100644
--- a/packages/features/auth/lib/getServerSession.ts
+++ b/packages/features/auth/lib/getServerSession.ts
@@ -1,18 +1,81 @@
+import { LRUCache } from "lru-cache";
 import type { GetServerSidePropsContext, NextApiRequest, NextApiResponse } from "next";
 import type { AuthOptions, Session } from "next-auth";
-import { getServerSession as getServerSessionInner } from "next-auth/next";
+import { getToken } from "next-auth/jwt";
 
-import { AUTH_OPTIONS } from "./next-auth-options";
+import checkLicense from "@calcom/features/ee/common/server/checkLicense";
+import { CAL_URL } from "@calcom/lib/constants";
+import prisma from "@calcom/prisma";
 
+/**
+ * Stores the session in memory using the stringified token as the key.
+ *
+ */
+const CACHE = new LRUCache<string, Session>({ max: 1000 });
+
+/**
+ * This is a slimmed down version of the `getServerSession` function from
+ * `next-auth`.
+ *
+ * Instead of requiring the entire options object for NextAuth, we create
+ * a compatible session using information from the incoming token.
+ *
+ * The downside to this is that we won't refresh sessions if the users
+ * token has expired (30 days). This should be fine as we call `/auth/session`
+ * frequently enough on the client-side to keep the session alive.
+ */
 export async function getServerSession(options: {
   req: NextApiRequest | GetServerSidePropsContext["req"];
-  res: NextApiResponse | GetServerSidePropsContext["res"];
+  res?: NextApiResponse | GetServerSidePropsContext["res"];
   authOptions?: AuthOptions;
 }) {
-  const { req, res, authOptions = AUTH_OPTIONS } = options;
+  const { req, authOptions: { secret } = {} } = options;
 
-  const session = await getServerSessionInner(req, res, authOptions);
+  const token = await getToken({
+    req,
+    secret,
+  });
 
-  // that these are equal are ensured in `[...nextauth]`'s callback
-  return session as Session | null;
+  if (!token || !token.email || !token.sub) {
+    return null;
+  }
+
+  const cachedSession = CACHE.get(JSON.stringify(token));
+
+  if (cachedSession) {
+    return cachedSession;
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      email: token.email.toLowerCase(),
+    },
+  });
+
+  if (!user) {
+    return null;
+  }
+
+  const hasValidLicense = await checkLicense(prisma);
+
+  const session: Session = {
+    hasValidLicense,
+    expires: new Date(typeof token.exp === "number" ? token.exp * 1000 : Date.now()).toISOString(),
+    user: {
+      id: user.id,
+      name: user.name,
+      username: user.username,
+      email: user.email,
+      emailVerified: user.emailVerified,
+      email_verified: user.emailVerified !== null,
+      role: user.role,
+      image: `${CAL_URL}/${user.username}/avatar.png`,
+      impersonatedByUID: token.impersonatedByUID ?? undefined,
+      belongsToActiveTeam: token.belongsToActiveTeam,
+    },
+  };
+
+  CACHE.set(JSON.stringify(token), session);
+
+  return session;
 }
diff --git a/packages/features/auth/lib/next-auth-options.ts b/packages/features/auth/lib/next-auth-options.ts
index c0209c1f94..bf366b84e0 100644
--- a/packages/features/auth/lib/next-auth-options.ts
+++ b/packages/features/auth/lib/next-auth-options.ts
@@ -42,13 +42,16 @@ type UserTeams = {
   })[];
 };
 
-const checkIfUserBelongsToActiveTeam = <T extends UserTeams>(user: T): boolean =>
-  user.teams.filter((m: { team: { metadata: unknown } }) => {
-    if (!IS_TEAM_BILLING_ENABLED) return true;
+export const checkIfUserBelongsToActiveTeam = <T extends UserTeams>(user: T) =>
+  user.teams.some((m: { team: { metadata: unknown } }) => {
+    if (!IS_TEAM_BILLING_ENABLED) {
+      return true;
+    }
+
     const metadata = teamMetadataSchema.safeParse(m.team.metadata);
-    if (metadata.success && metadata.data?.subscriptionId) return true;
-    return false;
-  }).length > 0;
+
+    return metadata.success && metadata.data?.subscriptionId;
+  });
 
 const providers: Provider[] = [
   CredentialsProvider({
diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json
index 35d7df8de5..e4a1262564 100644
--- a/packages/features/auth/package.json
+++ b/packages/features/auth/package.json
@@ -14,6 +14,7 @@
     "bcryptjs": "^2.4.3",
     "handlebars": "^4.7.7",
     "jose": "^4.13.1",
+    "lru-cache": "^9.0.3",
     "next-auth": "^4.20.1",
     "nodemailer": "^6.7.8",
     "otplib": "^12.0.1"
diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx
new file mode 100644
index 0000000000..1815b7ed27
--- /dev/null
+++ b/packages/features/bookings/Booker/Booker.tsx
@@ -0,0 +1,213 @@
+import type { MotionStyle } from "framer-motion";
+import { LazyMotion, domAnimation, m, AnimatePresence } from "framer-motion";
+import { Fragment, useEffect, useRef } from "react";
+import StickyBox from "react-sticky-box";
+import { shallow } from "zustand/shallow";
+
+import classNames from "@calcom/lib/classNames";
+import useGetBrandingColours from "@calcom/lib/getBrandColours";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
+import { Logo, ToggleGroup, useCalcomTheme } from "@calcom/ui";
+import { Calendar, Columns, Grid } from "@calcom/ui/components/icon";
+
+import { AvailableTimeSlots } from "./components/AvailableTimeSlots";
+import { Away } from "./components/Away";
+import { BookEventForm } from "./components/BookEventForm";
+import { DatePicker } from "./components/DatePicker";
+import { EventMeta } from "./components/EventMeta";
+import { LargeCalendar } from "./components/LargeCalendar";
+import { BookerSection } from "./components/Section";
+import { fadeInUp, fadeInLeft, resizeAnimationConfig } from "./config";
+import { useBookerStore, useInitializeBookerStore } from "./store";
+import type { BookerLayout, BookerProps } from "./types";
+import { useEvent } from "./utils/event";
+
+const useBrandColors = ({ brandColor, darkBrandColor }: { brandColor?: string; darkBrandColor?: string }) => {
+  const brandTheme = useGetBrandingColours({
+    lightVal: brandColor,
+    darkVal: darkBrandColor,
+  });
+  useCalcomTheme(brandTheme);
+};
+
+const BookerComponent = ({ username, eventSlug, month, rescheduleBooking }: BookerProps) => {
+  const { t } = useLocale();
+  const isMobile = useMediaQuery("(max-width: 768px)");
+  const isTablet = useMediaQuery("(max-width: 1024px)");
+  const timeslotsRef = useRef<HTMLDivElement>(null);
+  const StickyOnDesktop = isMobile ? "div" : StickyBox;
+  const rescheduleUid =
+    typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("rescheduleUid") : null;
+  const event = useEvent();
+  const [layout, setLayout] = useBookerStore((state) => [state.layout, state.setLayout], shallow);
+  const [bookerState, setBookerState] = useBookerStore((state) => [state.state, state.setState], shallow);
+  const selectedDate = useBookerStore((state) => state.selectedDate);
+  const [selectedTimeslot, setSelectedTimeslot] = useBookerStore(
+    (state) => [state.selectedTimeslot, state.setSelectedTimeslot],
+    shallow
+  );
+
+  useBrandColors({
+    brandColor: event.data?.profile.brandColor,
+    darkBrandColor: event.data?.profile.darkBrandColor,
+  });
+
+  useInitializeBookerStore({
+    username,
+    eventSlug,
+    month,
+    eventId: event?.data?.id,
+    rescheduleUid,
+    rescheduleBooking,
+  });
+
+  useEffect(() => {
+    setLayout(isMobile ? "mobile" : "small_calendar");
+  }, [isMobile, setLayout]);
+
+  useEffect(() => {
+    if (event.isLoading) return setBookerState("loading");
+    if (!selectedDate) return setBookerState("selecting_date");
+    if (!selectedTimeslot) return setBookerState("selecting_time");
+    return setBookerState("booking");
+  }, [event, selectedDate, selectedTimeslot, setBookerState]);
+
+  useEffect(() => {
+    if (layout === "mobile") {
+      timeslotsRef.current?.scrollIntoView({ behavior: "smooth" });
+    }
+  }, [layout, selectedDate]);
+
+  return (
+    <>
+      {/*
+        If we would render this on mobile, it would unset the mobile variant,
+        since that's not a valid option, so it would set the layout to null.
+      */}
+      {!isMobile && (
+        <div className="[&>div]:bg-muted fixed top-2 right-3 z-10">
+          <ToggleGroup
+            onValueChange={(layout) => setLayout(layout as BookerLayout)}
+            defaultValue="small_calendar"
+            options={[
+              {
+                value: "small_calendar",
+                label: <Calendar width="16" height="16" />,
+                tooltip: t("switch_monthly"),
+              },
+              {
+                value: "large_calendar",
+                label: <Grid width="16" height="16" />,
+                tooltip: t("switch_weekly"),
+              },
+              {
+                value: "large_timeslots",
+                label: <Columns width="16" height="16" />,
+                tooltip: t("switch_multiday"),
+              },
+            ]}
+          />
+        </div>
+      )}
+      <div className="flex h-full w-full flex-col items-center">
+        <m.div
+          layout
+          // Passing the default animation styles here as the styles, makes sure that there's no initial loading state
+          // where there's no styles applied yet (meaning there wouldn't be a grid + widths), which would cause
+          // the layout to jump around on load.
+          style={resizeAnimationConfig.small_calendar.default as MotionStyle}
+          animate={resizeAnimationConfig[layout]?.[bookerState] || resizeAnimationConfig[layout].default}
+          transition={{ ease: "easeInOut", duration: 0.4 }}
+          className={classNames(
+            "[--booker-meta-width:280px] [--booker-main-width:480px] [--booker-timeslots-width:240px] lg:[--booker-timeslots-width:280px]",
+            "bg-muted grid max-w-full items-start overflow-clip dark:[color-scheme:dark] md:flex-row",
+            layout === "small_calendar" &&
+              "border-subtle mt-20 min-h-[450px] w-[calc(var(--booker-meta-width)+var(--booker-main-width))] rounded-md border",
+            layout !== "small_calendar" && "h-auto min-h-screen w-screen"
+          )}>
+          <AnimatePresence>
+            <StickyOnDesktop key="meta" className="relative z-10">
+              <BookerSection area="meta" className="max-w-screen w-full md:w-[var(--booker-meta-width)]">
+                <EventMeta />
+                {layout !== "small_calendar" && !(layout === "mobile" && bookerState === "booking") && (
+                  <div className=" mt-auto p-6">
+                    <DatePicker />
+                  </div>
+                )}
+              </BookerSection>
+            </StickyOnDesktop>
+
+            <BookerSection
+              key="book-event-form"
+              area="main"
+              className="border-subtle sticky top-0 ml-[-1px] h-full p-6 md:w-[var(--booker-main-width)] md:border-l"
+              {...fadeInUp}
+              visible={bookerState === "booking"}>
+              <BookEventForm onCancel={() => setSelectedTimeslot(null)} />
+            </BookerSection>
+
+            <BookerSection
+              key="datepicker"
+              area="main"
+              visible={bookerState !== "booking" && layout === "small_calendar"}
+              {...fadeInUp}
+              initial="visible"
+              className="md:border-subtle ml-[-1px] h-full flex-shrink p-6 md:border-l lg:w-[var(--booker-main-width)]">
+              <DatePicker />
+            </BookerSection>
+
+            <BookerSection
+              key="large-calendar"
+              area="main"
+              visible={
+                layout === "large_calendar" &&
+                (bookerState === "selecting_date" || bookerState === "selecting_time")
+              }
+              className="border-muted sticky top-0 ml-[-1px] h-full md:border-l"
+              {...fadeInUp}>
+              <LargeCalendar />
+            </BookerSection>
+
+            <BookerSection
+              key="timeslots"
+              area={{ default: "main", small_calendar: "timeslots" }}
+              visible={
+                (layout !== "large_calendar" && bookerState === "selecting_time") ||
+                (layout === "large_timeslots" && bookerState !== "booking")
+              }
+              className={classNames(
+                "border-subtle flex h-full w-full flex-row p-6 pb-0 md:border-l",
+                layout === "small_calendar" && "h-full overflow-auto md:w-[var(--booker-timeslots-width)]",
+                layout !== "small_calendar" && "sticky top-0"
+              )}
+              ref={timeslotsRef}
+              {...fadeInLeft}>
+              <AvailableTimeSlots
+                extraDays={layout === "large_timeslots" ? (isTablet ? 2 : 4) : 0}
+                limitHeight={layout === "small_calendar"}
+                seatsPerTimeslot={event.data?.seatsPerTimeSlot}
+              />
+            </BookerSection>
+          </AnimatePresence>
+        </m.div>
+
+        <m.span
+          key="logo"
+          className={classNames("mt-auto mb-6 pt-6", layout === "small_calendar" ? "block" : "hidden")}>
+          <Logo small />
+        </m.span>
+      </div>
+    </>
+  );
+};
+
+export const Booker = (props: BookerProps) => {
+  if (props.isAway) return <Away />;
+
+  return (
+    <LazyMotion features={domAnimation}>
+      <BookerComponent {...props} />
+    </LazyMotion>
+  );
+};
diff --git a/packages/features/bookings/Booker/components/AvailableTimeSlots.tsx b/packages/features/bookings/Booker/components/AvailableTimeSlots.tsx
new file mode 100644
index 0000000000..8cb8711a04
--- /dev/null
+++ b/packages/features/bookings/Booker/components/AvailableTimeSlots.tsx
@@ -0,0 +1,78 @@
+import { useMemo } from "react";
+
+import dayjs from "@calcom/dayjs";
+import { AvailableTimes, AvailableTimesSkeleton } from "@calcom/features/bookings";
+import { useSlotsForMultipleDates } from "@calcom/features/schedules/lib/use-schedule/useSlotsForDate";
+import { classNames } from "@calcom/lib";
+
+import { useBookerStore } from "../store";
+import { useScheduleForEvent } from "../utils/event";
+
+type AvailableTimeSlotsProps = {
+  extraDays?: number;
+  limitHeight?: boolean;
+  seatsPerTimeslot?: number | null;
+};
+
+/**
+ * Renders available time slots for a given date.
+ * It will extract the date from the booker store.
+ * Next to that you can also pass in the `extraDays` prop, this
+ * will also fetch the next `extraDays` days and show multiple days
+ * in columns next to each other.
+ */
+export const AvailableTimeSlots = ({ extraDays, limitHeight, seatsPerTimeslot }: AvailableTimeSlotsProps) => {
+  const selectedDate = useBookerStore((state) => state.selectedDate);
+  const setSelectedTimeslot = useBookerStore((state) => state.setSelectedTimeslot);
+  const date = selectedDate || dayjs().format("YYYY-MM-DD");
+
+  const schedule = useScheduleForEvent({
+    prefetchNextMonth: !!extraDays && dayjs(date).month() !== dayjs(date).add(extraDays, "day").month(),
+  });
+
+  // Creates an array of dates to fetch slots for.
+  // If `extraDays` is passed in, we will extend the array with the next `extraDays` days.
+  const dates = useMemo(
+    () =>
+      !extraDays
+        ? [date]
+        : [
+            // If NO date is selected yet, we show by default the upcomming `nextDays` days.
+            date,
+            ...Array.from({ length: extraDays }).map((_, index) =>
+              dayjs(date)
+                .add(index + 1, "day")
+                .format("YYYY-MM-DD")
+            ),
+          ],
+    [date, extraDays]
+  );
+
+  const isMultipleDates = dates.length > 1;
+  const slotsPerDay = useSlotsForMultipleDates(dates, schedule?.data?.slots);
+
+  return (
+    <div
+      className={classNames(
+        limitHeight && "flex-grow md:h-[400px]",
+        !limitHeight &&
+          "flex w-full flex-row gap-4 [&_header]:top-4 md:[&_header]:top-12 [&_header:before]:h-20"
+      )}>
+      {schedule.isLoading
+        ? // Shows exact amount of days as skeleton.
+          Array.from({ length: 1 + (extraDays ?? 0) }).map((_, i) => <AvailableTimesSkeleton key={i} />)
+        : slotsPerDay.length > 0 &&
+          slotsPerDay.map((slots) => (
+            <AvailableTimes
+              className="w-full"
+              key={slots.date}
+              showTimeformatToggle={!isMultipleDates}
+              onTimeSelect={setSelectedTimeslot}
+              date={dayjs(slots.date)}
+              slots={slots.slots}
+              seatsPerTimeslot={seatsPerTimeslot}
+            />
+          ))}
+    </div>
+  );
+};
diff --git a/packages/features/bookings/Booker/components/Away.tsx b/packages/features/bookings/Booker/components/Away.tsx
new file mode 100644
index 0000000000..45109cc97c
--- /dev/null
+++ b/packages/features/bookings/Booker/components/Away.tsx
@@ -0,0 +1,20 @@
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+
+export const Away = () => {
+  const { t } = useLocale();
+
+  return (
+    <div className="h-screen">
+      <main className="mx-auto max-w-3xl px-4 py-24">
+        <div className="space-y-6" data-testid="event-types">
+          <div className="border-brand overflow-hidden rounded-sm border">
+            <div className="text-subtle p-8 text-center">
+              <h2 className="font-cal text-subtle mb-2 text-3xl">😴{" " + t("user_away")}</h2>
+              <p className="mx-auto max-w-md">{t("user_away_description")}</p>
+            </div>
+          </div>
+        </div>
+      </main>
+    </div>
+  );
+};
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
new file mode 100644
index 0000000000..27f07f6d4f
--- /dev/null
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
@@ -0,0 +1,342 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import type { UseMutationResult } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
+import { useRouter } from "next/router";
+import { useMemo } from "react";
+import type { FieldError } from "react-hook-form";
+import { useForm } from "react-hook-form";
+import type { TFunction } from "react-i18next";
+import { z } from "zod";
+
+import type { EventLocationType } from "@calcom/app-store/locations";
+import { createPaymentLink } from "@calcom/app-store/stripepayment/lib/client";
+import dayjs from "@calcom/dayjs";
+import {
+  useTimePreferences,
+  mapBookingToMutationInput,
+  createBooking,
+  createRecurringBooking,
+  mapRecurringBookingToMutationInput,
+} from "@calcom/features/bookings/lib";
+import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
+import getBookingResponsesSchema from "@calcom/features/bookings/lib/getBookingResponsesSchema";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { HttpError } from "@calcom/lib/http-error";
+import { Form, Button, Alert, EmptyScreen } from "@calcom/ui";
+import { Calendar } from "@calcom/ui/components/icon";
+
+import { useBookerStore } from "../../store";
+import { useEvent } from "../../utils/event";
+import { getQueryParam } from "../../utils/query-param";
+import { BookingFields } from "./BookingFields";
+import { FormSkeleton } from "./Skeleton";
+
+type BookEventFormProps = {
+  onCancel?: () => void;
+};
+
+const getSuccessPath = ({
+  uid,
+  email,
+  slug,
+  formerTime,
+  isRecurring,
+}: {
+  uid: string;
+  email: string;
+  slug: string;
+  formerTime?: string;
+  isRecurring: boolean;
+}) => ({
+  pathname: `/booking/${uid}`,
+  query: {
+    [isRecurring ? "allRemainingBookings" : "isSuccessBookingPage"]: true,
+    email: email,
+    eventTypeSlug: slug,
+    formerTime: formerTime,
+  },
+});
+
+export const BookEventForm = ({ onCancel }: BookEventFormProps) => {
+  const router = useRouter();
+  const { t, i18n } = useLocale();
+  const { timezone } = useTimePreferences();
+  const rescheduleUid = useBookerStore((state) => state.rescheduleUid);
+  const rescheduleBooking = useBookerStore((state) => state.rescheduleBooking);
+  const eventSlug = useBookerStore((state) => state.eventSlug);
+  const duration = useBookerStore((state) => state.selectedDuration);
+  const timeslot = useBookerStore((state) => state.selectedTimeslot);
+  const recurringEventCount = useBookerStore((state) => state.recurringEventCount);
+  const username = useBookerStore((state) => state.username);
+  const isRescheduling = !!rescheduleUid && !!rescheduleBooking;
+  const event = useEvent();
+  const eventType = event.data;
+
+  const defaultValues = useMemo(() => {
+    if (!eventType?.bookingFields) {
+      return {};
+    }
+
+    const defaultUserValues = {
+      email: rescheduleUid ? rescheduleBooking?.attendees[0].email : getQueryParam("email") || "",
+      name: rescheduleUid ? rescheduleBooking?.attendees[0].name : getQueryParam("name") || "",
+    };
+
+    if (!isRescheduling) {
+      const defaults = {
+        responses: {} as Partial<z.infer<typeof bookingFormSchema>["responses"]>,
+      };
+
+      const responses = eventType.bookingFields.reduce((responses, field) => {
+        return {
+          ...responses,
+          [field.name]: getQueryParam(field.name) || undefined,
+        };
+      }, {});
+      defaults.responses = {
+        ...responses,
+        name: defaultUserValues.name,
+        email: defaultUserValues.email,
+      };
+
+      return defaults;
+    }
+
+    if (!rescheduleBooking || !rescheduleBooking.attendees.length) {
+      return {};
+    }
+    const primaryAttendee = rescheduleBooking.attendees[0];
+    if (!primaryAttendee) {
+      return {};
+    }
+
+    const defaults = {
+      responses: {} as Partial<z.infer<typeof bookingFormSchema>["responses"]>,
+    };
+
+    const responses = eventType.bookingFields.reduce((responses, field) => {
+      return {
+        ...responses,
+        [field.name]: rescheduleBooking.responses[field.name],
+      };
+    }, {});
+    defaults.responses = {
+      ...responses,
+      name: defaultUserValues.name,
+      email: defaultUserValues.email,
+    };
+    return defaults;
+  }, [eventType?.bookingFields, isRescheduling, rescheduleBooking, rescheduleUid]);
+
+  const bookingFormSchema = z
+    .object({
+      responses: event?.data
+        ? getBookingResponsesSchema({
+            eventType: { bookingFields: getBookingFieldsWithSystemFields(event.data) },
+            view: rescheduleUid ? "reschedule" : "booking",
+          })
+        : // Fallback until event is loaded.
+          z.object({}),
+    })
+    .passthrough();
+
+  type BookingFormValues = {
+    locationType?: EventLocationType["type"];
+    responses: z.infer<typeof bookingFormSchema>["responses"];
+    // Key is not really part of form values, but only used to have a key
+    // to set generic error messages on. Needed until RHF has implemented root error keys.
+    globalError: undefined;
+  };
+
+  const bookingForm = useForm<BookingFormValues>({
+    defaultValues,
+    resolver: zodResolver(bookingFormSchema), // Since this isn't set to strict we only validate the fields in the schema
+  });
+
+  const createBookingMutation = useMutation(createBooking, {
+    onSuccess: async (responseData) => {
+      const { uid, paymentUid } = responseData;
+      if (paymentUid) {
+        return await router.push(
+          createPaymentLink({
+            paymentUid,
+            date: timeslot,
+            name: bookingForm.getValues("responses.name"),
+            email: bookingForm.getValues("responses.email"),
+            absolute: false,
+          })
+        );
+      }
+
+      if (!uid) {
+        console.error("No uid returned from createBookingMutation");
+        return;
+      }
+
+      return await router.push(
+        getSuccessPath({
+          uid,
+          email: bookingForm.getValues("responses.email"),
+          formerTime: rescheduleBooking?.startTime
+            ? dayjs(rescheduleBooking?.startTime).toISOString()
+            : undefined,
+          slug: `${eventSlug}`,
+          isRecurring: false,
+        })
+      );
+    },
+  });
+
+  const createRecurringBookingMutation = useMutation(createRecurringBooking, {
+    onSuccess: async (responseData) => {
+      const { uid } = responseData[0] || {};
+
+      if (!uid) {
+        console.error("No uid returned from createRecurringBookingMutation");
+        return;
+      }
+
+      return await router.push(
+        getSuccessPath({
+          uid,
+          email: bookingForm.getValues("responses.email"),
+          slug: `${eventSlug}`,
+          isRecurring: true,
+        })
+      );
+    },
+  });
+
+  if (event.isError) return <Alert severity="warning" message={t("error_booking_event")} />;
+  if (event.isLoading || !event.data) return <FormSkeleton />;
+  if (!timeslot)
+    return (
+      <EmptyScreen
+        headline={t("timeslot_missing_title")}
+        description={t("timeslot_missing_description")}
+        Icon={Calendar}
+        buttonText={t("timeslot_missing_cta")}
+        buttonOnClick={onCancel}
+      />
+    );
+
+  const bookEvent = (values: BookingFormValues) => {
+    bookingForm.clearErrors();
+
+    // It shouldn't be possible that this method is fired without having event data,
+    // but since in theory (looking at the types) it is possible, we still handle that case.
+    if (!event?.data) {
+      bookingForm.setError("globalError", { message: t("error_booking_event") });
+      return;
+    }
+
+    // Ensures that duration is an allowed value, if not it defaults to the
+    // default event duration.
+    const validDuration =
+      duration &&
+      event.data.metadata?.multipleDuration &&
+      event.data.metadata?.multipleDuration.includes(duration)
+        ? duration
+        : event.data.length;
+
+    const bookingInput = {
+      values,
+      duration: validDuration,
+      event: event.data,
+      date: timeslot,
+      timeZone: timezone,
+      language: i18n.language,
+      rescheduleUid: rescheduleUid || undefined,
+      username: username || "",
+      metadata: Object.keys(router.query)
+        .filter((key) => key.startsWith("metadata"))
+        .reduce(
+          (metadata, key) => ({
+            ...metadata,
+            [key.substring("metadata[".length, key.length - 1)]: router.query[key],
+          }),
+          {}
+        ),
+    };
+
+    if (event.data?.recurringEvent?.freq && recurringEventCount) {
+      createRecurringBookingMutation.mutate(
+        mapRecurringBookingToMutationInput(bookingInput, recurringEventCount)
+      );
+    } else {
+      createBookingMutation.mutate(mapBookingToMutationInput(bookingInput));
+    }
+  };
+
+  if (!eventType) {
+    console.warn("No event type found for event", router.query);
+    return <Alert severity="warning" message={t("error_booking_event")} />;
+  }
+
+  return (
+    <div className="flex h-full flex-col">
+      <Form className="flex h-full flex-col" form={bookingForm} handleSubmit={bookEvent} noValidate>
+        <BookingFields
+          isDynamicGroupBooking={!!(username && username.indexOf("+") > -1)}
+          fields={eventType.bookingFields}
+          locations={eventType.locations}
+          rescheduleUid={rescheduleUid || undefined}
+        />
+
+        <div className="mt-4 flex justify-end space-x-2 rtl:space-x-reverse">
+          {!!onCancel && (
+            <Button color="minimal" type="button" onClick={onCancel}>
+              {t("back")}
+            </Button>
+          )}
+          <Button
+            type="submit"
+            color="primary"
+            loading={createBookingMutation.isLoading || createRecurringBookingMutation.isLoading}
+            data-testid={rescheduleUid ? "confirm-reschedule-button" : "confirm-book-button"}>
+            {rescheduleUid ? t("reschedule") : t("confirm")}
+          </Button>
+        </div>
+      </Form>
+      {(createBookingMutation.isError ||
+        createRecurringBookingMutation.isError ||
+        bookingForm.formState.errors["globalError"]) && (
+        <div data-testid="booking-fail">
+          <Alert
+            className="mt-2"
+            severity="info"
+            title={rescheduleUid ? t("reschedule_fail") : t("booking_fail")}
+            message={getError(
+              bookingForm.formState.errors["globalError"],
+              createBookingMutation,
+              createRecurringBookingMutation,
+              t
+            )}
+          />
+        </div>
+      )}
+    </div>
+  );
+};
+
+const getError = (
+  globalError: FieldError | undefined,
+  // It feels like an implementation detail to reimplement the types of useMutation here.
+  // Since they don't matter for this function, I'd rather disable them then giving you
+  // the cognitive overload of thinking to update them here when anything changes.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  bookingMutation: UseMutationResult<any, any, any, any>,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  recurringBookingMutation: UseMutationResult<any, any, any, any>,
+  t: TFunction
+) => {
+  if (globalError) return globalError.message;
+
+  const error = bookingMutation.error || recurringBookingMutation.error;
+
+  return error instanceof HttpError || error instanceof Error ? (
+    <>{t("can_you_try_again")}</>
+  ) : (
+    "Unknown error"
+  );
+};
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
new file mode 100644
index 0000000000..6ba16a63e1
--- /dev/null
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx
@@ -0,0 +1,119 @@
+import { useFormContext } from "react-hook-form";
+
+import type { LocationObject } from "@calcom/app-store/locations";
+import getLocationOptionsForSelect from "@calcom/features/bookings/lib/getLocationOptionsForSelect";
+import { FormBuilderField } from "@calcom/features/form-builder";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import type { RouterOutputs } from "@calcom/trpc/react";
+
+import { SystemField } from "../../../lib/getBookingFields";
+
+export const BookingFields = ({
+  fields,
+  locations,
+  rescheduleUid,
+  isDynamicGroupBooking,
+}: {
+  fields: NonNullable<RouterOutputs["viewer"]["public"]["event"]>["bookingFields"];
+  locations: LocationObject[];
+  rescheduleUid?: string;
+  isDynamicGroupBooking: boolean;
+}) => {
+  const { t } = useLocale();
+  const { watch, setValue } = useFormContext();
+  const locationResponse = watch("responses.location");
+  const currentView = rescheduleUid ? "reschedule" : "";
+
+  return (
+    // TODO: It might make sense to extract this logic into BookingFields config, that would allow to quickly configure system fields and their editability in fresh booking and reschedule booking view
+    <div>
+      {fields.map((field, index) => {
+        // During reschedule by default all system fields are readOnly. Make them editable on case by case basis.
+        // Allowing a system field to be edited might require sending emails to attendees, so we need to be careful
+        let readOnly =
+          (field.editable === "system" || field.editable === "system-but-optional") && !!rescheduleUid;
+
+        let noLabel = false;
+        let hidden = !!field.hidden;
+        const fieldViews = field.views;
+
+        if (fieldViews && !fieldViews.find((view) => view.id === currentView)) {
+          return null;
+        }
+
+        if (field.name === SystemField.Enum.rescheduleReason) {
+          // rescheduleReason is a reschedule specific field and thus should be editable during reschedule
+          readOnly = false;
+        }
+
+        if (field.name === SystemField.Enum.smsReminderNumber) {
+          // `smsReminderNumber` and location.optionValue when location.value===phone are the same data point. We should solve it in a better way in the Form Builder itself.
+          // I think we should have a way to connect 2 fields together and have them share the same value in Form Builder
+          if (locationResponse?.value === "phone") {
+            setValue(`responses.${SystemField.Enum.smsReminderNumber}`, locationResponse?.optionValue);
+            // Just don't render the field now, as the value is already connected to attendee phone location
+            return null;
+          }
+          // `smsReminderNumber` can be edited during reschedule even though it's a system field
+          readOnly = false;
+        }
+
+        if (field.name === SystemField.Enum.guests) {
+          // No matter what user configured for Guests field, we don't show it for dynamic group booking as that doesn't support guests
+          hidden = isDynamicGroupBooking ? true : !!field.hidden;
+        }
+
+        // We don't show `notes` field during reschedule
+        if (
+          (field.name === SystemField.Enum.notes || field.name === SystemField.Enum.guests) &&
+          !!rescheduleUid
+        ) {
+          return null;
+        }
+
+        // Dynamically populate location field options
+        if (field.name === SystemField.Enum.location && field.type === "radioInput") {
+          if (!field.optionsInputs) {
+            throw new Error("radioInput must have optionsInputs");
+          }
+          const optionsInputs = field.optionsInputs;
+
+          // TODO: Instead of `getLocationOptionsForSelect` options should be retrieved from dataStore[field.getOptionsAt]. It would make it agnostic of the `name` of the field.
+          const options = getLocationOptionsForSelect(locations, t);
+          options.forEach((option) => {
+            const optionInput = optionsInputs[option.value as keyof typeof optionsInputs];
+            if (optionInput) {
+              optionInput.placeholder = option.inputPlaceholder;
+            }
+          });
+
+          field.options = options.filter(
+            (location): location is NonNullable<(typeof options)[number]> => !!location
+          );
+          // If we have only one option and it has an input, we don't show the field label because Option name acts as label.
+          // e.g. If it's just Attendee Phone Number option then we don't show `Location` label
+          if (field.options.length === 1) {
+            if (field.optionsInputs[field.options[0].value]) {
+              noLabel = true;
+            } else {
+              // If there's only one option and it doesn't have an input, we don't show the field at all because it's visible in the left side bar
+              hidden = true;
+            }
+          }
+        }
+
+        const label = noLabel ? "" : field.label || t(field.defaultLabel || "");
+        const placeholder = field.placeholder || t(field.defaultPlaceholder || "");
+
+        return (
+          <FormBuilderField
+            className="mb-4"
+            field={{ ...field, label, placeholder, hidden }}
+            readOnly={readOnly}
+            key={index}
+          />
+        );
+      })}
+    </div>
+  );
+};
diff --git a/packages/features/bookings/Booker/components/BookEventForm/Skeleton.tsx b/packages/features/bookings/Booker/components/BookEventForm/Skeleton.tsx
new file mode 100644
index 0000000000..5da8cbabd5
--- /dev/null
+++ b/packages/features/bookings/Booker/components/BookEventForm/Skeleton.tsx
@@ -0,0 +1,29 @@
+import { SkeletonText } from "@calcom/ui";
+
+export const FormSkeleton = () => (
+  <div className="flex flex-col">
+    <SkeletonText className="h-7 w-32" />
+    <SkeletonText className="mt-2 h-7 w-full" />
+    <SkeletonText className="mt-4 h-7 w-28" />
+    <SkeletonText className="mt-2 h-7 w-full" />
+
+    <div className="mt-12 flex h-7 w-full flex-row items-center gap-4">
+      <SkeletonText className="inline h-4 w-4 rounded-full" />
+      <SkeletonText className="inline h-7 w-32" />
+    </div>
+    <div className="mt-2 flex h-7 w-full flex-row items-center gap-4">
+      <SkeletonText className="inline h-4 w-4 rounded-full" />
+      <SkeletonText className="inline h-7 w-28" />
+    </div>
+
+    <SkeletonText className="mt-8 h-7 w-32" />
+    <SkeletonText className="mt-2 h-7 w-full" />
+    <SkeletonText className="mt-4 h-7 w-28" />
+    <SkeletonText className="mt-2 h-7 w-full" />
+
+    <div className="mt-6 flex flex-row gap-3">
+      <SkeletonText className="ml-auto h-8 w-20" />
+      <SkeletonText className="h-8 w-20" />
+    </div>
+  </div>
+);
diff --git a/packages/features/bookings/Booker/components/BookEventForm/index.ts b/packages/features/bookings/Booker/components/BookEventForm/index.ts
new file mode 100644
index 0000000000..323719ddb6
--- /dev/null
+++ b/packages/features/bookings/Booker/components/BookEventForm/index.ts
@@ -0,0 +1 @@
+export { BookEventForm } from "./BookEventForm";
diff --git a/packages/features/bookings/Booker/components/DatePicker.tsx b/packages/features/bookings/Booker/components/DatePicker.tsx
new file mode 100644
index 0000000000..e0679b73f6
--- /dev/null
+++ b/packages/features/bookings/Booker/components/DatePicker.tsx
@@ -0,0 +1,54 @@
+import { useEffect, useState } from "react";
+import { shallow } from "zustand/shallow";
+
+import type { Dayjs } from "@calcom/dayjs";
+import dayjs from "@calcom/dayjs";
+import { default as DatePickerComponent } from "@calcom/features/calendars/DatePicker";
+import { useNonEmptyScheduleDays } from "@calcom/features/schedules";
+import { weekdayToWeekIndex } from "@calcom/lib/date-fns";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+
+import { useBookerStore } from "../store";
+import { useEvent, useScheduleForEvent } from "../utils/event";
+
+export const DatePicker = () => {
+  const [isLoadedClientSide, setIsLoadedClientSide] = useState(false);
+  const { i18n } = useLocale();
+  const [month, selectedDate] = useBookerStore((state) => [state.month, state.selectedDate], shallow);
+  const [setSelectedDate, setMonth] = useBookerStore(
+    (state) => [state.setSelectedDate, state.setMonth],
+    shallow
+  );
+  const event = useEvent();
+  const schedule = useScheduleForEvent();
+  const nonEmptyScheduleDays = useNonEmptyScheduleDays(schedule?.data?.slots);
+
+  // Not rendering the component on the server side to avoid hydration issues
+  // @TODO: We should update the datepicker component as soon as the current booker isn't
+  // used anymore, so we don't need to have this check.
+  useEffect(() => {
+    setIsLoadedClientSide(true);
+  }, []);
+
+  if (!isLoadedClientSide) return null;
+
+  return (
+    <div className="mt-1">
+      <DatePickerComponent
+        isLoading={schedule.isLoading}
+        onChange={(date: Dayjs) => {
+          setSelectedDate(date.format("YYYY-MM-DD"));
+        }}
+        onMonthChange={(date: Dayjs) => {
+          setMonth(date.format("YYYY-MM"));
+          setSelectedDate(date.format("YYYY-MM-DD"));
+        }}
+        includedDates={nonEmptyScheduleDays}
+        locale={i18n.language}
+        browsingDate={month ? dayjs(month) : undefined}
+        selected={dayjs(selectedDate)}
+        weekStart={weekdayToWeekIndex(event?.data?.users?.[0]?.weekStart)}
+      />
+    </div>
+  );
+};
diff --git a/packages/features/bookings/Booker/components/EventMeta.tsx b/packages/features/bookings/Booker/components/EventMeta.tsx
new file mode 100644
index 0000000000..b2b05f5856
--- /dev/null
+++ b/packages/features/bookings/Booker/components/EventMeta.tsx
@@ -0,0 +1,93 @@
+import { m } from "framer-motion";
+import dynamic from "next/dynamic";
+
+import { EventDetails, EventMembers, EventMetaSkeleton, EventTitle } from "@calcom/features/bookings";
+import { EventMetaBlock } from "@calcom/features/bookings/components/event-meta/Details";
+import { useTimePreferences } from "@calcom/features/bookings/lib";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Calendar, Globe } from "@calcom/ui/components/icon";
+
+import { fadeInUp } from "../config";
+import { useBookerStore } from "../store";
+import { formatEventFromToTime } from "../utils/dates";
+import { useEvent } from "../utils/event";
+
+const TimezoneSelect = dynamic(() => import("@calcom/ui").then((mod) => mod.TimezoneSelect), {
+  ssr: false,
+});
+
+export const EventMeta = () => {
+  const { timezone, setTimezone, timeFormat } = useTimePreferences();
+  const selectedDuration = useBookerStore((state) => state.selectedDuration);
+  const selectedTimeslot = useBookerStore((state) => state.selectedTimeslot);
+  const bookerState = useBookerStore((state) => state.state);
+  const rescheduleBooking = useBookerStore((state) => state.rescheduleBooking);
+  const { i18n, t } = useLocale();
+  const { data: event, isLoading } = useEvent();
+
+  return (
+    <div className="relative z-10 p-6">
+      {isLoading && (
+        <m.div {...fadeInUp} initial="visible" layout>
+          <EventMetaSkeleton />
+        </m.div>
+      )}
+      {!isLoading && !!event && (
+        <m.div {...fadeInUp} layout transition={{ ...fadeInUp.transition, delay: 0.3 }}>
+          <EventMembers schedulingType={event.schedulingType} users={event.users} profile={event.profile} />
+          <EventTitle className="mt-2 mb-8">{event?.title}</EventTitle>
+          <div className="space-y-4">
+            {rescheduleBooking && (
+              <EventMetaBlock icon={Calendar}>
+                {t("former_time")}
+                <br />
+                <span className="line-through" data-testid="former_time_p">
+                  {formatEventFromToTime(
+                    rescheduleBooking.startTime.toString(),
+                    null,
+                    timeFormat,
+                    timezone,
+                    i18n.language
+                  )}
+                </span>
+              </EventMetaBlock>
+            )}
+            {selectedTimeslot && (
+              <EventMetaBlock icon={Calendar}>
+                {formatEventFromToTime(
+                  selectedTimeslot,
+                  selectedDuration,
+                  timeFormat,
+                  timezone,
+                  i18n.language
+                )}
+              </EventMetaBlock>
+            )}
+            <EventDetails event={event} />
+            <EventMetaBlock
+              className="cursor-pointer [&_.current-timezone:before]:focus-within:opacity-100 [&_.current-timezone:before]:hover:opacity-100 [&_>svg]:mt-[4px]"
+              contentClassName="relative"
+              icon={Globe}>
+              {bookerState === "booking" ? (
+                <>{timezone}</>
+              ) : (
+                <span className="current-timezone before:bg-subtle flex items-center justify-center before:absolute before:inset-0 before:left-[-30px] before:top-[-3px] before:bottom-[-3px] before:w-[calc(100%_+_35px)] before:rounded-md before:py-3 before:opacity-0 before:transition-opacity">
+                  <TimezoneSelect
+                    menuPosition="fixed"
+                    classNames={{
+                      control: () => "!min-h-0 p-0 border-0 bg-transparent focus-within:ring-0",
+                      menu: () => "!w-64 max-w-[90vw]",
+                      singleValue: () => "text-text py-1",
+                    }}
+                    value={timezone}
+                    onChange={(tz) => setTimezone(tz.value)}
+                  />
+                </span>
+              )}
+            </EventMetaBlock>
+          </div>
+        </m.div>
+      )}
+    </div>
+  );
+};
diff --git a/packages/features/bookings/Booker/components/LargeCalendar.tsx b/packages/features/bookings/Booker/components/LargeCalendar.tsx
new file mode 100644
index 0000000000..155e9c6a94
--- /dev/null
+++ b/packages/features/bookings/Booker/components/LargeCalendar.tsx
@@ -0,0 +1,30 @@
+import { shallow } from "zustand/shallow";
+
+import dayjs from "@calcom/dayjs";
+
+import { useBookerStore } from "../store";
+
+export const LargeCalendar = () => {
+  const [setSelectedDate, setSelectedTimeslot] = useBookerStore(
+    (state) => [state.setSelectedDate, state.setSelectedTimeslot],
+    shallow
+  );
+
+  return (
+    <div className="bg-muted flex h-full w-full flex-col items-center justify-center">
+      Something big is coming...
+      <br />
+      <button
+        className="max-w-[300px] underline"
+        type="button"
+        onClick={(ev) => {
+          ev.preventDefault();
+          setSelectedDate(dayjs().format("YYYY-MM-DD"));
+          setSelectedTimeslot(dayjs().format());
+        }}>
+        Click this button to set date + time in one go just like the big thing that is coming here would do.
+        :)
+      </button>
+    </div>
+  );
+};
diff --git a/packages/features/bookings/Booker/components/Section.tsx b/packages/features/bookings/Booker/components/Section.tsx
new file mode 100644
index 0000000000..4c1a039d1a
--- /dev/null
+++ b/packages/features/bookings/Booker/components/Section.tsx
@@ -0,0 +1,62 @@
+import type { MotionProps } from "framer-motion";
+import { m } from "framer-motion";
+import { forwardRef } from "react";
+
+import { classNames } from "@calcom/lib";
+
+import { useBookerStore } from "../store";
+import type { BookerAreas, BookerLayout } from "../types";
+
+/**
+ * Define what grid area a section should be in.
+ * Value is either a string (in case it's always the same area), or an object
+ * looking like:
+ * {
+ *  // Where default is the required default area.
+ *  default: "calendar",
+ *  // Any optional overrides for different layouts by their layout name.
+ *  large_calendar: "main",
+ * }
+ */
+type GridArea = BookerAreas | ({ [key in BookerLayout]?: BookerAreas } & { default: BookerAreas });
+
+type BookerSectionProps = {
+  children: React.ReactNode;
+  area: GridArea;
+  visible?: boolean;
+  className?: string;
+} & MotionProps;
+
+// This map with strings is needed so Tailwind generates all classnames,
+// If we would concatenate them with JS, Tailwind would not generate them.
+const gridAreaClassNameMap: { [key in BookerAreas]: string } = {
+  calendar: "[grid-area:calendar]",
+  main: "[grid-area:main]",
+  meta: "[grid-area:meta]",
+  timeslots: "[grid-area:timeslots]",
+};
+
+/**
+ * Small helper compnent that renders a booker section in a specific grid area.
+ */
+export const BookerSection = forwardRef<HTMLDivElement, BookerSectionProps>(function BookerSection(
+  { children, area, visible, className, ...props },
+  ref
+) {
+  const layout = useBookerStore((state) => state.layout);
+  let gridClassName: string;
+
+  if (typeof area === "string") {
+    gridClassName = gridAreaClassNameMap[area];
+  } else {
+    gridClassName = gridAreaClassNameMap[area[layout] || area.default];
+  }
+
+  if (!visible && typeof visible !== "undefined") return null;
+
+  return (
+    <m.div ref={ref} className={classNames(gridClassName, className)} layout {...props}>
+      {children}
+    </m.div>
+  );
+});
diff --git a/packages/features/bookings/Booker/config.ts b/packages/features/bookings/Booker/config.ts
new file mode 100644
index 0000000000..33a9c9aff7
--- /dev/null
+++ b/packages/features/bookings/Booker/config.ts
@@ -0,0 +1,82 @@
+import type { TargetAndTransition } from "framer-motion";
+
+import type { BookerLayout, BookerState } from "./types";
+
+// Framer motion fade in animation configs.
+export const fadeInLeft = {
+  variants: {
+    visible: { opacity: 1, x: 0 },
+    hidden: { opacity: 0, x: 20 },
+  },
+  initial: "hidden",
+  exit: "hidden",
+  animate: "visible",
+  transition: { ease: "easeInOut", delay: 0.1 },
+};
+export const fadeInUp = {
+  variants: {
+    visible: { opacity: 1, y: 0 },
+    hidden: { opacity: 0, y: 20 },
+  },
+  initial: "hidden",
+  exit: "hidden",
+  animate: "visible",
+  transition: { ease: "easeInOut", delay: 0.1 },
+};
+
+type ResizeAnimationConfig = {
+  [key in BookerLayout]: {
+    [key in BookerState | "default"]?: TargetAndTransition;
+  };
+};
+
+/**
+ * This configuration is used to animate the grid container for the booker.
+ * The object is structured as following:
+ *
+ * The root property of the object: is the name of the layout
+ * (mobile, small_calendar, large_calendar, large_timeslots)
+ *
+ * The values of these properties are objects that define the animation for each state of the booker.
+ * The animation have the same properties as you could pass to the animate prop of framer-motion:
+ * @see: https://www.framer.com/motion/animation/
+ */
+export const resizeAnimationConfig: ResizeAnimationConfig = {
+  mobile: {
+    default: {
+      width: "100%",
+      gridTemplateAreas: `
+          "meta"
+          "main"
+          "timeslots"
+        `,
+      gridTemplateColumns: "100%",
+    },
+  },
+  small_calendar: {
+    default: {
+      width: "calc(var(--booker-meta-width) + var(--booker-main-width))",
+      gridTemplateAreas: `"meta main"`,
+      gridTemplateColumns: "var(--booker-meta-width) var(--booker-main-width)",
+    },
+    selecting_time: {
+      width: "calc(var(--booker-meta-width) + var(--booker-main-width) + var(--booker-timeslots-width))",
+      gridTemplateAreas: `"meta main timeslots"`,
+      gridTemplateColumns: "var(--booker-meta-width) var(--booker-main-width) var(--booker-timeslots-width)",
+    },
+  },
+  large_calendar: {
+    default: {
+      width: "100%",
+      gridTemplateAreas: `"meta main"`,
+      gridTemplateColumns: "var(--booker-meta-width) 1fr",
+    },
+  },
+  large_timeslots: {
+    default: {
+      width: "100%",
+      gridTemplateAreas: `"meta main"`,
+      gridTemplateColumns: "var(--booker-meta-width) 1fr",
+    },
+  },
+};
diff --git a/packages/features/bookings/Booker/index.ts b/packages/features/bookings/Booker/index.ts
new file mode 100644
index 0000000000..8d7ec08eec
--- /dev/null
+++ b/packages/features/bookings/Booker/index.ts
@@ -0,0 +1,2 @@
+export { Booker } from "./Booker";
+export type { BookerProps } from "./types";
diff --git a/packages/features/bookings/Booker/store.ts b/packages/features/bookings/Booker/store.ts
new file mode 100644
index 0000000000..7716e575c1
--- /dev/null
+++ b/packages/features/bookings/Booker/store.ts
@@ -0,0 +1,168 @@
+import { useEffect } from "react";
+import { create } from "zustand";
+
+import dayjs from "@calcom/dayjs";
+
+import type { GetBookingType } from "../lib/get-booking";
+import type { BookerState, BookerLayout } from "./types";
+import { updateQueryParam, getQueryParam } from "./utils/query-param";
+
+/**
+ * Arguments passed into store initializer, containing
+ * the event data.
+ */
+type StoreInitializeType = {
+  username: string;
+  eventSlug: string;
+  // Month can be undefined if it's not passed in as a prop.
+  month?: string;
+  eventId: number | undefined;
+  rescheduleUid: string | null;
+  rescheduleBooking: GetBookingType | null | undefined;
+};
+
+type BookerStore = {
+  /**
+   * Event details. These are stored in store for easier
+   * access in child components.
+   */
+  username: string | null;
+  eventSlug: string | null;
+  eventId: number | null;
+  /**
+   * Current month being viewed. Format is YYYY-MM.
+   */
+  month: string | null;
+  setMonth: (month: string | null) => void;
+  /**
+   * Current state of the booking process
+   * the user is currently in. See enum for possible values.
+   */
+  state: BookerState;
+  setState: (state: BookerState) => void;
+  /**
+   * The booker component supports different layouts,
+   * this value tracks the current layout.
+   */
+  layout: BookerLayout;
+  setLayout: (layout: BookerLayout) => void;
+  /**
+   * Date selected by user (exact day). Format is YYYY-MM-DD.
+   */
+  selectedDate: string | null;
+  setSelectedDate: (date: string | null) => void;
+  /**
+   * Selected event duration in minutes.
+   */
+  selectedDuration: number | null;
+  setSelectedDuration: (duration: number | null) => void;
+  /**
+   * Selected timeslot user has chosen. This is a date string
+   * containing both the date + time.
+   */
+  selectedTimeslot: string | null;
+  setSelectedTimeslot: (timeslot: string | null) => void;
+  /**
+   * Number of recurring events to create.
+   */
+  recurringEventCount: number | null;
+  setRecurringEventCount(count: number | null): void;
+  /**
+   * If booking is being rescheduled, both the ID as well as
+   * the current booking details are passed in. The `rescheduleBooking`
+   * object is something that's fetched server side.
+   */
+  rescheduleUid: string | null;
+  rescheduleBooking: GetBookingType | null;
+  /**
+   * Method called by booker component to set initial data.
+   */
+  initialize: (data: StoreInitializeType) => void;
+};
+
+/**
+ * The booker store contains the data of the component's
+ * current state. This data can be reused within child components
+ * by importing this hook.
+ *
+ * See comments in interface above for more information on it's specific values.
+ */
+export const useBookerStore = create<BookerStore>((set, get) => ({
+  state: "loading",
+  setState: (state: BookerState) => set({ state }),
+  layout: "small_calendar",
+  setLayout: (layout: BookerLayout) => set({ layout }),
+  selectedDate: getQueryParam("date") || null,
+  setSelectedDate: (selectedDate: string | null) => {
+    set({ selectedDate });
+    updateQueryParam("date", selectedDate ?? "");
+  },
+  username: null,
+  eventSlug: null,
+  eventId: null,
+  month: getQueryParam("month") || getQueryParam("date") || dayjs().format("YYYY-MM"),
+  setMonth: (month: string | null) => {
+    set({ month, selectedTimeslot: null });
+    updateQueryParam("month", month ?? "");
+    get().setSelectedDate(null);
+  },
+  initialize: ({
+    username,
+    eventSlug,
+    month,
+    eventId,
+    rescheduleUid = null,
+    rescheduleBooking = null,
+  }: StoreInitializeType) => {
+    if (
+      get().username === username &&
+      get().eventSlug === eventSlug &&
+      get().month === month &&
+      get().eventId === eventId &&
+      get().rescheduleUid === rescheduleUid &&
+      get().rescheduleBooking?.responses.email === rescheduleBooking?.responses.email
+    )
+      return;
+    set({
+      username,
+      eventSlug,
+      eventId,
+      rescheduleUid,
+      rescheduleBooking,
+    });
+    // Unset selected timeslot if user is rescheduling. This could happen
+    // if the user reschedules a booking right after the confirmation page.
+    // In that case the time would still be store in the store, this way we
+    // force clear this.
+    if (rescheduleBooking) set({ selectedTimeslot: null });
+    if (month) set({ month });
+  },
+  selectedDuration: Number(getQueryParam("duration")) || null,
+  setSelectedDuration: (selectedDuration: number | null) => {
+    set({ selectedDuration });
+    updateQueryParam("duration", selectedDuration ?? "");
+  },
+  recurringEventCount: null,
+  setRecurringEventCount: (recurringEventCount: number | null) => set({ recurringEventCount }),
+  rescheduleBooking: null,
+  rescheduleUid: null,
+  selectedTimeslot: getQueryParam("slot") || null,
+  setSelectedTimeslot: (selectedTimeslot: string | null) => {
+    set({ selectedTimeslot });
+    updateQueryParam("slot", selectedTimeslot ?? "");
+  },
+}));
+
+export const useInitializeBookerStore = ({
+  username,
+  eventSlug,
+  month,
+  eventId,
+  rescheduleUid = null,
+  rescheduleBooking = null,
+}: StoreInitializeType) => {
+  const initializeStore = useBookerStore((state) => state.initialize);
+  useEffect(() => {
+    initializeStore({ username, eventSlug, month, eventId, rescheduleUid, rescheduleBooking });
+  }, [initializeStore, username, eventSlug, month, eventId, rescheduleUid, rescheduleBooking]);
+};
diff --git a/packages/features/bookings/Booker/types.ts b/packages/features/bookings/Booker/types.ts
new file mode 100644
index 0000000000..54687bd12c
--- /dev/null
+++ b/packages/features/bookings/Booker/types.ts
@@ -0,0 +1,46 @@
+import type { GetBookingType } from "../lib/get-booking";
+
+export interface BookerProps {
+  eventSlug: string;
+  username: string;
+
+  /**
+   * If month is NOT set as a prop on the component, we expect a query parameter
+   * called `month` to be present on the url. If that is missing, the component will
+   * default to the current month.
+   * @note In case you're using a client side router, please pass the value in as a prop,
+   * since the component will leverage window.location, which might not have the query param yet.
+   * @format YYYY-MM.
+   * @optional
+   */
+  month?: string;
+  /**
+   * Default selected date for with the slotpicker will already open.
+   * @optional
+   */
+  selectedDate?: Date;
+
+  hideBranding?: boolean;
+  /**
+   * Sets the Booker component to the away state.
+   * This is NOT revalidated by calling the API.
+   */
+  isAway?: boolean;
+  /**
+   * If false and the current username indicates a dynamic booking,
+   * the Booker will immediately show an error.
+   * This is NOT revalidated by calling the API.
+   */
+  allowsDynamicBooking?: boolean;
+  /**
+   * When rescheduling a booking, the current' bookings data is passed in via this prop.
+   * The component itself won't fetch booking data based on the ID, since there is not public
+   * api to fetch this data. Therefore rescheduling a booking currently is not possible
+   * within the atom (i.e. without a server side component).
+   */
+  rescheduleBooking?: GetBookingType;
+}
+
+export type BookerState = "loading" | "selecting_date" | "selecting_time" | "booking";
+export type BookerLayout = "small_calendar" | "large_timeslots" | "large_calendar" | "mobile";
+export type BookerAreas = "calendar" | "timeslots" | "main" | "meta";
diff --git a/packages/features/bookings/Booker/utils/dates.ts b/packages/features/bookings/Booker/utils/dates.ts
new file mode 100644
index 0000000000..7306119b08
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/dates.ts
@@ -0,0 +1,18 @@
+import dayjs from "@calcom/dayjs";
+import type { TimeFormat } from "@calcom/lib/timeFormat";
+
+export const formatEventFromToTime = (
+  date: string,
+  duration: number | null,
+  timeFormat: TimeFormat,
+  timeZone: string,
+  language: string
+) => {
+  const start = dayjs(date).tz(timeZone);
+  const end = duration ? start.add(duration, "minute") : null;
+  return `${start.format("dddd")}, ${start
+    .toDate()
+    .toLocaleDateString(language, { dateStyle: "long" })} ${start.format(timeFormat)} ${
+    end ? `– ${end.format(timeFormat)}` : ``
+  }`;
+};
diff --git a/packages/features/bookings/Booker/utils/event.ts b/packages/features/bookings/Booker/utils/event.ts
new file mode 100644
index 0000000000..3bdebef3f4
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/event.ts
@@ -0,0 +1,53 @@
+import { shallow } from "zustand/shallow";
+
+import { useSchedule } from "@calcom/features/schedules";
+import { trpc } from "@calcom/trpc/react";
+
+import { useTimePreferences } from "../../lib/timePreferences";
+import { useBookerStore } from "../store";
+
+/**
+ * Wrapper hook around the trpc query that fetches
+ * the event curently viewed in the booker. It will get
+ * the current event slug and username from the booker store.
+ *
+ * Using this hook means you only need to use one hook, instead
+ * of combining multiple conditional hooks.
+ */
+export const useEvent = () => {
+  const [username, eventSlug] = useBookerStore((state) => [state.username, state.eventSlug], shallow);
+
+  return trpc.viewer.public.event.useQuery(
+    { username: username ?? "", eventSlug: eventSlug ?? "" },
+    { refetchOnWindowFocus: false, enabled: Boolean(username) && Boolean(eventSlug) }
+  );
+};
+
+/**
+ * Gets schedule for the current event and current month.
+ * Gets all values from the booker store.
+ *
+ * Using this hook means you only need to use one hook, instead
+ * of combining multiple conditional hooks.
+ *
+ * The prefetchNextMonth argument can be used to prefetch two months at once,
+ * useful when the user is viewing dates near the end of the month,
+ * this way the multi day view will show data of both months.
+ */
+export const useScheduleForEvent = ({ prefetchNextMonth }: { prefetchNextMonth?: boolean } = {}) => {
+  const { timezone } = useTimePreferences();
+  const event = useEvent();
+  const [username, eventSlug, month] = useBookerStore(
+    (state) => [state.username, state.eventSlug, state.month],
+    shallow
+  );
+
+  return useSchedule({
+    username,
+    eventSlug,
+    eventId: event.data?.id,
+    month,
+    timezone,
+    prefetchNextMonth,
+  });
+};
diff --git a/packages/features/bookings/Booker/utils/query-param.ts b/packages/features/bookings/Booker/utils/query-param.ts
new file mode 100644
index 0000000000..efa7617371
--- /dev/null
+++ b/packages/features/bookings/Booker/utils/query-param.ts
@@ -0,0 +1,13 @@
+export const updateQueryParam = (param: string, value: string | number) => {
+  if (typeof window === "undefined") return;
+
+  const url = new URL(window.location.href);
+  url.searchParams.set(param, `${value}`);
+  window.history.pushState({}, "", url.href);
+};
+
+export const getQueryParam = (param: string) => {
+  if (typeof window === "undefined") return;
+
+  return new URLSearchParams(window.location.search).get(param);
+};
diff --git a/packages/features/bookings/components/AvailableTimes.tsx b/packages/features/bookings/components/AvailableTimes.tsx
new file mode 100644
index 0000000000..bd8ce620d3
--- /dev/null
+++ b/packages/features/bookings/components/AvailableTimes.tsx
@@ -0,0 +1,104 @@
+import type { Dayjs } from "@calcom/dayjs";
+import dayjs from "@calcom/dayjs";
+import type { Slots } from "@calcom/features/schedules";
+import { classNames } from "@calcom/lib";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { nameOfDay } from "@calcom/lib/weekday";
+import { Button, SkeletonText } from "@calcom/ui";
+
+import { useTimePreferences } from "../lib";
+import { TimeFormatToggle } from "./TimeFormatToggle";
+
+type AvailableTimesProps = {
+  date: Dayjs;
+  slots: Slots[string];
+  onTimeSelect: (time: string) => void;
+  seatsPerTimeslot?: number | null;
+  showTimeformatToggle?: boolean;
+  className?: string;
+};
+
+export const AvailableTimes = ({
+  date,
+  slots,
+  onTimeSelect,
+  seatsPerTimeslot,
+  showTimeformatToggle = true,
+  className,
+}: AvailableTimesProps) => {
+  const { t, i18n } = useLocale();
+  const [timeFormat, timezone] = useTimePreferences((state) => [state.timeFormat, state.timezone]);
+  const hasTimeSlots = !!seatsPerTimeslot;
+
+  return (
+    <div className={classNames("dark:text-white", className)}>
+      <header className="bg-muted before:bg-muted sticky top-0 left-0 z-10 mb-8 flex w-full flex-row items-center before:absolute before:-top-12 before:h-24 before:w-full md:flex-col md:items-start lg:flex-row lg:items-center">
+        <span className="relative z-10">
+          <span className="text-text font-semibold">
+            {nameOfDay(i18n.language, Number(date.format("d")), "short")},
+          </span>
+          <span className="dark:text-darkgray-500 text-gray-500">
+            {" "}
+            {date.toDate().toLocaleString(i18n.language, { month: "short" })} {date.format(" D ")}
+          </span>
+        </span>
+
+        {showTimeformatToggle && (
+          <div className="ml-auto md:ml-0 lg:ml-auto">
+            <TimeFormatToggle />
+          </div>
+        )}
+      </header>
+      <div className="pb-4">
+        {!slots.length && (
+          <p className={classNames("text-emphasis", showTimeformatToggle ? "-mt-1 text-lg" : "text-sm")}>
+            {t("all_booked_today")}
+          </p>
+        )}
+
+        {slots.map((slot) => {
+          const bookingFull = !!(hasTimeSlots && slot.attendees && slot.attendees >= seatsPerTimeslot);
+          return (
+            <Button
+              key={slot.time}
+              disabled={bookingFull}
+              data-testid="time"
+              data-time={slot.time}
+              onClick={() => onTimeSelect(slot.time)}
+              className="mb-3 flex h-auto min-h-[44px] w-full flex-col items-center justify-center py-2"
+              color="secondary">
+              {dayjs.utc(slot.time).tz(timezone).format(timeFormat)}
+              {bookingFull && <p className="text-sm">{t("booking_full")}</p>}
+              {hasTimeSlots && !bookingFull && (
+                <p className="flex items-center text-sm lowercase">
+                  <span
+                    className={classNames(
+                      slot.attendees && slot.attendees / seatsPerTimeslot >= 0.8
+                        ? "bg-rose-600"
+                        : slot.attendees && slot.attendees / seatsPerTimeslot >= 0.33
+                        ? "bg-yellow-500"
+                        : "bg-emerald-400",
+                      "mr-1 inline-block h-2 w-2 rounded-full"
+                    )}
+                    aria-hidden
+                  />
+                  {slot.attendees ? seatsPerTimeslot - slot.attendees : seatsPerTimeslot}{" "}
+                  {t("seats_available")}
+                </p>
+              )}
+            </Button>
+          );
+        })}
+      </div>
+    </div>
+  );
+};
+
+export const AvailableTimesSkeleton = () => (
+  <div className="mt-8 flex h-full w-[20%] flex-col only:w-full">
+    {/* Random number of elements between 1 and 10. */}
+    {Array.from({ length: Math.floor(Math.random() * 10) + 1 }).map((_, i) => (
+      <SkeletonText className="mb-4 h-6 w-full" key={i} />
+    ))}
+  </div>
+);
diff --git a/packages/features/bookings/components/PeopleFilter.tsx b/packages/features/bookings/components/PeopleFilter.tsx
index 6869905998..7691ec78c0 100644
--- a/packages/features/bookings/components/PeopleFilter.tsx
+++ b/packages/features/bookings/components/PeopleFilter.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 
+import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { AnimatedPopover, Avatar } from "@calcom/ui";
@@ -43,10 +44,10 @@ export const PeopleFilter = () => {
       {data &&
         data.map((user) => (
           <div
-            className="item-center focus-within:bg-subtle focus-within:bg-subtle hover:bg-muted flex px-4 py-[6px] hover:cursor-pointer"
+            className="item-center focus-within:bg-subtle hover:bg-muted flex px-4 py-[6px] hover:cursor-pointer"
             key={`${user.id}`}>
             <Avatar
-              imageSrc={user.avatar}
+              imageSrc={WEBAPP_URL + `/${user.username}/avatar.png`}
               size="sm"
               alt={`${user.name} Avatar`}
               gravatarFallbackMd5="fallback"
diff --git a/packages/features/bookings/components/TimeFormatToggle.tsx b/packages/features/bookings/components/TimeFormatToggle.tsx
new file mode 100644
index 0000000000..71add8b05b
--- /dev/null
+++ b/packages/features/bookings/components/TimeFormatToggle.tsx
@@ -0,0 +1,25 @@
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { TimeFormat } from "@calcom/lib/timeFormat";
+import { ToggleGroup } from "@calcom/ui";
+
+import { useTimePreferences } from "../lib";
+
+export const TimeFormatToggle = () => {
+  const timeFormat = useTimePreferences((state) => state.timeFormat);
+  const setTimeFormat = useTimePreferences((state) => state.setTimeFormat);
+  const { t } = useLocale();
+
+  return (
+    <ToggleGroup
+      onValueChange={(newFormat) => {
+        if (newFormat !== timeFormat) setTimeFormat(newFormat as TimeFormat);
+      }}
+      defaultValue={timeFormat}
+      value={timeFormat}
+      options={[
+        { value: TimeFormat.TWELVE_HOUR, label: t("12_hour_short") },
+        { value: TimeFormat.TWENTY_FOUR_HOUR, label: t("24_hour_short") },
+      ]}
+    />
+  );
+};
diff --git a/packages/features/bookings/components/event-meta/Details.tsx b/packages/features/bookings/components/event-meta/Details.tsx
new file mode 100644
index 0000000000..f1e68b0d1c
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Details.tsx
@@ -0,0 +1,168 @@
+import { Fragment } from "react";
+import React from "react";
+
+import classNames from "@calcom/lib/classNames";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Info, Clock, CheckSquare, RefreshCcw, CreditCard } from "@calcom/ui/components/icon";
+
+import type { PublicEvent } from "../../types";
+import { EventDetailBlocks } from "../../types";
+import { EventDuration } from "./Duration";
+import { EventLocations } from "./Locations";
+import { EventOccurences } from "./Occurences";
+import { EventPrice } from "./Price";
+
+type EventDetailsPropsBase = {
+  event: PublicEvent;
+  className?: string;
+};
+
+type EventDetailDefaultBlock = {
+  blocks?: EventDetailBlocks[];
+};
+
+// Rendering a custom block requires passing a name prop,
+// which is used as a key for the block.
+type EventDetailCustomBlock = {
+  blocks?: React.FC[];
+  name: string;
+};
+
+type EventDetailsProps = EventDetailsPropsBase & (EventDetailDefaultBlock | EventDetailCustomBlock);
+
+interface EventMetaProps {
+  icon: React.FC<{ className: string }> | string;
+  children: React.ReactNode;
+  // Emphasises the text in the block. For now only
+  // applying in dark mode.
+  highlight?: boolean;
+  contentClassName?: string;
+  className?: string;
+}
+
+/**
+ * Default order in which the event details will be rendered.
+ */
+const defaultEventDetailsBlocks = [
+  EventDetailBlocks.DESCRIPTION,
+  EventDetailBlocks.REQUIRES_CONFIRMATION,
+  EventDetailBlocks.DURATION,
+  EventDetailBlocks.OCCURENCES,
+  EventDetailBlocks.LOCATION,
+  EventDetailBlocks.PRICE,
+];
+
+/**
+ * Helper component that ensures the meta data of an event is
+ * rendered in a consistent way — adds an icon and children (text usually).
+ */
+export const EventMetaBlock = ({
+  icon: Icon,
+  children,
+  highlight,
+  contentClassName,
+  className,
+}: EventMetaProps) => {
+  if (!React.Children.count(children)) return null;
+
+  return (
+    <div
+      className={classNames(
+        "flex items-start justify-start text-sm",
+        highlight ? "text-emphasis" : "text-text",
+        className
+      )}>
+      {typeof Icon === "string" ? (
+        <img
+          src={Icon}
+          alt=""
+          // @TODO: Use SVG's instead of images, so we can get rid of the filter.
+          className="mr-2 mt-[2px] h-4 w-4 flex-shrink-0 [filter:invert(0.5)_brightness(0.5)] dark:[filter:invert(1)_brightness(0.9)]"
+        />
+      ) : (
+        <Icon className="relative z-20 mr-2 mt-[2px] h-4 w-4 flex-shrink-0" />
+      )}
+      <div className={classNames("relative z-10", contentClassName)}>{children}</div>
+    </div>
+  );
+};
+
+/**
+ * Component that renders event meta data in a structured way, with icons and labels.
+ * The component can be configured to show only specific blocks by overriding the
+ * `blocks` prop. The blocks prop takes in an array of block names, defined
+ * in the `EventDetailBlocks` enum. See the `defaultEventDetailsBlocks` const
+ * for the default order in which the blocks will be rendered.
+ *
+ * As part of the blocks array you can also decide to render a custom React Component,
+ * which will then also be rendered.
+ *
+ * Example:
+ * const MyCustomBlock = () => <div>Something nice</div>;
+ * <EventDetails event={event} blocks={[EventDetailBlocks.LOCATION, MyCustomBlock]} />
+ */
+export const EventDetails = ({ event, blocks = defaultEventDetailsBlocks }: EventDetailsProps) => {
+  const { t } = useLocale();
+
+  return (
+    <>
+      {blocks.map((block) => {
+        if (typeof block === "function") {
+          return <Fragment key={block.name}>{block(event)}</Fragment>;
+        }
+
+        switch (block) {
+          case EventDetailBlocks.DESCRIPTION:
+            if (!event.description) return null;
+            return (
+              <EventMetaBlock key={block} icon={Info} contentClassName="break-words max-w-full overflow-clip">
+                <div dangerouslySetInnerHTML={{ __html: event.description }} />
+              </EventMetaBlock>
+            );
+
+          case EventDetailBlocks.DURATION:
+            return (
+              <EventMetaBlock key={block} icon={Clock}>
+                <EventDuration event={event} />
+              </EventMetaBlock>
+            );
+
+          case EventDetailBlocks.LOCATION:
+            if (!event?.locations?.length) return null;
+            return (
+              <React.Fragment key={block}>
+                <EventLocations event={event} />
+              </React.Fragment>
+            );
+
+          case EventDetailBlocks.REQUIRES_CONFIRMATION:
+            if (!event.requiresConfirmation) return null;
+
+            return (
+              <EventMetaBlock key={block} icon={CheckSquare}>
+                {t("requires_confirmation")}
+              </EventMetaBlock>
+            );
+
+          case EventDetailBlocks.OCCURENCES:
+            if (!event.requiresConfirmation || !event.recurringEvent) return null;
+
+            return (
+              <EventMetaBlock key={block} icon={RefreshCcw}>
+                <EventOccurences event={event} />
+              </EventMetaBlock>
+            );
+
+          case EventDetailBlocks.PRICE:
+            if (event.price === 0) return null;
+
+            return (
+              <EventMetaBlock key={block} icon={CreditCard}>
+                <EventPrice event={event} />
+              </EventMetaBlock>
+            );
+        }
+      })}
+    </>
+  );
+};
diff --git a/packages/features/bookings/components/event-meta/Duration.tsx b/packages/features/bookings/components/event-meta/Duration.tsx
new file mode 100644
index 0000000000..f3965a9b6f
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Duration.tsx
@@ -0,0 +1,37 @@
+import { useEffect } from "react";
+
+import { useBookerStore } from "@calcom/features/bookings/Booker/store";
+import classNames from "@calcom/lib/classNames";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Badge } from "@calcom/ui";
+
+import type { PublicEvent } from "../../types";
+
+export const EventDuration = ({ event }: { event: PublicEvent }) => {
+  const { t } = useLocale();
+  const [selectedDuration, setSelectedDuration] = useBookerStore((state) => [
+    state.selectedDuration,
+    state.setSelectedDuration,
+  ]);
+
+  // Sets initial value of selected duration to the default duration.
+  useEffect(() => {
+    // Only store event duration in url if event has multiple durations.
+    if (!selectedDuration && event.metadata?.multipleDuration) setSelectedDuration(event.length);
+  }, [selectedDuration, setSelectedDuration, event.length, event.metadata?.multipleDuration]);
+
+  if (!event?.metadata?.multipleDuration) return <>{t("multiple_duration_mins", { count: event.length })}</>;
+
+  return (
+    <div className="flex flex-wrap gap-2">
+      {event.metadata.multipleDuration.map((duration) => (
+        <Badge
+          variant="gray"
+          className={classNames(selectedDuration === duration && "bg-inverted text-inverted")}
+          size="md"
+          key={duration}
+          onClick={() => setSelectedDuration(duration)}>{`${duration} ${t("minute_timeUnit")}`}</Badge>
+      ))}
+    </div>
+  );
+};
diff --git a/packages/features/bookings/components/event-meta/EventMeta.stories.mdx b/packages/features/bookings/components/event-meta/EventMeta.stories.mdx
new file mode 100644
index 0000000000..d177723916
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/EventMeta.stories.mdx
@@ -0,0 +1,42 @@
+import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs';
+import { Examples, Example, Note, Title, VariantsTable, VariantColumn, RowTitles, CustomArgsTable} from '@calcom/storybook/components'
+import { Icon } from "@calcom/ui";
+
+import { EventDetails } from './Details';
+import { EventTitle } from './Title';
+import { EventMembers } from './Members';
+import { mockEvent } from './event.mock.ts';
+
+<Meta title="Features/Events/Meta" component={EventDetails} />
+
+<Title title="Event Meta" suffix="Brief" subtitle="Version 2.0 — Last Update: 12 Dec 2022"/>
+
+<Examples title="Combined event meta block">
+  <div style={{maxWidth: 300}}>
+    <Example title="Event Title">
+      <EventTitle event={mockEvent}/>
+    </Example>
+    <Example title="Event Details">
+      <EventDetails event={mockEvent}/>
+    </Example>
+  </div>
+</Examples>
+
+<Canvas>
+  <Story name="All variants">
+    <VariantsTable titles={['Event Meta Components']} columnMinWidth={150}>
+      <VariantRow variant="">
+        <div style={{maxWidth: 300}}>
+          <EventMembers users={
+            [
+              {name: "Pro example", username: "pro"},
+              {name: "Team example", username: "team"}
+            ]
+          } />
+          <EventTitle>Quick catch-up</EventTitle>
+          <EventDetails event={mockEvent} />
+        </div>
+      </VariantRow>
+    </VariantsTable>
+  </Story>
+</Canvas>
diff --git a/packages/features/bookings/components/event-meta/Locations.tsx b/packages/features/bookings/components/event-meta/Locations.tsx
new file mode 100644
index 0000000000..2c5db9177b
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Locations.tsx
@@ -0,0 +1,42 @@
+import { getEventLocationType } from "@calcom/app-store/locations";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Tooltip } from "@calcom/ui";
+import { MapPin } from "@calcom/ui/components/icon";
+
+import type { PublicEvent } from "../../types";
+import { EventMetaBlock } from "./Details";
+
+export const EventLocations = ({ event }: { event: PublicEvent }) => {
+  const { t } = useLocale();
+  const locations = event.locations;
+  if (!locations?.length) return null;
+
+  return (
+    <EventMetaBlock icon={MapPin}>
+      {locations.length === 1 && (
+        <div key={locations[0].type}>{t(getEventLocationType(locations[0].type)?.label ?? "")}</div>
+      )}
+      {locations.length > 1 && (
+        <div
+          key={locations[0].type}
+          className="before:bg-subtle relative before:pointer-events-none before:absolute before:inset-0 before:left-[-30px] before:top-[-5px] before:bottom-[-5px] before:w-[calc(100%_+_35px)] before:rounded-md before:py-3 before:opacity-0 before:transition-opacity hover:before:opacity-100">
+          <Tooltip
+            content={
+              <>
+                <p className="mb-2">{t("select_on_next_step")}</p>
+                <ul className="list-disc pl-3">
+                  {locations.map((location) => (
+                    <li key={location.type}>
+                      <span>{t(getEventLocationType(location.type)?.label ?? "")}</span>
+                    </li>
+                  ))}
+                </ul>
+              </>
+            }>
+            <span className="relative z-[2] py-2">{t("num_locations", { num: locations.length })}</span>
+          </Tooltip>
+        </div>
+      )}
+    </EventMetaBlock>
+  );
+};
diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
new file mode 100644
index 0000000000..e416843322
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -0,0 +1,42 @@
+import { CAL_URL } from "@calcom/lib/constants";
+import { AvatarGroup } from "@calcom/ui";
+
+import type { PublicEvent } from "../../types";
+import { SchedulingType } from ".prisma/client";
+
+export interface EventMembersProps {
+  /**
+   * Used to determine whether all members should be shown or not.
+   * In case of Round Robin type, members aren't shown.
+   */
+  schedulingType: PublicEvent["schedulingType"];
+  users: PublicEvent["users"];
+  profile: PublicEvent["profile"];
+}
+
+export const EventMembers = ({ schedulingType, users, profile }: EventMembersProps) => {
+  const showMembers = schedulingType !== SchedulingType.ROUND_ROBIN;
+  const shownUsers = showMembers ? [...users, profile] : [profile];
+
+  const avatars = shownUsers
+    .map((user) => ({
+      title: `${user.name}`,
+      image: "image" in user ? `${user.image}` : `${CAL_URL}/${user.username}/avatar.png`,
+      alt: user.name || undefined,
+      href: user.username ? `${CAL_URL}/${user.username}` : undefined,
+    }))
+    .filter((item) => !!item.image)
+    .filter((item, index, self) => self.findIndex((t) => t.image === item.image) === index);
+
+  return (
+    <>
+      <AvatarGroup size="sm" className="border-muted" items={avatars} />
+      <p className="text-subtle text-sm">
+        {users
+          .map((user) => user.name)
+          .filter((name) => name)
+          .join(", ")}
+      </p>
+    </>
+  );
+};
diff --git a/packages/features/bookings/components/event-meta/Occurences.tsx b/packages/features/bookings/components/event-meta/Occurences.tsx
new file mode 100644
index 0000000000..f7b9b72c18
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Occurences.tsx
@@ -0,0 +1,42 @@
+import { useEffect } from "react";
+
+import { useBookerStore } from "@calcom/features/bookings/Booker/store";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { getRecurringFreq } from "@calcom/lib/recurringStrings";
+import { Input } from "@calcom/ui";
+
+import type { PublicEvent } from "../../types";
+
+export const EventOccurences = ({ event }: { event: PublicEvent }) => {
+  const { t } = useLocale();
+  const [setRecurringEventCount, recurringEventCount] = useBookerStore((state) => [
+    state.setRecurringEventCount,
+    state.recurringEventCount,
+  ]);
+
+  // Set initial value in booker store.
+  useEffect(() => {
+    if (!event.recurringEvent?.count) return;
+    setRecurringEventCount(event.recurringEvent.count);
+  }, [setRecurringEventCount, event.recurringEvent]);
+
+  if (!event.recurringEvent) return null;
+
+  return (
+    <>
+      {getRecurringFreq({ t, recurringEvent: event.recurringEvent })}
+      <br />
+      <Input
+        className="my-1 mr-3 inline-flex h-[26px] w-[46px] py-0 px-1"
+        type="number"
+        defaultValue={event.recurringEvent.count}
+        onChange={(event) => {
+          setRecurringEventCount(parseInt(event?.target.value));
+        }}
+      />
+      {t("occurrence", {
+        count: recurringEventCount || event.recurringEvent.count,
+      })}
+    </>
+  );
+};
diff --git a/packages/features/bookings/components/event-meta/Price.tsx b/packages/features/bookings/components/event-meta/Price.tsx
new file mode 100644
index 0000000000..792e88a444
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Price.tsx
@@ -0,0 +1,18 @@
+import getPaymentAppData from "@calcom/lib/getPaymentAppData";
+
+import type { PublicEvent } from "../../types";
+
+export const EventPrice = ({ event }: { event: PublicEvent }) => {
+  const stripeAppData = getPaymentAppData(event);
+
+  if (stripeAppData.price === 0) return null;
+
+  return (
+    <>
+      {Intl.NumberFormat("en", {
+        style: "currency",
+        currency: stripeAppData.currency.toUpperCase(),
+      }).format(stripeAppData.price / 100.0)}
+    </>
+  );
+};
diff --git a/packages/features/bookings/components/event-meta/Skeleton.tsx b/packages/features/bookings/components/event-meta/Skeleton.tsx
new file mode 100644
index 0000000000..cc7f73d255
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Skeleton.tsx
@@ -0,0 +1,19 @@
+import classNames from "@calcom/lib/classNames";
+import { SkeletonText } from "@calcom/ui";
+
+export const EventMetaSkeleton = () => (
+  <div className="flex flex-col">
+    <SkeletonText className="h-6 w-6 rounded-full" />
+    <SkeletonText className="mt-2 h-5 w-32" />
+    <SkeletonText className="mt-2 h-8 w-48" />
+
+    <div className="mt-8">
+      {Array.from({ length: 4 }).map((_, i) => (
+        <div className="mb-2 flex flex-row items-center" key={i}>
+          <SkeletonText className="mr-3 h-5 w-5 rounded-full" />
+          <SkeletonText className={classNames("h-6", i > 1 ? "w-24" : "w-32")} />
+        </div>
+      ))}
+    </div>
+  </div>
+);
diff --git a/packages/features/bookings/components/event-meta/Title.tsx b/packages/features/bookings/components/event-meta/Title.tsx
new file mode 100644
index 0000000000..a147b8cfc2
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/Title.tsx
@@ -0,0 +1,15 @@
+import classNames from "@calcom/lib/classNames";
+
+interface EventTitleProps {
+  children: React.ReactNode;
+  /**
+   * Option to override the default h1 tag.
+   */
+  as?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "p" | "span";
+  className?: string;
+}
+
+export const EventTitle = ({ children, as, className }: EventTitleProps) => {
+  const El = as || "h1";
+  return <El className={classNames("text-text text-xl font-semibold", className)}>{children}</El>;
+};
diff --git a/packages/features/bookings/components/event-meta/event.mock.ts b/packages/features/bookings/components/event-meta/event.mock.ts
new file mode 100644
index 0000000000..1b9e0cad9d
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/event.mock.ts
@@ -0,0 +1,14 @@
+import { RouterOutputs } from "@calcom/trpc/react";
+
+export const mockEvent: RouterOutputs["viewer"]["public"]["event"] = {
+  id: 1,
+  title: "Quick check-in",
+  slug: "quick-check-in",
+  eventName: "Quick check-in",
+  description:
+    "Use this event for a quick 15 minute catchup. Visit this long url to test the component https://cal.com/averylongurlwithoutspacesthatshouldntbreaklayout",
+  users: [{ name: "Pro Example", username: "pro" }],
+  schedulingType: null,
+  length: 30,
+  locations: [{ type: "integrations:google:meet" }, { type: "integrations:zoom" }],
+};
diff --git a/packages/features/bookings/components/event-meta/index.ts b/packages/features/bookings/components/event-meta/index.ts
new file mode 100644
index 0000000000..ca610b80d5
--- /dev/null
+++ b/packages/features/bookings/components/event-meta/index.ts
@@ -0,0 +1,4 @@
+export { EventDetails, EventMetaBlock } from "./Details";
+export { EventTitle } from "./Title";
+export { EventMetaSkeleton } from "./Skeleton";
+export { EventMembers } from "./Members";
diff --git a/packages/features/bookings/index.ts b/packages/features/bookings/index.ts
new file mode 100644
index 0000000000..75d6c92b0e
--- /dev/null
+++ b/packages/features/bookings/index.ts
@@ -0,0 +1,8 @@
+export {
+  EventDetails,
+  EventMembers,
+  EventMetaBlock,
+  EventMetaSkeleton,
+  EventTitle,
+} from "./components/event-meta";
+export { AvailableTimes, AvailableTimesSkeleton } from "./components/AvailableTimes";
diff --git a/packages/features/bookings/layout/BookingLayout.tsx b/packages/features/bookings/layout/BookingLayout.tsx
index 63d0790ada..fae8f86038 100644
--- a/packages/features/bookings/layout/BookingLayout.tsx
+++ b/packages/features/bookings/layout/BookingLayout.tsx
@@ -34,7 +34,7 @@ export default function BookingLayout({
   ...rest
 }: { children: React.ReactNode } & ComponentProps<typeof Shell>) {
   return (
-    <Shell {...rest}>
+    <Shell {...rest} hideHeadingOnMobile>
       <div className="flex max-w-6xl flex-col">
         <div className="flex flex-col lg:flex-row">
           <HorizontalTabs tabs={tabs} />
diff --git a/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx b/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
new file mode 100644
index 0000000000..9cf82e7b1f
--- /dev/null
+++ b/packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx
@@ -0,0 +1,83 @@
+import { v4 as uuidv4 } from "uuid";
+
+import dayjs from "@calcom/dayjs";
+import { parseRecurringDates } from "@calcom/lib/parse-dates";
+
+import type { PublicEvent, BookingCreateBody, RecurringBookingCreateBody } from "../../types";
+
+type BookingOptions = {
+  values: Record<string, unknown>;
+  event: PublicEvent;
+  date: string;
+  // @NOTE: duration is not validated in this function
+  duration: number | undefined | null;
+  timeZone: string;
+  language: string;
+  rescheduleUid: string | undefined;
+  username: string;
+  metadata?: Record<string, string>;
+};
+
+export const mapBookingToMutationInput = ({
+  values,
+  event,
+  date,
+  duration,
+  timeZone,
+  language,
+  rescheduleUid,
+  username,
+  metadata,
+}: BookingOptions): BookingCreateBody => {
+  return {
+    ...values,
+    user: username,
+    start: dayjs(date).format(),
+    end: dayjs(date)
+      // Defaults to the default event length in case no custom duration is set.
+      .add(duration || event.length, "minute")
+      .format(),
+    eventTypeId: event.id,
+    eventTypeSlug: event.slug,
+    timeZone: timeZone,
+    language: language,
+    rescheduleUid,
+    metadata: metadata || {},
+    hasHashedBookingLink: false,
+    // hasHashedBookingLink,
+    // hashedLink,
+  };
+};
+
+// This method is here to ensure that the types are correct (recurring count is required),
+// as well as generate a unique ID for the recurring bookings and turn one single booking
+// into an array of mutiple bookings based on the recurring count.
+// Other than that it forwards the mapping to mapBookingToMutationInput.
+export const mapRecurringBookingToMutationInput = (
+  booking: BookingOptions,
+  recurringCount: number
+): RecurringBookingCreateBody[] => {
+  const recurringEventId = uuidv4();
+  const [, recurringDates] = parseRecurringDates(
+    {
+      startDate: booking.date,
+      timeZone: booking.timeZone,
+      recurringEvent: booking.event.recurringEvent,
+      recurringCount,
+      withDefaultTimeFormat: true,
+    },
+    booking.language
+  );
+
+  const input = mapBookingToMutationInput(booking);
+
+  return recurringDates.map((recurringDate) => ({
+    ...input,
+    start: dayjs(recurringDate).format(),
+    end: dayjs(recurringDate)
+      .add(booking.duration || booking.event.length, "minute")
+      .format(),
+    recurringEventId,
+    recurringCount: recurringDates.length,
+  }));
+};
diff --git a/packages/features/bookings/lib/create-booking.ts b/packages/features/bookings/lib/create-booking.ts
new file mode 100644
index 0000000000..e7931723c3
--- /dev/null
+++ b/packages/features/bookings/lib/create-booking.ts
@@ -0,0 +1,8 @@
+import { post } from "@calcom/lib/fetch-wrapper";
+
+import type { BookingCreateBody, BookingResponse } from "../types";
+
+export const createBooking = async (data: BookingCreateBody) => {
+  const response = await post<BookingCreateBody, BookingResponse>("/api/book/event", data);
+  return response;
+};
diff --git a/apps/web/lib/mutations/bookings/create-recurring-booking.ts b/packages/features/bookings/lib/create-recurring-booking.ts
similarity index 67%
rename from apps/web/lib/mutations/bookings/create-recurring-booking.ts
rename to packages/features/bookings/lib/create-recurring-booking.ts
index 8cec5b82b4..41e29c467f 100644
--- a/apps/web/lib/mutations/bookings/create-recurring-booking.ts
+++ b/packages/features/bookings/lib/create-recurring-booking.ts
@@ -1,18 +1,10 @@
-import type { BookingCreateBody } from "@calcom/prisma/zod-utils";
+import * as fetch from "@calcom/lib/fetch-wrapper";
 import type { AppsStatus } from "@calcom/types/Calendar";
 
-import * as fetch from "@lib/core/http/fetch-wrapper";
-import type { BookingResponse } from "@lib/types/booking";
+import type { RecurringBookingCreateBody, BookingResponse } from "../types";
 
-type ExtendedBookingCreateBody = BookingCreateBody & {
-  noEmail?: boolean;
-  recurringCount?: number;
-  appsStatus?: AppsStatus[] | undefined;
-  allRecurringDates?: string[];
-  currentRecurringIndex?: number;
-};
-
-const createRecurringBooking = async (data: ExtendedBookingCreateBody[]) => {
+// @TODO: Didn't look at the contents of this function in order to not break old booking page.
+export const createRecurringBooking = async (data: RecurringBookingCreateBody[]) => {
   const createdBookings: BookingResponse[] = [];
   const allRecurringDates: string[] = data.map((booking) => booking.start);
   let appsStatus: AppsStatus[] | undefined = undefined;
@@ -35,7 +27,7 @@ const createRecurringBooking = async (data: ExtendedBookingCreateBody[]) => {
       appsStatus = Object.values(calcAppsStatus);
     }
 
-    const response = await fetch.post<ExtendedBookingCreateBody, BookingResponse>("/api/book/event", {
+    const response = await fetch.post<RecurringBookingCreateBody, BookingResponse>("/api/book/event", {
       ...booking,
       appsStatus,
       allRecurringDates,
@@ -46,5 +38,3 @@ const createRecurringBooking = async (data: ExtendedBookingCreateBody[]) => {
   }
   return createdBookings;
 };
-
-export default createRecurringBooking;
diff --git a/packages/features/bookings/lib/get-booking.ts b/packages/features/bookings/lib/get-booking.ts
new file mode 100644
index 0000000000..40ef06c938
--- /dev/null
+++ b/packages/features/bookings/lib/get-booking.ts
@@ -0,0 +1,163 @@
+import type { Prisma, PrismaClient } from "@prisma/client";
+import type { z } from "zod";
+
+import { bookingResponsesDbSchema } from "@calcom/features/bookings/lib/getBookingResponsesSchema";
+import slugify from "@calcom/lib/slugify";
+import prisma from "@calcom/prisma";
+
+type BookingSelect = {
+  description: true;
+  customInputs: true;
+  attendees: {
+    select: {
+      email: true;
+      name: true;
+    };
+  };
+  location: true;
+};
+
+// Backward Compatibility for booking created before we had managed booking questions
+function getResponsesFromOldBooking(
+  rawBooking: Prisma.BookingGetPayload<{
+    select: BookingSelect;
+  }>
+) {
+  const customInputs = rawBooking.customInputs || {};
+  const responses = Object.keys(customInputs).reduce((acc, label) => {
+    acc[slugify(label) as keyof typeof acc] = customInputs[label as keyof typeof customInputs];
+    return acc;
+  }, {});
+  return {
+    // It is possible to have no attendees in a booking when the booking is cancelled.
+    name: rawBooking.attendees[0]?.name || "Nameless",
+    email: rawBooking.attendees[0]?.email || "",
+    guests: rawBooking.attendees.slice(1).map((attendee) => {
+      return attendee.email;
+    }),
+    notes: rawBooking.description || "",
+    location: {
+      value: rawBooking.location || "",
+      optionValue: rawBooking.location || "",
+    },
+    ...responses,
+  };
+}
+
+async function getBooking(prisma: PrismaClient, uid: string) {
+  const rawBooking = await prisma.booking.findFirst({
+    where: {
+      uid,
+    },
+    select: {
+      id: true,
+      uid: true,
+      startTime: true,
+      description: true,
+      customInputs: true,
+      responses: true,
+      smsReminderNumber: true,
+      location: true,
+      attendees: {
+        select: {
+          email: true,
+          name: true,
+          bookingSeat: true,
+        },
+      },
+      user: {
+        select: {
+          id: true,
+        },
+      },
+    },
+  });
+
+  if (!rawBooking) {
+    return rawBooking;
+  }
+
+  const booking = getBookingWithResponses(rawBooking);
+
+  if (booking) {
+    // @NOTE: had to do this because Server side cant return [Object objects]
+    // probably fixable with json.stringify -> json.parse
+    booking["startTime"] = (booking?.startTime as Date)?.toISOString() as unknown as Date;
+  }
+
+  return booking;
+}
+
+export type GetBookingType = Prisma.PromiseReturnType<typeof getBooking>;
+
+export const getBookingWithResponses = <
+  T extends Prisma.BookingGetPayload<{
+    select: BookingSelect & {
+      responses: true;
+    };
+  }>
+>(
+  booking: T
+) => {
+  return {
+    ...booking,
+    responses: bookingResponsesDbSchema.parse(booking.responses || getResponsesFromOldBooking(booking)),
+  } as Omit<T, "responses"> & { responses: z.infer<typeof bookingResponsesDbSchema> };
+};
+
+export default getBooking;
+
+export const getBookingByUidOrRescheduleUid = async (uid: string) => {
+  let eventTypeId: number | null = null;
+  let rescheduleUid: string | null = null;
+  eventTypeId =
+    (
+      await prisma.booking.findFirst({
+        where: {
+          uid,
+        },
+        select: {
+          eventTypeId: true,
+        },
+      })
+    )?.eventTypeId || null;
+
+  // If no booking is found via the uid, it's probably a booking seat,
+  // which we query next.
+  let attendeeEmail: string | null = null;
+  if (!eventTypeId) {
+    const bookingSeat = await prisma.bookingSeat.findFirst({
+      where: {
+        referenceUid: uid,
+      },
+      select: {
+        id: true,
+        attendee: true,
+        booking: {
+          select: {
+            uid: true,
+          },
+        },
+      },
+    });
+    if (bookingSeat) {
+      rescheduleUid = bookingSeat.booking.uid;
+      attendeeEmail = bookingSeat.attendee.email;
+    }
+  }
+
+  // If we don't have a booking and no rescheduleUid, the ID is invalid,
+  // and we return null here.
+  if (!eventTypeId && !rescheduleUid) return null;
+
+  const booking = await getBooking(prisma, rescheduleUid || uid);
+
+  if (!booking) return null;
+
+  return {
+    ...booking,
+    attendees: rescheduleUid
+      ? booking.attendees.filter((attendee) => attendee.email === attendeeEmail)
+      : booking.attendees,
+  };
+};
diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts
index 49795f6af1..324ff32534 100644
--- a/packages/features/bookings/lib/handleCancelBooking.ts
+++ b/packages/features/bookings/lib/handleCancelBooking.ts
@@ -1,4 +1,4 @@
-import type { WebhookTriggerEvents, WorkflowReminder, Prisma } from "@prisma/client";
+import type { Prisma, WebhookTriggerEvents, WorkflowReminder } from "@prisma/client";
 import { BookingStatus, MembershipRole, WorkflowMethods } from "@prisma/client";
 import type { NextApiRequest } from "next";
 
@@ -38,7 +38,7 @@ async function getBookingToDelete(id: number | undefined, uid: string | undefine
       user: {
         select: {
           id: true,
-          credentials: true,
+          credentials: true, // Not leaking at the moment, be careful with
           email: true,
           timeZone: true,
           name: true,
@@ -58,6 +58,7 @@ async function getBookingToDelete(id: number | undefined, uid: string | undefine
       paid: true,
       eventType: {
         select: {
+          slug: true,
           owner: true,
           teamId: true,
           recurringEvent: true,
@@ -334,7 +335,11 @@ async function handler(req: CustomRequest) {
     await sendCancelledReminders({
       workflows: bookingToDelete.eventType?.workflows,
       smsReminderNumber: bookingToDelete.smsReminderNumber,
-      evt,
+      evt: {
+        ...evt,
+        ...{ eventType: { slug: bookingToDelete.eventType.slug } },
+      },
+      hideBranding: !!bookingToDelete.eventType.owner?.hideBranding,
     });
   }
 
diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.ts
index bed1992ed1..0e4742497d 100644
--- a/packages/features/bookings/lib/handleConfirmation.ts
+++ b/packages/features/bookings/lib/handleConfirmation.ts
@@ -1,4 +1,4 @@
-import type { PrismaClient, Workflow, WorkflowsOnEventTypes, WorkflowStep } from "@prisma/client";
+import type { Prisma, PrismaClient, Workflow, WorkflowsOnEventTypes, WorkflowStep } from "@prisma/client";
 import { BookingStatus, WebhookTriggerEvents } from "@prisma/client";
 
 import { scheduleTrigger } from "@calcom/app-store/zapier/lib/nodeScheduler";
@@ -10,6 +10,7 @@ import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import type { EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload";
 import sendPayload from "@calcom/features/webhooks/lib/sendPayload";
 import logger from "@calcom/lib/logger";
+import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
 import type { AdditionalInformation, CalendarEvent } from "@calcom/types/Calendar";
 
 const log = logger.getChildLogger({ prefix: ["[handleConfirmation] book:user"] });
@@ -66,11 +67,24 @@ export async function handleConfirmation(args: {
   let updatedBookings: {
     scheduledJobs: string[];
     id: number;
+    description: string | null;
+    location: string | null;
+    attendees: {
+      name: string;
+      email: string;
+    }[];
     startTime: Date;
     endTime: Date;
     uid: string;
     smsReminderNumber: string | null;
+    metadata: Prisma.JsonValue | null;
+    customInputs: Prisma.JsonValue;
     eventType: {
+      bookingFields: Prisma.JsonValue | null;
+      slug: string;
+      owner: {
+        hideBranding?: boolean | null;
+      } | null;
       workflows: (WorkflowsOnEventTypes & {
         workflow: Workflow & {
           steps: WorkflowStep[];
@@ -104,6 +118,13 @@ export async function handleConfirmation(args: {
         select: {
           eventType: {
             select: {
+              slug: true,
+              bookingFields: true,
+              owner: {
+                select: {
+                  hideBranding: true,
+                },
+              },
               workflows: {
                 include: {
                   workflow: {
@@ -115,15 +136,21 @@ export async function handleConfirmation(args: {
               },
             },
           },
+          description: true,
+          attendees: true,
+          location: true,
           uid: true,
           startTime: true,
+          metadata: true,
           endTime: true,
           smsReminderNumber: true,
+          customInputs: true,
           id: true,
           scheduledJobs: true,
         },
       })
     );
+
     const updatedBookingsResult = await Promise.all(updateBookingsPromise);
     updatedBookings = updatedBookings.concat(updatedBookingsResult);
   } else {
@@ -142,6 +169,13 @@ export async function handleConfirmation(args: {
       select: {
         eventType: {
           select: {
+            slug: true,
+            bookingFields: true,
+            owner: {
+              select: {
+                hideBranding: true,
+              },
+            },
             workflows: {
               include: {
                 workflow: {
@@ -155,8 +189,13 @@ export async function handleConfirmation(args: {
         },
         uid: true,
         startTime: true,
+        metadata: true,
         endTime: true,
         smsReminderNumber: true,
+        description: true,
+        attendees: true,
+        location: true,
+        customInputs: true,
         id: true,
         scheduledJobs: true,
       },
@@ -172,14 +211,21 @@ export async function handleConfirmation(args: {
         evtOfBooking.startTime = updatedBookings[index].startTime.toISOString();
         evtOfBooking.endTime = updatedBookings[index].endTime.toISOString();
         evtOfBooking.uid = updatedBookings[index].uid;
+        const eventTypeSlug = updatedBookings[index].eventType?.slug || "";
 
         const isFirstBooking = index === 0;
+        const videoCallUrl =
+          bookingMetadataSchema.parse(updatedBookings[index].metadata || {})?.videoCallUrl || "";
 
         await scheduleWorkflowReminders({
           workflows: updatedBookings[index]?.eventType?.workflows || [],
           smsReminderNumber: updatedBookings[index].smsReminderNumber,
-          calendarEvent: evtOfBooking,
+          calendarEvent: {
+            ...evtOfBooking,
+            ...{ metadata: { videoCallUrl }, eventType: { slug: eventTypeSlug } },
+          },
           isFirstRecurringEvent: isFirstBooking,
+          hideBranding: !!updatedBookings[index].eventType?.owner?.hideBranding,
         });
       }
     }
diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts
index 9d154152cd..0e463e6e69 100644
--- a/packages/features/bookings/lib/handleNewBooking.ts
+++ b/packages/features/bookings/lib/handleNewBooking.ts
@@ -53,7 +53,7 @@ import { updateWebUser as syncServicesUpdateWebUser } from "@calcom/lib/sync/Syn
 import { TimeFormat } from "@calcom/lib/timeFormat";
 import prisma, { userSelect } from "@calcom/prisma";
 import type { BookingReference } from "@calcom/prisma/client";
-import type { bookingCreateSchemaLegacyPropsForApi } from "@calcom/prisma/zod-utils";
+import { bookingCreateSchemaLegacyPropsForApi } from "@calcom/prisma/zod-utils";
 import {
   bookingCreateBodySchemaForApi,
   customInputSchema,
@@ -197,7 +197,13 @@ const getEventTypesFromDB = async (eventTypeId: number) => {
       id: true,
       customInputs: true,
       disableGuests: true,
-      users: userSelect,
+      users: {
+        select: {
+          credentials: true,
+          ...userSelect.select,
+        },
+      },
+      slug: true,
       team: {
         select: {
           id: true,
@@ -227,6 +233,11 @@ const getEventTypesFromDB = async (eventTypeId: number) => {
       seatsShowAttendees: true,
       bookingLimits: true,
       durationLimits: true,
+      owner: {
+        select: {
+          hideBranding: true,
+        },
+      },
       workflows: {
         include: {
           workflow: {
@@ -247,7 +258,12 @@ const getEventTypesFromDB = async (eventTypeId: number) => {
       hosts: {
         select: {
           isFixed: true,
-          user: userSelect,
+          user: {
+            select: {
+              credentials: true,
+              ...userSelect.select,
+            },
+          },
         },
       },
       availability: {
@@ -271,7 +287,7 @@ const getEventTypesFromDB = async (eventTypeId: number) => {
   };
 };
 
-type IsFixedAwareUser = User & { isFixed: boolean };
+type IsFixedAwareUser = User & { isFixed: boolean; credentials: Credential[] };
 
 async function ensureAvailableUsers(
   eventType: Awaited<ReturnType<typeof getEventTypesFromDB>> & {
@@ -388,21 +404,81 @@ function getBookingData({
   isNotAnApiCall: boolean;
   eventType: Awaited<ReturnType<typeof getEventTypesFromDB>>;
 }) {
+  const responsesSchema = getBookingResponsesSchema({
+    eventType: {
+      bookingFields: eventType.bookingFields,
+    },
+    view: req.body.rescheduleUid ? "reschedule" : "booking",
+  });
   const bookingDataSchema = isNotAnApiCall
     ? extendedBookingCreateBody.merge(
         z.object({
-          responses: getBookingResponsesSchema({
-            eventType: {
-              bookingFields: eventType.bookingFields,
-            },
-            view: req.body.rescheduleUid ? "reschedule" : "booking",
-          }),
+          responses: responsesSchema,
         })
       )
-    : bookingCreateBodySchemaForApi;
+    : bookingCreateBodySchemaForApi
+        .merge(
+          z.object({
+            responses: responsesSchema.optional(),
+          })
+        )
+        .superRefine((val, ctx) => {
+          if (val.responses && val.customInputs) {
+            ctx.addIssue({
+              code: "custom",
+              message:
+                "Don't use both customInputs and responses. `customInputs` is only there for legacy support.",
+            });
+            return;
+          }
+          const legacyProps = Object.keys(bookingCreateSchemaLegacyPropsForApi.shape);
+
+          if (val.responses) {
+            const unwantedProps: string[] = [];
+            legacyProps.forEach((legacyProp) => {
+              if (val[legacyProp as keyof typeof val]) {
+                unwantedProps.push(legacyProp);
+              }
+            });
+            if (unwantedProps.length) {
+              ctx.addIssue({
+                code: "custom",
+                message: `Legacy Props: ${unwantedProps.join(",")}. They can't be used with \`responses\``,
+              });
+              return;
+            }
+          } else if (val.customInputs) {
+            const { success } = bookingCreateSchemaLegacyPropsForApi.safeParse(val);
+            if (!success) {
+              ctx.addIssue({
+                code: "custom",
+                message: `With \`customInputs\` you must specify legacy props ${legacyProps.join(",")}`,
+              });
+            }
+          }
+        });
 
   const reqBody = bookingDataSchema.parse(req.body);
-  if ("responses" in reqBody) {
+  if ("customInputs" in reqBody) {
+    if (reqBody.customInputs) {
+      // Check if required custom inputs exist
+      handleCustomInputs(eventType.customInputs as EventTypeCustomInput[], reqBody.customInputs);
+    }
+    const reqBodyWithLegacyProps = bookingCreateSchemaLegacyPropsForApi.parse(reqBody);
+    return {
+      ...reqBody,
+      name: reqBodyWithLegacyProps.name,
+      email: reqBodyWithLegacyProps.email,
+      guests: reqBodyWithLegacyProps.guests,
+      location: reqBodyWithLegacyProps.location || "",
+      smsReminderNumber: reqBodyWithLegacyProps.smsReminderNumber,
+      notes: reqBodyWithLegacyProps.notes,
+      rescheduleReason: reqBodyWithLegacyProps.rescheduleReason,
+    };
+  } else {
+    if (!reqBody.responses) {
+      throw new Error("`responses` must not be nullish");
+    }
     const responses = reqBody.responses;
     const { userFieldsResponses: calEventUserFieldsResponses, responses: calEventResponses } =
       getCalEventResponses({
@@ -421,20 +497,6 @@ function getBookingData({
       rescheduleReason: responses.rescheduleReason,
       calEventResponses,
     };
-  } else {
-    // Check if required custom inputs exist
-    handleCustomInputs(eventType.customInputs as EventTypeCustomInput[], reqBody.customInputs);
-
-    return {
-      ...reqBody,
-      name: reqBody.name,
-      email: reqBody.email,
-      guests: reqBody.guests,
-      location: reqBody.location || "",
-      smsReminderNumber: reqBody.smsReminderNumber,
-      notes: reqBody.notes,
-      rescheduleReason: reqBody.rescheduleReason,
-    };
   }
 }
 
@@ -571,6 +633,7 @@ async function handler(
           },
           select: {
             ...userSelect.select,
+            credentials: true, // Don't leak to client
             metadata: true,
           },
         })
@@ -602,7 +665,10 @@ async function handler(
       where: {
         id: eventType.userId,
       },
-      ...userSelect,
+      select: {
+        credentials: true, // Don't leak to client
+        ...userSelect.select,
+      },
     });
     if (!eventTypeUser) {
       log.warn({ message: "NewBooking: eventTypeUser.notFound" });
@@ -631,8 +697,7 @@ async function handler(
       return aIndex - bIndex;
     });
     const firstUsersMetadata = userMetadataSchema.parse(users[0].metadata);
-    const app = getAppFromSlug(firstUsersMetadata?.defaultConferencingApp?.appSlug);
-    locationBodyString = app?.appData?.location?.type || locationBodyString;
+    locationBodyString = firstUsersMetadata?.defaultConferencingApp?.appLink || locationBodyString;
     defaultLocationUrl = firstUsersMetadata?.defaultConferencingApp?.appLink;
   }
 
@@ -788,6 +853,7 @@ async function handler(
 
   const calEventUserFieldsResponses =
     "calEventUserFieldsResponses" in reqBody ? reqBody.calEventUserFieldsResponses : null;
+
   let evt: CalendarEvent = {
     type: eventType.title,
     title: getEventName(eventNameObject), //this needs to be either forced in english, or fetched for each attendee and organizer separately
@@ -800,6 +866,7 @@ async function handler(
       id: organizerUser.id,
       name: organizerUser.name || "Nameless",
       email: organizerUser.email || "Email-less",
+      username: organizerUser.username || undefined,
       timeZone: organizerUser.timeZone,
       language: { translate: tOrganizer, locale: organizerUser.locale ?? "en" },
       timeFormat: organizerUser.timeFormat === 24 ? TimeFormat.TWENTY_FOUR_HOUR : TimeFormat.TWELVE_HOUR,
@@ -1376,6 +1443,7 @@ async function handler(
        * deep cloning evt to avoid this
        */
       const copyEvent = cloneDeep(evt);
+      copyEvent.uid = booking.uid;
       await sendScheduledSeatsEmails(copyEvent, invitee[0], newSeat, !!eventType.seatsShowAttendees);
 
       const credentials = await refreshCredentials(organizerUser.credentials);
@@ -1436,12 +1504,12 @@ async function handler(
     // Here we should handle every after action that needs to be done after booking creation
 
     // Obtain event metadata that includes videoCallUrl
-    const metadata = { videoCallUrl: evt.videoCallData?.url };
+    const metadata = evt.videoCallData?.url ? { videoCallUrl: evt.videoCallData.url } : undefined;
     try {
       await scheduleWorkflowReminders({
         workflows: eventType.workflows,
         smsReminderNumber: smsReminderNumber || null,
-        calendarEvent: { ...evt, responses, ...{ metadata } },
+        calendarEvent: { ...evt, ...{ metadata, eventType: { slug: eventType.slug } } },
         requiresConfirmation: evt.requiresConfirmation || false,
         isRescheduleEvent: !!rescheduleUid,
         isFirstRecurringEvent: true,
@@ -2052,16 +2120,20 @@ async function handler(
     log.error("Error while creating booking references", error);
   }
 
-  const metadataFromEvent = { videoCallUrl };
+  const metadataFromEvent = videoCallUrl ? { videoCallUrl } : undefined;
 
   try {
     await scheduleWorkflowReminders({
       workflows: eventType.workflows,
       smsReminderNumber: smsReminderNumber || null,
-      calendarEvent: { ...evt, responses, ...{ metadata: metadataFromEvent } },
+      calendarEvent: {
+        ...evt,
+        ...{ metadata: metadataFromEvent, eventType: { slug: eventType.slug } },
+      },
       requiresConfirmation: evt.requiresConfirmation || false,
       isRescheduleEvent: !!rescheduleUid,
       isFirstRecurringEvent: true,
+      hideBranding: !!eventType.owner?.hideBranding,
     });
   } catch (error) {
     log.error("Error while scheduling workflow reminders", error);
diff --git a/packages/features/bookings/lib/index.ts b/packages/features/bookings/lib/index.ts
new file mode 100644
index 0000000000..a9a36c1264
--- /dev/null
+++ b/packages/features/bookings/lib/index.ts
@@ -0,0 +1,7 @@
+export { useTimePreferences, timePreferencesStore } from "./timePreferences";
+export {
+  mapBookingToMutationInput,
+  mapRecurringBookingToMutationInput,
+} from "./book-event-form/booking-to-mutation-input-mapper";
+export { createBooking } from "./create-booking";
+export { createRecurringBooking } from "./create-recurring-booking";
diff --git a/packages/features/bookings/lib/timePreferences.ts b/packages/features/bookings/lib/timePreferences.ts
new file mode 100644
index 0000000000..4e56f1bf16
--- /dev/null
+++ b/packages/features/bookings/lib/timePreferences.ts
@@ -0,0 +1,34 @@
+import { create } from "zustand";
+
+import dayjs from "@calcom/dayjs";
+import { TimeFormat, detectBrowserTimeFormat, setIs24hClockInLocalStorage } from "@calcom/lib/timeFormat";
+import { localStorage } from "@calcom/lib/webstorage";
+
+type TimePreferencesStore = {
+  timeFormat: TimeFormat.TWELVE_HOUR | TimeFormat.TWENTY_FOUR_HOUR;
+  setTimeFormat: (format: TimeFormat.TWELVE_HOUR | TimeFormat.TWENTY_FOUR_HOUR) => void;
+  timezone: string;
+  setTimezone: (timeZone: string) => void;
+};
+
+const timezoneLocalStorageKey = "timeOption.preferredTimeZone";
+
+/**
+ * This hook is NOT inside the user feature, since
+ * these settings only apply to the booker component. They will not reflect
+ * any changes made in the user settings.
+ */
+export const timePreferencesStore = create<TimePreferencesStore>((set) => ({
+  timeFormat: detectBrowserTimeFormat,
+  setTimeFormat: (format: TimeFormat.TWELVE_HOUR | TimeFormat.TWENTY_FOUR_HOUR) => {
+    setIs24hClockInLocalStorage(format === TimeFormat.TWENTY_FOUR_HOUR);
+    set({ timeFormat: format });
+  },
+  timezone: localStorage.getItem(timezoneLocalStorageKey) || dayjs.tz.guess(),
+  setTimezone: (timezone: string) => {
+    localStorage.setItem(timezoneLocalStorageKey, timezone);
+    set({ timezone });
+  },
+}));
+
+export const useTimePreferences = timePreferencesStore;
diff --git a/packages/features/bookings/types.ts b/packages/features/bookings/types.ts
new file mode 100644
index 0000000000..6415612cd0
--- /dev/null
+++ b/packages/features/bookings/types.ts
@@ -0,0 +1,33 @@
+import type { ErrorOption, FieldPath } from "react-hook-form";
+
+import type { BookingCreateBody } from "@calcom/prisma/zod-utils";
+import type { RouterOutputs } from "@calcom/trpc/react";
+import type { AppsStatus } from "@calcom/types/Calendar";
+
+export type PublicEvent = NonNullable<RouterOutputs["viewer"]["public"]["event"]>;
+export type ValidationErrors<T extends object> = { key: FieldPath<T>; error: ErrorOption }[];
+
+export enum EventDetailBlocks {
+  DESCRIPTION,
+  // Includes duration select when event has multiple durations.
+  DURATION,
+  LOCATION,
+  REQUIRES_CONFIRMATION,
+  // Includes input to select # of occurences.
+  OCCURENCES,
+  PRICE,
+}
+
+export type { BookingCreateBody };
+
+export type RecurringBookingCreateBody = BookingCreateBody & {
+  noEmail?: boolean;
+  recurringCount?: number;
+  appsStatus?: AppsStatus[] | undefined;
+  allRecurringDates?: string[];
+  currentRecurringIndex?: number;
+};
+
+export type BookingResponse = Awaited<
+  ReturnType<typeof import("@calcom/features/bookings/lib/handleNewBooking").default>
+>;
diff --git a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx
index ad501e3aa4..4616df9b3b 100644
--- a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx
+++ b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx
@@ -3,7 +3,7 @@ import { Controller, useForm } from "react-hook-form";
 
 import dayjs from "@calcom/dayjs";
 import type { TApiKeys } from "@calcom/ee/api-keys/components/ApiKeyListItem";
-import LicenseRequired from "@calcom/ee/common/components/v2/LicenseRequired";
+import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Button, DatePicker, DialogFooter, Form, showToast, Switch, TextField, Tooltip } from "@calcom/ui";
diff --git a/packages/features/ee/common/components/LicenseRequired.tsx b/packages/features/ee/common/components/LicenseRequired.tsx
index e4e36a76cd..103330b9f2 100644
--- a/packages/features/ee/common/components/LicenseRequired.tsx
+++ b/packages/features/ee/common/components/LicenseRequired.tsx
@@ -1,14 +1,9 @@
-/**
- * @deprecated file
- * All new changes should be made to the V2 file in
- * `/packages/features/ee/common/components/v2/LicenseRequired.tsx`
- */
 import DOMPurify from "dompurify";
 import { useSession } from "next-auth/react";
 import type { AriaRole, ComponentType } from "react";
 import React, { Fragment } from "react";
 
-import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
+import { APP_NAME, CONSOLE_URL, SUPPORT_MAIL_ADDRESS, WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { EmptyScreen } from "@calcom/ui";
 import { AlertTriangle } from "@calcom/ui/components/icon";
@@ -20,20 +15,15 @@ type LicenseRequiredProps = {
   children: React.ReactNode;
 };
 
-/**
- * @deprecated file
- * All new changes should be made to the V2 file in
- * `/packages/features/ee/common/components/v2/LicenseRequired.tsx`
- * This component will only render it's children if the installation has a valid
- * license.
- */
 const LicenseRequired = ({ children, as = "", ...rest }: LicenseRequiredProps) => {
-  const { t } = useLocale();
   const session = useSession();
+  const { t } = useLocale();
   const Component = as || Fragment;
+  const hasValidLicense = session.data ? session.data.hasValidLicense : null;
+
   return (
     <Component {...rest}>
-      {session.data?.hasValidLicense ? (
+      {hasValidLicense === null || hasValidLicense ? (
         children
       ) : (
         <EmptyScreen
@@ -44,13 +34,12 @@ const LicenseRequired = ({ children, as = "", ...rest }: LicenseRequiredProps) =
               dangerouslySetInnerHTML={{
                 __html: DOMPurify.sanitize(
                   t("enterprise_license_description", {
-                    consoleUrl: `<a href="https://go.cal.com/console" target="_blank" class="underline">
+                    consoleUrl: `<a href="${CONSOLE_URL}" target="_blank" rel="noopener noreferrer" class="underline">
                 ${APP_NAME}
               </a>`,
-                    setupUrl: `<a href="${WEBAPP_URL}/auth/setup">/auth/setup</a>`,
-                    supportMail: `<a href="mailto:sales@cal.com" class="underline">
-                sales@cal.com
-              </a>`,
+                    setupUrl: `<a href="${WEBAPP_URL}/auth/setup" class="underline">/auth/setup</a>`,
+                    supportMail: `<a href="mailto:${SUPPORT_MAIL_ADDRESS}" class="underline">
+                ${SUPPORT_MAIL_ADDRESS}</a>`,
                   })
                 ),
               }}
diff --git a/packages/features/ee/common/components/v2/LicenseRequired.tsx b/packages/features/ee/common/components/v2/LicenseRequired.tsx
deleted file mode 100644
index 103330b9f2..0000000000
--- a/packages/features/ee/common/components/v2/LicenseRequired.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import DOMPurify from "dompurify";
-import { useSession } from "next-auth/react";
-import type { AriaRole, ComponentType } from "react";
-import React, { Fragment } from "react";
-
-import { APP_NAME, CONSOLE_URL, SUPPORT_MAIL_ADDRESS, WEBAPP_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { EmptyScreen } from "@calcom/ui";
-import { AlertTriangle } from "@calcom/ui/components/icon";
-
-type LicenseRequiredProps = {
-  as?: keyof JSX.IntrinsicElements | "";
-  className?: string;
-  role?: AriaRole | undefined;
-  children: React.ReactNode;
-};
-
-const LicenseRequired = ({ children, as = "", ...rest }: LicenseRequiredProps) => {
-  const session = useSession();
-  const { t } = useLocale();
-  const Component = as || Fragment;
-  const hasValidLicense = session.data ? session.data.hasValidLicense : null;
-
-  return (
-    <Component {...rest}>
-      {hasValidLicense === null || hasValidLicense ? (
-        children
-      ) : (
-        <EmptyScreen
-          Icon={AlertTriangle}
-          headline={t("enterprise_license")}
-          description={
-            <div
-              dangerouslySetInnerHTML={{
-                __html: DOMPurify.sanitize(
-                  t("enterprise_license_description", {
-                    consoleUrl: `<a href="${CONSOLE_URL}" target="_blank" rel="noopener noreferrer" class="underline">
-                ${APP_NAME}
-              </a>`,
-                    setupUrl: `<a href="${WEBAPP_URL}/auth/setup" class="underline">/auth/setup</a>`,
-                    supportMail: `<a href="mailto:${SUPPORT_MAIL_ADDRESS}" class="underline">
-                ${SUPPORT_MAIL_ADDRESS}</a>`,
-                  })
-                ),
-              }}
-            />
-          }
-        />
-      )}
-    </Component>
-  );
-};
-
-export const withLicenseRequired =
-  <T extends JSX.IntrinsicAttributes>(Component: ComponentType<T>) =>
-  // eslint-disable-next-line react/display-name
-  (hocProps: T) =>
-    (
-      <LicenseRequired>
-        <Component {...hocProps} />
-      </LicenseRequired>
-    );
-
-export default LicenseRequired;
diff --git a/packages/features/ee/components/PoweredBy.tsx b/packages/features/ee/components/PoweredBy.tsx
new file mode 100644
index 0000000000..6927a7baa2
--- /dev/null
+++ b/packages/features/ee/components/PoweredBy.tsx
@@ -0,0 +1,39 @@
+import { useSession } from "next-auth/react";
+import Link from "next/link";
+
+import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
+import { APP_NAME, POWERED_BY_URL } from "@calcom/lib/constants";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+
+const PoweredByCal = () => {
+  const { t } = useLocale();
+  const session = useSession();
+  const isEmbed = useIsEmbed();
+  const hasValidLicense = session.data ? session.data.hasValidLicense : null;
+
+  return (
+    <div className={"p-2 text-center text-xs sm:text-right" + (isEmbed ? " max-w-3xl" : "")}>
+      <Link href={POWERED_BY_URL} target="_blank" className="text-subtle opacity-50 hover:opacity-100">
+        {t("powered_by")}{" "}
+        {APP_NAME === "Cal.com" || !hasValidLicense ? (
+          <>
+            <img
+              className="relative -mt-px inline h-[10px] w-auto dark:hidden"
+              src="/cal-logo-word.svg"
+              alt="Cal.com Logo"
+            />
+            <img
+              className="relativ -mt-px hidden h-[10px] w-auto dark:inline"
+              src="/cal-logo-word-dark.svg"
+              alt="Cal.com Logo"
+            />
+          </>
+        ) : (
+          <span className="text-emphasis font-semibold">{APP_NAME}</span>
+        )}
+      </Link>
+    </div>
+  );
+};
+
+export default PoweredByCal;
diff --git a/packages/features/ee/payments/api/webhook.ts b/packages/features/ee/payments/api/webhook.ts
index dc3e97d5db..797cf1b6b9 100644
--- a/packages/features/ee/payments/api/webhook.ts
+++ b/packages/features/ee/payments/api/webhook.ts
@@ -55,7 +55,6 @@ async function getBooking(bookingId: number) {
         select: {
           id: true,
           username: true,
-          credentials: true,
           timeZone: true,
           email: true,
           name: true,
@@ -176,9 +175,11 @@ async function handlePaymentSuccess(event: Stripe.Event) {
     eventTypeRaw = await getEventType(booking.eventTypeId);
   }
 
-  const { user } = booking;
+  const { user: userWithCredentials } = booking;
 
-  if (!user) throw new HttpCode({ statusCode: 204, message: "No user found" });
+  if (!userWithCredentials) throw new HttpCode({ statusCode: 204, message: "No user found" });
+
+  const { credentials, ...user } = userWithCredentials;
 
   const t = await getTranslation(user.locale ?? "en", "common");
   const attendeesListPromises = booking.attendees.map(async (attendee) => {
@@ -227,7 +228,7 @@ async function handlePaymentSuccess(event: Stripe.Event) {
 
   const isConfirmed = booking.status === BookingStatus.ACCEPTED;
   if (isConfirmed) {
-    const eventManager = new EventManager(user);
+    const eventManager = new EventManager(userWithCredentials);
     const scheduleResult = await eventManager.create(evt);
     bookingData.references = { create: scheduleResult.referencesToCreate };
   }
@@ -255,7 +256,14 @@ async function handlePaymentSuccess(event: Stripe.Event) {
   await prisma.$transaction([paymentUpdate, bookingUpdate]);
 
   if (!isConfirmed && !eventTypeRaw?.requiresConfirmation) {
-    await handleConfirmation({ user, evt, prisma, bookingId: booking.id, booking, paid: true });
+    await handleConfirmation({
+      user: userWithCredentials,
+      evt,
+      prisma,
+      bookingId: booking.id,
+      booking,
+      paid: true,
+    });
   } else {
     await sendScheduledEmails({ ...evt });
   }
@@ -276,14 +284,32 @@ const handleSetupSuccess = async (event: Stripe.Event) => {
 
   if (!payment?.data || !payment?.id) throw new HttpCode({ statusCode: 204, message: "Payment not found" });
 
-  const { booking, user, evt, eventTypeRaw } = await getBooking(payment.bookingId);
+  const { user, evt, eventTypeRaw } = await getBooking(payment.bookingId);
 
   const bookingData: Prisma.BookingUpdateInput = {
     paid: true,
   };
 
+  const userWithCredentials = await prisma.user.findUnique({
+    where: {
+      id: user.id,
+    },
+    select: {
+      id: true,
+      username: true,
+      timeZone: true,
+      email: true,
+      name: true,
+      locale: true,
+      destinationCalendar: true,
+      credentials: true,
+    },
+  });
+
+  if (!userWithCredentials) throw new HttpCode({ statusCode: 204, message: "No user found" });
+
   if (!eventTypeRaw?.requiresConfirmation) {
-    const eventManager = new EventManager(user);
+    const eventManager = new EventManager(userWithCredentials);
     const scheduleResult = await eventManager.create(evt);
     bookingData.references = { create: scheduleResult.referencesToCreate };
     bookingData.status = BookingStatus.ACCEPTED;
diff --git a/packages/features/ee/payments/components/Payment.tsx b/packages/features/ee/payments/components/Payment.tsx
index a81f5e7fc8..52147577f6 100644
--- a/packages/features/ee/payments/components/Payment.tsx
+++ b/packages/features/ee/payments/components/Payment.tsx
@@ -57,19 +57,17 @@ const PaymentForm = (props: Props) => {
       email: router.query.email,
     };
     if (paymentOption === "HOLD" && "setupIntent" in props.payment.data) {
-      const setupIntentData = props.payment.data as unknown as StripeSetupIntentData;
       payload = await stripe.confirmSetup({
         elements,
         confirmParams: {
-          return_url: `${CAL_URL}/booking/${props.bookingUid}`,
+          return_url: props.eventType.successRedirectUrl || `${CAL_URL}/booking/${props.bookingUid}`,
         },
       });
     } else if (paymentOption === "ON_BOOKING") {
-      const paymentData = props.payment.data as unknown as StripePaymentData;
       payload = await stripe.confirmPayment({
         elements,
         confirmParams: {
-          return_url: `${CAL_URL}/booking/${props.bookingUid}`,
+          return_url: props.eventType.successRedirectUrl || `${CAL_URL}/booking/${props.bookingUid}`,
         },
       });
     }
diff --git a/packages/features/ee/payments/components/PaymentPage.tsx b/packages/features/ee/payments/components/PaymentPage.tsx
index d551d16b56..62c73cddd2 100644
--- a/packages/features/ee/payments/components/PaymentPage.tsx
+++ b/packages/features/ee/payments/components/PaymentPage.tsx
@@ -2,7 +2,6 @@ import classNames from "classnames";
 import Head from "next/head";
 import type { FC } from "react";
 import { useEffect, useState } from "react";
-import { FormattedNumber, IntlProvider } from "react-intl";
 
 import { getSuccessPageLocationMessage } from "@calcom/app-store/locations";
 import dayjs from "@calcom/dayjs";
@@ -19,7 +18,7 @@ import type { PaymentPageProps } from "../pages/payment";
 import PaymentComponent from "./Payment";
 
 const PaymentPage: FC<PaymentPageProps> = (props) => {
-  const { t } = useLocale();
+  const { t, i18n } = useLocale();
   const [is24h, setIs24h] = useState(isBrowserLocale24h());
   const [date, setDate] = useState(dayjs.utc(props.booking.startTime));
   const [timezone, setTimezone] = useState<string | null>(null);
@@ -107,13 +106,10 @@ const PaymentPage: FC<PaymentPageProps> = (props) => {
                         {props.payment.paymentOption === "HOLD" ? t("no_show_fee") : t("price")}
                       </div>
                       <div className="col-span-2 mb-6 font-semibold">
-                        <IntlProvider locale="en">
-                          <FormattedNumber
-                            value={paymentAppData.price / 100.0}
-                            style="currency"
-                            currency={paymentAppData?.currency?.toUpperCase()}
-                          />
-                        </IntlProvider>
+                        {new Intl.NumberFormat(i18n.language, {
+                          style: "currency",
+                          currency: paymentAppData.currency,
+                        }).format(paymentAppData.price / 100.0)}
                       </div>
                     </div>
                   </div>
diff --git a/packages/features/ee/sso/components/SSOConfiguration.tsx b/packages/features/ee/sso/components/SSOConfiguration.tsx
index abf0530c35..a214967d54 100644
--- a/packages/features/ee/sso/components/SSOConfiguration.tsx
+++ b/packages/features/ee/sso/components/SSOConfiguration.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 
 import ConnectionInfo from "@calcom/ee/sso/components/ConnectionInfo";
-import LicenseRequired from "@calcom/features/ee/common/components/v2/LicenseRequired";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import OIDCConnection from "@calcom/features/ee/sso/components/OIDCConnection";
 import SAMLConnection from "@calcom/features/ee/sso/components/SAMLConnection";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
diff --git a/packages/features/ee/support/components/HelpMenuItem.tsx b/packages/features/ee/support/components/HelpMenuItem.tsx
index 7bcdf66e4c..98b2b378aa 100644
--- a/packages/features/ee/support/components/HelpMenuItem.tsx
+++ b/packages/features/ee/support/components/HelpMenuItem.tsx
@@ -187,12 +187,12 @@ export default function HelpMenuItem({ onHelpItemSelect }: HelpMenuItemProps) {
         <p className="">{t("specific_issue")}</p>
         <button
           className="hover:text-emphasis text-defualt font-medium underline"
-          onClick={() => {
+          onClick={async () => {
             setActive(true);
             if (isFreshChatEnabled) {
               setFreshChat(true);
             } else if (isInterComEnabled) {
-              open();
+              await open();
             } else {
               loadChat({ open: true });
             }
diff --git a/packages/features/ee/support/lib/intercom/IntercomMenuItem.tsx b/packages/features/ee/support/lib/intercom/IntercomMenuItem.tsx
index feb45efaad..ee8348fd68 100644
--- a/packages/features/ee/support/lib/intercom/IntercomMenuItem.tsx
+++ b/packages/features/ee/support/lib/intercom/IntercomMenuItem.tsx
@@ -15,8 +15,8 @@ export default function IntercomMenuItem(props: IntercomMenuItemProps) {
 
   return (
     <button
-      onClick={() => {
-        open();
+      onClick={async () => {
+        await open();
         onHelpItemSelect();
       }}
       className="hover:bg-subtle hover:text-emphasis text-default flex w-full px-5 py-2 pr-4 text-sm font-medium">
diff --git a/packages/features/ee/support/lib/intercom/useIntercom.ts b/packages/features/ee/support/lib/intercom/useIntercom.ts
index 87d8e3b84c..bbf6391f37 100644
--- a/packages/features/ee/support/lib/intercom/useIntercom.ts
+++ b/packages/features/ee/support/lib/intercom/useIntercom.ts
@@ -25,12 +25,21 @@ export const useIntercom = () => {
   const { hasPaidPlan } = useHasPaidPlan();
   const { hasTeamPlan } = useHasTeamPlan();
 
-  const open = () => {
+  const open = async () => {
+    let userHash;
+
+    const req = await fetch(`/api/intercom-hash`);
+    const res = await req.json();
+    if (res?.hash) {
+      userHash = res.hash;
+    }
+
     hookData.boot({
       name: data?.name ?? "",
       email: data?.email,
       userId: String(data?.id),
       createdAt: String(dayjs(data?.createdDate).unix()),
+      ...(userHash && { userHash }),
       customAttributes: {
         //keys should be snake cased
         user_name: data?.username,
diff --git a/packages/features/ee/teams/components/AddNewTeamMembers.tsx b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
index d55d9044cc..f83836c074 100644
--- a/packages/features/ee/teams/components/AddNewTeamMembers.tsx
+++ b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
@@ -103,6 +103,7 @@ export const AddNewTeamMembersForm = ({
       <hr className="border-subtle my-6" />
       <Button
         EndIcon={ArrowRight}
+        color="primary"
         className="mt-6 w-full justify-center"
         disabled={publishTeamMutation.isLoading}
         onClick={() => {
@@ -118,7 +119,7 @@ export default AddNewTeamMembers;
 
 const AddNewTeamMemberSkeleton = () => {
   return (
-    <SkeletonContainer className="rounded-md border">
+    <SkeletonContainer className="border-subtle rounded-md border">
       <div className="flex w-full justify-between p-4">
         <div>
           <p className="text-emphasis text-sm font-medium">
diff --git a/packages/features/ee/teams/components/MemberListItem.tsx b/packages/features/ee/teams/components/MemberListItem.tsx
index 4e234a4bdf..b94bba4353 100644
--- a/packages/features/ee/teams/components/MemberListItem.tsx
+++ b/packages/features/ee/teams/components/MemberListItem.tsx
@@ -29,8 +29,8 @@ import {
 import { ExternalLink, MoreHorizontal, Edit2, Lock, Trash } from "@calcom/ui/components/icon";
 
 import MemberChangeRoleModal from "./MemberChangeRoleModal";
+import TeamAvailabilityModal from "./TeamAvailabilityModal";
 import TeamPill, { TeamRole } from "./TeamPill";
-import TeamAvailabilityModal from "./v2/TeamAvailabilityModal";
 
 interface Props {
   team: RouterOutputs["viewer"]["teams"]["get"];
diff --git a/packages/features/ee/teams/components/v2/SkeletonLoaderAvailabilityTimes.tsx b/packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
similarity index 100%
rename from packages/features/ee/teams/components/v2/SkeletonLoaderAvailabilityTimes.tsx
rename to packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
diff --git a/packages/features/ee/teams/components/TeamAvailabilityModal.tsx b/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
index bd680bd9d8..a4522a6ba1 100644
--- a/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
+++ b/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
@@ -1,13 +1,14 @@
 import { useEffect, useState } from "react";
 
 import dayjs from "@calcom/dayjs";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { WEBAPP_URL } from "@calcom/lib/constants";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import type { ITimezone } from "@calcom/ui";
-import { Avatar, DatePickerField as DatePicker, Select, TimezoneSelect } from "@calcom/ui";
+import { Avatar, DatePicker, Label, Select, TimezoneSelect } from "@calcom/ui";
 
-import LicenseRequired from "../../common/components/LicenseRequired";
 import TeamAvailabilityTimes from "./TeamAvailabilityTimes";
 
 interface Props {
@@ -21,6 +22,9 @@ export default function TeamAvailabilityModal(props: Props) {
   const [selectedTimeZone, setSelectedTimeZone] = useState<ITimezone>(
     localStorage.getItem("timeOption.preferredTimeZone") || dayjs.tz.guess()
   );
+
+  const { t } = useLocale();
+
   const [frequency, setFrequency] = useState<15 | 30 | 60>(30);
 
   useEffect(() => {
@@ -29,66 +33,71 @@ export default function TeamAvailabilityModal(props: Props) {
 
   return (
     <LicenseRequired>
-      <div className="flex max-h-[500px] min-h-[500px] flex-row  space-x-8 rtl:space-x-reverse">
-        <div className="min-w-64 w-64 space-y-5 p-5 pr-0">
-          <div className="flex">
-            <Avatar
-              size="sm"
-              imageSrc={WEBAPP_URL + "/" + props.member?.username + "/avatar.png"}
-              alt={props.member?.name || ""}
-              className="h-14 w-14 rounded-full"
-            />
-            <div className="ms-3 inline-block pt-1">
-              <span className="text-default text-lg font-bold">{props.member?.name}</span>
-              <span className="text-muted -mt-1 block text-sm">{props.member?.email}</span>
+      <>
+        <div className="grid h-[400px] grid-cols-2 space-x-11 rtl:space-x-reverse">
+          <div className="col-span-1">
+            <div className="flex">
+              <Avatar
+                size="md"
+                imageSrc={WEBAPP_URL + "/" + props.member?.username + "/avatar.png"}
+                alt={props.member?.name || ""}
+              />
+              <div className="flex items-center justify-center ">
+                <span className="text-subtle ml-2 text-base font-semibold leading-4">
+                  {props.member?.name}
+                </span>
+              </div>
+            </div>
+            <div>
+              <div className="text-brand-900 mt-4 mb-5 text-2xl font-semibold">{t("availability")}</div>
+              <DatePicker
+                minDate={new Date()}
+                date={selectedDate.toDate() || dayjs().toDate()}
+                onDatesChange={(newDate) => {
+                  setSelectedDate(dayjs(newDate));
+                }}
+              />
+
+              <Label className="mt-4">{t("timezone")}</Label>
+              <TimezoneSelect
+                id="timeZone"
+                autoFocus
+                value={selectedTimeZone}
+                className="w-64 rounded-md"
+                onChange={(timezone) => setSelectedTimeZone(timezone.value)}
+                classNamePrefix="react-select"
+              />
+            </div>
+            <div className="mt-3">
+              <Label>{t("slot_length")}</Label>
+              <Select
+                options={[
+                  { value: 15, label: "15 minutes" },
+                  { value: 30, label: "30 minutes" },
+                  { value: 60, label: "60 minutes" },
+                ]}
+                isSearchable={false}
+                classNamePrefix="react-select"
+                className="w-64"
+                value={{ value: frequency, label: `${frequency} minutes` }}
+                onChange={(newFrequency) => setFrequency(newFrequency?.value ?? 30)}
+              />
             </div>
           </div>
-          <div className="flex flex-col">
-            <span className="text-default font-bold">Date</span>
-            <DatePicker
-              date={selectedDate.toDate()}
-              onDatesChange={(newDate) => {
-                setSelectedDate(dayjs(newDate));
-              }}
-            />
-          </div>
-          <div>
-            <span className="text-default font-bold">Timezone</span>
-            <TimezoneSelect
-              id="timeZone"
-              value={selectedTimeZone}
-              onChange={(timezone) => setSelectedTimeZone(timezone.value)}
-              classNamePrefix="react-select"
-              className="react-select-container border-default mt-1 block w-full rounded-sm border text-sm focus:border-neutral-800 focus:ring-neutral-800"
-            />
-          </div>
-          <div>
-            <span className="text-default font-bold">Slot Length</span>
-            <Select
-              options={[
-                { value: 15, label: "15 minutes" },
-                { value: 30, label: "30 minutes" },
-                { value: 60, label: "60 minutes" },
-              ]}
-              isSearchable={false}
-              classNamePrefix="react-select"
-              className="react-select-container focus:ring-primary-500 focus:border-primary-500 border-default block w-full min-w-0 flex-1 rounded-sm border text-sm"
-              value={{ value: frequency, label: `${frequency} minutes` }}
-              onChange={(newFrequency) => setFrequency(newFrequency?.value ?? 30)}
-            />
+
+          <div className="col-span-1 max-h-[500px]">
+            {props.team && props.member && (
+              <TeamAvailabilityTimes
+                teamId={props.team.id}
+                memberId={props.member.id}
+                frequency={frequency}
+                selectedDate={selectedDate}
+                selectedTimeZone={selectedTimeZone}
+              />
+            )}
           </div>
         </div>
-        {props.team && props.member && (
-          <TeamAvailabilityTimes
-            className="overflow-scroll"
-            teamId={props.team.id}
-            memberId={props.member.id}
-            frequency={frequency}
-            selectedDate={selectedDate}
-            selectedTimeZone={selectedTimeZone}
-          />
-        )}
-      </div>
+      </>
     </LicenseRequired>
   );
 }
diff --git a/packages/features/ee/teams/components/TeamAvailabilityScreen.tsx b/packages/features/ee/teams/components/TeamAvailabilityScreen.tsx
deleted file mode 100644
index e33fb661a1..0000000000
--- a/packages/features/ee/teams/components/TeamAvailabilityScreen.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import type { CSSProperties } from "react";
-import { useEffect, useState } from "react";
-import AutoSizer from "react-virtualized-auto-sizer";
-import { FixedSizeList as List } from "react-window";
-
-import dayjs from "@calcom/dayjs";
-import { CAL_URL } from "@calcom/lib/constants";
-import type { RouterOutputs } from "@calcom/trpc/react";
-import { trpc } from "@calcom/trpc/react";
-import type { ITimezone } from "@calcom/ui";
-import { Avatar, DatePickerField as DatePicker, Select, TimezoneSelect } from "@calcom/ui";
-
-import TeamAvailabilityTimes from "./TeamAvailabilityTimes";
-
-interface Props {
-  team?: RouterOutputs["viewer"]["teams"]["get"];
-}
-
-export default function TeamAvailabilityScreen(props: Props) {
-  const utils = trpc.useContext();
-  const [selectedDate, setSelectedDate] = useState(dayjs());
-  const [selectedTimeZone, setSelectedTimeZone] = useState<ITimezone>(
-    localStorage.getItem("timeOption.preferredTimeZone") || dayjs.tz.guess()
-  );
-  const [frequency, setFrequency] = useState<15 | 30 | 60>(30);
-
-  useEffect(() => {
-    utils.viewer.teams.getMemberAvailability.invalidate();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedTimeZone, selectedDate]);
-
-  const Item = ({ index, style }: { index: number; style: CSSProperties }) => {
-    const member = props.team?.members?.[index];
-    if (!member) return <></>;
-
-    return (
-      <div key={member.id} style={style} className="border-subtle flex border-r pl-4 ">
-        <TeamAvailabilityTimes
-          teamId={props.team?.id as number}
-          memberId={member.id}
-          frequency={frequency}
-          selectedDate={selectedDate}
-          selectedTimeZone={selectedTimeZone}
-          HeaderComponent={
-            <div className="mb-6 flex items-center">
-              <Avatar
-                size="sm"
-                imageSrc={CAL_URL + "/" + member.username + "/avatar.png"}
-                alt={member?.name || ""}
-                className="min-w-10 min-h-10 mt-1 h-10 w-10 rounded-full"
-              />
-              <div className="ms-3 inline-block overflow-hidden pt-1">
-                <span className="text-default truncate text-lg font-bold">{member?.name}</span>
-                <span className="text-muted -mt-1 block truncate text-sm">{member?.email}</span>
-              </div>
-            </div>
-          }
-        />
-      </div>
-    );
-  };
-
-  return (
-    <div className="bg-default flex flex-1 flex-col rounded-sm border border-neutral-200">
-      <div className="border-subtle flex w-full space-x-5 border-b p-4 rtl:space-x-reverse">
-        <div className="flex flex-col">
-          <span className="text-default text-sm font-medium">Date</span>
-          <DatePicker
-            date={selectedDate.toDate()}
-            className="p-1.5"
-            onDatesChange={(newDate) => {
-              setSelectedDate(dayjs(newDate));
-            }}
-          />
-        </div>
-        <div className="flex flex-col">
-          <span className="text-default text-sm font-medium">Timezone</span>
-          <TimezoneSelect
-            id="timeZone"
-            value={selectedTimeZone}
-            onChange={(timezone) => setSelectedTimeZone(timezone.value)}
-            classNamePrefix="react-select"
-            className="react-select-container border-default w-full rounded-sm border text-sm"
-          />
-        </div>
-        <div className="hidden sm:block">
-          <span className="text-default text-sm font-medium">Slot Length</span>
-          <Select
-            options={[
-              { value: 15, label: "15 minutes" },
-              { value: 30, label: "30 minutes" },
-              { value: 60, label: "60 minutes" },
-            ]}
-            isSearchable={false}
-            className="border-default block w-full min-w-0 flex-1 rounded-sm border text-sm"
-            value={{ value: frequency, label: `${frequency} minutes` }}
-            onChange={(newFrequency) => setFrequency(newFrequency?.value ?? 30)}
-          />
-        </div>
-      </div>
-      <div className="flex h-full flex-1">
-        <AutoSizer>
-          {({ height, width }) => (
-            <List
-              itemSize={240}
-              itemCount={props.team?.members?.length ?? 0}
-              className="List"
-              height={height}
-              layout="horizontal"
-              width={width}>
-              {Item}
-            </List>
-          )}
-        </AutoSizer>
-      </div>
-    </div>
-  );
-}
diff --git a/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx b/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx
index 974f1b594d..e46e555ec7 100644
--- a/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx
+++ b/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx
@@ -3,9 +3,11 @@ import React from "react";
 import type { ITimezone } from "react-timezone-select";
 
 import type { Dayjs } from "@calcom/dayjs";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import getSlots from "@calcom/lib/slots";
 import { trpc } from "@calcom/trpc/react";
-import { Loader } from "@calcom/ui";
+
+import SkeletonLoader from "./SkeletonLoaderAvailabilityTimes";
 
 interface Props {
   teamId: number;
@@ -18,6 +20,8 @@ interface Props {
 }
 
 export default function TeamAvailabilityTimes(props: Props) {
+  const { t } = useLocale();
+
   const { data, isLoading } = trpc.viewer.teams.getMemberAvailability.useQuery(
     {
       teamId: props.teamId,
@@ -38,27 +42,32 @@ export default function TeamAvailabilityTimes(props: Props) {
         workingHours: data?.workingHours || [],
         minimumBookingNotice: 0,
         eventLength: props.frequency,
+        organizerTimeZone: `${data?.timeZone}`,
       })
     : [];
 
   return (
-    <div className={classNames("min-w-60 flex-grow p-5 pl-0", props.className)}>
+    <div className={classNames("min-w-60 flex-grow pl-0", props.className)}>
       {props.HeaderComponent}
-      {isLoading && slots.length === 0 && <Loader />}
-      {!isLoading && slots.length === 0 && (
+      {isLoading && slots.length === 0 && <SkeletonLoader />}
+      {!isLoading && slots.length === 0 ? (
         <div className="flex flex-col items-center justify-center pt-4">
-          <span className="text-subtle text-sm">No Available Slots</span>
+          <span className="text-subtle text-sm">{t("no_available_slots")}</span>
         </div>
+      ) : (
+        <>{!isLoading && <p className="text-default mb-3 text-sm">{t("time_available")}</p>}</>
       )}
-      {slots.map((slot) => (
-        <div key={slot.time.format()} className="flex flex-row items-center">
-          <a
-            className="min-w-48 border-brand-default text-bookingdarker hover:bg-brand hover:text-brandcontrast dark:hover:bg-darkmodebrand dark:hover:text-darkmodebrandcontrast  bg-default dark:hover:text-inverted mb-2 mr-3 block flex-grow rounded-sm border py-2 text-center font-medium dark:border-transparent dark:bg-gray-600 dark:hover:border-black dark:hover:bg-black"
-            data-testid="time">
-            {slot.time.format("HH:mm")}
-          </a>
-        </div>
-      ))}
+      <div className="max-h-[390px] overflow-scroll">
+        {slots.map((slot) => (
+          <div key={slot.time.format()} className="flex flex-row items-center ">
+            <a
+              className="min-w-48 border-brand-default text-bookingdarker  bg-default mb-2 mr-3 block flex-grow rounded-md border py-2 text-center font-medium dark:border-transparent dark:bg-gray-600 "
+              data-testid="time">
+              {slot.time.tz(props.selectedTimeZone.toString()).format("HH:mm")}
+            </a>
+          </div>
+        ))}
+      </div>
     </div>
   );
 }
diff --git a/packages/features/ee/teams/components/TeamListItem.tsx b/packages/features/ee/teams/components/TeamListItem.tsx
index 819e24973d..9b0bd92f7d 100644
--- a/packages/features/ee/teams/components/TeamListItem.tsx
+++ b/packages/features/ee/teams/components/TeamListItem.tsx
@@ -105,7 +105,7 @@ export default function TeamListItem(props: Props) {
         alt="Team Logo"
         className="inline-flex justify-center"
       />
-      <div className="ms-3 inline-block">
+      <div className="ms-3 inline-block truncate">
         <span className="text-default text-sm font-bold">{team.name}</span>
         <span className="text-muted block text-xs">
           {team.slug ? `${process.env.NEXT_PUBLIC_WEBSITE_URL}/team/${team.slug}` : "Unpublished team"}
diff --git a/packages/features/ee/teams/components/TeamsListing.tsx b/packages/features/ee/teams/components/TeamsListing.tsx
index 3c595e619c..9db1b93e05 100644
--- a/packages/features/ee/teams/components/TeamsListing.tsx
+++ b/packages/features/ee/teams/components/TeamsListing.tsx
@@ -65,6 +65,13 @@ export function TeamsListing() {
     <>
       {!!errorMessage && <Alert severity="error" title={errorMessage} />}
 
+      {invites.length > 0 && (
+        <div className="bg-subtle mb-6 rounded-md p-5">
+          <Label className=" text-emphasis pb-2 font-semibold">{t("pending_invites")}</Label>
+          <TeamList teams={invites} pending />
+        </div>
+      )}
+
       <UpgradeTip
         title="calcom_is_better_with_team"
         description="add_your_team_members"
@@ -82,15 +89,7 @@ export function TeamsListing() {
             </ButtonGroup>
           </div>
         }>
-        <>
-          {invites.length > 0 && (
-            <div className="bg-subtle mb-6 rounded-md p-5">
-              <Label className=" text-emphasis pb-2 font-semibold">{t("pending_invites")}</Label>
-              <TeamList teams={invites} pending />
-            </div>
-          )}
-          {teams.length > 0 && <TeamList teams={teams} />}
-        </>
+        {teams.length > 0 ? <TeamList teams={teams} /> : <></>}
       </UpgradeTip>
     </>
   );
diff --git a/packages/features/ee/teams/components/v2/TeamAvailabilityModal.tsx b/packages/features/ee/teams/components/v2/TeamAvailabilityModal.tsx
deleted file mode 100644
index 16de424af3..0000000000
--- a/packages/features/ee/teams/components/v2/TeamAvailabilityModal.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useEffect, useState } from "react";
-
-import dayjs from "@calcom/dayjs";
-import { WEBAPP_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { RouterOutputs } from "@calcom/trpc/react";
-import { trpc } from "@calcom/trpc/react";
-import type { ITimezone } from "@calcom/ui";
-import { Avatar, DatePicker, Label, Select, TimezoneSelect } from "@calcom/ui";
-
-import LicenseRequired from "../../../common/components/LicenseRequired";
-import TeamAvailabilityTimes from "./TeamAvailabilityTimes";
-
-interface Props {
-  team?: RouterOutputs["viewer"]["teams"]["get"];
-  member?: RouterOutputs["viewer"]["teams"]["get"]["members"][number];
-}
-
-export default function TeamAvailabilityModal(props: Props) {
-  const utils = trpc.useContext();
-  const [selectedDate, setSelectedDate] = useState(dayjs());
-  const [selectedTimeZone, setSelectedTimeZone] = useState<ITimezone>(
-    localStorage.getItem("timeOption.preferredTimeZone") || dayjs.tz.guess()
-  );
-
-  const { t } = useLocale();
-
-  const [frequency, setFrequency] = useState<15 | 30 | 60>(30);
-
-  useEffect(() => {
-    utils.viewer.teams.getMemberAvailability.invalidate();
-  }, [utils, selectedTimeZone, selectedDate]);
-
-  return (
-    <LicenseRequired>
-      <>
-        <div className="grid h-[400px] grid-cols-2 space-x-11 rtl:space-x-reverse">
-          <div className="col-span-1">
-            <div className="flex">
-              <Avatar
-                size="md"
-                imageSrc={WEBAPP_URL + "/" + props.member?.username + "/avatar.png"}
-                alt={props.member?.name || ""}
-              />
-              <div className="flex items-center justify-center ">
-                <span className="text-subtle ml-2 text-base font-semibold leading-4">
-                  {props.member?.name}
-                </span>
-              </div>
-            </div>
-            <div>
-              <div className="text-brand-900 mt-4 mb-5 text-2xl font-semibold">{t("availability")}</div>
-              <DatePicker
-                minDate={new Date()}
-                date={selectedDate.toDate() || dayjs().toDate()}
-                onDatesChange={(newDate) => {
-                  setSelectedDate(dayjs(newDate));
-                }}
-              />
-
-              <Label className="mt-4">{t("timezone")}</Label>
-              <TimezoneSelect
-                id="timeZone"
-                autoFocus
-                value={selectedTimeZone}
-                className="w-64 rounded-md"
-                onChange={(timezone) => setSelectedTimeZone(timezone.value)}
-                classNamePrefix="react-select"
-              />
-            </div>
-            <div className="mt-3">
-              <Label>{t("slot_length")}</Label>
-              <Select
-                options={[
-                  { value: 15, label: "15 minutes" },
-                  { value: 30, label: "30 minutes" },
-                  { value: 60, label: "60 minutes" },
-                ]}
-                isSearchable={false}
-                classNamePrefix="react-select"
-                className="w-64"
-                value={{ value: frequency, label: `${frequency} minutes` }}
-                onChange={(newFrequency) => setFrequency(newFrequency?.value ?? 30)}
-              />
-            </div>
-          </div>
-
-          <div className="col-span-1 max-h-[500px]">
-            {props.team && props.member && (
-              <TeamAvailabilityTimes
-                teamId={props.team.id}
-                memberId={props.member.id}
-                frequency={frequency}
-                selectedDate={selectedDate}
-                selectedTimeZone={selectedTimeZone}
-              />
-            )}
-          </div>
-        </div>
-      </>
-    </LicenseRequired>
-  );
-}
diff --git a/packages/features/ee/teams/components/v2/TeamAvailabilityScreen.tsx b/packages/features/ee/teams/components/v2/TeamAvailabilityScreen.tsx
deleted file mode 100644
index e33fb661a1..0000000000
--- a/packages/features/ee/teams/components/v2/TeamAvailabilityScreen.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import type { CSSProperties } from "react";
-import { useEffect, useState } from "react";
-import AutoSizer from "react-virtualized-auto-sizer";
-import { FixedSizeList as List } from "react-window";
-
-import dayjs from "@calcom/dayjs";
-import { CAL_URL } from "@calcom/lib/constants";
-import type { RouterOutputs } from "@calcom/trpc/react";
-import { trpc } from "@calcom/trpc/react";
-import type { ITimezone } from "@calcom/ui";
-import { Avatar, DatePickerField as DatePicker, Select, TimezoneSelect } from "@calcom/ui";
-
-import TeamAvailabilityTimes from "./TeamAvailabilityTimes";
-
-interface Props {
-  team?: RouterOutputs["viewer"]["teams"]["get"];
-}
-
-export default function TeamAvailabilityScreen(props: Props) {
-  const utils = trpc.useContext();
-  const [selectedDate, setSelectedDate] = useState(dayjs());
-  const [selectedTimeZone, setSelectedTimeZone] = useState<ITimezone>(
-    localStorage.getItem("timeOption.preferredTimeZone") || dayjs.tz.guess()
-  );
-  const [frequency, setFrequency] = useState<15 | 30 | 60>(30);
-
-  useEffect(() => {
-    utils.viewer.teams.getMemberAvailability.invalidate();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedTimeZone, selectedDate]);
-
-  const Item = ({ index, style }: { index: number; style: CSSProperties }) => {
-    const member = props.team?.members?.[index];
-    if (!member) return <></>;
-
-    return (
-      <div key={member.id} style={style} className="border-subtle flex border-r pl-4 ">
-        <TeamAvailabilityTimes
-          teamId={props.team?.id as number}
-          memberId={member.id}
-          frequency={frequency}
-          selectedDate={selectedDate}
-          selectedTimeZone={selectedTimeZone}
-          HeaderComponent={
-            <div className="mb-6 flex items-center">
-              <Avatar
-                size="sm"
-                imageSrc={CAL_URL + "/" + member.username + "/avatar.png"}
-                alt={member?.name || ""}
-                className="min-w-10 min-h-10 mt-1 h-10 w-10 rounded-full"
-              />
-              <div className="ms-3 inline-block overflow-hidden pt-1">
-                <span className="text-default truncate text-lg font-bold">{member?.name}</span>
-                <span className="text-muted -mt-1 block truncate text-sm">{member?.email}</span>
-              </div>
-            </div>
-          }
-        />
-      </div>
-    );
-  };
-
-  return (
-    <div className="bg-default flex flex-1 flex-col rounded-sm border border-neutral-200">
-      <div className="border-subtle flex w-full space-x-5 border-b p-4 rtl:space-x-reverse">
-        <div className="flex flex-col">
-          <span className="text-default text-sm font-medium">Date</span>
-          <DatePicker
-            date={selectedDate.toDate()}
-            className="p-1.5"
-            onDatesChange={(newDate) => {
-              setSelectedDate(dayjs(newDate));
-            }}
-          />
-        </div>
-        <div className="flex flex-col">
-          <span className="text-default text-sm font-medium">Timezone</span>
-          <TimezoneSelect
-            id="timeZone"
-            value={selectedTimeZone}
-            onChange={(timezone) => setSelectedTimeZone(timezone.value)}
-            classNamePrefix="react-select"
-            className="react-select-container border-default w-full rounded-sm border text-sm"
-          />
-        </div>
-        <div className="hidden sm:block">
-          <span className="text-default text-sm font-medium">Slot Length</span>
-          <Select
-            options={[
-              { value: 15, label: "15 minutes" },
-              { value: 30, label: "30 minutes" },
-              { value: 60, label: "60 minutes" },
-            ]}
-            isSearchable={false}
-            className="border-default block w-full min-w-0 flex-1 rounded-sm border text-sm"
-            value={{ value: frequency, label: `${frequency} minutes` }}
-            onChange={(newFrequency) => setFrequency(newFrequency?.value ?? 30)}
-          />
-        </div>
-      </div>
-      <div className="flex h-full flex-1">
-        <AutoSizer>
-          {({ height, width }) => (
-            <List
-              itemSize={240}
-              itemCount={props.team?.members?.length ?? 0}
-              className="List"
-              height={height}
-              layout="horizontal"
-              width={width}>
-              {Item}
-            </List>
-          )}
-        </AutoSizer>
-      </div>
-    </div>
-  );
-}
diff --git a/packages/features/ee/teams/components/v2/TeamAvailabilityTimes.tsx b/packages/features/ee/teams/components/v2/TeamAvailabilityTimes.tsx
deleted file mode 100644
index e46e555ec7..0000000000
--- a/packages/features/ee/teams/components/v2/TeamAvailabilityTimes.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import classNames from "classnames";
-import React from "react";
-import type { ITimezone } from "react-timezone-select";
-
-import type { Dayjs } from "@calcom/dayjs";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import getSlots from "@calcom/lib/slots";
-import { trpc } from "@calcom/trpc/react";
-
-import SkeletonLoader from "./SkeletonLoaderAvailabilityTimes";
-
-interface Props {
-  teamId: number;
-  memberId: number;
-  selectedDate: Dayjs;
-  selectedTimeZone: ITimezone;
-  frequency: number;
-  HeaderComponent?: React.ReactNode;
-  className?: string;
-}
-
-export default function TeamAvailabilityTimes(props: Props) {
-  const { t } = useLocale();
-
-  const { data, isLoading } = trpc.viewer.teams.getMemberAvailability.useQuery(
-    {
-      teamId: props.teamId,
-      memberId: props.memberId,
-      dateFrom: props.selectedDate.toString(),
-      dateTo: props.selectedDate.add(1, "day").toString(),
-      timezone: `${props.selectedTimeZone.toString()}`,
-    },
-    {
-      refetchOnWindowFocus: false,
-    }
-  );
-
-  const slots = !isLoading
-    ? getSlots({
-        frequency: props.frequency,
-        inviteeDate: props.selectedDate,
-        workingHours: data?.workingHours || [],
-        minimumBookingNotice: 0,
-        eventLength: props.frequency,
-        organizerTimeZone: `${data?.timeZone}`,
-      })
-    : [];
-
-  return (
-    <div className={classNames("min-w-60 flex-grow pl-0", props.className)}>
-      {props.HeaderComponent}
-      {isLoading && slots.length === 0 && <SkeletonLoader />}
-      {!isLoading && slots.length === 0 ? (
-        <div className="flex flex-col items-center justify-center pt-4">
-          <span className="text-subtle text-sm">{t("no_available_slots")}</span>
-        </div>
-      ) : (
-        <>{!isLoading && <p className="text-default mb-3 text-sm">{t("time_available")}</p>}</>
-      )}
-      <div className="max-h-[390px] overflow-scroll">
-        {slots.map((slot) => (
-          <div key={slot.time.format()} className="flex flex-row items-center ">
-            <a
-              className="min-w-48 border-brand-default text-bookingdarker  bg-default mb-2 mr-3 block flex-grow rounded-md border py-2 text-center font-medium dark:border-transparent dark:bg-gray-600 "
-              data-testid="time">
-              {slot.time.tz(props.selectedTimeZone.toString()).format("HH:mm")}
-            </a>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/packages/features/ee/teams/pages/availability.tsx b/packages/features/ee/teams/pages/availability.tsx
deleted file mode 100644
index 500d7d4e05..0000000000
--- a/packages/features/ee/teams/pages/availability.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useRouter } from "next/router";
-import { useMemo, useState } from "react";
-
-import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { trpc } from "@calcom/trpc/react";
-import { Alert, Avatar, Loader, Shell } from "@calcom/ui";
-
-import LicenseRequired from "../../common/components/LicenseRequired";
-import TeamAvailabilityScreen from "../components/TeamAvailabilityScreen";
-
-export function TeamAvailabilityPage() {
-  const router = useRouter();
-
-  const [errorMessage, setErrorMessage] = useState("");
-
-  const { data: team, isLoading } = trpc.viewer.teams.get.useQuery(
-    { teamId: Number(router.query.id) },
-    {
-      refetchOnWindowFocus: false,
-      onError: (e) => {
-        setErrorMessage(e.message);
-      },
-    }
-  );
-
-  // prevent unnecessary re-renders due to shell queries
-  const TeamAvailability = useMemo(() => {
-    return <TeamAvailabilityScreen team={team} />;
-  }, [team]);
-
-  return (
-    <Shell
-      backPath={!errorMessage ? `/settings/teams/${team?.id}` : undefined}
-      heading={team?.name}
-      flexChildrenContainer
-      subtitle={team && "Your team's availability at a glance"}
-      HeadingLeftIcon={
-        team && (
-          <Avatar
-            size="sm"
-            imageSrc={getPlaceholderAvatar(team?.logo, team?.name as string)}
-            alt="Team Logo"
-            className="mt-1"
-          />
-        )
-      }>
-      <LicenseRequired>
-        {!!errorMessage && <Alert className="-mt-24 border" severity="error" title={errorMessage} />}
-        {isLoading && <Loader />}
-        {TeamAvailability}
-      </LicenseRequired>
-    </Shell>
-  );
-}
-
-export default TeamAvailabilityPage;
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx
index acc88f1861..a1b6499619 100644
--- a/packages/features/ee/teams/pages/team-profile-view.tsx
+++ b/packages/features/ee/teams/pages/team-profile-view.tsx
@@ -4,6 +4,7 @@ import { MembershipRole } from "@prisma/client";
 import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { useRouter } from "next/router";
+import { useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 import { z } from "zod";
 
@@ -52,6 +53,7 @@ const ProfileView = () => {
   const router = useRouter();
   const utils = trpc.useContext();
   const session = useSession();
+  const [firstRender, setFirstRender] = useState(true);
 
   const mutation = trpc.viewer.teams.update.useMutation({
     onError: (err) => {
@@ -225,6 +227,8 @@ const ProfileView = () => {
                   setText={(value: string) => form.setValue("bio", turndown(value))}
                   excludedToolbarItems={["blockType"]}
                   disableLists
+                  firstRender={firstRender}
+                  setFirstRender={setFirstRender}
                 />
               </div>
               <p className="text-default mt-2 text-sm">{t("team_description")}</p>
diff --git a/packages/features/ee/users/components/UsersTable.tsx b/packages/features/ee/users/components/UsersTable.tsx
index 688bf0b2b5..984dcf406c 100644
--- a/packages/features/ee/users/components/UsersTable.tsx
+++ b/packages/features/ee/users/components/UsersTable.tsx
@@ -4,7 +4,7 @@ import { trpc } from "@calcom/trpc/react";
 import { Badge, ConfirmationDialogContent, Dialog, DropdownActions, showToast, Table } from "@calcom/ui";
 import { Edit, Trash } from "@calcom/ui/components/icon";
 
-import { withLicenseRequired } from "../../common/components/v2/LicenseRequired";
+import { withLicenseRequired } from "../../common/components/LicenseRequired";
 
 const { Body, Cell, ColumnTitle, Header, Row } = Table;
 
diff --git a/packages/features/ee/users/pages/users-add-view.tsx b/packages/features/ee/users/pages/users-add-view.tsx
index cce6458243..dedd817784 100644
--- a/packages/features/ee/users/pages/users-add-view.tsx
+++ b/packages/features/ee/users/pages/users-add-view.tsx
@@ -5,7 +5,7 @@ import { trpc } from "@calcom/trpc/react";
 import { Meta, showToast } from "@calcom/ui";
 
 import { getLayout } from "../../../settings/layouts/SettingsLayout";
-import LicenseRequired from "../../common/components/v2/LicenseRequired";
+import LicenseRequired from "../../common/components/LicenseRequired";
 import { UserForm } from "../components/UserForm";
 import { userBodySchema } from "../schemas/userBodySchema";
 
diff --git a/packages/features/ee/users/pages/users-edit-view.tsx b/packages/features/ee/users/pages/users-edit-view.tsx
index 438ee9bfe0..57a747956d 100644
--- a/packages/features/ee/users/pages/users-edit-view.tsx
+++ b/packages/features/ee/users/pages/users-edit-view.tsx
@@ -7,7 +7,7 @@ import { trpc } from "@calcom/trpc/react";
 import { Meta, showToast } from "@calcom/ui";
 
 import { getLayout } from "../../../settings/layouts/SettingsLayout";
-import LicenseRequired from "../../common/components/v2/LicenseRequired";
+import LicenseRequired from "../../common/components/LicenseRequired";
 import { UserForm } from "../components/UserForm";
 import { userBodySchema } from "../schemas/userBodySchema";
 
diff --git a/packages/features/ee/users/pages/users-listing-view.tsx b/packages/features/ee/users/pages/users-listing-view.tsx
index 7664995c0f..15dcb32021 100644
--- a/packages/features/ee/users/pages/users-listing-view.tsx
+++ b/packages/features/ee/users/pages/users-listing-view.tsx
@@ -2,7 +2,7 @@ import NoSSR from "@calcom/core/components/NoSSR";
 import { Button, Meta } from "@calcom/ui";
 
 import { getLayout } from "../../../settings/layouts/SettingsLayout";
-import LicenseRequired from "../../common/components/v2/LicenseRequired";
+import LicenseRequired from "../../common/components/LicenseRequired";
 import { UsersTable } from "../components/UsersTable";
 
 const DeploymentUsersListPage = () => {
diff --git a/packages/features/ee/video/ViewRecordingsDialog.tsx b/packages/features/ee/video/ViewRecordingsDialog.tsx
index eaa284bd96..1fa86ccbb1 100644
--- a/packages/features/ee/video/ViewRecordingsDialog.tsx
+++ b/packages/features/ee/video/ViewRecordingsDialog.tsx
@@ -1,7 +1,7 @@
 import { useState, Suspense } from "react";
 
 import dayjs from "@calcom/dayjs";
-import LicenseRequired from "@calcom/features/ee/common/components/v2/LicenseRequired";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import useHasPaidPlan from "@calcom/lib/hooks/useHasPaidPlan";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { RecordingItemSchema } from "@calcom/prisma/zod-utils";
diff --git a/packages/features/ee/workflows/api/scheduleEmailReminders.ts b/packages/features/ee/workflows/api/scheduleEmailReminders.ts
index ffe0f7a61d..c0b26a54c7 100644
--- a/packages/features/ee/workflows/api/scheduleEmailReminders.ts
+++ b/packages/features/ee/workflows/api/scheduleEmailReminders.ts
@@ -5,6 +5,7 @@ import sgMail from "@sendgrid/mail";
 import type { NextApiRequest, NextApiResponse } from "next";
 
 import dayjs from "@calcom/dayjs";
+import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { defaultHandler } from "@calcom/lib/server";
 import prisma from "@calcom/prisma";
 import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
@@ -164,51 +165,63 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
       let emailContent = {
         emailSubject: reminder.workflowStep.emailSubject || "",
-        emailBody: {
-          text: reminder.workflowStep.reminderBody || "",
-          html: `<body style="white-space: pre-wrap;">${reminder.workflowStep.reminderBody || ""}</body>`,
-        },
+        emailBody: `<body style="white-space: pre-wrap;">${reminder.workflowStep.reminderBody || ""}</body>`,
       };
 
-      switch (reminder.workflowStep.template) {
-        case WorkflowTemplates.REMINDER:
-          emailContent = emailReminderTemplate(
-            reminder.booking.startTime.toISOString() || "",
-            reminder.booking.endTime.toISOString() || "",
-            reminder.booking.eventType?.title || "",
-            timeZone || "",
-            attendeeName || "",
-            name || ""
-          );
-          break;
-        case WorkflowTemplates.CUSTOM:
-          const variables: VariablesType = {
-            eventName: reminder.booking?.eventType?.title || "",
-            organizerName: reminder.booking.user?.name || "",
-            attendeeName: reminder.booking.attendees[0].name,
-            attendeeEmail: reminder.booking.attendees[0].email,
-            eventDate: dayjs(reminder.booking.startTime).tz(timeZone),
-            eventTime: dayjs(reminder.booking.startTime).tz(timeZone),
-            timeZone: timeZone,
-            location: reminder.booking.location || "",
-            additionalNotes: reminder.booking.description,
-            responses: reminder.booking.responses,
-            meetingUrl: bookingMetadataSchema.parse(reminder.booking.metadata || {})?.videoCallUrl,
-          };
-          const emailSubject = await customTemplate(
-            reminder.workflowStep.emailSubject || "",
-            variables,
-            locale || ""
-          );
-          emailContent.emailSubject = emailSubject.text;
-          emailContent.emailBody = await customTemplate(
-            reminder.workflowStep.reminderBody || "",
-            variables,
-            locale || ""
-          );
-          break;
+      let emailBodyEmpty = false;
+
+      if (reminder.workflowStep.reminderBody) {
+        const { responses } = getCalEventResponses({
+          bookingFields: reminder.booking.eventType?.bookingFields ?? null,
+          booking: reminder.booking,
+        });
+
+        const variables: VariablesType = {
+          eventName: reminder.booking.eventType?.title || "",
+          organizerName: reminder.booking.user?.name || "",
+          attendeeName: reminder.booking.attendees[0].name,
+          attendeeEmail: reminder.booking.attendees[0].email,
+          eventDate: dayjs(reminder.booking.startTime).tz(timeZone),
+          eventEndTime: dayjs(reminder.booking?.endTime).tz(timeZone),
+          timeZone: timeZone,
+          location: reminder.booking.location || "",
+          additionalNotes: reminder.booking.description,
+          responses: responses,
+          meetingUrl: bookingMetadataSchema.parse(reminder.booking.metadata || {})?.videoCallUrl,
+          cancelLink: `/booking/${reminder.booking.uid}?cancel=true`,
+          rescheduleLink: `/${reminder.booking.user?.username}/${reminder.booking.eventType?.slug}?rescheduleUid=${reminder.booking.uid}`,
+        };
+        const emailSubject = customTemplate(
+          reminder.workflowStep.emailSubject || "",
+          variables,
+          locale || "",
+          !!reminder.booking.user?.hideBranding
+        ).text;
+        emailContent.emailSubject = emailSubject;
+        emailContent.emailBody = customTemplate(
+          reminder.workflowStep.reminderBody || "",
+          variables,
+          locale || "",
+          !!reminder.booking.user?.hideBranding
+        ).html;
+
+        emailBodyEmpty =
+          customTemplate(reminder.workflowStep.reminderBody || "", variables, locale || "").text.length === 0;
+      } else if (reminder.workflowStep.template === WorkflowTemplates.REMINDER) {
+        emailContent = emailReminderTemplate(
+          false,
+          reminder.workflowStep.action,
+          reminder.booking.startTime.toISOString() || "",
+          reminder.booking.endTime.toISOString() || "",
+          reminder.booking.eventType?.title || "",
+          timeZone || "",
+          attendeeName || "",
+          name || "",
+          !!reminder.booking.user?.hideBranding
+        );
       }
-      if (emailContent.emailSubject.length > 0 && emailContent.emailBody.text.length > 0 && sendTo) {
+
+      if (emailContent.emailSubject.length > 0 && !emailBodyEmpty && sendTo) {
         const batchIdResponse = await client.request({
           url: "/v3/mail/batch",
           method: "POST",
@@ -224,8 +237,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
               name: reminder.workflowStep.sender || "Cal.com",
             },
             subject: emailContent.emailSubject,
-            text: emailContent.emailBody.text,
-            html: emailContent.emailBody.html,
+            html: emailContent.emailBody,
             batchId: batchId,
             sendAt: dayjs(reminder.scheduledDate).unix(),
             replyTo: reminder.booking.user?.email || senderEmail,
diff --git a/packages/features/ee/workflows/api/scheduleSMSReminders.ts b/packages/features/ee/workflows/api/scheduleSMSReminders.ts
index 3d1d0a5b07..46f6d0e1f9 100644
--- a/packages/features/ee/workflows/api/scheduleSMSReminders.ts
+++ b/packages/features/ee/workflows/api/scheduleSMSReminders.ts
@@ -3,6 +3,7 @@ import { WorkflowActions, WorkflowMethods, WorkflowTemplates } from "@prisma/cli
 import type { NextApiRequest, NextApiResponse } from "next";
 
 import dayjs from "@calcom/dayjs";
+import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { defaultHandler } from "@calcom/lib/server";
 import prisma from "@calcom/prisma";
 import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
@@ -87,38 +88,46 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
           : reminder.booking?.user?.locale;
 
       let message: string | null = reminder.workflowStep.reminderBody;
-      switch (reminder.workflowStep.template) {
-        case WorkflowTemplates.REMINDER:
-          message = smsReminderTemplate(
-            reminder.booking?.startTime.toISOString() || "",
-            reminder.booking?.eventType?.title || "",
-            timeZone || "",
-            attendeeName || "",
-            userName
-          );
-          break;
-        case WorkflowTemplates.CUSTOM:
-          const variables: VariablesType = {
-            eventName: reminder.booking?.eventType?.title,
-            organizerName: reminder.booking?.user?.name || "",
-            attendeeName: reminder.booking?.attendees[0].name,
-            attendeeEmail: reminder.booking?.attendees[0].email,
-            eventDate: dayjs(reminder.booking?.startTime).tz(timeZone),
-            eventTime: dayjs(reminder.booking?.startTime).tz(timeZone),
-            timeZone: timeZone,
-            location: reminder.booking?.location || "",
-            additionalNotes: reminder.booking?.description,
-            responses: reminder.booking?.responses,
-            meetingUrl: bookingMetadataSchema.parse(reminder.booking?.metadata || {})?.videoCallUrl,
-          };
-          const customMessage = await customTemplate(
-            reminder.workflowStep.reminderBody || "",
-            variables,
-            locale || ""
-          );
-          message = customMessage.text;
-          break;
+
+      if (reminder.workflowStep.reminderBody) {
+        const { responses } = getCalEventResponses({
+          bookingFields: reminder.booking.eventType?.bookingFields ?? null,
+          booking: reminder.booking,
+        });
+
+        const variables: VariablesType = {
+          eventName: reminder.booking?.eventType?.title,
+          organizerName: reminder.booking?.user?.name || "",
+          attendeeName: reminder.booking?.attendees[0].name,
+          attendeeEmail: reminder.booking?.attendees[0].email,
+          eventDate: dayjs(reminder.booking?.startTime).tz(timeZone),
+          eventEndTime: dayjs(reminder.booking?.endTime).tz(timeZone),
+          timeZone: timeZone,
+          location: reminder.booking?.location || "",
+          additionalNotes: reminder.booking?.description,
+          responses: responses,
+          meetingUrl: bookingMetadataSchema.parse(reminder.booking?.metadata || {})?.videoCallUrl,
+          cancelLink: `/booking/${reminder.booking.uid}?cancel=true`,
+          rescheduleLink: `/${reminder.booking.user?.username}/${reminder.booking.eventType?.slug}?rescheduleUid=${reminder.booking.uid}`,
+        };
+        const customMessage = customTemplate(
+          reminder.workflowStep.reminderBody || "",
+          variables,
+          locale || ""
+        );
+        message = customMessage.text;
+      } else if (reminder.workflowStep.template === WorkflowTemplates.REMINDER) {
+        message = smsReminderTemplate(
+          false,
+          reminder.workflowStep.action,
+          reminder.booking?.startTime.toISOString() || "",
+          reminder.booking?.eventType?.title || "",
+          timeZone || "",
+          attendeeName || "",
+          userName
+        );
       }
+
       if (message?.length && message?.length > 0 && sendTo) {
         const scheduledSMS = await twilio.scheduleSMS(sendTo, message, reminder.scheduledDate, senderID);
 
diff --git a/packages/features/ee/workflows/components/EventWorkflowsTab.tsx b/packages/features/ee/workflows/components/EventWorkflowsTab.tsx
index 5aef209332..48d81abea1 100644
--- a/packages/features/ee/workflows/components/EventWorkflowsTab.tsx
+++ b/packages/features/ee/workflows/components/EventWorkflowsTab.tsx
@@ -12,7 +12,7 @@ import { trpc } from "@calcom/trpc/react";
 import { Button, EmptyScreen, showToast, Switch, Tooltip, Alert } from "@calcom/ui";
 import { ExternalLink, Zap, Lock } from "@calcom/ui/components/icon";
 
-import LicenseRequired from "../../common/components/v2/LicenseRequired";
+import LicenseRequired from "../../common/components/LicenseRequired";
 import { getActionIcon } from "../lib/getActionIcon";
 import SkeletonLoader from "./SkeletonLoaderEventWorkflowsTab";
 import type { WorkflowType } from "./WorkflowListPage";
diff --git a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
index 284c087b7e..236cb77be8 100644
--- a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
+++ b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
@@ -13,7 +13,7 @@ import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui";
 import { Button, Label, MultiSelectCheckboxes, TextField } from "@calcom/ui";
 import { ArrowDown, Trash2 } from "@calcom/ui/components/icon";
 
-import { isSMSAction } from "../lib/isSMSAction";
+import { isSMSAction } from "../lib/actionHelperFunctions";
 import type { FormValues } from "../pages/workflow";
 import { AddActionDialog } from "./AddActionDialog";
 import { DeleteDialog } from "./DeleteDialog";
diff --git a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
index 8ad1b8472d..9e1497046c 100644
--- a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
+++ b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
@@ -35,11 +35,13 @@ import {
   AddVariablesDropdown,
   Input,
 } from "@calcom/ui";
-import { ArrowDown, MoreHorizontal, Trash2, HelpCircle } from "@calcom/ui/components/icon";
+import { ArrowDown, MoreHorizontal, Trash2, HelpCircle, Info } from "@calcom/ui/components/icon";
 
+import { isAttendeeAction, isSMSAction } from "../lib/actionHelperFunctions";
 import { DYNAMIC_TEXT_VARIABLES } from "../lib/constants";
 import { getWorkflowTemplateOptions, getWorkflowTriggerOptions } from "../lib/getOptions";
-import { isSMSAction } from "../lib/isSMSAction";
+import emailReminderTemplate from "../lib/reminders/templates/emailReminderTemplate";
+import smsReminderTemplate from "../lib/reminders/templates/smsReminderTemplate";
 import type { FormValues } from "../pages/workflow";
 import { TimeTimeUnitInput } from "./TimeTimeUnitInput";
 
@@ -69,12 +71,14 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
     step?.action === WorkflowActions.SMS_NUMBER ? true : false
   );
 
+  const [updateTemplate, setUpdateTemplate] = useState(false);
+  const [firstRender, setFirstRender] = useState(true);
+
   const [isSenderIdNeeded, setIsSenderIdNeeded] = useState(
     step?.action === WorkflowActions.SMS_NUMBER || step?.action === WorkflowActions.SMS_ATTENDEE
       ? true
       : false
   );
-
   useEffect(() => {
     setNumberVerified(
       !!step &&
@@ -86,10 +90,6 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
     step?.action === WorkflowActions.EMAIL_ADDRESS ? true : false
   );
 
-  const [isCustomReminderBodyNeeded, setIsCustomReminderBodyNeeded] = useState(
-    step?.template === WorkflowTemplates.CUSTOM ? true : false
-  );
-
   const [isEmailSubjectNeeded, setIsEmailSubjectNeeded] = useState(
     step?.action === WorkflowActions.EMAIL_ATTENDEE ||
       step?.action === WorkflowActions.EMAIL_HOST ||
@@ -110,6 +110,28 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
   const triggerOptions = getWorkflowTriggerOptions(t);
   const templateOptions = getWorkflowTemplateOptions(t);
 
+  if (step && form.getValues(`steps.${step.stepNumber - 1}.template`) === WorkflowTemplates.REMINDER) {
+    if (!form.getValues(`steps.${step.stepNumber - 1}.reminderBody`)) {
+      if (isSMSAction(form.getValues(`steps.${step.stepNumber - 1}.action`))) {
+        const smsBody = smsReminderTemplate(true, form.getValues(`steps.${step.stepNumber - 1}.action`));
+        form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, smsBody);
+      } else {
+        const reminderBodyTemplate = emailReminderTemplate(
+          true,
+          form.getValues(`steps.${step.stepNumber - 1}.action`)
+        ).emailBody;
+        form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, reminderBodyTemplate);
+      }
+    }
+    if (!form.getValues(`steps.${step.stepNumber - 1}.emailSubject`)) {
+      const subjectTemplate = emailReminderTemplate(
+        true,
+        form.getValues(`steps.${step.stepNumber - 1}.action`)
+      ).emailSubject;
+      form.setValue(`steps.${step.stepNumber - 1}.emailSubject`, subjectTemplate);
+    }
+  }
+
   const { ref: emailSubjectFormRef, ...restEmailSubjectForm } = step
     ? form.register(`steps.${step.stepNumber - 1}.emailSubject`)
     : { ref: null, name: "" };
@@ -259,6 +281,10 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
               <div className="mt-5">
                 <Label>{showTimeSectionAfter ? t("how_long_after") : t("how_long_before")}</Label>
                 <TimeTimeUnitInput form={form} />
+                <div className="mt-1 flex text-gray-500">
+                  <Info className="mr-1 mt-0.5 h-4 w-4" />
+                  <p className="text-sm">{t("testing_workflow_info_message")}</p>
+                </div>
               </div>
             )}
           </div>
@@ -352,33 +378,71 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                               setIsEmailAddressNeeded(false);
                               setIsPhoneNumberNeeded(val.value === WorkflowActions.SMS_NUMBER);
                               setNumberVerified(false);
+
+                              // email action changes to sms action
                               if (!isSMSAction(oldValue)) {
                                 form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, "");
                                 form.setValue(`steps.${step.stepNumber - 1}.sender`, SENDER_ID);
                               }
+
+                              setIsEmailSubjectNeeded(false);
                             } else {
                               setIsPhoneNumberNeeded(false);
                               setIsSenderIdNeeded(false);
                               setIsEmailAddressNeeded(val.value === WorkflowActions.EMAIL_ADDRESS);
+                              setIsEmailSubjectNeeded(true);
+                            }
 
-                              if (isSMSAction(oldValue)) {
-                                form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, "");
-                                form.setValue(`steps.${step.stepNumber - 1}.senderName`, SENDER_NAME);
+                            if (
+                              form.getValues(`steps.${step.stepNumber - 1}.template`) ===
+                              WorkflowTemplates.REMINDER
+                            ) {
+                              if (isSMSAction(val.value) === isSMSAction(oldValue)) {
+                                if (isAttendeeAction(oldValue) !== isAttendeeAction(val.value)) {
+                                  const currentReminderBody =
+                                    form.getValues(`steps.${step.stepNumber - 1}.reminderBody`) || "";
+                                  const newReminderBody = currentReminderBody
+                                    .replaceAll("{ORGANIZER}", "{PLACEHOLDER}")
+                                    .replaceAll("{ATTENDEE}", "{ORGANIZER}")
+                                    .replaceAll("{PLACEHOLDER}", "{ATTENDEE}");
+                                  form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, newReminderBody);
+
+                                  if (!isSMSAction(val.value)) {
+                                    const currentEmailSubject =
+                                      form.getValues(`steps.${step.stepNumber - 1}.emailSubject`) || "";
+                                    const newEmailSubject = isAttendeeAction(val.value)
+                                      ? currentEmailSubject.replace("{ORGANIZER}", "{ATTENDEE}")
+                                      : currentEmailSubject.replace("{ATTENDEE}", "{ORGANIZER}");
+
+                                    form.setValue(
+                                      `steps.${step.stepNumber - 1}.emailSubject`,
+                                      newEmailSubject || ""
+                                    );
+                                  }
+                                }
+                              } else {
+                                if (isSMSAction(val.value)) {
+                                  form.setValue(
+                                    `steps.${step.stepNumber - 1}.reminderBody`,
+                                    smsReminderTemplate(true, val.value)
+                                  );
+                                } else {
+                                  const emailReminderBody = emailReminderTemplate(true, val.value);
+                                  form.setValue(
+                                    `steps.${step.stepNumber - 1}.reminderBody`,
+                                    emailReminderBody.emailBody
+                                  );
+                                  form.setValue(
+                                    `steps.${step.stepNumber - 1}.emailSubject`,
+                                    emailReminderBody.emailSubject
+                                  );
+                                }
                               }
                             }
-
                             form.unregister(`steps.${step.stepNumber - 1}.sendTo`);
                             form.clearErrors(`steps.${step.stepNumber - 1}.sendTo`);
-                            if (
-                              val.value === WorkflowActions.EMAIL_ATTENDEE ||
-                              val.value === WorkflowActions.EMAIL_HOST ||
-                              val.value === WorkflowActions.EMAIL_ADDRESS
-                            ) {
-                              setIsEmailSubjectNeeded(true);
-                            } else {
-                              setIsEmailSubjectNeeded(false);
-                            }
                             form.setValue(`steps.${step.stepNumber - 1}.action`, val.value);
+                            setUpdateTemplate(!updateTemplate);
                           }
                         }}
                         defaultValue={selectedAction}
@@ -478,7 +542,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   )}
                 </div>
               )}
-              <div className="bg-muted-4 mt-2 rounded-md pt-0">
+              <div className="bg-muted mt-2 rounded-md p-4 pt-0">
                 {isSenderIdNeeded ? (
                   <>
                     <div className="pt-4">
@@ -528,7 +592,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                 </div>
               )}
               {isEmailAddressNeeded && (
-                <div className="bg-muted-4 mt-5 rounded-md">
+                <div className="bg-muted mt-5 rounded-md p-4">
                   <EmailField
                     required
                     label={t("email_address")}
@@ -548,9 +612,37 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                         className="text-sm"
                         onChange={(val) => {
                           if (val) {
+                            if (val.value === WorkflowTemplates.REMINDER) {
+                              if (isSMSAction(form.getValues(`steps.${step.stepNumber - 1}.action`))) {
+                                form.setValue(
+                                  `steps.${step.stepNumber - 1}.reminderBody`,
+                                  smsReminderTemplate(
+                                    true,
+                                    form.getValues(`steps.${step.stepNumber - 1}.action`)
+                                  )
+                                );
+                              } else {
+                                form.setValue(
+                                  `steps.${step.stepNumber - 1}.reminderBody`,
+                                  emailReminderTemplate(
+                                    true,
+                                    form.getValues(`steps.${step.stepNumber - 1}.action`)
+                                  ).emailBody
+                                );
+                                form.setValue(
+                                  `steps.${step.stepNumber - 1}.emailSubject`,
+                                  emailReminderTemplate(
+                                    true,
+                                    form.getValues(`steps.${step.stepNumber - 1}.action`)
+                                  ).emailSubject
+                                );
+                              }
+                            } else {
+                              form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, "");
+                              form.setValue(`steps.${step.stepNumber - 1}.emailSubject`, "");
+                            }
                             form.setValue(`steps.${step.stepNumber - 1}.template`, val.value);
-                            const isCustomTemplate = val.value === WorkflowTemplates.CUSTOM;
-                            setIsCustomReminderBodyNeeded(isCustomTemplate);
+                            setUpdateTemplate(!updateTemplate);
                           }
                         }}
                         defaultValue={selectedTemplate}
@@ -560,98 +652,100 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   }}
                 />
               </div>
-              {isCustomReminderBodyNeeded && (
-                <div className="bg-muted-4 mt-2 rounded-md pt-2 md:p-6 md:pt-4">
-                  {isEmailSubjectNeeded && (
-                    <div className="mb-6">
-                      <div className="flex items-center">
-                        <Label className="mb-0 flex-none">{t("subject")}</Label>
-                        <div className="flex-grow text-right">
-                          <AddVariablesDropdown
-                            addVariable={addVariableEmailSubject}
-                            variables={DYNAMIC_TEXT_VARIABLES}
-                          />
-                        </div>
+              <div className="bg-muted mt-2 rounded-md pt-2 md:p-6 md:pt-4">
+                {isEmailSubjectNeeded && (
+                  <div className="mb-6">
+                    <div className="flex items-center">
+                      <Label className="mb-0 flex-none">{t("subject")}</Label>
+                      <div className="flex-grow text-right">
+                        <AddVariablesDropdown
+                          addVariable={addVariableEmailSubject}
+                          variables={DYNAMIC_TEXT_VARIABLES}
+                        />
                       </div>
-                      <TextArea
-                        ref={(e) => {
-                          emailSubjectFormRef?.(e);
-                          refEmailSubject.current = e;
-                        }}
-                        rows={1}
-                        className="my-0 focus:ring-transparent"
-                        required
-                        {...restEmailSubjectForm}
-                      />
-                      {form.formState.errors.steps &&
-                        form.formState?.errors?.steps[step.stepNumber - 1]?.emailSubject && (
-                          <p className="mt-1 text-xs text-red-500">
-                            {form.formState?.errors?.steps[step.stepNumber - 1]?.emailSubject?.message || ""}
-                          </p>
-                        )}
                     </div>
-                  )}
-
-                  {step.action !== WorkflowActions.SMS_ATTENDEE &&
-                  step.action !== WorkflowActions.SMS_NUMBER ? (
-                    <>
-                      <div className="mb-2 flex items-center pb-[1.5px]">
-                        <Label className="mb-0 flex-none ">
-                          {isEmailSubjectNeeded ? t("email_body") : t("text_message")}
-                        </Label>
-                      </div>
-                      <Editor
-                        getText={() => {
-                          return props.form.getValues(`steps.${step.stepNumber - 1}.reminderBody`) || "";
-                        }}
-                        setText={(text: string) => {
-                          props.form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, text);
-                          props.form.clearErrors();
-                        }}
-                        variables={DYNAMIC_TEXT_VARIABLES}
-                        height="200px"
-                      />
-                    </>
-                  ) : (
-                    <>
-                      <div className="flex items-center">
-                        <Label className="mb-0 flex-none">
-                          {isEmailSubjectNeeded ? t("email_body") : t("text_message")}
-                        </Label>
-                        <div className="flex-grow text-right">
-                          <AddVariablesDropdown
-                            addVariable={addVariableBody}
-                            variables={DYNAMIC_TEXT_VARIABLES}
-                          />
-                        </div>
-                      </div>
-                      <TextArea
-                        ref={(e) => {
-                          reminderBodyFormRef?.(e);
-                          refReminderBody.current = e;
-                        }}
-                        className="my-0 h-24"
-                        required
-                        {...restReminderBodyForm}
-                      />
-                    </>
-                  )}
-                  {form.formState.errors.steps &&
-                    form.formState?.errors?.steps[step.stepNumber - 1]?.reminderBody && (
-                      <p className="mt-1 text-sm text-red-500">
-                        {form.formState?.errors?.steps[step.stepNumber - 1]?.reminderBody?.message || ""}
-                      </p>
-                    )}
-                  <div className="mt-3 ">
-                    <button type="button" onClick={() => setIsAdditionalInputsDialogOpen(true)}>
-                      <div className="text-default mt-2 flex text-sm">
-                        <HelpCircle className="mt-[3px] h-3 w-3 ltr:mr-2 rtl:ml-2" />
-                        <p className="text-left">{t("using_additional_inputs_as_variables")}</p>
-                      </div>
-                    </button>
+                    <TextArea
+                      ref={(e) => {
+                        emailSubjectFormRef?.(e);
+                        refEmailSubject.current = e;
+                      }}
+                      rows={1}
+                      className="my-0 focus:ring-transparent"
+                      required
+                      {...restEmailSubjectForm}
+                    />
+                    {form.formState.errors.steps &&
+                      form.formState?.errors?.steps[step.stepNumber - 1]?.emailSubject && (
+                        <p className="mt-1 text-xs text-red-500">
+                          {form.formState?.errors?.steps[step.stepNumber - 1]?.emailSubject?.message || ""}
+                        </p>
+                      )}
                   </div>
+                )}
+
+                {step.action !== WorkflowActions.SMS_ATTENDEE &&
+                step.action !== WorkflowActions.SMS_NUMBER ? (
+                  <>
+                    <div className="mb-2 flex items-center pb-[1.5px]">
+                      <Label className="mb-0 flex-none ">
+                        {isEmailSubjectNeeded ? t("email_body") : t("text_message")}
+                      </Label>
+                    </div>
+                    <Editor
+                      getText={() => {
+                        return props.form.getValues(`steps.${step.stepNumber - 1}.reminderBody`) || "";
+                      }}
+                      setText={(text: string) => {
+                        props.form.setValue(`steps.${step.stepNumber - 1}.reminderBody`, text);
+                        props.form.clearErrors();
+                      }}
+                      variables={DYNAMIC_TEXT_VARIABLES}
+                      height="200px"
+                      updateTemplate={updateTemplate}
+                      firstRender={firstRender}
+                      setFirstRender={setFirstRender}
+                    />
+                  </>
+                ) : (
+                  <>
+                    <div className="flex items-center">
+                      <Label className="mb-0 flex-none">
+                        {isEmailSubjectNeeded ? t("email_body") : t("text_message")}
+                      </Label>
+                      <div className="flex-grow text-right">
+                        <AddVariablesDropdown
+                          addVariable={addVariableBody}
+                          variables={DYNAMIC_TEXT_VARIABLES}
+                        />
+                      </div>
+                    </div>
+                    <TextArea
+                      ref={(e) => {
+                        reminderBodyFormRef?.(e);
+                        refReminderBody.current = e;
+                      }}
+                      className="my-0 h-24"
+                      required
+                      {...restReminderBodyForm}
+                    />
+                  </>
+                )}
+                {form.formState.errors.steps &&
+                  form.formState?.errors?.steps[step.stepNumber - 1]?.reminderBody && (
+                    <p className="mt-1 text-sm text-red-500">
+                      {form.formState?.errors?.steps[step.stepNumber - 1]?.reminderBody?.message || ""}
+                    </p>
+                  )}
+                <div className="mt-3 ">
+                  <button type="button" onClick={() => setIsAdditionalInputsDialogOpen(true)}>
+                    <div className="text-default mt-2 flex text-sm">
+                      <HelpCircle className="mt-[3px] h-3 w-3 ltr:mr-2 rtl:ml-2" />
+                      <p className="text-left">{t("using_booking_questions_as_variables")}</p>
+                    </div>
+                  </button>
                 </div>
-              )}
+              </div>
+
               {/* {form.getValues(`steps.${step.stepNumber - 1}.action`) !== WorkflowActions.SMS_ATTENDEE && (
                 <Button
                   type="button"
@@ -754,19 +848,19 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
         <Dialog open={isAdditionalInputsDialogOpen} onOpenChange={setIsAdditionalInputsDialogOpen}>
           <DialogContent type="creation" className="sm:max-w-[610px] md:h-[570px]">
             <div className="-m-3 h-[430px] overflow-x-hidden overflow-y-scroll sm:m-0">
-              <h1 className="w-full text-xl font-semibold ">{t("how_additional_inputs_as_variables")}</h1>
+              <h1 className="w-full text-xl font-semibold ">{t("how_booking_questions_as_variables")}</h1>
               <div className="bg-muted-3 mb-7 mt-7 rounded-md sm:p-4">
                 <p className="test-sm font-medium">{t("format")}</p>
                 <ul className="text-emphasis mt-2 ml-5 list-disc">
                   <li>{t("uppercase_for_letters")}</li>
                   <li>{t("replace_whitespaces_underscores")}</li>
-                  <li>{t("ignore_special_characters")}</li>
+                  <li>{t("ignore_special_characters_booking_questions")}</li>
                 </ul>
                 <div className="mt-6">
                   <p className="test-sm w-full font-medium">{t("example_1")}</p>
                   <div className="mt-2 grid grid-cols-12">
                     <div className="test-sm text-default col-span-5 ltr:mr-2 rtl:ml-2">
-                      {t("additional_input_label")}
+                      {t("booking_question_identifier")}
                     </div>
                     <div className="test-sm text-emphasis col-span-7">{t("company_size")}</div>
                     <div className="test-sm text-default col-span-5 w-full">{t("variable")}</div>
@@ -785,7 +879,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
                   <p className="test-sm w-full font-medium">{t("example_2")}</p>
                   <div className="mt-2 grid grid-cols-12">
                     <div className="test-sm text-default col-span-5 ltr:mr-2 rtl:ml-2">
-                      {t("additional_input_label")}
+                      {t("booking_question_identifier")}
                     </div>
                     <div className="test-sm text-emphasis col-span-7">{t("what_help_needed")}</div>
                     <div className="test-sm text-default col-span-5">{t("variable")}</div>
diff --git a/packages/features/ee/workflows/lib/isSMSAction.ts b/packages/features/ee/workflows/lib/actionHelperFunctions.ts
similarity index 55%
rename from packages/features/ee/workflows/lib/isSMSAction.ts
rename to packages/features/ee/workflows/lib/actionHelperFunctions.ts
index c781328143..0bcda93572 100644
--- a/packages/features/ee/workflows/lib/isSMSAction.ts
+++ b/packages/features/ee/workflows/lib/actionHelperFunctions.ts
@@ -3,3 +3,7 @@ import { WorkflowActions } from "@prisma/client";
 export function isSMSAction(action: WorkflowActions) {
   return action === WorkflowActions.SMS_ATTENDEE || action === WorkflowActions.SMS_NUMBER;
 }
+
+export function isAttendeeAction(action: WorkflowActions) {
+  return action === WorkflowActions.SMS_ATTENDEE || action === WorkflowActions.EMAIL_ATTENDEE;
+}
diff --git a/packages/features/ee/workflows/lib/constants.ts b/packages/features/ee/workflows/lib/constants.ts
index 97b6d13d6a..d3a96df367 100644
--- a/packages/features/ee/workflows/lib/constants.ts
+++ b/packages/features/ee/workflows/lib/constants.ts
@@ -24,10 +24,16 @@ export const DYNAMIC_TEXT_VARIABLES = [
   "event_name",
   "event_date",
   "event_time",
+  "event_end_time",
+  "timezone",
   "location",
   "organizer_name",
   "attendee_name",
   "attendee_email",
   "additional_notes",
   "meeting_url",
+  "cancel_url",
+  "reschedule_url",
 ];
+
+export const FORMATTED_DYNAMIC_TEXT_VARIABLES = ["event_date_", "event_time_", "event_end_time_"];
diff --git a/packages/features/ee/workflows/lib/getOptions.ts b/packages/features/ee/workflows/lib/getOptions.ts
index 0bf64f4cf9..bd9d52fe39 100644
--- a/packages/features/ee/workflows/lib/getOptions.ts
+++ b/packages/features/ee/workflows/lib/getOptions.ts
@@ -1,8 +1,8 @@
 import { WorkflowActions } from "@prisma/client";
-import { TFunction } from "next-i18next";
+import type { TFunction } from "next-i18next";
 
+import { isSMSAction } from "./actionHelperFunctions";
 import { TIME_UNIT, WORKFLOW_ACTIONS, WORKFLOW_TEMPLATES, WORKFLOW_TRIGGER_EVENTS } from "./constants";
-import { isSMSAction } from "./isSMSAction";
 
 export function getWorkflowActionOptions(t: TFunction, isTeamsPlan?: boolean) {
   return WORKFLOW_ACTIONS.filter((action) => action !== WorkflowActions.EMAIL_ADDRESS) //removing EMAIL_ADDRESS for now due to abuse episode
diff --git a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
index 8f8eea763e..7520d427ae 100644
--- a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
+++ b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
@@ -1,10 +1,12 @@
 import type { TimeUnit } from "@prisma/client";
-import { WorkflowTriggerEvents, WorkflowTemplates, WorkflowActions, WorkflowMethods } from "@prisma/client";
+import { WorkflowTemplates } from "@prisma/client";
+import { WorkflowTriggerEvents, WorkflowActions, WorkflowMethods } from "@prisma/client";
 import client from "@sendgrid/client";
 import type { MailData } from "@sendgrid/helpers/classes/mail";
 import sgMail from "@sendgrid/mail";
 
 import dayjs from "@calcom/dayjs";
+import logger from "@calcom/lib/logger";
 import prisma from "@calcom/prisma";
 import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
 
@@ -15,6 +17,7 @@ import emailReminderTemplate from "./templates/emailReminderTemplate";
 
 let sendgridAPIKey, senderEmail: string;
 
+const log = logger.getChildLogger({ prefix: ["[emailReminderManager]"] });
 if (process.env.SENDGRID_API_KEY) {
   sendgridAPIKey = process.env.SENDGRID_API_KEY as string;
   senderEmail = process.env.SENDGRID_EMAIL as string;
@@ -36,7 +39,8 @@ export const scheduleEmailReminder = async (
   emailBody: string,
   workflowStepId: number,
   template: WorkflowTemplates,
-  sender: string
+  sender: string,
+  hideBranding?: boolean
 ) => {
   if (action === WorkflowActions.EMAIL_ADDRESS) return;
   const { startTime, endTime } = evt;
@@ -51,16 +55,12 @@ export const scheduleEmailReminder = async (
   } else if (triggerEvent === WorkflowTriggerEvents.AFTER_EVENT) {
     scheduledDate = timeSpan.time && timeUnit ? dayjs(endTime).add(timeSpan.time, timeUnit) : null;
   }
+
   if (!process.env.SENDGRID_API_KEY || !process.env.SENDGRID_EMAIL) {
     console.error("Sendgrid credentials are missing from the .env file");
     return;
   }
 
-  const batchIdResponse = await client.request({
-    url: "/v3/mail/batch",
-    method: "POST",
-  });
-
   let name = "";
   let attendeeName = "";
   let timeZone = "";
@@ -80,42 +80,54 @@ export const scheduleEmailReminder = async (
 
   let emailContent = {
     emailSubject,
-    emailBody: {
-      text: emailBody,
-      html: `<body style="white-space: pre-wrap;">${emailBody}</body>`,
-    },
+    emailBody: `<body style="white-space: pre-wrap;">${emailBody}</body>`,
   };
+  if (emailBody) {
+    const variables: VariablesType = {
+      eventName: evt.title || "",
+      organizerName: evt.organizer.name,
+      attendeeName: evt.attendees[0].name,
+      attendeeEmail: evt.attendees[0].email,
+      eventDate: dayjs(startTime).tz(timeZone),
+      eventEndTime: dayjs(endTime).tz(timeZone),
+      timeZone: timeZone,
+      location: evt.location,
+      additionalNotes: evt.additionalNotes,
+      responses: evt.responses,
+      meetingUrl: bookingMetadataSchema.parse(evt.metadata || {})?.videoCallUrl,
+      cancelLink: `/booking/${evt.uid}?cancel=true`,
+      rescheduleLink: `/${evt.organizer.username}/${evt.eventType.slug}?rescheduleUid=${evt.uid}`,
+    };
 
-  switch (template) {
-    case WorkflowTemplates.REMINDER:
-      emailContent = emailReminderTemplate(startTime, endTime, evt.title, timeZone, attendeeName, name);
-      break;
-    case WorkflowTemplates.CUSTOM:
-      const variables: VariablesType = {
-        eventName: evt.title || "",
-        organizerName: evt.organizer.name,
-        attendeeName: evt.attendees[0].name,
-        attendeeEmail: evt.attendees[0].email,
-        eventDate: dayjs(startTime).tz(timeZone),
-        eventTime: dayjs(startTime).tz(timeZone),
-        timeZone: timeZone,
-        location: evt.location,
-        additionalNotes: evt.additionalNotes,
-        responses: evt.responses,
-        meetingUrl: bookingMetadataSchema.parse(evt.metadata || {})?.videoCallUrl,
-      };
+    const locale =
+      action === WorkflowActions.EMAIL_ATTENDEE || action === WorkflowActions.SMS_ATTENDEE
+        ? evt.attendees[0].language?.locale
+        : evt.organizer.language.locale;
 
-      const locale =
-        action === WorkflowActions.EMAIL_ATTENDEE || action === WorkflowActions.SMS_ATTENDEE
-          ? evt.attendees[0].language?.locale
-          : evt.organizer.language.locale;
-
-      const emailSubjectTemplate = await customTemplate(emailSubject, variables, locale);
-      emailContent.emailSubject = emailSubjectTemplate.text;
-      emailContent.emailBody = await customTemplate(emailBody, variables, locale);
-      break;
+    const emailSubjectTemplate = customTemplate(emailSubject, variables, locale);
+    emailContent.emailSubject = emailSubjectTemplate.text;
+    emailContent.emailBody = customTemplate(emailBody, variables, locale, hideBranding).html;
+  } else if (template === WorkflowTemplates.REMINDER) {
+    emailContent = emailReminderTemplate(
+      false,
+      action,
+      startTime,
+      endTime,
+      evt.title,
+      timeZone,
+      attendeeName,
+      name
+    );
   }
 
+  // Allows debugging generated email content without waiting for sendgrid to send emails
+  log.debug(`Sending Email for trigger ${triggerEvent}`, JSON.stringify(emailContent));
+
+  const batchIdResponse = await client.request({
+    url: "/v3/mail/batch",
+    method: "POST",
+  });
+
   if (
     triggerEvent === WorkflowTriggerEvents.NEW_EVENT ||
     triggerEvent === WorkflowTriggerEvents.EVENT_CANCELLED ||
@@ -129,8 +141,7 @@ export const scheduleEmailReminder = async (
           name: sender,
         },
         subject: emailContent.emailSubject,
-        text: emailContent.emailBody.text,
-        html: emailContent.emailBody.html,
+        html: emailContent.emailBody,
         batchId: batchIdResponse[1].batch_id,
         replyTo: evt.organizer.email,
       });
@@ -156,8 +167,7 @@ export const scheduleEmailReminder = async (
             name: sender,
           },
           subject: emailContent.emailSubject,
-          text: emailContent.emailBody.text,
-          html: emailContent.emailBody.html,
+          html: emailContent.emailBody,
           batchId: batchIdResponse[1].batch_id,
           sendAt: scheduledDate.unix(),
           replyTo: evt.organizer.email,
diff --git a/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts b/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
index a7f22cf560..f7cf1d967a 100644
--- a/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
+++ b/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
@@ -8,6 +8,11 @@ import type { CalendarEvent } from "@calcom/types/Calendar";
 import { scheduleEmailReminder } from "./emailReminderManager";
 import { scheduleSMSReminder } from "./smsReminderManager";
 
+type ExtendedCalendarEvent = CalendarEvent & {
+  metadata?: { videoCallUrl: string | undefined };
+  eventType: { slug?: string };
+};
+
 export interface ScheduleWorkflowRemindersArgs {
   workflows: (WorkflowsOnEventTypes & {
     workflow: Workflow & {
@@ -15,11 +20,12 @@ export interface ScheduleWorkflowRemindersArgs {
     };
   })[];
   smsReminderNumber: string | null;
-  calendarEvent: CalendarEvent & { metadata?: { videoCallUrl: string | undefined } };
+  calendarEvent: ExtendedCalendarEvent;
   requiresConfirmation?: boolean;
   isRescheduleEvent?: boolean;
   isFirstRecurringEvent?: boolean;
   emailAttendeeSendToOverride?: string;
+  hideBranding?: boolean;
 }
 
 export const scheduleWorkflowReminders = async (args: ScheduleWorkflowRemindersArgs) => {
@@ -31,6 +37,7 @@ export const scheduleWorkflowReminders = async (args: ScheduleWorkflowRemindersA
     isRescheduleEvent = false,
     isFirstRecurringEvent = false,
     emailAttendeeSendToOverride = "",
+    hideBranding,
   } = args;
   if (workflows.length > 0 && !requiresConfirmation) {
     for (const workflowReference of workflows) {
@@ -95,7 +102,8 @@ export const scheduleWorkflowReminders = async (args: ScheduleWorkflowRemindersA
               step.reminderBody || "",
               step.id,
               step.template,
-              step.sender || SENDER_NAME
+              step.sender || SENDER_NAME,
+              hideBranding
             );
           }
         }
@@ -111,11 +119,12 @@ export interface SendCancelledRemindersArgs {
     };
   })[];
   smsReminderNumber: string | null;
-  evt: CalendarEvent;
+  evt: ExtendedCalendarEvent;
+  hideBranding?: boolean;
 }
 
 export const sendCancelledReminders = async (args: SendCancelledRemindersArgs) => {
-  const { workflows, smsReminderNumber, evt } = args;
+  const { workflows, smsReminderNumber, evt, hideBranding } = args;
 
   if (workflows.length > 0) {
     for (const workflowRef of workflows) {
@@ -170,7 +179,8 @@ export const sendCancelledReminders = async (args: SendCancelledRemindersArgs) =
               step.reminderBody || "",
               step.id,
               step.template,
-              step.sender || SENDER_NAME
+              step.sender || SENDER_NAME,
+              hideBranding
             );
           }
         }
diff --git a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts
index a6a326ec41..51a8b6e772 100644
--- a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts
+++ b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts
@@ -2,9 +2,11 @@ import type { TimeUnit } from "@prisma/client";
 import { WorkflowTriggerEvents, WorkflowTemplates, WorkflowActions, WorkflowMethods } from "@prisma/client";
 
 import dayjs from "@calcom/dayjs";
+import logger from "@calcom/lib/logger";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
+import type { CalEventResponses } from "@calcom/types/Calendar";
 
 import { getSenderId } from "../alphanumericSenderIdSupport";
 import * as twilio from "./smsProviders/twilioProvider";
@@ -17,6 +19,7 @@ export enum timeUnitLowerCase {
   MINUTE = "minute",
   YEAR = "year",
 }
+const log = logger.getChildLogger({ prefix: ["[smsReminderManager]"] });
 
 export type BookingInfo = {
   uid?: string | null;
@@ -26,13 +29,17 @@ export type BookingInfo = {
     name: string;
     email: string;
     timeZone: string;
+    username?: string;
+  };
+  eventType: {
+    slug?: string;
   };
   startTime: string;
   endTime: string;
   title: string;
   location?: string | null;
   additionalNotes?: string | null;
-  responses?: Prisma.JsonValue;
+  responses?: CalEventResponses | null;
   metadata?: Prisma.JsonValue;
 };
 
@@ -92,29 +99,32 @@ export const scheduleSMSReminder = async (
       ? evt.attendees[0].language?.locale
       : evt.organizer.language.locale;
 
-  switch (template) {
-    case WorkflowTemplates.REMINDER:
-      message = smsReminderTemplate(evt.startTime, evt.title, timeZone, attendeeName, name) || message;
-      break;
-    case WorkflowTemplates.CUSTOM:
-      const variables: VariablesType = {
-        eventName: evt.title,
-        organizerName: evt.organizer.name,
-        attendeeName: evt.attendees[0].name,
-        attendeeEmail: evt.attendees[0].email,
-        eventDate: dayjs(evt.startTime).tz(timeZone),
-        eventTime: dayjs(evt.startTime).tz(timeZone),
-        timeZone: timeZone,
-        location: evt.location,
-        additionalNotes: evt.additionalNotes,
-        responses: evt.responses,
-        meetingUrl: bookingMetadataSchema.parse(evt.metadata || {})?.videoCallUrl,
-      };
-      const customMessage = await customTemplate(message, variables, locale);
-      message = customMessage.text;
-      break;
+  if (message) {
+    const variables: VariablesType = {
+      eventName: evt.title,
+      organizerName: evt.organizer.name,
+      attendeeName: evt.attendees[0].name,
+      attendeeEmail: evt.attendees[0].email,
+      eventDate: dayjs(evt.startTime).tz(timeZone),
+      eventEndTime: dayjs(evt.endTime).tz(timeZone),
+      timeZone: timeZone,
+      location: evt.location,
+      additionalNotes: evt.additionalNotes,
+      responses: evt.responses,
+      meetingUrl: bookingMetadataSchema.parse(evt.metadata || {})?.videoCallUrl,
+      cancelLink: `/booking/${evt.uid}?cancel=true`,
+      rescheduleLink: `/${evt.organizer.username}/${evt.eventType.slug}?rescheduleUid=${evt.uid}`,
+    };
+    const customMessage = customTemplate(message, variables, locale);
+    message = customMessage.text;
+  } else if (template === WorkflowTemplates.REMINDER) {
+    message =
+      smsReminderTemplate(false, action, evt.startTime, evt.title, timeZone, attendeeName, name) || message;
   }
 
+  // Allows debugging generated email content without waiting for sendgrid to send emails
+  log.debug(`Sending sms for trigger ${triggerEvent}`, message);
+
   if (message.length > 0 && reminderPhone && isNumberVerified) {
     //send SMS when event is booked/cancelled/rescheduled
     if (
diff --git a/packages/features/ee/workflows/lib/reminders/templates/customTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/customTemplate.ts
index 4b6de8bd67..ad06218942 100644
--- a/packages/features/ee/workflows/lib/reminders/templates/customTemplate.ts
+++ b/packages/features/ee/workflows/lib/reminders/templates/customTemplate.ts
@@ -1,6 +1,7 @@
 import { guessEventLocationType } from "@calcom/app-store/locations";
 import type { Dayjs } from "@calcom/dayjs";
-import type { Prisma } from "@calcom/prisma/client";
+import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
+import type { CalEventResponses } from "@calcom/types/Calendar";
 
 export type VariablesType = {
   eventName?: string;
@@ -8,15 +9,22 @@ export type VariablesType = {
   attendeeName?: string;
   attendeeEmail?: string;
   eventDate?: Dayjs;
-  eventTime?: Dayjs;
+  eventEndTime?: Dayjs;
   timeZone?: string;
   location?: string | null;
   additionalNotes?: string | null;
-  responses?: Prisma.JsonValue;
+  responses?: CalEventResponses | null;
   meetingUrl?: string;
+  cancelLink?: string;
+  rescheduleLink?: string;
 };
 
-const customTemplate = async (text: string, variables: VariablesType, locale: string) => {
+const customTemplate = (
+  text: string,
+  variables: VariablesType,
+  locale: string,
+  isBrandingDisabled?: boolean
+) => {
   const translatedDate = new Intl.DateTimeFormat(locale, {
     weekday: "long",
     month: "long",
@@ -24,13 +32,15 @@ const customTemplate = async (text: string, variables: VariablesType, locale: st
     year: "numeric",
   }).format(variables.eventDate?.toDate());
 
-  const timeWithTimeZone = `${variables.eventTime?.format("HH:mm")} (${variables.timeZone})`;
   let locationString = variables.location || "";
 
   if (text.includes("{LOCATION}")) {
     locationString = guessEventLocationType(locationString)?.label || locationString;
   }
 
+  const cancelLink = variables.cancelLink ? `${WEBAPP_URL}${variables.cancelLink}` : "";
+  const rescheduleLink = variables.rescheduleLink ? `${WEBAPP_URL}${variables.rescheduleLink}` : "";
+
   let dynamicText = text
     .replaceAll("{EVENT_NAME}", variables.eventName || "")
     .replaceAll("{ORGANIZER}", variables.organizerName || "")
@@ -38,17 +48,36 @@ const customTemplate = async (text: string, variables: VariablesType, locale: st
     .replaceAll("{ORGANIZER_NAME}", variables.organizerName || "") //old variable names
     .replaceAll("{ATTENDEE_NAME}", variables.attendeeName || "") //old variable names
     .replaceAll("{EVENT_DATE}", translatedDate)
-    .replaceAll("{EVENT_TIME}", timeWithTimeZone)
+    .replaceAll("{EVENT_TIME}", variables.eventDate?.format("H:mmA") || "")
+    .replaceAll("{EVENT_END_TIME}", variables.eventEndTime?.format("H:mmA") || "")
     .replaceAll("{LOCATION}", locationString)
     .replaceAll("{ADDITIONAL_NOTES}", variables.additionalNotes || "")
     .replaceAll("{ATTENDEE_EMAIL}", variables.attendeeEmail || "")
+    .replaceAll("{TIMEZONE}", variables.timeZone || "")
+    .replaceAll("{CANCEL_URL}", cancelLink)
+    .replaceAll("{RESCHEDULE_URL}", rescheduleLink)
     .replaceAll("{MEETING_URL}", variables.meetingUrl || "");
 
   const customInputvariables = dynamicText.match(/\{(.+?)}/g)?.map((variable) => {
     return variable.replace("{", "").replace("}", "");
   });
 
+  // event date/time with formatting
   customInputvariables?.forEach((variable) => {
+    if (variable.startsWith("EVENT_DATE_") || variable.startsWith("EVENT_TIME_")) {
+      const dateFormat = variable.substring(11, text.length);
+      const formattedDate = variables.eventDate?.format(dateFormat);
+      dynamicText = dynamicText.replace(`{${variable}}`, formattedDate || "");
+      return;
+    }
+
+    if (variable.startsWith("EVENT_END_TIME_")) {
+      const dateFormat = variable.substring(15, text.length);
+      const formattedDate = variables.eventEndTime?.format(dateFormat);
+      dynamicText = dynamicText.replace(`{${variable}}`, formattedDate || "");
+      return;
+    }
+
     if (variables.responses) {
       Object.keys(variables.responses).forEach((customInput) => {
         const formatedToVariable = customInput
@@ -56,17 +85,24 @@ const customTemplate = async (text: string, variables: VariablesType, locale: st
           .trim()
           .replaceAll(" ", "_")
           .toUpperCase();
-        if (variable === formatedToVariable && variables.responses) {
+
+        if (
+          variable === formatedToVariable &&
+          variables.responses &&
+          variables.responses[customInput as keyof typeof variables.responses].value
+        ) {
           dynamicText = dynamicText.replace(
             `{${variable}}`,
-            variables.responses[customInput as keyof typeof variables.responses]
+            variables.responses[customInput as keyof typeof variables.responses].value.toString()
           );
         }
       });
     }
   });
 
-  const textHtml = `<body style="white-space: pre-wrap;">${dynamicText}</body>`;
+  const branding = !isBrandingDisabled ? `<br><br>_<br><br>Scheduling by ${APP_NAME}` : "";
+
+  const textHtml = `<body style="white-space: pre-wrap;">${dynamicText}${branding}</body>`;
   return { text: dynamicText, html: textHtml };
 };
 
diff --git a/packages/features/ee/workflows/lib/reminders/templates/emailReminderTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/emailReminderTemplate.ts
index 0e501306ce..715b06a200 100644
--- a/packages/features/ee/workflows/lib/reminders/templates/emailReminderTemplate.ts
+++ b/packages/features/ee/workflows/lib/reminders/templates/emailReminderTemplate.ts
@@ -1,43 +1,50 @@
+import { WorkflowActions } from "@prisma/client";
+
 import dayjs from "@calcom/dayjs";
 import { APP_NAME } from "@calcom/lib/constants";
 
 const emailReminderTemplate = (
-  startTime: string,
-  endTime: string,
-  eventName: string,
-  timeZone: string,
-  attendee: string,
-  name: string
+  isEditingMode: boolean,
+  action?: WorkflowActions,
+  startTime?: string,
+  endTime?: string,
+  eventName?: string,
+  timeZone?: string,
+  otherPerson?: string,
+  name?: string,
+  isBrandingDisabled?: boolean
 ) => {
-  const emailSubject = `Reminder: ${eventName} - ${dayjs(startTime)
-    .tz(timeZone)
-    .format("ddd, MMM D, YYYY")} ${dayjs(startTime).tz(timeZone).format("H:mmA")}`;
+  let eventDate = "";
 
-  const templateBodyText = `Hi ${name},this is a reminder that your meeting (${eventName}) with ${attendee} is on ${dayjs(
-    startTime
-  )
-    .tz(timeZone)
-    .format("YYYY MMM D")} at ${dayjs(startTime).tz(timeZone).format("h:mmA")} ${timeZone}.`;
+  if (isEditingMode) {
+    endTime = "{EVENT_END_TIME}";
+    eventName = "{EVENT_NAME}";
+    timeZone = "{TIMEZONE}";
+    otherPerson = action === WorkflowActions.EMAIL_ATTENDEE ? "{ORGANIZER}" : "{ATTENDEE}";
+    name = action === WorkflowActions.EMAIL_ATTENDEE ? "{ATTENDEE}" : "{ORGANIZER}";
+    eventDate = "{EVENT_DATE_ddd, MMM D, YYYY H:mmA}";
+  } else {
+    eventDate = dayjs(startTime).tz(timeZone).format("ddd, MMM D, YYYY H:mmA");
+
+    endTime = dayjs(endTime).tz(timeZone).format("H:mmA");
+  }
+  const emailSubject = `Reminder: ${eventName} - ${eventDate}`;
 
   const introHtml = `<body>Hi${
     name ? " " + name : ""
   },<br><br>This is a reminder about your upcoming event.<br><br>`;
 
-  const eventHtml = `<div style="font-weight: bold;">Event:</div>${eventName}<br><br>`;
+  const eventHtml = `<div><strong class="editor-text-bold">Event:</strong></div>${eventName}<br><br>`;
 
-  const dateTimeHtml = `<div style="font-weight: bold;">Date & Time:</div>${dayjs(startTime)
-    .tz(timeZone)
-    .format("ddd, MMM D, YYYY H:mmA")} - ${dayjs(endTime)
-    .tz(timeZone)
-    .format("H:mmA")} (${timeZone})<br><br>`;
+  const dateTimeHtml = `<div><strong class="editor-text-bold">Date & Time:</strong></div>${eventDate} - ${endTime} (${timeZone})<br><br>`;
 
-  const attendeeHtml = `<div style="font-weight: bold;">Attendees:</div>You & ${attendee}<br><br>`;
+  const attendeeHtml = `<div><strong class="editor-text-bold">Attendees:</strong></div>You & ${otherPerson}<br><br>`;
 
-  const endingHtml = `This reminder was triggered by a Workflow in Cal.<br><br>_<br><br>Scheduling by ${APP_NAME}</body>`;
+  const branding = !isBrandingDisabled && !isEditingMode ? `<br><br>_<br><br>Scheduling by ${APP_NAME}` : "";
 
-  const templateBodyHtml = introHtml + eventHtml + dateTimeHtml + attendeeHtml + endingHtml;
+  const endingHtml = `This reminder was triggered by a Workflow in Cal.${branding}</body>`;
 
-  const emailBody = { text: templateBodyText, html: templateBodyHtml };
+  const emailBody = introHtml + eventHtml + dateTimeHtml + attendeeHtml + endingHtml;
 
   return { emailSubject, emailBody };
 };
diff --git a/packages/features/ee/workflows/lib/reminders/templates/smsReminderTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/smsReminderTemplate.ts
index 466255cfa4..2c328f267e 100644
--- a/packages/features/ee/workflows/lib/reminders/templates/smsReminderTemplate.ts
+++ b/packages/features/ee/workflows/lib/reminders/templates/smsReminderTemplate.ts
@@ -1,23 +1,38 @@
+import { WorkflowActions } from "@prisma/client";
+
 import dayjs from "@calcom/dayjs";
 
 const smsReminderTemplate = (
-  startTime: string,
-  eventName: string,
-  timeZone: string,
-  attendee: string,
+  isEditingMode: boolean,
+  action?: WorkflowActions,
+  startTime?: string,
+  eventName?: string,
+  timeZone?: string,
+  attendee?: string,
   name?: string
 ) => {
-  const templateOne = `Hi${name ? ` ${name}` : ``}, this is a reminder that your meeting (${eventName}) with
-  ${attendee} is on ${dayjs(startTime).tz(timeZone).format("MMM D")} at ${dayjs(startTime)
-    .tz(timeZone)
-    .format("h:mmA")} ${timeZone}`;
+  let eventDate;
+  if (isEditingMode) {
+    eventName = "{EVENT_NAME}";
+    timeZone = "{TIMEZONE}";
+    startTime = "{START_TIME_h:mmA}";
+
+    eventDate = "{EVENT_DATE_YYYY MMM D}";
+    attendee = action === WorkflowActions.SMS_ATTENDEE ? "{ORGANIZER}" : "{ATTENDEE}";
+    name = action === WorkflowActions.SMS_ATTENDEE ? "{ATTENDEE}" : "{ORGANIZER}";
+  } else {
+    eventDate = dayjs(startTime).tz(timeZone).format("YYYY MMM D");
+    startTime = dayjs(startTime).tz(timeZone).format("h:mmA");
+  }
+
+  const templateOne = `Hi${
+    name ? ` ${name}` : ``
+  }, this is a reminder that your meeting (${eventName}) with ${attendee} is on ${eventDate} at ${startTime} ${timeZone}.`;
 
   //Twilio recomments message to be no longer than 320 characters
   if (templateOne.length <= 320) return templateOne;
 
-  const templateTwo = `Hi, this is a reminder that your meeting with ${attendee} is on ${dayjs(startTime)
-    .tz(timeZone)
-    .format("MMM D")} at ${dayjs(startTime).tz(timeZone).format("h:mmA")} ${timeZone}`;
+  const templateTwo = `Hi, this is a reminder that your meeting with ${attendee} is on ${eventDate} at ${startTime} ${timeZone}`;
 
   //Twilio supports up to 1600 characters
   if (templateTwo.length <= 1600) return templateTwo;
diff --git a/packages/features/ee/workflows/lib/variableTranslations.ts b/packages/features/ee/workflows/lib/variableTranslations.ts
index 9040a5e167..29810cd615 100644
--- a/packages/features/ee/workflows/lib/variableTranslations.ts
+++ b/packages/features/ee/workflows/lib/variableTranslations.ts
@@ -1,7 +1,8 @@
-import { TFunction } from "next-i18next";
+import type { TFunction } from "next-i18next";
 
-import { DYNAMIC_TEXT_VARIABLES } from "./constants";
+import { DYNAMIC_TEXT_VARIABLES, FORMATTED_DYNAMIC_TEXT_VARIABLES } from "./constants";
 
+// variables are saved in the db always in english, so here we translate them to the user's language
 export function getTranslatedText(text: string, language: { locale: string; t: TFunction }) {
   let translatedText = text;
 
@@ -12,12 +13,31 @@ export function getTranslatedText(text: string, language: { locale: string; t: T
 
     variables?.forEach((variable) => {
       const regex = new RegExp(`{${variable}}`, "g"); // .replaceAll is not available here for some reason
-      const translatedVariable = DYNAMIC_TEXT_VARIABLES.includes(variable.toLowerCase())
+      let translatedVariable = DYNAMIC_TEXT_VARIABLES.includes(variable.toLowerCase())
         ? language.t(variable.toLowerCase().concat("_variable")).replace(/ /g, "_").toLocaleUpperCase()
         : DYNAMIC_TEXT_VARIABLES.includes(variable.toLowerCase().concat("_name")) //for the old variables names (ORGANIZER_NAME, ATTENDEE_NAME)
         ? language.t(variable.toLowerCase().concat("_name_variable")).replace(/ /g, "_").toLocaleUpperCase()
         : variable;
 
+      // this takes care of translating formatted variables (e.g. {EVENT_DATE_DD MM YYYY})
+      const formattedVarToTranslate = FORMATTED_DYNAMIC_TEXT_VARIABLES.map((formattedVar) => {
+        if (variable.toLowerCase().startsWith(formattedVar)) return variable;
+      })[0];
+
+      if (formattedVarToTranslate) {
+        // only translate the variable part not the formatting
+        const variableName = formattedVarToTranslate
+          .substring(0, formattedVarToTranslate?.lastIndexOf("_"))
+          .toLowerCase()
+          .concat("_variable");
+
+        translatedVariable = language
+          .t(variableName)
+          .replace(/ /g, "_")
+          .toLocaleUpperCase()
+          .concat(formattedVarToTranslate?.substring(formattedVarToTranslate?.lastIndexOf("_")));
+      }
+
       translatedText = translatedText.replace(regex, `{${translatedVariable}}`);
     });
   }
@@ -48,6 +68,13 @@ export function translateVariablesToEnglish(text: string, language: { locale: st
           return;
         }
       });
+
+      FORMATTED_DYNAMIC_TEXT_VARIABLES.forEach((formattedVar) => {
+        const translatedVariable = language.t(`${formattedVar}variable`).replace(/ /g, "_").toUpperCase();
+        if (variable.startsWith(translatedVariable)) {
+          newText = newText.replace(translatedVariable, formattedVar.slice(0, -1).toUpperCase());
+        }
+      });
     });
   }
 
diff --git a/packages/features/ee/workflows/pages/index.tsx b/packages/features/ee/workflows/pages/index.tsx
index 2f4d6c4aca..24ecea6050 100644
--- a/packages/features/ee/workflows/pages/index.tsx
+++ b/packages/features/ee/workflows/pages/index.tsx
@@ -11,7 +11,7 @@ import { HttpError } from "@calcom/lib/http-error";
 import { trpc } from "@calcom/trpc/react";
 import { AnimatedPopover, Avatar, CreateButton, showToast } from "@calcom/ui";
 
-import LicenseRequired from "../../common/components/v2/LicenseRequired";
+import LicenseRequired from "../../common/components/LicenseRequired";
 import SkeletonLoader from "../components/SkeletonLoaderList";
 import type { WorkflowType } from "../components/WorkflowListPage";
 import WorkflowList from "../components/WorkflowListPage";
@@ -95,6 +95,7 @@ function WorkflowsPage() {
       heading={t("workflows")}
       title={t("workflows")}
       subtitle={t("workflows_to_automate_notifications")}
+      hideHeadingOnMobile
       CTA={
         query?.data?.profiles.length === 1 &&
         session.data?.hasValidLicense &&
diff --git a/packages/features/ee/workflows/pages/workflow.tsx b/packages/features/ee/workflows/pages/workflow.tsx
index 8cf8b32a70..457d1e8bd3 100644
--- a/packages/features/ee/workflows/pages/workflow.tsx
+++ b/packages/features/ee/workflows/pages/workflow.tsx
@@ -24,10 +24,10 @@ import { trpc } from "@calcom/trpc/react";
 import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui";
 import { Alert, Button, Form, showToast, Badge } from "@calcom/ui";
 
-import LicenseRequired from "../../common/components/v2/LicenseRequired";
+import LicenseRequired from "../../common/components/LicenseRequired";
 import SkeletonLoader from "../components/SkeletonLoaderEdit";
 import WorkflowDetailsPage from "../components/WorkflowDetailsPage";
-import { isSMSAction } from "../lib/isSMSAction";
+import { isSMSAction } from "../lib/actionHelperFunctions";
 import { getTranslatedText, translateVariablesToEnglish } from "../lib/variableTranslations";
 
 export type FormValues = {
@@ -204,10 +204,7 @@ function WorkflowPage() {
         values.steps.forEach((step) => {
           const strippedHtml = step.reminderBody?.replace(/<[^>]+>/g, "") || "";
 
-          const isBodyEmpty =
-            step.template === WorkflowTemplates.CUSTOM &&
-            !isSMSAction(step.action) &&
-            strippedHtml.length <= 1;
+          const isBodyEmpty = !isSMSAction(step.action) && strippedHtml.length <= 1;
 
           if (isBodyEmpty) {
             form.setError(`steps.${step.stepNumber - 1}.reminderBody`, {
@@ -266,6 +263,7 @@ function WorkflowPage() {
             </Button>
           </div>
         }
+        hideHeadingOnMobile
         heading={
           session.data?.hasValidLicense &&
           isAllDataLoaded && (
diff --git a/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx b/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx
index c1cddda3cb..99fd5a0543 100644
--- a/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx
+++ b/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx
@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
-import { Dialog, DialogContent, Form, DialogFooter, DialogClose, Button } from "@calcom/ui";
+import { Dialog, DialogContent, Form, DialogFooter, DialogClose, Button, Checkbox } from "@calcom/ui";
 
 export const BulkUpdateEventSchema = z.object({
   eventTypeIds: z.array(z.number()),
@@ -47,41 +47,31 @@ export function BulkEditDefaultConferencingModal(props: { open: boolean; setOpen
           <div className="flex flex-col space-y-2">
             {data.eventTypes.length > 0 && (
               <div className="flex items-center space-x-2 rounded-md py-2.5 px-3">
-                <label className="text-emphasis w-full text-sm font-medium leading-none">
-                  <input
-                    type="checkbox"
-                    className="text-primary-600 focus:ring-primary-500 border-default hover:bg-subtle h-4 w-4 rounded checked:bg-gray-800 ltr:mr-2 rtl:ml-2"
-                    onChange={(e) => {
-                      form.setValue("eventTypeIds", e.target.checked ? data.eventTypes.map((e) => e.id) : []);
-                    }}
-                    checked={eventTypesSelected.length === data.eventTypes.length}
-                  />
-                  {t("select_all")}
-                </label>
+                <Checkbox
+                  description={t("select_all")}
+                  descriptionAsLabel
+                  onChange={(e) => {
+                    form.setValue("eventTypeIds", e.target.checked ? data.eventTypes.map((e) => e.id) : []);
+                  }}
+                  checked={eventTypesSelected.length === data.eventTypes.length}
+                />
               </div>
             )}
             {data.eventTypes.map((eventType) => (
               <div key={eventType.id} className="bg-muted flex items-center space-x-2 rounded-md py-2.5 px-3">
-                <label className="text-emphasis w-full text-sm font-medium leading-none">
-                  <input
-                    type="checkbox"
-                    checked={eventTypesSelected.includes(eventType.id)}
-                    className="text-primary-600 focus:ring-primary-500 border-default hover:bg-subtle h-4 w-4 rounded checked:bg-gray-800 ltr:mr-2 rtl:ml-2"
-                    onChange={(e) => {
-                      form.setValue(
-                        "eventTypeIds",
-                        e.target.checked
-                          ? [...eventTypesSelected, eventType.id]
-                          : eventTypesSelected.filter((id) => id !== eventType.id)
-                      );
-                    }}
-                  />
-                  {eventType.title}
-                </label>
-
-                <div className="ml-auto flex h-4 w-4 items-center">
-                  <img src={eventType.logo} alt="#" />
-                </div>
+                <Checkbox
+                  description={eventType.title}
+                  descriptionAsLabel
+                  checked={eventTypesSelected.includes(eventType.id)}
+                  onChange={(e) => {
+                    form.setValue(
+                      "eventTypeIds",
+                      e.target.checked
+                        ? [...eventTypesSelected, eventType.id]
+                        : eventTypesSelected.filter((id) => id !== eventType.id)
+                    );
+                  }}
+                />
               </div>
             ))}
           </div>
diff --git a/packages/features/eventtypes/components/CheckedTeamSelect.tsx b/packages/features/eventtypes/components/CheckedTeamSelect.tsx
index affa5966ec..95061144cb 100644
--- a/packages/features/eventtypes/components/CheckedTeamSelect.tsx
+++ b/packages/features/eventtypes/components/CheckedTeamSelect.tsx
@@ -44,14 +44,16 @@ export const CheckedTeamSelect = ({
       />
       {/* This class name conditional looks a bit odd but it allows a seemless transition when using autoanimate
        - Slides down from the top instead of just teleporting in from nowhere*/}
-      <ul className={classNames("mt-3 rounded-md", value.length >= 1 && "border")} ref={animationRef}>
+      <ul
+        className={classNames("mt-3 rounded-md", value.length >= 1 && "border-subtle border")}
+        ref={animationRef}>
         {value.map((option, index) => (
           <li key={option.value} className={`flex py-2 px-3 ${index === value.length - 1 ? "" : "border-b"}`}>
             <Avatar size="sm" imageSrc={option.avatar} alt={option.label} />
-            <p className="text-emphasis my-auto ml-3 text-sm">{option.label}</p>
+            <p className="text-emphasis ms-3 my-auto text-sm">{option.label}</p>
             <X
               onClick={() => props.onChange(value.filter((item) => item.value !== option.value))}
-              className="my-auto ml-auto"
+              className="my-auto ml-auto h-4 w-4"
             />
           </li>
         ))}
diff --git a/packages/features/eventtypes/components/CheckedUserSelect.tsx b/packages/features/eventtypes/components/CheckedUserSelect.tsx
index db3fcbfb59..d1c188f003 100644
--- a/packages/features/eventtypes/components/CheckedUserSelect.tsx
+++ b/packages/features/eventtypes/components/CheckedUserSelect.tsx
@@ -1,10 +1,9 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import type { Props } from "react-select";
 
-import { CAL_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Avatar, EmptyScreen, Label, Select } from "@calcom/ui";
-import { FiUserPlus, FiX } from "@calcom/ui/components/icon";
+import { UserPlus, X } from "@calcom/ui/components/icon";
 
 export type CheckedUserSelectOption = {
   avatar: string;
@@ -48,14 +47,13 @@ export const CheckedUserSelect = ({
           <div className="flex overflow-hidden rounded-md border border-gray-200 bg-white">
             <ul className="w-full" data-testid="managed-event-types" ref={animationRef}>
               {value.map((option, index) => {
-                const calLink = `${CAL_URL}/${option.value}`;
                 return (
                   <li
                     key={option.value}
                     className={`flex py-2 px-3 ${index === value.length - 1 ? "" : "border-b"}`}>
                     <Avatar size="sm" imageSrc={option.avatar} alt={option.label} />
                     <p className="my-auto ml-3 text-sm text-gray-900">{option.label}</p>
-                    <FiX
+                    <X
                       onClick={() => props.onChange(value.filter((item) => item.value !== option.value))}
                       className="my-auto ml-auto"
                     />
@@ -68,7 +66,7 @@ export const CheckedUserSelect = ({
       ) : (
         <div className="mt-6">
           <EmptyScreen
-            Icon={FiUserPlus}
+            Icon={UserPlus}
             headline={t("no_assigned_members")}
             description={t("start_assigning_members_above")}
           />
diff --git a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx b/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
index 8b1fe5ee09..3aabcba827 100644
--- a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
+++ b/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
@@ -4,6 +4,7 @@ import { MembershipRole } from "@prisma/client";
 import { isValidPhoneNumber } from "libphonenumber-js";
 import { useRouter } from "next/router";
 import { useEffect } from "react";
+import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 
@@ -79,6 +80,7 @@ export default function CreateEventTypeDialog({
 }) {
   const { t } = useLocale();
   const router = useRouter();
+  const [firstRender, setFirstRender] = useState(true);
 
   const {
     data: { teamId, eventPage: pageSlug },
@@ -221,6 +223,8 @@ export default function CreateEventTypeDialog({
                   setText={(value: string) => form.setValue("description", turndown(value))}
                   excludedToolbarItems={["blockType", "link"]}
                   placeholder={t("quick_video_meeting")}
+                  firstRender={firstRender}
+                  setFirstRender={setFirstRender}
                 />
 
                 <div className="relative">
diff --git a/packages/features/eventtypes/components/EmptyPage.tsx b/packages/features/eventtypes/components/EmptyPage.tsx
index 0f4ce14504..813a04b6aa 100644
--- a/packages/features/eventtypes/components/EmptyPage.tsx
+++ b/packages/features/eventtypes/components/EmptyPage.tsx
@@ -32,10 +32,8 @@ function EmptyPage({ name }: { name: string }) {
         <SkeletonEventType />
       </div>
       <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 transform">
-        <h3 className="dark:text-inverted text-default text-lg font-semibold">{t("no_event_types")} </h3>
-        <h4 className="dark:text-inverted text-default text-sm leading-normal">
-          {t("no_event_types_description", { name })}
-        </h4>
+        <h3 className="text-emphasis text-lg font-semibold">{t("no_event_types")} </h3>
+        <h4 className="text-default text-sm leading-normal">{t("no_event_types_description", { name })}</h4>
       </div>
     </div>
   );
diff --git a/packages/features/eventtypes/components/EventTypeDescription.tsx b/packages/features/eventtypes/components/EventTypeDescription.tsx
index 5f4dfb5e00..fa43ff6482 100644
--- a/packages/features/eventtypes/components/EventTypeDescription.tsx
+++ b/packages/features/eventtypes/components/EventTypeDescription.tsx
@@ -1,7 +1,6 @@
 import type { Prisma } from "@prisma/client";
 import { SchedulingType } from "@prisma/client";
 import { useMemo } from "react";
-import { FormattedNumber, IntlProvider } from "react-intl";
 import type { z } from "zod";
 
 import { classNames, parseRecurringEvent } from "@calcom/lib";
@@ -32,14 +31,14 @@ export const EventTypeDescription = ({
   shortenDescription,
   isPublic,
 }: EventTypeDescriptionProps) => {
-  const { t } = useLocale();
+  const { t, i18n } = useLocale();
 
   const recurringEvent = useMemo(
     () => parseRecurringEvent(eventType.recurringEvent),
     [eventType.recurringEvent]
   );
 
-  const stripeAppData = getPaymentAppData(eventType);
+  const paymentAppData = getPaymentAppData(eventType);
 
   return (
     <>
@@ -93,16 +92,13 @@ export const EventTypeDescription = ({
               </Badge>
             </li>
           )}
-          {stripeAppData.price > 0 && (
+          {paymentAppData.enabled && (
             <li>
               <Badge variant="gray" startIcon={CreditCard}>
-                <IntlProvider locale="en">
-                  <FormattedNumber
-                    value={stripeAppData.price / 100.0}
-                    style="currency"
-                    currency={stripeAppData?.currency?.toUpperCase()}
-                  />
-                </IntlProvider>
+                {new Intl.NumberFormat(i18n.language, {
+                  style: "currency",
+                  currency: paymentAppData.currency,
+                }).format(paymentAppData.price / 100)}
               </Badge>
             </li>
           )}
diff --git a/packages/features/eventtypes/lib/getPublicEvent.ts b/packages/features/eventtypes/lib/getPublicEvent.ts
new file mode 100644
index 0000000000..a29b4e41b1
--- /dev/null
+++ b/packages/features/eventtypes/lib/getPublicEvent.ts
@@ -0,0 +1,201 @@
+import type { User } from "@prisma/client";
+import { Prisma } from "@prisma/client";
+
+import type { LocationObject } from "@calcom/app-store/locations";
+import { privacyFilteredLocations } from "@calcom/app-store/locations";
+import { getAppFromSlug } from "@calcom/app-store/utils";
+import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";
+import { isRecurringEvent, parseRecurringEvent } from "@calcom/lib";
+import { WEBAPP_URL } from "@calcom/lib/constants";
+import { getDefaultEvent } from "@calcom/lib/defaultEvents";
+import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
+import type { PrismaClient } from "@calcom/prisma/client";
+import {
+  EventTypeMetaDataSchema,
+  customInputSchema,
+  userMetadata as userMetadataSchema,
+} from "@calcom/prisma/zod-utils";
+
+const publicEventSelect = Prisma.validator<Prisma.EventTypeSelect>()({
+  id: true,
+  title: true,
+  description: true,
+  eventName: true,
+  slug: true,
+  schedulingType: true,
+  length: true,
+  locations: true,
+  customInputs: true,
+  disableGuests: true,
+  // @TODO: Could this contain sensitive data?
+  metadata: true,
+  requiresConfirmation: true,
+  recurringEvent: true,
+  price: true,
+  currency: true,
+  seatsPerTimeSlot: true,
+  bookingFields: true,
+  team: true,
+  workflows: {
+    include: {
+      workflow: {
+        include: {
+          steps: true,
+        },
+      },
+    },
+  },
+  hosts: {
+    select: {
+      user: {
+        select: {
+          username: true,
+          name: true,
+          weekStart: true,
+          brandColor: true,
+          darkBrandColor: true,
+        },
+      },
+    },
+  },
+  owner: true,
+});
+
+export const getPublicEvent = async (username: string, eventSlug: string, prisma: PrismaClient) => {
+  const usernameList = username.split("+");
+
+  // In case of dynamic group event, we fetch user's data and use the default event.
+  if (usernameList.length > 1) {
+    const users = await prisma.user.findMany({
+      where: {
+        username: {
+          in: usernameList,
+        },
+      },
+      select: {
+        username: true,
+        name: true,
+        weekStart: true,
+        metadata: true,
+        brandColor: true,
+        darkBrandColor: true,
+      },
+    });
+
+    const defaultEvent = getDefaultEvent(eventSlug);
+    let locations = defaultEvent.locations ? (defaultEvent.locations as LocationObject[]) : [];
+
+    // Get the prefered location type from the first user
+    const firstUsersMetadata = userMetadataSchema.parse(users[0].metadata || {});
+    const preferedLocationType = firstUsersMetadata?.defaultConferencingApp;
+
+    if (preferedLocationType?.appSlug) {
+      const foundApp = getAppFromSlug(preferedLocationType.appSlug);
+      const appType = foundApp?.appData?.location?.type;
+      if (appType) {
+        // Replace the location with the prefered location type
+        // This will still be default to daily if the app is not found
+        locations = [{ type: appType, link: preferedLocationType.appLink }] as LocationObject[];
+      }
+    }
+
+    return {
+      ...defaultEvent,
+      bookingFields: getBookingFieldsWithSystemFields(defaultEvent),
+      // Clears meta data since we don't want to send this in the public api.
+      users: users.map((user) => ({ ...user, metadata: undefined })),
+      locations: privacyFilteredLocations(locations),
+      profile: {
+        username: users[0].username,
+        name: users[0].name,
+        weekStart: users[0].weekStart,
+        image: `${WEBAPP_URL}/${users[0].username}/avatar.png`,
+        brandColor: users[0].brandColor,
+        darkBrandColor: users[0].darkBrandColor,
+      },
+    };
+  }
+
+  // In case it's not a group event, it's either a single user or a team, and we query that data.
+  const event = await prisma.eventType.findFirst({
+    where: {
+      slug: eventSlug,
+      OR: [
+        {
+          users: {
+            some: {
+              username,
+            },
+          },
+        },
+        {
+          team: {
+            slug: username,
+          },
+        },
+      ],
+    },
+    select: publicEventSelect,
+  });
+
+  if (!event) return null;
+
+  return {
+    ...event,
+    description: markdownToSafeHTML(event.description),
+    metadata: EventTypeMetaDataSchema.parse(event.metadata || {}),
+    customInputs: customInputSchema.array().parse(event.customInputs || []),
+    locations: privacyFilteredLocations((event.locations || []) as LocationObject[]),
+    bookingFields: getBookingFieldsWithSystemFields(event),
+    recurringEvent: isRecurringEvent(event.recurringEvent) ? parseRecurringEvent(event.recurringEvent) : null,
+    // Sets user data on profile object for easier access
+    profile: getProfileFromEvent(event),
+    users: getUsersFromEvent(event),
+  };
+};
+
+const eventData = Prisma.validator<Prisma.EventTypeArgs>()({
+  select: publicEventSelect,
+});
+
+type Event = Prisma.EventTypeGetPayload<typeof eventData>;
+
+function getProfileFromEvent(event: Event) {
+  const { team, hosts, owner } = event;
+  const profile = team || hosts?.[0]?.user || owner;
+  if (!profile) throw new Error("Event has no owner");
+
+  const username = "username" in profile ? profile.username : team?.slug;
+  if (!username) throw new Error("Event has no username/team slug");
+  const weekStart = hosts?.[0]?.user?.weekStart || owner?.weekStart || "Monday";
+  const basePath = team ? `/team/${username}` : `/${username}`;
+
+  return {
+    username,
+    name: profile.name,
+    weekStart,
+    image: `${WEBAPP_URL}${basePath}/avatar.png`,
+    brandColor: profile.brandColor,
+    darkBrandColor: profile.darkBrandColor,
+  };
+}
+
+function getUsersFromEvent(event: Event) {
+  const { team, hosts, owner } = event;
+  if (team) {
+    return (hosts || []).map(mapHostsToUsers);
+  }
+
+  if (!owner) throw new Error("Event has no owner");
+
+  const { username, name, weekStart } = owner;
+  return [{ username, name, weekStart }];
+}
+
+function mapHostsToUsers(host: { user: Pick<User, "username" | "name" | "weekStart"> }) {
+  return {
+    username: host.user.username,
+    name: host.user.name,
+    weekStart: host.user.weekStart,
+  };
+}
diff --git a/packages/features/flags/context/provider.ts b/packages/features/flags/context/provider.ts
index 9a8cb64e48..deb6adb5b5 100644
--- a/packages/features/flags/context/provider.ts
+++ b/packages/features/flags/context/provider.ts
@@ -1,4 +1,4 @@
-import * as React from "react";
+import { createContext, useContext, createElement } from "react";
 
 import type { AppFlags } from "../config";
 
@@ -12,7 +12,7 @@ export type Flags = AppFlags;
 /**
  * Allows you to access the flags from context
  */
-const FeatureContext = React.createContext<Flags | null>(null);
+const FeatureContext = createContext<Flags | null>(null);
 
 /**
  * Accesses the evaluated flags from context.
@@ -21,7 +21,7 @@ const FeatureContext = React.createContext<Flags | null>(null);
  * this component.
  */
 export function useFlagMap() {
-  const flagMapContext = React.useContext(FeatureContext);
+  const flagMapContext = useContext(FeatureContext);
   if (flagMapContext === null) throw new Error("Error: useFlagMap was used outside of FeatureProvider.");
   return flagMapContext as Flags;
 }
@@ -52,5 +52,5 @@ export function useFlagMap() {
  * so you might not need this at all._
  */
 export function FeatureProvider<F extends Flags>(props: { value: F; children: React.ReactNode }) {
-  return React.createElement(FeatureContext.Provider, { value: props.value }, props.children);
+  return createElement(FeatureContext.Provider, { value: props.value }, props.children);
 }
diff --git a/packages/features/form-builder/Components.tsx b/packages/features/form-builder/Components.tsx
index 1d5bb548a5..1cd065bba8 100644
--- a/packages/features/form-builder/Components.tsx
+++ b/packages/features/form-builder/Components.tsx
@@ -9,7 +9,17 @@ import type {
 import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { BookingFieldType } from "@calcom/prisma/zod-utils";
-import { PhoneInput, AddressInput, Button, Label, Group, RadioField, EmailField, Tooltip } from "@calcom/ui";
+import {
+  PhoneInput,
+  AddressInput,
+  Button,
+  Label,
+  Group,
+  RadioField,
+  EmailField,
+  Tooltip,
+  Checkbox,
+} from "@calcom/ui";
 import { UserPlus, X } from "@calcom/ui/components/icon";
 
 import { ComponentForField } from "./FormBuilder";
@@ -245,11 +255,11 @@ export const Components: Record<BookingFieldType, Component> = {
                     }
                     setValue(newValue);
                   }}
-                  className="dark:bg-darkgray-300 border-subtle border-default text-emphasis h-4 w-4 rounded focus:ring-black ltr:mr-2 rtl:ml-2"
+                  className="dark:bg-darkgray-300 border-subtle text-emphasis h-4 w-4 rounded focus:ring-black ltr:mr-2 rtl:ml-2"
                   value={option.value}
                   checked={value.includes(option.value)}
                 />
-                <span className="dark:text-inverted ms-2 me-2 text-sm">{option.label ?? ""}</span>
+                <span className="text-emphasis ms-2 me-2 text-sm">{option.label ?? ""}</span>
               </label>
             );
           })}
@@ -304,7 +314,7 @@ export const Components: Record<BookingFieldType, Component> = {
                         type="radio"
                         disabled={readOnly}
                         name={name}
-                        className="dark:bg-darkgray-300 border-subtle border-default text-emphasis h-4 w-4 focus:ring-black ltr:mr-2 rtl:ml-2"
+                        className="dark:bg-darkgray-300 border-subtle text-emphasis h-4 w-4 focus:ring-black ltr:mr-2 rtl:ml-2"
                         value={option.value}
                         onChange={(e) => {
                           setValue({
@@ -364,8 +374,7 @@ export const Components: Record<BookingFieldType, Component> = {
     factory: ({ readOnly, label, value, setValue }) => {
       return (
         <div className="flex">
-          <input
-            type="checkbox"
+          <Checkbox
             onChange={(e) => {
               if (e.target.checked) {
                 setValue(true);
@@ -373,12 +382,11 @@ export const Components: Record<BookingFieldType, Component> = {
                 setValue(false);
               }
             }}
-            className="border-default disabled:bg-emphasis disabled:dark:text-subtle text-emphasis h-4 w-4 rounded focus:ring-black ltr:mr-2 rtl:ml-2"
             placeholder=""
             checked={value}
             disabled={readOnly}
+            description={label ?? ""}
           />
-          <Label className="text-default dark:text-inverted -mt-px block text-sm font-medium">{label}</Label>
         </div>
       );
     },
diff --git a/packages/features/insights/components/AverageEventDurationChart.tsx b/packages/features/insights/components/AverageEventDurationChart.tsx
index 1c38ff0707..f2320f7f41 100644
--- a/packages/features/insights/components/AverageEventDurationChart.tsx
+++ b/packages/features/insights/components/AverageEventDurationChart.tsx
@@ -16,13 +16,21 @@ export const AverageEventDurationChart = () => {
   const [startDate, endDate] = dateRange;
   const { selectedTeamId: teamId, selectedUserId } = filter;
 
-  const { data, isSuccess, isLoading } = trpc.viewer.insights.averageEventDuration.useQuery({
-    startDate: startDate.toISOString(),
-    endDate: endDate.toISOString(),
-    teamId: teamId ?? undefined,
-    memberUserId: selectedMemberUserId ?? undefined,
-    userId: selectedUserId ?? undefined,
-  });
+  const { data, isSuccess, isLoading } = trpc.viewer.insights.averageEventDuration.useQuery(
+    {
+      startDate: startDate.toISOString(),
+      endDate: endDate.toISOString(),
+      teamId: teamId ?? undefined,
+      memberUserId: selectedMemberUserId ?? undefined,
+      userId: selectedUserId ?? undefined,
+    },
+    {
+      staleTime: 30000,
+      trpc: {
+        context: { skipBatch: true },
+      },
+    }
+  );
 
   if (isLoading) return <LoadingInsight />;
 
diff --git a/packages/features/insights/components/BookingKPICards.tsx b/packages/features/insights/components/BookingKPICards.tsx
index fc50b5f621..3487dbad8d 100644
--- a/packages/features/insights/components/BookingKPICards.tsx
+++ b/packages/features/insights/components/BookingKPICards.tsx
@@ -16,14 +16,22 @@ export const BookingKPICards = () => {
 
   const { selectedTeamId: teamId } = filter;
 
-  const { data, isSuccess, isLoading } = trpc.viewer.insights.eventsByStatus.useQuery({
-    startDate: startDate.toISOString(),
-    endDate: endDate.toISOString(),
-    teamId,
-    eventTypeId: selectedEventTypeId ?? undefined,
-    memberUserId: selectedMemberUserId ?? undefined,
-    userId: selectedUserId ?? undefined,
-  });
+  const { data, isSuccess, isLoading } = trpc.viewer.insights.eventsByStatus.useQuery(
+    {
+      startDate: startDate.toISOString(),
+      endDate: endDate.toISOString(),
+      teamId,
+      eventTypeId: selectedEventTypeId ?? undefined,
+      memberUserId: selectedMemberUserId ?? undefined,
+      userId: selectedUserId ?? undefined,
+    },
+    {
+      staleTime: 30000,
+      trpc: {
+        context: { skipBatch: true },
+      },
+    }
+  );
 
   const categories: {
     title: string;
diff --git a/packages/features/insights/components/BookingStatusLineChart.tsx b/packages/features/insights/components/BookingStatusLineChart.tsx
index 00ed4fd0d3..f16cfb4e8b 100644
--- a/packages/features/insights/components/BookingStatusLineChart.tsx
+++ b/packages/features/insights/components/BookingStatusLineChart.tsx
@@ -27,14 +27,22 @@ export const BookingStatusLineChart = () => {
     data: eventsTimeLine,
     isSuccess,
     isLoading,
-  } = trpc.viewer.insights.eventsTimeline.useQuery({
-    timeView: selectedTimeView,
-    startDate: startDate.toISOString(),
-    endDate: endDate.toISOString(),
-    teamId: selectedTeamId ?? undefined,
-    eventTypeId: selectedEventTypeId ?? undefined,
-    userId: selectedUserId ?? undefined,
-  });
+  } = trpc.viewer.insights.eventsTimeline.useQuery(
+    {
+      timeView: selectedTimeView,
+      startDate: startDate.toISOString(),
+      endDate: endDate.toISOString(),
+      teamId: selectedTeamId ?? undefined,
+      eventTypeId: selectedEventTypeId ?? undefined,
+      userId: selectedUserId ?? undefined,
+    },
+    {
+      staleTime: 30000,
+      trpc: {
+        context: { skipBatch: true },
+      },
+    }
+  );
 
   if (isLoading) return <LoadingInsight />;
 
diff --git a/packages/features/insights/components/LeastBookedTeamMembersTable.tsx b/packages/features/insights/components/LeastBookedTeamMembersTable.tsx
index 8285088ee3..5ba2766511 100644
--- a/packages/features/insights/components/LeastBookedTeamMembersTable.tsx
+++ b/packages/features/insights/components/LeastBookedTeamMembersTable.tsx
@@ -14,12 +14,20 @@ export const LeastBookedTeamMembersTable = () => {
   const { dateRange, selectedEventTypeId, selectedTeamId: teamId } = filter;
   const [startDate, endDate] = dateRange;
 
-  const { data, isSuccess, isLoading } = trpc.viewer.insights.membersWithLeastBookings.useQuery({
-    startDate: startDate.toISOString(),
-    endDate: endDate.toISOString(),
-    teamId,
-    eventTypeId: selectedEventTypeId ?? undefined,
-  });
+  const { data, isSuccess, isLoading } = trpc.viewer.insights.membersWithLeastBookings.useQuery(
+    {
+      startDate: startDate.toISOString(),
+      endDate: endDate.toISOString(),
+      teamId,
+      eventTypeId: selectedEventTypeId ?? undefined,
+    },
+    {
+      staleTime: 30000,
+      trpc: {
+        context: { skipBatch: true },
+      },
+    }
+  );
 
   if (isLoading) return <LoadingInsight />;
 
diff --git a/packages/features/insights/components/MostBookedTeamMembersTable.tsx b/packages/features/insights/components/MostBookedTeamMembersTable.tsx
index b83f714d44..984c4701c5 100644
--- a/packages/features/insights/components/MostBookedTeamMembersTable.tsx
+++ b/packages/features/insights/components/MostBookedTeamMembersTable.tsx
@@ -15,12 +15,20 @@ export const MostBookedTeamMembersTable = () => {
   const [startDate, endDate] = dateRange;
   const { selectedTeamId: teamId } = filter;
 
-  const { data, isSuccess, isLoading } = trpc.viewer.insights.membersWithMostBookings.useQuery({
-    startDate: startDate.toISOString(),
-    endDate: endDate.toISOString(),
-    teamId,
-    eventTypeId: selectedEventTypeId ?? undefined,
-  });
+  const { data, isSuccess, isLoading } = trpc.viewer.insights.membersWithMostBookings.useQuery(
+    {
+      startDate: startDate.toISOString(),
+      endDate: endDate.toISOString(),
+      teamId,
+      eventTypeId: selectedEventTypeId ?? undefined,
+    },
+    {
+      staleTime: 30000,
+      trpc: {
+        context: { skipBatch: true },
+      },
+    }
+  );
 
   if (isLoading) return <LoadingInsight />;
 
diff --git a/packages/features/insights/components/PopularEventsTable.tsx b/packages/features/insights/components/PopularEventsTable.tsx
index dfc2109fa5..9af8458027 100644
--- a/packages/features/insights/components/PopularEventsTable.tsx
+++ b/packages/features/insights/components/PopularEventsTable.tsx
@@ -14,13 +14,21 @@ export const PopularEventsTable = () => {
   const [startDate, endDate] = dateRange;
   const { selectedTeamId: teamId } = filter;
 
-  const { data, isSuccess, isLoading } = trpc.viewer.insights.popularEventTypes.useQuery({
-    startDate: startDate.toISOString(),
-    endDate: endDate.toISOString(),
-    teamId: teamId ?? undefined,
-    userId: selectedUserId ?? undefined,
-    memberUserId: selectedMemberUserId ?? undefined,
-  });
+  const { data, isSuccess, isLoading } = trpc.viewer.insights.popularEventTypes.useQuery(
+    {
+      startDate: startDate.toISOString(),
+      endDate: endDate.toISOString(),
+      teamId: teamId ?? undefined,
+      userId: selectedUserId ?? undefined,
+      memberUserId: selectedMemberUserId ?? undefined,
+    },
+    {
+      staleTime: 30000,
+      trpc: {
+        context: { skipBatch: true },
+      },
+    }
+  );
 
   if (isLoading) return <LoadingInsight />;
 
diff --git a/packages/features/insights/context/FiltersProvider.tsx b/packages/features/insights/context/FiltersProvider.tsx
index 05c97ebdb2..5fc726537a 100644
--- a/packages/features/insights/context/FiltersProvider.tsx
+++ b/packages/features/insights/context/FiltersProvider.tsx
@@ -117,9 +117,10 @@ export function FiltersProvider({ children }: { children: React.ReactNode }) {
         setSelectedTimeView: (selectedTimeView) => setSelectedTimeView(selectedTimeView),
         setSelectedMemberUserId: (selectedMemberUserId) => {
           setSelectedMemberUserId(selectedMemberUserId);
+          const { userId, eventTypeId, ...rest } = router.query;
           router.push({
             query: {
-              ...router.query,
+              ...rest,
               memberUserId: selectedMemberUserId,
             },
           });
@@ -127,8 +128,10 @@ export function FiltersProvider({ children }: { children: React.ReactNode }) {
         setSelectedTeamId: (selectedTeamId) => {
           setSelectedTeamId(selectedTeamId);
           setSelectedUserId(null);
+          setSelectedMemberUserId(null);
+          setSelectedEventTypeId(null);
           const { teamId, eventTypeId, memberUserId, ...rest } = router.query;
-          router.replace({
+          router.push({
             query: {
               ...rest,
               teamId: selectedTeamId,
@@ -139,8 +142,9 @@ export function FiltersProvider({ children }: { children: React.ReactNode }) {
           setSelectedUserId(selectedUserId);
           setSelectedTeamId(null);
           setSelectedTeamName(null);
+          setSelectedEventTypeId(null);
           const { teamId, eventTypeId, memberUserId, ...rest } = router.query;
-          router.replace({
+          router.push({
             query: {
               ...rest,
               userId: selectedUserId,
diff --git a/packages/features/insights/server/events.ts b/packages/features/insights/server/events.ts
index ac9800eed5..5c9f878dee 100644
--- a/packages/features/insights/server/events.ts
+++ b/packages/features/insights/server/events.ts
@@ -11,10 +11,13 @@ interface ITimeRange {
 type TimeViewType = "week" | "month" | "year" | "day";
 
 class EventsInsights {
-  static getBookingsInTimeRange = async (timeRange: ITimeRange, where: Prisma.BookingWhereInput) => {
+  static getBookingsInTimeRange = async (
+    timeRange: ITimeRange,
+    where: Prisma.BookingTimeStatusWhereInput
+  ) => {
     const { start, end } = timeRange;
 
-    const events = await prisma.booking.count({
+    const events = await prisma.bookingTimeStatus.count({
       where: {
         ...where,
         createdAt: {
@@ -27,48 +30,56 @@ class EventsInsights {
     return events;
   };
 
-  static getCreatedEventsInTimeRange = async (timeRange: ITimeRange, where: Prisma.BookingWhereInput) => {
+  static getCreatedEventsInTimeRange = async (
+    timeRange: ITimeRange,
+    where: Prisma.BookingTimeStatusWhereInput
+  ) => {
     const result = await this.getBookingsInTimeRange(timeRange, where);
 
     return result;
   };
 
-  static getCancelledEventsInTimeRange = async (timeRange: ITimeRange, where: Prisma.BookingWhereInput) => {
+  static getCancelledEventsInTimeRange = async (
+    timeRange: ITimeRange,
+    where: Prisma.BookingTimeStatusWhereInput
+  ) => {
     const result = await this.getBookingsInTimeRange(timeRange, {
       ...where,
-      status: "CANCELLED",
+      timeStatus: "cancelled",
     });
 
     return result;
   };
 
-  static getCompletedEventsInTimeRange = async (timeRange: ITimeRange, where: Prisma.BookingWhereInput) => {
+  static getCompletedEventsInTimeRange = async (
+    timeRange: ITimeRange,
+    where: Prisma.BookingTimeStatusWhereInput
+  ) => {
     const result = await this.getBookingsInTimeRange(timeRange, {
       ...where,
-      status: "ACCEPTED",
-      endTime: {
-        lte: dayjs().toISOString(),
-      },
+      timeStatus: "completed",
     });
 
     return result;
   };
 
-  static getRescheduledEventsInTimeRange = async (timeRange: ITimeRange, where: Prisma.BookingWhereInput) => {
+  static getRescheduledEventsInTimeRange = async (
+    timeRange: ITimeRange,
+    where: Prisma.BookingTimeStatusWhereInput
+  ) => {
     const result = await this.getBookingsInTimeRange(timeRange, {
       ...where,
-      rescheduled: true,
+      timeStatus: "rescheduled",
     });
 
     return result;
   };
 
-  static getBaseBookingForEventStatus = async (where: Prisma.BookingWhereInput) => {
-    const baseBookings = await prisma.booking.findMany({
+  static getBaseBookingForEventStatus = async (where: Prisma.BookingTimeStatusWhereInput) => {
+    const baseBookings = await prisma.bookingTimeStatus.findMany({
       where,
       select: {
         id: true,
-        eventType: true,
       },
     });
 
@@ -76,23 +87,23 @@ class EventsInsights {
   };
 
   static getTotalRescheduledEvents = async (bookingIds: number[]) => {
-    return await prisma.booking.count({
+    return await prisma.bookingTimeStatus.count({
       where: {
         id: {
           in: bookingIds,
         },
-        rescheduled: true,
+        timeStatus: "rescheduled",
       },
     });
   };
 
   static getTotalCancelledEvents = async (bookingIds: number[]) => {
-    return await prisma.booking.count({
+    return await prisma.bookingTimeStatus.count({
       where: {
         id: {
           in: bookingIds,
         },
-        status: "CANCELLED",
+        timeStatus: "cancelled",
       },
     });
   };
diff --git a/packages/features/insights/server/trpc-router.ts b/packages/features/insights/server/trpc-router.ts
index 6a62434647..38cda62918 100644
--- a/packages/features/insights/server/trpc-router.ts
+++ b/packages/features/insights/server/trpc-router.ts
@@ -93,7 +93,7 @@ export const insightsRouter = router({
         throw new TRPCError({ code: "UNAUTHORIZED" });
       }
 
-      let whereConditional: Prisma.BookingWhereInput = {};
+      let whereConditional: Prisma.BookingTimeStatusWhereInput = {};
 
       if (eventTypeId) {
         whereConditional["eventTypeId"] = eventTypeId;
@@ -102,9 +102,7 @@ export const insightsRouter = router({
         whereConditional["userId"] = memberUserId;
       }
       if (userId) {
-        whereConditional["eventType"] = {
-          teamId: null,
-        };
+        whereConditional["teamId"] = null;
         whereConditional["userId"] = userId;
       }
 
@@ -122,14 +120,13 @@ export const insightsRouter = router({
           ...whereConditional,
           OR: [
             {
-              eventType: {
-                teamId: teamId,
-              },
+              teamId,
             },
             {
               userId: {
                 in: userIdsFromTeam,
               },
+              teamId: null,
             },
           ],
         };
@@ -161,9 +158,7 @@ export const insightsRouter = router({
           gte: lastPeriodStartDate.toDate(),
           lte: lastPeriodEndDate.toDate(),
         },
-        eventType: {
-          teamId: teamId,
-        },
+        teamId: teamId,
       });
 
       const lastPeriodBaseBookingIds = lastPeriodBaseBookings.map((b) => b.id);
@@ -246,7 +241,7 @@ export const insightsRouter = router({
 
       const timeView = inputTimeView;
 
-      let whereConditional: Prisma.BookingWhereInput = {};
+      let whereConditional: Prisma.BookingTimeStatusWhereInput = {};
 
       if (teamId) {
         const usersFromTeam = await ctx.prisma.membership.findMany({
@@ -262,14 +257,13 @@ export const insightsRouter = router({
         whereConditional = {
           OR: [
             {
-              eventType: {
-                teamId,
-              },
+              teamId,
             },
             {
               userId: {
                 in: userIdsFromTeams,
               },
+              teamId: null,
             },
           ],
         };
@@ -291,9 +285,7 @@ export const insightsRouter = router({
       if (selfUserId && !!whereConditional) {
         // In this delete we are deleting the teamId filter
         whereConditional["userId"] = selfUserId;
-        whereConditional["eventType"] = {
-          teamId: null,
-        };
+        whereConditional["teamId"] = null;
       }
 
       // Get timeline data
@@ -382,7 +374,7 @@ export const insightsRouter = router({
         return [];
       }
 
-      let bookingWhere: Prisma.BookingWhereInput = {
+      let bookingWhere: Prisma.BookingTimeStatusWhereInput = {
         createdAt: {
           gte: dayjs(startDate).startOf("day").toDate(),
           lte: dayjs(endDate).endOf("day").toDate(),
@@ -403,14 +395,13 @@ export const insightsRouter = router({
           ...bookingWhere,
           OR: [
             {
-              eventType: {
-                teamId,
-              },
+              teamId,
             },
             {
               userId: {
                 in: userIdsFromTeams,
               },
+              teamId: null,
             },
           ],
         };
@@ -419,16 +410,14 @@ export const insightsRouter = router({
       if (userId) {
         bookingWhere.userId = userId;
         // Don't take bookings from any team
-        bookingWhere.eventType = {
-          teamId: null,
-        };
+        bookingWhere.teamId = null;
       }
 
       if (memberUserId) {
         bookingWhere.userId = memberUserId;
       }
 
-      const bookingsFromSelected = await ctx.prisma.booking.groupBy({
+      const bookingsFromSelected = await ctx.prisma.bookingTimeStatus.groupBy({
         by: ["eventTypeId"],
         where: bookingWhere,
         _count: {
@@ -545,14 +534,14 @@ export const insightsRouter = router({
       const startDate = dayjs(startDateString);
       const endDate = dayjs(endDateString);
 
-      let whereConditional: Prisma.BookingWhereInput = {
+      let whereConditional: Prisma.BookingTimeStatusWhereInput = {
         createdAt: {
           gte: dayjs(startDate).startOf("day").toDate(),
           lte: dayjs(endDate).endOf("day").toDate(),
         },
       };
       if (userId) {
-        delete whereConditional.eventType;
+        delete whereConditional.teamId;
         whereConditional["userId"] = userId;
       }
 
@@ -571,14 +560,13 @@ export const insightsRouter = router({
           ...whereConditional,
           OR: [
             {
-              eventType: {
-                teamId,
-              },
+              teamId,
             },
             {
               userId: {
                 in: userIdsFromTeams,
               },
+              teamId: null,
             },
           ],
         };
@@ -587,9 +575,7 @@ export const insightsRouter = router({
       if (memberUserId) {
         whereConditional = {
           userId: memberUserId,
-          eventType: {
-            teamId,
-          },
+          teamId,
         };
       }
 
@@ -614,7 +600,10 @@ export const insightsRouter = router({
         const startDate = dayjs(date).startOf(startOfEndOf);
         const endDate = dayjs(date).endOf(startOfEndOf);
 
-        const bookingsInTimeRange = await ctx.prisma.booking.findMany({
+        const bookingsInTimeRange = await ctx.prisma.bookingTimeStatus.findMany({
+          select: {
+            eventLength: true,
+          },
           where: {
             ...whereConditional,
             createdAt: {
@@ -622,14 +611,11 @@ export const insightsRouter = router({
               lte: endDate.toDate(),
             },
           },
-          include: {
-            eventType: true,
-          },
         });
 
         const avgDuration =
           bookingsInTimeRange.reduce((acc, booking) => {
-            const duration = booking.eventType?.length || 0;
+            const duration = booking.eventLength || 0;
             return acc + duration;
           }, 0) / bookingsInTimeRange.length;
 
@@ -654,21 +640,19 @@ export const insightsRouter = router({
         return [];
       }
       const user = ctx.user;
-      const eventTypeWhere: Prisma.EventTypeWhereInput = {
-        teamId: teamId,
-      };
-      if (eventTypeId) {
-        eventTypeWhere["id"] = eventTypeId;
-      }
 
-      const bookingWhere: Prisma.BookingWhereInput = {
-        eventType: eventTypeWhere,
+      const bookingWhere: Prisma.BookingTimeStatusWhereInput = {
+        teamId,
         createdAt: {
           gte: dayjs(startDate).startOf("day").toDate(),
           lte: dayjs(endDate).endOf("day").toDate(),
         },
       };
 
+      if (eventTypeId) {
+        bookingWhere.eventTypeId = eventTypeId;
+      }
+
       if (teamId) {
         const usersFromTeam = await ctx.prisma.membership.findMany({
           where: {
@@ -679,22 +663,22 @@ export const insightsRouter = router({
           },
         });
         const userIdsFromTeams = usersFromTeam.map((u) => u.userId);
-        delete bookingWhere.eventType;
+        delete bookingWhere.eventTypeId;
+        delete bookingWhere.teamId;
         bookingWhere["OR"] = [
           {
-            eventType: {
-              teamId,
-            },
+            teamId,
           },
           {
             userId: {
               in: userIdsFromTeams,
             },
+            teamId: null,
           },
         ];
       }
 
-      const bookingsFromTeam = await ctx.prisma.booking.groupBy({
+      const bookingsFromTeam = await ctx.prisma.bookingTimeStatus.groupBy({
         by: ["userId"],
         where: bookingWhere,
         _count: {
@@ -753,15 +737,9 @@ export const insightsRouter = router({
         return [];
       }
       const user = ctx.user;
-      const eventTypeWhere: Prisma.EventTypeWhereInput = {
-        teamId: teamId,
-      };
-      if (eventTypeId) {
-        eventTypeWhere["id"] = eventTypeId;
-      }
 
-      const bookingWhere: Prisma.BookingWhereInput = {
-        eventType: eventTypeWhere,
+      const bookingWhere: Prisma.BookingTimeStatusWhereInput = {
+        eventTypeId,
         createdAt: {
           gte: dayjs(startDate).startOf("day").toDate(),
           lte: dayjs(endDate).endOf("day").toDate(),
@@ -778,22 +756,20 @@ export const insightsRouter = router({
           },
         });
         const userIdsFromTeams = usersFromTeam.map((u) => u.userId);
-        delete bookingWhere.eventType;
         bookingWhere["OR"] = [
           {
-            eventType: {
-              teamId,
-            },
+            teamId,
           },
           {
             userId: {
               in: userIdsFromTeams,
             },
+            teamId: null,
           },
         ];
       }
 
-      const bookingsFromTeam = await ctx.prisma.booking.groupBy({
+      const bookingsFromTeam = await ctx.prisma.bookingTimeStatus.groupBy({
         by: ["userId"],
         where: bookingWhere,
         _count: {
diff --git a/packages/features/package.json b/packages/features/package.json
index f1c05ccb33..7582de6295 100644
--- a/packages/features/package.json
+++ b/packages/features/package.json
@@ -12,7 +12,13 @@
     "@calcom/ui": "*",
     "@lexical/react": "^0.5.0",
     "dompurify": "^2.4.1",
+    "framer-motion": "^10.12.3",
     "lexical": "^0.5.0",
-    "zustand": "^4.1.4"
+    "react-sticky-box": "^2.0.4",
+    "zustand": "^4.3.2"
+  },
+  "devDependencies": {
+    "@testing-library/react-hooks": "^8.0.1",
+    "mockdate": "^3.0.5"
   }
 }
diff --git a/packages/features/schedules/index.ts b/packages/features/schedules/index.ts
index 40b494c5f8..fe06d0e457 100644
--- a/packages/features/schedules/index.ts
+++ b/packages/features/schedules/index.ts
@@ -1 +1,3 @@
 export * from "./components";
+export type { Slots } from "./lib/use-schedule";
+export { useSchedule, useSlotsForDate, useNonEmptyScheduleDays } from "./lib/use-schedule";
diff --git a/packages/features/schedules/lib/use-schedule/index.ts b/packages/features/schedules/lib/use-schedule/index.ts
new file mode 100644
index 0000000000..ce81319e9c
--- /dev/null
+++ b/packages/features/schedules/lib/use-schedule/index.ts
@@ -0,0 +1,4 @@
+export { useSchedule } from "./useSchedule";
+export { useSlotsForDate } from "./useSlotsForDate";
+export { useNonEmptyScheduleDays } from "./useNonEmptyScheduleDays";
+export type {  Slots } from "./types";
diff --git a/packages/features/schedules/lib/use-schedule/types.ts b/packages/features/schedules/lib/use-schedule/types.ts
new file mode 100644
index 0000000000..72ba9df508
--- /dev/null
+++ b/packages/features/schedules/lib/use-schedule/types.ts
@@ -0,0 +1,3 @@
+import { RouterOutputs } from "@calcom/trpc/react";
+
+export type Slots = RouterOutputs["viewer"]["public"]["slots"]["getSchedule"]["slots"];
diff --git a/packages/features/schedules/lib/use-schedule/useNonEmptyScheduleDays.ts b/packages/features/schedules/lib/use-schedule/useNonEmptyScheduleDays.ts
new file mode 100644
index 0000000000..eca607c322
--- /dev/null
+++ b/packages/features/schedules/lib/use-schedule/useNonEmptyScheduleDays.ts
@@ -0,0 +1,14 @@
+import { useMemo } from "react";
+
+import type { Slots } from "../use-schedule";
+
+export const getNonEmptyScheduleDays = (slots?: Slots) => {
+  if (typeof slots === "undefined") return [];
+  return Object.keys(slots).filter((day) => slots[day].length > 0);
+};
+
+export const useNonEmptyScheduleDays = (slots?: Slots) => {
+  const days = useMemo(() => getNonEmptyScheduleDays(slots), [slots]);
+
+  return days;
+};
diff --git a/packages/features/schedules/lib/use-schedule/useSchedule.ts b/packages/features/schedules/lib/use-schedule/useSchedule.ts
new file mode 100644
index 0000000000..40e1ad2028
--- /dev/null
+++ b/packages/features/schedules/lib/use-schedule/useSchedule.ts
@@ -0,0 +1,49 @@
+import dayjs from "@calcom/dayjs";
+import { trpc } from "@calcom/trpc/react";
+
+type UseScheduleWithCacheArgs = {
+  username?: string | null;
+  eventSlug?: string | null;
+  eventId?: number | null;
+  month?: string | null;
+  timezone?: string | null;
+  prefetchNextMonth?: boolean;
+};
+
+export const useSchedule = ({
+  month,
+  timezone,
+  username,
+  eventSlug,
+  eventId,
+  prefetchNextMonth,
+}: UseScheduleWithCacheArgs) => {
+  const monthDayjs = month ? dayjs(month) : dayjs();
+  const nextMonthDayjs = monthDayjs.add(1, "month");
+
+  // Why the non-null assertions? All of these arguments are checked in the enabled condition,
+  // and the query will not run if they are null. However, the check in `enabled` does
+  // no satisfy typscript.
+  return trpc.viewer.public.slots.getSchedule.useQuery(
+    {
+      usernameList: username && username.indexOf("+") > -1 ? username.split("+") : [username!],
+      eventTypeSlug: eventSlug!,
+      // @TODO: Old code fetched 2 days ago if we were fetching the current month.
+      // Do we want / need to keep that behavior?
+      startTime: monthDayjs.startOf("month").toISOString(),
+      // if `prefetchNextMonth` is true, two months are fetched at once.
+      endTime: (prefetchNextMonth ? nextMonthDayjs : monthDayjs).endOf("month").toISOString(),
+      timeZone: timezone!,
+      eventTypeId: eventId!,
+    },
+    {
+      refetchOnWindowFocus: false,
+      enabled:
+        Boolean(username) &&
+        Boolean(eventSlug) &&
+        (Boolean(eventId) || eventId === 0) &&
+        Boolean(month) &&
+        Boolean(timezone),
+    }
+  );
+};
diff --git a/packages/features/schedules/lib/use-schedule/useSlotsForDate.ts b/packages/features/schedules/lib/use-schedule/useSlotsForDate.ts
new file mode 100644
index 0000000000..b74ede7ee6
--- /dev/null
+++ b/packages/features/schedules/lib/use-schedule/useSlotsForDate.ts
@@ -0,0 +1,31 @@
+import { useMemo } from "react";
+
+import type { Slots } from "./types";
+
+/**
+ * Get's slots for a specific date from the schedul cache.
+ * @param date Format YYYY-MM-DD
+ * @param scheduleCache Instance of useScheduleWithCache
+ */
+export const useSlotsForDate = (date: string | null, slots?: Slots) => {
+  const slotsForDate = useMemo(() => {
+    if (!date || typeof slots === "undefined") return [];
+    return slots[date] || [];
+  }, [date, slots]);
+
+  return slotsForDate;
+};
+
+export const useSlotsForMultipleDates = (dates: (string | null)[], slots?: Slots) => {
+  const slotsForDates = useMemo(() => {
+    if (typeof slots === "undefined") return [];
+    return dates
+      .filter((date) => date !== null)
+      .map((date) => ({
+        slots: slots[`${date}`] || [],
+        date,
+      }));
+  }, [dates, slots]);
+
+  return slotsForDates;
+};
diff --git a/packages/features/settings/layouts/SettingsLayout.tsx b/packages/features/settings/layouts/SettingsLayout.tsx
index 4a631bb7b1..c8c39c427d 100644
--- a/packages/features/settings/layouts/SettingsLayout.tsx
+++ b/packages/features/settings/layouts/SettingsLayout.tsx
@@ -255,8 +255,12 @@ const SettingsSidebarContainer = ({
                                   }),
                                 ])
                               }>
-                              <div className="ltr:mr-3 rtl:ml-3">
-                                {teamMenuState[index].teamMenuOpen ? <ChevronDown /> : <ChevronRight />}
+                              <div className="me-3">
+                                {teamMenuState[index].teamMenuOpen ? (
+                                  <ChevronDown className="h-4 w-4" />
+                                ) : (
+                                  <ChevronRight className="h-4 w-4" />
+                                )}
                               </div>
                               <img
                                 src={getPlaceholderAvatar(team.logo, team?.name as string)}
@@ -352,7 +356,7 @@ const MobileSettingsContainer = (props: { onSideContainerOpen?: () => void }) =>
           <button
             className="hover:bg-emphasis flex items-center space-x-2 rounded-md px-3 py-1 rtl:space-x-reverse"
             onClick={() => router.back()}>
-            <ArrowLeft className="text-default" />
+            <ArrowLeft className="text-default h-4 w-4" />
             <p className="text-emphasis font-semibold">{t("settings")}</p>
           </button>
         </div>
@@ -393,6 +397,7 @@ export default function SettingsLayout({
     <Shell
       withoutSeo={true}
       flexChildrenContainer
+      hideHeadingOnMobile
       {...rest}
       SidebarContainer={
         <>
diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx
index 8c1ba4d387..86b803aa3f 100644
--- a/packages/features/shell/Shell.tsx
+++ b/packages/features/shell/Shell.tsx
@@ -22,7 +22,6 @@ import classNames from "@calcom/lib/classNames";
 import { APP_NAME, DESKTOP_APP_LINK, JOIN_SLACK, ROADMAP, WEBAPP_URL } from "@calcom/lib/constants";
 import getBrandColours from "@calcom/lib/getBrandColours";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import useTheme from "@calcom/lib/hooks/useTheme";
 import { isKeyInObject } from "@calcom/lib/isKeyInObject";
 import { trpc } from "@calcom/trpc/react";
 import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
@@ -197,6 +196,7 @@ type LayoutProps = {
   // Gives the ability to include actions to the right of the heading
   actions?: JSX.Element;
   smallHeading?: boolean;
+  hideHeadingOnMobile?: boolean;
 };
 
 const useBrandColors = () => {
@@ -231,7 +231,8 @@ export default function Shell(props: LayoutProps) {
   // if a page is unauthed and isPublic is true, the redirect does not happen.
   useRedirectToLoginIfUnauthenticated(props.isPublic);
   useRedirectToOnboardingIfNeeded();
-  useTheme();
+  // System Theme is automatically supported using ThemeProvider. If we intend to use user theme throughout the app we need to uncomment this.
+  // useTheme(profile.theme);
   useBrandColors();
 
   return !props.isPublic ? (
@@ -796,8 +797,9 @@ export function ShellMain(props: LayoutProps) {
     <>
       <div
         className={classNames(
-          "flex items-center md:mt-0 md:mb-6",
-          props.smallHeading ? "lg:mb-7" : "lg:mb-8"
+          "flex items-center md:mb-6 md:mt-0",
+          props.smallHeading ? "lg:mb-7" : "lg:mb-8",
+          props.hideHeadingOnMobile ? "mb-0" : "mb-6"
         )}>
         {!!props.backPath && (
           <Button
@@ -813,14 +815,16 @@ export function ShellMain(props: LayoutProps) {
           />
         )}
         {props.heading && (
-          <header className={classNames(props.large && "py-8", "flex w-full max-w-full items-center")}>
+          <header
+            className={classNames(props.large && "py-8", "flex w-full max-w-full items-center truncate")}>
             {props.HeadingLeftIcon && <div className="ltr:mr-4">{props.HeadingLeftIcon}</div>}
-            <div className={classNames("w-full ltr:mr-4 rtl:ml-4 md:block", props.headerClassName)}>
+            <div className={classNames("w-full truncate ltr:mr-4 rtl:ml-4 md:block", props.headerClassName)}>
               {props.heading && (
                 <h3
                   className={classNames(
-                    "font-cal max-w-28 sm:max-w-72 md:max-w-80 text-emphasis hidden truncate text-xl font-semibold tracking-wide md:block xl:max-w-full",
-                    props.smallHeading ? "text-base" : "text-xl"
+                    "font-cal max-w-28 sm:max-w-72 md:max-w-80 text-emphasis inline truncate text-lg font-semibold tracking-wide sm:text-xl md:block xl:max-w-full",
+                    props.smallHeading ? "text-base" : "text-xl",
+                    props.hideHeadingOnMobile && "hidden"
                   )}>
                   {!isLocaleReady ? <SkeletonText invisible /> : props.heading}
                 </h3>
diff --git a/packages/features/tips/UpgradeTip.tsx b/packages/features/tips/UpgradeTip.tsx
index 1a03fb4729..66ca54a279 100644
--- a/packages/features/tips/UpgradeTip.tsx
+++ b/packages/features/tips/UpgradeTip.tsx
@@ -44,7 +44,7 @@ export function UpgradeTip({
             alt={title}
           />
         </picture>
-        <div className="relative mt-4 px-8 sm:px-14">
+        <div className="relative my-4 px-8 sm:px-14">
           <h1 className={classNames("font-cal text-3xl", dark && "text-inverted")}>{t(title)}</h1>
           <p className={classNames("mt-4 mb-8 max-w-sm", dark ? "text-inverted" : "text-default")}>
             {t(description)}
diff --git a/packages/features/tsconfig.json b/packages/features/tsconfig.json
index b8fb2a6430..baae362e9a 100644
--- a/packages/features/tsconfig.json
+++ b/packages/features/tsconfig.json
@@ -5,7 +5,8 @@
     "paths": {
       "~/*": ["/*"]
     },
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "esModuleInterop": true
   },
   "include": [".", "../types/next-auth.d.ts"],
   "exclude": ["dist", "build", "node_modules"]
diff --git a/packages/lib/CalEventParser.ts b/packages/lib/CalEventParser.ts
index cce5f9f283..0da136346b 100644
--- a/packages/lib/CalEventParser.ts
+++ b/packages/lib/CalEventParser.ts
@@ -150,7 +150,7 @@ export const getUid = (calEvent: CalendarEvent): string => {
 };
 
 const getSeatReferenceId = (calEvent: CalendarEvent): string => {
-  return calEvent.attendeeSeatId ? `seatReferenceUid=${calEvent.attendeeSeatId}` : "";
+  return calEvent.attendeeSeatId ? calEvent.attendeeSeatId : "";
 };
 
 export const getManageLink = (calEvent: CalendarEvent) => {
@@ -161,12 +161,12 @@ ${WEBAPP_URL + "/booking/" + getUid(calEvent) + "?changes=true"}
 };
 
 export const getCancelLink = (calEvent: CalendarEvent): string => {
-  return (
-    WEBAPP_URL +
-    `/booking/${getUid(
-      calEvent
-    )}?cancel=true&allRemainingBookings=${!!calEvent.recurringEvent}&${getSeatReferenceId}`
-  );
+  const cancelLink = new URL(WEBAPP_URL + `/booking/${getUid(calEvent)}`);
+  cancelLink.searchParams.append("cancel", "true");
+  cancelLink.searchParams.append("allRemainingBookings", String(!!calEvent.recurringEvent));
+  const seatReferenceUid = getSeatReferenceId(calEvent);
+  if (seatReferenceUid) cancelLink.searchParams.append("seatReferenceUid", seatReferenceUid);
+  return cancelLink.toString();
 };
 
 export const getRescheduleLink = (calEvent: CalendarEvent): string => {
diff --git a/packages/lib/CalendarService.ts b/packages/lib/CalendarService.ts
index f06d1b031a..d4c0f62049 100644
--- a/packages/lib/CalendarService.ts
+++ b/packages/lib/CalendarService.ts
@@ -71,17 +71,6 @@ const getDuration = (start: string, end: string): DurationObject => ({
   minutes: dayjs(end).diff(dayjs(start), "minute"),
 });
 
-const buildUtcOffset = (minutes: number): string => {
-  const h =
-    minutes > 0
-      ? "+" + (Math.floor(minutes / 60) < 10 ? "0" + Math.floor(minutes / 60) : Math.floor(minutes / 60))
-      : "-" +
-        (Math.ceil(minutes / 60) > -10 ? "0" + Math.ceil(minutes / 60) * -1 : Math.ceil(minutes / 60) * -1);
-  const m = Math.abs(minutes % 60);
-  const offset = `${h}:${m}`;
-  return offset;
-};
-
 const getAttendees = (attendees: Person[]): Attendee[] =>
   attendees.map(({ email, name }) => ({ name, email, partstat: "NEEDS-ACTION" }));
 
@@ -321,7 +310,6 @@ export default abstract class BaseCalendarService implements Calendar {
         console.error("Error parsing calendar object: ", e);
         return;
       }
-      // const vevent = vcalendar.getFirstSubcomponent("vevent");
       const vevents = vcalendar.getAllSubcomponents("vevent");
       vevents.forEach((vevent) => {
         // if event status is free or transparent, return
@@ -335,22 +323,26 @@ export default abstract class BaseCalendarService implements Calendar {
         const tzid: string | undefined = vevent?.getFirstPropertyValue("tzid") || isUTC ? "UTC" : timezone;
         // In case of icalendar, when only tzid is available without vtimezone, we need to add vtimezone explicitly to take care of timezone diff
         if (!vcalendar.getFirstSubcomponent("vtimezone") && tzid) {
-          // this.registerTimezone(tzid);
+          try {
+            const timezoneComp = new ICAL.Component("vtimezone");
+            timezoneComp.addPropertyWithValue("tzid", tzid);
+            const standard = new ICAL.Component("standard");
 
-          const timezoneComp = new ICAL.Component("vtimezone");
-          timezoneComp.addPropertyWithValue("tzid", tzid);
-          const standard = new ICAL.Component("standard");
-          // get timezone offset
-          const tzoffsetfrom = buildUtcOffset(dayjs(event.startDate.toJSDate()).tz(tzid, true).utcOffset());
-          const tzoffsetto = buildUtcOffset(dayjs(event.endDate.toJSDate()).tz(tzid, true).utcOffset());
+            // get timezone offset
+            const tzoffsetfrom = dayjs(event.startDate.toJSDate()).tz(tzid).format("Z");
+            const tzoffsetto = dayjs(event.endDate.toJSDate()).tz(tzid).format("Z");
 
-          // set timezone offset
-          standard.addPropertyWithValue("tzoffsetfrom", tzoffsetfrom);
-          standard.addPropertyWithValue("tzoffsetto", tzoffsetto);
-          // provide a standard dtstart
-          standard.addPropertyWithValue("dtstart", "1601-01-01T00:00:00");
-          timezoneComp.addSubcomponent(standard);
-          vcalendar.addSubcomponent(timezoneComp);
+            // set timezone offset
+            standard.addPropertyWithValue("tzoffsetfrom", tzoffsetfrom);
+            standard.addPropertyWithValue("tzoffsetto", tzoffsetto);
+            // provide a standard dtstart
+            standard.addPropertyWithValue("dtstart", "1601-01-01T00:00:00");
+            timezoneComp.addSubcomponent(standard);
+            vcalendar.addSubcomponent(timezoneComp);
+          } catch (e) {
+            // Adds try-catch to ensure the code proceeds when Apple Calendar provides non-standard TZIDs
+            console.log("error in adding vtimezone", e);
+          }
         }
         const vtimezone = vcalendar.getFirstSubcomponent("vtimezone");
 
@@ -420,6 +412,7 @@ export default abstract class BaseCalendarService implements Calendar {
           event.startDate = event.startDate.convertToZone(zone);
           event.endDate = event.endDate.convertToZone(zone);
         }
+
         return events.push({
           start: dayjs(event.startDate.toJSDate()).toISOString(),
           end: dayjs(event.endDate.toJSDate()).toISOString(),
diff --git a/packages/lib/array.ts b/packages/lib/array.ts
new file mode 100644
index 0000000000..03d7c22932
--- /dev/null
+++ b/packages/lib/array.ts
@@ -0,0 +1 @@
+export const notUndefined = <T>(val: T | undefined): val is T => Boolean(val);
diff --git a/packages/lib/bookingSuccessRedirect.ts b/packages/lib/bookingSuccessRedirect.ts
index 9a61355566..ee1c357f04 100644
--- a/packages/lib/bookingSuccessRedirect.ts
+++ b/packages/lib/bookingSuccessRedirect.ts
@@ -24,6 +24,7 @@ export const bookingSuccessRedirect = async ({
 
     // Using parent ensures, Embed iframe would redirect outside of the iframe.
     window.parent.location.href = url.toString();
+    return;
   }
   return router.push({
     pathname: `/booking/${bookingUid}`,
diff --git a/packages/lib/date-fns/index.ts b/packages/lib/date-fns/index.ts
index a6e12f1100..9f92f7b7dc 100644
--- a/packages/lib/date-fns/index.ts
+++ b/packages/lib/date-fns/index.ts
@@ -130,6 +130,21 @@ export const isNextDayInTimezone = (time: string, timezoneA: string, timezoneB:
   return hoursTimezoneBIsEarlier && timezoneBIsLaterTimezone;
 };
 
+const weekDays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"] as const;
+type WeekDays = (typeof weekDays)[number];
+type WeekDayIndex = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+
+/**
+ * Turns weekday string (eg "Monday") into a number (eg 1).
+ * Also accepts a number as parameter (and straight returns that), and accepts
+ * undefined as a parameter; returns 0 in that case.
+ */
+export const weekdayToWeekIndex = (weekday: WeekDays | string | number | undefined) => {
+  if (typeof weekday === "undefined") return 0;
+  if (typeof weekday === "number") return weekday >= 0 && weekday >= 6 ? (weekday as WeekDayIndex) : 0;
+  return (weekDays.indexOf(weekday as WeekDays) as WeekDayIndex) || 0;
+};
+
 /**
  * Dayjs does not expose the timeZone value publicly through .get("timeZone")
  * instead, we as devs are required to somewhat hack our way to get the
diff --git a/packages/lib/defaultEvents.ts b/packages/lib/defaultEvents.ts
index e76525b779..36f1671e4d 100644
--- a/packages/lib/defaultEvents.ts
+++ b/packages/lib/defaultEvents.ts
@@ -1,4 +1,4 @@
-import type { Prisma } from "@prisma/client";
+import type { Prisma, Credential } from "@prisma/client";
 import { PeriodType, SchedulingType } from "@prisma/client";
 
 import { DailyLocationType } from "@calcom/app-store/locations";
@@ -25,7 +25,7 @@ type UsernameSlugLinkProps = {
   slug: string;
 };
 
-const user: User = {
+const user: User & { credentials: Credential[] } = {
   metadata: null,
   theme: null,
   credentials: [],
diff --git a/apps/web/lib/core/http/fetch-wrapper.ts b/packages/lib/fetch-wrapper.ts
similarity index 97%
rename from apps/web/lib/core/http/fetch-wrapper.ts
rename to packages/lib/fetch-wrapper.ts
index 4d5d6365e8..9c7dceb358 100644
--- a/apps/web/lib/core/http/fetch-wrapper.ts
+++ b/packages/lib/fetch-wrapper.ts
@@ -1,4 +1,4 @@
-import { HttpError } from "@lib/core/http/error";
+import { HttpError } from "./http-error";
 
 async function http<T>(path: string, config: RequestInit): Promise<T> {
   const request = new Request(path, config);
diff --git a/packages/lib/getBrandColours.tsx b/packages/lib/getBrandColours.tsx
index 7c7bb3635b..485e51046a 100644
--- a/packages/lib/getBrandColours.tsx
+++ b/packages/lib/getBrandColours.tsx
@@ -183,12 +183,14 @@ const useGetBrandingColours = ({
       "cal-brand-emphasis": lightColourMap["400"],
       "cal-brand-subtle": lightColourMap["200"],
       "cal-brand-text": getWCAGContrastColor(lightColourMap["500"]),
+      "cal-brand-accent": getWCAGContrastColor(lightColourMap["500"]),
     },
     dark: {
       "cal-brand": darkColourMap["500"],
       "cal-brand-emphasis": darkColourMap["600"],
       "cal-brand-subtle": darkColourMap["800"],
       "cal-brand-text": getWCAGContrastColor(darkColourMap["500"]),
+      "cal-brand-accent": getWCAGContrastColor(darkColourMap["500"]),
     },
   };
   return theme;
diff --git a/packages/lib/getEventTypeById.ts b/packages/lib/getEventTypeById.ts
index 922197aba9..0863e00579 100644
--- a/packages/lib/getEventTypeById.ts
+++ b/packages/lib/getEventTypeById.ts
@@ -37,7 +37,6 @@ export default async function getEventTypeById({
     name: true,
     username: true,
     id: true,
-    avatar: true,
     email: true,
     locale: true,
     defaultScheduleId: true,
@@ -306,6 +305,14 @@ export default async function getEventTypeById({
     }
     eventType.users.push(fallbackUser);
   }
+
+  const eventTypeUsers: ((typeof eventType.users)[number] & { avatar: string })[] = eventType.users.map(
+    (user) => ({
+      ...user,
+      avatar: `${CAL_URL}/${user.username}/avatar.png`,
+    })
+  );
+
   const currentUser = eventType.users.find((u) => u.id === userId);
   const t = await getTranslation(currentUser?.locale ?? "en", "common");
   const integrations = await getEnabledApps(credentials);
@@ -324,6 +331,7 @@ export default async function getEventTypeById({
   }
 
   const eventTypeObject = Object.assign({}, eventType, {
+    users: eventTypeUsers,
     periodStartDate: eventType.periodStartDate?.toString() ?? null,
     periodEndDate: eventType.periodEndDate?.toString() ?? null,
     bookingFields: getBookingFieldsWithSystemFields(eventType),
@@ -331,13 +339,15 @@ export default async function getEventTypeById({
 
   const teamMembers = eventTypeObject.team
     ? eventTypeObject.team.members.map((member) => {
-        const user = member.user;
-        user.avatar = `${CAL_URL}/${user.username}/avatar.png`;
+        const user: typeof member.user & { avatar: string } = {
+          ...member.user,
+          avatar: `${CAL_URL}/${member.user.username}/avatar.png`,
+        };
         return { ...user, eventTypes: user.eventTypes.map((evTy) => evTy.slug), membership: member.role };
       })
     : [];
 
-  // Find the current users memebership so we can check role to enable/disable deletion.
+  // Find the current users membership so we can check role to enable/disable deletion.
   // Sets to null if no membership is found - this must mean we are in a none team event type
   const currentUserMembership = eventTypeObject.team?.members.find((el) => el.user.id === userId) ?? null;
 
diff --git a/packages/lib/hooks/useTheme.tsx b/packages/lib/hooks/useTheme.tsx
index 8a6c4555b2..f0d0bfaf61 100644
--- a/packages/lib/hooks/useTheme.tsx
+++ b/packages/lib/hooks/useTheme.tsx
@@ -4,24 +4,28 @@ import { useEffect } from "react";
 import { useEmbedTheme } from "@calcom/embed-core/embed-iframe";
 import type { Maybe } from "@calcom/trpc/server";
 
-// makes sure the ui doesn't flash
-export default function useTheme(theme?: Maybe<string>) {
+/**
+ * It should be called once per route and only if you want to use app configured theme. System only theme works automatically by using ThemeProvider
+ * Calling it without a theme will just returns the current theme.
+ * It handles embed configured theme as well.
+ */
+export default function useTheme(themeToSet?: Maybe<string>) {
   const { resolvedTheme, setTheme, forcedTheme, theme: activeTheme } = useNextTheme();
   const embedTheme = useEmbedTheme();
-  // Embed UI configuration takes more precedence over App Configuration
-  const currentTheme = embedTheme || theme || "system";
 
   useEffect(() => {
-    if (currentTheme !== activeTheme && typeof currentTheme === "string") {
-      setTheme(currentTheme);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- we do not want activeTheme to re-render this effect
-  }, [currentTheme, setTheme]);
+    // If themeToSet is not provided the purpose is to just return the current the current values
+    if (!themeToSet) return;
 
-  useEffect(() => {
-    if (forcedTheme) setTheme(forcedTheme);
-  }, [forcedTheme, setTheme]);
+    // Embed theme takes precedence over theme configured in app. This allows embeds to be themed differently
+    const finalThemeToSet = embedTheme || themeToSet;
 
+    if (!finalThemeToSet || finalThemeToSet === activeTheme) return;
+
+    setTheme(finalThemeToSet);
+    // We must not add `activeTheme` to the dependency list as it can cause an infinite loop b/w dark and theme switches
+    // because there might be another booking page with conflicting theme.
+  }, [themeToSet, setTheme, embedTheme]);
   return {
     resolvedTheme,
     setTheme,
diff --git a/packages/lib/i18n.ts b/packages/lib/i18n.ts
index 4b26a28743..d58df3006b 100644
--- a/packages/lib/i18n.ts
+++ b/packages/lib/i18n.ts
@@ -13,6 +13,3 @@ export function getLocaleFromHeaders(req: IncomingMessage): string {
   }
   return preferredLocale ?? i18n.defaultLocale;
 }
-
-export const getDirFromLang = (locale: string | undefined) =>
-  locale === "ar" || locale === "he" ? "rtl" : "ltr";
diff --git a/apps/web/lib/parseDate.ts b/packages/lib/parse-dates.ts
similarity index 62%
rename from apps/web/lib/parseDate.ts
rename to packages/lib/parse-dates.ts
index b262b5569e..d61d2d59d5 100644
--- a/apps/web/lib/parseDate.ts
+++ b/packages/lib/parse-dates.ts
@@ -1,24 +1,28 @@
-import type { I18n } from "next-i18next";
 import { RRule } from "rrule";
 
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
-import type { TimeFormat } from "@calcom/lib/timeFormat";
-import { detectBrowserTimeFormat } from "@calcom/lib/timeFormat";
+import { detectBrowserTimeFormat, TimeFormat } from "@calcom/lib/timeFormat";
 import type { RecurringEvent } from "@calcom/types/Calendar";
 
-import { parseZone } from "./parseZone";
+import { parseZone } from "./parse-zone";
 
-const processDate = (date: string | null | Dayjs, i18n: I18n, selectedTimeFormat?: TimeFormat) => {
+type ExtraOptions = { withDefaultTimeFormat?: boolean; selectedTimeFormat?: TimeFormat };
+
+const processDate = (date: string | null | Dayjs, language: string, options?: ExtraOptions) => {
   const parsedZone = parseZone(date);
   if (!parsedZone?.isValid()) return "Invalid date";
-  const formattedTime = parsedZone?.format(selectedTimeFormat || detectBrowserTimeFormat);
-  return formattedTime + ", " + dayjs(date).toDate().toLocaleString(i18n.language, { dateStyle: "full" });
+  const formattedTime = parsedZone?.format(
+    options?.withDefaultTimeFormat
+      ? TimeFormat.TWELVE_HOUR
+      : options?.selectedTimeFormat || detectBrowserTimeFormat
+  );
+  return formattedTime + ", " + dayjs(date).toDate().toLocaleString(language, { dateStyle: "full" });
 };
 
-export const parseDate = (date: string | null | Dayjs, i18n: I18n, selectedTimeFormat?: TimeFormat) => {
+export const parseDate = (date: string | null | Dayjs, language: string, options?: ExtraOptions) => {
   if (!date) return ["No date"];
-  return processDate(date, i18n, selectedTimeFormat);
+  return processDate(date, language, options);
 };
 
 export const parseRecurringDates = (
@@ -28,14 +32,16 @@ export const parseRecurringDates = (
     recurringEvent,
     recurringCount,
     selectedTimeFormat,
+    withDefaultTimeFormat,
   }: {
     startDate: string | null | Dayjs;
     timeZone?: string;
     recurringEvent: RecurringEvent | null;
     recurringCount: number;
     selectedTimeFormat?: TimeFormat;
+    withDefaultTimeFormat?: boolean;
   },
-  i18n: I18n
+  language: string
 ): [string[], Date[]] => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { count, ...restRecurringEvent } = recurringEvent || {};
@@ -53,7 +59,7 @@ export const parseRecurringDates = (
   });
   const dateStrings = times.map((t) => {
     // finally; show in local timeZone again
-    return processDate(t.tz(timeZone), i18n, selectedTimeFormat);
+    return processDate(t.tz(timeZone), language, { selectedTimeFormat, withDefaultTimeFormat });
   });
 
   return [dateStrings, times.map((t) => t.toDate())];
diff --git a/apps/web/lib/parseZone.ts b/packages/lib/parse-zone.ts
similarity index 100%
rename from apps/web/lib/parseZone.ts
rename to packages/lib/parse-zone.ts
diff --git a/packages/prisma/migrations/20230404100155_remove_reminder_body_email_subject_from_reminder_template/migration.sql b/packages/prisma/migrations/20230404100155_remove_reminder_body_email_subject_from_reminder_template/migration.sql
new file mode 100644
index 0000000000..a7f69bb6c0
--- /dev/null
+++ b/packages/prisma/migrations/20230404100155_remove_reminder_body_email_subject_from_reminder_template/migration.sql
@@ -0,0 +1,6 @@
+-- Until now reminderBody and emailSubject were ignored for the REMINDER template
+-- From now on we use the reminderBody and emailSubject also for templates
+
+UPDATE "WorkflowStep"
+SET "reminderBody" = NULL, "emailSubject" = NULL
+WHERE "template" = 'REMINDER';
diff --git a/packages/prisma/migrations/20230410234751_add_foreign_key_indexes/migration.sql b/packages/prisma/migrations/20230410234751_add_foreign_key_indexes/migration.sql
new file mode 100644
index 0000000000..f02dedd07f
--- /dev/null
+++ b/packages/prisma/migrations/20230410234751_add_foreign_key_indexes/migration.sql
@@ -0,0 +1,182 @@
+-- CreateIndex
+CREATE INDEX "Account_userId_idx" ON "Account"("userId");
+
+-- CreateIndex
+CREATE INDEX "Account_type_idx" ON "Account"("type");
+
+-- CreateIndex
+CREATE INDEX "ApiKey_userId_idx" ON "ApiKey"("userId");
+
+-- CreateIndex
+CREATE INDEX "App_enabled_idx" ON "App"("enabled");
+
+-- CreateIndex
+CREATE INDEX "App_RoutingForms_Form_userId_idx" ON "App_RoutingForms_Form"("userId");
+
+-- CreateIndex
+CREATE INDEX "App_RoutingForms_Form_disabled_idx" ON "App_RoutingForms_Form"("disabled");
+
+-- CreateIndex
+CREATE INDEX "App_RoutingForms_FormResponse_formFillerId_idx" ON "App_RoutingForms_FormResponse"("formFillerId");
+
+-- CreateIndex
+CREATE INDEX "App_RoutingForms_FormResponse_formId_idx" ON "App_RoutingForms_FormResponse"("formId");
+
+-- CreateIndex
+CREATE INDEX "Attendee_email_idx" ON "Attendee"("email");
+
+-- CreateIndex
+CREATE INDEX "Attendee_bookingId_idx" ON "Attendee"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "Availability_userId_idx" ON "Availability"("userId");
+
+-- CreateIndex
+CREATE INDEX "Booking_eventTypeId_idx" ON "Booking"("eventTypeId");
+
+-- CreateIndex
+CREATE INDEX "Booking_userId_idx" ON "Booking"("userId");
+
+-- CreateIndex
+CREATE INDEX "Booking_destinationCalendarId_idx" ON "Booking"("destinationCalendarId");
+
+-- CreateIndex
+CREATE INDEX "Booking_recurringEventId_idx" ON "Booking"("recurringEventId");
+
+-- CreateIndex
+CREATE INDEX "Booking_uid_idx" ON "Booking"("uid");
+
+-- CreateIndex
+CREATE INDEX "Booking_status_idx" ON "Booking"("status");
+
+-- CreateIndex
+CREATE INDEX "BookingReference_bookingId_idx" ON "BookingReference"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "BookingReference_credentialId_idx" ON "BookingReference"("credentialId");
+
+-- CreateIndex
+CREATE INDEX "BookingReference_type_idx" ON "BookingReference"("type");
+
+-- CreateIndex
+CREATE INDEX "BookingReference_uid_idx" ON "BookingReference"("uid");
+
+-- CreateIndex
+CREATE INDEX "BookingSeat_bookingId_idx" ON "BookingSeat"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "BookingSeat_attendeeId_idx" ON "BookingSeat"("attendeeId");
+
+-- CreateIndex
+CREATE INDEX "Credential_userId_idx" ON "Credential"("userId");
+
+-- CreateIndex
+CREATE INDEX "Credential_appId_idx" ON "Credential"("appId");
+
+-- CreateIndex
+CREATE INDEX "DestinationCalendar_userId_idx" ON "DestinationCalendar"("userId");
+
+-- CreateIndex
+CREATE INDEX "DestinationCalendar_eventTypeId_idx" ON "DestinationCalendar"("eventTypeId");
+
+-- CreateIndex
+CREATE INDEX "DestinationCalendar_credentialId_idx" ON "DestinationCalendar"("credentialId");
+
+-- CreateIndex
+CREATE INDEX "EventType_userId_idx" ON "EventType"("userId");
+
+-- CreateIndex
+CREATE INDEX "EventType_teamId_idx" ON "EventType"("teamId");
+
+-- CreateIndex
+CREATE INDEX "EventTypeCustomInput_eventTypeId_idx" ON "EventTypeCustomInput"("eventTypeId");
+
+-- CreateIndex
+CREATE INDEX "Feature_enabled_idx" ON "Feature"("enabled");
+
+-- CreateIndex
+CREATE INDEX "Feature_stale_idx" ON "Feature"("stale");
+
+-- CreateIndex
+CREATE INDEX "Feedback_userId_idx" ON "Feedback"("userId");
+
+-- CreateIndex
+CREATE INDEX "Feedback_rating_idx" ON "Feedback"("rating");
+
+-- CreateIndex
+CREATE INDEX "Host_userId_idx" ON "Host"("userId");
+
+-- CreateIndex
+CREATE INDEX "Host_eventTypeId_idx" ON "Host"("eventTypeId");
+
+-- CreateIndex
+CREATE INDEX "Membership_teamId_idx" ON "Membership"("teamId");
+
+-- CreateIndex
+CREATE INDEX "Membership_userId_idx" ON "Membership"("userId");
+
+-- CreateIndex
+CREATE INDEX "Payment_bookingId_idx" ON "Payment"("bookingId");
+
+-- CreateIndex
+CREATE INDEX "Payment_externalId_idx" ON "Payment"("externalId");
+
+-- CreateIndex
+CREATE INDEX "ReminderMail_referenceId_idx" ON "ReminderMail"("referenceId");
+
+-- CreateIndex
+CREATE INDEX "ReminderMail_reminderType_idx" ON "ReminderMail"("reminderType");
+
+-- CreateIndex
+CREATE INDEX "SelectedCalendar_userId_idx" ON "SelectedCalendar"("userId");
+
+-- CreateIndex
+CREATE INDEX "SelectedCalendar_integration_idx" ON "SelectedCalendar"("integration");
+
+-- CreateIndex
+CREATE INDEX "SelectedCalendar_externalId_idx" ON "SelectedCalendar"("externalId");
+
+-- CreateIndex
+CREATE INDEX "Session_userId_idx" ON "Session"("userId");
+
+-- CreateIndex
+CREATE INDEX "VerificationToken_token_idx" ON "VerificationToken"("token");
+
+-- CreateIndex
+CREATE INDEX "VerifiedNumber_userId_idx" ON "VerifiedNumber"("userId");
+
+-- CreateIndex
+CREATE INDEX "VerifiedNumber_teamId_idx" ON "VerifiedNumber"("teamId");
+
+-- CreateIndex
+CREATE INDEX "Workflow_userId_idx" ON "Workflow"("userId");
+
+-- CreateIndex
+CREATE INDEX "Workflow_teamId_idx" ON "Workflow"("teamId");
+
+-- CreateIndex
+CREATE INDEX "WorkflowReminder_bookingUid_idx" ON "WorkflowReminder"("bookingUid");
+
+-- CreateIndex
+CREATE INDEX "WorkflowReminder_workflowStepId_idx" ON "WorkflowReminder"("workflowStepId");
+
+-- CreateIndex
+CREATE INDEX "WorkflowStep_workflowId_idx" ON "WorkflowStep"("workflowId");
+
+-- CreateIndex
+CREATE INDEX "WorkflowsOnEventTypes_workflowId_idx" ON "WorkflowsOnEventTypes"("workflowId");
+
+-- CreateIndex
+CREATE INDEX "WorkflowsOnEventTypes_eventTypeId_idx" ON "WorkflowsOnEventTypes"("eventTypeId");
+
+-- CreateIndex
+CREATE INDEX "users_email_idx" ON "users"("email");
+
+-- CreateIndex
+CREATE INDEX "users_emailVerified_idx" ON "users"("emailVerified");
+
+-- CreateIndex
+CREATE INDEX "users_identityProvider_idx" ON "users"("identityProvider");
+
+-- CreateIndex
+CREATE INDEX "users_identityProviderId_idx" ON "users"("identityProviderId");
diff --git a/packages/prisma/migrations/20230417102118_app_logo_subdomain/migration.sql b/packages/prisma/migrations/20230417102118_app_logo_subdomain/migration.sql
new file mode 100644
index 0000000000..5190f7fbb4
--- /dev/null
+++ b/packages/prisma/migrations/20230417102118_app_logo_subdomain/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Team" ADD COLUMN     "appLogo" TEXT;
+ALTER TABLE "Team" ADD COLUMN     "appIconLogo" TEXT;
diff --git a/packages/prisma/migrations/20230418002117_booking_time_status/migration.sql b/packages/prisma/migrations/20230418002117_booking_time_status/migration.sql
new file mode 100644
index 0000000000..5c628d044e
--- /dev/null
+++ b/packages/prisma/migrations/20230418002117_booking_time_status/migration.sql
@@ -0,0 +1,34 @@
+-- View: public.BookingsTimeStatus
+
+-- DROP VIEW public."BookingsTimeStatus";
+
+CREATE OR REPLACE VIEW public."BookingTimeStatus"
+ AS
+ SELECT "Booking".id,
+    "Booking".uid,
+    "Booking"."eventTypeId",
+    "Booking".title,
+    "Booking".description,
+    "Booking"."startTime",
+    "Booking"."endTime",
+    "Booking"."createdAt",
+    "Booking".location,
+    "Booking".paid,
+    "Booking".status,
+    "Booking".rescheduled,
+    "Booking"."userId",
+    "et"."teamId",
+	"et"."length" as "eventLength",
+        CASE
+            WHEN "Booking".rescheduled IS TRUE THEN 'rescheduled'::text
+            WHEN "Booking".status = 'cancelled'::"BookingStatus" AND "Booking".rescheduled IS FALSE THEN 'cancelled'::text
+            WHEN "Booking"."endTime" < now() THEN 'completed'::text
+            WHEN "Booking"."endTime" > now() THEN 'uncompleted'::text
+            ELSE NULL::text
+        END AS "timeStatus"
+   FROM "Booking"
+     LEFT JOIN "EventType" et ON "Booking"."eventTypeId" = et.id
+	 LEFT JOIN "Membership" mb ON "mb"."userId" = "Booking"."userId";
+ 
+
+
diff --git a/packages/prisma/package.json b/packages/prisma/package.json
index 3bf672969b..e86e0a1d92 100644
--- a/packages/prisma/package.json
+++ b/packages/prisma/package.json
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@calcom/lib": "*",
-    "@prisma/client": "^4.11.0",
-    "prisma": "^4.11.0",
+    "@prisma/client": "^4.13.0",
+    "prisma": "^4.13.0",
     "ts-node": "^10.9.1",
     "zod": "^3.20.2",
     "zod-prisma": "^0.5.4"
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index f064323445..c24e9b2e0b 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -8,7 +8,7 @@ datasource db {
 
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = []
+  previewFeatures = ["views", "jsonProtocol"]
 }
 
 generator zod {
@@ -38,6 +38,8 @@ model Host {
   isFixed     Boolean   @default(false)
 
   @@id([userId, eventTypeId])
+  @@index([userId])
+  @@index([eventTypeId])
 }
 
 model EventType {
@@ -108,6 +110,8 @@ model EventType {
   @@unique([userId, slug])
   @@unique([teamId, slug])
   @@unique([userId, parentId])
+  @@index([userId])
+  @@index([teamId])
 }
 
 model Credential {
@@ -122,6 +126,9 @@ model Credential {
   appId                String?
   destinationCalendars DestinationCalendar[]
   invalid              Boolean?              @default(false)
+
+  @@index([userId])
+  @@index([appId])
 }
 
 enum IdentityProvider {
@@ -141,6 +148,10 @@ model DestinationCalendar {
   eventTypeId  Int?        @unique
   credentialId Int?
   credential   Credential? @relation(fields: [credentialId], references: [id], onDelete: Cascade)
+
+  @@index([userId])
+  @@index([eventTypeId])
+  @@index([credentialId])
 }
 
 enum UserPermissionRole {
@@ -210,6 +221,10 @@ model User {
   verifiedNumbers      VerifiedNumber[]
   hosts                Host[]
 
+  @@index([email])
+  @@index([emailVerified])
+  @@index([identityProvider])
+  @@index([identityProviderId])
   @@map(name: "users")
 }
 
@@ -220,6 +235,8 @@ model Team {
   /// @zod.min(1)
   slug                String?          @unique
   logo                String?
+  appLogo             String?
+  appIconLogo         String?
   bio                 String?
   hideBranding        Boolean          @default(false)
   hideBookATeamMember Boolean          @default(false)
@@ -251,6 +268,8 @@ model Membership {
   disableImpersonation Boolean        @default(false)
 
   @@id([userId, teamId])
+  @@index([teamId])
+  @@index([userId])
 }
 
 model VerificationToken {
@@ -262,6 +281,7 @@ model VerificationToken {
   updatedAt  DateTime @updatedAt
 
   @@unique([identifier, token])
+  @@index([token])
 }
 
 model BookingReference {
@@ -278,6 +298,11 @@ model BookingReference {
   externalCalendarId String?
   deleted            Boolean?
   credentialId       Int?
+
+  @@index([bookingId])
+  @@index([credentialId])
+  @@index([type])
+  @@index([uid])
 }
 
 model Attendee {
@@ -289,6 +314,9 @@ model Attendee {
   booking     Booking?     @relation(fields: [bookingId], references: [id], onDelete: Cascade)
   bookingId   Int?
   bookingSeat BookingSeat?
+
+  @@index([email])
+  @@index([bookingId])
 }
 
 enum BookingStatus {
@@ -336,6 +364,13 @@ model Booking {
   /// @zod.custom(imports.bookingMetadataSchema)
   metadata              Json?
   isRecorded            Boolean              @default(false)
+
+  @@index([eventTypeId])
+  @@index([userId])
+  @@index([destinationCalendarId])
+  @@index([recurringEventId])
+  @@index([uid])
+  @@index([status])
 }
 
 model Schedule {
@@ -363,6 +398,7 @@ model Availability {
   Schedule    Schedule?  @relation(fields: [scheduleId], references: [id])
   scheduleId  Int?
 
+  @@index([userId])
   @@index([eventTypeId])
   @@index([scheduleId])
 }
@@ -374,6 +410,9 @@ model SelectedCalendar {
   externalId  String
 
   @@id([userId, integration, externalId])
+  @@index([userId])
+  @@index([integration])
+  @@index([externalId])
 }
 
 enum EventTypeCustomInputType {
@@ -395,6 +434,8 @@ model EventTypeCustomInput {
   options     Json?
   required    Boolean
   placeholder String                   @default("")
+
+  @@index([eventTypeId])
 }
 
 model ResetPasswordRequest {
@@ -415,6 +456,9 @@ model ReminderMail {
   reminderType   ReminderType
   elapsedMinutes Int
   createdAt      DateTime     @default(now())
+
+  @@index([referenceId])
+  @@index([reminderType])
 }
 
 model Payment {
@@ -432,6 +476,9 @@ model Payment {
   data          Json
   externalId    String         @unique
   paymentOption PaymentOption? @default(ON_BOOKING)
+
+  @@index([bookingId])
+  @@index([externalId])
 }
 
 enum PaymentOption {
@@ -486,6 +533,8 @@ model ApiKey {
   user       User?     @relation(fields: [userId], references: [id], onDelete: Cascade)
   app        App?      @relation(fields: [appId], references: [slug], onDelete: Cascade)
   appId      String?
+
+  @@index([userId])
 }
 
 model HashedLink {
@@ -512,6 +561,8 @@ model Account {
   user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([provider, providerAccountId])
+  @@index([userId])
+  @@index([type])
 }
 
 model Session {
@@ -520,6 +571,8 @@ model Session {
   userId       Int
   expires      DateTime
   user         User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId])
 }
 
 enum AppCategories {
@@ -549,6 +602,8 @@ model App {
   Webhook     Webhook[]
   ApiKey      ApiKey[]
   enabled     Boolean         @default(false)
+
+  @@index([enabled])
 }
 
 model App_RoutingForms_Form {
@@ -565,6 +620,9 @@ model App_RoutingForms_Form {
   disabled    Boolean                         @default(false)
   /// @zod.custom(imports.RoutingFormSettings)
   settings    Json?
+
+  @@index([userId])
+  @@index([disabled])
 }
 
 model App_RoutingForms_FormResponse {
@@ -576,6 +634,8 @@ model App_RoutingForms_FormResponse {
   createdAt    DateTime              @default(now())
 
   @@unique([formFillerId, formId])
+  @@index([formFillerId])
+  @@index([formId])
 }
 
 model Feedback {
@@ -585,6 +645,9 @@ model Feedback {
   user    User     @relation(fields: [userId], references: [id], onDelete: Cascade)
   rating  String
   comment String?
+
+  @@index([userId])
+  @@index([rating])
 }
 
 enum WorkflowTriggerEvents {
@@ -617,6 +680,8 @@ model WorkflowStep {
   numberRequired            Boolean?
   sender                    String?
   numberVerificationPending Boolean            @default(true)
+
+  @@index([workflowId])
 }
 
 model Workflow {
@@ -631,6 +696,9 @@ model Workflow {
   time     Int?
   timeUnit TimeUnit?
   steps    WorkflowStep[]
+
+  @@index([userId])
+  @@index([teamId])
 }
 
 model WorkflowsOnEventTypes {
@@ -639,6 +707,9 @@ model WorkflowsOnEventTypes {
   workflowId  Int
   eventType   EventType @relation(fields: [eventTypeId], references: [id], onDelete: Cascade)
   eventTypeId Int
+
+  @@index([workflowId])
+  @@index([eventTypeId])
 }
 
 model Deployment {
@@ -668,6 +739,9 @@ model WorkflowReminder {
   workflowStepId Int?
   workflowStep   WorkflowStep?   @relation(fields: [workflowStepId], references: [id])
   cancelled      Boolean?
+
+  @@index([bookingUid])
+  @@index([workflowStepId])
 }
 
 enum WorkflowTemplates {
@@ -688,6 +762,9 @@ model BookingSeat {
   attendeeId   Int      @unique
   attendee     Attendee @relation(fields: [attendeeId], references: [id], onDelete: Cascade)
   data         Json?
+
+  @@index([bookingId])
+  @@index([attendeeId])
 }
 
 model VerifiedNumber {
@@ -697,6 +774,9 @@ model VerifiedNumber {
   teamId      Int?
   team        Team?  @relation(fields: [teamId], references: [id], onDelete: Cascade)
   phoneNumber String
+
+  @@index([userId])
+  @@index([teamId])
 }
 
 model Feature {
@@ -714,6 +794,9 @@ model Feature {
   createdAt   DateTime?    @default(now())
   updatedAt   DateTime?    @default(now()) @updatedAt
   updatedBy   Int?
+
+  @@index([enabled])
+  @@index([stale])
 }
 
 enum FeatureType {
@@ -736,3 +819,22 @@ model SelectedSlots {
 
   @@unique(fields: [userId, slotUtcStartDate, slotUtcEndDate, uid], name: "selectedSlotUnique")
 }
+
+view BookingTimeStatus {
+  id          Int            @unique
+  uid         String?
+  eventTypeId Int?
+  title       String?
+  description String?
+  startTime   DateTime?
+  endTime     DateTime?
+  createdAt   DateTime?
+  location    String?
+  paid        Boolean?
+  status      BookingStatus?
+  rescheduled Boolean?
+  userId      Int?
+  teamId      Int?
+  eventLength Int?
+  timeStatus  String?
+}
diff --git a/packages/prisma/seed-app-store.config.json b/packages/prisma/seed-app-store.config.json
index b5e9f2b04d..f8bb178003 100644
--- a/packages/prisma/seed-app-store.config.json
+++ b/packages/prisma/seed-app-store.config.json
@@ -232,5 +232,12 @@
     "slug": "discord",
     "type": "discord_video",
     "isTemplate": false
+  },
+  {
+    "dirName": "sylapsvideo",
+    "categories": ["video"],
+    "slug": "sylapsvideo",
+    "type": "sylaps_video",
+    "isTemplate": false
   }
 ]
diff --git a/packages/prisma/seed-app-store.ts b/packages/prisma/seed-app-store.ts
index 02f88a43a4..821deee798 100644
--- a/packages/prisma/seed-app-store.ts
+++ b/packages/prisma/seed-app-store.ts
@@ -157,16 +157,62 @@ async function createApp(
   keys?: Prisma.AppCreateInput["keys"],
   isTemplate?: boolean
 ) {
-  await prisma.app.upsert({
-    where: { slug },
-    create: { slug, dirName, categories, keys, enabled: true },
-    update: { dirName, categories, keys },
-  });
-  await prisma.credential.updateMany({
-    where: { type },
-    data: { appId: slug },
-  });
-  console.log(`📲 Upserted ${isTemplate ? "template" : "app"}: '${slug}'`);
+  try {
+    const foundApp = await prisma.app.findFirst({
+      /**
+       * slug and dirName both are unique and any of them can be used to find the app uniquely
+       * Using both here allows us to rename(after the app has been seeded already) `slug` or `dirName` while still finding the app to apply the change on.
+       * Note: dirName is legacy and it is same as slug for all apps created through App-Store Cli.
+       * - Take the case there was an app with slug `myvideo` and dirName `dirName-1` and that got seeded. Now, someone wants to rename the slug to `my-video`(more readable) for the app keeping dirName same.
+       *    This would make this fn to be called with slug `my-video` and dirName `dirName-1`.
+       *    Now, we can find the app because dirName would still match.
+       * - Similar, if someone changes dirName keeping slug same, we can find the app because slug would still match.
+       * - If both dirName and slug are changed, it will be added as a new entry in the DB.
+       */
+      where: {
+        OR: [
+          {
+            slug,
+          },
+          {
+            dirName,
+          },
+        ],
+      },
+    });
+
+    // We need to enable seeded apps as they are used in tests.
+    const data = { slug, dirName, categories, keys, enabled: true };
+
+    if (!foundApp) {
+      await prisma.app.create({
+        data,
+      });
+      console.log(`📲 Created ${isTemplate ? "template" : "app"}: '${slug}'`);
+    } else {
+      // We know that the app exists, so either it would have the same slug or dirName
+      // Because update query can't have both slug and dirName, try to find the app to update by slug and dirName one by one
+      // if there would have been a unique App.uuid, that never changes, we could have used that in update query.
+      await prisma.app.update({
+        where: { slug: foundApp.slug },
+        data,
+      });
+      await prisma.app.update({
+        where: { dirName: foundApp.dirName },
+        data,
+      });
+      console.log(`📲 Updated ${isTemplate ? "template" : "app"}: '${slug}'`);
+    }
+
+    await prisma.credential.updateMany({
+      // Credential should stop using type and instead use an App.uuid to refer to app deterministically. That uuid would never change even if slug/dirName changes.
+      // This would allow credentials to be not orphaned when slug(appId) changes.
+      where: { type },
+      data: { appId: slug },
+    });
+  } catch (e) {
+    console.log(`Could not upsert app: ${slug}. Error:`, e);
+  }
 }
 
 export default async function main() {
diff --git a/packages/prisma/seed-insights.ts b/packages/prisma/seed-insights.ts
index 8a832d3ddf..5c784450c5 100644
--- a/packages/prisma/seed-insights.ts
+++ b/packages/prisma/seed-insights.ts
@@ -268,7 +268,7 @@ async function main() {
 
     await prisma.booking.createMany({
       data: [
-        ...new Array(100)
+        ...new Array(10000)
           .fill(0)
           .map(() => shuffle({ ...baseBookingSingle }, dayjs().get("y") - 1, singleEvents)),
       ],
@@ -276,7 +276,7 @@ async function main() {
 
     await prisma.booking.createMany({
       data: [
-        ...new Array(100)
+        ...new Array(10000)
           .fill(0)
           .map(() => shuffle({ ...baseBookingSingle }, dayjs().get("y") - 0, singleEvents)),
       ],
@@ -332,7 +332,7 @@ async function main() {
   // Create past bookings -2y, -1y, -0y
   await prisma.booking.createMany({
     data: [
-      ...new Array(100)
+      ...new Array(10000)
         .fill(0)
         .map(() =>
           shuffle({ ...baseBooking }, dayjs().get("y") - 2, teamEvents, [
@@ -345,7 +345,7 @@ async function main() {
 
   await prisma.booking.createMany({
     data: [
-      ...new Array(100)
+      ...new Array(10000)
         .fill(0)
         .map(() =>
           shuffle({ ...baseBooking }, dayjs().get("y") - 1, teamEvents, [
@@ -358,7 +358,7 @@ async function main() {
 
   await prisma.booking.createMany({
     data: [
-      ...new Array(100)
+      ...new Array(10000)
         .fill(0)
         .map(() =>
           shuffle({ ...baseBooking }, dayjs().get("y"), teamEvents, [
@@ -392,3 +392,149 @@ main()
     await prisma.$disconnect();
     process.exit(1);
   });
+
+/**
+ * This will create many users in insights teams with bookings 1y in the past
+ * Should be run after the main function is executed once
+ */
+async function createPerformanceData() {
+  const createExtraMembers = false; // Turn ON to be executed
+  let extraMembersIds;
+  const insightsTeam = await prisma.team.findFirst({
+    where: {
+      slug: "insights-team",
+    },
+  });
+
+  if (createExtraMembers) {
+    const insightsRandomUsers: Prisma.UserCreateManyArgs["data"] = [];
+    const numInsightsUsers = 50; // Change this value to adjust the number of insights users to create
+    for (let i = 0; i < numInsightsUsers; i++) {
+      const timestamp = Date.now();
+      const email = `insightsuser${timestamp}@example.com`;
+      const insightsUser = {
+        email,
+        password: await hashPassword("insightsuser"),
+        name: `Insights User ${timestamp}`,
+        username: `insights-user-${timestamp}`,
+        completedOnboarding: true,
+      };
+      insightsRandomUsers.push(insightsUser);
+    }
+
+    await prisma.user.createMany({
+      data: insightsRandomUsers,
+    });
+    // Lets find the ids of the users we just created
+    extraMembersIds = await prisma.user.findMany({
+      where: {
+        email: {
+          in: insightsRandomUsers.map((user) => user.email),
+        },
+      },
+      select: {
+        id: true,
+      },
+    });
+  }
+
+  if (createExtraMembers) {
+    if (insightsTeam === null) {
+      console.log("This should not happen");
+      throw new Error("Insights team id is undefined or null");
+    }
+
+    await prisma.membership.createMany({
+      data: extraMembersIds.map((memberId) => ({
+        teamId: insightsTeam?.id ?? 1,
+        userId: memberId.id,
+        role: "MEMBER",
+        accepted: true,
+      })),
+    });
+
+    const updateMemberPromises = extraMembersIds.map((memberId) =>
+      prisma.team.update({
+        where: {
+          id: insightsTeam?.id,
+        },
+        data: {
+          members: {
+            connect: {
+              userId_teamId: {
+                userId: memberId.id,
+                teamId: insightsTeam?.id ?? 1,
+              },
+            },
+          },
+        },
+      })
+    );
+
+    await Promise.all(updateMemberPromises);
+
+    // Create events for every Member id
+    const createEvents = extraMembersIds.map((memberId) => ({
+      title: `Single Event User - ${memberId.id}`,
+      slug: `single-event-user-${memberId.id}`,
+      description: `Single Event User - ${memberId.id}`,
+      length: 30,
+      userId: memberId.id,
+      users: {
+        connect: {
+          id: memberId.id,
+        },
+      },
+    }));
+    const createEventPromises = createEvents.map((data) =>
+      prisma.eventType.create({
+        data,
+      })
+    );
+    await Promise.all(createEventPromises);
+
+    // load the events we just created
+    const singleEventsCreated = await prisma.eventType.findMany({
+      where: {
+        userId: {
+          in: extraMembersIds.map((memberId) => memberId.id),
+        },
+      },
+    });
+
+    // Create bookings for every single event
+    const baseBooking = {
+      uid: "demo performance data  booking",
+      title: "Single Event Booking Perf",
+      description: "Single Event Booking Perf",
+      startTime: dayjs().toISOString(),
+      endTime: dayjs().toISOString(),
+      eventTypeId: singleEventsCreated[0].id,
+    };
+
+    await prisma.booking.createMany({
+      data: [
+        ...new Array(10000)
+          .fill(0)
+          .map(() => shuffle({ ...baseBooking }, dayjs().get("y"), singleEventsCreated)),
+      ],
+    });
+  }
+}
+
+createPerformanceData()
+  .then(async () => {
+    await prisma.$disconnect();
+  })
+  .catch(async (e) => {
+    console.error(e);
+    await prisma.user.deleteMany({
+      where: {
+        username: {
+          contains: "insights-user-",
+        },
+      },
+    });
+    await prisma.$disconnect();
+    process.exit(1);
+  });
diff --git a/packages/prisma/selects/user.ts b/packages/prisma/selects/user.ts
index e87f6a511d..335c7e476b 100644
--- a/packages/prisma/selects/user.ts
+++ b/packages/prisma/selects/user.ts
@@ -1,16 +1,15 @@
 import { Prisma } from "@prisma/client";
 
 export const availabilityUserSelect = Prisma.validator<Prisma.UserSelect>()({
-  credentials: true,
+  id: true,
   timeZone: true,
   bufferTime: true,
-  availability: true,
-  id: true,
   startTime: true,
   username: true,
   endTime: true,
-  selectedCalendars: true,
   timeFormat: true,
+  defaultScheduleId: true,
+  // Relationships
   schedules: {
     select: {
       availability: true,
@@ -18,7 +17,8 @@ export const availabilityUserSelect = Prisma.validator<Prisma.UserSelect>()({
       id: true,
     },
   },
-  defaultScheduleId: true,
+  availability: true,
+  selectedCalendars: true,
 });
 
 export const baseUserSelect = Prisma.validator<Prisma.UserSelect>()({
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index fb6734f615..7bb69aca47 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -220,7 +220,7 @@ export const bookingCreateSchemaLegacyPropsForApi = z.object({
 
 // This is the schema that is used for the API. It has all the legacy props that are part of `responses` now.
 export const bookingCreateBodySchemaForApi = extendedBookingCreateBody.merge(
-  bookingCreateSchemaLegacyPropsForApi
+  bookingCreateSchemaLegacyPropsForApi.partial()
 );
 
 export const schemaBookingCancelParams = z.object({
diff --git a/packages/trpc/server/routers/viewer.tsx b/packages/trpc/server/routers/viewer.tsx
index 290ef1728d..8ac94e6b4f 100644
--- a/packages/trpc/server/routers/viewer.tsx
+++ b/packages/trpc/server/routers/viewer.tsx
@@ -25,6 +25,7 @@ import { verifyPassword } from "@calcom/features/auth/lib/verifyPassword";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
 import { samlTenantProduct } from "@calcom/features/ee/sso/lib/saml";
 import { userAdminRouter } from "@calcom/features/ee/users/server/trpc-router";
+import { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";
 import { featureFlagRouter } from "@calcom/features/flags/server/router";
 import { insightsRouter } from "@calcom/features/insights/server/trpc-router";
 import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib";
@@ -160,6 +161,17 @@ const publicViewerRouter = router({
       }
     }),
   slots: slotsRouter,
+  event: publicProcedure
+    .input(
+      z.object({
+        username: z.string(),
+        eventSlug: z.string(),
+      })
+    )
+    .query(async ({ ctx, input }) => {
+      const event = await getPublicEvent(input.username, input.eventSlug, ctx.prisma);
+      return event;
+    }),
   cityTimezones: publicProcedure.query(async () => {
     /**
      * Lazy loads third party dependency to avoid loading 1.5Mb for ALL tRPC procedures.
@@ -1041,7 +1053,6 @@ const loggedInViewerRouter = router({
                   user: {
                     select: {
                       id: true,
-                      credentials: true,
                       email: true,
                       timeZone: true,
                       name: true,
diff --git a/packages/trpc/server/routers/viewer/apps.tsx b/packages/trpc/server/routers/viewer/apps.tsx
index bfd28c172b..ffc6d1895c 100644
--- a/packages/trpc/server/routers/viewer/apps.tsx
+++ b/packages/trpc/server/routers/viewer/apps.tsx
@@ -12,19 +12,6 @@ import { TRPCError } from "@trpc/server";
 
 import { authedAdminProcedure, authedProcedure, router } from "../../trpc";
 
-interface FilteredApp {
-  name: string;
-  slug: string;
-  logo: string;
-  title?: string;
-  type: string;
-  description: string;
-  dirName: string;
-  keys: Prisma.JsonObject | null;
-  enabled: boolean;
-  isTemplate?: boolean;
-}
-
 export const appsRouter = router({
   listLocal: authedAdminProcedure
     .input(
@@ -34,9 +21,7 @@ export const appsRouter = router({
     )
     .query(async ({ ctx, input }) => {
       const category = input.category === "conferencing" ? "video" : input.category;
-      const localApps = getLocalAppMetadata().filter(
-        (app) => app.categories?.some((appCategory) => appCategory === category) || app.category === category
-      );
+      const localApps = getLocalAppMetadata();
 
       const dbApps = await ctx.prisma.app.findMany({
         where: {
@@ -52,15 +37,18 @@ export const appsRouter = router({
         },
       });
 
-      const filteredApps: FilteredApp[] = [];
+      return localApps.flatMap((app) => {
+        // Filter applications that does not belong to the current requested category.
+        if (!(app.category === category || app.categories?.some((appCategory) => appCategory === category))) {
+          return [];
+        }
 
-      for (const app of localApps) {
         // Find app metadata
         const dbData = dbApps.find((dbApp) => dbApp.slug === app.slug);
 
         // If the app already contains keys then return
         if (dbData?.keys) {
-          filteredApps.push({
+          return {
             name: app.name,
             slug: app.slug,
             logo: app.logo,
@@ -68,40 +56,39 @@ export const appsRouter = router({
             type: app.type,
             description: app.description,
             // We know that keys are going to be an object or null. Prisma can not type check against JSON fields
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            //@ts-ignore
-            keys: dbData.keys,
+            keys: dbData.keys as Prisma.JsonObject | null,
             dirName: app.dirName || app.slug,
             enabled: dbData?.enabled || false,
             isTemplate: app.isTemplate,
-          });
-        } else {
-          const keysSchema = appKeysSchemas[app.dirName as keyof typeof appKeysSchemas];
-
-          const keys: Record<string, string> = {};
-
-          if (typeof keysSchema !== "undefined") {
-            Object.values(keysSchema.keyof()._def.values).reduce((keysObject, key) => {
-              keys[key as string] = "";
-              return keysObject;
-            }, {} as Record<string, string>);
-          }
-
-          filteredApps.push({
-            name: app.name,
-            slug: app.slug,
-            logo: app.logo,
-            type: app.type,
-            title: app.title,
-            description: app.description,
-            enabled: dbData?.enabled || false,
-            dirName: app.dirName || app.slug,
-            keys: Object.keys(keys).length === 0 ? null : keys,
-          });
+          };
         }
-      }
 
-      return filteredApps;
+        const keysSchema = appKeysSchemas[app.dirName as keyof typeof appKeysSchemas];
+
+        const keys: Record<string, string> = {};
+
+        // `typeof val === 'undefined'` is always slower than !== undefined comparison
+        // it is important to avoid string to string comparisons as much as we can
+        if (keysSchema !== undefined) {
+          // TODO: Remove the Object.values and reduce to improve the performance.
+          Object.values(keysSchema.keyof()._def.values).reduce((keysObject, key) => {
+            keys[key as string] = "";
+            return keysObject;
+          }, {} as Record<string, string>);
+        }
+
+        return {
+          name: app.name,
+          slug: app.slug,
+          logo: app.logo,
+          type: app.type,
+          title: app.title,
+          description: app.description,
+          enabled: dbData?.enabled ?? false,
+          dirName: app.dirName ?? app.slug,
+          keys: Object.keys(keys).length === 0 ? null : keys,
+        };
+      });
     }),
   toggle: authedAdminProcedure
     .input(
@@ -112,6 +99,7 @@ export const appsRouter = router({
     )
     .mutation(async ({ ctx, input }) => {
       const { prisma } = ctx;
+      const { enabled } = input;
 
       // Get app name from metadata
       const localApps = getLocalAppMetadata();
@@ -125,7 +113,7 @@ export const appsRouter = router({
           slug: input.slug,
         },
         update: {
-          enabled: !input.enabled,
+          enabled,
           dirName: appMetadata?.dirName || appMetadata?.slug || "",
         },
         create: {
@@ -136,12 +124,14 @@ export const appsRouter = router({
             ([appMetadata?.category] as AppCategories[]) ||
             undefined,
           keys: undefined,
-          enabled: !input.enabled,
+          enabled,
         },
       });
 
       // If disabling an app then we need to alert users based on the app type
-      if (input.enabled) {
+      if (!enabled) {
+        const translations = new Map();
+
         if (app.categories.some((category) => ["calendar", "video"].includes(category))) {
           // Find all users with the app credentials
           const appCredentials = await prisma.credential.findMany({
@@ -158,18 +148,26 @@ export const appsRouter = router({
             },
           });
 
+          // TODO: This should be done async probably using a queue.
           Promise.all(
             appCredentials.map(async (credential) => {
-              const t = await getTranslation(credential.user?.locale || "en", "common");
+              // No need to continue if credential does not have a user
+              if (!credential.user || !credential.user.email) return;
 
-              if (credential.user?.email) {
-                await sendDisabledAppEmail({
-                  email: credential.user.email,
-                  appName: appMetadata?.name || app.slug,
-                  appType: app.categories,
-                  t,
-                });
+              const locale = credential.user.locale ?? "en";
+              let t = translations.get(locale);
+
+              if (!t) {
+                t = await getTranslation(locale, "common");
+                translations.set(locale, t);
               }
+
+              await sendDisabledAppEmail({
+                email: credential.user.email,
+                appName: appMetadata?.name || app.slug,
+                appType: app.categories,
+                t,
+              });
             })
           );
         } else {
@@ -193,8 +191,11 @@ export const appsRouter = router({
             },
           });
 
+          // TODO: This should be done async probably using a queue.
           Promise.all(
             eventTypesWithApp.map(async (eventType) => {
+              // TODO: This update query can be removed by merging it with
+              // the previous `findMany` query, if that query returns certain values.
               await prisma.eventType.update({
                 where: {
                   id: eventType.id,
@@ -215,18 +216,26 @@ export const appsRouter = router({
                 },
               });
 
-              eventType.users.map(async (user) => {
-                const t = await getTranslation(user.locale || "en", "common");
+              return Promise.all(
+                eventType.users.map(async (user) => {
+                  const locale = user.locale ?? "en";
+                  let t = translations.get(locale);
 
-                await sendDisabledAppEmail({
-                  email: user.email,
-                  appName: appMetadata?.name || app.slug,
-                  appType: app.categories,
-                  t,
-                  title: eventType.title,
-                  eventTypeId: eventType.id,
-                });
-              });
+                  if (!t) {
+                    t = await getTranslation(locale, "common");
+                    translations.set(locale, t);
+                  }
+
+                  await sendDisabledAppEmail({
+                    email: user.email,
+                    appName: appMetadata?.name || app.slug,
+                    appType: app.categories,
+                    t,
+                    title: eventType.title,
+                    eventTypeId: eventType.id,
+                  });
+                })
+              );
             })
           );
         }
@@ -246,9 +255,7 @@ export const appsRouter = router({
       })
     )
     .mutation(async ({ ctx, input }) => {
-      let appKey = deriveAppDictKeyFromType(input.type, appKeysSchemas);
-      if (!appKey) appKey = deriveAppDictKeyFromType(input.slug, appKeysSchemas);
-      const keysSchema = appKeysSchemas[appKey as keyof typeof appKeysSchemas];
+      const keysSchema = appKeysSchemas[input.dirName as keyof typeof appKeysSchemas];
       const keys = keysSchema.parse(input.keys);
 
       // Get app name from metadata
diff --git a/packages/trpc/server/routers/viewer/bookings.tsx b/packages/trpc/server/routers/viewer/bookings.tsx
index b7848f6129..fccc6460ed 100644
--- a/packages/trpc/server/routers/viewer/bookings.tsx
+++ b/packages/trpc/server/routers/viewer/bookings.tsx
@@ -23,7 +23,7 @@ import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib";
 import logger from "@calcom/lib/logger";
 import { getTranslation } from "@calcom/lib/server";
 import { bookingMinimalSelect } from "@calcom/prisma";
-import { bookingConfirmPatchBodySchema } from "@calcom/prisma/zod-utils";
+import { bookingConfirmPatchBodySchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import type { AdditionalInformation, CalendarEvent, Person } from "@calcom/types/Calendar";
 
 import { TRPCError } from "@trpc/server";
@@ -115,7 +115,7 @@ export const bookingsRouter = router({
           OR: [
             {
               recurringEventId: { not: null },
-              status: { notIn: [BookingStatus.PENDING, BookingStatus.CANCELLED, BookingStatus.REJECTED] },
+              status: { equals: BookingStatus.ACCEPTED },
             },
             {
               recurringEventId: { equals: null },
@@ -252,6 +252,8 @@ export const bookingsRouter = router({
                 eventName: true,
                 price: true,
                 recurringEvent: true,
+                currency: true,
+                metadata: true,
                 team: {
                   select: {
                     name: true,
@@ -365,6 +367,9 @@ export const bookingsRouter = router({
           eventType: {
             ...booking.eventType,
             recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),
+            price: booking.eventType?.price || 0,
+            currency: booking.eventType?.currency || "usd",
+            metadata: EventTypeMetaDataSchema.parse(booking.eventType?.metadata || {}),
           },
           startTime: booking.startTime.toISOString(),
           endTime: booking.endTime.toISOString(),
@@ -780,34 +785,28 @@ export const bookingsRouter = router({
       },
     });
 
-    const authorized = async () => {
-      // if the organizer
-      if (booking.userId === user.id) {
-        return true;
-      }
-      const eventType = await prisma.eventType.findUnique({
+    if (booking.userId !== user.id && booking.eventTypeId) {
+      // Only query database when it is explicitly required.
+      const eventType = await prisma.eventType.findFirst({
         where: {
-          id: booking.eventTypeId || undefined,
+          id: booking.eventTypeId,
+          schedulingType: SchedulingType.COLLECTIVE,
         },
         select: {
-          id: true,
-          schedulingType: true,
           users: true,
         },
       });
-      if (
-        eventType?.schedulingType === SchedulingType.COLLECTIVE &&
-        eventType.users.find((user) => user.id === user.id)
-      ) {
-        return true;
+
+      if (eventType && !eventType.users.find((user) => booking.userId === user.id)) {
+        throw new TRPCError({ code: "UNAUTHORIZED", message: "UNAUTHORIZED" });
       }
-      return false;
-    };
+    }
 
-    if (!(await authorized())) throw new TRPCError({ code: "UNAUTHORIZED", message: "UNAUTHORIZED" });
-
-    const isConfirmed = booking.status === BookingStatus.ACCEPTED;
-    if (isConfirmed) throw new TRPCError({ code: "BAD_REQUEST", message: "Booking already confirmed" });
+    // Do not move this before authorization check.
+    // This is done to avoid exposing extra information to the requester.
+    if (booking.status === BookingStatus.ACCEPTED) {
+      throw new TRPCError({ code: "BAD_REQUEST", message: "Booking already confirmed" });
+    }
 
     // If booking requires payment and is not paid, we don't allow confirmation
     if (confirmed && booking.payment.length > 0 && !booking.paid) {
@@ -823,14 +822,22 @@ export const bookingsRouter = router({
       return { message: "Booking confirmed", status: BookingStatus.ACCEPTED };
     }
 
+    // Cache translations to avoid requesting multiple times.
+    const translations = new Map();
     const attendeesListPromises = booking.attendees.map(async (attendee) => {
+      const locale = attendee.locale ?? "en";
+      let translate = translations.get(locale);
+      if (!translate) {
+        translate = await getTranslation(locale, "common");
+        translations.set(locale, translate);
+      }
       return {
         name: attendee.name,
         email: attendee.email,
         timeZone: attendee.timeZone,
         language: {
-          translate: await getTranslation(attendee.locale ?? "en", "common"),
-          locale: attendee.locale ?? "en",
+          translate,
+          locale,
         },
       };
     });
@@ -852,6 +859,7 @@ export const bookingsRouter = router({
       organizer: {
         email: user.email,
         name: user.name || "Unnamed",
+        username: user.username || undefined,
         timeZone: user.timeZone,
         language: { translate: tOrganizer, locale: user.locale ?? "en" },
       },
@@ -871,6 +879,9 @@ export const bookingsRouter = router({
             recurringEventId,
             id: booking.id,
           },
+          select: {
+            id: true,
+          },
         }))
       ) {
         // FIXME: It might be best to retrieve recurringEventId from the booking itself.
diff --git a/packages/trpc/server/routers/viewer/eventTypes.ts b/packages/trpc/server/routers/viewer/eventTypes.ts
index d36b8f715d..6efdf2132e 100644
--- a/packages/trpc/server/routers/viewer/eventTypes.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes.ts
@@ -7,7 +7,6 @@ import { z } from "zod";
 import getAppKeysFromSlug from "@calcom/app-store/_utils/getAppKeysFromSlug";
 import type { LocationObject } from "@calcom/app-store/locations";
 import { DailyLocationType } from "@calcom/app-store/locations";
-import { stripeDataSchema } from "@calcom/app-store/stripepayment/lib/server";
 import getApps, { getAppFromLocationValue, getAppFromSlug } from "@calcom/app-store/utils";
 import updateChildrenEventTypes from "@calcom/features/ee/managed-event-types/lib/handleChildrenEventTypes";
 import { validateIntervalLimitOrder } from "@calcom/lib";
@@ -525,32 +524,12 @@ export const eventTypesRouter = router({
       })
     )
     .query(async ({ ctx, input }) => {
-      const user = await ctx.prisma.user.findUnique({
-        where: {
-          id: ctx.user.id,
-        },
-        select: {
-          id: true,
-          username: true,
-          name: true,
-          startTime: true,
-          endTime: true,
-          bufferTime: true,
-          avatar: true,
-        },
-      });
-      if (!user) {
-        throw new TRPCError({ code: "INTERNAL_SERVER_ERROR" });
-      }
-
-      const res = await getEventTypeById({
+      return await getEventTypeById({
         eventTypeId: input.id,
         userId: ctx.user.id,
         prisma: ctx.prisma,
         isTrpcCall: true,
       });
-
-      return res;
     }),
   update: eventOwnerProcedure.input(EventTypeUpdateInput.strict()).mutation(async ({ ctx, input }) => {
     const {
@@ -667,27 +646,6 @@ export const eventTypesRouter = router({
       };
     }
 
-    if (input?.price || input.metadata?.apps?.stripe?.price) {
-      data.price = input.price || input.metadata?.apps?.stripe?.price;
-      const paymentCredential = await ctx.prisma.credential.findFirst({
-        where: {
-          userId: ctx.user.id,
-          type: {
-            contains: "_payment",
-          },
-        },
-        select: {
-          type: true,
-          key: true,
-        },
-      });
-
-      if (paymentCredential?.type === "stripe_payment") {
-        const { default_currency } = stripeDataSchema.parse(paymentCredential.key);
-        data.currency = default_currency;
-      }
-    }
-
     const connectedLink = await ctx.prisma.hashedLink.findFirst({
       where: {
         eventTypeId: input.id,
diff --git a/packages/trpc/server/routers/viewer/slots.ts b/packages/trpc/server/routers/viewer/slots.ts
index d15162c336..787d613109 100644
--- a/packages/trpc/server/routers/viewer/slots.ts
+++ b/packages/trpc/server/routers/viewer/slots.ts
@@ -218,12 +218,16 @@ async function getEventType(ctx: { prisma: typeof prisma }, input: z.infer<typeo
         select: {
           isFixed: true,
           user: {
-            select: availabilityUserSelect,
+            select: {
+              credentials: true, // Don't leak credentials to the client
+              ...availabilityUserSelect,
+            },
           },
         },
       },
       users: {
         select: {
+          credentials: true, // Don't leak credentials to the client
           ...availabilityUserSelect,
         },
       },
@@ -250,6 +254,7 @@ async function getDynamicEventType(ctx: { prisma: typeof prisma }, input: z.infe
     },
     select: {
       allowDynamicBooking: true,
+      credentials: true, // Don't leak credentials to the client
       ...availabilityUserSelect,
     },
   });
@@ -305,17 +310,17 @@ export async function getSchedule(input: z.infer<typeof getScheduleSchema>, ctx:
   }
   let currentSeats: CurrentSeats | undefined;
 
-  let users = eventType.users.map((user) => ({
+  let usersWithCredentials = eventType.users.map((user) => ({
     isFixed: !eventType.schedulingType || eventType.schedulingType === SchedulingType.COLLECTIVE,
     ...user,
   }));
   // overwrite if it is a team event & hosts is set, otherwise keep using users.
   if (eventType.schedulingType && !!eventType.hosts?.length) {
-    users = eventType.hosts.map(({ isFixed, user }) => ({ isFixed, ...user }));
+    usersWithCredentials = eventType.hosts.map(({ isFixed, user }) => ({ isFixed, ...user }));
   }
   /* We get all users working hours and busy slots */
   const userAvailability = await Promise.all(
-    users.map(async (currentUser) => {
+    usersWithCredentials.map(async (currentUser) => {
       const {
         busy,
         workingHours,
@@ -398,7 +403,7 @@ export async function getSchedule(input: z.infer<typeof getScheduleSchema>, ctx:
     /* FIXME: For some reason this returns undefined while testing in Jest */
     (await ctx.prisma.selectedSlots.findMany({
       where: {
-        userId: { in: users.map((user) => user.id) },
+        userId: { in: usersWithCredentials.map((user) => user.id) },
         releaseAt: { gt: dayjs.utc().format() },
       },
       select: {
@@ -527,13 +532,19 @@ export async function getSchedule(input: z.infer<typeof getScheduleSchema>, ctx:
     ) => {
       // TODO: Adds unit tests to prevent regressions in getSchedule (try multiple timezones)
       const time = _time.tz(input.timeZone);
+
       r[time.format("YYYY-MM-DD")] = r[time.format("YYYY-MM-DD")] || [];
       r[time.format("YYYY-MM-DD")].push({
         ...passThroughProps,
         time: time.toISOString(),
-        users: (eventType.hosts ? eventType.hosts.map((host) => host.user) : eventType.users).map(
-          (user) => user.username || ""
-        ),
+        users: (eventType.hosts
+          ? eventType.hosts.map((hostUserWithCredentials) => {
+              const { user } = hostUserWithCredentials;
+              const { credentials: _credentials, ...hostUser } = user;
+              return hostUser;
+            })
+          : eventType.users
+        ).map((user) => user.username || ""),
         // Conditionally add the attendees and booking id to slots object if there is already a booking during that time
         ...(currentSeats?.some((booking) => booking.startTime.toISOString() === time.toISOString()) && {
           attendees:
diff --git a/packages/trpc/server/routers/viewer/teams.tsx b/packages/trpc/server/routers/viewer/teams.tsx
index ff0acdc6fa..31c6f4ad62 100644
--- a/packages/trpc/server/routers/viewer/teams.tsx
+++ b/packages/trpc/server/routers/viewer/teams.tsx
@@ -520,6 +520,7 @@ export const viewerTeamsRouter = router({
         include: {
           user: {
             select: {
+              credentials: true, // needed for getUserAvailability
               ...availabilityUserSelect,
             },
           },
@@ -696,7 +697,7 @@ export const viewerTeamsRouter = router({
                 select: {
                   id: true,
                   name: true,
-                  avatar: true,
+                  username: true,
                 },
               },
             },
diff --git a/packages/trpc/server/routers/viewer/workflows.tsx b/packages/trpc/server/routers/viewer/workflows.tsx
index 15827580c0..05489f2be8 100644
--- a/packages/trpc/server/routers/viewer/workflows.tsx
+++ b/packages/trpc/server/routers/viewer/workflows.tsx
@@ -10,13 +10,14 @@ import {
 } from "@prisma/client";
 import { z } from "zod";
 
+import emailReminderTemplate from "@calcom/ee/workflows/lib/reminders/templates/emailReminderTemplate";
 import {
   SMS_REMINDER_NUMBER_FIELD,
   getSmsReminderNumberField,
   getSmsReminderNumberSource,
 } from "@calcom/features/bookings/lib/getBookingFields";
 import type { WorkflowType } from "@calcom/features/ee/workflows/components/WorkflowListPage";
-// import dayjs from "@calcom/dayjs";
+import { isSMSAction } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
 import {
   WORKFLOW_TEMPLATES,
   WORKFLOW_TRIGGER_EVENTS,
@@ -24,7 +25,6 @@ import {
   TIME_UNIT,
 } from "@calcom/features/ee/workflows/lib/constants";
 import { getWorkflowActionOptions } from "@calcom/features/ee/workflows/lib/getOptions";
-import { isSMSAction } from "@calcom/features/ee/workflows/lib/isSMSAction";
 import {
   deleteScheduledEmailReminder,
   scheduleEmailReminder,
@@ -359,8 +359,10 @@ export const workflowsRouter = router({
         await ctx.prisma.workflowStep.create({
           data: {
             stepNumber: 1,
-            action: WorkflowActions.EMAIL_HOST,
+            action: WorkflowActions.EMAIL_ATTENDEE,
             template: WorkflowTemplates.REMINDER,
+            reminderBody: emailReminderTemplate(true, WorkflowActions.EMAIL_ATTENDEE).emailBody,
+            emailSubject: emailReminderTemplate(true, WorkflowActions.EMAIL_ATTENDEE).emailSubject,
             workflowId: workflow.id,
             sender: SENDER_NAME,
             numberVerificationPending: false,
@@ -652,6 +654,9 @@ export const workflowsRouter = router({
                   endTime: booking.endTime.toISOString(),
                   title: booking.title,
                   language: { locale: booking?.user?.locale || "" },
+                  eventType: {
+                    slug: booking.eventType?.slug,
+                  },
                 };
                 if (
                   step.action === WorkflowActions.EMAIL_HOST ||
@@ -771,8 +776,8 @@ export const workflowsRouter = router({
                   : null,
               stepNumber: newStep.stepNumber,
               workflowId: newStep.workflowId,
-              reminderBody: newStep.template === WorkflowTemplates.CUSTOM ? newStep.reminderBody : null,
-              emailSubject: newStep.template === WorkflowTemplates.CUSTOM ? newStep.emailSubject : null,
+              reminderBody: newStep.reminderBody,
+              emailSubject: newStep.emailSubject,
               template: newStep.template,
               numberRequired: newStep.numberRequired,
               sender: getSender({
@@ -846,6 +851,9 @@ export const workflowsRouter = router({
                 endTime: booking.endTime.toISOString(),
                 title: booking.title,
                 language: { locale: booking?.user?.locale || "" },
+                eventType: {
+                  slug: booking.eventType?.slug,
+                },
               };
               if (
                 newStep.action === WorkflowActions.EMAIL_HOST ||
@@ -973,6 +981,9 @@ export const workflowsRouter = router({
                   endTime: booking.endTime.toISOString(),
                   title: booking.title,
                   language: { locale: booking?.user?.locale || "" },
+                  eventType: {
+                    slug: booking.eventType?.slug,
+                  },
                 };
 
                 if (
diff --git a/packages/types/Calendar.d.ts b/packages/types/Calendar.d.ts
index dfbad48f8d..1025884e59 100644
--- a/packages/types/Calendar.d.ts
+++ b/packages/types/Calendar.d.ts
@@ -135,7 +135,7 @@ export type AppsStatus = {
   warnings?: string[];
 };
 
-type CalEventResponses = Record<
+export type CalEventResponses = Record<
   string,
   {
     label: string;
diff --git a/packages/types/next-auth.d.ts b/packages/types/next-auth.d.ts
index ef7beb8e0a..2eb669c7af 100644
--- a/packages/types/next-auth.d.ts
+++ b/packages/types/next-auth.d.ts
@@ -1,4 +1,4 @@
-import type { User as PrismaUser } from "@prisma/client";
+import type { User as PrismaUser, UserPermissionRole } from "@prisma/client";
 import type { DefaultUser } from "next-auth";
 
 declare module "next-auth" {
@@ -9,6 +9,7 @@ declare module "next-auth" {
     hasValidLicense: boolean;
     user: User;
   }
+
   interface User extends Omit<DefaultUser, "id"> {
     id: PrismaUser["id"];
     emailVerified?: PrismaUser["emailVerified"];
@@ -19,3 +20,15 @@ declare module "next-auth" {
     role?: PrismaUser["role"] | "INACTIVE_ADMIN";
   }
 }
+
+declare module "next-auth/jwt" {
+  interface JWT {
+    id?: string | number;
+    name?: string | null;
+    username?: string | null;
+    email?: string | null;
+    role?: UserPermissionRole | "INACTIVE_ADMIN" | null;
+    impersonatedByUID?: number | null;
+    belongsToActiveTeam?: boolean;
+  }
+}
diff --git a/packages/ui/components/apps/AllApps.tsx b/packages/ui/components/apps/AllApps.tsx
index f030b17506..a1ecb8761a 100644
--- a/packages/ui/components/apps/AllApps.tsx
+++ b/packages/ui/components/apps/AllApps.tsx
@@ -94,7 +94,7 @@ function CategoryTab({ selectedCategory, categories, searchText }: CategoryTabPr
           }}
           className={classNames(
             selectedCategory === null ? "bg-emphasis text-default" : "bg-muted text-emphasis",
-            "hover:bg-emphasis rounded-md px-4 py-2.5 text-sm font-medium hover:cursor-pointer hover:text-gray-50"
+            "hover:bg-emphasis min-w-max rounded-md px-4 py-2.5 text-sm font-medium hover:cursor-pointer hover:text-gray-50"
           )}>
           {t("all_apps")}
         </li>
@@ -168,7 +168,7 @@ export function AllApps({ apps, searchText, categories }: AllAppsPropsType) {
       <CategoryTab selectedCategory={selectedCategory} searchText={searchText} categories={categories} />
       {filteredApps.length ? (
         <div
-          className="grid gap-3 lg:grid-cols-4 [@media(max-width:1270px)]:grid-cols-3 [@media(max-width:730px)]:grid-cols-2 [@media(max-width:500px)]:grid-cols-1"
+          className="grid gap-3 lg:grid-cols-4 [@media(max-width:1270px)]:grid-cols-3 [@media(max-width:730px)]:grid-cols-1 [@media(max-width:500px)]:grid-cols-1"
           ref={appsContainerRef}>
           {filteredApps.map((app) => (
             <AppCard key={app.name} app={app} searchText={searchText} credentials={app.credentials} />
diff --git a/packages/ui/components/apps/SkeletonLoader.tsx b/packages/ui/components/apps/SkeletonLoader.tsx
index b5b24af526..65e5184349 100644
--- a/packages/ui/components/apps/SkeletonLoader.tsx
+++ b/packages/ui/components/apps/SkeletonLoader.tsx
@@ -31,9 +31,13 @@ function SkeletonItem() {
       <div className="flex-grow truncate text-sm">
         <div className="flex justify-start space-x-2 rtl:space-x-reverse">
           <SkeletonText className="h-10 w-10" />
-          <div className="space-y-2">
-            <SkeletonText className="h-4 w-32" />
-            <SkeletonText className="h-4 w-16" />
+          <div className="space-y-1">
+            <div>
+              <SkeletonText className="h-4 w-16" />
+            </div>
+            <div>
+              <SkeletonText className="h-4 w-32" />
+            </div>
           </div>
         </div>
       </div>
diff --git a/packages/ui/components/avatar/AvatarGroup.tsx b/packages/ui/components/avatar/AvatarGroup.tsx
index 7ad45757b5..8f94a31f38 100644
--- a/packages/ui/components/avatar/AvatarGroup.tsx
+++ b/packages/ui/components/avatar/AvatarGroup.tsx
@@ -45,7 +45,7 @@ export const AvatarGroup = function AvatarGroup(props: AvatarGroupProps) {
       {numTruncatedAvatars > 0 && (
         <li
           className={classNames(
-            "bg-darkgray-300 relative -mr-[4px] mb-1 inline-flex justify-center overflow-hidden rounded-full",
+            "bg-inverted relative -mr-[4px] mb-1 inline-flex justify-center overflow-hidden rounded-full",
             props.size === "sm" ? "min-w-6 h-6" : "min-w-16 h-16"
           )}>
           <span
diff --git a/packages/ui/components/badge/Badge.tsx b/packages/ui/components/badge/Badge.tsx
index cdf2b89adb..f90331dcc9 100644
--- a/packages/ui/components/badge/Badge.tsx
+++ b/packages/ui/components/badge/Badge.tsx
@@ -1,6 +1,6 @@
 import type { VariantProps } from "class-variance-authority";
 import { cva } from "class-variance-authority";
-import type { ComponentProps, ReactNode } from "react";
+import React from "react";
 import { GoPrimitiveDot } from "react-icons/go";
 
 import classNames from "@calcom/lib/classNames";
@@ -41,19 +41,40 @@ type IconOrDot =
     }
   | { startIcon?: unknown; withDot?: boolean };
 
-export type BadgeProps = InferredBadgeStyles &
-  ComponentProps<"div"> & { children: ReactNode; rounded?: boolean } & IconOrDot;
+export type BadgeBaseProps = InferredBadgeStyles & {
+  children: React.ReactNode;
+  rounded?: boolean;
+} & IconOrDot;
+
+export type BadgeProps =
+  /**
+   * This union type helps TypeScript understand that there's two options for this component:
+   * Either it's a div element on which the onClick prop is not allowed, or it's a button element
+   * on which the onClick prop is required. This is because the onClick prop is used to determine
+   * whether the component should be a button or a div.
+   */
+  | (BadgeBaseProps & Omit<React.HTMLAttributes<HTMLDivElement>, "onClick"> & { onClick?: never })
+  | (BadgeBaseProps & Omit<React.HTMLAttributes<HTMLButtonElement>, "onClick"> & { onClick: () => void });
 
 export const Badge = function Badge(props: BadgeProps) {
   const { variant, className, size, startIcon, withDot, children, rounded, ...passThroughProps } = props;
+  const isButton = "onClick" in passThroughProps && passThroughProps.onClick !== undefined;
   const StartIcon = startIcon ? (startIcon as SVGComponent) : undefined;
-  return (
-    <div
-      className={classNames(badgeStyles({ variant, size }), rounded && "h-5 w-5 rounded-full p-0", className)}
-      {...passThroughProps}>
+  const classes = classNames(
+    badgeStyles({ variant, size }),
+    rounded && "h-5 w-5 rounded-full p-0",
+    className
+  );
+
+  const Children = () => (
+    <>
       {withDot ? <GoPrimitiveDot className="h-3 w-3 stroke-[3px]" /> : null}
       {StartIcon ? <StartIcon className="h-3 w-3 stroke-[3px]" /> : null}
-      <div>{children}</div>
-    </div>
+      {children}
+    </>
   );
+
+  const Wrapper = isButton ? "button" : "div";
+
+  return React.createElement(Wrapper, { ...passThroughProps, className: classes }, <Children />);
 };
diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index d1bfefa8a2..23d8b08156 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -99,7 +99,7 @@ export const DialogContent = React.forwardRef<HTMLDivElement, DialogContentProps
           {type === "confirmation" && (
             <div className="flex">
               {Icon && (
-                <div className="mr-4 inline-flex h-10 w-10 items-center justify-center rounded-full bg-gray-300">
+                <div className="bg-emphasis mr-4 inline-flex h-10 w-10 items-center justify-center rounded-full">
                   <Icon className="text-emphasis h-4 w-4" />
                 </div>
               )}
diff --git a/packages/ui/components/editor/Editor.tsx b/packages/ui/components/editor/Editor.tsx
index f631ca6f66..4ba3e95513 100644
--- a/packages/ui/components/editor/Editor.tsx
+++ b/packages/ui/components/editor/Editor.tsx
@@ -10,6 +10,7 @@ import { MarkdownShortcutPlugin } from "@lexical/react/LexicalMarkdownShortcutPl
 import { RichTextPlugin } from "@lexical/react/LexicalRichTextPlugin";
 import { HeadingNode, QuoteNode } from "@lexical/rich-text";
 import { TableCellNode, TableNode, TableRowNode } from "@lexical/table";
+import type { Dispatch, SetStateAction } from "react";
 
 import { classNames } from "@calcom/lib";
 
@@ -33,6 +34,9 @@ export type TextEditorProps = {
   height?: string;
   placeholder?: string;
   disableLists?: boolean;
+  updateTemplate?: boolean;
+  firstRender?: boolean;
+  setFirstRender?: Dispatch<SetStateAction<boolean>>;
   editable?: boolean;
 };
 
@@ -69,6 +73,9 @@ export const Editor = (props: TextEditorProps) => {
             editable={editable}
             excludedToolbarItems={props.excludedToolbarItems}
             variables={props.variables}
+            updateTemplate={props.updateTemplate}
+            firstRender={props.firstRender}
+            setFirstRender={props.setFirstRender}
           />
           <div
             className={classNames("editor-inner scroll-bar", !editable && "bg-muted")}
diff --git a/packages/ui/components/editor/plugins/AddVariablesDropdown.tsx b/packages/ui/components/editor/plugins/AddVariablesDropdown.tsx
index f6864babd7..4552494e3e 100644
--- a/packages/ui/components/editor/plugins/AddVariablesDropdown.tsx
+++ b/packages/ui/components/editor/plugins/AddVariablesDropdown.tsx
@@ -32,29 +32,31 @@ export const AddVariablesDropdown = (props: IAddVariablesDropdown) => {
           )}
         </div>
       </DropdownMenuTrigger>
-      <DropdownMenuContent className="h-40 overflow-scroll">
+      <DropdownMenuContent>
         <div className="pt-4 pb-1">
           <div className="text-subtle mb-2 px-4 text-left text-xs">
             {t("add_dynamic_variables").toLocaleUpperCase()}
           </div>
-          {props.variables.map((variable) => (
-            <DropdownMenuItem key={variable} className="hover:ring-0">
-              <button
-                key={variable}
-                type="button"
-                className="w-full px-4 py-2"
-                onClick={() => props.addVariable(t(`${variable}_variable`))}>
-                <div className="sm:grid sm:grid-cols-2">
-                  <div className="mr-3 text-left md:col-span-1">
-                    {`{${t(`${variable}_variable`).toUpperCase().replace(/ /g, "_")}}`}
+          <div className="h-64 overflow-scroll md:h-80">
+            {props.variables.map((variable) => (
+              <DropdownMenuItem key={variable} className="hover:ring-0">
+                <button
+                  key={variable}
+                  type="button"
+                  className="w-full px-4 py-2"
+                  onClick={() => props.addVariable(t(`${variable}_variable`))}>
+                  <div className="sm:grid sm:grid-cols-2">
+                    <div className="mr-3 text-left md:col-span-1">
+                      {`{${t(`${variable}_variable`).toUpperCase().replace(/ /g, "_")}}`}
+                    </div>
+                    <div className="text-default hidden text-left sm:col-span-1 sm:flex">
+                      {t(`${variable}_info`)}
+                    </div>
                   </div>
-                  <div className="text-default hidden text-left sm:col-span-1 sm:flex">
-                    {t(`${variable}_info`)}
-                  </div>
-                </div>
-              </button>
-            </DropdownMenuItem>
-          ))}
+                </button>
+              </DropdownMenuItem>
+            ))}
+          </div>
         </div>
       </DropdownMenuContent>
     </Dropdown>
diff --git a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
index a7ae8b5a14..9c6acdb905 100644
--- a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
+++ b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
@@ -340,23 +340,47 @@ export default function ToolbarPlugin(props: TextEditorProps) {
   };
 
   useEffect(() => {
-    editor.update(() => {
-      const parser = new DOMParser();
-      const dom = parser.parseFromString(props.getText(), "text/html");
+    if (!props.firstRender) {
+      editor.update(() => {
+        const root = $getRoot();
+        if (root) {
+          editor.update(() => {
+            const parser = new DOMParser();
+            // Create a new TextNode
+            const dom = parser.parseFromString(props.getText(), "text/html");
 
-      const nodes = $generateNodesFromDOM(editor, dom);
-
-      $getRoot().select();
-      $insertNodes(nodes);
-
-      editor.registerUpdateListener(({ editorState, prevEditorState }) => {
-        editorState.read(() => {
-          const textInHtml = $generateHtmlFromNodes(editor).replace(/&lt;/g, "<").replace(/&gt;/g, ">");
-          props.setText(textInHtml);
-        });
-        if (!prevEditorState._selection) editor.blur();
+            const nodes = $generateNodesFromDOM(editor, dom);
+            const paragraph = $createParagraphNode();
+            root.clear().append(paragraph);
+            paragraph.select();
+            $insertNodes(nodes);
+          });
+        }
       });
-    });
+    }
+  }, [props.updateTemplate]);
+
+  useEffect(() => {
+    if (props.setFirstRender) {
+      props.setFirstRender(false);
+      editor.update(() => {
+        const parser = new DOMParser();
+        const dom = parser.parseFromString(props.getText(), "text/html");
+
+        const nodes = $generateNodesFromDOM(editor, dom);
+
+        $getRoot().select();
+        $insertNodes(nodes);
+
+        editor.registerUpdateListener(({ editorState, prevEditorState }) => {
+          editorState.read(() => {
+            const textInHtml = $generateHtmlFromNodes(editor).replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+            props.setText(textInHtml);
+          });
+          if (!prevEditorState._selection) editor.blur();
+        });
+      });
+    }
   }, []);
 
   useEffect(() => {
diff --git a/packages/ui/components/editor/stylesEditor.css b/packages/ui/components/editor/stylesEditor.css
index 2db91898fd..e9ffd3616d 100644
--- a/packages/ui/components/editor/stylesEditor.css
+++ b/packages/ui/components/editor/stylesEditor.css
@@ -1,6 +1,5 @@
 
 .editor a {
-  color: #0000FF;
   text-decoration: underline;
   font-size: 14px;
 }
diff --git a/packages/ui/components/form/checkbox/Checkbox.tsx b/packages/ui/components/form/checkbox/Checkbox.tsx
index 30e41f94dd..c5ea496b1f 100644
--- a/packages/ui/components/form/checkbox/Checkbox.tsx
+++ b/packages/ui/components/form/checkbox/Checkbox.tsx
@@ -53,7 +53,7 @@ const CheckboxField = forwardRef<HTMLInputElement, Props>(
                     type="checkbox"
                     disabled={disabled}
                     className={classNames(
-                      "text-primary-600 focus:ring-primary-500 border-default h-4 w-4 rounded ltr:mr-2 rtl:ml-2 ",
+                      "text-primary-600 focus:ring-primary-500 border-default bg-default h-4 w-4 rounded ltr:mr-2 rtl:ml-2",
                       !error && disabled
                         ? "bg-gray-300 checked:bg-gray-300"
                         : "hover:bg-subtle checked:bg-gray-800",
diff --git a/packages/ui/components/form/index.ts b/packages/ui/components/form/index.ts
index cab81972dc..c751166c7d 100644
--- a/packages/ui/components/form/index.ts
+++ b/packages/ui/components/form/index.ts
@@ -22,7 +22,7 @@ export { Select, SelectField, SelectWithValidation, getReactSelectProps } from "
 export { TimezoneSelect } from "./timezone-select";
 export type { ITimezone, ITimezoneOption } from "./timezone-select";
 export { DateRangePickerLazy as DateRangePicker } from "./date-range-picker";
-export { BooleanToggleGroup, BooleanToggleGroupField, ToggleGroup, ToggleGroupItem } from "./toggleGroup";
+export { BooleanToggleGroup, BooleanToggleGroupField, ToggleGroup } from "./toggleGroup";
 export { DatePicker } from "./datepicker";
 export { FormStep, Steps, Stepper } from "./step";
 export { WizardForm } from "./wizard";
diff --git a/packages/ui/components/form/inputs/Input.tsx b/packages/ui/components/form/inputs/Input.tsx
index bfae9c6caa..0e188cb506 100644
--- a/packages/ui/components/form/inputs/Input.tsx
+++ b/packages/ui/components/form/inputs/Input.tsx
@@ -12,10 +12,10 @@ import { Eye, EyeOff, X } from "../../icon";
 import { HintsOrErrors } from "./HintOrErrors";
 import { Label } from "./Label";
 
-type InputProps = JSX.IntrinsicElements["input"] & { isFullWidth?: boolean };
+type InputProps = JSX.IntrinsicElements["input"] & { isFullWidth?: boolean; isStandaloneField?: boolean };
 
 export const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
-  { isFullWidth = true, ...props },
+  { isFullWidth = true, isStandaloneField = true, ...props },
   ref
 ) {
   return (
@@ -140,6 +140,7 @@ export const InputField = forwardRef<HTMLInputElement, InputFieldProps>(function
             type={type}
             placeholder={placeholder}
             isFullWidth={inputIsFullWidth}
+            isStandaloneField={false}
             className={classNames(
               className,
               "disabled:bg-muted disabled:hover:border-subtle disabled:cursor-not-allowed",
@@ -162,10 +163,7 @@ export const InputField = forwardRef<HTMLInputElement, InputFieldProps>(function
           {addOnSuffix && (
             <Addon
               isFilled={addOnFilled}
-              className={classNames(
-                "ltr:rounded-r-md ltr:border-l-0 rtl:rounded-l-md rtl:border-r-0",
-                addOnClassname
-              )}>
+              className={classNames("ltr:rounded-r-md rtl:rounded-l-md", addOnClassname)}>
               {addOnSuffix}
             </Addon>
           )}
@@ -224,14 +222,14 @@ export const PasswordField = forwardRef<HTMLInputElement, InputFieldProps>(funct
         placeholder={props.placeholder || "•••••••••••••"}
         ref={ref}
         {...props}
-        className={classNames("mb-0 ltr:border-r-0 ltr:pr-10 rtl:border-l-0 rtl:pl-10", props.className)}
+        className={classNames(
+          "addon-wrapper mb-0 ltr:border-r-0 ltr:pr-10 rtl:border-l-0 rtl:pl-10",
+          props.className
+        )}
         addOnFilled={false}
         addOnSuffix={
           <Tooltip content={textLabel}>
-            <button
-              className="text-emphasis absolute bottom-0 h-9 ltr:right-3 rtl:left-3"
-              type="button"
-              onClick={() => toggleIsPasswordVisible()}>
+            <button className="text-emphasis h-9" type="button" onClick={() => toggleIsPasswordVisible()}>
               {isPasswordVisible ? (
                 <EyeOff className="h-4 stroke-[2.5px]" />
               ) : (
diff --git a/packages/ui/components/form/selectimproved/components/Item.tsx b/packages/ui/components/form/selectimproved/components/Item.tsx
deleted file mode 100755
index 9350231eed..0000000000
--- a/packages/ui/components/form/selectimproved/components/Item.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Check } from "lucide-react";
-import React from "react";
-
-import { classNames as cn } from "@calcom/lib";
-
-import { useSelectContext } from "./SelectProvider";
-import type { Option } from "./type";
-
-interface ItemProps {
-  item: Option;
-  index?: number;
-  focused: boolean;
-}
-
-const Item: React.FC<ItemProps> = ({ item, index, focused }) => {
-  const { classNames, selectedItems, handleValueChange } = useSelectContext();
-  const isMultiple = Array.isArray(selectedItems);
-  const isSelected =
-    (isMultiple && selectedItems?.some((selection) => selection.value === item.value)) ||
-    (!isMultiple && selectedItems?.value === item.value);
-
-  if (item.disabled) {
-    return (
-      <li
-        className={cn(
-          " flex cursor-not-allowed select-none justify-between truncate rounded-[4px] px-3 py-2 text-gray-300 ",
-          focused ? "dark:bg-darkgray-200 bg-muted" : "dark:hover:bg-darkgray-200 hover:bg-subtle"
-        )}>
-        <>
-          <div className="space-x flex items-center">
-            {item.leftNode && item.leftNode}
-            <p>{item.label}</p>
-          </div>
-          {isMultiple ? (
-            <div
-              className={cn(
-                "flex h-4 w-4 items-center justify-center rounded-[4px]  border opacity-70 ltr:mr-2 rtl:ml-2",
-                isSelected
-                  ? "dark:bg-darkgray-200  border-subtle bg-gray-800 text-gray-50"
-                  : " dark:bg-darkgray-200 border-subtle border-default bg-mutedext-gray-600"
-              )}>
-              {isSelected && <Check className="h-3 w-3 text-current" />}
-            </div>
-          ) : (
-            isSelected && <Check className="text-emphasis h-3 w-3" strokeWidth={2} />
-          )}
-        </>
-      </li>
-    );
-  }
-
-  return (
-    <li
-      aria-selected={isSelected}
-      tabIndex={index}
-      role="option"
-      onClick={() => handleValueChange(item)}
-      className={cn(
-        "block flex cursor-pointer select-none items-center justify-between truncate border-transparent px-3 py-2 transition duration-200",
-        isSelected
-          ? "dark:bg-darkgray-200  bg-subtle text-emphasis"
-          : " dark:hover:bg-darkgray-200 text-default hover:bg-subtle",
-        focused && "dark:bg-darkgray-200 bg-muted",
-        classNames?.listItem
-      )}>
-      <div className="flex items-center space-x-2">
-        {item.leftNode && item.leftNode}
-        <p>{item.label}</p>
-      </div>
-
-      {isMultiple ? (
-        <div
-          className={cn(
-            "flex h-4 w-4 items-center justify-center rounded-[4px]  border ltr:mr-2 rtl:ml-2",
-            isSelected
-              ? "dark:bg-darkgray-200  border-subtle bg-gray-800 text-gray-50"
-              : " dark:bg-darkgray-200 border-subtle border-default bg-mutedext-gray-600"
-          )}>
-          {isSelected && <Check className="h-3 w-3 text-current" />}
-        </div>
-      ) : (
-        isSelected && <Check className="text-emphasis h-3 w-3" strokeWidth={2} />
-      )}
-    </li>
-  );
-};
-
-export default Item;
diff --git a/packages/ui/components/form/selectimproved/components/Options.tsx b/packages/ui/components/form/selectimproved/components/Options.tsx
deleted file mode 100755
index c59cff9e07..0000000000
--- a/packages/ui/components/form/selectimproved/components/Options.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
-
-import classNames from "@calcom/lib/classNames";
-import { useKeyPress } from "@calcom/lib/hooks/useKeyPress";
-
-import { Label } from "../../inputs/Label";
-import Item from "./Item";
-import { SelectContext } from "./SelectProvider";
-import type { Option } from "./type";
-
-interface OptionsProps<T extends Option> {
-  list: T[];
-  inputValue: string;
-  isMultiple: boolean;
-  selected: T | T[] | null;
-  searchBoxRef: React.RefObject<HTMLInputElement>;
-}
-
-type FlattenedOption = Option & { current: number; groupedIndex?: number };
-
-const flattenOptions = (options: Option[], groupCount?: number): FlattenedOption[] => {
-  return options.reduce((acc, option, current) => {
-    if (option.options) {
-      return [...acc, ...flattenOptions(option.options, current + (groupCount || 0))];
-    }
-    return [...acc, { ...option, current, groupedIndex: groupCount }];
-  }, [] as FlattenedOption[]);
-};
-
-function FilteredItem<T extends Option>({
-  index,
-  keyboardFocus,
-  item,
-  inputValue,
-  list,
-}: {
-  index: number;
-  keyboardFocus: number;
-  item: FlattenedOption;
-  inputValue: string;
-  list: T[];
-}) {
-  const focused = index === keyboardFocus;
-  const ref = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    if (ref.current && focused) {
-      ref.current.scrollIntoView({ behavior: "smooth" });
-    }
-  }, [ref, focused]);
-
-  return (
-    <div key={index} ref={ref}>
-      {item.current === 0 && item.groupedIndex !== undefined && !inputValue && (
-        <div>
-          {index !== 0 && <hr className="mt-2" />}
-          <Label
-            className={classNames(
-              " text-default mb-2 pl-3 text-xs font-normal uppercase leading-none",
-              index !== 0 ? "mt-5" : "mt-4" // rest, first
-            )}>
-            {list[item.groupedIndex].label}
-          </Label>
-        </div>
-      )}
-      <Item item={item} index={index} focused={focused} />
-    </div>
-  );
-}
-
-function Options<T extends Option>({ list, inputValue, searchBoxRef }: OptionsProps<T>) {
-  const { classNames, handleValueChange } = useContext(SelectContext);
-  const [keyboardFocus, setKeyboardFocus] = useState(-1);
-  const enterPress = useKeyPress("Enter", searchBoxRef);
-
-  const flattenedList = useMemo(() => flattenOptions(list), [list]);
-
-  const totalOptionsLength = useMemo(() => {
-    return flattenedList.length;
-  }, [flattenedList]);
-
-  useKeyPress("ArrowDown", searchBoxRef, () => setKeyboardFocus((prev) => (prev + 1) % totalOptionsLength));
-  useKeyPress("ArrowUp", searchBoxRef, () =>
-    setKeyboardFocus((prev) => (prev - 1 + totalOptionsLength) % totalOptionsLength)
-  );
-
-  useEffect(() => {
-    if (enterPress) {
-      const item = filteredList[keyboardFocus];
-      if (!item || item.disabled) return;
-      handleValueChange(item);
-    }
-    // We don't want to re-run this effect when handleValueChange changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [enterPress, keyboardFocus, list]);
-
-  const search = useCallback((optionsArray: FlattenedOption[], searchTerm: string) => {
-    // search options by label, or group label or options.options
-    return optionsArray.reduce((acc: FlattenedOption[], option: FlattenedOption) => {
-      // @TODO: add search by lavbel group gets awkward as it doesnt exist in the flattened list
-      if (option.label.toLowerCase().includes(searchTerm.toLowerCase())) {
-        acc.push(option);
-      }
-
-      return acc;
-    }, [] as FlattenedOption[]);
-  }, []);
-
-  const filteredList = useMemo(() => {
-    if (inputValue.length > 0) {
-      return search(flattenedList, inputValue);
-    }
-
-    return flattenedList;
-  }, [inputValue, flattenedList, search]);
-
-  return (
-    <div
-      className={
-        classNames?.list ?? "flex max-h-72 flex-col space-y-[1px] overflow-y-auto overflow-y-scroll"
-      }>
-      {filteredList?.map((item, index) => (
-        <FilteredItem
-          key={index}
-          item={item}
-          index={index}
-          keyboardFocus={keyboardFocus}
-          inputValue={inputValue}
-          list={list}
-        />
-      ))}
-    </div>
-  );
-}
-
-export default Options;
diff --git a/packages/ui/components/form/selectimproved/components/SearchInput.tsx b/packages/ui/components/form/selectimproved/components/SearchInput.tsx
deleted file mode 100755
index 455d9510b9..0000000000
--- a/packages/ui/components/form/selectimproved/components/SearchInput.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useContext } from "react";
-
-import { Search } from "../../../icon";
-import { SelectContext } from "./SelectProvider";
-
-interface SearchInputProps {
-  placeholder?: string;
-  value: string;
-  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
-  name?: string;
-  searchInputRef?: React.RefObject<HTMLInputElement>;
-}
-
-const SearchInput: React.FC<SearchInputProps> = ({
-  placeholder = "",
-  value = "",
-  onChange,
-  name = "",
-  searchInputRef,
-}) => {
-  const { classNames } = useContext(SelectContext);
-  return (
-    <div
-      className={
-        classNames && classNames.searchContainer ? classNames.searchContainer : "relative py-1 px-2.5"
-      }>
-      <Search
-        className={
-          classNames && classNames.searchIcon
-            ? classNames.searchIcon
-            : " text-subtle absolute mt-2.5 ml-2 h-5 w-5 pb-0.5"
-        }
-      />
-      <input
-        ref={searchInputRef}
-        className={
-          classNames && classNames.searchBox
-            ? classNames.searchBox
-            : "border-subtle dark:bg-darkgray-100   focus:border-darkgray-900 text-subtle border-subtle w-full rounded-[6px] border py-2 pl-8 text-sm focus:border-gray-900 focus:outline-none focus:ring-0"
-        }
-        autoFocus
-        type="text"
-        placeholder={placeholder}
-        value={value}
-        onChange={onChange}
-        name={name}
-      />
-    </div>
-  );
-};
-
-export default SearchInput;
diff --git a/packages/ui/components/form/selectimproved/components/Select.tsx b/packages/ui/components/form/selectimproved/components/Select.tsx
deleted file mode 100755
index f3740352c3..0000000000
--- a/packages/ui/components/form/selectimproved/components/Select.tsx
+++ /dev/null
@@ -1,233 +0,0 @@
-import * as Popover from "@radix-ui/react-popover";
-import React, { useCallback, useRef, useState } from "react";
-
-import { classNames as cn } from "@calcom/lib";
-
-import { X, ChevronDown } from "../../../icon";
-import Options from "./Options";
-import SearchInput from "./SearchInput";
-import SelectProvider from "./SelectProvider";
-import type { Option } from "./type";
-
-interface SelectProps<T extends Option> {
-  options: T[];
-  selectedItems: T | T[] | null;
-  onChange: (value?: Option | Option[] | null) => void;
-  placeholder?: string;
-  isMultiple?: boolean;
-  isClearable?: boolean;
-  isSearchable?: boolean;
-  isDisabled?: boolean;
-  loading?: boolean;
-  menuIsOpen?: boolean;
-  searchInputPlaceholder?: string;
-  noOptionsMessage?: string;
-  classNames?: {
-    menuButton?: ({ isDisabled }: { isDisabled: boolean }) => string;
-    menu?: string;
-    tagItem?: ({ isDisabled }: { isDisabled: boolean }) => string;
-    tagItemText?: string;
-    tagItemIconContainer?: string;
-    tagItemIcon?: string;
-    list?: string;
-    listGroupLabel?: string;
-    listItem?: ({ isSelected }: { isSelected: boolean }) => string;
-    listDisabledItem?: string;
-    ChevronIcon?: ({ open }: { open: boolean }) => string;
-    searchContainer?: string;
-    searchBox?: string;
-    searchIcon?: string;
-    closeIcon?: string;
-  };
-}
-
-function Select<T extends Option>({
-  options = [],
-  selectedItems = null,
-  onChange,
-  placeholder = "Select...",
-  searchInputPlaceholder = "Search...",
-  isMultiple = false,
-  isClearable = false,
-  isSearchable = false,
-  isDisabled = false,
-  menuIsOpen = false,
-  classNames,
-}: SelectProps<T>) {
-  const [inputValue, setInputValue] = useState<string>("");
-  const [open, setOpen] = useState(menuIsOpen);
-  const searchBoxRef = useRef<HTMLInputElement>(null);
-
-  const isMultipleValue = Array.isArray(selectedItems) && isMultiple;
-
-  const removeItem = useCallback(
-    (item: Option) => {
-      // remove the item from the selected items
-      if (Array.isArray(selectedItems)) {
-        const newSelectedItems = selectedItems.filter((selectedItem) => selectedItem.value !== item.value);
-        onChange(newSelectedItems);
-      } else {
-        onChange(null);
-      }
-    },
-    [onChange, selectedItems]
-  );
-
-  const closeDropDown = useCallback(() => {
-    console.log({ open });
-    if (open) setOpen(false);
-  }, [open]);
-
-  const handleValueChange = useCallback(
-    (selected: Option) => {
-      function update() {
-        if (!isMultiple && !Array.isArray(selectedItems)) {
-          // Close dropdown when you select an item when we are on single select
-          closeDropDown();
-          onChange(selected);
-          return;
-        }
-
-        // check if the selected item is already selected
-        if (Array.isArray(selectedItems)) {
-          const isAlreadySelected = selectedItems.some((item) => item.value === selected.value);
-          if (isAlreadySelected) {
-            removeItem(selected);
-            return;
-          }
-          onChange(selectedItems === null ? [selected] : [...selectedItems, selected]);
-        }
-      }
-
-      if (selected.disabled) return;
-
-      if (selected !== selectedItems) {
-        update();
-      }
-    },
-    [closeDropDown, isMultiple, onChange, selectedItems, removeItem]
-  );
-
-  const clearValue = useCallback(
-    (e: React.MouseEvent<HTMLDivElement>) => {
-      e.stopPropagation();
-      onChange(isMultiple ? [] : null);
-    },
-    [onChange, isMultiple]
-  );
-
-  return (
-    <SelectProvider
-      options={{
-        classNames,
-      }}
-      selectedItems={selectedItems}
-      handleValueChange={handleValueChange}>
-      <div className="relative w-full">
-        <Popover.Root>
-          <Popover.Trigger>
-            <div
-              className={cn(
-                "min-w-64 border-default text-muted flex max-h-[36px] items-center justify-between rounded-md border text-sm transition-all duration-300 focus:outline-none",
-                isDisabled
-                  ? " dark:bg-darkgray-200 border-subtle bg-subtle dark:text-subtle text-muted border-subtle"
-                  : "border-subtle dark:bg-darkgray-50  dark:focus:border-darkgray-700 dark:focus:bg-darkgray-100 dark:focus:text-darkgray-900 dark:hover:text-darkgray-900 bg-default hover:border-empthasis focus:border-gray-900"
-              )}>
-              <div className="flex w-full grow-0 items-center gap-1 overflow-x-hidden">
-                <>
-                  {((isMultipleValue && selectedItems.length === 0) || selectedItems === null) && (
-                    <div className="text-muted py-2.5 px-3 dark:text-current">
-                      <p>{placeholder}</p>
-                    </div>
-                  )}
-
-                  {Array.isArray(selectedItems) ? (
-                    <div className="flex gap-1 overflow-x-scroll p-1 ">
-                      {selectedItems.map((item, index) => (
-                        <div
-                          className={cn(
-                            "dark:bg-darkgray-200 bg-emphasis flex items-center space-x-2 rounded px-2 py-[6px]"
-                          )}
-                          key={index}>
-                          <p
-                            className={cn(
-                              classNames?.tagItemText ??
-                                " text-default cursor-default select-none truncate text-sm leading-none"
-                            )}>
-                            {item.label}
-                          </p>
-                          {!isDisabled && (
-                            <button
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                removeItem(item);
-                              }}>
-                              <X
-                                className={
-                                  classNames?.tagItemIcon ??
-                                  " dark:hover:text-darkgray-900 hover:text-emphasis text-subtle h-4 w-4"
-                                }
-                              />
-                            </button>
-                          )}
-                        </div>
-                      ))}
-                    </div>
-                  ) : (
-                    <div className=" text-emphasis py-2.5 px-3 text-sm leading-none">
-                      <p>{selectedItems?.label}</p>
-                    </div>
-                  )}
-                </>
-              </div>
-
-              <div className=" text-emphasis flex flex-none items-center rounded-[6px] p-1.5 opacity-75 ">
-                <>
-                  {isClearable && !isDisabled && selectedItems !== null && (
-                    <div className="cursor-pointer" onClick={clearValue}>
-                      <X
-                        className={
-                          classNames && classNames.closeIcon ? classNames.closeIcon : "h-5 w-5 p-0.5"
-                        }
-                      />
-                    </div>
-                  )}
-
-                  <ChevronDown className={cn("h-5 w-5 transition duration-300")} />
-                </>
-              </div>
-            </div>
-          </Popover.Trigger>
-          <Popover.Portal>
-            <Popover.Content>
-              <div
-                className={
-                  classNames?.menu ??
-                  "dark:bg-darkgray-100 border-subtle min-w-64 bg-default text-default z-10 mt-1.5 overflow-x-hidden rounded border py-1 text-sm shadow-sm"
-                }>
-                {isSearchable && (
-                  <SearchInput
-                    searchInputRef={searchBoxRef}
-                    value={inputValue}
-                    placeholder={searchInputPlaceholder}
-                    onChange={(e) => setInputValue(e.target.value)}
-                  />
-                )}
-
-                <Options
-                  searchBoxRef={searchBoxRef}
-                  list={options}
-                  inputValue={inputValue}
-                  isMultiple={isMultiple}
-                  selected={selectedItems}
-                />
-              </div>
-            </Popover.Content>
-          </Popover.Portal>
-        </Popover.Root>
-      </div>
-    </SelectProvider>
-  );
-}
-
-export default Select;
diff --git a/packages/ui/components/form/selectimproved/components/SelectProvider.tsx b/packages/ui/components/form/selectimproved/components/SelectProvider.tsx
deleted file mode 100644
index adbc7e782f..0000000000
--- a/packages/ui/components/form/selectimproved/components/SelectProvider.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React, { createContext, useContext, useMemo } from "react";
-
-import type { ClassNames, Option } from "./type";
-
-interface Store {
-  selectedItems: Option | Option[] | null;
-  handleValueChange: (selected: Option) => void;
-  classNames?: ClassNames;
-}
-
-interface Props {
-  selectedItems: Option | Option[] | null;
-  handleValueChange: (selected: Option) => void;
-  children: JSX.Element;
-  options: {
-    classNames?: ClassNames;
-  };
-}
-
-export const SelectContext = createContext<Store>({
-  selectedItems: null,
-  handleValueChange: (selected) => {
-    return selected;
-  },
-  classNames: undefined,
-});
-
-export const useSelectContext = (): Store => {
-  return useContext(SelectContext);
-};
-
-const SelectProvider: React.FC<Props> = ({ selectedItems, handleValueChange, options, children }) => {
-  const store = useMemo(() => {
-    return {
-      selectedItems,
-      handleValueChange,
-      classNames: options?.classNames,
-    } as Store;
-  }, [handleValueChange, options, selectedItems]);
-
-  return <SelectContext.Provider value={store}>{children}</SelectContext.Provider>;
-};
-
-export default SelectProvider;
diff --git a/packages/ui/components/form/selectimproved/components/type.ts b/packages/ui/components/form/selectimproved/components/type.ts
deleted file mode 100644
index d8d6a52a8a..0000000000
--- a/packages/ui/components/form/selectimproved/components/type.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export interface Option {
-  value?: string;
-  label: string;
-  disabled?: boolean;
-  isSelected?: boolean;
-  options?: Option[];
-  leftNode?: React.ReactNode;
-}
-
-export interface ClassNames {
-  menuButton?: (args: { isDisabled: boolean }) => string;
-  menu?: string;
-  tagItem?: (args: { isDisabled: boolean }) => string;
-  tagItemText?: string;
-  tagItemIconContainer?: string;
-  tagItemIcon?: string;
-  list?: string;
-  listGroupLabel?: string;
-  listItem?: (args: { isSelected: boolean }) => string;
-  listDisabledItem?: string;
-  ChevronIcon?: (args: { open: boolean }) => string;
-  searchContainer?: string;
-  searchBox?: string;
-  searchIcon?: string;
-  closeIcon?: string;
-}
diff --git a/packages/ui/components/form/selectimproved/index.tsx b/packages/ui/components/form/selectimproved/index.tsx
deleted file mode 100644
index 948d811236..0000000000
--- a/packages/ui/components/form/selectimproved/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Select from "./components/Select";
-
-export default Select;
diff --git a/packages/ui/components/form/selectimproved/selectimproved.stories.mdx b/packages/ui/components/form/selectimproved/selectimproved.stories.mdx
deleted file mode 100644
index a8988a5738..0000000000
--- a/packages/ui/components/form/selectimproved/selectimproved.stories.mdx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-import {
-  Examples,
-  Example,
-  Note,
-  Title,
-  CustomArgsTable,
-  VariantRow,
-  VariantsTable,
-} from "@calcom/storybook/components";
-
-import Select from "./components/Select";
-
-<Meta title="UI/Form/CustomSelect" component={Select} />
-
-<Title title="Select" suffix="Brief" subtitle="Version 2.0 — Last Update: 22 Aug 2022" />
-
-export const options = [
-  {
-    //4
-    label: "Cal.com Inc",
-    options: [
-      { value: "UserA", label: "Pro" }, // 5
-      { value: "UserB", label: "Teampro" }, // 6
-      { value: "UserC", label: "Example" },
-      { value: "UserD", label: "Admin", disabled: true },
-    ],
-  },
-  {
-    // 5
-    label: "Acme Inc",
-    options: [
-      { value: "UserE", label: "Acme Pro" }, // 1 == 6
-      { value: "UserF", label: "Acme Teampro" },
-      { value: "UserG", label: "Acme example" },
-      { value: "UserH", label: "Acme Admin", disabled: true },
-    ],
-  },
-];
-
-export const SelectWithState = (...args) => {
-  const [value, setValue] = React.useState(options[0].options[0]);
-  return <Select options={options} selectedItems={value} onChange={(e) => setValue(e)} isClearable />;
-};
-
-export const MultiWithState = (...args) => {
-  const [value, setValue] = React.useState([options[0].options[0]]);
-  return (
-    <Select
-      options={options}
-      selectedItems={value}
-      onChange={(e) => {
-        setValue(e);
-      }}
-      isSearchable
-      isMultiple
-      isClearable
-    />
-  );
-};
-
-<Examples title="State">
-  <Example title="Single" isFullWidth>
-    <SelectWithState />
-  </Example>
-  <Example title="Multi" isFullWidth>
-    <MultiWithState />
-  </Example>
-</Examples>
-
-<Canvas>
-  <Story name="Default">
-    <div className="flex flex-col space-y-4">
-      <VariantsTable titles={[]} columnMinWidth={300}>
-        <VariantRow variant="Single">
-          <SelectWithState />
-        </VariantRow>
-        <VariantRow variant="Multi">
-          <MultiWithState />
-        </VariantRow>
-      </VariantsTable>
-    </div>
-  </Story>
-</Canvas>
diff --git a/packages/ui/components/form/switch/Switch.tsx b/packages/ui/components/form/switch/Switch.tsx
index a0d3b12699..8c0d04f0a8 100644
--- a/packages/ui/components/form/switch/Switch.tsx
+++ b/packages/ui/components/form/switch/Switch.tsx
@@ -19,26 +19,28 @@ const Switch = (
     fitToHeight?: boolean;
     disabled?: boolean;
     tooltip?: string;
+    labelOnLeading?: boolean;
     classNames?: {
       container?: string;
       thumb?: string;
     };
   }
 ) => {
-  const { label, fitToHeight, classNames, ...primitiveProps } = props;
+  const { label, fitToHeight, classNames, labelOnLeading, ...primitiveProps } = props;
   const id = useId();
-
+  const isChecked = props.checked || props.defaultChecked;
   return (
     <Wrapper tooltip={props.tooltip}>
       <div
         className={cx(
           "flex h-auto w-auto flex-row items-center",
           fitToHeight && "h-fit",
+          labelOnLeading && "flex-row-reverse",
           classNames?.container
         )}>
         <PrimitiveSwitch.Root
           className={cx(
-            props.checked || props.defaultChecked ? "bg-inverted" : "bg-emphasis",
+            props.checked || props.defaultChecked ? "bg-brand-default" : "bg-emphasis",
             primitiveProps.disabled && "cursor-not-allowed",
             "focus:ring-brand-default h-5 w-[34px] rounded-full shadow-none",
             props.className
@@ -48,7 +50,7 @@ const Switch = (
             id={id}
             className={cx(
               "block h-[14px] w-[14px] rounded-full transition will-change-transform ltr:translate-x-[4px] rtl:-translate-x-[4px] ltr:[&[data-state='checked']]:translate-x-[17px] rtl:[&[data-state='checked']]:-translate-x-[17px]",
-              props.checked || props.defaultChecked ? "bg-default shadow-inner" : "bg-inverted",
+              isChecked ? "bg-brand-accent shadow-inner" : "bg-default",
               classNames?.thumb
             )}
           />
@@ -58,7 +60,8 @@ const Switch = (
             htmlFor={id}
             className={cx(
               "text-emphasis ms-2 align-text-top text-sm font-medium",
-              primitiveProps.disabled ? "cursor-not-allowed opacity-25" : "cursor-pointer "
+              primitiveProps.disabled ? "cursor-not-allowed opacity-25" : "cursor-pointer",
+              labelOnLeading && "flex-1"
             )}>
             {label}
           </Label.Root>
diff --git a/packages/ui/components/form/timezone-select/TimezoneSelect.tsx b/packages/ui/components/form/timezone-select/TimezoneSelect.tsx
index 129260b1e2..5977a7c6bc 100644
--- a/packages/ui/components/form/timezone-select/TimezoneSelect.tsx
+++ b/packages/ui/components/form/timezone-select/TimezoneSelect.tsx
@@ -15,6 +15,7 @@ export interface ICity {
 
 export function TimezoneSelect({
   className,
+  classNames: timezoneClassNames,
   components,
   variant = "default",
   ...props
@@ -49,13 +50,15 @@ export function TimezoneSelect({
       formatOptionLabel={(option) => <p className="truncate">{(option as ITimezoneOption).value}</p>}
       getOptionLabel={(option) => handleOptionLabel(option as ITimezoneOption, cities)}
       classNames={{
-        input: () => classNames("text-emphasis", props.classNames?.input),
+        ...timezoneClassNames,
+        input: (state) =>
+          classNames("text-emphasis", timezoneClassNames?.input && timezoneClassNames.input(state)),
         option: (state) =>
           classNames(
             "bg-default flex cursor-pointer justify-between py-2.5 px-3 rounded-none text-default ",
             state.isFocused && "bg-subtle",
             state.isSelected && "bg-emphasis text-default",
-            props.classNames?.option
+            timezoneClassNames?.option && timezoneClassNames.option(state)
           ),
         placeholder: (state) => classNames("text-muted", state.isFocused && "hidden"),
         dropdownIndicator: () => "text-default",
@@ -64,33 +67,44 @@ export function TimezoneSelect({
             variant === "default"
               ? "px-3 py-2 bg-default border-default !min-h-9 text-sm leading-4 placeholder:text-sm placeholder:font-normal focus-within:ring-2 focus-within:ring-emphasis hover:border-emphasis rounded-md border gap-1"
               : "text-sm gap-1",
-            props.classNames?.control
+            timezoneClassNames?.control && timezoneClassNames.control(state)
           ),
-        singleValue: () => classNames("text-emphasis placeholder:text-muted", props.classNames?.singleValue),
-        valueContainer: () =>
-          classNames("text-emphasis placeholder:text-muted flex gap-1", props.classNames?.valueContainer),
-        multiValue: () =>
+        singleValue: (state) =>
+          classNames(
+            "text-emphasis placeholder:text-muted",
+            timezoneClassNames?.singleValue && timezoneClassNames.singleValue(state)
+          ),
+        valueContainer: (state) =>
+          classNames(
+            "text-emphasis placeholder:text-muted flex gap-1",
+            timezoneClassNames?.valueContainer && timezoneClassNames.valueContainer(state)
+          ),
+        multiValue: (state) =>
           classNames(
             "bg-subtle text-default rounded-md py-1.5 px-2 flex items-center text-sm leading-none",
-            props.classNames?.multiValue
+            timezoneClassNames?.multiValue && timezoneClassNames.multiValue(state)
           ),
-        menu: () =>
+        menu: (state) =>
           classNames(
             "rounded-md bg-default text-sm leading-4 text-default mt-1 border border-subtle",
-            props.classNames?.menu
+            timezoneClassNames?.menu && timezoneClassNames.menu(state)
           ),
         groupHeading: () => "leading-none text-xs uppercase text-default pl-2.5 pt-4 pb-2",
-        menuList: () => classNames("scroll-bar scrollbar-track-w-20 rounded-md", props.classNames?.menuList),
+        menuList: (state) =>
+          classNames(
+            "scroll-bar scrollbar-track-w-20 rounded-md",
+            timezoneClassNames?.menuList && timezoneClassNames.menuList(state)
+          ),
         indicatorsContainer: (state) =>
           classNames(
             state.selectProps.menuIsOpen
               ? state.isMulti
                 ? "[&>*:last-child]:rotate-180 [&>*:last-child]:transition-transform"
                 : "rotate-180 transition-transform"
-              : "text-default" // Woo it adds another SVG here on multi for some reason
+              : "text-default", // Woo it adds another SVG here on multi for some reason
+            timezoneClassNames?.indicatorsContainer && timezoneClassNames.indicatorsContainer(state)
           ),
         multiValueRemove: () => "text-default py-auto ml-2",
-        ...props.classNames,
       }}
     />
   );
diff --git a/packages/ui/components/form/toggleGroup/ToggleGroup.tsx b/packages/ui/components/form/toggleGroup/ToggleGroup.tsx
index cc942b987f..dfe1584f82 100644
--- a/packages/ui/components/form/toggleGroup/ToggleGroup.tsx
+++ b/packages/ui/components/form/toggleGroup/ToggleGroup.tsx
@@ -1,15 +1,32 @@
 import * as RadixToggleGroup from "@radix-ui/react-toggle-group";
+import type { ReactNode } from "react";
 import { useEffect, useState } from "react";
 
 import { classNames } from "@calcom/lib";
-
-export const ToggleGroupItem = () => <div>hi</div>;
+import { Tooltip } from "@calcom/ui";
 
 interface ToggleGroupProps extends Omit<RadixToggleGroup.ToggleGroupSingleProps, "type"> {
-  options: { value: string; label: string; disabled?: boolean }[];
+  options: { value: string; label: string | ReactNode; disabled?: boolean; tooltip?: string }[];
   isFullWidth?: boolean;
 }
 
+const OptionalTooltipWrapper = ({
+  children,
+  tooltipText,
+}: {
+  children: ReactNode;
+  tooltipText?: ReactNode;
+}) => {
+  if (tooltipText) {
+    return (
+      <Tooltip delayDuration={150} sideOffset={12} side="bottom" content={tooltipText}>
+        {children}
+      </Tooltip>
+    );
+  }
+  return <>{children}</>;
+};
+
 export const ToggleGroup = ({ options, onValueChange, isFullWidth, ...props }: ToggleGroupProps) => {
   const [value, setValue] = useState<string | undefined>(props.defaultValue);
   const [activeToggleElement, setActiveToggleElement] = useState<null | HTMLButtonElement>(null);
@@ -36,25 +53,26 @@ export const ToggleGroup = ({ options, onValueChange, isFullWidth, ...props }: T
           style={{ left: activeToggleElement?.offsetLeft, width: activeToggleElement?.offsetWidth }}
         />
         {options.map((option) => (
-          <RadixToggleGroup.Item
-            disabled={option.disabled}
-            key={option.value}
-            value={option.value}
-            className={classNames(
-              "relative rounded-[4px] px-3 py-1 text-sm leading-tight",
-              option.disabled
-                ? " text-gray-400 hover:cursor-not-allowed"
-                : " text-default [&[aria-checked='false']]:hover:bg-subtle",
-              isFullWidth && "w-full"
-            )}
-            ref={(node) => {
-              if (node && value === option.value) {
-                setActiveToggleElement(node);
-              }
-              return node;
-            }}>
-            {option.label}
-          </RadixToggleGroup.Item>
+          <OptionalTooltipWrapper key={option.value} tooltipText={option.tooltip}>
+            <RadixToggleGroup.Item
+              disabled={option.disabled}
+              value={option.value}
+              className={classNames(
+                "relative rounded-[4px] px-3 py-1 text-sm leading-tight",
+                option.disabled
+                  ? "text-gray-400 hover:cursor-not-allowed"
+                  : "text-default [&[aria-checked='false']]:hover:bg-subtle",
+                isFullWidth && "w-full"
+              )}
+              ref={(node) => {
+                if (node && value === option.value && activeToggleElement !== node) {
+                  setActiveToggleElement(node);
+                }
+                return node;
+              }}>
+              {option.label}
+            </RadixToggleGroup.Item>
+          </OptionalTooltipWrapper>
         ))}
       </RadixToggleGroup.Root>
     </>
diff --git a/packages/ui/components/form/toggleGroup/index.ts b/packages/ui/components/form/toggleGroup/index.ts
index 582aaebb30..a111fc9c00 100644
--- a/packages/ui/components/form/toggleGroup/index.ts
+++ b/packages/ui/components/form/toggleGroup/index.ts
@@ -1,2 +1,2 @@
-export { ToggleGroup, ToggleGroupItem } from "./ToggleGroup";
+export { ToggleGroup } from "./ToggleGroup";
 export { BooleanToggleGroup, BooleanToggleGroupField } from "./BooleanToggleGroup";
diff --git a/packages/ui/components/image-uploader/ImageUploader.tsx b/packages/ui/components/image-uploader/ImageUploader.tsx
index cef443c763..8238a73b7b 100644
--- a/packages/ui/components/image-uploader/ImageUploader.tsx
+++ b/packages/ui/components/image-uploader/ImageUploader.tsx
@@ -6,6 +6,7 @@ import Cropper from "react-easy-crop";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 
 import { Button, Dialog, DialogClose, DialogContent, DialogTrigger } from "../..";
+import { showToast } from "../toast";
 
 type ReadAsMethod = "readAsText" | "readAsDataURL" | "readAsArrayBuffer" | "readAsBinaryString";
 
@@ -134,7 +135,15 @@ export default function ImageUploader({
     if (!e.target.files?.length) {
       return;
     }
-    setFile(e.target.files[0]);
+
+    const limit = 5 * 1000000; // max limit 5mb
+    const file = e.target.files[0];
+
+    if (file.size > limit) {
+      showToast(t("image_size_limit_exceed"), "error");
+    } else {
+      setFile(file);
+    }
   };
 
   const showCroppedImage = useCallback(
diff --git a/packages/ui/components/logo/Logo.tsx b/packages/ui/components/logo/Logo.tsx
index f22d80f9c9..31e7e224cd 100644
--- a/packages/ui/components/logo/Logo.tsx
+++ b/packages/ui/components/logo/Logo.tsx
@@ -1,18 +1,27 @@
 import classNames from "@calcom/lib/classNames";
-import { LOGO_ICON, LOGO } from "@calcom/lib/constants";
 
-export default function Logo({ small, icon }: { small?: boolean; icon?: boolean }) {
+export default function Logo({
+  small,
+  icon,
+  inline = true,
+  className,
+}: {
+  small?: boolean;
+  icon?: boolean;
+  inline?: boolean;
+  className?: string;
+}) {
   return (
-    <h3 className="logo inline ">
+    <h3 className={classNames("logo", inline && "inline", className)}>
       <strong>
         {icon ? (
-          <img className="mx-auto w-9 dark:invert" alt="Cal" title="Cal" src={LOGO_ICON} />
+          <img className="mx-auto w-9 dark:invert" alt="Cal" title="Cal" src="/api/logo?icon=1" />
         ) : (
           <img
             className={classNames(small ? "h-4 w-auto" : "h-5 w-auto", "dark:invert")}
             alt="Cal"
             title="Cal"
-            src={LOGO}
+            src="/api/logo"
           />
         )}
       </strong>
diff --git a/packages/ui/components/meta/Meta.tsx b/packages/ui/components/meta/Meta.tsx
index e868802205..d7acc751e2 100644
--- a/packages/ui/components/meta/Meta.tsx
+++ b/packages/ui/components/meta/Meta.tsx
@@ -1,5 +1,6 @@
 import Head from "next/head";
-import React, { createContext, useContext, useState, useEffect } from "react";
+import { createContext, useContext, useState, useEffect } from "react";
+import type { ReactNode } from "react";
 
 import { APP_NAME } from "@calcom/lib/constants";
 
@@ -7,7 +8,7 @@ type MetaType = {
   title: string;
   description: string;
   backButton?: boolean;
-  CTA?: React.ReactNode;
+  CTA?: ReactNode;
 };
 
 const initialMeta: MetaType = {
@@ -27,7 +28,7 @@ export function useMeta() {
   return useContext(MetaContext);
 }
 
-export function MetaProvider({ children }: { children: React.ReactNode }) {
+export function MetaProvider({ children }: { children: ReactNode }) {
   const [value, setValue] = useState(initialMeta);
   const setMeta = (newMeta: Partial<MetaType>) => {
     setValue((v) => ({ ...v, ...newMeta }));
diff --git a/packages/ui/components/navigation/tabs/VerticalTabItem.tsx b/packages/ui/components/navigation/tabs/VerticalTabItem.tsx
index 0b6e566d3e..f3a98a9c75 100644
--- a/packages/ui/components/navigation/tabs/VerticalTabItem.tsx
+++ b/packages/ui/components/navigation/tabs/VerticalTabItem.tsx
@@ -25,9 +25,10 @@ export type VerticalTabItemProps = {
   isExternalLink?: boolean;
   linkProps?: Omit<ComponentProps<typeof Link>, "href">;
   avatar?: string;
+  iconClassName?: string;
 };
 
-const VerticalTabItem = function ({
+const VerticalTabItem = ({
   name,
   href,
   info,
@@ -35,11 +36,10 @@ const VerticalTabItem = function ({
   disableChevron,
   linkProps,
   ...props
-}: VerticalTabItemProps) {
+}: VerticalTabItemProps) => {
   const { t } = useLocale();
   const { asPath } = useRouter();
   const isCurrent = asPath.startsWith(href);
-
   return (
     <Fragment key={name}>
       {!props.hidden && (
@@ -60,7 +60,12 @@ const VerticalTabItem = function ({
             data-testid={`vertical-tab-${name}`}
             aria-current={isCurrent ? "page" : undefined}>
             {props.icon && (
-              <props.icon className="h-[16px] w-[16px] stroke-[2px] ltr:mr-2 rtl:ml-2 md:mt-0" />
+              <props.icon
+                className={classNames(
+                  "h-[16px] w-[16px] stroke-[2px] ltr:mr-2 rtl:ml-2 md:mt-0",
+                  props.iconClassName
+                )}
+              />
             )}
             <div className="h-fit">
               <span className="flex items-center space-x-2 rtl:space-x-reverse">
diff --git a/packages/ui/components/navigation/tabs/VerticalTabs.tsx b/packages/ui/components/navigation/tabs/VerticalTabs.tsx
index bec1c6e720..8d6d4d66a7 100644
--- a/packages/ui/components/navigation/tabs/VerticalTabs.tsx
+++ b/packages/ui/components/navigation/tabs/VerticalTabs.tsx
@@ -12,9 +12,18 @@ export interface NavTabProps {
   sticky?: boolean;
   linkProps?: VerticalTabItemProps["linkProps"];
   itemClassname?: string;
+  iconClassName?: string;
 }
 
-const NavTabs = function ({ tabs, className = "", sticky, linkProps, itemClassname, ...props }: NavTabProps) {
+const NavTabs = function ({
+  tabs,
+  className = "",
+  sticky,
+  linkProps,
+  itemClassname,
+  iconClassName,
+  ...props
+}: NavTabProps) {
   return (
     <nav
       className={classNames(
@@ -27,7 +36,13 @@ const NavTabs = function ({ tabs, className = "", sticky, linkProps, itemClassna
       {sticky && <div className="pt-6" />}
       {props.children}
       {tabs.map((tab, idx) => (
-        <VerticalTabItem {...tab} key={idx} linkProps={linkProps} className={itemClassname} />
+        <VerticalTabItem
+          {...tab}
+          key={idx}
+          linkProps={linkProps}
+          className={itemClassname}
+          iconClassName={iconClassName}
+        />
       ))}
     </nav>
   );
diff --git a/packages/ui/components/tooltip/Tooltip.tsx b/packages/ui/components/tooltip/Tooltip.tsx
index 6fa833f68d..80aba46461 100644
--- a/packages/ui/components/tooltip/Tooltip.tsx
+++ b/packages/ui/components/tooltip/Tooltip.tsx
@@ -1,7 +1,7 @@
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 import React from "react";
 
-import { classNames } from "@calcom/lib";
+import classNames from "@calcom/lib/classNames";
 
 export function Tooltip({
   children,
@@ -9,19 +9,21 @@ export function Tooltip({
   open,
   defaultOpen,
   onOpenChange,
+  delayDuration,
   side = "top",
   ...props
 }: {
   children: React.ReactNode;
   content: React.ReactNode;
+  delayDuration?: number;
   open?: boolean;
   defaultOpen?: boolean;
   side?: "top" | "right" | "bottom" | "left";
   onOpenChange?: (open: boolean) => void;
-}) {
+} & TooltipPrimitive.TooltipContentProps) {
   return (
     <TooltipPrimitive.Root
-      delayDuration={50}
+      delayDuration={delayDuration || 50}
       open={open}
       defaultOpen={defaultOpen}
       onOpenChange={onOpenChange}>
@@ -31,7 +33,7 @@ export function Tooltip({
           className={classNames(
             side === "top" && "-mt-7",
             side === "right" && "ml-2",
-            "bg-inverted text-inverted relative rounded-md px-2 py-1 text-xs font-semibold shadow-lg"
+            "bg-inverted text-inverted relative relative z-20 rounded-md px-2 py-1 text-xs font-semibold shadow-lg"
           )}
           side={side}
           align="center"
diff --git a/packages/ui/form/AddressInput.tsx b/packages/ui/form/AddressInput.tsx
index 1dce80fa4e..75ee6acf33 100644
--- a/packages/ui/form/AddressInput.tsx
+++ b/packages/ui/form/AddressInput.tsx
@@ -1,3 +1,6 @@
+import cx from "@calcom/lib/classNames";
+
+import { Input } from "../components/form";
 import { MapPin } from "../components/icon";
 
 export type AddressInputProps = {
@@ -9,18 +12,17 @@ export type AddressInputProps = {
   className?: string;
 };
 
-function AddressInput({ className = "", value, onChange, ...rest }: AddressInputProps) {
+function AddressInput({ value, onChange, ...rest }: AddressInputProps) {
   return (
-    <div className="relative ">
-      <MapPin color="#D2D2D2" className="absolute top-1/2 left-0.5 ml-3 h-6 -translate-y-1/2" />
-      <input
+    <div className="relative flex items-center">
+      <MapPin className="text-muted absolute left-0.5 ml-3 h-4 w-4 -translate-y-1/2" style={{ top: "44%" }} />
+      <Input
         {...rest}
         value={value}
         onChange={(e) => {
           onChange(e.target.value);
         }}
-        color="#D2D2D2"
-        className={`${className} focus-within:border-brand-default dark:bg-darkgray-100 border-subtle border-default disabled:text-subtle disabled:dark:text-subtle dark:text-inverted block  h-10 w-full rounded-md border border py-px pl-10 text-sm outline-none ring-black focus-within:ring-1 disabled:opacity-50 dark:placeholder-gray-500 dark:selection:bg-green-500`}
+        className={cx("pl-10", rest?.className)}
       />
     </div>
   );
diff --git a/packages/ui/form/MultiSelectCheckboxes.tsx b/packages/ui/form/MultiSelectCheckboxes.tsx
deleted file mode 100644
index 6df15b54fa..0000000000
--- a/packages/ui/form/MultiSelectCheckboxes.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @deprecated file
- * All new changes should be made to the V2 file in
- * `/packages/ui/v2/core/form/MultiSelectCheckboxes.tsx`
- */
-import type { Dispatch, SetStateAction } from "react";
-import React from "react";
-import type { GroupBase, OptionProps } from "react-select";
-import { components } from "react-select";
-import type { Props } from "react-select";
-
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-
-import Select from "./Select";
-
-export type Option = {
-  value: string;
-  label: string;
-};
-
-const InputOption: React.FC<OptionProps<any, boolean, GroupBase<any>>> = ({
-  isDisabled,
-  isFocused,
-  isSelected,
-  children,
-  innerProps,
-  ...rest
-}) => {
-  const style = {
-    alignItems: "center",
-    backgroundColor: isFocused ? "rgba(244, 245, 246, var(--tw-bg-opacity))" : "transparent",
-    color: "inherit",
-    display: "flex ",
-  };
-
-  const props = {
-    ...innerProps,
-    style,
-  };
-
-  return (
-    <components.Option
-      {...rest}
-      isDisabled={isDisabled}
-      isFocused={isFocused}
-      isSelected={isSelected}
-      innerProps={props}>
-      <input
-        type="checkbox"
-        className="text-primary-600 focus:ring-primary-500 border-default h-4 w-4 rounded ltr:mr-2 rtl:ml-2"
-        checked={isSelected}
-        readOnly
-      />
-      {children}
-    </components.Option>
-  );
-};
-
-type MultiSelectionCheckboxesProps = {
-  options: { label: string; value: string }[];
-  setSelected: Dispatch<SetStateAction<Option[]>>;
-  selected: Option[];
-  setValue: (s: Option[]) => unknown;
-};
-
-const MultiValue = ({ index, getValue }: { index: number; getValue: any }) => {
-  const { t } = useLocale();
-
-  return <>{!index && <div>{t("nr_event_type", { count: getValue().length })}</div>}</>;
-};
-
-/**
- * @deprecated file
- * All new changes should be made to the V2 file in
- * `/packages/ui/v2/core/form/MultiSelectCheckboxes.tsx`
- */
-export default function MultiSelectCheckboxes({
-  options,
-  isLoading,
-  selected,
-  setSelected,
-  setValue,
-}: Omit<Props, "options"> & MultiSelectionCheckboxesProps) {
-  const additonalComponents = { MultiValue };
-
-  return (
-    <Select
-      value={selected}
-      onChange={(s: any) => {
-        setSelected(s);
-        setValue(s);
-      }}
-      options={options}
-      isMulti
-      className="w-64 text-sm"
-      isSearchable={false}
-      closeMenuOnSelect={false}
-      hideSelectedOptions={false}
-      isLoading={isLoading}
-      components={{
-        ...additonalComponents,
-        Option: InputOption,
-      }}
-    />
-  );
-}
diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx
index 707aa31923..5d86e20889 100644
--- a/packages/ui/index.tsx
+++ b/packages/ui/index.tsx
@@ -33,7 +33,6 @@ export {
   DateRangePicker,
   MultiSelectCheckbox,
   ToggleGroup,
-  ToggleGroupItem,
   getReactSelectProps,
   ColorPicker,
   FormStep,
diff --git a/turbo.json b/turbo.json
index ccbc681ecd..2ab5a86df0 100644
--- a/turbo.json
+++ b/turbo.json
@@ -221,7 +221,6 @@
     "NEXT_PUBLIC_MINUTES_TO_BOOK",
     "NEXT_PUBLIC_SENDER_ID",
     "NEXT_PUBLIC_SENDGRID_SENDER_NAME",
-    "NEXT_PUBLIC_SENTRY_DSN",
     "NEXT_PUBLIC_STRIPE_PRICING_TABLE_ID",
     "NEXT_PUBLIC_STRIPE_PRICING_TABLE_PUBLISHABLE_KEY",
     "NEXT_PUBLIC_SUPPORT_MAIL_ADDRESS",
@@ -250,7 +249,6 @@
     "SENDGRID_API_KEY",
     "SENDGRID_EMAIL",
     "SENDGRID_SYNC_API_KEY",
-    "SENTRY_DSN",
     "SLACK_CLIENT_ID",
     "SLACK_CLIENT_SECRET",
     "SLACK_SIGNING_SECRET",
@@ -279,6 +277,7 @@
     "ZOHOCRM_CLIENT_ID",
     "ZOHOCRM_CLIENT_SECRET",
     "ZOOM_CLIENT_ID",
-    "ZOOM_CLIENT_SECRET"
+    "ZOOM_CLIENT_SECRET",
+    "INTERCOM_SECRET"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index 9039885949..2fcb0eecd1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -122,25 +122,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@auth/core@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "@auth/core@npm:0.1.4"
-  dependencies:
-    "@panva/hkdf": 1.0.2
-    cookie: 0.5.0
-    jose: 4.11.1
-    oauth4webapi: 2.0.5
-    preact: 10.11.3
-    preact-render-to-string: 5.2.3
-  peerDependencies:
-    nodemailer: 6.8.0
-  peerDependenciesMeta:
-    nodemailer:
-      optional: true
-  checksum: 64854404ea1883e0deb5535b34bed95cd43fc85094aeaf4f15a79e14045020eb944f844defe857edfc8528a0a024be89cbb2a3069dedef0e9217a74ca6c3eb79
-  languageName: node
-  linkType: hard
-
 "@aws-crypto/ie11-detection@npm:^3.0.0":
   version: 3.0.0
   resolution: "@aws-crypto/ie11-detection@npm:3.0.0"
@@ -3083,7 +3064,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-source@npm:^7.16.7":
+"@babel/plugin-transform-react-jsx-source@npm:^7.16.7, @babel/plugin-transform-react-jsx-source@npm:^7.19.6":
   version: 7.19.6
   resolution: "@babel/plugin-transform-react-jsx-source@npm:7.19.6"
   dependencies:
@@ -3120,7 +3101,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.17.3":
+"@babel/plugin-transform-react-jsx@npm:^7.17.3, @babel/plugin-transform-react-jsx@npm:^7.19.0":
   version: 7.21.0
   resolution: "@babel/plugin-transform-react-jsx@npm:7.21.0"
   dependencies:
@@ -3897,6 +3878,8 @@ __metadata:
     "@calcom/core": "*"
     "@calcom/dayjs": "*"
     "@calcom/emails": "*"
+    "@calcom/embed-core": "*"
+    "@calcom/embed-snippet": "*"
     "@calcom/features": "*"
     "@calcom/lib": "*"
     "@calcom/prisma": "*"
@@ -3909,16 +3892,17 @@ __metadata:
     jest: ^28.1.0
     memory-cache: ^0.2.0
     modify-response-middleware: ^1.1.0
-    next: ^13.2.1
+    next: ^12.3.1
     next-api-middleware: ^1.0.1
-    next-axiom: ^0.16.0
+    next-axiom: ^0.10.0
     next-swagger-doc: ^0.3.4
+    next-transpile-modules: ^9.0.0
     next-validations: ^0.2.0
     node-mocks-http: ^1.11.0
-    typescript: ^4.9.4
+    typescript: ^4.7.4
     tzdata: ^1.0.30
     uuid: ^8.3.2
-    zod: ^3.20.2
+    zod: ^3.19.1
   languageName: unknown
   linkType: soft
 
@@ -3980,36 +3964,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@calcom/auth@workspace:apps/auth":
+"@calcom/atoms@workspace:packages/atoms":
   version: 0.0.0-use.local
-  resolution: "@calcom/auth@workspace:apps/auth"
+  resolution: "@calcom/atoms@workspace:packages/atoms"
   dependencies:
-    "@auth/core": ^0.1.4
-    "@calcom/app-store": "*"
-    "@calcom/app-store-cli": "*"
-    "@calcom/config": "*"
-    "@calcom/core": "*"
-    "@calcom/dayjs": "*"
-    "@calcom/embed-core": "workspace:*"
-    "@calcom/embed-react": "workspace:*"
-    "@calcom/embed-snippet": "workspace:*"
-    "@calcom/features": "*"
-    "@calcom/lib": "*"
-    "@calcom/prisma": "*"
-    "@calcom/trpc": "*"
-    "@calcom/tsconfig": "*"
-    "@calcom/types": "*"
-    "@calcom/ui": "*"
-    "@types/node": 16.9.1
-    "@types/react": 18.0.26
-    "@types/react-dom": 18.0.9
-    eslint: ^8.34.0
-    eslint-config-next: ^13.2.1
-    next: ^13.2.1
-    next-auth: ^4.20.1
-    react: ^18.2.0
-    react-dom: ^18.2.0
-    typescript: ^4.9.4
+    "@rollup/plugin-node-resolve": ^15.0.1
+    "@types/react": ^18.0.25
+    "@types/react-dom": ^18.0.9
+    "@vitejs/plugin-react": ^2.2.0
+    rollup-plugin-node-builtins: ^2.1.2
+    typescript: ^4.9.3
+    vite: ^3.2.4
   languageName: unknown
   linkType: soft
 
@@ -4050,6 +4015,7 @@ __metadata:
   resolution: "@calcom/config@workspace:packages/config"
   dependencies:
     "@calcom/eslint-plugin-eslint": "*"
+    "@savvywombat/tailwindcss-grid-areas": ^3.0.0
     "@tailwindcss/forms": ^0.5.2
     "@tailwindcss/line-clamp": ^0.4.0
     "@tailwindcss/typography": ^0.5.4
@@ -4063,6 +4029,7 @@ __metadata:
     eslint-plugin-playwright: ^0.12.0
     eslint-plugin-prettier: ^4.2.1
     eslint-plugin-unused-imports: ^2.0.0
+    eslint-plugin-you-dont-need-lodash-underscore: ^6.12.0
     prettier: ^2.8.6
     prettier-plugin-tailwindcss: ^0.2.5
     tailwind-scrollbar: ^2.0.1
@@ -4076,34 +4043,37 @@ __metadata:
   resolution: "@calcom/console@workspace:apps/console"
   dependencies:
     "@calcom/dayjs": "*"
+    "@calcom/embed-react": "*"
     "@calcom/features": "*"
     "@calcom/lib": "*"
     "@calcom/tsconfig": "*"
     "@calcom/ui": "*"
     "@headlessui/react": ^1.5.0
     "@heroicons/react": ^1.0.6
-    "@prisma/client": ^4.11.0
+    "@prisma/client": ^4.7.1
     "@tailwindcss/forms": ^0.5.2
     "@types/node": 16.9.1
-    "@types/react": 18.0.26
+    "@types/react": ^18.0.17
     autoprefixer: ^10.4.12
     chart.js: ^3.7.1
     client-only: ^0.0.1
-    eslint: ^8.34.0
-    next: ^13.2.1
-    next-auth: ^4.20.1
+    eslint: ^8.22.0
+    next: ^12.3.1
+    next-auth: ^4.10.3
     next-i18next: ^11.3.0
+    next-transpile-modules: ^9.0.0
     postcss: ^8.4.18
-    prisma: ^4.11.0
+    prisma: ^4.7.1
     prisma-field-encryption: ^1.4.0
     react: ^18.2.0
     react-chartjs-2: ^4.0.1
     react-dom: ^18.2.0
-    react-hook-form: ^7.43.3
+    react-hook-form: ^7.34.2
     react-live-chat-loader: ^2.7.3
     swr: ^1.2.2
     tailwindcss: ^3.2.1
-    typescript: ^4.9.4
+    turbo: ^1.4.3
+    typescript: ^4.7.4
     zod: ^3.20.2
   languageName: unknown
   linkType: soft
@@ -4206,7 +4176,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@calcom/embed-core@workspace:*, @calcom/embed-core@workspace:packages/embeds/embed-core":
+"@calcom/embed-core@*, @calcom/embed-core@workspace:*, @calcom/embed-core@workspace:packages/embeds/embed-core":
   version: 0.0.0-use.local
   resolution: "@calcom/embed-core@workspace:packages/embeds/embed-core"
   dependencies:
@@ -4220,7 +4190,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@calcom/embed-react@workspace:*, @calcom/embed-react@workspace:^, @calcom/embed-react@workspace:packages/embeds/embed-react":
+"@calcom/embed-react@*, @calcom/embed-react@workspace:*, @calcom/embed-react@workspace:^, @calcom/embed-react@workspace:packages/embeds/embed-react":
   version: 0.0.0-use.local
   resolution: "@calcom/embed-react@workspace:packages/embeds/embed-react"
   dependencies:
@@ -4240,7 +4210,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@calcom/embed-snippet@workspace:*, @calcom/embed-snippet@workspace:packages/embeds/embed-snippet":
+"@calcom/embed-snippet@*, @calcom/embed-snippet@workspace:*, @calcom/embed-snippet@workspace:packages/embeds/embed-snippet":
   version: 0.0.0-use.local
   resolution: "@calcom/embed-snippet@workspace:packages/embeds/embed-snippet"
   dependencies:
@@ -4332,6 +4302,7 @@ __metadata:
     bcryptjs: ^2.4.3
     handlebars: ^4.7.7
     jose: ^4.13.1
+    lru-cache: ^9.0.3
     next-auth: ^4.20.1
     nodemailer: ^6.7.8
     otplib: ^12.0.1
@@ -4347,9 +4318,13 @@ __metadata:
     "@calcom/trpc": "*"
     "@calcom/ui": "*"
     "@lexical/react": ^0.5.0
+    "@testing-library/react-hooks": ^8.0.1
     dompurify: ^2.4.1
+    framer-motion: ^10.12.3
     lexical: ^0.5.0
-    zustand: ^4.1.4
+    mockdate: ^3.0.5
+    react-sticky-box: ^2.0.4
+    zustand: ^4.3.2
   languageName: unknown
   linkType: soft
 
@@ -4465,6 +4440,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@calcom/metapixel@workspace:packages/app-store/metapixel":
+  version: 0.0.0-use.local
+  resolution: "@calcom/metapixel@workspace:packages/app-store/metapixel"
+  dependencies:
+    "@calcom/lib": "*"
+    "@calcom/types": "*"
+  languageName: unknown
+  linkType: soft
+
 "@calcom/n8n@workspace:packages/app-store/n8n":
   version: 0.0.0-use.local
   resolution: "@calcom/n8n@workspace:packages/app-store/n8n"
@@ -4526,9 +4510,9 @@ __metadata:
   resolution: "@calcom/prisma@workspace:packages/prisma"
   dependencies:
     "@calcom/lib": "*"
-    "@prisma/client": ^4.11.0
+    "@prisma/client": ^4.13.0
     npm-run-all: ^4.1.5
-    prisma: ^4.11.0
+    prisma: ^4.13.0
     ts-node: ^10.9.1
     zod: ^3.20.2
     zod-prisma: ^0.5.4
@@ -4882,7 +4866,6 @@ __metadata:
     "@radix-ui/react-switch": ^1.0.0
     "@radix-ui/react-toggle-group": ^1.0.0
     "@radix-ui/react-tooltip": ^1.0.0
-    "@sentry/nextjs": ^7.20.0
     "@stripe/react-stripe-js": ^1.10.0
     "@stripe/stripe-js": ^1.35.0
     "@tanstack/react-query": ^4.3.9
@@ -4905,8 +4888,6 @@ __metadata:
     "@types/qrcode": ^1.4.3
     "@types/react": 18.0.26
     "@types/react-phone-number-input": ^3.0.14
-    "@types/react-virtualized-auto-sizer": ^1.0.1
-    "@types/react-window": ^1.8.5
     "@types/sanitize-html": ^2.9.0
     "@types/stripe": ^8.0.417
     "@types/turndown": ^5.0.1
@@ -4973,8 +4954,6 @@ __metadata:
     react-select: ^5.7.0
     react-timezone-select: ^1.4.0
     react-use-intercom: 1.5.1
-    react-virtualized-auto-sizer: ^1.0.6
-    react-window: ^1.8.7
     remark: ^14.0.2
     rrule: ^2.7.1
     sanitize-html: ^2.10.0
@@ -5373,6 +5352,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emotion/is-prop-valid@npm:^0.8.2":
+  version: 0.8.8
+  resolution: "@emotion/is-prop-valid@npm:0.8.8"
+  dependencies:
+    "@emotion/memoize": 0.7.4
+  checksum: bb7ec6d48c572c540e24e47cc94fc2f8dec2d6a342ae97bc9c8b6388d9b8d283862672172a1bb62d335c02662afe6291e10c71e9b8642664a8b43416cdceffac
+  languageName: node
+  linkType: hard
+
+"@emotion/memoize@npm:0.7.4":
+  version: 0.7.4
+  resolution: "@emotion/memoize@npm:0.7.4"
+  checksum: 4e3920d4ec95995657a37beb43d3f4b7d89fed6caa2b173a4c04d10482d089d5c3ea50bbc96618d918b020f26ed6e9c4026bbd45433566576c1f7b056c3271dc
+  languageName: node
+  linkType: hard
+
 "@emotion/memoize@npm:^0.7.4, @emotion/memoize@npm:^0.7.5":
   version: 0.7.5
   resolution: "@emotion/memoize@npm:0.7.5"
@@ -5464,6 +5459,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm@npm:0.15.18":
+  version: 0.15.18
+  resolution: "@esbuild/android-arm@npm:0.15.18"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm@npm:0.16.17":
   version: 0.16.17
   resolution: "@esbuild/android-arm@npm:0.16.17"
@@ -5534,6 +5536,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-loong64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "@esbuild/linux-loong64@npm:0.15.18"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-loong64@npm:0.16.17":
   version: 0.16.17
   resolution: "@esbuild/linux-loong64@npm:0.16.17"
@@ -5618,6 +5627,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint-community/eslint-utils@npm:^4.2.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+  dependencies:
+    eslint-visitor-keys: ^3.3.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
+  languageName: node
+  linkType: hard
+
+"@eslint-community/regexpp@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "@eslint-community/regexpp@npm:4.5.0"
+  checksum: 99c01335947dbd7f2129e954413067e217ccaa4e219fe0917b7d2bd96135789384b8fedbfb8eb09584d5130b27a7b876a7150ab7376f51b3a0c377d5ce026a10
+  languageName: node
+  linkType: hard
+
 "@eslint/eslintrc@npm:^1.0.5":
   version: 1.3.0
   resolution: "@eslint/eslintrc@npm:1.3.0"
@@ -5652,6 +5679,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/eslintrc@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@eslint/eslintrc@npm:2.0.2"
+  dependencies:
+    ajv: ^6.12.4
+    debug: ^4.3.2
+    espree: ^9.5.1
+    globals: ^13.19.0
+    ignore: ^5.2.0
+    import-fresh: ^3.2.1
+    js-yaml: ^4.1.0
+    minimatch: ^3.1.2
+    strip-json-comments: ^3.1.1
+  checksum: cfcf5e12c7b2c4476482e7f12434e76eae16fcd163ee627309adb10b761e5caa4a4e52ed7be464423320ff3d11eca5b50de5bf8be3e25834222470835dd5c801
+  languageName: node
+  linkType: hard
+
+"@eslint/js@npm:8.38.0":
+  version: 8.38.0
+  resolution: "@eslint/js@npm:8.38.0"
+  checksum: 1f28987aa8c9cd93e23384e16c7220863b39b5dc4b66e46d7cdbccce868040f455a98d24cd8b567a884f26545a0555b761f7328d4a00c051e7ef689cbea5fce1
+  languageName: node
+  linkType: hard
+
 "@ethereumjs/common@npm:^2.5.0, @ethereumjs/common@npm:^2.6.3":
   version: 2.6.3
   resolution: "@ethereumjs/common@npm:2.6.3"
@@ -6350,10 +6401,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "@floating-ui/core@npm:1.2.4"
-  checksum: 1c163ea1804e2b0a28fda6e32efed0e242d0db8081fd24aab9d1cbb100f94a558709231c483bf74bf09a9204ea6e7845813d43b5322ceb6ee63285308f68f65b
+"@floating-ui/core@npm:^1.2.6":
+  version: 1.2.6
+  resolution: "@floating-ui/core@npm:1.2.6"
+  checksum: e4aa96c435277f1720d4bc939e17a79b1e1eebd589c20b622d3c646a5273590ff889b8c6e126f7be61873cf8c4d7db7d418895986ea19b8b0d0530de32504c3a
   languageName: node
   linkType: hard
 
@@ -6367,11 +6418,11 @@ __metadata:
   linkType: hard
 
 "@floating-ui/dom@npm:^1.0.1, @floating-ui/dom@npm:^1.2.1":
-  version: 1.2.5
-  resolution: "@floating-ui/dom@npm:1.2.5"
+  version: 1.2.6
+  resolution: "@floating-ui/dom@npm:1.2.6"
   dependencies:
-    "@floating-ui/core": ^1.2.4
-  checksum: a21c272a36c7cd7d337eaed82c1f8a81ccc5003d04cefa07591dc7fbb0a24d57a2c097b410593b5416145a68ac10a7a7a745c3cc4f8196268fa002364d28804b
+    "@floating-ui/core": ^1.2.6
+  checksum: 2226c6c244b96ae75ab14cc35bb119c8d7b83a85e2ff04e9d9800cffdb17faf4a7cf82db741dd045242ced56e31c8a08e33c8c512c972309a934d83b1f410441
   languageName: node
   linkType: hard
 
@@ -6543,14 +6594,14 @@ __metadata:
   linkType: hard
 
 "@headlessui/react@npm:^1.5.0":
-  version: 1.7.13
-  resolution: "@headlessui/react@npm:1.7.13"
+  version: 1.7.14
+  resolution: "@headlessui/react@npm:1.7.14"
   dependencies:
     client-only: ^0.0.1
   peerDependencies:
     react: ^16 || ^17 || ^18
     react-dom: ^16 || ^17 || ^18
-  checksum: 132e5fce86978b9a6fd9d669fb556acec783debcd8f510c99226b3b3229dad50a13aeed69fc9af66465fc7029487ecfc46e6226f14218b760d5a309e08c0d059
+  checksum: 9122114d7a618877a8da2ada000422ce82e6af47195e414076fa5cf45687709479eb30b0df414eed52079be6e5904151bc92e4acfafbdde2592c608f015c490e
   languageName: node
   linkType: hard
 
@@ -7441,6 +7492,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/sourcemap-codec@npm:^1.4.13":
+  version: 1.4.15
+  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
+  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
+  languageName: node
+  linkType: hard
+
 "@jridgewell/trace-mapping@npm:0.3.9":
   version: 0.3.9
   resolution: "@jridgewell/trace-mapping@npm:0.3.9"
@@ -7945,6 +8003,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/env@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/env@npm:12.3.4"
+  checksum: daa3fc11efd1344c503eab41311a0e503ba7fd08607eeb3dc571036a6211eb37959cc4ed48b71dcc411cc214e7623ffd02411080aad3e09dc6a1192d5b256e60
+  languageName: node
+  linkType: hard
+
 "@next/env@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/env@npm:13.2.3"
@@ -7968,6 +8033,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-android-arm-eabi@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-android-arm-eabi@npm:12.3.4"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@next/swc-android-arm-eabi@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-android-arm-eabi@npm:13.2.3"
@@ -7982,6 +8054,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-android-arm64@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-android-arm64@npm:12.3.4"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@next/swc-android-arm64@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-android-arm64@npm:13.2.3"
@@ -7996,6 +8075,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-darwin-arm64@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-darwin-arm64@npm:12.3.4"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@next/swc-darwin-arm64@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-darwin-arm64@npm:13.2.3"
@@ -8010,6 +8096,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-darwin-x64@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-darwin-x64@npm:12.3.4"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@next/swc-darwin-x64@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-darwin-x64@npm:13.2.3"
@@ -8024,6 +8117,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-freebsd-x64@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-freebsd-x64@npm:12.3.4"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@next/swc-freebsd-x64@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-freebsd-x64@npm:13.2.3"
@@ -8038,6 +8138,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-linux-arm-gnueabihf@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.4"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@next/swc-linux-arm-gnueabihf@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-linux-arm-gnueabihf@npm:13.2.3"
@@ -8052,6 +8159,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-linux-arm64-gnu@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-linux-arm64-gnu@npm:12.3.4"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@next/swc-linux-arm64-gnu@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-linux-arm64-gnu@npm:13.2.3"
@@ -8066,6 +8180,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-linux-arm64-musl@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-linux-arm64-musl@npm:12.3.4"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@next/swc-linux-arm64-musl@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-linux-arm64-musl@npm:13.2.3"
@@ -8080,6 +8201,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-linux-x64-gnu@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-linux-x64-gnu@npm:12.3.4"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "@next/swc-linux-x64-gnu@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-linux-x64-gnu@npm:13.2.3"
@@ -8094,6 +8222,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-linux-x64-musl@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-linux-x64-musl@npm:12.3.4"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "@next/swc-linux-x64-musl@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-linux-x64-musl@npm:13.2.3"
@@ -8108,6 +8243,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-win32-arm64-msvc@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-win32-arm64-msvc@npm:12.3.4"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@next/swc-win32-arm64-msvc@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-win32-arm64-msvc@npm:13.2.3"
@@ -8122,6 +8264,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-win32-ia32-msvc@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-win32-ia32-msvc@npm:12.3.4"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@next/swc-win32-ia32-msvc@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-win32-ia32-msvc@npm:13.2.3"
@@ -8136,6 +8285,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@next/swc-win32-x64-msvc@npm:12.3.4":
+  version: 12.3.4
+  resolution: "@next/swc-win32-x64-msvc@npm:12.3.4"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@next/swc-win32-x64-msvc@npm:13.2.3":
   version: 13.2.3
   resolution: "@next/swc-win32-x64-msvc@npm:13.2.3"
@@ -8295,13 +8451,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@panva/hkdf@npm:1.0.2":
-  version: 1.0.2
-  resolution: "@panva/hkdf@npm:1.0.2"
-  checksum: 75183b4d5ea816ef516dcea70985c610683579a9e2ac540c2d59b9a3ed27eedaff830a43a1c43c1683556a457c92ac66e09109ee995ab173090e4042c4c4bb03
-  languageName: node
-  linkType: hard
-
 "@panva/hkdf@npm:^1.0.2":
   version: 1.0.4
   resolution: "@panva/hkdf@npm:1.0.4"
@@ -8392,17 +8541,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@prisma/client@npm:^4.11.0":
-  version: 4.11.0
-  resolution: "@prisma/client@npm:4.11.0"
+"@prisma/client@npm:^4.13.0":
+  version: 4.13.0
+  resolution: "@prisma/client@npm:4.13.0"
   dependencies:
-    "@prisma/engines-version": 4.11.0-57.8fde8fef4033376662cad983758335009d522acb
+    "@prisma/engines-version": 4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a
   peerDependencies:
     prisma: "*"
   peerDependenciesMeta:
     prisma:
       optional: true
-  checksum: ca8d8f820caaf4a76b94674f88207d5bb14f57a9682d37d2f79c56378f259cd3b14b30a110ab59a97647fcf3c46f896e7a2d20ded2777e09b835d7accd70cf1d
+  checksum: 74e2ede6308d6f70dc6244c34d13cf5f6c8da4f1a1ffe42a26192675ecac02733cb5482518d2a37fa057f160873fe8d42f5e3a08fc45d52b1eb386522bdbec0b
+  languageName: node
+  linkType: hard
+
+"@prisma/client@npm:^4.7.1":
+  version: 4.12.0
+  resolution: "@prisma/client@npm:4.12.0"
+  dependencies:
+    "@prisma/engines-version": 4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7
+  peerDependencies:
+    prisma: "*"
+  peerDependenciesMeta:
+    prisma:
+      optional: true
+  checksum: bbd17500ee218a71e765a75b649c56bc0da1903e63d69d716b6a0e6995c8e1cc5265423ba1518a789c3e71b91d93e7937180db2d107e426bd4ad2f51998240f0
   languageName: node
   linkType: hard
 
@@ -8417,40 +8580,54 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@prisma/debug@npm:4.12.0":
-  version: 4.12.0
-  resolution: "@prisma/debug@npm:4.12.0"
+"@prisma/debug@npm:4.13.0":
+  version: 4.13.0
+  resolution: "@prisma/debug@npm:4.13.0"
   dependencies:
     "@types/debug": 4.1.7
     debug: 4.3.4
     strip-ansi: 6.0.1
-  checksum: 0ae182634f4a25231ff946768e1da1f694b5141d21c92cb2a142580de30d67ebd1595f8575a4c63356740e415d5d64829449a4710d8421e7147016ea0acb2643
+  checksum: cd8b3361a3992ad93855923aeea0cedfc3ff316508fc1d6b526d46d05af35b47dc2e2203e3e0f95258c9e5a72a8a6d9a9737ebca9d8280e4df6135ef810b553b
   languageName: node
   linkType: hard
 
-"@prisma/engines-version@npm:4.11.0-57.8fde8fef4033376662cad983758335009d522acb":
-  version: 4.11.0-57.8fde8fef4033376662cad983758335009d522acb
-  resolution: "@prisma/engines-version@npm:4.11.0-57.8fde8fef4033376662cad983758335009d522acb"
-  checksum: f040b93d09b21feaef193080eed22142fa26b3cf86d089ebb4286f5f45ed17a98e030a8bb55c0bec2892e15880a697f6754c6966b7795cf7ba4553f59fb387e7
+"@prisma/engines-version@npm:4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7":
+  version: 4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7
+  resolution: "@prisma/engines-version@npm:4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7"
+  checksum: 54615d6982db9c50eed6132ad7ab3f32ef93f64d36b7f932b0d6109cd54028ea459293833e48b849a5dd968d934bb3cfb275b9a9172934032f95355d6f663dcf
   languageName: node
   linkType: hard
 
-"@prisma/engines@npm:4.11.0":
-  version: 4.11.0
-  resolution: "@prisma/engines@npm:4.11.0"
-  checksum: 98030cead39e5009b7a91fd2463433ccdb16cbeb6c7345ed7950c25dbe0731a425fc888458a1423b594d659972e081ca3d63d301ef647f05a634209c75769db2
+"@prisma/engines-version@npm:4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a":
+  version: 4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a
+  resolution: "@prisma/engines-version@npm:4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a"
+  checksum: cc583fe956b65fd4548082917f14ccf1c3c54d6b26623583f5e63298a8b4b5a492ba90597123af1fc272115621cb7340e2d708d5b5e252f59139b35f0df00abe
+  languageName: node
+  linkType: hard
+
+"@prisma/engines@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@prisma/engines@npm:4.12.0"
+  checksum: 5d226a2c86bee5bc6fa34910ec9ba9a68a1c0248977d0da47964372edcfe773ee6c4bb00e244258f535570f018d883f0ab9e2677cf06471869bb8857f79880f6
+  languageName: node
+  linkType: hard
+
+"@prisma/engines@npm:4.13.0":
+  version: 4.13.0
+  resolution: "@prisma/engines@npm:4.13.0"
+  checksum: 6c2315dc1e1a8a07f02a074ee6898a66a96a3bbbb4341224cb1dc966da3959c2ee7557131a2ce37fd559c53d210b904b72c4559474e017438e6753d480c3cfe1
   languageName: node
   linkType: hard
 
 "@prisma/generator-helper@npm:^4.0.0":
-  version: 4.12.0
-  resolution: "@prisma/generator-helper@npm:4.12.0"
+  version: 4.13.0
+  resolution: "@prisma/generator-helper@npm:4.13.0"
   dependencies:
-    "@prisma/debug": 4.12.0
+    "@prisma/debug": 4.13.0
     "@types/cross-spawn": 6.0.2
     chalk: 4.1.2
     cross-spawn: 7.0.3
-  checksum: b844fcf736c922ce39e6aa1081b7c133b921ceb5d272f51296cf7afc3128ca6085ef1594ce63045ef47a462c56e5e37b9a1094a36d5dd484f77017d6f227641f
+  checksum: 0b0724bd03d40b691a85e002d8ed91216df9e6883d1fe5e69368ad135b59cff5ae49d65860db727fca6acf984c3efe382bca26c4127e0328b2e72748dbf59369
   languageName: node
   linkType: hard
 
@@ -9780,6 +9957,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/plugin-commonjs@npm:24.0.0":
+  version: 24.0.0
+  resolution: "@rollup/plugin-commonjs@npm:24.0.0"
+  dependencies:
+    "@rollup/pluginutils": ^5.0.1
+    commondir: ^1.0.1
+    estree-walker: ^2.0.2
+    glob: ^8.0.3
+    is-reference: 1.2.1
+    magic-string: ^0.27.0
+  peerDependencies:
+    rollup: ^2.68.0||^3.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: e2a1bf295bbb45ab56747f7ce636d4b94046bfecc758a64c7276823b80271e0ba1196642c232aa61d1b1a98abeaddad45486c7227ec19a97d19d16f7661d49a6
+  languageName: node
+  linkType: hard
+
 "@rollup/plugin-inject@npm:^4.0.0":
   version: 4.0.4
   resolution: "@rollup/plugin-inject@npm:4.0.4"
@@ -9793,27 +9989,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-sucrase@npm:4.0.4":
-  version: 4.0.4
-  resolution: "@rollup/plugin-sucrase@npm:4.0.4"
+"@rollup/plugin-node-resolve@npm:^15.0.1":
+  version: 15.0.1
+  resolution: "@rollup/plugin-node-resolve@npm:15.0.1"
   dependencies:
-    "@rollup/pluginutils": ^4.1.1
-    sucrase: ^3.20.0
+    "@rollup/pluginutils": ^5.0.1
+    "@types/resolve": 1.20.2
+    deepmerge: ^4.2.2
+    is-builtin-module: ^3.2.0
+    is-module: ^1.0.0
+    resolve: ^1.22.1
   peerDependencies:
-    rollup: ^2.53.1
-  checksum: ccb01d7eb35014497518a42e242dbebfeb721584ad547cf3121b80f99e13110975f19a4fe7d5537a8d82227400501caa396ff9d809af8904c6aa885530f3a6b3
-  languageName: node
-  linkType: hard
-
-"@rollup/plugin-virtual@npm:3.0.0":
-  version: 3.0.0
-  resolution: "@rollup/plugin-virtual@npm:3.0.0"
-  peerDependencies:
-    rollup: ^1.20.0||^2.0.0||^3.0.0
+    rollup: ^2.78.0||^3.0.0
   peerDependenciesMeta:
     rollup:
       optional: true
-  checksum: 2335cabee21718fda145caada23132d0255293009207bb6014b47aaefccf25cc6a7cf239c74f54be1ad93b07bb7dd4ba83ca2507c8dbb730876cb83d706bae90
+  checksum: 90e30b41626a15ebf02746a83d34b15f9fe9051ddc156a9bf785504f489947980b3bdeb7bf2f80828a9becfe472a03a96d0238328a3e3e2198a482fcac7eb3aa
   languageName: node
   linkType: hard
 
@@ -9830,7 +10021,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^4.1.1, @rollup/pluginutils@npm:^4.2.1":
+"@rollup/pluginutils@npm:^4.2.1":
   version: 4.2.1
   resolution: "@rollup/pluginutils@npm:4.2.1"
   dependencies:
@@ -9840,6 +10031,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/pluginutils@npm:^5.0.1":
+  version: 5.0.2
+  resolution: "@rollup/pluginutils@npm:5.0.2"
+  dependencies:
+    "@types/estree": ^1.0.0
+    estree-walker: ^2.0.2
+    picomatch: ^2.3.1
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: edea15e543bebc7dcac3b0ac8bc7b8e8e6dbd46e2864dbe5dd28072de1fbd5b0e10d545a610c0edaa178e8a7ac432e2a2a52e547ece1308471412caba47db8ce
+  languageName: node
+  linkType: hard
+
 "@rushstack/eslint-patch@npm:^1.1.3":
   version: 1.1.3
   resolution: "@rushstack/eslint-patch@npm:1.1.3"
@@ -9847,6 +10054,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@savvywombat/tailwindcss-grid-areas@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "@savvywombat/tailwindcss-grid-areas@npm:3.0.1"
+  dependencies:
+    lodash: ^4.17.21
+  peerDependencies:
+    tailwindcss: ^3.0.1
+  checksum: 016672a0585b2b1bdd0ae2f8ed821d634d2a5ba7ea26484adbc8cd38499366be80c6e338cd93d8c25cf6e29a8f33293eb7e24ff68184bea3b36ea27b9884dbb1
+  languageName: node
+  linkType: hard
+
 "@sendgrid/client@npm:^7.7.0":
   version: 7.7.0
   resolution: "@sendgrid/client@npm:7.7.0"
@@ -9876,142 +10094,154 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/browser@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/browser@npm:7.20.0"
+"@sentry-internal/tracing@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry-internal/tracing@npm:7.49.0"
   dependencies:
-    "@sentry/core": 7.20.0
-    "@sentry/types": 7.20.0
-    "@sentry/utils": 7.20.0
+    "@sentry/core": 7.49.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
     tslib: ^1.9.3
-  checksum: 740903325b83d6e1776040424eec2223a32a1fe2e785b9c3903ae985096f2ce0cc3bc8da0868b05fbac36e5d41518b997948df6a6135454809b9f2a673f6ca6f
+  checksum: 765e15b26e5074acb49f7b18f1eac9171cd00f19d9c7b311af1da05d5a8f8e114ee99512deeb9a85e2759ffea521a392da5edda529485abe5d519a3047ca02bf
+  languageName: node
+  linkType: hard
+
+"@sentry/browser@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/browser@npm:7.49.0"
+  dependencies:
+    "@sentry-internal/tracing": 7.49.0
+    "@sentry/core": 7.49.0
+    "@sentry/replay": 7.49.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
+    tslib: ^1.9.3
+  checksum: 4a7ff0cf566937b59f892d52453895dea0e9b689f6fa0f725909171afc9d2e692ccb767cd277b325355fb4406dc17bbd1398ed9b3a291cd1d83a67e9377335b8
   languageName: node
   linkType: hard
 
 "@sentry/cli@npm:^1.74.6":
-  version: 1.74.6
-  resolution: "@sentry/cli@npm:1.74.6"
+  version: 1.75.0
+  resolution: "@sentry/cli@npm:1.75.0"
   dependencies:
     https-proxy-agent: ^5.0.0
     mkdirp: ^0.5.5
     node-fetch: ^2.6.7
-    npmlog: ^4.1.2
     progress: ^2.0.3
     proxy-from-env: ^1.1.0
     which: ^2.0.2
   bin:
     sentry-cli: bin/sentry-cli
-  checksum: 3d1ef94d5505ed23858503228b59ae1ed401774e27466d7a47eba47be3855e9706f12292d4a0a6135303a5916791620e0d3a184d2fda9e28f2d26ccd347b36fb
+  checksum: d5b130bb45bc96d0f738801343455e6a113d1cc9e16166f0d6bfa022809b557159f010677d2dc05adcdfa7f8ad23c401182b6daef720fa2a0bad82fa6e3b2148
   languageName: node
   linkType: hard
 
-"@sentry/core@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/core@npm:7.20.0"
+"@sentry/core@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/core@npm:7.49.0"
   dependencies:
-    "@sentry/types": 7.20.0
-    "@sentry/utils": 7.20.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
     tslib: ^1.9.3
-  checksum: 3998605dff85a56f83efaae747567b76941d4b6de9a30202f280d50ad38fb176ed8560067f122238fb1170c133dfc9a063ae71ee66b6ebd639977b44f3f8311c
+  checksum: b1222afd09d219c990e2a8df136c6e540bd13f26616331f3d4e143182b6b4b550426b165dafc52e504a4bff111b634c756202656b383557e4cb3f2ff58022e1b
   languageName: node
   linkType: hard
 
-"@sentry/integrations@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/integrations@npm:7.20.0"
+"@sentry/integrations@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/integrations@npm:7.49.0"
   dependencies:
-    "@sentry/types": 7.20.0
-    "@sentry/utils": 7.20.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
     localforage: ^1.8.1
     tslib: ^1.9.3
-  checksum: 9e364567481d5f0788af43e1feef03d9cfc58c4c83532c6eecf40f6a8586e72302b6f8c0fa77a392c9ee4aece50ab4de4aa6b9a7f72dc7e7712884e5de476374
+  checksum: 547d3bf84e9abfa7a6ab80e7a2589293657166334a9fb75d221f4fa0f8d6327f35b4c2e5bea3f87ea0306392908c159ce3961ceb04f06e82ee656d39aa0cf4d6
   languageName: node
   linkType: hard
 
 "@sentry/nextjs@npm:^7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/nextjs@npm:7.20.0"
+  version: 7.49.0
+  resolution: "@sentry/nextjs@npm:7.49.0"
   dependencies:
-    "@rollup/plugin-sucrase": 4.0.4
-    "@rollup/plugin-virtual": 3.0.0
-    "@sentry/core": 7.20.0
-    "@sentry/integrations": 7.20.0
-    "@sentry/node": 7.20.0
-    "@sentry/react": 7.20.0
-    "@sentry/tracing": 7.20.0
-    "@sentry/types": 7.20.0
-    "@sentry/utils": 7.20.0
+    "@rollup/plugin-commonjs": 24.0.0
+    "@sentry/core": 7.49.0
+    "@sentry/integrations": 7.49.0
+    "@sentry/node": 7.49.0
+    "@sentry/react": 7.49.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
     "@sentry/webpack-plugin": 1.20.0
     chalk: 3.0.0
     rollup: 2.78.0
+    stacktrace-parser: ^0.1.10
     tslib: ^1.9.3
   peerDependencies:
     next: ^10.0.8 || ^11.0 || ^12.0 || ^13.0
-    react: 15.x || 16.x || 17.x || 18.x
+    react: 16.x || 17.x || 18.x
     webpack: ">= 4.0.0"
   peerDependenciesMeta:
     webpack:
       optional: true
-  checksum: e80ba8f7412de4e8c14bf7b72909ad585194cd62170cabf4f0dd325919d926df116732f43b69453a7d82bd0df717b7c5ea4bcbbdebc82cde8ebb690cee118176
+  checksum: 79a330e77851d2c809db5909d9591b9c88145a75ce0a9856860dee9b627ac82071298bf92ba5dae7e20a21ea4c7052dd7f78408b12d6769d40cacd0f7b3162b2
   languageName: node
   linkType: hard
 
-"@sentry/node@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/node@npm:7.20.0"
+"@sentry/node@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/node@npm:7.49.0"
   dependencies:
-    "@sentry/core": 7.20.0
-    "@sentry/types": 7.20.0
-    "@sentry/utils": 7.20.0
+    "@sentry-internal/tracing": 7.49.0
+    "@sentry/core": 7.49.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
     cookie: ^0.4.1
     https-proxy-agent: ^5.0.0
     lru_map: ^0.3.3
     tslib: ^1.9.3
-  checksum: b88709bb3e432ec987a1745c4cf567cc89dce009db2bec192743f9d4493cceab5c7d4f09b9133e359309fee37d29a70823467cfeaf21602d5dc7b01999e2a662
+  checksum: 13650fb0384e438f18c4cba1d0cff86d4be4c61da4ed12d4fa720bc37627ff7190c2368f934287cb39fe898b38e24f7b097fcb5e4b10aaf24131c46145f1e3c2
   languageName: node
   linkType: hard
 
-"@sentry/react@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/react@npm:7.20.0"
+"@sentry/react@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/react@npm:7.49.0"
   dependencies:
-    "@sentry/browser": 7.20.0
-    "@sentry/types": 7.20.0
-    "@sentry/utils": 7.20.0
+    "@sentry/browser": 7.49.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
     hoist-non-react-statics: ^3.3.2
     tslib: ^1.9.3
   peerDependencies:
     react: 15.x || 16.x || 17.x || 18.x
-  checksum: bb1506e4e7c3848dbe57b8520cd0bdfce6d97e137035a7dff5d4c6f8a318324fbe874aae3b0d11d15d42c60fc8f8791b65ae72a242e163445a026f2880812d4c
+  checksum: 73cdef3362c9263c04ecdfa677f7a7b39109d6247737f2592b21e17fdfcfcd0fda3ac3a2fafcd1db8b2fe34a5d1882e7062fe931c590fbb8cb290149f71b24f0
   languageName: node
   linkType: hard
 
-"@sentry/tracing@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/tracing@npm:7.20.0"
+"@sentry/replay@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/replay@npm:7.49.0"
   dependencies:
-    "@sentry/core": 7.20.0
-    "@sentry/types": 7.20.0
-    "@sentry/utils": 7.20.0
-    tslib: ^1.9.3
-  checksum: 12a13c374b113081faffedf772fee36e4a0d5f9f06c0d11023d18bb836002d6394532751e4254b43eb9c6b44e69894533be46a8180fa734feb711f82af485e30
+    "@sentry/core": 7.49.0
+    "@sentry/types": 7.49.0
+    "@sentry/utils": 7.49.0
+  checksum: 0789ead51e2284fcf6871ba11c4b022de608b31354aa1c1fc30bb26811bad3e353a80dfb2a1517b1567c39be80e263e67f4d5d1efb0747048ee173d855daa308
   languageName: node
   linkType: hard
 
-"@sentry/types@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/types@npm:7.20.0"
-  checksum: eb012cb9cd83b2747ffb256e9d1f783c5508b54f78e45a2714090bd6d44e472b5f8655c4614e9cf4da042b0ec277675cf9dd2ab7d864e04e58d1b67c43289ff9
+"@sentry/types@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/types@npm:7.49.0"
+  checksum: c6665e5ea14aa0288a44daf0ccbf8ab3134ec7ab61a6cda57e233c865a9c1ca3a9e45b5ab75705d2d3506c357e08cc500a550794fe6e888d363e0254b46c057b
   languageName: node
   linkType: hard
 
-"@sentry/utils@npm:7.20.0":
-  version: 7.20.0
-  resolution: "@sentry/utils@npm:7.20.0"
+"@sentry/utils@npm:7.49.0":
+  version: 7.49.0
+  resolution: "@sentry/utils@npm:7.49.0"
   dependencies:
-    "@sentry/types": 7.20.0
+    "@sentry/types": 7.49.0
     tslib: ^1.9.3
-  checksum: 510753d5afce22a521f5780ab87767ed1496eb24bad6adda14848abef69dac8aa3d3168d8bc861ddf7d7af4f7476b70e1d84405991ec5b000008743d63ad3820
+  checksum: b3382418fbc98a685c3c01571ef24217d8cbcb283f8e12e2e44a518d9697e9fadcaa48c24e31063ecad6a13f3fc7b0caf0dcb8e7c0097bc2613e8f465de5d0be
   languageName: node
   linkType: hard
 
@@ -11840,6 +12070,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@swc/helpers@npm:0.4.11":
+  version: 0.4.11
+  resolution: "@swc/helpers@npm:0.4.11"
+  dependencies:
+    tslib: ^2.4.0
+  checksum: 736857d524b41a8a4db81094e9b027f554004e0fa3e86325d85bdb38f7e6459ce022db079edb6c61ba0f46fe8583b3e663e95f7acbd13e51b8da6c34e45bba2e
+  languageName: node
+  linkType: hard
+
 "@swc/helpers@npm:0.4.14":
   version: 0.4.14
   resolution: "@swc/helpers@npm:0.4.14"
@@ -11997,6 +12236,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@testing-library/react-hooks@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "@testing-library/react-hooks@npm:8.0.1"
+  dependencies:
+    "@babel/runtime": ^7.12.5
+    react-error-boundary: ^3.1.0
+  peerDependencies:
+    "@types/react": ^16.9.0 || ^17.0.0
+    react: ^16.9.0 || ^17.0.0
+    react-dom: ^16.9.0 || ^17.0.0
+    react-test-renderer: ^16.9.0 || ^17.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    react-dom:
+      optional: true
+    react-test-renderer:
+      optional: true
+  checksum: 7fe44352e920deb5cb1876f80d64e48615232072c9d5382f1e0284b3aab46bb1c659a040b774c45cdf084a5257b8fe463f7e08695ad8480d8a15635d4d3d1f6d
+  languageName: node
+  linkType: hard
+
 "@testing-library/react@npm:^13.3.0":
   version: 13.3.0
   resolution: "@testing-library/react@npm:13.3.0"
@@ -12499,6 +12760,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/estree@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "@types/estree@npm:1.0.1"
+  checksum: e9aa175eacb797216fafce4d41e8202c7a75555bc55232dee0f9903d7171f8f19f0ae7d5191bb1a88cb90e65468be508c0df850a9fb81b4433b293a5a749899d
+  languageName: node
+  linkType: hard
+
 "@types/express-jwt@npm:0.0.42":
   version: 0.0.42
   resolution: "@types/express-jwt@npm:0.0.42"
@@ -13017,24 +13285,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-virtualized-auto-sizer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@types/react-virtualized-auto-sizer@npm:1.0.1"
-  dependencies:
-    "@types/react": "*"
-  checksum: 67eff0670a1991c2b16992274ada5f0b3f9d5c2d6209ef38e8f8ae2c0218211a3292882f5b7dd6f09519000dc20847629f049c9acc267e000626b7141e5927a6
-  languageName: node
-  linkType: hard
-
-"@types/react-window@npm:^1.8.5":
-  version: 1.8.5
-  resolution: "@types/react-window@npm:1.8.5"
-  dependencies:
-    "@types/react": "*"
-  checksum: 5f519e1402300d11b6e6595223feb6499f3227e38da166cbc565773cd7f71862abcf855b7835d391b5119fcfacdfba79d73a965b45f60a293fc1ff25986319ed
-  languageName: node
-  linkType: hard
-
 "@types/react@npm:18.0.26":
   version: 18.0.26
   resolution: "@types/react@npm:18.0.26"
@@ -13046,6 +13296,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/resolve@npm:1.20.2":
+  version: 1.20.2
+  resolution: "@types/resolve@npm:1.20.2"
+  checksum: 61c2cad2499ffc8eab36e3b773945d337d848d3ac6b7b0a87c805ba814bc838ef2f262fc0f109bfd8d2e0898ff8bd80ad1025f9ff64f1f71d3d4294c9f14e5f6
+  languageName: node
+  linkType: hard
+
 "@types/responselike@npm:*, @types/responselike@npm:^1.0.0":
   version: 1.0.0
   resolution: "@types/responselike@npm:1.0.0"
@@ -13629,6 +13886,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitejs/plugin-react@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "@vitejs/plugin-react@npm:2.2.0"
+  dependencies:
+    "@babel/core": ^7.19.6
+    "@babel/plugin-transform-react-jsx": ^7.19.0
+    "@babel/plugin-transform-react-jsx-development": ^7.18.6
+    "@babel/plugin-transform-react-jsx-self": ^7.18.6
+    "@babel/plugin-transform-react-jsx-source": ^7.19.6
+    magic-string: ^0.26.7
+    react-refresh: ^0.14.0
+  peerDependencies:
+    vite: ^3.0.0
+  checksum: cc85ab31b4689ab137c4b1e65383dccce494371523eb164c579096e513a2abbaa7efb49ba08655fae9f6692f5b7b2602ad339bdce4ae5982fc08fe444fb8a4e5
+  languageName: node
+  linkType: hard
+
 "@wagmi/core@npm:^0.5.4":
   version: 0.5.4
   resolution: "@wagmi/core@npm:0.5.4"
@@ -14333,6 +14607,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"abstract-leveldown@npm:~0.12.0, abstract-leveldown@npm:~0.12.1":
+  version: 0.12.4
+  resolution: "abstract-leveldown@npm:0.12.4"
+  dependencies:
+    xtend: ~3.0.0
+  checksum: e300f04bb638cc9c462f6e8fa925672e51beb24c1470c39ece709e54f2f499661ac5fe0119175c7dcb6e32c843423d6960009d4d24e72526478b261163e8070b
+  languageName: node
+  linkType: hard
+
 "accept-language-parser@npm:^1.5.0":
   version: 1.5.0
   resolution: "accept-language-parser@npm:1.5.0"
@@ -14798,7 +15081,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3, aproba@npm:^1.1.1":
+"aproba@npm:^1.1.1":
   version: 1.2.0
   resolution: "aproba@npm:1.2.0"
   checksum: 0fca141966559d195072ed047658b6e6c4fe92428c385dd38e288eacfc55807e7b4989322f030faff32c0f46bb0bc10f1e0ac32ec22d25315a1e5bbc0ebb76dc
@@ -14841,16 +15124,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"are-we-there-yet@npm:~1.1.2":
-  version: 1.1.7
-  resolution: "are-we-there-yet@npm:1.1.7"
-  dependencies:
-    delegates: ^1.0.0
-    readable-stream: ^2.0.6
-  checksum: 70d251719c969b2745bfe5ddf3ebaefa846a636e90a6d5212573676af5d6670e15457761d4725731e19cbebdce42c4ab0cbedf23ab047f2a08274985aa10a3c7
-  languageName: node
-  linkType: hard
-
 "arg@npm:1.0.0":
   version: 1.0.0
   resolution: "arg@npm:1.0.0"
@@ -15913,6 +16186,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bl@npm:~0.8.1":
+  version: 0.8.2
+  resolution: "bl@npm:0.8.2"
+  dependencies:
+    readable-stream: ~1.0.26
+  checksum: 18767c5c861ae1cdbb000bb346e9e8e29137225e8eef97f39db78beeb236beca609f465580c5c1b177d621505f57400834fb4a17a66d264f33a0237293ec2ac5
+  languageName: node
+  linkType: hard
+
 "blakejs@npm:^1.1.0":
   version: 1.2.1
   resolution: "blakejs@npm:1.2.1"
@@ -16177,6 +16459,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browserify-fs@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "browserify-fs@npm:1.0.0"
+  dependencies:
+    level-filesystem: ^1.0.1
+    level-js: ^2.1.3
+    levelup: ^0.18.2
+  checksum: e0c35cf42c839c0a217048b1671d91ee6e53fd05f163db4f809e46c2f6264f784768e7c850abc200b0eaca378d42e00e01876eda21fd84fc0a4280bd6200a9c3
+  languageName: node
+  linkType: hard
+
 "browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1":
   version: 4.1.0
   resolution: "browserify-rsa@npm:4.1.0"
@@ -16377,6 +16670,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"buffer-es6@npm:^4.9.2":
+  version: 4.9.3
+  resolution: "buffer-es6@npm:4.9.3"
+  checksum: dfc8ebb3c5c00166e6f81e6ec7ea876693ea6197a8d0b07b1a17482ffab0e5d3307bfb539f84862b1ae35cd70ad03835db0f3c7dc4e337cbd16c50bb4c7e5df7
+  languageName: node
+  linkType: hard
+
 "buffer-fill@npm:^1.0.0":
   version: 1.0.0
   resolution: "buffer-fill@npm:1.0.0"
@@ -16463,6 +16763,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"builtin-modules@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "builtin-modules@npm:3.3.0"
+  checksum: db021755d7ed8be048f25668fe2117620861ef6703ea2c65ed2779c9e3636d5c3b82325bd912244293959ff3ae303afa3471f6a15bf5060c103e4cc3a839749d
+  languageName: node
+  linkType: hard
+
 "builtin-status-codes@npm:^3.0.0":
   version: 3.0.0
   resolution: "builtin-status-codes@npm:3.0.0"
@@ -17392,6 +17699,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"clone@npm:~0.1.9":
+  version: 0.1.19
+  resolution: "clone@npm:0.1.19"
+  checksum: 5e710e16da67abe30c0664c8fd69c280635be59a4fae0a5fe58ed324e701e99348b48ce67288716fa223edd42ba574e58a3783cb2fcfa381b8b49ce7e56ac3f4
+  languageName: node
+  linkType: hard
+
 "clsx@npm:1.1.0":
   version: 1.1.0
   resolution: "clsx@npm:1.1.0"
@@ -17463,13 +17777,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"code-point-at@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "code-point-at@npm:1.1.0"
-  checksum: 17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681
-  languageName: node
-  linkType: hard
-
 "coffeescript@npm:^1.10.0":
   version: 1.12.7
   resolution: "coffeescript@npm:1.12.7"
@@ -17728,7 +18035,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"concat-stream@npm:^1.5.0":
+"concat-stream@npm:^1.4.4, concat-stream@npm:^1.5.0":
   version: 1.6.2
   resolution: "concat-stream@npm:1.6.2"
   dependencies:
@@ -17767,7 +18074,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0, console-control-strings@npm:~1.1.0":
+"console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0":
   version: 1.1.0
   resolution: "console-control-strings@npm:1.1.0"
   checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed
@@ -18839,6 +19146,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deferred-leveldown@npm:~0.2.0":
+  version: 0.2.0
+  resolution: "deferred-leveldown@npm:0.2.0"
+  dependencies:
+    abstract-leveldown: ~0.12.1
+  checksum: f7690ec5b1e951e6f56998be26dd0a1331ef28cb7eaa9e090a282780d47dc006effd4b82a2a82b636cae801378047997aca10c0b44b09c8624633cdb96b07913
+  languageName: node
+  linkType: hard
+
 "define-lazy-prop@npm:^2.0.0":
   version: 2.0.0
   resolution: "define-lazy-prop@npm:2.0.0"
@@ -19729,7 +20045,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"errno@npm:^0.1.3, errno@npm:~0.1.7":
+"errno@npm:^0.1.1, errno@npm:^0.1.3, errno@npm:~0.1.1, errno@npm:~0.1.7":
   version: 0.1.8
   resolution: "errno@npm:0.1.8"
   dependencies:
@@ -19983,6 +20299,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-android-64@npm:0.15.18"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-android-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-android-arm64@npm:0.14.54"
@@ -19990,6 +20313,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-android-arm64@npm:0.15.18"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-darwin-64@npm:0.14.54"
@@ -19997,6 +20327,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-darwin-64@npm:0.15.18"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-darwin-arm64@npm:0.14.54"
@@ -20004,6 +20341,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-darwin-arm64@npm:0.15.18"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-freebsd-64@npm:0.14.54"
@@ -20011,6 +20355,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-freebsd-64@npm:0.15.18"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-freebsd-arm64@npm:0.14.54"
@@ -20018,6 +20369,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-freebsd-arm64@npm:0.15.18"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-32@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-32@npm:0.14.54"
@@ -20025,6 +20383,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-32@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-32@npm:0.15.18"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-64@npm:0.14.54"
@@ -20032,6 +20397,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-64@npm:0.15.18"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-arm64@npm:0.14.54"
@@ -20039,6 +20411,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-arm64@npm:0.15.18"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-arm@npm:0.14.54"
@@ -20046,6 +20425,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-arm@npm:0.15.18"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-mips64le@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-mips64le@npm:0.14.54"
@@ -20053,6 +20439,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-mips64le@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-mips64le@npm:0.15.18"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-ppc64le@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-ppc64le@npm:0.14.54"
@@ -20060,6 +20453,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-ppc64le@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-ppc64le@npm:0.15.18"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-riscv64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-riscv64@npm:0.14.54"
@@ -20067,6 +20467,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-riscv64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-riscv64@npm:0.15.18"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-s390x@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-linux-s390x@npm:0.14.54"
@@ -20074,6 +20481,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-s390x@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-s390x@npm:0.15.18"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
 "esbuild-netbsd-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-netbsd-64@npm:0.14.54"
@@ -20081,6 +20495,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-netbsd-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-netbsd-64@npm:0.15.18"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-openbsd-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-openbsd-64@npm:0.14.54"
@@ -20088,6 +20509,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-openbsd-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-openbsd-64@npm:0.15.18"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-sunos-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-sunos-64@npm:0.14.54"
@@ -20095,6 +20523,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-sunos-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-sunos-64@npm:0.15.18"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-32@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-windows-32@npm:0.14.54"
@@ -20102,6 +20537,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-32@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-windows-32@npm:0.15.18"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-windows-64@npm:0.14.54"
@@ -20109,6 +20551,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-windows-64@npm:0.15.18"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-arm64@npm:0.14.54":
   version: 0.14.54
   resolution: "esbuild-windows-arm64@npm:0.14.54"
@@ -20116,6 +20565,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-windows-arm64@npm:0.15.18"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild@npm:^0.14.27":
   version: 0.14.54
   resolution: "esbuild@npm:0.14.54"
@@ -20190,6 +20646,83 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.15.9":
+  version: 0.15.18
+  resolution: "esbuild@npm:0.15.18"
+  dependencies:
+    "@esbuild/android-arm": 0.15.18
+    "@esbuild/linux-loong64": 0.15.18
+    esbuild-android-64: 0.15.18
+    esbuild-android-arm64: 0.15.18
+    esbuild-darwin-64: 0.15.18
+    esbuild-darwin-arm64: 0.15.18
+    esbuild-freebsd-64: 0.15.18
+    esbuild-freebsd-arm64: 0.15.18
+    esbuild-linux-32: 0.15.18
+    esbuild-linux-64: 0.15.18
+    esbuild-linux-arm: 0.15.18
+    esbuild-linux-arm64: 0.15.18
+    esbuild-linux-mips64le: 0.15.18
+    esbuild-linux-ppc64le: 0.15.18
+    esbuild-linux-riscv64: 0.15.18
+    esbuild-linux-s390x: 0.15.18
+    esbuild-netbsd-64: 0.15.18
+    esbuild-openbsd-64: 0.15.18
+    esbuild-sunos-64: 0.15.18
+    esbuild-windows-32: 0.15.18
+    esbuild-windows-64: 0.15.18
+    esbuild-windows-arm64: 0.15.18
+  dependenciesMeta:
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: ec12682b2cb2d4f0669d0e555028b87a9284ca7f6a1b26e35e69a8697165b35cc682ad598abc70f0bbcfdc12ca84ef888caf5ceee389237862e8f8c17da85f89
+  languageName: node
+  linkType: hard
+
 "esbuild@npm:^0.16.14":
   version: 0.16.17
   resolution: "esbuild@npm:0.16.17"
@@ -20568,6 +21101,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-you-dont-need-lodash-underscore@npm:^6.12.0":
+  version: 6.12.0
+  resolution: "eslint-plugin-you-dont-need-lodash-underscore@npm:6.12.0"
+  dependencies:
+    kebab-case: ^1.0.0
+  checksum: 9371cfa3c524f9b7c27de0ea3f8232ea60812e80a1f9ec99be3e7caaec22db44ce69f26db067e7ea1f2ca60f2b29f371c773e8f9913caae878fa3f45b4ada0e8
+  languageName: node
+  linkType: hard
+
 "eslint-rule-composer@npm:^0.3.0":
   version: 0.3.0
   resolution: "eslint-rule-composer@npm:0.3.0"
@@ -20630,6 +21172,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-visitor-keys@npm:^3.4.0":
+  version: 3.4.0
+  resolution: "eslint-visitor-keys@npm:3.4.0"
+  checksum: 33159169462d3989321a1ec1e9aaaf6a24cc403d5d347e9886d1b5bfe18ffa1be73bdc6203143a28a606b142b1af49787f33cff0d6d0813eb5f2e8d2e1a6043c
+  languageName: node
+  linkType: hard
+
 "eslint@npm:8.4.1":
   version: 8.4.1
   resolution: "eslint@npm:8.4.1"
@@ -20678,6 +21227,56 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint@npm:^8.22.0":
+  version: 8.38.0
+  resolution: "eslint@npm:8.38.0"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@eslint-community/regexpp": ^4.4.0
+    "@eslint/eslintrc": ^2.0.2
+    "@eslint/js": 8.38.0
+    "@humanwhocodes/config-array": ^0.11.8
+    "@humanwhocodes/module-importer": ^1.0.1
+    "@nodelib/fs.walk": ^1.2.8
+    ajv: ^6.10.0
+    chalk: ^4.0.0
+    cross-spawn: ^7.0.2
+    debug: ^4.3.2
+    doctrine: ^3.0.0
+    escape-string-regexp: ^4.0.0
+    eslint-scope: ^7.1.1
+    eslint-visitor-keys: ^3.4.0
+    espree: ^9.5.1
+    esquery: ^1.4.2
+    esutils: ^2.0.2
+    fast-deep-equal: ^3.1.3
+    file-entry-cache: ^6.0.1
+    find-up: ^5.0.0
+    glob-parent: ^6.0.2
+    globals: ^13.19.0
+    grapheme-splitter: ^1.0.4
+    ignore: ^5.2.0
+    import-fresh: ^3.0.0
+    imurmurhash: ^0.1.4
+    is-glob: ^4.0.0
+    is-path-inside: ^3.0.3
+    js-sdsl: ^4.1.4
+    js-yaml: ^4.1.0
+    json-stable-stringify-without-jsonify: ^1.0.1
+    levn: ^0.4.1
+    lodash.merge: ^4.6.2
+    minimatch: ^3.1.2
+    natural-compare: ^1.4.0
+    optionator: ^0.9.1
+    strip-ansi: ^6.0.1
+    strip-json-comments: ^3.1.0
+    text-table: ^0.2.0
+  bin:
+    eslint: bin/eslint.js
+  checksum: 73b6d9b650d0434aa7c07d0a1802f099b086ee70a8d8ba7be730439a26572a5eb71def12125c82942be2ec8ee5be38a6f1b42a13e40d4b67f11a148ec9e263eb
+  languageName: node
+  linkType: hard
+
 "eslint@npm:^8.34.0":
   version: 8.34.0
   resolution: "eslint@npm:8.34.0"
@@ -20771,6 +21370,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"espree@npm:^9.5.1":
+  version: 9.5.1
+  resolution: "espree@npm:9.5.1"
+  dependencies:
+    acorn: ^8.8.0
+    acorn-jsx: ^5.3.2
+    eslint-visitor-keys: ^3.4.0
+  checksum: cdf6e43540433d917c4f2ee087c6e987b2063baa85a1d9cdaf51533d78275ebd5910c42154e7baf8e3e89804b386da0a2f7fad2264d8f04420e7506bf87b3b88
+  languageName: node
+  linkType: hard
+
 "esprima@npm:^4.0.0, esprima@npm:^4.0.1":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"
@@ -20790,6 +21400,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esquery@npm:^1.4.2":
+  version: 1.5.0
+  resolution: "esquery@npm:1.5.0"
+  dependencies:
+    estraverse: ^5.1.0
+  checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900
+  languageName: node
+  linkType: hard
+
 "esrecurse@npm:^4.1.0, esrecurse@npm:^4.3.0":
   version: 4.3.0
   resolution: "esrecurse@npm:4.3.0"
@@ -20879,7 +21498,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^2.0.1":
+"estree-walker@npm:^2.0.1, estree-walker@npm:^2.0.2":
   version: 2.0.2
   resolution: "estree-walker@npm:2.0.2"
   checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
@@ -22097,6 +22716,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"foreach@npm:~2.0.1":
+  version: 2.0.6
+  resolution: "foreach@npm:2.0.6"
+  checksum: f7b68494545ee41cbd0b0425ebf5386c265dc38ef2a9b0d5cd91a1b82172e939b4cf9387f8e0ebf6db4e368fc79ed323f2198424d5c774515ac3ed9b08901c0e
+  languageName: node
+  linkType: hard
+
 "foreground-child@npm:^2.0.0":
   version: 2.0.0
   resolution: "foreground-child@npm:2.0.0"
@@ -22276,6 +22902,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"framer-motion@npm:^10.12.3":
+  version: 10.12.3
+  resolution: "framer-motion@npm:10.12.3"
+  dependencies:
+    "@emotion/is-prop-valid": ^0.8.2
+    tslib: ^2.4.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  dependenciesMeta:
+    "@emotion/is-prop-valid":
+      optional: true
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: c292da47b5bcb313e3db2ffe19e61b3c76bf59f4a45dc72f62a3d9b33f58533d420aced47d5e9eb06be20be97651c937ae91aebb93d8bad6d0412c2768715956
+  languageName: node
+  linkType: hard
+
 "fresh@npm:0.5.2, fresh@npm:^0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
@@ -22495,6 +23142,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fwd-stream@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "fwd-stream@npm:1.0.4"
+  dependencies:
+    readable-stream: ~1.0.26-4
+  checksum: db4dcf68f214b3fabd6cd9658630dfd1d7ed8d43f7f45408027a90220cd75276e782d1e958821775d7a3a4a83034778e75a097bdc7002c758e8896f76213c65d
+  languageName: node
+  linkType: hard
+
 "gauge@npm:^3.0.0":
   version: 3.0.2
   resolution: "gauge@npm:3.0.2"
@@ -22528,22 +23184,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gauge@npm:~2.7.3":
-  version: 2.7.4
-  resolution: "gauge@npm:2.7.4"
-  dependencies:
-    aproba: ^1.0.3
-    console-control-strings: ^1.0.0
-    has-unicode: ^2.0.0
-    object-assign: ^4.1.0
-    signal-exit: ^3.0.0
-    string-width: ^1.0.1
-    strip-ansi: ^3.0.1
-    wide-align: ^1.1.0
-  checksum: a89b53cee65579b46832e050b5f3a79a832cc422c190de79c6b8e2e15296ab92faddde6ddf2d376875cbba2b043efa99b9e1ed8124e7365f61b04e3cee9d40ee
-  languageName: node
-  linkType: hard
-
 "gaxios@npm:^4.0.0":
   version: 4.3.2
   resolution: "gaxios@npm:4.3.2"
@@ -22875,7 +23515,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.1, glob@npm:^8.1.0":
+"glob@npm:^8.0.1, glob@npm:^8.0.3, glob@npm:^8.1.0":
   version: 8.1.0
   resolution: "glob@npm:8.1.0"
   dependencies:
@@ -23366,7 +24006,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1":
+"has-unicode@npm:^2.0.1":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
   checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400
@@ -24119,6 +24759,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"idb-wrapper@npm:^1.5.0":
+  version: 1.7.2
+  resolution: "idb-wrapper@npm:1.7.2"
+  checksum: a5fa3a771166205e2d5d2b93c66bd31571dada3526b59bc0f8583efb091b6b327125f1a964a25a281b85ef1c44af10a3c511652632ad3adf8229a161132d66ae
+  languageName: node
+  linkType: hard
+
 "idna-uts46-hx@npm:^2.3.1":
   version: 2.3.1
   resolution: "idna-uts46-hx@npm:2.3.1"
@@ -24263,6 +24910,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"indexof@npm:~0.0.1":
+  version: 0.0.1
+  resolution: "indexof@npm:0.0.1"
+  checksum: 0fb04e8b147b8585d981a6df1564f25bb3678d6fa74e33e5cecc1464b10f78e15e8ef6bb688f135fe5c2844a128fac8a7831cbe5adc81fdcf12681b093dfcc25
+  languageName: node
+  linkType: hard
+
 "infer-owner@npm:^1.0.3, infer-owner@npm:^1.0.4":
   version: 1.0.4
   resolution: "infer-owner@npm:1.0.4"
@@ -24630,6 +25284,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-builtin-module@npm:^3.2.0":
+  version: 3.2.1
+  resolution: "is-builtin-module@npm:3.2.1"
+  dependencies:
+    builtin-modules: ^3.3.0
+  checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
+  languageName: node
+  linkType: hard
+
 "is-callable@npm:^1.1.4, is-callable@npm:^1.2.4":
   version: 1.2.4
   resolution: "is-callable@npm:1.2.4"
@@ -24794,15 +25457,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-fullwidth-code-point@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-fullwidth-code-point@npm:1.0.0"
-  dependencies:
-    number-is-nan: ^1.0.0
-  checksum: 4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57
-  languageName: node
-  linkType: hard
-
 "is-fullwidth-code-point@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-fullwidth-code-point@npm:2.0.0"
@@ -24916,6 +25570,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-module@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-module@npm:1.0.0"
+  checksum: 8cd5390730c7976fb4e8546dd0b38865ee6f7bacfa08dfbb2cc07219606755f0b01709d9361e01f13009bbbd8099fa2927a8ed665118a6105d66e40f1b838c3f
+  languageName: node
+  linkType: hard
+
 "is-nan@npm:^1.3.2":
   version: 1.3.2
   resolution: "is-nan@npm:1.3.2"
@@ -24986,6 +25647,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-object@npm:~0.1.2":
+  version: 0.1.2
+  resolution: "is-object@npm:0.1.2"
+  checksum: 7e500b15f4748278ea0a8d43b1283e75e866c055e4a790389087ce652eab8a9343fd74710738f0fdf13a323c31330d65bdcc106f38e9bb7bc0b9c60ae3fd2a2d
+  languageName: node
+  linkType: hard
+
 "is-path-inside@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-path-inside@npm:3.0.3"
@@ -25044,6 +25712,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-reference@npm:1.2.1":
+  version: 1.2.1
+  resolution: "is-reference@npm:1.2.1"
+  dependencies:
+    "@types/estree": "*"
+  checksum: e7b48149f8abda2c10849ea51965904d6a714193d68942ad74e30522231045acf06cbfae5a4be2702fede5d232e61bf50b3183acdc056e6e3afe07fcf4f4b2bc
+  languageName: node
+  linkType: hard
+
 "is-reference@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-reference@npm:3.0.0"
@@ -25235,6 +25912,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is@npm:~0.2.6":
+  version: 0.2.7
+  resolution: "is@npm:0.2.7"
+  checksum: 45cea1e6deb41150b5753e18041a833657313e9c791c73f96fb9014b613346f5af2e6650858ef50ea6262c79555b65e09b13d30a268139863885025dd65f1059
+  languageName: node
+  linkType: hard
+
+"isarray@npm:0.0.1":
+  version: 0.0.1
+  resolution: "isarray@npm:0.0.1"
+  checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
+  languageName: node
+  linkType: hard
+
 "isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "isarray@npm:1.0.0"
@@ -25249,6 +25940,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"isbuffer@npm:~0.0.0":
+  version: 0.0.0
+  resolution: "isbuffer@npm:0.0.0"
+  checksum: 9796296d3c493974c1f71ccf3170cc8007217a19ce8b3b9dedffd32e8ccc3ac42473b572bbf1b24b86143e826ea157aead11fd1285389518abab76c7da5f50ed
+  languageName: node
+  linkType: hard
+
 "isexe@npm:^2.0.0":
   version: 2.0.0
   resolution: "isexe@npm:2.0.0"
@@ -26055,13 +26753,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jose@npm:4.11.1":
-  version: 4.11.1
-  resolution: "jose@npm:4.11.1"
-  checksum: cd15cba258d0fd20f6168631ce2e94fda8442df80e43c1033c523915cecdf390a1cc8efe0eab0c2d65935ca973d791c668aea80724d2aa9c2879d4e70f3081d7
-  languageName: node
-  linkType: hard
-
 "jose@npm:4.12.0":
   version: 4.12.0
   resolution: "jose@npm:4.12.0"
@@ -26601,6 +27292,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"kebab-case@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "kebab-case@npm:1.0.2"
+  checksum: bf01164e11c544ee9b3aa1a91c2e7d6aa6b3356b834a5e885d43f36db14aae5d347cd4a298a566133321b82fde6bac6b597f148ac19bfd3d3fc81e1034a79729
+  languageName: node
+  linkType: hard
+
 "keccak@npm:^3.0.0, keccak@npm:^3.0.1":
   version: 3.0.2
   resolution: "keccak@npm:3.0.2"
@@ -26742,6 +27440,109 @@ __metadata:
   languageName: node
   linkType: hard
 
+"level-blobs@npm:^0.1.7":
+  version: 0.1.7
+  resolution: "level-blobs@npm:0.1.7"
+  dependencies:
+    level-peek: 1.0.6
+    once: ^1.3.0
+    readable-stream: ^1.0.26-4
+  checksum: e3cf78ef0bc64ff350edb4e247b2689cd4f5facf1119694ca8c96c28a05a38dc9d88e0bd065b18af65330bc22f5d588719a5c3e63adaa5feba5ea7913f87bebe
+  languageName: node
+  linkType: hard
+
+"level-filesystem@npm:^1.0.1":
+  version: 1.2.0
+  resolution: "level-filesystem@npm:1.2.0"
+  dependencies:
+    concat-stream: ^1.4.4
+    errno: ^0.1.1
+    fwd-stream: ^1.0.4
+    level-blobs: ^0.1.7
+    level-peek: ^1.0.6
+    level-sublevel: ^5.2.0
+    octal: ^1.0.0
+    once: ^1.3.0
+    xtend: ^2.2.0
+  checksum: a29e6a9d8c1879d43610113d1bcb59368685ec0ae413fcf0f8dcbb0a0c26b88fcf16f7481acb2b4650e5951ba0635e73a2c8fbe25cd599c50f80949a5547a367
+  languageName: node
+  linkType: hard
+
+"level-fix-range@npm:2.0":
+  version: 2.0.0
+  resolution: "level-fix-range@npm:2.0.0"
+  dependencies:
+    clone: ~0.1.9
+  checksum: 250cefa69e1035d1412b4ba3e5cab83cceb894aa833fb0a93417d8d6230c60f6f8154feffbd0f116461ddd441b909e7df1323355d3e1769b3bb20a55729145b5
+  languageName: node
+  linkType: hard
+
+"level-fix-range@npm:~1.0.2":
+  version: 1.0.2
+  resolution: "level-fix-range@npm:1.0.2"
+  checksum: 6c9a3894ea08947fae79c41b75e8b9d57979523b656bec43c589f2dc4455276a150df445d9a7ca880a7c58c2ef19f5cea7f661d777993b870f4943af6b31d5bb
+  languageName: node
+  linkType: hard
+
+"level-hooks@npm:>=4.4.0 <5":
+  version: 4.5.0
+  resolution: "level-hooks@npm:4.5.0"
+  dependencies:
+    string-range: ~1.2
+  checksum: f198ad2e0901a4719e324e67f546097589af79665ebaaabee7122fda18a41ada3158bb1816b8b82430f30c68610125e4e20b5c09ec3ba7ae262d97dba34f48ab
+  languageName: node
+  linkType: hard
+
+"level-js@npm:^2.1.3":
+  version: 2.2.4
+  resolution: "level-js@npm:2.2.4"
+  dependencies:
+    abstract-leveldown: ~0.12.0
+    idb-wrapper: ^1.5.0
+    isbuffer: ~0.0.0
+    ltgt: ^2.1.2
+    typedarray-to-buffer: ~1.0.0
+    xtend: ~2.1.2
+  checksum: 4fed784fcfad4bc6ec97d9c3897e95eaa30326fcdab9f4c7437624d10fa875fa84aafcc2acac0d53181af506cbc012c03f413b4da12ff83758d3bcbb699f8c8e
+  languageName: node
+  linkType: hard
+
+"level-peek@npm:1.0.6, level-peek@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "level-peek@npm:1.0.6"
+  dependencies:
+    level-fix-range: ~1.0.2
+  checksum: e07d5f8b80675727204d9a226a249139da9e354e633b9d57b7a5186a7b85be445e550ca628f5133bf7a220a9311a193ded5a3f83588dc4eaa53ffb86b426154a
+  languageName: node
+  linkType: hard
+
+"level-sublevel@npm:^5.2.0":
+  version: 5.2.3
+  resolution: "level-sublevel@npm:5.2.3"
+  dependencies:
+    level-fix-range: 2.0
+    level-hooks: ">=4.4.0 <5"
+    string-range: ~1.2.1
+    xtend: ~2.0.4
+  checksum: f0fdffc2f9ca289aa183a1bf7f300a8f92e4f01be60eab37ab36e1f6ec33ed449519d8f69504a616e82f3ddca13a15fa4e19af1dcc1beba9044a4c60b6cd94bf
+  languageName: node
+  linkType: hard
+
+"levelup@npm:^0.18.2":
+  version: 0.18.6
+  resolution: "levelup@npm:0.18.6"
+  dependencies:
+    bl: ~0.8.1
+    deferred-leveldown: ~0.2.0
+    errno: ~0.1.1
+    prr: ~0.0.0
+    readable-stream: ~1.0.26
+    semver: ~2.3.1
+    xtend: ~3.0.0
+  checksum: 80e140dd83dc94050e283fc02874ae85116cb560d81e14fee0ac111f86006887835ec905dca7a081414c07eca202245a580f1e02f696367b777ecc23a9e05b86
+  languageName: node
+  linkType: hard
+
 "leven@npm:^3.1.0":
   version: 3.1.0
   resolution: "leven@npm:3.1.0"
@@ -27366,6 +28167,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "lru-cache@npm:9.0.3"
+  checksum: 218415714d44c113bc3a8d12ceca6dedf310915aa861f9e0df13df1fe6db9833e1b5f1f656e9a117ac82677ad3e499be23bff2f670f2a7c5c186d64a92596b68
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:~4.0.0":
   version: 4.0.2
   resolution: "lru-cache@npm:4.0.2"
@@ -27393,6 +28201,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ltgt@npm:^2.1.2":
+  version: 2.2.1
+  resolution: "ltgt@npm:2.2.1"
+  checksum: 7e3874296f7538bc8087b428ac4208008d7b76916354b34a08818ca7c83958c1df10ec427eeeaad895f6b81e41e24745b18d30f89abcc21d228b94f6961d50a2
+  languageName: node
+  linkType: hard
+
 "lucide-react@npm:^0.125.0":
   version: 0.125.0
   resolution: "lucide-react@npm:0.125.0"
@@ -27445,6 +28260,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.26.7":
+  version: 0.26.7
+  resolution: "magic-string@npm:0.26.7"
+  dependencies:
+    sourcemap-codec: ^1.4.8
+  checksum: 89b0d60cbb32bbf3d1e23c46ea93db082d18a8230b972027aecb10a40bba51be519ecce0674f995571e3affe917b76b09f59d8dbc9a1b2c9c4102a2b6e8a2b01
+  languageName: node
+  linkType: hard
+
+"magic-string@npm:^0.27.0":
+  version: 0.27.0
+  resolution: "magic-string@npm:0.27.0"
+  dependencies:
+    "@jridgewell/sourcemap-codec": ^1.4.13
+  checksum: 273faaa50baadb7a2df6e442eac34ad611304fc08fe16e24fe2e472fd944bfcb73ffb50d2dc972dc04e92784222002af46868cb9698b1be181c81830fd95a13e
+  languageName: node
+  linkType: hard
+
 "make-dir@npm:^1.0.0":
   version: 1.3.0
   resolution: "make-dir@npm:1.3.0"
@@ -27975,13 +28808,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memoize-one@npm:>=3.1.1 <6":
-  version: 5.2.1
-  resolution: "memoize-one@npm:5.2.1"
-  checksum: a3cba7b824ebcf24cdfcd234aa7f86f3ad6394b8d9be4c96ff756dafb8b51c7f71320785fbc2304f1af48a0467cbbd2a409efc9333025700ed523f254cb52e3d
-  languageName: node
-  linkType: hard
-
 "memoize-one@npm:^6.0.0":
   version: 6.0.0
   resolution: "memoize-one@npm:6.0.0"
@@ -29327,6 +30153,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"next-auth@npm:^4.10.3":
+  version: 4.22.0
+  resolution: "next-auth@npm:4.22.0"
+  dependencies:
+    "@babel/runtime": ^7.20.13
+    "@panva/hkdf": ^1.0.2
+    cookie: ^0.5.0
+    jose: ^4.11.4
+    oauth: ^0.9.15
+    openid-client: ^5.4.0
+    preact: ^10.6.3
+    preact-render-to-string: ^5.1.19
+    uuid: ^8.3.2
+  peerDependencies:
+    next: ^12.2.5 || ^13
+    nodemailer: ^6.6.5
+    react: ^17.0.2 || ^18
+    react-dom: ^17.0.2 || ^18
+  peerDependenciesMeta:
+    nodemailer:
+      optional: true
+  checksum: 327a7715a963c890afd0b5a47316ce2c4cec887a86d96f2c208135df0f10b52c6e1fdcbb436a77926c24695165beea3bd0588da2411d5dec12fa19baae0c2533
+  languageName: node
+  linkType: hard
+
 "next-auth@npm:^4.20.1":
   version: 4.20.1
   resolution: "next-auth@npm:4.20.1"
@@ -29352,6 +30203,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"next-axiom@npm:^0.10.0":
+  version: 0.10.0
+  resolution: "next-axiom@npm:0.10.0"
+  dependencies:
+    whatwg-fetch: ^3.6.2
+  peerDependencies:
+    next: ^12.1.4
+  checksum: 57aea4edbdab1a4da59eb16644e850a082a23657128f1f953a2b3601b09fa4558090d42b616f8a3e6022c0deef0d95937321f373caa9ca591178dd8445528921
+  languageName: node
+  linkType: hard
+
 "next-axiom@npm:^0.16.0":
   version: 0.16.0
   resolution: "next-axiom@npm:0.16.0"
@@ -29459,6 +30321,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"next-transpile-modules@npm:^9.0.0":
+  version: 9.1.0
+  resolution: "next-transpile-modules@npm:9.1.0"
+  dependencies:
+    enhanced-resolve: ^5.10.0
+    escalade: ^3.1.1
+  checksum: 8cc46196db3c2d2063fb29fe5b4d03c21065ab08130085b24d61e4ed512d99c12083d28179771cf02f70f8bf5970db0781a228aacf6cc61662dbdcabaddfc472
+  languageName: node
+  linkType: hard
+
 "next-validations@npm:^0.2.0":
   version: 0.2.1
   resolution: "next-validations@npm:0.2.1"
@@ -29539,6 +30411,75 @@ __metadata:
   languageName: node
   linkType: hard
 
+"next@npm:^12.3.1":
+  version: 12.3.4
+  resolution: "next@npm:12.3.4"
+  dependencies:
+    "@next/env": 12.3.4
+    "@next/swc-android-arm-eabi": 12.3.4
+    "@next/swc-android-arm64": 12.3.4
+    "@next/swc-darwin-arm64": 12.3.4
+    "@next/swc-darwin-x64": 12.3.4
+    "@next/swc-freebsd-x64": 12.3.4
+    "@next/swc-linux-arm-gnueabihf": 12.3.4
+    "@next/swc-linux-arm64-gnu": 12.3.4
+    "@next/swc-linux-arm64-musl": 12.3.4
+    "@next/swc-linux-x64-gnu": 12.3.4
+    "@next/swc-linux-x64-musl": 12.3.4
+    "@next/swc-win32-arm64-msvc": 12.3.4
+    "@next/swc-win32-ia32-msvc": 12.3.4
+    "@next/swc-win32-x64-msvc": 12.3.4
+    "@swc/helpers": 0.4.11
+    caniuse-lite: ^1.0.30001406
+    postcss: 8.4.14
+    styled-jsx: 5.0.7
+    use-sync-external-store: 1.2.0
+  peerDependencies:
+    fibers: ">= 3.1.0"
+    node-sass: ^6.0.0 || ^7.0.0
+    react: ^17.0.2 || ^18.0.0-0
+    react-dom: ^17.0.2 || ^18.0.0-0
+    sass: ^1.3.0
+  dependenciesMeta:
+    "@next/swc-android-arm-eabi":
+      optional: true
+    "@next/swc-android-arm64":
+      optional: true
+    "@next/swc-darwin-arm64":
+      optional: true
+    "@next/swc-darwin-x64":
+      optional: true
+    "@next/swc-freebsd-x64":
+      optional: true
+    "@next/swc-linux-arm-gnueabihf":
+      optional: true
+    "@next/swc-linux-arm64-gnu":
+      optional: true
+    "@next/swc-linux-arm64-musl":
+      optional: true
+    "@next/swc-linux-x64-gnu":
+      optional: true
+    "@next/swc-linux-x64-musl":
+      optional: true
+    "@next/swc-win32-arm64-msvc":
+      optional: true
+    "@next/swc-win32-ia32-msvc":
+      optional: true
+    "@next/swc-win32-x64-msvc":
+      optional: true
+  peerDependenciesMeta:
+    fibers:
+      optional: true
+    node-sass:
+      optional: true
+    sass:
+      optional: true
+  bin:
+    next: dist/bin/next
+  checksum: d96fc4f5bcd5a630d74111519f4820dcbd75dddf16c6d00d2167bd3cb8d74965d46d83c8e5ec301bf999013c7d96f1bfff9424f0221317d68b594c4d01f5825e
+  languageName: node
+  linkType: hard
+
 "next@npm:^13.2.1":
   version: 13.2.3
   resolution: "next@npm:13.2.3"
@@ -29965,18 +30906,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npmlog@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "npmlog@npm:4.1.2"
-  dependencies:
-    are-we-there-yet: ~1.1.2
-    console-control-strings: ~1.1.0
-    gauge: ~2.7.3
-    set-blocking: ~2.0.0
-  checksum: edbda9f95ec20957a892de1839afc6fb735054c3accf6fbefe767bac9a639fd5cea2baeac6bd2bcd50a85cb54924d57d9886c81c7fbc2332c2ddd19227504192
-  languageName: node
-  linkType: hard
-
 "npmlog@npm:^5.0.1":
   version: 5.0.1
   resolution: "npmlog@npm:5.0.1"
@@ -30017,13 +30946,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"number-is-nan@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "number-is-nan@npm:1.0.1"
-  checksum: 13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb
-  languageName: node
-  linkType: hard
-
 "number-to-bn@npm:1.7.0":
   version: 1.7.0
   resolution: "number-to-bn@npm:1.7.0"
@@ -30048,13 +30970,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oauth4webapi@npm:2.0.5":
-  version: 2.0.5
-  resolution: "oauth4webapi@npm:2.0.5"
-  checksum: 32d0cb7b1cca42d51dfb88075ca2d69fe33172a807e8ea50e317d17cab3bc80588ab8ebcb7eb4600c371a70af4674595b4b341daf6f3a655f1efa1ab715bb6c9
-  languageName: node
-  linkType: hard
-
 "oauth@npm:^0.9.15":
   version: 0.9.15
   resolution: "oauth@npm:0.9.15"
@@ -30115,6 +31030,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-keys@npm:~0.2.0":
+  version: 0.2.0
+  resolution: "object-keys@npm:0.2.0"
+  dependencies:
+    foreach: ~2.0.1
+    indexof: ~0.0.1
+    is: ~0.2.6
+  checksum: 4b96bab88fe9df22a03aec3c59a084bdffc789ad1318a39081e6b8389af6b9ab8571dd3776eed3ec5831137d057fb7ba76911552c6a6efd59b5d126ac3b6e432
+  languageName: node
+  linkType: hard
+
+"object-keys@npm:~0.4.0":
+  version: 0.4.0
+  resolution: "object-keys@npm:0.4.0"
+  checksum: 1be3ebe9b48c0d5eda8e4a30657d887a748cb42435e0e2eaf49faf557bdd602cd2b7558b8ce90a4eb2b8592d16b875a1900bce859cbb0f35b21c67e11a45313c
+  languageName: node
+  linkType: hard
+
 "object-path@npm:^0.11.8":
   version: 0.11.8
   resolution: "object-path@npm:0.11.8"
@@ -30278,6 +31211,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"octal@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "octal@npm:1.0.0"
+  checksum: d648917f4f0a1042d7a4e230262aed00274c9791fe4795e9a2ce3b64ab7f2ca93e62cd55ca5ad4e4bd3fc375ca84d6919d7bf417be461790c1042503ac2c2310
+  languageName: node
+  linkType: hard
+
 "oidc-token-hash@npm:^5.0.1":
   version: 5.0.1
   resolution: "oidc-token-hash@npm:5.0.1"
@@ -31720,17 +32660,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"preact-render-to-string@npm:5.2.3":
-  version: 5.2.3
-  resolution: "preact-render-to-string@npm:5.2.3"
-  dependencies:
-    pretty-format: ^3.8.0
-  peerDependencies:
-    preact: ">=10"
-  checksum: 6e46288d8956adde35b9fe3a21aecd9dea29751b40f0f155dea62f3896f27cb8614d457b32f48d33909d2da81135afcca6c55077520feacd7d15164d1371fb44
-  languageName: node
-  linkType: hard
-
 "preact-render-to-string@npm:^5.1.19":
   version: 5.2.6
   resolution: "preact-render-to-string@npm:5.2.6"
@@ -31742,13 +32671,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"preact@npm:10.11.3, preact@npm:^10.6.3":
-  version: 10.11.3
-  resolution: "preact@npm:10.11.3"
-  checksum: 9387115aa0581e8226309e6456e9856f17dfc0e3d3e63f774de80f3d462a882ba7c60914c05942cb51d51e23e120dcfe904b8d392d46f29ad15802941fe7a367
-  languageName: node
-  linkType: hard
-
 "preact@npm:10.4.1":
   version: 10.4.1
   resolution: "preact@npm:10.4.1"
@@ -31763,6 +32685,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"preact@npm:^10.6.3":
+  version: 10.11.3
+  resolution: "preact@npm:10.11.3"
+  checksum: 9387115aa0581e8226309e6456e9856f17dfc0e3d3e63f774de80f3d462a882ba7c60914c05942cb51d51e23e120dcfe904b8d392d46f29ad15802941fe7a367
+  languageName: node
+  linkType: hard
+
 "prelude-ls@npm:^1.2.1":
   version: 1.2.1
   resolution: "prelude-ls@npm:1.2.1"
@@ -31975,15 +32904,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prisma@npm:^4.11.0":
-  version: 4.11.0
-  resolution: "prisma@npm:4.11.0"
+"prisma@npm:^4.13.0":
+  version: 4.13.0
+  resolution: "prisma@npm:4.13.0"
   dependencies:
-    "@prisma/engines": 4.11.0
+    "@prisma/engines": 4.13.0
   bin:
     prisma: build/index.js
     prisma2: build/index.js
-  checksum: 760d80766ae16ad2d25cfc20d75433b020dff0937eab864b94b95beadd89e481508e4d3c6370a5df90749d5ac5c7af77c9c2f293b74bfdee0e548b04a905c2e7
+  checksum: b735dd19842da1dfe5b3411551665db5f2a419ee5e67136dfc2c8cae3c7fe0f885b472b0f9decb3adb4af83260c51a605ecca8f2194805804e020c382096a75a
+  languageName: node
+  linkType: hard
+
+"prisma@npm:^4.7.1":
+  version: 4.12.0
+  resolution: "prisma@npm:4.12.0"
+  dependencies:
+    "@prisma/engines": 4.12.0
+  bin:
+    prisma: build/index.js
+    prisma2: build/index.js
+  checksum: 826b90901391eead0aa2e1ab4539474c308f8a956b480e87594b241bfaba423ebd781b8082fc329f4e7e780f3a7162a09ac61c367d3f43382e93d506e4a66c7c
   languageName: node
   linkType: hard
 
@@ -32001,6 +32942,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"process-es6@npm:^0.11.2":
+  version: 0.11.6
+  resolution: "process-es6@npm:0.11.6"
+  checksum: 8849ea1a799a20a8e863fd3a5558d4085357ee59cae16b76f61327e3b3a27697b4e49c880742a6cc0f0c37eb0bd78fb0d4e382bd2e5318bb699b404b55a9b91e
+  languageName: node
+  linkType: hard
+
 "process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
@@ -32141,6 +33089,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prr@npm:~0.0.0":
+  version: 0.0.0
+  resolution: "prr@npm:0.0.0"
+  checksum: 6552d9d92d9d55ec1afb8952ad80f81bbb1b4379f24ff7c506ad083ea701caf1bf6d4b092a2baeb98ec3f312c5a49d8bdf1d9b20a6db2998d05c2d52aa6a82e7
+  languageName: node
+  linkType: hard
+
 "prr@npm:~1.0.1":
   version: 1.0.1
   resolution: "prr@npm:1.0.1"
@@ -32779,13 +33734,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-error-boundary@npm:^3.1.0":
+  version: 3.1.4
+  resolution: "react-error-boundary@npm:3.1.4"
+  dependencies:
+    "@babel/runtime": ^7.12.5
+  peerDependencies:
+    react: ">=16.13.1"
+  checksum: f36270a5d775a25c8920f854c0d91649ceea417b15b5bc51e270a959b0476647bb79abb4da3be7dd9a4597b029214e8fe43ea914a7f16fa7543c91f784977f1b
+  languageName: node
+  linkType: hard
+
 "react-fast-marquee@npm:^1.3.5":
-  version: 1.3.5
-  resolution: "react-fast-marquee@npm:1.3.5"
+  version: 1.5.0
+  resolution: "react-fast-marquee@npm:1.5.0"
   peerDependencies:
     react: ">= 16.8.0 || 18.0.0"
     react-dom: ">= 16.8.0 || 18.0.0"
-  checksum: 95301d63faa858ac0e8c2ab32e1e864ed49d8b36e96216960af0ac797bc30fe11c7747b9c3bed3728f5371e57a93277a064fd433c6f8e1a24a9a32bbf1d354e8
+  checksum: b159c1f567d24eed00a20c72339e896213b3107d0dd30a24bbcac5a8ae39b23398ff721efdbe63224b5c87ae7997351cac425046dd9d632ebe4b166d466f30fe
   languageName: node
   linkType: hard
 
@@ -32825,6 +33791,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-hook-form@npm:^7.34.2":
+  version: 7.43.9
+  resolution: "react-hook-form@npm:7.43.9"
+  peerDependencies:
+    react: ^16.8.0 || ^17 || ^18
+  checksum: 65b94de625f2b7921c4e856bf0abbe142bfe06c052217bd1bcc3a842e2cc37fa3a3e03758119dc038bbcf5edb49e02c29206528b80b201f9a4d601471ef78153
+  languageName: node
+  linkType: hard
+
 "react-hook-form@npm:^7.43.3":
   version: 7.43.3
   resolution: "react-hook-form@npm:7.43.3"
@@ -33251,6 +34226,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-sticky-box@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "react-sticky-box@npm:2.0.4"
+  peerDependencies:
+    react: ">=16.8.0"
+  checksum: 6f6c1ab7b04851bcafce12cf9125d60d7944ff4f713ecfa53babb7695c6bfbb66d89a3e3cb040145a895a49a0fc9d47cf7325de3402a95f7fb16899ea96f2f80
+  languageName: node
+  linkType: hard
+
 "react-string-replace@npm:^1.1.0":
   version: 1.1.0
   resolution: "react-string-replace@npm:1.1.0"
@@ -33413,29 +34397,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-virtualized-auto-sizer@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "react-virtualized-auto-sizer@npm:1.0.6"
-  peerDependencies:
-    react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0
-    react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0
-  checksum: 81270e9d328e9b779515f42b6aa8dea2f21097f69fc776906d6b7d31ada03706d34408a6318baf59531f180402fbf74fdb9928ab65d53442a134b7ee5ba01265
-  languageName: node
-  linkType: hard
-
-"react-window@npm:^1.8.7":
-  version: 1.8.7
-  resolution: "react-window@npm:1.8.7"
-  dependencies:
-    "@babel/runtime": ^7.0.0
-    memoize-one: ">=3.1.1 <6"
-  peerDependencies:
-    react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 1e122c29224781e70359978287a2e850ccdf509cd71ba16b16ea258725687a62f5c16ab69f52f732b4ed20df583196dbe2a04804f3e4a176bb3e62f3fc910452
-  languageName: node
-  linkType: hard
-
 "react@npm:^18.2.0":
   version: 18.2.0
   resolution: "react@npm:18.2.0"
@@ -33509,7 +34470,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.0, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
+"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.1.0, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
   version: 2.3.7
   resolution: "readable-stream@npm:2.3.7"
   dependencies:
@@ -33524,6 +34485,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:^1.0.26-4":
+  version: 1.1.14
+  resolution: "readable-stream@npm:1.1.14"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.1
+    isarray: 0.0.1
+    string_decoder: ~0.10.x
+  checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0
+  languageName: node
+  linkType: hard
+
 "readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0":
   version: 3.6.0
   resolution: "readable-stream@npm:3.6.0"
@@ -33535,6 +34508,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:~1.0.26, readable-stream@npm:~1.0.26-4":
+  version: 1.0.34
+  resolution: "readable-stream@npm:1.0.34"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.1
+    isarray: 0.0.1
+    string_decoder: ~0.10.x
+  checksum: 85042c537e4f067daa1448a7e257a201070bfec3dd2706abdbd8ebc7f3418eb4d3ed4b8e5af63e2544d69f88ab09c28d5da3c0b77dc76185fddd189a59863b60
+  languageName: node
+  linkType: hard
+
 "readdirp@npm:^2.2.1":
   version: 2.2.1
   resolution: "readdirp@npm:2.2.1"
@@ -34382,6 +35367,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup-plugin-node-builtins@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "rollup-plugin-node-builtins@npm:2.1.2"
+  dependencies:
+    browserify-fs: ^1.0.0
+    buffer-es6: ^4.9.2
+    crypto-browserify: ^3.11.0
+    process-es6: ^0.11.2
+  checksum: 184338123fff678e1671ef958621058b679b5bc955620bb4457fe7e7005c6550497b9d978f7f74705ea46a6adedaa541066d3c7454c6878bde48791cd9a7b61a
+  languageName: node
+  linkType: hard
+
 "rollup-plugin-polyfill-node@npm:^0.10.2":
   version: 0.10.2
   resolution: "rollup-plugin-polyfill-node@npm:0.10.2"
@@ -34421,6 +35418,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^2.79.1":
+  version: 2.79.1
+  resolution: "rollup@npm:2.79.1"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 6a2bf167b3587d4df709b37d149ad0300692cc5deb510f89ac7bdc77c8738c9546ae3de9322b0968e1ed2b0e984571f5f55aae28fa7de4cfcb1bc5402a4e2be6
+  languageName: node
+  linkType: hard
+
 "rollup@npm:^3.10.0":
   version: 3.17.0
   resolution: "rollup@npm:3.17.0"
@@ -34904,6 +35915,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:~2.3.1":
+  version: 2.3.2
+  resolution: "semver@npm:2.3.2"
+  bin:
+    semver: ./bin/semver
+  checksum: e0649fb18a1da909df7b5a6f586314a7f6e052385fc1e6eafa7084dd77c0787e755ab35ca491f9eec986fe1d0d6d36eae85a21eb7e2ed32ae5906796acb92c56
+  languageName: node
+  linkType: hard
+
 "send@npm:0.17.2":
   version: 0.17.2
   resolution: "send@npm:0.17.2"
@@ -35055,7 +36075,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-blocking@npm:^2.0.0, set-blocking@npm:~2.0.0":
+"set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
   checksum: 6e65a05f7cf7ebdf8b7c75b101e18c0b7e3dff4940d480efed8aad3a36a4005140b660fa1d804cb8bce911cac290441dc728084a30504d3516ac2ff7ad607b02
@@ -35677,6 +36697,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stacktrace-parser@npm:^0.1.10":
+  version: 0.1.10
+  resolution: "stacktrace-parser@npm:0.1.10"
+  dependencies:
+    type-fest: ^0.7.1
+  checksum: f4fbddfc09121d91e587b60de4beb4941108e967d71ad3a171812dc839b010ca374d064ad0a296295fed13acd103609d99a4224a25b4e67de13cae131f1901ee
+  languageName: node
+  linkType: hard
+
 "state-toggle@npm:^1.0.0":
   version: 1.0.3
   resolution: "state-toggle@npm:1.0.3"
@@ -35936,14 +36965,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "string-width@npm:1.0.2"
-  dependencies:
-    code-point-at: ^1.0.0
-    is-fullwidth-code-point: ^1.0.0
-    strip-ansi: ^3.0.0
-  checksum: 5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e
+"string-range@npm:~1.2, string-range@npm:~1.2.1":
+  version: 1.2.2
+  resolution: "string-range@npm:1.2.2"
+  checksum: 7118cc83a7e63fca5fd8bef9b61464bfc51197b5f6dc475c9e1d24a93ce02fa27f7adb4cd7adac5daf599bde442b383608078f9b051bddb108d3b45840923097
   languageName: node
   linkType: hard
 
@@ -36092,6 +37117,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string_decoder@npm:~0.10.x":
+  version: 0.10.31
+  resolution: "string_decoder@npm:0.10.31"
+  checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202
+  languageName: node
+  linkType: hard
+
 "string_decoder@npm:~1.1.1":
   version: 1.1.1
   resolution: "string_decoder@npm:1.1.1"
@@ -36341,6 +37373,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"styled-jsx@npm:5.0.7":
+  version: 5.0.7
+  resolution: "styled-jsx@npm:5.0.7"
+  peerDependencies:
+    react: ">= 16.8.0 || 17.x.x || ^18.0.0-0"
+  peerDependenciesMeta:
+    "@babel/core":
+      optional: true
+    babel-plugin-macros:
+      optional: true
+  checksum: 61959993915f4b1662a682dbbefb3512de9399cf6901969bcadd26ba5441d2b5ca5c1021b233bbd573da2541b41efb45d56c6f618dbc8d88a381ebc62461fefe
+  languageName: node
+  linkType: hard
+
 "styled-jsx@npm:5.1.1":
   version: 5.1.1
   resolution: "styled-jsx@npm:5.1.1"
@@ -36364,23 +37410,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sucrase@npm:^3.20.0":
-  version: 3.28.0
-  resolution: "sucrase@npm:3.28.0"
-  dependencies:
-    commander: ^4.0.0
-    glob: 7.1.6
-    lines-and-columns: ^1.1.6
-    mz: ^2.7.0
-    pirates: ^4.0.1
-    ts-interface-checker: ^0.1.9
-  bin:
-    sucrase: bin/sucrase
-    sucrase-node: bin/sucrase-node
-  checksum: 6a2369c140cee674988ebcf83538f38b11270e47ebaffc811baabe1db3fc586f1a357d4bbc66388a6b99054ba06a08f31b44b764e777abbd457b9e29332b12d0
-  languageName: node
-  linkType: hard
-
 "sucrase@npm:^3.29.0":
   version: 3.31.0
   resolution: "sucrase@npm:3.31.0"
@@ -37736,6 +38765,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"turbo-darwin-64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "turbo-darwin-64@npm:1.9.3"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "turbo-darwin-arm64@npm:1.8.3":
   version: 1.8.3
   resolution: "turbo-darwin-arm64@npm:1.8.3"
@@ -37743,6 +38779,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"turbo-darwin-arm64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "turbo-darwin-arm64@npm:1.9.3"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "turbo-linux-64@npm:1.8.3":
   version: 1.8.3
   resolution: "turbo-linux-64@npm:1.8.3"
@@ -37750,6 +38793,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"turbo-linux-64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "turbo-linux-64@npm:1.9.3"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "turbo-linux-arm64@npm:1.8.3":
   version: 1.8.3
   resolution: "turbo-linux-arm64@npm:1.8.3"
@@ -37757,6 +38807,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"turbo-linux-arm64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "turbo-linux-arm64@npm:1.9.3"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "turbo-windows-64@npm:1.8.3":
   version: 1.8.3
   resolution: "turbo-windows-64@npm:1.8.3"
@@ -37764,6 +38821,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"turbo-windows-64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "turbo-windows-64@npm:1.9.3"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "turbo-windows-arm64@npm:1.8.3":
   version: 1.8.3
   resolution: "turbo-windows-arm64@npm:1.8.3"
@@ -37771,6 +38835,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"turbo-windows-arm64@npm:1.9.3":
+  version: 1.9.3
+  resolution: "turbo-windows-arm64@npm:1.9.3"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"turbo@npm:^1.4.3":
+  version: 1.9.3
+  resolution: "turbo@npm:1.9.3"
+  dependencies:
+    turbo-darwin-64: 1.9.3
+    turbo-darwin-arm64: 1.9.3
+    turbo-linux-64: 1.9.3
+    turbo-linux-arm64: 1.9.3
+    turbo-windows-64: 1.9.3
+    turbo-windows-arm64: 1.9.3
+  dependenciesMeta:
+    turbo-darwin-64:
+      optional: true
+    turbo-darwin-arm64:
+      optional: true
+    turbo-linux-64:
+      optional: true
+    turbo-linux-arm64:
+      optional: true
+    turbo-windows-64:
+      optional: true
+    turbo-windows-arm64:
+      optional: true
+  bin:
+    turbo: bin/turbo
+  checksum: ebf06d3b9b1401a5baabace238cd1e0d8fc1dc062b4f7bd577f644298c555f326d15f331144641c0b43a60ae8058769bcbd9d1660874fa9927ec64b5be8ee9dc
+  languageName: node
+  linkType: hard
+
 "turbo@npm:^1.8.3":
   version: 1.8.3
   resolution: "turbo@npm:1.8.3"
@@ -37935,6 +39035,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^0.7.1":
+  version: 0.7.1
+  resolution: "type-fest@npm:0.7.1"
+  checksum: 5b1b113529d59949d97b76977d545989ddc11b81bb0c766b6d2ccc65473cb4b4a5c7d24f5be2c2bb2de302a5d7a13c1732ea1d34c8c59b7e0ec1f890cf7fc424
+  languageName: node
+  linkType: hard
+
 "type-fest@npm:^0.8.1":
   version: 0.8.1
   resolution: "type-fest@npm:0.8.1"
@@ -37989,6 +39096,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typedarray-to-buffer@npm:~1.0.0":
+  version: 1.0.4
+  resolution: "typedarray-to-buffer@npm:1.0.4"
+  checksum: ac6989c456a0b175c8362b3ebbd8a74af7b9bcc94f9dc9ffd34436569cd29aea6a1e0e5f5752d0d5bd855a55b2520e960d1d4cb9c9149f863ce09220540df17f
+  languageName: node
+  linkType: hard
+
 "typedarray@npm:^0.0.6":
   version: 0.0.6
   resolution: "typedarray@npm:0.0.6"
@@ -38078,6 +39192,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@npm:^4.7.4, typescript@npm:^4.9.3":
+  version: 4.9.5
+  resolution: "typescript@npm:4.9.5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db
+  languageName: node
+  linkType: hard
+
 "typescript@npm:^4.9.4":
   version: 4.9.4
   resolution: "typescript@npm:4.9.4"
@@ -38088,6 +39212,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@^4.7.4#~builtin<compat/typescript>, typescript@patch:typescript@^4.9.3#~builtin<compat/typescript>":
+  version: 4.9.5
+  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=23ec76"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: ab417a2f398380c90a6cf5a5f74badd17866adf57f1165617d6a551f059c3ba0a3e4da0d147b3ac5681db9ac76a303c5876394b13b3de75fdd5b1eaa06181c9d
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@^4.9.4#~builtin<compat/typescript>":
   version: 4.9.4
   resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>::version=4.9.4&hash=23ec76"
@@ -39135,6 +40269,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite@npm:^3.2.4":
+  version: 3.2.5
+  resolution: "vite@npm:3.2.5"
+  dependencies:
+    esbuild: ^0.15.9
+    fsevents: ~2.3.2
+    postcss: ^8.4.18
+    resolve: ^1.22.1
+    rollup: ^2.79.1
+  peerDependencies:
+    "@types/node": ">= 14"
+    less: "*"
+    sass: "*"
+    stylus: "*"
+    sugarss: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+    less:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: ad35b7008c2b62a167d1d1a82f0a0c60fa457733f1969e9eedf0b0077f67a7ac74b4c9477e75a397895150f09b6551f0c17841c5b05c34d9fe302bb0b5dc28a8
+  languageName: node
+  linkType: hard
+
 "vite@npm:^4.1.2":
   version: 4.1.2
   resolution: "vite@npm:4.1.2"
@@ -40000,7 +41172,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.0, wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
+"wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
   version: 1.1.5
   resolution: "wide-align@npm:1.1.5"
   dependencies:
@@ -40385,6 +41557,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xtend@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "xtend@npm:2.2.0"
+  checksum: 9fcd1ddabefdb3c68a698b08177525ad14a6df3423b13bad9a53900d19374e476a43c219b0756d39675776b2326a35fe477c547cfb8a05ae9fea4ba2235bebe2
+  languageName: node
+  linkType: hard
+
 "xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:^4.0.2, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
@@ -40392,6 +41571,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xtend@npm:~2.0.4":
+  version: 2.0.6
+  resolution: "xtend@npm:2.0.6"
+  dependencies:
+    is-object: ~0.1.2
+    object-keys: ~0.2.0
+  checksum: 414531e51cbc56d4676ae2b3a4070052e0c7a36caf7ee74f2e8449fe0fc1752b971a776fca5b85ec02ef3d0a33b8e75491d900474b8407f3f4bba3f49325a785
+  languageName: node
+  linkType: hard
+
+"xtend@npm:~2.1.2":
+  version: 2.1.2
+  resolution: "xtend@npm:2.1.2"
+  dependencies:
+    object-keys: ~0.4.0
+  checksum: a8b79f31502c163205984eaa2b196051cd2fab0882b49758e30f2f9018255bc6c462e32a090bf3385d1bda04755ad8cc0052a09e049b0038f49eb9b950d9c447
+  languageName: node
+  linkType: hard
+
+"xtend@npm:~3.0.0":
+  version: 3.0.0
+  resolution: "xtend@npm:3.0.0"
+  checksum: ecdc4dd74f26e561dbc13d4148fcc7b8f46f49b9259862fc31e42b7cede9eee62af9d869050a7b8e089475e858744a74ceae3f0da2943755ef712f3277ad2e50
+  languageName: node
+  linkType: hard
+
 "y18n@npm:^4.0.0":
   version: 4.0.3
   resolution: "y18n@npm:4.0.3"
@@ -40677,7 +41882,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.17.3":
+"zod@npm:^3.17.3, zod@npm:^3.19.1":
   version: 3.21.4
   resolution: "zod@npm:3.21.4"
   checksum: f185ba87342ff16f7a06686767c2b2a7af41110c7edf7c1974095d8db7a73792696bcb4a00853de0d2edeb34a5b2ea6a55871bc864227dace682a0a28de33e1f
@@ -40708,9 +41913,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zustand@npm:^4.1.4":
-  version: 4.1.5
-  resolution: "zustand@npm:4.1.5"
+"zustand@npm:^4.3.2":
+  version: 4.3.6
+  resolution: "zustand@npm:4.3.6"
   dependencies:
     use-sync-external-store: 1.2.0
   peerDependencies:
@@ -40721,7 +41926,7 @@ __metadata:
       optional: true
     react:
       optional: true
-  checksum: 13190ee8e8a797c5347b525a7c392be62b2addacdd9645dd20d37ea053f96c7c7067c099c6201e98ebb8d54991f2e04e241cc323f9a25b841d44f0ae048e3afc
+  checksum: 4d3cec03526f04ff3de6dc45b6f038c47f091836af9660fbf5f682cae1628221102882df20e4048dfe699a43f67424e5d6afc1116f3838a80eea5dd4f95ddaed
   languageName: node
   linkType: hard