diff --git a/src/index.css b/src/index.css
index 650e370..4d58922 100644
--- a/src/index.css
+++ b/src/index.css
@@ -5,15 +5,15 @@
 
 :root {
   /* @colorThemes/lightTheme/grayNavyBlue */
-  --background: #ffffff;
-  --card: #f9f9f9;
-  --foreground: #0a0a0a;
-  --primary-cta: #0a0a0a;
-  --primary-cta-text: #ffffff;
-  --secondary-cta: #ffffff;
-  --secondary-cta-text: #0a0a0a;
-  --accent: #e5e5e5;
-  --background-accent: #e5e5e5;
+  --background: #0a0a0a;
+  --card: #1a1a1a;
+  --foreground: #ffffff;
+  --primary-cta: #ffffff;
+  --primary-cta-text: #0a0a0a;
+  --secondary-cta: #1a1a1a;
+  --secondary-cta-text: #ffffff;
+  --accent: #333333;
+  --background-accent: #333333;
 
   /* @layout/border-radius/rounded */
   --radius: 1.5rem;
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 217db65..95baa71 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,166 +1,27 @@
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
-import FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
-import HeroBrand from '@/components/sections/hero/HeroBrand';
-import TestimonialOverlayCards from '@/components/sections/testimonial/TestimonialOverlayCards';
-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 FeaturedSection from './HomePage/sections/Featured';
+import TestimonialsSection from './HomePage/sections/Testimonials';
+import FaqSectionSection from './HomePage/sections/FaqSection';
+import ContactCtaSection from './HomePage/sections/ContactCta';
+
+export default function HomePage(): React.JSX.Element {
   return (
-    <>
-  <div id="hero" data-section="hero">
-    <SectionErrorBoundary name="hero">
-          <HeroBrand
-      brand="Apex Athletics"
-      description="Built for Performance. Designed for Everyday."
-      primaryButton={{
-        text: "Shop Shorts",
-        href: "/shop",
-      }}
-      secondaryButton={{
-        text: "Learn More",
-        href: "/about",
-      }}
-      imageSrc="http://img.b2bpic.net/free-photo/man-athletic-wear-posing-stairs-outdoors_23-2148773867.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="featured" data-section="featured">
-    <SectionErrorBoundary name="featured">
-          <FeaturesImageBento
-      tag="Collection"
-      title="Built for Performance"
-      description="Engineered with four-way stretch fabric and sweat-wicking technology to keep you moving."
-      items={[
-        {
-          title: "5-Inch Inseam",
-          description: "Designed for range of motion.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-wool-texture-details_23-2149620438.jpg",
-        },
-        {
-          title: "Sweat-Wicking",
-          description: "Stay dry during intense sessions.",
-          imageSrc: "http://img.b2bpic.net/free-photo/pretty-woman-lifting-dumbbells-road_23-2147775512.jpg",
-        },
-        {
-          title: "Hidden Pockets",
-          description: "Secure storage for your essentials.",
-          imageSrc: "http://img.b2bpic.net/free-photo/tablet-near-shorts-fruits_23-2147750737.jpg",
-        },
-        {
-          title: "Precision Fit",
-          description: "Contours to your physique.",
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-woman-posing-with-closed-eyes_176420-3995.jpg",
-        },
-        {
-          title: "Performance Fabric",
-          description: "Lightweight and durable.",
-          imageSrc: "http://img.b2bpic.net/free-photo/sportswoman_23-2148023661.jpg",
-        },
-        {
-          title: "Four-Way Stretch",
-          description: "Ultimate mobility in every move.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-gym-suit-indoors_23-2148267255.jpg",
-        },
-        {
-          title: "Everyday Comfort",
-          description: "From gym to the street.",
-          imageSrc: "http://img.b2bpic.net/free-photo/fruits-near-shorts_23-2147750735.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FeaturedSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialOverlayCards
-      tag="Reviews"
-      title="What Our Athletes Say"
-      description="Hear from thousands of athletes performing at their best."
-      testimonials={[
-        {
-          name: "Alex R.",
-          role: "Crossfit Athlete",
-          company: "Elite Gains",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-smiling-handsome-redhead-model-man-flannel-shirt-gray-background_613910-19110.jpg",
-        },
-        {
-          name: "Marcus B.",
-          role: "Bodybuilder",
-          company: "Iron Mind",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-adult-doing-indoor-sport-gym_23-2149205541.jpg",
-        },
-        {
-          name: "David L.",
-          role: "Running Enthusiast",
-          company: "RunFast",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-sportive-girl-posing-with-crossed-arms-dark-wall_176420-623.jpg",
-        },
-        {
-          name: "Sam T.",
-          role: "Personal Trainer",
-          company: "FitLab",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/confident-african-american-businessman-black-classic-jacket-isolated-dark-background_613910-17869.jpg",
-        },
-        {
-          name: "Chris J.",
-          role: "Powerlifter",
-          company: "MaxStrength",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/sporty-woman-sportswear-resting-bench-fitness_1153-9779.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq-section" data-section="faq-section">
-    <SectionErrorBoundary name="faq-section">
-          <FaqTabbedAccordion
-      tag="Support"
-      title="Frequently Asked Questions"
-      description="Have questions? We have answers."
-      categories={[
-        {
-          name: "General",
-          items: [
-            {
-              question: "What is the return policy?",
-              answer: "We offer a 30-day return policy on all unworn items.",
-            },
-            {
-              question: "Are these shorts sweat-wicking?",
-              answer: "Yes, our proprietary fabric wicks moisture away instantly.",
-            },
-          ],
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSectionSection />
 
-  <div id="contact-cta" data-section="contact-cta">
-    <SectionErrorBoundary name="contact-cta">
-          <ContactCta
-      tag="Join Us"
-      text="Join the community. Sign up for exclusive drops."
-      primaryButton={{
-        text: "Newsletter Signup",
-        href: "/contact",
-      }}
-      secondaryButton={{
-        text: "Contact Support",
-        href: "/contact",
-      }}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ContactCtaSection />
     </>
   );
 }
diff --git a/src/pages/HomePage/sections/ContactCta.tsx b/src/pages/HomePage/sections/ContactCta.tsx
new file mode 100644
index 0000000..bf33a7e
--- /dev/null
+++ b/src/pages/HomePage/sections/ContactCta.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-cta" section.
+
+import React from 'react';
+import ContactCta from '@/components/sections/contact/ContactCta';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ContactCtaSection(): React.JSX.Element {
+  return (
+    <div id="contact-cta" data-section="contact-cta">
+        <SectionErrorBoundary name="contact-cta">
+              <ContactCta
+          tag="Join Us"
+          text="Join the community. Sign up for exclusive drops."
+          primaryButton={{
+            text: "Newsletter Signup",
+            href: "/contact",
+          }}
+          secondaryButton={{
+            text: "Contact Support",
+            href: "/contact",
+          }}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/FaqSection.tsx b/src/pages/HomePage/sections/FaqSection.tsx
new file mode 100644
index 0000000..eec84a2
--- /dev/null
+++ b/src/pages/HomePage/sections/FaqSection.tsx
@@ -0,0 +1,35 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "faq-section" section.
+
+import React from 'react';
+import FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSectionSection(): React.JSX.Element {
+  return (
+    <div id="faq-section" data-section="faq-section">
+        <SectionErrorBoundary name="faq-section">
+              <FaqTabbedAccordion
+          tag="Support"
+          title="Frequently Asked Questions"
+          description="Have questions? We have answers."
+          categories={[
+            {
+              name: "General",
+              items: [
+                {
+                  question: "What is the return policy?",
+                  answer: "We offer a 30-day return policy on all unworn items.",
+                },
+                {
+                  question: "Are these shorts sweat-wicking?",
+                  answer: "Yes, our proprietary fabric wicks moisture away instantly.",
+                },
+              ],
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Featured.tsx b/src/pages/HomePage/sections/Featured.tsx
new file mode 100644
index 0000000..9aba410
--- /dev/null
+++ b/src/pages/HomePage/sections/Featured.tsx
@@ -0,0 +1,21 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "featured" section.
+
+import React from 'react';
+import FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FeaturedSection(): React.JSX.Element {
+  return (
+    <div id="featured" data-section="featured">
+        <SectionErrorBoundary name="featured">
+              <FeaturesImageBento
+        tag="Collection"
+        title="Built for Performance"
+        description="Engineered with four-way stretch fabric and sweat-wicking technology to keep you moving. Featuring a 5-inch inseam and hidden zipper pockets."
+        items={[{"title":"5-Inch Inseam","imageSrc":"https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.jpg","description":"Designed for range of motion."},{"title":"Sweat-Wicking","imageSrc":"https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.jpg","description":"Stay dry during intense sessions."},{"description":"Secure storage for your essentials.","title":"Hidden Pockets","imageSrc":"https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.jpg"},{"title":"Precision Fit","imageSrc":"https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.jpg","description":"Contours to your physique."},{"description":"Lightweight and durable.","imageSrc":"https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.jpg","title":"Performance Fabric"},{"description":"Ultimate mobility in every move.","imageSrc":"https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.jpg","title":"Four-Way Stretch"},{"imageSrc":"https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.jpg","title":"Everyday Comfort","description":"From gym to the street."}]}
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..2ca0390
--- /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 HeroBrand from '@/components/sections/hero/HeroBrand';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroBrand
+        brand="Apex Athletics"
+        description="Built for Performance. Designed for Everyday."
+        primaryButton={{
+            text: "Shop Shorts",
+            href: "/shop",
+          }}
+        secondaryButton={{
+            text: "Learn More",
+            href: "/about",
+          }}
+        imageSrc="https://ae01.alicdn.com/kf/S5502a39b359f4f358645d94726487e41q/Pantalones-cortos-deportivos-de-secado-r-pido-para-hombre-Shorts-de-entrenamiento-para-correr-Fitness-gimnasio.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..ce4f39d
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,57 @@
+// 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 TestimonialOverlayCards from '@/components/sections/testimonial/TestimonialOverlayCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialOverlayCards
+          tag="Reviews"
+          title="What Our Athletes Say"
+          description="Hear from thousands of athletes performing at their best."
+          testimonials={[
+            {
+              name: "Alex R.",
+              role: "Crossfit Athlete",
+              company: "Elite Gains",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/young-smiling-handsome-redhead-model-man-flannel-shirt-gray-background_613910-19110.jpg",
+            },
+            {
+              name: "Marcus B.",
+              role: "Bodybuilder",
+              company: "Iron Mind",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/young-adult-doing-indoor-sport-gym_23-2149205541.jpg",
+            },
+            {
+              name: "David L.",
+              role: "Running Enthusiast",
+              company: "RunFast",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/beautiful-sportive-girl-posing-with-crossed-arms-dark-wall_176420-623.jpg",
+            },
+            {
+              name: "Sam T.",
+              role: "Personal Trainer",
+              company: "FitLab",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/confident-african-american-businessman-black-classic-jacket-isolated-dark-background_613910-17869.jpg",
+            },
+            {
+              name: "Chris J.",
+              role: "Powerlifter",
+              company: "MaxStrength",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/sporty-woman-sportswear-resting-bench-fitness_1153-9779.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}