diff --git a/Leibit.Core/Data/Areas.xml b/Leibit.Core/Data/Areas.xml
index 920cc07..18d561a 100644
--- a/Leibit.Core/Data/Areas.xml
+++ b/Leibit.Core/Data/Areas.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <leibit>
   <area id="nhth" name="Mitteldeutschland">
+    <estw id="FSP" name="Frankfurt Sportfeld" dataFile="leibit_FF-SPORTFELD.dat" infrastructureManager="DB"/>
+    <estw id="FF_N" name="Frankfurt Hbf Nordseite" dataFile="leibit_FF-HBF NORDSEITE.dat" infrastructureManager="DB"/>
+    <estw id="FF_S" name="Frankfurt Hbf Südseite" dataFile="leibit_FF-HBF SÜDSEITE.dat" infrastructureManager="DB"/>
+    <estw id="FHAU" name="Frankfurt-Hauptwache" dataFile="leibit_FF-HAUPTWACHE.dat" infrastructureManager="DB"/>
     <estw id="NWH" name="Würzburg Hbf" dataFile="leibit_WÜRZBURG HBF.dat" infrastructureManager="DB"/>
     <estw id="NGM" name="Gemünden" dataFile="leibit_GEMÜNDEN.dat" infrastructureManager="DB"/>
     <estw id="NLO" name="Lohr" dataFile="leibit_LOHR.dat" infrastructureManager="DB"/>
