diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Motorstation_links.xml b/Editor2DLibrary/SSG/shapes/svg/s_Motorstation_links.xml
index 57f28ce..e7778a2 100644
--- a/Editor2DLibrary/SSG/shapes/svg/s_Motorstation_links.xml
+++ b/Editor2DLibrary/SSG/shapes/svg/s_Motorstation_links.xml
@@ -6,15 +6,13 @@
         <rect x="335.80807" y="350.70276" width="66" height="61" stroke-width="1px" />
       </defs>
       <g transform="matrix(1.0119722,0,0,1.0119718,-4.9320851,-5.294875)">
-        <circle style="fill:none;stroke:#f33256;stroke-dasharray:none;stroke-opacity:1" cx="498.95874" cy="499.31702" r="484.42657" stroke-width="1px" />
-        <g aria-label="M" transform="matrix(6.1801477,0,0,6.1801477,-1706.7688,-1845.1508)" style="font-size:53.3333px;white-space:pre;shape-inside:url(#rect4873);display:inline;fill:#f33256;stroke:#f33256;stroke-width:0">
-          <path d="m 339.76692,399.36071 v -38.17706 h 7.60417 l 9.03645,27.03124 q 1.25,3.77604 1.82292,5.65103 0.65104,-2.08333 2.03124,-6.11978 l 9.14062,-26.56249 h 6.79687 v 38.17706 h -4.86978 v -31.9531 l -11.09375,31.9531 h -4.55729 l -11.04166,-32.49998 v 32.49998 z" style="font-family:Arial;-inkscape-font-specification:Arial" stroke-width="1px" />
-        </g>
+        <path style="fill:none;stroke-dasharray:none;stroke-opacity:1" d="M14.532169999999951,499.31702a484.42657,484.42657 0 1,0 968.85314,0a484.42657,484.42657 0 1,0 -968.85314,0" stroke-width="1px" stroke="#f33256" />
+        <path d="M 393.04101,622.9574 V 387.01729 h 46.99489 l 55.84666,167.05719 q 7.72519,23.3365 11.2659,34.92428 4.02354,-12.87531 12.55343,-37.82123 l 56.49044,-164.16024 h 42.0057 V 622.9574 H 588.10199 V 425.48229 L 519.54095,622.9574 H 491.3762 L 423.13705,422.10252 V 622.9574 Z" fill="#f33256" stroke-width="1px" stroke="#f33256" />
         <path style="fill:#f33256;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1" d="M 9.9166825,501.46813 H 93.105309" stroke-width="1px" stroke="#f33256" />
         <path style="fill:#f33256;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1" d="M 498.95872,89.663606 V 6.4749764" stroke-width="1px" stroke="#f33256" />
         <path style="fill:#f33256;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1" d="M 498.95872,986.73152 V 903.54289" stroke-width="1px" stroke="#f33256" />
         <path style="fill:#f33256;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1" d="m 906.25102,501.46813 h 83.18862" stroke-width="1px" stroke="#f33256" />
-        <path d="m 502.77488,214.80519 c -158.47505,0 -289.21698,125.1953 -297.14072,283.67034 l -70.5214,-70.52139 c -9.5085,-8.71612 -23.77125,-8.71612 -33.27975,0.79238 -8.716133,8.71613 -9.508515,23.77126 -0.79239,33.27976 l 111.72491,111.7249 c 2.37713,2.37714 4.75426,3.96188 7.92376,4.75425 0.79238,0 1.58475,0.79239 3.1695,0.79239 l 1.58475,0.79237 h 2.37712 2.37713 1.58475 c 5.54662,0 11.09325,-3.16951 15.05513,-7.13138 L 358.56257,461.2339 c 9.50852,-9.5085 9.50852,-24.56364 0,-33.27976 -9.5085,-9.5085 -24.56362,-9.5085 -33.27974,0 l -72.10616,72.10615 c 5.54663,-112.5173 85.57653,-206.80994 195.71669,-231.37358 110.14017,-24.56363 222.65745,27.73314 274.95421,127.57242 52.29677,99.83929 31.69501,221.86507 -50.71201,298.72547 -9.5085,8.71613 -10.30088,23.77126 -0.79238,33.27976 8.71613,9.5085 23.77126,10.30089 33.27976,1.58476 89.5384,-83.19941 118.85631,-212.35658 73.6909,-326.45861 C 734.94083,289.28847 624.80066,214.80519 502.77488,214.80519 Z" stroke="#00b050" stroke-width="1px" fill="none" />
+        <path style="stroke:#00b050; fill:none" d="m 502.77488,214.80519 c -158.47505,0 -289.21698,125.1953 -297.14072,283.67034 l -70.5214,-70.52139 c -9.5085,-8.71612 -23.77125,-8.71612 -33.27975,0.79238 -8.716133,8.71613 -9.508515,23.77126 -0.79239,33.27976 l 111.72491,111.7249 c 2.37713,2.37714 4.75426,3.96188 7.92376,4.75425 0.79238,0 1.58475,0.79239 3.1695,0.79239 l 1.58475,0.79237 h 2.37712 2.37713 1.58475 c 5.54662,0 11.09325,-3.16951 15.05513,-7.13138 L 358.56257,461.2339 c 9.50852,-9.5085 9.50852,-24.56364 0,-33.27976 -9.5085,-9.5085 -24.56362,-9.5085 -33.27974,0 l -72.10616,72.10615 c 5.54663,-112.5173 85.57653,-206.80994 195.71669,-231.37358 110.14017,-24.56363 222.65745,27.73314 274.95421,127.57242 52.29677,99.83929 31.69501,221.86507 -50.71201,298.72547 -9.5085,8.71613 -10.30088,23.77126 -0.79238,33.27976 8.71613,9.5085 23.77126,10.30089 33.27976,1.58476 89.5384,-83.19941 118.85631,-212.35658 73.6909,-326.45861 C 734.94083,289.28847 624.80066,214.80519 502.77488,214.80519 Z" stroke-width="1px" />
       </g>
     </svg>
   </g>
diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Spannstation_links.xml b/Editor2DLibrary/SSG/shapes/svg/s_Spannstation_links.xml
index aa54b44..af91ce2 100644
--- a/Editor2DLibrary/SSG/shapes/svg/s_Spannstation_links.xml
+++ b/Editor2DLibrary/SSG/shapes/svg/s_Spannstation_links.xml
@@ -6,7 +6,7 @@
         <rect x="335.80807" y="350.70276" width="66" height="61" stroke-width="1px" />
       </defs>
       <g transform="matrix(1.0107993,0,0,1.0107985,-5.3993012,-5.3994667)">
-        <circle style="fill:none;stroke:#f33256;stroke-dasharray:none;stroke-opacity:1" cx="500" cy="500" r="485" stroke-width="1px" />
+        <path style="fill:none;stroke-dasharray:none;stroke-opacity:1" d="M14.532169999999951,499.31702a484.42657,484.42657 0 1,0 968.85314,0a484.42657,484.42657 0 1,0 -968.85314,0" stroke-width="1px" stroke="#f33256" />
         <g aria-label="S" transform="matrix(6.1801477,0,0,6.1801477,-1685.1038,-1847.8589)" style="font-size:53.3333px;white-space:pre;shape-inside:url(#rect4873);display:inline;fill:#f33256;stroke:#f33256;stroke-width:0">
           <path d="m 338.20443,387.0951 4.76562,-0.41667 q 0.33854,2.86458 1.5625,4.71354 1.25,1.82291 3.85416,2.96875 2.60417,1.11979 5.85937,1.11979 2.89063,0 5.10417,-0.85938 2.21354,-0.85937 3.28124,-2.34375 1.09375,-1.51041 1.09375,-3.28124 0,-1.79688 -1.04166,-3.125 -1.04167,-1.35417 -3.4375,-2.26563 -1.53646,-0.59895 -6.79687,-1.84895 -5.26041,-1.27604 -7.36979,-2.39584 -2.73437,-1.43229 -4.08854,-3.54166 -1.32812,-2.13542 -1.32812,-4.76562 0,-2.89063 1.64062,-5.39062 1.64063,-2.52604 4.79167,-3.82813 3.15104,-1.30208 7.0052,-1.30208 4.24479,0 7.47395,1.38021 3.25521,1.35416 5,4.01041 1.74479,2.65625 1.875,6.01562 l -4.84375,0.36459 q -0.39062,-3.61979 -2.65625,-5.46875 -2.23958,-1.84896 -6.64062,-1.84896 -4.58333,0 -6.6927,1.69271 -2.08333,1.66667 -2.08333,4.03646 0,2.05729 1.48437,3.38541 1.45833,1.32813 7.60416,2.73437 6.17187,1.38021 8.46354,2.42188 3.33333,1.53646 4.92187,3.90625 1.58854,2.34374 1.58854,5.41666 0,3.04687 -1.74479,5.7552 -1.74479,2.68229 -5.02604,4.19271 -3.2552,1.48437 -7.34374,1.48437 -5.18229,0 -8.69791,-1.51041 -3.48959,-1.51042 -5.49479,-4.53125 -1.97917,-3.04687 -2.08333,-6.87499 z" fill="#f33256" stroke-width="1px" stroke="#f33256" />
         </g>
