diff --git a/src/components/layout/Footer.astro b/src/components/layout/Footer.astro
index a69f571..7a326a8 100644
--- a/src/components/layout/Footer.astro
+++ b/src/components/layout/Footer.astro
@@ -10,18 +10,18 @@ const footer = yaml.load(
 <footer class="f-footer">
   <div class="f-footer-inner">
     <div class="f-footer-col">
-      <h3 class="f-footer-col-title">{footer.company.name}</h3>
-      <p class="f-footer-col-text">
+      <h3>{footer.company.name}</h3>
+      <p>
         {footer.company.address.line1}<br />
         {footer.company.address.line2}
       </p>
     </div>
 
     <div class="f-footer-col">
-      <h4 class="f-footer-col-title">Kontakt</h4>
+      <h4>Kontakt</h4>
       {
         footer.contact.phones.map((phone: string) => (
-          <p class="f-footer=col-text">
+          <p>
             {phone}
           </p>
         ))
@@ -34,7 +34,7 @@ const footer = yaml.load(
     </div>
 
     <div class="f-footer-col">
-      <h4 class="f-footer-col-title">{footer.services.title}</h4>
+      <h4>{footer.services.title}</h4>
       <ul>
         {
           footer.services.items.map((item: any) => (
diff --git a/src/components/layout/Header.astro b/src/components/layout/Header.astro
index d057700..57b1cac 100644
--- a/src/components/layout/Header.astro
+++ b/src/components/layout/Header.astro
@@ -5,7 +5,6 @@ const links = [
   { name: "START", href: "/" },
   { name: "INTERNET ŚWIATŁOWODOWY", href: "/internet-swiatlowodowy" },
   { name: "INTERNET I TELEWIZJA", href: "/internet-telewizja" },
-  { name: "INTERNET RADIOWY", href: "/internet-radiowy" },
   { name: "TELEFON", href: "/telefon" },
   { name: "ZASIĘG SIECI", href: "/mapa-zasiegu" },
   { name: "KONTAKT", href: "/#contact" },
diff --git a/src/components/sections/SectionContact.astro b/src/components/sections/SectionContact.astro
index a497902..4dbbfb7 100644
--- a/src/components/sections/SectionContact.astro
+++ b/src/components/sections/SectionContact.astro
@@ -2,7 +2,7 @@
 import yaml from "js-yaml";
 import fs from "fs";
 import MapGoogle from "../maps/MapGoogle.astro";
-import "../../styles/contact.css";
+// import "../../styles/contact.css";
 
 const data = yaml.load(
     fs.readFileSync("./src/content/contact/contact.yaml", "utf8"),
@@ -11,32 +11,31 @@ const apiKey = import.meta.env.PUBLIC_GOOGLE_MAPS_KEY;
 const form = data.form;
 ---
 
-<section id="contact" class="fuz-section">
-    <div class="fuz-contact-grid">
+<section id="contact" class="f-section">
+    <div class="f-contact-grid">
         <!-- Lewa kolumna -->
-        <div class="space-y-6">
-            <h2 class="fuz-section-title">{data.title}</h2>
-            <div class="fuz-contact-description" set:html={data.description} />
+        <div class="f-contact-col-1">
+            <h2>{data.title}</h2>
+            <div class="f-contact-item" set:html={data.description} />
         </div>
 
         <!-- Formularz -->
-        <div class="fuz-contact-box">
-            <h2 class="fuz-section-title">{data.contactFormTitle}</h2>
-
-            <form id="contactForm" class="fuz-contact-form">
-                <div class="grid grid-cols-2 gap-4">
+        <div class="f-contact-col-2">
+            <h2>{data.contactFormTitle}</h2>
+            <form id="contactForm" class="f-contact-form">
+                <div class="f-contact-form-inner">
                     <input
                         type="text"
                         name="firstName"
                         placeholder={form.firstName.placeholder}
-                        class="fuz-input"
+                        class="f-input"
                         required
                     />
                     <input
                         type="text"
                         name="lastName"
                         placeholder={form.lastName.placeholder}
-                        class="fuz-input"
+                        class="f-input"
                         required
                     />
                 </div>
@@ -46,7 +45,7 @@ const form = data.form;
                         type="email"
                         name="email"
                         placeholder={form.email.placeholder}
-                        class="fuz-input"
+                        class="f-input"
                         required
                         autocomplete="email"
                     />
@@ -54,7 +53,7 @@ const form = data.form;
                         type="tel"
                         name="phone"
                         placeholder={form.phone.placeholder}
-                        class="fuz-input"
+                        class="f-input"
                         required
                         autocomplete="tel"
                     />
@@ -64,7 +63,7 @@ const form = data.form;
                     type="text"
                     name="subject"
                     placeholder={form.subject.placeholder}
-                    class="fuz-input"
+                    class="f-input"
                     required
                 />
 
@@ -72,16 +71,11 @@ const form = data.form;
                     name="message"
                     rows={form.message.rows}
                     placeholder={form.message.placeholder}
-                    class="fuz-input"
+                    class="f-input"
                     required></textarea>
 
-                <label class="fuz-rodo">
-                    <input
-                        type="checkbox"
-                        name="rodo"
-                        class="mt-1 h-4 w-4"
-                        required
-                    />
+                <label class="f-rodo">
+                    <input type="checkbox" name="rodo" required />
                     <span>
                         {form.rodo.label}
                         <a
@@ -92,17 +86,14 @@ const form = data.form;
                     </span>
                 </label>
 
-                <button
-                    class="btn btn-outline w-full py-3 text-lg"
-                    title={form.submit.title}
-                >
+                <button title={form.submit.title}>
                     {form.submit.label}
                 </button>
             </form>
         </div>
     </div>
 
-    <div class="fuz-contact-map-wrapper">
+    <div class="f-contact-map">
         <MapGoogle
             apiKey={apiKey}
             lat={data.lat}
@@ -115,11 +106,11 @@ const form = data.form;
             mapStyleId={data.maps.mapId}
         />
     </div>
-
-    <div id="toast" class="fuz-toast"></div>
+    <!-- TODO: Poprawić obslugę błedu wysyłania wiadomości by pojawiał sie toast i ulozyć css -->
+    <div id="toast" class="f-toast"></div>
 </section>
 
-<!-- ReCaptcha init -->
+<!-- ReCaptcha -->
 <script
     is:inline
     define:vars={{ siteKey: import.meta.env.PUBLIC_RECAPTCHA_SITE_KEY }}
@@ -132,7 +123,7 @@ const form = data.form;
     document.head.appendChild(recaptchaScript);
 </script>
 
-<!-- Formularz + toast -->
+
 <script
     is:inline
     define:vars={{
@@ -144,7 +135,7 @@ const form = data.form;
         const form = document.getElementById("contactForm");
         const toast = document.getElementById("toast");
 
-        if (!form) return; // Safety
+        if (!form) return;
 
         form.addEventListener("submit", async (e) => {
             if (!form.reportValidity()) return;
@@ -182,14 +173,9 @@ const form = data.form;
         ${message}
       </div>
     `;
-            // reset animacji
             toast.classList.remove("visible");
-            void toast.offsetWidth; // magiczny hack forcing reflow
-
-            // pokaż
+            void toast.offsetWidth;
             toast.classList.add("visible");
-
-            // ukryj po 3s
             setTimeout(() => {
                 toast.classList.remove("visible");
             }, 3000);
diff --git a/src/islands/RangeForm.jsx b/src/islands/RangeForm.jsx
index bef79cf..e82a0e9 100644
--- a/src/islands/RangeForm.jsx
+++ b/src/islands/RangeForm.jsx
@@ -258,7 +258,7 @@ export default function RangeForm() {
             {/* CITY */}
             <div class="autocomplete-wrapper">
                 <input
-                    class={`fuz-input w-full ${citySuggest.length ? "autocomplete-open" : ""}`}
+                    class={`f-input ${citySuggest.length ? "autocomplete-open" : ""}`}
                     placeholder="Wpisz miejscowość..."
                     value={city}
                     onInput={onCityInput}
@@ -287,7 +287,7 @@ export default function RangeForm() {
             {/* STREET */}
             <div class="autocomplete-wrapper">
                 <input
-                    class={`fuz-input w-full ${
+                    class={`f-input ${
                         streetSuggest.length ? "autocomplete-open" : ""
                     } ${streetDisabled ? "opacity-50 cursor-not-allowed" : ""}`}
                     placeholder={
@@ -322,7 +322,7 @@ export default function RangeForm() {
 
             {/* NUMBER */}
             <input
-                class="fuz-input"
+                class="f-input"
                 placeholder="np. 1A"
                 value={number}
                 onInput={(e) => setNumber(e.target.value)}
@@ -336,7 +336,7 @@ export default function RangeForm() {
 
             {/* BUTTON */}
             <button
-                class="btn btn-outline w-full py-3 flex items-center justify-center gap-2"
+                class="btn btn-outline"
                 disabled={loading}
             >
                 {loading ? (
diff --git a/src/styles/base.css b/src/styles/base.css
index b91d59a..9905e2a 100644
--- a/src/styles/base.css
+++ b/src/styles/base.css
@@ -7,6 +7,7 @@
 @import "./markdown.css";
 @import "./footer.css";
 @import "./cookie.css";
+@import "./contact.css";
 
 .grecaptcha-badge {
   display: none !important;
diff --git a/src/styles/buttons.css b/src/styles/buttons.css
index 84b23a9..c23056a 100644
--- a/src/styles/buttons.css
+++ b/src/styles/buttons.css
@@ -1,8 +1,5 @@
 .btn {
-  @apply inline-flex items-center justify-center 
-         font-semibold rounded-lg px-6 py-3
-         text-base transition-all duration-200
-         cursor-pointer select-none;
+  @apply inline-flex items-center justify-center font-semibold rounded-lg px-6 py-3 text-base transition-all duration-200 cursor-pointer select-none;
 }
 
 .btn-primary {
@@ -36,39 +33,23 @@
   background-color: var(--btn-ghost-hover-bg);
 }
 
-.fuz-input {
-  width: 100%;
-  padding: 0.75rem 1rem; /* bardziej eleganckie */
-  border-radius: 0.75rem;
-
-  /* Kolory z theme.css */
-  background-color: var(--f-background);
-  color: var(--f-text);
-  border: 1px solid var(--fuz-border, #d1d5db); /* fallback dla bezpieczeństwa */
-
-  box-shadow: 0 1px 2px rgba(0,0,0,0.06);
-
-  transition: all 0.2s ease;
+.f-input {
+  @apply w-full py-3 px-4 rounded-xl border border-[var(--f-input-border)] bg-[var(--f-background)] text-[var(--f-text)] transition-all duration-200;
 }
 
-/* Hover odcien zależny od border, nie od Tailwind */
-.fuz-input:hover {
-  border-color: var(--f-text);
-  opacity: 0.9;
+.f-input:hover {
+  @apply border-[var(--f-text)] opacity-[0.9];
+}
+
+.f-input:focus {
+  @apply outline-none border-[var(--f-header)];
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--f-header) 40%, transparent);
 }
 
-/* Placeholder — używa f-text ale jaśniejszy */
 .fuz-input::placeholder {
   color: color-mix(in srgb, var(--f-text) 40%, transparent);
 }
 
-/* Focus — używa accent */
-.fuz-input:focus {
-  outline: none;
-  border-color: var(--fuz-accent);
-  box-shadow: 0 0 0 3px color-mix(in srgb, var(--fuz-accent) 40%, transparent);
-}
-
 /* Error */
 .fuz-input-error {
   border-color: #ff4d4f !important;
@@ -107,11 +88,10 @@
 
 /* Dropdown */
 .autocomplete-list {
-  @apply absolute left-0 right-0 z-50 bg-[var(--f-background)] text-[var(--f-text)]
-         border border-gray-300 dark:border-slate-700
-         rounded-b-xl shadow-xl max-h-56 overflow-auto;
+  @apply absolute left-0 right-0 z-50 bg-[var(--f-background)] text-[var(--f-text)] border border-gray-300 dark:border-slate-700 rounded-b-xl shadow-xl max-h-56 overflow-auto;
 
-  border-top: none; /* ważne */
+  border-top: none;
+  /* ważne */
   animation: fadeIn 0.12s ease-out;
 }
 
@@ -125,6 +105,13 @@
 }
 
 @keyframes fadeIn {
-  from { opacity: 0; transform: translateY(-2px); }
-  to   { opacity: 1; transform: translateY(0); }
+  from {
+    opacity: 0;
+    transform: translateY(-2px);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
\ No newline at end of file
diff --git a/src/styles/contact.css b/src/styles/contact.css
index 140f6ab..f511924 100644
--- a/src/styles/contact.css
+++ b/src/styles/contact.css
@@ -1,68 +1,97 @@
-.fuz-contact-grid {
+@tailwind base;
+
+.f-contact-grid {
   @apply grid md:grid-cols-2 gap-10 items-start max-w-7xl mx-auto;
 }
 
-.fuz-contact-box {
+.f-contact-col-1 {
 
-  background-color: var(--f-background);
-  color: var(--f-text);
+  h1,
+  h2,
+  h3,
+  h4 {
+    @apply f-section-header;
+  }
 }
 
-.fuz-contact-description h3 {
-  @apply text-xl font-semibold mb-2;
-  color: var(--f-text);
+.f-contact-col-2 {
+  @apply bg-[var(--f-background)] text-[var(--f-text)];
+
+  h1,
+  h2,
+  h3,
+  h4 {
+    @apply f-section-header;
+  }
 }
 
-.fuz-contact-description h4 {
-  @apply text-xl font-semibold mb-1;
-  color: var(--f-text);
+.f-contact-item {
+  @apply space-y-1;
+  
+  h1,
+  h2,
+  h3,
+  h4 {
+    @apply text-2xl font-semibold text-[var(--f-text)] m-0;
+  }
+
+  p {
+    @apply text-xl mt-4 leading-relaxed text-[var(--f-text)];
+  }
+
 }
 
-.fuz-contact-description p {
-  @apply text-xl mt-4 leading-relaxed;
-  color: var(--f-text);
+.f-contact-form {
+  @apply space-y-1;
+
+  .f-contact-form-inner {
+    @apply grid grid-cols-2 gap-4
+  }
+
+  .f-rodo {
+    @apply flex items-start gap-3 text-lg text-[var(--f-text)];
+
+    a {
+      @apply text-[var(--f-link-text)];
+    }
+
+    a:hover {
+      @apply text-[var(--fuz-link-hover)];
+    }
+
+    input {
+      @apply mt-2 h-4 w-4;
+    }
+  }
+
+   button {
+      @apply btn btn-outline w-full py-3 text-lg;
+    }
 }
 
-.fuz-contact-form {
-  @apply space-y-2;
+.f-contact-map {
+  @apply w-full max-w-7xl mx-auto mt-6;
 }
 
-/* --- RODO --- */
-.fuz-rodo {
-  @apply flex items-start gap-3 text-sm;
-  color: var(--f-text);
-}
-
-/* .fuz-rodo a {
-  color: var(--fuz-accent);            
-} */
-
-.fuz-rodo a:hover {
-  color: var(--fuz-accent-hover);        /* jeśli masz globalne zmienne */
-}
-/* --- TOAST --- */
-/* --- TOAST SYSTEM (Tailwind version) --- */
-
-.fuz-toast {
+.s-toast {
   @apply fixed top-5 left-1/2 z-[9999] pointer-events-none;
   @apply opacity-0 -translate-y-3 -translate-x-1/2 transition-all duration-300 ease-out;
 }
 
-.fuz-toast.visible {
+.f-toast.visible {
   @apply opacity-100 translate-y-0;
 }
 
-.fuz-toast-msg {
+.f-toast-msg {
   @apply px-5 py-3 rounded-xl shadow-lg text-sm;
   background: var(--fuz-accent);
   color: var(--fuz-accent-text);
 }
 
-.fuz-toast-msg.success {
+.f-toast-msg.success {
   background: var(--fuz-accent);
 }
 
-.fuz-toast-msg.error {
+.f-toast-msg.error {
   @apply bg-red-500 text-white;
-}
-
+}
\ No newline at end of file
diff --git a/src/styles/footer.css b/src/styles/footer.css
index 389cd04..c05bbea 100644
--- a/src/styles/footer.css
+++ b/src/styles/footer.css
@@ -4,31 +4,43 @@
     }
 
     .f-footer-inner {
-       @apply max-w-7xl mx-auto px-6 grid md:grid-cols-3 gap-12;
+        @apply max-w-7xl mx-auto px-6 grid md:grid-cols-3 gap-12;
     }
 
     .f-footer-col {
         @apply max-w-sm pt-4 space-y-1;
-    }
 
-    .f-footer-col-title {
-        @apply text-xl font-semibold text-[var(--f-header)];
+        h1,
+        h2,
+        h3,
+        h4,
+        h5,
+        h6 {
+            @apply text-xl font-semibold text-[var(--f-header)];
+        }
 
-    }
+        a {
+            @apply text-[var(--f-link-text)];
+        }
 
-    .f-footer-col-text {
-        @apply text-base;
+        a:hover {
+            @apply text-[var(--fuz-link-hover)];
+        }
+
+        p {
+            @apply text-base;
+        }
     }
 
     .f-footer-copyright {
         @apply text-center py-4 text-base text-[var(--f-text)];
     }
 
-     .f-footer-recaptcha {
+    .f-footer-recaptcha {
         @apply text-base;
 
         a {
             @apply text-[var(--f-link-text)];
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/styles/map-google.css b/src/styles/map-google.css
index c09b133..567a59c 100644
--- a/src/styles/map-google.css
+++ b/src/styles/map-google.css
@@ -17,10 +17,7 @@
 .fuz-map--card {
   @apply w-full h-[350px] overflow-hidden mt-8;
 }
-.fuz-contact-map-wrapper {
-  /* @apply col-span-2 w-full border-cyan-200; */
-  @apply w-full max-w-7xl mx-auto mt-6;
-}
+
 
 .map-range-container {
   @apply sticky top-[67px] z-[999] flex justify-center w-full pointer-events-auto;
diff --git a/src/styles/sections.css b/src/styles/sections.css
index d5286f1..546eb02 100644
--- a/src/styles/sections.css
+++ b/src/styles/sections.css
@@ -1,3 +1,13 @@
+@layer components{
+
+  .f-section-header{
+    @apply text-3xl md:text-4xl font-bold mb-6 text-[var(--f-header)];
+  }
+}
+
+.f-section{
+  @apply pt-10 pb-1 mx-2;
+}
 .fuz-section {
   @apply py-10 mx-2;
 }
@@ -46,4 +56,4 @@
 
 .dark .fuz-iframe {
   background: transparent !important;
-}
+}
\ No newline at end of file
diff --git a/src/styles/theme.css b/src/styles/theme.css
index 114a24a..ef40fa2 100644
--- a/src/styles/theme.css
+++ b/src/styles/theme.css
@@ -38,6 +38,7 @@
 
   --f-text: var(--text2-light);
   --f-link-text: var(--f-header);
+  --f-link-text-hover: var(--f-text2-light);
 
   --btn-background: var(--surface2-light);
   --btn-text: var(--text1-light);
@@ -49,6 +50,8 @@
   --btn-outline-background-hover: var(--surface4-light);
   --btn-outline-text-hover: var(--brand-light);
 
+  --f-input-border: var(--surface1-light);
+
   /* Invert Color */
   --f-background-invert: #0d1117;
   --f-text-invert: #e6edf3;
@@ -82,6 +85,7 @@
 
   --f-text: var(--text1-dark);
   --f-link-text: var(--f-header);
+  --f-link-text-hover: var(--f-text2-dark);
 
   --btn-background: var(--surface4-dark);
   --btn-text: var(--text1-dark);
@@ -93,6 +97,8 @@
   --btn-outline-background-hover: var(--surface4-dark);
   --btn-outline-text-hover: var(--brand-dark);
 
+   --f-input-border: var(--surface4-dark);
+   
   /* Invert Color */
   --f-background-invert: #ffffff;
   --f-text-invert: #0d0d0d;