diff --git a/Leibit.Core/Data/nhth/FF_N.xml b/Leibit.Core/Data/nhth/FF_N.xml
new file mode 100644
index 0000000..2b75ba5
--- /dev/null
+++ b/Leibit.Core/Data/nhth/FF_N.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<estw>
+  <station name="Frankfurt (Main) Hbf" short="FF_N" refNr="2" scheduleFile="G2______.ABF" localOrderFile="bf2_____.abf" displayName="Frankfurt Hbf">
+    <track name="011" displayName="11">
+      <block name="02BFSFN3"/>
+    </track>
+    <track name="012" displayName="12">
+      <block name="02BFSFN2"/>
+    </track>
+    <track name="013" displayName="13">
+      <block name="02G013"/>
+      <block name="02G213"/>
+    </track>
+    <track name="014" displayName="14">
+      <block name="02G014"/>
+      <block name="02G214"/>
+    </track>
+    <track name="015" displayName="15">
+      <block name="02G015"/>
+      <block name="02G215"/>
+    </track>
+    <track name="016" displayName="16">
+      <block name="02G016"/>
+      <block name="02G216"/>
+    </track>
+    <track name="017" displayName="17">
+      <block name="02G017"/>
+      <block name="02G217"/>
+    </track>
+    <track name="018" displayName="18">
+      <block name="02G018"/>
+      <block name="02G218"/>
+    </track>
+    <track name="019" displayName="19">
+      <block name="02G019"/>
+      <block name="02G219"/>
+    </track>
+    <track name="020" displayName="20">
+      <block name="02G020"/>
+      <block name="02G220"/>
+    </track>
+    <track name="021" displayName="21">
+      <block name="02G021"/>
+      <block name="02G221"/>
+    </track>
+    <track name="022" displayName="22">
+      <block name="02G022"/>
+      <block name="02G222"/>
+    </track>
+    <track name="023" displayName="23">
+      <block name="02G023"/>
+      <block name="02G223"/>
+    </track>
+    <track name="024" displayName="24">
+      <block name="02G024"/>
+      <block name="02G224"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Hbf" short="FF_S" refNr="1">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="02BFSFN1" direction="left"/>
+      <block name="02BFSFN4" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Galluswarte" short="FGA" refNr="21">
+    <scheduleFile fileName="G21_____.abf">
+      <track>003</track>
+      <track>004</track>
+      <track>105</track>
+      <track>106</track>
+      <track>107</track>
+      <track>200</track>
+    </scheduleFile>
+
+    <track name="003">
+      <block name="21S003"/>
+    </track>
+    <track name="004">
+      <block name="21S004"/>
+    </track>
+    <track name="105">
+      <block name="21S102"/>
+      <alternative track="003"/>
+      <alternative track="004"/>
+      <alternative track="106"/>
+      <alternative track="107"/>
+    </track>
+    <track name="106">
+      <block name="21S101"/>
+      <alternative track="003"/>
+      <alternative track="004"/>
+      <alternative track="105"/>
+      <alternative track="107"/>
+    </track>
+    <track name="107">
+      <block name="21S100"/>
+      <alternative track="003"/>
+      <alternative track="004"/>
+      <alternative track="105"/>
+      <alternative track="106"/>
+    </track>
+    <track name="200">
+      <block name="21S200"/>
+      <alternative track="003"/>
+      <alternative track="004"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) West" short="FFW" refNr="22">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="21S301" direction="left"/>
+      <block name="21S302" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Hbf (tief)" short="FFT" refNr="3">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="03BFTFN1" direction="right"/>
+      <block name="03BFTFN2" direction="right"/>
+    </track>
+  </station>
+  
+  <station name="Frankfurt (Main) Hoch/Tief" short="FF H" refNr="3" scheduleFile="b3______.ABF">
+    <track name="113">
+      <block name="12B113"/>
+    </track>
+    <track name="419" isPlatform="false">
+      <block name="02G419" direction="left"/>
+    </track>
+    <track name="519" isPlatform="false">
+      <block name="02B114" direction="right"/>
+    </track>
+    <track name="170" isPlatform="false">
+      <block name="03G170" direction="left"/>
+    </track>
+    <track name="190" isPlatform="false">
+      <block name="03G12" direction="right"/>
+    </track>
+    <track name="070" isPlatform="false">
+      <block name="03G070" direction="left"/>
+    </track>
+    <track name="090" isPlatform="false">
+      <block name="03B11" direction="right"/>
+    </track>
+    <track name="620" isPlatform="false">
+      <block name="02G620" direction="left"/>
+    </track>
+    <track name="621" isPlatform="false">
+      <block name="02G621" direction="left"/>
+    </track>
+    <track name="820" isPlatform="false">
+      <block name="02G820" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Außenbahnhof" short="FFAU" refNr="3">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="02BFAFF" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt Mainzer Landstraße" short="FMLA" refNr="6">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="02B101" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt am Main Kleyerstraße" short="FKY" refNr="4" scheduleFile="G4______.ABF">
+    <track name="11" isPlatform="false">
+      <block name="03B11" direction="left"/>
+    </track>
+    <track name="12" isPlatform="false">
+      <block name="04G12" direction="left"/>
+    </track>
+    <track name="91" isPlatform="false">
+      <block name="04B21" direction="right"/>
+    </track>
+    <track name="92" isPlatform="false">
+      <block name="04G22" direction="right"/>
+    </track>
+    <track name="93" isPlatform="false">
+      <block name="04B01" direction="right"/>
+    </track>
+    <track name="94" isPlatform="false">
+      <block name="12B02" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Niederrad" short="FNI" refNr="12" scheduleFile="v12_____.ABF" displayName="F-Niederrad">
+    <track name="03" displayName="4">
+      <block name="12S03"/>
+    </track>
+    <track name="04" displayName="3">
+      <block name="12S04"/>
+    </track>
+
+    <track calculateDelay="false" isPlatform="false">
+      <block name="12S111" direction="left"/>
+      <block name="12S112" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt Sportfeld" short="FSP" refNr="13">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="12S05" direction="left"/>
+      <block name="12S06" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Griesheim" short="FGM" refNr="5">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="05B24" direction="left"/>
+      <block name="04B21" direction="left"/>
+    </track>
+  </station>
+</estw>
\ No newline at end of file
diff --git a/Leibit.Core/Data/nhth/FF_S.xml b/Leibit.Core/Data/nhth/FF_S.xml
new file mode 100644
index 0000000..6590209
--- /dev/null
+++ b/Leibit.Core/Data/nhth/FF_S.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<estw>
+  <station name="Frankfurt (Main) Hbf" short="FF_S" refNr="1" scheduleFile="g1______.abf" localOrderFile="bf1_____.abf" displayName="Frankfurt Hbf">
+    <track name="100" displayName="1a">
+      <block name="01G100"/>
+    </track>
+    <track name="001" displayName="1">
+      <block name="01G001"/>
+      <block name="01G201"/>
+    </track>
+    <track name="002" displayName="2">
+      <block name="01G002"/>
+      <block name="01G202"/>
+    </track>
+    <track name="003" displayName="3">
+      <block name="01G003"/>
+      <block name="01G203"/>
+    </track>
+    <track name="004" displayName="4">
+      <block name="01G004"/>
+      <block name="01G204"/>
+    </track>
+    <track name="005" displayName="5">
+      <block name="01G005"/>
+      <block name="01G205"/>
+    </track>
+    <track name="006" displayName="6">
+      <block name="01G006"/>
+      <block name="01G206"/>
+    </track>
+    <track name="007" displayName="7">
+      <block name="01G007"/>
+      <block name="01G207"/>
+    </track>
+    <track name="008" displayName="8">
+      <block name="01G008"/>
+      <block name="01G208"/>
+    </track>
+    <track name="009" displayName="9">
+      <block name="01G009"/>
+      <block name="01G209"/>
+    </track>
+    <track name="010" displayName="10">
+      <block name="01G010"/>
+      <block name="01G210"/>
+    </track>
+    <track name="011" displayName="11">
+      <block name="01G011"/>
+      <block name="01G211"/>
+    </track>
+    <track name="012" displayName="12">
+      <block name="01G012"/>
+      <block name="01G212"/>
+    </track>
+    <track name="013" displayName="13">
+      <block name="01BFNFS1"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Hbf" short="FF_N" refNr="2">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="01BFNFS2" direction="left"/>
+      <block name="01BFNFS3" direction="left"/>
+      <block name="01BFNFS4" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt Main-Neckar-Brücke" short="FMST" refNr="40">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="40S21" direction="left"/>
+      <block name="40S23" direction="left"/>
+      <block name="40S03" direction="left"/>
+      <block name="40S1003" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Gutleuthof" short="FGUR" refNr="11" scheduleFile="g11_____.abf">
+    <track name="101" isPlatform="false">
+      <block name="11B01" direction="left"/>
+    </track>
+    <track name="102" isPlatform="false">
+      <block name="11B02" direction="left"/>
+    </track>
+    <track name="103" isPlatform="false">
+      <block name="11B902" direction="right"/>
+    </track>
+    <track name="104" isPlatform="false">
+      <block name="12B901" direction="right"/>
+    </track>
+    <track name="201" isPlatform="false">
+      <block name="11B11" direction="right"/>
+    </track>
+    <track name="202" isPlatform="false">
+      <block name="06B12" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Niederrad" short="FNI" refNr="12">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="11B902" direction="left"/>
+      <block name="12S12G81" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt Mainzer Landstraße" short="FMLA" refNr="6">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="11B11" direction="left"/>
+      <block name="06B12" direction="left"/>
+    </track>
+  </station>
+</estw>
\ No newline at end of file
diff --git a/Leibit.Core/Data/nhth/FHAU.xml b/Leibit.Core/Data/nhth/FHAU.xml
new file mode 100644
index 0000000..7128afb
--- /dev/null
+++ b/Leibit.Core/Data/nhth/FHAU.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<estw>
+  <station name="Langen-Flugsicherung" short="FLGF" refNr="9" scheduleFile="v9______.ABF">
+    <track name="312" calculateDelay="false" displayName="1">
+      <block name="09S312"/>
+    </track>
+    <track name="313" calculateDelay="false" displayName="2">
+      <block name="09S313"/>
+    </track>
+  </station>
+
+  <station name="Dreieich-Buchschlag Hp" short="FBUSS" refNr="9" scheduleFile="b9______.ABF">
+    <track name="310" calculateDelay="false" displayName="2">
+      <block name="09B310"/>
+    </track>
+    <track name="311" calculateDelay="false" displayName="3">
+      <block name="08B311"/>
+    </track>
+  </station>
+
+  <station name="Neu Isenburg Hp" short="FNUI" refNr="8" scheduleFile="b8______.ABF">
+    <track name="304" calculateDelay="false" displayName="2">
+      <block name="08B304"/>
+    </track>
+    <track name="305" calculateDelay="false" displayName="3">
+      <block name="08B305"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Louisa" short="FLS" refNr="7" scheduleFile="g7______.ABF" localOrderFile="bf7_____.ABF" displayName="F-Louisa">
+    <track name="001" displayName="1">
+      <block name="07G001"/>
+    </track>
+    <track name="002" displayName="2">
+      <block name="07G002"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Stresemannallee" short="FSTL" refNr="7" scheduleFile="b7______.ABF" displayName="F-Stresemannallee">
+    <track name="302" calculateDelay="false" displayName="2">
+      <block name="07B302"/>
+    </track>
+    <track name="303" calculateDelay="false" displayName="1">
+      <block name="06B303"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Süd" short="FFS" refNr="6" scheduleFile="g6______.ABF" localOrderFile="bf6_____.ABF" displayName="F-Süd">
+    <track name="001" displayName="1">
+      <block name="06G001"/>
+    </track>
+    <track name="002" displayName="2">
+      <block name="06G002"/>
+    </track>
+    <track name="003" displayName="3">
+      <block name="06G003"/>
+    </track>
+    <track name="004" displayName="4">
+      <block name="06G004"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Lokalbahnhof" short="FLBF" refNr="5" scheduleFile="b5______.ABF" displayName="F-Lokalbahnhof">
+    <track name="094" calculateDelay="false" displayName="1">
+      <block name="05B094"/>
+    </track>
+    <track name="194" calculateDelay="false" displayName="2">
+      <block name="05B194"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Schlachthof" short="FSHF" refNr="5" scheduleFile="g50_____.abf">
+    <track name="092" isPlatform="false">
+      <block name="05G092" direction="left"/>
+      <block name="05G133" direction="right"/>
+    </track>
+    <track name="134" isPlatform="false">
+      <block name="05G134" direction="right"/>
+      <block name="05G136" direction="right"/>
+    </track>
+    <track name="135" isPlatform="false">
+      <block name="05G135" direction="right"/>
+    </track>
+    <track name="190" isPlatform="false">
+      <block name="05G192" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Mühlberg" short="FMUL" refNr="5" scheduleFile="g5______.ABF" localOrderFile="bf5_____.ABF" displayName="F-Mühlberg">
+    <track name="137" displayName="1">
+      <block name="05G137"/>
+    </track>
+    <track name="138" displayName="2">
+      <block name="05G138"/>
+    </track>
+  </station>
+
+  <station name="Offenbach-Kaiserlei" short="FOKL" refNr="5" scheduleFile="v5______.ABF" displayName="OF-Kaiserlei">
+    <track name="145" displayName="1">
+      <block name="05G145"/>
+    </track>
+    <track name="148" displayName="2">
+      <block name="05G148"/>
+    </track>
+  </station>
+
+  <station name="Offenbach Ledermuseum" short="FOLM" refNr="45" scheduleFile="v45_____.ABF" displayName="OF-Ledermuseum">
+    <track name="21" calculateDelay="false" displayName="1">
+      <block name="46B21"/>
+    </track>
+    <track name="22" calculateDelay="false" displayName="2">
+      <block name="45B22"/>
+    </track>
+  </station>
+
+  <station name="Offenbach Marktplatz" short="FOMP" refNr="46" scheduleFile="v46_____.ABF" displayName="OF-Marktplatz">
+    <track name="25" calculateDelay="false" displayName="1">
+      <block name="46S25"/>
+    </track>
+    <track name="26" calculateDelay="false" displayName="2">
+      <block name="46S26"/>
+    </track>
+  </station>
+
+  <station name="Offenbach (Main) Ost" short="FOO" refNr="46">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="46S27" direction="left"/>
+      <block name="46S28" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Ostendstraße" short="FOST" refNr="4" scheduleFile="v4______.ABF" displayName="F-Ostendstraße">
+    <track name="131" displayName="1">
+      <block name="04G131"/>
+    </track>
+    <track name="132" displayName="2">
+      <block name="04G132"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Konstablerwache" short="FKON" refNr="4" scheduleFile="b4______.ABF" displayName="F-Konstablerwache">
+    <track name="125" displayName="2">
+      <block name="04G125"/>
+    </track>
+    <track name="126" displayName="3">
+      <block name="04G126"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Hauptwache" short="FHAU" refNr="4" scheduleFile="g4______.ABF" displayName="F-Hauptwache" localOrderFile="bf4_____.ABF">
+    <track name="121" displayName="2">
+      <block name="04G121"/>
+    </track>
+    <track name="122" displayName="3">
+      <block name="04G122"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Taunusanlage" short="FFTA" refNr="3" scheduleFile="b3______.ABF" displayName="F-Taunusanlage">
+    <track name="117" displayName="1">
+      <block name="03G117"/>
+    </track>
+    <track name="118" displayName="2">
+      <block name="03G118"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Hbf (tief)" short="FFT" refNr="3" scheduleFile="g3______.ABF" displayName="F-Hbf" localOrderFile="bf3_____.ABF">
+    <track name="101">
+      <block name="03G101"/>
+    </track>
+    <track name="102">
+      <block name="03G102"/>
+    </track>
+    <track name="103">
+      <block name="03G103"/>
+    </track>
+    <track name="104">
+      <block name="03G104"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Galluswarte" short="FFGA" refNr="21">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="03B01" direction="left"/>
+      <block name="21B02" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Hoch/Tief" short="FF H" refNr="3">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="03BFNFT1" direction="left"/>
+      <block name="03BFNFT2" direction="left"/>
+    </track>
+  </station>
+</estw>
\ No newline at end of file
diff --git a/Leibit.Core/Data/nhth/FSP.xml b/Leibit.Core/Data/nhth/FSP.xml
new file mode 100644
index 0000000..8da3464
--- /dev/null
+++ b/Leibit.Core/Data/nhth/FSP.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<estw>
+  <station name="Frankfurt (Main) Hbf" short="FF" refNr="1">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="01B01" direction="right"/>
+      <block name="40B02" direction="right"/>
+      <block name="01B1001" direction="right"/>
+      <block name="40B1002" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Galluswarte" short="FFGA" refNr="21">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="21B101" direction="right"/>
+      <block name="40G102" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt Main-Neckar-Brücke" short="FMST" refNr="40" scheduleFile="G40_____.ABF" localOrderFile="bf40____.abf">
+    <track name="11" isPlatform="false">
+      <block name="40G21" direction="left"/>
+    </track>
+    <track name="12" isPlatform="false">
+      <block name="40B03" direction="left"/>
+    </track>
+    <track name="13" isPlatform="false">
+      <block name="40G23" direction="left"/>
+    </track>
+    <track name="14" isPlatform="false">
+      <block name="40B1003" direction="left"/>
+    </track>
+    <track name="15" isPlatform="false">
+      <block name="40B102" direction="left"/>
+    </track>
+    <track name="16" isPlatform="false">
+      <block name="21B101" direction="left"/>
+    </track>
+    <track name="83" isPlatform="false">
+      <block name="41B12" direction="right"/>
+    </track>
+    <track name="84" isPlatform="false">
+      <block name="40G94" direction="right"/>
+    </track>
+    <track name="91" isPlatform="false">
+      <block name="43B10" direction="right"/>
+    </track>
+    <track name="92" isPlatform="false">
+      <block name="40G92" direction="right"/>
+    </track>
+    <track name="111">
+      <block name="40G111"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Süd Abstellbahnhof" short="FFS A" refNr="43">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="43B10" direction="left"/>
+      <block name="40B13" direction="left"/>
+      <block name="41B101" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Louisa" short="FLS" refNr="41" scheduleFile="G41_____.ABF" localOrderFile="bf41____.ABF">
+    <track name="04">
+      <block name="41G04"/>
+    </track>
+    <track name="05">
+      <block name="41G05"/>
+    </track>
+    <track name="06">
+      <block name="41G06"/>
+    </track>
+  </station>
+
+  <station name="Neu-Isenburg Nord" short="FNIS N" refNr="51" scheduleFile="G51_____.ABF" localOrderFile="bf51____.ABF">
+    <track name="12" isPlatform="false">
+      <block name="41B22" direction="left"/>
+    </track>
+    <track name="13" isPlatform="false">
+      <block name="41B21" direction="left"/>
+    </track>
+    <track name="14" isPlatform="false">
+      <block name="51B11" direction="right"/>
+    </track>
+    <track name="91" isPlatform="false">
+      <block name="51B01" direction="right"/>
+    </track>
+    <track name="92" isPlatform="false">
+      <block name="51B32" direction="right"/>
+    </track>
+    <track name="93" isPlatform="false">
+      <block name="51B31" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Neu-Isenburg" short="FNIS" refNr="52">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="51B01" direction="left"/>
+      <block name="52S2" direction="left"/>
+      <block name="52S3" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Süd" short="FFS" refNr="44">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="44S13" direction="right"/>
+      <block name="44S14" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Forsthaus (Frankfurt)" short="FFOR" refNr="42" scheduleFile="G42_____.ABF" localOrderFile="bf42____.ABF">
+    <track name="01" isPlatform="false"/>
+    <track name="03" isPlatform="false"/>
+    <track name="04" isPlatform="false"/>
+    <track name="06" isPlatform="false"/>
+    <track name="08" isPlatform="false"/>
+
+    <track name="10" isPlatform="false">
+      <block name="12B21" direction="right"/>
+    </track>
+    <track name="11" isPlatform="false">
+      <block name="42B02" direction="right"/>
+    </track>
+    <track name="12" isPlatform="false">
+      <block name="42B01" direction="right"/>
+    </track>
+    <track name="90" isPlatform="false">
+      <block name="41B01" direction="left"/>
+    </track>
+    <track name="91" isPlatform="false">
+      <block name="44B12" direction="left"/>
+    </track>
+    <track name="92" isPlatform="false">
+      <block name="42B11" direction="left"/>
+    </track>
+    <track name="93" isPlatform="false">
+      <block name="51B11" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Gutleuthof" short="FGUR" refNr="11">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="12B901" direction="right"/>
+      <block name="11B902" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Hoch/Tief" short="FF H" refNr="3">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="12B113" direction="right"/>
+      <block name="02B114" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (Main) Außenbahnhof" short="FFAU" refNr="3">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="12B101" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt Mainzer Landstraße" short="FMLA" refNr="6">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="12B201" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Griesheim" short="FGM" refNr="5">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="12B301" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt am Main Kleyerstraße" short="FKY" refNr="4">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="04B01" direction="right"/>
+      <block name="12B02" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Niederrad" short="FNI" refNr="12" scheduleFile="G12_____.ABF" localOrderFile="bf12____.ABF" displayName="F-Niederrad">
+    <track name="03" displayName="1">
+      <block name="12G03"/>
+      <alternative track="04"/>
+      <alternative track="08"/>
+    </track>
+    <track name="04" displayName="2">
+      <block name="12G04"/>
+      <alternative track="03"/>
+      <alternative track="08"/>
+    </track>
+    <track name="08">
+      <block name="12G08"/>
+      <alternative track="03"/>
+      <alternative track="04"/>
+    </track>
+
+    <track name="53">
+      <block name="12G53"/>
+      <alternative track="54"/>
+      <alternative track="58"/>
+    </track>
+    <track name="54">
+      <block name="12G54"/>
+      <alternative track="53"/>
+      <alternative track="58"/>
+    </track>
+    <track name="58">
+      <block name="12G58"/>
+      <alternative track="53"/>
+      <alternative track="54"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Niederrad Hp" short="FNI S" refNr="12" scheduleFile="b12_____.ABF" displayName="F-Niederrad">
+    <track name="03" displayName="4">
+      <block name="12B03"/>
+    </track>
+    <track name="04" displayName="3">
+      <block name="12B04"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt Sportfeld" short="FSP" refNr="13" scheduleFile="G13_____.ABF" localOrderFile="bf13____.ABF" displayName="F-Stadion">
+    <track name="01" displayName="1">
+      <block name="13G01"/>
+    </track>
+    <track name="02" displayName="2">
+      <block name="13G02"/>
+    </track>
+    <track name="03" displayName="3">
+      <block name="13G03"/>
+    </track>
+    <track name="04" displayName="4">
+      <block name="13G04"/>
+    </track>
+    <track name="05" displayName="5">
+      <block name="13G05"/>
+    </track>
+    <track name="06" displayName="6">
+      <block name="13G06"/>
+    </track>
+    <track name="07" displayName="7">
+      <block name="13G07"/>
+    </track>
+  </station>
+
+  <station name="Zeppelinheim" short="FZEP" refNr="74" scheduleFile="V74_____.ABF">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="72B101" direction="right"/>
+      <block name="74B102" direction="right"/>
+    </track>
+
+    <track name="41" calculateDelay="false">
+      <block name="74S41"/>
+    </track>
+    <track name="42" calculateDelay="false">
+      <block name="74S42"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt-Schwanheim" short="FSWA" refNr="14" scheduleFile="G14_____.ABF" localOrderFile="bf14____.ABF">
+    <track name="101" isPlatform="false">
+      <block name="14B91" direction="left"/>
+      <block name="14B85" direction="right"/>
+    </track>
+    <track name="103" isPlatform="false">
+      <block name="14B12" direction="left"/>
+      <block name="15B22" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (M) Flughafen Regiobf" short="FFLU" refNr="15">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="14B21" direction="left"/>
+      <block name="15B22" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Kelsterbach" short="FKCH" refNr="16">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="16B81" direction="left"/>
+      <block name="14B82" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurter Kreuz" short="FFK" refNr="73" scheduleFile="G73_____.ABF">
+    <track name="101" isPlatform="false">
+      <block name="72B181" direction="right"/>
+    </track>
+    <track name="102" isPlatform="false">
+      <block name="73B182" direction="right"/>
+    </track>
+    <track name="201" isPlatform="false">
+      <block name="13B191" direction="left"/>
+    </track>
+    <track name="202" isPlatform="false">
+      <block name="13B192" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Frankfurt (M) Flughafen Fernbf" short="FFLF" refNr="72" scheduleFile="G72_____.ABF" displayName="F-Flughafen Fernbf">
+    <track name="204" displayName="4" displaySubName="A-D">
+      <block name="72G204"/>
+      <alternative track="305"/>
+      <alternative track="306"/>
+      <alternative track="207"/>
+    </track>
+    <track name="305" displayName="5" displaySubName="A-D">
+      <block name="72G305"/>
+      <alternative track="204"/>
+      <alternative track="306"/>
+      <alternative track="207"/>
+    </track>
+    <track name="306" displayName="6" displaySubName="A-D">
+      <block name="72G306"/>
+      <alternative track="204"/>
+      <alternative track="305"/>
+      <alternative track="207"/>
+    </track>
+    <track name="207" displayName="7" displaySubName="A-D">
+      <block name="72G207"/>
+      <alternative track="204"/>
+      <alternative track="305"/>
+      <alternative track="306"/>
+    </track>
+
+    <track name="304" displayName="4" displaySubName="D-G">
+      <block name="72G304"/>
+      <alternative track="405"/>
+      <alternative track="406"/>
+      <alternative track="307"/>
+    </track>
+    <track name="405" displayName="5" displaySubName="D-G">
+      <block name="72G405"/>
+      <alternative track="304"/>
+      <alternative track="406"/>
+      <alternative track="307"/>
+    </track>
+    <track name="406" displayName="6" displaySubName="D-G">
+      <block name="72G406"/>
+      <alternative track="304"/>
+      <alternative track="405"/>
+      <alternative track="307"/>
+    </track>
+    <track name="307" displayName="7" displaySubName="D-G">
+      <block name="72G307"/>
+      <alternative track="304"/>
+      <alternative track="405"/>
+      <alternative track="406"/>
+    </track>
+  </station>
+
+  <station name="Raunheim Mönchhof" short="FMOH" refNr="71" scheduleFile="G71_____.ABF">
+    <track name="101" isPlatform="false">
+      <block name="70B161" direction="right"/>
+    </track>
+    <track name="102" isPlatform="false">
+      <block name="71B162" direction="right"/>
+    </track>
+    <track name="103" isPlatform="false">
+      <block name="71B01" direction="right"/>
+    </track>
+    <track name="201" isPlatform="false">
+      <block name="71B3171" direction="left"/>
+    </track>
+    <track name="202" isPlatform="false">
+      <block name="71B172" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Raunheim Caltex" short="FCX" refNr="70" scheduleFile="G70_____.ABF">
+    <track name="160" isPlatform="false">
+      <block name="71B162" direction="left"/>
+      <block name="70S156" direction="right"/>
+    </track>
+    <track name="155" isPlatform="false">
+      <block name="70B161" direction="left"/>
+      <block name="70S155" direction="right"/>
+    </track>
+    <track name="01" isPlatform="false">
+      <block name="70S01" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Breckenheim" short="FBRM" refNr="69">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="70S151" direction="left"/>
+      <block name="70S152" direction="left"/>
+    </track>
+  </station>
+
+  <station name="Kelsterbach Brunnenschneise" short="FBRS" refNr="17">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="70S01" direction="right"/>
+    </track>
+  </station>
+
+  <station name="Raunheim Mönchwald" short="FMOW" refNr="18">
+    <track calculateDelay="false" isPlatform="false">
+      <block name="71B01" direction="left"/>
+    </track>
+  </station>
+</estw>
\ No newline at end of file
diff --git a/Leibit.Core/Data/nhth/TrainNumbers.xml b/Leibit.Core/Data/nhth/TrainNumbers.xml
index 13991ad..8d15140 100644
--- a/Leibit.Core/Data/nhth/TrainNumbers.xml
+++ b/Leibit.Core/Data/nhth/TrainNumbers.xml
@@ -1,8 +1,36 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <TrainNumbers>
+  <TrainNumber type="S" pattern="400x" line="S2"/>
+  <TrainNumber type="S" pattern="401x" line="S2"/>
+  <TrainNumber type="S" pattern="402x" line="S2"/>
+  <TrainNumber type="S" pattern="403x" line="S2"/>
   <TrainNumber type="S" pattern="41xx" line="S1"/>
