From 8ed12b64e988bd651077648d92d4d2a070302a3a Mon Sep 17 00:00:00 2001
From: Samer Ayadi <s.ayadi@schoenenberger.de>
Date: Tue, 8 Sep 2026 10:39:42 +0200
Subject: [PATCH] fix misplaced items and update positions

---
 menu/SSG_LIB.cui                 | 610 +++++++++++++++----------------
 tests/testdata/hm_recformat.json |  36 +-
 tests/testdata/hundm05.json      |  69 +++-
 3 files changed, 380 insertions(+), 335 deletions(-)

diff --git a/menu/SSG_LIB.cui b/menu/SSG_LIB.cui
index eeacf5c..58b2b9f 100644
--- a/menu/SSG_LIB.cui
+++ b/menu/SSG_LIB.cui
@@ -20,715 +20,715 @@
 
   <MenuGroup Name="SSG_LIB">
     <MacroGroup Name="SSG_LIBMacros">
-      <MenuMacro UID="MM_00007">
+      <MenuMacro UID="MM_00001">
         <Macro>
           <Name>Einfuegen</Name>
           <Command>^C^C(ssg-ensure "KreiselInsert") KreiselInsert</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00008">
+      <MenuMacro UID="MM_00002">
         <Macro>
           <Name>Verbinden</Name>
           <Command>^C^C(ssg-ensure "KreiselInsert") KreiselConnect</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00009">
+      <MenuMacro UID="MM_00003">
         <Macro>
           <Name>Bearbeiten</Name>
           <Command>^C^C(ssg-ensure "KreiselInsert") KreiselEdit</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00010">
+      <MenuMacro UID="MM_00004">
         <Macro>
           <Name>Eckrad</Name>
           <Command>^C^C(ssg-ensure "KreiselInsert") ILS_Eckrad</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00012">
+      <MenuMacro UID="MM_00005">
         <Macro>
           <Name>BTMT-Beladung</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_BTMT_Beladung</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00013">
+      <MenuMacro UID="MM_00006">
         <Macro>
           <Name>BTMT-Entladung</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_BTMT_Entladung</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00015">
+      <MenuMacro UID="MM_00007">
         <Macro>
           <Name>Scanner einfuegen</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_SCANNER_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00016">
+      <MenuMacro UID="MM_00008">
         <Macro>
           <Name>Separator einfuegen</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_SEPARATOR_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00019">
+      <MenuMacro UID="MM_00009">
         <Macro>
           <Name>Werte manuell</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") StandardVarioFoerderer</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00020">
+      <MenuMacro UID="MM_00010">
         <Macro>
           <Name>aus 3D-Linie</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") StandardVarioFoerderer3D</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00022">
+      <MenuMacro UID="MM_00011">
         <Macro>
           <Name>Werte manuell</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00023">
+      <MenuMacro UID="MM_00012">
         <Macro>
           <Name>aus 3D-Linie</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") EtageVarioFoerderer3D</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00024">
+      <MenuMacro UID="MM_00013">
         <Macro>
           <Name>3D-Linienzug</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") LinienzugVarioFoerderer</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00025">
+      <MenuMacro UID="MM_00014">
         <Macro>
           <Name>Vario_Kette_Merge</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") Vario_Kette_Merge</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00026">
+      <MenuMacro UID="MM_00015">
         <Macro>
           <Name>VarioFoerderer nachruesten (Marker)</Name>
           <Command>^C^C(ssg-ensure "VarioFoerderer") VARIOFOERDERER_NACHRUESTEN</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00028">
+      <MenuMacro UID="MM_00016">
         <Macro>
           <Name>einfach</Name>
           <Command>^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EINFACH</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00029">
+      <MenuMacro UID="MM_00017">
         <Macro>
           <Name>aus 3D-Linie</Name>
           <Command>^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_3DLINIE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00030">
+      <MenuMacro UID="MM_00018">
         <Macro>
           <Name>aus Linienzug (LINE + ARC)</Name>
           <Command>^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_LINIENZUG</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00033">
+      <MenuMacro UID="MM_00019">
         <Macro>
           <Name>90</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_630_90</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00034">
+      <MenuMacro UID="MM_00020">
         <Macro>
           <Name>67.5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_550_675</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00035">
+      <MenuMacro UID="MM_00021">
         <Macro>
           <Name>45</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_630_45</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00036">
+      <MenuMacro UID="MM_00022">
         <Macro>
           <Name>22.5</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_550_225</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00037">
+      <MenuMacro UID="MM_00023">
         <Macro>
           <Name>180</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_650_180</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00039">
+      <MenuMacro UID="MM_00024">
         <Macro>
           <Name>90</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APB60_90</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00041">
+      <MenuMacro UID="MM_00025">
         <Macro>
           <Name>AP 60</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_AP60</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00042">
+      <MenuMacro UID="MM_00026">
         <Macro>
           <Name>AP 110</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_AP110</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00043">
+      <MenuMacro UID="MM_00027">
         <Macro>
           <Name>APG 110</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_APG110</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00045">
+      <MenuMacro UID="MM_00028">
         <Macro>
           <Name>Einfach 90 700/700 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00046">
+      <MenuMacro UID="MM_00029">
         <Macro>
           <Name>Doppel 90 700/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00047">
+      <MenuMacro UID="MM_00030">
         <Macro>
           <Name>Dreiwege 90 700/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00049">
+      <MenuMacro UID="MM_00031">
         <Macro>
           <Name>Einfach 45 350/700 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00050">
+      <MenuMacro UID="MM_00032">
         <Macro>
           <Name>Doppel 45 350/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00051">
+      <MenuMacro UID="MM_00033">
         <Macro>
           <Name>Dreiwege 45 350/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00053">
+      <MenuMacro UID="MM_00034">
         <Macro>
           <Name>Einfach Parallel 200/750 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00054">
+      <MenuMacro UID="MM_00035">
         <Macro>
           <Name>Doppel Parallel 200/750 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00055">
