Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/SpecialeBoring.cls.xml
===================================================================
diff -u -r59712 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/SpecialeBoring.cls.xml	(.../SpecialeBoring.cls.xml)	(revision 59712)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/SpecialeBoring.cls.xml	(.../SpecialeBoring.cls.xml)	(revision 60049)
@@ -28,6 +28,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..SvgBox
+   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml
===================================================================
diff -u -r59712 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 59712)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/TCross.cls.xml	(.../TCross.cls.xml)	(revision 60049)
@@ -18,19 +18,33 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Width:%Integer,Height:%Integer</FormalSpec>
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set ..HorizontalLine = BasisElementFactory.MaakLijn(0,0, Width, 0)
+	Do ..HorizontalLine.SetFill(kleur)
 	Set ..VerticalLine = BasisElementFactory.MaakLijn(Width/2, 0, Width/2, Height)
+	Do ..VerticalLine.SetFill(kleur)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..HorizontalLine
+   	Set sc = val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+ 	Set val=..VerticalLine
+   	Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml
===================================================================
diff -u -r59917 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 59917)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 60049)
@@ -18,16 +18,17 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,BasisElementFactory:TECH.Svg.BasisElementFactory=""</FormalSpec>
+<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart(),BasisElementFactory:TECH.Svg.BasisElementFactory=""</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 ..BasisElementFactory =##class(TECH.Svg.BasisElementFactory).%New()
-	#Dim CrossDiag as APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height)
+	#Dim CrossDiag as APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height, kleur)
 	Set Circle = ..BasisElementFactory.MaakCirkel(Width/2,Height/2,(Width/2.2))
+	Do Circle.SetFill(kleur)
 	Set ..SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	DO ..SvgBox.VoegToeElement(CrossDiag)
 	DO ..SvgBox.VoegToeElement(Circle)
@@ -36,6 +37,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..SvgBox
+   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml
===================================================================
diff -u -r59712 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml	(.../DoorBoring.cls.xml)	(revision 59712)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/DoorBoring.cls.xml	(.../DoorBoring.cls.xml)	(revision 60049)
@@ -13,21 +13,32 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer</FormalSpec>
+<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set Circle = BasisElementFactory.MaakCirkel( Width/2,Height/2,(Width/10))
+	Do Circle.SetFill(kleur)
 	Set ..SvgBox = BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	DO ..SvgBox.VoegToeElement(Circle)
 	DO ..SvgBox.VoegToeID("doorboring")
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..SvgBox
+   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml
===================================================================
diff -u -r59917 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 59917)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 60049)
@@ -13,15 +13,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Rotation:%Integer=0</FormalSpec>
+<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Rotation:%Integer=0,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set Group = ##class(TECH.Svg.Basis.Group).%New()
-	Set TCross = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross).%New(Width, Height)
+	Set TCross = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross).%New(Width, Height, kleur)
 	Set ..SvgBox = BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	Do Group.VoegToeTransform("rotate("_Rotation_" "_(Width/2)_" "_(Height/2)_")")
 	Do Group.VoegToeElement(TCross)
@@ -31,6 +31,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..SvgBox
+   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml
===================================================================
diff -u -r59712 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml	(.../CrossDiag.cls.xml)	(revision 59712)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossDiag.cls.xml	(.../CrossDiag.cls.xml)	(revision 60049)
@@ -18,7 +18,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Width:%Integer,Height:%Integer</FormalSpec>
+<FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -27,10 +27,24 @@
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set ..TopLine = BasisElementFactory.MaakLijn(0,0,Width,Height)
 	Set ..BottomLine = BasisElementFactory.MaakLijn(0,Height,Width,0)
+	Do ..TopLine.SetStroke(kleur)
+	Do ..BottomLine.SetStroke(kleur)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..TopLine
+   	Set sc = val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+ 	Set val=..BottomLine
+   	Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml
===================================================================
diff -u -r59712 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml	(.../CrossVH.cls.xml)	(revision 59712)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossVH.cls.xml	(.../CrossVH.cls.xml)	(revision 60049)
@@ -18,7 +18,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Width:%Integer,Height:%Integer</FormalSpec>
+<FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -27,10 +27,24 @@
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
 	Set ..HorizontalLine = BasisElementFactory.MaakLijn(0,Height/2,Width,Height/2)
 	Set ..VerticalLine = BasisElementFactory.MaakLijn(Width/2,0,Width/2,Height)
