diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 7c72392..62c9da9 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-03-03T10:42:18" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-03-03T16:53:53" LanguageVersion="2014.1.3.699" />
 	<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">
@@ -12905,7 +12905,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<EXP><![CDATA[$=$DatenSelected.KurvenWinkel]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
-							<SET Id="RDK:23363233" VarRef="Shape_Prototype.OFWeicheDefinition.KurvenRichtung">
+							<SET Id="RDK:23363233" VarRef="Shape_Prototype.OFWeicheDefinition.KurvenRichtung" Suppressed="True">
 								<EXP><![CDATA[$=$DatenSelected.KurvenRichtung]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
@@ -13023,12 +13023,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="AutoCommit" />
 									<PAR Name="ValidateFail" />
 									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource">
-										<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-									</PAR>
+									<PAR Name="DataSource" />
 									<PAR Name="Options" />
 								</ACTION_CALL>
-								<ACTION_CALL Id="RDK:23264126" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+								<ACTION_CALL Id="RDK:23407476" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 									<PAR Name="RDLibraryName">
 										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 									</PAR>
@@ -13043,14 +13041,14 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$C$0]]></EXP>
 									</PAR>
 									<PAR Name="Id">
-										<EXP><![CDATA[$C$AntriebKurve]]></EXP>
+										<EXP><![CDATA[$C$Schaltungstyp]]></EXP>
 									</PAR>
 									<PAR Name="ParentId" />
 									<PAR Name="Label">
-										<EXP><![CDATA[$C$Kurve TEF]]></EXP>
+										<EXP><![CDATA[$C$Mech/Pneu]]></EXP>
 									</PAR>
 									<PAR Name="Field">
-										<EXP><![CDATA[$C$AntriebKurve]]></EXP>
+										<EXP><![CDATA[$C$Schaltungstyp]]></EXP>
 									</PAR>
 									<PAR Name="Value" />
 									<PAR Name="Uom" />
@@ -13062,7 +13060,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Rules" />
 									<PAR Name="Image" />
 									<PAR Name="ControlType">
-										<EXP><![CDATA[$C$checkbox]]></EXP>
+										<EXP><![CDATA[$C$dropdown]]></EXP>
 									</PAR>
 									<PAR Name="ButtonSubType" />
 									<PAR Name="DropdownSubType" />
@@ -13076,11 +13074,13 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Disabled" />
 									<PAR Name="Pressed" />
 									<PAR Name="AutoCommit">
-										<EXP><![CDATA[$=$True]]></EXP>
+										<EXP><![CDATA[$C$True]]></EXP>
 									</PAR>
 									<PAR Name="ValidateFail" />
 									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource" />
+									<PAR Name="DataSource">
+										<EXP><![CDATA[$=$WeichenArtItemList]]></EXP>
+									</PAR>
 									<PAR Name="Options">
 										<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 									</PAR>
@@ -13135,9 +13135,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="AutoCommit" />
 									<PAR Name="ValidateFail" />
 									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource">
-										<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-									</PAR>
+									<PAR Name="DataSource" />
 									<PAR Name="Options" />
 								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:23264129" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
@@ -13190,9 +13188,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="AutoCommit" />
 									<PAR Name="ValidateFail" />
 									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource">
-										<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-									</PAR>
+									<PAR Name="DataSource" />
 									<PAR Name="Options" />
 								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:23264130" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
@@ -13245,9 +13241,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="AutoCommit" />
 									<PAR Name="ValidateFail" />
 									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource">
-										<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-									</PAR>
+									<PAR Name="DataSource" />
 									<PAR Name="Options" />
 								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:23264131" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point">
@@ -13279,7 +13273,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Tooltip" />
 									<PAR Name="Styles" />
 									<PAR Name="Classes">
-										<EXP><![CDATA[$C$col-2]]></EXP>
+										<EXP><![CDATA[$C$col-3]]></EXP>
 									</PAR>
 									<PAR Name="Rules" />
 									<PAR Name="Image" />
@@ -13300,8 +13294,65 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="AutoCommit" />
 									<PAR Name="ValidateFail" />
 									<PAR Name="ValidateMsg" />
+									<PAR Name="DataSource" />
+									<PAR Name="Options" />
+								</ACTION_CALL>
+								<ACTION_CALL Id="RDK:23421203" 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_OFWeiche]]></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$KurvenRichtung]]></EXP>
+									</PAR>
+									<PAR Name="ParentId" />
+									<PAR Name="Label">
+										<EXP><![CDATA[$C$Richtung]]></EXP>
+									</PAR>
+									<PAR Name="Field">
+										<EXP><![CDATA[$C$KurvenRichtung]]></EXP>
+									</PAR>
+									<PAR Name="Value">
+										<EXP><![CDATA[$C$2]]></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$dropdownwithimages]]></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[$C$True]]></EXP>
+									</PAR>
+									<PAR Name="ValidateFail" />
+									<PAR Name="ValidateMsg" />
 									<PAR Name="DataSource">
-										<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
+										<EXP><![CDATA[$=$WeichenRichtungItemList]]></EXP>
 									</PAR>
 									<PAR Name="Options" />
 								</ACTION_CALL>
@@ -44260,63 +44311,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Options" />
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:23222527" 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_OFWeiche]]></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$AntriebKurve]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$Kurve TEF]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$AntriebKurve]]></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$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" />
-							<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>
-						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23279520" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -44346,7 +44340,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-2]]></EXP>
+								<EXP><![CDATA[$C$col-3]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -44376,63 +44370,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 							</PAR>
 						</ACTION_CALL>
-						<ACTION_CALL Id="RDK:23232061" 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_OFWeiche]]></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$KurvenRichtung]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$Richtung]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$KurvenRichtung]]></EXP>
-							</PAR>
-							<PAR Name="Value" />
-							<PAR Name="Uom" />
-							<PAR Name="Tooltip" />
-							<PAR Name="Styles" />
-							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-2]]></EXP>
-							</PAR>
-							<PAR Name="Rules" />
-							<PAR Name="Image" />
-							<PAR Name="ControlType">
-								<EXP><![CDATA[$C$dropdownwithimages]]></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[$C$True]]></EXP>
-							</PAR>
-							<PAR Name="ValidateFail" />
-							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$WeichenRichtungItemList]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23222528" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -44483,9 +44420,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AutoCommit" />
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-							</PAR>
+							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23222529" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
@@ -44538,9 +44473,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AutoCommit" />
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-							</PAR>
+							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23222863" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
@@ -44593,9 +44526,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AutoCommit" />
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-							</PAR>
+							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23222530" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}" DesignTimeTip="cp1 top point">
@@ -44627,7 +44558,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Styles" />
 							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-2]]></EXP>
+								<EXP><![CDATA[$C$col-3]]></EXP>
 							</PAR>
 							<PAR Name="Rules" />
 							<PAR Name="Image" />
@@ -44648,9 +44579,62 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="AutoCommit" />
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
+							<PAR Name="DataSource" />
+							<PAR Name="Options" />
+						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:23232061" 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_OFWeiche]]></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$KurvenRichtung]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Richtung]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$KurvenRichtung]]></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$dropdownwithimages]]></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[$C$True]]></EXP>
+							</PAR>
+							<PAR Name="ValidateFail" />
+							<PAR Name="ValidateMsg" />
+							<PAR Name="DataSource" />
 							<PAR Name="Options" />
 						</ACTION_CALL>
 					</GROUP>