Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60575 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60575)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 61353)
@@ -12,19 +12,19 @@
 </Property>
 
 <Property name="CrossFactory">
-<Type>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</Type>
+<Type>TECH.Svg.Tooling.CrossFactory</Type>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory,CrossFactory:APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</FormalSpec>
+<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory,CrossFactory:TECH.Svg.Tooling.CrossFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
 	Set ..ElementToevoeger = $$$Inject(ElementToevoeger, ##class(TECH.Svg.Basis.SvgBox.ElementToevoeger).%New())
-	Set ..CrossFactory = $$$Inject(CrossFactory, ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New())
+	Set ..CrossFactory = $$$Inject(CrossFactory, ##class(TECH.Svg.Tooling.CrossFactory).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -51,9 +51,10 @@
 	Set Puntboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New()
 	Set Puntboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do Puntboring.SvgBox.VoegToeID("puntboring")
-	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height,Kleur)
+	#dim CrossDiag As TECH.Svg.Tooling.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height,Kleur)
+	Do ##class(Tools.Wlip).%New(238).ObjToXML(CrossDiag)
 	Do ..ElementToevoeger.VoegToeElement(Puntboring.SvgBox,CrossDiag)
-	
+	Do ##class(Tools.Wlip).%New(238).ObjToXML(Puntboring.SvgBox)
 	Quit Puntboring
 ]]></Implementation>
 </Method>
@@ -62,7 +63,7 @@
 <FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <ReturnType>APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring</ReturnType>
 <Implementation><![CDATA[
-	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height, Kleur)
+	#dim CrossDiag As TECH.Svg.Tooling.CrossDiag = ..CrossFactory.MaakCrossDiag(Width,Height, Kleur)
 	#dim Circle As TECH.Svg.Basis.Circle = ..BasisElementFactory.MaakCirkel(Width/2,Height/2,(Width/2.2))
 	Do Circle.SetFill(Kleur)
 	Set Rugboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New()
@@ -82,7 +83,7 @@
 	Set Zijboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New()
 	Set Zijboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do Zijboring.SvgBox.VoegToeID("zijboring")
-	#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = ..CrossFactory.MaakTCross(Width, Height, kleur)
+	#dim TCross As TECH.Svg.Tooling.TCross = ..CrossFactory.MaakTCross(Width, Height, kleur)
 	Set Group = ##class(TECH.Svg.Basis.Group).%New()
 	Do Group.VoegToeTransform("rotate("_Rotation_" "_(Width/2)_" "_(Height/2)_")")
 	Do Group.VoegToeElement(TCross)
@@ -99,7 +100,7 @@
 	Set Specialeboring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New()
 	Set Specialeboring.SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do Specialeboring.SvgBox.VoegToeID("specialeBoring")
-	#dim CrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = ..CrossFactory.MaakCrossVH(Width,Height, kleur)
+	#dim CrossVH As TECH.Svg.Tooling.CrossVH = ..CrossFactory.MaakCrossVH(Width,Height, kleur)
 	Do ..ElementToevoeger.VoegToeElement(Specialeboring.SvgBox, CrossVH)
 	
 	Quit Specialeboring
Index: vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u -r60343 -r61353
--- vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60343)
+++ vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 61353)
@@ -5,23 +5,23 @@
 Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
 Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</Super>
+<Super>TECH.Svg.Tooling.CrossFactory</Super>
 
 <Method name="MaakCrossDiag">
 <FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</ReturnType>
+<ReturnType>TECH.Svg.Tooling.CrossDiag</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakCrossVH">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH</ReturnType>
+<ReturnType>TECH.Svg.Tooling.CrossVH</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakTCross">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross</ReturnType>
+<ReturnType>TECH.Svg.Tooling.TCross</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml
===================================================================
diff -u -r60292 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml	(.../PuntBoring.cls.xml)	(revision 60292)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml	(.../PuntBoring.cls.xml)	(revision 61353)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring">
-<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.BasisElementSvgTooling</Super>
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling</Super>
 
 <Parameter name="XMLNAME">
 <Default>puntboring</Default>
Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u -r60343 -r61353
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60343)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 61353)
@@ -5,7 +5,7 @@
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
 Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory,Tools.Mock.MockClassBase</Super>
+<Super>TECH.Svg.Tooling.CrossFactory,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
@@ -17,21 +17,21 @@
 
 <Method name="MaakCrossDiag">
 <FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</ReturnType>
