From 0d93017a771699f85662b6a2df5343c8379c30a2 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sat, 21 Mar 2026 12:54:47 +0100
Subject: [PATCH 01/10] feat: added select to contact-form.html

---
 assets/sass/fonts.scss               |  4 +-
 assets/sass/form.scss                |  4 ++
 content/contact/index.de.md          |  2 -
 content/contact/index.en.md          |  2 -
 content/contact/index.fr.md          |  2 -
 layouts/shortcodes/contact-form.html | 62 +++++++++++++++++++++++++++-
 6 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/assets/sass/fonts.scss b/assets/sass/fonts.scss
index 8b5202314..6395b99c5 100644
--- a/assets/sass/fonts.scss
+++ b/assets/sass/fonts.scss
@@ -122,7 +122,9 @@
 }
 
 body,
-button {
+input,
+select,
+.a-button {
   font-family: "Roboto", Arial, Helvetica, sans-serif;
   word-wrap: break-word;
   hyphens: auto;
diff --git a/assets/sass/form.scss b/assets/sass/form.scss
index e81128a28..da32e8599 100644
--- a/assets/sass/form.scss
+++ b/assets/sass/form.scss
@@ -31,6 +31,10 @@
 
     @include focus-indicator(0.2rem);
   }
+
+  select {
+    width: calc(50% + 2.8rem);
+  }
 }
 
 #success {
diff --git a/content/contact/index.de.md b/content/contact/index.de.md
index d3c46dabf..32777ca34 100644
--- a/content/contact/index.de.md
+++ b/content/contact/index.de.md
@@ -18,5 +18,3 @@ Die FIP Guide Community ist über die Online-Plattform _Discord_ erreichbar und
 Kontaktiere das Team hinter dem FIP Guide – wir sind für Fragen und Anmerkungen erreichbar und freuen uns auf deinen Inhaltsbeitrag.
 
 {{< contact-form >}}
-
-Oder schreibe uns eine Mail: [nextstop@fipguide.org](mailto:nextstop@fipguide.org)
diff --git a/content/contact/index.en.md b/content/contact/index.en.md
index 071cf3c44..f0795dbf0 100644
--- a/content/contact/index.en.md
+++ b/content/contact/index.en.md
@@ -18,5 +18,3 @@ The FIP Guide Community is available on the online platform _Discord_ and suppor
 Contact the team behind the FIP Guide – we are here for questions and comments and look forward to your content contribution.
 
 {{< contact-form >}}
-
-Or write us an email: [nextstop@fipguide.org](mailto:nextstop@fipguide.org)
diff --git a/content/contact/index.fr.md b/content/contact/index.fr.md
index b1a6b4fe3..1add91886 100644
--- a/content/contact/index.fr.md
+++ b/content/contact/index.fr.md
@@ -18,5 +18,3 @@ La communauté FIP Guide est accessible via la plateforme en ligne _Discord_ et
 Contactez l'équipe derrière le FIP Guide – nous sommes à votre disposition pour vos questions, remarques ou contributions de contenu.
 
 {{< contact-form >}}
-
-Ou écrivez-nous un e-mail : [nextstop@fipguide.org](mailto:nextstop@fipguide.org)
diff --git a/layouts/shortcodes/contact-form.html b/layouts/shortcodes/contact-form.html
index 23e3f251a..41df2e7af 100644
--- a/layouts/shortcodes/contact-form.html
+++ b/layouts/shortcodes/contact-form.html
@@ -32,7 +32,48 @@
     <input type="email" id="email" name="email" autocomplete="email" required />
   </label>
 
-  <label for="message"
+  <label for="topic"
+    >Thema auswählen:
+    <select id="topic" name="topic" required>
+      <option value="">Bitte wählen…</option>
+      <option value="general">Allgemeine Frage</option>
+      <option value="request">Änderungsvorschlag</option>
+      <option value="feedback">Feedback</option>
+      <option value="accessibility">Barriere melden</option>
+      <option value="other">Sonstiges</option>
+    </select>
+  </label>
+
+  <div class="field-group" data-field="general" style="display:none;">
+    <p>
+      Bitte prüfe vor Absenden deiner Anfrage, ob die Antwort bereits im FIP
+      Guide vorhanden ist. Schaue auf der passenden Seite des
+      <a href="/de/country">Landes</a> oder
+      <a href="/de/operator">Betreibers</a>. Du kannst hierfür auch die Suche
+      nutzen.
+    </p>
+  </div>
+
+  <label for="page" data-field="accessibility" style="display:none;"
+    >Betroffene Seite (URL)
+    <input type="text" id="page" name="page" required />
+  </label>
+
+  <label for="accessibility" data-field="accessibility" style="display:none;"
+    >Beschreibe bitte, welcher Fehler aufgetreten ist:
+    <textarea
+      id="accessibility"
+      name="accessibility"
+      rows="4"
+      cols="50"
+      required
+    ></textarea>
+  </label>
+
+  <label
+    for="message"
+    data-field="general,request,feedback,other"
+    style="display:none;"
     >{{ T "contact.messageLabel" }}
     <textarea
       id="message"
@@ -46,6 +87,8 @@
   <input
     type="submit"
     class="a-button"
+    data-field="general,request,feedback,accessibility,other"
+    style="display:none;"
     value="{{ T "contact.submitButton" }}"
   />
 </form>
