diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index e8df75f..cdb0679 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-02-27T11:06:55" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-02-27T13:47:14" 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">
@@ -1251,10 +1251,14 @@
 					<VAR Id="RDK:23038271" Name="OFBogenItem" Type="DataSourceValInfo" />
 					<VAR Id="RDK:23038275" Name="OFBogenItemList" Type="DataSourceValInfo[]" />
 				</GROUP>
-				<GROUP Id="RDK:23279536" Name="Weichenart" SubType="VarSet" IncludeDate="0">
+				<GROUP Id="RDK:23279536" Name="OF Weichenart mech/pneu" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:23279534" Name="WeichenArtItem" Type="DataSourceValInfo" />
 					<VAR Id="RDK:23279535" Name="WeichenArtItemList" Type="DataSourceValInfo[]" />
 				</GROUP>
+				<GROUP Id="RDK:23302581" Name="OF Weichenrichtung" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:23302579" Name="WeichenRichtungItem" Type="DataSourceValInfo" />
+					<VAR Id="RDK:23302580" Name="WeichenRichtungItemList" Type="DataSourceValInfo[]" />
+				</GROUP>
 				<GROUP Id="RDK:23221911" Name="OFWeiche" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:23221909" Name="OFWeicheItem" Type="DataSourceValInfo" />
 					<VAR Id="RDK:23221910" Name="OFWeicheItemList" Type="DataSourceValInfo[]" />
@@ -1299,8 +1303,8 @@
 			<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" DesignTimeRemark="Enthält ; separtiert alle Strings, damit die Gruppen beschrieben werden können. a;b;c wäre z.B. eine Gruppe aus den Objekten a, b und c" />
 			<VAR Id="RDK:22342749" Name="CountKeys" Type="SSGDictInt[]" DesignTimeRemark="Array von Key-Value paaren, um sich die Anzahl von Key  in Value zu merken. Dient zum Zählen" />
 			<VAR Id="RDK:22938910" Name="KeyValues" Type="SSGDictArr[]" DesignTimeRemark="Array von Key-Value paaren, um sich eine liste von Begriffen zu einem Key zu merken" />
-			<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" />
-			<VAR Id="RDK:23222658" Name="OFWeichenData" Type="OFWeicheType[]" />
+			<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" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -11951,7 +11955,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</FUNCTION>
-					<FUNCTION Id="RDK:23222043" Name="SetDropdownOFWeiche" InputTypeName="OFWeicheType">
+					<FUNCTION Id="RDK:23222043" Name="SetDropdownOFWeiche" InputTypeName="OFWeicheType" ResultTypeName="string">
 						<GROUP Id="RDK:23222011" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:23222010" Name="Local_Buffer" Type="DataSourceValInfo[]" />
 							<VAR Id="RDK:23265069" Name="ToAdd" Type="OFWeicheType" />
@@ -11971,6 +11975,17 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</SET>
 							</VAR>
 						</GROUP>
+						<IFTHENELSE Id="RDK:23321027" DesignTimeRemark="Wenn Keine Richtung als Kriterium dienen soll, dann dieses einfach als Bedingung rausnehmen">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Weiche.KurvenRichtung = 0]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:23321026" SubType="Then">
+								<SET Id="RDK:23321048" VarRef="Weiche.KurvenRichtung">
+									<EXP />
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:23278511">
 							<VALUECONDITION Value="false">
 								<EXP><![CDATA[$=$isEmpty(Weiche.KurvenWinkel)]]></EXP>
@@ -12014,7 +12029,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<SELECTCASE Id="RDK:23278585">
 								<EXP><![CDATA[$=$nUnknown]]></EXP>
 								<CASEGROUP Id="RDK:23278586" CaseType="0">
-									<EXP><![CDATA[$C$2]]></EXP>
+									<EXP><![CDATA[$C$3]]></EXP>
 									<IFTHENELSE Id="RDK:23275452">
 										<VALUECONDITION Value="false">
 											<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenWinkel)]]></EXP>
@@ -12031,7 +12046,52 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 													<EXP><![CDATA[$=$Weiche.Schaltungstyp = ToAdd.Schaltungstyp]]></EXP>
 												</VALUECONDITION>
 												<GROUP Id="RDK:23275493" SubType="Then">