-  <TrainNumber type="S" pattern="47xx" line="S9"/>
+  <TrainNumber type="S" pattern="42xx" line="S2"/>
+  <TrainNumber type="S" pattern="43xx" line="S3"/>
+  <TrainNumber type="S" pattern="44xx" line="S4"/>
+  <TrainNumber type="S" pattern="45xx" line="S5"/>
+  <TrainNumber type="S" pattern="46xx" line="S6"/>
+  <TrainNumber type="S" pattern="470x" line="S9"/>
+  <TrainNumber type="S" pattern="471x" line="S9"/>
+  <TrainNumber type="S" pattern="474x" line="S9"/>
+  <TrainNumber type="S" pattern="476x" line="S8"/>
+  <TrainNumber type="S" pattern="477x" line="S8"/>
+  <TrainNumber type="S" pattern="478x" line="S8"/>
+  <TrainNumber type="S" pattern="479x" line="S8"/>
   <TrainNumber type="S" pattern="48xx" line="S8"/>
   <TrainNumber type="S" pattern="49xx" line="S9"/>
   <TrainNumber type="S" pattern="50xx" line="S1"/>
+  <TrainNumber type="S" pattern="56xx" line="S6"/>
+  <TrainNumber type="S" pattern="680x" line="S4"/>
+  <TrainNumber type="S" pattern="681x" line="S4"/>
+  <TrainNumber type="S" pattern="682x" line="S4"/>
+  <TrainNumber type="S" pattern="683x" line="S4"/>
+  <TrainNumber type="S" pattern="685x" line="S5"/>
+  <TrainNumber type="S" pattern="686x" line="S5"/>
+  <TrainNumber type="S" pattern="687x" line="S5"/>
+  <TrainNumber type="S" pattern="688x" line="S5"/>
+  <TrainNumber type="S" pattern="689x" line="S5"/>
+  <TrainNumber type="S" pattern="69xx" line="S9"/>
+  <TrainNumber type="S" pattern="951xx" line="S1"/>
+  <TrainNumber type="S" pattern="952xx" line="S7"/>
 </TrainNumbers>
