Update src/app/styles/variables.css

Update src/app/services/page.tsx
Update src/app/page.tsx
2026-04-17 23:50:59 +00:00 · 2026-04-17 23:50:59 +00:00 · 2026-04-17 23:50:58 +00:00 · 2026-04-17 23:50:58 +00:00 · 2026-04-17 23:50:57 +00:00 · 2026-04-17 23:41:26 +00:00
5 changed files with 101 additions and 293 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -27,27 +27,17 @@ export default function LandingPage() {
      <NavbarLayoutFloatingOverlay
      navItems={[
        {
-          name: "Home",
-          id: "/",
-        },
+          name: "Home",          id: "/"},
        {
-          name: "Services",
-          id: "/services",
-        },
+          name: "Services",          id: "/services"},
        {
-          name: "About Ray",
-          id: "/about",
-        },
+          name: "About Ray",          id: "/about"},
        {
-          name: "Contact",
-          id: "/contact",
-        },
+          name: "Contact",          id: "/contact"},
      ]}
      brandName="Kinsley HVAC"
      button={{
-        text: "(555) 555-5555",
-        href: "tel:5555555555",
-      }}
+        text: "(555) 555-5555",        href: "tel:5555555555"}}
    />
  </div>

@@ -58,19 +48,13 @@ export default function LandingPage() {
      metrics={[
        {
          icon: Award,
-          label: "Years of Craft",
-          value: "20+",
-        },
+          label: "Years of Craft",          value: "20+"},
        {
          icon: Shield,
-          label: "Guaranteed Work",
-          value: "100%",
-        },
+          label: "Guaranteed Work",          value: "100%"},
        {
          icon: CheckCircle,
-          label: "Transparent Jobs",
-          value: "1000+",
-        },
+          label: "Transparent Jobs",          value: "1000+"},
      ]}
      metricsAnimation="slide-up"
    />
@@ -85,19 +69,9 @@ export default function LandingPage() {
      description="The numbers behind our dedication."
      metrics={[
        {
-          id: "m1",
-          value: "20+",
-          title: "Years Experience",
-          description: "Hands-on expertise.",
-          imageSrc: "http://img.b2bpic.net/free-photo/electrical-technician-looking-focused-while-working-switchboard-with-fuses_169016-23720.jpg",
-        },
+          id: "m1",          value: "20+",          title: "Years Experience",          description: "Hands-on expertise.",          imageSrc: "https://images.unsplash.com/photo-1581092160607-ee22621dd758?q=80&w=800&auto=format&fit=crop"},
        {
-          id: "m2",
-          value: "100%",
-          title: "Customer Satisfaction",
-          description: "Our highest priority.",
-          imageSrc: "http://img.b2bpic.net/free-photo/specialist-phone-with-home-owner_482257-80143.jpg",
-        },
+          id: "m2",          value: "100%",          title: "Customer Satisfaction",          description: "Our highest priority.",          imageSrc: "https://images.unsplash.com/photo-1556740738-b6a63e27c4df?q=80&w=800&auto=format&fit=crop"},
      ]}
    />
  </div>
@@ -108,29 +82,19 @@ export default function LandingPage() {
        {
          items: [
            {
-              label: "Services",
-              href: "/services",
-            },
+              label: "Services",              href: "/services"},
            {
-              label: "About Ray",
-              href: "/about",
-            },
+              label: "About Ray",              href: "/about"},
            {
-              label: "Schedule Service",
-              href: "/contact",
-            },
+              label: "Schedule Service",              href: "/contact"},
          ],
        },
        {
          items: [
            {
-              label: "Terms of Service",
-              href: "#",
-            },
+              label: "Terms of Service",              href: "#"},
            {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
          ],
        },
      ]}
@@ -140,4 +104,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -26,27 +26,17 @@ export default function LandingPage() {
      <NavbarLayoutFloatingOverlay
      navItems={[
        {
-          name: "Home",
-          id: "/",
-        },
+          name: "Home",          id: "/"},
        {
-          name: "Services",
-          id: "/services",
-        },
+          name: "Services",          id: "/services"},
        {
-          name: "About Ray",
-          id: "/about",
-        },
+          name: "About Ray",          id: "/about"},
        {
-          name: "Contact",
-          id: "/contact",
-        },
+          name: "Contact",          id: "/contact"},
      ]}
      brandName="Kinsley HVAC"
      button={{
-        text: "(555) 555-5555",
-        href: "tel:5555555555",
-      }}
+        text: "(555) 555-5555",        href: "tel:5555555555"}}
    />
  </div>

