diff --git a/src/app/page.tsx b/src/app/page.tsx
index 7605a50..17eda34 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,13 +2,14 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
-import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery';
-import MediaAbout from '@/components/sections/about/MediaAbout';
+import ContactCTA from '@/components/sections/contact/ContactCTA';
+import FeatureCardTwentyOne from '@/components/sections/feature/FeatureCardTwentyOne';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import HeroBillboardTestimonial from '@/components/sections/hero/HeroBillboardTestimonial';
+import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
+import TestimonialCardThirteen from '@/components/sections/testimonial/TestimonialCardThirteen';
+import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import { Award, Coffee, Zap } from "lucide-react";
 
 export default function LandingPage() {
@@ -29,191 +30,95 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingOverlay
       navItems={[
-        {
-          name: "ホーム",
-          id: "hero",
-        },
-        {
-          name: "体験について",
-          id: "about",
-        },
-        {
-          name: "こだわり",
-          id: "features",
-        },
-        {
-          name: "お問い合わせ",
-          id: "contact",
-        },
+        { name: "ホーム", id: "hero" },
+        { name: "体験について", id: "about" },
+        { name: "こだわり", id: "features" },
+        { name: "お問い合わせ", id: "contact" },
       ]}
       brandName="讃喫茶室"
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroBillboardGallery
-      background={{
-        variant: "radial-gradient",
-      }}
+      <HeroBillboardTestimonial
+      background={{ variant: "radial-gradient" }}
       title="Slow Down with the Perfect Pour."
       description="Experience the art of hand-dripped specialty coffee in a space designed for quiet reflection in Takarazuka."
-      buttons={[
-        {
-          text: "Reserve Your Experience",
-          href: "#contact",
-        },
-      ]}
-      mediaItems={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/low-angle-coffee-process-work_23-2148366579.jpg?_wi=1",
-          imageAlt: "Artisan coffee pour",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-selective-closeup-shot-coffee-with-latte-art-blue-ceramic-cup-wooden-table_181624-1792.jpg?_wi=1",
-          imageAlt: "Minimalist zen café interior",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/lots-small-onions-shallots-bowls-top-view-dark-table_176474-2002.jpg?_wi=1",
-          imageAlt: "Freshly roasted coffee beans",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/glass-cocktail-book-cellphone-digital-tablet-wooden-table-restaurant_23-2147936117.jpg?_wi=1",
-          imageAlt: "Quiet café corner for reading",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-person-s-hand-holding-cup-coffee-surrounded-by-coffee-beans_23-2148028153.jpg?_wi=1",
-          imageAlt: "Hand drip coffee ritual",
-        },
+      testimonials={[
+        { name: "Local Regular", handle: "@takara_coffee_lover", testimonial: "A hidden gem in Nogami. The attention to detail in every cup is unmatched.", rating: 5 },
+        { name: "Takarazuka Visitor", handle: "@travel_enthusiast", testimonial: "The atmosphere is unlike any other. Truly a Zen-Modern sanctuary.", rating: 5 }
       ]}
+      buttons={[{ text: "Reserve Your Experience", href: "#contact" }]}
+      imageSrc="http://img.b2bpic.net/free-photo/low-angle-coffee-process-work_23-2148366579.jpg?_wi=1"
       mediaAnimation="slide-up"
     />
   </div>
 
-  <div id="about" data-section="about">
-      <MediaAbout
+  <div id="socialProof" data-section="socialProof">
+      <SocialProofOne
+      names={["Takarazuka Local", "Coffee Journal", "Japan Tourism", "Zen Guide"]}
+      title="Featured In"
+      textboxLayout="default"
       useInvertedBackground={false}
-      title="Quiet Reflection"
-      description="讃喫茶室 (San Kissashitsu) offers a sanctuary for those who appreciate the finer details. From carefully sourced specialty beans to our intentional 'quiet space' policy, we invite you to disconnect from the city noise and reconnect with yourself over a perfect cup."
-      imageSrc="http://img.b2bpic.net/free-photo/vertical-selective-closeup-shot-coffee-with-latte-art-blue-ceramic-cup-wooden-table_181624-1792.jpg?_wi=2"
-      imageAlt="Minimalist café interior"
+    />
+  </div>
+
+  <div id="about" data-section="about">
+      <InlineImageSplitTextAbout
+      heading={[{ type: "text", content: "Quiet Reflection" }]}
+      useInvertedBackground={false}
+      buttons={[{ text: "Learn More" }]}
     />
   </div>
 
   <div id="features" data-section="features">
-      <FeatureBorderGlow
-      animationType="slide-up"
-      textboxLayout="split"
-      useInvertedBackground={true}
-      features={[
-        {
-          icon: Zap,
-          title: "Artisanal Brewing",
-          description: "Every cup is meticulously hand-dripped to bring out unique flavor profiles.",
-        },
-        {
-          icon: Coffee,
-          title: "Quiet Atmosphere",
-          description: "A dedicated 'quiet space' policy ensures a relaxing environment away from the city noise.",
-        },
-        {
-          icon: Award,
-          title: "Curated Selection",
-          description: "Rotating specialty beans sourced from the finest origins worldwide.",
-        },
-      ]}
+      <FeatureCardTwentyOne
       title="こだわり (Our Craft)"
       description="We believe in the beauty of slowness and precision in every step of the journey."
-      buttons={[
-        {
-          text: "Reserve Your Experience",
-          href: "#contact",
-        },
+      accordionItems={[
+        { id: "1", title: "Artisanal Brewing", content: "Every cup is meticulously hand-dripped to bring out unique flavor profiles." },
+        { id: "2", title: "Quiet Atmosphere", content: "A dedicated 'quiet space' policy ensures a relaxing environment away from the city noise." },
+        { id: "3", title: "Curated Selection", content: "Rotating specialty beans sourced from the finest origins worldwide." }
       ]}
+      useInvertedBackground={true}
+      mediaAnimation="slide-up"
     />
   </div>
 
   <div id="testimonials" data-section="testimonials">
-      <TestimonialCardSix
+      <TestimonialCardThirteen
+      testimonials={[
+        { id: "1", name: "Local Resident", handle: "@nogami_life", testimonial: "The perfect place to read a book and enjoy an exquisite pour-over.", rating: 5 },
+        { id: "2", name: "Artisan Seeker", handle: "@zen_minimalist", testimonial: "The balance of flavor and silence here is profound. I return every Sunday.", rating: 5 }
+      ]}
+      showRating={true}
       animationType="slide-up"
       textboxLayout="default"
-      useInvertedBackground={false}
-      testimonials={[
-        {
-          id: "1",
-          name: "Local Regular",
-          handle: "@takara_coffee_lover",
-          testimonial: "A hidden gem in Nogami. The attention to detail in every cup is unmatched. The most peaceful hour of my week.",
-          imageSrc: "http://img.b2bpic.net/free-photo/low-angle-coffee-process-work_23-2148366579.jpg?_wi=2",
-          imageAlt: "hand-dripped specialty coffee pour",
-        },
-        {
-          id: "2",
-          name: "Takarazuka Visitor",
-          handle: "@travel_enthusiast",
-          testimonial: "The atmosphere is unlike any other. Truly a Zen-Modern sanctuary.",
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-selective-closeup-shot-coffee-with-latte-art-blue-ceramic-cup-wooden-table_181624-1792.jpg?_wi=3",
-          imageAlt: "minimalist zen café interior dark wood",
-        },
-        {
-          id: "3",
-          name: "Coffee Enthusiast",
-          handle: "@bean_connoisseur",
-          testimonial: "Their rotating bean selection is phenomenal. A must-visit in Hyogo.",
-          imageSrc: "http://img.b2bpic.net/free-photo/lots-small-onions-shallots-bowls-top-view-dark-table_176474-2002.jpg?_wi=2",
-          imageAlt: "specialty coffee beans macro shot",
-        },
-        {
-          id: "4",
-          name: "Local Resident",
-          handle: "@nogami_life",
-          testimonial: "The perfect place to read a book and enjoy an exquisite pour-over.",
-          imageSrc: "http://img.b2bpic.net/free-photo/glass-cocktail-book-cellphone-digital-tablet-wooden-table-restaurant_23-2147936117.jpg?_wi=2",
-          imageAlt: "minimalist cafe quiet corner",
-        },
-        {
-          id: "5",
-          name: "Artisan Seeker",
-          handle: "@zen_minimalist",
-          testimonial: "The balance of flavor and silence here is profound. I return every Sunday.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-person-s-hand-holding-cup-coffee-surrounded-by-coffee-beans_23-2148028153.jpg?_wi=2",
-          imageAlt: "coffee brewing masterclass hand drip",
-        },
-      ]}
       title="Customer Stories"
-      description="Experience the peace our regulars cherish."
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
+      <ContactCTA
+      tag="Connect"
+      title="Join Our Coffee Circle"
+      description="Sign up to receive updates on limited-edition seasonal beans and upcoming brewing workshops at 讃喫茶室."
+      buttons={[{ text: "Sign Up" }]}
+      background={{ variant: "sparkles-gradient" }}
       useInvertedBackground={true}
-      background={{
-        variant: "sparkles-gradient",
-      }}
-      text="Join Our Coffee Circle. Sign up to receive updates on limited-edition seasonal beans and upcoming brewing workshops at 讃喫茶室."
-      buttons={[
-        {
-          text: "Reserve Your Experience",
-          href: "#",
-        },
-      ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
+      <FooterBaseCard
       logoText="讃喫茶室"
-      leftLink={{
-        text: "1-chōme-5-6 Nogami, Takarazuka",
-        href: "https://maps.google.com",
-      }}
-      rightLink={{
-        text: "Open Today: 10:00 - 18:00",
-        href: "#",
-      }}
+      columns={[
+        { title: "Location", items: [{ label: "1-chōme-5-6 Nogami, Takarazuka", href: "#" }] },
+        { title: "Hours", items: [{ label: "Open Today: 10:00 - 18:00", href: "#" }] }
+      ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}
\ No newline at end of file