diff --git a/apps/docs/src/components/Accordion/index.tsx b/apps/docs/src/components/Accordion/index.tsx
index 71025a17b..9fd951f7f 100644
--- a/apps/docs/src/components/Accordion/index.tsx
+++ b/apps/docs/src/components/Accordion/index.tsx
@@ -19,7 +19,7 @@ export interface AccordionProps {
     className?: string;
 }
 
-const AccordionRoot: React.FC<AccordionProps> = ({ items, type = 'single', defaultValue, className }) => {
+const AccordionRoot = ({ items, type = 'single', defaultValue, className }: AccordionProps) => {
     if (type === 'single') {
         return (
             <AccordionPrimitive.Root
@@ -54,11 +54,7 @@ const AccordionRoot: React.FC<AccordionProps> = ({ items, type = 'single', defau
     );
 };
 
-const AccordionItem: React.FC<{
-    children: ReactNode;
-    value: string;
-    className?: string;
-}> = ({ children, value, className }) => {
+const AccordionItem = ({ children, value, className }: { children: ReactNode; value: string; className?: string }) => {
     return (
         <AccordionPrimitive.Item value={value} className={clsx('border-b border-white w-full', className)}>
             {children}
@@ -66,10 +62,7 @@ const AccordionItem: React.FC<{
     );
 };
 
-const AccordionTrigger: React.FC<{
-    children: ReactNode;
-    className?: string;
-}> = ({ children, className }) => {
+const AccordionTrigger = ({ children, className }: { children: ReactNode; className?: string }) => {
     return (
         <AccordionPrimitive.Trigger
             className={clsx(
@@ -84,10 +77,7 @@ const AccordionTrigger: React.FC<{
     );
 };
 
-const AccordionContent: React.FC<{
-    children: ReactNode;
-    className?: string;
-}> = ({ children, className }) => {
+const AccordionContent = ({ children, className }: { children: ReactNode; className?: string }) => {
     return (
         <AccordionPrimitive.Content className={clsx(styles.accordionContent, className)}>
             <div className="pb-4 pt-0">{children}</div>
diff --git a/apps/docs/src/components/Badge/index.tsx b/apps/docs/src/components/Badge/index.tsx
index d5bc15b01..8b39e0984 100644
--- a/apps/docs/src/components/Badge/index.tsx
+++ b/apps/docs/src/components/Badge/index.tsx
@@ -24,7 +24,7 @@ const getVariantClasses = (variant: BadgeProps['variant']): string => {
     }
 };
 
-const Badge: React.FC<BadgeProps> = ({ title, icon, variant = 'primary' }) => (
+const Badge = ({ title, icon, variant = 'primary' }: BadgeProps) => (
     <div
         className={clsx(
             'flex items-center justify-center gap-2.5 px-2.5 py-0.5 rounded-full',
diff --git a/apps/docs/src/components/BadgeList/index.tsx b/apps/docs/src/components/BadgeList/index.tsx
index 54b59bbb1..32ed260f0 100644
--- a/apps/docs/src/components/BadgeList/index.tsx
+++ b/apps/docs/src/components/BadgeList/index.tsx
@@ -6,7 +6,7 @@ interface BadgeListProps {
     badges: { title: string; icon?: string | null }[];
 }
 
-const BadgeList: React.FC<BadgeListProps> = ({ badges }) => (
+const BadgeList = ({ badges }: BadgeListProps) => (
     <ul className="list-none flex flex-wrap gap-2.5 m-0! p-0!">
         {badges.map((badge, index) => (
             <li key={index} className="">
diff --git a/apps/docs/src/components/BenefitsSection/index.tsx b/apps/docs/src/components/BenefitsSection/index.tsx
index eea9bfba6..6c0b2611a 100644
--- a/apps/docs/src/components/BenefitsSection/index.tsx
+++ b/apps/docs/src/components/BenefitsSection/index.tsx
@@ -26,7 +26,7 @@ export interface BenefitCardProps {
     borderColor?: 'gradient' | 'blue' | 'green' | 'light' | 'transparent';
 }
 
-export const BenefitCard: React.FC<BenefitCardProps> = ({
+export const BenefitCard = ({
     team,
     icon,
     iconPosition = 'right',
@@ -34,7 +34,7 @@ export const BenefitCard: React.FC<BenefitCardProps> = ({
     description,
     link,
     borderColor = 'blue',
-}) => {
+}: BenefitCardProps) => {
     return (
         <Card borderColor={borderColor} gap={team ? 'gap-2' : 'gap-6'}>
             {team && (
@@ -78,7 +78,7 @@ export const BenefitCard: React.FC<BenefitCardProps> = ({
     );
 };
 
-export const BenefitsSection: React.FC<BenefitsSectionProps> = ({ title, description, benefits }) => {
+export const BenefitsSection = ({ title, description, benefits }: BenefitsSectionProps) => {
     return (
         <div className="flex flex-col items-start justify-start w-full gap-20">
             <div className="flex flex-col gap-6">
diff --git a/apps/docs/src/components/Card/index.tsx b/apps/docs/src/components/Card/index.tsx
index a268467f2..6c8fcb7de 100644
--- a/apps/docs/src/components/Card/index.tsx
+++ b/apps/docs/src/components/Card/index.tsx
@@ -7,7 +7,7 @@ interface CardProps {
     gap?: string;
 }
 
-const Card: React.FC<CardProps> = ({ children, borderColor = 'blue', className = '', gap = 'gap-[30px]' }) => {
+const Card = ({ children, borderColor = 'blue', className = '', gap = 'gap-[30px]' }: CardProps) => {
     const getBorderClass = () => {
         if (borderColor === 'gradient') return 'card-gradient-border';
         if (borderColor === 'blue') return 'card-base card-solid-border card-border-blue';
diff --git a/apps/docs/src/components/ClientsSection/index.tsx b/apps/docs/src/components/ClientsSection/index.tsx
index 86714e95b..f6a14c455 100644
--- a/apps/docs/src/components/ClientsSection/index.tsx
+++ b/apps/docs/src/components/ClientsSection/index.tsx
@@ -10,7 +10,7 @@ export interface ClientsSectionProps {
     clients: Client[];
 }
 
-export const ClientsSection: React.FC<ClientsSectionProps> = ({ lead, clients }) => {
+export const ClientsSection = ({ lead, clients }: ClientsSectionProps) => {
     return (
         <div className="flex flex-col gap-16 items-start justify-start w-full">
             {lead && <div className="text-white max-w-[700px] m-auto! text-center">{lead}</div>}
diff --git a/apps/docs/src/components/DXPFeaturesSection/index.tsx b/apps/docs/src/components/DXPFeaturesSection/index.tsx
index f549fd4bd..7f4a131f6 100644
--- a/apps/docs/src/components/DXPFeaturesSection/index.tsx
+++ b/apps/docs/src/components/DXPFeaturesSection/index.tsx
@@ -55,14 +55,7 @@ const features: Array<FeatureCardProps> = [
     },
 ];
 
-const FeatureCard: React.FC<FeatureCardProps> = ({
-    title,
-    icon,
-    features,
-    buttonText,
-    buttonUrl,
-    borderColor = 'blue',
-}) => {
+const FeatureCard = ({ title, icon, features, buttonText, buttonUrl, borderColor = 'blue' }: FeatureCardProps) => {
     return (
         <Card borderColor={borderColor}>
             {/* Header */}
diff --git a/apps/docs/src/components/DXPIntegrationsSection/index.tsx b/apps/docs/src/components/DXPIntegrationsSection/index.tsx
index 6e8476516..758255a82 100644
--- a/apps/docs/src/components/DXPIntegrationsSection/index.tsx
+++ b/apps/docs/src/components/DXPIntegrationsSection/index.tsx
@@ -9,7 +9,7 @@ interface IntegrationBadgeProps {
     name: string;
 }
 
-const IntegrationBadge: React.FC<IntegrationBadgeProps> = ({ icon, name }) => {
+const IntegrationBadge = ({ icon, name }: IntegrationBadgeProps) => {
     return (
         <div className="flex gap-2.5 items-center justify-center px-0 py-0.5 rounded-full">
             <div className="relative w-5 h-5 shrink-0">
diff --git a/apps/docs/src/components/DXPUseCasesSection/index.tsx b/apps/docs/src/components/DXPUseCasesSection/index.tsx
index d8cd15a15..b4054050d 100644
--- a/apps/docs/src/components/DXPUseCasesSection/index.tsx
+++ b/apps/docs/src/components/DXPUseCasesSection/index.tsx
@@ -12,7 +12,7 @@ interface UseCaseCardProps {
     title: string;
 }
 
-const UseCaseCard: React.FC<UseCaseCardProps> = ({ icon, title }) => {
+const UseCaseCard = ({ icon, title }: UseCaseCardProps) => {
     return (
         <div className="flex flex-col gap-2 items-start justify-start rounded-lg shadow-sm">
             <div className="flex-shrink-0">
diff --git a/apps/docs/src/components/FeatureTile/index.tsx b/apps/docs/src/components/FeatureTile/index.tsx
index 059cab02d..4228c797e 100644
--- a/apps/docs/src/components/FeatureTile/index.tsx
+++ b/apps/docs/src/components/FeatureTile/index.tsx
@@ -11,7 +11,7 @@ export interface FeatureTileProps {
     badge?: string;
 }
 
-export const FeatureTile: React.FC<FeatureTileProps> = ({ icon, title, description, badge }) => {
+export const FeatureTile = ({ icon, title, description, badge }: FeatureTileProps) => {
     return (
         <div className={clsx('card-base')}>
             <div className="flex justify-between p-6 w-full h-full">
@@ -39,7 +39,7 @@ export interface FeatureTileListProps {
     features: FeatureTileProps[];
 }
 
-export const FeatureTileList: React.FC<FeatureTileListProps> = ({ title, features }) => {
+export const FeatureTileList = ({ title, features }: FeatureTileListProps) => {
     return (
         <div className="flex flex-col gap-4 flex-1">
             <H3 className="mb-0!">{title}</H3>
diff --git a/apps/docs/src/components/FooterSection/index.tsx b/apps/docs/src/components/FooterSection/index.tsx
index 625c50743..04e2f1b70 100644
--- a/apps/docs/src/components/FooterSection/index.tsx
+++ b/apps/docs/src/components/FooterSection/index.tsx
@@ -23,7 +23,7 @@ export interface FooterSectionProps {
     };
 }
 
-export const FooterSection: React.FC<FooterSectionProps> = ({ title, description, primaryButton, secondaryButton }) => {
+export const FooterSection = ({ title, description, primaryButton, secondaryButton }: FooterSectionProps) => {
     return (
         <div className="flex flex-col gap-12 items-center justify-start w-full">
             {/* Text Content */}
diff --git a/apps/docs/src/components/GuidesSection/index.tsx b/apps/docs/src/components/GuidesSection/index.tsx
index fa5167e6b..e1d42ae71 100644
--- a/apps/docs/src/components/GuidesSection/index.tsx
+++ b/apps/docs/src/components/GuidesSection/index.tsx
@@ -31,7 +31,7 @@ export interface GuidesSectionProps {
     info?: GuideInfo;
 }
 
-export const GuidesSection: React.FC<GuidesSectionProps> = ({ title, guides, info }) => {
+export const GuidesSection = ({ title, guides, info }: GuidesSectionProps) => {
     return (
         <div className="flex flex-col items-start justify-start w-full">
             {title && <H2 className="text-3xl text-white w-full">{title}</H2>}
diff --git a/apps/docs/src/components/HomepageBenefitsSection/index.tsx b/apps/docs/src/components/HomepageBenefitsSection/index.tsx
index 8ead36c8d..a25dabd6a 100644
--- a/apps/docs/src/components/HomepageBenefitsSection/index.tsx
+++ b/apps/docs/src/components/HomepageBenefitsSection/index.tsx
@@ -11,7 +11,7 @@ interface BenefitProps {
     reverse?: boolean;
 }
 
-const Benefit: React.FC<BenefitProps> = ({ title, description, image }) => (
+const Benefit = ({ title, description, image }: BenefitProps) => (
     <div>
         <div className="mb-6">{image}</div>
         <div>
diff --git a/apps/docs/src/components/HomepageFeaturesSection/index.tsx b/apps/docs/src/components/HomepageFeaturesSection/index.tsx
index c76a54271..55e26dbc0 100644
--- a/apps/docs/src/components/HomepageFeaturesSection/index.tsx
+++ b/apps/docs/src/components/HomepageFeaturesSection/index.tsx
@@ -17,7 +17,7 @@ interface FeatureItemProps {
     textClassName?: string;
 }
 
-const FeatureItem: React.FC<FeatureItemProps> = ({ text, icon, textClassName = '' }) => (
+const FeatureItem = ({ text, icon, textClassName = '' }: FeatureItemProps) => (
     <div className="flex gap-4 items-start">
         <div className="flex items-center pt-0.5 shrink-0">{icon}</div>
         <Body className={`mb-0! text-base leading-6 ${textClassName}`}>{text}</Body>
@@ -29,7 +29,7 @@ interface BuildingBlockCardProps {
     icon: React.ReactNode;
 }
 
-const BuildingBlockCard: React.FC<BuildingBlockCardProps> = ({ title, icon }) => (
+const BuildingBlockCard = ({ title, icon }: BuildingBlockCardProps) => (
     <div className="flex flex-col gap-2 items-start">
         <div className="flex items-center mb-2 [&_svg_path]:stroke-(--color-highlighted)">{icon}</div>
         <H4 className="mb-0! leading-7!">{title}</H4>
diff --git a/apps/docs/src/components/HomepageStartersSection/index.tsx b/apps/docs/src/components/HomepageStartersSection/index.tsx
index a6b07c95e..9fc696a19 100644
--- a/apps/docs/src/components/HomepageStartersSection/index.tsx
+++ b/apps/docs/src/components/HomepageStartersSection/index.tsx
@@ -41,7 +41,7 @@ const STARTERS: HoverCardProps[] = [
     },
 ];
 
-export const HomepageStartersSection: React.FC = () => {
+export const HomepageStartersSection = () => {
     return (
         <section className="px-4 flex flex-col items-center gap-y-20">
             <div className="flex flex-col gap-6 items-center text-center">
diff --git a/apps/docs/src/components/HoverCard/index.tsx b/apps/docs/src/components/HoverCard/index.tsx
index c00b1cd15..83be31441 100644
--- a/apps/docs/src/components/HoverCard/index.tsx
+++ b/apps/docs/src/components/HoverCard/index.tsx
@@ -19,15 +19,7 @@ export interface HoverCardProps {
     };
 }
 
-export const HoverCard: React.FC<HoverCardProps> = ({
-    title,
-    description,
-    href,
-    gradient,
-    badge,
-    ctaLabel,
-    backgroundImage,
-}) => {
+export const HoverCard = ({ title, description, href, gradient, badge, ctaLabel, backgroundImage }: HoverCardProps) => {
     const cardWrapperClasses = 'relative group block rounded-lg transition-all duration-200';
 
     const cardContent = () => {
diff --git a/apps/docs/src/components/HubspotForm/index.tsx b/apps/docs/src/components/HubspotForm/index.tsx
index 0e0b01902..d4ee4c49b 100644
--- a/apps/docs/src/components/HubspotForm/index.tsx
+++ b/apps/docs/src/components/HubspotForm/index.tsx
@@ -72,15 +72,7 @@ type HubspotFormProps = {
     consents?: HubspotConsent[];
 };
 
-const HubspotForm: React.FC<HubspotFormProps> = ({
-    portalId,
-    formId,
-    title,
-    description,
-    pageName,
-    fields,
-    consents = [],
-}) => {
+const HubspotForm = ({ portalId, formId, title, description, pageName, fields, consents = [] }: HubspotFormProps) => {
     const [values, setValues] = useState<Record<string, string | string[]>>(() => {
         const initial: Record<string, string> = {};
         fields.forEach((f) => (initial[f.name] = ''));
diff --git a/apps/docs/src/components/SubscribeSection/index.tsx b/apps/docs/src/components/SubscribeSection/index.tsx
index 13dd5c3e0..2c2b23e87 100644
--- a/apps/docs/src/components/SubscribeSection/index.tsx
+++ b/apps/docs/src/components/SubscribeSection/index.tsx
@@ -12,7 +12,7 @@ interface SubscribeSectionProps {
     formId: string;
 }
 
-export const SubscribeSection: React.FC<SubscribeSectionProps> = ({ portalId, formId }) => {
+export const SubscribeSection = ({ portalId, formId }: SubscribeSectionProps) => {
     const [email, setEmail] = useState('');
     const [emailContactConsent, setEmailContactConsent] = useState(false);
     const [status, setStatus] = useState<{ type: 'success' | 'error' | null; message: string }>({
diff --git a/apps/docs/src/components/Tile/index.tsx b/apps/docs/src/components/Tile/index.tsx
index 78925207d..dd04a37dc 100644
--- a/apps/docs/src/components/Tile/index.tsx
+++ b/apps/docs/src/components/Tile/index.tsx
@@ -6,7 +6,7 @@ interface TileProps {
     children: string;
 }
 
-export const Tile: React.FC<TileProps> = ({ title, children, icon }) => (
+export const Tile = ({ title, children, icon }: TileProps) => (
     <div className="flex flex-col p-6 space-y-2 rounded-lg text-accent-foreground bg-white shadow-md">
         {icon && <img src={icon} alt="" className="w-4 h-4" />}
         <p className="text-xl! font-semibold! font m-0!">{title}</p>
@@ -14,6 +14,4 @@ export const Tile: React.FC<TileProps> = ({ title, children, icon }) => (
     </div>
 );
 
-export const TileGroup: React.FC<TileProps> = ({ children }) => (
-    <div className="grid grid-cols-2 gap-4 w-full">{children}</div>
-);
+export const TileGroup = ({ children }: TileProps) => <div className="grid grid-cols-2 gap-4 w-full">{children}</div>;
diff --git a/apps/frontend/src/containers/Auth/AuthLayout/AuthLayout.tsx b/apps/frontend/src/containers/Auth/AuthLayout/AuthLayout.tsx
index a2daef8a7..8e78efbe2 100644
--- a/apps/frontend/src/containers/Auth/AuthLayout/AuthLayout.tsx
+++ b/apps/frontend/src/containers/Auth/AuthLayout/AuthLayout.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { AuthLayoutProps } from './AuthLayout.types';
 
-export const AuthLayout: React.FC<AuthLayoutProps> = ({ layout = 'main-side', toolbar, children }) => {
+export const AuthLayout = ({ layout = 'main-side', toolbar, children }: AuthLayoutProps) => {
     const main = (
         <div className="flex flex-col md:max-w-[50%] w-full p-4">
             <div className="flex flex-col justify-center items-center md:h-full">
diff --git a/apps/frontend/src/containers/Auth/SignInForm/SignInForm.tsx b/apps/frontend/src/containers/Auth/SignInForm/SignInForm.tsx
index bdf25c71a..6c0eb9616 100644
--- a/apps/frontend/src/containers/Auth/SignInForm/SignInForm.tsx
+++ b/apps/frontend/src/containers/Auth/SignInForm/SignInForm.tsx
@@ -28,7 +28,7 @@ const MAX_USERNAME_CHARS = 64;
 const MIN_PASSWORD_CHARS = 4;
 const MAX_PASSWORD_CHARS = 64;
 
-export const SignInForm: React.FC<SignInFormProps> = ({ providers, labels, onSignIn }) => {
+export const SignInForm = ({ providers, labels, onSignIn }: SignInFormProps) => {
     const [isSubmitting, setIsSubmitting] = useState(false);
     const [passwordVisible, setPasswordVisible] = useState(false);
     const [error, setError] = useState<AuthError | null>(null);
diff --git a/apps/frontend/src/containers/Auth/Toolbar/LocaleSwitcher.tsx b/apps/frontend/src/containers/Auth/Toolbar/LocaleSwitcher.tsx
index d0d9d7ec9..a9a8996a6 100644
--- a/apps/frontend/src/containers/Auth/Toolbar/LocaleSwitcher.tsx
+++ b/apps/frontend/src/containers/Auth/Toolbar/LocaleSwitcher.tsx
@@ -13,7 +13,7 @@ import { usePathname, useRouter } from '@/i18n';
 
 import { ToolbarProps } from './Toolbar.types';
 
-export const LocaleSwitcher: React.FC<ToolbarProps> = ({ label, alternativeUrls }) => {
+export const LocaleSwitcher = ({ label, alternativeUrls }: ToolbarProps) => {
     const pathname = usePathname();
     const searchParams = useSearchParams();
     const router = useRouter();
diff --git a/apps/frontend/src/containers/ContextSwitcher/ContextSwitcher.tsx b/apps/frontend/src/containers/ContextSwitcher/ContextSwitcher.tsx
index d5feb2ec6..1d3e1d3c4 100644
--- a/apps/frontend/src/containers/ContextSwitcher/ContextSwitcher.tsx
+++ b/apps/frontend/src/containers/ContextSwitcher/ContextSwitcher.tsx
@@ -18,7 +18,7 @@ import { sdk } from '@/api/sdk';
 import { Content } from './Content/Content';
 import { ContextSwitcherProps } from './ContextSwitcher.types';
 
-export const ContextSwitcher: React.FC<ContextSwitcherProps> = ({ data }) => {
+export const ContextSwitcher = ({ data }: ContextSwitcherProps) => {
     const session = useSession();
     const locale = useLocale();
 
diff --git a/apps/frontend/src/containers/Footer/Footer.tsx b/apps/frontend/src/containers/Footer/Footer.tsx
index fb0ad229e..d8481f01c 100644
--- a/apps/frontend/src/containers/Footer/Footer.tsx
+++ b/apps/frontend/src/containers/Footer/Footer.tsx
@@ -176,7 +176,7 @@ const NavigationGroup = ({
     );
 };
 
-export const Footer: React.FC<FooterProps> = ({ data }) => {
+export const Footer = ({ data }: FooterProps) => {
     const locale = useLocale();
 
     const navigationItemClass = cn(navigationMenuTriggerStyle());
diff --git a/apps/frontend/src/containers/Header/Header.tsx b/apps/frontend/src/containers/Header/Header.tsx
index 913d44822..d0cfe814e 100644
--- a/apps/frontend/src/containers/Header/Header.tsx
+++ b/apps/frontend/src/containers/Header/Header.tsx
@@ -20,7 +20,7 @@ import { MobileNavigation } from './MobileNavigation/MobileNavigation';
 import { NotificationInfo } from './NotificationInfo/NotificationInfo';
 import { UserInfo } from './UserInfo/UserInfo';
 
-export const Header: React.FC<HeaderProps> = ({ data, alternativeUrls, children }) => {
+export const Header = ({ data, alternativeUrls, children }: HeaderProps) => {
     const session = useSession();
     const isSignedIn = !!session.data?.user;
 
diff --git a/apps/frontend/src/templates/OneColumnTemplate/OneColumnTemplate.tsx b/apps/frontend/src/templates/OneColumnTemplate/OneColumnTemplate.tsx
index f836d4eb5..6ed3eda4e 100644
--- a/apps/frontend/src/templates/OneColumnTemplate/OneColumnTemplate.tsx
+++ b/apps/frontend/src/templates/OneColumnTemplate/OneColumnTemplate.tsx
@@ -4,7 +4,7 @@ import { renderBlocks } from '@/blocks/renderBlocks';
 
 import { OneColumnTemplateProps } from './OneColumnTemplate.types';
 
-export const OneColumnTemplate: React.FC<OneColumnTemplateProps> = async ({ slug, data }) => {
+export const OneColumnTemplate = async ({ slug, data }: OneColumnTemplateProps) => {
     return (
         <div className="flex flex-col gap-12 row-start-2 items-center sm:items-start w-full">
             {renderBlocks(data.slots.main, slug)}
diff --git a/apps/frontend/src/templates/PageTemplate/PageTemplate.tsx b/apps/frontend/src/templates/PageTemplate/PageTemplate.tsx
index 3d1d5289d..39b2e4eaf 100644
--- a/apps/frontend/src/templates/PageTemplate/PageTemplate.tsx
+++ b/apps/frontend/src/templates/PageTemplate/PageTemplate.tsx
@@ -5,7 +5,7 @@ import { TwoColumnTemplate } from '@/templates/TwoColumnTemplate/TwoColumnTempla
 
 import { PageTemplateProps } from './PageTemplate.types';
 
-export const PageTemplate: React.FC<PageTemplateProps> = ({ slug, data }) => {
+export const PageTemplate = ({ slug, data }: PageTemplateProps) => {
     const getTemplate = () => {
         switch (data.template.__typename) {
             case 'OneColumnTemplate':
diff --git a/apps/frontend/src/templates/TwoColumnTemplate/TwoColumnTemplate.tsx b/apps/frontend/src/templates/TwoColumnTemplate/TwoColumnTemplate.tsx
index 4652cb5e0..f32957ed1 100644
--- a/apps/frontend/src/templates/TwoColumnTemplate/TwoColumnTemplate.tsx
+++ b/apps/frontend/src/templates/TwoColumnTemplate/TwoColumnTemplate.tsx
@@ -4,7 +4,7 @@ import { renderBlocks } from '@/blocks/renderBlocks';
 
 import { TwoColumnTemplateProps } from './TwoColumnTemplate.types';
 
-export const TwoColumnTemplate: React.FC<TwoColumnTemplateProps> = async ({ slug, data }) => {
+export const TwoColumnTemplate = async ({ slug, data }: TwoColumnTemplateProps) => {
     return (
         <div className="flex flex-col gap-8 w-full">
             <div className="flex flex-col gap-8 items-center sm:items-start w-full">
diff --git a/package-lock.json b/package-lock.json
index 62da61b5a..8b8abb747 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -278,6 +278,7 @@
             "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "readdirp": "^4.0.1"
             },
@@ -673,6 +674,7 @@
             "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.44.0.tgz",
             "integrity": "sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@algolia/client-common": "5.44.0",
                 "@algolia/requester-browser-xhr": "5.44.0",
@@ -3846,6 +3848,7 @@
             "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "env-paths": "^2.2.1",
                 "import-fresh": "^3.3.0",
@@ -4300,6 +4303,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=18"
             },
@@ -4322,6 +4326,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=18"
             }
@@ -5839,6 +5844,7 @@
             "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.9.2.tgz",
             "integrity": "sha512-C5wZsGuKTY8jEYsqdxhhFOe1ZDjH0uIYJ9T/jebHwkyxqnr4wW0jTkB72OMqNjsoQRcb0JN3PcSeTwFlVgzCZg==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@docusaurus/core": "3.9.2",
                 "@docusaurus/logger": "3.9.2",
@@ -6067,6 +6073,7 @@
             "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.9.2.tgz",
             "integrity": "sha512-IGUsArG5hhekXd7RDb11v94ycpJpFdJPkLnt10fFQWOVxAtq5/D7hT6lzc2fhyQKaaCE62qVajOMKL7OiAFAIA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@docusaurus/core": "3.9.2",
                 "@docusaurus/logger": "3.9.2",
@@ -6107,6 +6114,7 @@
             "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.9.2.tgz",
             "integrity": "sha512-6c4DAbR6n6nPbnZhY2V3tzpnKnGL+6aOsLvFL26VRqhlczli9eWG0VDUNoCQEPnGwDMhPS42UhSAnz5pThm5Ag==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@docusaurus/mdx-loader": "3.9.2",
                 "@docusaurus/module-type-aliases": "3.9.2",
@@ -11478,6 +11486,7 @@
             "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.1.1.tgz",
             "integrity": "sha512-f++rKLQgUVYDAtECQ6fn/is15GkEH9+nZPM3MS0RcxVqoTfawHvDlSCH7JbMhAM6uJ32v3eXLvLmLvjGu7PTQw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/mdx": "^2.0.0"
             },
@@ -11562,6 +11571,7 @@
             "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-4.0.1.tgz",
             "integrity": "sha512-68pFJgu+/AZbWkGu65Z3r55bTsCPlgyKaV4BSG8yUAD72q1PPuyVRgUwFv6BxdnibTUHlyxm06FmYWNC+bjN7A==",
             "license": "MIT",
+            "peer": true,
             "peerDependencies": {
                 "@nestjs/common": "^10.0.0 || ^11.0.0",
                 "axios": "^1.3.1",
@@ -11573,6 +11583,7 @@
             "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-11.1.9.tgz",
             "integrity": "sha512-zDntUTReRbAThIfSp3dQZ9kKqI+LjgLp5YZN5c1bgNRDuoeLySAoZg46Bg1a+uV8TMgIRziHocglKGNzr6l+bQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "file-type": "21.1.0",
                 "iterare": "1.2.1",
@@ -11604,6 +11615,7 @@
             "resolved": "https://registry.npmjs.org/@nestjs/config/-/config-4.0.2.tgz",
             "integrity": "sha512-McMW6EXtpc8+CwTUwFdg6h7dYcBUpH5iUILCclAsa+MbCEvC9ZKu4dCHRlJqALuhjLw97pbQu62l4+wRwGeZqA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "dotenv": "16.4.7",
                 "dotenv-expand": "12.0.1",
@@ -11647,6 +11659,7 @@
             "integrity": "sha512-a00B0BM4X+9z+t3UxJqIZlemIwCQdYoPKrMcM+ky4z3pkqqG1eTWexjs+YXpGObnLnjtMPVKWlcZHp3adDYvUw==",
             "hasInstallScript": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@nuxt/opencollective": "0.4.1",
                 "fast-safe-stringify": "2.1.1",
@@ -11697,6 +11710,7 @@
             "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-11.1.9.tgz",
             "integrity": "sha512-GVd3+0lO0mJq2m1kl9hDDnVrX3Nd4oH3oDfklz0pZEVEVS0KVSp63ufHq2Lu9cyPdSBuelJr9iPm2QQ1yX+Kmw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "cors": "2.8.5",
                 "express": "5.1.0",
@@ -13081,42 +13095,6 @@
                 "@noble/hashes": "^1.1.5"
             }
         },
-        "node_modules/@parcel/watcher": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-            "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "detect-libc": "^1.0.3",
-                "is-glob": "^4.0.3",
-                "micromatch": "^4.0.5",
-                "node-addon-api": "^7.0.0"
-            },
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            },
-            "optionalDependencies": {
-                "@parcel/watcher-android-arm64": "2.5.1",
-                "@parcel/watcher-darwin-arm64": "2.5.1",
-                "@parcel/watcher-darwin-x64": "2.5.1",
-                "@parcel/watcher-freebsd-x64": "2.5.1",
-                "@parcel/watcher-linux-arm-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm-musl": "2.5.1",
-                "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm64-musl": "2.5.1",
-                "@parcel/watcher-linux-x64-glibc": "2.5.1",
-                "@parcel/watcher-linux-x64-musl": "2.5.1",
-                "@parcel/watcher-win32-arm64": "2.5.1",
-                "@parcel/watcher-win32-ia32": "2.5.1",
-                "@parcel/watcher-win32-x64": "2.5.1"
-            }
-        },
         "node_modules/@parcel/watcher-android-arm64": {
             "version": "2.5.1",
             "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
@@ -13377,19 +13355,6 @@
                 "url": "https://opencollective.com/parcel"
             }
         },
-        "node_modules/@parcel/watcher/node_modules/detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-            "license": "Apache-2.0",
-            "optional": true,
-            "bin": {
-                "detect-libc": "bin/detect-libc.js"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
         "node_modules/@pkgjs/parseargs": {
             "version": "0.11.0",
             "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -13469,6 +13434,7 @@
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -13578,6 +13544,7 @@
             "integrity": "sha512-QXFT+N/bva/QI2qoXmjBzL7D6aliPffIwP+81AdTGq0FXDoLxLkWivGMawG8iM5B9BKfxLIXxfWWAF6wbuJU6g==",
             "hasInstallScript": true,
             "license": "Apache-2.0",
+            "peer": true,
             "engines": {
                 "node": ">=18.18"
             },
@@ -15868,6 +15835,7 @@
             "resolved": "https://registry.npmjs.org/@redis/client/-/client-5.10.0.tgz",
             "integrity": "sha512-JXmM4XCoso6C75Mr3lhKA3eNxSzkYi3nCzxDIKY+YOszYsJjuKbFgVtguVPbLMOttN4iu2fXoc2BGhdnYhIOxA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "cluster-key-slot": "1.1.2"
             },
@@ -16128,6 +16096,7 @@
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -16762,6 +16731,7 @@
             "version": "8.1.0",
             "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz",
             "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
+            "peer": true,
             "dependencies": {
                 "@babel/core": "^7.21.3",
                 "@svgr/babel-preset": "8.1.0",
@@ -17072,6 +17042,7 @@
             "version": "0.5.15",
             "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
             "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==",
+            "peer": true,
             "dependencies": {
                 "tslib": "^2.8.0"
             }
@@ -17453,7 +17424,6 @@
             "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@babel/code-frame": "^7.10.4",
                 "@babel/runtime": "^7.12.5",
@@ -17474,7 +17444,6 @@
             "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "engines": {
                 "node": ">=10"
             },
@@ -17488,7 +17457,6 @@
             "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
             "dev": true,
             "license": "Apache-2.0",
-            "peer": true,
             "dependencies": {
                 "dequal": "^2.0.3"
             }
@@ -17499,7 +17467,6 @@
             "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "ansi-regex": "^5.0.1",
                 "ansi-styles": "^5.0.0",
@@ -17514,8 +17481,7 @@
             "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
             "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/@testing-library/jest-dom": {
             "version": "6.8.0",
@@ -17904,8 +17870,7 @@
             "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
             "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/@types/babel__core": {
             "version": "7.20.5",
@@ -18328,6 +18293,7 @@
             "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
             "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/estree": "*",
                 "@types/json-schema": "*"
@@ -18361,6 +18327,7 @@
             "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.25.tgz",
             "integrity": "sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/body-parser": "*",
                 "@types/express-serve-static-core": "^4.17.33",
@@ -18607,6 +18574,7 @@
             "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
             "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "undici-types": "~7.16.0"
             }
@@ -18650,6 +18618,7 @@
             "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
             "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "csstype": "^3.2.2"
             }
@@ -18669,6 +18638,7 @@
             "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
             "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
             "license": "MIT",
+            "peer": true,
             "peerDependencies": {
                 "@types/react": "^19.2.0"
             }
@@ -18806,7 +18776,8 @@
             "version": "5.0.2",
             "resolved": "https://registry.npmjs.org/@types/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
             "integrity": "sha512-pDzSNulqooSKvSNcksnV72nk8p7gRqN8As71Sp28nov1IgmPKWbOEIwAWvBME5pPTtaXJAvG3O4oc76HlQ4kqQ==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/@types/through": {
             "version": "0.0.33",
@@ -19098,6 +19069,7 @@
             "integrity": "sha512-lJi3PfxVmo0AkEY93ecfN+r8SofEqZNGByvHAI3GBLrvt1Cw6H5k1IM02nSzu0RfUafr2EvFSw0wAsZgubNplQ==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@typescript-eslint/scope-manager": "8.47.0",
                 "@typescript-eslint/types": "8.47.0",
@@ -19930,6 +19902,7 @@
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
             "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -20015,6 +19988,7 @@
             "version": "6.12.6",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
             "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
@@ -20075,6 +20049,7 @@
             "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.44.0.tgz",
             "integrity": "sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@algolia/abtesting": "1.10.0",
                 "@algolia/client-abtesting": "5.44.0",
@@ -20630,6 +20605,7 @@
             "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
             "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "follow-redirects": "^1.15.6",
                 "form-data": "^4.0.4",
@@ -20689,6 +20665,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -21497,6 +21474,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "baseline-browser-mapping": "^2.8.25",
                 "caniuse-lite": "^1.0.30001754",
@@ -22261,6 +22239,7 @@
             "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-11.0.3.tgz",
             "integrity": "sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==",
             "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
                 "@chevrotain/cst-dts-gen": "11.0.3",
                 "@chevrotain/gast": "11.0.3",
@@ -23319,6 +23298,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -23764,6 +23744,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -24044,6 +24025,7 @@
             "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz",
             "integrity": "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=0.10"
             }
@@ -24458,6 +24440,7 @@
             "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
             "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
             "license": "ISC",
+            "peer": true,
             "engines": {
                 "node": ">=12"
             }
@@ -24656,7 +24639,8 @@
             "version": "1.11.19",
             "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
             "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/debounce": {
             "version": "1.2.1",
@@ -25176,8 +25160,7 @@
             "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
             "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/dom-converter": {
             "version": "0.2.0",
@@ -25621,6 +25604,7 @@
             "version": "2.4.1",
             "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
             "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+            "peer": true,
             "dependencies": {
                 "ansi-colors": "^4.1.1",
                 "strip-ansi": "^6.0.1"
@@ -25893,6 +25877,7 @@
             "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==",
             "dev": true,
             "hasInstallScript": true,
+            "peer": true,
             "bin": {
                 "esbuild": "bin/esbuild"
             },
@@ -25986,6 +25971,7 @@
             "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
@@ -26087,6 +26073,7 @@
             "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "eslint-config-prettier": "bin/cli.js"
             },
@@ -26197,6 +26184,7 @@
             "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
             "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
             "dev": true,
+            "peer": true,
             "dependencies": {
                 "@rtsao/scc": "^1.1.0",
                 "array-includes": "^3.1.8",
@@ -28375,6 +28363,7 @@
             "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz",
             "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
             }
@@ -28424,6 +28413,7 @@
             "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-7.3.4.tgz",
             "integrity": "sha512-kbpP5dw9hHIL5jN/2VS2JU0/Sc1hlsj7zrYBKSDiYd5iG8QfX7P79u26ZBi84eAijsqYVZEpLvCCwEzVxscWhg==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@graphql-typed-document-node/core": "^3.2.0"
             },
@@ -28435,6 +28425,7 @@
             "version": "2.12.6",
             "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz",
             "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
+            "peer": true,
             "dependencies": {
                 "tslib": "^2.1.0"
             },
@@ -32820,6 +32811,7 @@
             "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
             "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "jws": "^3.2.2",
                 "lodash.includes": "^4.3.0",
@@ -33957,7 +33949,6 @@
             "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "bin": {
                 "lz-string": "bin/bin.js"
             }
@@ -36415,6 +36406,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -36718,6 +36710,7 @@
             "resolved": "https://registry.npmjs.org/next/-/next-15.5.6.tgz",
             "integrity": "sha512-zTxsnI3LQo3c9HSdSf91O1jMNsEzIXDShXd4wVdg9y5shwLqBXi4ZtUUJyB86KGVSJLZx0PFONvO54aheGX8QQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@next/env": "15.5.6",
                 "@swc/helpers": "0.5.15",
@@ -36770,6 +36763,7 @@
             "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-5.0.0-beta.30.tgz",
             "integrity": "sha512-+c51gquM3F6nMVmoAusRJ7RIoY0K4Ts9HCCwyy/BRoe4mp3msZpOzYMyb5LAYc1wSo74PMQkGDcaghIO7W6Xjg==",
             "license": "ISC",
+            "peer": true,
             "dependencies": {
                 "@auth/core": "0.41.0"
             },
@@ -36808,6 +36802,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@formatjs/intl-localematcher": "^0.5.4",
                 "@swc/core": "^1.15.2",
@@ -38451,6 +38446,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.11",
                 "picocolors": "^1.1.1",
@@ -39692,6 +39688,7 @@
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
             "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+            "peer": true,
             "dependencies": {
                 "cssesc": "^3.0.0",
                 "util-deprecate": "^1.0.2"
@@ -39794,6 +39791,7 @@
             "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.3.tgz",
             "integrity": "sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==",
             "license": "MIT",
+            "peer": true,
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/preact"
@@ -39823,6 +39821,7 @@
             "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "prettier": "bin/prettier.cjs"
             },
@@ -39936,6 +39935,7 @@
             "integrity": "sha512-F3eX7K+tWpkbhl3l4+VkFtrwJlLXbAM+f9jolgoUZbFcm1DgHZ4cq9AgVEgUym2au5Ad/TDLN8lg83D+M10ycw==",
             "hasInstallScript": true,
             "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
                 "@prisma/config": "6.19.0",
                 "@prisma/engines": "6.19.0"
@@ -40300,6 +40300,7 @@
             "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
             "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -40378,6 +40379,7 @@
             "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
             "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "scheduler": "^0.27.0"
             },
@@ -40453,6 +40455,7 @@
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-6.0.0.tgz",
             "integrity": "sha512-YMMxTUQV/QFSnbgrP3tjDzLHRg7vsbMn8e9HAa8o/1iXoiomo48b7sk/kkmWEuWNDPJVlKSJRB6Y2fHqdJk+SQ==",
+            "peer": true,
             "dependencies": {
                 "@types/react": "*"
             },
@@ -40481,6 +40484,7 @@
             "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -40534,6 +40538,7 @@
             "version": "5.3.4",
             "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
             "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
+            "peer": true,
             "dependencies": {
                 "@babel/runtime": "^7.12.13",
                 "history": "^4.9.0",
@@ -40925,7 +40930,8 @@
         "node_modules/reflect-metadata": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
-            "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="
+            "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
+            "peer": true
         },
         "node_modules/reflect.getprototypeof": {
             "version": "1.0.10",
@@ -41699,6 +41705,7 @@
             "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
             "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
             "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
                 "tslib": "^2.1.0"
             }
@@ -41795,6 +41802,7 @@
             "resolved": "https://registry.npmjs.org/sass/-/sass-1.94.2.tgz",
             "integrity": "sha512-N+7WK20/wOr7CzA2snJcUSSNTCzeCGUTFY3OgeQP3mZ1aj9NMQ0mSTXwlrnd89j33zzQJGqIN52GIOmYrfq46A==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "chokidar": "^4.0.0",
                 "immutable": "^5.0.2",
@@ -43006,6 +43014,7 @@
             "integrity": "sha512-vQMufKKA9TxgoEDHJv3esrqUkjszuuRiDkThiHxENFPdQawHhm2Dei+iwNRwH5W671zTDy9iRT9P1KDjcU5Iyw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@storybook/global": "^5.0.0",
                 "@storybook/icons": "^1.6.0",
@@ -43572,7 +43581,8 @@
             "version": "2.3.16",
             "resolved": "https://registry.npmjs.org/survey-core/-/survey-core-2.3.16.tgz",
             "integrity": "sha512-yRbeacio72oBmfODuJ8igRL3N8w7fjEwPPHd3CT019ht14qs4rVNGIs50kdip2NFo3B+xfvP1pQWcr2U7TxKrQ==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/survey-react-ui": {
             "version": "2.3.16",
@@ -43874,7 +43884,8 @@
             "version": "4.1.17",
             "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.17.tgz",
             "integrity": "sha512-j9Ee2YjuQqYT9bbRTfTZht9W/ytp5H+jJpZKiYdP/bpnXARAuELt9ofP0lPnmHjbga7SNQIxdTAXCmtKVYjN+Q==",
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/tailwindcss-animate": {
             "version": "1.0.7",
@@ -43964,6 +43975,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -44518,6 +44530,7 @@
             "version": "10.9.2",
             "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
             "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+            "peer": true,
             "dependencies": {
                 "@cspotcode/source-map-support": "^0.8.0",
                 "@tsconfig/node10": "^1.0.7",
@@ -44644,7 +44657,8 @@
         "node_modules/tslib": {
             "version": "2.8.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "peer": true
         },
         "node_modules/tsx": {
             "version": "4.20.6",
@@ -44679,6 +44693,7 @@
             "integrity": "sha512-qBwXXuDT3rA53kbNafGbT5r++BrhRgx3sAo0cHoDAeG9g1ItTmUMgltz3Hy7Hazy1ODqNpR+C7QwqL6DYB52yA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "turbo": "bin/turbo"
             },
@@ -44811,6 +44826,7 @@
             "version": "0.21.3",
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
             "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "peer": true,
             "engines": {
                 "node": ">=10"
             },
@@ -44926,6 +44942,7 @@
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
             "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "license": "Apache-2.0",
+            "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -46120,6 +46137,7 @@
             "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.103.0.tgz",
             "integrity": "sha512-HU1JOuV1OavsZ+mfigY0j8d1TgQgbZ6M+J75zDkpEAwYeXjWSqrGJtgnPblJjd/mAyTNQ7ygw0MiKOn6etz8yw==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/eslint-scope": "^3.7.7",
                 "@types/estree": "^1.0.8",
@@ -46245,6 +46263,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -46405,6 +46424,7 @@
             "version": "8.17.1",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -46514,6 +46534,7 @@
             "integrity": "sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "ansi-html-community": "0.0.8",
                 "html-entities": "^2.1.0",
@@ -46563,6 +46584,7 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
             "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -47026,6 +47048,7 @@
             "version": "7.5.10",
             "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
             "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+            "peer": true,
             "engines": {
                 "node": ">=8.3.0"
             },
@@ -47239,6 +47262,7 @@
             "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz",
             "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==",
             "license": "MIT",
+            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
@@ -48640,7 +48664,7 @@
         },
         "packages/integrations/mocked": {
             "name": "@o2s/integrations.mocked",
-            "version": "1.13.0",
+            "version": "1.13.1",
             "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {
@@ -48781,6 +48805,7 @@
             "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-10.4.20.tgz",
             "integrity": "sha512-hxJxZF7jcKGuUzM9EYbuES80Z/36piJbiqmPy86mk8qOn5gglFebBTvcx7PWVbRNSb4gngASYnefBj/Y2HAzpQ==",
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "file-type": "20.4.1",
                 "iterare": "1.2.1",
diff --git a/packages/blocks/article-list/src/frontend/ArticleList.client.tsx b/packages/blocks/article-list/src/frontend/ArticleList.client.tsx
index 0a4bd4d6f..5c2d9db14 100644
--- a/packages/blocks/article-list/src/frontend/ArticleList.client.tsx
+++ b/packages/blocks/article-list/src/frontend/ArticleList.client.tsx
@@ -9,12 +9,7 @@ import { ContentSection } from '@o2s/ui/components/ContentSection';
 
 import { ArticleListPureProps } from './ArticleList.types';
 
-export const ArticleListPure: React.FC<Readonly<ArticleListPureProps>> = ({
-    routing,
-    hasPriority,
-    meta,
-    ...component
-}) => {
+export const ArticleListPure = ({ routing, hasPriority, meta, ...component }: Readonly<ArticleListPureProps>) => {
     const { Link: LinkComponent } = createNavigation(routing);
     const inspector = LivePreview.useInspector();
 
diff --git a/packages/blocks/article-list/src/frontend/ArticleList.renderer.tsx b/packages/blocks/article-list/src/frontend/ArticleList.renderer.tsx
index dfd1d950c..42c50f814 100644
--- a/packages/blocks/article-list/src/frontend/ArticleList.renderer.tsx
+++ b/packages/blocks/article-list/src/frontend/ArticleList.renderer.tsx
@@ -6,13 +6,13 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { ArticleList } from './ArticleList.server';
 import { ArticleListRendererProps } from './ArticleList.types';
 
-export const ArticleListRenderer: React.FC<ArticleListRendererProps> = ({
+export const ArticleListRenderer = ({
     id,
     accessToken,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: ArticleListRendererProps) => {
     const locale = useLocale();
     return (
         <Suspense
diff --git a/packages/blocks/article-list/src/frontend/ArticleList.server.tsx b/packages/blocks/article-list/src/frontend/ArticleList.server.tsx
index fd530610a..bdf43c467 100644
--- a/packages/blocks/article-list/src/frontend/ArticleList.server.tsx
+++ b/packages/blocks/article-list/src/frontend/ArticleList.server.tsx
@@ -9,14 +9,14 @@ export const ArticleListDynamic = dynamic(() =>
     import('./ArticleList.client').then((module) => module.ArticleListPure),
 );
 
-export const ArticleList: React.FC<ArticleListProps> = async ({
+export const ArticleList = async ({
     id,
     accessToken,
     locale,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: ArticleListProps) => {
     try {
         const data = await sdk.blocks.getArticleList(
             {
diff --git a/packages/blocks/article-search/src/frontend/ArticleSearch.client.tsx b/packages/blocks/article-search/src/frontend/ArticleSearch.client.tsx
index 9200d848e..4d3cb6b6e 100644
--- a/packages/blocks/article-search/src/frontend/ArticleSearch.client.tsx
+++ b/packages/blocks/article-search/src/frontend/ArticleSearch.client.tsx
@@ -14,7 +14,7 @@ import { sdk } from '../sdk';
 
 import { ArticleSearchPureProps } from './ArticleSearch.types';
 
-export const ArticleSearchPure: React.FC<ArticleSearchPureProps> = ({
+export const ArticleSearchPure = ({
     title,
     inputLabel,
     noResults,
@@ -22,7 +22,7 @@ export const ArticleSearchPure: React.FC<ArticleSearchPureProps> = ({
     accessToken,
     locale,
     routing,
-}) => {
+}: ArticleSearchPureProps) => {
     const { useRouter } = createNavigation(routing);
     const router = useRouter();
 
diff --git a/packages/blocks/article-search/src/frontend/ArticleSearch.renderer.tsx b/packages/blocks/article-search/src/frontend/ArticleSearch.renderer.tsx
index 0610fbb8a..6de70b7fc 100644
--- a/packages/blocks/article-search/src/frontend/ArticleSearch.renderer.tsx
+++ b/packages/blocks/article-search/src/frontend/ArticleSearch.renderer.tsx
@@ -7,12 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { ArticleSearch } from './ArticleSearch.server';
 import { ArticleSearchRendererProps } from './ArticleSearch.types';
 
-export const ArticleSearchRenderer: React.FC<ArticleSearchRendererProps> = ({
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const ArticleSearchRenderer = ({ id, accessToken, routing, hasPriority }: ArticleSearchRendererProps) => {
     const locale = useLocale();
     return (
         <Suspense
diff --git a/packages/blocks/article-search/src/frontend/ArticleSearch.server.tsx b/packages/blocks/article-search/src/frontend/ArticleSearch.server.tsx
index e1bf9eeeb..102b35230 100644
--- a/packages/blocks/article-search/src/frontend/ArticleSearch.server.tsx
+++ b/packages/blocks/article-search/src/frontend/ArticleSearch.server.tsx
@@ -9,13 +9,7 @@ export const ArticleSearchDynamic = dynamic(() =>
     import('./ArticleSearch.client').then((module) => module.ArticleSearchPure),
 );
 
-export const ArticleSearch: React.FC<ArticleSearchProps> = async ({
-    id,
-    accessToken,
-    locale,
-    routing,
-    hasPriority,
-}) => {
+export const ArticleSearch = async ({ id, accessToken, locale, routing, hasPriority }: ArticleSearchProps) => {
     try {
         const data = await sdk.blocks.getArticleSearch(
             {
diff --git a/packages/blocks/article/src/frontend/Article.client.tsx b/packages/blocks/article/src/frontend/Article.client.tsx
index 445ffc2db..46c6ba9a3 100644
--- a/packages/blocks/article/src/frontend/Article.client.tsx
+++ b/packages/blocks/article/src/frontend/Article.client.tsx
@@ -12,7 +12,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { ArticlePureProps } from './Article.types';
 
-export const ArticlePure: React.FC<Readonly<ArticlePureProps>> = ({ hasPriority, ...component }) => {
+export const ArticlePure = ({ hasPriority, ...component }: Readonly<ArticlePureProps>) => {
     const {
         data: { author, createdAt, sections },
     } = component;
diff --git a/packages/blocks/article/src/frontend/Article.renderer.tsx b/packages/blocks/article/src/frontend/Article.renderer.tsx
index 6f855c767..62b1d81c7 100644
--- a/packages/blocks/article/src/frontend/Article.renderer.tsx
+++ b/packages/blocks/article/src/frontend/Article.renderer.tsx
@@ -7,7 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { Article } from './Article.server';
 import { ArticleRendererProps } from './Article.types';
 
-export const ArticleRenderer: React.FC<ArticleRendererProps> = ({ id, slug, accessToken, routing, hasPriority }) => {
+export const ArticleRenderer = ({ id, slug, accessToken, routing, hasPriority }: ArticleRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/article/src/frontend/Article.server.tsx b/packages/blocks/article/src/frontend/Article.server.tsx
index 3f1d0b158..a6a8626ec 100644
--- a/packages/blocks/article/src/frontend/Article.server.tsx
+++ b/packages/blocks/article/src/frontend/Article.server.tsx
@@ -7,7 +7,7 @@ import { ArticleProps } from './Article.types';
 
 export const ArticleDynamic = dynamic(() => import('./Article.client').then((module) => module.ArticlePure));
 
-export const Article: React.FC<ArticleProps> = async ({ slug, accessToken, locale, routing, hasPriority }) => {
+export const Article = async ({ slug, accessToken, locale, routing, hasPriority }: ArticleProps) => {
     try {
         const data = await sdk.blocks.getArticle(
             {
diff --git a/packages/blocks/category-list/src/frontend/CategoryList.client.tsx b/packages/blocks/category-list/src/frontend/CategoryList.client.tsx
index 7ac2b8adb..34e0618a0 100644
--- a/packages/blocks/category-list/src/frontend/CategoryList.client.tsx
+++ b/packages/blocks/category-list/src/frontend/CategoryList.client.tsx
@@ -10,13 +10,13 @@ import { DynamicIconProps } from '@o2s/ui/components/DynamicIcon';
 
 import { CategoryListPureProps } from './CategoryList.types';
 
-export const CategoryListPure: React.FC<Readonly<CategoryListPureProps>> = ({
+export const CategoryListPure = ({
     locale,
     accessToken,
     routing,
     meta,
     ...component
-}) => {
+}: Readonly<CategoryListPureProps>) => {
     const { Link: LinkComponent } = createNavigation(routing);
     const inspector = LivePreview.useInspector();
 
diff --git a/packages/blocks/category-list/src/frontend/CategoryList.renderer.tsx b/packages/blocks/category-list/src/frontend/CategoryList.renderer.tsx
index fadf6b77f..33928dae0 100644
--- a/packages/blocks/category-list/src/frontend/CategoryList.renderer.tsx
+++ b/packages/blocks/category-list/src/frontend/CategoryList.renderer.tsx
@@ -6,13 +6,13 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { CategoryList } from './CategoryList.server';
 import { CategoryListProps } from './CategoryList.types';
 
-export const CategoryListRenderer: React.FC<CategoryListProps> = ({
+export const CategoryListRenderer = ({
     id,
     accessToken,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: CategoryListProps) => {
     const locale = useLocale();
     return (
         <Suspense
diff --git a/packages/blocks/category-list/src/frontend/CategoryList.server.tsx b/packages/blocks/category-list/src/frontend/CategoryList.server.tsx
index 129c472d7..2bc7facb7 100644
--- a/packages/blocks/category-list/src/frontend/CategoryList.server.tsx
+++ b/packages/blocks/category-list/src/frontend/CategoryList.server.tsx
@@ -9,14 +9,14 @@ export const CategoryListDynamic = dynamic(() =>
     import('./CategoryList.client').then((module) => module.CategoryListPure),
 );
 
-export const CategoryList: React.FC<CategoryListProps> = async ({
+export const CategoryList = async ({
     id,
     accessToken,
     locale,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: CategoryListProps) => {
     let data;
     try {
         data = await sdk.blocks.getCategoryList(
diff --git a/packages/blocks/category/src/frontend/Category.client.tsx b/packages/blocks/category/src/frontend/Category.client.tsx
index 4e8397141..ba7c03b7e 100644
--- a/packages/blocks/category/src/frontend/Category.client.tsx
+++ b/packages/blocks/category/src/frontend/Category.client.tsx
@@ -18,7 +18,7 @@ import { sdk } from '../sdk';
 
 import { CategoryPureProps } from './Category.types';
 
-export const CategoryPure: React.FC<CategoryPureProps> = ({
+export const CategoryPure = ({
     slug,
     locale,
     accessToken,
@@ -26,7 +26,7 @@ export const CategoryPure: React.FC<CategoryPureProps> = ({
     blocks,
     hasPriority,
     ...component
-}) => {
+}: CategoryPureProps) => {
     const { Link: LinkComponent } = createNavigation(routing);
 
     const initialArticles: Request.GetCategoryBlockArticlesQuery = {
diff --git a/packages/blocks/category/src/frontend/Category.renderer.tsx b/packages/blocks/category/src/frontend/Category.renderer.tsx
index 494a3cd18..a37ac6644 100644
--- a/packages/blocks/category/src/frontend/Category.renderer.tsx
+++ b/packages/blocks/category/src/frontend/Category.renderer.tsx
@@ -7,14 +7,14 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { Category } from './Category.server';
 import { CategoryRendererProps } from './Category.types';
 
-export const CategoryRenderer: React.FC<CategoryRendererProps> = ({
+export const CategoryRenderer = ({
     slug,
     id,
     accessToken,
     routing,
     renderBlocks,
     hasPriority,
-}) => {
+}: CategoryRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/category/src/frontend/Category.server.tsx b/packages/blocks/category/src/frontend/Category.server.tsx
index 5fb2cfaa9..3d0670852 100644
--- a/packages/blocks/category/src/frontend/Category.server.tsx
+++ b/packages/blocks/category/src/frontend/Category.server.tsx
@@ -8,7 +8,7 @@ import { CategoryBlocks } from './CategoryBlocks';
 
 export const CategoryDynamic = dynamic(() => import('./Category.client').then((module) => module.CategoryPure));
 
-export const Category: React.FC<CategoryProps> = async ({
+export const Category = async ({
     id,
     slug,
     accessToken,
@@ -16,7 +16,7 @@ export const Category: React.FC<CategoryProps> = async ({
     routing,
     renderBlocks,
     hasPriority,
-}) => {
+}: CategoryProps) => {
     try {
         const data = await sdk.blocks.getCategory(
             {
diff --git a/packages/blocks/category/src/frontend/CategoryBlocks.tsx b/packages/blocks/category/src/frontend/CategoryBlocks.tsx
index 4c3cc36ab..eeb52c4c0 100644
--- a/packages/blocks/category/src/frontend/CategoryBlocks.tsx
+++ b/packages/blocks/category/src/frontend/CategoryBlocks.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { CategoryBlocksProps } from './Category.types';
 
-export const CategoryBlocks: React.FC<CategoryBlocksProps> = ({ components, slug, renderBlocks }) => {
+export const CategoryBlocks = ({ components, slug, renderBlocks }: CategoryBlocksProps) => {
     if (!components?.length) return null;
 
     return <div>{renderBlocks(components, slug)}</div>;
diff --git a/packages/blocks/faq/src/frontend/Faq.client.tsx b/packages/blocks/faq/src/frontend/Faq.client.tsx
index baaa0324f..81bb0c22f 100644
--- a/packages/blocks/faq/src/frontend/Faq.client.tsx
+++ b/packages/blocks/faq/src/frontend/Faq.client.tsx
@@ -13,7 +13,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { FaqPureProps } from './Faq.types';
 
-export const FaqPure: React.FC<FaqPureProps> = ({ locale, accessToken, routing, ...component }) => {
+export const FaqPure = ({ locale, accessToken, routing, ...component }: FaqPureProps) => {
     const { Link: LinkComponent } = createNavigation(routing);
     const inspector = LivePreview.useInspector();
 
diff --git a/packages/blocks/faq/src/frontend/Faq.renderer.tsx b/packages/blocks/faq/src/frontend/Faq.renderer.tsx
index b9e3677c2..b74d1787d 100644
--- a/packages/blocks/faq/src/frontend/Faq.renderer.tsx
+++ b/packages/blocks/faq/src/frontend/Faq.renderer.tsx
@@ -7,13 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { Faq } from './Faq.server';
 import { FaqRendererProps } from './Faq.types';
 
-export const FaqRenderer: React.FC<FaqRendererProps> = ({
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-    isDraftModeEnabled,
-}) => {
+export const FaqRenderer = ({ id, accessToken, routing, hasPriority, isDraftModeEnabled }: FaqRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/faq/src/frontend/Faq.server.tsx b/packages/blocks/faq/src/frontend/Faq.server.tsx
index e8aaf5af7..049aabdd4 100644
--- a/packages/blocks/faq/src/frontend/Faq.server.tsx
+++ b/packages/blocks/faq/src/frontend/Faq.server.tsx
@@ -7,14 +7,7 @@ import { FaqProps } from './Faq.types';
 
 export const FaqDynamic = dynamic(() => import('./Faq.client').then((module) => module.FaqPure));
 
-export const Faq: React.FC<FaqProps> = async ({
-    id,
-    accessToken,
-    locale,
-    routing,
-    hasPriority,
-    isDraftModeEnabled,
-}) => {
+export const Faq = async ({ id, accessToken, locale, routing, hasPriority, isDraftModeEnabled }: FaqProps) => {
     try {
         const data = await sdk.blocks.getFaq(
             {
diff --git a/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.client.tsx b/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.client.tsx
index b5c8e66c9..f1004048e 100644
--- a/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.client.tsx
+++ b/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.client.tsx
@@ -14,7 +14,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { FeaturedServiceListPureProps } from './FeaturedServiceList.types';
 
-export const FeaturedServiceListPure: React.FC<FeaturedServiceListPureProps> = ({ routing, ...component }) => {
+export const FeaturedServiceListPure = ({ routing, ...component }: FeaturedServiceListPureProps) => {
     const t = useTranslations();
     const { Link: LinkComponent } = createNavigation(routing);
 
diff --git a/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.renderer.tsx b/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.renderer.tsx
index 6481ec960..e60cc8dfa 100644
--- a/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.renderer.tsx
+++ b/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.renderer.tsx
@@ -7,13 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { FeaturedServiceList } from './FeaturedServiceList.server';
 import { FeaturedServiceListRendererProps } from './FeaturedServiceList.types';
 
-export const Renderer: React.FC<FeaturedServiceListRendererProps> = ({
-    id,
-    accessToken,
-    slug,
-    routing,
-    hasPriority,
-}) => {
+export const Renderer = ({ id, accessToken, slug, routing, hasPriority }: FeaturedServiceListRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.server.tsx b/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.server.tsx
index c290b73c2..b8a97d6fc 100644
--- a/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.server.tsx
+++ b/packages/blocks/featured-service-list/src/frontend/FeaturedServiceList.server.tsx
@@ -9,13 +9,13 @@ export const FeaturedServiceListDynamic = dynamic(() =>
     import('./FeaturedServiceList.client').then((module) => module.FeaturedServiceListPure),
 );
 
-export const FeaturedServiceList: React.FC<FeaturedServiceListProps> = async ({
+export const FeaturedServiceList = async ({
     id,
     accessToken,
     locale,
     routing,
     hasPriority,
-}) => {
+}: FeaturedServiceListProps) => {
     try {
         const data = await sdk.blocks.getFeaturedServiceList(
             {
diff --git a/packages/blocks/invoice-list/src/frontend/InvoiceList.client.tsx b/packages/blocks/invoice-list/src/frontend/InvoiceList.client.tsx
index 3ee0f8e81..364d833b0 100644
--- a/packages/blocks/invoice-list/src/frontend/InvoiceList.client.tsx
+++ b/packages/blocks/invoice-list/src/frontend/InvoiceList.client.tsx
@@ -25,7 +25,7 @@ import { sdk } from '../sdk';
 
 import { InvoiceListPureProps } from './InvoiceList.types';
 
-export const InvoiceListPure: React.FC<InvoiceListPureProps> = ({ locale, accessToken, routing, ...component }) => {
+export const InvoiceListPure = ({ locale, accessToken, routing, ...component }: InvoiceListPureProps) => {
     const { labels } = useGlobalContext();
 
     const initialFilters: Request.GetInvoiceListBlockQuery = {
diff --git a/packages/blocks/invoice-list/src/frontend/InvoiceList.renderer.tsx b/packages/blocks/invoice-list/src/frontend/InvoiceList.renderer.tsx
index ee39ed670..d500c839e 100644
--- a/packages/blocks/invoice-list/src/frontend/InvoiceList.renderer.tsx
+++ b/packages/blocks/invoice-list/src/frontend/InvoiceList.renderer.tsx
@@ -7,7 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { InvoiceListServer } from './InvoiceList.server';
 import { InvoiceListRendererProps } from './InvoiceList.types';
 
-export const InvoiceListRenderer: React.FC<InvoiceListRendererProps> = ({ id, accessToken, routing, hasPriority }) => {
+export const InvoiceListRenderer = ({ id, accessToken, routing, hasPriority }: InvoiceListRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/invoice-list/src/frontend/InvoiceList.server.tsx b/packages/blocks/invoice-list/src/frontend/InvoiceList.server.tsx
index 28465ac26..84e630abc 100644
--- a/packages/blocks/invoice-list/src/frontend/InvoiceList.server.tsx
+++ b/packages/blocks/invoice-list/src/frontend/InvoiceList.server.tsx
@@ -9,13 +9,7 @@ export const InvoiceListDynamic = dynamic(() =>
     import('./InvoiceList.client').then((module) => module.InvoiceListPure),
 );
 
-export const InvoiceListServer: React.FC<InvoiceListProps> = async ({
-    id,
-    accessToken,
-    locale,
-    routing,
-    hasPriority,
-}) => {
+export const InvoiceListServer = async ({ id, accessToken, locale, routing, hasPriority }: InvoiceListProps) => {
     try {
         const data = await sdk.blocks.getInvoiceList(
             {
diff --git a/packages/blocks/notification-details/src/frontend/NotificationDetails.client.tsx b/packages/blocks/notification-details/src/frontend/NotificationDetails.client.tsx
index 3d2cae2d0..a5f475952 100644
--- a/packages/blocks/notification-details/src/frontend/NotificationDetails.client.tsx
+++ b/packages/blocks/notification-details/src/frontend/NotificationDetails.client.tsx
@@ -15,7 +15,7 @@ import { sdk } from '../sdk';
 
 import { NotificationDetailsPureProps } from './NotificationDetails.types';
 
-export const NotificationDetailsPure: React.FC<NotificationDetailsPureProps> = ({ locale, ...component }) => {
+export const NotificationDetailsPure = ({ locale, ...component }: NotificationDetailsPureProps) => {
     const { data: notification } = component;
 
     useEffect(() => {
diff --git a/packages/blocks/notification-details/src/frontend/NotificationDetails.renderer.tsx b/packages/blocks/notification-details/src/frontend/NotificationDetails.renderer.tsx
index d3ef99a43..29836cb4e 100644
--- a/packages/blocks/notification-details/src/frontend/NotificationDetails.renderer.tsx
+++ b/packages/blocks/notification-details/src/frontend/NotificationDetails.renderer.tsx
@@ -7,13 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { NotificationDetails } from './NotificationDetails.server';
 import { FaqRendererProps } from './NotificationDetails.types';
 
-export const NotificationDetailsRenderer: React.FC<FaqRendererProps> = ({
-    slug,
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const NotificationDetailsRenderer = ({ slug, id, accessToken, routing, hasPriority }: FaqRendererProps) => {
     const locale = useLocale();
 
     if (!slug[1]) {
diff --git a/packages/blocks/notification-details/src/frontend/NotificationDetails.server.tsx b/packages/blocks/notification-details/src/frontend/NotificationDetails.server.tsx
index 2f968a816..01bdea34d 100644
--- a/packages/blocks/notification-details/src/frontend/NotificationDetails.server.tsx
+++ b/packages/blocks/notification-details/src/frontend/NotificationDetails.server.tsx
@@ -9,14 +9,14 @@ export const NotificationDetailsDynamic = dynamic(() =>
     import('./NotificationDetails.client').then((module) => module.NotificationDetailsPure),
 );
 
-export const NotificationDetails: React.FC<NotificationDetailsProps> = async ({
+export const NotificationDetails = async ({
     id,
     notificationId,
     accessToken,
     locale,
     routing,
     hasPriority,
-}) => {
+}: NotificationDetailsProps) => {
     try {
         const data = await sdk.blocks.getNotificationDetails(
             {
diff --git a/packages/blocks/notification-list/src/frontend/NotificationList.client.tsx b/packages/blocks/notification-list/src/frontend/NotificationList.client.tsx
index 287900384..c89036cf3 100644
--- a/packages/blocks/notification-list/src/frontend/NotificationList.client.tsx
+++ b/packages/blocks/notification-list/src/frontend/NotificationList.client.tsx
@@ -24,12 +24,7 @@ import { sdk } from '../sdk';
 
 import { NotificationListPureProps } from './NotificationList.types';
 
-export const NotificationListPure: React.FC<NotificationListPureProps> = ({
-    locale,
-    accessToken,
-    routing,
-    ...component
-}) => {
+export const NotificationListPure = ({ locale, accessToken, routing, ...component }: NotificationListPureProps) => {
     const { Link: LinkComponent } = createNavigation(routing);
 
     const initialFilters: Request.GetNotificationListBlockQuery = {
diff --git a/packages/blocks/notification-list/src/frontend/NotificationList.renderer.tsx b/packages/blocks/notification-list/src/frontend/NotificationList.renderer.tsx
index 4d64c011c..785403ead 100644
--- a/packages/blocks/notification-list/src/frontend/NotificationList.renderer.tsx
+++ b/packages/blocks/notification-list/src/frontend/NotificationList.renderer.tsx
@@ -6,12 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { NotificationListServer } from './NotificationList.server';
 import { NotificationListRendererProps } from './NotificationList.types';
 
-export const NotificationListRenderer: React.FC<NotificationListRendererProps> = ({
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const NotificationListRenderer = ({ id, accessToken, routing, hasPriority }: NotificationListRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/notification-list/src/frontend/NotificationList.server.tsx b/packages/blocks/notification-list/src/frontend/NotificationList.server.tsx
index 03d925e29..6e8ed9da4 100644
--- a/packages/blocks/notification-list/src/frontend/NotificationList.server.tsx
+++ b/packages/blocks/notification-list/src/frontend/NotificationList.server.tsx
@@ -9,13 +9,13 @@ export const NotificationListDynamic = dynamic(() =>
     import('./NotificationList.client').then((module) => module.NotificationListPure),
 );
 
-export const NotificationListServer: React.FC<NotificationListProps> = async ({
+export const NotificationListServer = async ({
     id,
     accessToken,
     locale,
     routing,
     hasPriority,
-}) => {
+}: NotificationListProps) => {
     try {
         const data = await sdk.blocks.getNotificationList(
             {
diff --git a/packages/blocks/notification-summary/src/frontend/NotificationSummary.client.tsx b/packages/blocks/notification-summary/src/frontend/NotificationSummary.client.tsx
index fd0a21cb2..2cd5bb899 100644
--- a/packages/blocks/notification-summary/src/frontend/NotificationSummary.client.tsx
+++ b/packages/blocks/notification-summary/src/frontend/NotificationSummary.client.tsx
@@ -14,7 +14,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { NotificationSummaryPureProps } from './NotificationSummary.types';
 
-export const NotificationSummaryPure: React.FC<NotificationSummaryPureProps> = ({ ...component }) => {
+export const NotificationSummaryPure = ({ ...component }: NotificationSummaryPureProps) => {
     const { infoCards, layout } = component;
 
     if (!infoCards || infoCards.length === 0) {
diff --git a/packages/blocks/notification-summary/src/frontend/NotificationSummary.renderer.tsx b/packages/blocks/notification-summary/src/frontend/NotificationSummary.renderer.tsx
index 38e942229..c982bc1b6 100644
--- a/packages/blocks/notification-summary/src/frontend/NotificationSummary.renderer.tsx
+++ b/packages/blocks/notification-summary/src/frontend/NotificationSummary.renderer.tsx
@@ -6,11 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { NotificationSummary } from './NotificationSummary.server';
 import { NotificationSummaryRendererProps } from './NotificationSummary.types';
 
-export const NotificationSummaryRenderer: React.FC<NotificationSummaryRendererProps> = ({
-    id,
-    accessToken,
-    routing,
-}) => {
+export const NotificationSummaryRenderer = ({ id, accessToken, routing }: NotificationSummaryRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/notification-summary/src/frontend/NotificationSummary.server.tsx b/packages/blocks/notification-summary/src/frontend/NotificationSummary.server.tsx
index 8d9e4ef3a..90107ad4b 100644
--- a/packages/blocks/notification-summary/src/frontend/NotificationSummary.server.tsx
+++ b/packages/blocks/notification-summary/src/frontend/NotificationSummary.server.tsx
@@ -9,7 +9,7 @@ export const NotificationSummaryDynamic = dynamic(() =>
     import('./NotificationSummary.client').then((module) => module.NotificationSummaryPure),
 );
 
-export const NotificationSummary: React.FC<NotificationSummaryProps> = async ({ id, accessToken, locale, routing }) => {
+export const NotificationSummary = async ({ id, accessToken, locale, routing }: NotificationSummaryProps) => {
     try {
         const data = await sdk.blocks.getNotificationSummary(
             {
diff --git a/packages/blocks/order-details/src/frontend/OrderDetails.client.tsx b/packages/blocks/order-details/src/frontend/OrderDetails.client.tsx
index a318c7707..6e426d6e9 100644
--- a/packages/blocks/order-details/src/frontend/OrderDetails.client.tsx
+++ b/packages/blocks/order-details/src/frontend/OrderDetails.client.tsx
@@ -36,16 +36,17 @@ import { sdk } from '../sdk';
 
 import { OrderDetailsPureProps } from './OrderDetails.types';
 
-const ProgressBar: React.FC<
-    Readonly<{
-        currentStatus: {
-            title: string;
-            label: string;
-            value: Orders.Model.OrderStatus;
-        };
-        statusLadder?: string[];
-    }>
-> = ({ currentStatus, statusLadder }) => {
+const ProgressBar = ({
+    currentStatus,
+    statusLadder,
+}: Readonly<{
+    currentStatus: {
+        title: string;
+        label: string;
+        value: Orders.Model.OrderStatus;
+    };
+    statusLadder?: string[];
+}>) => {
     const value = Mappings.StatusOrder.statusMap.find((item) => item.id === currentStatus.value)?.value || 0;
     const badge = Mappings.StatusOrder.statusMap.find((item) => item.id === currentStatus.value)?.badge || 'outline';
     const previousStatuses = statusLadder?.slice(0, -1);
@@ -91,13 +92,13 @@ const ProgressBar: React.FC<
     );
 };
 
-export const OrderDetailsPure: React.FC<Readonly<OrderDetailsPureProps>> = ({
+export const OrderDetailsPure = ({
     locale,
     accessToken,
     orderId,
     routing,
     ...component
-}) => {
+}: Readonly<OrderDetailsPureProps>) => {
     const { Link: LinkComponent } = createNavigation(routing);
 
     const initialFilters: Request.GetOrderDetailsBlockQuery = {
diff --git a/packages/blocks/order-details/src/frontend/OrderDetails.renderer.tsx b/packages/blocks/order-details/src/frontend/OrderDetails.renderer.tsx
index 4f6d546c5..a14eb267c 100644
--- a/packages/blocks/order-details/src/frontend/OrderDetails.renderer.tsx
+++ b/packages/blocks/order-details/src/frontend/OrderDetails.renderer.tsx
@@ -6,13 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { OrderDetails } from './OrderDetails.server';
 import { OrderDetailsRendererProps } from './OrderDetails.types';
 
-export const OrderDetailsRenderer: React.FC<OrderDetailsRendererProps> = ({
-    slug,
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const OrderDetailsRenderer = ({ slug, id, accessToken, routing, hasPriority }: OrderDetailsRendererProps) => {
     const locale = useLocale();
 
     if (!slug[1]) {
diff --git a/packages/blocks/order-details/src/frontend/OrderDetails.server.tsx b/packages/blocks/order-details/src/frontend/OrderDetails.server.tsx
index 66ae12d30..a4f0dad92 100644
--- a/packages/blocks/order-details/src/frontend/OrderDetails.server.tsx
+++ b/packages/blocks/order-details/src/frontend/OrderDetails.server.tsx
@@ -10,14 +10,7 @@ export const OrderDetailsDynamic = dynamic(() =>
     import('./OrderDetails.client').then((module) => module.OrderDetailsPure),
 );
 
-export const OrderDetails: React.FC<OrderDetailsProps> = async ({
-    id,
-    orderId,
-    accessToken,
-    locale,
-    routing,
-    hasPriority,
-}) => {
+export const OrderDetails = async ({ id, orderId, accessToken, locale, routing, hasPriority }: OrderDetailsProps) => {
     try {
         const data = await sdk.blocks.getOrderDetails(
             {
diff --git a/packages/blocks/order-list/src/frontend/OrderList.client.tsx b/packages/blocks/order-list/src/frontend/OrderList.client.tsx
index f7f3647b5..d2dffa5ce 100644
--- a/packages/blocks/order-list/src/frontend/OrderList.client.tsx
+++ b/packages/blocks/order-list/src/frontend/OrderList.client.tsx
@@ -28,7 +28,7 @@ import { sdk } from '../sdk';
 
 import { OrderListPureProps } from './OrderList.types';
 
-export const OrderListPure: React.FC<OrderListPureProps> = ({ locale, accessToken, routing, ...component }) => {
+export const OrderListPure = ({ locale, accessToken, routing, ...component }: OrderListPureProps) => {
     const { Link: LinkComponent } = createNavigation(routing);
 
     const initialFilters: Request.GetOrderListBlockQuery = {
diff --git a/packages/blocks/order-list/src/frontend/OrderList.renderer.tsx b/packages/blocks/order-list/src/frontend/OrderList.renderer.tsx
index 83621052f..9d2344bec 100644
--- a/packages/blocks/order-list/src/frontend/OrderList.renderer.tsx
+++ b/packages/blocks/order-list/src/frontend/OrderList.renderer.tsx
@@ -6,7 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { OrderList } from './OrderList.server';
 import { OrderListRendererProps } from './OrderList.types';
 
-export const Renderer: React.FC<OrderListRendererProps> = ({ id, accessToken, routing, hasPriority }) => {
+export const Renderer = ({ id, accessToken, routing, hasPriority }: OrderListRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/order-list/src/frontend/OrderList.server.tsx b/packages/blocks/order-list/src/frontend/OrderList.server.tsx
index 1c180de86..cc42203ca 100644
--- a/packages/blocks/order-list/src/frontend/OrderList.server.tsx
+++ b/packages/blocks/order-list/src/frontend/OrderList.server.tsx
@@ -7,7 +7,7 @@ import { OrderListProps } from './OrderList.types';
 
 export const OrderListDynamic = dynamic(() => import('./OrderList.client').then((module) => module.OrderListPure));
 
-export const OrderList: React.FC<OrderListProps> = async ({ id, accessToken, locale, routing, hasPriority }) => {
+export const OrderList = async ({ id, accessToken, locale, routing, hasPriority }: OrderListProps) => {
     try {
         const data = await sdk.blocks.getOrderList(
             {
diff --git a/packages/blocks/orders-summary/src/frontend/OrdersSummary.client.tsx b/packages/blocks/orders-summary/src/frontend/OrdersSummary.client.tsx
index 0e9f44f42..fd09805b0 100644
--- a/packages/blocks/orders-summary/src/frontend/OrdersSummary.client.tsx
+++ b/packages/blocks/orders-summary/src/frontend/OrdersSummary.client.tsx
@@ -25,7 +25,7 @@ const DoubleLineChart = dynamic(
     {},
 );
 
-const Trend: React.FC<Readonly<{ value?: number }>> = ({ value }) => {
+const Trend = ({ value }: Readonly<{ value?: number }>) => {
     const locale = useLocale();
 
     if (!value) {
@@ -48,11 +48,7 @@ const Trend: React.FC<Readonly<{ value?: number }>> = ({ value }) => {
     );
 };
 
-export const OrdersSummaryPure: React.FC<Readonly<OrdersSummaryPureProps>> = ({
-    locale,
-    accessToken,
-    ...component
-}) => {
+export const OrdersSummaryPure = ({ locale, accessToken, ...component }: Readonly<OrdersSummaryPureProps>) => {
     const initialFilters: Request.GetOrdersSummaryBlockQuery = {
         id: component.id,
         dateFrom: dayjs().subtract(6, 'months').toISOString(),
diff --git a/packages/blocks/orders-summary/src/frontend/OrdersSummary.renderer.tsx b/packages/blocks/orders-summary/src/frontend/OrdersSummary.renderer.tsx
index 3a8fdd44d..04ab02c85 100644
--- a/packages/blocks/orders-summary/src/frontend/OrdersSummary.renderer.tsx
+++ b/packages/blocks/orders-summary/src/frontend/OrdersSummary.renderer.tsx
@@ -6,12 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { OrdersSummary } from './OrdersSummary.server';
 import { OrdersSummaryRendererProps } from './OrdersSummary.types';
 
-export const OrdersSummaryRenderer: React.FC<OrdersSummaryRendererProps> = ({
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const OrdersSummaryRenderer = ({ id, accessToken, routing, hasPriority }: OrdersSummaryRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/orders-summary/src/frontend/OrdersSummary.server.tsx b/packages/blocks/orders-summary/src/frontend/OrdersSummary.server.tsx
index 5e5d8b6e2..480097303 100644
--- a/packages/blocks/orders-summary/src/frontend/OrdersSummary.server.tsx
+++ b/packages/blocks/orders-summary/src/frontend/OrdersSummary.server.tsx
@@ -11,13 +11,7 @@ export const OrdersSummaryDynamic = dynamic(() =>
     import('./OrdersSummary.client').then((module) => module.OrdersSummaryPure),
 );
 
-export const OrdersSummary: React.FC<OrdersSummaryProps> = async ({
-    id,
-    accessToken,
-    locale,
-    routing,
-    hasPriority,
-}) => {
+export const OrdersSummary = async ({ id, accessToken, locale, routing, hasPriority }: OrdersSummaryProps) => {
     try {
         const data = await sdk.blocks.getOrdersSummary(
             {
diff --git a/packages/blocks/payments-history/src/frontend/PaymentsHistory.client.tsx b/packages/blocks/payments-history/src/frontend/PaymentsHistory.client.tsx
index 041018e7b..64ce9581d 100644
--- a/packages/blocks/payments-history/src/frontend/PaymentsHistory.client.tsx
+++ b/packages/blocks/payments-history/src/frontend/PaymentsHistory.client.tsx
@@ -12,7 +12,7 @@ const StackedBarChart = dynamic(() =>
     import('@o2s/ui/components/Chart/StackedBarChart').then((module) => module.StackedBarChart),
 );
 
-export const PaymentsHistoryPure: React.FC<PaymentsHistoryPureProps> = ({ ...component }) => {
+export const PaymentsHistoryPure = ({ ...component }: PaymentsHistoryPureProps) => {
     const { chartData, labels, title, currency } = component;
 
     return (
diff --git a/packages/blocks/payments-history/src/frontend/PaymentsHistory.renderer.tsx b/packages/blocks/payments-history/src/frontend/PaymentsHistory.renderer.tsx
index 52fdcc08a..1fbb39ebe 100644
--- a/packages/blocks/payments-history/src/frontend/PaymentsHistory.renderer.tsx
+++ b/packages/blocks/payments-history/src/frontend/PaymentsHistory.renderer.tsx
@@ -11,7 +11,7 @@ export interface PaymentsHistoryRendererProps {
     hasPriority?: boolean;
 }
 
-export const PaymentsHistoryRenderer: React.FC<PaymentsHistoryRendererProps> = ({ id, accessToken, hasPriority }) => {
+export const PaymentsHistoryRenderer = ({ id, accessToken, hasPriority }: PaymentsHistoryRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/payments-history/src/frontend/PaymentsHistory.server.tsx b/packages/blocks/payments-history/src/frontend/PaymentsHistory.server.tsx
index c3751b2d3..7f0d1381c 100644
--- a/packages/blocks/payments-history/src/frontend/PaymentsHistory.server.tsx
+++ b/packages/blocks/payments-history/src/frontend/PaymentsHistory.server.tsx
@@ -9,7 +9,7 @@ export const PaymentsHistoryDynamic = dynamic(() =>
     import('./PaymentsHistory.client').then((module) => module.PaymentsHistoryPure),
 );
 
-export const PaymentsHistory: React.FC<PaymentsHistoryProps> = async ({ id, accessToken, locale, hasPriority }) => {
+export const PaymentsHistory = async ({ id, accessToken, locale, hasPriority }: PaymentsHistoryProps) => {
     try {
         const data = await sdk.blocks.getPaymentsHistory(
             {
diff --git a/packages/blocks/payments-summary/src/frontend/PaymentsSummary.client.tsx b/packages/blocks/payments-summary/src/frontend/PaymentsSummary.client.tsx
index ab823f33c..0c08427ad 100644
--- a/packages/blocks/payments-summary/src/frontend/PaymentsSummary.client.tsx
+++ b/packages/blocks/payments-summary/src/frontend/PaymentsSummary.client.tsx
@@ -22,7 +22,7 @@ const StackedBarChart = dynamic(() =>
     import('@o2s/ui/components/Chart/StackedBarChart').then((module) => module.StackedBarChart),
 );
 
-export const PaymentsSummaryPure: React.FC<PaymentsSummaryPureProps> = ({ routing, ...component }) => {
+export const PaymentsSummaryPure = ({ routing, ...component }: PaymentsSummaryPureProps) => {
     const { overdue, toBePaid, layout, chart } = component;
 
     const t = useTranslations();
diff --git a/packages/blocks/payments-summary/src/frontend/PaymentsSummary.renderer.tsx b/packages/blocks/payments-summary/src/frontend/PaymentsSummary.renderer.tsx
index 5e8462d3f..3cd676b55 100644
--- a/packages/blocks/payments-summary/src/frontend/PaymentsSummary.renderer.tsx
+++ b/packages/blocks/payments-summary/src/frontend/PaymentsSummary.renderer.tsx
@@ -6,12 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { PaymentsSummary } from './PaymentsSummary.server';
 import { PaymentsSummaryRendererProps } from './PaymentsSummary.types';
 
-export const PaymentsSummaryRenderer: React.FC<PaymentsSummaryRendererProps> = ({
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const PaymentsSummaryRenderer = ({ id, accessToken, routing, hasPriority }: PaymentsSummaryRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/payments-summary/src/frontend/PaymentsSummary.server.tsx b/packages/blocks/payments-summary/src/frontend/PaymentsSummary.server.tsx
index 56cf0bf00..9cb9a0b29 100644
--- a/packages/blocks/payments-summary/src/frontend/PaymentsSummary.server.tsx
+++ b/packages/blocks/payments-summary/src/frontend/PaymentsSummary.server.tsx
@@ -9,13 +9,7 @@ export const PaymentsSummaryDynamic = dynamic(() =>
     import('./PaymentsSummary.client').then((module) => module.PaymentsSummaryPure),
 );
 
-export const PaymentsSummary: React.FC<PaymentsSummaryProps> = async ({
-    id,
-    accessToken,
-    locale,
-    routing,
-    hasPriority,
-}) => {
+export const PaymentsSummary = async ({ id, accessToken, locale, routing, hasPriority }: PaymentsSummaryProps) => {
     try {
         const data = await sdk.blocks.getPaymentsSummary(
             {
diff --git a/packages/blocks/quick-links/src/frontend/QuickLinks.client.tsx b/packages/blocks/quick-links/src/frontend/QuickLinks.client.tsx
index f1ae444c9..7f471bd03 100644
--- a/packages/blocks/quick-links/src/frontend/QuickLinks.client.tsx
+++ b/packages/blocks/quick-links/src/frontend/QuickLinks.client.tsx
@@ -10,13 +10,7 @@ import { DynamicIconProps } from '@o2s/ui/components/DynamicIcon';
 
 import { QuickLinksPureProps } from './QuickLinks.types';
 
-export const QuickLinksPure: React.FC<Readonly<QuickLinksPureProps>> = ({
-    locale,
-    accessToken,
-    routing,
-    meta,
-    ...component
-}) => {
+export const QuickLinksPure = ({ locale, accessToken, routing, meta, ...component }: Readonly<QuickLinksPureProps>) => {
     const { Link: LinkComponent } = createNavigation(routing);
     const inspector = LivePreview.useInspector();
 
diff --git a/packages/blocks/quick-links/src/frontend/QuickLinks.renderer.tsx b/packages/blocks/quick-links/src/frontend/QuickLinks.renderer.tsx
index c016da82b..6c96f2f23 100644
--- a/packages/blocks/quick-links/src/frontend/QuickLinks.renderer.tsx
+++ b/packages/blocks/quick-links/src/frontend/QuickLinks.renderer.tsx
@@ -7,13 +7,13 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { QuickLinks } from './QuickLinks.server';
 import { QuickLinksRendererProps } from './QuickLinks.types';
 
-export const QuickLinksRenderer: React.FC<QuickLinksRendererProps> = ({
+export const QuickLinksRenderer = ({
     id,
     accessToken,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: QuickLinksRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/quick-links/src/frontend/QuickLinks.server.tsx b/packages/blocks/quick-links/src/frontend/QuickLinks.server.tsx
index 388988f1f..f2923cb0c 100644
--- a/packages/blocks/quick-links/src/frontend/QuickLinks.server.tsx
+++ b/packages/blocks/quick-links/src/frontend/QuickLinks.server.tsx
@@ -7,14 +7,14 @@ import { QuickLinksProps } from './QuickLinks.types';
 
 export const QuickLinksDynamic = dynamic(() => import('./QuickLinks.client').then((module) => module.QuickLinksPure));
 
-export const QuickLinks: React.FC<QuickLinksProps> = async ({
+export const QuickLinks = async ({
     id,
     accessToken,
     locale,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: QuickLinksProps) => {
     let data;
     try {
         data = await sdk.blocks.getQuickLinks(
diff --git a/packages/blocks/service-details/src/frontend/ServiceDetails.client.tsx b/packages/blocks/service-details/src/frontend/ServiceDetails.client.tsx
index c7df20cfe..486cc36d8 100644
--- a/packages/blocks/service-details/src/frontend/ServiceDetails.client.tsx
+++ b/packages/blocks/service-details/src/frontend/ServiceDetails.client.tsx
@@ -19,7 +19,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { ServiceDetailsPureProps } from './ServiceDetails.types';
 
-export const ServiceDetailsPure: React.FC<ServiceDetailsPureProps> = ({ ...component }) => {
+export const ServiceDetailsPure = ({ ...component }: ServiceDetailsPureProps) => {
     const { data: service } = component;
 
     const t = useTranslations();
diff --git a/packages/blocks/service-details/src/frontend/ServiceDetails.renderer.tsx b/packages/blocks/service-details/src/frontend/ServiceDetails.renderer.tsx
index b2981122e..4357e3d0b 100644
--- a/packages/blocks/service-details/src/frontend/ServiceDetails.renderer.tsx
+++ b/packages/blocks/service-details/src/frontend/ServiceDetails.renderer.tsx
@@ -7,13 +7,13 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { ServiceDetails } from './ServiceDetails.server';
 import { ServiceDetailsRendererProps } from './ServiceDetails.types';
 
-export const ServiceDetailsRenderer: React.FC<ServiceDetailsRendererProps> = ({
+export const ServiceDetailsRenderer = ({
     slug,
     id,
     accessToken,
     routing,
     hasPriority,
-}) => {
+}: ServiceDetailsRendererProps) => {
     const locale = useLocale();
 
     if (!slug[1]) {
diff --git a/packages/blocks/service-details/src/frontend/ServiceDetails.server.tsx b/packages/blocks/service-details/src/frontend/ServiceDetails.server.tsx
index 9302df1cb..96ddb2c22 100644
--- a/packages/blocks/service-details/src/frontend/ServiceDetails.server.tsx
+++ b/packages/blocks/service-details/src/frontend/ServiceDetails.server.tsx
@@ -9,14 +9,14 @@ export const ServiceDetailsDynamic = dynamic(() =>
     import('./ServiceDetails.client').then((module) => module.ServiceDetailsPure),
 );
 
-export const ServiceDetails: React.FC<ServiceDetailsProps> = async ({
+export const ServiceDetails = async ({
     id,
     serviceId,
     accessToken,
     locale,
     routing,
     hasPriority,
-}) => {
+}: ServiceDetailsProps) => {
     try {
         const data = await sdk.blocks.getServiceDetails(
             {
diff --git a/packages/blocks/service-list/src/frontend/ServiceList.client.tsx b/packages/blocks/service-list/src/frontend/ServiceList.client.tsx
index 7c98789d8..f1a8b66c6 100644
--- a/packages/blocks/service-list/src/frontend/ServiceList.client.tsx
+++ b/packages/blocks/service-list/src/frontend/ServiceList.client.tsx
@@ -17,7 +17,7 @@ import { sdk } from '../sdk';
 
 import { ServiceListPureProps } from './ServiceList.types';
 
-export const ServiceListPure: React.FC<ServiceListPureProps> = ({ locale, accessToken, routing, ...component }) => {
+export const ServiceListPure = ({ locale, accessToken, routing, ...component }: ServiceListPureProps) => {
     const initialFilters = {
         id: component.id,
         offset: 0,
diff --git a/packages/blocks/service-list/src/frontend/ServiceList.renderer.tsx b/packages/blocks/service-list/src/frontend/ServiceList.renderer.tsx
index b564d47aa..055c05168 100644
--- a/packages/blocks/service-list/src/frontend/ServiceList.renderer.tsx
+++ b/packages/blocks/service-list/src/frontend/ServiceList.renderer.tsx
@@ -6,7 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { ServiceList } from './ServiceList.server';
 import { ServiceListRendererProps } from './ServiceList.types';
 
-export const Renderer: React.FC<ServiceListRendererProps> = ({ id, accessToken, routing, hasPriority }) => {
+export const Renderer = ({ id, accessToken, routing, hasPriority }: ServiceListRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/service-list/src/frontend/ServiceList.server.tsx b/packages/blocks/service-list/src/frontend/ServiceList.server.tsx
index 81ad7362f..a20156904 100644
--- a/packages/blocks/service-list/src/frontend/ServiceList.server.tsx
+++ b/packages/blocks/service-list/src/frontend/ServiceList.server.tsx
@@ -9,7 +9,7 @@ export const ServiceListDynamic = dynamic(() =>
     import('./ServiceList.client').then((module) => module.ServiceListPure),
 );
 
-export const ServiceList: React.FC<ServiceListProps> = async ({ id, accessToken, locale, routing, hasPriority }) => {
+export const ServiceList = async ({ id, accessToken, locale, routing, hasPriority }: ServiceListProps) => {
     try {
         const data = await sdk.blocks.getServiceList(
             {
diff --git a/packages/blocks/surveyjs-form/src/frontend/SurveyJs.client.tsx b/packages/blocks/surveyjs-form/src/frontend/SurveyJs.client.tsx
index d3dd8253e..f860ad8f1 100644
--- a/packages/blocks/surveyjs-form/src/frontend/SurveyJs.client.tsx
+++ b/packages/blocks/surveyjs-form/src/frontend/SurveyJs.client.tsx
@@ -11,7 +11,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { SurveyJsFormPureProps } from './SurveyJs.types';
 
-export const SurveyJsPure: React.FC<SurveyJsFormPureProps> = ({ locale, accessToken, ...component }) => {
+export const SurveyJsPure = ({ locale, accessToken, ...component }: SurveyJsFormPureProps) => {
     const { labels } = useGlobalContext();
 
     const { code, title } = component;
diff --git a/packages/blocks/surveyjs-form/src/frontend/SurveyJs.renderer.tsx b/packages/blocks/surveyjs-form/src/frontend/SurveyJs.renderer.tsx
index 9001bc029..855698198 100644
--- a/packages/blocks/surveyjs-form/src/frontend/SurveyJs.renderer.tsx
+++ b/packages/blocks/surveyjs-form/src/frontend/SurveyJs.renderer.tsx
@@ -7,7 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { SurveyJsServer } from './SurveyJs.server';
 import { SurveyJsFormRendererProps } from './SurveyJs.types';
 
-export const SurveyJsRenderer: React.FC<SurveyJsFormRendererProps> = ({ id, accessToken, routing, hasPriority }) => {
+export const SurveyJsRenderer = ({ id, accessToken, routing, hasPriority }: SurveyJsFormRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/surveyjs-form/src/frontend/SurveyJs.server.tsx b/packages/blocks/surveyjs-form/src/frontend/SurveyJs.server.tsx
index 0ede0b4a3..55910df02 100644
--- a/packages/blocks/surveyjs-form/src/frontend/SurveyJs.server.tsx
+++ b/packages/blocks/surveyjs-form/src/frontend/SurveyJs.server.tsx
@@ -7,13 +7,7 @@ import { SurveyJsFormProps } from './SurveyJs.types';
 
 export const SurveyJsDynamic = dynamic(() => import('./SurveyJs.client').then((module) => module.SurveyJsPure));
 
-export const SurveyJsServer: React.FC<SurveyJsFormProps> = async ({
-    id,
-    accessToken,
-    locale,
-    routing,
-    hasPriority,
-}) => {
+export const SurveyJsServer = async ({ id, accessToken, locale, routing, hasPriority }: SurveyJsFormProps) => {
     try {
         const data = await sdk.blocks.getSurveyjsBlock(
             {
diff --git a/packages/blocks/ticket-details/src/frontend/TicketDetails.client.tsx b/packages/blocks/ticket-details/src/frontend/TicketDetails.client.tsx
index 07ba8c690..6a9d2ca48 100644
--- a/packages/blocks/ticket-details/src/frontend/TicketDetails.client.tsx
+++ b/packages/blocks/ticket-details/src/frontend/TicketDetails.client.tsx
@@ -17,12 +17,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { TicketDetailsPureProps } from './TicketDetails.types';
 
-export const TicketDetailsPure: React.FC<Readonly<TicketDetailsPureProps>> = ({
-    locale,
-    accessToken,
-    routing,
-    ...component
-}) => {
+export const TicketDetailsPure = ({ locale, accessToken, routing, ...component }: Readonly<TicketDetailsPureProps>) => {
     const { data: ticket } = component;
     return (
         <div className="w-full">
diff --git a/packages/blocks/ticket-details/src/frontend/TicketDetails.renderer.tsx b/packages/blocks/ticket-details/src/frontend/TicketDetails.renderer.tsx
index a1a5365fa..791fc7db6 100644
--- a/packages/blocks/ticket-details/src/frontend/TicketDetails.renderer.tsx
+++ b/packages/blocks/ticket-details/src/frontend/TicketDetails.renderer.tsx
@@ -7,13 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { TicketDetails } from './TicketDetails.server';
 import { TicketDetailsRendererProps } from './TicketDetails.types';
 
-export const TicketDetailsRenderer: React.FC<TicketDetailsRendererProps> = ({
-    slug,
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const TicketDetailsRenderer = ({ slug, id, accessToken, routing, hasPriority }: TicketDetailsRendererProps) => {
     const locale = useLocale();
 
     if (!slug[1]) {
diff --git a/packages/blocks/ticket-details/src/frontend/TicketDetails.server.tsx b/packages/blocks/ticket-details/src/frontend/TicketDetails.server.tsx
index 13f4c1bd0..7b7e2e808 100644
--- a/packages/blocks/ticket-details/src/frontend/TicketDetails.server.tsx
+++ b/packages/blocks/ticket-details/src/frontend/TicketDetails.server.tsx
@@ -9,14 +9,14 @@ export const TicketDetailsDynamic = dynamic(() =>
     import('./TicketDetails.client').then((module) => module.TicketDetailsPure),
 );
 
-export const TicketDetails: React.FC<TicketDetailsProps> = async ({
+export const TicketDetails = async ({
     id,
     ticketId,
     accessToken,
     locale,
     routing,
     hasPriority,
-}) => {
+}: TicketDetailsProps) => {
     try {
         const data = await sdk.blocks.getTicketDetails(
             {
diff --git a/packages/blocks/ticket-list/src/frontend/TicketList.client.tsx b/packages/blocks/ticket-list/src/frontend/TicketList.client.tsx
index ed52b8593..552f47afe 100644
--- a/packages/blocks/ticket-list/src/frontend/TicketList.client.tsx
+++ b/packages/blocks/ticket-list/src/frontend/TicketList.client.tsx
@@ -25,7 +25,7 @@ import { sdk } from '../sdk';
 
 import { TicketListPureProps } from './TicketList.types';
 
-export const TicketListPure: React.FC<TicketListPureProps> = ({ locale, accessToken, routing, meta, ...component }) => {
+export const TicketListPure = ({ locale, accessToken, routing, meta, ...component }: TicketListPureProps) => {
     const { Link: LinkComponent } = createNavigation(routing);
     const inspector = LivePreview.useInspector();
 
diff --git a/packages/blocks/ticket-list/src/frontend/TicketList.renderer.tsx b/packages/blocks/ticket-list/src/frontend/TicketList.renderer.tsx
index 7fe099af5..320d4fd1a 100644
--- a/packages/blocks/ticket-list/src/frontend/TicketList.renderer.tsx
+++ b/packages/blocks/ticket-list/src/frontend/TicketList.renderer.tsx
@@ -6,13 +6,13 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { TicketListServer } from './TicketList.server';
 import { TicketListRendererProps } from './TicketList.types';
 
-export const TicketListRenderer: React.FC<TicketListRendererProps> = ({
+export const TicketListRenderer = ({
     id,
     accessToken,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: TicketListRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/ticket-list/src/frontend/TicketList.server.tsx b/packages/blocks/ticket-list/src/frontend/TicketList.server.tsx
index 8551ea7b0..d987dfb13 100644
--- a/packages/blocks/ticket-list/src/frontend/TicketList.server.tsx
+++ b/packages/blocks/ticket-list/src/frontend/TicketList.server.tsx
@@ -7,14 +7,14 @@ import { TicketListProps } from './TicketList.types';
 
 export const TicketListDynamic = dynamic(() => import('./TicketList.client').then((module) => module.TicketListPure));
 
-export const TicketListServer: React.FC<TicketListProps> = async ({
+export const TicketListServer = async ({
     id,
     accessToken,
     locale,
     routing,
     hasPriority,
     isDraftModeEnabled,
-}) => {
+}: TicketListProps) => {
     let data;
     try {
         data = await sdk.blocks.getTicketList(
diff --git a/packages/blocks/ticket-recent/src/frontend/TicketRecent.client.tsx b/packages/blocks/ticket-recent/src/frontend/TicketRecent.client.tsx
index ea537bb70..1c0d221d8 100644
--- a/packages/blocks/ticket-recent/src/frontend/TicketRecent.client.tsx
+++ b/packages/blocks/ticket-recent/src/frontend/TicketRecent.client.tsx
@@ -14,7 +14,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { TicketRecentPureProps } from './TicketRecent.types';
 
-export const TicketRecentPure: React.FC<TicketRecentPureProps> = ({ locale, accessToken, routing, ...component }) => {
+export const TicketRecentPure = ({ locale, accessToken, routing, ...component }: TicketRecentPureProps) => {
     const { title, tickets, noResults, details } = component;
 
     const { Link: LinkComponent } = createNavigation(routing);
diff --git a/packages/blocks/ticket-recent/src/frontend/TicketRecent.renderer.tsx b/packages/blocks/ticket-recent/src/frontend/TicketRecent.renderer.tsx
index 64ba4ceab..2c764ce66 100644
--- a/packages/blocks/ticket-recent/src/frontend/TicketRecent.renderer.tsx
+++ b/packages/blocks/ticket-recent/src/frontend/TicketRecent.renderer.tsx
@@ -7,12 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { TicketRecent } from './TicketRecent.server';
 import { TicketRecentRendererProps } from './TicketRecent.types';
 
-export const TicketRecentRenderer: React.FC<TicketRecentRendererProps> = ({
-    id,
-    accessToken,
-    routing,
-    hasPriority,
-}) => {
+export const TicketRecentRenderer = ({ id, accessToken, routing, hasPriority }: TicketRecentRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/ticket-recent/src/frontend/TicketRecent.server.tsx b/packages/blocks/ticket-recent/src/frontend/TicketRecent.server.tsx
index 0dd1ed75b..1bcd64c86 100644
--- a/packages/blocks/ticket-recent/src/frontend/TicketRecent.server.tsx
+++ b/packages/blocks/ticket-recent/src/frontend/TicketRecent.server.tsx
@@ -9,7 +9,7 @@ export const TicketRecentDynamic = dynamic(() =>
     import('./TicketRecent.client').then((module) => module.TicketRecentPure),
 );
 
-export const TicketRecent: React.FC<TicketRecentProps> = async ({ id, accessToken, locale, routing, hasPriority }) => {
+export const TicketRecent = async ({ id, accessToken, locale, routing, hasPriority }: TicketRecentProps) => {
     try {
         const data = await sdk.blocks.getTicketRecent(
             {
diff --git a/packages/blocks/ticket-summary/src/frontend/TicketSummary.client.tsx b/packages/blocks/ticket-summary/src/frontend/TicketSummary.client.tsx
index b34f0e0da..07dda046f 100644
--- a/packages/blocks/ticket-summary/src/frontend/TicketSummary.client.tsx
+++ b/packages/blocks/ticket-summary/src/frontend/TicketSummary.client.tsx
@@ -14,7 +14,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { TicketSummaryPureProps } from './TicketSummary.types';
 
-export const TicketSummaryPure: React.FC<TicketSummaryPureProps> = ({ ...component }) => {
+export const TicketSummaryPure = ({ ...component }: TicketSummaryPureProps) => {
     const { infoCards, layout } = component;
 
     if (!infoCards || infoCards.length === 0) {
diff --git a/packages/blocks/ticket-summary/src/frontend/TicketSummary.renderer.tsx b/packages/blocks/ticket-summary/src/frontend/TicketSummary.renderer.tsx
index 12a14090c..24e724514 100644
--- a/packages/blocks/ticket-summary/src/frontend/TicketSummary.renderer.tsx
+++ b/packages/blocks/ticket-summary/src/frontend/TicketSummary.renderer.tsx
@@ -6,7 +6,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { TicketSummary } from './TicketSummary.server';
 import { TicketSummaryRendererProps } from './TicketSummary.types';
 
-export const TicketSummaryRenderer: React.FC<TicketSummaryRendererProps> = ({ id, accessToken, routing }) => {
+export const TicketSummaryRenderer = ({ id, accessToken, routing }: TicketSummaryRendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/packages/blocks/ticket-summary/src/frontend/TicketSummary.server.tsx b/packages/blocks/ticket-summary/src/frontend/TicketSummary.server.tsx
index 4b7f3c251..33dd703b7 100644
--- a/packages/blocks/ticket-summary/src/frontend/TicketSummary.server.tsx
+++ b/packages/blocks/ticket-summary/src/frontend/TicketSummary.server.tsx
@@ -9,7 +9,7 @@ export const TicketSummaryDynamic = dynamic(() =>
     import('./TicketSummary.client').then((module) => module.TicketSummaryPure),
 );
 
-export const TicketSummary: React.FC<TicketSummaryProps> = async ({ id, accessToken, locale, routing }) => {
+export const TicketSummary = async ({ id, accessToken, locale, routing }: TicketSummaryProps) => {
     try {
         const data = await sdk.blocks.getTicketSummary(
             {
diff --git a/packages/blocks/user-account/src/frontend/UserAccount.client.tsx b/packages/blocks/user-account/src/frontend/UserAccount.client.tsx
index 28758ce1b..091dd77a2 100644
--- a/packages/blocks/user-account/src/frontend/UserAccount.client.tsx
+++ b/packages/blocks/user-account/src/frontend/UserAccount.client.tsx
@@ -13,7 +13,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { UserAccountPureProps } from './UserAccount.types';
 
-export const UserAccountPure: React.FC<UserAccountPureProps> = (component) => {
+export const UserAccountPure = (component: UserAccountPureProps) => {
     const { fields, labels, basicInformationTitle, basicInformationDescription, user, title, onSignOut } = component;
 
     const t = useTranslations();
diff --git a/packages/blocks/user-account/src/frontend/UserAccount.renderer.tsx b/packages/blocks/user-account/src/frontend/UserAccount.renderer.tsx
index c62ea81ec..4cc93ad28 100644
--- a/packages/blocks/user-account/src/frontend/UserAccount.renderer.tsx
+++ b/packages/blocks/user-account/src/frontend/UserAccount.renderer.tsx
@@ -7,14 +7,14 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { UserAccount } from './UserAccount.server';
 import { UserAccountRendererProps } from './UserAccount.types';
 
-export const UserAccountRenderer: React.FC<UserAccountRendererProps> = ({
+export const UserAccountRenderer = ({
     id,
     accessToken,
     routing,
     userId,
     onSignOut,
     hasPriority,
-}) => {
+}: UserAccountRendererProps) => {
     const locale = useLocale();
 
     if (!userId) {
diff --git a/packages/blocks/user-account/src/frontend/UserAccount.server.tsx b/packages/blocks/user-account/src/frontend/UserAccount.server.tsx
index 6ac0e31e1..4af5f5d6a 100644
--- a/packages/blocks/user-account/src/frontend/UserAccount.server.tsx
+++ b/packages/blocks/user-account/src/frontend/UserAccount.server.tsx
@@ -9,7 +9,7 @@ export const UserAccountDynamic = dynamic(() =>
     import('./UserAccount.client').then((module) => module.UserAccountPure),
 );
 
-export const UserAccount: React.FC<UserAccountProps> = async ({
+export const UserAccount = async ({
     id,
     accessToken,
     locale,
@@ -17,7 +17,7 @@ export const UserAccount: React.FC<UserAccountProps> = async ({
     userId,
     onSignOut,
     hasPriority,
-}) => {
+}: UserAccountProps) => {
     if (!userId) {
         return null;
     }
diff --git a/packages/modules/surveyjs/src/frontend/Components/Fieldset/Fieldset.tsx b/packages/modules/surveyjs/src/frontend/Components/Fieldset/Fieldset.tsx
index ac157c8b4..9ddf0d955 100644
--- a/packages/modules/surveyjs/src/frontend/Components/Fieldset/Fieldset.tsx
+++ b/packages/modules/surveyjs/src/frontend/Components/Fieldset/Fieldset.tsx
@@ -1,10 +1,10 @@
-import React, { FC } from 'react';
+import React from 'react';
 
 import { Typography } from '@o2s/ui/elements/typography';
 
 import { FieldsetProps } from './Fieldset.types';
 
-export const Fieldset: FC<FieldsetProps> = ({ legend, children, optionalLabel }) => {
+export const Fieldset = ({ legend, children, optionalLabel }: FieldsetProps) => {
     return (
         <fieldset className={'border-0 m-0 p-0'}>
             <legend className={'items-center gap-2 hidden'}>
diff --git a/packages/modules/surveyjs/src/frontend/Questions/CustomSurveyQuestionText.tsx b/packages/modules/surveyjs/src/frontend/Questions/CustomSurveyQuestionText.tsx
index 34879b76d..21f2a03ca 100644
--- a/packages/modules/surveyjs/src/frontend/Questions/CustomSurveyQuestionText.tsx
+++ b/packages/modules/surveyjs/src/frontend/Questions/CustomSurveyQuestionText.tsx
@@ -45,7 +45,7 @@ interface CustomSurveyQuestionTextProps {
     };
 }
 
-const CustomSurveyQuestionText: React.FC<CustomSurveyQuestionTextProps> = (props) => {
+const CustomSurveyQuestionText = (props: CustomSurveyQuestionTextProps) => {
     const [open, setOpen] = useState(false);
     const locale = useLocale();
     const question = props.question;
diff --git a/packages/modules/surveyjs/src/frontend/Survey.tsx b/packages/modules/surveyjs/src/frontend/Survey.tsx
index fff10d321..d6021add8 100644
--- a/packages/modules/surveyjs/src/frontend/Survey.tsx
+++ b/packages/modules/surveyjs/src/frontend/Survey.tsx
@@ -92,7 +92,7 @@ const handleError = (error: unknown, labels: Labels) => {
     return error instanceof Error ? error.message : 'Unknown error';
 };
 
-export const Survey: React.FC<SurveyProps> = ({ code, labels, locale, accessToken }) => {
+export const Survey = ({ code, labels, locale, accessToken }: SurveyProps) => {
     const [state, dispatch] = useActionState((prevState: SurveyState, action: SurveyAction) => {
         switch (action.type) {
             case 'LOAD':
diff --git a/packages/ui/src/components/ActionList/ActionList.tsx b/packages/ui/src/components/ActionList/ActionList.tsx
index c0772c2b2..588b1ba2f 100644
--- a/packages/ui/src/components/ActionList/ActionList.tsx
+++ b/packages/ui/src/components/ActionList/ActionList.tsx
@@ -14,13 +14,13 @@ import {
 
 import { ActionListProps } from './ActionList.types';
 
-export const ActionList: React.FC<Readonly<ActionListProps>> = ({
+export const ActionList = ({
     className,
     showMoreLabel,
     visibleActions,
     dropdownActions,
     triggerVariant = 'outline',
-}) => {
+}: Readonly<ActionListProps>) => {
     if (!visibleActions.length && !dropdownActions.length) {
         return null;
     }
diff --git a/packages/ui/src/components/AppSpinner/AppSpinner.stories.tsx b/packages/ui/src/components/AppSpinner/AppSpinner.stories.tsx
index 74c12d447..59707e1fc 100644
--- a/packages/ui/src/components/AppSpinner/AppSpinner.stories.tsx
+++ b/packages/ui/src/components/AppSpinner/AppSpinner.stories.tsx
@@ -6,7 +6,7 @@ import { useGlobalContext } from '@o2s/ui/providers/GlobalProvider';
 import { AppSpinner } from './AppSpinner';
 
 // Wrapper component to control the spinner visibility through props
-const AppSpinnerWrapper: React.FC<{ isVisible: boolean }> = ({ isVisible }) => {
+const AppSpinnerWrapper = ({ isVisible }: { isVisible: boolean }) => {
     const { spinner } = useGlobalContext();
 
     useEffect(() => {
diff --git a/packages/ui/src/components/AppSpinner/AppSpinner.tsx b/packages/ui/src/components/AppSpinner/AppSpinner.tsx
index 581a608ad..929ce2022 100644
--- a/packages/ui/src/components/AppSpinner/AppSpinner.tsx
+++ b/packages/ui/src/components/AppSpinner/AppSpinner.tsx
@@ -6,7 +6,7 @@ import { useGlobalContext } from '@o2s/ui/providers/GlobalProvider';
 
 import { Spinner } from '@o2s/ui/elements/spinner';
 
-export const AppSpinner: React.FC = () => {
+export const AppSpinner = () => {
     const { spinner } = useGlobalContext();
 
     if (!spinner.isVisible) {
diff --git a/packages/ui/src/components/Author/Author.tsx b/packages/ui/src/components/Author/Author.tsx
index c9e16ef18..93e80d0df 100644
--- a/packages/ui/src/components/Author/Author.tsx
+++ b/packages/ui/src/components/Author/Author.tsx
@@ -5,7 +5,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { AuthorProps } from './Author.types';
 
-export const Author: React.FC<Readonly<AuthorProps>> = ({ name, avatar, position }) => {
+export const Author = ({ name, avatar, position }: Readonly<AuthorProps>) => {
     return (
         <div className="flex items-center gap-2">
             <Avatar>
diff --git a/packages/ui/src/components/Breadcrumbs/Breadcrumbs.tsx b/packages/ui/src/components/Breadcrumbs/Breadcrumbs.tsx
index a7e6a81a9..be1a8a12b 100644
--- a/packages/ui/src/components/Breadcrumbs/Breadcrumbs.tsx
+++ b/packages/ui/src/components/Breadcrumbs/Breadcrumbs.tsx
@@ -13,7 +13,7 @@ import { Link } from '@o2s/ui/elements/link';
 
 import { BreadcrumbsProps } from './Breadcrumbs.types';
 
-export const Breadcrumbs: React.FC<BreadcrumbsProps> = ({ breadcrumbs, LinkComponent }) => {
+export const Breadcrumbs = ({ breadcrumbs, LinkComponent }: BreadcrumbsProps) => {
     if (!breadcrumbs?.length) return null;
 
     return (
diff --git a/packages/ui/src/components/Cards/BlogCard/BlogCard.tsx b/packages/ui/src/components/Cards/BlogCard/BlogCard.tsx
index 8900cd9ca..6b7cc081d 100644
--- a/packages/ui/src/components/Cards/BlogCard/BlogCard.tsx
+++ b/packages/ui/src/components/Cards/BlogCard/BlogCard.tsx
@@ -7,7 +7,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { BlogCardProps } from './BlogCard.types';
 
-export const BlogCard: React.FC<Readonly<BlogCardProps>> = ({
+export const BlogCard = ({
     title,
     lead,
     image,
@@ -17,7 +17,7 @@ export const BlogCard: React.FC<Readonly<BlogCardProps>> = ({
     categoryTitle,
     LinkComponent,
     priority,
-}) => {
+}: Readonly<BlogCardProps>) => {
     return (
         <LinkComponent
             href={url}
diff --git a/packages/ui/src/components/Cards/FeatureCard/FeatureCard.tsx b/packages/ui/src/components/Cards/FeatureCard/FeatureCard.tsx
index 889c2577e..8a43c04be 100644
--- a/packages/ui/src/components/Cards/FeatureCard/FeatureCard.tsx
+++ b/packages/ui/src/components/Cards/FeatureCard/FeatureCard.tsx
@@ -12,7 +12,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { FeatureCardProps } from './FeatureCard.types';
 
-export const FeatureCardContent: React.FC<FeatureCardProps> = ({ title, description, image, link, LinkComponent }) => {
+export const FeatureCardContent = ({ title, description, image, link, LinkComponent }: FeatureCardProps) => {
     return (
         <div className="flex flex-col relative rounded-lg bg-card w-full h-full border border-border hover:border-primary transition-all duration-300">
             <div className="p-6 md:p-8 flex flex-col gap-2 flex-1">
@@ -50,7 +50,7 @@ export const FeatureCardContent: React.FC<FeatureCardProps> = ({ title, descript
     );
 };
 
-export const FeatureCard: React.FC<Readonly<FeatureCardProps>> = (props) => {
+export const FeatureCard = (props: Readonly<FeatureCardProps>) => {
     const router = useRouter();
 
     return (
diff --git a/packages/ui/src/components/Cards/InfoCard/InfoCard.tsx b/packages/ui/src/components/Cards/InfoCard/InfoCard.tsx
index ce0cc34c3..f18301d59 100644
--- a/packages/ui/src/components/Cards/InfoCard/InfoCard.tsx
+++ b/packages/ui/src/components/Cards/InfoCard/InfoCard.tsx
@@ -10,7 +10,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { InfoCardProps } from './InfoCard.types';
 
-export const InfoCard: React.FC<Readonly<InfoCardProps>> = ({ title, value, description, icon, button, className }) => {
+export const InfoCard = ({ title, value, description, icon, button, className }: Readonly<InfoCardProps>) => {
     return (
         <Card className={cn('h-full w-full', className)}>
             <div className="p-6 flex flex-col gap-2 h-full">
diff --git a/packages/ui/src/components/Cards/InformativeCard/InformativeCard.tsx b/packages/ui/src/components/Cards/InformativeCard/InformativeCard.tsx
index bd87b440f..d553fe1de 100644
--- a/packages/ui/src/components/Cards/InformativeCard/InformativeCard.tsx
+++ b/packages/ui/src/components/Cards/InformativeCard/InformativeCard.tsx
@@ -11,13 +11,7 @@ import { RichText } from '../../RichText';
 
 import { InformativeCardProps } from './InformativeCard.types';
 
-const InformativeCardContent: React.FC<Readonly<InformativeCardProps>> = ({
-    icon,
-    title,
-    description,
-    href,
-    lineClamp = 7,
-}) => {
+const InformativeCardContent = ({ icon, title, description, href, lineClamp = 7 }: Readonly<InformativeCardProps>) => {
     if (!icon && !title && !description) {
         return null;
     }
@@ -55,7 +49,7 @@ const InformativeCardContent: React.FC<Readonly<InformativeCardProps>> = ({
     );
 };
 
-export const InformativeCard: React.FC<Readonly<InformativeCardProps>> = (props) => {
+export const InformativeCard = (props: Readonly<InformativeCardProps>) => {
     const LinkComponent = props.LinkComponent;
 
     if (props.href) {
diff --git a/packages/ui/src/components/Cards/PricingCard/PricingCard.tsx b/packages/ui/src/components/Cards/PricingCard/PricingCard.tsx
index 00b32633f..ec28107b4 100644
--- a/packages/ui/src/components/Cards/PricingCard/PricingCard.tsx
+++ b/packages/ui/src/components/Cards/PricingCard/PricingCard.tsx
@@ -18,7 +18,7 @@ import { LinkList } from '../../LinkList';
 
 import { FeatureItemProps, PricingCardProps } from './PricingCard.types';
 
-export const FeatureItem: React.FC<FeatureItemProps> = ({ title, description, icon }) => {
+export const FeatureItem = ({ title, description, icon }: FeatureItemProps) => {
     return (
         <div className="flex flex-row gap-3 w-full justify-between">
             <div className="flex flex-row gap-3">
@@ -48,7 +48,7 @@ export const FeatureItem: React.FC<FeatureItemProps> = ({ title, description, ic
     );
 };
 
-export const PricingCard: React.FC<Readonly<PricingCardProps>> = (props) => {
+export const PricingCard = (props: Readonly<PricingCardProps>) => {
     const { title, description, image, price, isPromoted, tags, links, featureListTitle, featureList, LinkComponent } =
         props;
 
diff --git a/packages/ui/src/components/Cards/ProductCard/ProductCard.tsx b/packages/ui/src/components/Cards/ProductCard/ProductCard.tsx
index 804c3b917..113dbbcbb 100644
--- a/packages/ui/src/components/Cards/ProductCard/ProductCard.tsx
+++ b/packages/ui/src/components/Cards/ProductCard/ProductCard.tsx
@@ -13,7 +13,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { ProductCardProps } from './ProductCard.types';
 
-export const ProductCard: React.FC<ProductCardProps> = ({
+export const ProductCard = ({
     title,
     description,
     price,
@@ -23,7 +23,7 @@ export const ProductCard: React.FC<ProductCardProps> = ({
     link,
     action,
     LinkComponent,
-}) => {
+}: ProductCardProps) => {
     return (
         <div className={cn('flex flex-col bg-card rounded-lg border border-border shadow-sm relative w-full h-full')}>
             {/* Image section */}
diff --git a/packages/ui/src/components/Carousel/Carousel.tsx b/packages/ui/src/components/Carousel/Carousel.tsx
index 835d01d68..12df59c06 100644
--- a/packages/ui/src/components/Carousel/Carousel.tsx
+++ b/packages/ui/src/components/Carousel/Carousel.tsx
@@ -11,7 +11,7 @@ import { cn } from '@o2s/ui/lib/utils';
 
 import { CarouselProps } from './Carousel.types';
 
-export const Carousel: React.FC<Readonly<CarouselProps>> = ({
+export const Carousel = ({
     slides,
     className,
     showNavigation = true,
@@ -20,7 +20,7 @@ export const Carousel: React.FC<Readonly<CarouselProps>> = ({
     startingSlideIndex = 0,
     noSwipingSelector,
     ...swiperProps
-}) => {
+}: Readonly<CarouselProps>) => {
     const allModules = [
         A11y,
         Keyboard,
diff --git a/packages/ui/src/components/Chart/ChartRoundedBar/ChartRoundedBar.tsx b/packages/ui/src/components/Chart/ChartRoundedBar/ChartRoundedBar.tsx
index 79a93aa90..a07b505ec 100644
--- a/packages/ui/src/components/Chart/ChartRoundedBar/ChartRoundedBar.tsx
+++ b/packages/ui/src/components/Chart/ChartRoundedBar/ChartRoundedBar.tsx
@@ -1,9 +1,9 @@
-import React, { FC } from 'react';
+import React from 'react';
 import { Props } from 'recharts/types/cartesian/Bar';
 
 import { ChartRoundedBarProps } from './ChartRoundedBar.types';
 
-export const ChartRoundedBar: FC<Props & ChartRoundedBarProps> = (props) => {
+export const ChartRoundedBar = (props: Props & ChartRoundedBarProps) => {
     const {
         x: xString,
         y: yString,
diff --git a/packages/ui/src/components/Chart/ChartTooltip/ChartTooltip.tsx b/packages/ui/src/components/Chart/ChartTooltip/ChartTooltip.tsx
index 92a441941..3bcb1cfd2 100644
--- a/packages/ui/src/components/Chart/ChartTooltip/ChartTooltip.tsx
+++ b/packages/ui/src/components/Chart/ChartTooltip/ChartTooltip.tsx
@@ -7,7 +7,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { ChartTooltipProps } from './ChartTooltip.types';
 
-export const ChartTooltip: React.FC<ChartTooltipProps> = ({ type = 'number', active, payload }) => {
+export const ChartTooltip = ({ type = 'number', active, payload }: ChartTooltipProps) => {
     if (!active || !payload?.length) {
         return null;
     }
diff --git a/packages/ui/src/components/Chart/DoubleLineChart/DoubleLineChart.tsx b/packages/ui/src/components/Chart/DoubleLineChart/DoubleLineChart.tsx
index 23f02a976..e1da1e1a2 100644
--- a/packages/ui/src/components/Chart/DoubleLineChart/DoubleLineChart.tsx
+++ b/packages/ui/src/components/Chart/DoubleLineChart/DoubleLineChart.tsx
@@ -8,7 +8,7 @@ import { ChartTooltip as CustomTooltip } from '../ChartTooltip';
 
 import { DoubleLineChartProps } from './DoubleLineChart.types';
 
-export const DoubleLineChart: React.FC<DoubleLineChartProps> = ({ chartData, legend, tooltipType }) => {
+export const DoubleLineChart = ({ chartData, legend, tooltipType }: DoubleLineChartProps) => {
     const chartConfig = {
         prev: {
             stroke: 'var(--chart-2)',
diff --git a/packages/ui/src/components/Chart/StackedBarChart/StackedBarChart.tsx b/packages/ui/src/components/Chart/StackedBarChart/StackedBarChart.tsx
index dac5932ce..c7bffa76d 100644
--- a/packages/ui/src/components/Chart/StackedBarChart/StackedBarChart.tsx
+++ b/packages/ui/src/components/Chart/StackedBarChart/StackedBarChart.tsx
@@ -13,13 +13,7 @@ import { ChartTooltip as CustomTooltip } from '../ChartTooltip';
 
 import { StackedBarChartProps } from './StackedBarChart.types';
 
-export const StackedBarChart: React.FC<StackedBarChartProps> = ({
-    chartData,
-    labels,
-    unit,
-    tooltipType,
-    maxBarSize = 80,
-}) => {
+export const StackedBarChart = ({ chartData, labels, unit, tooltipType, maxBarSize = 80 }: StackedBarChartProps) => {
     const chartConfig = {
         topSegment: {
             color: 'var(--destructive)',
diff --git a/packages/ui/src/components/Container/Container.tsx b/packages/ui/src/components/Container/Container.tsx
index 1a5dd2b0b..9ad617571 100644
--- a/packages/ui/src/components/Container/Container.tsx
+++ b/packages/ui/src/components/Container/Container.tsx
@@ -39,14 +39,14 @@ const containerBackgroundVariants = cva('w-full', {
     },
 });
 
-export const Container: React.FC<ContainerProps> = ({
+export const Container = ({
     variant = 'full',
     children,
     className,
     spacing = 'none',
     background = 'none',
     theme,
-}) => {
+}: ContainerProps) => {
     let finalTheme = theme;
     if (theme) {
         finalTheme = `theme-${theme}`;
diff --git a/packages/ui/src/components/ContentSection/ContentSection.tsx b/packages/ui/src/components/ContentSection/ContentSection.tsx
index c324d55ba..8882b2705 100644
--- a/packages/ui/src/components/ContentSection/ContentSection.tsx
+++ b/packages/ui/src/components/ContentSection/ContentSection.tsx
@@ -10,14 +10,14 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { ContentSectionProps } from './ContentSection.types';
 
-export const ContentSection: React.FC<Readonly<ContentSectionProps>> = ({
+export const ContentSection = ({
     title,
     description,
     categoryLink,
     children,
     LinkComponent,
     meta,
-}) => {
+}: Readonly<ContentSectionProps>) => {
     const inspector = LivePreview.useInspector();
 
     return (
diff --git a/packages/ui/src/components/DynamicIcon/DynamicIcon.tsx b/packages/ui/src/components/DynamicIcon/DynamicIcon.tsx
index 39d4768a8..063339f26 100644
--- a/packages/ui/src/components/DynamicIcon/DynamicIcon.tsx
+++ b/packages/ui/src/components/DynamicIcon/DynamicIcon.tsx
@@ -5,13 +5,13 @@ import { DynamicIconProps } from './DynamicIcon.types';
 
 const toKebabCase = (str: string) => str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
 
-export const DynamicIcon: React.FC<DynamicIconProps> = ({
+export const DynamicIcon = ({
     name,
     size = 24,
     color = 'currentColor',
     className,
     strokeWidth = 2,
-}) => {
+}: DynamicIconProps) => {
     if (!name) {
         return null;
     }
diff --git a/packages/ui/src/components/ErrorPage/ErrorPage.tsx b/packages/ui/src/components/ErrorPage/ErrorPage.tsx
index 3f231639b..771d0f91f 100644
--- a/packages/ui/src/components/ErrorPage/ErrorPage.tsx
+++ b/packages/ui/src/components/ErrorPage/ErrorPage.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React from 'react';
 
 import { RichText } from '@o2s/ui/components/RichText';
 
@@ -7,7 +7,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { ErrorPageProps } from './ErrorPage.types';
 
-export const ErrorPage: FC<ErrorPageProps> = ({ errorType, title, description, link, LinkComponent }) => {
+export const ErrorPage = ({ errorType, title, description, link, LinkComponent }: ErrorPageProps) => {
     return (
         <div className="w-full h-full flex flex-col justify-center items-center gap-6 my-24">
             <Typography variant="subtitle">{errorType}</Typography>
diff --git a/packages/ui/src/components/Image/Image.tsx b/packages/ui/src/components/Image/Image.tsx
index c80e43bb3..b1f564b41 100644
--- a/packages/ui/src/components/Image/Image.tsx
+++ b/packages/ui/src/components/Image/Image.tsx
@@ -10,7 +10,7 @@ const _imageLoader: ImageLoader = ({ src, width, quality }) => {
     return `${src}?w=${width}&q=${quality || 99}&fm=webp`;
 };
 
-export const Image: React.FC<ImageProps> = ({ src, alt, width, height, quality = 90, fill, priority, ...rest }) => {
+export const Image = ({ src, alt, width, height, quality = 90, fill, priority, ...rest }: ImageProps) => {
     if ((width && height) || fill) {
         return (
             <NextImage
diff --git a/packages/ui/src/components/LinkList/LinkList.tsx b/packages/ui/src/components/LinkList/LinkList.tsx
index 58323e024..d180d5a66 100644
--- a/packages/ui/src/components/LinkList/LinkList.tsx
+++ b/packages/ui/src/components/LinkList/LinkList.tsx
@@ -8,7 +8,7 @@ import { DynamicIcon } from '../DynamicIcon';
 
 import { LinkListProps } from './LinkList.types';
 
-export const LinkList: React.FC<Readonly<LinkListProps>> = ({ className, links, LinkComponent, children }) => {
+export const LinkList = ({ className, links, LinkComponent, children }: Readonly<LinkListProps>) => {
     if (!links && !children) {
         return null;
     }
diff --git a/packages/ui/src/components/Loading/Loading.tsx b/packages/ui/src/components/Loading/Loading.tsx
index 09d322de9..6f36b59e4 100644
--- a/packages/ui/src/components/Loading/Loading.tsx
+++ b/packages/ui/src/components/Loading/Loading.tsx
@@ -4,7 +4,7 @@ import { Skeleton } from '@o2s/ui/elements/skeleton';
 
 import { LoadingProps } from './Loading.types';
 
-export const Loading: React.FC<LoadingProps> = ({ bars = 2, variant = 'component' }) => {
+export const Loading = ({ bars = 2, variant = 'component' }: LoadingProps) => {
     switch (variant) {
         case 'post':
             return (
diff --git a/packages/ui/src/components/NoResults/NoResults.tsx b/packages/ui/src/components/NoResults/NoResults.tsx
index 28d94cc52..50e353918 100644
--- a/packages/ui/src/components/NoResults/NoResults.tsx
+++ b/packages/ui/src/components/NoResults/NoResults.tsx
@@ -7,7 +7,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { NoResultsProps } from './NoResults.types';
 
-export const NoResults: React.FC<NoResultsProps> = ({ title, description }) => {
+export const NoResults = ({ title, description }: NoResultsProps) => {
     return (
         <div className="flex flex-col items-center gap-6">
             <div className="p-3 border rounded-lg border-gray-200">
diff --git a/packages/ui/src/components/Pagination/Pagination.stories.tsx b/packages/ui/src/components/Pagination/Pagination.stories.tsx
index a9acda14c..73e335d1d 100644
--- a/packages/ui/src/components/Pagination/Pagination.stories.tsx
+++ b/packages/ui/src/components/Pagination/Pagination.stories.tsx
@@ -4,12 +4,17 @@ import React, { useState } from 'react';
 import { Pagination } from './Pagination';
 
 // Wrapper component to handle state for the pagination
-const PaginationWrapper: React.FC<{
+const PaginationWrapper = ({
+    total,
+    limit,
+    initialOffset = 0,
+    disabled = false,
+}: {
     total: number;
     limit: number;
     initialOffset?: number;
     disabled?: boolean;
-}> = ({ total, limit, initialOffset = 0, disabled = false }) => {
+}) => {
     const [offset, setOffset] = useState(initialOffset);
 
     const handlePageChange = (page: number) => {
diff --git a/packages/ui/src/components/Pagination/Pagination.tsx b/packages/ui/src/components/Pagination/Pagination.tsx
index 40fd784b6..ceadc948e 100644
--- a/packages/ui/src/components/Pagination/Pagination.tsx
+++ b/packages/ui/src/components/Pagination/Pagination.tsx
@@ -14,7 +14,7 @@ import { Typography } from '@o2s/ui/elements/typography';
 
 import { PaginationProps } from './Pagination.types';
 
-export const Pagination: React.FC<PaginationProps> = ({
+export const Pagination = ({
     disabled,
     total,
     offset,
@@ -24,7 +24,7 @@ export const Pagination: React.FC<PaginationProps> = ({
     legend,
     limit,
     selectPage,
-}) => {
+}: PaginationProps) => {
     const currentPage = offset / limit + 1;
     const totalPages = Math.ceil(total / limit);
 
diff --git a/packages/ui/src/components/RichText/RichText.tsx b/packages/ui/src/components/RichText/RichText.tsx
index 455952776..4a04be71b 100644
--- a/packages/ui/src/components/RichText/RichText.tsx
+++ b/packages/ui/src/components/RichText/RichText.tsx
@@ -1,6 +1,6 @@
 import Markdown, { MarkdownToJSX } from 'markdown-to-jsx';
 import NextLink, { LinkProps } from 'next/link';
-import React, { FC, ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 
 import { cn } from '@o2s/ui/lib/utils';
 
@@ -9,7 +9,7 @@ import { Typography, TypographyProps } from '@o2s/ui/elements/typography';
 
 import { RichTextProps } from './RichText.types';
 
-const LinkComp: FC<Readonly<LinkProps & { children: ReactNode; className?: string }>> = ({ children, ...props }) => {
+const LinkComp = ({ children, ...props }: Readonly<LinkProps & { children: ReactNode; className?: string }>) => {
     const { className, ...rest } = props;
     return (
         <Link className={className} asChild>
@@ -18,10 +18,7 @@ const LinkComp: FC<Readonly<LinkProps & { children: ReactNode; className?: strin
     );
 };
 
-const TypographyComp: FC<Readonly<TypographyProps & { children: ReactNode; tag: string }>> = ({
-    children,
-    ...props
-}) => {
+const TypographyComp = ({ children, ...props }: Readonly<TypographyProps & { children: ReactNode; tag: string }>) => {
     const Tag = props.tag || 'p';
     return (
         <Typography variant={props.variant} asChild>
@@ -30,14 +27,12 @@ const TypographyComp: FC<Readonly<TypographyProps & { children: ReactNode; tag:
     );
 };
 
-const TdComp: FC<Readonly<TypographyProps & { children: ReactNode }>> = ({
+const TdComp = ({
     children,
+    'data-highlighted': dataHighlighted,
     ...props
-}: {
-    children: ReactNode;
-    'data-highlighted'?: boolean;
-}) => {
-    const variant = props['data-highlighted'] ? 'tableCellHighlighted' : 'tableCell';
+}: Readonly<TypographyProps & { children: ReactNode; 'data-highlighted'?: boolean }>) => {
+    const variant = dataHighlighted ? 'tableCellHighlighted' : 'tableCell';
     return (
         <TypographyComp variant={variant} tag="td" {...props}>
             {children}
@@ -45,13 +40,13 @@ const TdComp: FC<Readonly<TypographyProps & { children: ReactNode }>> = ({
     );
 };
 
-export const RichText: FC<Readonly<RichTextProps>> = ({
+export const RichText = ({
     content,
     baseFontSize = 'body',
     className,
     startingHeadingLevel = 1,
     ...rest
-}) => {
+}: Readonly<RichTextProps>) => {
     if (!content) {
         return null;
     }
diff --git a/packages/ui/src/elements/link.tsx b/packages/ui/src/elements/link.tsx
index b1b44cfea..aecfa8596 100644
--- a/packages/ui/src/elements/link.tsx
+++ b/packages/ui/src/elements/link.tsx
@@ -8,7 +8,7 @@ export interface LinkProps extends React.AnchorHTMLAttributes<HTMLAnchorElement>
     asChild?: boolean;
 }
 
-const Link: React.FC<LinkProps> = ({ className, variant = 'link', asChild = false, ...restProps }) => {
+const Link = ({ className, variant = 'link', asChild = false, ...restProps }: LinkProps) => {
     const Comp = asChild ? Slot : 'a';
     return (
         <Comp
diff --git a/packages/ui/turbo/generators/templates/component.hbs b/packages/ui/turbo/generators/templates/component.hbs
index fcc2361d9..3b139021d 100644
--- a/packages/ui/turbo/generators/templates/component.hbs
+++ b/packages/ui/turbo/generators/templates/component.hbs
@@ -4,7 +4,7 @@ import { cn } from '@o2s/ui/lib/utils';
 
 import { {{ pascalCase name }}Props } from './{{ pascalCase name }}.types';
 
-export const {{ pascalCase name }}: React.FC<Readonly<{{ pascalCase name }}Props>> = ({ className, ...props }) => {
+export const {{ pascalCase name }} = ({ className, ...props }: Readonly<{{ pascalCase name }}Props>) => {
     return (
         <div className={cn('', className)} {...props}>
             {{ pascalCase name }}
diff --git a/packages/utils/frontend/src/models/link.ts b/packages/utils/frontend/src/models/link.ts
index 96ee1ab20..fad516141 100644
--- a/packages/utils/frontend/src/models/link.ts
+++ b/packages/utils/frontend/src/models/link.ts
@@ -1,6 +1,6 @@
 import React from 'react';
 
-export type LinkComponent = React.FC<
-    Required<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>> &
-        React.AnchorHTMLAttributes<HTMLAnchorElement>
->;
+export type LinkComponent = (
+    props: Required<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>> &
+        React.AnchorHTMLAttributes<HTMLAnchorElement>,
+) => React.ReactNode;
diff --git a/turbo/generators/templates/block/frontend/client.hbs b/turbo/generators/templates/block/frontend/client.hbs
index 301915205..dabdd73b4 100644
--- a/turbo/generators/templates/block/frontend/client.hbs
+++ b/turbo/generators/templates/block/frontend/client.hbs
@@ -5,7 +5,7 @@ import React from 'react';
 
 import { {{ pascalCase name }}PureProps } from './{{ pascalCase name }}.types';
 
-export const {{ pascalCase name }}Pure: React.FC<{{ pascalCase name }}PureProps> = ({ locale, accessToken, routing, ...component }) => {
+export const {{ pascalCase name }}Pure = ({ locale, accessToken, routing, ...component }: {{ pascalCase name }}PureProps) => {
     const { Link: LinkComponent } = createNavigation(routing);
 
     return (
diff --git a/turbo/generators/templates/block/frontend/renderer.hbs b/turbo/generators/templates/block/frontend/renderer.hbs
index 945b8c60f..6084e0f09 100644
--- a/turbo/generators/templates/block/frontend/renderer.hbs
+++ b/turbo/generators/templates/block/frontend/renderer.hbs
@@ -7,7 +7,7 @@ import { Loading } from '@o2s/ui/components/Loading';
 import { {{ pascalCase name }} } from './{{ pascalCase name }}.server';
 import { {{ pascalCase name }}RendererProps } from './{{ pascalCase name }}.types';
 
-export const {{ pascalCase name }}Renderer: React.FC<{{ pascalCase name }}RendererProps> = ({ id, accessToken, routing }) => {
+export const {{ pascalCase name }}Renderer = ({ id, accessToken, routing }: {{ pascalCase name }}RendererProps) => {
     const locale = useLocale();
 
     return (
diff --git a/turbo/generators/templates/block/frontend/server.hbs b/turbo/generators/templates/block/frontend/server.hbs
index 329d1b8cf..12a2b53ce 100644
--- a/turbo/generators/templates/block/frontend/server.hbs
+++ b/turbo/generators/templates/block/frontend/server.hbs
@@ -10,7 +10,7 @@ export const {{ pascalCase name }}Dynamic = dynamic(() =>
     import('./{{ pascalCase name }}.client').then((module) => module.{{ pascalCase name }}Pure),
 );
 
-export const {{ pascalCase name }}: React.FC<{{ pascalCase name }}Props> = async ({ id, accessToken, locale, routing }) => {
+export const {{ pascalCase name }} = async ({ id, accessToken, locale, routing }: {{ pascalCase name }}Props) => {
     try {
         const data = await sdk.blocks.get{{ pascalCase name }}(
             {