+	Do ..HorizontalLine.SetStroke(kleur)
+	Do ..VerticalLine.SetStroke(kleur)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..HorizontalLine
+   	Set sc = val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+ 	Set val=..VerticalLine
+   	Set sc=  val.XMLExport("line", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml
===================================================================
diff -u -r59917 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml	(.../Boringen.cls.xml)	(revision 59917)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml	(.../Boringen.cls.xml)	(revision 60049)
@@ -12,7 +12,9 @@
 <Method name="VoegToeBoringen">
 <FormalSpec>KaderdeurObject:Prod.GADef.KaderDeur</FormalSpec>
 <Implementation><![CDATA[
+	
 	Do ..Group.VoegToeID("Boringen")
+	#dim Kleur As TECH.Svg.enu.Kleur = ##class(TECH.Svg.enu.Kleur).Zwart()
 	#dim Boringen As array of Prod.GADef.emKadBoring = KaderdeurObject.Boringen
 	#dim Key As %String = ""
 	#dim Boring As Prod.GADef.emKadBoring = Boringen.GetNext(.Key)
@@ -27,106 +29,172 @@
 	#dim SpecialeBoring As APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring
 	
 	
-	While ($$$HasLength(Boring)) {
+	While ($$$HasLength(Boring) ) {
+		Do ##class(Tools.Wlip).%New(238).ObjToText(Boring)
 		#dim ProfielPlaats As %String = KaderdeurObject.ProfielPlaatsGet(Boring)
-		#dim XPos As %Integer = Boring.XPos
-		#dim YPos As %Integer = Boring.YPos
-		#dim Straal As %Integer = Boring.BoorDiameter/2
-		Set BoorType=$S((Boring.BoringType="EX")!(Boring.BoringType="IN"):"Z", 1:Boring.BoringType)
-		If (BoorType="Z") {
-			Set Rotation=$S(ProfielPlaats="PL":0, ProfielPlaats="PB":90, ProfielPlaats="PR":180, ProfielPlaats="PO":270, 1:0)
-			Set ZijBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(XPos,YPos,10,10,Rotation)
-			Do ..Group.VoegToeElement(ZijBoring)
-		}
-		ElseIf(Boring.IsSpecialeBoring()){
-			Set SpecialeBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New(XPos,YPos,10,10)
-			Do ..Group.VoegToeElement(SpecialeBoring)
-		}
-		ElseIf (Boring.BoorDiepte < 0) {
-			Set Circle= ##class(TECH.Svg.BasisElementFactory).%New().MaakCirkel(XPos,YPos,Straal)
-			Do Circle.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
-			Do ..Group.VoegToeElement(Circle)
-		}
-		ElseIf(Boring.BoorDiameter<0)||(Boring.BoorDiepte=0){
-			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,10,10)
-			Do ..Group.VoegToeElement(DoorBoring)
-		}
-		Else {
+		If (KaderdeurObject.NietOpProfiel(ProfielPlaats)) {
+			Set Boring = Boringen.GetNext(.Key)
+		} Else {
+			#dim XPos As %Integer = Boring.XPos
+			#dim YPos As %Integer = Boring.YPos
+			#dim Straal As %Integer = Boring.BoorDiameter/2
+			Set BoorType=$S((Boring.BoringType="EX")!(Boring.BoringType="IN"):"Z", 1:Boring.BoringType)
+			If (BoorType="Z") {
+				Set Rotation=$S(ProfielPlaats="PL":0, ProfielPlaats="PB":90, ProfielPlaats="PR":180, ProfielPlaats="PO":270, 1:0)
+				Set ZijBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(XPos,YPos,10,10,Rotation,Kleur)
+				Do ..Group.VoegToeElement(ZijBoring)
+			}
+			ElseIf(Boring.IsSpecialeBoring()){
+				Set SpecialeBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New(XPos,YPos,10,10,Kleur)
+				Do ..Group.VoegToeElement(SpecialeBoring)
+			}
+			ElseIf (Boring.BoorDiepte < 0) {
+				Set Circle= ##class(TECH.Svg.BasisElementFactory).%New().MaakCirkel(XPos,YPos,Straal)
+				Do Circle.SetFill(Kleur)
+				Do ..Group.VoegToeElement(Circle)
+			}
+			ElseIf(Boring.BoorDiameter<0)||(Boring.BoorDiepte=0){
+				Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,10,10,Kleur)
+				Do ..Group.VoegToeElement(DoorBoring)
+			}
+			Else {
 		
-			Set RugBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New(XPos, YPos,10,10)
-			Do RugBoring.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
-			Do ..Group.VoegToeElement(RugBoring)
-		}	
+				Set RugBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New(XPos, YPos,10,10,Kleur)
+				Do RugBoring.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
+				Do ..Group.VoegToeElement(RugBoring)
+			}	
 		
-		If (BoorType = "Z"), (Boring.BoorDiepte<0) {
-			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,10,10)
-			Do ..Group.VoegToeElement(DoorBoring)
+			If (BoorType = "Z"), (Boring.BoorDiepte<0) {
+				Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,10,10,Kleur)
+				Do ..Group.VoegToeElement(DoorBoring)
+			}
+			Set Boring = Boringen.GetNext(.Key)
 		}
-		Set Boring = Boringen.GetNext(.Key)
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="VoegToeBeslagBoringen">
-<FormalSpec>Beslag:Res.PI.Beslag,Plaats:%String</FormalSpec>
+<FormalSpec>Beslag:Res.PI.Beslag,ProfielPlaats:%String,BPosX:%Integer,BPosY:%Integer,BPosZ:%Integer</FormalSpec>
 <Implementation><![CDATA[
+	
 	Do ..Group.VoegToeID("Boringen")
 	#dim Boringen As list of Prod.GADef.emKadBoring = Beslag.Boringen
 	#dim Boring As Prod.GADef.emKadBoring = ##class(Prod.GADef.emKadBoring).%New()
 	#dim BoringenIterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(Boringen)
+	#dim BasisElementFactory As TECH.Svg.BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	#dim Kleur As TECH.Svg.enu.Kleur = ##class(TECH.Svg.enu.Kleur).Blauw()
+	Do ##class(Tools.Wlip).%New(238).ObjToText(Beslag)
+	Set:(BPosX<0) BPosX= Breedte - BPosX
+	Set:(BPosY<0) BPosY= Hoogte - BPosY
+	Set TijdelijkeOffsetX = Beslag.ConstructAfm.GetAt("OFFSX")
+	Set TijdelijkeOffsetY = Beslag.ConstructAfm.GetAt("OFFSY")
+	Set TijdelijkeBreedte = Beslag.ConstructAfm.GetAt("VRZB")
+	Set TijdelijkeHoogte = Beslag.ConstructAfm.GetAt("VRZH")
+	Set Hoogte =$S(ProfielPlaats="PB"!(ProfielPlaats="PO"):TijdelijkeBreedte, 1:TijdelijkeHoogte)
+	Set Breedte = $S(ProfielPlaats="PB"!(ProfielPlaats="PO"):TijdelijkeHoogte, 1:TijdelijkeBreedte)
+	If (ProfielPlaats = "PL") {
+		Set OffsetX = TijdelijkeOffsetX
+		Set OffsetY = TijdelijkeOffsetY
+	}
+	ElseIf (ProfielPlaats = "PR") {
+		Set OffsetX = Breedte- TijdelijkeOffsetX
+		Set OffsetY = TijdelijkeOffsetY
+	}ElseIf (ProfielPlaats = "PB") {
+		Set OffsetX = TijdelijkeOffsetY
+		Set OffsetY = TijdelijkeOffsetX
+	}ElseIf (ProfielPlaats = "PO") {
+		Set OffsetX =TijdelijkeOffsetY
+		Set OffsetY = Hoogte - TijdelijkeOffsetX
+	}
+
+	
+	#Dim SvgBox As TECH.Svg.Basis.SvgBox = BasisElementFactory.MaakSvgBox(BPosX - OffsetX, BPosY - OffsetY,Hoogte,Breedte)
+	#Dim Rechthoek As TECH.Svg.Basis.Rect = BasisElementFactory.MaakRechthoek(0,0,Breedte, Hoogte)
+	Do Rechthoek.SetStroke(##class(TECH.Svg.enu.Kleur).Blauw())
+	Do Rechthoek.SetFill(##class(TECH.Svg.enu.Kleur).Geen())
+
 	While (BoringenIterator.HasNext()) {
+		
 		Set Boring = BoringenIterator.Next()
-		Set XPos=Boring.XPos
- 		Set YPos=Boring.YPos
+		Do ##class(Tools.Wlip).%New(238).ObjToText(Boring)
+		Set tmpX=Boring.XPos
+ 		Set tmpY=Boring.YPos
+ 		Set XPos = $S(ProfielPlaats="PR":-tmpX, (ProfielPlaats="PB")!(ProfielPlaats="PO"):tmpY, 1:tmpX)
+ 		Set YPos = $S(ProfielPlaats="PR":tmpY, ProfielPlaats="PB":tmpX, ProfielPlaats="PO":-tmpX, 1:tmpY)
+ 		Set XPos = XPos + OffsetX
+ 		Set YPos = YPos + OffsetY 
+ 		Set Breedte = Beslag.ConstructAfm.GetAt("VRZB")
+ 		Set Lengte =  Beslag.ConstructAfm.GetAt("VRZH")
  		Set GrootteBoring=$S(Boring.BoorDiameter<0:0,1:Boring.BoorDiameter)
- 		Set Rotation=$S(Plaats="PL":0, Plaats="PB":90, Plaats="PR":180, Plaats="PO":270, 1:0)   ; Externe boring
+ 		Set Rotation=$S(ProfielPlaats="PL":0, ProfielPlaats="PB":90, ProfielPlaats="PR":180, ProfielPlaats="PO":270, 1:0)   ; Externe boring
  		Set strColor="blue"
 		Set BoorType = Boring.BoringType
 		Set BoorType=$S((Boring.BoringType="EX")!(Boring.BoringType="IN"):"Z", 1:Boring.BoringType)
+	
+		
 		If ($L(Boring.VmlID)>2) {
-			Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(Boring.VmlID, XPos, YPos, Rotation)
+			Do ##class(Tools.Wlip).%New(238).String("1")
+	
+			Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(Boring.VmlID, Breedte, Lengte, Rotation)
 			Do ..Group.VoegToeElement(BeslagBoringSpecialeVorm)
 		}
 		ElseIf (BoorType="Z") {
-			Do ##class(Tools.Wlip).%New(238).String(Boring.VmlID)
+			Do ##class(Tools.Wlip).%New(238).String("2")
 			Set GrootteBoring = 14
-			Set Rotation=$S(Plaats="PL":0, Plaats="PB":90, Plaats="PR":180, Plaats="PO":270, 1:0)
-			Set ZijBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring,Rotation)
-			Do ..Group.VoegToeElement(ZijBoring)
+			Set Rotation=$S(ProfielPlaats="PL":0, ProfielPlaats="PB":90, ProfielPlaats="PR":180, ProfielPlaats="PO":270, 1:0)
+			Set ZijBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring,Rotation, Kleur)
+			Do SvgBox.VoegToeElement(ZijBoring)
 		}
 		ElseIf(Boring.IsSpecialeBoring()){
+			Do ##class(Tools.Wlip).%New(238).String("3")
 			Set GrootteBoring = 10
-			Set SpecialeBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring)
-		;	Do ##class(Tools.Wlip).%New(238).ObjToXML(SpecialeBoring)
-			Do ..Group.VoegToeElement(SpecialeBoring)
+			if (YPos < 0) {
+			Set SpecialeBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New(##class(TECH.Math).Abs(XPos),##class(TECH.Math).Abs(YPos),GrootteBoring,GrootteBoring, Kleur)
+			} Else {
+				Set SpecialeBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New(##class(TECH.Math).Abs(XPos),YPos,GrootteBoring,GrootteBoring, Kleur)
+			}
+			
+			
+			Do SvgBox.VoegToeElement(SpecialeBoring)
 		}
 		ElseIf (Boring.BoorDiepte < 0) {
-		
-			Set Circle= ##class(TECH.Svg.BasisElementFactory).%New().MaakCirkel(XPos,YPos,GrootteBoring/2)
-			Do Circle.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
-			Do ..Group.VoegToeElement(Circle)
+			Do ##class(Tools.Wlip).%New(238).String("4")
+			Set GrootteBoring = 10
+			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring, Kleur)
+			Do SvgBox.VoegToeElement(DoorBoring)
 		}
-		ElseIf(Boring.BoorDiameter<0)||(Boring.BoorDiepte=0){
-		
+		ElseIf(Boring.BoorDiameter<0) || (Boring.BoorDiepte=0){
+			Do ##class(Tools.Wlip).%New(238).String("5")
 			Set GrootteBoring = 10
-			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring)
-			Do ..Group.VoegToeElement(DoorBoring)
+			if (YPos < 0) {
+				Set PuntBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New(XPos,##class(TECH.Math).Abs(YPos),GrootteBoring,GrootteBoring, Kleur)
+			} Else {
+				Set PuntBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.PuntBoring).%New(XPos, ##class(TECH.Math).Abs(YPos) ,GrootteBoring,GrootteBoring, Kleur)
+				
+			}
+			
+			Do SvgBox.VoegToeElement(PuntBoring)
 		}
 		Else {
-			Do ##class(Tools.Wlip).%New(238).String(BoorType)
+			Do ##class(Tools.Wlip).%New(238).String("6")
 			If (GrootteBoring<10) {
-				Do ##class(Tools.Wlip).%New(238).String("else")
-				Set RugBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New(XPos, YPos,GrootteBoring,GrootteBoring)
+				Set RugBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New(XPos, YPos,10,10, Kleur)
 				Do RugBoring.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
 				Do ..Group.VoegToeElement(RugBoring)
+			}Else {
+			
+				Set Straal = GrootteBoring\2
+				Set Cirkel = BasisElementFactory.MaakCirkel((XPos-(Straal))\1 +Straal, (YPos-(Straal))\1 +Straal, Straal)
+				Do Cirkel.SetFill(Kleur)
+				Do SvgBox.VoegToeElement(Cirkel)	
 			}
 		}	
-		If (BoorType = "Z"), (Boring.BoorDiepte<0) {
-			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring)
-			Do ..Group.VoegToeElement(DoorBoring)
-		}
-		
+	
 	}
+	Do SvgBox.VoegToeElement(Rechthoek)
+	Do SvgBox.VoegToeID("beslag")
+	Do ..Group.VoegToeElement(SvgBox)
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml
===================================================================
diff -u -r59712 -r60049
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml	(.../PuntBoring.cls.xml)	(revision 59712)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/PuntBoring.cls.xml	(.../PuntBoring.cls.xml)	(revision 60049)
@@ -13,21 +13,31 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer</FormalSpec>
+<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
-	Set CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height)
+	Set CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height,kleur)
 	Set ..SvgBox = BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	DO ..SvgBox.VoegToeElement(CrossDiag)
 	DO ..SvgBox.VoegToeID("puntboring")
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="XMLExport">
+<FormalSpec><![CDATA[top:%String,format:%String,namespaces:%XML.Namespaces,attrs,createId:%String,typeAttr:%String,&oreflist,&idlist,initialIndent:%String,local:%Boolean]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set val=..SvgBox
+   	Set sc = val.XMLExport("svg", .format, .namespaces, .attrs, .createId, "", .oreflist, .idlist, .initialIndent, .local )
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">