@@ -54,8 +44,7 @@ export default function LandingPage() {
      <ContactCenter
      useInvertedBackground={false}
      background={{
-        variant: "plain",
-      }}
+        variant: "plain"}}
      tag="Let's Talk"
      title="Schedule Your Service"
      description="Fill out the form below and we'll get back to you within 24 hours to schedule Ray for a visit."
@@ -66,14 +55,11 @@ export default function LandingPage() {
      <ContactText
      useInvertedBackground={false}
      background={{
-        variant: "plain",
-      }}
+        variant: "plain"}}
      text="Don't suffer in extreme temperatures. Call Ray today for a prompt, honest visit and let's get your home back to its perfect comfort level."
      buttons={[
        {
-          text: "Call Now",
-          href: "tel:5555555555",
-        },
+          text: "Call Now",          href: "tel:5555555555"},
      ]}
    />
  </div>
@@ -84,29 +70,19 @@ export default function LandingPage() {
        {
          items: [
            {
-              label: "Services",
-              href: "/services",
-            },
+              label: "Services",              href: "/services"},
            {
-              label: "About Ray",
-              href: "/about",
-            },
+              label: "About Ray",              href: "/about"},
            {
-              label: "Schedule Service",
-              href: "/contact",
-            },
+              label: "Schedule Service",              href: "/contact"},
          ],
        },
        {
          items: [
            {
-              label: "Terms of Service",
-              href: "#",
-            },
+              label: "Terms of Service",              href: "#"},
            {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
          ],
        },
      ]}
@@ -116,4 +92,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -29,93 +29,58 @@ export default function LandingPage() {
      <NavbarLayoutFloatingOverlay
      navItems={[
        {
-          name: "Home",
-          id: "/",
-        },
+          name: "Home",          id: "/"},
        {
-          name: "Services",
-          id: "/services",
-        },
+          name: "Services",          id: "/services"},
        {
-          name: "About Ray",
-          id: "/about",
-        },
+          name: "About Ray",          id: "/about"},
        {
-          name: "Contact",
-          id: "/contact",
-        },
+          name: "Contact",          id: "/contact"},
      ]}
      brandName="Kinsley HVAC"
      button={{
-        text: "(555) 555-5555",
-        href: "tel:5555555555",
-      }}
+        text: "(555) 555-5555",        href: "tel:5555555555"}}
    />
  </div>

  <div id="home-hero" data-section="home-hero">
      <HeroSplit
      background={{
-        variant: "gradient-bars",
-      }}
+        variant: "gradient-bars"}}
      title="Honest HVAC Service. No Upsells. Just Fixed."
      description="Ray is the local HVAC tech your neighbors actually recommend. Serving our community with transparent diagnostics, fair pricing, and expert repairs you can count on."
      buttons={[
        {
-          text: "Schedule Service",
-          href: "/contact",
-        },
+          text: "Schedule Service",          href: "/contact"},
        {
-          text: "Call Ray",
-          href: "tel:5555555555",
-        },
+          text: "Call Ray",          href: "tel:5555555555"},
      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/young-worker-raising-hands-helpless-manner-uniform-looking-upset-front-view_176474-21722.jpg?_wi=1"
