diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index c4968d7..2fc1c0c 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -25,7 +25,7 @@
 					<FIELD Id="RDK:20734834" Name="direction_x" Type="double" DesignTimeRemark="1 if direction posititve x-axis, -1 if is negative x-axis, 0 if it is in y-direction" />
 					<FIELD Id="RDK:20734836" Name="direction_y" Type="double" DesignTimeRemark="1 if direction posititve y-axis, -1 if is negative y-axis, 0 if it is in x-direction" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -52,10 +52,9 @@
 					<FIELD Id="RDK:1561130" Name="depth_PinBand" Type="integer" DesignTimeNotes="Höhe der BounddingBox für den Band" />
 					<FIELD Id="RDK:19929929" Name="height_PinBand" Type="integer" DesignTimeNotes="Breite der BounddingBox für den Band" />
 				</TYPE>
-				<TYPE Id="RDK:1520433" Name="EckradType" SubType="structure">
+				<TYPE Id="RDK:1520433" Name="EckradType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1520415" Name="Beschreibung" Type="string" />
-					<FIELD Id="RDK:1520416" Name="AbstandMS" Type="double" Suppressed="True" />
 					<FIELD Id="RDK:1520417" Name="Hoehe" Type="double" />
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
@@ -71,7 +70,6 @@
 					<FIELD Id="RDK:20543121" Name="FesteL1" Type="boolean" />
 					<FIELD Id="RDK:22608407" Name="H1gtH0" Type="integer" />
 					<FIELD Id="RDK:302573" Name="HoeheOben" Type="double" />
-					<FIELD Id="RDK:26481247" Name="FesteL_th" Type="boolean" />
 					<FIELD Id="RDK:22582208" Name="FesteH1" Type="boolean" />
 					<FIELD Id="RDK:302583" Name="HoeheUnten" Type="double" />
 					<FIELD Id="RDK:22582206" Name="FesteH0" Type="boolean" />
@@ -970,7 +968,7 @@
 					<FIELD Id="RDK:22353200" Name="Anzahl" Type="integer" DesignTimeNotes="Bezeichnung sollte vom Benutzer jedem Objekt zugewiesen werden können, um in den Listen besser ein Verständnis zu diesem Objekt zu finden" />
 					<FIELD Id="RDK:22305596" Name="Merkmale" Type="string" DesignTimeNotes="Merkmale sind die vom Nutzer angegebenen Merkmale dieses Objeks, Z.B. Abstand der Motor zur Spannstation, Höhe, usw." />
 				</TYPE>
-				<TYPE Id="RDK:900066" Name="KreiselMerkmaleType" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
+				<TYPE Id="RDK:900066" Name="KreiselMerkmaleType" Expanded="True" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:900067" Name="Abstand (Kreiselachse A - Kreiselachse) in Meter" Type="string" />
 					<FIELD Id="RDK:900069" Name="Anzahl der Separatoren" Type="string" />
@@ -1041,9 +1039,11 @@
 					<TYPE_VALUES />
 					<FIELD Id="RDK:973723" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1664608" Name="EckradMerkmaleType" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
+				<TYPE Id="RDK:1664608" Name="EckradMerkmaleType" Expanded="True" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1664607" Name="Höhe in m" Type="string" />
+					<FIELD Id="RDK:26456392" Name="Drehrichtung" Type="string" />
+					<FIELD Id="RDK:26456394" Name="Durchmesser" Type="double" />
 				</TYPE>
 				<TYPE Id="RDK:1668585" Name="BTMTBeladungMerkmaleType" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
 					<TYPE_VALUES />
@@ -1431,7 +1431,6 @@
 			<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" DesignTimeRemark="Dropdown Liste aller Bögen im Interface" />
 			<VAR Id="RDK:23222658" Name="OFWeichenData" Type="OFWeicheType[]" DesignTimeRemark="Dropdown Liste aller Weichen im Interface" />
 			<VAR Id="RDK:23747696" Name="TEFBogenData" Type="TEFBogenType[]" DesignTimeRemark="Liste aller TEF Bögen" />
-			<VAR Id="RDK:26406392" Name="H0" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -11919,9 +11918,15 @@ SSGConnectionPoint.x_M
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
 							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape2.family = "TEFGerade"]]></EXP>
+							</VALUECONDITION>
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
 							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
+							</VALUECONDITION>
 							<GROUP Id="RDK:26415273" SubType="Then">
 								<SET Id="RDK:26415275" VarRef="ConTypeList1">
 									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
@@ -12188,17 +12193,35 @@ SSGConnectionPoint.x_M
 							</GROUP>
 						</IFTHENELSE>
 					</FUNCTION>
-					<FUNCTION Id="RDK:26443144" Name="getDistance" DesignTimeRemark="returns the distance between the given Connection Points" ResultTypeName="string">
+					<FUNCTION Id="RDK:26443144" Name="getDistance" DesignTimeRemark="returns the length of the line" ResultTypeName="string">
 						<GROUP Id="RDK:26443123" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:26443107" Name="partner1" Type="string">