@@ -59,4 +102,21 @@
       document.getElementById("success").style.display = "block";
     }
   });
+
+  document.getElementById("topic").addEventListener("change", function () {
+    // Alle Gruppen verstecken
+    document
+      .querySelectorAll("[data-field]")
+      .forEach((field) => (field.style.display = "none"));
+
+    // Ausgewählte Gruppe anzeigen
+    const value = this.value;
+    if (value) {
+      document.querySelectorAll("[data-field]").forEach((el) => {
+        if (el.dataset.field.split(",").includes(value)) {
+          el.style.display = "flex";
+        }
+      });
+    }
+  });
 </script>

From 89651233c811300b5b5ee36ef19a501047b434c0 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Fri, 3 Apr 2026 15:31:55 +0200
Subject: [PATCH 02/10] feat: add i11n, refactoring

---
 assets/sass/fonts.scss               |  1 +
 assets/sass/form.scss                | 14 ++----
 i18n/de.yaml                         | 14 ++++++
 layouts/shortcodes/contact-form.html | 75 +++++++++++++++-------------
 4 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/assets/sass/fonts.scss b/assets/sass/fonts.scss
index 6395b99c5..835b1025e 100644
--- a/assets/sass/fonts.scss
+++ b/assets/sass/fonts.scss
@@ -123,6 +123,7 @@
 
 body,
 input,
+textarea,
 select,
 .a-button {
   font-family: "Roboto", Arial, Helvetica, sans-serif;
diff --git a/assets/sass/form.scss b/assets/sass/form.scss
index da32e8599..cf4d654e9 100644
--- a/assets/sass/form.scss
+++ b/assets/sass/form.scss
@@ -2,9 +2,10 @@
   margin-bottom: 1.6rem;
   margin-left: 0;
   margin-right: 0;
+  width: 100%;
 
-  @media (max-width: #{$breakpoint-md}) {
-    max-width: fit-content;
+  @media (min-width: #{$breakpoint-md}) {
+    width: 66%;
   }
 
   label {
@@ -25,16 +26,8 @@
     color: var(--body-color);
     resize: vertical;
 
-    @media (min-width: #{$breakpoint-md}) {
-      width: 50%;
-    }
-
     @include focus-indicator(0.2rem);
   }
-
-  select {
-    width: calc(50% + 2.8rem);
-  }
 }
 
 #success {
@@ -44,4 +37,5 @@
   background-color: green;
   color: white;
   text-align: left;
+  width: fit-content;
 }
diff --git a/i18n/de.yaml b/i18n/de.yaml
index f8a28c3da..5e99a1890 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -24,6 +24,20 @@ contact:
   successMessage: >-
     Vielen Dank! Deine Nachricht wurde erfolgreich gesendet. Wir melden uns
     schnellstmöglich zurück.
+  topic:
+    accessibility: Barriere melden
+    accessibility-note: 'Beschreibe bitte, wie wir uns verbessern können:'
+    accessibility-webpage: Betroffene Seite (URL)
+    empty: Bitte wählen …
+    feedback: Feedback zur Website
+    general: Allgemeine Frage
+    general-note: >-
+      Bitte prüfe vor Absenden deiner Anfrage, ob die Antwort bereits im FIP
+      Guide vorhanden ist. Schaue auf der passenden Seite des [Landes](/country)
+      oder [Betreibers](/operator). Du kannst hierfür auch die Suche nutzen.
+    label: 'Thema:'
+    others: Sonstiges
+    request: Inhaltliche Ergänzung oder Korrektur vorschlagen
 contentNavigation:
   button: Inhaltsübersicht öffnen und schließen
   relatedCountries: Länder, in den der Betreibers aktiv ist
diff --git a/layouts/shortcodes/contact-form.html b/layouts/shortcodes/contact-form.html
index 41df2e7af..c7bc69478 100644
--- a/layouts/shortcodes/contact-form.html
+++ b/layouts/shortcodes/contact-form.html
@@ -33,61 +33,62 @@
   </label>
 
   <label for="topic"
-    >Thema auswählen:
+    >{{ T "contact.topic.label" }}
     <select id="topic" name="topic" required>
-      <option value="">Bitte wählen…</option>
-      <option value="general">Allgemeine Frage</option>
-      <option value="request">Änderungsvorschlag</option>
-      <option value="feedback">Feedback</option>
-      <option value="accessibility">Barriere melden</option>
-      <option value="other">Sonstiges</option>
+      <option value="">{{ T "contact.topic.empty" }}</option>
+      <option value="general">{{ T "contact.topic.general" }}</option>
+      <option value="request">{{ T "contact.topic.request" }}</option>
+      <option value="feedback">{{ T "contact.topic.feedback" }}</option>
+      <option value="accessibility">
+        {{ T "contact.topic.accessibility" }}
+      </option>
+      <option value="others">{{ T "contact.topic.others" }}</option>
     </select>
   </label>
 
-  <div class="field-group" data-field="general" style="display:none;">
+  <div data-field="general" style="display:none;">
     <p>
-      Bitte prüfe vor Absenden deiner Anfrage, ob die Antwort bereits im FIP
-      Guide vorhanden ist. Schaue auf der passenden Seite des
-      <a href="/de/country">Landes</a> oder
-      <a href="/de/operator">Betreibers</a>. Du kannst hierfür auch die Suche
-      nutzen.
+      {{ T "contact.topic.general-note" | .Page.RenderString }}
     </p>
   </div>
 
