diff --git a/tests/board_samples/kicad_6/bom.kicad_sch b/tests/board_samples/kicad_6/bom.kicad_sch
index 6e9d7bb1..56195c44 100644
--- a/tests/board_samples/kicad_6/bom.kicad_sch
+++ b/tests/board_samples/kicad_6/bom.kicad_sch
@@ -1,6 +1,6 @@
-(kicad_sch (version 20200828) (generator eeschema)
+(kicad_sch (version 20211123) (generator eeschema)
 
-  (page 1 1)
+  (uuid e6521bef-4109-48f7-8b88-4121b0468927)
 
   (paper "A4")
 
@@ -33,14 +33,16 @@
             (xy -2.032 -0.762)
             (xy 2.032 -0.762)
           )
-          (stroke (width 0.508)) (fill (type none))
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
         (polyline
           (pts
             (xy -2.032 0.762)
             (xy 2.032 0.762)
           )
-          (stroke (width 0.508)) (fill (type none))
+          (stroke (width 0.508) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
       )
       (symbol "C_1_1"
@@ -78,7 +80,8 @@
       )
       (symbol "R_0_1"
         (rectangle (start -1.016 -2.54) (end 1.016 2.54)
-          (stroke (width 0.254)) (fill (type none))
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
       )
       (symbol "R_1_1"
@@ -121,7 +124,8 @@
             (xy -1.27 -1.27)
             (xy 0 -1.27)
           )
-          (stroke (width 0)) (fill (type none))
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
       )
       (symbol "GND_1_1"
@@ -156,21 +160,24 @@
             (xy -0.762 1.27)
             (xy 0 2.54)
           )
-          (stroke (width 0)) (fill (type none))
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
         (polyline
           (pts
             (xy 0 0)
             (xy 0 2.54)
           )
-          (stroke (width 0)) (fill (type none))
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
         (polyline
           (pts
             (xy 0 2.54)
             (xy 0.762 1.27)
           )
-          (stroke (width 0)) (fill (type none))
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
         )
       )
       (symbol "VCC_1_1"
@@ -182,78 +189,42 @@
     )
   )
 
-  (junction (at 88.9 62.23) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 88.9 62.23) (diameter 1.016) (color 0 0 0 0)
+    (uuid 53c85970-3e21-4fae-a84f-721cfc0513b5)
+  )
 
-  (wire (pts (xy 88.9 52.07) (xy 88.9 49.53))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 88.9 59.69) (xy 88.9 62.23))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 88.9 62.23) (xy 88.9 66.04))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
-  (wire (pts (xy 88.9 76.2) (xy 88.9 73.66))
-    (stroke (width 0) (type solid) (color 0 0 0 0))
-  )
   (wire (pts (xy 99.06 62.23) (xy 88.9 62.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 2bf3f24b-fd30-41a7-a274-9b519491916b)
+  )
+  (wire (pts (xy 88.9 52.07) (xy 88.9 49.53))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 34871042-9d5c-4e29-abdd-a168368c3c22)
   )
   (wire (pts (xy 99.06 66.04) (xy 99.06 62.23))
     (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 4831966c-bb32-4bc8-a400-0382a02ffa1c)
+  )
+  (wire (pts (xy 88.9 62.23) (xy 88.9 66.04))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid a9ec539a-d80d-40cc-803c-12b6adefe42a)
+  )
+  (wire (pts (xy 88.9 76.2) (xy 88.9 73.66))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid c264c438-a475-4ad4-9915-0f1e6ecf3053)
   )
   (wire (pts (xy 99.06 76.2) (xy 99.06 73.66))
     (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid e25ce415-914a-48fe-bf09-324317917b2e)
   )
