diff --git a/src/index.css b/src/index.css
index c48795b..90b32d3 100644
--- a/src/index.css
+++ b/src/index.css
@@ -5,13 +5,13 @@
 
 :root {
   /* @colorThemes/lightTheme/grayNavyBlue */
-  --background: #0a0a0a;
-  --card: #1a1a1a;
-  --foreground: #f5f5f5;
+  --background: #ffffff;
+  --card: #f5f5f5;
+  --foreground: #0a0a0a;
   --primary-cta: #dfff1c;
   --primary-cta-text: #0a0a0a;
-  --secondary-cta: #1a1a1a;
-  --secondary-cta-text: #ffffff;
+  --secondary-cta: #f5f5f5;
+  --secondary-cta-text: #0a0a0a;
   --accent: #8b9a1b;
   --background-accent: #5d6b00;
 
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 1cbcf5d..1808608 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,307 +1,30 @@
-import AboutTestimonial from '@/components/sections/about/AboutTestimonial';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
-import FeaturesIconCards from '@/components/sections/features/FeaturesIconCards';
-import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
-import MetricsSimpleCards from '@/components/sections/metrics/MetricsSimpleCards';
-import PricingLayeredCards from '@/components/sections/pricing/PricingLayeredCards';
-import TeamOverlayCards from '@/components/sections/team/TeamOverlayCards';
-import TestimonialQuoteCards from '@/components/sections/testimonial/TestimonialQuoteCards';
-import { Activity, Apple, Users } from "lucide-react";
-import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+// AUTO-GENERATED shell by per-section-migrate.
+// Section bodies live in ./<PageBase>/sections/<X>.tsx. Edit the section
+// files directly; this shell only fixes render order.
 
-export default function HomePage() {
+import React from 'react';
+import HeroSection from './HomePage/sections/Hero';
+import FeaturesSection from './HomePage/sections/Features';
+import AboutSection from './HomePage/sections/About';
+import MetricsSection from './HomePage/sections/Metrics';
+import PricingSection from './HomePage/sections/Pricing';
+import TeamSection from './HomePage/sections/Team';
+import TestimonialsSection from './HomePage/sections/Testimonials';
+import FaqSection from './HomePage/sections/Faq';
+import ContactSection from './HomePage/sections/Contact';
+
+export default function HomePage(): React.JSX.Element {
   return (
     <>
-  <div id="hero" data-section="hero">
-    <SectionErrorBoundary name="hero">
-          <HeroBillboardCarousel
-      tag="Unleash Your Potential"
-      title="Forge Your Best Self"
-      description="Transform your body and mind with personalized training, expert guidance, and a community that empowers you every step of the way. Start your journey to strength, health, and confidence."
-      primaryButton={{
-        text: "Start Your Transformation",
-        href: "#pricing",
-      }}
-      secondaryButton={{
-        text: "Explore Programs",
-        href: "#features",
-      }}
-      items={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/full-length-portrait-muscular-adult-sportswoman_171337-8704.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/young-man-listening-music-warming-up_23-2148375912.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/mom-daughter-stretching-before-exercise_1153-4798.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-doing-burpees_23-2149445906.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-females-working-out-together_23-2148387792.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-nutrition-food-meal-planning_23-2149074210.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="features" data-section="features">
-    <SectionErrorBoundary name="features">
-          <FeaturesIconCards
-      tag="Our Core Offerings"
-      title="Tailored Fitness Solutions"
-      description="Discover a range of programs designed to meet your individual goals, whether you're a beginner or an experienced athlete."
-      features={[
-        {
-          icon: Activity,
-          title: "Personal Training",
-          description: "One-on-one sessions with certified trainers to maximize your results and ensure proper form.",
-        },
-        {
-          icon: Users,
-          title: "Group Classes",
-          description: "High-energy classes, from HIIT to yoga, fostering a motivating and supportive community spirit.",
-        },
-        {
-          icon: Apple,
-          title: "Nutrition Coaching",
-          description: "Expert advice and personalized meal plans to fuel your body effectively and sustainably.",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutTestimonial
-      tag="Our Philosophy"
-      quote="At FitForge, we believe fitness is a journey, not a destination. We're dedicated to building strong bodies, resilient minds, and empowering futures for every member."
-      author="Marcus Thorne"
-      role="Founder, FitForge"
-      imageSrc="http://img.b2bpic.net/free-photo/sporty-belly-woman-standing-isolated-dark-background_231208-10257.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsSimpleCards
-      tag="Our Impact"
-      title="Achieve Your Goals with Us"
-      description="Join a thriving community dedicated to health and progress. Our numbers speak for themselves."
-      metrics={[
-        {
-          value: "10+",
-          description: "Years of experience helping clients achieve peak fitness.",
-        },
-        {
-          value: "500+",
-          description: "Satisfied members who have transformed their lives.",
-        },
-        {
-          value: "95%",
-          description: "Client retention rate, reflecting our commitment to your success.",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="pricing" data-section="pricing">
-    <SectionErrorBoundary name="pricing">
-          <PricingLayeredCards
-      tag="Membership Plans"
-      title="Find Your Perfect Plan"
-      description="Choose from our flexible membership options to kickstart your fitness journey today. No hidden fees, just pure results."
-      plans={[
-        {
-          tag: "Basic",
-          price: "$49/month",
-          description: "Access to all gym facilities and basic group classes.",
-          primaryButton: {
-            text: "Join Basic",
-            href: "#contact",
-          },
-          features: [
-            "Full gym access",
-            "Unlimited group classes",
-            "Locker room access",
-          ],
-        },
-        {
-          tag: "Pro",
-          price: "$79/month",
-          description: "Enhanced access with personal training sessions and advanced classes.",
-          primaryButton: {
-            text: "Join Pro",
-            href: "#contact",
-          },
-          features: [
-            "Everything in Basic",
-            "2 personal training sessions/month",
-            "Access to advanced workshops",
-            "Nutritional guide",
-          ],
-        },
-        {
-          tag: "Elite",
-          price: "$129/month",
-          description: "The ultimate fitness experience with comprehensive support and VIP benefits.",
-          primaryButton: {
-            text: "Join Elite",
-            href: "#contact",
-          },
-          features: [
-            "Everything in Pro",
-            "Unlimited personal training",
-            "Custom meal plans",
-            "Priority booking",
-            "Exclusive merchandise",
-          ],
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="team" data-section="team">
-    <SectionErrorBoundary name="team">
-          <TeamOverlayCards
-      tag="Meet Our Experts"
-      title="Dedicated to Your Success"
-      description="Our team of certified professionals is here to guide, motivate, and support you every step of the way."
-      members={[
-        {
-          name: "Alex 'The Dynamo' Chen",
-          role: "Head Trainer",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-adult-doing-indoor-sport-gym_23-2149205541.jpg",
-        },
-        {
-          name: "Sophia 'Zen' Rodriguez",
-          role: "Yoga & Wellness Coach",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-yoga-instructor-mat_23-2148924666.jpg",
-        },
-        {
-          name: "David 'Ironclad' Kim",
-          role: "Strength & Conditioning Specialist",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-training-gym_23-2151717242.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialQuoteCards
-      tag="What Our Members Say"
-      title="Real Results, Real Stories"
-      description="Hear directly from our community about how FitForge has helped them achieve their fitness goals and transform their lives."
-      testimonials={[
-        {
-          name: "Sarah J.",
-          role: "Marketing Manager",
-          quote: "FitForge changed my life! The trainers are incredibly supportive, and the community aspect keeps me motivated every day. I've never felt stronger.",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-female-excited-pink_179666-2069.jpg",
-        },
-        {
-          name: "Michael T.",
-          role: "Software Engineer",
-          quote: "I was hesitant about joining a gym, but FitForge made it easy. The personalized plans really work, and I've seen amazing progress in just a few months.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-boxer-taking-break-from-training_23-2148416621.jpg",
-        },
-        {
-          name: "Emily R.",
-          role: "Graphic Designer",
-          quote: "The group classes are fantastic! So much energy and variety. It's more than just a gym; it's a place where I feel empowered and part of something great.",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-female-smiling-pink_179666-2195.jpg",
-        },
-        {
-          name: "David L.",
-          role: "Entrepreneur",
-          quote: "As a busy professional, I appreciate the flexibility and effectiveness of FitForge's programs. My energy levels are up, and I feel healthier than ever.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-muscular-male-athlete-looking-camera_23-2148162169.jpg",
-        },
-        {
-          name: "Jessica M.",
-          role: "Educator",
-          quote: "The nutrition coaching was a game-changer. It taught me how to fuel my body properly, complementing my workouts and accelerating my results.",
-          imageSrc: "http://img.b2bpic.net/free-photo/athletic-woman-exercising-outside_23-2148781798.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqTabbedAccordion
-      tag="Got Questions?"
-      title="Frequently Asked Questions"
-      description="Find quick answers to the most common inquiries about our gym, memberships, and services."
-      categories={[
-        {
-          name: "Membership",
-          items: [
-            {
-              question: "What are your membership options?",
-              answer: "We offer Basic, Pro, and Elite memberships, each with different benefits from gym access to personal training and nutritional coaching. Visit our 'Pricing' section for details.",
-            },
-            {
-              question: "Can I try a class before joining?",
-              answer: "Yes! We offer a complimentary trial class for all new prospective members. Please contact us to schedule your first session.",
-            },
-            {
-              question: "How do I cancel my membership?",
-              answer: "Memberships can be canceled with a 30-day written notice. Please speak with our front desk staff or contact us via email for assistance.",
-            },
-          ],
-        },
-        {
-          name: "Services",
-          items: [
-            {
-              question: "Do you offer personal training?",
-              answer: "Absolutely! Personal training is available with our Pro and Elite memberships, or you can purchase individual sessions. Our certified trainers will create a custom plan for you.",
-            },
-            {
-              question: "What kind of group classes do you have?",
-              answer: "Our diverse schedule includes HIIT, Yoga, Spin, Pilates, Bootcamp, and more. Check our class schedule online for the most up-to-date offerings.",
-            },
-            {
-              question: "Is nutrition coaching included?",
-              answer: "Nutrition coaching is a premium feature included with our Elite membership, and can be added to other plans for an additional fee.",
-            },
-          ],
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
-
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Ready to Transform?"
-      text="Join the FitForge Community Today!"
-      primaryButton={{
-        text: "Get Started Now",
-        href: "#pricing",
-      }}
-      secondaryButton={{
-        text: "Contact Us",
-        href: "mailto:info@fitforge.com",
-      }}
-    />
-    </SectionErrorBoundary>
-  </div>
+      <HeroSection />
+      <FeaturesSection />
+      <AboutSection />
+      <MetricsSection />
+      <PricingSection />
+      <TeamSection />
+      <TestimonialsSection />
+      <FaqSection />
+      <ContactSection />
     </>
   );
 }
diff --git a/src/pages/HomePage/sections/About.tsx b/src/pages/HomePage/sections/About.tsx
new file mode 100644
index 0000000..3341196
--- /dev/null
+++ b/src/pages/HomePage/sections/About.tsx
@@ -0,0 +1,22 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "about" section.
+
+import React from 'react';
+import AboutTestimonial from '@/components/sections/about/AboutTestimonial';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+              <AboutTestimonial
+          tag="Our Philosophy"
+          quote="At FitForge, we believe fitness is a journey, not a destination. We're dedicated to building strong bodies, resilient minds, and empowering futures for every member."
+          author="Marcus Thorne"
+          role="Founder, FitForge"
+          imageSrc="http://img.b2bpic.net/free-photo/sporty-belly-woman-standing-isolated-dark-background_231208-10257.jpg"
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Contact.tsx b/src/pages/HomePage/sections/Contact.tsx
new file mode 100644
index 0000000..d6e863f
--- /dev/null
+++ b/src/pages/HomePage/sections/Contact.tsx
@@ -0,0 +1,27 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "contact" section.
+
+import React from 'react';
+import ContactCta from '@/components/sections/contact/ContactCta';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ContactSection(): React.JSX.Element {
+  return (
+    <div id="contact" data-section="contact">
+        <SectionErrorBoundary name="contact">
+              <ContactCta
+          tag="Ready to Transform?"
+          text="Join the FitForge Community Today!"
+          primaryButton={{
+            text: "Get Started Now",
+            href: "#pricing",
+          }}
+          secondaryButton={{
+            text: "Contact Us",
+            href: "mailto:info@fitforge.com",
+          }}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..c4b633d
--- /dev/null
+++ b/src/pages/HomePage/sections/Faq.tsx
@@ -0,0 +1,56 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "faq" section.
+
+import React from 'react';
+import FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSection(): React.JSX.Element {
+  return (
+    <div id="faq" data-section="faq">
+        <SectionErrorBoundary name="faq">
+              <FaqTabbedAccordion
+          tag="Got Questions?"
+          title="Frequently Asked Questions"
+          description="Find quick answers to the most common inquiries about our gym, memberships, and services."
+          categories={[
+            {
+              name: "Membership",
+              items: [
+                {
+                  question: "What are your membership options?",
+                  answer: "We offer Basic, Pro, and Elite memberships, each with different benefits from gym access to personal training and nutritional coaching. Visit our 'Pricing' section for details.",
+                },
+                {
+                  question: "Can I try a class before joining?",
+                  answer: "Yes! We offer a complimentary trial class for all new prospective members. Please contact us to schedule your first session.",
+                },
+                {
+                  question: "How do I cancel my membership?",
+                  answer: "Memberships can be canceled with a 30-day written notice. Please speak with our front desk staff or contact us via email for assistance.",
+                },
+              ],
+            },
+            {
+              name: "Services",
+              items: [
+                {
+                  question: "Do you offer personal training?",
+                  answer: "Absolutely! Personal training is available with our Pro and Elite memberships, or you can purchase individual sessions. Our certified trainers will create a custom plan for you.",
+                },
+                {
+                  question: "What kind of group classes do you have?",
+                  answer: "Our diverse schedule includes HIIT, Yoga, Spin, Pilates, Bootcamp, and more. Check our class schedule online for the most up-to-date offerings.",
+                },
+                {
+                  question: "Is nutrition coaching included?",
+                  answer: "Nutrition coaching is a premium feature included with our Elite membership, and can be added to other plans for an additional fee.",
+                },
+              ],
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Features.tsx b/src/pages/HomePage/sections/Features.tsx
new file mode 100644
index 0000000..4a5b69c
--- /dev/null
+++ b/src/pages/HomePage/sections/Features.tsx
@@ -0,0 +1,38 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "features" section.
+
+import React from 'react';
+import FeaturesIconCards from '@/components/sections/features/FeaturesIconCards';
+import { Activity, Apple, Users } from "lucide-react";
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FeaturesSection(): React.JSX.Element {
+  return (
+    <div id="features" data-section="features">
+        <SectionErrorBoundary name="features">
+              <FeaturesIconCards
+          tag="Our Core Offerings"
+          title="Tailored Fitness Solutions"
+          description="Discover a range of programs designed to meet your individual goals, whether you're a beginner or an experienced athlete."
+          features={[
+            {
+              icon: Activity,
+              title: "Personal Training",
+              description: "One-on-one sessions with certified trainers to maximize your results and ensure proper form.",
+            },
+            {
+              icon: Users,
+              title: "Group Classes",
+              description: "High-energy classes, from HIIT to yoga, fostering a motivating and supportive community spirit.",
+            },
+            {
+              icon: Apple,
+              title: "Nutrition Coaching",
+              description: "Expert advice and personalized meal plans to fuel your body effectively and sustainably.",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..1e73492
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,48 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "hero" section.
+
+import React from 'react';
+import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroBillboardCarousel
+          tag="Unleash Your Potential"
+          title="Forge Your Best Self"
+          description="Transform your body and mind with personalized training, expert guidance, and a community that empowers you every step of the way. Start your journey to strength, health, and confidence."
+          primaryButton={{
+            text: "Start Your Transformation",
+            href: "#pricing",
+          }}
+          secondaryButton={{
+            text: "Explore Programs",
+            href: "#features",
+          }}
+          items={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/full-length-portrait-muscular-adult-sportswoman_171337-8704.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/young-man-listening-music-warming-up_23-2148375912.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/mom-daughter-stretching-before-exercise_1153-4798.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-doing-burpees_23-2149445906.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-females-working-out-together_23-2148387792.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-nutrition-food-meal-planning_23-2149074210.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Metrics.tsx b/src/pages/HomePage/sections/Metrics.tsx
new file mode 100644
index 0000000..9ebcdf1
--- /dev/null
+++ b/src/pages/HomePage/sections/Metrics.tsx
@@ -0,0 +1,34 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "metrics" section.
+
+import React from 'react';
+import MetricsSimpleCards from '@/components/sections/metrics/MetricsSimpleCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function MetricsSection(): React.JSX.Element {
+  return (
+    <div id="metrics" data-section="metrics">
+        <SectionErrorBoundary name="metrics">
+              <MetricsSimpleCards
+          tag="Our Impact"
+          title="Achieve Your Goals with Us"
+          description="Join a thriving community dedicated to health and progress. Our numbers speak for themselves."
+          metrics={[
+            {
+              value: "10+",
+              description: "Years of experience helping clients achieve peak fitness.",
+            },
+            {
+              value: "500+",
+              description: "Satisfied members who have transformed their lives.",
+            },
+            {
+              value: "95%",
+              description: "Client retention rate, reflecting our commitment to your success.",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Pricing.tsx b/src/pages/HomePage/sections/Pricing.tsx
new file mode 100644
index 0000000..57d14d6
--- /dev/null
+++ b/src/pages/HomePage/sections/Pricing.tsx
@@ -0,0 +1,67 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "pricing" section.
+
+import React from 'react';
+import PricingLayeredCards from '@/components/sections/pricing/PricingLayeredCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function PricingSection(): React.JSX.Element {
+  return (
+    <div id="pricing" data-section="pricing">
+        <SectionErrorBoundary name="pricing">
+              <PricingLayeredCards
+          tag="Membership Plans"
+          title="Find Your Perfect Plan"
+          description="Choose from our flexible membership options to kickstart your fitness journey today. No hidden fees, just pure results."
+          plans={[
+            {
+              tag: "Basic",
+              price: "$49/month",
+              description: "Access to all gym facilities and basic group classes.",
+              primaryButton: {
+                text: "Join Basic",
+                href: "#contact",
+              },
+              features: [
+                "Full gym access",
+                "Unlimited group classes",
+                "Locker room access",
+              ],
+            },
+            {
+              tag: "Pro",
+              price: "$79/month",
+              description: "Enhanced access with personal training sessions and advanced classes.",
+              primaryButton: {
+                text: "Join Pro",
+                href: "#contact",
+              },
+              features: [
+                "Everything in Basic",
+                "2 personal training sessions/month",
+                "Access to advanced workshops",
+                "Nutritional guide",
+              ],
+            },
+            {
+              tag: "Elite",
+              price: "$129/month",
+              description: "The ultimate fitness experience with comprehensive support and VIP benefits.",
+              primaryButton: {
+                text: "Join Elite",
+                href: "#contact",
+              },
+              features: [
+                "Everything in Pro",
+                "Unlimited personal training",
+                "Custom meal plans",
+                "Priority booking",
+                "Exclusive merchandise",
+              ],
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Team.tsx b/src/pages/HomePage/sections/Team.tsx
new file mode 100644
index 0000000..4cabd8f
--- /dev/null
+++ b/src/pages/HomePage/sections/Team.tsx
@@ -0,0 +1,37 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "team" section.
+
+import React from 'react';
+import TeamOverlayCards from '@/components/sections/team/TeamOverlayCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TeamSection(): React.JSX.Element {
+  return (
+    <div id="team" data-section="team">
+        <SectionErrorBoundary name="team">
+              <TeamOverlayCards
+          tag="Meet Our Experts"
+          title="Dedicated to Your Success"
+          description="Our team of certified professionals is here to guide, motivate, and support you every step of the way."
+          members={[
+            {
+              name: "Alex 'The Dynamo' Chen",
+              role: "Head Trainer",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-adult-doing-indoor-sport-gym_23-2149205541.jpg",
+            },
+            {
+              name: "Sophia 'Zen' Rodriguez",
+              role: "Yoga & Wellness Coach",
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-yoga-instructor-mat_23-2148924666.jpg",
+            },
+            {
+              name: "David 'Ironclad' Kim",
+              role: "Strength & Conditioning Specialist",
+              imageSrc: "http://img.b2bpic.net/free-photo/man-training-gym_23-2151717242.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Testimonials.tsx b/src/pages/HomePage/sections/Testimonials.tsx
new file mode 100644
index 0000000..e52045a
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,52 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "testimonials" section.
+
+import React from 'react';
+import TestimonialQuoteCards from '@/components/sections/testimonial/TestimonialQuoteCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialQuoteCards
+          tag="What Our Members Say"
+          title="Real Results, Real Stories"
+          description="Hear directly from our community about how FitForge has helped them achieve their fitness goals and transform their lives."
+          testimonials={[
+            {
+              name: "Sarah J.",
+              role: "Marketing Manager",
+              quote: "FitForge changed my life! The trainers are incredibly supportive, and the community aspect keeps me motivated every day. I've never felt stronger.",
+              imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-female-excited-pink_179666-2069.jpg",
+            },
+            {
+              name: "Michael T.",
+              role: "Software Engineer",
+              quote: "I was hesitant about joining a gym, but FitForge made it easy. The personalized plans really work, and I've seen amazing progress in just a few months.",
+              imageSrc: "http://img.b2bpic.net/free-photo/woman-boxer-taking-break-from-training_23-2148416621.jpg",
+            },
+            {
+              name: "Emily R.",
+              role: "Graphic Designer",
+              quote: "The group classes are fantastic! So much energy and variety. It's more than just a gym; it's a place where I feel empowered and part of something great.",
+              imageSrc: "http://img.b2bpic.net/free-photo/front-view-young-female-smiling-pink_179666-2195.jpg",
+            },
+            {
+              name: "David L.",
+              role: "Entrepreneur",
+              quote: "As a busy professional, I appreciate the flexibility and effectiveness of FitForge's programs. My energy levels are up, and I feel healthier than ever.",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-muscular-male-athlete-looking-camera_23-2148162169.jpg",
+            },
+            {
+              name: "Jessica M.",
+              role: "Educator",
+              quote: "The nutrition coaching was a game-changer. It taught me how to fuel my body properly, complementing my workouts and accelerating my results.",
+              imageSrc: "http://img.b2bpic.net/free-photo/athletic-woman-exercising-outside_23-2148781798.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}