@@ -14,7 +14,7 @@
         <path style="fill:#f33256;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1" d="M 500,90 V 6.5" stroke-width="1px" stroke="#f33256" />
         <path style="fill:#f33256;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1" d="M 500,985 V 900" stroke-width="1px" stroke="#f33256" />
         <path style="fill:#f33256;fill-opacity:1;stroke-dasharray:none;stroke-opacity:1" d="m 900,500 h 83" stroke-width="1px" stroke="#f33256" />
-        <path d="m 515.60019,207.95049 c -158.47505,0 -289.21698,125.1953 -297.14072,283.67034 l -70.5214,-70.52139 c -9.5085,-8.71612 -23.77125,-8.71612 -33.27975,0.79238 -8.71613,8.71613 -9.50852,23.77126 -0.79239,33.27976 l 111.72491,111.7249 c 2.37713,2.37714 4.75426,3.96188 7.92376,4.75425 0.79238,0 1.58475,0.79239 3.1695,0.79239 l 1.58475,0.79237 h 2.37712 2.37713 1.58475 c 5.54662,0 11.09325,-3.16951 15.05513,-7.13138 L 371.38788,454.3792 c 9.50852,-9.5085 9.50852,-24.56364 0,-33.27976 -9.5085,-9.5085 -24.56362,-9.5085 -33.27974,0 l -72.10616,72.10615 c 5.54663,-112.5173 85.57653,-206.80994 195.71669,-231.37358 110.14017,-24.56363 222.65745,27.73314 274.95421,127.57242 52.29677,99.83929 31.69501,221.86507 -50.71201,298.72547 -9.5085,8.71613 -10.30088,23.77126 -0.79238,33.27976 8.71613,9.5085 23.77126,10.30089 33.27976,1.58476 89.5384,-83.19941 118.85631,-212.35658 73.6909,-326.45861 C 747.76614,282.43377 637.62597,207.95049 515.60019,207.95049 Z" stroke="#00b050" stroke-width="1px" fill="none" />
+        <path style="stroke:#00b050" d="m 515.60019,207.95049 c -158.47505,0 -289.21698,125.1953 -297.14072,283.67034 l -70.5214,-70.52139 c -9.5085,-8.71612 -23.77125,-8.71612 -33.27975,0.79238 -8.71613,8.71613 -9.50852,23.77126 -0.79239,33.27976 l 111.72491,111.7249 c 2.37713,2.37714 4.75426,3.96188 7.92376,4.75425 0.79238,0 1.58475,0.79239 3.1695,0.79239 l 1.58475,0.79237 h 2.37712 2.37713 1.58475 c 5.54662,0 11.09325,-3.16951 15.05513,-7.13138 L 371.38788,454.3792 c 9.50852,-9.5085 9.50852,-24.56364 0,-33.27976 -9.5085,-9.5085 -24.56362,-9.5085 -33.27974,0 l -72.10616,72.10615 c 5.54663,-112.5173 85.57653,-206.80994 195.71669,-231.37358 110.14017,-24.56363 222.65745,27.73314 274.95421,127.57242 52.29677,99.83929 31.69501,221.86507 -50.71201,298.72547 -9.5085,8.71613 -10.30088,23.77126 -0.79238,33.27976 8.71613,9.5085 23.77126,10.30089 33.27976,1.58476 89.5384,-83.19941 118.85631,-212.35658 73.6909,-326.45861 C 747.76614,282.43377 637.62597,207.95049 515.60019,207.95049 Z" stroke-width="1px" fill="none" />
       </g>
     </svg>
   </g>
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index c18a67b..3fa0e7b 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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-12T09:47:57" LanguageVersion="2014.1.3.674" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-12T11:57:48" LanguageVersion="2014.1.3.674" />
 	<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">
@@ -50,7 +50,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -4174,7 +4174,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="Options" />
 									</ACTION_CALL>
 									<COMMENTS Id="RDK:1653127" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
-									<SET_STRUCT Id="RDK:1653128" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
+									<SET_STRUCT Id="RDK:1653128" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
 										<PAR Name="SivasNummer" />
 										<PAR Name="Rotationsklasse" />
 										<PAR Name="IDCounter" />