-													<SET_STRUCT Id="RDK:23275492" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
+													<IFTHENELSE Id="RDK:23275580">
+														<VALUECONDITION Value="false">
+															<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenRichtung)]]></EXP>
+														</VALUECONDITION>
+														<VALUECONDITION Value="true">
+															<EXP><![CDATA[$=$Weiche.KurvenRichtung = ToAdd.KurvenRichtung]]></EXP>
+														</VALUECONDITION>
+														<GROUP Id="RDK:23275579" SubType="Then">
+															<SET_STRUCT Id="RDK:23275578" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
+																<PAR Name="Value">
+																	<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
+																</PAR>
+																<PAR Name="Prompt">
+																	<EXP><![CDATA[$=$ToAdd.ProfilTyp]]></EXP>
+																</PAR>
+																<PAR Name="Image" />
+																<PAR Name="Tooltip" />
+																<PAR Name="Tags" />
+															</SET_STRUCT>
+															<EXIT_PROCESS Id="RDK:23275668" BreakType="2" ExitStatus="0" />
+														</GROUP>
+													</IFTHENELSE>
+												</GROUP>
+											</IFTHENELSE>
+										</GROUP>
+									</IFTHENELSE>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:23312725" CaseType="0">
+									<EXP><![CDATA[$C$2]]></EXP>
+									<IFTHENELSE Id="RDK:23312718">
+										<VALUECONDITION Value="false">
+											<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenWinkel)]]></EXP>
+										</VALUECONDITION>
+										<VALUECONDITION Value="true">
+											<EXP><![CDATA[$=$Weiche.KurvenWinkel = ToAdd.KurvenWinkel]]></EXP>
+										</VALUECONDITION>
+										<GROUP Id="RDK:23312717" SubType="Then">
+											<IFTHENELSE Id="RDK:23312712">
+												<VALUECONDITION Value="false">
+													<EXP><![CDATA[$=$IsEmpty(Weiche.Schaltungstyp)]]></EXP>
+												</VALUECONDITION>
+												<VALUECONDITION Value="true">
+													<EXP><![CDATA[$=$Weiche.Schaltungstyp = ToAdd.Schaltungstyp]]></EXP>
+												</VALUECONDITION>
+												<GROUP Id="RDK:23312711" SubType="Then">
+													<SET_STRUCT Id="RDK:23312709" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
 														<PAR Name="Value">
 															<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
 														</PAR>
@@ -12042,18 +12102,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 														<PAR Name="Tooltip" />
 														<PAR Name="Tags" />
 													</SET_STRUCT>
-													<EXIT_PROCESS Id="RDK:23275664" BreakType="2" ExitStatus="0" />
+													<EXIT_PROCESS Id="RDK:23312710" BreakType="2" ExitStatus="0" />
 												</GROUP>
 											</IFTHENELSE>
-											<IFTHENELSE Id="RDK:23275580">
+											<IFTHENELSE Id="RDK:23312716">
 												<VALUECONDITION Value="false">
 													<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenRichtung)]]></EXP>
 												</VALUECONDITION>
 												<VALUECONDITION Value="true">
 													<EXP><![CDATA[$=$Weiche.KurvenRichtung= ToAdd.KurvenRichtung]]></EXP>
 												</VALUECONDITION>
-												<GROUP Id="RDK:23275579" SubType="Then">
-													<SET_STRUCT Id="RDK:23275578" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
+												<GROUP Id="RDK:23312715" SubType="Then">
+													<SET_STRUCT Id="RDK:23312713" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
 														<PAR Name="Value">
 															<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
 														</PAR>
@@ -12064,28 +12124,28 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 														<PAR Name="Tooltip" />
 														<PAR Name="Tags" />
 													</SET_STRUCT>
-													<EXIT_PROCESS Id="RDK:23275668" BreakType="2" ExitStatus="0" />
+													<EXIT_PROCESS Id="RDK:23312714" BreakType="2" ExitStatus="0" />
 												</GROUP>
 											</IFTHENELSE>
 										</GROUP>
 									</IFTHENELSE>