+      imageSrc="https://images.unsplash.com/photo-1621905251189-08b45d6a268e?q=80&w=800&auto=format&fit=crop"
      mediaAnimation="slide-up"
      avatars={[
        {
-          src: "http://img.b2bpic.net/free-photo/handsome-businessman-holding-jacket-shoulder-with-headphones-with-microphone-looking-camera-with-smile-face-showing-thumbs-up-standing-white-background_141793-53875.jpg",
-          alt: "Satisfied customer",
-        },
+          src: "http://img.b2bpic.net/free-photo/handsome-businessman-holding-jacket-shoulder-with-headphones-with-microphone-looking-camera-with-smile-face-showing-thumbs-up-standing-white-background_141793-53875.jpg",          alt: "Satisfied customer"},
        {
-          src: "http://img.b2bpic.net/free-photo/man-having-online-meeting-work_23-2148940751.jpg",
-          alt: "Satisfied customer",
-        },
+          src: "http://img.b2bpic.net/free-photo/man-having-online-meeting-work_23-2148940751.jpg",          alt: "Satisfied customer"},
        {
-          src: "http://img.b2bpic.net/free-photo/optimistic-confident-carefree-chill-african-american-female_176420-31297.jpg",
-          alt: "Satisfied customer",
-        },
+          src: "http://img.b2bpic.net/free-photo/optimistic-confident-carefree-chill-african-american-female_176420-31297.jpg",          alt: "Satisfied customer"},
        {
-          src: "http://img.b2bpic.net/free-photo/smiling-handsome-man-holding-her-girlfriend-s-hand_23-2147891265.jpg",
-          alt: "Satisfied customer",
-        },
+          src: "http://img.b2bpic.net/free-photo/smiling-handsome-man-holding-her-girlfriend-s-hand_23-2147891265.jpg",          alt: "Satisfied customer"},
        {
-          src: "http://img.b2bpic.net/free-photo/beauty-style-fashion-femininity-concept-positive-beautiful-young-european-woman-blue-shirt-looking-camera-with-broad-happy-smile-being-good-mood-kitchen-interior-background_343059-2087.jpg",
-          alt: "Satisfied customer",
-        },
+          src: "http://img.b2bpic.net/free-photo/beauty-style-fashion-femininity-concept-positive-beautiful-young-european-woman-blue-shirt-looking-camera-with-broad-happy-smile-being-good-mood-kitchen-interior-background_343059-2087.jpg",          alt: "Satisfied customer"},
      ]}
      avatarText="Trusted by 500+ local neighbors"
      marqueeItems={[
        {
-          type: "text",
-          text: "Licensed & Insured",
-        },
+          type: "text",          text: "Licensed & Insured"},
        {
-          type: "text",
-          text: "24/7 Emergency Support",
-        },
+          type: "text",          text: "24/7 Emergency Support"},
        {
-          type: "text",
-          text: "Family Owned & Operated",
-        },
+          type: "text",          text: "Family Owned & Operated"},
        {
-          type: "text",
-          text: "Upfront Pricing",
-        },
+          type: "text",          text: "Upfront Pricing"},
        {
-          type: "text",
-          text: "No-Pressure Consultations",
-        },
+          type: "text",          text: "No-Pressure Consultations"},
      ]}
    />
  </div>
@@ -125,35 +90,20 @@ export default function LandingPage() {
      animationType="slide-up"
      textboxLayout="default"
      useInvertedBackground={false}
+      buttons={[
+        {
+          text: "Book Your Appointment",          href: "/contact"
+        }
+      ]}
      features={[
        {
-          id: "s1",
-          title: "Air Conditioning",
-          subtitle: "Repairs & Maintenance",
-          category: "Cooling",
-          value: "Reliable cooling all summer long.",
-        },
+          id: "s1",          title: "Air Conditioning",          subtitle: "Repairs & Maintenance",          category: "Cooling",          value: "Lower your energy bills with efficient maintenance."},
        {
-          id: "s2",
-          title: "Heating & Boilers",
-          subtitle: "Service & Repairs",
-          category: "Heating",
-          value: "Stay warm through the coldest months.",
-        },
+          id: "s2",          title: "Heating & Boilers",          subtitle: "Service & Repairs",          category: "Heating",          value: "Eliminate cold spots for year-round comfort."},
        {
-          id: "s3",
-          title: "Ductless Mini-Splits",
-          subtitle: "Install & Service",
-          category: "Systems",
-          value: "Efficient climate control for any space.",
-        },
+          id: "s3",          title: "Ductless Mini-Splits",          subtitle: "Install & Service",          category: "Systems",          value: "Reduce noise and maximize energy efficiency."},
        {
-          id: "s4",
-          title: "Diagnostics",
-          subtitle: "Second Opinions",
-          category: "Advice",
-          value: "Honest advice to save you money.",
-        },
+          id: "s4",          title: "Diagnostics",          subtitle: "Second Opinions",          category: "Advice",          value: "Avoid unnecessary replacements with honest expert input."},
      ]}
      title="Professional HVAC Services"
      description="From seasonal tune-ups to complex diagnostics, we keep your home comfortable year-round."
