diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index fbf924b..c712248 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-11-06T17:05:38" LanguageVersion="2014.1.3.712" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-11-11T10:23:21" LanguageVersion="2014.1.3.712" />
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -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" />
@@ -155,7 +155,7 @@
 					<FIELD Id="RDK:18530488" Name="LH_fits" Type="boolean" DesignTimeRemark="True wenn Länge L1 und L_th zueinander passen und damit zur Höhendifferenz" />
 					<FIELD Id="RDK:18530602" Name="LH_toleranz" Type="double" DesignTimeRemark="Toleranz in mm für den Längenunterschied, bei dem eine Differenz akzeptiert wird" />
 				</TYPE>
-				<TYPE Id="RDK:22028969" Name="VarioFoerdererType" SubType="structure">
+				<TYPE Id="RDK:22028969" Name="VarioFoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22028956" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:22038424" Name="Typ" Type="string" DesignTimeRemark="Auf, Ab oder Horizontal" />
@@ -180,6 +180,10 @@
 					<FIELD Id="RDK:22028966" Name="H_th" Type="double" DesignTimeRemark="Theoretische Höhendifferenz berechnet aus Winkel und L1 (projizierte Länge)" />
 					<FIELD Id="RDK:22028967" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:22028968" Name="n_Scan" Type="integer" />
+					<FIELD Id="RDK:26448134" Name="hat_Motor" Type="boolean" />
+					<FIELD Id="RDK:26448136" Name="hat_Umlenk" Type="boolean" />
+					<FIELD Id="RDK:26448138" Name="anKreisel_Anfang" Type="boolean" />
+					<FIELD Id="RDK:26448140" Name="anKreisel_Ende" Type="boolean" />
 				</TYPE>
 				<TYPE Id="RDK:973713" Name="WeicheType" SubType="structure">
 					<TYPE_VALUES />
@@ -253,7 +257,7 @@
 					<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:16577441" Name="Beschreibung" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -276,7 +280,7 @@
 					<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
 					<FIELD Id="RDK:19961198" Name="isDefined" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
+				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
@@ -312,7 +316,7 @@
 					<FIELD Id="RDK:22938802" Name="Key" Type="string" />
 					<FIELD Id="RDK:22938803" Name="StrArr" Type="string[]" />
 				</TYPE>
-				<TYPE Id="RDK:18530545" Name="SSG_Limits" SubType="structure">
+				<TYPE Id="RDK:18530545" Name="SSG_Limits" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530548" Name="Kreisel_top" Type="KreiselType" />
 					<FIELD Id="RDK:18530546" Name="Kreisel_bot" Type="KreiselType" />
@@ -969,6 +973,7 @@
 					<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" />
+					<FIELD Id="RDK:26448118" Name="Kreiselart" Type="string" />
 					<FIELD Id="RDK:900071" Name="Anzahl der Scanner" Type="string" />
 					<FIELD Id="RDK:952180" Name="Anzahl der Rampen" Type="string" />
 					<FIELD Id="RDK:1065211" Name="Höhe in m" Type="string" />
@@ -1015,7 +1020,7 @@
 					<FIELD Id="RDK:22305694" Name="Höhe Ende" Type="string" />
 					<FIELD Id="RDK:25719736" Name="Drehung" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:22028983" Name="VarioFoerdererMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:22028983" Name="VarioFoerdererMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22425783" Name="Förderrichtung" Type="string" />
 					<FIELD Id="RDK:22425781" Name="Motorseite" Type="string" />
@@ -1026,6 +1031,10 @@
 					<FIELD Id="RDK:22305688" Name="Höhe Anfang" Type="string" />
 					<FIELD Id="RDK:22305690" Name="Höhe Ende" Type="string" />
 					<FIELD Id="RDK:25719734" Name="Drehung" Type="double" />
+					<FIELD Id="RDK:26448128" Name="Laenge_Gefaellestrecke" Type="double" />
+					<FIELD Id="RDK:26448130" Name="Winkel_Gefaellestrecke" Type="double" />
+					<FIELD Id="RDK:26448124" Name="hatMotor" Type="boolean" />
+					<FIELD Id="RDK:26448126" Name="hatUmlenkung" Type="boolean" />
 				</TYPE>
 				<TYPE Id="RDK:973721" Name="WeicheMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
@@ -7030,9 +7039,11 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
-										<PAR Name="FoerdererDefinition" />
 										<PAR Name="VarioFoerdererDefinition" />
 										<PAR Name="KurveDefinition" />
+										<PAR Name="TEFBogenDefinition" />
+										<PAR Name="TEFGeradeDefinition" />
+										<PAR Name="TEFUmlenkDefinition" />
 										<PAR Name="KurveFoerdererDefinition" />
 										<PAR Name="OFGeradeDefinition">
 											<EXP><![CDATA[$=$Shape_Prototype.OFGeradeDefinition]]></EXP>
