diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index aa30af3..504826a 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-19T16:58:10" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-02-20T11:48:40" 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">
@@ -167,7 +167,7 @@
 					<FIELD Id="RDK:23017101" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:23017102" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:23017447" Name="OFBogenType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:23017447" Name="OFBogenType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017438" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23017439" Name="L1" Type="double" />
@@ -6735,49 +6735,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 									</SET_STRUCT>
-									<GROUP Id="RDK:23016594" Name="Setze Art der Kurve" SubType="Generic">
-										<SET Id="RDK:23016583" VarRef="ShapeList[i].OFBogenDefinition.KurvenRichtung">
-											<EXP><![CDATA[$C$rechts]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<IFTHENELSE Id="RDK:23016586" DesignTimeRemark="Rechtskurve, wenn der Name ein &quot;R&quot; enthält">
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$StrIndexOf(ShapeList[i].source, "_L", 0) >= 0]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:23016585" SubType="Then">
-												<SET Id="RDK:23016584" VarRef="ShapeList[i].OFBogenDefinition.KurvenRichtung">
-													<EXP><![CDATA[$C$links]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-											</GROUP>
-										</IFTHENELSE>
-										<SET Id="RDK:23016587" VarRef="ShapeList[i].OFBogenDefinition.Kurvenwinkel">
-											<EXP><![CDATA[$=$90]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<IFTHENELSE Id="RDK:23016590" DesignTimeRemark="60  Grad, wenn 60 im Namen vorkommt">
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$StrIndexOf(ShapeList[i].source, "60", 0) >= 0]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:23016589" SubType="Then">
-												<SET Id="RDK:23016588" VarRef="ShapeList[i].OFBogenDefinition.Kurvenwinkel">
-													<EXP><![CDATA[$=$60]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-											</GROUP>
-										</IFTHENELSE>
-										<IFTHENELSE Id="RDK:23016593" DesignTimeRemark="30  Grad, wenn 30 im Namen vorkommt">
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$StrIndexOf(ShapeList[i].source, "30", 0) >= 0]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:23016592" SubType="Then">
-												<SET Id="RDK:23016591" VarRef="ShapeList[i].OFBogenDefinition.Kurvenwinkel">
-													<EXP><![CDATA[$=$30]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
-											</GROUP>
-										</IFTHENELSE>
-									</GROUP>
 								</GROUP>
 							</CASEGROUP>
 						</SELECTCASE>
@@ -11309,6 +11266,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
+						<VAR Id="RDK:23092608" Name="Local_OFBogenItemList" Type="DataSourceValInfo[]" />
 					</GROUP>
 					<IFTHENELSE Id="RDK:23038210">
 						<VALUECONDITION Value="false">
@@ -11320,9 +11278,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$Winkel = 22.5]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:23038381" SubType="Then">
-									<SET_STRUCT Id="RDK:23038383" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038383" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
-											<EXP><![CDATA[$C$821104025]]></EXP>
+											<EXP><![CDATA[$=$821104025]]></EXP>
 										</PAR>
 										<PAR Name="Prompt">
 											<EXP><![CDATA[$C$APB 110 R 550/22,5° – 84/522 ]]></EXP>
@@ -11338,7 +11296,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$Winkel = 45]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:23038333" SubType="Then">
-									<SET_STRUCT Id="RDK:23038346" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038346" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104021]]></EXP>
 										</PAR>
@@ -11349,7 +11307,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038368" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038368" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104026]]></EXP>
 										</PAR>
@@ -11360,7 +11318,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038370" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038370" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104037]]></EXP>
 										</PAR>
@@ -11371,7 +11329,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038372" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038372" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104029]]></EXP>
 										</PAR>
@@ -11382,7 +11340,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038374" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038374" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104031]]></EXP>
 										</PAR>
@@ -11400,7 +11358,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$Winkel = 67.5]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:23038359" SubType="Then">
-									<SET_STRUCT Id="RDK:23038355" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038355" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104024]]></EXP>
 										</PAR>
@@ -11411,7 +11369,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038356" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038356" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104027]]></EXP>
 										</PAR>
@@ -11422,7 +11380,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038357" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038357" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104028]]></EXP>
 										</PAR>
@@ -11433,7 +11391,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038358" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038358" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104065]]></EXP>
 										</PAR>
@@ -11451,7 +11409,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$Winkel =90]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:23038290" SubType="Then">
-									<SET_STRUCT Id="RDK:23038288" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038288" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104022]]></EXP>
 										</PAR>
@@ -11462,7 +11420,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038299" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038299" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104030]]></EXP>
 										</PAR>
@@ -11473,7 +11431,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038307" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038307" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104066]]></EXP>
 										</PAR>
@@ -11484,7 +11442,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038301" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038301" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104033]]></EXP>
 										</PAR>
@@ -11495,7 +11453,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038305" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038305" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104041]]></EXP>
 										</PAR>
@@ -11506,7 +11464,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="Tooltip" />
 										<PAR Name="Tags" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:23038303" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038303" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104035]]></EXP>
 										</PAR>
@@ -11524,7 +11482,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$Winkel = 180]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:23038322" SubType="Then">
-									<SET_STRUCT Id="RDK:23038309" VarRef="OFBogenItem" ClearAll="True" ListRef="OFBogenItemList">
+									<SET_STRUCT Id="RDK:23038309" VarRef="OFBogenItem" ClearAll="True" ListRef="Local_OFBogenItemList">
 										<PAR Name="Value">
 											<EXP><![CDATA[$C$821104043]]></EXP>
 										</PAR>
@@ -11539,6 +11497,65 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</IFTHENELSE>
 						</GROUP>
 					</IFTHENELSE>