-									<IFTHENELSE Id="RDK:23275606">
+									<IFTHENELSE Id="RDK:23312724">
 										<VALUECONDITION Value="false">
 											<EXP><![CDATA[$=$IsEmpty(Weiche.Schaltungstyp)]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="true">
 											<EXP><![CDATA[$=$Weiche.Schaltungstyp= ToAdd.Schaltungstyp]]></EXP>
 										</VALUECONDITION>
-										<GROUP Id="RDK:23275605" SubType="Then">
-											<IFTHENELSE Id="RDK:23275612">
+										<GROUP Id="RDK:23312723" SubType="Then">
+											<IFTHENELSE Id="RDK:23312722">
 												<VALUECONDITION Value="false">
 													<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenRichtung)]]></EXP>
 												</VALUECONDITION>
 												<VALUECONDITION Value="true">
 													<EXP><![CDATA[$=$Weiche.KurvenRichtung= ToAdd.KurvenRichtung]]></EXP>
 												</VALUECONDITION>
-												<GROUP Id="RDK:23275611" SubType="Then">
-													<SET_STRUCT Id="RDK:23275610" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
+												<GROUP Id="RDK:23312721" SubType="Then">
+													<SET_STRUCT Id="RDK:23312719" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
 														<PAR Name="Value">
 															<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
 														</PAR>
@@ -12096,7 +12156,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 														<PAR Name="Tooltip" />
 														<PAR Name="Tags" />
 													</SET_STRUCT>
-													<EXIT_PROCESS Id="RDK:23275670" BreakType="2" ExitStatus="0" />
+													<EXIT_PROCESS Id="RDK:23312720" BreakType="2" ExitStatus="0" />
 												</GROUP>
 											</IFTHENELSE>
 										</GROUP>
@@ -12199,7 +12259,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$Weichenart]]></EXP>
+								<EXP><![CDATA[$C$Auswahl]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$Sivasnr]]></EXP>
@@ -12235,6 +12295,17 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="Options" />
 						</ACTION_CALL>