+<ReturnType>TECH.Svg.Tooling.CrossDiag</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakCrossDiag",Width,Height,kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakCrossVH">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH</ReturnType>
+<ReturnType>TECH.Svg.Tooling.CrossVH</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakCrossVH",Width,Height,kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakTCross">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross</ReturnType>
+<ReturnType>TECH.Svg.Tooling.TCross</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakTCross",Width,Height,kleur)
 ]]></Implementation>
 </Method>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml
===================================================================
diff -u -r60292 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml	(.../DoorBoring.cls.xml)	(revision 60292)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml	(.../DoorBoring.cls.xml)	(revision 61353)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring">
-<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.BasisElementSvgTooling</Super>
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling</Super>
 
 <Parameter name="XMLNAME">
 <Default>doorboring</Default>
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml
===================================================================
diff -u -r61338 -r61353
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 61338)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringELementFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 61353)
@@ -64,8 +64,8 @@
 		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(0,0,"kleur")
+		Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
+		#dim DummyCrossDiag As TECH.Svg.Tooling.CrossDiag = CrossFactory.MaakCrossDiag(0,0,"kleur")
 		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossDiag)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
@@ -104,9 +104,9 @@
 		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+		Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
 		#dim DummyCirkel As TECH.Svg.Basis.Circle = BasisElementFactory.MaakCirkel(0,0,0)
-		#dim DummyCrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = CrossFactory.MaakCrossDiag(0,0,"kleur")
+		#dim DummyCrossDiag As TECH.Svg.Tooling.CrossDiag = CrossFactory.MaakCrossDiag(0,0,"kleur")
 		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossDiag",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossDiag)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakCirkel",5,2.5,4.545454545454545455).DanReturn(DummyCirkel)
@@ -145,8 +145,8 @@
 		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim DummyTCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross = CrossFactory.MaakTCross(0,0,"kleur")
+		Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
+		#dim DummyTCross As TECH.Svg.Tooling.TCross = CrossFactory.MaakTCross(0,0,"kleur")
 		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakTCross",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyTCross)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
@@ -184,8 +184,8 @@
 		Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 		Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 		Set CrossFactoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-		#dim DummyCrossVH As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH = CrossFactory.MaakCrossVH(0,0,"kleur")
+		Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
+		#dim DummyCrossVH As TECH.Svg.Tooling.CrossVH = CrossFactory.MaakCrossVH(0,0,"kleur")
 		#dim DummySvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(0,0,0,0)
 		Do CrossFactoryMock.VerwachtMethodCall("MaakCrossVH",10,5,##class(TECH.Svg.enu.Kleur).Zwart()).DanReturn(DummyCrossVH)
 		Do BasisElementFactoryMock.VerwachtMethodCall("MaakSvgBox", 20,12.5,10,5).DanReturn(DummySvgBox)
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r61337 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61337)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61353)
@@ -43,6 +43,7 @@
 	}ElseIf (VmlId ="REGULA_SM"){
 		Do ..SD35FREES(Breedte, Lengte,Rotation)
 	}
+	Quit ..SvgBox
 ]]></Implementation>
 </Method>
 
@@ -99,7 +100,6 @@
 
 <Method name="KadFreesRect">
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer</FormalSpec>
-<ReturnType>TECH.Svg.Basis.SvgBox</ReturnType>
 <Implementation><![CDATA[
 	Set ElementToevoeger = ##class(TECH.Svg.Basis.SvgBox.ElementToevoeger).%New()
 	#dim FreesB As %Integer =16
@@ -118,9 +118,7 @@
 	If (Rotation = 270) {
 		Set Rect = ..BasisElementFactory.MaakRechthoek(Breedte, Lengte , FreesB, FreesL)
 	}
-	
 	Do ElementToevoeger.VoegToeElement(..SvgBox,Rect)
-	Quit ..SvgBox
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger.cls.xml
===================================================================
diff -u -r61337 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger.cls.xml	(.../HoekverbinderToevoeger.cls.xml)	(revision 61337)
+++ APPS/Halux/PPS/ALUFrees/Svg/Kaderdeur/HoekverbinderToevoeger.cls.xml	(.../HoekverbinderToevoeger.cls.xml)	(revision 61353)
@@ -75,6 +75,7 @@
 	
 	;benedenprofiel
 	If (ProfPlaats="PO"){ 
+	    ;Set VerbindersArray = ..HoekverbinderMaker.MaakHoekverbinder("LO","RO")
 		Do ..ElementToevoeger.VoegToeElement(VerbinderGroup, VerbinderLinksOnder.Group)
 		Do ..ElementToevoeger.VoegToeElement(VerbinderGroup, VerbinderRechtsOnder.Group)
 	}
Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml
===================================================================
diff -u -r60342 -r61353
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 60342)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/BoringElementFactory.cls.xml	(.../BoringElementFactory.cls.xml)	(revision 61353)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory,CrossFactory:APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory</FormalSpec>
+<FormalSpec>ElementToevoeger:TECH.Svg.Basis.SvgBox.ElementToevoeger,BasisElementFactory:TECH.Svg.BasisElementFactory,CrossFactory:TECH.Svg.Tooling.CrossFactory</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml
===================================================================
diff -u -r60385 -r61353
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 60385)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/BeslagBoringSpecialeVorm.cls.xml	(.../BeslagBoringSpecialeVorm.cls.xml)	(revision 61353)
@@ -17,8 +17,7 @@
 
 <Method name="KadFreesRect">
 <FormalSpec>Breedte:%Integer,Lengte:%Integer,Rotation:%Integer</FormalSpec>