-  <label for="page" data-field="accessibility" style="display:none;"
-    >Betroffene Seite (URL)
-    <input type="text" id="page" name="page" required />
+  <label
+    for="accessibility-webpage"
+    data-field="accessibility"
+    style="display:none;"
+    >{{ T "contact.topic.accessibility-webpage" }}
+    <input
+      type="text"
+      id="accessibility-webpage"
+      name="accessibility-webpage"
+    />
   </label>
 
-  <label for="accessibility" data-field="accessibility" style="display:none;"
-    >Beschreibe bitte, welcher Fehler aufgetreten ist:
+  <label
+    for="accessibility-note"
+    data-field="accessibility"
+    style="display:none;"
+    >{{ T "contact.topic.accessibility-note" }}
     <textarea
-      id="accessibility"
-      name="accessibility"
+      id="accessibility-note"
+      name="accessibility-note"
       rows="4"
       cols="50"
-      required
     ></textarea>
   </label>
 
   <label
     for="message"
-    data-field="general,request,feedback,other"
+    data-field="general,request,feedback,others"
     style="display:none;"
     >{{ T "contact.messageLabel" }}
-    <textarea
-      id="message"
-      name="message"
-      rows="4"
-      cols="50"
-      required
-    ></textarea>
+    <textarea id="message" name="message" rows="4" cols="50"></textarea>
   </label>
 
   <input
     type="submit"
     class="a-button"
-    data-field="general,request,feedback,accessibility,other"
+    data-field="general,request,feedback,accessibility,others"
     style="display:none;"
     value="{{ T "contact.submitButton" }}"
   />
