diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 8599463..b585ddb 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -108,7 +108,7 @@
 					<FIELD Id="RDK:23747161" Name="H_Ende" Type="double" />
 					<FIELD Id="RDK:23747164" Name="isOk" Type="boolean" DesignTimeRemark="True wenn es an zwei Umlenkstationen angebunden ist und damit definiert" />
 				</TYPE>
-				<TYPE Id="RDK:23747177" Name="TEFUmlenkType" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:23747177" Name="TEFUmlenkType" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23747172" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23747174" Name="Hoehe" Type="double" />
@@ -168,7 +168,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" />
@@ -193,8 +193,6 @@
 					<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" />
 					<FIELD Id="RDK:26695021" Name="Spannstation_vorn" Type="boolean" />
@@ -1051,7 +1049,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" />
@@ -1066,8 +1064,6 @@
 					<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" />
 					<FIELD Id="RDK:26705259" Name="Spannstation_vorn" Type="boolean" />
 					<FIELD Id="RDK:26705261" Name="Motorstation_hinten" Type="boolean" />
 					<FIELD Id="RDK:26705263" Name="Ausschleus_vorn" Type="boolean" />
@@ -1129,7 +1125,7 @@
 					<FIELD Id="RDK:23747544" Name="Höhe unten" Type="string" />
 					<FIELD Id="RDK:26502199" Name="Drehung" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:23747553" Name="TEFUmlenkMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:23747553" Name="TEFUmlenkMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23747550" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:23747551" Name="Höhe" Type="string" />
@@ -17237,11 +17233,11 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:26448146" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Motor">
+								<SET Id="RDK:26448146" VarRef="Shape_Prototype.VarioFoerdererDefinition.Spannstation_vorn">
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:26448148" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Umlenk">
+								<SET Id="RDK:26448148" VarRef="Shape_Prototype.VarioFoerdererDefinition.Motorstation_hinten">
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -17286,11 +17282,11 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:26448142" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Motor">
+								<SET Id="RDK:26448142" VarRef="Shape_Prototype.VarioFoerdererDefinition.Spannstation_vorn">
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:26448144" VarRef="Shape_Prototype.VarioFoerdererDefinition.hat_Umlenk">
+								<SET Id="RDK:26448144" VarRef="Shape_Prototype.VarioFoerdererDefinition.Motorstation_hinten">
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -47235,7 +47231,7 @@ me.x
 								<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
 								<IFTHENELSE Id="RDK:26448175">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.hat_Motor]]></EXP>
+										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.Motorstation_hinten]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:26448176" SubType="Then">
 										<SET Id="RDK:22537241" VarRef="AnzahlMotorenVarioFörderer">
@@ -47246,7 +47242,7 @@ me.x
 								</IFTHENELSE>
 								<IFTHENELSE Id="RDK:26448197">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.hat_Umlenk]]></EXP>
+										<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.Spannstation_vorn]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:26448196" SubType="Then">
 										<SET Id="RDK:26448195" VarRef="AnzahlUmlenkVarioFörderer">
@@ -48503,9 +48499,6 @@ me.x
 											<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>
@@ -61051,6 +61044,7 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
+							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23747293" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -61106,6 +61100,7 @@ me.x
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource" />
 							<PAR Name="Options" />
+							<PAR Name="WebviewSubType" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23747303" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
@@ -67127,7 +67122,21 @@ me.x
 					<PAR Name="anKreisel_Anfang">
 						<EXP><![CDATA[$C$False]]></EXP>
 					</PAR>
-					<PAR Name="anKreisel_Ende" />
+					<PAR Name="anKreisel_Ende">
+						<EXP><![CDATA[$C$False]]></EXP>
+					</PAR>
+					<PAR Name="Spannstation_vorn">
+						<EXP><![CDATA[$C$True]]></EXP>
+					</PAR>
+					<PAR Name="Motorstation_hinten">
+						<EXP><![CDATA[$C$True]]></EXP>
+					</PAR>
+					<PAR Name="Ausschleus_vorn">
+						<EXP><![CDATA[$C$False]]></EXP>
+					</PAR>
+					<PAR Name="Einschleus_hinten">
+						<EXP><![CDATA[$C$False]]></EXP>
+					</PAR>
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:1007716" Name="SSG_Shapes" SubType="Generic">