diff --git a/tests/board_samples/kicad_6/kibom-variant_3.kicad_pcb b/tests/board_samples/kicad_6/kibom-variant_3.kicad_pcb
index fcf37a3c..d9c88d29 100644
--- a/tests/board_samples/kicad_6/kibom-variant_3.kicad_pcb
+++ b/tests/board_samples/kicad_6/kibom-variant_3.kicad_pcb
@@ -1,4 +1,4 @@
-(kicad_pcb (version 20201002) (generator pcbnew)
+(kicad_pcb (version 20211014) (generator pcbnew)
 
   (general
     (thickness 1.6)
@@ -29,6 +29,7 @@
   )
 
   (setup
+    (pad_to_mask_clearance 0)
     (aux_axis_origin 139.89 89.63)
     (pcbplotparams
       (layerselection 0x00010fc_ffffffff)
@@ -47,6 +48,9 @@
       (hpglpennumber 1)
       (hpglpenspeed 20)
       (hpglpendiameter 15.000000)
+      (dxfpolygonmode true)
+      (dxfimperialunits true)
+      (dxfusepcbnewfont true)
       (psnegative false)
       (psa4output false)
       (plotreference true)
@@ -62,7 +66,6 @@
     )
   )
 
-
   (net 0 "")
   (net 1 "Net-(C1-Pad2)")
   (net 2 "Net-(C1-Pad1)")
@@ -73,7 +76,8 @@
   (net 7 "Net-(R2-Pad2)")
   (net 8 "Net-(R2-Pad1)")
 
-  (module "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f496a58)
+  (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f496a58)
     (at 137.16 87.63)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
@@ -91,7 +95,7 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 610d3dab-96f1-467e-a8bb-982e1a5e28b3)
     )
-    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (tstamp b95c9af6-d571-4ff7-aa89-c20d6a5096f9))
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp b95c9af6-d571-4ff7-aa89-c20d6a5096f9))
     (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp 535fb667-3ef5-4c7d-8b0e-f211f4b2598f))
     (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp 877d03b3-2e6b-4283-8774-f9a3972e5d1b))
     (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 179b1cfd-2c85-4f43-a5f6-868ca3ed1710))
@@ -102,9 +106,9 @@
     (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 53842113-2eed-4e07-83f9-cf62ab0b8b6b))
     (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp 6052d8c7-51a2-4347-a770-b463e8004a6a))
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp ffd4eef0-200f-473f-98ef-875ae2710211))
-    (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "1" smd roundrect locked (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "Net-(C1-Pad1)") (tstamp 0396208e-a401-46d6-a9d6-4fc5f29a991e))
-    (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "2" smd roundrect locked (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 1 "Net-(C1-Pad2)") (tstamp c0e176e6-2b65-4e42-ab43-deafd4b2725e))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
@@ -118,7 +122,8 @@
     )
   )
 
-  (module "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f496a69)
+  (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f496a69)
     (at 137.16 90.58)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
@@ -136,7 +141,7 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 210883df-9124-4ab7-9e4d-1d5de0e14436)
     )
-    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (tstamp 565df081-bb0e-4272-889c-8883a6cf574f))
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp 565df081-bb0e-4272-889c-8883a6cf574f))
     (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp b38aac83-d426-48eb-8136-075909ca0d4a))
     (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp f39138bd-8e9c-4749-b1f6-ad562a76c547))
     (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 446b00b9-49fb-4d19-99d8-f7dfbf5ba90e))
@@ -147,9 +152,9 @@
     (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp 72ae4549-fa18-4dbf-93bb-1305330c71a6))
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 7fc277fd-f98e-4d8c-95fe-9dde488db0c6))
     (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp ff6fa4d8-6d22-441b-96c5-4b33ac32fe1e))
-    (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "1" smd roundrect locked (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 4 "Net-(C2-Pad1)") (tstamp bb444f3e-7d1f-4c82-8eb7-24fddaab885c))
-    (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "2" smd roundrect locked (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 3 "Net-(C2-Pad2)") (tstamp 378300c0-8cef-4c8a-8338-6f66311fc3c2))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
@@ -158,7 +163,8 @@
     )
   )
 
-  (module "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f496a8b)
+  (footprint "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f496a8b)
     (at 141.57 90.58)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "resistor")
@@ -176,7 +182,7 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp e7acb238-433c-4d0c-9ac5-aada44ae87c6)
     )