+      <MenuMacro UID="MM_00036">
         <Macro>
           <Name>Dreiwege Parallel 200/750 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00057">
+      <MenuMacro UID="MM_00037">
         <Macro>
           <Name>Einfach 22.5 links M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Einfach</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00058">
+      <MenuMacro UID="MM_00038">
         <Macro>
           <Name>Doppel 22.5 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Doppel</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00059">
+      <MenuMacro UID="MM_00039">
         <Macro>
           <Name>Dreiwege 22.5 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Dreiwege</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00061">
+      <MenuMacro UID="MM_00040">
         <Macro>
           <Name>Delta 1400/700 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1400</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00062">
+      <MenuMacro UID="MM_00041">
         <Macro>
           <Name>Delta 1600/800 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1600</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00063">
+      <MenuMacro UID="MM_00042">
         <Macro>
           <Name>Star 1400/1400 M</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Star</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00065">
+      <MenuMacro UID="MM_00043">
         <Macro>
           <Name>TEF Antriebst. rechts</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebR</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00066">
+      <MenuMacro UID="MM_00044">
         <Macro>
           <Name>TEF Umlenkspannst. rechts</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkR</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00068">
+      <MenuMacro UID="MM_00045">
         <Macro>
           <Name>TEF Antriebst. links</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00069">
+      <MenuMacro UID="MM_00046">
         <Macro>
           <Name>TEF Umlenkspannst. links</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00071">
+      <MenuMacro UID="MM_00047">
         <Macro>
           <Name>TEF Gerade auf Linie</Name>
           <Command>^C^C(ssg-ensure "TEFInsert") TEF_FOERDERER_LINIE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00072">
+      <MenuMacro UID="MM_00048">
         <Macro>
           <Name>TEF Gerade</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_Gerade</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00074">
+      <MenuMacro UID="MM_00049">
         <Macro>
           <Name>Stopper AP</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_STOPPER</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00075">
+      <MenuMacro UID="MM_00050">
         <Macro>
           <Name>Scanner</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_SCANNER</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00076">
+      <MenuMacro UID="MM_00051">
         <Macro>
           <Name>Bürstenbremse</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_BUERSTENBREMSE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00077">
+      <MenuMacro UID="MM_00052">
         <Macro>
           <Name>KettenFoerderer</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_KettenFoerderer</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00079">
+      <MenuMacro UID="MM_00053">
         <Macro>
           <Name>TV W-W kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_W</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00080">
+      <MenuMacro UID="MM_00054">
         <Macro>
           <Name>TV W-AP110 kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP110</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00081">
+      <MenuMacro UID="MM_00055">
         <Macro>
           <Name>TV W-AP60 oben kpl.</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP60</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00082">
+      <MenuMacro UID="MM_00056">
         <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_00083">
+      <MenuMacro UID="MM_00057">
         <Macro>
           <Name>TV W-AP oben kpl</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00084">
+      <MenuMacro UID="MM_00058">
         <Macro>
           <Name>TV 80</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_80</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00085">
+      <MenuMacro UID="MM_00059">
         <Macro>
           <Name>TV 50</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_50</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00086">
+      <MenuMacro UID="MM_00060">
         <Macro>
           <Name>Endplatte Al-Profil AP schraubbar</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ENDPLATTE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00087">
+      <MenuMacro UID="MM_00061">
         <Macro>
           <Name>Anschlag AP-Ende fuer Spulenzug</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ANSCHLAG</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00088">
+      <MenuMacro UID="MM_00062">
         <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_00089">
+      <MenuMacro UID="MM_00063">
         <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_00090">
+      <MenuMacro UID="MM_00064">
         <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_00091">
+      <MenuMacro UID="MM_00065">
         <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_00092">
+      <MenuMacro UID="MM_00066">
         <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_00093">
+      <MenuMacro UID="MM_00067">
         <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_00094">
+      <MenuMacro UID="MM_00068">
         <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_00095">
+      <MenuMacro UID="MM_00069">
         <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_00096">
+      <MenuMacro UID="MM_00070">
         <Macro>
           <Name>Muffe</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_MUFFE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00098">
+      <MenuMacro UID="MM_00071">
         <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_00099">
+      <MenuMacro UID="MM_00072">
         <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_00100">
+      <MenuMacro UID="MM_00073">
         <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_00101">
+      <MenuMacro UID="MM_00074">
         <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_00102">
+      <MenuMacro UID="MM_00075">
         <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_00103">
+      <MenuMacro UID="MM_00076">
         <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_00104">
+      <MenuMacro UID="MM_00077">
         <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_00105">
+      <MenuMacro UID="MM_00078">
         <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_00106">
+      <MenuMacro UID="MM_00079">
         <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_00107">
+      <MenuMacro UID="MM_00080">
         <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_00108">
+      <MenuMacro UID="MM_00081">
         <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_00109">
+      <MenuMacro UID="MM_00082">
         <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_00110">
+      <MenuMacro UID="MM_00083">
         <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_00111">
+      <MenuMacro UID="MM_00084">
         <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_00112">
+      <MenuMacro UID="MM_00085">
         <Macro>
           <Name>Element bearbeiten</Name>
           <Command>^C^C(ssg-ensure "OmniModulInsert") OMNI_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00115">
+      <MenuMacro UID="MM_00086">
         <Macro>
           <Name>Marker einfuegen</Name>
           <Command>^C^C(ssg-ensure "Tro_Edit") TRO_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00116">
+      <MenuMacro UID="MM_00087">
         <Macro>
           <Name>Marker bearbeiten</Name>
           <Command>^C^C(ssg-ensure "Tro_Edit") TRO_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00117">
+      <MenuMacro UID="MM_00088">
         <Macro>
           <Name>Bearbeiten (Auto)</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00119">
+      <MenuMacro UID="MM_00089">
         <Macro>
           <Name>Verbindung einfuegen</Name>
           <Command>^C^C(ssg-ensure "Connection_Edit") CONNECTION_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00120">