-
-  (symbol (lib_id "power:VCC") (at 88.9 49.53 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005ebe99a0")
-    (property "Reference" "#PWR01" (id 0) (at 88.9 53.34 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "VCC" (id 1) (at 89.3318 45.1358 0))
-    (property "Footprint" "" (id 2) (at 88.9 49.53 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 88.9 49.53 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
-
-  (symbol (lib_id "power:GND") (at 88.9 76.2 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005ebe9830")
-    (property "Reference" "#PWR02" (id 0) (at 88.9 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 89.027 80.5942 0))
-    (property "Footprint" "" (id 2) (at 88.9 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 88.9 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-  )
-
-  (symbol (lib_id "power:GND") (at 99.06 76.2 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005ebe965a")
-    (property "Reference" "#PWR03" (id 0) (at 99.06 82.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 99.187 80.5942 0))
-    (property "Footprint" "" (id 2) (at 99.06 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 99.06 76.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
+  (wire (pts (xy 88.9 59.69) (xy 88.9 62.23))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid ef1b4b98-541b-4673-a04f-2043250fc40a)
   )
 
   (symbol (lib_id "Device:R") (at 88.9 55.88 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005ebe8a2e")
+    (uuid 00000000-0000-0000-0000-00005ebe8a2e)
     (property "Reference" "R1" (id 0) (at 90.678 54.7116 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -266,11 +237,13 @@
     (property "Datasheet" "~" (id 3) (at 88.9 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 3f5fe6b7-98fc-4d3e-9567-f9f7202d1455))
+    (pin "2" (uuid bb7f0588-d4d8-44bf-9ebf-3c533fe4d6ae))
   )
 
   (symbol (lib_id "Device:R") (at 88.9 69.85 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005ebe8e9e")
+    (uuid 00000000-0000-0000-0000-00005ebe8e9e)
     (property "Reference" "R2" (id 0) (at 90.678 68.6816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -283,11 +256,13 @@
     (property "Datasheet" "~" (id 3) (at 88.9 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 94c158d1-8503-4553-b511-bf42f506c2a8))
+    (pin "2" (uuid 23bb2798-d93a-4696-a962-c305c4298a0c))
   )
 
   (symbol (lib_id "Device:C") (at 99.06 69.85 0) (unit 1)
     (in_bom yes) (on_board yes)
-    (uuid "00000000-0000-0000-0000-00005ebe91ac")
+    (uuid 00000000-0000-0000-0000-00005ebe91ac)
     (property "Reference" "C1" (id 0) (at 101.981 68.6816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -300,6 +275,60 @@
     (property "Datasheet" "~" (id 3) (at 99.06 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (pin "1" (uuid 746ba970-8279-4e7b-aed3-f28687777c21))
+    (pin "2" (uuid 71c31975-2c45-4d18-a25a-18e07a55d11e))
+  )
+
+  (symbol (lib_id "power:GND") (at 99.06 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 00000000-0000-0000-0000-00005ebe965a)
+    (property "Reference" "#PWR03" (id 0) (at 99.06 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 99.187 80.5942 0))
+    (property "Footprint" "" (id 2) (at 99.06 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 99.06 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 13abf99d-5265-4779-8973-e94370fd18ff))
+  )
+
+  (symbol (lib_id "power:GND") (at 88.9 76.2 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 00000000-0000-0000-0000-00005ebe9830)
+    (property "Reference" "#PWR02" (id 0) (at 88.9 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 89.027 80.5942 0))
+    (property "Footprint" "" (id 2) (at 88.9 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 88.9 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1860e030-7a36-4298-b7fc-a16d48ab15ba))
+  )
+
+  (symbol (lib_id "power:VCC") (at 88.9 49.53 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 00000000-0000-0000-0000-00005ebe99a0)
+    (property "Reference" "#PWR01" (id 0) (at 88.9 53.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "VCC" (id 1) (at 89.3318 45.1358 0))
+    (property "Footprint" "" (id 2) (at 88.9 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 88.9 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid e9bb29b2-2bb9-4ea2-acd9-2bb3ca677a12))
+  )
+
+  (sheet_instances
+    (path "/" (page "1"))
   )
 
   (symbol_instances
diff --git a/tests/board_samples/kicad_6/bom.xml b/tests/board_samples/kicad_6/bom.xml
index c22a1426..82725099 100644
--- a/tests/board_samples/kicad_6/bom.xml
+++ b/tests/board_samples/kicad_6/bom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<export version="D">
+<export version="E">
   <design>
-    <source>/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_5/bom/bom.kicad_sch</source>
-    <date>jue 15 oct 2020 17:09:06</date>
-    <tool>Eeschema 5.99.0-unknown-b8453d1b6~104~ubuntu20.10.1</tool>
+    <source>/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_6/bom.kicad_sch</source>
+    <date>vie 17 dic 2021 11:43:04</date>
+    <tool>Eeschema 6.0.0-rc1-unknown-rc1+332+gd00810c0fb</tool>
     <sheet number="1" name="/" tstamps="/">
       <title_block>
         <title/>
@@ -27,32 +27,29 @@
     <comp ref="C1">
       <value>1uF</value>
       <footprint>Capacitor_SMD:C_0805_2012Metric</footprint>
-      <datasheet>~</datasheet>
       <libsource lib="Device" part="C" description="Unpolarized capacitor"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_5/bom/bom.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="bom.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005ebe91ac</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005ebe91ac</tstamps>
     </comp>
     <comp ref="R1">
       <value>100</value>
       <footprint>Resistor_SMD:R_0805_2012Metric</footprint>
-      <datasheet>~</datasheet>
       <libsource lib="Device" part="R" description="Resistor"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_5/bom/bom.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="bom.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005ebe8a2e</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005ebe8a2e</tstamps>
     </comp>
     <comp ref="R2">
       <value>200</value>
       <footprint>Resistor_SMD:R_0805_2012Metric</footprint>
-      <datasheet>~</datasheet>
       <libsource lib="Device" part="R" description="Resistor"/>
-      <property name="Nombre de hoja" value=""/>
-      <property name="Sheet file" value="/home/salvador/0Data/Eccosur/kibot/tests/board_samples/kicad_5/bom/bom.sch"/>
+      <property name="Sheetname" value=""/>
+      <property name="Sheetfile" value="bom.kicad_sch"/>
       <sheetpath names="/" tstamps="/"/>
-      <tstamp>00000000-0000-0000-0000-00005ebe8e9e</tstamp>
+      <tstamps>00000000-0000-0000-0000-00005ebe8e9e</tstamps>
     </comp>
   </components>
   <libparts>
@@ -68,8 +65,8 @@
         <field name="Datasheet">~</field>
       </fields>
       <pins>
-        <pin num="1" name="~" type="passive"/>
-        <pin num="2" name="~" type="passive"/>
+        <pin num="1" name="" type="passive"/>
+        <pin num="2" name="" type="passive"/>
       </pins>
     </libpart>
     <libpart lib="Device" part="R">
@@ -84,8 +81,8 @@
         <field name="Datasheet">~</field>
       </fields>
       <pins>
-        <pin num="1" name="~" type="passive"/>
-        <pin num="2" name="~" type="passive"/>
+        <pin num="1" name="" type="passive"/>
+        <pin num="2" name="" type="passive"/>
       </pins>
     </libpart>
   </libparts>
@@ -96,16 +93,16 @@
   </libraries>
   <nets>
     <net code="1" name="GND">
-      <node ref="C1" pin="2"/>
-      <node ref="R2" pin="2"/>
+      <node ref="C1" pin="2" pintype="passive"/>
+      <node ref="R2" pin="2" pintype="passive"/>
     </net>
     <net code="2" name="Net-(C1-Pad1)">
-      <node ref="C1" pin="1"/>
-      <node ref="R1" pin="2"/>
-      <node ref="R2" pin="1"/>
+      <node ref="C1" pin="1" pintype="passive"/>
+      <node ref="R1" pin="2" pintype="passive"/>
+      <node ref="R2" pin="1" pintype="passive"/>
     </net>
     <net code="3" name="VCC">
-      <node ref="R1" pin="1"/>
+      <node ref="R1" pin="1" pintype="passive"/>
     </net>
   </nets>
 </export>