-    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (tstamp 5e9a445e-d281-40e5-aa88-5a4ca0015602))
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp 5e9a445e-d281-40e5-aa88-5a4ca0015602))
     (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp 2f751c07-db61-4fb2-a551-ac48ab965e3e))
     (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp 77b6adbd-4ea1-4b55-ac32-3d73199bfa37))
     (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 1c18e8fe-20b5-44a9-abff-9239aded7a2a))
@@ -187,9 +193,9 @@
     (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp a40020d7-ffd1-4386-b107-b0101c1b0ce5))
     (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp c22ae2e3-a19d-4183-bd18-87d52e335b80))
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp df843824-3ab8-4db7-a313-5cb6e638d41e))
-    (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "1" smd roundrect locked (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 8 "Net-(R2-Pad1)") (tstamp d82b2b32-b91d-4cb1-86e2-007ccd994e78))
-    (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "2" smd roundrect locked (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 7 "Net-(R2-Pad2)") (tstamp ba5049a8-ad9a-49c4-997a-84e5c7fdd3d9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
@@ -198,7 +204,8 @@
     )
   )
 
-  (module "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f503c2a)
+  (footprint "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f503c2a)
     (at 141.57 87.63)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "resistor")
@@ -216,7 +223,7 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 6d891518-8781-400e-8095-ad01983a9315)
     )
-    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (tstamp b6bf2be9-d47d-4982-baf3-f6485d5fc2fa))
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp b6bf2be9-d47d-4982-baf3-f6485d5fc2fa))
     (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp 3f82faa0-e76b-430f-9a3e-124be5e074a2))
     (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp 47987321-48a0-4e03-bdbc-dad9ea6b9662))
     (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 2320c397-f9b3-417f-93bc-7684581ff540))
@@ -227,9 +234,9 @@
     (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 5d794526-beca-4e0a-b441-f09f1366536c))
     (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp a32c49f6-0990-4f13-ad49-4db52adad6aa))
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp b953df13-a55a-4953-a0fa-5fdc226f66e6))
-    (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "1" smd roundrect locked (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 6 "Net-(R1-Pad1)") (tstamp 3fbca69d-47ae-4671-b766-56ad2b10b635))
-    (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "2" smd roundrect locked (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 5 "Net-(R1-Pad2)") (tstamp 364ef61c-3c7f-49af-92ac-c9cb1c72df90))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
@@ -238,7 +245,8 @@
     )
   )
 
-  (module "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu") (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f503c4a)
+  (footprint "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005f503c4a)
     (at 148.555 89.154)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "resistor")
@@ -256,7 +264,7 @@
       (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 760a8cec-d133-4ac1-9b68-2a482625bd1f)
     )
-    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (tstamp e5b325c5-598d-4f6b-a413-d3a79eb95cbb))
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp e5b325c5-598d-4f6b-a413-d3a79eb95cbb))
     (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp 02c4cbf5-9900-4c08-981d-8f9deb435440))
     (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp 35b37184-c1db-4605-9bcd-675b2c4b2158))
     (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 2ad9142c-8923-4abd-b90a-c8ae2f7c9d80))
@@ -267,9 +275,9 @@
     (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp c9abcf12-7a33-4d52-8f7f-751243a70726))
     (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp d540225e-b626-44df-a06e-d1355b1826a9))
     (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp d7ea9ea0-5b1e-4200-8463-6407ba1b21a5))
-    (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "1" smd roundrect locked (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 6 "Net-(R1-Pad1)") (tstamp 7c75769f-18a4-4d0c-9703-f047e8f5ab1d))
-    (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+    (pad "2" smd roundrect locked (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 5 "Net-(R1-Pad2)") (tstamp 2b8f6242-95b2-4ff4-8124-8f1c2a171f0a))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
@@ -278,7 +286,8 @@
     )
   )
 