-<ReturnType>TECH.Svg.Basis.SvgBox</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("KadFreesRect",Breedte,Lengte,Rotation)
+<Implementation><![CDATA[	do ..VerwerkMethodCall("KadFreesRect",Breedte,Lengte,Rotation)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory/Test.cls.xml
===================================================================
diff -u -r61338 -r61353
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 61338)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory/Test.cls.xml	(.../Test.cls.xml)	(revision 61353)
@@ -5,8 +5,8 @@
 
 <Method name="Test bestaan CrossDiag">
 <Implementation><![CDATA[
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
+	#dim CrossDiag As TECH.Svg.Tooling.CrossDiag
 	Set CrossDiag = CrossFactory.MaakCrossDiag(25,30)
 		
 	Do ..AssertSvg(CrossDiag, "<line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""25"" y2=""30""></line><line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""30"" x2=""25"" y2=""0""></line>")
@@ -15,8 +15,8 @@
 
 <Method name="Test invulling objecten CrossDiag">
 <Implementation><![CDATA[
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
+	#dim CrossDiag As TECH.Svg.Tooling.CrossDiag
 	Set CrossDiag = CrossFactory.MaakCrossDiag(25,30)
 	
 	Do $$$AssertEquals("TECH.Svg.Basis.Line",CrossDiag.TopLine.%ClassName(1))
@@ -32,14 +32,14 @@
 <Implementation><![CDATA[
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	#dim CrossDiag As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag
+	#dim CrossDiag As TECH.Svg.Tooling.CrossDiag
 	#dim DummyLine1 As TECH.Svg.Basis.Line = BasisElementFactory.MaakLijn(0,0,0,0)
 	#dim DummyLine2 As TECH.Svg.Basis.Line = BasisElementFactory.MaakLijn(0,0,0,0)
 	
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,0,25,30).DanReturn(DummyLine1)
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,30,25,0).DanReturn(DummyLine2)
 	
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New(BasisElementFactoryMock)
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New(BasisElementFactoryMock)
 	Set CrossDiag = CrossFactory.MaakCrossDiag(25,30,##class(TECH.Svg.enu.Kleur).Blauw())
 	
 	Do $$$AssertEquals(CrossDiag.TopLine.Stroke, ##class(TECH.Svg.enu.Kleur).Blauw())
@@ -50,7 +50,7 @@
 
 <Method name="Test bestaan CrossVH">
 <Implementation><![CDATA[
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
 	#dim CrossVH As PPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH
 	Set CrossVH = CrossFactory.MaakCrossVH(25,30)
 	Do ..AssertSvg(CrossVH, "<line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""15"" x2=""25"" y2=""15""></line><line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""12.5"" y1=""0"" x2=""12.5"" y2=""30""></line>")
@@ -59,7 +59,7 @@
 
 <Method name="Test invulling objecten CrossVH">
 <Implementation><![CDATA[
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
 	#dim CrossVH As PPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH
 	Set CrossVH = CrossFactory.MaakCrossVH(25,30)
 		
@@ -84,7 +84,7 @@
 	
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,15,25,15).DanReturn(DummyLine1)
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",12.5,0,12.5,30).DanReturn(DummyLine2)
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New(BasisElementFactoryMock)
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New(BasisElementFactoryMock)
 	Set CrossVH = CrossFactory.MaakCrossVH(25,30, ##class(TECH.Svg.enu.Kleur).Blauw())
 	
 	Do $$$AssertEquals(CrossVH.VerticalLine.Stroke,##class(TECH.Svg.enu.Kleur).Blauw())
@@ -95,8 +95,8 @@
 
 <Method name="Test bestaan TCross">
 <Implementation><![CDATA[
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-	#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
+	#dim TCross As TECH.Svg.Tooling.TCross
 	Set TCross = CrossFactory.MaakTCross(25,30)
 		
 	Do ..AssertSvg(TCross, "<line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""0"" y1=""0"" x2=""25"" y2=""0""></line><line stroke=""black"" stroke-width=""1"" stroke-dasharray=""none"" x1=""12.5"" y1=""0"" x2=""12.5"" y2=""30""></line>")
@@ -105,8 +105,8 @@
 
 <Method name="Test invulling objecten Tcross">
 <Implementation><![CDATA[
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New()
-	#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New()
+	#dim TCross As TECH.Svg.Tooling.TCross
 	Set TCross = CrossFactory.MaakTCross(25,30)
 		
 	Do $$$AssertEquals("TECH.Svg.Basis.Line",TCross.HorizontalLine.%ClassName(1))
@@ -124,13 +124,13 @@
 <Implementation><![CDATA[
 	Set BasisElementFactoryMock = ##class(vhTest.Mock.TECH.Svg.BasisElementFactory).%New()
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	#dim TCross As APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross
+	#dim TCross As TECH.Svg.Tooling.TCross
 	#dim DummyLine1 As TECH.Svg.Basis.Line = BasisElementFactory.MaakLijn(0,0,0,0)
 	#dim DummyLine2 As TECH.Svg.Basis.Line = BasisElementFactory.MaakLijn(0,0,0,0)
 	
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",0,0,25,0).DanReturn(DummyLine1)
 	Do BasisElementFactoryMock.VerwachtMethodCall("MaakLijn",12.5,0,12.5,30).DanReturn(DummyLine2)
-	Set CrossFactory = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossFactory).%New(BasisElementFactoryMock)
+	Set CrossFactory = ##class(TECH.Svg.Tooling.CrossFactory).%New(BasisElementFactoryMock)
 	Set TCross = CrossFactory.MaakTCross(25,30, ##class(TECH.Svg.enu.Kleur).Blauw())
 	
 	Do $$$AssertEquals(TCross.HorizontalLine.Stroke, ##class(TECH.Svg.enu.Kleur).Blauw())
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml
===================================================================
diff -u -r60292 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 60292)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 61353)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring">
-<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.BasisElementSvgTooling</Super>
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling</Super>
 
 <Parameter name="XMLNAME">
 <Default>zijboring</Default>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml
===================================================================
diff -u -r61337 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml	(.../Boringen.cls.xml)	(revision 61337)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml	(.../Boringen.cls.xml)	(revision 61353)
@@ -159,7 +159,9 @@
 		Set BoorType = $S((Boring.BoringType="EX")!(Boring.BoringType="IN"):"Z", 1:Boring.BoringType)
 		
 		If ($L(Boring.VmlID) > 2) {
-			Do ..ElementToevoeger.VoegToeElement(SvgBox, ..BeslagBoringSpecialevorm.MaakBoringSpecialeVorm(Boring.VmlID, Breedte, Lengte, Rotation))
+			w !,Boring.VmlID_" "_Breedte_" "_Lengte_" "_Rotation
+			#Dim SvgBoxTest As TECH.Svg.Basis.SvgBox = ..BeslagBoringSpecialevorm.MaakBoringSpecialeVorm(Boring.VmlID, Breedte, Lengte, Rotation)
+			Do ..ElementToevoeger.VoegToeElement(SvgBox, SvgBoxTest)
 		}
 		ElseIf (BoorType="Z") {
 			Set GrootteBoring = 14
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/SpecialeBoring.cls.xml
===================================================================
diff -u -r60292 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/SpecialeBoring.cls.xml	(.../SpecialeBoring.cls.xml)	(revision 60292)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/SpecialeBoring.cls.xml	(.../SpecialeBoring.cls.xml)	(revision 61353)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring">
-<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.BasisElementSvgTooling</Super>
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling</Super>
 
 <Parameter name="XMLNAME">
 <Default>specialeBoring</Default>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml
===================================================================
diff -u -r60292 -r61353
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 60292)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 61353)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring">
-<Super>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.BasisElementSvgTooling</Super>
+<Super>TECH.Svg.Tooling.BasisElementSvgTooling</Super>
 
 <Parameter name="XMLNAME">
 <Default>rugboring</Default>