+      <MenuMacro UID="MM_00090">
         <Macro>
           <Name>Verbindung bearbeiten</Name>
           <Command>^C^C(ssg-ensure "Connection_Edit") CONNECTION_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00122">
+      <MenuMacro UID="MM_00091">
         <Macro>
           <Name>Eingang</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_EINGANG_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00123">
+      <MenuMacro UID="MM_00092">
         <Macro>
           <Name>Ausgang</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_AUSGANG_INSERT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00124">
+      <MenuMacro UID="MM_00093">
         <Macro>
           <Name>SPS Schliessen</Name>
           <Command>^C^C</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00126">
+      <MenuMacro UID="MM_00094">
         <Macro>
           <Name>Export Sivas</Name>
           <Command>^C^C(ssg-ensure "export") EXPORTSIVAS</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00127">
+      <MenuMacro UID="MM_00095">
         <Macro>
           <Name>Export CSV</Name>
           <Command>^C^C(ssg-ensure "export") EXPORTCSV</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00129">
+      <MenuMacro UID="MM_00096">
         <Macro>
           <Name>Umschalten 2D und 3D</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_SWITCH</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00130">
+      <MenuMacro UID="MM_00097">
         <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_00131">
+      <MenuMacro UID="MM_00098">
         <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_00132">
+      <MenuMacro UID="MM_00099">
         <Macro>
           <Name>Sprache</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_SPRACHE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00133">
+      <MenuMacro UID="MM_00100">
         <Macro>
           <Name>Planquadrate an/aus</Name>
           <Command>^C^C(ssg-ensure "DrawPlanquadrate") PLANQUADRATE_TOGGLE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00136">
+      <MenuMacro UID="MM_00101">
         <Macro>
           <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_00137">
+      <MenuMacro UID="MM_00102">
         <Macro>
           <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_00138">
+      <MenuMacro UID="MM_00103">
         <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_00140">
+      <MenuMacro UID="MM_00104">
         <Macro>
           <Name>Kreisel</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_kreisel.lsp")) TEST_KREISEL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00141">
+      <MenuMacro UID="MM_00105">
         <Macro>
           <Name>Foerderer</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_foerderer.lsp")) TEST_FOERDERER</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00142">
+      <MenuMacro UID="MM_00106">
         <Macro>
           <Name>Foerderer-Linienzug</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_linienzug.lsp")) TEST_LINIENZUG</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00143">
+      <MenuMacro UID="MM_00107">
         <Macro>
           <Name>Omniflo</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo.lsp")) TEST_OMNIFLO</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00144">
+      <MenuMacro UID="MM_00108">
         <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_00145">
+      <MenuMacro UID="MM_00109">
         <Macro>
           <Name>Gefaellestrecke</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_gefaellestrecke.lsp")) TEST_GEFAELLESTRECKE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00146">
+      <MenuMacro UID="MM_00110">
         <Macro>
           <Name>Mubea Gesamtmodell</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_mubea.lsp")) TEST_MUBEA</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00147">
+      <MenuMacro UID="MM_00111">
         <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_00148">
+      <MenuMacro UID="MM_00112">
         <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_00160">
+      <MenuMacro UID="MM_00113">
         <Macro>
           <Name>Kreisel bearbeiten</Name>
           <Command>(ssg-ensure "KreiselInsert") KreiselEdit</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00161">
+      <MenuMacro UID="MM_00114">
         <Macro>
           <Name>Omniflo Element bearbeiten</Name>
           <Command>(ssg-ensure "OmniModulInsert") OMNI_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00162">