-  (module "Fiducial:Fiducial_0.5mm_Mask1mm" (layer "F.Cu") (tedit 5C18CB26) (tstamp 00000000-0000-0000-0000-00005f57ee4f)
+  (footprint "Fiducial:Fiducial_0.5mm_Mask1mm" (layer "F.Cu")
+    (tedit 5C18CB26) (tstamp 00000000-0000-0000-0000-00005f57ee4f)
     (at 139.6746 82.9564)
     (descr "Circular Fiducial, 0.5mm bare copper, 1mm soldermask opening (Level C)")
     (tags "fiducial")
@@ -296,9 +305,9 @@
       (effects (font (size 0.2 0.2) (thickness 0.04)))
       (tstamp af5353c5-81fd-4093-969d-2b7178673638)
     )
-    (fp_circle (center 0 0) (end 0.75 0) (layer "F.CrtYd") (width 0.05) (tstamp bd1aa9f8-fd9c-4c73-ad79-67b18a6317f1))
-    (fp_circle (center 0 0) (end 0.5 0) (layer "F.Fab") (width 0.1) (tstamp b2736e48-774d-475e-b008-2b03645f9be3))
-    (pad "" smd circle (at 0 0) (size 0.5 0.5) (layers "F.Cu" "F.Mask")
+    (fp_circle (center 0 0) (end 0.75 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp bd1aa9f8-fd9c-4c73-ad79-67b18a6317f1))
+    (fp_circle (center 0 0) (end 0.5 0) (layer "F.Fab") (width 0.1) (fill none) (tstamp b2736e48-774d-475e-b008-2b03645f9be3))
+    (pad "" smd circle locked (at 0 0) (size 0.5 0.5) (layers "F.Cu" "F.Mask")
       (solder_mask_margin 0.25) (clearance 0.25) (tstamp 1dde19d5-99c8-4d8b-8f79-2b55c7e0cf67))
   )
 
diff --git a/tests/board_samples/kicad_6/kibom-variant_3.kicad_sch b/tests/board_samples/kicad_6/kibom-variant_3.kicad_sch
index 81fc9310..6e42cfb4 100644
--- a/tests/board_samples/kicad_6/kibom-variant_3.kicad_sch
+++ b/tests/board_samples/kicad_6/kibom-variant_3.kicad_sch
@@ -1,6 +1,6 @@
-(kicad_sch (version 20200828) (generator eeschema)
+(kicad_sch (version 20211123) (generator eeschema)
 
-  (page 1 1)
+  (uuid e6521bef-4109-48f7-8b88-4121b0468927)
 
   (paper "A4")
 
@@ -40,14 +40,16 @@
             (xy -2.032 -0.762)
             (xy 2.032 -0.762)
           )
-          (stroke (width 0.508)) (fill (type none))
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
         (polyline
           (pts
             (xy -2.032 0.762)
             (xy 2.032 0.762)
           )
-          (stroke (width 0.508)) (fill (type none))
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
       )
       (symbol "C_1_1"
@@ -85,7 +87,8 @@
       )
       (symbol "R_0_1"
         (rectangle (start -1.016 -2.54) (end 1.016 2.54)
-          (stroke (width 0.254)) (fill (type none))
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
       )
       (symbol "R_1_1"
@@ -122,7 +125,10 @@
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "Fiducial_0_1"
-        (circle (center 0 0) (radius 1.27) (stroke (width 0.508)) (fill (type background)))
+        (circle (center 0 0) (radius 1.27)
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type background))
+        )
       )
     )
   )