@@ -168,45 +118,20 @@ export default function LandingPage() {
      useInvertedBackground={false}
      testimonials={[
        {
-          id: "t1",
-          name: "Sarah J.",
-          role: "Homeowner",
-          company: "Local Resident",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-man-relaxing-lunch-modern-cafe-sitting-front-open-laptop-smiling-happily-while-watching-funny-videos-online-earphones_273609-1958.jpg",
-        },
+          id: "t1",          name: "Sarah J.",          role: "Homeowner",          company: "Local Resident",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/attractive-young-man-relaxing-lunch-modern-cafe-sitting-front-open-laptop-smiling-happily-while-watching-funny-videos-online-earphones_273609-1958.jpg"},
        {
-          id: "t2",
-          name: "Michael C.",
-          role: "Homeowner",
-          company: "Local Resident",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-woman-celebrating-birthday-together_23-2150598991.jpg",
-        },
+          id: "t2",          name: "Michael C.",          role: "Homeowner",          company: "Local Resident",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/front-view-woman-celebrating-birthday-together_23-2150598991.jpg"},
        {
-          id: "t3",
-          name: "Emily R.",
-          role: "Homeowner",
-          company: "Local Resident",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg",
-        },
+          id: "t3",          name: "Emily R.",          role: "Homeowner",          company: "Local Resident",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-young-musician-woman-learns-how-play-ukulele-sits-sofa-with-crossed-legs_1258-204931.jpg"},
        {
-          id: "t4",
-          name: "David K.",
-          role: "Homeowner",
-          company: "Local Resident",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-handsome-happy-man-office-guy-sits-coworking-space-looking-camera-smiling-laughing-talking-mobile-phone-using-smartphone-answer-call-from-client_1258-314633.jpg",
-        },
+          id: "t4",          name: "David K.",          role: "Homeowner",          company: "Local Resident",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/portrait-handsome-happy-man-office-guy-sits-coworking-space-looking-camera-smiling-laughing-talking-mobile-phone-using-smartphone-answer-call-from-client_1258-314633.jpg"},
        {
-          id: "t5",
-          name: "John D.",
-          role: "Homeowner",
-          company: "Local Resident",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/businessman-having-videocall-work_23-2148940777.jpg",
-        },
+          id: "t5",          name: "John D.",          role: "Homeowner",          company: "Local Resident",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/businessman-having-videocall-work_23-2148940777.jpg"},
      ]}
      title="Don't Just Take Our Word For It"
      description="Hear why homeowners trust Ray to keep their systems running efficiently."
@@ -221,15 +146,9 @@ export default function LandingPage() {
      description="Frequently asked questions about our services and process."
      faqs={[
        {
-          id: "q1",
-          title: "What areas do you serve?",
-          content: "We proudly serve our local community and surrounding areas.",
-        },
+          id: "q1",          title: "What areas do you serve?",          content: "We proudly serve our local community and surrounding areas."},
        {
-          id: "q2",
-          title: "Do you offer emergency repairs?",
-          content: "Yes, we provide 24/7 support for urgent heating and cooling needs.",
-        },
+          id: "q2",          title: "Do you offer emergency repairs?",          content: "Yes, we provide 24/7 support for urgent heating and cooling needs."},
      ]}
      faqsAnimation="slide-up"
    />
@@ -240,8 +159,8 @@ export default function LandingPage() {
      useInvertedBackground={false}
      title="Commitment to Quality"
      description="Ray has dedicated his career to honest service. Every job is an opportunity to prove why local expertise matters."
-      imageSrc="http://img.b2bpic.net/free-photo/young-worker-raising-hands-helpless-manner-uniform-looking-upset-front-view_176474-21722.jpg?_wi=2"
-      imageAlt="Ray at work"
+      imageSrc="https://images.unsplash.com/photo-1534347628048-617573ede396?q=80&w=800&auto=format&fit=crop"
+      imageAlt="Professional HVAC technician performing maintenance"
    />
  </div>

@@ -251,29 +170,19 @@ export default function LandingPage() {
        {
          items: [
            {
-              label: "Services",
-              href: "/services",
-            },
+              label: "Services",              href: "/services"},
            {
-              label: "About Ray",
-              href: "/about",
-            },
+              label: "About Ray",              href: "/about"},
            {
-              label: "Schedule Service",
-              href: "/contact",
-            },
+              label: "Schedule Service",              href: "/contact"},
          ],
        },
        {
          items: [
            {
-              label: "Terms of Service",
-              href: "#",
-            },
+              label: "Terms of Service",              href: "#"},
            {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
          ],
        },
      ]}
@@ -283,4 +192,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -26,27 +26,17 @@ export default function LandingPage() {
      <NavbarLayoutFloatingOverlay
      navItems={[
        {
-          name: "Home",
-          id: "/",
-        },
+          name: "Home",          id: "/"},
        {
-          name: "Services",
-          id: "/services",
-        },
+          name: "Services",          id: "/services"},
        {
-          name: "About Ray",
-          id: "/about",
-        },
+          name: "About Ray",          id: "/about"},
        {
-          name: "Contact",
-          id: "/contact",
-        },
+          name: "Contact",          id: "/contact"},
      ]}
      brandName="Kinsley HVAC"
      button={{
-        text: "(555) 555-5555",
-        href: "tel:5555555555",
-      }}
+        text: "(555) 555-5555",        href: "tel:5555555555"}}
    />
  </div>