@@ -4248,6 +4248,80 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 									</SET_STRUCT>
+									<SET_STRUCT Id="RDK:19615244" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
+										<PAR Name="SivasNummer" />
+										<PAR Name="Rotationsklasse" />
+										<PAR Name="IDCounter" />
+										<PAR Name="KreiselDefinition" />
+										<PAR Name="EckradDefinition" />
+										<PAR Name="GefaelleDefinition" />
+										<PAR Name="StreckeDefinition" />
+										<PAR Name="FoerdererDefinition" />
+										<PAR Name="WeicheDefinition" />
+										<PAR Name="BTMTBeladungDefinition" />
+										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="source">
+											<EXP><![CDATA[$C$BTMTBeladung_Default]]></EXP>
+										</PAR>
+										<PAR Name="sourceLibrary">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="signature" />
+										<PAR Name="id">
+											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+										</PAR>
+										<PAR Name="name" />
+										<PAR Name="family" />
+										<PAR Name="description" />
+										<PAR Name="x" />
+										<PAR Name="y" />
+										<PAR Name="z" />
+										<PAR Name="width">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="height">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.height, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="depth">
+											<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.depth, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="rotation">
+											<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
+										</PAR>
+										<PAR Name="text" />
+										<PAR Name="behaviour" />
+										<PAR Name="datadump" />
+										<PAR Name="path" />
+										<PAR Name="ctrl1x" />
+										<PAR Name="ctrl1y" />
+										<PAR Name="ctrl2x" />
+										<PAR Name="ctrl2y" />
+										<PAR Name="shapeFromId" />
+										<PAR Name="shapeFromPointIndex" />
+										<PAR Name="shapeToId" />
+										<PAR Name="shapeToPointIndex" />
+										<PAR Name="dimStack" />
+										<PAR Name="dimType" />
+										<PAR Name="dimDriving" />
+										<PAR Name="dimValue" />
+										<PAR Name="color" />
+										<PAR Name="colorOpacity" />
+										<PAR Name="color3D" />
+										<PAR Name="colorOpacity3D" />
+										<PAR Name="lineWidth" />
+										<PAR Name="lineColor" />
+										<PAR Name="lineOpacity" />
+										<PAR Name="lineColor3D" />
+										<PAR Name="lineOpacity3D" />
+										<PAR Name="links" />
+										<PAR Name="group" />
+										<PAR Name="layer" />
+										<PAR Name="connectionPoints" />
+										<PAR Name="modified" />
+										<PAR Name="pinned" />
+										<PAR Name="selected" />
+										<PAR Name="includeInBOM" />
+									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:18107672" CaseType="0">
@@ -7860,6 +7934,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</SET>
 						</VAR>
 						<VAR Id="RDK:19440105" Name="idx" Type="integer" />
+						<VAR Id="RDK:19615246" Name="temp_link" Type="string" />
 						<VAR Id="RDK:19440117" Name="shape_id" Type="string">
 							<SET Id="RDK:19440124" VarRef="Me">
 								<EXP><![CDATA[$=$Param.Input["key=id"].Str]]></EXP>
@@ -7867,7 +7942,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</SET>
 						</VAR>
 					</GROUP>
-					<FOREACHLOOP Id="RDK:19440093" ItemVarRef="Link" IndexVarRef="idx">
+					<FOREACHLOOP Id="RDK:19440093" ItemVarRef="temp_link" IndexVarRef="idx">
 						<PAR Name="ArrayValueExp">
 							<EXP><![CDATA[$=$id_array]]></EXP>
 						</PAR>
@@ -7876,7 +7951,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</PAR>
 						<IFTHENELSE Id="RDK:19440095">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Link=shape_id]]></EXP>
+								<EXP><![CDATA[$=$temp_link=shape_id]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19440096" SubType="Then">
 								<SET Id="RDK:19441477" VarRef="Param.Result">
@@ -15546,7 +15621,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</VAR>
 					<VAR Id="RDK:19595237" Name="label" Type="string">
 						<SET Id="RDK:19595243" VarRef="Me">
-							<EXP><![CDATA[$=$Param.Input["key=Label"].Str]]></EXP>
+							<EXP><![CDATA[$=$E$ Param.Input["key=Label"].Str]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</VAR>
@@ -15567,6 +15642,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<EXP><![CDATA[$=$shape_item.family]]></EXP>
 					<CASEGROUP Id="RDK:19595346" CaseType="0">
 						<EXP><![CDATA[$C$Kreisel]]></EXP>
+						<SET Id="RDK:19615251" VarRef="ShapeList[&quot;id=&quot;+shapeId].KreiselDefinition.Hoehe">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19595362" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>