@@ -131,72 +137,17 @@
   (text "This schematic serves as a test-file for the KiBot export script.\nHere we implement the IBoM variants style."
     (at 12.7 19.05 0)
     (effects (font (size 2.0066 2.0066)) (justify left bottom))
+    (uuid 9a9f2d82-f64d-4264-8bec-c182528fc4de)
   )
   (text "The test tests the following \nvariants matrix:\n        production   test   default\nC1                     X\nC2          X          X\nR1          X          X       X\nR2          X                  X\n\nproduction: blacklist T2\ntest: blacklist T1\ndefault: whitelist T1,default \n         blacklist T2,T3"
     (at 151.13 81.28 0)
     (effects (font (size 2.9972 2.9972)) (justify left bottom))
-  )
-
-  (symbol (lib_id "Mechanical:Fiducial") (at 44.45 57.15 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005f57eddb")
-    (property "Reference" "FID1" (id 0) (at 46.609 55.9816 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "Fiducial" (id 1) (at 46.609 58.293 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Fiducial:Fiducial_0.5mm_Mask1mm" (id 2) (at 44.45 57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 44.45 57.15 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
-
-  (symbol (lib_id "Device:R") (at 53.34 43.18 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005f43d144")
-    (property "Reference" "R1" (id 0) (at 55.118 42.0116 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1k" (id 1) (at 55.118 44.323 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 51.562 43.18 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 53.34 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Config" "default" (id 4) (at 53.34 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
-
-  (symbol (lib_id "Device:R") (at 63.5 43.18 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005f43d4bb")
-    (property "Reference" "R2" (id 0) (at 65.278 42.0116 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "1000" (id 1) (at 65.278 44.323 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 61.722 43.18 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 63.5 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Config" "T1" (id 4) (at 63.5 43.18 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
+    (uuid b60c50d1-225e-415c-8712-7acb5e3dc8ea)
   )
 
   (symbol (lib_id "Device:C") (at 25.4 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005f43bec2")
+    (uuid 00000000-0000-0000-0000-00005f43bec2)
     (property "Reference" "C1" (id 0) (at 28.321 42.0116 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -212,11 +163,13 @@
     (property "Config" "T2" (id 4) (at 25.4 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid d22e95aa-f3db-4fbc-a331-048a2523233e))
+    (pin "2" (uuid 0d0bb7b2-a6e5-46d2-9492-a1aa6e5a7b2f))
   )
 
   (symbol (lib_id "Device:C") (at 36.83 43.18 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005f43ce1c")
+    (uuid 00000000-0000-0000-0000-00005f43ce1c)
     (property "Reference" "C2" (id 0) (at 39.751 42.0116 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -232,6 +185,73 @@
     (property "Config" "T3" (id 4) (at 36.83 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 0a3cc030-c9dd-4d74-9d50-715ed2b361a2))
+    (pin "2" (uuid 8322f275-268c-4e87-a69f-4cfbf05e747f))
+  )
+
+  (symbol (lib_id "Device:R") (at 53.34 43.18 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 00000000-0000-0000-0000-00005f43d144)
+    (property "Reference" "R1" (id 0) (at 55.118 42.0116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "1k" (id 1) (at 55.118 44.323 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 51.562 43.18 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 53.34 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Config" "default" (id 4) (at 53.34 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 48f827a8-6e22-4a2e-abdc-c2a03098d883))
+    (pin "2" (uuid e877bf4a-4210-4bd3-b7b0-806eb4affc5b))
+  )
+
+  (symbol (lib_id "Device:R") (at 63.5 43.18 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 00000000-0000-0000-0000-00005f43d4bb)
+    (property "Reference" "R2" (id 0) (at 65.278 42.0116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "1000" (id 1) (at 65.278 44.323 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (id 2) (at 61.722 43.18 90)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 63.5 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Config" "T1" (id 4) (at 63.5 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid c70d9ef3-bfeb-47e0-a1e1-9aeba3da7864))
+    (pin "2" (uuid 4e3d7c0d-12e3-42f2-b944-e4bcdbbcac2a))
+  )
+
+  (symbol (lib_id "Mechanical:Fiducial") (at 44.45 57.15 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 00000000-0000-0000-0000-00005f57eddb)
+    (property "Reference" "FID1" (id 0) (at 46.609 55.9816 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Fiducial" (id 1) (at 46.609 58.293 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Fiducial:Fiducial_0.5mm_Mask1mm" (id 2) (at 44.45 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 44.45 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (sheet_instances
+    (path "/" (page "1"))
   )
 
   (symbol_instances
diff --git a/tests/board_samples/kicad_6/kibom-variant_3.xml b/tests/board_samples/kicad_6/kibom-variant_3.xml
index 4e5a1f75..bf36e1a5 100644
--- a/tests/board_samples/kicad_6/kibom-variant_3.xml
+++ b/tests/board_samples/kicad_6/kibom-variant_3.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<export version="D">
+<export version="E">
   <design>
-    <source>/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/1/kibom-variant_3.kicad_sch</source>
-    <date>lun 19 oct 2020 13:08:28</date>
-    <tool>Eeschema 5.99.0-unknown-688a03179~104~ubuntu20.10.1</tool>
+    <source>/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/kibom-variant_3.kicad_sch</source>
+    <date>vie 17 dic 2021 12:17:19</date>
+    <tool>Eeschema 6.0.0-rc1-unknown-rc1+332+gd00810c0fb</tool>
     <sheet number="1" name="/" tstamps="/">
       <title_block>
         <title>KiBom Test Schematic</title>
@@ -27,68 +27,63 @@
     <comp ref="C1">
       <value>1nF</value>
       <footprint>Capacitor_SMD:C_0805_2012Metric</footprint>
-      <datasheet>~</datasheet>
       <fields>
         <field name="Config">T2</field>
       </fields>
       <libsource lib="Device" part="C" description="Unpolarized capacitor"/>
       <property name="Config" value="T2"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/1/kibom-variant_3.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="kibom-variant_3.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005f43bec2</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005f43bec2</tstamps>
     </comp>
     <comp ref="C2">
       <value>1000 pF</value>
       <footprint>Capacitor_SMD:C_0805_2012Metric</footprint>
-      <datasheet>~</datasheet>
       <fields>
         <field name="Config">T3</field>
       </fields>
       <libsource lib="Device" part="C" description="Unpolarized capacitor"/>
       <property name="Config" value="T3"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/1/kibom-variant_3.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="kibom-variant_3.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005f43ce1c</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005f43ce1c</tstamps>
     </comp>
     <comp ref="FID1">
       <value>Fiducial</value>
       <footprint>Fiducial:Fiducial_0.5mm_Mask1mm</footprint>
-      <datasheet>~</datasheet>
       <libsource lib="Mechanical" part="Fiducial" description="Fiducial Marker"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/1/kibom-variant_3.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="kibom-variant_3.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005f57eddb</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005f57eddb</tstamps>
     </comp>
     <comp ref="R1">
       <value>1k</value>
       <footprint>Resistor_SMD:R_0805_2012Metric</footprint>
-      <datasheet>~</datasheet>
       <fields>
         <field name="Config">default</field>
       </fields>
       <libsource lib="Device" part="R" description="Resistor"/>
       <property name="Config" value="default"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/1/kibom-variant_3.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="kibom-variant_3.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005f43d144</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005f43d144</tstamps>
     </comp>
     <comp ref="R2">
       <value>1000</value>
       <footprint>Resistor_SMD:R_0805_2012Metric</footprint>
-      <datasheet>~</datasheet>
       <fields>
         <field name="Config">T1</field>
       </fields>
       <libsource lib="Device" part="R" description="Resistor"/>
       <property name="Config" value="T1"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/1/kibom-variant_3.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="kibom-variant_3.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005f43d4bb</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005f43d4bb</tstamps>
     </comp>
   </components>
   <libparts>
@@ -104,8 +99,8 @@
         <field name="Datasheet">~</field>
       </fields>
       <pins>
-        <pin num="1" name="~" type="passive"/>
-        <pin num="2" name="~" type="passive"/>
+        <pin num="1" name="" type="passive"/>
+        <pin num="2" name="" type="passive"/>
       </pins>
     </libpart>
     <libpart lib="Device" part="R">
@@ -120,8 +115,8 @@
         <field name="Datasheet">~</field>
       </fields>
       <pins>
-        <pin num="1" name="~" type="passive"/>
-        <pin num="2" name="~" type="passive"/>
+        <pin num="1" name="" type="passive"/>
+        <pin num="2" name="" type="passive"/>
       </pins>
     </libpart>
     <libpart lib="Mechanical" part="Fiducial">
@@ -146,29 +141,29 @@
     </library>
   </libraries>
   <nets>
-    <net code="1" name="Net-(C1-Pad1)">
-      <node ref="C1" pin="1"/>
+    <net code="1" name="unconnected-(C1-Pad1)">
+      <node ref="C1" pin="1" pintype="passive"/>
     </net>
-    <net code="2" name="Net-(C1-Pad2)">
-      <node ref="C1" pin="2"/>
+    <net code="2" name="unconnected-(C1-Pad2)">
+      <node ref="C1" pin="2" pintype="passive"/>
     </net>
-    <net code="3" name="Net-(C2-Pad1)">
-      <node ref="C2" pin="1"/>
+    <net code="3" name="unconnected-(C2-Pad1)">
+      <node ref="C2" pin="1" pintype="passive"/>
     </net>
-    <net code="4" name="Net-(C2-Pad2)">
-      <node ref="C2" pin="2"/>
+    <net code="4" name="unconnected-(C2-Pad2)">
+      <node ref="C2" pin="2" pintype="passive"/>
     </net>
-    <net code="5" name="Net-(R1-Pad1)">
-      <node ref="R1" pin="1"/>
+    <net code="5" name="unconnected-(R1-Pad1)">
+      <node ref="R1" pin="1" pintype="passive"/>
     </net>
-    <net code="6" name="Net-(R1-Pad2)">
-      <node ref="R1" pin="2"/>
+    <net code="6" name="unconnected-(R1-Pad2)">
+      <node ref="R1" pin="2" pintype="passive"/>
     </net>
-    <net code="7" name="Net-(R2-Pad1)">
-      <node ref="R2" pin="1"/>
+    <net code="7" name="unconnected-(R2-Pad1)">
+      <node ref="R2" pin="1" pintype="passive"/>
     </net>
-    <net code="8" name="Net-(R2-Pad2)">
-      <node ref="R2" pin="2"/>
+    <net code="8" name="unconnected-(R2-Pad2)">
+      <node ref="R2" pin="2" pintype="passive"/>
     </net>
   </nets>
 </export>