+      <MenuMacro UID="MM_00115">
         <Macro>
           <Name>Gefaellestrecke bearbeiten</Name>
           <Command>(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00163">
+      <MenuMacro UID="MM_00116">
         <Macro>
           <Name>VarioFoerderer bearbeiten</Name>
           <Command>(ssg-ensure "VarioFoerderer") VARIOFOERDERER_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00164">
+      <MenuMacro UID="MM_00117">
         <Macro>
           <Name>TRO-Marker bearbeiten</Name>
           <Command>(ssg-ensure "Tro_Edit") TRO_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00165">
+      <MenuMacro UID="MM_00118">
         <Macro>
           <Name>Verbindung bearbeiten</Name>
           <Command>(ssg-ensure "Connection_Edit") CONNECTION_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00167">
+      <MenuMacro UID="MM_00119">
         <Macro>
           <Name>SSG Bearbeiten (Auto)</Name>
           <Command>(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT</Command>
@@ -740,846 +740,846 @@
       <MouseButtonRoot/>
       <DigitizerButtonRoot/>
       <PopMenuRoot>
-        <PopMenu UID="PM_00004">
+        <PopMenu UID="PM_00001">
           <Alias>POP1</Alias>
           <Name>SSG_LIB</Name>
-          <PopMenuRef pUID="PM_00005"/>
-          <PopMenuRef pUID="PM_00031"/>
-          <PopMenuRef pUID="PM_00113"/>
-          <PopMenuRef pUID="PM_00125"/>
-          <PopMenuRef pUID="PM_00128"/>
-          <PopMenuRef pUID="PM_00135"/>
-        </PopMenu>
-        <PopMenu UID="PM_00005">
-          <Name>ILS</Name>
-          <PopMenuRef pUID="PM_00006"/>
-          <PopMenuRef pUID="PM_00011"/>
-          <PopMenuRef pUID="PM_00017"/>
+          <PopMenuRef pUID="PM_00002"/>
+          <PopMenuRef pUID="PM_00009"/>
+          <PopMenuRef pUID="PM_00022"/>
+          <PopMenuRef pUID="PM_00025"/>
+          <PopMenuRef pUID="PM_00026"/>
           <PopMenuRef pUID="PM_00027"/>
         </PopMenu>
-        <PopMenu UID="PM_00006">
+        <PopMenu UID="PM_00002">
+          <Name>ILS</Name>
+          <PopMenuRef pUID="PM_00003"/>
+          <PopMenuRef pUID="PM_00004"/>
+          <PopMenuRef pUID="PM_00005"/>
+          <PopMenuRef pUID="PM_00008"/>
+        </PopMenu>
+        <PopMenu UID="PM_00003">
           <Name>Kreisel-Module</Name>
           <PopMenuItem>
             <NameRef>Einfuegen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00007"/>
+              <MacroRef MenuMacroID="MM_00001"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Verbinden</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00008"/>
+              <MacroRef MenuMacroID="MM_00002"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00009"/>
+              <MacroRef MenuMacroID="MM_00003"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Eckrad</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00010"/>
+              <MacroRef MenuMacroID="MM_00004"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00011">
+        <PopMenu UID="PM_00004">
           <Name>Zusatzmodul</Name>
           <PopMenuItem>
             <NameRef>BTMT-Beladung</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00012"/>
+              <MacroRef MenuMacroID="MM_00005"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>BTMT-Entladung</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00013"/>
+              <MacroRef MenuMacroID="MM_00006"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>Scanner einfuegen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00015"/>
+              <MacroRef MenuMacroID="MM_00007"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Separator einfuegen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00016"/>
+              <MacroRef MenuMacroID="MM_00008"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00017">
+        <PopMenu UID="PM_00005">
           <Name>Foerderer</Name>
-          <PopMenuRef pUID="PM_00018"/>
-          <PopMenuRef pUID="PM_00021"/>
+          <PopMenuRef pUID="PM_00006"/>
+          <PopMenuRef pUID="PM_00007"/>
           <PopMenuItem>
             <NameRef>3D-Linienzug</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00024"/>
+              <MacroRef MenuMacroID="MM_00013"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Vario_Kette_Merge</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00025"/>
+              <MacroRef MenuMacroID="MM_00014"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>VarioFoerderer nachruesten (Marker)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00026"/>
+              <MacroRef MenuMacroID="MM_00015"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00018">
+        <PopMenu UID="PM_00006">
           <Name>Standard</Name>
           <PopMenuItem>
             <NameRef>Werte manuell</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00019"/>
+              <MacroRef MenuMacroID="MM_00009"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>aus 3D-Linie</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00020"/>
+              <MacroRef MenuMacroID="MM_00010"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00021">
+        <PopMenu UID="PM_00007">
           <Name>Etage</Name>
           <PopMenuItem>
             <NameRef>Werte manuell</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00022"/>
+              <MacroRef MenuMacroID="MM_00011"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>aus 3D-Linie</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00023"/>
+              <MacroRef MenuMacroID="MM_00012"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00027">
+        <PopMenu UID="PM_00008">
           <Name>Gefaellestrecke</Name>
           <PopMenuItem>
             <NameRef>einfach</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00028"/>
+              <MacroRef MenuMacroID="MM_00016"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>aus 3D-Linie</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00029"/>
+              <MacroRef MenuMacroID="MM_00017"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>aus Linienzug (LINE + ARC)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00030"/>
+              <MacroRef MenuMacroID="MM_00018"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00031">
+        <PopMenu UID="PM_00009">
           <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"/>
+          <PopMenuRef pUID="PM_00010"/>
+          <PopMenuRef pUID="PM_00011"/>
+          <PopMenuRef pUID="PM_00012"/>
+          <PopMenuRef pUID="PM_00013"/>
+          <PopMenuRef pUID="PM_00014"/>
+          <PopMenuRef pUID="PM_00015"/>
+          <PopMenuRef pUID="PM_00016"/>
+          <PopMenuRef pUID="PM_00017"/>
+          <PopMenuRef pUID="PM_00018"/>
+          <PopMenuRef pUID="PM_00019"/>
           <PopMenuItem>
             <NameRef>~KettenFoerderer</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00077"/>
+              <MacroRef MenuMacroID="MM_00052"/>
             </MenuItem>
           </PopMenuItem>
-          <PopMenuRef pUID="PM_00078"/>
-          <PopMenuRef pUID="PM_00097"/>
+          <PopMenuRef pUID="PM_00020"/>
+          <PopMenuRef pUID="PM_00021"/>
           <PopMenuItem>
             <NameRef>Element bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00112"/>
+              <MacroRef MenuMacroID="MM_00085"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00032">
+        <PopMenu UID="PM_00010">
           <Name>Boegen APB110</Name>
           <PopMenuItem>
             <NameRef>90</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00033"/>
+              <MacroRef MenuMacroID="MM_00019"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>67.5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00034"/>
+              <MacroRef MenuMacroID="MM_00020"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>45</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00035"/>
+              <MacroRef MenuMacroID="MM_00021"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>22.5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00036"/>
+              <MacroRef MenuMacroID="MM_00022"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>180</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00037"/>
+              <MacroRef MenuMacroID="MM_00023"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00038">
+        <PopMenu UID="PM_00011">
           <Name>Boegen APB60</Name>
           <PopMenuItem>
             <NameRef>90</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00039"/>
+              <MacroRef MenuMacroID="MM_00024"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00040">
+        <PopMenu UID="PM_00012">
           <Name>Aluprofil Gerade</Name>
           <PopMenuItem>
             <NameRef>AP 60</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00041"/>
+              <MacroRef MenuMacroID="MM_00025"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>AP 110</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00042"/>
+              <MacroRef MenuMacroID="MM_00026"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>APG 110</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00043"/>
+              <MacroRef MenuMacroID="MM_00027"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00044">
+        <PopMenu UID="PM_00013">
           <Name>Weiche 90 Grad</Name>
           <PopMenuItem>
             <NameRef>Einfach 90 700/700 links M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00045"/>
+              <MacroRef MenuMacroID="MM_00028"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Doppel 90 700/700 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00046"/>
+              <MacroRef MenuMacroID="MM_00029"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Dreiwege 90 700/700 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00047"/>
+              <MacroRef MenuMacroID="MM_00030"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00048">
+        <PopMenu UID="PM_00014">
           <Name>Weiche 45 Grad</Name>
           <PopMenuItem>
             <NameRef>Einfach 45 350/700 links M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00049"/>
+              <MacroRef MenuMacroID="MM_00031"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Doppel 45 350/700 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00050"/>
+              <MacroRef MenuMacroID="MM_00032"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Dreiwege 45 350/700 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00051"/>
+              <MacroRef MenuMacroID="MM_00033"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00052">
+        <PopMenu UID="PM_00015">
           <Name>Weichen Parallel</Name>
           <PopMenuItem>
             <NameRef>Einfach Parallel 200/750 links M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00053"/>
+              <MacroRef MenuMacroID="MM_00034"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Doppel Parallel 200/750 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00054"/>
+              <MacroRef MenuMacroID="MM_00035"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Dreiwege Parallel 200/750 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00055"/>
+              <MacroRef MenuMacroID="MM_00036"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00056">
+        <PopMenu UID="PM_00016">
           <Name>Weichenkoerper</Name>
           <PopMenuItem>
             <NameRef>Einfach 22.5 links M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00057"/>
+              <MacroRef MenuMacroID="MM_00037"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Doppel 22.5 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00058"/>
+              <MacroRef MenuMacroID="MM_00038"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Dreiwege 22.5 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00059"/>
+              <MacroRef MenuMacroID="MM_00039"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00060">
+        <PopMenu UID="PM_00017">
           <Name>Weichenkombinationen</Name>
           <PopMenuItem>
             <NameRef>Delta 1400/700 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00061"/>
+              <MacroRef MenuMacroID="MM_00040"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Delta 1600/800 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00062"/>
+              <MacroRef MenuMacroID="MM_00041"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Star 1400/1400 M</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00063"/>
+              <MacroRef MenuMacroID="MM_00042"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00064">
+        <PopMenu UID="PM_00018">
           <Name>TEF Elemente</Name>
           <PopMenuItem>
             <NameRef>TEF Antriebst. rechts</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00065"/>
+              <MacroRef MenuMacroID="MM_00043"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TEF Umlenkspannst. rechts</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00066"/>
+              <MacroRef MenuMacroID="MM_00044"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>TEF Antriebst. links</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00068"/>
+              <MacroRef MenuMacroID="MM_00045"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TEF Umlenkspannst. links</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00069"/>
+              <MacroRef MenuMacroID="MM_00046"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>TEF Gerade auf Linie</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00071"/>
+              <MacroRef MenuMacroID="MM_00047"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TEF Gerade</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00072"/>
+              <MacroRef MenuMacroID="MM_00048"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00073">
+        <PopMenu UID="PM_00019">
           <Name>Anbaugruppen</Name>
           <PopMenuItem>
             <NameRef>Stopper AP</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00074"/>
+              <MacroRef MenuMacroID="MM_00049"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Scanner</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00075"/>
+              <MacroRef MenuMacroID="MM_00050"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Bürstenbremse</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00076"/>
+              <MacroRef MenuMacroID="MM_00051"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00078">
+        <PopMenu UID="PM_00020">
           <Name>Verbinder</Name>
           <PopMenuItem>
             <NameRef>~TV W-W kpl</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00079"/>
+              <MacroRef MenuMacroID="MM_00053"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV W-AP110 kpl</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00080"/>
+              <MacroRef MenuMacroID="MM_00054"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV W-AP60 oben kpl.</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00081"/>
+              <MacroRef MenuMacroID="MM_00055"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV W-AP110-W kpl</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00082"/>
+              <MacroRef MenuMacroID="MM_00056"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV W-AP oben kpl</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00083"/>
+              <MacroRef MenuMacroID="MM_00057"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV 80</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00084"/>
+              <MacroRef MenuMacroID="MM_00058"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV 50</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00085"/>
+              <MacroRef MenuMacroID="MM_00059"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~Endplatte Al-Profil AP schraubbar</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00086"/>
+              <MacroRef MenuMacroID="MM_00060"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~Anschlag AP-Ende fuer Spulenzug</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00087"/>
+              <MacroRef MenuMacroID="MM_00061"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-A fuer AP110/AP60 kpl</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00088"/>
+              <MacroRef MenuMacroID="MM_00062"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-A fuer AP60/ST</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00089"/>
+              <MacroRef MenuMacroID="MM_00063"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-A fuer AP110/ST kpl</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00090"/>
+              <MacroRef MenuMacroID="MM_00064"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-SW II fuer SW-SW</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00091"/>
+              <MacroRef MenuMacroID="MM_00065"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-SW III fuer SW-AP110-SW</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00092"/>
+              <MacroRef MenuMacroID="MM_00066"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-SW III fuer SW-AP110</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00093"/>
+              <MacroRef MenuMacroID="MM_00067"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-SW IV fuer Anschluss SW-AP60</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00094"/>
+              <MacroRef MenuMacroID="MM_00068"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~TV-SW IV fuer SW-ST</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00095"/>
+              <MacroRef MenuMacroID="MM_00069"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~Muffe</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00096"/>
+              <MacroRef MenuMacroID="MM_00070"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00097">
+        <PopMenu UID="PM_00021">
           <Name>Boegen fuer Weichen</Name>
           <PopMenuItem>
             <NameRef>~APB 110 R400/45 140 nur fuer Delta</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00098"/>
+              <MacroRef MenuMacroID="MM_00071"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APB 110 R550/45 194 nur fuer Delta</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00099"/>
+              <MacroRef MenuMacroID="MM_00072"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/22,5 360x248,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00100"/>
+              <MacroRef MenuMacroID="MM_00073"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/22,5 410x298,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00101"/>
+              <MacroRef MenuMacroID="MM_00074"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/22,5 410x78,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00102"/>
+              <MacroRef MenuMacroID="MM_00075"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/22,5 410x98,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00103"/>
+              <MacroRef MenuMacroID="MM_00076"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/67,5 360x598,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00104"/>
+              <MacroRef MenuMacroID="MM_00077"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R400/67,5 260x398,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00105"/>
+              <MacroRef MenuMacroID="MM_00078"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/45 77x160</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00106"/>
+              <MacroRef MenuMacroID="MM_00079"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/67,5 125x83,5</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00107"/>
+              <MacroRef MenuMacroID="MM_00080"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R750/90 200x290</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00108"/>
+              <MacroRef MenuMacroID="MM_00081"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R650/90 300x190</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00109"/>
+              <MacroRef MenuMacroID="MM_00082"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/67,5 208x347</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00110"/>
+              <MacroRef MenuMacroID="MM_00083"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>~APBW 110 R550/67,5 58x497</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00111"/>
+              <MacroRef MenuMacroID="MM_00084"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00113">
+        <PopMenu UID="PM_00022">
           <Name>SPS</Name>
-          <PopMenuRef pUID="PM_00114"/>
-          <PopMenuRef pUID="PM_00118"/>
-          <PopMenuItem>
-            <NameRef>Eingang</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00122"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Ausgang</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00123"/>
-            </MenuItem>
-          </PopMenuItem>
+          <PopMenuRef pUID="PM_00023"/>
+          <PopMenuRef pUID="PM_00024"/>
           <PopMenuItem>
             <NameRef>SPS Schliessen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00124"/>
+              <MacroRef MenuMacroID="MM_00093"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00114">
+        <PopMenu UID="PM_00023">
           <Name>TRO</Name>
           <PopMenuItem>
             <NameRef>Marker einfuegen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00115"/>
+              <MacroRef MenuMacroID="MM_00086"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Marker bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00116"/>
+              <MacroRef MenuMacroID="MM_00087"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Bearbeiten (Auto)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00117"/>
+              <MacroRef MenuMacroID="MM_00088"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00118">
+        <PopMenu UID="PM_00024">
           <Name>Connections</Name>
           <PopMenuItem>
             <NameRef>Verbindung einfuegen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00119"/>
+              <MacroRef MenuMacroID="MM_00089"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Verbindung bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00120"/>
+              <MacroRef MenuMacroID="MM_00090"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Eingang</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00091"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Ausgang</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00092"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Bearbeiten (Auto)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00117"/>
+              <MacroRef MenuMacroID="MM_00088"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00125">
+        <PopMenu UID="PM_00025">
           <Name>Export</Name>
           <PopMenuItem>
             <NameRef>Export Sivas</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00126"/>
+              <MacroRef MenuMacroID="MM_00094"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Export CSV</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00127"/>
+              <MacroRef MenuMacroID="MM_00095"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00128">
+        <PopMenu UID="PM_00026">
           <Name>Konfiguration</Name>
           <PopMenuItem>
             <NameRef>Umschalten 2D und 3D</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00129"/>
+              <MacroRef MenuMacroID="MM_00096"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Alle Bloecke auf 2D</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00130"/>
+              <MacroRef MenuMacroID="MM_00097"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Alle Bloecke auf 3D</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00131"/>
+              <MacroRef MenuMacroID="MM_00098"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Sprache</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00132"/>
+              <MacroRef MenuMacroID="MM_00099"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Planquadrate an/aus</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00133"/>
+              <MacroRef MenuMacroID="MM_00100"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Konfiguration Schliessen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00124"/>
+              <MacroRef MenuMacroID="MM_00093"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00135">
+        <PopMenu UID="PM_00027">
           <Name>Tests</Name>
           <PopMenuItem>
             <NameRef>alle Tests ausfuehren und exportieren</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00136"/>
+              <MacroRef MenuMacroID="MM_00101"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Tests ausfuehren und stehen lassen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00137"/>
+              <MacroRef MenuMacroID="MM_00102"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Export CSV/Sivas ALL</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00138"/>
+              <MacroRef MenuMacroID="MM_00103"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>Kreisel</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00140"/>
+              <MacroRef MenuMacroID="MM_00104"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Foerderer</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00141"/>
+              <MacroRef MenuMacroID="MM_00105"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Foerderer-Linienzug</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00142"/>
+              <MacroRef MenuMacroID="MM_00106"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00143"/>
+              <MacroRef MenuMacroID="MM_00107"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo Strecke</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00144"/>
+              <MacroRef MenuMacroID="MM_00108"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Gefaellestrecke</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00145"/>
+              <MacroRef MenuMacroID="MM_00109"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Mubea Gesamtmodell</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00146"/>
+              <MacroRef MenuMacroID="MM_00110"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>HundM05 Kreisel-Abschnitt</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00147"/>
+              <MacroRef MenuMacroID="MM_00111"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>KS 2D/3D pruefen (CSV)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00148"/>
+              <MacroRef MenuMacroID="MM_00112"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00159">
+        <PopMenu UID="PM_00028">
           <Alias>POP501</Alias>
           <Name>SSG_LIB Edit Context</Name>
           <PopMenuItem>
             <NameRef>Kreisel bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00160"/>
+              <MacroRef MenuMacroID="MM_00113"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo Element bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00161"/>
+              <MacroRef MenuMacroID="MM_00114"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Gefaellestrecke bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00162"/>
+              <MacroRef MenuMacroID="MM_00115"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>VarioFoerderer bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00163"/>
+              <MacroRef MenuMacroID="MM_00116"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TRO-Marker bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00164"/>
+              <MacroRef MenuMacroID="MM_00117"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Verbindung bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00165"/>
+              <MacroRef MenuMacroID="MM_00118"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>SSG Bearbeiten (Auto)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00167"/>
+              <MacroRef MenuMacroID="MM_00119"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
diff --git a/tests/testdata/hm_recformat.json b/tests/testdata/hm_recformat.json
index b9ffb11..9017a20 100644
--- a/tests/testdata/hm_recformat.json
+++ b/tests/testdata/hm_recformat.json
@@ -348,24 +348,24 @@
     "anzahl_eingaben": 54,
     "block": "VF_46",
     "dxf_handle": "EFD4",
-    "startpunkt_mm": [8571.95068, 1276.061424, 2494.930831],
+    "startpunkt_mm": [8572.181, 1226.825, 2154.0],
     "rotation_grad": 0.0,
-    "beschreibung": "Linienzug (Modus 1), Start Z2495: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
+    "beschreibung": "Linienzug (Modus 1), Start Z2154: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
     "sivas_id": "0019",
     "sivas_bezeichnung": "VarioFoerderer :5",
     "planquadrat": "D/1",
     "erwartung_hinweis": "Sivas-Export (EXPORTSIVAS), Strecke 0019: DeltaL_mm=1788, DeltaH_mm=220, Hoehe_Von_mm=2154, Hoehe_Bis_mm=2374, L_GF_m=2.727,0.4,0.418, L_VF_m=0.177,0.339,0.356,0.548, VF_Winkel=0,0,39,0, Anzahl_Separator=3",
-    "quelle": "INSERT EFD4 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]"
+    "quelle": "INSERT EFD4 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]; korrigiert per HundM05.dxf (sps_skel) - Startpunkt war faelschlich auf [8571.95068, 1276.061424, 2494.930831] aufgezeichnet (Anschluss an Kreisel hatte Luecke)"
   },
   {
     "typ": "point_abs",
-    "wert": [8571.95068, 1276.061424, 2494.930831],
+    "wert": [8572.181, 1226.825, 2154.0],
     "kommentar": "getpoint  Startpunkt der Kette (absoluter Weltpunkt, einziger Anker der ganzen Kette)"
   },
   {
     "typ": "real",
-    "wert": 2494.930831,
-    "kommentar": "getreal   Hoehe (Z) Startpunkt -> 2494.9 mm"
+    "wert": 2154.0,
+    "kommentar": "getreal   Hoehe (Z) Startpunkt -> 2154.0 mm"
   },
   {
     "typ": "string",
@@ -635,24 +635,24 @@
     "anzahl_eingaben": 54,
     "block": "VF_46",
     "dxf_handle": "FA5A",
-    "startpunkt_mm": [12916.465798, 1276.061424, 2494.930831],
+    "startpunkt_mm": [12916.988, 1237.971, 2154.0],
     "rotation_grad": 0.0,
-    "beschreibung": "Linienzug (Modus 1), Start Z2495: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
+    "beschreibung": "Linienzug (Modus 1), Start Z2154: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
     "sivas_id": "0018",
     "sivas_bezeichnung": "VarioFoerderer :4",
     "planquadrat": "F/1",
     "erwartung_hinweis": "Sivas-Export (EXPORTSIVAS), Strecke 0018: DeltaL_mm=1788, DeltaH_mm=220, Hoehe_Von_mm=2154, Hoehe_Bis_mm=2374, L_GF_m=2.727,0.4,0.418, L_VF_m=0.177,0.339,0.356,0.548, VF_Winkel=0,0,39,0, Anzahl_Separator=3",
-    "quelle": "INSERT FA5A (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]"
+    "quelle": "INSERT FA5A (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]; korrigiert per HundM05.dxf (sps_skel) - Startpunkt war faelschlich auf [12916.465798, 1276.061424, 2494.930831] aufgezeichnet (Anschluss an Kreisel hatte Luecke)"
   },
   {
     "typ": "point_abs",
-    "wert": [12916.465798, 1276.061424, 2494.930831],
+    "wert": [12916.988, 1237.971, 2154.0],
     "kommentar": "getpoint  Startpunkt der Kette (absoluter Weltpunkt, einziger Anker der ganzen Kette)"
   },
   {
     "typ": "real",
-    "wert": 2494.930831,
-    "kommentar": "getreal   Hoehe (Z) Startpunkt -> 2494.9 mm"
+    "wert": 2154.0,
+    "kommentar": "getreal   Hoehe (Z) Startpunkt -> 2154.0 mm"
   },
   {
     "typ": "string",
@@ -1209,24 +1209,24 @@
     "anzahl_eingaben": 54,
     "block": "VF_46",
     "dxf_handle": "104E0",
-    "startpunkt_mm": [21490.273781, 1195.739767, 2494.930831],
+    "startpunkt_mm": [21491.319, 1213.582, 2154.0],
     "rotation_grad": 0.0,
-    "beschreibung": "Linienzug (Modus 1), Start Z2495: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
+    "beschreibung": "Linienzug (Modus 1), Start Z2154: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
     "sivas_id": "0008",
     "sivas_bezeichnung": "VarioFoerderer :3",
     "planquadrat": "J/1",
     "erwartung_hinweis": "Sivas-Export (EXPORTSIVAS), Strecke 0008: DeltaL_mm=1788, DeltaH_mm=220, Hoehe_Von_mm=2154, Hoehe_Bis_mm=2374, L_GF_m=2.727,0.4,0.418, L_VF_m=0.177,0.339,0.356,0.548, VF_Winkel=0,0,39,0, Anzahl_Separator=3",
-    "quelle": "INSERT 104E0 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]"
+    "quelle": "INSERT 104E0 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]; korrigiert per HundM05.dxf (sps_skel) - Startpunkt war faelschlich auf [21490.273781, 1195.739767, 2494.930831] aufgezeichnet"
   },
   {
     "typ": "point_abs",
-    "wert": [21490.273781, 1195.739767, 2494.930831],
+    "wert": [21491.319, 1213.582, 2154.0],
     "kommentar": "getpoint  Startpunkt der Kette (absoluter Weltpunkt, einziger Anker der ganzen Kette)"
   },
   {
     "typ": "real",
-    "wert": 2494.930831,
-    "kommentar": "getreal   Hoehe (Z) Startpunkt -> 2494.9 mm"
+    "wert": 2154.0,
+    "kommentar": "getreal   Hoehe (Z) Startpunkt -> 2154.0 mm"
   },
   {
     "typ": "string",
diff --git a/tests/testdata/hundm05.json b/tests/testdata/hundm05.json
index 37a3269..b52c9ea 100644
--- a/tests/testdata/hundm05.json
+++ b/tests/testdata/hundm05.json
@@ -94,18 +94,18 @@
   {
     "spec_id": "VF_hundm05_LZ_02",
     "modus": 1,
-    "start_punkt": [8571.95068, 1276.061424, 2494.930831],
-    "start_hoehe": 2494.930831,
+    "start_punkt": [8572.181, 1226.825, 2154.0],
+    "start_hoehe": 2154.0,
     "as": 1,
     "as_winkel": "90",
     "as_seite": "links",
-    "beschreibung": "Linienzug (Modus 1), Start Z2495: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
+    "beschreibung": "Linienzug (Modus 1), Start Z2154: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
     "sivas_id": "0019",
     "sivas_bezeichnung": "VarioFoerderer :5",
     "planquadrat": "D/1",
     "block": "VF_46",
     "dxf_handle": "EFD4",
-    "quelle": "INSERT EFD4 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]"
+    "quelle": "INSERT EFD4 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]; korrigiert per HundM05.dxf (sps_skel) - Startpunkt war faelschlich auf [8571.95068, 1276.061424, 2494.930831] aufgezeichnet (Anschluss an Kreisel hatte Luecke)"
   },
   {
     "glied": "Linie-GF",
@@ -175,18 +175,18 @@
   {
     "spec_id": "VF_hundm05_LZ_03",
     "modus": 1,
-    "start_punkt": [12916.465798, 1276.061424, 2494.930831],
-    "start_hoehe": 2494.930831,
+    "start_punkt": [12916.988, 1237.971, 2154.0],
+    "start_hoehe": 2154.0,
     "as": 1,
     "as_winkel": "90",
     "as_seite": "links",
-    "beschreibung": "Linienzug (Modus 1), Start Z2495: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
+    "beschreibung": "Linienzug (Modus 1), Start Z2154: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
     "sivas_id": "0018",
     "sivas_bezeichnung": "VarioFoerderer :4",
     "planquadrat": "F/1",
     "block": "VF_46",
     "dxf_handle": "FA5A",
-    "quelle": "INSERT FA5A (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]"
+    "quelle": "INSERT FA5A (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]; korrigiert per HundM05.dxf (sps_skel) - Startpunkt war faelschlich auf [12916.465798, 1276.061424, 2494.930831] aufgezeichnet (Anschluss an Kreisel hatte Luecke)"
   },
   {
     "glied": "Linie-GF",
@@ -337,18 +337,18 @@
   {
     "spec_id": "VF_hundm05_LZ_05",
     "modus": 1,
-    "start_punkt": [21490.273781, 1195.739767, 2494.930831],
-    "start_hoehe": 2494.930831,
+    "start_punkt": [21491.319, 1213.582, 2154.0],
+    "start_hoehe": 2154.0,
     "as": 1,
     "as_winkel": "90",
     "as_seite": "links",
-    "beschreibung": "Linienzug (Modus 1), Start Z2495: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
+    "beschreibung": "Linienzug (Modus 1), Start Z2154: GF-Linie 3149 mm / 3 Grad -> Horizontal-VF 1575 mm -> Vario-Kurve 90 rechts innen -> Vario-Kurve 90 rechts innen -> Linie bis Kettenende 1153 mm auf Z2154 -> ES 90 links",
     "sivas_id": "0008",
     "sivas_bezeichnung": "VarioFoerderer :3",
     "planquadrat": "J/1",
     "block": "VF_46",
     "dxf_handle": "104E0",
-    "quelle": "INSERT 104E0 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]"
+    "quelle": "INSERT 104E0 (Block VF_46) in polylines.dxf, XDATA-App SSG_VF_EDIT, Marker linienzug; im Journal aufgezeichneter Kettenstart: [17201.778323, 1205.360995, 2100.000000]; korrigiert per HundM05.dxf (sps_skel) - Startpunkt war faelschlich auf [21490.273781, 1195.739767, 2494.930831] aufgezeichnet"
   },
   {
     "glied": "Linie-GF",
@@ -427,5 +427,50 @@
     "expect_block_prefix": "KREISEL_",
     "expect_hoehe": "2154",
     "expect_kreiselart": "STANDARD"
+  },
+  {
+    "comment": "Separator 1 (Nachtrag HundM05, reale Koordinate laut Anwender)",
+    "function": "insert",
+    "block": "S-LP",
+    "x": 2355,
+    "y": 365,
+    "z": 2154,
+    "rotation": 0
+  },
+  {
+    "comment": "Separator 2 (Nachtrag HundM05, reale Koordinate laut Anwender)",
+    "function": "insert",
+    "block": "S-LP",
+    "x": 4052.79,
+    "y": 1165.94,
+    "z": 2154,
+    "rotation": 180
+  },
+  {
+    "comment": "Scanner zu Separator 2 (Nachtrag HundM05, reale Koordinate laut Anwender)",
+    "function": "insert",
+    "block": "Scanner",
+    "x": 4095.51,
+    "y": 1164.08,
+    "z": 2154,
+    "rotation": 270
+  },
+  {
+    "comment": "Separator 3 (Nachtrag HundM05, reale Koordinate laut Anwender)",
+    "function": "insert",
+    "block": "S-LP",
+    "x": 7831.77,
+    "y": 1169.53,
+    "z": 2154,
+    "rotation": 180
+  },
+  {
+    "comment": "Scanner zu Separator 3 (Nachtrag HundM05, reale Koordinate laut Anwender)",
+    "function": "insert",
+    "block": "Scanner",
+    "x": 7874.49,
+    "y": 1167.67,
+    "z": 2154,
+    "rotation": 270
   }
 ]