+						<IFTHENELSE Id="RDK:23340307">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Count(Local_Buffer) > 0]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:23340308" SubType="Then">
+								<SET Id="RDK:23340306" VarRef="Param.Result">
+									<EXP><![CDATA[$=$Local_Buffer[0].Value]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
 					</FUNCTION>
 				</GROUP>
 				<FUNCTION Id="RDK:23051733" Name="RefreshOFBogenUI" DesignTimeRemark="Wird nur innerhalb der MUI OFBogenUI aufgerufen und verwendet Daten aus Shape_Prototype" InputTypeName="double">
@@ -12831,7 +12902,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<EXP><![CDATA[$=$DatenSelected.KurvenWinkel]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
-							<SET Id="RDK:23283207" VarRef="Shape_Prototype.OFWeicheDefinition.KurvenRichtung">
+							<SET Id="RDK:23363233" VarRef="Shape_Prototype.OFWeicheDefinition.KurvenRichtung">
 								<EXP><![CDATA[$=$DatenSelected.KurvenRichtung]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
@@ -12843,10 +12914,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<EXP><![CDATA[$=$DatenSelected.Länge]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
-							<SET Id="RDK:23283209" VarRef="Shape_Prototype.OFWeicheDefinition.Hoehe">
-								<EXP><![CDATA[$=$DatenSelected.Hoehe]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
 							<GROUP Id="RDK:23264132" Name="OFWeiche UI panels" SubType="Generic">
 								<ACTION_CALL Id="RDK:23264124" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 									<PAR Name="RDLibraryName">
@@ -12922,7 +12989,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="ParentId" />
 									<PAR Name="Label">
-										<EXP><![CDATA[$C$SivasNummer]]></EXP>
+										<EXP><![CDATA[$C$Auswahl]]></EXP>
 									</PAR>
 									<PAR Name="Field">
 										<EXP><![CDATA[$C$Sivasnr]]></EXP>
@@ -12932,7 +12999,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" />
@@ -12987,7 +13054,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" />
@@ -13015,65 +13082,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 									</PAR>
 								</ACTION_CALL>
-								<ACTION_CALL Id="RDK:23283203" 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$Schaltungstyp]]></EXP>
-									</PAR>
-									<PAR Name="ParentId" />
-									<PAR Name="Label">
-										<EXP><![CDATA[$C$Mech/Pneu]]></EXP>
-									</PAR>
-									<PAR Name="Field">
-										<EXP><![CDATA[$C$Schaltungstyp]]></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$dropdown]]></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">
-										<EXP><![CDATA[$=$WeichenArtItemList]]></EXP>
-									</PAR>
-									<PAR Name="Options">
-										<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
-									</PAR>
-								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:23264127" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 									<PAR Name="RDLibraryName">
 										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -13102,61 +13110,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Uom" />
 									<PAR Name="Tooltip" />
 									<PAR Name="Styles" />
-									<PAR Name="Classes">
-										<EXP><![CDATA[$C$col-4]]></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" />
-									<PAR Name="ValidateFail" />
-									<PAR Name="ValidateMsg" />
-									<PAR Name="DataSource">
-										<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</ACTION_CALL>
-								<ACTION_CALL Id="RDK:23264128" 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>
@@ -20679,45 +20632,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 					</SELECTCASE>
 				</FUNCTION>
 				<FUNCTION Id="RDK:23222230" Name="OFWeicheUI">
-					<GROUP Id="RDK:23270581" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-						<VAR Id="RDK:23270583" Name="Weiche" Type="OFWeicheType">
-							<SET_STRUCT Id="RDK:23270650" VarRef="Me" ClearAll="True" Bookmarked="True">
-								<PAR Name="Beschreibung" />
-								<PAR Name="WeichenTyp" />
-								<PAR Name="L1" />
-								<PAR Name="L2" />
-								<PAR Name="L3" />
-								<PAR Name="Hoehe" />
-								<PAR Name="KurvenWinkel">
-									<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.KurvenWinkel]]></EXP>
-								</PAR>
-								<PAR Name="KurvenRichtung" />
-								<PAR Name="isOk" />
-								<PAR Name="Sivasnr" />
-								<PAR Name="ProfilTyp" />
-								<PAR Name="Schaltungstyp">
-									<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Schaltungstyp]]></EXP>
-								</PAR>
-								<PAR Name="AntriebKurve" />
-								<PAR Name="n_Sep" />
-								<PAR Name="n_Scan" />
-								<PAR Name="Länge" />
-								<PAR Name="Breite" />
-							</SET_STRUCT>
-						</VAR>
-					</GROUP>
-					<CALLFUNCTION Id="RDK:23222214">
-						<PAR Name="FuncName">
-							<EXP><![CDATA[$C$SetDropdownOfWeiche]]></EXP>
-						</PAR>
-						<PAR Name="InputExp">
-							<EXP><![CDATA[$=$Weiche]]></EXP>
-						</PAR>
-						<PAR Name="ResultRef">
-							<EXP><![CDATA[$V$]]></EXP>
-						</PAR>
-						<PAR Name="Options" />
-					</CALLFUNCTION>
 					<ACTION_CALL Id="RDK:23222215" Name="RDEngineering_ModernUIRender">
 						<PAR Name="RDLibraryName">
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -20749,6 +20663,34 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<PAR Name="Options" />
 						<PAR Name="ProfileName" />
 					</ACTION_CALL>
+					<GROUP Id="RDK:23270581" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:23270583" Name="Weiche" Type="OFWeicheType">
+							<SET_STRUCT Id="RDK:23270650" VarRef="Me" ClearAll="True" Bookmarked="True">
+								<PAR Name="Beschreibung" />
+								<PAR Name="WeichenTyp" />
+								<PAR Name="L1" />
+								<PAR Name="L2" />
+								<PAR Name="L3" />
+								<PAR Name="Hoehe" />
+								<PAR Name="KurvenWinkel">
+									<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.KurvenWinkel]]></EXP>
+								</PAR>
+								<PAR Name="KurvenRichtung" />
+								<PAR Name="isOk" />
+								<PAR Name="Sivasnr" />
+								<PAR Name="ProfilTyp" />
+								<PAR Name="Schaltungstyp">
+									<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Schaltungstyp]]></EXP>
+								</PAR>
+								<PAR Name="AntriebKurve" />
+								<PAR Name="n_Sep" />
+								<PAR Name="n_Scan" />
+								<PAR Name="Länge" />
+								<PAR Name="Breite" />
+							</SET_STRUCT>
+						</VAR>
+						<VAR Id="RDK:23340329" Name="newItemId" Type="string" />
+					</GROUP>
 					<SELECTCASE Id="RDK:23222229">
 						<EXP><![CDATA[$=$Button]]></EXP>
 						<CASEGROUP Id="RDK:23222221" CaseType="0">