@@ -7106,9 +7117,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="TEFBogenDefinition" />
-										<PAR Name="TEFGeradeDefinition" />
-										<PAR Name="TEFUmlenkDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -7755,7 +7763,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
-										<PAR Name="FoerdererDefinition" />
 										<PAR Name="VarioFoerdererDefinition" />
 										<PAR Name="KurveDefinition" />
 										<PAR Name="TEFBogenDefinition" />
@@ -11955,38 +11962,6 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$C$NOTHING]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<ACTION_CALL Id="RDK:26417399" Name="RDEngineering_E2DManageShape" Suppressed="True" DesignTimeRemark="Eigenschaften des Shape_Prototype nach Property_Prototype kopieren">
-									<PAR Name="RDLibraryName">
-										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-									</PAR>
-									<PAR Name="e2dMode">
-										<EXP><![CDATA[$C$0]]></EXP>
-									</PAR>
-									<PAR Name="libraryID">
-										<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
-									</PAR>
-									<PAR Name="operType">
-										<EXP><![CDATA[$C$0]]></EXP>
-									</PAR>
-									<PAR Name="shpId">
-										<EXP><![CDATA[$=$Property_Prototype.id]]></EXP>
-									</PAR>
-									<PAR Name="catId" />
-									<PAR Name="shpItemId" />
-									<PAR Name="shpItem">
-										<EXP><![CDATA[$=$Property_Prototype]]></EXP>
-									</PAR>
-									<PAR Name="shpItemList">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="shpList">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="outShapeIdList">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</ACTION_CALL>
 								<SET Id="RDK:26422344" VarRef="Property_Prototype.eventClass">
 									<EXP><![CDATA[$C$OnDoubleclick,OnInserted,OnLinked,OnPasted]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -12208,8 +12183,162 @@ SSGConnectionPoint.x_M
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
+								<CALLFUNCTION Id="RDK:26431190">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 								<SET Id="RDK:26418413" VarRef="Param.Result">
 									<EXP><![CDATA[$=$Shape_Prototype.id
+]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+					</FUNCTION>
+					<FUNCTION Id="RDK:26443144" Name="getDistance" DesignTimeRemark="returns the distance between the given Connection Points" 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>
+									<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>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26443111" Name="Shape1" Type="Editor2DShapeType">
+								<SET Id="RDK:26443110" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner1]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26443113" Name="Shape2" Type="Editor2DShapeType">
+								<SET Id="RDK:26443112" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner2]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26443114" Name="cp1" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26443115" Name="cp2" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26443118" Name="ConTypeList1" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26443119" Name="ConTypeList2" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26443120" Name="distance" Type="double" />
+						</GROUP>
+						<IFTHENELSE Id="RDK:26443143">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:26443142" SubType="Then">
+								<SET Id="RDK:26443124" VarRef="ConTypeList1">
+									<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>
+								<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" />
+								</SET>
+								<SET Id="RDK:26443141" VarRef="Param.Result">
+									<EXP><![CDATA[$=$distrance
+]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+					</FUNCTION>
+					<FUNCTION Id="RDK:26448110" Name="stretchTEFGerade" DesignTimeRemark="increases the lenght of the TEFGerade that it fits to the next connectionPoint" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="string">
+						<GROUP Id="RDK:26448101" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+							<VAR Id="RDK:26448089" Name="partner1" Type="string">
+								<SET Id="RDK:26448088" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input[0].shapeid]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448091" Name="partner2" Type="string">
+								<SET Id="RDK:26448090" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input[1].shapeid]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448093" Name="Shape1" Type="Editor2DShapeType">
+								<SET Id="RDK:26448092" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner1]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448095" Name="Shape2" Type="Editor2DShapeType">
+								<SET Id="RDK:26448094" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner2]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448096" Name="cp1" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26448097" Name="cp2" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26448098" Name="ConTypeList1" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26448099" Name="ConTypeList2" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26448100" Name="distance" Type="double" />
+						</GROUP>
+						<IFTHENELSE Id="RDK:26448109">
+							<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[$=$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>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26448103" 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:26448104" VarRef="ConTypeList2">
+									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26448105" 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:26448106" 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:26448107" VarRef="Param.Result">
+									<EXP><![CDATA[$=$distrance
 ]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -16448,6 +16577,14 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:26448146" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Motor">
+									<EXP><![CDATA[$=$]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26448148" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Umlenk">
+									<EXP><![CDATA[$=$]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<SET Id="RDK:24796513" VarRef="Shape_Prototype.VarioFoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits == True, in Ordnung">
 									<EXP><![CDATA[$=$True]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -16489,6 +16626,14 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:26448142" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Motor">
+									<EXP><![CDATA[$=$]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26448144" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Umlenk">
+									<EXP><![CDATA[$=$]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<SET Id="RDK:24796520" VarRef="Shape_Prototype.VarioFoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits ==False, nicht in Ordnung , rot dargestellt">
 									<EXP><![CDATA[$=$False]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -29185,6 +29330,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<PAR Name="ValidateMsg" />
 						<PAR Name="DataSource" />
 						<PAR Name="Options" />
+						<PAR Name="WebviewSubType" />
 					</ACTION_CALL>
 					<ACTION_CALL Id="RDK:24757631" 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 &#xD;&#xA;">
 						<PAR Name="RDLibraryName">
@@ -40109,6 +40255,67 @@ me.x
 							</GROUP>
 						</IFTHENELSE>
 					</CASEGROUP>
+					<CASEGROUP Id="RDK:26439093" CaseType="0">
+						<EXP><![CDATA[$C$TEFGerade]]></EXP>
+						<IFTHENELSE Id="RDK:26439092">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFBogen"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="OFWeiche"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:26439089" SubType="Then">
+								<CALLFUNCTION Id="RDK:26439088">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></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: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}">
+									<PAR Name="RDLibraryName">
+										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+									</PAR>
+									<PAR Name="MsgText">
+										<EXP><![CDATA[$C$connect not allowed. No Data set. Please unlink it again. ]]></EXP>
+									</PAR>
+									<PAR Name="MsgStyle">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="BtnLayout">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="MsgCaption" />
+									<PAR Name="BaloonType" />
+									<PAR Name="BtnPressed">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+								</ACTION_CALL>
+							</GROUP>
+						</IFTHENELSE>
+					</CASEGROUP>
 					<CASEGROUP Id="RDK:1576708" CaseType="1">
 						<EXP />
 						<ACTION_CALL Id="RDK:22071740" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
@@ -44885,6 +45092,12 @@ me.x
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
+						<VAR Id="RDK:26448187" Name="AnzahlUmlenkVarioFörderer" Type="integer">
+							<SET Id="RDK:26448189" VarRef="Me">
+								<EXP><![CDATA[$C$0]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
 						<VAR Id="RDK:22537097" Name="AnzahlETFs" Type="integer">
 							<SET Id="RDK:22537262" VarRef="Me">
 								<EXP><![CDATA[$C$0]]></EXP>
@@ -45068,10 +45281,28 @@ me.x
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:22537121" CaseType="0">
 								<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
-								<SET Id="RDK:22537241" VarRef="AnzahlMotorenVarioFörderer">
-									<EXP><![CDATA[$=$AnzahlMotorenVarioFörderer+1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
+								<IFTHENELSE Id="RDK:26448175">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.hat_Motor]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:26448176" SubType="Then">
+										<SET Id="RDK:22537241" VarRef="AnzahlMotorenVarioFörderer">
+											<EXP><![CDATA[$=$AnzahlMotorenVarioFörderer+1]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
+								<IFTHENELSE Id="RDK:26448197">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.hat_Umlenk]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:26448196" SubType="Then">
+										<SET Id="RDK:26448195" VarRef="AnzahlUmlenkVarioFörderer">
+											<EXP><![CDATA[$=$AnzahlUmlenkVarioFördererr+1]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 								<SET Id="RDK:22537315" VarRef="LängenVarioFörderer">
 									<EXP><![CDATA[$=$LängenVarioFörderer+ShapeItem.VarioFoerdererDefinition.L1 / cos(DegToRad(ShapeItem.VarioFoerdererDefinition.winkel)) ]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -45913,6 +46144,10 @@ me.x
 													<EXP><![CDATA[$=$ToJSON("ILS 2.0 Kreisel")]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<SET Id="RDK:26448120" VarRef="CSV_Item.Kreiselart">
+													<EXP><![CDATA[$C$Standard]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
 											</CASEGROUP>
 											<CASEGROUP Id="RDK:24270613" CaseType="0">
 												<EXP><![CDATA[$C$Pin]]></EXP>
@@ -45920,6 +46155,10 @@ me.x
 													<EXP><![CDATA[$=$ToJSON("ILS 2.0 Kreisel mit Pin")]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<SET Id="RDK:26448122" VarRef="CSV_Item.Kreiselart">
+													<EXP><![CDATA[$C$Pin]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
 											</CASEGROUP>
 											<CASEGROUP Id="RDK:24270614" CaseType="1">
 												<EXP />
@@ -46202,6 +46441,18 @@ me.x
 											<PAR Name="Drehung">
 												<EXP><![CDATA[$=$Drehung]]></EXP>
 											</PAR>
+											<PAR Name="Laenge_Gefaellestrecke">
+												<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.L_GF]]></EXP>
+											</PAR>
+											<PAR Name="Winkel_Gefaellestrecke">
+												<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.winkel_GF]]></EXP>
+											</PAR>
+											<PAR Name="hatMotor">
+												<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.hat_Motor]]></EXP>
+											</PAR>
+											<PAR Name="hatUmlenkung">
+												<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.hat_Umlenk]]></EXP>
+											</PAR>
 										</SET_STRUCT>
 										<SET Id="RDK:24270655" VarRef="CSV_Item.Merkmale">
 											<EXP><![CDATA[$=$ToJSON(VarioFoerdererMerkmale)]]></EXP>
@@ -47460,6 +47711,18 @@ me.x
 				</FUNCTION>
 			</GROUP>
 			<FUNCTION Id="RDK:1630766" Name="GetNewShapeIDCounter" InputTypeName="string">
+				<IFTHENELSE Id="RDK:26439066">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.family)]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:26439063" SubType="Then">
+						<SET Id="RDK:26439062" VarRef="Shape_Prototype.IDCounter">
+							<EXP><![CDATA[$=$1]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<EXIT_PROCESS Id="RDK:26439073" BreakType="4" ExitStatus="0" />
+					</GROUP>
+				</IFTHENELSE>
 				<IFTHENELSE Id="RDK:26418401">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$IsEmpty(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))]]></EXP>
@@ -49484,37 +49747,16 @@ me.x
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:23748078" CaseType="0">
 						<EXP><![CDATA[$C$TEFGerade]]></EXP>
-						<IFTHENELSE Id="RDK:23748075">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$label="cp1"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:23748071" SubType="Then">
-								<SET Id="RDK:23748069" VarRef="ShapeList[&quot;id=&quot;+shapeId].TEFGeradeDefinition.H_Anfang">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:23748074" SubType="Else">
-								<SET Id="RDK:23748072" VarRef="ShapeList[&quot;id=&quot;+shapeId].OFGeradeDefinition.H_Ende">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<CALLFUNCTION Id="RDK:23748076" Suppressed="True" DesignTimeRemark="TODO; Hier ist nach Abstand von Vorne und Hinten zur Omniflo Strecke die Höhe zu bestimmen">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$shapeId]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
+						<SET Id="RDK:23748069" VarRef="ShapeList[&quot;id=&quot;+shapeId].TEFGeradeDefinition.H_Anfang">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:23748072" VarRef="ShapeList[&quot;id=&quot;+shapeId].TEFGeradeDefinition.H_Ende">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:23748077" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
-							<EXP><![CDATA[$=$ShapeList["id="+shapeId].TEFGeradeDefinition.H_Anfang/2 + ShapeList["id="+shapeId].TEFGeradeDefinition.H_Ende/2]]></EXP>
+							<EXP><![CDATA[$=$hoehe]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</CASEGROUP>
@@ -52290,6 +52532,27 @@ me.x
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</CASEGROUP>
+					<CASEGROUP Id="RDK:26439101" CaseType="0">
+						<EXP><![CDATA[$C$TEFGerade]]></EXP>
+						<SET Id="RDK:26439103" VarRef="hoehe">
+							<EXP><![CDATA[$=$item.TEFGeradeDefinition.H_Anfang]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:26439105" CaseType="0">
+						<EXP><![CDATA[$C$TEFBogen]]></EXP>
+						<SET Id="RDK:26439107" VarRef="hoehe">
+							<EXP><![CDATA[$=$item.TEFBogenDefinition.Hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:26440099" CaseType="0">
+						<EXP><![CDATA[$C$TEFUmlenk]]></EXP>
+						<SET Id="RDK:26440098" VarRef="hoehe">
+							<EXP><![CDATA[$=$item.TEFUmlenkDefinition.Hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
 					<CASEGROUP Id="RDK:18741920" CaseType="1">
 						<EXP />
 						<SET Id="RDK:18928863" VarRef="hoehe">
@@ -55499,6 +55762,7 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
+							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:314385" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -55717,6 +55981,7 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
+							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:20543119" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -56235,6 +56500,7 @@ me.x
 								<PAR Name="ValidateMsg" />
 								<PAR Name="DataSource" />
 								<PAR Name="Options" />
+								<PAR Name="WebviewSubType" />
 							</ACTION_CALL>
 							<ACTION_CALL Id="RDK:397360" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 								<PAR Name="RDLibraryName">
@@ -63956,7 +64222,9 @@ me.x
 			<GROUP Id="RDK:23747317" Name="TEF Gerade" SubType="Generic">
 				<SET_STRUCT Id="RDK:23747316" VarRef="TEFGeradeData_defaults" ClearAll="True">
 					<PAR Name="Beschreibung" />
-					<PAR Name="L1" />
+					<PAR Name="L1">
+						<EXP><![CDATA[$C$2500]]></EXP>
+					</PAR>
 					<PAR Name="H_Anfang">
 						<EXP><![CDATA[$C$2000]]></EXP>
 					</PAR>