diff --git a/Lisp/Gefaellestrecke.lsp b/Lisp/Gefaellestrecke.lsp
index 3232d19..883d509 100644
--- a/Lisp/Gefaellestrecke.lsp
+++ b/Lisp/Gefaellestrecke.lsp
@@ -1685,7 +1685,11 @@
 ;; TEIL 6: HAUPTBEFEHL
 ;; ============================================================
 
-(defun c:GEFAELLESTRECKE ( / antwort deltaL winkel
+;; Gemeinsamer Ablauf fuer alle drei Eingabemodi. "modus" ist "1"/"2"/"3"
+;; (Werteingabe / 3D-Linie / Linienzug). Banner + Bibliotheks-Init laufen
+;; vorab; der Aufrufer (C:GEFAELLESTRECKE oder die drei Menue-Befehle
+;; GEFAELLESTRECKE_EINFACH/_3DLINIE/_LINIENZUG) bestimmt den Modus.
+(defun gf-strecke-lauf ( modus / antwort deltaL winkel
                              as-seite es-seite gf-as-winkel gf-es-winkel
                              line-points startpunkt endpunkt differenz
                              deltaX deltaY startpunkt-fuer-einfuegen hz-winkel
@@ -1704,12 +1708,7 @@
     )
   )
 
-  ;; Eingabemodus
-  (princ (ssg-text "gf-eingabemodus-header"))
-  (princ (ssg-text "gf-eingabemodus-1"))
-  (princ (ssg-text "gf-eingabemodus-2"))
-  (princ (ssg-text "gf-eingabemodus-3"))
-  (setq antwort (getstring (ssg-text "prompt-wahl-1-2-3")))
+  (setq antwort modus)
 
   (cond
     ;; Modus 3: Linienzug mit Bogen
@@ -1831,6 +1830,23 @@
   nil
 )
 
+;; Hauptbefehl: fragt den Eingabemodus per Konsole ab und startet den Lauf.
+;; (Interaktive Auswahl bleibt fuer Direktaufruf erhalten; das Menue nutzt
+;; stattdessen die drei modus-spezifischen Befehle unten.)
+(defun c:GEFAELLESTRECKE ( / antwort)
+  (princ (ssg-text "gf-eingabemodus-header"))
+  (princ (ssg-text "gf-eingabemodus-1"))
+  (princ (ssg-text "gf-eingabemodus-2"))
+  (princ (ssg-text "gf-eingabemodus-3"))
+  (setq antwort (getstring (ssg-text "prompt-wahl-1-2-3")))
+  (gf-strecke-lauf antwort)
+)
+
+;; Menue-Befehle: je ein fester Eingabemodus ohne Rueckfrage.
+(defun c:GEFAELLESTRECKE_EINFACH   () (gf-strecke-lauf "1")) ; Werteingabe (DCL)
+(defun c:GEFAELLESTRECKE_3DLINIE   () (gf-strecke-lauf "2")) ; aus 3D-Linie
+(defun c:GEFAELLESTRECKE_LINIENZUG () (gf-strecke-lauf "3")) ; Linienzug LINE+ARC
+
 ;; ============================================================
 ;; TEIL 7: GEFAELLESTRECKE_EDIT - Doppelklick/Kontextmenue-Bearbeitung
 ;; ============================================================
diff --git a/Lisp/vf_core.lsp b/Lisp/vf_core.lsp
index fb0fcd2..3e23a49 100644
--- a/Lisp/vf_core.lsp
+++ b/Lisp/vf_core.lsp
@@ -76,6 +76,10 @@
 ;; ============================================================
 (if (null *vf-typ-registry*) (setq *vf-typ-registry* nil))
 (if (null *vf-vorauswahl-typ*) (setq *vf-vorauswahl-typ* nil))
+;; Vorauswahl des Eingabemodus (Standard/Etage): "1"=3D-Linie, "2"=Werte.
+;; Von den Menue-Wrappern gesetzt, damit die Konsolen-/Dialog-Frage
+;; entfaellt. nil = interaktiv fragen (Direktaufruf VarioFoerderer).
+(if (null *vf-vorauswahl-eingabemodus*) (setq *vf-vorauswahl-eingabemodus* nil))
 
 ;; Registriert einen Foerderanlagen-Typ.
 ;; berechne-fn:  '(lambda (deltaL deltaH richtung seite) ...)
@@ -654,10 +658,19 @@
 
 (defun vf-eingabe-abfragen ( / eingabe-modus line-points startpunkt endpunkt differenz
                                 deltaL deltaH deltaX deltaY richtung antwort hz-winkel)
-  (princ (ssg-text "vfc-eingabemodus-header"))
-  (princ (ssg-text "vfc-eingabemodus-3dlinie"))
-  (princ (ssg-text "vfc-eingabemodus-werte"))
-  (setq antwort (getstring (ssg-text "vfc-prompt-wahl-1-2-ohne-default")))
+  ;; Eingabemodus: von einem Menue-Wrapper vorbelegt (dann keine Frage) oder
+  ;; interaktiv. Die Vorauswahl gilt nur EINMAL und wird hier verbraucht,
+  ;; damit ein spaeterer Direktaufruf wieder fragt.
+  (if *vf-vorauswahl-eingabemodus*
+    (setq antwort *vf-vorauswahl-eingabemodus*
+          *vf-vorauswahl-eingabemodus* nil)
+    (progn
+      (princ (ssg-text "vfc-eingabemodus-header"))
+      (princ (ssg-text "vfc-eingabemodus-3dlinie"))
+      (princ (ssg-text "vfc-eingabemodus-werte"))
+      (setq antwort (getstring (ssg-text "vfc-prompt-wahl-1-2-ohne-default")))
+    )
+  )
   (cond
     ((= antwort "1") (setq eingabe-modus "Linie"))
     ((= antwort "2") (setq eingabe-modus "Wert"))
@@ -1154,10 +1167,16 @@
   ;; stellt - siehe vf-eingabe-abfragen).
   (if (member anlage-typ '("standard" "etage"))
     (progn
-      (princ (ssg-text "vfc-eingabemodus-header"))
-      (princ (ssg-text "vfc-eingabemodus-3dlinie"))
-      (princ (ssg-text "vfc-eingabemodus-werte"))
-      (setq antwort (getstring (ssg-text "vfc-prompt-wahl-1-2-ohne-default")))
+      ;; Eingabemodus: Vorauswahl (Menue-Wrapper) hat Vorrang, sonst fragen.
+      (if *vf-vorauswahl-eingabemodus*
+        (setq antwort *vf-vorauswahl-eingabemodus*)
+        (progn
+          (princ (ssg-text "vfc-eingabemodus-header"))
+          (princ (ssg-text "vfc-eingabemodus-3dlinie"))
+          (princ (ssg-text "vfc-eingabemodus-werte"))
+          (setq antwort (getstring (ssg-text "vfc-prompt-wahl-1-2-ohne-default")))
+        )
+      )
       (if (= antwort "2")
         (progn
           (if (= anlage-typ "etage")
@@ -1356,8 +1375,39 @@
 ;; ============================================================
 (defun c:Foerderanlage () (c:VarioFoerderer))
 
-(defun c:EtageVarioFoerderer ()
-  (setq *vf-vorauswahl-typ* "etage")
+;; Menue-Wrapper: jeder feste Endpunkt der VarioFoerderer-Erzeugung ist
+;; direkt aufrufbar (Typ + Eingabemodus vorbelegt, keine Rueckfrage).
+;; Nur der Linienzug fragt intern noch Modus 1/2/3 (komplexer Fall).
+;;   Eingabemodus-Vorauswahl: "2" = Werte manuell (DCL-Dialog),
+;;                            "1" = aus 3D-Linie (Linie picken).
+
+;; --- Standard (AS/ES 90 Grad) ---
+(defun c:StandardVarioFoerderer ()          ; Werte manuell (DCL)
+  (setq *vf-vorauswahl-typ* "standard"
+        *vf-vorauswahl-eingabemodus* "2")
+  (c:VarioFoerderer)
+)
+(defun c:StandardVarioFoerderer3D ()        ; aus 3D-Linie
+  (setq *vf-vorauswahl-typ* "standard"
+        *vf-vorauswahl-eingabemodus* "1")
+  (c:VarioFoerderer)
+)
+
+;; --- Etage (AS/ES 30 Grad, uebereinander) ---
+(defun c:EtageVarioFoerderer ()             ; Werte manuell (DCL)
+  (setq *vf-vorauswahl-typ* "etage"
+        *vf-vorauswahl-eingabemodus* "2")
+  (c:VarioFoerderer)
+)
+(defun c:EtageVarioFoerderer3D ()           ; aus 3D-Linie
+  (setq *vf-vorauswahl-typ* "etage"
+        *vf-vorauswahl-eingabemodus* "1")
+  (c:VarioFoerderer)
+)
+
+;; --- Linienzug (bleibt interaktiv: fragt Modus 1/2/3) ---
+(defun c:LinienzugVarioFoerderer ()
+  (setq *vf-vorauswahl-typ* "linienzug")
   (c:VarioFoerderer)
 )
 
diff --git a/menu/SSG_LIB.cui b/menu/SSG_LIB.cui
index 25e4067..f8351a9 100644
--- a/menu/SSG_LIB.cui
+++ b/menu/SSG_LIB.cui
@@ -68,613 +68,649 @@
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_SEPARATOR_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00018">
-        <Macro>
-          <Name>VarioFoerderer</Name>
-          <Command>^C^C(ssg-ensure "VarioFoerderer") VarioFoerderer</Command>
-        </Macro>
-      </MenuMacro>
       <MenuMacro UID="MM_00019">
         <Macro>
-          <Name>EtageVarioFoerderer</Name>
-          <Command>^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer</Command>
+          <Name>Werte manuell</Name>
+          <Command>^C^C(ssg-ensure "VarioFoerderer") StandardVarioFoerderer</Command>
         </Macro>
       </MenuMacro>
       <MenuMacro UID="MM_00020">
+        <Macro>
+          <Name>aus 3D-Linie</Name>
+          <Command>^C^C(ssg-ensure "VarioFoerderer") StandardVarioFoerderer3D</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00022">
+        <Macro>
+          <Name>Werte manuell</Name>
+          <Command>^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00023">
+        <Macro>
+          <Name>aus 3D-Linie</Name>
+          <Command>^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer3D</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00024">
+        <Macro>
+          <Name>3D-Linienzug</Name>
+          <Command>^C^C(ssg-ensure "VarioFoerderer") LinienzugVarioFoerderer</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00025">
         <Macro>
           <Name>Vario_Kette_Merge</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") Vario_Kette_Merge</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00021">
+      <MenuMacro UID="MM_00026">
         <Macro>
           <Name>VarioFoerderer nachruesten (Marker)</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") VARIOFOERDERER_NACHRUESTEN</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00022">
+      <MenuMacro UID="MM_00028">
         <Macro>
-          <Name>Gefaellestrecke</Name>
-          <Command>^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE</Command>
+          <Name>einfach</Name>
+          <Command>^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EINFACH</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00025">
+      <MenuMacro UID="MM_00029">
+        <Macro>
+          <Name>aus 3D-Linie</Name>
+          <Command>^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_3DLINIE</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00030">
+        <Macro>
+          <Name>aus Linienzug (LINE + ARC)</Name>
+          <Command>^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_LINIENZUG</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00033">
         <Macro>
           <Name>90</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_630_90</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00026">
+      <MenuMacro UID="MM_00034">
         <Macro>
           <Name>67.5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_550_675</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00027">
+      <MenuMacro UID="MM_00035">
         <Macro>
           <Name>45</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_630_45</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00028">
+      <MenuMacro UID="MM_00036">
         <Macro>
           <Name>22.5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_550_225</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00029">
+      <MenuMacro UID="MM_00037">
         <Macro>
           <Name>180</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_650_180</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00031">
+      <MenuMacro UID="MM_00039">
         <Macro>
           <Name>90</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB60_90</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00033">
+      <MenuMacro UID="MM_00041">
         <Macro>
           <Name>AP 60</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_AP60</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00034">
+      <MenuMacro UID="MM_00042">
         <Macro>
           <Name>AP 110</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_AP110</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00035">
+      <MenuMacro UID="MM_00043">
         <Macro>
           <Name>APG 110</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APG110</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00037">
+      <MenuMacro UID="MM_00045">
         <Macro>
           <Name>Einfach 90 700/700 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00038">
+      <MenuMacro UID="MM_00046">
         <Macro>
           <Name>Doppel 90 700/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00039">
+      <MenuMacro UID="MM_00047">
         <Macro>
           <Name>Dreiwege 90 700/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00041">
+      <MenuMacro UID="MM_00049">
         <Macro>
           <Name>Einfach 45 350/700 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00042">
+      <MenuMacro UID="MM_00050">
         <Macro>
           <Name>Doppel 45 350/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00043">
+      <MenuMacro UID="MM_00051">
         <Macro>
           <Name>Dreiwege 45 350/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00045">
+      <MenuMacro UID="MM_00053">
         <Macro>
           <Name>Einfach Parallel 200/750 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00046">
+      <MenuMacro UID="MM_00054">
         <Macro>
           <Name>Doppel Parallel 200/750 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00047">
+      <MenuMacro UID="MM_00055">
         <Macro>
           <Name>Dreiwege Parallel 200/750 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00049">
+      <MenuMacro UID="MM_00057">
         <Macro>
           <Name>Einfach 22.5 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00050">
+      <MenuMacro UID="MM_00058">
         <Macro>
           <Name>Doppel 22.5 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00051">
+      <MenuMacro UID="MM_00059">
         <Macro>
           <Name>Dreiwege 22.5 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00053">
+      <MenuMacro UID="MM_00061">
         <Macro>
           <Name>Delta 1400/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1400</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00054">
+      <MenuMacro UID="MM_00062">
         <Macro>
           <Name>Delta 1600/800 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1600</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00055">
+      <MenuMacro UID="MM_00063">
         <Macro>
           <Name>Star 1400/1400 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Star</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00057">
+      <MenuMacro UID="MM_00065">
         <Macro>
           <Name>TEF Antriebst. rechts</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebR</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00058">
+      <MenuMacro UID="MM_00066">
         <Macro>
           <Name>TEF Umlenkspannst. rechts</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkR</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00060">
+      <MenuMacro UID="MM_00068">
         <Macro>
           <Name>TEF Antriebst. links</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00061">
+      <MenuMacro UID="MM_00069">
         <Macro>
           <Name>TEF Umlenkspannst. links</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00063">
+      <MenuMacro UID="MM_00071">
         <Macro>
           <Name>TEF Gerade auf Linie</Name>
           <Command>^C^C(ssg-ensure "TEFInsert") TEF_FOERDERER_LINIE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00064">
+      <MenuMacro UID="MM_00072">
         <Macro>
           <Name>TEF Gerade</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_Gerade</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00066">
+      <MenuMacro UID="MM_00074">
         <Macro>
           <Name>Stopper AP</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_STOPPER</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00067">
+      <MenuMacro UID="MM_00075">
         <Macro>
           <Name>Scanner</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_SCANNER</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00068">
+      <MenuMacro UID="MM_00076">
         <Macro>
           <Name>Bürstenbremse</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_BUERSTENBREMSE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00069">
+      <MenuMacro UID="MM_00077">
         <Macro>
           <Name>KettenFoerderer</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_KettenFoerderer</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00071">
+      <MenuMacro UID="MM_00079">
         <Macro>
           <Name>TV W-W kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_W</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00072">
+      <MenuMacro UID="MM_00080">
         <Macro>
           <Name>TV W-AP110 kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP110</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00073">
+      <MenuMacro UID="MM_00081">
         <Macro>
           <Name>TV W-AP60 oben kpl.</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP60</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00074">
+      <MenuMacro UID="MM_00082">
         <Macro>
           <Name>TV W-AP110-W kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP110_W</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00075">
+      <MenuMacro UID="MM_00083">
         <Macro>
           <Name>TV W-AP oben kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00076">
+      <MenuMacro UID="MM_00084">
         <Macro>
           <Name>TV 80</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_80</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00077">
+      <MenuMacro UID="MM_00085">
         <Macro>
           <Name>TV 50</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_50</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00078">
+      <MenuMacro UID="MM_00086">
         <Macro>
           <Name>Endplatte Al-Profil AP schraubbar</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ENDPLATTE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00079">
+      <MenuMacro UID="MM_00087">
         <Macro>
           <Name>Anschlag AP-Ende fuer Spulenzug</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ANSCHLAG</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00080">
+      <MenuMacro UID="MM_00088">
         <Macro>
           <Name>TV-A fuer AP110/AP60 kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP110_AP60</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00081">
+      <MenuMacro UID="MM_00089">
         <Macro>
           <Name>TV-A fuer AP60/ST</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP60_ST</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00082">
+      <MenuMacro UID="MM_00090">
         <Macro>
           <Name>TV-A fuer AP110/ST kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP110_ST</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00083">
+      <MenuMacro UID="MM_00091">
         <Macro>
           <Name>TV-SW II fuer SW-SW</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_II_SW_SW</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00084">
+      <MenuMacro UID="MM_00092">
         <Macro>
           <Name>TV-SW III fuer SW-AP110-SW</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_III_AP110_SW</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00085">
+      <MenuMacro UID="MM_00093">
         <Macro>
           <Name>TV-SW III fuer SW-AP110</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_III_AP110</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00086">
+      <MenuMacro UID="MM_00094">
         <Macro>
           <Name>TV-SW IV fuer Anschluss SW-AP60</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_IV_AP60</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00087">
+      <MenuMacro UID="MM_00095">
         <Macro>
           <Name>TV-SW IV fuer SW-ST</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_IV_ST</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00088">
+      <MenuMacro UID="MM_00096">
         <Macro>
           <Name>Muffe</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_MUFFE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00090">
+      <MenuMacro UID="MM_00098">
         <Macro>
           <Name>APB 110 R400/45 140 nur fuer Delta</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R400_45_140</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00091">
+      <MenuMacro UID="MM_00099">
         <Macro>
           <Name>APB 110 R550/45 194 nur fuer Delta</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_45_194</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00092">
+      <MenuMacro UID="MM_00100">
         <Macro>
           <Name>APBW 110 R550/22,5 360x248,5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_360</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00093">
+      <MenuMacro UID="MM_00101">
         <Macro>
           <Name>APBW 110 R550/22,5 410x298,5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410A</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00094">
+      <MenuMacro UID="MM_00102">
         <Macro>
           <Name>APBW 110 R550/22,5 410x78,5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410B</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00095">
+      <MenuMacro UID="MM_00103">
         <Macro>
           <Name>APBW 110 R550/22,5 410x98,5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410C</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00096">
+      <MenuMacro UID="MM_00104">
         <Macro>
           <Name>APBW 110 R550/67,5 360x598,5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_360</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00097">
+      <MenuMacro UID="MM_00105">
         <Macro>
           <Name>APBW 110 R400/67,5 260x398,5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R400_675_260</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00098">
+      <MenuMacro UID="MM_00106">
         <Macro>
           <Name>APBW 110 R550/45 77x160</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_45_77</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00099">
+      <MenuMacro UID="MM_00107">
         <Macro>
           <Name>APBW 110 R550/67,5 125x83,5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_125</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00100">
+      <MenuMacro UID="MM_00108">
         <Macro>
           <Name>APBW 110 R750/90 200x290</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R750_90_200</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00101">
+      <MenuMacro UID="MM_00109">
         <Macro>
           <Name>APBW 110 R650/90 300x190</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R650_90_300</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00102">
+      <MenuMacro UID="MM_00110">
         <Macro>
           <Name>APBW 110 R550/67,5 208x347</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_208</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00103">
+      <MenuMacro UID="MM_00111">
         <Macro>
           <Name>APBW 110 R550/67,5 58x497</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_58</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00104">
+      <MenuMacro UID="MM_00112">
         <Macro>
           <Name>Element bearbeiten</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00107">
+      <MenuMacro UID="MM_00115">
         <Macro>
           <Name>Marker einfuegen</Name>
           <Command>^C^C(ssg-ensure "Tro_Edit") TRO_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00108">
+      <MenuMacro UID="MM_00116">
         <Macro>
           <Name>Marker bearbeiten</Name>
           <Command>^C^C(ssg-ensure "Tro_Edit") TRO_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00109">
+      <MenuMacro UID="MM_00117">
         <Macro>
           <Name>Bearbeiten (Auto)</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00111">
+      <MenuMacro UID="MM_00119">
         <Macro>
           <Name>Verbindung einfuegen</Name>
           <Command>^C^C(ssg-ensure "Connection_Edit") CONNECTION_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00112">
+      <MenuMacro UID="MM_00120">
         <Macro>
           <Name>Verbindung bearbeiten</Name>
           <Command>^C^C(ssg-ensure "Connection_Edit") CONNECTION_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00114">
+      <MenuMacro UID="MM_00122">
         <Macro>
           <Name>SPS Schliessen</Name>
           <Command>^C^C</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00116">
+      <MenuMacro UID="MM_00124">
         <Macro>
           <Name>Export Sivas</Name>
           <Command>^C^C(ssg-ensure "export") EXPORTSIVAS</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00117">
+      <MenuMacro UID="MM_00125">
         <Macro>
           <Name>Export CSV</Name>
           <Command>^C^C(ssg-ensure "export") EXPORTCSV</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00119">
+      <MenuMacro UID="MM_00127">
         <Macro>
           <Name>Umschalten 2D und 3D</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_SWITCH</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00120">
+      <MenuMacro UID="MM_00128">
         <Macro>
           <Name>Alle Bloecke auf 2D</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_ALL_2D</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00121">
+      <MenuMacro UID="MM_00129">
         <Macro>
           <Name>Alle Bloecke auf 3D</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_ALL_3D</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00122">
+      <MenuMacro UID="MM_00130">
         <Macro>
           <Name>Sprache</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_SPRACHE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00125">
-        <Macro>
-          <Name>Alle Tests ausfuehren</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS</Command>
-        </Macro>
-      </MenuMacro>
-      <MenuMacro UID="MM_00127">
-        <Macro>
-          <Name>Kreisel</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_kreisel.lsp")) TEST_KREISEL</Command>
-        </Macro>
-      </MenuMacro>
-      <MenuMacro UID="MM_00128">
-        <Macro>
-          <Name>Foerderer</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_foerderer.lsp")) TEST_FOERDERER</Command>
-        </Macro>
-      </MenuMacro>
-      <MenuMacro UID="MM_00129">
-        <Macro>
-          <Name>Foerderer-Linienzug</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_linienzug.lsp")) TEST_LINIENZUG</Command>
-        </Macro>
-      </MenuMacro>
-      <MenuMacro UID="MM_00130">
-        <Macro>
-          <Name>Omniflo</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo.lsp")) TEST_OMNIFLO</Command>
-        </Macro>
-      </MenuMacro>
-      <MenuMacro UID="MM_00131">
-        <Macro>
-          <Name>Omniflo Strecke</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo_strecke.lsp")) TEST_OMNIFLO_STRECKE</Command>
-        </Macro>
-      </MenuMacro>
-      <MenuMacro UID="MM_00132">
-        <Macro>
-          <Name>Gefaellestrecke</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_gefaellestrecke.lsp")) TEST_GEFAELLESTRECKE</Command>
-        </Macro>
-      </MenuMacro>
       <MenuMacro UID="MM_00133">
         <Macro>
-          <Name>Mubea Gesamtmodell</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_mubea.lsp")) TEST_MUBEA</Command>
+          <Name>alle Tests ausfuehren und exportieren</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS_EXPORT</Command>
         </Macro>
       </MenuMacro>
       <MenuMacro UID="MM_00134">
         <Macro>
-          <Name>HundM05 Kreisel-Abschnitt</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_hundm05.lsp")) TEST_HUNDM05</Command>
+          <Name>Tests ausfuehren und stehen lassen</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS_OFFEN</Command>
         </Macro>
       </MenuMacro>
       <MenuMacro UID="MM_00135">
-        <Macro>
-          <Name>KS 2D/3D pruefen (CSV)</Name>
-          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/Lisp/ks_pruefung.lsp")) KS_PRUEFEN</Command>
-        </Macro>
-      </MenuMacro>
-      <MenuMacro UID="MM_00136">
         <Macro>
           <Name>Export CSV/Sivas ALL</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_export_all.lsp")) TEST_EXPORT_ALL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00148">
+      <MenuMacro UID="MM_00137">
+        <Macro>
+          <Name>Kreisel</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_kreisel.lsp")) TEST_KREISEL</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00138">
+        <Macro>
+          <Name>Foerderer</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_foerderer.lsp")) TEST_FOERDERER</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00139">
+        <Macro>
+          <Name>Foerderer-Linienzug</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_linienzug.lsp")) TEST_LINIENZUG</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00140">
+        <Macro>
+          <Name>Omniflo</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo.lsp")) TEST_OMNIFLO</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00141">
+        <Macro>
+          <Name>Omniflo Strecke</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo_strecke.lsp")) TEST_OMNIFLO_STRECKE</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00142">
+        <Macro>
+          <Name>Gefaellestrecke</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_gefaellestrecke.lsp")) TEST_GEFAELLESTRECKE</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00143">
+        <Macro>
+          <Name>Mubea Gesamtmodell</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_mubea.lsp")) TEST_MUBEA</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00144">
+        <Macro>
+          <Name>HundM05 Kreisel-Abschnitt</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_hundm05.lsp")) TEST_HUNDM05</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00145">
+        <Macro>
+          <Name>KS 2D/3D pruefen (CSV)</Name>
+          <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/Lisp/ks_pruefung.lsp")) KS_PRUEFEN</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00157">
         <Macro>
           <Name>Kreisel bearbeiten</Name>
           <Command>(ssg-ensure "KreiselInsert") KreiselEdit</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00149">
+      <MenuMacro UID="MM_00158">
         <Macro>
           <Name>Omniflo Element bearbeiten</Name>
           <Command>(ssg-ensure "OmniModulInsert") OMNI_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00150">
+      <MenuMacro UID="MM_00159">
         <Macro>
           <Name>Gefaellestrecke bearbeiten</Name>
           <Command>(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00151">
+      <MenuMacro UID="MM_00160">
         <Macro>
           <Name>VarioFoerderer bearbeiten</Name>
           <Command>(ssg-ensure "VarioFoerderer") VARIOFOERDERER_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00152">
+      <MenuMacro UID="MM_00161">
         <Macro>
           <Name>TRO-Marker bearbeiten</Name>
           <Command>(ssg-ensure "Tro_Edit") TRO_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00153">
+      <MenuMacro UID="MM_00162">
         <Macro>
           <Name>Verbindung bearbeiten</Name>
           <Command>(ssg-ensure "Connection_Edit") CONNECTION_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00155">
+      <MenuMacro UID="MM_00164">
         <Macro>
           <Name>SSG Bearbeiten (Auto)</Name>
           <Command>(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT</Command>
@@ -690,17 +726,18 @@
           <Alias>POP1</Alias>
           <Name>SSG_LIB</Name>
           <PopMenuRef pUID="PM_00005"/>
-          <PopMenuRef pUID="PM_00023"/>
-          <PopMenuRef pUID="PM_00105"/>
-          <PopMenuRef pUID="PM_00115"/>
-          <PopMenuRef pUID="PM_00118"/>
-          <PopMenuRef pUID="PM_00124"/>
+          <PopMenuRef pUID="PM_00031"/>
+          <PopMenuRef pUID="PM_00113"/>
+          <PopMenuRef pUID="PM_00123"/>
+          <PopMenuRef pUID="PM_00126"/>
+          <PopMenuRef pUID="PM_00132"/>
         </PopMenu>
         <PopMenu UID="PM_00005">
           <Name>ILS</Name>
           <PopMenuRef pUID="PM_00006"/>
           <PopMenuRef pUID="PM_00011"/>
           <PopMenuRef pUID="PM_00017"/>
+          <PopMenuRef pUID="PM_00027"/>
         </PopMenu>
         <PopMenu UID="PM_00006">
           <Name>Kreisel-Module</Name>
@@ -759,707 +796,754 @@
         </PopMenu>
         <PopMenu UID="PM_00017">
           <Name>Foerderer</Name>
+          <PopMenuRef pUID="PM_00018"/>
+          <PopMenuRef pUID="PM_00021"/>
           <PopMenuItem>
-            <NameRef>VarioFoerderer</NameRef>
+            <NameRef>3D-Linienzug</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00018"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>EtageVarioFoerderer</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00019"/>
+              <MacroRef MenuMacroID="MM_00024"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Vario_Kette_Merge</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00020"/>
+              <MacroRef MenuMacroID="MM_00025"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>VarioFoerderer nachruesten (Marker)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00021"/>
+              <MacroRef MenuMacroID="MM_00026"/>
+            </MenuItem>
+          </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00018">
+          <Name>Standard</Name>
+          <PopMenuItem>
+            <NameRef>Werte manuell</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00019"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Gefaellestrecke</NameRef>
+            <NameRef>aus 3D-Linie</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00020"/>
+            </MenuItem>
+          </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00021">
+          <Name>Etage</Name>
+          <PopMenuItem>
+            <NameRef>Werte manuell</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00022"/>
             </MenuItem>
           </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00023">
-          <Name>Omniflo</Name>
-          <PopMenuRef pUID="PM_00024"/>
-          <PopMenuRef pUID="PM_00030"/>
-          <PopMenuRef pUID="PM_00032"/>
-          <PopMenuRef pUID="PM_00036"/>
-          <PopMenuRef pUID="PM_00040"/>
-          <PopMenuRef pUID="PM_00044"/>
-          <PopMenuRef pUID="PM_00048"/>
-          <PopMenuRef pUID="PM_00052"/>
-          <PopMenuRef pUID="PM_00056"/>
-          <PopMenuRef pUID="PM_00065"/>
           <PopMenuItem>
-            <NameRef>~KettenFoerderer</NameRef>
+            <NameRef>aus 3D-Linie</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00069"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuRef pUID="PM_00070"/>
-          <PopMenuRef pUID="PM_00089"/>
-          <PopMenuItem>
-            <NameRef>Element bearbeiten</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00104"/>
+              <MacroRef MenuMacroID="MM_00023"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00024">
-          <Name>Boegen APB110</Name>
+        <PopMenu UID="PM_00027">
+          <Name>Gefaellestrecke</Name>
           <PopMenuItem>
-            <NameRef>90</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00025"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>67.5</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00026"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>45</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00027"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>22.5</NameRef>
+            <NameRef>einfach</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00028"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>180</NameRef>
+            <NameRef>aus 3D-Linie</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00029"/>
             </MenuItem>
           </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00030">
-          <Name>Boegen APB60</Name>
           <PopMenuItem>
-            <NameRef>90</NameRef>
+            <NameRef>aus Linienzug (LINE + ARC)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00031"/>
+              <MacroRef MenuMacroID="MM_00030"/>
+            </MenuItem>
+          </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00031">
+          <Name>Omniflo</Name>
+          <PopMenuRef pUID="PM_00032"/>
+          <PopMenuRef pUID="PM_00038"/>
+          <PopMenuRef pUID="PM_00040"/>
+          <PopMenuRef pUID="PM_00044"/>
+          <PopMenuRef pUID="PM_00048"/>
+          <PopMenuRef pUID="PM_00052"/>
+          <PopMenuRef pUID="PM_00056"/>
+          <PopMenuRef pUID="PM_00060"/>
+          <PopMenuRef pUID="PM_00064"/>
+          <PopMenuRef pUID="PM_00073"/>
+          <PopMenuItem>
+            <NameRef>~KettenFoerderer</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00077"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuRef pUID="PM_00078"/>
+          <PopMenuRef pUID="PM_00097"/>
+          <PopMenuItem>
+            <NameRef>Element bearbeiten</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00112"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00032">
-          <Name>Aluprofil Gerade</Name>
+          <Name>Boegen APB110</Name>
           <PopMenuItem>
-            <NameRef>AP 60</NameRef>
+            <NameRef>90</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00033"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>AP 110</NameRef>
+            <NameRef>67.5</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00034"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>APG 110</NameRef>
+            <NameRef>45</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00035"/>
             </MenuItem>
           </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00036">
-          <Name>Weiche 90 Grad</Name>
           <PopMenuItem>
-            <NameRef>Einfach 90 700/700 links M</NameRef>
+            <NameRef>22.5</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00036"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>180</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00037"/>
             </MenuItem>
           </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00038">
+          <Name>Boegen APB60</Name>
           <PopMenuItem>
-            <NameRef>Doppel 90 700/700 M</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00038"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Dreiwege 90 700/700 M</NameRef>
+            <NameRef>90</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00039"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00040">
-          <Name>Weiche 45 Grad</Name>
+          <Name>Aluprofil Gerade</Name>
           <PopMenuItem>
-            <NameRef>Einfach 45 350/700 links M</NameRef>
+            <NameRef>AP 60</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00041"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Doppel 45 350/700 M</NameRef>
+            <NameRef>AP 110</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00042"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Dreiwege 45 350/700 M</NameRef>
+            <NameRef>APG 110</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00043"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00044">
-          <Name>Weichen Parallel</Name>
+          <Name>Weiche 90 Grad</Name>
           <PopMenuItem>
-            <NameRef>Einfach Parallel 200/750 links M</NameRef>
+            <NameRef>Einfach 90 700/700 links M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00045"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Doppel Parallel 200/750 M</NameRef>
+            <NameRef>Doppel 90 700/700 M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00046"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Dreiwege Parallel 200/750 M</NameRef>
+            <NameRef>Dreiwege 90 700/700 M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00047"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00048">
-          <Name>Weichenkoerper</Name>
+          <Name>Weiche 45 Grad</Name>
           <PopMenuItem>
-            <NameRef>Einfach 22.5 links M</NameRef>
+            <NameRef>Einfach 45 350/700 links M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00049"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Doppel 22.5 M</NameRef>
+            <NameRef>Doppel 45 350/700 M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00050"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Dreiwege 22.5 M</NameRef>
+            <NameRef>Dreiwege 45 350/700 M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00051"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00052">
-          <Name>Weichenkombinationen</Name>
+          <Name>Weichen Parallel</Name>
           <PopMenuItem>
-            <NameRef>Delta 1400/700 M</NameRef>
+            <NameRef>Einfach Parallel 200/750 links M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00053"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Delta 1600/800 M</NameRef>
+            <NameRef>Doppel Parallel 200/750 M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00054"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Star 1400/1400 M</NameRef>
+            <NameRef>Dreiwege Parallel 200/750 M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00055"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00056">
-          <Name>TEF Elemente</Name>
+          <Name>Weichenkoerper</Name>
           <PopMenuItem>
-            <NameRef>TEF Antriebst. rechts</NameRef>
+            <NameRef>Einfach 22.5 links M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00057"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>TEF Umlenkspannst. rechts</NameRef>
+            <NameRef>Doppel 22.5 M</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00058"/>
             </MenuItem>
           </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Dreiwege 22.5 M</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00059"/>
+            </MenuItem>
+          </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00060">
+          <Name>Weichenkombinationen</Name>
+          <PopMenuItem>
+            <NameRef>Delta 1400/700 M</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00061"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Delta 1600/800 M</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00062"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Star 1400/1400 M</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00063"/>
+            </MenuItem>
+          </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00064">
+          <Name>TEF Elemente</Name>
+          <PopMenuItem>
+            <NameRef>TEF Antriebst. rechts</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00065"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>TEF Umlenkspannst. rechts</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00066"/>
+            </MenuItem>
+          </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>TEF Antriebst. links</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00060"/>
+              <MacroRef MenuMacroID="MM_00068"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TEF Umlenkspannst. links</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00061"/>
+              <MacroRef MenuMacroID="MM_00069"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>TEF Gerade auf Linie</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00063"/>
+              <MacroRef MenuMacroID="MM_00071"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TEF Gerade</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00064"/>
-            </MenuItem>
-          </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00065">
-          <Name>Anbaugruppen</Name>
-          <PopMenuItem>
-            <NameRef>Stopper AP</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00066"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Scanner</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00067"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Bürstenbremse</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00068"/>
-            </MenuItem>
-          </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00070">
-          <Name>Verbinder</Name>
-          <PopMenuItem>
-            <NameRef>~TV W-W kpl</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00071"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>~TV W-AP110 kpl</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00072"/>
             </MenuItem>
           </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00073">
+          <Name>Anbaugruppen</Name>
           <PopMenuItem>
-            <NameRef>~TV W-AP60 oben kpl.</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00073"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>~TV W-AP110-W kpl</NameRef>
+            <NameRef>Stopper AP</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00074"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV W-AP oben kpl</NameRef>
+            <NameRef>Scanner</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00075"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV 80</NameRef>
+            <NameRef>Bürstenbremse</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00076"/>
             </MenuItem>
           </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00078">
+          <Name>Verbinder</Name>
           <PopMenuItem>
-            <NameRef>~TV 50</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00077"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>~Endplatte Al-Profil AP schraubbar</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00078"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>~Anschlag AP-Ende fuer Spulenzug</NameRef>
+            <NameRef>~TV W-W kpl</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00079"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-A fuer AP110/AP60 kpl</NameRef>
+            <NameRef>~TV W-AP110 kpl</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00080"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-A fuer AP60/ST</NameRef>
+            <NameRef>~TV W-AP60 oben kpl.</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00081"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-A fuer AP110/ST kpl</NameRef>
+            <NameRef>~TV W-AP110-W kpl</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00082"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-SW II fuer SW-SW</NameRef>
+            <NameRef>~TV W-AP oben kpl</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00083"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-SW III fuer SW-AP110-SW</NameRef>
+            <NameRef>~TV 80</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00084"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-SW III fuer SW-AP110</NameRef>
+            <NameRef>~TV 50</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00085"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-SW IV fuer Anschluss SW-AP60</NameRef>
+            <NameRef>~Endplatte Al-Profil AP schraubbar</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00086"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~TV-SW IV fuer SW-ST</NameRef>
+            <NameRef>~Anschlag AP-Ende fuer Spulenzug</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00087"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~Muffe</NameRef>
+            <NameRef>~TV-A fuer AP110/AP60 kpl</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00088"/>
             </MenuItem>
           </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00089">
-          <Name>Boegen fuer Weichen</Name>
           <PopMenuItem>
-            <NameRef>~APB 110 R400/45 140 nur fuer Delta</NameRef>
+            <NameRef>~TV-A fuer AP60/ST</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00089"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>~TV-A fuer AP110/ST kpl</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00090"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APB 110 R550/45 194 nur fuer Delta</NameRef>
+            <NameRef>~TV-SW II fuer SW-SW</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00091"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 360x248,5</NameRef>
+            <NameRef>~TV-SW III fuer SW-AP110-SW</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00092"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 410x298,5</NameRef>
+            <NameRef>~TV-SW III fuer SW-AP110</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00093"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 410x78,5</NameRef>
+            <NameRef>~TV-SW IV fuer Anschluss SW-AP60</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00094"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/22,5 410x98,5</NameRef>
+            <NameRef>~TV-SW IV fuer SW-ST</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00095"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 360x598,5</NameRef>
+            <NameRef>~Muffe</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00096"/>
             </MenuItem>
           </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00097">
+          <Name>Boegen fuer Weichen</Name>
           <PopMenuItem>
-            <NameRef>~APBW 110 R400/67,5 260x398,5</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00097"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>~APBW 110 R550/45 77x160</NameRef>
+            <NameRef>~APB 110 R400/45 140 nur fuer Delta</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00098"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 125x83,5</NameRef>
+            <NameRef>~APB 110 R550/45 194 nur fuer Delta</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00099"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R750/90 200x290</NameRef>
+            <NameRef>~APBW 110 R550/22,5 360x248,5</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00100"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R650/90 300x190</NameRef>
+            <NameRef>~APBW 110 R550/22,5 410x298,5</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00101"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 208x347</NameRef>
+            <NameRef>~APBW 110 R550/22,5 410x78,5</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00102"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>~APBW 110 R550/67,5 58x497</NameRef>
+            <NameRef>~APBW 110 R550/22,5 410x98,5</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00103"/>
             </MenuItem>
           </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00105">
-          <Name>SPS</Name>
-          <PopMenuRef pUID="PM_00106"/>
-          <PopMenuRef pUID="PM_00110"/>
           <PopMenuItem>
-            <NameRef>SPS Schliessen</NameRef>
+            <NameRef>~APBW 110 R550/67,5 360x598,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00114"/>
+              <MacroRef MenuMacroID="MM_00104"/>
             </MenuItem>
           </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00106">
-          <Name>TRO</Name>
           <PopMenuItem>
-            <NameRef>Marker einfuegen</NameRef>
+            <NameRef>~APBW 110 R400/67,5 260x398,5</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00105"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>~APBW 110 R550/45 77x160</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00106"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>~APBW 110 R550/67,5 125x83,5</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00107"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Marker bearbeiten</NameRef>
+            <NameRef>~APBW 110 R750/90 200x290</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00108"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Bearbeiten (Auto)</NameRef>
+            <NameRef>~APBW 110 R650/90 300x190</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00109"/>
             </MenuItem>
           </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00110">
-          <Name>Connections</Name>
           <PopMenuItem>
-            <NameRef>Verbindung einfuegen</NameRef>
+            <NameRef>~APBW 110 R550/67,5 208x347</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00110"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>~APBW 110 R550/67,5 58x497</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00111"/>
             </MenuItem>
           </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00113">
+          <Name>SPS</Name>
+          <PopMenuRef pUID="PM_00114"/>
+          <PopMenuRef pUID="PM_00118"/>
           <PopMenuItem>
-            <NameRef>Verbindung bearbeiten</NameRef>
+            <NameRef>SPS Schliessen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00112"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Bearbeiten (Auto)</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00109"/>
+              <MacroRef MenuMacroID="MM_00122"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00115">
-          <Name>Export</Name>
+        <PopMenu UID="PM_00114">
+          <Name>TRO</Name>
           <PopMenuItem>
-            <NameRef>Export Sivas</NameRef>
+            <NameRef>Marker einfuegen</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00115"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Marker bearbeiten</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00116"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Export CSV</NameRef>
+            <NameRef>Bearbeiten (Auto)</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00117"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00118">
-          <Name>Konfiguration</Name>
+          <Name>Connections</Name>
           <PopMenuItem>
-            <NameRef>Umschalten 2D und 3D</NameRef>
+            <NameRef>Verbindung einfuegen</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00119"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Alle Bloecke auf 2D</NameRef>
+            <NameRef>Verbindung bearbeiten</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00120"/>
             </MenuItem>
           </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Bearbeiten (Auto)</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00117"/>
+            </MenuItem>
+          </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00123">
+          <Name>Export</Name>
+          <PopMenuItem>
+            <NameRef>Export Sivas</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00124"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Export CSV</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00125"/>
+            </MenuItem>
+          </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00126">
+          <Name>Konfiguration</Name>
+          <PopMenuItem>
+            <NameRef>Umschalten 2D und 3D</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00127"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Alle Bloecke auf 2D</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00128"/>
+            </MenuItem>
+          </PopMenuItem>
           <PopMenuItem>
             <NameRef>Alle Bloecke auf 3D</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00121"/>
+              <MacroRef MenuMacroID="MM_00129"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Sprache</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00122"/>
+              <MacroRef MenuMacroID="MM_00130"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Konfiguration Schliessen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00114"/>
+              <MacroRef MenuMacroID="MM_00122"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00124">
+        <PopMenu UID="PM_00132">
           <Name>Tests</Name>
           <PopMenuItem>
-            <NameRef>Alle Tests ausfuehren</NameRef>
+            <NameRef>alle Tests ausfuehren und exportieren</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00125"/>
+              <MacroRef MenuMacroID="MM_00133"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Tests ausfuehren und stehen lassen</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00134"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Export CSV/Sivas ALL</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00135"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>Kreisel</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00127"/>
+              <MacroRef MenuMacroID="MM_00137"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Foerderer</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00128"/>
+              <MacroRef MenuMacroID="MM_00138"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Foerderer-Linienzug</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00129"/>
+              <MacroRef MenuMacroID="MM_00139"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00130"/>
+              <MacroRef MenuMacroID="MM_00140"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo Strecke</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00131"/>
+              <MacroRef MenuMacroID="MM_00141"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Gefaellestrecke</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00132"/>
+              <MacroRef MenuMacroID="MM_00142"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Mubea Gesamtmodell</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00133"/>
+              <MacroRef MenuMacroID="MM_00143"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>HundM05 Kreisel-Abschnitt</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00134"/>
+              <MacroRef MenuMacroID="MM_00144"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>KS 2D/3D pruefen (CSV)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00135"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Export CSV/Sivas ALL</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00136"/>
+              <MacroRef MenuMacroID="MM_00145"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00147">
+        <PopMenu UID="PM_00156">
           <Alias>POP501</Alias>
           <Name>SSG_LIB Edit Context</Name>
           <PopMenuItem>
             <NameRef>Kreisel bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00148"/>
+              <MacroRef MenuMacroID="MM_00157"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo Element bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00149"/>
+              <MacroRef MenuMacroID="MM_00158"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Gefaellestrecke bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00150"/>
+              <MacroRef MenuMacroID="MM_00159"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>VarioFoerderer bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00151"/>
+              <MacroRef MenuMacroID="MM_00160"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TRO-Marker bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00152"/>
+              <MacroRef MenuMacroID="MM_00161"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Verbindung bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00153"/>
+              <MacroRef MenuMacroID="MM_00162"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>SSG Bearbeiten (Auto)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00155"/>
+              <MacroRef MenuMacroID="MM_00164"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
diff --git a/menu/SSG_LIB.mnu b/menu/SSG_LIB.mnu
index 17765ee..0b76ce7 100644
--- a/menu/SSG_LIB.mnu
+++ b/menu/SSG_LIB.mnu
@@ -15,11 +15,19 @@
 [Scanner einfuegen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_SCANNER_INSERT
 [<-Separator einfuegen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_SEPARATOR_INSERT
 [->Foerderer]
-[VarioFoerderer]^C^C(ssg-ensure "VarioFoerderer") VarioFoerderer
-[EtageVarioFoerderer]^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer
+[->Standard]
+[Werte manuell]^C^C(ssg-ensure "VarioFoerderer") StandardVarioFoerderer
+[<-aus 3D-Linie]^C^C(ssg-ensure "VarioFoerderer") StandardVarioFoerderer3D
+[->Etage]
+[Werte manuell]^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer
+[<-aus 3D-Linie]^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer3D
+[3D-Linienzug]^C^C(ssg-ensure "VarioFoerderer") LinienzugVarioFoerderer
 [Vario_Kette_Merge]^C^C(ssg-ensure "VarioFoerderer") Vario_Kette_Merge
-[VarioFoerderer nachruesten (Marker)]^C^C(ssg-ensure "VarioFoerderer") VARIOFOERDERER_NACHRUESTEN
-[<-<-Gefaellestrecke]^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE
+[<-VarioFoerderer nachruesten (Marker)]^C^C(ssg-ensure "VarioFoerderer") VARIOFOERDERER_NACHRUESTEN
+[->Gefaellestrecke]
+[einfach]^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EINFACH
+[aus 3D-Linie]^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_3DLINIE
+[<-<-aus Linienzug (LINE + ARC)]^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_LINIENZUG
 [->Omniflo]
 [->Boegen APB110]
 [90]^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_630_90
@@ -122,7 +130,9 @@
 [Sprache]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_SPRACHE
 [<-Konfiguration Schliessen]^C^C
 [->Tests]
-[Alle Tests ausfuehren]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS
+[alle Tests ausfuehren und exportieren]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS_EXPORT
+[Tests ausfuehren und stehen lassen]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS_OFFEN
+[Export CSV/Sivas ALL]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_export_all.lsp")) TEST_EXPORT_ALL
 [--]
 [Kreisel]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_kreisel.lsp")) TEST_KREISEL
 [Foerderer]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_foerderer.lsp")) TEST_FOERDERER
@@ -132,8 +142,7 @@
 [Gefaellestrecke]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_gefaellestrecke.lsp")) TEST_GEFAELLESTRECKE
 [Mubea Gesamtmodell]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_mubea.lsp")) TEST_MUBEA
 [HundM05 Kreisel-Abschnitt]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_hundm05.lsp")) TEST_HUNDM05
-[KS 2D/3D pruefen (CSV)]^C^C(load (strcat (getenv "DXFMAKRO") "/Lisp/ks_pruefung.lsp")) KS_PRUEFEN
-[<-Export CSV/Sivas ALL]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_export_all.lsp")) TEST_EXPORT_ALL
+[<-KS 2D/3D pruefen (CSV)]^C^C(load (strcat (getenv "DXFMAKRO") "/Lisp/ks_pruefung.lsp")) KS_PRUEFEN
 
 ***DOUBLECLICK
 [INSERT]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT
diff --git a/tests/test_run_all.lsp b/tests/test_run_all.lsp
index ba7c2ca..52a093c 100644
--- a/tests/test_run_all.lsp
+++ b/tests/test_run_all.lsp
@@ -22,17 +22,18 @@
 ;;   SSG_RUN_ALL_TESTS
 ;;
 ;; Jedes Testmodul laeuft in einer eigenen, neuen Zeichnung (statt die
-;; aktuelle zu leeren/wiederzuverwenden). SSG_RUN_ALL_TESTS fragt zu
-;; Beginn interaktiv nach dem gewuenschten Modus:
-;;   Kontroll-Modus (Default): Zeichnung wird gespeichert, auf den
-;;     Inhalt gezoomt und bleibt als Tab offen - kein CSV/Sivas-Export.
-;;     Am Ende sind alle Testzeichnungen gleichzeitig offen und koennen
-;;     direkt begutachtet werden. CSV/Sivas-Export danach bei Bedarf
-;;     manuell ueber TEST_EXPORT_ALL (tests/test_export_all.lsp).
-;;   Automatik-Modus: Zeichnung wird gespeichert, per EXPORTCSV/
-;;     EXPORTSIVAS exportiert und danach sofort wieder geschlossen -
-;;     kompletter Lauf ohne manuellen Zusatzschritt, aber ohne
-;;     gleichzeitige visuelle Kontrolle aller Zeichnungen am Ende.
+;; aktuelle zu leeren/wiederzuverwenden). Der Modus wird ueber den
+;; aufgerufenen Befehl bestimmt (keine interaktive Rueckfrage):
+;;   SSG_RUN_ALL_TESTS_OFFEN / SSG_RUN_ALL_TESTS (Kontroll-Modus, Default):
+;;     Zeichnung wird gespeichert, auf den Inhalt gezoomt und bleibt als
+;;     Tab offen - kein CSV/Sivas-Export. Am Ende sind alle Testzeichnungen
+;;     gleichzeitig offen und koennen direkt begutachtet werden. CSV/Sivas-
+;;     Export danach bei Bedarf manuell ueber TEST_EXPORT_ALL
+;;     (tests/test_export_all.lsp).
+;;   SSG_RUN_ALL_TESTS_EXPORT (Automatik-Modus): Zeichnung wird gespeichert,
+;;     per EXPORTCSV/EXPORTSIVAS exportiert und danach sofort wieder
+;;     geschlossen - kompletter Lauf ohne manuellen Zusatzschritt, aber
+;;     ohne gleichzeitige visuelle Kontrolle aller Zeichnungen am Ende.
 ;; ============================================================
 
 (vl-load-com)
@@ -169,14 +170,20 @@
   (setq anz (length *test-module*))
   (setq idx 0)
 
-  ;; Modus abfragen: Kontrolle (Zeichnungen bleiben offen, kein Export)
+  ;; Modus bestimmen: Kontrolle (Zeichnungen bleiben offen, kein Export)
   ;; oder Automatik (Speichern + CSV/Sivas-Export + Schliessen je Test).
-  ;; ssg-ques gibt T zurueck wenn "No" gewaehlt wurde - deshalb "not".
-  ;; Default = Nein -> Kontroll-Modus (nicht-destruktiver Default).
-  (setq auto-export
-    (not (ssg-ques
-      "Zeichnungen automatisch speichern, exportieren (CSV/Sivas) und schliessen"
-      nil))
+  ;; Die Wahl kommt ueber die Menue-Befehle SSG_RUN_ALL_TESTS_EXPORT
+  ;; (Automatik) bzw. SSG_RUN_ALL_TESTS_OFFEN (Kontrolle), die
+  ;; *ssg-run-all-auto-export* vorbelegen - keine interaktive Rueckfrage.
+  ;; Ein direkter SSG_RUN_ALL_TESTS ohne Vorbelegung faellt auf den
+  ;; nicht-destruktiven Kontroll-Modus (nil) zurueck.
+  (if (boundp '*ssg-run-all-auto-export*)
+    (progn
+      (setq auto-export *ssg-run-all-auto-export*)
+      (setq *ssg-run-all-auto-export* nil)  ;; Vorauswahl nur einmal gueltig
+      (makunbound '*ssg-run-all-auto-export*)
+    )
+    (setq auto-export nil)
   )
 
   (princ "\n")
@@ -415,3 +422,16 @@
   (princ "\n================================================================")
   (princ)
 )
+
+;; Menue-Wrapper: fester Modus ohne Rueckfrage.
+;;   _EXPORT = Automatik (speichern + CSV/Sivas-Export + schliessen)
+;;   _OFFEN  = Kontrolle (Zeichnungen bleiben offen, kein Export)
+(defun c:SSG_RUN_ALL_TESTS_EXPORT ()
+  (setq *ssg-run-all-auto-export* T)
+  (c:SSG_RUN_ALL_TESTS)
+)
+
+(defun c:SSG_RUN_ALL_TESTS_OFFEN ()
+  (setq *ssg-run-all-auto-export* nil)
+  (c:SSG_RUN_ALL_TESTS)
+)