@@ -20949,10 +20891,90 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$Weiche]]></EXP>
 									</PAR>
 									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
+										<EXP><![CDATA[$V$newItemId]]></EXP>
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<IFTHENELSE Id="RDK:23340322">
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$isEmpty(newItemId)]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:23340323" SubType="Then">
+										<CALLFUNCTION Id="RDK:23340335">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$RefreshOFWeicheUI]]></EXP>
+											</PAR>
+											<PAR Name="InputExp">
+												<EXP><![CDATA[$=$newItemId]]></EXP>
+											</PAR>
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+									</GROUP>
+								</IFTHENELSE>
+							</GROUP>
+							<GROUP Id="RDK:23304429" Name="Group" SubType="Generic">
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="KurvenRichtung"]]></EXP>
+								</VALUECONDITION>
+								<SET_STRUCT Id="RDK:23304427" VarRef="Weiche" ClearAll="True">
+									<PAR Name="Beschreibung" />
+									<PAR Name="WeichenTyp" />
+									<PAR Name="L1" />
+									<PAR Name="L2" />
+									<PAR Name="L3" />
+									<PAR Name="Hoehe" />
+									<PAR Name="KurvenWinkel">
+										<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.KurvenWinkel]]></EXP>
+									</PAR>
+									<PAR Name="KurvenRichtung">
+										<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.KurvenRichtung]]></EXP>
+									</PAR>
+									<PAR Name="isOk" />
+									<PAR Name="Sivasnr" />
+									<PAR Name="ProfilTyp" />
+									<PAR Name="Schaltungstyp">
+										<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Schaltungstyp]]></EXP>
+									</PAR>
+									<PAR Name="AntriebKurve" />
+									<PAR Name="n_Sep" />
+									<PAR Name="n_Scan" />
+									<PAR Name="Länge" />
+									<PAR Name="Breite" />
+								</SET_STRUCT>
+								<CALLFUNCTION Id="RDK:23304428">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetDropdownOfWeiche]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Weiche]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$newItemId]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<IFTHENELSE Id="RDK:23344924">
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$isEmpty(newItemId)]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:23344923" SubType="Then">
+										<CALLFUNCTION Id="RDK:23344922">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$RefreshOFWeicheUI]]></EXP>
+											</PAR>
+											<PAR Name="InputExp">
+												<EXP><![CDATA[$=$newItemId]]></EXP>
+											</PAR>
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+									</GROUP>
+								</IFTHENELSE>
 							</GROUP>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:23222228" CaseType="0">
@@ -43968,7 +43990,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$M]]></EXP>
 							</PAR>
 							<PAR Name="Prompt">
-								<EXP><![CDATA[$C$Mechnisch]]></EXP>
+								<EXP><![CDATA[$C$Mechanisch]]></EXP>
 							</PAR>
 							<PAR Name="Image" />
 							<PAR Name="Tooltip" />
@@ -43986,6 +44008,47 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tags" />
 						</SET_STRUCT>
 					</GROUP>