\ No newline at end of file
diff --git a/Leibit.Core/Leibit.Core.csproj b/Leibit.Core/Leibit.Core.csproj
index 1352cff..4081bc3 100644
--- a/Leibit.Core/Leibit.Core.csproj
+++ b/Leibit.Core/Leibit.Core.csproj
@@ -31,8 +31,12 @@
     <None Remove="Data\nhth\FEL.xml" />
     <None Remove="Data\nhth\FFS.xml" />
     <None Remove="Data\nhth\FFU.xml" />
+    <None Remove="Data\nhth\FF_N.xml" />
+    <None Remove="Data\nhth\FF_S.xml" />
     <None Remove="Data\nhth\FH_N.xml" />
     <None Remove="Data\nhth\FH_S.xml" />
+    <None Remove="Data\nhth\FHAU.xml" />
+    <None Remove="Data\nhth\FSP.xml" />
     <None Remove="Data\nhth\NGM.xml" />
     <None Remove="Data\nhth\NHEI.xml" />
     <None Remove="Data\nhth\NAH.xml" />
@@ -115,8 +119,12 @@
     <EmbeddedResource Include="Data\nhth\FEL.xml" />
     <EmbeddedResource Include="Data\nhth\FFS.xml" />
     <EmbeddedResource Include="Data\nhth\FFU.xml" />