@@ -104,17 +105,21 @@
   });
 
   document.getElementById("topic").addEventListener("change", function () {
-    // Alle Gruppen verstecken
-    document
-      .querySelectorAll("[data-field]")
-      .forEach((field) => (field.style.display = "none"));
+    document.querySelectorAll("[data-field]").forEach((field) => {
+      field.style.display = "none";
+      field
+        .querySelectorAll("input, textarea, select")
+        .forEach((el) => el.removeAttribute("required"));
+    });
 
-    // Ausgewählte Gruppe anzeigen
     const value = this.value;
     if (value) {
       document.querySelectorAll("[data-field]").forEach((el) => {
         if (el.dataset.field.split(",").includes(value)) {
           el.style.display = "flex";
+          el.querySelectorAll("input, textarea, select").forEach((input) =>
+            input.setAttribute("required", "required"),
+          );
         }
       });
     }

From b38cd31423f14bbde0a2e0a9ed8ee336b65acb18 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Fri, 3 Apr 2026 15:34:54 +0200
Subject: [PATCH 03/10] feat: add i11n

---
 i18n/en.yaml | 15 +++++++++++++++
 i18n/fr.yaml | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/i18n/en.yaml b/i18n/en.yaml
index f39268855..8c1c544f6 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -25,6 +25,21 @@ contact:
   successMessage: >-
     Thank you! Your message has been sent successfully. We'll get back to you as
     soon as possible.
+  topic:
+    accessibility: Report an accessibility barrier
+    accessibility-note: 'Please describe how we can improve:'
+    accessibility-webpage: Affected page (URL)
+    empty: Please select …
+    feedback: Feedback on the website
+    general: General question
+    general-note: >-
+      Before submitting your request, please check whether the answer is already
+      available in the FIP Guide. Have a look at the appropriate
+      [country](/country) or [operator](/operator) page. You can also use the
+      search for this.
+    label: 'Topic:'
+    others: Other
+    request: Suggest a content addition or correction
 contentNavigation:
   button: Open and close content overview
   relatedCountries: Countries in which the operator is active
diff --git a/i18n/fr.yaml b/i18n/fr.yaml
index 33c82f0aa..6e49648d4 100644
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@@ -25,6 +25,21 @@ contact:
   successMessage: >-
     Merci ! Votre message a été envoyé avec succès. Nous vous répondrons dès que
     possible.
+  topic:
+    accessibility: Signaler une barrière d'accessibilité
+    accessibility-note: 'Veuillez décrire comment nous pouvons nous améliorer :'
+    accessibility-webpage: Page concernée (URL)
+    empty: Veuillez sélectionner …
+    feedback: Commentaires sur le site Web
+    general: Question générale
+    general-note: >-
+      Avant d'envoyer votre demande, veuillez vérifier si la réponse est déjà
+      disponible dans le FIP Guide. Consultez la page du [pays](/country) ou de
+      l'[opérateur](/operator) appropriée. Vous pouvez également utiliser la
+      recherche à cet effet.
+    label: 'Sujet :'
+    others: Autre
+    request: Proposer un ajout ou une correction de contenu
 contentNavigation:
   button: Ouvrir et fermer l’aperçu du contenu
   relatedCountries: Pays dans lesquels l'opérateur est actif
@@ -81,6 +96,7 @@ fipValidity:
 footer-love:
   aria-label: Fait avec amour en Europe
   text: Fait avec ♥️ en Europe
+general: Général
 highlight:
   confusion: Risque de confusion
   important: Informations importantes

From edd08337ddad7bab082fc53cb465ef8bcdb07d8d Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sat, 4 Apr 2026 15:44:54 +0200
Subject: [PATCH 04/10] feat: add options

---
 layouts/shortcodes/contact-form.html | 63 +++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/layouts/shortcodes/contact-form.html b/layouts/shortcodes/contact-form.html
index c7bc69478..23e3f381f 100644
--- a/layouts/shortcodes/contact-form.html
+++ b/layouts/shortcodes/contact-form.html
@@ -22,23 +22,16 @@
     value="{{ ref . "contact" }}?success=true"
   />
 
-  <label for="name"
-    >{{ T "contact.nameLabel" }}
-    <input type="text" id="name" name="name" autocomplete="name" required />
-  </label>
-
-  <label for="email"
-    >{{ T "contact.emailLabel" }}
-    <input type="email" id="email" name="email" autocomplete="email" required />
-  </label>
-
   <label for="topic"
     >{{ T "contact.topic.label" }}
     <select id="topic" name="topic" required>
       <option value="">{{ T "contact.topic.empty" }}</option>
       <option value="general">{{ T "contact.topic.general" }}</option>
-      <option value="request">{{ T "contact.topic.request" }}</option>
+      <option value="routes">{{ T "contact.topic.routes" }}</option>
+      <option value="tickets">{{ T "contact.topic.tickets" }}</option>
+      <option value="fipcard">{{ T "contact.topic.fipcard" }}</option>
       <option value="feedback">{{ T "contact.topic.feedback" }}</option>
+      <option value="content">{{ T "contact.topic.content" }}</option>
       <option value="accessibility">
         {{ T "contact.topic.accessibility" }}
       </option>
@@ -47,9 +40,31 @@
   </label>
 
   <div data-field="general" style="display:none;">
-    <p>
-      {{ T "contact.topic.general-note" | .Page.RenderString }}
-    </p>
+    {{- partial "highlight"
+      (dict "Content" (T "contact.topic.general-note" | .Page.RenderString) "Type" "important")
+    -}}
+  </div>
+
+  <div data-field="routes" style="display:none;">
+    {{- partial "highlight"
+      (dict "Content" (T "contact.topic.routes-note" | .Page.RenderString) "Type" "important")
+    -}}
+  </div>
+
+  <div data-field="tickets" style="display:none;">
+    {{- partial "highlight"
+      (dict "Content" (T "contact.topic.tickets-note" | .Page.RenderString) "Type" "important")
+    -}}
+  </div>
+
+  <div data-field="fipcard" style="display:none;">
+    {{- partial "highlight"
+      (dict "Content" (T "contact.topic.fipcard-note" | .Page.RenderString) "Type" "important")
+    -}}
+  </div>
+
+  <div data-field="feedback,content,accessibility" style="display:none;">
+    {{ T "contact.topic.feedback-note" }}
   </div>
 
   <label
@@ -79,16 +94,32 @@
 
   <label
     for="message"
-    data-field="general,request,feedback,others"
+    data-field="feedback,content,others"
     style="display:none;"
     >{{ T "contact.messageLabel" }}
     <textarea id="message" name="message" rows="4" cols="50"></textarea>
   </label>
 
+  <label
+    for="name"
+    data-field="feedback,content,accessibility,others"
+    style="display:none;"
+    >{{ T "contact.nameLabel" }}
+    <input type="text" id="name" name="name" autocomplete="name" />
+  </label>
+
+  <label
+    for="email"
+    data-field="feedback,content,accessibility,others"
+    style="display:none;"
+    >{{ T "contact.emailLabel" }}
+    <input type="email" id="email" name="email" autocomplete="email" />
+  </label>
+
   <input
     type="submit"
     class="a-button"
-    data-field="general,request,feedback,accessibility,others"
+    data-field="feedback,content,accessibility,others"
     style="display:none;"
     value="{{ T "contact.submitButton" }}"
   />

From a8807c33b458dd0dffd76528ff119978a719043c Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sat, 4 Apr 2026 20:23:27 +0200
Subject: [PATCH 05/10] feat: finalized german version

---
 i18n/de.yaml                         | 74 ++++++++++++++++++++++------
 layouts/shortcodes/contact-form.html | 48 +++++++++++-------
 2 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/i18n/de.yaml b/i18n/de.yaml
index 4fcefd32e..37442f753 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -16,29 +16,75 @@ booking:
   visit-additional-information-website: Weitere Informationen
   visit-booking-website: Zur Buchungsseite
 contact:
+  accessibility:
+    label: 'Feedback zur Website: Barrierefreiheit'
+    message: 'Beschreibe bitte, wie wir uns verbessern können:'
+    webpage: Betroffene Seite (URL)
+  content:
+    label: 'Feedback zur Website: Inhaltliche Ergänzung oder Korrektur'
   emailLabel: 'E-Mail-Adresse:'
   emailSubject: Neue Nachricht vom FIP Guide
+  empty: Bitte wählen …
+  feedback:
+    label: 'Feedback zur Website: Lob und Kritik'
+    note: >-
+      Wir freuen uns über jedes Feedback, um die Website für unsere Kolleginnen
+      und Kollege der FIP-Mitglieder zu verbessern.
+  fipcard:
+    label: Beantragung von FIP Ausweis und FIP Freifahrtschein
+    note: >-
+      Leider können wir in diesem Fall nicht weiterhelfen. Wir sind ein
+      unabhängiges Community-Projekt und können daher die Ausstellung von FIP
+      Ausweisen und Freifahrtscheinen nicht beeinflussen.
+
+
+      Bitte wende dich an deine zuständige Personalabteilung.
   formAriaLabel: Kontaktformular
+  general:
+    label: Allgemeine Frage zur FIP-Nutzung
+    note: >-
+      Allgemeine Fragen beantworten wir auf der Seite [Übergreifende
+      Informationen](/generalinformation). Nutze auch gern die Suche für
+      konkrete Suchbegriffe.
+
+      Detaillierte Informationen sind auf [Landesseiten](/country) und
+      [Betreiberseiten](/operator) zu finden.
+
+
+      Konkrete Fragen beantwortet die Community und das FIP Guide Team auf
+      [Discord](https://discord.gg/5nWS9Eu9zz).
   messageLabel: 'Nachricht:'
   nameLabel: 'Name:'
+  others:
+    label: Sonstiges
+    topicLabel: 'Zusammenfassung:'
+  routes:
+    label: Frage zu Reiserouten und Zügen
+    note: >-
+      Nutze die Suche, um passende Informationen zu deiner Reise zu finden.
+
+      Detaillierte Informationen sind auf [Landesseiten](/country) und
+      [Betreiberseiten](/operator) zu lesen.
+
+
+      Konkrete Fragen beantwortet die Community und das FIP Guide Team auf
+      [Discord](https://discord.gg/5nWS9Eu9zz).
   submitButton: Absenden
   successMessage: >-
     Vielen Dank! Deine Nachricht wurde erfolgreich gesendet. Wir melden uns
     schnellstmöglich zurück.
-  topic:
-    accessibility: Barriere melden
-    accessibility-note: 'Beschreibe bitte, wie wir uns verbessern können:'
-    accessibility-webpage: Betroffene Seite (URL)
-    empty: Bitte wählen …
-    feedback: Feedback zur Website
-    general: Allgemeine Frage
-    general-note: >-
-      Bitte prüfe vor Absenden deiner Anfrage, ob die Antwort bereits im FIP
-      Guide vorhanden ist. Schaue auf der passenden Seite des [Landes](/country)
-      oder [Betreibers](/operator). Du kannst hierfür auch die Suche nutzen.
-    label: 'Thema:'
-    others: Sonstiges
-    request: Inhaltliche Ergänzung oder Korrektur vorschlagen
+  tickets:
+    label: Frage zum Ticketkauf und zu Reservierungen
+    note: >-
+      Wir können keine Tickets und Reservierungen für Züge verkaufen.
+
+      Informationen zu den Buchungsmöglichkeiten findest du auf der
+      [Betreiberseite](/operator) des jeweiligen Unternehmens.
+
+
+      Konkrete Fragen beantwortet die Community und das FIP Guide Team auf
+      [Discord](https://discord.gg/5nWS9Eu9zz).
+  topicLabel: 'Thema:'
 contentNavigation:
   button: Inhaltsübersicht öffnen und schließen
   relatedCountries: Länder, in den der Betreibers aktiv ist
diff --git a/layouts/shortcodes/contact-form.html b/layouts/shortcodes/contact-form.html
index 23e3f381f..c2095bb18 100644
--- a/layouts/shortcodes/contact-form.html
+++ b/layouts/shortcodes/contact-form.html
@@ -23,55 +23,55 @@
   />
 
   <label for="topic"
-    >{{ T "contact.topic.label" }}
+    >{{ T "contact.topicLabel" }}
     <select id="topic" name="topic" required>
-      <option value="">{{ T "contact.topic.empty" }}</option>
-      <option value="general">{{ T "contact.topic.general" }}</option>
-      <option value="routes">{{ T "contact.topic.routes" }}</option>
-      <option value="tickets">{{ T "contact.topic.tickets" }}</option>
-      <option value="fipcard">{{ T "contact.topic.fipcard" }}</option>
-      <option value="feedback">{{ T "contact.topic.feedback" }}</option>
-      <option value="content">{{ T "contact.topic.content" }}</option>
+      <option value="">{{ T "contact.empty" }}</option>
+      <option value="general">{{ T "contact.general.label" }}</option>
+      <option value="routes">{{ T "contact.routes.label" }}</option>
+      <option value="tickets">{{ T "contact.tickets.label" }}</option>
+      <option value="fipcard">{{ T "contact.fipcard.label" }}</option>
+      <option value="feedback">{{ T "contact.feedback.label" }}</option>
+      <option value="content">{{ T "contact.content.label" }}</option>
       <option value="accessibility">
-        {{ T "contact.topic.accessibility" }}
+        {{ T "contact.accessibility.label" }}
       </option>
-      <option value="others">{{ T "contact.topic.others" }}</option>
+      <option value="others">{{ T "contact.others.label" }}</option>
     </select>
   </label>
 
   <div data-field="general" style="display:none;">
     {{- partial "highlight"
-      (dict "Content" (T "contact.topic.general-note" | .Page.RenderString) "Type" "important")
+      (dict "Content" (T "contact.general.note" | .Page.RenderString) "Type" "important")
     -}}
   </div>
 
   <div data-field="routes" style="display:none;">
     {{- partial "highlight"
-      (dict "Content" (T "contact.topic.routes-note" | .Page.RenderString) "Type" "important")
+      (dict "Content" (T "contact.routes.note" | .Page.RenderString) "Type" "important")
     -}}
   </div>
 
   <div data-field="tickets" style="display:none;">
     {{- partial "highlight"
-      (dict "Content" (T "contact.topic.tickets-note" | .Page.RenderString) "Type" "important")
+      (dict "Content" (T "contact.tickets.note" | .Page.RenderString) "Type" "important")
     -}}
   </div>
 
   <div data-field="fipcard" style="display:none;">
     {{- partial "highlight"
-      (dict "Content" (T "contact.topic.fipcard-note" | .Page.RenderString) "Type" "important")
+      (dict "Content" (T "contact.fipcard.note" | .Page.RenderString) "Type" "important")
     -}}
   </div>
 
-  <div data-field="feedback,content,accessibility" style="display:none;">
-    {{ T "contact.topic.feedback-note" }}
-  </div>
+  <p data-field="feedback,content,accessibility" style="display:none;">
+    {{ T "contact.feedback.note" }}
+  </p>
 
   <label
     for="accessibility-webpage"
     data-field="accessibility"
     style="display:none;"
-    >{{ T "contact.topic.accessibility-webpage" }}
+    >{{ T "contact.accessibility.webpage" }}
     <input
       type="text"
       id="accessibility-webpage"
@@ -83,7 +83,7 @@
     for="accessibility-note"
     data-field="accessibility"
     style="display:none;"
-    >{{ T "contact.topic.accessibility-note" }}
+    >{{ T "contact.accessibility.message" }}
     <textarea
       id="accessibility-note"
       name="accessibility-note"
@@ -92,6 +92,11 @@
     ></textarea>
   </label>
 
+  <label for="others" data-field="others" style="display:none;"
+    >{{ T "contact.others.topicLabel" }}
+    <input type="text" id="others" name="others" />
+  </label>
+
   <label
     for="message"
     data-field="feedback,content,others"
@@ -100,6 +105,11 @@
     <textarea id="message" name="message" rows="4" cols="50"></textarea>
   </label>
 
+  <hr
+    data-field="feedback,content,accessibility,others"
+    style="display:none;"
+  />
+
   <label
     for="name"
     data-field="feedback,content,accessibility,others"

From 9e6bda875a4802eb72a299b8aa9b3cfdde8e92ee Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sat, 4 Apr 2026 20:27:01 +0200
Subject: [PATCH 06/10] feat: translation

---
 i18n/de.yaml |  2 +-
 i18n/en.yaml | 71 ++++++++++++++++++++++++++++++++++++++++-----------
 i18n/fr.yaml | 72 +++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/i18n/de.yaml b/i18n/de.yaml
index 37442f753..68e7d1b83 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -84,7 +84,7 @@ contact:
 
       Konkrete Fragen beantwortet die Community und das FIP Guide Team auf
       [Discord](https://discord.gg/5nWS9Eu9zz).
-  topicLabel: 'Thema:'
+  topicLabel: 'Kategorie:'
 contentNavigation:
   button: Inhaltsübersicht öffnen und schließen
   relatedCountries: Länder, in den der Betreibers aktiv ist
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 8c1c544f6..377eb7e7d 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -16,30 +16,71 @@ booking:
   visit-additional-information-website: Additional Information
   visit-booking-website: To Booking Website
 contact:
+  accessibility:
+    label: 'Website Feedback: Accessibility'
+    message: 'Please describe how we can improve:'
+    webpage: Affected page (URL)
+  content:
+    label: 'Website Feedback: Content Addition or Correction'
   emailLabel: 'Email:'
   emailSubject: New Message from FIP Guide
+  empty: Please select …
+  feedback:
+    label: 'Website Feedback: Praise and Criticism'
+    note: >-
+      We welcome any feedback to improve the website for our colleagues who are
+      FIP members.
+  fipcard:
+    label: Application for FIP Card and FIP Coupon
+    note: >-
+      Unfortunately, we are unable to help in this case. We are an independent
+      community project and therefore cannot influence the issuance of FIP Cards
+      and FIP Coupons.
+
+      Please contact your responsible HR department.
   formAriaLabel: Contact Form
+  general:
+    label: General question about using FIP
+    note: >-
+      We answer general questions on the [General
+      Information](/generalinformation) page. Feel free to use the search for
+      specific terms.
+
+      Detailed information can be found on [country pages](/country) and
+      [operator pages](/operator).
+
+      Specific questions are answered by the community and the FIP Guide team on
+      [Discord](https://discord.gg/5nWS9Eu9zz).
   messageLabel: 'Message:'
   nameLabel: 'Name:'
+  others:
+    label: Other
+    topicLabel: 'Summary:'
+  routes:
+    label: Question about travel routes and trains
+    note: >-
+      Use the search to find relevant information for your journey.
+
+      Detailed information can be found on [country pages](/country) and
+      [operator pages](/operator).
+
+      Specific questions are answered by the community and the FIP Guide team on
+      [Discord](https://discord.gg/5nWS9Eu9zz).
   submitButton: Submit
   successMessage: >-
     Thank you! Your message has been sent successfully. We'll get back to you as
     soon as possible.
-  topic:
-    accessibility: Report an accessibility barrier
-    accessibility-note: 'Please describe how we can improve:'
-    accessibility-webpage: Affected page (URL)
-    empty: Please select …
-    feedback: Feedback on the website
-    general: General question
-    general-note: >-
-      Before submitting your request, please check whether the answer is already
-      available in the FIP Guide. Have a look at the appropriate
-      [country](/country) or [operator](/operator) page. You can also use the
-      search for this.
-    label: 'Topic:'
-    others: Other
-    request: Suggest a content addition or correction
+  tickets:
+    label: Question about ticket purchase and reservations
+    note: >-
+      We cannot sell tickets and reservations for trains.
+
+      Information on booking options can be found on the [operator
+      page](/operator) of the respective company.
+
+      Specific questions are answered by the community and the FIP Guide team on
+      [Discord](https://discord.gg/5nWS9Eu9zz).
+  topicLabel: 'Category:'
 contentNavigation:
   button: Open and close content overview
   relatedCountries: Countries in which the operator is active
diff --git a/i18n/fr.yaml b/i18n/fr.yaml
index 6e49648d4..8680f08b6 100644
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@@ -16,30 +16,72 @@ booking:
   visit-additional-information-website: Informations complémentaires
   visit-booking-website: Aller sur le site de réservation
 contact:
+  accessibility:
+    label: 'Retour sur le site Web : Accessibilité'
+    message: 'Veuillez décrire comment nous pouvons nous améliorer :'
+    webpage: Page concernée (URL)
+  content:
+    label: 'Retour sur le site Web : Ajout ou correction de contenu'
   emailLabel: 'E-mail :'
   emailSubject: Nouveau message depuis FIP Guide
+  empty: Veuillez sélectionner …
+  feedback:
+    label: 'Retour sur le site Web : Éloges et critiques'
+    note: >-
+      Nous accueillons tous les retours pour améliorer le site Web pour nos
+      collègues membres FIP.
+  fipcard:
+    label: Demande de Carte FIP et de Coupon FIP
+    note: >-
+      Malheureusement, nous ne pouvons pas vous aider dans ce cas. Nous sommes
+      un projet communautaire indépendant et ne pouvons donc pas influencer la
+      délivrance des Cartes FIP et Coupons FIP.
+
+      Veuillez contacter votre service des ressources humaines compétent.
   formAriaLabel: Formulaire de contact
+  general:
+    label: Question générale sur l'utilisation du FIP
+    note: >-
+      Nous répondons aux questions générales sur la page [Informations
+      générales](/generalinformation). N'hésitez pas à utiliser la recherche
+      pour des termes spécifiques.
+
+      Des informations détaillées se trouvent sur les [pages des pays](/country)
+      et les [pages des opérateurs](/operator).
+
+      Les questions spécifiques sont répondues par la communauté et l'équipe FIP
+      Guide sur [Discord](https://discord.gg/5nWS9Eu9zz).
   messageLabel: 'Message :'
   nameLabel: 'Nom :'
+  others:
+    label: Autre
+    topicLabel: 'Résumé :'
+  routes:
+    label: Question sur les itinéraires et les trains
+    note: >-
+      Utilisez la recherche pour trouver des informations pertinentes pour votre
+      voyage.
+
+      Des informations détaillées se trouvent sur les [pages des pays](/country)
+      et les [pages des opérateurs](/operator).
+
+      Les questions spécifiques sont répondues par la communauté et l'équipe FIP
+      Guide sur [Discord](https://discord.gg/5nWS9Eu9zz).
   submitButton: Envoyer
   successMessage: >-
     Merci ! Votre message a été envoyé avec succès. Nous vous répondrons dès que
     possible.
-  topic:
-    accessibility: Signaler une barrière d'accessibilité
-    accessibility-note: 'Veuillez décrire comment nous pouvons nous améliorer :'
-    accessibility-webpage: Page concernée (URL)
-    empty: Veuillez sélectionner …
-    feedback: Commentaires sur le site Web
-    general: Question générale
-    general-note: >-
-      Avant d'envoyer votre demande, veuillez vérifier si la réponse est déjà
-      disponible dans le FIP Guide. Consultez la page du [pays](/country) ou de
-      l'[opérateur](/operator) appropriée. Vous pouvez également utiliser la
-      recherche à cet effet.
-    label: 'Sujet :'
-    others: Autre
-    request: Proposer un ajout ou une correction de contenu
+  tickets:
+    label: Question sur l'achat de billets et les réservations
+    note: >-
+      Nous ne pouvons pas vendre de billets et de réservations pour les trains.
+
+      Des informations sur les possibilités de réservation se trouvent sur la
+      [page de l'opérateur](/operator) de l'entreprise concernée.
+
+      Les questions spécifiques sont répondues par la communauté et l'équipe FIP
+      Guide sur [Discord](https://discord.gg/5nWS9Eu9zz).
+  topicLabel: 'Catégorie :'
 contentNavigation:
   button: Ouvrir et fermer l’aperçu du contenu
   relatedCountries: Pays dans lesquels l'opérateur est actif

From f24d351a2fd2035f73dc94d48c0bb0ad82456a87 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sat, 4 Apr 2026 21:07:42 +0200
Subject: [PATCH 07/10] feat: translation

---
 i18n/en.yaml | 3 +++
 i18n/fr.yaml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/i18n/en.yaml b/i18n/en.yaml
index 377eb7e7d..d214e5182 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -49,6 +49,7 @@ contact:
       Detailed information can be found on [country pages](/country) and
       [operator pages](/operator).
 
+
       Specific questions are answered by the community and the FIP Guide team on
       [Discord](https://discord.gg/5nWS9Eu9zz).
   messageLabel: 'Message:'
@@ -64,6 +65,7 @@ contact:
       Detailed information can be found on [country pages](/country) and
       [operator pages](/operator).
 
+
       Specific questions are answered by the community and the FIP Guide team on
       [Discord](https://discord.gg/5nWS9Eu9zz).
   submitButton: Submit
@@ -78,6 +80,7 @@ contact:
       Information on booking options can be found on the [operator
       page](/operator) of the respective company.
 
+
       Specific questions are answered by the community and the FIP Guide team on
       [Discord](https://discord.gg/5nWS9Eu9zz).
   topicLabel: 'Category:'
diff --git a/i18n/fr.yaml b/i18n/fr.yaml
index 8680f08b6..0d7d1684e 100644
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@@ -49,6 +49,7 @@ contact:
       Des informations détaillées se trouvent sur les [pages des pays](/country)
       et les [pages des opérateurs](/operator).
 
+
       Les questions spécifiques sont répondues par la communauté et l'équipe FIP
       Guide sur [Discord](https://discord.gg/5nWS9Eu9zz).
   messageLabel: 'Message :'
@@ -65,6 +66,7 @@ contact:
       Des informations détaillées se trouvent sur les [pages des pays](/country)
       et les [pages des opérateurs](/operator).
 
+
       Les questions spécifiques sont répondues par la communauté et l'équipe FIP
       Guide sur [Discord](https://discord.gg/5nWS9Eu9zz).
   submitButton: Envoyer
@@ -79,6 +81,7 @@ contact:
       Des informations sur les possibilités de réservation se trouvent sur la
       [page de l'opérateur](/operator) de l'entreprise concernée.
 
+
       Les questions spécifiques sont répondues par la communauté et l'équipe FIP
       Guide sur [Discord](https://discord.gg/5nWS9Eu9zz).
   topicLabel: 'Catégorie :'

From 4b077c11b7b89b3f25eeeebe5260a0d324881254 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sun, 5 Apr 2026 18:57:12 +0200
Subject: [PATCH 08/10] feat: style fixes

---
 assets/sass/fonts.scss  | 2 ++
 assets/sass/form.scss   | 8 ++++++++
 assets/sass/styles.scss | 2 --
 i18n/de.yaml            | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/assets/sass/fonts.scss b/assets/sass/fonts.scss
index 835b1025e..4de747b40 100644
--- a/assets/sass/fonts.scss
+++ b/assets/sass/fonts.scss
@@ -129,6 +129,8 @@ select,
   font-family: "Roboto", Arial, Helvetica, sans-serif;
   word-wrap: break-word;
   hyphens: auto;
+  font-size: 1.8rem;
+  line-height: 1.5;
 }
 
 .material-symbols-rounded::before {
diff --git a/assets/sass/form.scss b/assets/sass/form.scss
index cf4d654e9..05465d1e8 100644
--- a/assets/sass/form.scss
+++ b/assets/sass/form.scss
@@ -28,6 +28,14 @@
 
     @include focus-indicator(0.2rem);
   }
+
+  select {
+    height: 5.1rem;
+  }
+
+  .a-button {
+    border: 0.2rem solid var(--link-default);
+  }
 }
 
 #success {
diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss
index 8dad07a23..0bf51a230 100644
--- a/assets/sass/styles.scss
+++ b/assets/sass/styles.scss
@@ -7,10 +7,8 @@ html {
 body {
   color: var(--color-body);
   background-color: var(--bg-neutral);
-  font-size: 1.8rem;
   overflow-x: hidden;
   margin: 0;
-  line-height: 1.5;
 
   @media print {
     print-color-adjust: exact;
diff --git a/i18n/de.yaml b/i18n/de.yaml
index 28c7d93a9..ecd55a41f 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -29,7 +29,7 @@ contact:
     label: 'Feedback zur Website: Lob und Kritik'
     note: >-
       Wir freuen uns über jedes Feedback, um die Website für unsere Kolleginnen
-      und Kollege der FIP-Mitglieder zu verbessern.
+      und Kollegen der FIP-Mitglieder zu verbessern.
   fipcard:
     label: Beantragung von FIP Ausweis und FIP Freifahrtschein
     note: >-

From a6da74b1a6b867e76afa92a472ce9d9fca46fecc Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sun, 5 Apr 2026 19:20:23 +0200
Subject: [PATCH 09/10] feat: style fixes

---
 assets/sass/form.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/sass/form.scss b/assets/sass/form.scss
index 05465d1e8..b2f857796 100644
--- a/assets/sass/form.scss
+++ b/assets/sass/form.scss
@@ -30,7 +30,7 @@
   }
 
   select {
-    height: 5.1rem;
+    height: 5.5rem;
   }
 
   .a-button {

From 16ceb6a9f3688cb7bd756924fbe965c9daadea78 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robert.r.schuster@deutschebahn.com>
Date: Sun, 5 Apr 2026 19:26:34 +0200
Subject: [PATCH 10/10] feat: style fixes

---
 assets/sass/form.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/sass/form.scss b/assets/sass/form.scss
index b2f857796..04806433d 100644
--- a/assets/sass/form.scss
+++ b/assets/sass/form.scss
@@ -25,6 +25,7 @@
     background-color: var(--bg-neutral);
     color: var(--body-color);
     resize: vertical;
+    text-overflow: ellipsis;
 
     @include focus-indicator(0.2rem);
   }