+					<GROUP Id="RDK:23302573" Name="Weichenrichtung" SubType="Generic">
+						<SET_STRUCT Id="RDK:23302572" VarRef="WeichenRichtungItem" ClearAll="True" ListRef="WeichenRichtungItemList">
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$0]]></EXP>
+							</PAR>
+							<PAR Name="Prompt">
+								<EXP><![CDATA[$C$alle]]></EXP>
+							</PAR>
+							<PAR Name="Image">
+								<EXP><![CDATA[$C$icon:arrow-left-right]]></EXP>
+							</PAR>
+							<PAR Name="Tooltip" />
+							<PAR Name="Tags" />
+						</SET_STRUCT>
+						<SET_STRUCT Id="RDK:23305355" VarRef="WeichenRichtungItem" ClearAll="True" ListRef="WeichenRichtungItemList">
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$1]]></EXP>
+							</PAR>
+							<PAR Name="Prompt">
+								<EXP><![CDATA[$C$links]]></EXP>
+							</PAR>
+							<PAR Name="Image">
+								<EXP><![CDATA[$C$icon:chevron-left]]></EXP>
+							</PAR>
+							<PAR Name="Tooltip" />
+							<PAR Name="Tags" />
+						</SET_STRUCT>
+						<SET_STRUCT Id="RDK:23302571" VarRef="WeichenRichtungItem" ClearAll="True" ListRef="WeichenRichtungItemList">
+							<PAR Name="Value">
+								<EXP><![CDATA[$C$2]]></EXP>
+							</PAR>
+							<PAR Name="Prompt">
+								<EXP><![CDATA[$C$rechts]]></EXP>
+							</PAR>
+							<PAR Name="Image">
+								<EXP><![CDATA[$C$icon:chevron-right]]></EXP>
+							</PAR>
+							<PAR Name="Tooltip" />
+							<PAR Name="Tags" />
+						</SET_STRUCT>
+					</GROUP>
 					<GROUP Id="RDK:23222531" Name="OFWeiche UI panels" SubType="Generic">
 						<ACTION_CALL Id="RDK:23222498" Name="RDEngineering_ModernUIPanel" DesignTimeRemark="{PanelName} {BindingType}">
 							<PAR Name="RDLibraryName">
@@ -44032,7 +44095,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$Sivas Nummer]]></EXP>
+								<EXP><![CDATA[$C$Auswahl]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$Sivasnr]]></EXP>
@@ -44097,7 +44160,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" />
@@ -44152,7 +44215,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" />
@@ -44228,7 +44291,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<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" />
@@ -44239,61 +44302,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
 							</PAR>
 						</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>
-							</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$KurvenWinkel]]></EXP>
-							</PAR>
-							<PAR Name="ParentId" />
-							<PAR Name="Label">
-								<EXP><![CDATA[$C$Winkel]]></EXP>
-							</PAR>
-							<PAR Name="Field">
-								<EXP><![CDATA[$C$KurvenWinkel]]></EXP>
-							</PAR>
-							<PAR Name="Value" />
-							<PAR Name="Uom" />
-							<PAR Name="Tooltip" />
-							<PAR Name="Styles" />
-							<PAR Name="Classes">
-								<EXP><![CDATA[$C$col-4]]></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" />
-							<PAR Name="ValidateFail" />
-							<PAR Name="ValidateMsg" />
-							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$OFWeicheItemList]]></EXP>
-							</PAR>
-							<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>
@@ -44327,6 +44335,63 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</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>
+							</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$KurvenWinkel]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$Winkel]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$KurvenWinkel]]></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$textbox]]></EXP>
 							</PAR>
@@ -44726,6 +44791,45 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="Options" />
 				</CALLFUNCTION>
+				<GROUP Id="RDK:23331141" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:23331140" Name="Weiche" Type="OFWeicheType">
+						<SET_STRUCT Id="RDK:23331139" VarRef="Me" ClearAll="True" Bookmarked="True">
+							<PAR Name="Beschreibung" />
+							<PAR Name="WeichenTyp" />
+							<PAR Name="L1" />
+							<PAR Name="L2" />
+							<PAR Name="L3" />
+							<PAR Name="Hoehe" />
+							<PAR Name="KurvenWinkel">
+								<EXP><![CDATA[$C$90]]></EXP>
+							</PAR>
+							<PAR Name="KurvenRichtung" />
+							<PAR Name="isOk" />
+							<PAR Name="Sivasnr" />
+							<PAR Name="ProfilTyp" />
+							<PAR Name="Schaltungstyp">
+								<EXP><![CDATA[$C$M]]></EXP>
+							</PAR>
+							<PAR Name="AntriebKurve" />
+							<PAR Name="n_Sep" />
+							<PAR Name="n_Scan" />
+							<PAR Name="Länge" />
+							<PAR Name="Breite" />
+						</SET_STRUCT>
+					</VAR>
+				</GROUP>
+				<CALLFUNCTION Id="RDK:23331143" DesignTimeRemark="Setze die Dropdownlist der Weichen nach dem Default fest. ">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$SetDropdownOfWeiche]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$Weiche]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
 			</GROUP>
 		</GROUP>
 		<GROUP Id="RDK:93787" Name="Default Settings" SubType="Generic">