+    <EmbeddedResource Include="Data\nhth\FF_N.xml" />
+    <EmbeddedResource Include="Data\nhth\FF_S.xml" />
     <EmbeddedResource Include="Data\nhth\FH_N.xml" />
     <EmbeddedResource Include="Data\nhth\FH_S.xml" />
+    <EmbeddedResource Include="Data\nhth\FHAU.xml" />
+    <EmbeddedResource Include="Data\nhth\FSP.xml" />
     <EmbeddedResource Include="Data\nhth\NGM.xml" />
     <EmbeddedResource Include="Data\nhth\NHEI.xml" />
     <EmbeddedResource Include="Data\nhth\NAH.xml" />
diff --git a/assets/ESTWonline/ESTWsim_Liste.ini b/assets/ESTWonline/ESTWsim_Liste.ini
index 33c7d06..23d74cb 100644
--- a/assets/ESTWonline/ESTWsim_Liste.ini
+++ b/assets/ESTWonline/ESTWsim_Liste.ini
@@ -3,7 +3,7 @@ Hamburg / Schleswig-Holstein=1
 Bremen / Niedersachsen=2
 Berlin=13
 Nordrhein-Westfalen=3
-Rhein/Main=7
+Rhein/Main=17
 Osthessen / Thüringen=8
 Main-Kinzig / Spessart=4
 Stuttgart=10
