diff --git a/src/index.css b/src/index.css
index c948a94..d05e092 100644
--- a/src/index.css
+++ b/src/index.css
@@ -5,15 +5,15 @@
 
 :root {
   /* @colorThemes/lightTheme/grayNavyBlue */
-  --background: #000000;
-  --card: #0c0c0c;
+  --background: #020617;
+  --card: #0f172a;
   --foreground: #ffffff;
-  --primary-cta: #106EFB;
-  --primary-cta-text: #ffffff;
-  --secondary-cta: #000000;
+  --primary-cta: #FACC15;
+  --primary-cta-text: #000000;
+  --secondary-cta: #1e293b;
   --secondary-cta-text: #ffffff;
   --accent: #535353;
-  --background-accent: #106EFB;
+  --background-accent: #2563eb;
 
   /* @layout/border-radius/rounded */
   --radius: 1.5rem;
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 11a392e..ac19331 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,224 +1,36 @@
-import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqSimple from '@/components/sections/faq/FaqSimple';
-import FeaturesArrowCards from '@/components/sections/features/FeaturesArrowCards';
-import FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
-import HeroBillboardBrand from '@/components/sections/hero/HeroBillboardBrand';
-import MetricsSimpleCards from '@/components/sections/metrics/MetricsSimpleCards';
-import TestimonialTrustCard from '@/components/sections/testimonial/TestimonialTrustCard';
-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. Non-block content (wrappers, non-inlinable sections) is
+// preserved inline; extracted section blocks become <XSection/> refs.
 
-export default function HomePage() {
+import React from 'react';
+import HeroSection from './HomePage/sections/Hero';
+import AboutSection from './HomePage/sections/About';
+import FeaturesSection from './HomePage/sections/Features';
+import ProductSection from './HomePage/sections/Product';
+import MetricsSection from './HomePage/sections/Metrics';
+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">
-          <HeroBillboardBrand
-      brand="Master Your Future at Follow Me Academy"
-      description="Accelerate your professional growth with industry-leading courses and a community built to help you scale."
-      primaryButton={{
-        text: "Enroll Now",
-        href: "#contact",
-      }}
-      secondaryButton={{
-        text: "Explore Curriculum",
-        href: "#features",
-      }}
-      imageSrc="http://img.b2bpic.net/free-photo/close-up-person-holding-smartphone_23-2148389008.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutMediaOverlay
-      tag="About Us"
-      title="Built for High-Achievers"
-      description="We bridge the gap between where you are and where you want to be through actionable content and expert-led mentorship."
-      imageSrc="http://img.b2bpic.net/free-photo/portrait-female-work-having-video-call_23-2148902305.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="features" data-section="features">
-    <SectionErrorBoundary name="features">
-          <FeaturesArrowCards
-      tag="Our Curriculum"
-      title="What We Deliver"
-      description="Comprehensive pathways designed to get you results."
-      items={[
-        {
-          title: "Strategic Skill Building",
-          tags: [
-            "Growth",
-            "Skills",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/young-employee-yawning-feeling-sleepy-desk-working-financial-business-report-office-exhausted-startup-worker-planning-investment-project-feeling-sleepy-night-tripod-shot_482257-63113.jpg",
-        },
-        {
-          title: "Data-Driven Success",
-          tags: [
-            "Analytics",
-            "Results",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/engineer-data-center-with-tablet-integrating-ai-driven-automation-tools_482257-125604.jpg",
-        },
-        {
-          title: "Global Community",
-          tags: [
-            "Networking",
-            "Global",
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/digital-art-inmersive-exhibition_23-2151428448.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FeaturesSection />
 
-  <div id="product" data-section="product">
-    <SectionErrorBoundary name="product">
-          <FeaturesImageBento
-      tag="Platform"
-      title="Academy Experience"
-      description="High-end tools to track your progress."
-      items={[
-        {
-          title: "Dashboard",
-          description: "Manage your journey.",
-          imageSrc: "http://img.b2bpic.net/free-photo/minimal-laptop-black-white-workspace-calm-tech-backdrop_169016-70803.jpg",
-        },
-        {
-          title: "Curriculum",
-          description: "Modules that matter.",
-          imageSrc: "http://img.b2bpic.net/free-photo/entrepreneur-analyzing-architectural-sketches-blueprints-his-home_482257-90908.jpg",
-        },
-        {
-          title: "Video Library",
-          description: "Expert insights.",
-          imageSrc: "http://img.b2bpic.net/free-photo/video-player-front-side_187299-39606.jpg",
-        },
-        {
-          title: "Analytics",
-          description: "See your growth.",
-          imageSrc: "http://img.b2bpic.net/free-photo/3d-modern-data-techncology-network-communications-design_1048-16342.jpg",
-        },
-        {
-          title: "Profile",
-          description: "Track achievements.",
-          imageSrc: "http://img.b2bpic.net/free-vector/infographic-element-collection_52683-6918.jpg",
-        },
-        {
-          title: "Progress",
-          description: "Visual feedback.",
-          imageSrc: "http://img.b2bpic.net/free-photo/team-business-colleagues-reviewing-statistics-sales-data_482257-89491.jpg",
-        },
-        {
-          title: "Community",
-          description: "Join the experts.",
-          imageSrc: "http://img.b2bpic.net/free-vector/instagram-post-template-with-notifications_23-2147822196.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ProductSection />
 
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsSimpleCards
-      tag="Impact"
-      title="By The Numbers"
-      description="Proven results for ambitious professionals."
-      metrics={[
-        {
-          value: "10K+",
-          description: "Active Students",
-        },
-        {
-          value: "500+",
-          description: "Success Stories",
-        },
-        {
-          value: "98%",
-          description: "Satisfaction Rate",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MetricsSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialTrustCard
-      quote="Follow Me Academy transformed my career path completely. The practical approach is unmatched."
-      rating={5}
-      author="Sarah J., Marketing Executive"
-      avatars={[
-        {
-          name: "Sarah J.",
-          imageSrc: "http://img.b2bpic.net/free-photo/confident-businessman-smiling_107420-84734.jpg",
-        },
-        {
-          name: "Mark L.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-optimistic-businessman-formalwear_1262-3600.jpg",
-        },
-        {
-          name: "Alex R.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg",
-        },
-        {
-          name: "Elena V.",
-          imageSrc: "http://img.b2bpic.net/free-photo/serious-executive-with-short-hair-crossed-arms_1149-89.jpg",
-        },
-        {
-          name: "David K.",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-black-blazer-portrait_23-2152009548.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqSimple
-      tag="Support"
-      title="Common Questions"
-      description="Everything you need to know."
-      items={[
-        {
-          question: "Is this suitable for beginners?",
-          answer: "Yes, our programs cater to all skill levels.",
-        },
-        {
-          question: "Can I access lessons offline?",
-          answer: "Yes, our mobile app supports offline viewing.",
-        },
-        {
-          question: "Is there a money-back guarantee?",
-          answer: "We offer a 30-day money-back guarantee.",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Join Today"
-      text="Ready to take the next step in your career?"
-      primaryButton={{
-        text: "Enroll Now",
-        href: "#",
-      }}
-      secondaryButton={{
-        text: "Contact Support",
-        href: "#",
-      }}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ContactSection />
     </>
   );
 }
diff --git a/src/pages/HomePage/sections/About.tsx b/src/pages/HomePage/sections/About.tsx
new file mode 100644
index 0000000..9a656d6
--- /dev/null
+++ b/src/pages/HomePage/sections/About.tsx
@@ -0,0 +1,21 @@
+// 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 AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+              <AboutMediaOverlay
+          tag="About Us"
+          title="Built for High-Achievers"
+          description="We bridge the gap between where you are and where you want to be through actionable content and expert-led mentorship."
+          imageSrc="http://img.b2bpic.net/free-photo/portrait-female-work-having-video-call_23-2148902305.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..6739e9a
--- /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="Join Today"
+          text="Ready to take the next step in your career?"
+          primaryButton={{
+            text: "Enroll Now",
+            href: "#",
+          }}
+          secondaryButton={{
+            text: "Contact Support",
+            href: "#",
+          }}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..19c96b8
--- /dev/null
+++ b/src/pages/HomePage/sections/Faq.tsx
@@ -0,0 +1,34 @@
+// 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 FaqSimple from '@/components/sections/faq/FaqSimple';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSection(): React.JSX.Element {
+  return (
+    <div id="faq" data-section="faq">
+        <SectionErrorBoundary name="faq">
+              <FaqSimple
+          tag="Support"
+          title="Common Questions"
+          description="Everything you need to know."
+          items={[
+            {
+              question: "Is this suitable for beginners?",
+              answer: "Yes, our programs cater to all skill levels.",
+            },
+            {
+              question: "Can I access lessons offline?",
+              answer: "Yes, our mobile app supports offline viewing.",
+            },
+            {
+              question: "Is there a money-back guarantee?",
+              answer: "We offer a 30-day money-back guarantee.",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Features.tsx b/src/pages/HomePage/sections/Features.tsx
new file mode 100644
index 0000000..b54ee03
--- /dev/null
+++ b/src/pages/HomePage/sections/Features.tsx
@@ -0,0 +1,46 @@
+// 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 FeaturesArrowCards from '@/components/sections/features/FeaturesArrowCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FeaturesSection(): React.JSX.Element {
+  return (
+    <div id="features" data-section="features">
+        <SectionErrorBoundary name="features">
+              <FeaturesArrowCards
+          tag="Our Curriculum"
+          title="What We Deliver"
+          description="Comprehensive pathways designed to get you results."
+          items={[
+            {
+              title: "Strategic Skill Building",
+              tags: [
+                "Growth",
+                "Skills",
+              ],
+              imageSrc: "http://img.b2bpic.net/free-photo/young-employee-yawning-feeling-sleepy-desk-working-financial-business-report-office-exhausted-startup-worker-planning-investment-project-feeling-sleepy-night-tripod-shot_482257-63113.jpg",
+            },
+            {
+              title: "Data-Driven Success",
+              tags: [
+                "Analytics",
+                "Results",
+              ],
+              imageSrc: "http://img.b2bpic.net/free-photo/engineer-data-center-with-tablet-integrating-ai-driven-automation-tools_482257-125604.jpg",
+            },
+            {
+              title: "Global Community",
+              tags: [
+                "Networking",
+                "Global",
+              ],
+              imageSrc: "http://img.b2bpic.net/free-photo/digital-art-inmersive-exhibition_23-2151428448.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..31a4858
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,28 @@
+// 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 HeroBillboardBrand from '@/components/sections/hero/HeroBillboardBrand';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroBillboardBrand
+          brand="Master Your Future at Follow Me Academy"
+          description="Accelerate your professional growth with industry-leading courses and a community built to help you scale."
+          primaryButton={{
+            text: "Enroll Now",
+            href: "#contact",
+          }}
+          secondaryButton={{
+            text: "Explore Curriculum",
+            href: "#features",
+          }}
+          imageSrc="http://img.b2bpic.net/free-photo/close-up-person-holding-smartphone_23-2148389008.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..2fbd946
--- /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="Impact"
+          title="By The Numbers"
+          description="Proven results for ambitious professionals."
+          metrics={[
+            {
+              value: "10K+",
+              description: "Active Students",
+            },
+            {
+              value: "500+",
+              description: "Success Stories",
+            },
+            {
+              value: "98%",
+              description: "Satisfaction Rate",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Product.tsx b/src/pages/HomePage/sections/Product.tsx
new file mode 100644
index 0000000..5ca4e36
--- /dev/null
+++ b/src/pages/HomePage/sections/Product.tsx
@@ -0,0 +1,57 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "product" section.
+
+import React from 'react';
+import FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ProductSection(): React.JSX.Element {
+  return (
+    <div id="product" data-section="product">
+        <SectionErrorBoundary name="product">
+              <FeaturesImageBento
+          tag="Platform"
+          title="Academy Experience"
+          description="High-end tools to track your progress."
+          items={[
+            {
+              title: "Dashboard",
+              description: "Manage your journey.",
+              imageSrc: "http://img.b2bpic.net/free-photo/minimal-laptop-black-white-workspace-calm-tech-backdrop_169016-70803.jpg",
+            },
+            {
+              title: "Curriculum",
+              description: "Modules that matter.",
+              imageSrc: "http://img.b2bpic.net/free-photo/entrepreneur-analyzing-architectural-sketches-blueprints-his-home_482257-90908.jpg",
+            },
+            {
+              title: "Video Library",
+              description: "Expert insights.",
+              imageSrc: "http://img.b2bpic.net/free-photo/video-player-front-side_187299-39606.jpg",
+            },
+            {
+              title: "Analytics",
+              description: "See your growth.",
+              imageSrc: "http://img.b2bpic.net/free-photo/3d-modern-data-techncology-network-communications-design_1048-16342.jpg",
+            },
+            {
+              title: "Profile",
+              description: "Track achievements.",
+              imageSrc: "http://img.b2bpic.net/free-vector/infographic-element-collection_52683-6918.jpg",
+            },
+            {
+              title: "Progress",
+              description: "Visual feedback.",
+              imageSrc: "http://img.b2bpic.net/free-photo/team-business-colleagues-reviewing-statistics-sales-data_482257-89491.jpg",
+            },
+            {
+              title: "Community",
+              description: "Join the experts.",
+              imageSrc: "http://img.b2bpic.net/free-vector/instagram-post-template-with-notifications_23-2147822196.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..4f99c4d
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,42 @@
+// 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 TestimonialTrustCard from '@/components/sections/testimonial/TestimonialTrustCard';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialTrustCard
+          quote="Follow Me Academy transformed my career path completely. The practical approach is unmatched."
+          rating={5}
+          author="Sarah J., Marketing Executive"
+          avatars={[
+            {
+              name: "Sarah J.",
+              imageSrc: "http://img.b2bpic.net/free-photo/confident-businessman-smiling_107420-84734.jpg",
+            },
+            {
+              name: "Mark L.",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-optimistic-businessman-formalwear_1262-3600.jpg",
+            },
+            {
+              name: "Alex R.",
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg",
+            },
+            {
+              name: "Elena V.",
+              imageSrc: "http://img.b2bpic.net/free-photo/serious-executive-with-short-hair-crossed-arms_1149-89.jpg",
+            },
+            {
+              name: "David K.",
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-black-blazer-portrait_23-2152009548.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}