diff --git a/tests/board_samples/kicad_6/kibom-variant_4.kicad_pcb b/tests/board_samples/kicad_6/kibom-variant_4.kicad_pcb
new file mode 100644
index 00000000..7d94d598
--- /dev/null
+++ b/tests/board_samples/kicad_6/kibom-variant_4.kicad_pcb
@@ -0,0 +1,290 @@
+(kicad_pcb (version 20211014) (generator pcbnew)
+
+  (general
+    (thickness 1.6)
+  )
+
+  (paper "A4")
+  (layers
+    (0 "F.Cu" signal)
+    (31 "B.Cu" signal)
+    (32 "B.Adhes" user "B.Adhesive")
+    (33 "F.Adhes" user "F.Adhesive")
+    (34 "B.Paste" user)
+    (35 "F.Paste" user)
+    (36 "B.SilkS" user "B.Silkscreen")
+    (37 "F.SilkS" user "F.Silkscreen")
+    (38 "B.Mask" user)
+    (39 "F.Mask" user)
+    (40 "Dwgs.User" user "User.Drawings")
+    (41 "Cmts.User" user "User.Comments")
+    (42 "Eco1.User" user "User.Eco1")
+    (43 "Eco2.User" user "User.Eco2")
+    (44 "Edge.Cuts" user)
+    (45 "Margin" user)
+    (46 "B.CrtYd" user "B.Courtyard")
+    (47 "F.CrtYd" user "F.Courtyard")
+    (48 "B.Fab" user)
+    (49 "F.Fab" user)
+  )
+
+  (setup
+    (pad_to_mask_clearance 0)
+    (aux_axis_origin 139.89 89.63)
+    (pcbplotparams
+      (layerselection 0x00010fc_ffffffff)
+      (disableapertmacros false)
+      (usegerberextensions false)
+      (usegerberattributes true)
+      (usegerberadvancedattributes true)
+      (creategerberjobfile true)
+      (svguseinch false)
+      (svgprecision 6)
+      (excludeedgelayer true)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (dxfpolygonmode true)
+      (dxfimperialunits true)
+      (dxfusepcbnewfont true)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (sketchpadsonfab false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 1)
+      (scaleselection 1)
+      (outputdirectory "")
+    )
+  )
+
+  (net 0 "")
+  (net 1 "Net-(C1-Pad2)")
+  (net 2 "Net-(C1-Pad1)")
+  (net 3 "Net-(C2-Pad2)")
+  (net 4 "Net-(C2-Pad1)")
+  (net 5 "Net-(R1-Pad2)")
+  (net 6 "Net-(R1-Pad1)")
+  (net 7 "Net-(R2-Pad2)")
+  (net 8 "Net-(R2-Pad1)")
+
+  (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")
+    (path "/00000000-0000-0000-0000-00005f43bec2")
+    (attr exclude_from_pos_files exclude_from_bom)
+    (fp_text reference "C1" (at 0 -1.65) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 5fc27c35-3e1c-4f96-817c-93b5570858a6)
+    )
+    (fp_text value "1nF" (at 0 1.65) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6c9b793c-e74d-4754-a2c0-901e73b26f1c)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+      (tstamp ce83728b-bebd-48c2-8734-b6a50d837931)
+    )
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp 6a45789b-3855-401f-8139-3c734f7f52f9))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp f71da641-16e6-4257-80c3-0b9d804fee4f))
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp fd470e95-4861-44fe-b1e4-6d8a7c66e144))
+    (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 127679a9-3981-4934-815e-896a4e3ff56e))
+    (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 48ab88d7-7084-4d02-b109-3ad55a30bb11))
+    (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 716e31c5-485f-40b5-88e3-a75900da9811))
+    (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp b1086f75-01ba-4188-8d36-75a9e2828ca9))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 0eaa98f0-9565-4637-ace3-42a5231b07f7))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 181abe7a-f941-42b6-bd46-aaa3131f90fb))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp 704d6d51-bb34-4cbf-83d8-841e208048d8))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp 8174b4de-74b1-48db-ab8e-c8432251095b))
+    (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 9340c285-5767-42d5-8b6d-63fe2a40ddf3))
+    (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 c41b3c8b-634e-435a-b582-96b83bbd4032))
+    (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (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")
+    (path "/00000000-0000-0000-0000-00005f43d4bb")
+    (attr through_hole)
+    (fp_text reference "R2" (at 0 -1.65) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 81bbc3ff-3938-49ac-8297-ce2bcc9a42bd)
+    )
+    (fp_text value "1000" (at 1.178 2.13) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 15875808-74d5-4210-b8ca-aa8fbc04ae21)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+      (tstamp a7520ad3-0f8b-4788-92d4-8ffb277041e6)
+    )
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp dd00c2e1-6027-4717-b312-4fab3ee52002))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp 1860e030-7a36-4298-b7fc-a16d48ab15ba))
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp 3dcc657b-55a1-48e0-9667-e01e7b6b08b5))
+    (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 0a3cc030-c9dd-4d74-9d50-715ed2b361a2))
+    (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 8322f275-268c-4e87-a69f-4cfbf05e747f))
+    (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp b6270a28-e0d9-4655-a18a-03dbf007b940))
+    (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp f3490fa5-5a27-423b-af60-53609669542c))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 13abf99d-5265-4779-8973-e94370fd18ff))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp 32667662-ae86-4904-b198-3e95f11851bf))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp 67f6e996-3c99-493c-8f6f-e739e2ed5d7a))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp a05d7640-f2f6-4ba7-8c51-5a4af431fc13))
+    (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 46918595-4a45-48e8-84c0-961b4db7f35f))
+    (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 a795f1ba-cdd5-4cc5-9a52-08586e982934))
+    (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (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")
+    (path "/00000000-0000-0000-0000-00005f43d144")
+    (attr smd)
+    (fp_text reference "R1" (at 0 -1.65) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 983c426c-24e0-4c65-ab69-1f1824adc5c6)
+    )
+    (fp_text value "1k" (at 0 1.65) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp c1d83899-e380-49f9-a87d-8e78bc089ebf)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+      (tstamp 746ba970-8279-4e7b-aed3-f28687777c21)
+    )
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp e9bb29b2-2bb9-4ea2-acd9-2bb3ca677a12))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp 3f5fe6b7-98fc-4d3e-9567-f9f7202d1455))
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp bb7f0588-d4d8-44bf-9ebf-3c533fe4d6ae))
+    (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 5cbb5968-dbb5-4b84-864a-ead1cacf75b9))
+    (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 62c076a3-d618-44a2-9042-9a08b3576787))
+    (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp afb8e687-4a13-41a1-b8c0-89a749e897fe))
+    (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp da469d11-a8a4-414b-9449-d151eeaf4853))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp 6a955fc7-39d9-4c75-9a69-676ca8c0b9b2))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp e10b5627-3247-4c86-b9f6-ef474ca11543))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp e8314017-7be6-4011-9179-37449a29b311))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp f1830a1b-f0cc-47ae-a2c9-679c82032f14))
+    (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 10109f84-4940-47f8-8640-91f185ac9bc1))
+    (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 71c31975-2c45-4d18-a25a-18e07a55d11e))
+    (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (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")
+    (path "/00000000-0000-0000-0000-00005f43d144")
+    (attr smd)
+    (fp_text reference "R3" (at 0 -1.65) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp b635b16e-60bb-4b3e-9fc3-47d34eef8381)
+    )
+    (fp_text value "1k" (at 0 1.65) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 13475e15-f37c-4de8-857e-1722b0c39513)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)))
+      (tstamp 4e3d7c0d-12e3-42f2-b944-e4bcdbbcac2a)
+    )
+    (fp_circle (center 0 0) (end 0.4 0) (layer "F.Adhes") (width 0.1) (fill none) (tstamp 2732632c-4768-42b6-bf7f-14643424019e))
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "F.SilkS") (width 0.12) (tstamp cef6f603-8a0b-4dd0-af99-ebfbef7d1b4b))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "F.SilkS") (width 0.12) (tstamp e877bf4a-4210-4bd3-b7b0-806eb4affc5b))
+    (fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 120a7b0f-ddfd-4447-85c1-35665465acdb))
+    (fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 48f827a8-6e22-4a2e-abdc-c2a03098d883))
+    (fp_line (start 1.68 0.95) (end -1.68 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 854dd5d4-5fd2-4730-bd49-a9cd8299a065))
+    (fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 8d55e186-3e11-40e8-a65e-b36a8a00069e))
+    (fp_line (start -1 -0.6) (end 1 -0.6) (layer "F.Fab") (width 0.1) (tstamp 5b2b5c7d-f943-4634-9f0a-e9561705c49d))
+    (fp_line (start 1 0.6) (end -1 0.6) (layer "F.Fab") (width 0.1) (tstamp 9c8ccb2a-b1e9-4f2c-94fe-301b5975277e))
+    (fp_line (start 1 -0.6) (end 1 0.6) (layer "F.Fab") (width 0.1) (tstamp a03e565f-d8cd-4032-aae3-b7327d4143dd))
+    (fp_line (start -1 0.6) (end -1 -0.6) (layer "F.Fab") (width 0.1) (tstamp c70d9ef3-bfeb-47e0-a1e1-9aeba3da7864))
+    (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) (tstamp aa02e544-13f5-4cf8-a5f4-3e6cda006090))
+    (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) (tstamp 6a44418c-7bb4-4e99-8836-57f153c19721))
+    (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "B.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")
+    (path "/00000000-0000-0000-0000-00005f43ce1c")
+    (attr through_hole)
+    (fp_text reference "C2" (at 0 1.65) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp e615f7aa-337e-474d-9615-2ad82b1c44ca)
+    )
+    (fp_text value "1000 pF" (at -0.508 -2.13) (layer "B.Fab")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 4fb02e58-160a-4a39-9f22-d0c75e82ee72)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+      (tstamp 2e642b3e-a476-4c54-9a52-dcea955640cd)
+    )
+    (fp_circle (center 0 0) (end 0.4 0) (layer "B.Adhes") (width 0.1) (fill none) (tstamp ef8fe2ac-6a7f-4682-9418-b801a1b10a3b))
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "B.SilkS") (width 0.12) (tstamp 3b838d52-596d-4e4d-a6ac-e4c8e7621137))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "B.SilkS") (width 0.12) (tstamp cbdcaa78-3bbc-413f-91bf-2709119373ce))
+    (fp_line (start 1.68 -0.95) (end -1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 44d8279a-9cd1-4db6-856f-0363131605fc))
+    (fp_line (start -1.68 0.95) (end 1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 66116376-6967-4178-9f23-a26cdeafc400))
+    (fp_line (start -1.68 -0.95) (end -1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 749dfe75-c0d6-4872-9330-29c5bbcb8ff8))
+    (fp_line (start 1.68 0.95) (end 1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp eb667eea-300e-4ca7-8a6f-4b00de80cd45))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 1e1b062d-fad0-427c-a622-c5b8a80b5268))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer "B.Fab") (width 0.1) (tstamp 30f15357-ce1d-48b9-93dc-7d9b1b2aa048))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer "B.Fab") (width 0.1) (tstamp 87371631-aa02-498a-998a-09bdb74784c1))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer "B.Fab") (width 0.1) (tstamp d8603679-3e7b-4337-8dbc-1827f5f54d8a))
+    (pad "1" smd roundrect locked (at -0.9375 0) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 4 "Net-(C2-Pad1)") (tstamp ac264c30-3e9a-4be2-b97a-9949b68bd497))
+    (pad "2" smd roundrect locked (at 0.9375 0) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 3 "Net-(C2-Pad2)") (tstamp 5038e144-5119-49db-b6cf-f7c345f1cf03))
+    (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (gr_line (start 133.35 83.82) (end 133.35 93.98) (layer "Edge.Cuts") (width 0.1) (tstamp 00000000-0000-0000-0000-00005f496acc))
+  (gr_line (start 146.05 83.82) (end 133.35 83.82) (layer "Edge.Cuts") (width 0.1) (tstamp 0b21a65d-d20b-411e-920a-75c343ac5136))
+  (gr_line (start 146.05 93.98) (end 146.05 83.82) (layer "Edge.Cuts") (width 0.1) (tstamp 3cd1bda0-18db-417d-b581-a0c50623df68))
+  (gr_line (start 133.35 93.98) (end 146.05 93.98) (layer "Edge.Cuts") (width 0.1) (tstamp d57dcfee-5058-4fc2-a68b-05f9a48f685b))
+  (gr_text "Bogus component.\nNot in schematic." (at 161.163 89.281) (layer "Cmts.User") (tstamp 1831fb37-1c5d-42c4-b898-151be6fca9dc)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
+
+)
diff --git a/tests/board_samples/kicad_6/kibom-variant_4.kicad_sch b/tests/board_samples/kicad_6/kibom-variant_4.kicad_sch
new file mode 100644
index 00000000..94ea537d
--- /dev/null
+++ b/tests/board_samples/kicad_6/kibom-variant_4.kicad_sch
@@ -0,0 +1,225 @@
+(kicad_sch (version 20211123) (generator eeschema)
+
+  (uuid e6521bef-4109-48f7-8b88-4121b0468927)
+
+  (paper "A4")
+
+  (title_block
+    (title "KiBom Test Schematic")
+    (date "2020-03-12")
+    (rev "A")
+    (company "https://github.com/SchrodingersGat/KiBom")
+  )
+
+  (lib_symbols
+    (symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
+      (property "Reference" "C" (id 0) (at 0.635 2.54 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Value" "C" (id 1) (at 0.635 -2.54 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "" (id 2) (at 0.9652 -3.81 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "cap capacitor" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Unpolarized capacitor" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "C_*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "C_0_1"
+        (polyline
+          (pts
+            (xy -2.032 -0.762)
+            (xy 2.032 -0.762)
+          )
+          (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) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "C_1_1"
+        (pin passive line (at 0 3.81 270) (length 2.794)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -3.81 90) (length 2.794)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+    (symbol "Device:R" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+      (property "Reference" "R" (id 0) (at 2.032 0 90)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "R" (id 1) (at 0 0 90)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at -1.778 0 90)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "R res resistor" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Resistor" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "R_*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "R_0_1"
+        (rectangle (start -1.016 -2.54) (end 1.016 2.54)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "R_1_1"
+        (pin passive line (at 0 3.81 270) (length 1.27)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -3.81 90) (length 1.27)
+          (name "~" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
+  )
+
+
+  (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 825c70b0-4860-42b7-97dc-86bfa46e06fd)
+  )
+  (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))
+    (uuid cbc539d2-6a10-4052-9b7a-f10326dcac67)
+  )
+
+  (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)
+    (property "Reference" "C1" (id 0) (at 28.321 42.0116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "1nF" (id 1) (at 28.321 44.323 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 26.3652 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 25.4 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Config" "T2" (id 4) (at 25.4 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 06555ac3-0ee6-4a86-ad0c-e09cac2dcd90))
+    (pin "2" (uuid 0e70e462-56bb-4e9b-b060-51e913ae478e))
+  )
+
+  (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)
+    (property "Reference" "C2" (id 0) (at 39.751 42.0116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "1000 pF" (id 1) (at 39.751 44.323 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (id 2) (at 37.7952 46.99 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 36.83 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Config" "T3" (id 4) (at 36.83 43.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid b6fdfb81-c406-4c88-ae0b-ee646ef2d740))
+    (pin "2" (uuid 28200062-4f55-4fa7-a570-28e2ab274545))
+  )
+
+  (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 71b25962-3bdb-41b6-8555-b03d1677ed65))
+    (pin "2" (uuid 3c65acc2-e8fe-49eb-a1b1-0df75c185195))
+  )
+
+  (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 d34385b1-fadf-4359-a8b1-59e02579d7e5))
+    (pin "2" (uuid 43c60605-74b4-4257-83a1-c4affa06551c))
+  )
+
+  (sheet_instances
+    (path "/" (page "1"))
+  )
+
+  (symbol_instances
+    (path "/00000000-0000-0000-0000-00005f43bec2"
+      (reference "C1") (unit 1) (value "1nF") (footprint "Capacitor_SMD:C_0805_2012Metric")
+    )
+    (path "/00000000-0000-0000-0000-00005f43ce1c"
+      (reference "C2") (unit 1) (value "1000 pF") (footprint "Capacitor_SMD:C_0805_2012Metric")
+    )
+    (path "/00000000-0000-0000-0000-00005f43d144"
+      (reference "R1") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric")
+    )
+    (path "/00000000-0000-0000-0000-00005f43d4bb"
+      (reference "R2") (unit 1) (value "1000") (footprint "Resistor_SMD:R_0805_2012Metric")
+    )
+  )
+)
diff --git a/tests/board_samples/kicad_6/zone-refill.kicad_pcb b/tests/board_samples/kicad_6/zone-refill.kicad_pcb
new file mode 100644
index 00000000..c1389b4f
--- /dev/null
+++ b/tests/board_samples/kicad_6/zone-refill.kicad_pcb
@@ -0,0 +1,509 @@
+(kicad_pcb (version 20211014) (generator pcbnew)
+
+  (general
+    (thickness 1.6)
+  )
+
+  (paper "A4")
+  (layers
+    (0 "F.Cu" signal)
+    (31 "B.Cu" signal)
+    (32 "B.Adhes" user "B.Adhesive")
+    (33 "F.Adhes" user "F.Adhesive")
+    (34 "B.Paste" user)
+    (35 "F.Paste" user)
+    (36 "B.SilkS" user "B.Silkscreen")
+    (37 "F.SilkS" user "F.Silkscreen")
+    (38 "B.Mask" user)
+    (39 "F.Mask" user)
+    (40 "Dwgs.User" user "User.Drawings")
+    (41 "Cmts.User" user "User.Comments")
+    (42 "Eco1.User" user "User.Eco1")
+    (43 "Eco2.User" user "User.Eco2")
+    (44 "Edge.Cuts" user)
+    (45 "Margin" user)
+    (46 "B.CrtYd" user "B.Courtyard")
+    (47 "F.CrtYd" user "F.Courtyard")
+    (48 "B.Fab" user)
+    (49 "F.Fab" user)
+  )
+
+  (setup
+    (pad_to_mask_clearance 0.051)
+    (solder_mask_min_width 0.25)
+    (pcbplotparams
+      (layerselection 0x00010fc_ffffffff)
+      (disableapertmacros false)
+      (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (svguseinch false)
+      (svgprecision 6)
+      (excludeedgelayer true)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (dxfpolygonmode true)
+      (dxfimperialunits true)
+      (dxfusepcbnewfont true)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (sketchpadsonfab false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 1)
+      (scaleselection 1)
+      (outputdirectory "")
+    )
+  )
+
+  (net 0 "")
+  (net 1 "GND")
+  (net 2 "Net-(C1-Pad1)")
+  (net 3 "Net-(J1-Pad1)")
+
+  (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu")
+    (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005ebac57b)
+    (at 167 77.54 180)
+    (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+    (tags "Through hole pin header THT 1x02 2.54mm single row")
+    (path "/00000000-0000-0000-0000-00005ebac9be")
+    (attr through_hole)
+    (fp_text reference "J2" (at 0 -2.33) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6a44418c-7bb4-4e99-8836-57f153c19721)
+    )
+    (fp_text value "Conn_01x02_Male" (at -4 4.87) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0147f16a-c952-4891-8f53-a9fb8cddeb8d)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.27 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d1262c4d-2245-4c4f-8f35-7bb32cd9e21e)
+    )
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 0a3cc030-c9dd-4d74-9d50-715ed2b361a2))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 15875808-74d5-4210-b8ca-aa8fbc04ae21))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 8322f275-268c-4e87-a69f-4cfbf05e747f))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp b6270a28-e0d9-4655-a18a-03dbf007b940))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp dd00c2e1-6027-4717-b312-4fab3ee52002))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp f3490fa5-5a27-423b-af60-53609669542c))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 0d0bb7b2-a6e5-46d2-9492-a1aa6e5a7b2f))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 81bbc3ff-3938-49ac-8297-ce2bcc9a42bd))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp b1169a2d-8998-4b50-a48d-c520bcc1b8e1))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp d22e95aa-f3db-4fbc-a331-048a2523233e))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 1860e030-7a36-4298-b7fc-a16d48ab15ba))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 32667662-ae86-4904-b198-3e95f11851bf))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 3dcc657b-55a1-48e0-9667-e01e7b6b08b5))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 67f6e996-3c99-493c-8f6f-e739e2ed5d7a))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp a05d7640-f2f6-4ba7-8c51-5a4af431fc13))
+    (pad "1" thru_hole rect locked (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 1 "GND") (tstamp a7520ad3-0f8b-4788-92d4-8ffb277041e6))
+    (pad "2" thru_hole oval locked (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 2 "Net-(C1-Pad1)") (tstamp 13abf99d-5265-4779-8973-e94370fd18ff))
+    (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu")
+    (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005ebac6b7)
+    (at 157.82 74.85)
+    (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+    (tags "Through hole pin header THT 1x02 2.54mm single row")
+    (path "/00000000-0000-0000-0000-00005ebac114")
+    (attr through_hole)
+    (fp_text reference "J1" (at 0 -2.33) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 78cbdd6c-4878-4cc5-9a58-0e506478e37d)
+    )
+    (fp_text value "Conn_01x02_Male" (at -4.82 5.15) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6e105729-aba0-497c-a99e-c32d2b3ddb6d)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.27 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 983c426c-24e0-4c65-ab69-1f1824adc5c6)
+    )
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 3f5fe6b7-98fc-4d3e-9567-f9f7202d1455))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 5cbb5968-dbb5-4b84-864a-ead1cacf75b9))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 6a955fc7-39d9-4c75-9a69-676ca8c0b9b2))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp afb8e687-4a13-41a1-b8c0-89a749e897fe))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp bb7f0588-d4d8-44bf-9ebf-3c533fe4d6ae))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp f1830a1b-f0cc-47ae-a2c9-679c82032f14))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 62c076a3-d618-44a2-9042-9a08b3576787))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp c1d83899-e380-49f9-a87d-8e78bc089ebf))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp da469d11-a8a4-414b-9449-d151eeaf4853))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp e9bb29b2-2bb9-4ea2-acd9-2bb3ca677a12))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 10109f84-4940-47f8-8640-91f185ac9bc1))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 71c31975-2c45-4d18-a25a-18e07a55d11e))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 746ba970-8279-4e7b-aed3-f28687777c21))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp e10b5627-3247-4c86-b9f6-ef474ca11543))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp e8314017-7be6-4011-9179-37449a29b311))
+    (pad "1" thru_hole rect locked (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 3 "Net-(J1-Pad1)") (tstamp f4f99e3d-7269-4f6a-a759-16ad2a258779))
+    (pad "2" thru_hole oval locked (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 1 "GND") (tstamp 55e740a3-0735-4744-896e-2bf5437093b9))
+    (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "B.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005ebac54f)
+    (at 163 77.0625 -90)
+    (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")
+    (path "/00000000-0000-0000-0000-00005ebae412")
+    (attr smd)
+    (fp_text reference "C1" (at 0 1.65 -90) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp ef8fe2ac-6a7f-4682-9418-b801a1b10a3b)
+    )
+    (fp_text value "C" (at 0 -1.65 -90) (layer "B.Fab")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 44d8279a-9cd1-4db6-856f-0363131605fc)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0 -90) (layer "B.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+      (tstamp eb667eea-300e-4ca7-8a6f-4b00de80cd45)
+    )
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "B.SilkS") (width 0.12) (tstamp 1e1b062d-fad0-427c-a622-c5b8a80b5268))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "B.SilkS") (width 0.12) (tstamp d8603679-3e7b-4337-8dbc-1827f5f54d8a))
+    (fp_line (start -1.68 0.95) (end 1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 3b838d52-596d-4e4d-a6ac-e4c8e7621137))
+    (fp_line (start 1.68 -0.95) (end -1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 66116376-6967-4178-9f23-a26cdeafc400))
+    (fp_line (start 1.68 0.95) (end 1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 749dfe75-c0d6-4872-9330-29c5bbcb8ff8))
+    (fp_line (start -1.68 -0.95) (end -1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp cbdcaa78-3bbc-413f-91bf-2709119373ce))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer "B.Fab") (width 0.1) (tstamp 2e642b3e-a476-4c54-9a52-dcea955640cd))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 30f15357-ce1d-48b9-93dc-7d9b1b2aa048))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer "B.Fab") (width 0.1) (tstamp 5038e144-5119-49db-b6cf-f7c345f1cf03))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 87371631-aa02-498a-998a-09bdb74784c1))
+    (pad "1" smd roundrect locked (at -0.9375 0 270) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(C1-Pad1)") (tstamp 54365317-1355-4216-bb75-829375abc4ec))
+    (pad "2" smd roundrect locked (at 0.9375 0 270) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "GND") (tstamp ac264c30-3e9a-4be2-b97a-9949b68bd497))
+    (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Resistor_SMD:R_0805_2012Metric" (layer "B.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005ebac712)
+    (at 161.9375 74 180)
+    (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")
+    (path "/00000000-0000-0000-0000-00005ebad9a3")
+    (attr smd)
+    (fp_text reference "R1" (at 0 1.65) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 1a2f72d1-0b36-4610-afc4-4ad1660d5d3b)
+    )
+    (fp_text value "R" (at 0 -1.65) (layer "B.Fab")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 0dcdf1b8-13c6-48b4-bd94-5d26038ff231)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+      (tstamp dde3dba8-1b81-466c-93a3-c284ff4da1ef)
+    )
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "B.SilkS") (width 0.12) (tstamp 2732632c-4768-42b6-bf7f-14643424019e))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "B.SilkS") (width 0.12) (tstamp 854dd5d4-5fd2-4730-bd49-a9cd8299a065))
+    (fp_line (start -1.68 -0.95) (end -1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 13475e15-f37c-4de8-857e-1722b0c39513))
+    (fp_line (start 1.68 -0.95) (end -1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 58dc14f9-c158-4824-a84e-24a6a482a7a4))
+    (fp_line (start -1.68 0.95) (end 1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp b635b16e-60bb-4b3e-9fc3-47d34eef8381))
+    (fp_line (start 1.68 0.95) (end 1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp f976e2cc-36f9-4479-a816-2c74d1d5da6f))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 120a7b0f-ddfd-4447-85c1-35665465acdb))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer "B.Fab") (width 0.1) (tstamp 48f827a8-6e22-4a2e-abdc-c2a03098d883))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 8d55e186-3e11-40e8-a65e-b36a8a00069e))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer "B.Fab") (width 0.1) (tstamp e877bf4a-4210-4bd3-b7b0-806eb4affc5b))
+    (pad "1" smd roundrect locked (at -0.9375 0 180) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(C1-Pad1)") (tstamp 9c8ccb2a-b1e9-4f2c-94fe-301b5975277e))
+    (pad "2" smd roundrect locked (at 0.9375 0 180) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 3 "Net-(J1-Pad1)") (tstamp cef6f603-8a0b-4dd0-af99-ebfbef7d1b4b))
+    (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (gr_line (start 170 80) (end 169 80) (layer "Edge.Cuts") (width 0.05) (tstamp 00000000-0000-0000-0000-00005ebac92c))
+  (gr_line (start 155 80) (end 155 72) (layer "Edge.Cuts") (width 0.05) (tstamp 5fc27c35-3e1c-4f96-817c-93b5570858a6))
+  (gr_line (start 169 80) (end 155 80) (layer "Edge.Cuts") (width 0.05) (tstamp 6c9b793c-e74d-4754-a2c0-901e73b26f1c))
+  (gr_line (start 170 72) (end 170 80) (layer "Edge.Cuts") (width 0.05) (tstamp c144caa5-b0d4-4cef-840a-d4ad178a2102))
+  (gr_line (start 155 72) (end 170 72) (layer "Edge.Cuts") (width 0.05) (tstamp efeac2a2-7682-4dc7-83ee-f6f1b23da506))
+
+  (segment (start 167 77.54) (end 163.46 77.54) (width 0.25) (layer "B.Cu") (net 1) (tstamp 127679a9-3981-4934-815e-896a4e3ff56e))
+  (segment (start 162.39 77.39) (end 163 78) (width 0.25) (layer "B.Cu") (net 1) (tstamp 6a45789b-3855-401f-8139-3c734f7f52f9))
+  (segment (start 163.46 77.54) (end 163 78) (width 0.25) (layer "B.Cu") (net 1) (tstamp 716e31c5-485f-40b5-88e3-a75900da9811))
+  (segment (start 157.82 77.39) (end 162.39 77.39) (width 0.25) (layer "B.Cu") (net 1) (tstamp b1086f75-01ba-4188-8d36-75a9e2828ca9))
+  (segment (start 167 75) (end 164 75) (width 0.25) (layer "B.Cu") (net 2) (tstamp 48ab88d7-7084-4d02-b109-3ad55a30bb11))
+  (segment (start 164 75) (end 163 76) (width 0.25) (layer "B.Cu") (net 2) (tstamp f71da641-16e6-4257-80c3-0b9d804fee4f))
+  (segment (start 164 75) (end 163 74) (width 0.25) (layer "B.Cu") (net 2) (tstamp fd470e95-4861-44fe-b1e4-6d8a7c66e144))
+  (segment (start 158.92 74.85) (end 159.7 74) (width 0.25) (layer "B.Cu") (net 3) (tstamp 0eaa98f0-9565-4637-ace3-42a5231b07f7))
+  (segment (start 157.82 74.85) (end 158.92 74.85) (width 0.25) (layer "B.Cu") (net 3) (tstamp 704d6d51-bb34-4cbf-83d8-841e208048d8))
+  (segment (start 159.7 74) (end 161 74) (width 0.25) (layer "B.Cu") (net 3) (tstamp 8174b4de-74b1-48db-ab8e-c8432251095b))
+
+  (zone (net 1) (net_name "GND") (layer "B.Cu") (tstamp 00000000-0000-0000-0000-00005ebac970) (hatch edge 0.508)
+    (connect_pads (clearance 0.508))
+    (min_thickness 0.254)
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508))
+    (polygon
+      (pts
+        (xy 170 80)
+        (xy 155 80)
+        (xy 155 72)
+        (xy 170 72)
+      )
+    )
+    (filled_polygon
+      (layer "B.Cu")
+      (pts
+        (xy 169.340001 79.34)
+        (xy 155.66 79.34)
+        (xy 155.66 77.74689)
+        (xy 156.378524 77.74689)
+        (xy 156.423175 77.894099)
+        (xy 156.548359 78.15692)
+        (xy 156.722412 78.390269)
+        (xy 156.938645 78.585178)
+        (xy 157.188748 78.734157)
+        (xy 157.463109 78.831481)
+        (xy 157.693 78.710814)
+        (xy 157.693 77.517)
+        (xy 157.947 77.517)
+        (xy 157.947 78.710814)
+        (xy 158.176891 78.831481)
+        (xy 158.451252 78.734157)
+        (xy 158.701355 78.585178)
+        (xy 158.917588 78.390269)
+        (xy 158.917788 78.39)
+        (xy 165.511928 78.39)
+        (xy 165.524188 78.514482)
+        (xy 165.560498 78.63418)
+        (xy 165.619463 78.744494)
+        (xy 165.698815 78.841185)
+        (xy 165.795506 78.920537)
+        (xy 165.90582 78.979502)
+        (xy 166.025518 79.015812)
+        (xy 166.15 79.028072)
+        (xy 166.71425 79.025)
+        (xy 166.873 78.86625)
+        (xy 166.873 77.667)
+        (xy 167.127 77.667)
+        (xy 167.127 78.86625)
+        (xy 167.28575 79.025)
+        (xy 167.85 79.028072)
+        (xy 167.974482 79.015812)
+        (xy 168.09418 78.979502)
+        (xy 168.204494 78.920537)
+        (xy 168.301185 78.841185)
+        (xy 168.380537 78.744494)
+        (xy 168.439502 78.63418)
+        (xy 168.475812 78.514482)
+        (xy 168.488072 78.39)
+        (xy 168.485 77.82575)
+        (xy 168.32625 77.667)
+        (xy 167.127 77.667)
+        (xy 166.873 77.667)
+        (xy 165.67375 77.667)
+        (xy 165.515 77.82575)
+        (xy 165.511928 78.39)
+        (xy 158.917788 78.39)
+        (xy 159.091641 78.15692)
+        (xy 159.216825 77.894099)
+        (xy 159.261476 77.74689)
+        (xy 159.140155 77.517)
+        (xy 157.947 77.517)
+        (xy 157.693 77.517)
+        (xy 156.499845 77.517)
+        (xy 156.378524 77.74689)
+        (xy 155.66 77.74689)
+        (xy 155.66 74)
+        (xy 156.331928 74)
+        (xy 156.331928 75.7)
+        (xy 156.344188 75.824482)
+        (xy 156.380498 75.94418)
+        (xy 156.439463 76.054494)
+        (xy 156.518815 76.151185)
+        (xy 156.615506 76.230537)
+        (xy 156.72582 76.289502)
+        (xy 156.806466 76.313966)
+        (xy 156.722412 76.389731)
+        (xy 156.548359 76.62308)
+        (xy 156.423175 76.885901)
+        (xy 156.378524 77.03311)
+        (xy 156.499845 77.263)
+        (xy 157.693 77.263)
+        (xy 157.693 77.243)
+        (xy 157.947 77.243)
+        (xy 157.947 77.263)
+        (xy 159.140155 77.263)
+        (xy 159.261476 77.03311)
+        (xy 159.216825 76.885901)
+        (xy 159.091641 76.62308)
+        (xy 158.917588 76.389731)
+        (xy 158.833534 76.313966)
+        (xy 158.91418 76.289502)
+        (xy 159.024494 76.230537)
+        (xy 159.121185 76.151185)
+        (xy 159.200537 76.054494)
+        (xy 159.259502 75.94418)
+        (xy 159.295812 75.824482)
+        (xy 159.308072 75.7)
+        (xy 159.308072 75.592847)
+        (xy 160.012857 75.560218)
+        (xy 160.065361 75.560874)
+        (xy 160.124226 75.549928)
+        (xy 160.183465 75.541311)
+        (xy 160.197692 75.536266)
+        (xy 160.212544 75.533504)
+        (xy 160.268139 75.511284)
+        (xy 160.324563 75.491275)
+        (xy 160.337542 75.483545)
+        (xy 160.351559 75.477943)
+        (xy 160.401746 75.445309)
+        (xy 160.453187 75.414673)
+        (xy 160.492188 75.379524)
+        (xy 161.50392 74.570139)
+        (xy 161.584237 74.491803)
+        (xy 161.668957 74.368374)
+        (xy 161.727969 74.230789)
+        (xy 161.759006 74.084334)
+        (xy 161.760058 74)
+        (xy 162.236324 74)
+        (xy 162.250998 74.148985)
+        (xy 162.294454 74.292246)
+        (xy 162.365026 74.424276)
+        (xy 162.436201 74.511002)
+        (xy 162.925199 75)
+        (xy 162.436201 75.488998)
+        (xy 162.365026 75.575724)
+        (xy 162.294454 75.707754)
+        (xy 162.250998 75.851015)
+        (xy 162.236324 76)
+        (xy 162.250998 76.148985)
+        (xy 162.294454 76.292246)
+        (xy 162.365026 76.424276)
+        (xy 162.459999 76.540001)
+        (xy 162.575724 76.634974)
+        (xy 162.707754 76.705546)
+        (xy 162.851015 76.749002)
+        (xy 163 76.763676)
+        (xy 163.148985 76.749002)
+        (xy 163.292246 76.705546)
+        (xy 163.424276 76.634974)
+        (xy 163.511002 76.563799)
+        (xy 164.314802 75.76)
+        (xy 165.721822 75.76)
+        (xy 165.846525 75.946632)
+        (xy 165.97838 76.078487)
+        (xy 165.90582 76.100498)
+        (xy 165.795506 76.159463)
+        (xy 165.698815 76.238815)
+        (xy 165.619463 76.335506)
+        (xy 165.560498 76.44582)
+        (xy 165.524188 76.565518)
+        (xy 165.511928 76.69)
+        (xy 165.515 77.25425)
+        (xy 165.67375 77.413)
+        (xy 166.873 77.413)
+        (xy 166.873 77.393)
+        (xy 167.127 77.393)
+        (xy 167.127 77.413)
+        (xy 168.32625 77.413)
+        (xy 168.485 77.25425)
+        (xy 168.488072 76.69)
+        (xy 168.475812 76.565518)
+        (xy 168.439502 76.44582)
+        (xy 168.380537 76.335506)
+        (xy 168.301185 76.238815)
+        (xy 168.204494 76.159463)
+        (xy 168.09418 76.100498)
+        (xy 168.02162 76.078487)
+        (xy 168.153475 75.946632)
+        (xy 168.31599 75.703411)
+        (xy 168.427932 75.433158)
+        (xy 168.485 75.14626)
+        (xy 168.485 74.85374)
+        (xy 168.427932 74.566842)
+        (xy 168.31599 74.296589)
+        (xy 168.153475 74.053368)
+        (xy 167.946632 73.846525)
+        (xy 167.703411 73.68401)
+        (xy 167.433158 73.572068)
+        (xy 167.14626 73.515)
+        (xy 166.85374 73.515)
+        (xy 166.566842 73.572068)
+        (xy 166.296589 73.68401)
+        (xy 166.053368 73.846525)
+        (xy 165.846525 74.053368)
+        (xy 165.721822 74.24)
+        (xy 164.314802 74.24)
+        (xy 163.511002 73.436201)
+        (xy 163.424276 73.365026)
+        (xy 163.292246 73.294454)
+        (xy 163.148985 73.250998)
+        (xy 163 73.236324)
+        (xy 162.851015 73.250998)
+        (xy 162.707754 73.294454)
+        (xy 162.575724 73.365026)
+        (xy 162.459999 73.459999)
+        (xy 162.365026 73.575724)
+        (xy 162.294454 73.707754)
+        (xy 162.250998 73.851015)
+        (xy 162.236324 74)
+        (xy 161.760058 74)
+        (xy 161.760874 73.934639)
+        (xy 161.733504 73.787456)
+        (xy 161.677944 73.64844)
+        (xy 161.596331 73.522935)
+        (xy 161.491802 73.415763)
+        (xy 161.368373 73.331043)
+        (xy 161.230788 73.272031)
+        (xy 161.084334 73.240995)
+        (xy 160.934638 73.239126)
+        (xy 160.787455 73.266496)
+        (xy 160.64844 73.322057)
+        (xy 160.554384 73.383218)
+        (xy 159.718111 74.052237)
+        (xy 159.308072 74.07122)
+        (xy 159.308072 74)
+        (xy 159.295812 73.875518)
+        (xy 159.259502 73.75582)
+        (xy 159.200537 73.645506)
+        (xy 159.121185 73.548815)
+        (xy 159.024494 73.469463)
+        (xy 158.91418 73.410498)
+        (xy 158.794482 73.374188)
+        (xy 158.67 73.361928)
+        (xy 156.97 73.361928)
+        (xy 156.845518 73.374188)
+        (xy 156.72582 73.410498)
+        (xy 156.615506 73.469463)
+        (xy 156.518815 73.548815)
+        (xy 156.439463 73.645506)
+        (xy 156.380498 73.75582)
+        (xy 156.344188 73.875518)
+        (xy 156.331928 74)
+        (xy 155.66 74)
+        (xy 155.66 72.66)
+        (xy 169.34 72.66)
+      )
+    )
+  )
+)
diff --git a/tests/board_samples/kicad_6/zone-refill.kicad_pcb.ok b/tests/board_samples/kicad_6/zone-refill.kicad_pcb.ok
new file mode 100644
index 00000000..c1389b4f
--- /dev/null
+++ b/tests/board_samples/kicad_6/zone-refill.kicad_pcb.ok
@@ -0,0 +1,509 @@
+(kicad_pcb (version 20211014) (generator pcbnew)
+
+  (general
+    (thickness 1.6)
+  )
+
+  (paper "A4")
+  (layers
+    (0 "F.Cu" signal)
+    (31 "B.Cu" signal)
+    (32 "B.Adhes" user "B.Adhesive")
+    (33 "F.Adhes" user "F.Adhesive")
+    (34 "B.Paste" user)
+    (35 "F.Paste" user)
+    (36 "B.SilkS" user "B.Silkscreen")
+    (37 "F.SilkS" user "F.Silkscreen")
+    (38 "B.Mask" user)
+    (39 "F.Mask" user)
+    (40 "Dwgs.User" user "User.Drawings")
+    (41 "Cmts.User" user "User.Comments")
+    (42 "Eco1.User" user "User.Eco1")
+    (43 "Eco2.User" user "User.Eco2")
+    (44 "Edge.Cuts" user)
+    (45 "Margin" user)
+    (46 "B.CrtYd" user "B.Courtyard")
+    (47 "F.CrtYd" user "F.Courtyard")
+    (48 "B.Fab" user)
+    (49 "F.Fab" user)
+  )
+
+  (setup
+    (pad_to_mask_clearance 0.051)
+    (solder_mask_min_width 0.25)
+    (pcbplotparams
+      (layerselection 0x00010fc_ffffffff)
+      (disableapertmacros false)
+      (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (svguseinch false)
+      (svgprecision 6)
+      (excludeedgelayer true)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (dxfpolygonmode true)
+      (dxfimperialunits true)
+      (dxfusepcbnewfont true)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (sketchpadsonfab false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 1)
+      (scaleselection 1)
+      (outputdirectory "")
+    )
+  )
+
+  (net 0 "")
+  (net 1 "GND")
+  (net 2 "Net-(C1-Pad1)")
+  (net 3 "Net-(J1-Pad1)")
+
+  (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu")
+    (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005ebac57b)
+    (at 167 77.54 180)
+    (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+    (tags "Through hole pin header THT 1x02 2.54mm single row")
+    (path "/00000000-0000-0000-0000-00005ebac9be")
+    (attr through_hole)
+    (fp_text reference "J2" (at 0 -2.33) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6a44418c-7bb4-4e99-8836-57f153c19721)
+    )
+    (fp_text value "Conn_01x02_Male" (at -4 4.87) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0147f16a-c952-4891-8f53-a9fb8cddeb8d)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.27 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d1262c4d-2245-4c4f-8f35-7bb32cd9e21e)
+    )
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 0a3cc030-c9dd-4d74-9d50-715ed2b361a2))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 15875808-74d5-4210-b8ca-aa8fbc04ae21))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 8322f275-268c-4e87-a69f-4cfbf05e747f))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp b6270a28-e0d9-4655-a18a-03dbf007b940))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp dd00c2e1-6027-4717-b312-4fab3ee52002))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp f3490fa5-5a27-423b-af60-53609669542c))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 0d0bb7b2-a6e5-46d2-9492-a1aa6e5a7b2f))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 81bbc3ff-3938-49ac-8297-ce2bcc9a42bd))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp b1169a2d-8998-4b50-a48d-c520bcc1b8e1))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp d22e95aa-f3db-4fbc-a331-048a2523233e))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 1860e030-7a36-4298-b7fc-a16d48ab15ba))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 32667662-ae86-4904-b198-3e95f11851bf))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 3dcc657b-55a1-48e0-9667-e01e7b6b08b5))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 67f6e996-3c99-493c-8f6f-e739e2ed5d7a))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp a05d7640-f2f6-4ba7-8c51-5a4af431fc13))
+    (pad "1" thru_hole rect locked (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 1 "GND") (tstamp a7520ad3-0f8b-4788-92d4-8ffb277041e6))
+    (pad "2" thru_hole oval locked (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 2 "Net-(C1-Pad1)") (tstamp 13abf99d-5265-4779-8973-e94370fd18ff))
+    (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu")
+    (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005ebac6b7)
+    (at 157.82 74.85)
+    (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+    (tags "Through hole pin header THT 1x02 2.54mm single row")
+    (path "/00000000-0000-0000-0000-00005ebac114")
+    (attr through_hole)
+    (fp_text reference "J1" (at 0 -2.33) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 78cbdd6c-4878-4cc5-9a58-0e506478e37d)
+    )
+    (fp_text value "Conn_01x02_Male" (at -4.82 5.15) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6e105729-aba0-497c-a99e-c32d2b3ddb6d)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.27 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 983c426c-24e0-4c65-ab69-1f1824adc5c6)
+    )
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 3f5fe6b7-98fc-4d3e-9567-f9f7202d1455))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 5cbb5968-dbb5-4b84-864a-ead1cacf75b9))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 6a955fc7-39d9-4c75-9a69-676ca8c0b9b2))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp afb8e687-4a13-41a1-b8c0-89a749e897fe))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp bb7f0588-d4d8-44bf-9ebf-3c533fe4d6ae))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp f1830a1b-f0cc-47ae-a2c9-679c82032f14))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 62c076a3-d618-44a2-9042-9a08b3576787))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp c1d83899-e380-49f9-a87d-8e78bc089ebf))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp da469d11-a8a4-414b-9449-d151eeaf4853))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp e9bb29b2-2bb9-4ea2-acd9-2bb3ca677a12))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 10109f84-4940-47f8-8640-91f185ac9bc1))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 71c31975-2c45-4d18-a25a-18e07a55d11e))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 746ba970-8279-4e7b-aed3-f28687777c21))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp e10b5627-3247-4c86-b9f6-ef474ca11543))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp e8314017-7be6-4011-9179-37449a29b311))
+    (pad "1" thru_hole rect locked (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 3 "Net-(J1-Pad1)") (tstamp f4f99e3d-7269-4f6a-a759-16ad2a258779))
+    (pad "2" thru_hole oval locked (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 1 "GND") (tstamp 55e740a3-0735-4744-896e-2bf5437093b9))
+    (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "B.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005ebac54f)
+    (at 163 77.0625 -90)
+    (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")
+    (path "/00000000-0000-0000-0000-00005ebae412")
+    (attr smd)
+    (fp_text reference "C1" (at 0 1.65 -90) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp ef8fe2ac-6a7f-4682-9418-b801a1b10a3b)
+    )
+    (fp_text value "C" (at 0 -1.65 -90) (layer "B.Fab")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 44d8279a-9cd1-4db6-856f-0363131605fc)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0 -90) (layer "B.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+      (tstamp eb667eea-300e-4ca7-8a6f-4b00de80cd45)
+    )
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "B.SilkS") (width 0.12) (tstamp 1e1b062d-fad0-427c-a622-c5b8a80b5268))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "B.SilkS") (width 0.12) (tstamp d8603679-3e7b-4337-8dbc-1827f5f54d8a))
+    (fp_line (start -1.68 0.95) (end 1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 3b838d52-596d-4e4d-a6ac-e4c8e7621137))
+    (fp_line (start 1.68 -0.95) (end -1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 66116376-6967-4178-9f23-a26cdeafc400))
+    (fp_line (start 1.68 0.95) (end 1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 749dfe75-c0d6-4872-9330-29c5bbcb8ff8))
+    (fp_line (start -1.68 -0.95) (end -1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp cbdcaa78-3bbc-413f-91bf-2709119373ce))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer "B.Fab") (width 0.1) (tstamp 2e642b3e-a476-4c54-9a52-dcea955640cd))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 30f15357-ce1d-48b9-93dc-7d9b1b2aa048))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer "B.Fab") (width 0.1) (tstamp 5038e144-5119-49db-b6cf-f7c345f1cf03))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 87371631-aa02-498a-998a-09bdb74784c1))
+    (pad "1" smd roundrect locked (at -0.9375 0 270) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(C1-Pad1)") (tstamp 54365317-1355-4216-bb75-829375abc4ec))
+    (pad "2" smd roundrect locked (at 0.9375 0 270) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "GND") (tstamp ac264c30-3e9a-4be2-b97a-9949b68bd497))
+    (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Resistor_SMD:R_0805_2012Metric" (layer "B.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005ebac712)
+    (at 161.9375 74 180)
+    (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")
+    (path "/00000000-0000-0000-0000-00005ebad9a3")
+    (attr smd)
+    (fp_text reference "R1" (at 0 1.65) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 1a2f72d1-0b36-4610-afc4-4ad1660d5d3b)
+    )
+    (fp_text value "R" (at 0 -1.65) (layer "B.Fab")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 0dcdf1b8-13c6-48b4-bd94-5d26038ff231)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+      (tstamp dde3dba8-1b81-466c-93a3-c284ff4da1ef)
+    )
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "B.SilkS") (width 0.12) (tstamp 2732632c-4768-42b6-bf7f-14643424019e))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "B.SilkS") (width 0.12) (tstamp 854dd5d4-5fd2-4730-bd49-a9cd8299a065))
+    (fp_line (start -1.68 -0.95) (end -1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 13475e15-f37c-4de8-857e-1722b0c39513))
+    (fp_line (start 1.68 -0.95) (end -1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 58dc14f9-c158-4824-a84e-24a6a482a7a4))
+    (fp_line (start -1.68 0.95) (end 1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp b635b16e-60bb-4b3e-9fc3-47d34eef8381))
+    (fp_line (start 1.68 0.95) (end 1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp f976e2cc-36f9-4479-a816-2c74d1d5da6f))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 120a7b0f-ddfd-4447-85c1-35665465acdb))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer "B.Fab") (width 0.1) (tstamp 48f827a8-6e22-4a2e-abdc-c2a03098d883))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 8d55e186-3e11-40e8-a65e-b36a8a00069e))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer "B.Fab") (width 0.1) (tstamp e877bf4a-4210-4bd3-b7b0-806eb4affc5b))
+    (pad "1" smd roundrect locked (at -0.9375 0 180) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(C1-Pad1)") (tstamp 9c8ccb2a-b1e9-4f2c-94fe-301b5975277e))
+    (pad "2" smd roundrect locked (at 0.9375 0 180) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 3 "Net-(J1-Pad1)") (tstamp cef6f603-8a0b-4dd0-af99-ebfbef7d1b4b))
+    (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (gr_line (start 170 80) (end 169 80) (layer "Edge.Cuts") (width 0.05) (tstamp 00000000-0000-0000-0000-00005ebac92c))
+  (gr_line (start 155 80) (end 155 72) (layer "Edge.Cuts") (width 0.05) (tstamp 5fc27c35-3e1c-4f96-817c-93b5570858a6))
+  (gr_line (start 169 80) (end 155 80) (layer "Edge.Cuts") (width 0.05) (tstamp 6c9b793c-e74d-4754-a2c0-901e73b26f1c))
+  (gr_line (start 170 72) (end 170 80) (layer "Edge.Cuts") (width 0.05) (tstamp c144caa5-b0d4-4cef-840a-d4ad178a2102))
+  (gr_line (start 155 72) (end 170 72) (layer "Edge.Cuts") (width 0.05) (tstamp efeac2a2-7682-4dc7-83ee-f6f1b23da506))
+
+  (segment (start 167 77.54) (end 163.46 77.54) (width 0.25) (layer "B.Cu") (net 1) (tstamp 127679a9-3981-4934-815e-896a4e3ff56e))
+  (segment (start 162.39 77.39) (end 163 78) (width 0.25) (layer "B.Cu") (net 1) (tstamp 6a45789b-3855-401f-8139-3c734f7f52f9))
+  (segment (start 163.46 77.54) (end 163 78) (width 0.25) (layer "B.Cu") (net 1) (tstamp 716e31c5-485f-40b5-88e3-a75900da9811))
+  (segment (start 157.82 77.39) (end 162.39 77.39) (width 0.25) (layer "B.Cu") (net 1) (tstamp b1086f75-01ba-4188-8d36-75a9e2828ca9))
+  (segment (start 167 75) (end 164 75) (width 0.25) (layer "B.Cu") (net 2) (tstamp 48ab88d7-7084-4d02-b109-3ad55a30bb11))
+  (segment (start 164 75) (end 163 76) (width 0.25) (layer "B.Cu") (net 2) (tstamp f71da641-16e6-4257-80c3-0b9d804fee4f))
+  (segment (start 164 75) (end 163 74) (width 0.25) (layer "B.Cu") (net 2) (tstamp fd470e95-4861-44fe-b1e4-6d8a7c66e144))
+  (segment (start 158.92 74.85) (end 159.7 74) (width 0.25) (layer "B.Cu") (net 3) (tstamp 0eaa98f0-9565-4637-ace3-42a5231b07f7))
+  (segment (start 157.82 74.85) (end 158.92 74.85) (width 0.25) (layer "B.Cu") (net 3) (tstamp 704d6d51-bb34-4cbf-83d8-841e208048d8))
+  (segment (start 159.7 74) (end 161 74) (width 0.25) (layer "B.Cu") (net 3) (tstamp 8174b4de-74b1-48db-ab8e-c8432251095b))
+
+  (zone (net 1) (net_name "GND") (layer "B.Cu") (tstamp 00000000-0000-0000-0000-00005ebac970) (hatch edge 0.508)
+    (connect_pads (clearance 0.508))
+    (min_thickness 0.254)
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508))
+    (polygon
+      (pts
+        (xy 170 80)
+        (xy 155 80)
+        (xy 155 72)
+        (xy 170 72)
+      )
+    )
+    (filled_polygon
+      (layer "B.Cu")
+      (pts
+        (xy 169.340001 79.34)
+        (xy 155.66 79.34)
+        (xy 155.66 77.74689)
+        (xy 156.378524 77.74689)
+        (xy 156.423175 77.894099)
+        (xy 156.548359 78.15692)
+        (xy 156.722412 78.390269)
+        (xy 156.938645 78.585178)
+        (xy 157.188748 78.734157)
+        (xy 157.463109 78.831481)
+        (xy 157.693 78.710814)
+        (xy 157.693 77.517)
+        (xy 157.947 77.517)
+        (xy 157.947 78.710814)
+        (xy 158.176891 78.831481)
+        (xy 158.451252 78.734157)
+        (xy 158.701355 78.585178)
+        (xy 158.917588 78.390269)
+        (xy 158.917788 78.39)
+        (xy 165.511928 78.39)
+        (xy 165.524188 78.514482)
+        (xy 165.560498 78.63418)
+        (xy 165.619463 78.744494)
+        (xy 165.698815 78.841185)
+        (xy 165.795506 78.920537)
+        (xy 165.90582 78.979502)
+        (xy 166.025518 79.015812)
+        (xy 166.15 79.028072)
+        (xy 166.71425 79.025)
+        (xy 166.873 78.86625)
+        (xy 166.873 77.667)
+        (xy 167.127 77.667)
+        (xy 167.127 78.86625)
+        (xy 167.28575 79.025)
+        (xy 167.85 79.028072)
+        (xy 167.974482 79.015812)
+        (xy 168.09418 78.979502)
+        (xy 168.204494 78.920537)
+        (xy 168.301185 78.841185)
+        (xy 168.380537 78.744494)
+        (xy 168.439502 78.63418)
+        (xy 168.475812 78.514482)
+        (xy 168.488072 78.39)
+        (xy 168.485 77.82575)
+        (xy 168.32625 77.667)
+        (xy 167.127 77.667)
+        (xy 166.873 77.667)
+        (xy 165.67375 77.667)
+        (xy 165.515 77.82575)
+        (xy 165.511928 78.39)
+        (xy 158.917788 78.39)
+        (xy 159.091641 78.15692)
+        (xy 159.216825 77.894099)
+        (xy 159.261476 77.74689)
+        (xy 159.140155 77.517)
+        (xy 157.947 77.517)
+        (xy 157.693 77.517)
+        (xy 156.499845 77.517)
+        (xy 156.378524 77.74689)
+        (xy 155.66 77.74689)
+        (xy 155.66 74)
+        (xy 156.331928 74)
+        (xy 156.331928 75.7)
+        (xy 156.344188 75.824482)
+        (xy 156.380498 75.94418)
+        (xy 156.439463 76.054494)
+        (xy 156.518815 76.151185)
+        (xy 156.615506 76.230537)
+        (xy 156.72582 76.289502)
+        (xy 156.806466 76.313966)
+        (xy 156.722412 76.389731)
+        (xy 156.548359 76.62308)
+        (xy 156.423175 76.885901)
+        (xy 156.378524 77.03311)
+        (xy 156.499845 77.263)
+        (xy 157.693 77.263)
+        (xy 157.693 77.243)
+        (xy 157.947 77.243)
+        (xy 157.947 77.263)
+        (xy 159.140155 77.263)
+        (xy 159.261476 77.03311)
+        (xy 159.216825 76.885901)
+        (xy 159.091641 76.62308)
+        (xy 158.917588 76.389731)
+        (xy 158.833534 76.313966)
+        (xy 158.91418 76.289502)
+        (xy 159.024494 76.230537)
+        (xy 159.121185 76.151185)
+        (xy 159.200537 76.054494)
+        (xy 159.259502 75.94418)
+        (xy 159.295812 75.824482)
+        (xy 159.308072 75.7)
+        (xy 159.308072 75.592847)
+        (xy 160.012857 75.560218)
+        (xy 160.065361 75.560874)
+        (xy 160.124226 75.549928)
+        (xy 160.183465 75.541311)
+        (xy 160.197692 75.536266)
+        (xy 160.212544 75.533504)
+        (xy 160.268139 75.511284)
+        (xy 160.324563 75.491275)
+        (xy 160.337542 75.483545)
+        (xy 160.351559 75.477943)
+        (xy 160.401746 75.445309)
+        (xy 160.453187 75.414673)
+        (xy 160.492188 75.379524)
+        (xy 161.50392 74.570139)
+        (xy 161.584237 74.491803)
+        (xy 161.668957 74.368374)
+        (xy 161.727969 74.230789)
+        (xy 161.759006 74.084334)
+        (xy 161.760058 74)
+        (xy 162.236324 74)
+        (xy 162.250998 74.148985)
+        (xy 162.294454 74.292246)
+        (xy 162.365026 74.424276)
+        (xy 162.436201 74.511002)
+        (xy 162.925199 75)
+        (xy 162.436201 75.488998)
+        (xy 162.365026 75.575724)
+        (xy 162.294454 75.707754)
+        (xy 162.250998 75.851015)
+        (xy 162.236324 76)
+        (xy 162.250998 76.148985)
+        (xy 162.294454 76.292246)
+        (xy 162.365026 76.424276)
+        (xy 162.459999 76.540001)
+        (xy 162.575724 76.634974)
+        (xy 162.707754 76.705546)
+        (xy 162.851015 76.749002)
+        (xy 163 76.763676)
+        (xy 163.148985 76.749002)
+        (xy 163.292246 76.705546)
+        (xy 163.424276 76.634974)
+        (xy 163.511002 76.563799)
+        (xy 164.314802 75.76)
+        (xy 165.721822 75.76)
+        (xy 165.846525 75.946632)
+        (xy 165.97838 76.078487)
+        (xy 165.90582 76.100498)
+        (xy 165.795506 76.159463)
+        (xy 165.698815 76.238815)
+        (xy 165.619463 76.335506)
+        (xy 165.560498 76.44582)
+        (xy 165.524188 76.565518)
+        (xy 165.511928 76.69)
+        (xy 165.515 77.25425)
+        (xy 165.67375 77.413)
+        (xy 166.873 77.413)
+        (xy 166.873 77.393)
+        (xy 167.127 77.393)
+        (xy 167.127 77.413)
+        (xy 168.32625 77.413)
+        (xy 168.485 77.25425)
+        (xy 168.488072 76.69)
+        (xy 168.475812 76.565518)
+        (xy 168.439502 76.44582)
+        (xy 168.380537 76.335506)
+        (xy 168.301185 76.238815)
+        (xy 168.204494 76.159463)
+        (xy 168.09418 76.100498)
+        (xy 168.02162 76.078487)
+        (xy 168.153475 75.946632)
+        (xy 168.31599 75.703411)
+        (xy 168.427932 75.433158)
+        (xy 168.485 75.14626)
+        (xy 168.485 74.85374)
+        (xy 168.427932 74.566842)
+        (xy 168.31599 74.296589)
+        (xy 168.153475 74.053368)
+        (xy 167.946632 73.846525)
+        (xy 167.703411 73.68401)
+        (xy 167.433158 73.572068)
+        (xy 167.14626 73.515)
+        (xy 166.85374 73.515)
+        (xy 166.566842 73.572068)
+        (xy 166.296589 73.68401)
+        (xy 166.053368 73.846525)
+        (xy 165.846525 74.053368)
+        (xy 165.721822 74.24)
+        (xy 164.314802 74.24)
+        (xy 163.511002 73.436201)
+        (xy 163.424276 73.365026)
+        (xy 163.292246 73.294454)
+        (xy 163.148985 73.250998)
+        (xy 163 73.236324)
+        (xy 162.851015 73.250998)
+        (xy 162.707754 73.294454)
+        (xy 162.575724 73.365026)
+        (xy 162.459999 73.459999)
+        (xy 162.365026 73.575724)
+        (xy 162.294454 73.707754)
+        (xy 162.250998 73.851015)
+        (xy 162.236324 74)
+        (xy 161.760058 74)
+        (xy 161.760874 73.934639)
+        (xy 161.733504 73.787456)
+        (xy 161.677944 73.64844)
+        (xy 161.596331 73.522935)
+        (xy 161.491802 73.415763)
+        (xy 161.368373 73.331043)
+        (xy 161.230788 73.272031)
+        (xy 161.084334 73.240995)
+        (xy 160.934638 73.239126)
+        (xy 160.787455 73.266496)
+        (xy 160.64844 73.322057)
+        (xy 160.554384 73.383218)
+        (xy 159.718111 74.052237)
+        (xy 159.308072 74.07122)
+        (xy 159.308072 74)
+        (xy 159.295812 73.875518)
+        (xy 159.259502 73.75582)
+        (xy 159.200537 73.645506)
+        (xy 159.121185 73.548815)
+        (xy 159.024494 73.469463)
+        (xy 158.91418 73.410498)
+        (xy 158.794482 73.374188)
+        (xy 158.67 73.361928)
+        (xy 156.97 73.361928)
+        (xy 156.845518 73.374188)
+        (xy 156.72582 73.410498)
+        (xy 156.615506 73.469463)
+        (xy 156.518815 73.548815)
+        (xy 156.439463 73.645506)
+        (xy 156.380498 73.75582)
+        (xy 156.344188 73.875518)
+        (xy 156.331928 74)
+        (xy 155.66 74)
+        (xy 155.66 72.66)
+        (xy 169.34 72.66)
+      )
+    )
+  )
+)
diff --git a/tests/board_samples/kicad_6/zone-refill.kicad_pcb.refill b/tests/board_samples/kicad_6/zone-refill.kicad_pcb.refill
new file mode 100644
index 00000000..2f9d8c7f
--- /dev/null
+++ b/tests/board_samples/kicad_6/zone-refill.kicad_pcb.refill
@@ -0,0 +1,572 @@
+(kicad_pcb (version 20211014) (generator pcbnew)
+
+  (general
+    (thickness 1.6)
+  )
+
+  (paper "A4")
+  (layers
+    (0 "F.Cu" signal)
+    (31 "B.Cu" signal)
+    (32 "B.Adhes" user "B.Adhesive")
+    (33 "F.Adhes" user "F.Adhesive")
+    (34 "B.Paste" user)
+    (35 "F.Paste" user)
+    (36 "B.SilkS" user "B.Silkscreen")
+    (37 "F.SilkS" user "F.Silkscreen")
+    (38 "B.Mask" user)
+    (39 "F.Mask" user)
+    (40 "Dwgs.User" user "User.Drawings")
+    (41 "Cmts.User" user "User.Comments")
+    (42 "Eco1.User" user "User.Eco1")
+    (43 "Eco2.User" user "User.Eco2")
+    (44 "Edge.Cuts" user)
+    (45 "Margin" user)
+    (46 "B.CrtYd" user "B.Courtyard")
+    (47 "F.CrtYd" user "F.Courtyard")
+    (48 "B.Fab" user)
+    (49 "F.Fab" user)
+  )
+
+  (setup
+    (pad_to_mask_clearance 0.051)
+    (solder_mask_min_width 0.25)
+    (pcbplotparams
+      (layerselection 0x00010fc_ffffffff)
+      (disableapertmacros false)
+      (usegerberextensions false)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (svguseinch false)
+      (svgprecision 6)
+      (excludeedgelayer true)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (dxfpolygonmode true)
+      (dxfimperialunits true)
+      (dxfusepcbnewfont true)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (sketchpadsonfab false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 1)
+      (scaleselection 1)
+      (outputdirectory "")
+    )
+  )
+
+  (net 0 "")
+  (net 1 "GND")
+  (net 2 "Net-(C1-Pad1)")
+  (net 3 "Net-(J1-Pad1)")
+
+  (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu")
+    (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005ebac57b)
+    (at 167 77.54 180)
+    (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+    (tags "Through hole pin header THT 1x02 2.54mm single row")
+    (path "/00000000-0000-0000-0000-00005ebac9be")
+    (attr through_hole)
+    (fp_text reference "J2" (at 0 -2.33) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6a44418c-7bb4-4e99-8836-57f153c19721)
+    )
+    (fp_text value "Conn_01x02_Male" (at -4 4.87) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 0147f16a-c952-4891-8f53-a9fb8cddeb8d)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.27 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp d1262c4d-2245-4c4f-8f35-7bb32cd9e21e)
+    )
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 0a3cc030-c9dd-4d74-9d50-715ed2b361a2))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 15875808-74d5-4210-b8ca-aa8fbc04ae21))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 8322f275-268c-4e87-a69f-4cfbf05e747f))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp b6270a28-e0d9-4655-a18a-03dbf007b940))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp dd00c2e1-6027-4717-b312-4fab3ee52002))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp f3490fa5-5a27-423b-af60-53609669542c))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 0d0bb7b2-a6e5-46d2-9492-a1aa6e5a7b2f))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 81bbc3ff-3938-49ac-8297-ce2bcc9a42bd))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp b1169a2d-8998-4b50-a48d-c520bcc1b8e1))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp d22e95aa-f3db-4fbc-a331-048a2523233e))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 1860e030-7a36-4298-b7fc-a16d48ab15ba))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 32667662-ae86-4904-b198-3e95f11851bf))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp 3dcc657b-55a1-48e0-9667-e01e7b6b08b5))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 67f6e996-3c99-493c-8f6f-e739e2ed5d7a))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp a05d7640-f2f6-4ba7-8c51-5a4af431fc13))
+    (pad "1" thru_hole rect locked (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 1 "GND") (tstamp a7520ad3-0f8b-4788-92d4-8ffb277041e6))
+    (pad "2" thru_hole oval locked (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 2 "Net-(C1-Pad1)") (tstamp 13abf99d-5265-4779-8973-e94370fd18ff))
+    (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu")
+    (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005ebac6b7)
+    (at 157.82 74.85)
+    (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
+    (tags "Through hole pin header THT 1x02 2.54mm single row")
+    (path "/00000000-0000-0000-0000-00005ebac114")
+    (attr through_hole)
+    (fp_text reference "J1" (at 0 -2.33) (layer "F.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 78cbdd6c-4878-4cc5-9a58-0e506478e37d)
+    )
+    (fp_text value "Conn_01x02_Male" (at -4.82 5.15) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 6e105729-aba0-497c-a99e-c32d2b3ddb6d)
+    )
+    (fp_text user "${REFERENCE}" (at 0 1.27 90) (layer "F.Fab")
+      (effects (font (size 1 1) (thickness 0.15)))
+      (tstamp 983c426c-24e0-4c65-ab69-1f1824adc5c6)
+    )
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 3f5fe6b7-98fc-4d3e-9567-f9f7202d1455))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 5cbb5968-dbb5-4b84-864a-ead1cacf75b9))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 6a955fc7-39d9-4c75-9a69-676ca8c0b9b2))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp afb8e687-4a13-41a1-b8c0-89a749e897fe))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp bb7f0588-d4d8-44bf-9ebf-3c533fe4d6ae))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp f1830a1b-f0cc-47ae-a2c9-679c82032f14))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 62c076a3-d618-44a2-9042-9a08b3576787))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp c1d83899-e380-49f9-a87d-8e78bc089ebf))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp da469d11-a8a4-414b-9449-d151eeaf4853))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp e9bb29b2-2bb9-4ea2-acd9-2bb3ca677a12))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 10109f84-4940-47f8-8640-91f185ac9bc1))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 71c31975-2c45-4d18-a25a-18e07a55d11e))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 746ba970-8279-4e7b-aed3-f28687777c21))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp e10b5627-3247-4c86-b9f6-ef474ca11543))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp e8314017-7be6-4011-9179-37449a29b311))
+    (pad "1" thru_hole rect locked (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 3 "Net-(J1-Pad1)") (tstamp f4f99e3d-7269-4f6a-a759-16ad2a258779))
+    (pad "2" thru_hole oval locked (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 1 "GND") (tstamp 55e740a3-0735-4744-896e-2bf5437093b9))
+    (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "B.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005ebac54f)
+    (at 163 77.0625 -90)
+    (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")
+    (path "/00000000-0000-0000-0000-00005ebae412")
+    (attr smd)
+    (fp_text reference "C1" (at 0 1.65 -90) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp ef8fe2ac-6a7f-4682-9418-b801a1b10a3b)
+    )
+    (fp_text value "C" (at 0 -1.65 -90) (layer "B.Fab")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 44d8279a-9cd1-4db6-856f-0363131605fc)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0 -90) (layer "B.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+      (tstamp eb667eea-300e-4ca7-8a6f-4b00de80cd45)
+    )
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "B.SilkS") (width 0.12) (tstamp 1e1b062d-fad0-427c-a622-c5b8a80b5268))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "B.SilkS") (width 0.12) (tstamp d8603679-3e7b-4337-8dbc-1827f5f54d8a))
+    (fp_line (start -1.68 0.95) (end 1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 3b838d52-596d-4e4d-a6ac-e4c8e7621137))
+    (fp_line (start 1.68 -0.95) (end -1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 66116376-6967-4178-9f23-a26cdeafc400))
+    (fp_line (start 1.68 0.95) (end 1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 749dfe75-c0d6-4872-9330-29c5bbcb8ff8))
+    (fp_line (start -1.68 -0.95) (end -1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp cbdcaa78-3bbc-413f-91bf-2709119373ce))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer "B.Fab") (width 0.1) (tstamp 2e642b3e-a476-4c54-9a52-dcea955640cd))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 30f15357-ce1d-48b9-93dc-7d9b1b2aa048))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer "B.Fab") (width 0.1) (tstamp 5038e144-5119-49db-b6cf-f7c345f1cf03))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 87371631-aa02-498a-998a-09bdb74784c1))
+    (pad "1" smd roundrect locked (at -0.9375 0 270) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(C1-Pad1)") (tstamp 54365317-1355-4216-bb75-829375abc4ec))
+    (pad "2" smd roundrect locked (at 0.9375 0 270) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 1 "GND") (tstamp ac264c30-3e9a-4be2-b97a-9949b68bd497))
+    (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (footprint "Resistor_SMD:R_0805_2012Metric" (layer "B.Cu")
+    (tedit 5B36C52B) (tstamp 00000000-0000-0000-0000-00005ebac712)
+    (at 161.9375 74 180)
+    (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")
+    (path "/00000000-0000-0000-0000-00005ebad9a3")
+    (attr smd)
+    (fp_text reference "R1" (at 0 1.65) (layer "B.SilkS")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 1a2f72d1-0b36-4610-afc4-4ad1660d5d3b)
+    )
+    (fp_text value "R" (at 0 -1.65) (layer "B.Fab")
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+      (tstamp 0dcdf1b8-13c6-48b4-bd94-5d26038ff231)
+    )
+    (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
+      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+      (tstamp dde3dba8-1b81-466c-93a3-c284ff4da1ef)
+    )
+    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71) (layer "B.SilkS") (width 0.12) (tstamp 2732632c-4768-42b6-bf7f-14643424019e))
+    (fp_line (start -0.258578 0.71) (end 0.258578 0.71) (layer "B.SilkS") (width 0.12) (tstamp 854dd5d4-5fd2-4730-bd49-a9cd8299a065))
+    (fp_line (start -1.68 -0.95) (end -1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp 13475e15-f37c-4de8-857e-1722b0c39513))
+    (fp_line (start 1.68 -0.95) (end -1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp 58dc14f9-c158-4824-a84e-24a6a482a7a4))
+    (fp_line (start -1.68 0.95) (end 1.68 0.95) (layer "B.CrtYd") (width 0.05) (tstamp b635b16e-60bb-4b3e-9fc3-47d34eef8381))
+    (fp_line (start 1.68 0.95) (end 1.68 -0.95) (layer "B.CrtYd") (width 0.05) (tstamp f976e2cc-36f9-4479-a816-2c74d1d5da6f))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 120a7b0f-ddfd-4447-85c1-35665465acdb))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer "B.Fab") (width 0.1) (tstamp 48f827a8-6e22-4a2e-abdc-c2a03098d883))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer "B.Fab") (width 0.1) (tstamp 8d55e186-3e11-40e8-a65e-b36a8a00069e))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer "B.Fab") (width 0.1) (tstamp e877bf4a-4210-4bd3-b7b0-806eb4affc5b))
+    (pad "1" smd roundrect locked (at -0.9375 0 180) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(C1-Pad1)") (tstamp 9c8ccb2a-b1e9-4f2c-94fe-301b5975277e))
+    (pad "2" smd roundrect locked (at 0.9375 0 180) (size 0.975 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
+      (net 3 "Net-(J1-Pad1)") (tstamp cef6f603-8a0b-4dd0-af99-ebfbef7d1b4b))
+    (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
+      (offset (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (gr_line (start 170 80) (end 169 80) (layer "Edge.Cuts") (width 0.05) (tstamp 00000000-0000-0000-0000-00005ebac92c))
+  (gr_line (start 155 80) (end 155 72) (layer "Edge.Cuts") (width 0.05) (tstamp 5fc27c35-3e1c-4f96-817c-93b5570858a6))
+  (gr_line (start 169 80) (end 155 80) (layer "Edge.Cuts") (width 0.05) (tstamp 6c9b793c-e74d-4754-a2c0-901e73b26f1c))
+  (gr_line (start 170 72) (end 170 80) (layer "Edge.Cuts") (width 0.05) (tstamp c144caa5-b0d4-4cef-840a-d4ad178a2102))
+  (gr_line (start 155 72) (end 170 72) (layer "Edge.Cuts") (width 0.05) (tstamp efeac2a2-7682-4dc7-83ee-f6f1b23da506))
+
+  (segment (start 167 77.54) (end 163.46 77.54) (width 0.25) (layer "B.Cu") (net 1) (tstamp 127679a9-3981-4934-815e-896a4e3ff56e))
+  (segment (start 162.39 77.39) (end 163 78) (width 0.25) (layer "B.Cu") (net 1) (tstamp 6a45789b-3855-401f-8139-3c734f7f52f9))
+  (segment (start 163.46 77.54) (end 163 78) (width 0.25) (layer "B.Cu") (net 1) (tstamp 716e31c5-485f-40b5-88e3-a75900da9811))
+  (segment (start 157.82 77.39) (end 162.39 77.39) (width 0.25) (layer "B.Cu") (net 1) (tstamp b1086f75-01ba-4188-8d36-75a9e2828ca9))
+  (segment (start 167 75) (end 164 75) (width 0.25) (layer "B.Cu") (net 2) (tstamp 48ab88d7-7084-4d02-b109-3ad55a30bb11))
+  (segment (start 164 75) (end 163 76) (width 0.25) (layer "B.Cu") (net 2) (tstamp f71da641-16e6-4257-80c3-0b9d804fee4f))
+  (segment (start 164 75) (end 163 74) (width 0.25) (layer "B.Cu") (net 2) (tstamp fd470e95-4861-44fe-b1e4-6d8a7c66e144))
+  (segment (start 158.92 74.85) (end 159.7 74) (width 0.25) (layer "B.Cu") (net 3) (tstamp 0eaa98f0-9565-4637-ace3-42a5231b07f7))
+  (segment (start 157.82 74.85) (end 158.92 74.85) (width 0.25) (layer "B.Cu") (net 3) (tstamp 704d6d51-bb34-4cbf-83d8-841e208048d8))
+  (segment (start 159.7 74) (end 161 74) (width 0.25) (layer "B.Cu") (net 3) (tstamp 8174b4de-74b1-48db-ab8e-c8432251095b))
+
+  (zone (net 1) (net_name "GND") (layer "B.Cu") (tstamp 00000000-0000-0000-0000-00005ebac970) (hatch edge 0.508)
+    (connect_pads (clearance 0.508))
+    (min_thickness 0.254)
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508))
+    (polygon
+      (pts
+        (xy 170 80)
+        (xy 155 80)
+        (xy 155 72)
+        (xy 170 72)
+      )
+    )
+    (filled_polygon
+      (layer "B.Cu")
+      (pts
+        (xy 169.340001 79.34)
+        (xy 155.66 79.34)
+        (xy 155.66 77.74689)
+        (xy 156.378524 77.74689)
+        (xy 156.423175 77.894099)
+        (xy 156.548359 78.15692)
+        (xy 156.722412 78.390269)
+        (xy 156.938645 78.585178)
+        (xy 157.188748 78.734157)
+        (xy 157.463109 78.831481)
+        (xy 157.693 78.710814)
+        (xy 157.693 77.517)
+        (xy 157.947 77.517)
+        (xy 157.947 78.710814)
+        (xy 158.176891 78.831481)
+        (xy 158.451252 78.734157)
+        (xy 158.701355 78.585178)
+        (xy 158.809719 78.4875)
+        (xy 161.661928 78.4875)
+        (xy 161.674188 78.611982)
+        (xy 161.710498 78.73168)
+        (xy 161.769463 78.841994)
+        (xy 161.848815 78.938685)
+        (xy 161.945506 79.018037)
+        (xy 162.05582 79.077002)
+        (xy 162.175518 79.113312)
+        (xy 162.3 79.125572)
+        (xy 162.71425 79.1225)
+        (xy 162.873 78.96375)
+        (xy 162.873 78.127)
+        (xy 163.127 78.127)
+        (xy 163.127 78.96375)
+        (xy 163.28575 79.1225)
+        (xy 163.7 79.125572)
+        (xy 163.824482 79.113312)
+        (xy 163.94418 79.077002)
+        (xy 164.054494 79.018037)
+        (xy 164.151185 78.938685)
+        (xy 164.230537 78.841994)
+        (xy 164.289502 78.73168)
+        (xy 164.325812 78.611982)
+        (xy 164.338072 78.4875)
+        (xy 164.336588 78.39)
+        (xy 165.511928 78.39)
+        (xy 165.524188 78.514482)
+        (xy 165.560498 78.63418)
+        (xy 165.619463 78.744494)
+        (xy 165.698815 78.841185)
+        (xy 165.795506 78.920537)
+        (xy 165.90582 78.979502)
+        (xy 166.025518 79.015812)
+        (xy 166.15 79.028072)
+        (xy 166.71425 79.025)
+        (xy 166.873 78.86625)
+        (xy 166.873 77.667)
+        (xy 167.127 77.667)
+        (xy 167.127 78.86625)
+        (xy 167.28575 79.025)
+        (xy 167.85 79.028072)
+        (xy 167.974482 79.015812)
+        (xy 168.09418 78.979502)
+        (xy 168.204494 78.920537)
+        (xy 168.301185 78.841185)
+        (xy 168.380537 78.744494)
+        (xy 168.439502 78.63418)
+        (xy 168.475812 78.514482)
+        (xy 168.488072 78.39)
+        (xy 168.485 77.82575)
+        (xy 168.32625 77.667)
+        (xy 167.127 77.667)
+        (xy 166.873 77.667)
+        (xy 165.67375 77.667)
+        (xy 165.515 77.82575)
+        (xy 165.511928 78.39)
+        (xy 164.336588 78.39)
+        (xy 164.335 78.28575)
+        (xy 164.17625 78.127)
+        (xy 163.127 78.127)
+        (xy 162.873 78.127)
+        (xy 161.82375 78.127)
+        (xy 161.665 78.28575)
+        (xy 161.661928 78.4875)
+        (xy 158.809719 78.4875)
+        (xy 158.917588 78.390269)
+        (xy 159.091641 78.15692)
+        (xy 159.216825 77.894099)
+        (xy 159.261476 77.74689)
+        (xy 159.140155 77.517)
+        (xy 157.947 77.517)
+        (xy 157.693 77.517)
+        (xy 156.499845 77.517)
+        (xy 156.378524 77.74689)
+        (xy 155.66 77.74689)
+        (xy 155.66 74)
+        (xy 156.331928 74)
+        (xy 156.331928 75.7)
+        (xy 156.344188 75.824482)
+        (xy 156.380498 75.94418)
+        (xy 156.439463 76.054494)
+        (xy 156.518815 76.151185)
+        (xy 156.615506 76.230537)
+        (xy 156.72582 76.289502)
+        (xy 156.806466 76.313966)
+        (xy 156.722412 76.389731)
+        (xy 156.548359 76.62308)
+        (xy 156.423175 76.885901)
+        (xy 156.378524 77.03311)
+        (xy 156.499845 77.263)
+        (xy 157.693 77.263)
+        (xy 157.693 77.243)
+        (xy 157.947 77.243)
+        (xy 157.947 77.263)
+        (xy 159.140155 77.263)
+        (xy 159.261476 77.03311)
+        (xy 159.216825 76.885901)
+        (xy 159.091641 76.62308)
+        (xy 158.917588 76.389731)
+        (xy 158.833534 76.313966)
+        (xy 158.91418 76.289502)
+        (xy 159.024494 76.230537)
+        (xy 159.121185 76.151185)
+        (xy 159.200537 76.054494)
+        (xy 159.259502 75.94418)
+        (xy 159.295812 75.824482)
+        (xy 159.308072 75.7)
+        (xy 159.308072 75.504326)
+        (xy 159.344276 75.484974)
+        (xy 159.356983 75.474546)
+        (xy 159.371129 75.466185)
+        (xy 159.41474 75.427146)
+        (xy 159.460001 75.390001)
+        (xy 159.494163 75.348374)
+        (xy 159.964226 74.836127)
+        (xy 160.023042 74.946164)
+        (xy 160.132708 75.079792)
+        (xy 160.266336 75.189458)
+        (xy 160.418791 75.270947)
+        (xy 160.584215 75.321128)
+        (xy 160.75625 75.338072)
+        (xy 161.24375 75.338072)
+        (xy 161.415785 75.321128)
+        (xy 161.581209 75.270947)
+        (xy 161.733664 75.189458)
+        (xy 161.867292 75.079792)
+        (xy 161.9375 74.994244)
+        (xy 162.007708 75.079792)
+        (xy 162.076264 75.136054)
+        (xy 162.053836 75.148042)
+        (xy 161.920208 75.257708)
+        (xy 161.810542 75.391336)
+        (xy 161.729053 75.543791)
+        (xy 161.678872 75.709215)
+        (xy 161.661928 75.88125)
+        (xy 161.661928 76.36875)
+        (xy 161.678872 76.540785)
+        (xy 161.729053 76.706209)
+        (xy 161.810542 76.858664)
+        (xy 161.920208 76.992292)
+        (xy 161.926564 76.997508)
+        (xy 161.848815 77.061315)
+        (xy 161.769463 77.158006)
+        (xy 161.710498 77.26832)
+        (xy 161.674188 77.388018)
+        (xy 161.661928 77.5125)
+        (xy 161.665 77.71425)
+        (xy 161.82375 77.873)
+        (xy 162.873 77.873)
+        (xy 162.873 77.853)
+        (xy 163.127 77.853)
+        (xy 163.127 77.873)
+        (xy 164.17625 77.873)
+        (xy 164.335 77.71425)
+        (xy 164.338072 77.5125)
+        (xy 164.325812 77.388018)
+        (xy 164.289502 77.26832)
+        (xy 164.230537 77.158006)
+        (xy 164.151185 77.061315)
+        (xy 164.073436 76.997508)
+        (xy 164.079792 76.992292)
+        (xy 164.189458 76.858664)
+        (xy 164.270947 76.706209)
+        (xy 164.321128 76.540785)
+        (xy 164.338072 76.36875)
+        (xy 164.338072 75.88125)
+        (xy 164.32613 75.76)
+        (xy 165.721822 75.76)
+        (xy 165.846525 75.946632)
+        (xy 165.97838 76.078487)
+        (xy 165.90582 76.100498)
+        (xy 165.795506 76.159463)
+        (xy 165.698815 76.238815)
+        (xy 165.619463 76.335506)
+        (xy 165.560498 76.44582)
+        (xy 165.524188 76.565518)
+        (xy 165.511928 76.69)
+        (xy 165.515 77.25425)
+        (xy 165.67375 77.413)
+        (xy 166.873 77.413)
+        (xy 166.873 77.393)
+        (xy 167.127 77.393)
+        (xy 167.127 77.413)
+        (xy 168.32625 77.413)
+        (xy 168.485 77.25425)
+        (xy 168.488072 76.69)
+        (xy 168.475812 76.565518)
+        (xy 168.439502 76.44582)
+        (xy 168.380537 76.335506)
+        (xy 168.301185 76.238815)
+        (xy 168.204494 76.159463)
+        (xy 168.09418 76.100498)
+        (xy 168.02162 76.078487)
+        (xy 168.153475 75.946632)
+        (xy 168.31599 75.703411)
+        (xy 168.427932 75.433158)
+        (xy 168.485 75.14626)
+        (xy 168.485 74.85374)
+        (xy 168.427932 74.566842)
+        (xy 168.31599 74.296589)
+        (xy 168.153475 74.053368)
+        (xy 167.946632 73.846525)
+        (xy 167.703411 73.68401)
+        (xy 167.433158 73.572068)
+        (xy 167.14626 73.515)
+        (xy 166.85374 73.515)
+        (xy 166.566842 73.572068)
+        (xy 166.296589 73.68401)
+        (xy 166.053368 73.846525)
+        (xy 165.846525 74.053368)
+        (xy 165.721822 74.24)
+        (xy 164.314802 74.24)
+        (xy 164.000572 73.925771)
+        (xy 164.000572 73.54375)
+        (xy 163.983628 73.371715)
+        (xy 163.933447 73.206291)
+        (xy 163.851958 73.053836)
+        (xy 163.742292 72.920208)
+        (xy 163.608664 72.810542)
+        (xy 163.456209 72.729053)
+        (xy 163.290785 72.678872)
+        (xy 163.11875 72.661928)
+        (xy 162.63125 72.661928)
+        (xy 162.459215 72.678872)
+        (xy 162.293791 72.729053)
+        (xy 162.141336 72.810542)
+        (xy 162.007708 72.920208)
+        (xy 161.9375 73.005756)
+        (xy 161.867292 72.920208)
+        (xy 161.733664 72.810542)
+        (xy 161.581209 72.729053)
+        (xy 161.415785 72.678872)
+        (xy 161.24375 72.661928)
+        (xy 160.75625 72.661928)
+        (xy 160.584215 72.678872)
+        (xy 160.418791 72.729053)
+        (xy 160.266336 72.810542)
+        (xy 160.132708 72.920208)
+        (xy 160.023042 73.053836)
+        (xy 159.941553 73.206291)
+        (xy 159.931327 73.24)
+        (xy 159.720983 73.24)
+        (xy 159.667234 73.237027)
+        (xy 159.609291 73.245257)
+        (xy 159.551014 73.250997)
+        (xy 159.535281 73.255769)
+        (xy 159.519014 73.25808)
+        (xy 159.463788 73.277456)
+        (xy 159.407753 73.294454)
+        (xy 159.393257 73.302202)
+        (xy 159.37775 73.307643)
+        (xy 159.32735 73.337431)
+        (xy 159.275724 73.365026)
+        (xy 159.26302 73.375452)
+        (xy 159.24887 73.383815)
+        (xy 159.205248 73.422864)
+        (xy 159.159999 73.459999)
+        (xy 159.125845 73.501616)
+        (xy 159.099137 73.530721)
+        (xy 159.024494 73.469463)
+        (xy 158.91418 73.410498)
+        (xy 158.794482 73.374188)
+        (xy 158.67 73.361928)
+        (xy 156.97 73.361928)
+        (xy 156.845518 73.374188)
+        (xy 156.72582 73.410498)
+        (xy 156.615506 73.469463)
+        (xy 156.518815 73.548815)
+        (xy 156.439463 73.645506)
+        (xy 156.380498 73.75582)
+        (xy 156.344188 73.875518)
+        (xy 156.331928 74)
+        (xy 155.66 74)
+        (xy 155.66 72.66)
+        (xy 169.34 72.66)
+      )
+    )
+  )
+)