-								<SET Id="RDK:26443152" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input["key=from"].string]]></EXP>
+							<VAR Id="RDK:26450282" Name="shapeId" Type="string">
+								<SET Id="RDK:26450284" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
-							<VAR Id="RDK:26443109" Name="partner2" Type="string">
-								<SET Id="RDK:26443154" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input["key=to"].string]]></EXP>
+							<VAR Id="RDK:26450288" Name="partner1" Type="string">
+								<SET Id="RDK:26450287" VarRef="Me">
+									<EXP><![CDATA[$=$Shape_Prototype.shapeFromId]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26452356" Name="cp1_name" Type="string">
+								<SET Id="RDK:26456333" VarRef="Me">
+									<EXP><![CDATA[$=$Shape_Prototype.shapeFormPointIndex]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26450292" Name="partner2" Type="string">
+								<SET Id="RDK:26450291" VarRef="Me">
+									<EXP><![CDATA[$=$Shape_Prototype.shapeToId]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26452358" Name="cp2_name" Type="string">
+								<SET Id="RDK:26456335" VarRef="Me">
+									<EXP><![CDATA[$=$Shape_Prototype.shapeToId]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
@@ -12219,11 +12242,31 @@ SSGConnectionPoint.x_M
 							<VAR Id="RDK:26443118" Name="ConTypeList1" Type="Editor2DConnectionPointTypeList" />
 							<VAR Id="RDK:26443119" Name="ConTypeList2" Type="Editor2DConnectionPointTypeList" />
 							<VAR Id="RDK:26443120" Name="distance" Type="double" />
+							<VAR Id="RDK:26456363" Name="linkname" Type="string" />
+							<VAR Id="RDK:26456365" Name="item_index" Type="integer" />
 						</GROUP>
 						<IFTHENELSE Id="RDK:26443143">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
 							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape2.family = "OFBogen"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "OFBogen"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape2.family = "OFGerade"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "OFGerade"]]></EXP>
+							</VALUECONDITION>
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
 							</VALUECONDITION>
@@ -12232,18 +12275,50 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:26443125" VarRef="cp1" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList1[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
+								<FOREACHLOOP Id="RDK:26456338" ItemVarRef="linkname" IndexVarRef="item_index">
+									<PAR Name="ArrayValueExp">
+										<EXP><![CDATA[$=$Shape1.links]]></EXP>
+									</PAR>
+									<PAR Name="ExitCondExp">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<IFTHENELSE Id="RDK:26456366">
+										<VALUECONDITION Value="true">
+											<EXP><![CDATA[$=$splitStr(linkname, ";") = cp1_name]]></EXP>
+										</VALUECONDITION>
+										<GROUP Id="RDK:26456367" SubType="Then">
+											<SET Id="RDK:26443125" VarRef="cp1">
+												<EXP><![CDATA[$=$ConTypeList1[item_index]]]></EXP>
+												<PAR Name="AdvancedOptions" />
+											</SET>
+											<EXIT_PROCESS Id="RDK:26456389" BreakType="3" ExitStatus="0" />
+										</GROUP>
+									</IFTHENELSE>
+								</FOREACHLOOP>
+								<FOREACHLOOP Id="RDK:26456382" ItemVarRef="linkname" IndexVarRef="item_index">
+									<PAR Name="ArrayValueExp">
+										<EXP><![CDATA[$=$Shape2.links]]></EXP>
+									</PAR>
+									<PAR Name="ExitCondExp">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<IFTHENELSE Id="RDK:26456381">
+										<VALUECONDITION Value="true">
+											<EXP><![CDATA[$=$splitStr(linkname, ";") = cp2_name]]></EXP>
+										</VALUECONDITION>
+										<GROUP Id="RDK:26456380" SubType="Then">
+											<SET Id="RDK:26456379" VarRef="cp2">
+												<EXP><![CDATA[$=$ConTypeList2[item_index]]]></EXP>
+												<PAR Name="AdvancedOptions" />
+											</SET>
+											<EXIT_PROCESS Id="RDK:26456387" BreakType="3" ExitStatus="0" />
+										</GROUP>
+									</IFTHENELSE>
+								</FOREACHLOOP>
 								<SET Id="RDK:26443126" VarRef="ConTypeList2">
 									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:26443127" VarRef="cp2" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList2[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
 								<SET Id="RDK:26443128" VarRef="distance">
 									<EXP><![CDATA[$=$IIF(Abs(cp1.x - cp2.x)>=Abs(cp1.y - cp2.y), Abs(cp1.x - cp2.x), Abs(cp1.y - cp2.y))]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -12292,15 +12367,9 @@ SSGConnectionPoint.x_M
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
 							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
+							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Shape2.family = "TEFGerade"]]></EXP>
 							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
 							<GROUP Id="RDK:26448108" SubType="Then">
 								<SET Id="RDK:26448102" VarRef="ConTypeList1">
 									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
@@ -12324,6 +12393,59 @@ SSGConnectionPoint.x_M
 								</SET>
 								<SET Id="RDK:26448107" VarRef="Param.Result">
 									<EXP><![CDATA[$=$distrance
+]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+						<IFTHENELSE Id="RDK:26449253">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape1.family = "OFBogen"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "OFBogen"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:26449252" SubType="Then">
+								<SET Id="RDK:26449246" VarRef="ConTypeList1">
+									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26449247" VarRef="cp1" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
+									<EXP><![CDATA[$=$ConTypeList1[0]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26449248" VarRef="ConTypeList2">
+									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26449249" VarRef="cp2" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
+									<EXP><![CDATA[$=$ConTypeList2[0]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26449250" VarRef="distance">
+									<EXP><![CDATA[$=$IIF(Abs(cp1.x - cp2.x)>=Abs(cp1.y - cp2.y), Abs(cp1.x - cp2.x), Abs(cp1.y - cp2.y))]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26449251" VarRef="Param.Result">
+									<EXP><![CDATA[$=$distrance
 ]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -12431,8 +12553,6 @@ SSGConnectionPoint.x_M
 							<VAR Id="RDK:23155502" Name="winkel" Type="double" />
 							<VAR Id="RDK:23155641" Name="FesteH1" Type="boolean" />
 							<VAR Id="RDK:23155725" Name="FesteH0" Type="boolean" />
-							<VAR Id="RDK:26481258" Name="FesteL_th" Type="boolean" />
-							<VAR Id="RDK:26484407" Name="FesteL1" Type="boolean" />
 							<VAR Id="RDK:23155672" Name="L1" Type="double" />
 							<VAR Id="RDK:21069328" Name="L_th" Type="double" />
 							<VAR Id="RDK:23159239" Name="LH_toleranz" Type="double" />
@@ -12476,10 +12596,6 @@ SSGConnectionPoint.x_M
 										<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH1]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
-									<SET Id="RDK:26481260" VarRef="FesteL_th">
-										<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteL_th]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
 									<IFTHENELSE Id="RDK:22915898">
 										<VALUECONDITION Value="true">
 											<EXP><![CDATA[$=$HoeheOben=HoeheUnten]]></EXP>
@@ -12576,7 +12692,7 @@ SSGConnectionPoint.x_M
 									<VAR Id="RDK:23155720" Name="text" Type="string" />
 									<VAR Id="RDK:23155722" Name="z" Type="double" />
 								</GROUP>
-								<IFTHENELSE Id="RDK:22744528" DesignTimeRemark="HöheOben UND HöheUnten haben Werte und sind fixiert">
+								<IFTHENELSE Id="RDK:22744528">
 									<VALUECONDITION Value="true">
 										<EXP><![CDATA[$=$FesteH1]]></EXP>
 									</VALUECONDITION>
@@ -12612,8 +12728,8 @@ SSGConnectionPoint.x_M
 										</IFTHENELSE>
 									</GROUP>
 									<GROUP Id="RDK:22744530" SubType="Else">
-										<SET Id="RDK:26481178" VarRef="H_th">
-											<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
+										<SET Id="RDK:21069357" VarRef="H_th">
+											<EXP><![CDATA[$=$L1*Tan(DegToRad(winkel))]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 										<IFTHENELSE Id="RDK:26481316" DesignTimeRemark="Es gibt zwei Höhenangaben, aber keine ist fest gegeben: Winkel und Länge zählen">
@@ -12700,7 +12816,7 @@ SSGConnectionPoint.x_M
 								</IFTHENELSE>
 								<COMMENTS Id="RDK:21069355" DesignTimeRemark="Es werden die Länge, Winkel und Höhen als gegeben angsehen. Jetzt nur noch rechnen ob die Angaben passen. " />
 								<SET Id="RDK:21069356" VarRef="L_th">
-									<EXP><![CDATA[$=$Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel))]]></EXP>
+									<EXP><![CDATA[$=$(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel))]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:21069358" VarRef="winkel_th">
@@ -12717,56 +12833,27 @@ SSGConnectionPoint.x_M
 								</SET>
 								<IFTHENELSE Id="RDK:21902123">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$HoeheOben=HoeheUnten]]></EXP>
+										<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:21902124" SubType="Then">
-										<SET Id="RDK:21902137" VarRef="H_th">
-											<EXP><![CDATA[$=$0]]></EXP>
+										<SET Id="RDK:21902137" VarRef="text">
+											<EXP><![CDATA[$=$"↓"]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<SET Id="RDK:26481370" VarRef="text">
-											<EXP><![CDATA[$=$"O"]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:26481372" VarRef="LH_fits">
-											<EXP><![CDATA[$=$False]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:26481374" VarRef="H1gtH0">
-											<EXP><![CDATA[$=$]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:22732262" VarRef="L_th">
-											<EXP><![CDATA[$=$L1]]></EXP>
+										<SET Id="RDK:22732262" VarRef="H1gtH0">
+											<EXP><![CDATA[$=$-1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
 									<GROUP Id="RDK:21902125" SubType="Else">
-										<IFTHENELSE Id="RDK:26481362">
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:26481358" SubType="Then">
-												<SET Id="RDK:26481356" VarRef="text">
-													<EXP><![CDATA[$=$"↓"]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-												<SET Id="RDK:26481357" VarRef="H1gtH0">
-													<EXP><![CDATA[$=$-1]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-											</GROUP>
-											<GROUP Id="RDK:26481361" SubType="Else">
-												<SET Id="RDK:26481359" VarRef="text" DesignTimeTip="↓">
-													<EXP><![CDATA[$=$"↑"]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-												<SET Id="RDK:26481360" VarRef="H1gtH0">
-													<EXP><![CDATA[$=$1]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-											</GROUP>
-										</IFTHENELSE>
+										<SET Id="RDK:21902117" VarRef="text" DesignTimeTip="↓">
+											<EXP><![CDATA[$=$"↑"]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:22732264" VarRef="H1gtH0">
+											<EXP><![CDATA[$=$1]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
 									</GROUP>
 								</IFTHENELSE>
 								<GROUP Id="RDK:23155612" Name="LocalToShapeItem" SubType="Generic">
@@ -12859,7 +12946,6 @@ SSGConnectionPoint.x_M
 							<VAR Id="RDK:23134099" Name="LH_Fits" Type="boolean" />
 							<VAR Id="RDK:23134310" Name="FesteH0" Type="boolean" />
 							<VAR Id="RDK:23168890" Name="FesteL1" Type="boolean" />
-							<VAR Id="RDK:26481412" Name="FesteL_th" Type="boolean" />
 							<VAR Id="RDK:23134312" Name="FesteH1" Type="boolean" />
 						</GROUP>
 						<GROUP Id="RDK:23134356" Name="TransferFromPrototype" SubType="Generic">
@@ -12879,10 +12965,6 @@ SSGConnectionPoint.x_M
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.LH_toleranz]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
-									<SET Id="RDK:26494245" VarRef="L_th">
-										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L_th]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
 									<SET Id="RDK:23134292" VarRef="winkel">
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -12903,10 +12985,6 @@ SSGConnectionPoint.x_M
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
-									<SET Id="RDK:26481414" VarRef="FesteL_th">
-										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL_th]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
 									<SET Id="RDK:23134341" VarRef="H1gtH0">
 										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.H1gtH0]]></EXP>
 										<PAR Name="AdvancedOptions" />
@@ -13054,16 +13132,16 @@ SSGConnectionPoint.x_M
 														<EXP><![CDATA[$=$winkel]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
+													<SET Id="RDK:23472851" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+														<EXP><![CDATA[$=$winkel_th]]></EXP>
+														<PAR Name="AdvancedOptions" />
+													</SET>
 													<SET Id="RDK:23472852" VarRef="Shape_Prototype.GefaelleDefinition.L1">
 														<EXP><![CDATA[$=$L1]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
-													<SET Id="RDK:23472851" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
-														<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
-														<PAR Name="AdvancedOptions" />
-													</SET>
 													<SET Id="RDK:23472853" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-														<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
+														<EXP><![CDATA[$=$L_th]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
 													<SET Id="RDK:23472854" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
@@ -13093,14 +13171,14 @@ SSGConnectionPoint.x_M
 														<EXP><![CDATA[$=$winkel]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
-													<SET Id="RDK:23472862" VarRef="Shape_Prototype.OFGeradeDefinition.L1">
-														<EXP><![CDATA[$=$L1]]></EXP>
-														<PAR Name="AdvancedOptions" />
-													</SET>
 													<SET Id="RDK:23472861" VarRef="Shape_Prototype.OFGeradeDefinition.winkel_th">
 														<EXP><![CDATA[$=$winkel_th]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
+													<SET Id="RDK:23472862" VarRef="Shape_Prototype.OFGeradeDefinition.L1">
+														<EXP><![CDATA[$=$L1]]></EXP>
+														<PAR Name="AdvancedOptions" />
+													</SET>
 													<SET Id="RDK:23472863" VarRef="Shape_Prototype.OFGeradeDefinition.L_th">
 														<EXP><![CDATA[$=$L_th]]></EXP>
 														<PAR Name="AdvancedOptions" />
@@ -13202,16 +13280,16 @@ SSGConnectionPoint.x_M
 														<EXP><![CDATA[$=$winkel]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
+													<SET Id="RDK:23472803" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+														<EXP><![CDATA[$=$winkel_th]]></EXP>
+														<PAR Name="AdvancedOptions" />
+													</SET>
 													<SET Id="RDK:23472804" VarRef="Shape_Prototype.GefaelleDefinition.L1">
 														<EXP><![CDATA[$=$L1]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
-													<SET Id="RDK:23472803" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
-														<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
-														<PAR Name="AdvancedOptions" />
-													</SET>
 													<SET Id="RDK:23472805" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-														<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
+														<EXP><![CDATA[$=$L_th]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
 													<SET Id="RDK:23472806" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
@@ -13429,14 +13507,6 @@ SSGConnectionPoint.x_M
 												</IFTHENELSE>
 											</GROUP>
 										</IFTHENELSE>
-										<SET Id="RDK:23134031" VarRef="L_th">
-											<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<SET Id="RDK:23134033" VarRef="winkel_th">
-											<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
 									</GROUP>
 								</IFTHENELSE>
 							</GROUP>
@@ -19341,7 +19411,6 @@ SSGConnectionPoint.x_M
 											<PAR Name="Options">
 												<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
 											</PAR>
-											<PAR Name="WebviewSubType" />
 										</ACTION_CALL>
 										<SET Id="RDK:24540193" VarRef="shape_item.VarioFoerdererDefinition.winkel">
 											<EXP><![CDATA[$C$0]]></EXP>
@@ -27966,128 +28035,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</SELECTCASE>
 				</FUNCTION>
 				<FUNCTION Id="RDK:314271" Name="GefaelleStreckeUI">
-					<ACTION_CALL Id="RDK:26406389" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only &#xD;&#xA;">
-						<PAR Name="RDLibraryName">
-							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-						</PAR>
-						<PAR Name="RenderList">
-							<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-						</PAR>
-						<PAR Name="PanelName">
-							<EXP><![CDATA[$C$0]]></EXP>
-						</PAR>
-						<PAR Name="CustomPanel" />
-						<PAR Name="ActionType">
-							<EXP><![CDATA[$C$0]]></EXP>
-						</PAR>
-						<PAR Name="Id">
-							<EXP><![CDATA[$C$HoeheUnten]]></EXP>
-						</PAR>
-						<PAR Name="ParentId" />
-						<PAR Name="Label">
-							<EXP><![CDATA[$=$IIF(Shape_Prototype.Gefaelledefinition.FesteH0,"H0 ist angebunden", "H0")]]></EXP>
-						</PAR>
-						<PAR Name="Field">
-							<EXP><![CDATA[$C$HoeheUnten]]></EXP>
-						</PAR>
-						<PAR Name="Value">
-							<EXP><![CDATA[$=$]]></EXP>
-						</PAR>
-						<PAR Name="Uom" />
-						<PAR Name="Tooltip" />
-						<PAR Name="Styles" />
-						<PAR Name="Classes">
-							<EXP><![CDATA[$C$col-3]]></EXP>
-						</PAR>
-						<PAR Name="Rules" />
-						<PAR Name="Image" />
-						<PAR Name="ControlType">
-							<EXP><![CDATA[$C$textbox]]></EXP>
-						</PAR>
-						<PAR Name="ButtonSubType" />
-						<PAR Name="DropdownSubType" />
-						<PAR Name="TextboxSubType" />
-						<PAR Name="Action" />
-						<PAR Name="Required">
-							<EXP><![CDATA[$C$True]]></EXP>
-						</PAR>
-						<PAR Name="Hidden" />
-						<PAR Name="ROnly">
-							<EXP><![CDATA[$=$Shape_Prototype.Gefaelledefinition.FesteH0]]></EXP>
-						</PAR>
-						<PAR Name="Disabled" />
-						<PAR Name="Pressed" />
-						<PAR Name="AutoCommit">
-							<EXP><![CDATA[$=$True]]></EXP>
-						</PAR>
-						<PAR Name="ValidateFail" />
-						<PAR Name="ValidateMsg" />
-						<PAR Name="DataSource" />
-						<PAR Name="Options" />
-						<PAR Name="WebviewSubType" />
-					</ACTION_CALL>
-					<ACTION_CALL Id="RDK:26406391" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only ">
-						<PAR Name="RDLibraryName">
-							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-						</PAR>
-						<PAR Name="RenderList">
-							<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-						</PAR>
-						<PAR Name="PanelName">
-							<EXP><![CDATA[$C$0]]></EXP>
-						</PAR>
-						<PAR Name="CustomPanel" />
-						<PAR Name="ActionType">
-							<EXP><![CDATA[$C$0]]></EXP>
-						</PAR>
-						<PAR Name="Id">
-							<EXP><![CDATA[$C$HoeheOben]]></EXP>
-						</PAR>
-						<PAR Name="ParentId" />
-						<PAR Name="Label">
-							<EXP><![CDATA[$=$IIF(Shape_Prototype.Gefaelledefinition.FesteH1,"H1 ist angebunden", "H1")]]></EXP>
-						</PAR>
-						<PAR Name="Field">
-							<EXP><![CDATA[$C$HoeheOben]]></EXP>
-						</PAR>
-						<PAR Name="Value">
-							<EXP><![CDATA[$=$]]></EXP>
-						</PAR>
-						<PAR Name="Uom" />
-						<PAR Name="Tooltip" />
-						<PAR Name="Styles" />
-						<PAR Name="Classes">
-							<EXP><![CDATA[$C$col-3]]></EXP>
-						</PAR>
-						<PAR Name="Rules" />
-						<PAR Name="Image" />
-						<PAR Name="ControlType">
-							<EXP><![CDATA[$C$textbox]]></EXP>
-						</PAR>
-						<PAR Name="ButtonSubType" />
-						<PAR Name="DropdownSubType" />
-						<PAR Name="TextboxSubType" />
-						<PAR Name="Action" />
-						<PAR Name="Required">
-							<EXP><![CDATA[$C$True]]></EXP>
-						</PAR>
-						<PAR Name="Hidden">
-							<EXP><![CDATA[$=$]]></EXP>
-						</PAR>
-						<PAR Name="ROnly">
-							<EXP><![CDATA[$=$Shape_Prototype.Gefaelledefinition.FesteH1]]></EXP>
-						</PAR>
-						<PAR Name="Disabled" />
-						<PAR Name="Pressed" />
-						<PAR Name="AutoCommit">
-							<EXP><![CDATA[$=$True]]></EXP>
-						</PAR>
-						<PAR Name="ValidateFail" />
-						<PAR Name="ValidateMsg" />
-						<PAR Name="DataSource" />
-						<PAR Name="Options" />
-						<PAR Name="WebviewSubType" />
-					</ACTION_CALL>
 					<ACTION_CALL Id="RDK:397364" Name="RDEngineering_ModernUIRender">
 						<PAR Name="RDLibraryName">
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -28700,7 +28647,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$FieldAffected="FesteL_th"]]></EXP>
+									<EXP><![CDATA[$=$FieldAffected="H1gtH0"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
 								</VALUECONDITION>
 								<COMMENTS Id="RDK:18348402" DesignTimeRemark="Änderung von Winkel und Länge" />
 								<CALLFUNCTION Id="RDK:18348398">
@@ -37185,6 +37135,30 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$=$Shape_Prototype.source="line"]]></EXP>
 					</VALUECONDITION>
 					<CALLFUNCTION Id="RDK:26409338" DesignTimeRemark="Funktion agiert nur bei TEF Umlenk und Motorstation">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$getDistance]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<CALLFUNCTION Id="RDK:26451294" Suppressed="True">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$stretchTEFGerade]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$Param.Input]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<CALLFUNCTION Id="RDK:26450280" Suppressed="True" DesignTimeRemark="Funktion agiert nur bei TEF Umlenk und Motorstation">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$createTEFConnection]]></EXP>
 						</PAR>
@@ -39363,6 +39337,7 @@ me.x
 					<PAR Name="Int" />
 					<PAR Name="Boo" />
 					<PAR Name="StrArr" />
+					<PAR Name="StrArr2D" />
 				</SET_STRUCT>
 				<SELECTCASE Id="RDK:1576706">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family]]></EXP>
@@ -40521,18 +40496,6 @@ me.x
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
-								<CALLFUNCTION Id="RDK:26448115">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$stretchTEFGerade]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
 							</GROUP>
 							<GROUP Id="RDK:26439091" SubType="Else">
 								<ACTION_CALL Id="RDK:26439090" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
@@ -46999,6 +46962,12 @@ me.x
 											<PAR Name="Höhe in m">
 												<EXP><![CDATA[$=$StrReplace(ShapeItem.EckradDefinition.Hoehe/1000, ",", ".")]]></EXP>
 											</PAR>
+											<PAR Name="Drehrichtung">
+												<EXP><![CDATA[$=$IIF(ShapeITem.EckradDefinition.Drehung=1,"UZS", "GUZS")]]></EXP>
+											</PAR>
+											<PAR Name="Durchmesser">
+												<EXP><![CDATA[$=$ShapeItem.EckradDefinition.Durchmesser/1000]]></EXP>
+											</PAR>
 										</SET_STRUCT>
 										<SET Id="RDK:24270721" VarRef="CSV_Item.Merkmale">
 											<EXP><![CDATA[$=$ToJSON(EckradMerkmale)]]></EXP>
@@ -49673,68 +49642,6 @@ me.x
 									<EXP><![CDATA[$=$True]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<ACTION_CALL Id="RDK:26481240" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only ">
-									<PAR Name="RDLibraryName">
-										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-									</PAR>
-									<PAR Name="RenderList">
-										<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-									</PAR>
-									<PAR Name="PanelName">
-										<EXP><![CDATA[$C$0]]></EXP>
-									</PAR>
-									<PAR Name="CustomPanel" />
-									<PAR Name="ActionType">
-										<EXP><![CDATA[$C$0]]></EXP>
-									</PAR>
-									<PAR Name="Id">
-										<EXP><![CDATA[$C$HoeheOben]]></EXP>
-									</PAR>
-									<PAR Name="ParentId" />
-									<PAR Name="Label">
-										<EXP><![CDATA[$=$IIF(Shape_Prototype.Gefaelledefinition.FesteH1,"H1 ist angebunden", "H1")]]></EXP>
-									</PAR>
-									<PAR Name="Field">
-										<EXP><![CDATA[$C$HoeheOben]]></EXP>
-									</PAR>
-									<PAR Name="Value">
-										<EXP><![CDATA[$=$]]></EXP>
-									</PAR>
-									<PAR Name="Uom" />
-									<PAR Name="Tooltip" />
-									<PAR Name="Styles" />
-									<PAR Name="Classes">
-										<EXP><![CDATA[$C$col-3]]></EXP>
-									</PAR>
-									<PAR Name="Rules" />
-									<PAR Name="Image" />
-									<PAR Name="ControlType">
-										<EXP><![CDATA[$C$textbox]]></EXP>
-									</PAR>
-									<PAR Name="ButtonSubType" />
-									<PAR Name="DropdownSubType" />
-									<PAR Name="TextboxSubType" />
-									<PAR Name="Action" />
-									<PAR Name="Required">
-										<EXP><![CDATA[$C$True]]></EXP>
-									</PAR>
-									<PAR Name="Hidden">
-										<EXP><![CDATA[$=$]]></EXP>
-									</PAR>
-									<PAR Name="ROnly">
-										<EXP><![CDATA[$C$Shape_Prototype.Gefaelledefinition.FesteH1]]></EXP>
-									</PAR>
-									<PAR Name="Disabled" />
-									<PAR Name="Pressed" />
-									<PAR Name="AutoCommit">
-										<EXP><![CDATA[$=$True]]></EXP>
-									</PAR>
-									<PAR Name="ValidateFail" />
-									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource" />
-									<PAR Name="Options" />
-									<PAR Name="WebviewSubType" />
-								</ACTION_CALL>
 							</GROUP>
 							<GROUP Id="RDK:21920354" SubType="Else">
 								<SET Id="RDK:21920353" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheUnten">
@@ -49745,66 +49652,6 @@ me.x
 									<EXP><![CDATA[$=$True]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<ACTION_CALL Id="RDK:26481238" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only &#xD;&#xA;">
-									<PAR Name="RDLibraryName">
-										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-									</PAR>
-									<PAR Name="RenderList">
-										<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-									</PAR>
-									<PAR Name="PanelName">
-										<EXP><![CDATA[$C$0]]></EXP>
-									</PAR>
-									<PAR Name="CustomPanel" />
-									<PAR Name="ActionType">
-										<EXP><![CDATA[$C$0]]></EXP>
-									</PAR>
-									<PAR Name="Id">
-										<EXP><![CDATA[$C$HoeheUnten]]></EXP>
-									</PAR>
-									<PAR Name="ParentId" />
-									<PAR Name="Label">
-										<EXP><![CDATA[$=$IIF(Shape_Prototype.Gefaelledefinition.FesteH0,"H0 ist angebunden", "H0")]]></EXP>
-									</PAR>
-									<PAR Name="Field">
-										<EXP><![CDATA[$C$HoeheUnten]]></EXP>
-									</PAR>
-									<PAR Name="Value">
-										<EXP><![CDATA[$=$]]></EXP>
-									</PAR>
-									<PAR Name="Uom" />
-									<PAR Name="Tooltip" />
-									<PAR Name="Styles" />
-									<PAR Name="Classes">
-										<EXP><![CDATA[$C$col-3]]></EXP>
-									</PAR>
-									<PAR Name="Rules" />
-									<PAR Name="Image" />
-									<PAR Name="ControlType">
-										<EXP><![CDATA[$C$textbox]]></EXP>
-									</PAR>
-									<PAR Name="ButtonSubType" />
-									<PAR Name="DropdownSubType" />
-									<PAR Name="TextboxSubType" />
-									<PAR Name="Action" />
-									<PAR Name="Required">
-										<EXP><![CDATA[$C$True]]></EXP>
-									</PAR>
-									<PAR Name="Hidden" />
-									<PAR Name="ROnly">
-										<EXP><![CDATA[$=$Shape_Prototype.Gefaelledefinition.FesteH0]]></EXP>
-									</PAR>
-									<PAR Name="Disabled" />
-									<PAR Name="Pressed" />
-									<PAR Name="AutoCommit">
-										<EXP><![CDATA[$=$True]]></EXP>
-									</PAR>
-									<PAR Name="ValidateFail" />
-									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource" />
-									<PAR Name="Options" />
-									<PAR Name="WebviewSubType" />
-								</ACTION_CALL>
 							</GROUP>
 						</IFTHENELSE>
 						<CALLFUNCTION Id="RDK:21920356">
@@ -50666,7 +50513,7 @@ me.x
 								</PAR>
 								<PAR Name="Options" />
 							</CALLFUNCTION>
-							<CALLFUNCTION Id="RDK:25950490" Suppressed="True">
+							<CALLFUNCTION Id="RDK:25950490">
 								<PAR Name="FuncName">
 									<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
 								</PAR>
@@ -51121,6 +50968,7 @@ me.x
 						</PAR>
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
+						<PAR Name="StrArr2D" />
 					</SET_STRUCT>
 					<CALLFUNCTION Id="RDK:21911233">
 						<PAR Name="FuncName">
@@ -56076,120 +55924,6 @@ me.x
 							<PAR Name="RenderStatus" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:837492" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
-							<PAR Name="RDLibraryName">
-								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-							</PAR>
-							<PAR Name="RenderList">
-								<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-							</PAR>
-							<PAR Name="PanelName">
-								<EXP><![CDATA[$C$0]]></EXP>
-							</PAR>
-							<PAR Name="CustomPanel" />
-							<PAR Name="ActionType">
-								<EXP><![CDATA[$C$0]]></EXP>
-							</PAR>
-							<PAR Name="Id">
-								<EXP><![CDATA[$C$winkel]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$Neigungswinkel]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$winkel]]></EXP>
-							</PAR>
-							<PAR Name="Value" />
-							<PAR Name="Uom" />
-							<PAR Name="Tooltip" />
-							<PAR Name="Styles" />
-							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
-							</PAR>
-							<PAR Name="Rules" />
-							<PAR Name="Image" />
-							<PAR Name="ControlType">
-								<EXP><![CDATA[$C$textbox]]></EXP>
-							</PAR>
-							<PAR Name="ButtonSubType" />
-							<PAR Name="DropdownSubType" />
-							<PAR Name="TextboxSubType" />
-							<PAR Name="Action" />
-							<PAR Name="Required">
-								<EXP><![CDATA[$C$True]]></EXP>
-							</PAR>
-							<PAR Name="Hidden" />
-							<PAR Name="ROnly" />
-							<PAR Name="Disabled" />
-							<PAR Name="Pressed" />
-							<PAR Name="AutoCommit">
-								<EXP><![CDATA[$=$True]]></EXP>
-							</PAR>
-							<PAR Name="ValidateFail" />
-							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource" />
-							<PAR Name="Options">
-								<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
-							</PAR>
-							<PAR Name="WebviewSubType" />
-						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:19866068" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
-							<PAR Name="RDLibraryName">
-								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-							</PAR>
-							<PAR Name="RenderList">
-								<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-							</PAR>
-							<PAR Name="PanelName">
-								<EXP><![CDATA[$C$0]]></EXP>
-							</PAR>
-							<PAR Name="CustomPanel" />
-							<PAR Name="ActionType">
-								<EXP><![CDATA[$C$0]]></EXP>
-							</PAR>
-							<PAR Name="Id">
-								<EXP><![CDATA[$C$winkel_th]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$Theoretischer Neigungswinkel]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$winkel_th]]></EXP>
-							</PAR>
-							<PAR Name="Value" />
-							<PAR Name="Uom" />
-							<PAR Name="Tooltip" />
-							<PAR Name="Styles" />
-							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
-							</PAR>
-							<PAR Name="Rules" />
-							<PAR Name="Image" />
-							<PAR Name="ControlType">
-								<EXP><![CDATA[$C$textbox]]></EXP>
-							</PAR>
-							<PAR Name="ButtonSubType" />
-							<PAR Name="DropdownSubType" />
-							<PAR Name="TextboxSubType" />
-							<PAR Name="Action" />
-							<PAR Name="Required" />
-							<PAR Name="Hidden" />
-							<PAR Name="ROnly">
-								<EXP><![CDATA[$C$True]]></EXP>
-							</PAR>
-							<PAR Name="Disabled" />
-							<PAR Name="Pressed" />
-							<PAR Name="AutoCommit">
-								<EXP><![CDATA[$=$]]></EXP>
-							</PAR>
-							<PAR Name="ValidateFail" />
-							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource" />
-							<PAR Name="Options" />
-							<PAR Name="WebviewSubType" />
-						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:880711" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -56219,7 +55953,7 @@ me.x
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
+								<EXP><![CDATA[$C$col-6]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -56271,7 +56005,7 @@ me.x
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
+								<EXP><![CDATA[$C$col-6]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -56292,7 +56026,118 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
-							<PAR Name="WebviewSubType" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:837492" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$winkel]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Neigungswinkel]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$winkel]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-7]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$slider]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly" />
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$True]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options">
+								<EXP><![CDATA[$C$(RANGE=0,5,0.1)]]></EXP>
+							</PAR>
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:19866068" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+							<PAR Name="RDLibraryName">
+								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+							</PAR>
+							<PAR Name="RenderList">
+								<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
+							</PAR>
+							<PAR Name="PanelName">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="CustomPanel" />
+							<PAR Name="ActionType">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Id">
+								<EXP><![CDATA[$C$winkel_th]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Theoretischer Neigungswinkel]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$winkel_th]]></EXP>
+							</PAR>
+							<PAR Name="Value" />
+							<PAR Name="Uom" />
+							<PAR Name="Tooltip" />
+							<PAR Name="Styles" />
+							<PAR Name="Classes">
+								<EXP><![CDATA[$C$col-5]]></EXP>
+							</PAR>
+							<PAR Name="Rules" />
+							<PAR Name="Image" />
+							<PAR Name="ControlType">
+								<EXP><![CDATA[$C$textbox]]></EXP>
+							</PAR>
+							<PAR Name="ButtonSubType" />
+							<PAR Name="DropdownSubType" />
+							<PAR Name="TextboxSubType" />
+							<PAR Name="Action" />
+							<PAR Name="Required" />
+							<PAR Name="Hidden" />
+							<PAR Name="ROnly">
+								<EXP><![CDATA[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="Disabled" />
+							<PAR Name="Pressed" />
+							<PAR Name="AutoCommit">
+								<EXP><![CDATA[$=$]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
+							<PAR Name="Options" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:314383" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -56323,7 +56168,7 @@ me.x
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-5]]></EXP>
+								<EXP><![CDATA[$C$col-6]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -56408,7 +56253,6 @@ me.x
 							<PAR Name="Options">
 								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 							</PAR>
-							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:18539546" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed">
 							<PAR Name="RDLibraryName">
@@ -56462,67 +56306,6 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
-							<PAR Name="WebviewSubType" />
-						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:26481245" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
-							<PAR Name="RDLibraryName">
-								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-							</PAR>
-							<PAR Name="RenderList">
-								<EXP><![CDATA[$=$Render_Gefaelle]]></EXP>
-							</PAR>
-							<PAR Name="PanelName">
-								<EXP><![CDATA[$C$0]]></EXP>
-							</PAR>
-							<PAR Name="CustomPanel" />
-							<PAR Name="ActionType">
-								<EXP><![CDATA[$C$0]]></EXP>
-							</PAR>
-							<PAR Name="Id">
-								<EXP><![CDATA[$C$FesteL_th]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$übernimmt]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$FesteL_th]]></EXP>
-							</PAR>
-							<PAR Name="Value" />
-							<PAR Name="Uom" />
-							<PAR Name="Tooltip" />
-							<PAR Name="Styles" />
-							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-1]]></EXP>
-							</PAR>
-							<PAR Name="Rules" />
-							<PAR Name="Image" />
-							<PAR Name="ControlType">
-								<EXP><![CDATA[$C$checkbox]]></EXP>
-							</PAR>
-							<PAR Name="ButtonSubType" />
-							<PAR Name="DropdownSubType" />
-							<PAR Name="TextboxSubType" />
-							<PAR Name="Action" />
-							<PAR Name="Required">
-								<EXP><![CDATA[$C$True]]></EXP>
-							</PAR>
-							<PAR Name="Hidden" />
-							<PAR Name="ROnly">
-								<EXP><![CDATA[$=$]]></EXP>
-							</PAR>
-							<PAR Name="Disabled" />
-							<PAR Name="Pressed" />
-							<PAR Name="AutoCommit">
-								<EXP><![CDATA[$=$True]]></EXP>
-							</PAR>
-							<PAR Name="ValidateFail" />
-							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource" />
-							<PAR Name="Options">
-								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
-							</PAR>
-							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:837490" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp2 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only &#xD;&#xA;">
 							<PAR Name="RDLibraryName">
@@ -56553,7 +56336,7 @@ me.x
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
+								<EXP><![CDATA[$C$col-2]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -56576,7 +56359,6 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
-							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:22582210" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -56618,10 +56400,10 @@ me.x
 							<PAR Name="DropdownSubType" />
 							<PAR Name="TextboxSubType" />
 							<PAR Name="Action" />
-							<PAR Name="Required" />
-							<PAR Name="Hidden">
+							<PAR Name="Required">
 								<EXP><![CDATA[$C$True]]></EXP>
 							</PAR>
+							<PAR Name="Hidden" />
 							<PAR Name="ROnly" />
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
@@ -56634,7 +56416,6 @@ me.x
 							<PAR Name="Options">
 								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 							</PAR>
-							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:22593698" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -56690,7 +56471,6 @@ me.x
 								<EXP><![CDATA[$=$SteigungList]]></EXP>
 							</PAR>
 							<PAR Name="Options" />
-							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:314381" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed&#xD;&#xA;&#xD;&#xA;20241001 -1-&#xD;&#xA;set H0 and H1 to Read only ">
 							<PAR Name="RDLibraryName">
@@ -56721,7 +56501,7 @@ me.x
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-3]]></EXP>
+								<EXP><![CDATA[$C$col-2]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -56744,7 +56524,6 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
-							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:22582212" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -56786,10 +56565,10 @@ me.x
 							<PAR Name="DropdownSubType" />
 							<PAR Name="TextboxSubType" />
 							<PAR Name="Action" />
-							<PAR Name="Required" />
-							<PAR Name="Hidden">
+							<PAR Name="Required">
 								<EXP><![CDATA[$C$True]]></EXP>
 							</PAR>
+							<PAR Name="Hidden" />
 							<PAR Name="ROnly" />
 							<PAR Name="Disabled" />
 							<PAR Name="Pressed" />
@@ -56802,7 +56581,6 @@ me.x
 							<PAR Name="Options">
 								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 							</PAR>
-							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:18539544" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeNotes="20231005 -1-&#xD;&#xA;Read only changed&#xD;&#xA;&#xD;&#xA;20230928 -1-&#xD;&#xA;Label changed">
 							<PAR Name="RDLibraryName">
@@ -64321,14 +64099,11 @@ me.x
 						<EXP><![CDATA[$C$10]]></EXP>
 					</PAR>
 					<PAR Name="winkel">
-						<EXP><![CDATA[$C$3]]></EXP>
+						<EXP><![CDATA[$C$2]]></EXP>
 					</PAR>
 					<PAR Name="FesteL1" />
-					<PAR Name="H1gtH0" />
 					<PAR Name="HoeheOben" />
-					<PAR Name="FesteH1" />
 					<PAR Name="HoeheUnten" />
-					<PAR Name="FesteH0" />
 					<PAR Name="winkel_th" />
 					<PAR Name="H_th" />
 					<PAR Name="n_Sep">
@@ -64337,6 +64112,9 @@ me.x
 					<PAR Name="n_Scan">
 						<EXP><![CDATA[$C$0]]></EXP>
 					</PAR>
+					<PAR Name="H1gtH0" />
+					<PAR Name="FesteH1" />
+					<PAR Name="FesteH0" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:18732243" Name="Kurve" SubType="Generic">