@@ -11,7 +11,7 @@ Bayern=9
 Allgäu / Bodensee=5
 Vorarlberg=6
 Tauernbahn=11
-Schweiz=12
+Zentralschweiz=12
 
 
 [BZ_Hamburg / Schleswig-Holstein]
@@ -53,12 +53,12 @@ Allg
 Bodensee
 
 [BZ_Vorarlberg]
-Vorarlberg
+Bregenz
 
 [BZ_Tauernbahn]
 Schwarzach-St.Veit
 
-[BZ_Schweiz]
+[BZ_Zentralschweiz]
 Luzern
 
 
@@ -110,6 +110,10 @@ Wuppertal Hbf
 
 
 [Frankfurt]
+Ff-Hauptwache
+Ff-Hbf Nordseite
+Ff-Hbf Südseite
+Ff-Sportfeld
 Frankfurt Süd
 Hanau Nordseite
 Hanau Südseite
@@ -175,6 +179,12 @@ Lindau
 Singen
 
 
+[Bregenz]
+BFZ Bregenz
+BFZ Feldkirch
+ESTW Lindau
+
+
 [Schwarzach-St.Veit]
 BFZ Badgastein
 BFZ Bischofshofen
@@ -184,15 +194,9 @@ BFZ Schwarzach-St.Veit
 BFZ Spittal-Millstättersee
 
 
-[Vorarlberg]
-BFZ Bregenz
-BFZ Feldkirch
-ESTW Lindau
-
-
 [Luzern]
 ILTIS Arth-Goldau
 ILTIS Luzern SBB
 ILTIS Rotkreuz
 
-[16.11.2023]
\ No newline at end of file
+[13.11.2024]
diff --git a/maps/Norddeutschland.png b/maps/Norddeutschland.png
index d578dfc..7b69989 100644
Binary files a/maps/Norddeutschland.png and b/maps/Norddeutschland.png differ
diff --git a/maps/Norddeutschland.xcf b/maps/Norddeutschland.xcf
index a6bcb10..bb31a86 100644
Binary files a/maps/Norddeutschland.xcf and b/maps/Norddeutschland.xcf differ
diff --git a/maps/rhein_main.png b/maps/rhein_main.png
index cb22f33..dd98337 100644
Binary files a/maps/rhein_main.png and b/maps/rhein_main.png differ
diff --git a/maps/rhein_main.xcf b/maps/rhein_main.xcf
new file mode 100644
index 0000000..0d616e9
Binary files /dev/null and b/maps/rhein_main.xcf differ