+					<SET Id="RDK:23092610" VarRef="OFBogenItemList">
+						<EXP><![CDATA[$=$Local_OFBogenItemList]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<ACTION_CALL Id="RDK:23092603" 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_OFBogen]]></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$SivasNummer]]></EXP>
+						</PAR>
+						<PAR Name="ParentId" />
+						<PAR Name="Label">
+							<EXP><![CDATA[$C$Bogenart]]></EXP>
+						</PAR>
+						<PAR Name="Field">
+							<EXP><![CDATA[$C$Sivasnr]]></EXP>
+						</PAR>
+						<PAR Name="Value" />
+						<PAR Name="Uom" />
+						<PAR Name="Tooltip" />
+						<PAR Name="Styles" />
+						<PAR Name="Classes">
+							<EXP><![CDATA[$C$col-6]]></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" />
+						<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[$=$OFBogenItemList]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</ACTION_CALL>
 				</FUNCTION>
 				<FUNCTION Id="RDK:23040220" Name="GetOFBogenData" InputTypeName="string" ResultTypeName="OFBogenType">
 					<GROUP Id="RDK:23040184" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -12044,6 +12061,33 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<PAR Name="AdvancedOptions" />
 					</SET>
 				</FUNCTION>
+				<FUNCTION Id="RDK:23067139" Name="GetOFBogenWinkelFromId" InputTypeName="string" ResultTypeName="double">
+					<GROUP Id="RDK:23067098" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:23067096" Name="SivasNummer" Type="string">
+							<SET Id="RDK:23067095" VarRef="Me">
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:23067142" Name="BogenData" Type="OFBogenType" />
+					</GROUP>
+					<CALLFUNCTION Id="RDK:23067140">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$GetOFBogenData]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$SivasNummer]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$BogenData]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<SET Id="RDK:23067138" VarRef="Param.Result">
+						<EXP><![CDATA[$=$BogenData.KurvenWinkel]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+				</FUNCTION>
 				<FUNCTION Id="RDK:23051733" Name="RefreshOFBogenUI" DesignTimeRemark="Wird nur innerhalb der MUI OFBogenUI aufgerufen und verwendet Daten aus Shape_Prototype" InputTypeName="double">
 					<GROUP Id="RDK:23051720" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 						<VAR Id="RDK:23051719" Name="SivasNummer" Type="double">
@@ -12143,6 +12187,61 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</ACTION_CALL>
+								<ACTION_CALL Id="RDK:23107506" 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_OFBogen]]></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$SivasNummerText]]></EXP>
+									</PAR>
+									<PAR Name="ParentId" />
+									<PAR Name="Label">
+										<EXP><![CDATA[$C$SivasNummer]]></EXP>
+									</PAR>
+									<PAR Name="Field">
+										<EXP><![CDATA[$C$Sivasnr]]></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>
+									<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[$=$OFBogenItemList]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</ACTION_CALL>
 								<ACTION_CALL Id="RDK:23067034" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 									<PAR Name="RDLibraryName">
 										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -12172,7 +12271,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<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" />
@@ -12229,7 +12328,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<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" />
@@ -19735,6 +19834,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 					</SELECTCASE>
 				</FUNCTION>
 				<FUNCTION Id="RDK:23016516" Name="OFBogenUI">
+					<CALLFUNCTION Id="RDK:23091725">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$SetDropdownOfBogen]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$Shape_Prototype.OFBogenDefinition.KurvenWinkel]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
 					<ACTION_CALL Id="RDK:23016499" Name="RDEngineering_ModernUIRender">
 						<PAR Name="RDLibraryName">
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -21015,6 +21126,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<EXP><![CDATA[$=$OFBogenData_defaults]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
+							<CALLFUNCTION Id="RDK:23067144">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$GetOFBogenWinkelFromId]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$Shape_Prototype.source]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$Shape_Prototype.OFBogenDefinition.KurvenWinkel]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
 						</GROUP>
 						<SET Id="RDK:23016703" VarRef="Shape_Prototype.Rotationsklasse">
 							<EXP><![CDATA[$C$Rotationsobjekt]]></EXP>
@@ -21036,7 +21159,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 							</PAR>
 							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$Shape_Prototype.OFBogenDefinition.Sivasnr]]></EXP>
+								<EXP><![CDATA[$V$]]></EXP>
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
@@ -40875,7 +40998,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</GROUP>
 				</GROUP>
 				<GROUP Id="RDK:23016549" Name="OFBogenUI" SubType="Generic">
-					<CALLFUNCTION Id="RDK:23040241">
+					<CALLFUNCTION Id="RDK:23085571" Suppressed="True">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$SetDropdownOfBogen]]></EXP>
 						</PAR>
@@ -40933,7 +41056,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="ParentId" />
 							<PAR Name="Label">
-								<EXP><![CDATA[$C$Sivas Nummer]]></EXP>
+								<EXP><![CDATA[$C$Bogenart]]></EXP>
 							</PAR>
 							<PAR Name="Field">
 								<EXP><![CDATA[$C$Sivasnr]]></EXP>
@@ -40969,6 +41092,61 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Options" />
 						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:23107504" 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_OFBogen]]></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$SivasNummerText]]></EXP>
+							</PAR>
+							<PAR Name="ParentId" />
+							<PAR Name="Label">
+								<EXP><![CDATA[$C$SivasNummer]]></EXP>
+							</PAR>
+							<PAR Name="Field">
+								<EXP><![CDATA[$C$Sivasnr]]></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>
+							<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[$=$OFBogenItemList]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</ACTION_CALL>
 						<ACTION_CALL Id="RDK:23024078" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -40998,7 +41176,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<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" />
@@ -41055,7 +41233,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<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" />