diff --git a/src/app/page.tsx b/src/app/page.tsx
index 58a2e7b..ddfbb59 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FaqDouble from '@/components/sections/faq/FaqDouble';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
-import FooterMedia from '@/components/sections/footer/FooterMedia';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroBillboardTestimonial from '@/components/sections/hero/HeroBillboardTestimonial';
 import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -268,7 +268,7 @@ export default function LandingPage() {
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqDouble
+      <FaqBase
       textboxLayout="default"
       useInvertedBackground={true}
       faqs={[
@@ -290,27 +290,32 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactSplit
+      <ContactSplitForm
       useInvertedBackground={false}
-      background={{
-        variant: "plain"}}
-      tag="Contact Us"
       title="Reach Out! We are Just a Click Away."
-      description="Have a project in mind or a question for us? We'd love to hear from you. Our team is ready to provide tailored solutions and support.\n\n📬 Email: info@oaks.cloud\n📞 Phone: +39 333 8725026\n\n🏢 Office: Piazza della Trivulziana 4/A, 20126, Milano, Italy"
+      description="Have a project in mind or a question for us? Fill out the form below, and our team will get back to you shortly to discuss tailored solutions and support."
       imageSrc="http://img.b2bpic.net/free-photo/call-center-senior-manager-providing-guidance-multiethnic-team_482257-125769.jpg"
       imageAlt="People collaborating in a modern office"
       mediaAnimation="slide-up"
       mediaPosition="right"
-      inputPlaceholder="Enter your email"
+      inputs={[
+        {
+          name: "name",          type: "text",          placeholder: "Your Name",          required: true
+        },
+        {
+          name: "email",          type: "email",          placeholder: "Your Email",          required: true
+        },
+        {
+          name: "message",          type: "textarea",          placeholder: "Your Message",          required: true
+        },
+      ]}
       buttonText="Send Message"
-      termsText="By sending a message you're confirming that you agree with our Terms and Conditions."
+      onSubmit={(data) => console.log("Form submitted:", data)}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterMedia
-      imageSrc="http://img.b2bpic.net/free-photo/3d-particles-with-flowing-cyber-dots_1048-12512.jpg"
-      imageAlt="Abstract tech background for footer"
+      <FooterBase
       logoText="OAKS"
       columns={[
         {