@@ -57,26 +47,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      features={[
        {
-          id: "d1",
-          title: "Air Conditioning",
-          subtitle: "Maintenance & Installation",
-          category: "AC",
-          value: "We fix cooling problems right the first time, ensuring your home stays cool efficiently.",
-        },
+          id: "d1",          title: "Air Conditioning",          subtitle: "Maintenance & Installation",          category: "AC",          value: "We fix cooling problems right the first time, ensuring your home stays cool efficiently."},
        {
-          id: "d2",
-          title: "Boilers & Heating",
-          subtitle: "Season Repairs",
-          category: "Heating",
-          value: "Expert boiler and furnace repairs to get you through the winter with peace of mind.",
-        },
+          id: "d2",          title: "Boilers & Heating",          subtitle: "Season Repairs",          category: "Heating",          value: "Expert boiler and furnace repairs to get you through the winter with peace of mind."},
        {
-          id: "d3",
-          title: "Ductless Systems",
-          subtitle: "Precision Installation",
-          category: "Mini-Splits",
-          value: "Modern, energy-efficient solutions customized to your specific space and needs.",
-        },
+          id: "d3",          title: "Ductless Systems",          subtitle: "Precision Installation",          category: "Mini-Splits",          value: "Modern, energy-efficient solutions customized to your specific space and needs."},
      ]}
      title="Comprehensive HVAC Solutions"
      description="We specialize in honest, expert residential HVAC care. We take the time to explain every detail, ensuring you get the right solution at a fair price."
@@ -91,15 +66,9 @@ export default function LandingPage() {
      description="Details about our maintenance and installation procedures."
      faqs={[
        {
-          id: "s-q1",
-          title: "How often should I tune up my AC?",
-          content: "We recommend an annual inspection before the cooling season starts.",
-        },
+          id: "s-q1",          title: "How often should I tune up my AC?",          content: "We recommend an annual inspection before the cooling season starts."},
        {
-          id: "s-q2",
-          title: "Is a ductless system right for my home?",
-          content: "Ductless systems are ideal for add-ons, older homes, or rooms where traditional ductwork isn't feasible.",
-        },
+          id: "s-q2",          title: "Is a ductless system right for my home?",          content: "Ductless systems are ideal for add-ons, older homes, or rooms where traditional ductwork isn't feasible."},
      ]}
      faqsAnimation="slide-up"
    />
@@ -111,29 +80,19 @@ export default function LandingPage() {
        {
          items: [
            {
-              label: "Services",
-              href: "/services",
-            },
+              label: "Services",              href: "/services"},
            {
-              label: "About Ray",
-              href: "/about",
-            },
+              label: "About Ray",              href: "/about"},
            {
-              label: "Schedule Service",
-              href: "/contact",
-            },
+              label: "Schedule Service",              href: "/contact"},
          ],
        },
        {
          items: [
            {
-              label: "Terms of Service",
-              href: "#",
-            },
+              label: "Terms of Service",              href: "#"},
            {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
          ],
        },
      ]}
@@ -143,4 +102,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #f5f4ef;
-  --card: #dad6cd;
-  --foreground: #2a2928;
-  --primary-cta: #2a2928;
+  --background: #0a0a0a;
+  --card: #1a1a1a;
+  --foreground: #ffffffe6;
+  --primary-cta: #e6e6e6;
  --primary-cta-text: #f5f4ef;
-  --secondary-cta: #ecebea;
+  --secondary-cta: #1a1a1a;
  --secondary-cta-text: #2a2928;
-  --accent: #ffffff;
-  --background-accent: #c6b180;
+  --accent: #737373;
+  --background-accent: #737373;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	7f0d14995c	Update src/app/styles/variables.css	2026-04-17 23:50:59 +00:00
bender	d361317cad	Update src/app/services/page.tsx	2026-04-17 23:50:59 +00:00
bender	2bace358ec	Update src/app/page.tsx	2026-04-17 23:50:58 +00:00
bender	f81ca9c012	Update src/app/contact/page.tsx	2026-04-17 23:50:58 +00:00
bender	14cfd3692b	Update src/app/about/page.tsx	2026-04-17 23:50:57 +00:00
bender	6c5deb4156	Merge version_3 into main Merge version_3 into main	2026-04-17 23:41:26 +00:00
bender	366b498bff	Update src/app/page.tsx	2026-04-17 23:41:20 +00:00
bender	54a566747d	Merge version_2 into main Merge version_2 into main	2026-04-17 23:40:29 +00:00
bender	c0bc5dda20	Update src/app/page.tsx	2026-04-17 23:40:26 +00:00
bender	f34a8234ff	Merge version_1 into main Merge version_1 into main	2026-04-17 23:37:39 +00:00